June 2015 - crux-commits

ports/opt (3.2): masqmail: show pid in the status message of the rc script
by crux＠crux.nu 29 Jun '15

29 Jun '15

commit b777188f35d7c31da232af6b22b6dd70d95df6c0 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 29 17:08:38 2015 +0200 masqmail: show pid in the status message of the rc script diff --git a/masqmail/.md5sum b/masqmail/.md5sum index efd767c..c25fb27 100644 --- a/masqmail/.md5sum +++ b/masqmail/.md5sum @@ -1,2 +1,2 @@ -af808bb35a4d7ed37dc895d5a13201b9 masqmail +62727ca2b322af33fbf5fdf34f033a99 masqmail 67bc223b0ae2e990a4255265f62cc1e4 masqmail-0.3.5.tar.gz diff --git a/masqmail/Pkgfile b/masqmail/Pkgfile index d9d3bf1..f4c5b99 100644 --- a/masqmail/Pkgfile +++ b/masqmail/Pkgfile @@ -5,7 +5,7 @@ name=masqmail version=0.3.5 -release=2 +release=3 source=(http://marmaro.de/prog/masqmail/files/$name-$version.tar.gz masqmail) diff --git a/masqmail/masqmail b/masqmail/masqmail index af5262e..31d62e6 100644 --- a/masqmail/masqmail +++ b/masqmail/masqmail @@ -22,7 +22,7 @@ restart) status) $SSD --status --pidfile $PID case $? in - 0) echo "$PROG is running" ;; + 0) echo "$PROG is running with pid $(cat $PID)" ;; 1) echo "$PROG is not running but the pid file $PID exists" ;; 3) echo "$PROG is not running" ;; 4) echo "Unable to determine the program status" ;;

1 0

ports/opt (3.2): dropbear: show pid in the status message of the rc script
by crux＠crux.nu 29 Jun '15

29 Jun '15

commit 621ff463b53e6c04b90d4534f1f594789f8d32d4 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 29 17:08:22 2015 +0200 dropbear: show pid in the status message of the rc script diff --git a/dropbear/.md5sum b/dropbear/.md5sum index 9f39d2d..4d36bcb 100644 --- a/dropbear/.md5sum +++ b/dropbear/.md5sum @@ -1,2 +1,2 @@ -513e13e2b2dd352dff0b58e6ae8bd586 dropbear +3b758db19554e494b0a1d69996fe5d29 dropbear e967e320344cd4bfebe321e3ab8514d6 dropbear-2015.67.tar.bz2 diff --git a/dropbear/Pkgfile b/dropbear/Pkgfile index f7bc976..52cb7a5 100644 --- a/dropbear/Pkgfile +++ b/dropbear/Pkgfile @@ -5,7 +5,7 @@ name=dropbear version=2015.67 -release=2 +release=3 source=(http://matt.ucc.asn.au/$name/releases/$name-$version.tar.bz2 \ $name) diff --git a/dropbear/dropbear b/dropbear/dropbear index c2a6c17..20f6b22 100644 --- a/dropbear/dropbear +++ b/dropbear/dropbear @@ -53,7 +53,7 @@ restart) status) $SSD --status --pidfile $PID case $? in - 0) echo "$PROG is running" ;; + 0) echo "$PROG is running with pid $(cat $PID)" ;; 1) echo "$PROG is not running but the pid file $PID exists" ;; 3) echo "$PROG is not running" ;; 4) echo "Unable to determine the program status" ;;

1 0

ports/opt (3.2): cups-filters: show pid in the status message of the cups-browsed rc script
by crux＠crux.nu 29 Jun '15

29 Jun '15

commit 9088d177b479e503e4ea4fce484307e48e44b37e Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 29 17:03:46 2015 +0200 cups-filters: show pid in the status message of the cups-browsed rc script diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index bc0ebb1..74c909d 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1,2 @@ -6ac0b4af2a1c70293588faf12a11b652 cups-browsed +7540a6989be0042429f41770b1cdf215 cups-browsed 5afe1bca041c905ec8861d1a6ffbc634 cups-filters-1.0.70.tar.xz diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 1524358..b261d23 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -5,7 +5,7 @@ name=cups-filters version=1.0.70 -release=1 +release=2 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz cups-browsed) diff --git a/cups-filters/cups-browsed b/cups-filters/cups-browsed index 22cd950..ee541ec 100755 --- a/cups-filters/cups-browsed +++ b/cups-filters/cups-browsed @@ -21,7 +21,7 @@ restart) status) $SSD --status --pidfile $PID case $? in - 0) echo "$PROG is running" ;; + 0) echo "$PROG is running with pid $(cat $PID)" ;; 1) echo "$PROG is not running but the pid file $PID exists" ;; 3) echo "$PROG is not running" ;; 4) echo "Unable to determine the program status" ;;

