April 2015 - crux-commits

ports/contrib (3.1): docker: 1.5.0 -> 1.6.0
by crux＠crux.nu 20 Apr '15

20 Apr '15

commit b67cfa717ca775129f0207b8e5fc774fe8e8cf81 Author: James Mills <prologic(a)shortcircuit.net.au> Date: Mon Apr 20 11:14:31 2015 +1000 docker: 1.5.0 -> 1.6.0 diff --git a/docker/.md5sum b/docker/.md5sum index 7132b31..30d49c7 100644 --- a/docker/.md5sum +++ b/docker/.md5sum @@ -1,4 +1,4 @@ 69858e8f5c2f47bae23aae6a11822e55 check-config.sh -849b268387b3a23ce4e0b0bdf0c342d4 docker -5a4c44dc046f863f60bba02080d66fd1 docker.conf -a622207cd9eb21d95333501d2495ef5d v1.5.0.tar.gz +e3601957bbb866eb53ead26221779ff8 docker +223f19d2f5a6792499c1be3916855057 docker.conf +a7d81b566e3003698003506516ad932e v1.6.0.tar.gz diff --git a/docker/Pkgfile b/docker/Pkgfile index 2f89543..0f73356 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -2,12 +2,12 @@ # URL: http://www.docker.com/ # Maintainer: James Mills, prologic at shortcircuit dot net dot au # -# Depends on: go sqlite3 cgroupfs-mount +# Depends on: go sqlite3 cgroupfs-mount start-stop-daemon name=docker -version=1.5.0 -revision=a8a31eff10 -release=5 +version=1.6.0 +revision=47496519da +release=1 source=( https://raw.githubusercontent.com/docker/docker/v${version}/contrib/check-c… https://github.com/docker/docker/archive/v$version.tar.gz diff --git a/docker/UPGRADE b/docker/UPGRADE index bc4abbc..8c608af 100644 --- a/docker/UPGRADE +++ b/docker/UPGRADE @@ -1,18 +1,8 @@ -Upgrade Notes for Docker 1.5.0 +Upgrade Notes for Docker 1.6.0 ============================== -Docker 1.5.0 introduced several new features. +Docker 1.6.0 introduced several new features. -.. see:: http://docs.docker.com/release-notes/#version-150 +.. see:: https://blog.docker.com/2015/04/docker-release-1-6/ -As such several new Kernel configuration options -are **required**: - -- ``CONFIG_CGROUP_FREEZER=y`` -- ``CONFIG_CPUSETS=y`` -- ``CONFIG_CGROUP_PERF=y`` -- ``CONFIG_POSIX_MQUEUE=y`` - -Please make sure when you're upgrading your Docker engine -that you ensure these new Kernel configuration options -are enabled. +No kernel changes required. diff --git a/docker/docker b/docker/docker index 92fbbe9..f15a77e 100755 --- a/docker/docker +++ b/docker/docker @@ -3,31 +3,27 @@ # /etc/rc.d/docker: start/stop docker daemon # -export PATH="/sbin:/usr/sbin:$PATH" +SSD=/sbin/start-stop-daemon +PROG=/usr/bin/docker +PIDFILE=/var/run/docker.pid +LOGFILE=/var/log/docker.log -source /etc/docker.conf +. /etc/docker.conf case $1 in start) # Ensure ownership and permissiong of log file. - touch /var/log/docker.log - chgrp docker /var/log/docker.log - chown 640 /var/log/docker.log + touch $LOGFILE + chgrp docker $LOGFILE + chown 640 $LOGFILE # Ensure cgroups is properly mounted. cgroupfs-mount - nohup /usr/bin/docker $DOCKER_OPTS > /var/log/docker.log 2>&1 & + $SSD --start --background --make-pidfile --pidfile $PIDFILE --exec $PROG -- $OPTS >> $LOGFILE 2>&1 ;; stop) - if [ -f /var/run/docker.pid ]; then - kill $(< /var/run/docker.pid) - rm -f /var/run/docker.pid - rm -f /var/run/docker.sock - else - killall -q /usr/bin/docker - rm -f /var/run/docker.sock - fi + $SSD --stop --retry 10 --pidfile $PIDFILE # Unmount cgroups is cgroupfs-umount @@ -37,8 +33,20 @@ restart) sleep 2 $0 start ;; +reload) + $SSD --stop --pidfile $PIDFILE --signal HUP + ;; +status) + $SSD --status --pidfile $PIDFILE + case $? in + 0) echo "$(basename $PROG) is running with pid $(cat $PID)" ;; + 1) echo "$(basename $PROG) is not running but the pid file $PID exists" ;; + 3) echo "$(basename $PROG) is not running" ;; + 4) echo "Unable to determine the program status" ;; + esac + ;; *) - echo "usage: $0 [start|stop|restart]" + echo "usage: $0 [start|stop|restart|reload|status]" ;; esac diff --git a/docker/docker.conf b/docker/docker.conf index 383629d..f6200bb 100644 --- a/docker/docker.conf +++ b/docker/docker.conf @@ -2,6 +2,6 @@ # # For configuration options see: docker --help -DOCKER_OPTS="-d -p /var/run/docker.pid" +OPTS="-d -p /var/run/docker.pid" # vim: syntax=sh diff --git a/docker/post-install b/docker/post-install index a75854d..1f205cf 100755 --- a/docker/post-install +++ b/docker/post-install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # create docker group getent group docker > /dev/null || groupadd -g 142 docker

