From 2ffe9c080a960ba990959e3905cd0479f11d5763 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Mon, 22 Oct 2018 00:48:28 +0200
Subject: [PATCH 1/3] [skip-ci] tzdata: update to 2018f

---
 tzdata/PKGBUILD | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/tzdata/PKGBUILD b/tzdata/PKGBUILD
index 41f133faa..41a8c703a 100644
--- a/tzdata/PKGBUILD
+++ b/tzdata/PKGBUILD
@@ -1,25 +1,42 @@
 pkgname=tzdata
-pkgver=2018e
+pkgver=2018f
 pkgrel=1
 pkgdesc="Sources for time zone and daylight saving time data"
 arch=('x86_64')
-url="http://www.iana.org/time-zones"
+url="https://www.iana.org/time-zones"
 license=('GPL')
 options=('!emptydirs')
-source=(http://www.iana.org/time-zones/repository/releases/${pkgname}${pkgver}.tar.gz)
+source=(https://www.iana.org/time-zones/repository/releases/tzcode${pkgver}.tar.gz
+        https://www.iana.org/time-zones/repository/releases/${pkgname}${pkgver}.tar.gz)
+sha256sums=('4ec74f8a84372570135ea4be16a042442fafe100f5598cb1017bfd30af6aaa70'
+            '0af6a85fc4ea95832f76524f35696a61abb3992fd3f8db33e5a1f95653e043f2')
 
 timezones=('africa' 'antarctica' 'asia' 'australasia'
            'europe' 'northamerica' 'southamerica'
            'pacificnew' 'etcetera' 'backward'
            'systemv' 'factory')
-md5sums=('97d654f4d7253173b3eeb76a836dd65e')
+
+prepare() {
+  sed -i "s:sbin:bin:g" Makefile
+}
+
+build() {
+  make
+}
 
 package() {
   cd ${srcdir}
-  zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo ${timezones[@]}
-  zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/posix ${timezones[@]}
-  zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo/right -L leapseconds ${timezones[@]}
+  # install tzcode stuff
+  make DESTDIR="${pkgdir}" install
+
+  # install tzdata stuff
+  ./zic -d ${pkgdir}/usr/share/zoneinfo ${timezones[@]}
+  ./zic -d ${pkgdir}/usr/share/zoneinfo/posix ${timezones[@]}
+  ./zic -d ${pkgdir}/usr/share/zoneinfo/right -L leapseconds ${timezones[@]}
   
-  zic -y ./yearistype -d ${pkgdir}/usr/share/zoneinfo -p America/New_York
+  ./zic -d ${pkgdir}/usr/share/zoneinfo -p America/New_York
   install -m444 -t ${pkgdir}/usr/share/zoneinfo iso3166.tab zone1970.tab zone.tab # zone.tab is depricated and will go soon
+  
+  # cleanup
+  rm "${pkgdir}/etc/localtime"
 }

From 93435a6dcda4a96e8e07ddfeaf1505338820d8c6 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Mon, 22 Oct 2018 01:06:40 +0200
Subject: [PATCH 2/3] [skip-ci] man-pages: update to 4.16

---
 man-pages/PKGBUILD | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/man-pages/PKGBUILD b/man-pages/PKGBUILD
index ccc0a61f6..ef7341105 100644
--- a/man-pages/PKGBUILD
+++ b/man-pages/PKGBUILD
@@ -1,10 +1,6 @@
-#
-# Core Packages for Chakra, part of chakra.org
-#
-
 pkgname=man-pages
-pkgver=4.00
-_posixver=2003-a
+pkgver=4.16
+_posixver=2013-a
 pkgrel=1
 pkgdesc="Linux man pages"
 arch=('any')
@@ -13,8 +9,8 @@ url="http://man7.org/linux/man-pages/index.html"
 groups=('base')
 depends=()
 source=(http://www.kernel.org/pub/linux/docs/man-pages/$pkgname-$pkgver.tar.xz
-        http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/$pkgname-posix-${_posixver}.tar.bz2)
-md5sums=('3401eb0020c56639070d199c3e59a4f8'
+        http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/$pkgname-posix-${_posixver}.tar.xz)
+sah256sums=('3401eb0020c56639070d199c3e59a4f8'
          '7c78aff03c0a6767ba483d34f19e4b09')
 
 build() {
@@ -38,7 +34,7 @@ package() {
   install -m644 ${srcdir}/$pkgname-posix-${_posixver}/POSIX-COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/POSIX-COPYRIGHT"
 
   cd ${pkgdir}/usr/share/man
-  # these are included in coreutils || return 1
+  # these are included in coreutils
   rm -f man1/{chgrp,chmod,chown,cp,dir,dd}.1
   rm -f man1/{df,dircolors,du,install,ln,ls}.1
   rm -f man1/{mkdir,mkfifo,mknod,mv,rm,rmdir}.1
@@ -52,4 +48,12 @@ package() {
   rm -f man4/mouse.4
   # this is included in attr
   rm -f man5/attr.5 
+  # included in lirc
+  rm -f man4/lirc.4
+  # included in keyutils
+  rm -f man7/{keyrings.7,persistent-keyring.7,process-keyring.7,session-keyring.7,thread-keyring.7,user-keyring.7,user-session-keyring.7}
+  # included in tzdata
+  rm -f man5/tzfile.5 man8/{tzselect,zdump,zic}.8
 }
+md5sums=('ad9f1ff81276fe8d90d077484d6d4b5e'
+         '825fde78e6fddd02426ecdd50e2cbe0d')

From 4a52429e173911ff9afabcfdf55872b8f2bec0a4 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@chakralinux.org>
Date: Mon, 22 Oct 2018 01:10:11 +0200
Subject: [PATCH 3/3] glibc: remove some files shipped in tzdata

---
 glibc/PKGBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/glibc/PKGBUILD b/glibc/PKGBUILD
index 56464980c..8ac69eedd 100644
--- a/glibc/PKGBUILD
+++ b/glibc/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=glibc
 pkgver=2.26
-pkgrel=2
+pkgrel=3
 _commit=633e2f7f3d88df6427aa3a7a984d3a6b796d9611  # release/2.26/master
 pkgdesc="GNU C Library"
 arch=('x86_64')
@@ -114,6 +114,9 @@ package() {
   make install_root=${pkgdir} install
   rm -f ${pkgdir}/etc/ld.so.{cache,conf}
 
+  # Shipped in tzdata
+  rm -f "$pkgdir"/usr/bin/{tzselect,zdump,zic}
+
   cd ../glibc
   
   install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d}