1 0

ports/opt (3.2): pure-ftpd: upstream fixed a bug without increasing the version number
by crux＠crux.nu 29 Jun '15

29 Jun '15

commit d59bbf78bbfd1fd7bc10ced1103a077e69085d65 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 29 16:41:58 2015 +0200 pure-ftpd: upstream fixed a bug without increasing the version number diff --git a/pure-ftpd/.md5sum b/pure-ftpd/.md5sum index 566166f..6dc3a39 100644 --- a/pure-ftpd/.md5sum +++ b/pure-ftpd/.md5sum @@ -1,3 +1,3 @@ 3698dc9fced3c059e3acd0497bda6b1a pure-ftpd -8a8e0d3e7a2ce99607e4ef0a969e5a14 pure-ftpd-1.0.41.tar.bz2 +76c2364591418f153ed815034621d058 pure-ftpd-1.0.41.tar.bz2 91e56b81f8f77c8b9d81d455817b1892 pure-ftpd.conf diff --git a/pure-ftpd/Pkgfile b/pure-ftpd/Pkgfile index 66033f7..ebe8f3f 100644 --- a/pure-ftpd/Pkgfile +++ b/pure-ftpd/Pkgfile @@ -5,15 +5,13 @@ name=pure-ftpd version=1.0.41 -release=1 +release=2 source=(http://download.pureftpd.org/$name/releases/$name-$version.tar.bz2 \ pure-ftpd pure-ftpd.conf) build () { cd $name-$version - sed -i 's/TLS_CERTIFICATE_FILE/DEFAULT_CERT_FILE/' configure - ./configure --prefix=/usr \ --mandir=/usr/man \ --with-certfile=/etc/ssl/certs/pure-ftpd.pem \

1 0

ports/opt (3.2): [notify] mysql: minor structural changes
by crux＠crux.nu 29 Jun '15

29 Jun '15

commit 0bbce585ca8b0171598a330fa5be5b75491a652e Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 29 15:35:17 2015 +0200 [notify] mysql: minor structural changes - location of pid-file changed from /var/run to directory /var/run/mysql which is owned by mysql:mysql - added new directoy /var/log/mysql owned by mysql:mysql which can be used to log queries - logging of queries is now longer enabled in /etc/my.cnf - error messages are logged to /var/log/mysqld.log Note: rejmerge /etc/my.conf to avoid problems due to the above changes diff --git a/mysql/.footprint b/mysql/.footprint index 14b1840..be38058 100644 --- a/mysql/.footprint +++ b/mysql/.footprint @@ -254,4 +254,6 @@ drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ drwx------ mysql/mysql var/lib/mysql/ drwxr-xr-x root/root var/log/ --rw------- mysql/mysql var/log/mysqld.log (EMPTY) +drwx------ mysql/mysql var/log/mysql/ +drwxr-xr-x root/root var/run/ +drwx------ mysql/mysql var/run/mysql/ diff --git a/mysql/.md5sum b/mysql/.md5sum index e37688b..c8ce7b7 100644 --- a/mysql/.md5sum +++ b/mysql/.md5sum @@ -1,3 +1,3 @@ -0bf963dec6788c90f82ab7b104b8f427 my.cnf +1622e62c80d128f1951a12c0125d3fb5 my.cnf 37664399c91021abe070faa700ecd0ed mysql-5.6.25.tar.gz -464c23eafb83d93f24d2a04415db2202 mysqld +5ce1297ee84c95df59260707f0ec44c3 mysqld diff --git a/mysql/Pkgfile b/mysql/Pkgfile index 2d1dd03..2ef4f0e 100644 --- a/mysql/Pkgfile +++ b/mysql/Pkgfile @@ -5,7 +5,7 @@ name=mysql version=5.6.25 -release=1 +release=2 source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.6/$name-$version.tar.gz \ my.cnf mysqld) @@ -34,10 +34,7 @@ build () { rm $PKG/usr/share/mysql/charsets/README find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \; - install -d $PKG/var/{lib,log} - touch mysqld.log - install -m 600 -o mysql -g mysql mysqld.log $PKG/var/log - install -d -m 700 -o mysql -g mysql $PKG/var/lib/mysql + install -d -m 700 -o mysql -g mysql $PKG/var/{lib,log,run}/mysql install -D -m 755 $SRC/mysqld $PKG/etc/rc.d/mysqld install -m 600 $SRC/my.cnf $PKG/etc } diff --git a/mysql/my.cnf b/mysql/my.cnf index db6f0d3..e8854b5 100644 --- a/mysql/my.cnf +++ b/mysql/my.cnf @@ -5,11 +5,11 @@ [mysqld] datadir = /var/lib/mysql user = mysql -pid-file = /var/run/mysqld.pid +pid-file = /var/run/mysql/mysqld.pid socket = /tmp/mysql.sock port = 3306 -general_log = 1 -general_log_file = /var/log/mysqld.log +#general_log = 1 +#general_log_file = /var/log/mysql/general.log skip-networking skip-innodb diff --git a/mysql/mysqld b/mysql/mysqld index eb9b74e..8df06b2 100644 --- a/mysql/mysqld +++ b/mysql/mysqld @@ -6,13 +6,12 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/mysqld MYSQL_CFG=/etc/my.cnf -PID=$(sed -n 's/^pid-file[ \t]*=[ \t]*//p' $MYSQL_CFG) -USR=$(sed -n 's/^user[ \t]*=[ \t]*//p' $MYSQL_CFG) +PID=/var/run/mysql/mysqld.pid +LOG=/var/log/mysqld.log case $1 in start) - touch $PID && chown $USR:$USR $PID - $SSD --start --background --pidfile $PID --exec $PROG + $SSD --start -bC --pidfile $PID --exec $PROG >> $LOG 2>&1 ;; stop) $SSD --stop --remove-pidfile --retry 10 --pidfile $PID

