Merge branch '2.5' into 2.6

Conflicts:
	xz/.footprint
	xz/.md5sum
	xz/Pkgfile
This commit is contained in:
Juergen Daubert 2009-08-14 11:59:59 +02:00
commit 2fbdc2d025
13 changed files with 2804 additions and 2803 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
299c445e4b14bfbb2a05323734d89c0c jdk-6u14-dlj-linux-i586.bin
0192217f85f084f2d1a23ce9b4457786 jdk-6u15-dlj-linux-i586.bin

View File

@ -4,9 +4,9 @@
# Packager: Simone Rota, sip at crux dot nu
name=jdk
version=1.6.0_14
version=1.6.0_15
release=1
source=(http://download.java.net/dlj/binaries/jdk-6u14-dlj-linux-i586.bin)
source=(http://download.java.net/dlj/binaries/jdk-6u15-dlj-linux-i586.bin)
build(){
mkdir -p $PKG/usr/lib; cd $PKG/usr/lib

View File

@ -1 +1 @@
8bf7637ac99368db0890e3f085fa690d subversion-1.6.3.tar.bz2
11e3fa838c9a558cadc378f2807572e2 subversion-1.6.4.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: subversion apache
name=mod_svn
version=1.6.3
version=1.6.4
release=1
source=(http://subversion.tigris.org/downloads/subversion-$version.tar.bz2)

View File

@ -1 +1 @@
8bf7637ac99368db0890e3f085fa690d subversion-1.6.3.tar.bz2
11e3fa838c9a558cadc378f2807572e2 subversion-1.6.4.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: apr, neon, expat, sqlite3
name=subversion
version=1.6.3
version=1.6.4
release=1
source=(http://subversion.tigris.org/downloads/$name-$version.tar.bz2)

View File

@ -1,3 +1,3 @@
7a0ece0af8aefad4313270a8786e041e vsftpd
6a8c8579d50adf0d0fc07226c03bfb52 vsftpd-2.1.2.tar.gz
fcab6b296ab56bd35db58f7ab660f2dc vsftpd-config.patch
7f5bb0bcd0f3a54673157aaaee6f6c30 vsftpd
e4eb190af270ae65d57a84274a38ec31 vsftpd-2.2.0.tar.gz
2256ca9d50baddf2b39ec81419bde710 vsftpd-config.patch

View File

@ -4,7 +4,7 @@
# Depends on: openssl libcap
name=vsftpd
version=2.1.2
version=2.2.0
release=1
source=(ftp://vsftpd.beasts.org/users/cevans/$name-$version.tar.gz \
$name-config.patch vsftpd)

View File

@ -8,7 +8,7 @@ KEY=/etc/ssl/keys/vsftpd.key
case $1 in
start)
if [ ! -s $CRT ]; then
if [ ! -s $CRT -o ! -s $KEY ]; then
/usr/bin/mksslcert $KEY $CRT
fi
/usr/sbin/vsftpd

View File

@ -1,6 +1,6 @@
diff -Nru vsftpd-2.1.2.orig/Makefile vsftpd-2.1.2/Makefile
--- vsftpd-2.1.2.orig/Makefile 2009-06-02 16:39:21.000000000 +0200
+++ vsftpd-2.1.2/Makefile 2009-06-02 16:39:36.000000000 +0200
diff -Nru vsftpd-2.2.0.orig/Makefile vsftpd-2.2.0/Makefile
--- vsftpd-2.2.0.orig/Makefile 2009-08-13 10:56:15.000000000 +0200
+++ vsftpd-2.2.0/Makefile 2009-08-13 10:56:35.000000000 +0200
@@ -3,7 +3,7 @@
INSTALL = install
IFLAGS = -idirafter dummyinc
@ -36,9 +36,9 @@ diff -Nru vsftpd-2.1.2.orig/Makefile vsftpd-2.1.2/Makefile
clean:
rm -f *.o *.swp vsftpd
diff -Nru vsftpd-2.1.2.orig/builddefs.h vsftpd-2.1.2/builddefs.h
--- vsftpd-2.1.2.orig/builddefs.h 2009-06-02 16:39:21.000000000 +0200
+++ vsftpd-2.1.2/builddefs.h 2009-06-02 16:39:36.000000000 +0200
diff -Nru vsftpd-2.2.0.orig/builddefs.h vsftpd-2.2.0/builddefs.h
--- vsftpd-2.2.0.orig/builddefs.h 2009-08-13 10:56:15.000000000 +0200
+++ vsftpd-2.2.0/builddefs.h 2009-08-13 10:56:35.000000000 +0200
@@ -1,9 +1,9 @@
#ifndef VSF_BUILDDEFS_H
#define VSF_BUILDDEFS_H
@ -52,10 +52,10 @@ diff -Nru vsftpd-2.1.2.orig/builddefs.h vsftpd-2.1.2/builddefs.h
#endif /* VSF_BUILDDEFS_H */
diff -Nru vsftpd-2.1.2.orig/tunables.c vsftpd-2.1.2/tunables.c
--- vsftpd-2.1.2.orig/tunables.c 2009-06-02 16:39:21.000000000 +0200
+++ vsftpd-2.1.2/tunables.c 2009-06-02 16:39:36.000000000 +0200
@@ -244,7 +244,7 @@
diff -Nru vsftpd-2.2.0.orig/tunables.c vsftpd-2.2.0/tunables.c
--- vsftpd-2.2.0.orig/tunables.c 2009-08-13 10:56:15.000000000 +0200
+++ vsftpd-2.2.0/tunables.c 2009-08-13 10:56:35.000000000 +0200
@@ -246,7 +246,7 @@
/* -rw------- */
tunable_chown_upload_mode = 0600;
@ -64,7 +64,7 @@ diff -Nru vsftpd-2.1.2.orig/tunables.c vsftpd-2.1.2/tunables.c
install_str_setting("ftp", &tunable_ftp_username);
install_str_setting("root", &tunable_chown_username);
install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
@@ -271,11 +271,11 @@
@@ -273,11 +273,11 @@
install_str_setting(0, &tunable_user_sub_token);
install_str_setting("/etc/vsftpd.email_passwords",
&tunable_email_password_file);
@ -78,9 +78,9 @@ diff -Nru vsftpd-2.1.2.orig/tunables.c vsftpd-2.1.2/tunables.c
install_str_setting(0, &tunable_dsa_private_key_file);
install_str_setting(0, &tunable_ca_certs_file);
}
diff -Nru vsftpd-2.1.2.orig/vsftpd.conf vsftpd-2.1.2/vsftpd.conf
--- vsftpd-2.1.2.orig/vsftpd.conf 2009-06-02 16:39:21.000000000 +0200
+++ vsftpd-2.1.2/vsftpd.conf 2009-06-02 16:39:36.000000000 +0200
diff -Nru vsftpd-2.2.0.orig/vsftpd.conf vsftpd-2.2.0/vsftpd.conf
--- vsftpd-2.2.0.orig/vsftpd.conf 2009-08-13 10:56:15.000000000 +0200
+++ vsftpd-2.2.0/vsftpd.conf 2009-08-13 10:56:35.000000000 +0200
@@ -8,11 +8,25 @@
# Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
# capabilities.
@ -107,9 +107,9 @@ diff -Nru vsftpd-2.1.2.orig/vsftpd.conf vsftpd-2.1.2/vsftpd.conf
#
# Uncomment this to enable any form of FTP write command.
#write_enable=YES
diff -Nru vsftpd-2.1.2.orig/vsftpd.conf.5 vsftpd-2.1.2/vsftpd.conf.5
--- vsftpd-2.1.2.orig/vsftpd.conf.5 2009-06-02 16:39:21.000000000 +0200
+++ vsftpd-2.1.2/vsftpd.conf.5 2009-06-02 16:39:36.000000000 +0200
diff -Nru vsftpd-2.2.0.orig/vsftpd.conf.5 vsftpd-2.2.0/vsftpd.conf.5
--- vsftpd-2.2.0.orig/vsftpd.conf.5 2009-08-13 10:56:15.000000000 +0200
+++ vsftpd-2.2.0/vsftpd.conf.5 2009-08-13 10:56:35.000000000 +0200
@@ -953,21 +953,21 @@
This option specifies the location of the RSA certificate to use for SSL
encrypted connections.

View File

@ -1,2 +1,2 @@
2bc971a1753fe57aca05fde7c005a16c configure.diff
9133a24dde377ad355139f5d6bc9b336 xterm-244.tgz
ad87d0a641da70a3c1196a209c8db70e xterm-245.tgz

View File

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