Merge branch '3.1' into 3.2

This commit is contained in:
Fredrik Rinnestam 2015-06-30 00:20:39 +02:00
commit f346ca53a4
28 changed files with 40 additions and 66 deletions

View File

@ -1,2 +1,2 @@
6ac0b4af2a1c70293588faf12a11b652 cups-browsed
7540a6989be0042429f41770b1cdf215 cups-browsed
5afe1bca041c905ec8861d1a6ffbc634 cups-filters-1.0.70.tar.xz

View File

@ -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)

View File

@ -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" ;;

View File

@ -1,2 +1,2 @@
513e13e2b2dd352dff0b58e6ae8bd586 dropbear
3b758db19554e494b0a1d69996fe5d29 dropbear
e967e320344cd4bfebe321e3ab8514d6 dropbear-2015.67.tar.bz2

View File

@ -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)

View File

@ -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" ;;

View File

@ -1 +1 @@
427e7fc3a84abf6964e70682d930f843 maildrop-2.8.2.tar.bz2
4e3b2b19b58a76581a486381e4444b5e maildrop-2.8.3.tar.bz2

View File

@ -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/$name-$version.tar.bz2)

View File

@ -1,2 +1,2 @@
af808bb35a4d7ed37dc895d5a13201b9 masqmail
62727ca2b322af33fbf5fdf34f033a99 masqmail
67bc223b0ae2e990a4255265f62cc1e4 masqmail-0.3.5.tar.gz

View File

@ -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)

View File

@ -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" ;;

View File

@ -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/

View File

@ -1,3 +1,3 @@
0bf963dec6788c90f82ab7b104b8f427 my.cnf
1622e62c80d128f1951a12c0125d3fb5 my.cnf
37664399c91021abe070faa700ecd0ed mysql-5.6.25.tar.gz
464c23eafb83d93f24d2a04415db2202 mysqld
5ce1297ee84c95df59260707f0ec44c3 mysqld

View File

@ -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
}

View File

@ -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

View File

@ -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

View File

@ -4,8 +4,8 @@ c5ccf58f5f9f57aba75c8b72219eb6e6 exports
1e2f3c1ed468dee02d00c534c002ea10 nfs-utils-1.3.2.tar.bz2
cdb5314516ef986b5283ee7dcc7d2278 nfsclient
794de0e76b5532fa68ac3ad57bd78856 nfsserver
c43297cce919319aeef70cfd25103850 rpc.idmapd
4d37ba8d95cc2acd5a9e1bd942b8e89b rpc.mountd
dfe1c59368b5846316ebcf3b32666c54 rpc.idmapd
ae09bd1df5f97d36b551c067d0f9261a rpc.mountd
abde0543c54fac9353cb22015fa7a898 rpc.nfsd
9c70fa34927bd6d7723e0a36253e0a52 rpc.statd
21d75587a1538b325bc9be0ecd9426a5 rpc.statd
b4c745cd305c718157af2f24eef21525 statd_foreground_mode.patch

View File

@ -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" ;;

View File

@ -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" ;;

View File

@ -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" ;;

View File

@ -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

View File

@ -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-$version.tar.gz \
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"

View File

@ -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

View File

@ -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 \

View File

@ -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

View File

@ -1 +1 @@
f76d28eadc4caaf6cdff00685ae6ad46 screen-4.3.0.tar.gz
5bb3b0ff2674e29378c31ad3411170ad screen-4.3.1.tar.gz

View File

@ -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)

View File

@ -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;