1 0

ports/opt (3.2): maildrop: update to 2.8.3
by crux＠crux.nu 29 Jun '15

29 Jun '15

commit b2a438000bfc8301d89cd74c2db58dfee318cbb1 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 29 15:34:08 2015 +0200 maildrop: update to 2.8.3 diff --git a/maildrop/.md5sum b/maildrop/.md5sum index d22c8f8..22d7525 100644 --- a/maildrop/.md5sum +++ b/maildrop/.md5sum @@ -1 +1 @@ -427e7fc3a84abf6964e70682d930f843 maildrop-2.8.2.tar.bz2 +4e3b2b19b58a76581a486381e4444b5e maildrop-2.8.3.tar.bz2 diff --git a/maildrop/Pkgfile b/maildrop/Pkgfile index d2990a2..213133c 100644 --- a/maildrop/Pkgfile +++ b/maildrop/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gdbm libpcre courier-unicode name=maildrop -version=2.8.2 +version=2.8.3 release=1 source=(http://download.sourceforge.net/project/courier/$name/$version/$nam…

1 0

ports/opt (3.2): screen: update to 4.3.1
by crux＠crux.nu 29 Jun '15

29 Jun '15

commit 95b5c3b51a858f06fb478e64867da8938ae9fe16 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 29 08:35:27 2015 +0200 screen: update to 4.3.1 diff --git a/screen/.footprint b/screen/.footprint index 587f8e7..83457ec 100644 --- a/screen/.footprint +++ b/screen/.footprint @@ -1,7 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -lrwxrwxrwx root/root usr/bin/screen -> screen-4.3.0 --rwxr-xr-x root/root usr/bin/screen-4.3.0 +lrwxrwxrwx root/root usr/bin/screen -> screen-4.3.1 +-rwxr-xr-x root/root usr/bin/screen-4.3.1 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/screen.1.gz diff --git a/screen/.md5sum b/screen/.md5sum index e2d523c..aaeb383 100644 --- a/screen/.md5sum +++ b/screen/.md5sum @@ -1 +1 @@ -f76d28eadc4caaf6cdff00685ae6ad46 screen-4.3.0.tar.gz +5bb3b0ff2674e29378c31ad3411170ad screen-4.3.1.tar.gz diff --git a/screen/Pkgfile b/screen/Pkgfile index e036c86..7904e96 100644 --- a/screen/Pkgfile +++ b/screen/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses name=screen -version=4.3.0 +version=4.3.1 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz) diff --git a/screen/screen-extend_term_string.patch b/screen/screen-extend_term_string.patch deleted file mode 100644 index 8123e40..0000000 --- a/screen/screen-extend_term_string.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h ---- screen-4.0.3-orig//display.h 2003-07-02 00:01:42.000000000 +1000 -+++ screen-4.0.3/display.h 2010-12-03 20:19:23.826671689 +1000 -@@ -85,7 +85,7 @@ - struct win *d_other; /* pointer to other window */ - int d_nonblock; /* -1 don't block if obufmax reached */ - /* >0: block after nonblock secs */ -- char d_termname[20 + 1]; /* $TERM */ -+ char d_termname[40 + 1]; /* $TERM */ - char *d_tentry; /* buffer for tgetstr */ - char d_tcinited; /* termcap inited flag */ - int d_width, d_height; /* width/height of the screen */ -diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h ---- screen-4.0.3-orig//screen.h 2003-08-22 22:28:43.000000000 +1000 -+++ screen-4.0.3/screen.h 2010-12-03 20:19:43.163338333 +1000 -@@ -202,7 +202,7 @@ - char preselect[20]; - int esc; /* his new escape character unless -1 */ - int meta_esc; /* his new meta esc character unless -1 */ -- char envterm[20 + 1]; /* terminal type */ -+ char envterm[40 + 1]; /* terminal type */ - int encoding; /* encoding of display */ - } - attach; -

