From d7a1806370c353fe4ce790a775a2e3bdbb7c6c9f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 10:54:36 +0000 Subject: [PATCH 01/16] psmisc: updated to 22.21 --- psmisc/.md5sum | 2 +- psmisc/Pkgfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/psmisc/.md5sum b/psmisc/.md5sum index 12be186..416bd43 100644 --- a/psmisc/.md5sum +++ b/psmisc/.md5sum @@ -1 +1 @@ -a25fc99a6dc7fa7ae6e4549be80b401f psmisc-22.20.tar.gz +935c0fd6eb208288262b385fa656f1bf psmisc-22.21.tar.gz diff --git a/psmisc/Pkgfile b/psmisc/Pkgfile index 6372cb3..e9500a5 100644 --- a/psmisc/Pkgfile +++ b/psmisc/Pkgfile @@ -5,7 +5,7 @@ # Depends on: ncurses name=psmisc -version=22.20 +version=22.21 release=1 source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz) -- 2.26.2 From b5252367e0fca0ce74c216d9e2ba97eb3d722ad3 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 10:57:31 +0000 Subject: [PATCH 02/16] rc: updated to 2.29 --- rc/.md5sum | 4 ++-- rc/Pkgfile | 2 +- rc/rc | 5 ----- rc/rc.conf | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/rc/.md5sum b/rc/.md5sum index 60987c3..3627cdd 100644 --- a/rc/.md5sum +++ b/rc/.md5sum @@ -1,6 +1,6 @@ 49523b36db24792e3e70be2190f2e64a inittab -3858dfcab370c4e9b9d7356a1d3464a1 rc -c8fe38143dffbbc628a7a33966fae408 rc.conf +73d785cc2b05907e5599c1ee3954570b rc +670f547fca904321c968c61a73714a63 rc.conf afe5cd67920474246ae74e54a9845339 rc.fix d1be35927946756c68242f29c16ee983 rc.local 394d5cff98ab59fd1a0ec64fe79292cb rc.modules diff --git a/rc/Pkgfile b/rc/Pkgfile index eeb1d6e..9e71bc7 100644 --- a/rc/Pkgfile +++ b/rc/Pkgfile @@ -4,7 +4,7 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=rc -version=2.28 +version=2.29 release=1 source=(inittab rc rc.modules rc.single rc.multi rc.local rc.fix rc.shutdown rc.conf) diff --git a/rc/rc b/rc/rc index 4fc61d2..a200e6a 100644 --- a/rc/rc +++ b/rc/rc @@ -19,11 +19,6 @@ if [ -x /sbin/lvm ]; then /sbin/vgchange --ignorelockingfailure -a y fi -# Scan for btrfs volumes to simplify fstab entries -if [ -r /sys/fs/btrfs ]; then - /sbin/btrfs dev scan -fi - # Mount root read-only /bin/mount -o remount,ro / diff --git a/rc/rc.conf b/rc/rc.conf index 6c28c05..c4265ce 100644 --- a/rc/rc.conf +++ b/rc/rc.conf @@ -7,6 +7,6 @@ KEYMAP=us TIMEZONE=UTC HOSTNAME=host SYSLOG=sysklogd -SERVICES=(net crond) +SERVICES=(lo net crond) # End of file -- 2.26.2 From be5c24661864cc196c6f26c608dab2684a52821f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 11:16:14 +0000 Subject: [PATCH 03/16] sysvinit: updated to 2.88-3 --- sysvinit/.footprint | 11 ----------- sysvinit/Pkgfile | 12 ++++++++++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/sysvinit/.footprint b/sysvinit/.footprint index 77505ef..b289a3a 100644 --- a/sysvinit/.footprint +++ b/sysvinit/.footprint @@ -1,5 +1,4 @@ drwxr-xr-x root/root bin/ -lrwxrwxrwx root/root bin/pidof -> /sbin/killall5 drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/bootlogd -rwxr-xr-x root/root sbin/fstab-decode @@ -13,19 +12,10 @@ lrwxrwxrwx root/root sbin/reboot -> halt -rwxr-xr-x root/root sbin/sulogin lrwxrwxrwx root/root sbin/telinit -> init drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/last -lrwxrwxrwx root/root usr/bin/lastb -> last --rwxr-xr-x root/root usr/bin/mesg --rwxr-xr-x root/root usr/bin/wall drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/initreq.h drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/last.1.gz --rw-r--r-- root/root usr/man/man1/lastb.1.gz --rw-r--r-- root/root usr/man/man1/mesg.1.gz --rw-r--r-- root/root usr/man/man1/wall.1.gz drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/initscript.5.gz -rw-r--r-- root/root usr/man/man5/inittab.5.gz @@ -35,7 +25,6 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/halt.8.gz -rw-r--r-- root/root usr/man/man8/init.8.gz -rw-r--r-- root/root usr/man/man8/killall5.8.gz --rw-r--r-- root/root usr/man/man8/pidof.8.gz -rw-r--r-- root/root usr/man/man8/poweroff.8.gz -rw-r--r-- root/root usr/man/man8/reboot.8.gz -rw-r--r-- root/root usr/man/man8/runlevel.8.gz diff --git a/sysvinit/Pkgfile b/sysvinit/Pkgfile index 4f6cca5..d1ff7f4 100644 --- a/sysvinit/Pkgfile +++ b/sysvinit/Pkgfile @@ -6,16 +6,24 @@ name=sysvinit version=2.88 -release=1 +release=3 source=(http://download.savannah.gnu.org/releases/$name/$name-${version}dsf.tar.bz2) build() { cd $name-${version}dsf make -C src CC="$CC" make -C src ROOT=$PKG MANDIR=/usr/man install - # Provided by util-linux + + # Provided by util-linux rm $PKG/{bin/mountpoint,usr/bin/utmpdump} rm $PKG/usr/man/man1/{mountpoint,utmpdump}.1 + rm $PKG/usr/bin/{last,lastb,mesg,wall} + rm $PKG/usr/man/man1/{last,lastb,mesg,wall}.1 + rmdir $PKG/usr/bin + + # Provided by procps + rm $PKG/bin/pidof + rm $PKG/usr/man/man8/pidof.8 install -d $PKG/var/log touch $PKG/var/log/wtmp -- 2.26.2 From 7e609d087528aac47337656efa89debf34ad4d5f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 11:27:46 +0000 Subject: [PATCH 04/16] tar: updated to 1.27.1 --- tar/.md5sum | 4 ++-- tar/Pkgfile | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tar/.md5sum b/tar/.md5sum index 303e8e3..0af408f 100644 --- a/tar/.md5sum +++ b/tar/.md5sum @@ -1,4 +1,4 @@ 6a56bc4bb64fc9bb48d28e66a30ad937 rmt.8 -0ced6f20b9fa1bea588005b5ad4b52c1 tar-1.26.tar.xz -e4038247fa36a51d2784e163f58f6e38 tar-rootp.patch +e0382a4064e09a4943f3adeff1435978 tar-1.27.1.tar.xz +ca1dfac68cbaed902edc75290cccf03a tar-rootp.patch 7c2293e8c051ade56db42daf2279e5eb tar.1 diff --git a/tar/Pkgfile b/tar/Pkgfile index 119b48b..c119b25 100644 --- a/tar/Pkgfile +++ b/tar/Pkgfile @@ -5,18 +5,14 @@ # Depends on: name=tar -version=1.26 -release=2 +version=1.27.1 +release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz \ $name-rootp.patch tar.1 rmt.8) build() { cd $name-$version - - # fix for glibc 'gets' removal - sed -i -e '/gets is a/d' gnu/stdio.in.h patch -p1 -i $SRC/$name-rootp.patch - ./configure --build=$CHOST \ --host=$CTARGET \ --prefix= \ @@ -26,7 +22,6 @@ build() { make make DESTDIR=$PKG install - rm -rf $PKG/{sbin,share} install -D -m 644 $SRC/tar.1 $PKG/usr/man/man1/tar.1 install -D -m 644 $SRC/rmt.8 $PKG/usr/man/man8/rmt.8 -- 2.26.2 From fcacfef8b1865526968a771838d4c3f70808c2e0 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 15:44:34 +0000 Subject: [PATCH 05/16] tzcode: updated to 2014e --- tzdata/.footprint | 35 ++++------ tzdata/.md5sum | 8 +-- tzdata/Pkgfile | 6 +- tzdata/tzcode-makefile.patch | 121 +++++++++++++++++++-------------- tzdata/zic_host-makefile.patch | 69 +++++++++++-------- 5 files changed, 130 insertions(+), 109 deletions(-) diff --git a/tzdata/.footprint b/tzdata/.footprint index f88b9a5..6acf58a 100644 --- a/tzdata/.footprint +++ b/tzdata/.footprint @@ -1,6 +1,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/tzselect +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libtz.a drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/newctime.3.gz @@ -247,6 +249,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Antarctica/ -rw-r--r-- root/root usr/share/zoneinfo/Antarctica/Rothera -rw-r--r-- root/root usr/share/zoneinfo/Antarctica/South_Pole -rw-r--r-- root/root usr/share/zoneinfo/Antarctica/Syowa +-rw-r--r-- root/root usr/share/zoneinfo/Antarctica/Troll -rw-r--r-- root/root usr/share/zoneinfo/Antarctica/Vostok drwxr-xr-x root/root usr/share/zoneinfo/Arctic/ -rw-r--r-- root/root usr/share/zoneinfo/Arctic/Longyearbyen @@ -294,6 +297,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/Asia/Kashgar -rw-r--r-- root/root usr/share/zoneinfo/Asia/Kathmandu -rw-r--r-- root/root usr/share/zoneinfo/Asia/Katmandu +-rw-r--r-- root/root usr/share/zoneinfo/Asia/Khandyga -rw-r--r-- root/root usr/share/zoneinfo/Asia/Kolkata -rw-r--r-- root/root usr/share/zoneinfo/Asia/Krasnoyarsk -rw-r--r-- root/root usr/share/zoneinfo/Asia/Kuala_Lumpur @@ -317,9 +321,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/Asia/Qyzylorda -rw-r--r-- root/root usr/share/zoneinfo/Asia/Rangoon -rw-r--r-- root/root usr/share/zoneinfo/Asia/Riyadh --rw-r--r-- root/root usr/share/zoneinfo/Asia/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/Asia/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/Asia/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/Asia/Saigon -rw-r--r-- root/root usr/share/zoneinfo/Asia/Sakhalin -rw-r--r-- root/root usr/share/zoneinfo/Asia/Samarkand @@ -338,6 +339,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/Asia/Ulaanbaatar -rw-r--r-- root/root usr/share/zoneinfo/Asia/Ulan_Bator -rw-r--r-- root/root usr/share/zoneinfo/Asia/Urumqi +-rw-r--r-- root/root usr/share/zoneinfo/Asia/Ust-Nera -rw-r--r-- root/root usr/share/zoneinfo/Asia/Vientiane -rw-r--r-- root/root usr/share/zoneinfo/Asia/Vladivostok -rw-r--r-- root/root usr/share/zoneinfo/Asia/Yakutsk @@ -453,6 +455,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/Europe/ -rw-r--r-- root/root usr/share/zoneinfo/Europe/Brussels -rw-r--r-- root/root usr/share/zoneinfo/Europe/Bucharest -rw-r--r-- root/root usr/share/zoneinfo/Europe/Budapest +-rw-r--r-- root/root usr/share/zoneinfo/Europe/Busingen -rw-r--r-- root/root usr/share/zoneinfo/Europe/Chisinau -rw-r--r-- root/root usr/share/zoneinfo/Europe/Copenhagen -rw-r--r-- root/root usr/share/zoneinfo/Europe/Dublin @@ -537,10 +540,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/Mexico/ -rw-r--r-- root/root usr/share/zoneinfo/Mexico/BajaNorte -rw-r--r-- root/root usr/share/zoneinfo/Mexico/BajaSur -rw-r--r-- root/root usr/share/zoneinfo/Mexico/General -drwxr-xr-x root/root usr/share/zoneinfo/Mideast/ --rw-r--r-- root/root usr/share/zoneinfo/Mideast/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/Mideast/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/Mideast/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/NZ -rw-r--r-- root/root usr/share/zoneinfo/NZ-CHAT -rw-r--r-- root/root usr/share/zoneinfo/Navajo @@ -853,6 +852,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Antarctica/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Antarctica/Rothera -rw-r--r-- root/root usr/share/zoneinfo/posix/Antarctica/South_Pole -rw-r--r-- root/root usr/share/zoneinfo/posix/Antarctica/Syowa +-rw-r--r-- root/root usr/share/zoneinfo/posix/Antarctica/Troll -rw-r--r-- root/root usr/share/zoneinfo/posix/Antarctica/Vostok drwxr-xr-x root/root usr/share/zoneinfo/posix/Arctic/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Arctic/Longyearbyen @@ -900,6 +900,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Kashgar -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Kathmandu -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Katmandu +-rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Khandyga -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Kolkata -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Krasnoyarsk -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Kuala_Lumpur @@ -923,9 +924,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Qyzylorda -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Rangoon -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Riyadh --rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Saigon -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Sakhalin -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Samarkand @@ -944,6 +942,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Ulaanbaatar -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Ulan_Bator -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Urumqi +-rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Ust-Nera -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Vientiane -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Vladivostok -rw-r--r-- root/root usr/share/zoneinfo/posix/Asia/Yakutsk @@ -1059,6 +1058,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Europe/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Brussels -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Bucharest -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Budapest +-rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Busingen -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Chisinau -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Copenhagen -rw-r--r-- root/root usr/share/zoneinfo/posix/Europe/Dublin @@ -1143,10 +1143,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/posix/Mexico/ -rw-r--r-- root/root usr/share/zoneinfo/posix/Mexico/BajaNorte -rw-r--r-- root/root usr/share/zoneinfo/posix/Mexico/BajaSur -rw-r--r-- root/root usr/share/zoneinfo/posix/Mexico/General -drwxr-xr-x root/root usr/share/zoneinfo/posix/Mideast/ --rw-r--r-- root/root usr/share/zoneinfo/posix/Mideast/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/posix/Mideast/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/posix/Mideast/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/posix/NZ -rw-r--r-- root/root usr/share/zoneinfo/posix/NZ-CHAT -rw-r--r-- root/root usr/share/zoneinfo/posix/Navajo @@ -1458,6 +1454,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Antarctica/ -rw-r--r-- root/root usr/share/zoneinfo/right/Antarctica/Rothera -rw-r--r-- root/root usr/share/zoneinfo/right/Antarctica/South_Pole -rw-r--r-- root/root usr/share/zoneinfo/right/Antarctica/Syowa +-rw-r--r-- root/root usr/share/zoneinfo/right/Antarctica/Troll -rw-r--r-- root/root usr/share/zoneinfo/right/Antarctica/Vostok drwxr-xr-x root/root usr/share/zoneinfo/right/Arctic/ -rw-r--r-- root/root usr/share/zoneinfo/right/Arctic/Longyearbyen @@ -1505,6 +1502,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Kashgar -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Kathmandu -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Katmandu +-rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Khandyga -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Kolkata -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Krasnoyarsk -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Kuala_Lumpur @@ -1528,9 +1526,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Qyzylorda -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Rangoon -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Riyadh --rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Saigon -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Sakhalin -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Samarkand @@ -1549,6 +1544,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Asia/ -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Ulaanbaatar -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Ulan_Bator -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Urumqi +-rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Ust-Nera -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Vientiane -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Vladivostok -rw-r--r-- root/root usr/share/zoneinfo/right/Asia/Yakutsk @@ -1664,6 +1660,7 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Europe/ -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Brussels -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Bucharest -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Budapest +-rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Busingen -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Chisinau -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Copenhagen -rw-r--r-- root/root usr/share/zoneinfo/right/Europe/Dublin @@ -1748,10 +1745,6 @@ drwxr-xr-x root/root usr/share/zoneinfo/right/Mexico/ -rw-r--r-- root/root usr/share/zoneinfo/right/Mexico/BajaNorte -rw-r--r-- root/root usr/share/zoneinfo/right/Mexico/BajaSur -rw-r--r-- root/root usr/share/zoneinfo/right/Mexico/General -drwxr-xr-x root/root usr/share/zoneinfo/right/Mideast/ --rw-r--r-- root/root usr/share/zoneinfo/right/Mideast/Riyadh87 --rw-r--r-- root/root usr/share/zoneinfo/right/Mideast/Riyadh88 --rw-r--r-- root/root usr/share/zoneinfo/right/Mideast/Riyadh89 -rw-r--r-- root/root usr/share/zoneinfo/right/NZ -rw-r--r-- root/root usr/share/zoneinfo/right/NZ-CHAT -rw-r--r-- root/root usr/share/zoneinfo/right/Navajo diff --git a/tzdata/.md5sum b/tzdata/.md5sum index f719d59..0e8a346 100644 --- a/tzdata/.md5sum +++ b/tzdata/.md5sum @@ -1,4 +1,4 @@ -051c7f462b3b9e3934572a5afd276d9a tzcode-makefile.patch -868b5d0dbf0e115ae4eb39a932ad0c4c tzcode2012j.tar.gz -ba2f92ae7ad099090e8f86cff2f2d799 tzdata2012j.tar.gz -0a1f00a575587eec635bbef60c62f6d9 zic_host-makefile.patch +cd1eb9bce381be0d6a35337f593aca18 tzcode-makefile.patch +552251600ee3571c244d33c7196ec2ed tzcode2014e.tar.gz +8a49fdedd4e832da8e85f7f9bcaedc33 tzdata2014e.tar.gz +551ff6a7cbf071846bf3b18114bb3ab4 zic_host-makefile.patch diff --git a/tzdata/Pkgfile b/tzdata/Pkgfile index 1fcb28d..5064d31 100644 --- a/tzdata/Pkgfile +++ b/tzdata/Pkgfile @@ -4,7 +4,7 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=tzdata -version=2012j +version=2014e release=1 source=(http://www.iana.org/time-zones/repository/releases/$name$version.tar.gz @@ -21,9 +21,5 @@ build() { patch -p0 -i $SRC/zic_host-makefile.patch make - - # fix error when directory exists - sed 's|mkdir |mkdir -p |g' -i Makefile - make DESTDIR=$PKG install } diff --git a/tzdata/tzcode-makefile.patch b/tzdata/tzcode-makefile.patch index 683184d..1c964c1 100644 --- a/tzdata/tzcode-makefile.patch +++ b/tzdata/tzcode-makefile.patch @@ -1,31 +1,43 @@ -# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch -# Patch reapplied and fixed for tzcode 2012i +# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/2013f-makefile.patch +# added some fixes for the file-layout (jue) +# +# - Support env CC +# - Don't build/install libtz.a +# - Don't install man-pages provided by man-pages +# - Move zic, zdump to sbin and tzselect to bin ala glibc +# - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc +# - Install leaps zoneinfo into zoneinfo/right/ ala glibc + diff -Nru tzcode.orig/Makefile tzcode/Makefile ---- tzcode.orig/Makefile 2012-11-04 10:31:01.772733264 +0100 -+++ tzcode/Makefile 2012-11-04 10:31:16.358872807 +0100 -@@ -39,17 +39,17 @@ +--- tzcode.orig/Makefile 2013-12-21 14:05:52.169527862 +0100 ++++ tzcode/Makefile 2013-12-21 14:06:05.299054045 +0100 +@@ -45,21 +45,21 @@ # Everything gets put in subdirectories of. . . -TOPDIR= /usr/local -+TOPDIR= $(DESTDIR)/usr ++TOPDIR= /usr # "Compiled" time zone information is placed in the "TZDIR" directory # (and subdirectories). # Use an absolute path name for TZDIR unless you're just testing the software. --TZDIR= $(TOPDIR)/etc/zoneinfo -+TZDIR= $(TOPDIR)/share/zoneinfo + TZDIR_BASENAME= zoneinfo +-TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) ++TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME) + + # Types to try, as an alternative to time_t. int64_t should be first. + TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t # The "tzselect", "zic", and "zdump" commands get installed in. . . -ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin ++SBINDIR= $(TOPDIR)/sbin # If you "make INSTALL", the "date" command gets installed in. . . -@@ -274,8 +274,10 @@ +@@ -290,8 +290,10 @@ ############################################################################### @@ -33,57 +45,66 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile -CC= $(cc) -DTZDIR=\"$(TZDIR)\" +CC+= -DTZDIR=\"$(TZDIR)\" +ifeq ($(NLS),1) -+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" ++CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" +endif - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c - TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -316,13 +318,15 @@ + AR= ar +@@ -341,19 +343,18 @@ ALL: all date --install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) -+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) + install: all $(DATA) $(REDO) $(MANS) +- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ +- $(DESTDIR)$(LIBDIR) \ ++ mkdir -p $(DESTDIR)$(SBINDIR) $(DESTDIR)$(TZDIR) \ ++ $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) \ + $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ + $(DESTDIR)$(MANDIR)/man8 $(ZIC) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -- -mkdir $(TOPDIR) $(ETCDIR) -- cp tzselect zic zdump $(ETCDIR)/. -+ -mkdir $(TOPDIR) $(SBINDIR) -+ cp zic zdump $(SBINDIR)/. -+ -mkdir $(TOPDIR) $(BINDIR) -+ cp tzselect $(BINDIR)/. - -mkdir $(TOPDIR) $(MANDIR) \ - $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 - -rm -f $(MANDIR)/man3/newctime.3 \ -@@ -332,8 +336,6 @@ - $(MANDIR)/man8/zdump.8 \ - $(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(MANDIR)/man3/. -- cp tzfile.5 $(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. + -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) + cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. +- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. ++ cp zic zdump $(DESTDIR)$(SBINDIR)/. ++ cp tzselect $(DESTDIR)$(BINDIR)/. + cp libtz.a $(DESTDIR)$(LIBDIR)/. + $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a + cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. +- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/. +- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. INSTALL: ALL install date.1 - -mkdir $(TOPDIR) $(BINDIR) -@@ -372,9 +374,9 @@ + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 +@@ -396,19 +397,17 @@ # You must replace all of $(TZDIR) to switch from not using leap seconds # to using them, or vice versa. - other_two: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) -+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) - $(ZIC) -y $(YEARISTYPE) \ -- -d $(TZDIR)-leaps -L leapseconds $(TDATA) -+ -d $(TZDIR)/right -L leapseconds $(TDATA) - - posix_right: posix_only other_two - -@@ -400,7 +402,7 @@ + right_posix: right_only leapseconds +- rm -fr $(DESTDIR)$(TZDIR)-leaps +- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \ +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ ++ rm -fr $(DESTDIR)$(TZDIR)/right ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) + + posix_right: posix_only leapseconds + rm -fr $(DESTDIR)$(TZDIR)-posix +- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \ +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) + + zones: $(REDO) +@@ -431,7 +430,7 @@ <$? >$@ chmod +x $@ --check: check_tables check_web -+check: check_tables +-check: check_character_set check_tables check_web ++check: check_character_set check_tables - check_tables: checktab.awk $(PRIMARY_YDATA) - $(AWK) -f checktab.awk $(PRIMARY_YDATA) + check_character_set: $(ENCHILADA) + sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA) diff --git a/tzdata/zic_host-makefile.patch b/tzdata/zic_host-makefile.patch index a3ae162..5772498 100644 --- a/tzdata/zic_host-makefile.patch +++ b/tzdata/zic_host-makefile.patch @@ -1,46 +1,57 @@ ---- Makefile.orig 2012-10-15 16:32:13.248683438 +0000 -+++ Makefile 2012-10-15 16:33:33.324686164 +0000 -@@ -219,8 +219,8 @@ - # If you want zic's -s option used when installing, uncomment the next line - # ZFLAGS= -s +--- Makefile.orig 2014-10-01 15:40:50.900427432 +0000 ++++ Makefile 2014-10-01 15:42:37.400428739 +0000 +@@ -231,8 +231,8 @@ + + LDFLAGS= $(LFLAGS) -zic= ./zic -ZIC= $(zic) $(ZFLAGS) +ZIC_HOST= ./zic_host +ZIC= $(ZIC_HOST) $(ZFLAGS) - # The name of a Posix-compliant `awk' on your system. - AWK= awk -@@ -301,7 +301,7 @@ - ALL: all date + ZFLAGS= - install: all $(DATA) $(REDO) $(MANS) $(TABDATA) +@@ -347,7 +347,7 @@ + $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) \ + $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ + $(DESTDIR)$(MANDIR)/man8 - $(ZIC) -y $(YEARISTYPE) \ + $(ZIC_HOST) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -@@ -341,10 +341,10 @@ - chmod +x yearistype + -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) + cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. + cp zic zdump $(DESTDIR)$(SBINDIR)/. +@@ -380,11 +380,11 @@ + $(AWK) -f leapseconds.awk leap-seconds.list >$@ posix_only: zic $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA) -+ $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR) -L /dev/null $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ + -L /dev/null $(TDATA) right_only: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA) -+ $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR) \ + -L leapseconds $(TDATA) # In earlier versions of this makefile, the other two directories were - # subdirectories of $(TZDIR). However, this led to configuration errors. -@@ -356,8 +356,8 @@ - # You must replace all of $(TZDIR) to switch from not using leap seconds +@@ -398,16 +398,16 @@ # to using them, or vice versa. - other_two: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) -- $(ZIC) -y $(YEARISTYPE) \ -+ $(ZIC_HOST) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) -+ $(ZIC_HOST) -y $(YEARISTYPE) \ - -d $(TZDIR)/right -L leapseconds $(TDATA) + right_posix: right_only leapseconds + rm -fr $(DESTDIR)$(TZDIR)/right +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) + + posix_right: posix_only leapseconds + rm -fr $(DESTDIR)$(TZDIR)-posix +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ ++ $(ZIC_HOST) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) - posix_right: posix_only other_two \ No newline at end of file + zones: $(REDO) -- 2.26.2 From a1362674076035be9633b0dcb8fed2a440faaf78 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 16:11:38 +0000 Subject: [PATCH 06/16] vim: updated to 7.4.316 --- vim/.footprint | 75 ++++++++++++++++++++++++++++++++++++++++++ vim/.md5sum | 17 +--------- vim/Pkgfile | 24 ++------------ vim/vim-7.3-cross.diff | 11 ------- 4 files changed, 79 insertions(+), 48 deletions(-) delete mode 100644 vim/vim-7.3-cross.diff diff --git a/vim/.footprint b/vim/.footprint index f9699ef..420d938 100644 --- a/vim/.footprint +++ b/vim/.footprint @@ -27,6 +27,7 @@ drwxr-xr-x root/root usr/share/vim/autoload/ -rw-r--r-- root/root usr/share/vim/autoload/ada.vim -rw-r--r-- root/root usr/share/vim/autoload/adacomplete.vim -rw-r--r-- root/root usr/share/vim/autoload/ccomplete.vim +-rw-r--r-- root/root usr/share/vim/autoload/clojurecomplete.vim -rw-r--r-- root/root usr/share/vim/autoload/csscomplete.vim -rw-r--r-- root/root usr/share/vim/autoload/decada.vim -rw-r--r-- root/root usr/share/vim/autoload/getscript.vim @@ -37,6 +38,7 @@ drwxr-xr-x root/root usr/share/vim/autoload/ -rw-r--r-- root/root usr/share/vim/autoload/netrw.vim -rw-r--r-- root/root usr/share/vim/autoload/netrwFileHandlers.vim -rw-r--r-- root/root usr/share/vim/autoload/netrwSettings.vim +-rw-r--r-- root/root usr/share/vim/autoload/netrw_gitignore.vim -rw-r--r-- root/root usr/share/vim/autoload/paste.vim -rw-r--r-- root/root usr/share/vim/autoload/phpcomplete.vim -rw-r--r-- root/root usr/share/vim/autoload/python3complete.vim @@ -73,6 +75,7 @@ drwxr-xr-x root/root usr/share/vim/colors/ -rw-r--r-- root/root usr/share/vim/colors/desert.vim -rw-r--r-- root/root usr/share/vim/colors/elflord.vim -rw-r--r-- root/root usr/share/vim/colors/evening.vim +-rw-r--r-- root/root usr/share/vim/colors/industry.vim -rw-r--r-- root/root usr/share/vim/colors/koehler.vim -rw-r--r-- root/root usr/share/vim/colors/morning.vim -rw-r--r-- root/root usr/share/vim/colors/murphy.vim @@ -92,6 +95,7 @@ drwxr-xr-x root/root usr/share/vim/compiler/ -rw-r--r-- root/root usr/share/vim/compiler/cucumber.vim -rw-r--r-- root/root usr/share/vim/compiler/decada.vim -rw-r--r-- root/root usr/share/vim/compiler/dot.vim +-rw-r--r-- root/root usr/share/vim/compiler/erlang.vim -rw-r--r-- root/root usr/share/vim/compiler/eruby.vim -rw-r--r-- root/root usr/share/vim/compiler/fortran_F.vim -rw-r--r-- root/root usr/share/vim/compiler/fortran_cv.vim @@ -99,10 +103,14 @@ drwxr-xr-x root/root usr/share/vim/compiler/ -rw-r--r-- root/root usr/share/vim/compiler/fortran_g77.vim -rw-r--r-- root/root usr/share/vim/compiler/fortran_lf95.vim -rw-r--r-- root/root usr/share/vim/compiler/fpc.vim +-rw-r--r-- root/root usr/share/vim/compiler/g95.vim -rw-r--r-- root/root usr/share/vim/compiler/gcc.vim +-rw-r--r-- root/root usr/share/vim/compiler/gfortran.vim -rw-r--r-- root/root usr/share/vim/compiler/gnat.vim +-rw-r--r-- root/root usr/share/vim/compiler/haml.vim -rw-r--r-- root/root usr/share/vim/compiler/hp_acc.vim -rw-r--r-- root/root usr/share/vim/compiler/icc.vim +-rw-r--r-- root/root usr/share/vim/compiler/ifort.vim -rw-r--r-- root/root usr/share/vim/compiler/intel.vim -rw-r--r-- root/root usr/share/vim/compiler/irix5_c.vim -rw-r--r-- root/root usr/share/vim/compiler/irix5_cpp.vim @@ -113,22 +121,27 @@ drwxr-xr-x root/root usr/share/vim/compiler/ -rw-r--r-- root/root usr/share/vim/compiler/mipspro_c89.vim -rw-r--r-- root/root usr/share/vim/compiler/mipspro_cpp.vim -rw-r--r-- root/root usr/share/vim/compiler/modelsim_vcom.vim +-rw-r--r-- root/root usr/share/vim/compiler/msbuild.vim -rw-r--r-- root/root usr/share/vim/compiler/msvc.vim -rw-r--r-- root/root usr/share/vim/compiler/neato.vim +-rw-r--r-- root/root usr/share/vim/compiler/ocaml.vim -rw-r--r-- root/root usr/share/vim/compiler/onsgmls.vim -rw-r--r-- root/root usr/share/vim/compiler/pbx.vim -rw-r--r-- root/root usr/share/vim/compiler/perl.vim -rw-r--r-- root/root usr/share/vim/compiler/php.vim -rw-r--r-- root/root usr/share/vim/compiler/pyunit.vim +-rw-r--r-- root/root usr/share/vim/compiler/rake.vim -rw-r--r-- root/root usr/share/vim/compiler/rspec.vim -rw-r--r-- root/root usr/share/vim/compiler/rst.vim -rw-r--r-- root/root usr/share/vim/compiler/ruby.vim -rw-r--r-- root/root usr/share/vim/compiler/rubyunit.vim +-rw-r--r-- root/root usr/share/vim/compiler/sass.vim -rw-r--r-- root/root usr/share/vim/compiler/se.vim -rw-r--r-- root/root usr/share/vim/compiler/splint.vim -rw-r--r-- root/root usr/share/vim/compiler/tcl.vim -rw-r--r-- root/root usr/share/vim/compiler/tex.vim -rw-r--r-- root/root usr/share/vim/compiler/tidy.vim +-rw-r--r-- root/root usr/share/vim/compiler/xbuild.vim -rw-r--r-- root/root usr/share/vim/compiler/xmllint.vim -rw-r--r-- root/root usr/share/vim/compiler/xmlwf.vim -rw-r--r-- root/root usr/share/vim/delmenu.vim @@ -273,6 +286,7 @@ drwxr-xr-x root/root usr/share/vim/doc/ drwxr-xr-x root/root usr/share/vim/ftplugin/ -rw-r--r-- root/root usr/share/vim/ftplugin/a2ps.vim -rw-r--r-- root/root usr/share/vim/ftplugin/aap.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/abap.vim -rw-r--r-- root/root usr/share/vim/ftplugin/abaqus.vim -rw-r--r-- root/root usr/share/vim/ftplugin/ada.vim -rw-r--r-- root/root usr/share/vim/ftplugin/alsaconf.vim @@ -289,6 +303,7 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/ -rw-r--r-- root/root usr/share/vim/ftplugin/cdrdaoconf.vim -rw-r--r-- root/root usr/share/vim/ftplugin/ch.vim -rw-r--r-- root/root usr/share/vim/ftplugin/changelog.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/clojure.vim -rw-r--r-- root/root usr/share/vim/ftplugin/cobol.vim -rw-r--r-- root/root usr/share/vim/ftplugin/conf.vim -rw-r--r-- root/root usr/share/vim/ftplugin/config.vim @@ -308,13 +323,16 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/ -rw-r--r-- root/root usr/share/vim/ftplugin/dictdconf.vim -rw-r--r-- root/root usr/share/vim/ftplugin/diff.vim -rw-r--r-- root/root usr/share/vim/ftplugin/dircolors.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/docbk.vim -rw-r--r-- root/root usr/share/vim/ftplugin/dosbatch.vim -rw-r--r-- root/root usr/share/vim/ftplugin/dosini.vim -rw-r--r-- root/root usr/share/vim/ftplugin/dtd.vim -rw-r--r-- root/root usr/share/vim/ftplugin/dtrace.vim -rw-r--r-- root/root usr/share/vim/ftplugin/elinks.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/erlang.vim -rw-r--r-- root/root usr/share/vim/ftplugin/eruby.vim -rw-r--r-- root/root usr/share/vim/ftplugin/eterm.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/falcon.vim -rw-r--r-- root/root usr/share/vim/ftplugin/fetchmail.vim -rw-r--r-- root/root usr/share/vim/ftplugin/flexwiki.vim -rw-r--r-- root/root usr/share/vim/ftplugin/fortran.vim @@ -326,6 +344,7 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/ -rw-r--r-- root/root usr/share/vim/ftplugin/gitrebase.vim -rw-r--r-- root/root usr/share/vim/ftplugin/gitsendemail.vim -rw-r--r-- root/root usr/share/vim/ftplugin/gpg.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/gprof.vim -rw-r--r-- root/root usr/share/vim/ftplugin/group.vim -rw-r--r-- root/root usr/share/vim/ftplugin/grub.vim -rw-r--r-- root/root usr/share/vim/ftplugin/haml.vim @@ -339,8 +358,10 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/ -rw-r--r-- root/root usr/share/vim/ftplugin/indent.vim -rw-r--r-- root/root usr/share/vim/ftplugin/initex.vim -rw-r--r-- root/root usr/share/vim/ftplugin/ishd.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/j.vim -rw-r--r-- root/root usr/share/vim/ftplugin/java.vim -rw-r--r-- root/root usr/share/vim/ftplugin/javascript.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/jproperties.vim -rw-r--r-- root/root usr/share/vim/ftplugin/jsp.vim -rw-r--r-- root/root usr/share/vim/ftplugin/kconfig.vim -rw-r--r-- root/root usr/share/vim/ftplugin/kwt.vim @@ -398,6 +419,7 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/ -rw-r--r-- root/root usr/share/vim/ftplugin/quake.vim -rw-r--r-- root/root usr/share/vim/ftplugin/racc.vim -rw-r--r-- root/root usr/share/vim/ftplugin/readline.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/registry.vim -rw-r--r-- root/root usr/share/vim/ftplugin/reva.vim -rw-r--r-- root/root usr/share/vim/ftplugin/rnc.vim -rw-r--r-- root/root usr/share/vim/ftplugin/rpl.vim @@ -422,10 +444,13 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/ -rw-r--r-- root/root usr/share/vim/ftplugin/sudoers.vim -rw-r--r-- root/root usr/share/vim/ftplugin/svg.vim -rw-r--r-- root/root usr/share/vim/ftplugin/sysctl.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/systemverilog.vim -rw-r--r-- root/root usr/share/vim/ftplugin/tcl.vim -rw-r--r-- root/root usr/share/vim/ftplugin/tcsh.vim -rw-r--r-- root/root usr/share/vim/ftplugin/terminfo.vim -rw-r--r-- root/root usr/share/vim/ftplugin/tex.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/treetop.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/tt2html.vim -rw-r--r-- root/root usr/share/vim/ftplugin/udevconf.vim -rw-r--r-- root/root usr/share/vim/ftplugin/udevperm.vim -rw-r--r-- root/root usr/share/vim/ftplugin/udevrules.vim @@ -444,6 +469,7 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/ -rw-r--r-- root/root usr/share/vim/ftplugin/xsd.vim -rw-r--r-- root/root usr/share/vim/ftplugin/xslt.vim -rw-r--r-- root/root usr/share/vim/ftplugin/yaml.vim +-rw-r--r-- root/root usr/share/vim/ftplugin/zimbu.vim -rw-r--r-- root/root usr/share/vim/ftplugin/zsh.vim -rw-r--r-- root/root usr/share/vim/ftplugof.vim -rw-r--r-- root/root usr/share/vim/gvimrc_example.vim @@ -461,6 +487,7 @@ drwxr-xr-x root/root usr/share/vim/indent/ -rw-r--r-- root/root usr/share/vim/indent/ch.vim -rw-r--r-- root/root usr/share/vim/indent/chaiscript.vim -rw-r--r-- root/root usr/share/vim/indent/changelog.vim +-rw-r--r-- root/root usr/share/vim/indent/clojure.vim -rw-r--r-- root/root usr/share/vim/indent/cmake.vim -rw-r--r-- root/root usr/share/vim/indent/cobol.vim -rw-r--r-- root/root usr/share/vim/indent/config.vim @@ -480,15 +507,18 @@ drwxr-xr-x root/root usr/share/vim/indent/ -rw-r--r-- root/root usr/share/vim/indent/erlang.vim -rw-r--r-- root/root usr/share/vim/indent/eruby.vim -rw-r--r-- root/root usr/share/vim/indent/eterm.vim +-rw-r--r-- root/root usr/share/vim/indent/falcon.vim -rw-r--r-- root/root usr/share/vim/indent/fortran.vim -rw-r--r-- root/root usr/share/vim/indent/framescript.vim -rw-r--r-- root/root usr/share/vim/indent/gitconfig.vim +-rw-r--r-- root/root usr/share/vim/indent/gitolite.vim -rw-r--r-- root/root usr/share/vim/indent/haml.vim -rw-r--r-- root/root usr/share/vim/indent/hamster.vim -rw-r--r-- root/root usr/share/vim/indent/html.vim -rw-r--r-- root/root usr/share/vim/indent/htmldjango.vim -rw-r--r-- root/root usr/share/vim/indent/idlang.vim -rw-r--r-- root/root usr/share/vim/indent/ishd.vim +-rw-r--r-- root/root usr/share/vim/indent/j.vim -rw-r--r-- root/root usr/share/vim/indent/java.vim -rw-r--r-- root/root usr/share/vim/indent/javascript.vim -rw-r--r-- root/root usr/share/vim/indent/jsp.vim @@ -515,6 +545,7 @@ drwxr-xr-x root/root usr/share/vim/indent/ -rw-r--r-- root/root usr/share/vim/indent/prolog.vim -rw-r--r-- root/root usr/share/vim/indent/pyrex.vim -rw-r--r-- root/root usr/share/vim/indent/python.vim +-rw-r--r-- root/root usr/share/vim/indent/r.vim -rw-r--r-- root/root usr/share/vim/indent/readline.vim -rw-r--r-- root/root usr/share/vim/indent/rpl.vim -rw-r--r-- root/root usr/share/vim/indent/rst.vim @@ -527,10 +558,13 @@ drwxr-xr-x root/root usr/share/vim/indent/ -rw-r--r-- root/root usr/share/vim/indent/sml.vim -rw-r--r-- root/root usr/share/vim/indent/sql.vim -rw-r--r-- root/root usr/share/vim/indent/sqlanywhere.vim +-rw-r--r-- root/root usr/share/vim/indent/systemverilog.vim -rw-r--r-- root/root usr/share/vim/indent/tcl.vim -rw-r--r-- root/root usr/share/vim/indent/tcsh.vim +-rw-r--r-- root/root usr/share/vim/indent/tex.vim -rw-r--r-- root/root usr/share/vim/indent/tf.vim -rw-r--r-- root/root usr/share/vim/indent/tilde.vim +-rw-r--r-- root/root usr/share/vim/indent/treetop.vim -rw-r--r-- root/root usr/share/vim/indent/vb.vim -rw-r--r-- root/root usr/share/vim/indent/verilog.vim -rw-r--r-- root/root usr/share/vim/indent/vhdl.vim @@ -542,6 +576,8 @@ drwxr-xr-x root/root usr/share/vim/indent/ -rw-r--r-- root/root usr/share/vim/indent/xsd.vim -rw-r--r-- root/root usr/share/vim/indent/xslt.vim -rw-r--r-- root/root usr/share/vim/indent/yacc.vim +-rw-r--r-- root/root usr/share/vim/indent/yaml.vim +-rw-r--r-- root/root usr/share/vim/indent/zimbu.vim -rw-r--r-- root/root usr/share/vim/indent/zsh.vim -rw-r--r-- root/root usr/share/vim/indoff.vim -rw-r--r-- root/root usr/share/vim/menu.vim @@ -604,6 +640,7 @@ drwxr-xr-x root/root usr/share/vim/spell/ -rw-r--r-- root/root usr/share/vim/spell/en.utf-8.sug -rw-r--r-- root/root usr/share/vim/spell/fixdup.vim -rw-r--r-- root/root usr/share/vim/spell/he.vim +-rw-r--r-- root/root usr/share/vim/spell/spell.vim -rw-r--r-- root/root usr/share/vim/spell/yi.vim -rw-r--r-- root/root usr/share/vim/synmenu.vim drwxr-xr-x root/root usr/share/vim/syntax/ @@ -627,8 +664,11 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/antlr.vim -rw-r--r-- root/root usr/share/vim/syntax/apache.vim -rw-r--r-- root/root usr/share/vim/syntax/apachestyle.vim +-rw-r--r-- root/root usr/share/vim/syntax/aptconf.vim -rw-r--r-- root/root usr/share/vim/syntax/arch.vim +-rw-r--r-- root/root usr/share/vim/syntax/arduino.vim -rw-r--r-- root/root usr/share/vim/syntax/art.vim +-rw-r--r-- root/root usr/share/vim/syntax/asciidoc.vim -rw-r--r-- root/root usr/share/vim/syntax/asm.vim -rw-r--r-- root/root usr/share/vim/syntax/asm68k.vim -rw-r--r-- root/root usr/share/vim/syntax/asmh8300.vim @@ -675,6 +715,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/cl.vim -rw-r--r-- root/root usr/share/vim/syntax/clean.vim -rw-r--r-- root/root usr/share/vim/syntax/clipper.vim +-rw-r--r-- root/root usr/share/vim/syntax/clojure.vim -rw-r--r-- root/root usr/share/vim/syntax/cmake.vim -rw-r--r-- root/root usr/share/vim/syntax/cmusrc.vim -rw-r--r-- root/root usr/share/vim/syntax/cobol.vim @@ -689,6 +730,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/crontab.vim -rw-r--r-- root/root usr/share/vim/syntax/cs.vim -rw-r--r-- root/root usr/share/vim/syntax/csc.vim +-rw-r--r-- root/root usr/share/vim/syntax/csdl.vim -rw-r--r-- root/root usr/share/vim/syntax/csh.vim -rw-r--r-- root/root usr/share/vim/syntax/csp.vim -rw-r--r-- root/root usr/share/vim/syntax/css.vim @@ -718,9 +760,11 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/dictdconf.vim -rw-r--r-- root/root usr/share/vim/syntax/diff.vim -rw-r--r-- root/root usr/share/vim/syntax/dircolors.vim +-rw-r--r-- root/root usr/share/vim/syntax/dirpager.vim -rw-r--r-- root/root usr/share/vim/syntax/diva.vim -rw-r--r-- root/root usr/share/vim/syntax/django.vim -rw-r--r-- root/root usr/share/vim/syntax/dns.vim +-rw-r--r-- root/root usr/share/vim/syntax/dnsmasq.vim -rw-r--r-- root/root usr/share/vim/syntax/docbk.vim -rw-r--r-- root/root usr/share/vim/syntax/docbksgml.vim -rw-r--r-- root/root usr/share/vim/syntax/docbkxml.vim @@ -733,6 +777,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/dtd.vim -rw-r--r-- root/root usr/share/vim/syntax/dtml.vim -rw-r--r-- root/root usr/share/vim/syntax/dtrace.vim +-rw-r--r-- root/root usr/share/vim/syntax/dts.vim -rw-r--r-- root/root usr/share/vim/syntax/dylan.vim -rw-r--r-- root/root usr/share/vim/syntax/dylanintr.vim -rw-r--r-- root/root usr/share/vim/syntax/dylanlid.vim @@ -748,10 +793,13 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/esqlc.vim -rw-r--r-- root/root usr/share/vim/syntax/esterel.vim -rw-r--r-- root/root usr/share/vim/syntax/eterm.vim +-rw-r--r-- root/root usr/share/vim/syntax/euphoria3.vim +-rw-r--r-- root/root usr/share/vim/syntax/euphoria4.vim -rw-r--r-- root/root usr/share/vim/syntax/eviews.vim -rw-r--r-- root/root usr/share/vim/syntax/exim.vim -rw-r--r-- root/root usr/share/vim/syntax/expect.vim -rw-r--r-- root/root usr/share/vim/syntax/exports.vim +-rw-r--r-- root/root usr/share/vim/syntax/falcon.vim -rw-r--r-- root/root usr/share/vim/syntax/fan.vim -rw-r--r-- root/root usr/share/vim/syntax/fasm.vim -rw-r--r-- root/root usr/share/vim/syntax/fdcc.vim @@ -774,12 +822,15 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/git.vim -rw-r--r-- root/root usr/share/vim/syntax/gitcommit.vim -rw-r--r-- root/root usr/share/vim/syntax/gitconfig.vim +-rw-r--r-- root/root usr/share/vim/syntax/gitolite.vim -rw-r--r-- root/root usr/share/vim/syntax/gitrebase.vim -rw-r--r-- root/root usr/share/vim/syntax/gitsendemail.vim -rw-r--r-- root/root usr/share/vim/syntax/gkrellmrc.vim +-rw-r--r-- root/root usr/share/vim/syntax/gnash.vim -rw-r--r-- root/root usr/share/vim/syntax/gnuplot.vim -rw-r--r-- root/root usr/share/vim/syntax/gp.vim -rw-r--r-- root/root usr/share/vim/syntax/gpg.vim +-rw-r--r-- root/root usr/share/vim/syntax/gprof.vim -rw-r--r-- root/root usr/share/vim/syntax/grads.vim -rw-r--r-- root/root usr/share/vim/syntax/gretl.vim -rw-r--r-- root/root usr/share/vim/syntax/groff.vim @@ -797,9 +848,11 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/help.vim -rw-r--r-- root/root usr/share/vim/syntax/hercules.vim -rw-r--r-- root/root usr/share/vim/syntax/hex.vim +-rw-r--r-- root/root usr/share/vim/syntax/hgcommit.vim -rw-r--r-- root/root usr/share/vim/syntax/hitest.vim -rw-r--r-- root/root usr/share/vim/syntax/hog.vim -rw-r--r-- root/root usr/share/vim/syntax/hostconf.vim +-rw-r--r-- root/root usr/share/vim/syntax/hostsaccess.vim -rw-r--r-- root/root usr/share/vim/syntax/html.vim -rw-r--r-- root/root usr/share/vim/syntax/htmlcheetah.vim -rw-r--r-- root/root usr/share/vim/syntax/htmldjango.vim @@ -820,6 +873,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/ishd.vim -rw-r--r-- root/root usr/share/vim/syntax/iss.vim -rw-r--r-- root/root usr/share/vim/syntax/ist.vim +-rw-r--r-- root/root usr/share/vim/syntax/j.vim -rw-r--r-- root/root usr/share/vim/syntax/jal.vim -rw-r--r-- root/root usr/share/vim/syntax/jam.vim -rw-r--r-- root/root usr/share/vim/syntax/jargon.vim @@ -828,6 +882,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/javascript.vim -rw-r--r-- root/root usr/share/vim/syntax/jess.vim -rw-r--r-- root/root usr/share/vim/syntax/jgraph.vim +-rw-r--r-- root/root usr/share/vim/syntax/jovial.vim -rw-r--r-- root/root usr/share/vim/syntax/jproperties.vim -rw-r--r-- root/root usr/share/vim/syntax/jsp.vim -rw-r--r-- root/root usr/share/vim/syntax/kconfig.vim @@ -867,6 +922,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/mailaliases.vim -rw-r--r-- root/root usr/share/vim/syntax/mailcap.vim -rw-r--r-- root/root usr/share/vim/syntax/make.vim +-rw-r--r-- root/root usr/share/vim/syntax/mallard.vim -rw-r--r-- root/root usr/share/vim/syntax/man.vim -rw-r--r-- root/root usr/share/vim/syntax/manconf.vim -rw-r--r-- root/root usr/share/vim/syntax/manual.vim @@ -883,6 +939,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/mgl.vim -rw-r--r-- root/root usr/share/vim/syntax/mgp.vim -rw-r--r-- root/root usr/share/vim/syntax/mib.vim +-rw-r--r-- root/root usr/share/vim/syntax/mix.vim -rw-r--r-- root/root usr/share/vim/syntax/mma.vim -rw-r--r-- root/root usr/share/vim/syntax/mmix.vim -rw-r--r-- root/root usr/share/vim/syntax/mmp.vim @@ -911,6 +968,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/ncf.vim -rw-r--r-- root/root usr/share/vim/syntax/netrc.vim -rw-r--r-- root/root usr/share/vim/syntax/netrw.vim +-rw-r--r-- root/root usr/share/vim/syntax/ninja.vim -rw-r--r-- root/root usr/share/vim/syntax/nosyntax.vim -rw-r--r-- root/root usr/share/vim/syntax/nqc.vim -rw-r--r-- root/root usr/share/vim/syntax/nroff.vim @@ -943,6 +1001,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/pine.vim -rw-r--r-- root/root usr/share/vim/syntax/pinfo.vim -rw-r--r-- root/root usr/share/vim/syntax/plaintex.vim +-rw-r--r-- root/root usr/share/vim/syntax/pli.vim -rw-r--r-- root/root usr/share/vim/syntax/plm.vim -rw-r--r-- root/root usr/share/vim/syntax/plp.vim -rw-r--r-- root/root usr/share/vim/syntax/plsql.vim @@ -959,6 +1018,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/progress.vim -rw-r--r-- root/root usr/share/vim/syntax/prolog.vim -rw-r--r-- root/root usr/share/vim/syntax/promela.vim +-rw-r--r-- root/root usr/share/vim/syntax/proto.vim -rw-r--r-- root/root usr/share/vim/syntax/protocols.vim -rw-r--r-- root/root usr/share/vim/syntax/psf.vim -rw-r--r-- root/root usr/share/vim/syntax/ptcap.vim @@ -976,6 +1036,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/rcslog.vim -rw-r--r-- root/root usr/share/vim/syntax/readline.vim -rw-r--r-- root/root usr/share/vim/syntax/rebol.vim +-rw-r--r-- root/root usr/share/vim/syntax/redif.vim -rw-r--r-- root/root usr/share/vim/syntax/registry.vim -rw-r--r-- root/root usr/share/vim/syntax/remind.vim -rw-r--r-- root/root usr/share/vim/syntax/resolv.vim @@ -984,6 +1045,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/rhelp.vim -rw-r--r-- root/root usr/share/vim/syntax/rib.vim -rw-r--r-- root/root usr/share/vim/syntax/rnc.vim +-rw-r--r-- root/root usr/share/vim/syntax/rng.vim -rw-r--r-- root/root usr/share/vim/syntax/rnoweb.vim -rw-r--r-- root/root usr/share/vim/syntax/robots.vim -rw-r--r-- root/root usr/share/vim/syntax/rpcgen.vim @@ -1046,6 +1108,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/sql.vim -rw-r--r-- root/root usr/share/vim/syntax/sqlanywhere.vim -rw-r--r-- root/root usr/share/vim/syntax/sqlforms.vim +-rw-r--r-- root/root usr/share/vim/syntax/sqlhana.vim -rw-r--r-- root/root usr/share/vim/syntax/sqlinformix.vim -rw-r--r-- root/root usr/share/vim/syntax/sqlj.vim -rw-r--r-- root/root usr/share/vim/syntax/sqloracle.vim @@ -1064,6 +1127,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/synload.vim -rw-r--r-- root/root usr/share/vim/syntax/syntax.vim -rw-r--r-- root/root usr/share/vim/syntax/sysctl.vim +-rw-r--r-- root/root usr/share/vim/syntax/systemverilog.vim -rw-r--r-- root/root usr/share/vim/syntax/tads.vim -rw-r--r-- root/root usr/share/vim/syntax/tags.vim -rw-r--r-- root/root usr/share/vim/syntax/tak.vim @@ -1085,17 +1149,27 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/tli.vim -rw-r--r-- root/root usr/share/vim/syntax/tpp.vim -rw-r--r-- root/root usr/share/vim/syntax/trasys.vim +-rw-r--r-- root/root usr/share/vim/syntax/treetop.vim -rw-r--r-- root/root usr/share/vim/syntax/trustees.vim -rw-r--r-- root/root usr/share/vim/syntax/tsalt.vim -rw-r--r-- root/root usr/share/vim/syntax/tsscl.vim -rw-r--r-- root/root usr/share/vim/syntax/tssgm.vim -rw-r--r-- root/root usr/share/vim/syntax/tssop.vim +-rw-r--r-- root/root usr/share/vim/syntax/tt2.vim +-rw-r--r-- root/root usr/share/vim/syntax/tt2html.vim +-rw-r--r-- root/root usr/share/vim/syntax/tt2js.vim -rw-r--r-- root/root usr/share/vim/syntax/uc.vim -rw-r--r-- root/root usr/share/vim/syntax/udevconf.vim -rw-r--r-- root/root usr/share/vim/syntax/udevperm.vim -rw-r--r-- root/root usr/share/vim/syntax/udevrules.vim -rw-r--r-- root/root usr/share/vim/syntax/uil.vim -rw-r--r-- root/root usr/share/vim/syntax/updatedb.vim +-rw-r--r-- root/root usr/share/vim/syntax/upstart.vim +-rw-r--r-- root/root usr/share/vim/syntax/upstreamdat.vim +-rw-r--r-- root/root usr/share/vim/syntax/upstreaminstalllog.vim +-rw-r--r-- root/root usr/share/vim/syntax/upstreamlog.vim +-rw-r--r-- root/root usr/share/vim/syntax/usserverlog.vim +-rw-r--r-- root/root usr/share/vim/syntax/usw2kagtlog.vim -rw-r--r-- root/root usr/share/vim/syntax/valgrind.vim -rw-r--r-- root/root usr/share/vim/syntax/vb.vim -rw-r--r-- root/root usr/share/vim/syntax/vera.vim @@ -1139,5 +1213,6 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/yacc.vim -rw-r--r-- root/root usr/share/vim/syntax/yaml.vim -rw-r--r-- root/root usr/share/vim/syntax/z8a.vim +-rw-r--r-- root/root usr/share/vim/syntax/zimbu.vim -rw-r--r-- root/root usr/share/vim/syntax/zsh.vim -rw-r--r-- root/root usr/share/vim/vimrc diff --git a/vim/.md5sum b/vim/.md5sum index c40670f..0baac50 100644 --- a/vim/.md5sum +++ b/vim/.md5sum @@ -1,16 +1 @@ -22791e40a0572e73eb09c9f185ecf6d2 vim-7.3-cross.diff -8a37f055666a095059a11cd4f3551b62 vim-7.3.001-050.xz -19ed55574b327b62eda0375121c6f1c1 vim-7.3.051-102.xz -ad27623207bb17d6accf1ba2d9f0b301 vim-7.3.103-154.xz -225deb98aa81f7817398884a997de4e3 vim-7.3.155-198.xz -ac39ba760ec1318424c73601d6a38467 vim-7.3.199-260.xz -c640a1147b6824c902c56f0d512ac5d8 vim-7.3.261-303.xz -8fca251214c3f64c5e314a34999d4178 vim-7.3.304-353.xz -0569f542588bdff085cf4c2a913e84f1 vim-7.3.354-401.xz -820bb5a8bc11642a350c28e723751e60 vim-7.3.402-470.xz -bd739c11c478b7ee352467d6caed871d vim-7.3.471-515.xz -a48bc97d01078fa6b396dc79f9916fa1 vim-7.3.516-600.xz -c4608d5814f016a9d67fe2f13ab036fb vim-7.3.601-659.xz -9ffdd42550500b2a86f35c8191917c6f vim-7.3.660-712.xz -2af3bf40678d6616e1c2a093b750185c vim-7.3.713-754.xz -5b9510a17074e2b37d8bb38ae09edbf2 vim-7.3.tar.bz2 +af80c3d62fd5b5c48a5dab2c238db226 vim-7.4.316.tar.xz diff --git a/vim/Pkgfile b/vim/Pkgfile index 6d1df10..30e72b6 100644 --- a/vim/Pkgfile +++ b/vim/Pkgfile @@ -5,30 +5,12 @@ # Depends on: ncurses acl name=vim -version=7.3.754 +version=7.4.316 release=1 -source=(ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 - http://crux.nu/files/distfiles/vim-7.3.001-050.xz - http://crux.nu/files/distfiles/vim-7.3.051-102.xz - http://crux.nu/files/distfiles/vim-7.3.103-154.xz - http://crux.nu/files/distfiles/vim-7.3.155-198.xz - http://crux.nu/files/distfiles/vim-7.3.199-260.xz - http://crux.nu/files/distfiles/vim-7.3.261-303.xz - http://crux.nu/files/distfiles/vim-7.3.304-353.xz - http://crux.nu/files/distfiles/vim-7.3.354-401.xz - http://crux.nu/files/distfiles/vim-7.3.402-470.xz - http://crux.nu/files/distfiles/vim-7.3.471-515.xz - http://crux.nu/files/distfiles/vim-7.3.516-600.xz - http://crux.nu/files/distfiles/vim-7.3.601-659.xz - http://crux.nu/files/distfiles/vim-7.3.660-712.xz - http://crux.nu/files/distfiles/vim-7.3.713-754.xz - vim-7.3-cross.diff) +source=(http://crux.nu/files/distfiles/$name-$version.tar.xz) build () { - cd vim73/src - - unxz -c $SRC/vim-7.3.*.xz | patch -p0 -d $SRC/vim73 - patch -p2 -i $SRC/vim-7.3-cross.diff + cd $name-$version/src cat > auto/config.cache << EOF vim_cv_getcwd_broken=no diff --git a/vim/vim-7.3-cross.diff b/vim/vim-7.3-cross.diff deleted file mode 100644 index e2e33c1..0000000 --- a/vim/vim-7.3-cross.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/auto/configure -+++ b/src/auto/configure -@@ -11660,7 +11657,7 @@ main() { - exit(0); - } - _ACEOF --if ac_fn_c_try_run "$LINENO"; then : -+if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 - $as_echo "ok" >&6; } - else -- 2.26.2 From d6601bbdf2803cfa05c1cf78955a9db9d53d251c Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 16:25:16 +0000 Subject: [PATCH 07/16] wget: updated to 1.15 --- wget/.md5sum | 2 +- wget/Pkgfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wget/.md5sum b/wget/.md5sum index dd2b681..1e93dc7 100644 --- a/wget/.md5sum +++ b/wget/.md5sum @@ -1,2 +1,2 @@ -316f6f59292c9098ad81fd54f658c579 wget-1.14.tar.xz +7a279d5ac5594919124d5526e7143e28 wget-1.15.tar.xz fa717c9970a09e8ee1775a93e51fb694 wgetrc diff --git a/wget/Pkgfile b/wget/Pkgfile index 5a0b5a2..128cbde 100644 --- a/wget/Pkgfile +++ b/wget/Pkgfile @@ -5,7 +5,7 @@ # Depends on: openssl name=wget -version=1.14 +version=1.15 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz \ wgetrc) -- 2.26.2 From 010d2bb42d3018dceea45804b0af9fa7a5da7d9f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 16:32:26 +0000 Subject: [PATCH 08/16] which: updated source --- which/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/which/Pkgfile b/which/Pkgfile index 1477dd6..297ec1d 100644 --- a/which/Pkgfile +++ b/which/Pkgfile @@ -6,7 +6,7 @@ name=which version=2.20 release=1 -source=(http://www.xs4all.nl/~carlo17/which/$name-$version.tar.gz) +source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.gz) build() { cd $name-$version -- 2.26.2 From 5ef83cfaedee076c0c3b976dd022d52d8eca9d5f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 18:41:10 +0000 Subject: [PATCH 09/16] util-linux: fixed build without nologin managed by shadow --- util-linux/.footprint | 2 -- util-linux/Pkgfile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/util-linux/.footprint b/util-linux/.footprint index c78d359..5ef5c90 100644 --- a/util-linux/.footprint +++ b/util-linux/.footprint @@ -36,7 +36,6 @@ drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/mkfs -rwxr-xr-x root/root sbin/mkfs.cramfs -rwxr-xr-x root/root sbin/mkswap --rwxr-xr-x root/root sbin/nologin -rwxr-xr-x root/root sbin/pivot_root -rwxr-xr-x root/root sbin/raw -rwxr-xr-x root/root sbin/sfdisk @@ -209,7 +208,6 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/mkfs.cramfs.8.gz -rw-r--r-- root/root usr/man/man8/mkswap.8.gz -rw-r--r-- root/root usr/man/man8/mount.8.gz --rw-r--r-- root/root usr/man/man8/nologin.8.gz -rw-r--r-- root/root usr/man/man8/partx.8.gz -rw-r--r-- root/root usr/man/man8/pivot_root.8.gz -rw-r--r-- root/root usr/man/man8/raw.8.gz diff --git a/util-linux/Pkgfile b/util-linux/Pkgfile index 9bb3ded..46aaddc 100644 --- a/util-linux/Pkgfile +++ b/util-linux/Pkgfile @@ -16,7 +16,7 @@ build() { --prefix=/usr \ --mandir=/usr/man \ --disable-{nls,wall} \ - --disable-{login,su,sulogin} \ + --disable-{login,su,sulogin,nologin} \ --enable-{write,raw,kill} make -- 2.26.2 From e9af0b5aa138660a313908752407f9a985c28c87 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 1 Oct 2014 18:42:50 +0000 Subject: [PATCH 10/16] shadow: updated source --- shadow/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shadow/Pkgfile b/shadow/Pkgfile index 3766631..7a99338 100644 --- a/shadow/Pkgfile +++ b/shadow/Pkgfile @@ -7,7 +7,7 @@ name=shadow version=4.1.5.1 release=3 -source=(http://pkg-shadow.alioth.debian.org/releases/$name-$version.tar.bz2 \ +source=(http://ftp.cross-lfs.org/pub/clfs/conglomeration/shadow/$name-$version.tar.bz2 pwck login.defs) build() { -- 2.26.2 From 8e334ad94829e6a357b078ee1214d6e6764aff91 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 14 Oct 2014 16:30:15 +0000 Subject: [PATCH 11/16] procps: fixed pidof and lib install --- procps/.footprint | 10 ++++++++-- procps/Pkgfile | 5 ++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/procps/.footprint b/procps/.footprint index 1452884..f14c5f5 100644 --- a/procps/.footprint +++ b/procps/.footprint @@ -1,4 +1,5 @@ drwxr-xr-x root/root bin/ +-rwxr-xr-x root/root bin/pidof -rwxr-xr-x root/root bin/ps drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/sysctl.conf @@ -11,7 +12,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/free -rwxr-xr-x root/root usr/bin/pgrep --rwxr-xr-x root/root usr/bin/pidof -rwxr-xr-x root/root usr/bin/pkill -rwxr-xr-x root/root usr/bin/pmap -rwxr-xr-x root/root usr/bin/pwdx @@ -39,7 +39,7 @@ drwxr-xr-x root/root usr/include/proc/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libprocps.a -rwxr-xr-x root/root usr/lib/libprocps.la -lrwxrwxrwx root/root usr/lib/libprocps.so -> ../../lib/ +lrwxrwxrwx root/root usr/lib/libprocps.so -> ../../lib/libprocps.so.3.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libprocps.pc drwxr-xr-x root/root usr/man/ @@ -62,3 +62,9 @@ drwxr-xr-x root/root usr/man/man5/ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/sysctl.8.gz -rw-r--r-- root/root usr/man/man8/vmstat.8.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/doc/ +drwxr-xr-x root/root usr/share/doc/procps-ng/ +-rw-r--r-- root/root usr/share/doc/procps-ng/BUGS +-rw-r--r-- root/root usr/share/doc/procps-ng/FAQ +-rw-r--r-- root/root usr/share/doc/procps-ng/README.top diff --git a/procps/Pkgfile b/procps/Pkgfile index 78ac0fb..f956eb1 100644 --- a/procps/Pkgfile +++ b/procps/Pkgfile @@ -32,9 +32,8 @@ EOF make DESTDIR=$PKG install install -d $PKG/{lib,etc} + mv $PKG/usr/bin/pidof $PKG/bin/ mv $PKG/usr/lib/libprocps.so.* $PKG/lib - ln -sf ../../lib/$(readlink $PKG/lib/libprocps.so.0) $PKG/usr/lib/libprocps.so + ln -sf ../../lib/$(readlink $PKG/lib/libprocps.so.3) $PKG/usr/lib/libprocps.so install -m 0644 $SRC/sysctl.conf $PKG/etc/sysctl.conf - - rm -r $PKG/usr/share } -- 2.26.2 From 49aeec085f627d6bba9209af549e617c60d9a3d5 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 14 Oct 2014 16:34:01 +0000 Subject: [PATCH 12/16] filesystem: updated group file --- filesystem/group | 1 + 1 file changed, 1 insertion(+) diff --git a/filesystem/group b/filesystem/group index 9996a02..a0a42c3 100644 --- a/filesystem/group +++ b/filesystem/group @@ -20,6 +20,7 @@ floppy::18: tape::19: scanner::20: cdrom::21: +input::22: nobody::99: messagebus::81: users::100: -- 2.26.2 From 42eb451817ed9353a5d72bbddd82f8cae416d986 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 14 Oct 2014 16:39:51 +0000 Subject: [PATCH 13/16] filesystem: updated .md5sum --- filesystem/.md5sum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filesystem/.md5sum b/filesystem/.md5sum index 6b6d8b5..ce14ef1 100644 --- a/filesystem/.md5sum +++ b/filesystem/.md5sum @@ -1,5 +1,5 @@ 1ea1c43f6dceaf64d1a8d96fda1d4c2b fstab -7b103e0325616227a5d615f3c8687bb8 group +7e668cdf21a22956f1bb8ef119c0da07 group ca2a8cf1bf672f64af8807259b9abf63 issue 346ede8d637940e2898cd29c56a37d30 mime.types d41d8cd98f00b204e9800998ecf8427e motd -- 2.26.2 From 419503a9cb44ab9a0b04ccf51de04c2e02527a5b Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 15 Oct 2014 09:49:14 +0000 Subject: [PATCH 14/16] net-tools: added port to manage net interfaces under crossrootfs avoiding iptables/iproute2 --- net-tools/.footprint | 38 ++++ net-tools/.md5sum | 10 + net-tools/Pkgfile | 39 ++++ net-tools/net-tools-1.60-arp.patch | 54 +++++ net-tools/net-tools-1.60-compile_fixes.patch | 118 +++++++++++ net-tools/net-tools-1.60-config.patch | 212 +++++++++++++++++++ net-tools/net-tools-1.60-ipv6.patch | 86 ++++++++ net-tools/net-tools-1.60-man.patch | 39 ++++ net-tools/net-tools-1.60-manydevs.patch | 16 ++ net-tools/net-tools-1.60-miiioctl.patch | 20 ++ net-tools/net-tools-1.60-nameif.patch | 61 ++++++ net-tools/net-tools-1.60-virtualname.patch | 26 +++ 12 files changed, 719 insertions(+) create mode 100644 net-tools/.footprint create mode 100644 net-tools/.md5sum create mode 100644 net-tools/Pkgfile create mode 100644 net-tools/net-tools-1.60-arp.patch create mode 100644 net-tools/net-tools-1.60-compile_fixes.patch create mode 100644 net-tools/net-tools-1.60-config.patch create mode 100644 net-tools/net-tools-1.60-ipv6.patch create mode 100644 net-tools/net-tools-1.60-man.patch create mode 100644 net-tools/net-tools-1.60-manydevs.patch create mode 100644 net-tools/net-tools-1.60-miiioctl.patch create mode 100644 net-tools/net-tools-1.60-nameif.patch create mode 100644 net-tools/net-tools-1.60-virtualname.patch diff --git a/net-tools/.footprint b/net-tools/.footprint new file mode 100644 index 0000000..0e2cf52 --- /dev/null +++ b/net-tools/.footprint @@ -0,0 +1,38 @@ +drwxr-xr-x root/root bin/ +lrwxrwxrwx root/root bin/dnsdomainname -> hostname +lrwxrwxrwx root/root bin/domainname -> hostname +-rwxr-xr-x root/root bin/hostname +-rwxr-xr-x root/root bin/netstat +lrwxrwxrwx root/root bin/nisdomainname -> hostname +lrwxrwxrwx root/root bin/ypdomainname -> hostname +drwxr-xr-x root/root sbin/ +-rwxr-xr-x root/root sbin/arp +-rwxr-xr-x root/root sbin/ifconfig +-rwxr-xr-x root/root sbin/ipmaddr +-rwxr-xr-x root/root sbin/iptunnel +-rwxr-xr-x root/root sbin/mii-tool +-rwxr-xr-x root/root sbin/nameif +-rwxr-xr-x root/root sbin/plipconfig +-rwxr-xr-x root/root sbin/rarp +-rwxr-xr-x root/root sbin/route +-rwxr-xr-x root/root sbin/slattach +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/man/ +drwxr-xr-x root/root usr/man/man1/ +-rw-r--r-- root/root usr/man/man1/dnsdomainname.1.gz +-rw-r--r-- root/root usr/man/man1/domainname.1.gz +-rw-r--r-- root/root usr/man/man1/hostname.1.gz +-rw-r--r-- root/root usr/man/man1/nisdomainname.1.gz +-rw-r--r-- root/root usr/man/man1/ypdomainname.1.gz +drwxr-xr-x root/root usr/man/man5/ +-rw-r--r-- root/root usr/man/man5/ethers.5.gz +drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/arp.8.gz +-rw-r--r-- root/root usr/man/man8/ifconfig.8.gz +-rw-r--r-- root/root usr/man/man8/mii-tool.8.gz +-rw-r--r-- root/root usr/man/man8/nameif.8.gz +-rw-r--r-- root/root usr/man/man8/netstat.8.gz +-rw-r--r-- root/root usr/man/man8/plipconfig.8.gz +-rw-r--r-- root/root usr/man/man8/rarp.8.gz +-rw-r--r-- root/root usr/man/man8/route.8.gz +-rw-r--r-- root/root usr/man/man8/slattach.8.gz diff --git a/net-tools/.md5sum b/net-tools/.md5sum new file mode 100644 index 0000000..d0d48f9 --- /dev/null +++ b/net-tools/.md5sum @@ -0,0 +1,10 @@ +830e6f4e684836ba37490466f76291ea net-tools-1.60-arp.patch +60fc4a56b77b1eed2edb1b5ec36811c2 net-tools-1.60-compile_fixes.patch +e6bac543b1ecd00dce441e01a36803e8 net-tools-1.60-config.patch +ad589817be77ec4a62d58c5b3da854c4 net-tools-1.60-ipv6.patch +a118ce66a9f4434eea1132616d641360 net-tools-1.60-man.patch +87b0463b53d19acb3fb64cbcc782f530 net-tools-1.60-manydevs.patch +b5dac908351a917214afc7ce1e50785b net-tools-1.60-miiioctl.patch +1f12d84c3543e8b9a605a5e47d72d907 net-tools-1.60-nameif.patch +7372c2824f687adbae15d415cfb50c51 net-tools-1.60-virtualname.patch +888774accab40217dde927e21979c165 net-tools-1.60.tar.bz2 diff --git a/net-tools/Pkgfile b/net-tools/Pkgfile new file mode 100644 index 0000000..a798436 --- /dev/null +++ b/net-tools/Pkgfile @@ -0,0 +1,39 @@ +# Description: Network utilities +# URL: http://www.tazenda.demon.co.uk/phil/net-tools/ +# Maintainer: CRUX System Team, core-ports at crux dot nu +# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu +# Depends on: + +name=net-tools +version=1.60 +release=6 +source=(http://www.tazenda.demon.co.uk/phil/net-tools/$name-$version.tar.bz2 \ + $name-$version-config.patch \ + $name-$version-compile_fixes.patch \ + $name-$version-arp.patch \ + $name-$version-man.patch \ + $name-$version-nameif.patch \ + $name-$version-manydevs.patch \ + $name-$version-virtualname.patch \ + $name-$version-ipv6.patch \ + $name-$version-miiioctl.patch) + +build() { + cd $name-$version + patch -p1 < ../$name-$version-config.patch + patch -p1 < ../$name-$version-compile_fixes.patch + patch -p1 < ../$name-$version-arp.patch + patch -p1 < ../$name-$version-man.patch + patch -p1 < ../$name-$version-nameif.patch + patch -p1 < ../$name-$version-manydevs.patch + patch -p1 < ../$name-$version-virtualname.patch + patch -p1 < ../$name-$version-ipv6.patch + patch -p1 < ../$name-$version-miiioctl.patch + find -name "*.c" -o -name "*.h"|while read src; do + sed -i "s%%%" $src + sed -i "s%%%" $src + sed -i "s%%%" $src + done + make COPTS="$CFLAGS -D_GNU_SOURCE -Wall" + make BASEDIR=$PKG mandir=/usr/man install +} diff --git a/net-tools/net-tools-1.60-arp.patch b/net-tools/net-tools-1.60-arp.patch new file mode 100644 index 0000000..6dd53cd --- /dev/null +++ b/net-tools/net-tools-1.60-arp.patch @@ -0,0 +1,54 @@ +From Rawhide. Allows ARP to display in a Linux style. + +diff -Naur net-tools-1.60.orig/arp.c net-tools-1.60/arp.c +--- net-tools-1.60.orig/arp.c 2001-04-08 17:05:05.000000000 +0000 ++++ net-tools-1.60/arp.c 2003-09-12 22:36:51.000000000 +0000 +@@ -619,6 +619,7 @@ + fprintf(stderr, _(" arp [-v] [] [-i ] -Ds [netmask ] pub <-''-\n\n")); + + fprintf(stderr, _(" -a display (all) hosts in alternative (BSD) style\n")); ++ fprintf(stderr, _(" -e display (all) hosts in default (Linux) style\n")); + fprintf(stderr, _(" -s, --set set a new ARP entry\n")); + fprintf(stderr, _(" -d, --delete delete a specified entry\n")); + fprintf(stderr, _(" -v, --verbose be verbose\n")); +diff -Naur net-tools-1.60.orig/man/en_US/arp.8 net-tools-1.60/man/en_US/arp.8 +--- net-tools-1.60.orig/man/en_US/arp.8 2000-10-28 10:59:42.000000000 +0000 ++++ net-tools-1.60/man/en_US/arp.8 2003-09-12 22:36:51.000000000 +0000 +@@ -3,7 +3,7 @@ + arp \- manipulate the system ARP cache + .SH SYNOPSIS + .B arp +-.RB [ \-vn ] ++.RB [ \-evn ] + .RB [ "\-H type" ] + .RB [ "-i if" ] + .B -a +@@ -60,7 +60,7 @@ + shows numerical addresses instead of trying to determine symbolic host, port + or user names. + .TP +-.B "\-H type, \-\-hw-type type" ++.B "\-H type, \-\-hw-type type, \-t type" + When setting or reading the ARP cache, this optional parameter tells + .B arp + which class of entries it should check for. The default value of +@@ -81,7 +81,8 @@ + .B hostname + parameter is not used, + .B all +-entries will be displayed. ++entries will be displayed. ++The entries will be displayed in alternate (BSD) style. + .TP + .B "\-d hostname, \-\-delete hostname" + Remove any entry for the specified host. This can be used if the +@@ -92,6 +93,9 @@ + .BR ifa "'s" + hardware address. + .TP ++.B "\-e" ++Shows the entries in default (Linux) style. ++.TP + .B "\-i If, \-\-device If" + Select an interface. When dumping the ARP cache only entries matching + the specified interface will be printed. When setting a permanent or diff --git a/net-tools/net-tools-1.60-compile_fixes.patch b/net-tools/net-tools-1.60-compile_fixes.patch new file mode 100644 index 0000000..132d4e0 --- /dev/null +++ b/net-tools/net-tools-1.60-compile_fixes.patch @@ -0,0 +1,118 @@ +diff -Nru net-tools-1.60/mii-tool.c net-tools-1.60-new/mii-tool.c +--- net-tools-1.60/mii-tool.c 2000-05-21 16:31:17.000000000 +0200 ++++ net-tools-1.60-new/mii-tool.c 2003-11-08 02:11:31.000000000 +0100 +@@ -379,17 +379,17 @@ + /*--------------------------------------------------------------------*/ + + const char *usage = +-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...] +- -V, --version display version information +- -v, --verbose more verbose output +- -R, --reset reset MII to poweron state +- -r, --restart restart autonegotiation +- -w, --watch monitor for link status changes +- -l, --log with -w, write events to syslog +- -A, --advertise=media,... advertise only specified media +- -F, --force=media force specified media technology +-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD, +- (to advertise both HD and FD) 100baseTx, 10baseT\n"; ++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n" ++" -V, --version display version information\n" ++" -v, --verbose more verbose output\n" ++" -R, --reset reset MII to poweron state\n" ++" -r, --restart restart autonegotiation\n" ++" -w, --watch monitor for link status changes\n" ++" -l, --log with -w, write events to syslog\n" ++" -A, --advertise=media,... advertise only specified media\n" ++" -F, --force=media force specified media technology\n" ++"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n" ++" (to advertise both HD and FD) 100baseTx, 10baseT\n"; + + int main(int argc, char **argv) + { +diff -ru net-tools-1.60/lib/x25_sr.c net-tools-1.60-new/lib/x25_sr.c +--- net-tools-1.60/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200 ++++ net-tools-1.60-new/lib/x25_sr.c 2004-04-30 23:37:10.536499600 +0200 +@@ -77,7 +77,7 @@ + rt.sigdigits=sigdigits; + + /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */ +- memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address)); ++ memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address)); + + while (*args) { + if (!strcmp(*args,"device") || !strcmp(*args,"dev")) { +diff -ru net-tools-1.60/lib/inet6_sr.c net-tools-1.60-new/lib/inet6_sr.c +--- net-tools-1.60/lib/inet6_sr.c 2000-05-22 23:18:37.000000000 +0200 ++++ net-tools-1.60-new/lib/inet6_sr.c 2004-04-30 23:48:24.146095376 +0200 +@@ -32,6 +32,7 @@ + #include "net-support.h" + #include "pathnames.h" + #include "intl.h" ++#include "util.h" + #include "net-features.h" + + +diff -ru net-tools-1.60/lib/inet_sr.c net-tools-1.60-new/lib/inet_sr.c +--- net-tools-1.60/lib/inet_sr.c 2000-02-20 22:46:45.000000000 +0100 ++++ net-tools-1.60-new/lib/inet_sr.c 2004-05-01 00:01:21.358941064 +0200 +@@ -105,6 +105,7 @@ + case 2: + isnet = 0; break; + default: ++ break; + } + + /* Fill in the other fields. */ +diff -ru net-tools-1.60/hostname.c net-tools-1.60-new/hostname.c +--- net-tools-1.60/hostname.c 2001-04-08 19:04:23.000000000 +0200 ++++ net-tools-1.60-new/hostname.c 2004-05-01 00:03:32.373023896 +0200 +@@ -31,6 +31,7 @@ + * your option) any later version. + */ + #include ++#include + #include + #include + #include +@@ -78,6 +79,7 @@ + fprintf(stderr, _("%s: name too long\n"), program_name); + break; + default: ++ break; + } + exit(1); + } +@@ -98,6 +100,7 @@ + fprintf(stderr, _("%s: name too long\n"), program_name); + break; + default: ++ break; + } + exit(1); + }; +@@ -117,6 +120,7 @@ + fprintf(stderr, _("%s: name too long\n"), program_name); + break; + default: ++ break; + } + exit(1); + }; +@@ -174,6 +178,7 @@ + printf("%s\n", hp->h_name); + break; + default: ++ break; + } + } + +@@ -330,7 +335,7 @@ + case 'h': + default: + usage(); +- ++ break; + }; + + diff --git a/net-tools/net-tools-1.60-config.patch b/net-tools/net-tools-1.60-config.patch new file mode 100644 index 0000000..34d57d9 --- /dev/null +++ b/net-tools/net-tools-1.60-config.patch @@ -0,0 +1,212 @@ +diff -Nru net-tools-1.60/config.h net-tools-1.60-new/config.h +--- net-tools-1.60/config.h 1970-01-01 01:00:00.000000000 +0100 ++++ net-tools-1.60-new/config.h 2003-11-08 02:11:23.000000000 +0100 +@@ -0,0 +1,74 @@ ++/* ++* config.h Automatically generated configuration includefile ++* ++* NET-TOOLS A collection of programs that form the base set of the ++* NET-3 Networking Distribution for the LINUX operating ++* system. ++* ++* DO NOT EDIT DIRECTLY ++* ++*/ ++ ++/* ++ * ++ * Internationalization ++ * ++ * The net-tools package has currently been translated to French, ++ * German and Brazilian Portugese. Other translations are, of ++ * course, welcome. Answer `n' here if you have no support for ++ * internationalization on your system. ++ * ++ */ ++#define I18N 0 ++ ++/* ++ * ++ * Protocol Families. ++ * ++ */ ++#define HAVE_AFUNIX 1 ++#define HAVE_AFINET 1 ++#define HAVE_AFINET6 1 ++#define HAVE_AFIPX 1 ++#define HAVE_AFATALK 1 ++#define HAVE_AFAX25 1 ++#define HAVE_AFNETROM 1 ++#define HAVE_AFROSE 0 ++#define HAVE_AFX25 1 ++#define HAVE_AFECONET 0 ++#define HAVE_AFDECnet 0 ++#define HAVE_AFASH 0 ++ ++/* ++ * ++ * Device Hardware types. ++ * ++ */ ++#define HAVE_HWETHER 1 ++#define HAVE_HWARC 1 ++#define HAVE_HWSLIP 1 ++#define HAVE_HWPPP 1 ++#define HAVE_HWTUNNEL 1 ++#define HAVE_HWSTRIP 1 ++#define HAVE_HWTR 1 ++#define HAVE_HWAX25 1 ++#define HAVE_HWROSE 0 ++#define HAVE_HWNETROM 1 ++#define HAVE_HWX25 1 ++#define HAVE_HWFR 1 ++#define HAVE_HWSIT 1 ++#define HAVE_HWFDDI 0 ++#define HAVE_HWHIPPI 0 ++#define HAVE_HWASH 0 ++#define HAVE_HWHDLCLAPB 0 ++#define HAVE_HWIRDA 1 ++#define HAVE_HWEC 0 ++ ++/* ++ * ++ * Other Features. ++ * ++ */ ++#define HAVE_FW_MASQUERADE 1 ++#define HAVE_IP_TOOLS 1 ++#define HAVE_MII 1 +diff -Nru net-tools-1.60/config.make net-tools-1.60-new/config.make +--- net-tools-1.60/config.make 1970-01-01 01:00:00.000000000 +0100 ++++ net-tools-1.60-new/config.make 2003-11-08 02:11:23.000000000 +0100 +@@ -0,0 +1,35 @@ ++# I18N=0 ++HAVE_AFUNIX=1 ++HAVE_AFINET=1 ++HAVE_AFINET6=1 ++HAVE_AFIPX=1 ++HAVE_AFATALK=1 ++HAVE_AFAX25=1 ++HAVE_AFNETROM=1 ++# HAVE_AFROSE=0 ++HAVE_AFX25=1 ++# HAVE_AFECONET=0 ++# HAVE_AFDECnet=0 ++# HAVE_AFASH=0 ++HAVE_HWETHER=1 ++HAVE_HWARC=1 ++HAVE_HWSLIP=1 ++HAVE_HWPPP=1 ++HAVE_HWTUNNEL=1 ++HAVE_HWSTRIP=1 ++HAVE_HWTR=1 ++HAVE_HWAX25=1 ++# HAVE_HWROSE=0 ++HAVE_HWNETROM=1 ++HAVE_HWX25=1 ++HAVE_HWFR=1 ++HAVE_HWSIT=1 ++# HAVE_HWFDDI=0 ++# HAVE_HWHIPPI=0 ++# HAVE_HWASH=0 ++# HAVE_HWHDLCLAPB=0 ++HAVE_HWIRDA=1 ++# HAVE_HWEC=0 ++HAVE_FW_MASQUERADE=1 ++HAVE_IP_TOOLS=1 ++HAVE_MII=1 +diff -Nru net-tools-1.60/config.status net-tools-1.60-new/config.status +--- net-tools-1.60/config.status 1970-01-01 01:00:00.000000000 +0100 ++++ net-tools-1.60-new/config.status 2003-11-08 02:11:23.000000000 +0100 +@@ -0,0 +1,91 @@ ++# ++# config.in Configure.sh source for the net-tools. ++# This file contains the definition of what the support ++# library contains. Most of all, it defines which types ++# of address families and hardware we know of. ++# ++# NET-TOOLS A collection of programs that form the base set of the ++# NET-3 Networking Distribution for the LINUX operating ++# system. ++# ++# Version: config.in 1.22 (99-04-19) ++# ++# Author: Fred N. van Kempen, ++# Copyright 1988-1993 MicroWalt Corporation ++# ++# Bernd 'eckes' Eckenfels ++# Arnaldo Carvalho de Melo ++# GNU gettext - I18N ++# ++# This program is free software; you can redistribute it ++# and/or modify it under the terms of the GNU General ++# Public License as published by the Free Software ++# Foundation; either version 2 of the License, or (at ++# your option) any later version. ++# ++= /* ++= * config.h Automatically generated configuration includefile ++= * ++= * NET-TOOLS A collection of programs that form the base set of the ++= * NET-3 Networking Distribution for the LINUX operating ++= * system. ++= * ++= * DO NOT EDIT DIRECTLY ++= * ++= */ ++* ++* ++* Internationalization ++* ++* The net-tools package has currently been translated to French, ++* German and Brazilian Portugese. Other translations are, of ++* course, welcome. Answer `n' here if you have no support for ++* internationalization on your system. ++* ++bool 'Does your system support GNU gettext?' I18N n ++* ++* ++* Protocol Families. ++* ++bool 'UNIX protocol family' HAVE_AFUNIX y ++bool 'INET (TCP/IP) protocol family' HAVE_AFINET y ++bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y ++bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y ++bool 'Appletalk DDP protocol family' HAVE_AFATALK y ++bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y ++bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y ++bool 'Rose (packet radio) protocol family' HAVE_AFROSE n ++bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y ++bool 'Econet protocol family' HAVE_AFECONET n ++bool 'DECnet protocol family' HAVE_AFDECnet n ++bool 'Ash protocol family' HAVE_AFASH n ++* ++* ++* Device Hardware types. ++* ++bool 'Ethernet (generic) support' HAVE_HWETHER y ++bool 'ARCnet support' HAVE_HWARC y ++bool 'SLIP (serial line) support' HAVE_HWSLIP y ++bool 'PPP (serial line) support' HAVE_HWPPP y ++bool 'IPIP Tunnel support' HAVE_HWTUNNEL y ++bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y ++bool 'Token ring (generic) support' HAVE_HWTR y ++bool 'AX25 (packet radio) support' HAVE_HWAX25 y ++bool 'Rose (packet radio) support' HAVE_HWROSE n ++bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y ++bool 'X.25 (generic) support' HAVE_HWX25 y ++bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y ++bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y ++bool 'FDDI (generic) support' HAVE_HWFDDI n ++bool 'HIPPI (generic) support' HAVE_HWHIPPI n ++bool 'Ash hardware support' HAVE_HWASH n ++bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n ++bool 'IrDA support' HAVE_HWIRDA y ++bool 'Econet hardware support' HAVE_HWEC n ++* ++* ++* Other Features. ++* ++bool 'IP Masquerading support' HAVE_FW_MASQUERADE y ++bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y ++bool 'Build mii-tool' HAVE_MII y diff --git a/net-tools/net-tools-1.60-ipv6.patch b/net-tools/net-tools-1.60-ipv6.patch new file mode 100644 index 0000000..3764f3d --- /dev/null +++ b/net-tools/net-tools-1.60-ipv6.patch @@ -0,0 +1,86 @@ +From Rawhide. Fixes IPV6 Lookup. + +diff -Naur net-tools-1.60.orig/lib/inet6.c net-tools-1.60/lib/inet6.c +--- net-tools-1.60.orig/lib/inet6.c 2000-10-28 11:04:00.000000000 +0000 ++++ net-tools-1.60/lib/inet6.c 2003-09-12 22:40:45.000000000 +0000 +@@ -133,28 +133,9 @@ + } + + +-static int INET6_getsock(char *bufp, struct sockaddr *sap) +-{ +- struct sockaddr_in6 *sin6; +- +- sin6 = (struct sockaddr_in6 *) sap; +- sin6->sin6_family = AF_INET6; +- sin6->sin6_port = 0; +- +- if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0) +- return (-1); +- +- return 16; /* ?;) */ +-} +- + static int INET6_input(int type, char *bufp, struct sockaddr *sap) + { +- switch (type) { +- case 1: +- return (INET6_getsock(bufp, sap)); +- default: +- return (INET6_resolve(bufp, (struct sockaddr_in6 *) sap)); +- } ++ return (INET6_resolve(bufp, (struct sockaddr_in6 *) sap)); + } + + +diff -Naur net-tools-1.60.orig/lib/inet6_gr.c net-tools-1.60/lib/inet6_gr.c +--- net-tools-1.60.orig/lib/inet6_gr.c 2001-04-01 14:48:06.000000000 +0000 ++++ net-tools-1.60/lib/inet6_gr.c 2003-09-12 22:40:45.000000000 +0000 +@@ -100,7 +100,7 @@ + addr6p[4], addr6p[5], addr6p[6], addr6p[7]); + inet6_aftype.input(1, addr6, (struct sockaddr *) &saddr6); + snprintf(addr6, sizeof(addr6), "%s/%d", +- inet6_aftype.sprint((struct sockaddr *) &saddr6, 1), ++ inet6_aftype.sprint((struct sockaddr *) &saddr6, numeric), + prefix_len); + + /* Fetch and resolve the nexthop address. */ +@@ -109,7 +109,7 @@ + naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7]); + inet6_aftype.input(1, naddr6, (struct sockaddr *) &snaddr6); + snprintf(naddr6, sizeof(naddr6), "%s", +- inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1)); ++ inet6_aftype.sprint((struct sockaddr *) &snaddr6, numeric)); + + /* Decode the flags. */ + strcpy(flags, "U"); +diff -Naur net-tools-1.60.orig/lib/inet6_sr.c net-tools-1.60/lib/inet6_sr.c +--- net-tools-1.60.orig/lib/inet6_sr.c 2000-05-22 21:18:37.000000000 +0000 ++++ net-tools-1.60/lib/inet6_sr.c 2003-09-12 22:40:45.000000000 +0000 +@@ -63,7 +63,7 @@ + if (*args == NULL) + return (usage()); + +- strcpy(target, *args++); ++ safe_strncpy(target, *args++, sizeof(target)); + if (!strcmp(target, "default")) { + prefix_len = 0; + memset(&sa6, 0, sizeof(sa6)); +@@ -112,7 +112,7 @@ + return (usage()); + if (rt.rtmsg_flags & RTF_GATEWAY) + return (usage()); +- strcpy(gateway, *args); ++ safe_strncpy(gateway, *args, sizeof(gateway)); + if (inet6_aftype.input(1, gateway, + (struct sockaddr *) &sa6) < 0) { + inet6_aftype.herror(gateway); +@@ -152,7 +152,7 @@ + } + if (devname) { + memset(&ifr, 0, sizeof(ifr)); +- strcpy(ifr.ifr_name, devname); ++ safe_strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name)); + + if (ioctl(skfd, SIOGIFINDEX, &ifr) < 0) { + perror("SIOGIFINDEX"); diff --git a/net-tools/net-tools-1.60-man.patch b/net-tools/net-tools-1.60-man.patch new file mode 100644 index 0000000..b02068f --- /dev/null +++ b/net-tools/net-tools-1.60-man.patch @@ -0,0 +1,39 @@ +From Rawhide. Removes nodename from Hostname man page. + +diff -Naur net-tools-1.60.orig/man/en_US/hostname.1 net-tools-1.60/man/en_US/hostname.1 +--- net-tools-1.60.orig/man/en_US/hostname.1 1999-02-27 12:11:14.000000000 +0000 ++++ net-tools-1.60/man/en_US/hostname.1 2003-09-12 22:44:09.000000000 +0000 +@@ -10,8 +10,6 @@ + nisdomainname \- show or set system's NIS/YP domain name + .br + ypdomainname \- show or set the system's NIS/YP domain name +-.br +-nodename \- show or set the system's DECnet node name + + .SH SYNOPSIS + .B hostname +@@ -96,12 +94,6 @@ + function. This is also known as the YP/NIS domain name of the system. + + .LP +-.B nodename +-will print the DECnet node name of the system as returned by the +-.BR getnodename (2) +-function. +- +-.LP + .B dnsdomainname + will print the domain part of the FQDN (Fully Qualified Domain Name). The + complete FQDN of the system is returned with +@@ -184,11 +176,6 @@ + .I "\-i, \-\-ip-address" + Display the IP address(es) of the host. + .TP +-.I "\-n, \-\-node" +-Display the DECnet node name. If a parameter is given (or +-.B \-\-file name +-) the root can also set a new node name. +-.TP + .I "\-s, \-\-short" + Display the short host name. This is the host name cut at the first dot. + .TP diff --git a/net-tools/net-tools-1.60-manydevs.patch b/net-tools/net-tools-1.60-manydevs.patch new file mode 100644 index 0000000..a4cb0b4 --- /dev/null +++ b/net-tools/net-tools-1.60-manydevs.patch @@ -0,0 +1,16 @@ +From Rawhide. Allows check of multiple devices. + +diff -Naur net-tools-1.60.orig/lib/nstrcmp.c net-tools-1.60/lib/nstrcmp.c +--- net-tools-1.60.orig/lib/nstrcmp.c 1999-01-09 15:55:20.000000000 +0000 ++++ net-tools-1.60/lib/nstrcmp.c 2003-09-12 22:46:13.000000000 +0000 +@@ -16,8 +16,8 @@ + b++; + } + if (isdigit(*a)) { +- if (!isdigit(*b)) +- return -1; ++ if (!isdigit(*b)) ++ return 1; + while (a > astr) { + a--; + if (!isdigit(*a)) { diff --git a/net-tools/net-tools-1.60-miiioctl.patch b/net-tools/net-tools-1.60-miiioctl.patch new file mode 100644 index 0000000..eb2ab20 --- /dev/null +++ b/net-tools/net-tools-1.60-miiioctl.patch @@ -0,0 +1,20 @@ +From Rawhide. Updates mii ioctls. + +diff -Naur net-tools-1.60.orig/include/mii.h net-tools-1.60/include/mii.h +--- net-tools-1.60.orig/include/mii.h 2000-05-21 14:21:27.000000000 +0000 ++++ net-tools-1.60/include/mii.h 2003-09-12 22:47:27.000000000 +0000 +@@ -11,11 +11,9 @@ + + /* network interface ioctl's for MII commands */ + #ifndef SIOCGMIIPHY +-#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Read from current PHY */ +-#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read any PHY register */ +-#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write any PHY register */ +-#define SIOCGPARAMS (SIOCDEVPRIVATE+3) /* Read operational parameters */ +-#define SIOCSPARAMS (SIOCDEVPRIVATE+4) /* Set operational parameters */ ++#define SIOCGMIIPHY 0x8947 /* Read from current PHY */ ++#define SIOCGMIIREG 0x8948 /* Read any PHY register */ ++#define SIOCSMIIREG 0x8949 /* Write any PHY register */ + #endif + + #include diff --git a/net-tools/net-tools-1.60-nameif.patch b/net-tools/net-tools-1.60-nameif.patch new file mode 100644 index 0000000..a742a8e --- /dev/null +++ b/net-tools/net-tools-1.60-nameif.patch @@ -0,0 +1,61 @@ +From Rawhide. Fix for when the wrong device information is shown. + +diff -Naur net-tools-1.60.orig/nameif.c net-tools-1.60/nameif.c +--- net-tools-1.60.orig/nameif.c 2000-10-18 17:26:29.000000000 +0000 ++++ net-tools-1.60/nameif.c 2003-09-12 22:48:57.000000000 +0000 +@@ -117,7 +117,8 @@ + } + + struct change { +- struct change *next,**pprev; ++ struct change *next; ++ int found; + char ifname[IFNAMSIZ+1]; + unsigned char mac[6]; + }; +@@ -139,10 +140,7 @@ + ch->ifname, pos); + if (parsemac(p,ch->mac) < 0) + complain(_("cannot parse MAC `%s' at %s"), p, pos); +- if (clist) +- clist->pprev = &ch->next; + ch->next = clist; +- ch->pprev = &clist; + clist = ch; + return 0; + } +@@ -200,7 +198,7 @@ + + void usage(void) + { +- fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); ++ fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); + exit(1); + } + +@@ -277,21 +275,21 @@ + ch = lookupmac(mac); + if (!ch) + continue; +- +- *ch->pprev = ch->next; ++ ++ ch->found = 1; + if (strcmp(p, ch->ifname)) { + if (setname(p, ch->ifname) < 0) + complain(_("cannot change name of %s to %s: %s"), + p, ch->ifname, strerror(errno)); + } +- free(ch); + } + fclose(ifh); + + while (clist) { + struct change *ch = clist; + clist = clist->next; +- warning(_("interface '%s' not found"), ch->ifname); ++ if (!ch->found) ++ warning(_("interface '%s' not found"), ch->ifname); + free(ch); + } + diff --git a/net-tools/net-tools-1.60-virtualname.patch b/net-tools/net-tools-1.60-virtualname.patch new file mode 100644 index 0000000..e768e1f --- /dev/null +++ b/net-tools/net-tools-1.60-virtualname.patch @@ -0,0 +1,26 @@ +From Rawhide. Show Virtual Name in netstat. + +diff -Naur net-tools-1.60.orig/lib/interface.c net-tools-1.60/lib/interface.c +--- net-tools-1.60.orig/lib/interface.c 2001-02-10 19:31:15.000000000 +0000 ++++ net-tools-1.60/lib/interface.c 2003-09-12 22:50:35.000000000 +0000 +@@ -579,7 +579,7 @@ + + void ife_print_short(struct interface *ptr) + { +- printf("%-5.5s ", ptr->name); ++ printf("%-9.8s ", ptr->name); + printf("%5d %3d", ptr->mtu, ptr->metric); + /* If needed, display the interface statistics. */ + if (ptr->statistics_valid) { +diff -Naur net-tools-1.60.orig/netstat.c net-tools-1.60/netstat.c +--- net-tools-1.60.orig/netstat.c 2003-09-12 22:43:54.000000000 +0000 ++++ net-tools-1.60/netstat.c 2003-09-12 22:50:35.000000000 +0000 +@@ -1449,7 +1449,7 @@ + } + if (flag_exp < 2) { + ife_short = 1; +- printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); ++ printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n")); + } + + if (for_all_interfaces(do_if_print, &flag_all) < 0) { -- 2.26.2 From 4b8f91fd5611819f66be3a4f18578058458b33ac Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 15 Oct 2014 10:06:09 +0000 Subject: [PATCH 15/16] inetutils: removed hostname --- inetutils/.footprint | 6 +----- inetutils/Pkgfile | 7 ++----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/inetutils/.footprint b/inetutils/.footprint index 094fb85..424aaec 100644 --- a/inetutils/.footprint +++ b/inetutils/.footprint @@ -1,19 +1,15 @@ -drwxr-xr-x root/root bin/ --rwxr-xr-x root/root bin/hostname drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/inetd.conf drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/inetd -drwxr-xr-x root/root sbin/ --rwxr-xr-x root/root sbin/ifconfig drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/ifconfig -rwxr-xr-x root/root usr/bin/telnet -rwsrwxr-x root/root usr/bin/traceroute drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/ftp.1.gz --rw-r--r-- root/root usr/man/man1/hostname.1.gz -rw-r--r-- root/root usr/man/man1/ifconfig.1.gz -rw-r--r-- root/root usr/man/man1/telnet.1.gz -rw-r--r-- root/root usr/man/man1/traceroute.1.gz diff --git a/inetutils/Pkgfile b/inetutils/Pkgfile index eed4009..7baf897 100644 --- a/inetutils/Pkgfile +++ b/inetutils/Pkgfile @@ -27,15 +27,12 @@ build() { --localstatedir=/var \ --sysconfdir=/etc \ --disable-{servers,clients} \ - --enable-{hostname,ifconfig,inetd,ftp,telnet,traceroute} + --enable-{ifconfig,inetd,ftp,telnet,traceroute} make make DESTDIR=$PKG install - install -d $PKG/{etc/rc.d,bin,sbin} - - mv $PKG/usr/bin/hostname $PKG/bin/ - mv $PKG/usr/bin/ifconfig $PKG/sbin/ + install -d $PKG/etc/rc.d install -m 644 $SRC/inetd.conf $PKG/etc install -m 755 $SRC/inetd $PKG/etc/rc.d -- 2.26.2 From 8598e485bd5d659e7b5f97be7255836bb585d039 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 15 Oct 2014 10:59:01 +0000 Subject: [PATCH 16/16] rc: removed lo/net support from rc.conf --- rc/.md5sum | 2 +- rc/rc.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rc/.md5sum b/rc/.md5sum index 3627cdd..91e1cf9 100644 --- a/rc/.md5sum +++ b/rc/.md5sum @@ -1,6 +1,6 @@ 49523b36db24792e3e70be2190f2e64a inittab 73d785cc2b05907e5599c1ee3954570b rc -670f547fca904321c968c61a73714a63 rc.conf +c9c1e10fb7ef7248e914879184cf8324 rc.conf afe5cd67920474246ae74e54a9845339 rc.fix d1be35927946756c68242f29c16ee983 rc.local 394d5cff98ab59fd1a0ec64fe79292cb rc.modules diff --git a/rc/rc.conf b/rc/rc.conf index c4265ce..650391a 100644 --- a/rc/rc.conf +++ b/rc/rc.conf @@ -7,6 +7,6 @@ KEYMAP=us TIMEZONE=UTC HOSTNAME=host SYSLOG=sysklogd -SERVICES=(lo net crond) +SERVICES=(crond) # End of file -- 2.26.2