1 0

ports/core (3.1): man-pages: updated to 3.83
by crux＠crux.nu 19 Apr '15

19 Apr '15

commit 75c988a900d11f25c67bf0765ba4228f1aa20638 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Apr 19 19:43:01 2015 +0200 man-pages: updated to 3.83 diff --git a/man-pages/.footprint b/man-pages/.footprint index b1c2b32..141123b 100644 --- a/man-pages/.footprint +++ b/man-pages/.footprint @@ -503,6 +503,7 @@ drwxr-xr-x root/root usr/man/man2/ -rw-r--r-- root/root usr/man/man2/munmap.2.gz -rw-r--r-- root/root usr/man/man2/name_to_handle_at.2.gz -rw-r--r-- root/root usr/man/man2/nanosleep.2.gz +-rw-r--r-- root/root usr/man/man2/newfstatat.2.gz -rw-r--r-- root/root usr/man/man2/nfsservctl.2.gz -rw-r--r-- root/root usr/man/man2/nice.2.gz -rw-r--r-- root/root usr/man/man2/oldfstat.2.gz @@ -541,6 +542,7 @@ drwxr-xr-x root/root usr/man/man2/ -rw-r--r-- root/root usr/man/man2/pread64.2.gz -rw-r--r-- root/root usr/man/man2/preadv.2.gz -rw-r--r-- root/root usr/man/man2/prlimit.2.gz +-rw-r--r-- root/root usr/man/man2/prlimit64.2.gz -rw-r--r-- root/root usr/man/man2/process_vm_readv.2.gz -rw-r--r-- root/root usr/man/man2/process_vm_writev.2.gz -rw-r--r-- root/root usr/man/man2/prof.2.gz @@ -1714,6 +1716,7 @@ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/pmap_unset.3.gz -rw-r--r-- root/root usr/man/man3/popen.3.gz -rw-r--r-- root/root usr/man/man3/posix_fallocate.3.gz +-rw-r--r-- root/root usr/man/man3/posix_madvise.3.gz -rw-r--r-- root/root usr/man/man3/posix_memalign.3.gz -rw-r--r-- root/root usr/man/man3/posix_openpt.3.gz -rw-r--r-- root/root usr/man/man3/pow.3.gz diff --git a/man-pages/.md5sum b/man-pages/.md5sum index 0a17a88..5396ef2 100644 --- a/man-pages/.md5sum +++ b/man-pages/.md5sum @@ -1,2 +1,2 @@ -b3d4d949530d0ce13971040b53cf7a39 man-pages-3.82.tar.xz +a8d21f07f4ee01a117f196ab2f5e260a man-pages-3.83.tar.xz 825fde78e6fddd02426ecdd50e2cbe0d man-pages-posix-2013-a.tar.xz diff --git a/man-pages/Pkgfile b/man-pages/Pkgfile index 26a64d1..7555405 100644 --- a/man-pages/Pkgfile +++ b/man-pages/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=man-pages -version=3.82 +version=3.83 release=1 source=(http://www.kernel.org/pub/linux/docs/$name/$name-$version.tar.xz \ http://www.kernel.org/pub/linux/docs/$name/$name-posix/$name-posix-2013-a.t…)

1 0

ports/xorg (3.1): xorg-server: README improve commands again
by crux＠crux.nu 18 Apr '15

18 Apr '15

commit 49a693ef62ccd8fb9d3dd300da0e1966290a4c6c Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 18 23:37:56 2015 +1000 xorg-server: README improve commands again diff --git a/xorg-server/README b/xorg-server/README index f853d66..d26b034 100644 --- a/xorg-server/README +++ b/xorg-server/README @@ -31,18 +31,8 @@ POST-INSTALL NOTE: This only applies on ABI changes between major versions eg, 1.16.0 -> 1.17.0. -prt-get update -fr $(prt-get listinst | egrep '^xorg-xf86-(input|video)|^mesa3d') +prt-get update -fr $(prt-get listinst --regex '^xorg-xf86-(input|video)|^mesa3d') If you use nvidia you also need to do this: -gl-select use xorg -prt-get update -fr $(prt-get listinst | egrep '^nvidia') -gl-select use nvidia - - To avoid rebooting you can do this: - - NOTE: you have to exit xorg to do this. - -rmmod nvidia -depmod -a - +gl-select use xorg && gl-select use nvidia

1 0

ports/xorg (3.1): xorg-server: README improve commands
by crux＠crux.nu 18 Apr '15

18 Apr '15

commit bd7cebf4576d24746581e965f957895295ca7435 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 18 21:34:18 2015 +1000 xorg-server: README improve commands diff --git a/xorg-server/README b/xorg-server/README index 7f088fe..f853d66 100644 --- a/xorg-server/README +++ b/xorg-server/README @@ -31,13 +31,12 @@ POST-INSTALL NOTE: This only applies on ABI changes between major versions eg, 1.16.0 -> 1.17.0. -prt-get update -fr $(prt-get listinst | egrep '^xorg-xf86-(input|video)') \ -$(prt-get listinst | egrep '^mesa3d') +prt-get update -fr $(prt-get listinst | egrep '^xorg-xf86-(input|video)|^mesa3d') If you use nvidia you also need to do this: gl-select use xorg -prt-get update -fr $(prt-get listinst | grep 'nvidia') +prt-get update -fr $(prt-get listinst | egrep '^nvidia') gl-select use nvidia To avoid rebooting you can do this:

1 0

ports/opt (3.1): u-boot-tools: updated to 2015.04
by crux＠crux.nu 18 Apr '15

18 Apr '15

commit 18c2af38aa2d9bb2cdd534b82615e6bbb96d104c Author: Jose V Beneyto <sepen(a)crux.nu> Date: Sat Apr 18 10:35:28 2015 +0200 u-boot-tools: updated to 2015.04 diff --git a/u-boot-tools/.md5sum b/u-boot-tools/.md5sum index a61dfca..86b0215 100644 --- a/u-boot-tools/.md5sum +++ b/u-boot-tools/.md5sum @@ -1 +1 @@ -7f08dc9e98a71652bd6968888ed6ec95 u-boot-2015.01.tar.bz2 +570bdc2c47270c2a98ca60ff6c5c74cd u-boot-2015.04.tar.bz2 diff --git a/u-boot-tools/Pkgfile b/u-boot-tools/Pkgfile index 5c43c74..d81bb55 100644 --- a/u-boot-tools/Pkgfile +++ b/u-boot-tools/Pkgfile @@ -5,7 +5,7 @@ # Depends on: name=u-boot-tools -version=2015.01 +version=2015.04 release=1 source=(ftp://ftp.denx.de/pub/u-boot/u-boot-$version.tar.bz2)

1 0

ports/opt (3.1): scite: update to 3.5.5
by crux＠crux.nu 18 Apr '15

18 Apr '15

commit 5d768a5bd1be8186fee7b4c79d332c0d55413d89 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Apr 18 09:47:49 2015 +0200 scite: update to 3.5.5 diff --git a/scite/.md5sum b/scite/.md5sum index f2d9cc1..f153ace 100644 --- a/scite/.md5sum +++ b/scite/.md5sum @@ -1 +1 @@ -5438237551c50a9d57fce80dc23a4494 scite354.tgz +5c96c719fa01b27e987909502b671e25 scite355.tgz diff --git a/scite/Pkgfile b/scite/Pkgfile index d318259..00f57fe 100644 --- a/scite/Pkgfile +++ b/scite/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk name=scite -version=3.5.4 +version=3.5.5 release=1 source=(http://downloads.sourceforge.net/project/scintilla/SciTE/$version/$…

1 0

ports/opt (3.1): stunnel: update to 5.15
by crux＠crux.nu 18 Apr '15

18 Apr '15

commit 72c065d999788e4caac113e8f6cfd7a4201abd2d Author: Juergen Daubert <jue(a)jue.li> Date: Sat Apr 18 09:47:39 2015 +0200 stunnel: update to 5.15 diff --git a/stunnel/.md5sum b/stunnel/.md5sum index bf4287d..ffbc509 100644 --- a/stunnel/.md5sum +++ b/stunnel/.md5sum @@ -1,3 +1,3 @@ -fd36d81539b5268afb99f51fdb090f95 stunnel -e716501960dc6856d80f92547298f724 stunnel-5.14.tar.gz -00bfe2db668d5558482238dbf796c2aa stunnel-config.patch +4d5387895f3a162d63a6ed76ebbafae8 stunnel +3a79787bdc898507224976606803d92a stunnel-5.15.tar.gz +16694d0e035fdd5e908ff42bc44ea805 stunnel.conf diff --git a/stunnel/Pkgfile b/stunnel/Pkgfile index d468fa2..c33fb77 100644 --- a/stunnel/Pkgfile +++ b/stunnel/Pkgfile @@ -4,16 +4,14 @@ # Depends on: openssl tcp_wrappers zlib name=stunnel -version=5.14 +version=5.15 release=1 source=(https://www.stunnel.org/downloads/$name-$version.tar.gz \ - $name-config.patch $name) + $name.conf $name) build () { cd $name-$version - patch -p1 -i $SRC/$name-config.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -25,10 +23,12 @@ build () { install -D -m 0755 src/stunnel $PKG/usr/sbin/stunnel install -D -m 0644 doc/stunnel.8 $PKG/usr/man/man8/stunnel.8 install -D -m 0755 $SRC/stunnel $PKG/etc/rc.d/stunnel - install -m 0644 tools/stunnel.conf-sample $PKG/etc/stunnel.conf + install -D -m 0644 $SRC/stunnel.conf $PKG/etc/stunnel.conf - install -d $PKG/{var/run,etc/ssl/{certs,keys}} + install -d $PKG/var/run install -d -m 770 -o stunnel -g stunnel $PKG/var/run/stunnel + + install -d $PKG/etc/ssl/{certs,keys} touch $PKG/etc/ssl/{certs/stunnel.crt,keys/stunnel.key} chmod 0600 $PKG/etc/ssl/keys/stunnel.key } diff --git a/stunnel/stunnel b/stunnel/stunnel index 30cf302..5ba6ec0 100644 --- a/stunnel/stunnel +++ b/stunnel/stunnel @@ -6,6 +6,7 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/stunnel PID=/var/run/stunnel/stunnel.pid +CFG=/etc/stunnel.conf CRT=/etc/ssl/certs/stunnel.crt KEY=/etc/ssl/keys/stunnel.key @@ -15,7 +16,7 @@ start) if [ ! -s $KEY -o ! -s $CRT ]; then /usr/bin/mksslcert $KEY $CRT fi - $SSD --start --pidfile $PID --exec $PROG + $SSD --start --pidfile $PID --exec $PROG -- $CFG ;; stop) $SSD --stop --retry 10 --pidfile $PID diff --git a/stunnel/stunnel-config.patch b/stunnel/stunnel-config.patch deleted file mode 100644 index b712e7e..0000000 --- a/stunnel/stunnel-config.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Nru stunnel-5.14.orig/src/Makefile.in stunnel-5.14/src/Makefile.in ---- stunnel-5.14.orig/src/Makefile.in 2015-03-26 11:18:09.430260236 +0100 -+++ stunnel-5.14/src/Makefile.in 2015-03-26 11:18:21.656486171 +0100 -@@ -387,7 +387,7 @@ - - # Additional preprocesor definitions - stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \ -- -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' -+ -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' - - # SSL library - stunnel_LDFLAGS = -L$(SSLDIR)/lib64 -L$(SSLDIR)/lib -lssl -lcrypto -diff -Nru stunnel-5.14.orig/tools/stunnel.conf-sample.in stunnel-5.14/tools/stunnel.conf-sample.in ---- stunnel-5.14.orig/tools/stunnel.conf-sample.in 2015-03-26 11:18:09.430260236 +0100 -+++ stunnel-5.14/tools/stunnel.conf-sample.in 2015-03-26 11:18:21.656486171 +0100 -@@ -10,25 +10,34 @@ - ; A copy of some devices and system files is needed within the chroot jail - ; Chroot conflicts with configuration file reload and many other features - ; Remember also to update the logrotate configuration. --;chroot = @prefix@/var/lib/stunnel/ -+chroot = /var/run/stunnel/ - ; Chroot jail can be escaped if setuid option is not used --;setuid = nobody --;setgid = @DEFAULT_GROUP@ -+setuid = stunnel -+setgid = stunnel - - ; PID file is created inside the chroot jail (if enabled) --;pid = @prefix@/var/run/stunnel.pid -+pid = /stunnel.pid - - ; Debugging stuff (may be useful for troubleshooting) - ;debug = 7 -+; logfile is created inside the chroot jail - ;output = stunnel.log -+; without chroot -+;output = /var/log/stunnel.log -+; log via syslog -+syslog =yes -+ -+; Enable or disable the use of libwrap -+libwrap = yes -+ - - ; ************************************************************************** - ; * Service defaults may also be specified in individual service sections * - ; ************************************************************************** - - ; Certificate/key is needed in server mode and optional in client mode --cert = @prefix@/etc/stunnel/mail.pem --;key = @prefix@/etc/stunnel/mail.pem -+cert = /etc/ssl/stunnel.crt -+key = /etc/ssl/stunnel.key - - ; Authentication stuff needs to be configured to prevent MITM attacks - ; It is not enabled by default! diff --git a/stunnel/stunnel.conf b/stunnel/stunnel.conf new file mode 100644 index 0000000..655f583 --- /dev/null +++ b/stunnel/stunnel.conf @@ -0,0 +1,16 @@ +; +; /etc/stunnel/stunnel.conf +; + +setuid = stunnel +setgid = stunnel + +chroot = /var/run/stunnel/ +pid = /stunnel.pid + +syslog = yes + +cert = /etc/ssl/certs/stunnel.crt +key = /etc/ssl/keys/stunnel.key + +; End of file

1 0

ports/xorg (3.1): xorg-server: update README to remove xorg-glamor-egl
by crux＠crux.nu 18 Apr '15

18 Apr '15

commit c5898bc32fba78fbdd55f62a9bd249a228237e73 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 18 10:54:31 2015 +1000 xorg-server: update README to remove xorg-glamor-egl diff --git a/xorg-server/README b/xorg-server/README index 67e2708..7f088fe 100644 --- a/xorg-server/README +++ b/xorg-server/README @@ -13,13 +13,14 @@ WARNING: PRE-INSTALL xorg-server 1.16 new dependency libepoxy + xorg-server 1.16 removed dependency xorg-glamor-egl xorg-server 1.17 new dependency xorg-xcb-util-keysyms xorg-server 1.17 removed dependency xorg-xf86-video-modesetting The current version of xorg-server needs these packages sorted out before a prt-get sysup from crux 3.1 release is done. -prt-get remove xorg-xf86-video-modesetting +prt-get remove xorg-xf86-video-modesetting xorg-glamor-egl prt-get depinst libepoxy xorg-xcb-util-keysyms POST-INSTALL

1 0

ports/xorg (3.1): xorg-server: update README to include details of new and removed dependencies
by crux＠crux.nu 18 Apr '15

18 Apr '15

commit c4122a226a5b9211a107e6fc8efa40ae226a0445 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Apr 18 10:08:51 2015 +1000 xorg-server: update README to include details of new and removed dependencies diff --git a/xorg-server/README b/xorg-server/README index 585a362..67e2708 100644 --- a/xorg-server/README +++ b/xorg-server/README @@ -10,6 +10,17 @@ WARNING: reisub +PRE-INSTALL + + xorg-server 1.16 new dependency libepoxy + xorg-server 1.17 new dependency xorg-xcb-util-keysyms + xorg-server 1.17 removed dependency xorg-xf86-video-modesetting + + The current version of xorg-server needs these packages sorted out before + a prt-get sysup from crux 3.1 release is done. + +prt-get remove xorg-xf86-video-modesetting +prt-get depinst libepoxy xorg-xcb-util-keysyms POST-INSTALL

1 0

ports/xorg (3.1): xorg-xmodmap: 1.0.8 -> 1.0.9
by crux＠crux.nu 17 Apr '15

17 Apr '15

commit b004e95280e1642f650fa55b2eaa26c61432cca5 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Apr 17 20:52:39 2015 +1000 xorg-xmodmap: 1.0.8 -> 1.0.9 diff --git a/xorg-xmodmap/.md5sum b/xorg-xmodmap/.md5sum index 07ba462..c3d810e 100644 --- a/xorg-xmodmap/.md5sum +++ b/xorg-xmodmap/.md5sum @@ -1 +1 @@ -5511da3361eea4eaa21427652c559e1c xmodmap-1.0.8.tar.bz2 +723f02d3a5f98450554556205f0a9497 xmodmap-1.0.9.tar.bz2 diff --git a/xorg-xmodmap/Pkgfile b/xorg-xmodmap/Pkgfile index 31c1232..2e79699 100644 --- a/xorg-xmodmap/Pkgfile +++ b/xorg-xmodmap/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-libx11 name=xorg-xmodmap -version=1.0.8 +version=1.0.9 release=1 source=(http://xorg.freedesktop.org/releases/individual/app/xmodmap-$versio…

1 0