1 0

ports/opt (3.2): postfix: 2.11.4 -> 2.11.5
by crux＠crux.nu 29 Jun '15

29 Jun '15

commit 688a4864b60c4b207cff5982a52274a9ca6c0157 Author: Thomas Penteker <tek(a)serverop.de> Date: Sun Jun 28 22:17:19 2015 +0200 postfix: 2.11.4 -> 2.11.5 diff --git a/postfix/.md5sum b/postfix/.md5sum index 1e79f81..e3d8cc3 100644 --- a/postfix/.md5sum +++ b/postfix/.md5sum @@ -1,4 +1,4 @@ be543b65525f544386a2d8395ea19cdf aliases -7f1f67b205992f3e8acc98d597a4deef postfix-2.11.4.tar.gz +8523f6d1de6f522313207524d794ee9c postfix-2.11.5.tar.gz 8bee559587e2ccbaf0aadd88b6ca339a postfix.patch d18be5c17604f9c712a28339ff0f61cb postfix.rc diff --git a/postfix/Pkgfile b/postfix/Pkgfile index 786c9fb..aa86f29 100644 --- a/postfix/Pkgfile +++ b/postfix/Pkgfile @@ -5,7 +5,7 @@ # Depends on: cyrus-sasl name=postfix -version=2.11.4 +version=2.11.5 release=1 source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/$name-$ver… \ aliases postfix.rc postfix.patch) @@ -14,6 +14,9 @@ build() { cd $name-$version patch -p1 < $SRC/postfix.patch + + # enable building on 4.x kernels + sed -i 's:$Linux.3\*$):\1|Linux.4*):1' makedefs _CCARGS="$CCARGS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -DUSE_TLS -I/usr/include/openssl" _AUXLIBS="-L/usr/lib -lsasl2 -lssl -lcrypto"

1 0

ports/core (3.2): iproute2: update to 4.1.0
by crux＠crux.nu 29 Jun '15

29 Jun '15

commit 9513121c03036076f40dee16e46ce6cba42a71a7 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jun 29 13:27:42 2015 +0200 iproute2: update to 4.1.0 diff --git a/iproute2/.footprint b/iproute2/.footprint index 404b8a5..94e9565 100644 --- a/iproute2/.footprint +++ b/iproute2/.footprint @@ -76,6 +76,7 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/rtstat.8.gz -rw-r--r-- root/root usr/man/man8/ss.8.gz -rw-r--r-- root/root usr/man/man8/tc-bfifo.8.gz +-rw-r--r-- root/root usr/man/man8/tc-bpf.8.gz -rw-r--r-- root/root usr/man/man8/tc-cbq-details.8.gz -rw-r--r-- root/root usr/man/man8/tc-cbq.8.gz -rw-r--r-- root/root usr/man/man8/tc-choke.8.gz diff --git a/iproute2/.md5sum b/iproute2/.md5sum index ae16b11..01f7a77 100644 --- a/iproute2/.md5sum +++ b/iproute2/.md5sum @@ -1,3 +1,3 @@ -3adc263ade4ee76c35032e8f50b54108 iproute2-4.0.0.tar.xz +37efb479b3943b60c449ea02362b5ffc iproute2-4.1.0.tar.xz 7b469125cfe2d9916ba03f7c65b9dcd5 lo.iproute2 826848debe693f2e2a3e235ce9abe601 net.iproute2 diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile index 64777ba..f218a37 100644 --- a/iproute2/Pkgfile +++ b/iproute2/Pkgfile @@ -4,16 +4,22 @@ # Depends on: db iptables name=iproute2 -version=4.0.0 +version=4.1.0 release=1 source=(https://www.kernel.org/pub/linux/utils/net/$name/$name-$version.tar… \ lo.iproute2 net.iproute2) build() { cd $name-$version + + # tipc depends on libmnl + rm -r tipc + sed -i '/^SUBDIRS/s/tipc//' Makefile + ./configure make CCOPTS="$CFLAGS" make MANDIR=/usr/man DESTDIR=$PKG install + rm -r $PKG/usr/share install -D -m 0755 $SRC/lo.iproute2 $PKG/etc/rc.d/lo install -D -m 0755 $SRC/net.iproute2 $PKG/etc/rc.d/net

1 0

ports/core (3.2): Merge branch '3.1' into 3.2
by crux＠crux.nu 29 Jun '15

29 Jun '15

commit 8435b24c232c0e4d60e449a1e75ac43facb467e0 Merge: cd5366c 9513121 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Jun 30 00:19:50 2015 +0200 Merge branch '3.1' into 3.2

1 0