June 2016 - crux-commits

ports/core (3.3): vim: update to 7.4.1947, fix for FS#1324
by crux＠crux.nu 25 Jun '16

25 Jun '16

commit 059555396e5efbed3f61763ff39e29d0073b338f Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 20 16:50:59 2016 +0200 vim: update to 7.4.1947, fix for FS#1324 diff --git a/vim/.md5sum b/vim/.md5sum index 03c4cc9..c7e807b 100644 --- a/vim/.md5sum +++ b/vim/.md5sum @@ -1 +1 @@ -725d268efac80bfc9000c75d2e890c41 vim-7.4.1859.tar.xz +66fdc62dea2e595d552f58d0ee90ec96 vim-7.4.1947.tar.xz diff --git a/vim/Pkgfile b/vim/Pkgfile index 27802cc..39f510c 100644 --- a/vim/Pkgfile +++ b/vim/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses acl name=vim -version=7.4.1859 +version=7.4.1947 release=1 source=(http://crux.nu/files/distfiles/$name-$version.tar.xz) @@ -47,4 +47,6 @@ build () { make VIMRTDIR= make -j1 VIMRTDIR= DESTDIR=$PKG installvimbin + + sed -i '/^packadd matchit/s/^/" /' $PKG/usr/share/vim/vimrc }

1 0

ports/core (3.3): dhcpcd: update to 6.11.1
by crux＠crux.nu 25 Jun '16

25 Jun '16

commit 01537b93a23df5e0f372a4ebe083cb846e985e2e Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 20 12:21:25 2016 +0200 dhcpcd: update to 6.11.1 diff --git a/dhcpcd/.md5sum b/dhcpcd/.md5sum index 4757128..725d986 100644 --- a/dhcpcd/.md5sum +++ b/dhcpcd/.md5sum @@ -1,2 +1 @@ -8c1340a53fd7e56d32bb6fef6e1354ee dhcpcd-6.11.0.tar.xz -5c1e9f596840d38affc4bddbc5e6eeb6 dhcpcd-truncated-packet.patch +8acf2c0295f0c132a1e9f8060665b53d dhcpcd-6.11.1.tar.xz diff --git a/dhcpcd/Pkgfile b/dhcpcd/Pkgfile index 52dbffd..c65f35b 100644 --- a/dhcpcd/Pkgfile +++ b/dhcpcd/Pkgfile @@ -4,16 +4,13 @@ # Depends on: eudev name=dhcpcd -version=6.11.0 -release=2 -source=(http://roy.marples.name/downloads/dhcpcd/$name-$version.tar.xz - dhcpcd-truncated-packet.patch) +version=6.11.1 +release=1 +source=(http://roy.marples.name/downloads/dhcpcd/$name-$version.tar.xz) build () { cd $name-$version - patch -p0 <$SRC/dhcpcd-truncated-packet.patch - ./configure --prefix= \ --libexecdir=/lib/dhcpcd \ --dbdir=/var/lib/dhcpcd \ diff --git a/dhcpcd/dhcpcd-truncated-packet.patch b/dhcpcd/dhcpcd-truncated-packet.patch deleted file mode 100644 index c21fd60..0000000 --- a/dhcpcd/dhcpcd-truncated-packet.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: dhcp.c -================================================================== ---- dhcp.c -+++ dhcp.c -@@ -1082,13 +1082,16 @@ - } - - *p++ = DHO_END; - len = (size_t)(p - (uint8_t *)bootp); - -- /* Pad out to the BOOTP minimum message length. -- * Some DHCP servers incorrectly require this. */ -- while (len < BOOTP_MESSAGE_LENTH_MIN) { -+ /* Pad out to the BOOTP message length. -+ * Even if we send a DHCP packet with a variable length vendor area, -+ * some servers / relay agents don't like packets smaller than -+ * a BOOTP message which is fine because that's stipulated -+ * in RFC1542 section 2.1. */ -+ while (len < sizeof(*bootp)) { - *p++ = DHO_PAD; - len++; - } - - if (ifo->auth.options & DHCPCD_AUTH_SEND && auth_len != 0) -@@ -3134,18 +3137,30 @@ - { - logger(ifp->ctx, LOG_WARNING, - "%s: server %s is not destination", - ifp->name, inet_ntoa(from)); - } -- -+ /* -+ * DHCP has a variable option area rather than a fixed -+ * vendor area. -+ * Because DHCP uses the BOOTP protocol it should -+ * still send BOOTP sized packets to be RFC compliant. -+ * However some servers send a truncated vendor area. -+ * dhcpcd can work fine without the vendor area being sent. -+ */ - bytes = get_udp_data(&bootp, buf); -- if (bytes < sizeof(struct bootp)) { -+ if (bytes < offsetof(struct bootp, vend)) { - logger(ifp->ctx, LOG_ERR, - "%s: truncated packet (%zu) from %s", - ifp->name, bytes, inet_ntoa(from)); - continue; - } -+ /* But to make our IS_DHCP macro easy, ensure the vendor -+ * area has at least 4 octets. */ -+ while (bytes < offsetof(struct bootp, vend) + 4) -+ bootp[bytes++] = '\0'; -+ - dhcp_handledhcp(ifp, (struct bootp *)bootp, bytes, &from); - if (state->raw_fd == -1) - break; - } - } - -Index: dhcp.h -================================================================== ---- dhcp.h -+++ dhcp.h -@@ -129,13 +129,10 @@ - FQDN_NONE = 0x18, - FQDN_PTR = 0x20, - FQDN_BOTH = 0x31 - }; - --/* Some crappy DHCP servers require the BOOTP minimum length */ --#define BOOTP_MESSAGE_LENTH_MIN 300 -- - /* Don't import common.h as that defines __unused which causes problems - * on some Linux systems which define it as part of a structure */ - #if __GNUC__ > 2 || defined(__INTEL_COMPILER) - # ifndef __packed - # define __packed __attribute__((__packed__)) -

