Merge branch '3.0' into 3.1

This commit is contained in:
Juergen Daubert 2014-03-09 11:15:45 +01:00
commit 498dce2f4a
16 changed files with 30 additions and 29 deletions

View File

@ -1 +1 @@
6d000d9f68b7766dfe12c88c4aaaa293 dosfstools-3.0.25.tar.xz
45012f5f56f2aae3afcd62120b9e5a08 dosfstools-3.0.26.tar.xz

View File

@ -5,7 +5,7 @@
# Depends on:
name=dosfstools
version=3.0.25
version=3.0.26
release=1
source=(http://www.daniel-baumann.ch/files/software/$name/$name-$version.tar.xz)

View File

@ -1 +1 @@
11eb45f3d3edf1f03887fd13afc61b51 hplip-3.14.1.tar.gz
a0ae59a75d202b92738dc24610b98428 hplip-3.14.3.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: cups
name=hpcups
version=3.14.1
version=3.14.3
release=1
source=(http://downloads.sourceforge.net/project/hplip/hplip/$version/hplip-$version.tar.gz)

View File

@ -7,9 +7,9 @@ drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/mpg123.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libmpg123.la
lrwxrwxrwx root/root usr/lib/libmpg123.so -> libmpg123.so.0.39.1
lrwxrwxrwx root/root usr/lib/libmpg123.so.0 -> libmpg123.so.0.39.1
-rwxr-xr-x root/root usr/lib/libmpg123.so.0.39.1
lrwxrwxrwx root/root usr/lib/libmpg123.so -> libmpg123.so.0.40.1
lrwxrwxrwx root/root usr/lib/libmpg123.so.0 -> libmpg123.so.0.40.1
-rwxr-xr-x root/root usr/lib/libmpg123.so.0.40.1
drwxr-xr-x root/root usr/lib/mpg123/
-rwxr-xr-x root/root usr/lib/mpg123/output_alsa.la
-rwxr-xr-x root/root usr/lib/mpg123/output_alsa.so

View File

@ -1 +1 @@
229de769fdfc1c1de788280f141a7f69 mpg123-1.18.1.tar.bz2
87731f1437cfd8c50537a606d81130e4 mpg123-1.19.0.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: libtool, alsa-lib
name=mpg123
version=1.18.1
version=1.19.0
release=1
source=(http://www.mpg123.de/download/$name-$version.tar.bz2)

View File

@ -1 +1 @@
792ac0ffa30dc95ea1889a548128186d msmtp-1.4.31.tar.bz2
aa60e22211118f222470439cea60f795 msmtp-1.4.32.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: openssl
name=msmtp
version=1.4.31
version=1.4.32
release=1
source=(http://downloads.sourceforge.net/project/msmtp/msmtp/$version/$name-$version.tar.bz2)

View File

@ -1,3 +1,3 @@
20d8078911733e4de22903034e725db6 stunnel
ac4c4a30bd7a55b6687cbd62d864054c stunnel-4.56.tar.gz
b557cb1f0a946560481791c7a5aa8c6a stunnel-config.patch
4f00fd0faf99e3c9cf258a19dd83d14a stunnel-5.00.tar.gz
e7c5ad19e0c7268a571f3b1b95435fef stunnel-config.patch

View File

@ -4,9 +4,9 @@
# Depends on: openssl tcp_wrappers zlib
name=stunnel
version=4.56
version=5.00
release=1
source=(http://stunnel.cybermirror.org/archive/4.x/$name-$version.tar.gz \
source=(http://stunnel.cybermirror.org/archive/5.x/$name-$version.tar.gz \
$name-config.patch $name)
build () {
@ -26,6 +26,7 @@ build () {
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 $PKG/{var/run,etc/ssl/{certs,keys}}
install -d -m 770 -o stunnel -g stunnel $PKG/var/run/stunnel
touch $PKG/etc/ssl/{certs/stunnel.crt,keys/stunnel.key}

View File

@ -1,18 +1,18 @@
diff -Nru stunnel-4.50.orig/src/Makefile.in stunnel-4.50/src/Makefile.in
--- stunnel-4.50.orig/src/Makefile.in 2011-12-04 09:43:44.928367692 +0100
+++ stunnel-4.50/src/Makefile.in 2011-12-04 09:44:40.733021677 +0100
@@ -271,7 +271,7 @@
diff -Nru stunnel-5.00.orig/src/Makefile.in stunnel-5.00/src/Makefile.in
--- stunnel-5.00.orig/src/Makefile.in 2014-03-07 10:30:11.982768737 +0100
+++ stunnel-5.00/src/Makefile.in 2014-03-07 10:31:17.433779070 +0100
@@ -310,7 +310,7 @@
# Additional preprocesor definitions
stunnel_CPPFLAGS = -I/usr/kerberos/include -I$(SSLDIR)/include \
- -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"' \
+ -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"' \
-DPIDFILE='"$(localstatedir)/run/stunnel/stunnel.pid"'
- -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)/stunnel"'
+ -DLIBDIR='"$(pkglibdir)"' -DCONFDIR='"$(sysconfdir)"'
# Win32 executable
diff -Nru stunnel-4.50.orig/tools/stunnel.conf-sample.in stunnel-4.50/tools/stunnel.conf-sample.in
--- stunnel-4.50.orig/tools/stunnel.conf-sample.in 2011-12-04 09:43:44.931700905 +0100
+++ stunnel-4.50/tools/stunnel.conf-sample.in 2011-12-04 09:48:22.478352458 +0100
EXTRA_DIST = make.bat makece.bat makew32.bat mingw.mak evc.mak vc.mak \
diff -Nru stunnel-5.00.orig/tools/stunnel.conf-sample.in stunnel-5.00/tools/stunnel.conf-sample.in
--- stunnel-5.00.orig/tools/stunnel.conf-sample.in 2014-03-07 10:30:11.986101953 +0100
+++ stunnel-5.00/tools/stunnel.conf-sample.in 2014-03-07 10:30:40.365094717 +0100
@@ -9,25 +9,33 @@
; A copy of some devices and system files is needed within the chroot jail

View File

@ -1 +1 @@
20442f81dbb4e7c59462360ad0bb1afb sylpheed-3.3.0.tar.bz2
34551fa05722bac80bbe0688bb4a3341 sylpheed-3.3.1.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: gtk, openssl
name=sylpheed
version=3.3.0
version=3.3.1
release=1
source=(http://sylpheed.sraoss.jp/sylpheed/v3.3/$name-$version.tar.bz2)

View File

@ -1,2 +1,2 @@
2bc971a1753fe57aca05fde7c005a16c configure.diff
494e2f3988d22fe7266410c862042250 xterm-302.tgz
48f6d49b2b6b6933d501d767cbed9254 xterm-303.tgz

View File

@ -5,7 +5,7 @@
# Depends on: xorg-libxaw xorg-font-alias xorg-font-misc-misc
name=xterm
version=302
version=303
release=1
source=(ftp://invisible-island.net/$name/$name-$version.tgz \
configure.diff)