May 2016 - crux-commits - lists.crux.nu

ports/opt (3.2): thunderbird: updated to 45.1.1
by crux＠crux.nu 31 May '16

31 May '16

commit 9a1ccb0d47f217b9720b136f5d6d8fd1c619db81 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue May 31 19:07:04 2016 +0200 thunderbird: updated to 45.1.1 diff --git a/thunderbird/.md5sum b/thunderbird/.md5sum index 4167941..5aae8bc 100644 --- a/thunderbird/.md5sum +++ b/thunderbird/.md5sum @@ -1,3 +1,3 @@ -ffd8dcef63986c75e197a51f82f2a723 thunderbird-45.1.0.source.tar.xz +19e1a8eb1aa99927c35ea2fcfbd7f255 thunderbird-45.1.1.source.tar.xz 9a78c5c35311cc20425913c5598bf2b9 thunderbird-install-dir.patch 87f8666f06ba8c3668e39068050bb77a thunderbird.desktop diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile index 5b83d02..86aa2e8 100644 --- a/thunderbird/Pkgfile +++ b/thunderbird/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python,gtk,alsa-lib,xorg-libxt,libidl,nss,yasm,mesa3d,libjpeg-turbo name=thunderbird -version=45.1.0 +version=45.1.1 release=1 source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/source/$na… $name.desktop thunderbird-install-dir.patch)

1 0

ports/opt (3.2): gvim: update to 7.4.1859
by crux＠crux.nu 31 May '16

31 May '16

commit 59a737cce54e645098bdafa9c01db40eabf5ae5b Author: Juergen Daubert <jue(a)jue.li> Date: Tue May 31 17:41:33 2016 +0200 gvim: update to 7.4.1859 diff --git a/gvim/.md5sum b/gvim/.md5sum index 9e6fc2e..ad079c1 100644 --- a/gvim/.md5sum +++ b/gvim/.md5sum @@ -1,2 +1,2 @@ 8e16af6325c8f479717e1ce4121d5bf6 gvim.desktop -d42ec2fbe9e3e08d2c6b6f72901cde98 vim-7.4.1635.tar.xz +725d268efac80bfc9000c75d2e890c41 vim-7.4.1859.tar.xz diff --git a/gvim/Pkgfile b/gvim/Pkgfile index f58da20..d80cb67 100644 --- a/gvim/Pkgfile +++ b/gvim/Pkgfile @@ -4,7 +4,7 @@ # Depends on: vim, gtk, xorg-libxt name=gvim -version=7.4.1635 +version=7.4.1859 release=1 source=(http://crux.nu/files/distfiles/vim-$version.tar.xz gvim.desktop)

1 0

ports/core (3.2): vim: update to 7.4.1859
by crux＠crux.nu 31 May '16

31 May '16