1 0

ports/core (3.3): file: update to 5.28
by crux＠crux.nu 25 Jun '16

25 Jun '16

commit 0d3b3204ab48283ad4cd134c6cfa7b2d99acfc92 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 20 12:21:05 2016 +0200 file: update to 5.28 diff --git a/file/.md5sum b/file/.md5sum index 4b716c3..3ad33a4 100644 --- a/file/.md5sum +++ b/file/.md5sum @@ -1 +1 @@ -18f1c60aa27a296a26c2e9389ac92ba5 file-5.27.tar.gz +3f7771424aa855f32094b49571e19b33 file-5.28.tar.gz diff --git a/file/Pkgfile b/file/Pkgfile index 2d2b99c..f5db220 100644 --- a/file/Pkgfile +++ b/file/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib name=file -version=5.27 +version=5.28 release=1 source=(ftp://ftp.astron.com/pub/file/$name-$version.tar.gz)

1 0

ports/core (3.3): libdevmapper: update to 1.02.127
by crux＠crux.nu 25 Jun '16

25 Jun '16

commit 6b23ba9ebb056699541a827ee78055274a45b146 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 20 12:20:56 2016 +0200 libdevmapper: update to 1.02.127 diff --git a/libdevmapper/.md5sum b/libdevmapper/.md5sum index 5f96ec9..f192ab5 100644 --- a/libdevmapper/.md5sum +++ b/libdevmapper/.md5sum @@ -1 +1 @@ -c119be1af5e96deb2b17c4e43b8eb51b LVM2.2.02.156.tgz +fbe85b1c8527d0302c66d465ab05f3e3 LVM2.2.02.157.tgz diff --git a/libdevmapper/Pkgfile b/libdevmapper/Pkgfile index 4700863..1ed6abc 100644 --- a/libdevmapper/Pkgfile +++ b/libdevmapper/Pkgfile @@ -4,12 +4,12 @@ # Depends on: eudev util-linux name=libdevmapper -version=1.02.127 +version=1.02.128 release=1 -source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/releases/LVM2.2.02.156.tgz) +source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/releases/LVM2.2.02.157.tgz) build() { - cd LVM2.2.02.156 + cd LVM2.2.02.157 ./configure --prefix=/usr \ --exec-prefix= \

1 0

ports/core (3.3): bash: update to 4.3.46
by crux＠crux.nu 25 Jun '16

25 Jun '16

commit aabd7598a5e104932e8f064a9d0ff1fabbd8be16 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 20 12:20:45 2016 +0200 bash: update to 4.3.46 diff --git a/bash/.md5sum b/bash/.md5sum index 5d208fb..b9ea7ca 100644 --- a/bash/.md5sum +++ b/bash/.md5sum @@ -1,3 +1,3 @@ -e9bced547088b3805ea929ec56b6f20a bash-4.3.42.patch.gz +d42c964424756fb1e9bc44a5e32b89a3 bash-4.3.46.patch.gz 81348932d5da294953e15d4814c74dd1 bash-4.3.tar.gz be4c698ea8bb7d52eab2d6ce2c3fab8e profile diff --git a/bash/Pkgfile b/bash/Pkgfile index 8fd5b0e..6e326f8 100644 --- a/bash/Pkgfile +++ b/bash/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses readline name=bash -version=4.3.42 +version=4.3.46 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-${version:0:3}.tar.gz \ $name-$version.patch.gz profile) diff --git a/bash/bash-4.3.42.patch.gz b/bash/bash-4.3.42.patch.gz deleted file mode 100644 index a2d5538..0000000 Binary files a/bash/bash-4.3.42.patch.gz and /dev/null differ diff --git a/bash/bash-4.3.46.patch.gz b/bash/bash-4.3.46.patch.gz new file mode 100644 index 0000000..0de3a51 Binary files /dev/null and b/bash/bash-4.3.46.patch.gz differ