commit b3233ef5581716da1223b3c99fb85d4acc58e362 Author: Juergen Daubert <jue(a)jue.li> Date: Tue May 31 17:40:43 2016 +0200 vim: update to 7.4.1859 diff --git a/vim/.footprint b/vim/.footprint index 34a3f32..9142010 100644 --- a/vim/.footprint +++ b/vim/.footprint @@ -278,6 +278,7 @@ drwxr-xr-x root/root usr/share/vim/doc/ -rw-r--r-- root/root usr/share/vim/doc/version5.txt -rw-r--r-- root/root usr/share/vim/doc/version6.txt -rw-r--r-- root/root usr/share/vim/doc/version7.txt +-rw-r--r-- root/root usr/share/vim/doc/version8.txt -rw-r--r-- root/root usr/share/vim/doc/vi_diff.txt -rwxr-xr-x root/root usr/share/vim/doc/vim2html.pl -rw-r--r-- root/root usr/share/vim/doc/visual.txt @@ -353,6 +354,7 @@ drwxr-xr-x root/root usr/share/vim/ftplugin/ -rw-r--r-- root/root usr/share/vim/ftplugin/go.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/groovy.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 @@ -615,10 +617,38 @@ drwxr-xr-x root/root usr/share/vim/indent/ -rw-r--r-- root/root usr/share/vim/menu.vim -rw-r--r-- root/root usr/share/vim/mswin.vim -rw-r--r-- root/root usr/share/vim/optwin.vim +drwxr-xr-x root/root usr/share/vim/pack/ +drwxr-xr-x root/root usr/share/vim/pack/dist/ +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/ +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/dvorak/ +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/dvorak/dvorak/ +-rw-r--r-- root/root usr/share/vim/pack/dist/opt/dvorak/dvorak/disable.vim +-rw-r--r-- root/root usr/share/vim/pack/dist/opt/dvorak/dvorak/enable.vim +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/dvorak/plugin/ +-rw-r--r-- root/root usr/share/vim/pack/dist/opt/dvorak/plugin/dvorak.vim +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/editexisting/ +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/editexisting/plugin/ +-rw-r--r-- root/root usr/share/vim/pack/dist/opt/editexisting/plugin/editexisting.vim +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/justify/ +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/justify/plugin/ +-rw-r--r-- root/root usr/share/vim/pack/dist/opt/justify/plugin/justify.vim +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/matchit/ +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/matchit/doc/ +-rw-r--r-- root/root usr/share/vim/pack/dist/opt/matchit/doc/matchit.txt +-rw-r--r-- root/root usr/share/vim/pack/dist/opt/matchit/doc/tags +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/matchit/plugin/ +-rw-r--r-- root/root usr/share/vim/pack/dist/opt/matchit/plugin/matchit.vim +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/shellmenu/ +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/shellmenu/plugin/ +-rw-r--r-- root/root usr/share/vim/pack/dist/opt/shellmenu/plugin/shellmenu.vim +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/swapmouse/ +drwxr-xr-x root/root usr/share/vim/pack/dist/opt/swapmouse/plugin/ +-rw-r--r-- root/root usr/share/vim/pack/dist/opt/swapmouse/plugin/swapmouse.vim drwxr-xr-x root/root usr/share/vim/plugin/ -rw-r--r-- root/root usr/share/vim/plugin/getscriptPlugin.vim -rw-r--r-- root/root usr/share/vim/plugin/gzip.vim -rw-r--r-- root/root usr/share/vim/plugin/logiPat.vim +-rw-r--r-- root/root usr/share/vim/plugin/manpager.vim -rw-r--r-- root/root usr/share/vim/plugin/matchparen.vim -rw-r--r-- root/root usr/share/vim/plugin/netrwPlugin.vim -rw-r--r-- root/root usr/share/vim/plugin/rrhelper.vim @@ -661,6 +691,7 @@ drwxr-xr-x root/root usr/share/vim/print/ -rw-r--r-- root/root usr/share/vim/print/latin1.ps -rw-r--r-- root/root usr/share/vim/print/mac-roman.ps -rw-r--r-- root/root usr/share/vim/print/prolog.ps +-rw-r--r-- root/root usr/share/vim/rgb.txt -rw-r--r-- root/root usr/share/vim/scripts.vim drwxr-xr-x root/root usr/share/vim/spell/ -rw-r--r-- root/root usr/share/vim/spell/check_locales.vim @@ -715,6 +746,7 @@ drwxr-xr-x root/root usr/share/vim/syntax/ -rw-r--r-- root/root usr/share/vim/syntax/autoit.vim -rw-r--r-- root/root usr/share/vim/syntax/automake.vim -rw-r--r-- root/root usr/share/vim/syntax/ave.vim +-rw-r--r-- root/root usr/share/vim/syntax/avra.vim -rw-r--r-- root/root usr/share/vim/syntax/awk.vim -rw-r--r-- root/root usr/share/vim/syntax/ayacc.vim -rw-r--r-- root/root usr/share/vim/syntax/b.vim diff --git a/vim/.md5sum b/vim/.md5sum index 1e9b3a5..03c4cc9 100644 --- a/vim/.md5sum +++ b/vim/.md5sum @@ -1 +1 @@ -d42ec2fbe9e3e08d2c6b6f72901cde98 vim-7.4.1635.tar.xz +725d268efac80bfc9000c75d2e890c41 vim-7.4.1859.tar.xz diff --git a/vim/Pkgfile b/vim/Pkgfile index 97f41a9..27802cc 100644 --- a/vim/Pkgfile +++ b/vim/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses acl name=vim -version=7.4.1635 +version=7.4.1859 release=1 source=(http://crux.nu/files/distfiles/$name-$version.tar.xz)

1 0

ports/core (3.2): make: update to 4.2
by crux＠crux.nu 31 May '16

31 May '16

commit aaee569b884a5039b2925fddf0056801c45bb203 Author: Juergen Daubert <jue(a)jue.li> Date: Tue May 31 14:15:09 2016 +0200 make: update to 4.2 diff --git a/make/.md5sum b/make/.md5sum index 5bb2d44..b67cac5 100644 --- a/make/.md5sum +++ b/make/.md5sum @@ -1 +1,2 @@ -57a7a224a822f94789a587ccbcedff69 make-4.1.tar.bz2 +5223072dd0e421f37eae76b6cb26e301 fix_parallel_build.patch +85ad14d08766201ffe71efa866f4fb91 make-4.2.tar.bz2 diff --git a/make/Pkgfile b/make/Pkgfile index aa1d62d..3c71965 100644 --- a/make/Pkgfile +++ b/make/Pkgfile @@ -3,12 +3,17 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=make -version=4.1 -release=2 -source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2) +version=4.2 +release=1 +source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2 + fix_parallel_build.patch) build() { cd $name-$version + + # http://thread.gmane.org/gmane.comp.gnu.make.bugs/8729 + patch -p1 -i $SRC/fix_parallel_build.patch + ./configure --prefix=/usr --disable-nls make make DESTDIR=$PKG install diff --git a/make/fix_parallel_build.patch b/make/fix_parallel_build.patch new file mode 100644 index 0000000..642bd42 --- /dev/null +++ b/make/fix_parallel_build.patch @@ -0,0 +1,164 @@ +From 4762480ae9cb8df4878286411f178d32db14eff0 Mon Sep 17 00:00:00 2001 +From: Paul Smith <psmith(a)gnu.org> +Date: Tue, 31 May 2016 06:56:51 +0000 +Subject: [SV 47995] Ensure forced double-colon rules work with -j. + +The fix for SV 44742 had a side-effect that some double-colon targets +were skipped. This happens because the "considered" facility assumed +that all targets would be visited on each walk through the dependency +graph: we used a bit for considered and toggled it on each pass; if +we didn't walk the entire graph on every pass the bit would get out +of sync. The new behavior after SV 44742 might return early without +walking the entire graph. To fix this I changed the considered value +to an integer which is monotonically increasing: it is then never +possible to incorrectly determine that a previous pass through the +graph already considered the current target. + +* filedef.h (struct file): make CONSIDERED an unsigned int. +* main.c (main): No longer need to reset CONSIDERED. +* remake.c (update_goal_chain): increment CONSIDERED rather than +inverting it between 0<->1. +(update_file_1): Reset CONSIDERED to 0 so it's re-considered. +(check_dep): Ditto. +* tests/scripts/features/double_colon: Add a regression test. +--- +diff --git a/filedef.h b/filedef.h +index 507a027..14b4187 100644 +--- a/filedef.h ++++ b/filedef.h +@@ -58,6 +58,8 @@ struct file + FILE_TIMESTAMP last_mtime; /* File's modtime, if already known. */ + FILE_TIMESTAMP mtime_before_update; /* File's modtime before any updating + has been performed. */ ++ unsigned int considered; /* equal to 'considered' if file has been ++ considered on current scan of goal chain */ + int command_flags; /* Flags OR'd in for cmds; see commands.h. */ + enum update_status /* Status of the last attempt to update. */ + { +@@ -96,8 +98,6 @@ struct file + unsigned int ignore_vpath:1;/* Nonzero if we threw out VPATH name. */ + unsigned int pat_searched:1;/* Nonzero if we already searched for + pattern-specific variables. */ +- unsigned int considered:1; /* equal to 'considered' if file has been +- considered on current scan of goal chain */ + unsigned int no_diag:1; /* True if the file failed to update and no + diagnostics has been issued (dontcare). */ + }; +diff --git a/main.c b/main.c +index 576f2e9..e606488 100644 +--- a/main.c ++++ b/main.c +@@ -2262,10 +2262,6 @@ main (int argc, char **argv, char **envp) + + for (i = 0, d = read_files; d != 0; ++i, d = d->next) + { +- /* Reset the considered flag; we may need to look at the file +- again to print an error. */ +- d->file->considered = 0; +- + if (d->file->updated) + { + /* This makefile was updated. */ +diff --git a/remake.c b/remake.c +index df1a9e0..5d5d67a 100644 +--- a/remake.c ++++ b/remake.c +@@ -57,8 +57,9 @@ unsigned int commands_started = 0; + static struct goaldep *goal_list; + static struct dep *goal_dep; + +-/* Current value for pruning the scan of the goal chain (toggle 0/1). */ +-static unsigned int considered; ++/* Current value for pruning the scan of the goal chain. ++ All files start with considered == 0. */ ++static unsigned int considered = 0; + + static enum update_status update_file (struct file *file, unsigned int depth); + static enum update_status update_file_1 (struct file *file, unsigned int depth); +@@ -90,12 +91,12 @@ update_goal_chain (struct goaldep *goaldeps) + + goal_list = rebuilding_makefiles ? goaldeps : NULL; + +- /* All files start with the considered bit 0, so the global value is 1. */ +- considered = 1; +- + #define MTIME(file) (rebuilding_makefiles ? file_mtime_no_search (file) \ + : file_mtime (file)) + ++ /* Start a fresh batch of consideration. */ ++ ++considered; ++ + /* Update all the goals until they are all finished. */ + + while (goals != 0) +@@ -247,10 +248,10 @@ update_goal_chain (struct goaldep *goaldeps) + } + } + +- /* If we reached the end of the dependency graph toggle the considered +- flag for the next pass. */ ++ /* If we reached the end of the dependency graph update CONSIDERED ++ for the next pass. */ + if (g == 0) +- considered = !considered; ++ ++considered; + } + + if (rebuilding_makefiles) +@@ -615,8 +616,8 @@ update_file_1 (struct file *file, unsigned int depth) + break; + + if (!running) +- /* The prereq is considered changed if the timestamp has changed while +- it was built, OR it doesn't exist. */ ++ /* The prereq is considered changed if the timestamp has changed ++ while it was built, OR it doesn't exist. */ + d->changed = ((file_mtime (d->file) != mtime) + || (mtime == NONEXISTENT_MTIME)); + +@@ -650,7 +651,7 @@ update_file_1 (struct file *file, unsigned int depth) + /* We may have already considered this file, when we didn't know + we'd need to update it. Force update_file() to consider it and + not prune it. */ +- d->file->considered = !considered; ++ d->file->considered = 0; + + new = update_file (d->file, depth); + if (new > dep_status) +@@ -1087,7 +1088,7 @@ check_dep (struct file *file, unsigned int depth, + /* If the target was waiting for a dependency it has to be + reconsidered, as that dependency might have finished. */ + if (file->command_state == cs_deps_running) +- file->considered = !considered; ++ file->considered = 0; + + set_command_state (file, cs_not_started); + } +diff --git a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon +index 80ddb31..58f126f 100644 +--- a/tests/scripts/features/double_colon ++++ b/tests/scripts/features/double_colon +@@ -197,6 +197,21 @@ all:: 3 + ', + '-rs -j2 1 2 root', "all_one\nall_two\nroot\n"); + ++# SV 47995 : Parallel double-colon rules with FORCE ++ ++run_make_test(' ++all:: ; @echo one ++ ++all:: joe ; @echo four ++ ++joe: FORCE ; touch joe-is-forced ++ ++FORCE: ++', ++ '-j5', "one\ntouch joe-is-forced\nfour\n"); ++ ++unlink('joe-is-forced'); ++ + # This tells the test driver that the perl test script executed properly. + 1; + +-- +cgit v0.9.0.2

1 0

ports/opt (3.2): alsa-plugins: 1.1.0 -> 1.1.1
by crux＠crux.nu 31 May '16

31 May '16

commit d2e371ddb0bfcbc330a2232a0ae54fafbb9d9843 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue May 31 20:45:13 2016 +1000 alsa-plugins: 1.1.0 -> 1.1.1 diff --git a/alsa-plugins/.md5sum b/alsa-plugins/.md5sum index dcb543d..7dd4a91 100644 --- a/alsa-plugins/.md5sum +++ b/alsa-plugins/.md5sum @@ -1 +1 @@ -b123e42ed881b9adbc99e4040f257c39 alsa-plugins-1.1.0.tar.bz2 +69f9f3e2de3c97fc71d496e91e271fe5 alsa-plugins-1.1.1.tar.bz2 diff --git a/alsa-plugins/Pkgfile b/alsa-plugins/Pkgfile index 4b860b4..fe7cacc 100644 --- a/alsa-plugins/Pkgfile +++ b/alsa-plugins/Pkgfile @@ -3,10 +3,10 @@ # Maintainer: Danny Rawlins, crux at romster dot me # Packager: Vitaly Sinilin, vs at kp4 dot ru # Depends on: alsa-lib -# Nice to have: ffmpeg speex jack libsamplerate +# Optional: ffmpeg speex jack libsamplerate name=alsa-plugins -version=1.1.0 +version=1.1.1 release=1 source=(ftp://ftp.alsa-project.org/pub/plugins/$name-$version.tar.bz2)

1 0

ports/contrib (3.2): docker: cleaned up, added docker.conf
by crux＠crux.nu 31 May '16

31 May '16

commit d5bc156b9df421a306d11b7f8366024bb458814b Author: Matt Housh <jaeger(a)crux.ninja> Date: Mon May 30 23:13:03 2016 -0500 docker: cleaned up, added docker.conf diff --git a/docker/.footprint b/docker/.footprint index 3b6c48d..ec6239d 100644 --- a/docker/.footprint +++ b/docker/.footprint @@ -1,6 +1,7 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/bash_completion.d/ -rw-r--r-- root/root etc/bash_completion.d/docker +-rw-r--r-- root/root etc/docker.conf drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/docker drwxr-xr-x root/root etc/udev/ diff --git a/docker/.md5sum b/docker/.md5sum index 7b914c5..36f8b0e 100644 --- a/docker/.md5sum +++ b/docker/.md5sum @@ -1,3 +1,4 @@ 2767e2b5098dbf330b1fc08e2105207d docker-1.11.1.tar.xz 8c86c300b3e70144c10797deddf10911 docker-man-pages-1.11.1.tar.xz -fc6ebe7d940298fc737ddb662bcd4219 docker.rc +639d3af72199001bb612e545335a67a3 docker.conf +a5958065f57184ef580fdf3a76d58a07 docker.rc diff --git a/docker/Pkgfile b/docker/Pkgfile index 02e5ae5..5163afd 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -5,10 +5,10 @@ name=docker version=1.11.1 -release=3 +release=4 source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.xz \ http://jaeger.morpheus.net/linux/crux/files/$name-man-pages-$version.tar.xz \ - $name.rc) + $name.rc $name.conf) build() { export AUTO_GOPATH=1 @@ -26,6 +26,8 @@ build() { install -D -m 0755 $SRC/$name.rc \ $PKG/etc/rc.d/$name + install -D -m 0644 $SRC/$name.conf \ + $PKG/etc/$name.conf ln -s containerd $PKG/usr/bin/docker-containerd ln -s containerd-shim $PKG/usr/bin/docker-containerd-shim diff --git a/docker/UPGRADE b/docker/UPGRADE deleted file mode 100644 index 8c608af..0000000 --- a/docker/UPGRADE +++ /dev/null @@ -1,8 +0,0 @@ -Upgrade Notes for Docker 1.6.0 -============================== - -Docker 1.6.0 introduced several new features. - -.. see:: https://blog.docker.com/2015/04/docker-release-1-6/ - -No kernel changes required. diff --git a/docker/docker b/docker/docker deleted file mode 100755 index dc68e3e..0000000 --- a/docker/docker +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/docker: start/stop docker daemon -# - -SSD=/sbin/start-stop-daemon -PROG=/usr/bin/docker -PIDFILE=/var/run/docker.pid -LOGFILE=/var/log/docker.log - -. /etc/docker.conf - -case $1 in -start) - # Ensure ownership and permissiong of log file. - touch $LOGFILE - chgrp docker $LOGFILE - chown 640 $LOGFILE - - # Ensure cgroups is properly mounted. - cgroupfs-mount - - $SSD --start --background --make-pidfile --pidfile $PIDFILE --exec $PROG -- daemon $OPTS >> $LOGFILE 2>&1 - ;; -stop) - $SSD --stop --retry 10 --pidfile $PIDFILE - - # Unmount cgroups is - cgroupfs-umount - ;; -restart) - $0 stop - 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|reload|status]" - ;; -esac - -# End of file diff --git a/docker/docker.conf b/docker/docker.conf index 40d5691..729a803 100644 --- a/docker/docker.conf +++ b/docker/docker.conf @@ -2,6 +2,4 @@ # # For configuration options see: docker daemon --help -OPTS="" - -# vim: syntax=sh +OPTS="-p /var/run/docker.pid -G docker" diff --git a/docker/docker.rc b/docker/docker.rc index 5aa23e1..e52f09d 100755 --- a/docker/docker.rc +++ b/docker/docker.rc @@ -6,12 +6,28 @@ SSD=/sbin/start-stop-daemon PROG=/usr/bin/docker PID=/var/run/docker.pid -OPTS="-p $PID -G docker" +CONF=/etc/docker.conf +LOG=/var/log/docker.log + +if [ -f $CONF ]; then + . $CONF +else + if [ -z $OPTS ]; then + OPTS="-p $PID -G docker" + fi +fi case $1 in start) + if [ ! -f $LOG ]; then + touch $LOG + chgrp docker $LOG + chmod 640 $LOG + fi + /usr/bin/cgroupfs-mount - $SSD --start --pidfile $PID --background --exec $PROG -- daemon $OPTS + + $SSD --start --pidfile $PID --background --exec $PROG -- daemon $OPTS >> $LOG 2>&1 ;; stop) $SSD --stop --retry 10 --pidfile $PID diff --git a/docker/post-install b/docker/post-install deleted file mode 100755 index 1f205cf..0000000 --- a/docker/post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# create docker group -getent group docker > /dev/null || groupadd -g 142 docker

1 0

ports/contrib (3.2): libmpdclient: clean configure flags
by crux＠crux.nu 30 May '16

30 May '16

commit 183d2c10119477e18fd72c8b777c6eb273ad595c Author: Thomas Penteker <tek(a)serverop.de> Date: Tue May 31 00:59:19 2016 +0200 libmpdclient: clean configure flags diff --git a/libmpdclient/Pkgfile b/libmpdclient/Pkgfile index b49edbc..1c706c5 100644 --- a/libmpdclient/Pkgfile +++ b/libmpdclient/Pkgfile @@ -10,10 +10,7 @@ source=(http://www.musicpd.org/download/libmpdclient/2/libmpdclient-$versio… build() { cd $name-$version - ./configure \ - --prefix=/usr \ - --mandir=/usr/man \ - --disable-documentation + ./configure --prefix=/usr --disable-documentation make make DESTDIR=$PKG install

1 0

ports/contrib (3.2): mpc: move man pages
by crux＠crux.nu 30 May '16

30 May '16

commit e8c17ae61bbab37762ec76a03dfa0c026a6d1f12 Author: Thomas Penteker <tek(a)serverop.de> Date: Tue May 31 01:18:26 2016 +0200 mpc: move man pages diff --git a/mpc/.footprint b/mpc/.footprint index c8235b2..89cf076 100644 --- a/mpc/.footprint +++ b/mpc/.footprint @@ -1,6 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/mpc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/mpc.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/mpc.1.gz diff --git a/mpc/Pkgfile b/mpc/Pkgfile index 4070344..9366089 100644 --- a/mpc/Pkgfile +++ b/mpc/Pkgfile @@ -12,11 +12,10 @@ source=(http://www.musicpd.org/download/mpc/0/mpc-$version.tar.xz) build() { cd $name-$version - ./configure \ - --prefix=/usr \ - --mandir=/usr/man + ./configure --prefix=/usr --mandir=/usr/share/man + make make DESTDIR=$PKG install - rm -rf $PKG/usr/share + rm -rf $PKG/usr/share/doc }

1 0

ports/contrib (3.2): xlockmore: 5.46 -> 5.47
by crux＠crux.nu 30 May '16

30 May '16

commit bba343d28774a7fa9219a87e04ddea4e92d03ac2 Author: Thomas Penteker <tek(a)serverop.de> Date: Tue May 31 00:25:09 2016 +0200 xlockmore: 5.46 -> 5.47 diff --git a/xlockmore/.md5sum b/xlockmore/.md5sum index e067da8..0dae23e 100644 --- a/xlockmore/.md5sum +++ b/xlockmore/.md5sum @@ -1 +1 @@ -068b9c2bfbcdd02461edbac4d729cd27 xlockmore-5.46.tar.xz +d059df32d1673ce5a434a98a49606f3b xlockmore-5.47.tar.xz diff --git a/xlockmore/Pkgfile b/xlockmore/Pkgfile index 9b81333..a9fb194 100644 --- a/xlockmore/Pkgfile +++ b/xlockmore/Pkgfile @@ -5,7 +5,7 @@ # Depends on: gtk, fortune name=xlockmore -version=5.46 +version=5.47 release=1 source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$version.tar.xz) @@ -13,8 +13,7 @@ build(){ cd $name-$version ./configure --prefix=/usr --enable-vtlock --enable-syslog \ --enable-multiple-user --enable-multiple-root \ - --disable-magick --without-motif --with-opengl \ - --without-esound + --without-motif --with-opengl --without-esound make make prefix=$PKG/usr xapploaddir=$PKG/etc/X11/app-defaults install if [ -d $PKG/usr/lib ]; then

1 0

ports/contrib (3.2): libreoffice: 5.1.2 -> 5.1.3
by crux＠crux.nu 30 May '16

30 May '16

commit 37ee49b27555ebaa53c06f5482f57954ffe25141 Author: Thomas Penteker <tek(a)serverop.de> Date: Tue May 31 00:26:58 2016 +0200 libreoffice: 5.1.2 -> 5.1.3 diff --git a/libreoffice/.md5sum b/libreoffice/.md5sum index 3dbb3e2..9f2c189 100644 --- a/libreoffice/.md5sum +++ b/libreoffice/.md5sum @@ -1 +1 @@ -63de4fc4cf42594721ad4aa1e980849a LibreOffice_5.1.2_Linux_x86-64_rpm.tar.gz +227cba27a9f8ea29cea99e73b5b7e567 LibreOffice_5.1.3_Linux_x86-64_rpm.tar.gz diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index 9fa84f3..edad9c3 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -5,7 +5,7 @@ # Depends on: mesa3d cups xorg-libxaw xorg-libxcursor xorg-libxft xorg-libxinerama xorg-libxi xorg-libxrandr dbus-glib krb5 glu name=libreoffice -version=5.1.2 +version=5.1.3 release=1 source=(http://download.documentfoundation.org/$name/stable/$version/rpm/x8…

1 0