1 0

ports/core (3.2): sysklogd: appended patch for faulty fclose() call.
by crux＠crux.nu 25 Jun '16

25 Jun '16

commit 74a1b24907018d109d29e3c6e2696b3ced9b4e08 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sat Jun 25 02:28:33 2016 +0200 sysklogd: appended patch for faulty fclose() call. diff --git a/sysklogd/.md5sum b/sysklogd/.md5sum index 32388cc..b29605c 100644 --- a/sysklogd/.md5sum +++ b/sysklogd/.md5sum @@ -1,6 +1,6 @@ 41dfad9077311e159c793216adf90723 rotatelog b34c927b05f072083d801deba5420e80 sysklogd c70599ab0d037fde724f7210c2c8d7f8 sysklogd-1.5.1.tar.gz -31a0c87a3e78f8cc141a6a1e86e2e27d sysklogd.diff +65329b18bdabea65ef2b9b0f62562c05 sysklogd.diff 844e5e75944beb8cf4f39a0535e56ba4 syslog f8d478b8d60c1d3879f4a10a955db6e5 syslog.conf diff --git a/sysklogd/Pkgfile b/sysklogd/Pkgfile index 683bcc0..ede10e7 100644 --- a/sysklogd/Pkgfile +++ b/sysklogd/Pkgfile @@ -4,7 +4,7 @@ name=sysklogd version=1.5.1 -release=4 +release=5 source=(http://www.infodrom.org/projects/$name/download/$name-$version.tar.… \ sysklogd.diff rotatelog syslog syslog.conf sysklogd) diff --git a/sysklogd/sysklogd.diff b/sysklogd/sysklogd.diff index a94e0d1..9362ea0 100644 --- a/sysklogd/sysklogd.diff +++ b/sysklogd/sysklogd.diff @@ -11,3 +11,16 @@ diff -aur sysklogd-1.5.1.orig/Makefile sysklogd-1.5.1/Makefile # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE # $(shell getconf LFS_SKFLAGS) + +diff --git a/ksym_mod.c b/ksym_mod.c +index 68cd6b6..2cdd104 100644 +--- a/ksym_mod.c ++++ b/ksym_mod.c +@@ -189,7 +189,6 @@ extern int InitMsyms() + else + Syslog(LOG_ERR, "Error loading kernel symbols " \ + "- %s\n", strerror(errno)); +- fclose(ksyms); + return(0); + } +

1 0

ports/opt (3.2): btrfs-progs: don't remove device mapper udev rules
by crux＠crux.nu 24 Jun '16

24 Jun '16

commit 45853a373d443ee0674a615fa55e51935885e601 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Jun 24 23:52:19 2016 +0200 btrfs-progs: don't remove device mapper udev rules diff --git a/btrfs-progs/.footprint b/btrfs-progs/.footprint index 951df48..3eb7f57 100644 --- a/btrfs-progs/.footprint +++ b/btrfs-progs/.footprint @@ -1,3 +1,7 @@ +drwxr-xr-x root/root lib/ +drwxr-xr-x root/root lib/udev/ +drwxr-xr-x root/root lib/udev/rules.d/ +-rw-r--r-- root/root lib/udev/rules.d/64-btrfs-dm.rules drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/btrfs -rwxr-xr-x root/root sbin/btrfs-convert diff --git a/btrfs-progs/Pkgfile b/btrfs-progs/Pkgfile index 24a116e..6fad285 100644 --- a/btrfs-progs/Pkgfile +++ b/btrfs-progs/Pkgfile @@ -14,6 +14,4 @@ build() { ./configure --prefix=/usr --bindir=/sbin make make DESTDIR=$PKG install - # We already supply udev rules for btrfs - rm -r $PKG/lib }

1 0

ports/opt (3.2): btrfs-progs: updated to 4.6.1
by crux＠crux.nu 24 Jun '16

24 Jun '16

commit 2702ae4bd1a7e5771d0e5bbf99210b600da0d241 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Fri Jun 24 23:46:28 2016 +0200 btrfs-progs: updated to 4.6.1 diff --git a/btrfs-progs/.md5sum b/btrfs-progs/.md5sum index d70b9a5..43e70e3 100644 --- a/btrfs-progs/.md5sum +++ b/btrfs-progs/.md5sum @@ -1,2 +1,2 @@ -eb82eac654aa892168d06f0bf2d91bd7 btrfs-progs-man-v4.5.3.tar.xz -3feb593cb52df7570769559366d5e320 btrfs-progs-v4.5.3.tar.xz +676cd1450285bf0ba823273be690bd9d btrfs-progs-man-v4.6.1.tar.xz +39c6395eeb5cb0d642b78464e05d9283 btrfs-progs-v4.6.1.tar.xz diff --git a/btrfs-progs/Pkgfile b/btrfs-progs/Pkgfile index 5551ab0..24a116e 100644 --- a/btrfs-progs/Pkgfile +++ b/btrfs-progs/Pkgfile @@ -4,7 +4,7 @@ # Depends on: util-linux e2fsprogs lzo zlib name=btrfs-progs -version=4.5.3 +version=4.6.1 release=1 source=(https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/bt… \ $name-man-v$version.tar.xz) @@ -14,4 +14,6 @@ build() { ./configure --prefix=/usr --bindir=/sbin make make DESTDIR=$PKG install + # We already supply udev rules for btrfs + rm -r $PKG/lib } diff --git a/btrfs-progs/btrfs-progs-man-v4.5.3.tar.xz b/btrfs-progs/btrfs-progs-man-v4.5.3.tar.xz deleted file mode 100644 index 7043929..0000000 Binary files a/btrfs-progs/btrfs-progs-man-v4.5.3.tar.xz and /dev/null differ diff --git a/btrfs-progs/btrfs-progs-man-v4.6.1.tar.xz b/btrfs-progs/btrfs-progs-man-v4.6.1.tar.xz new file mode 100644 index 0000000..db46404 Binary files /dev/null and b/btrfs-progs/btrfs-progs-man-v4.6.1.tar.xz differ

1 0

ports/contrib (3.2): pmwiki: update to 2.2.87
by crux＠crux.nu 24 Jun '16

24 Jun '16

commit 97fc5abf7a458373f5473f42140a2452588c674b Author: Juergen Daubert <jue(a)jue.li> Date: Fri Jun 24 13:51:58 2016 +0200 pmwiki: update to 2.2.87 diff --git a/pmwiki/.md5sum b/pmwiki/.md5sum index 7009a58..2da2af9 100644 --- a/pmwiki/.md5sum +++ b/pmwiki/.md5sum @@ -1 +1 @@ -56dcd0af5745be8ab7e84727f6a09ed0 pmwiki-2.2.85.tgz +8869bab0b0006f920f2b0f3739c8a9d1 pmwiki-2.2.87.tgz diff --git a/pmwiki/Pkgfile b/pmwiki/Pkgfile index 8f2e9f8..c8aa541 100644 --- a/pmwiki/Pkgfile +++ b/pmwiki/Pkgfile @@ -4,7 +4,7 @@ # Depends on: php-fpm name=pmwiki -version=2.2.85 +version=2.2.87 release=1 source=(http://www.pmwiki.org/pub/$name/$name-$version.tgz)

1 0

ports/contrib (3.2): php-xsl: update to 5.6.23
by crux＠crux.nu 24 Jun '16

24 Jun '16

commit 5b5c473e5e5adc8300f4c01d8ea60d5fc58b08ed Author: Juergen Daubert <jue(a)jue.li> Date: Fri Jun 24 13:51:12 2016 +0200 php-xsl: update to 5.6.23 diff --git a/php-xsl/.md5sum b/php-xsl/.md5sum index 9605124..1294aa4 100644 --- a/php-xsl/.md5sum +++ b/php-xsl/.md5sum @@ -1 +1 @@ -e81f3993997acafeac2ddd2c8bab7153 php-5.6.20.tar.xz +c2d2155e50bcbaa0ee7a63845862c894 php-5.6.23.tar.xz diff --git a/php-xsl/Pkgfile b/php-xsl/Pkgfile index c2ea729..8daf9f9 100644 --- a/php-xsl/Pkgfile +++ b/php-xsl/Pkgfile @@ -5,7 +5,7 @@ # Depends on: libxslt name=php-xsl -version=5.6.20 +version=5.6.23 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz)

1 0