Merge branch '2.2' into 2.3

This commit is contained in:
Juergen Daubert 2007-02-27 17:52:00 +01:00
commit ad4efb8f74
7 changed files with 6 additions and 26 deletions

View File

@ -15,10 +15,6 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/mountd.8.gz
-rw-r--r-- root/root usr/man/man8/nfsd.8.gz
-rw-r--r-- root/root usr/man/man8/nfsstat.8.gz
-rw-r--r-- root/root usr/man/man8/nhfsgraph.8.gz
-rw-r--r-- root/root usr/man/man8/nhfsnums.8.gz
-rw-r--r-- root/root usr/man/man8/nhfsrun.8.gz
-rw-r--r-- root/root usr/man/man8/nhfsstone.8.gz
lrwxrwxrwx root/root usr/man/man8/rpc.lockd.8.gz -> lockd.8.gz
lrwxrwxrwx root/root usr/man/man8/rpc.mountd.8.gz -> mountd.8.gz
lrwxrwxrwx root/root usr/man/man8/rpc.nfsd.8.gz -> nfsd.8.gz
@ -31,10 +27,6 @@ lrwxrwxrwx root/root usr/man/man8/rpc.statd.8.gz -> statd.8.gz
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/exportfs
-rwxr-xr-x root/root usr/sbin/nfsstat
-rwxr-xr-x root/root usr/sbin/nhfsgraph
-rwxr-xr-x root/root usr/sbin/nhfsnums
-rwxr-xr-x root/root usr/sbin/nhfsrun
-rwxr-xr-x root/root usr/sbin/nhfsstone
-rwxr-xr-x root/root usr/sbin/rpc.lockd
-rwxr-xr-x root/root usr/sbin/rpc.mountd
-rwxr-xr-x root/root usr/sbin/rpc.nfsd

View File

@ -1,5 +1,4 @@
c5ccf58f5f9f57aba75c8b72219eb6e6 exports
73ad69a472b77946167025b946e0794a nfs
6cb41ec29e1bbfc92e023f3a4a32fe2b nfs-utils-1.0.10-uts-release.patch
1949634d0dc896696d8a880bdca622c8 nfs-utils-1.0.10.tar.gz
acf3656cec3872deb597aa7ac13f3c3a nfs-utils-1.0.12.tar.gz
91238e88d73c9841b9e8beb24aafa873 nfsserver

View File

@ -3,15 +3,13 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=nfs-utils
version=1.0.10
version=1.0.12
release=1
source=(http://dl.sourceforge.net/nfs/$name-$version.tar.gz \
$name-$version-uts-release.patch \
exports nfs nfsserver)
build () {
cd $name-$version
patch -p0 -i $SRC/$name-$version-uts-release.patch
./configure --prefix=/usr \
--mandir=/usr/man \
--enable-nfsv3 \

View File

@ -1,11 +0,0 @@
--- tools/getkversion/getkversion.c
+++ tools/getkversion/getkversion.c
@@ -14,6 +14,8 @@
int
main(void) /* This is for Dan Popp ;) */
{
+#ifdef UTS_RELEASE
printf("%s\n", UTS_RELEASE);
+#endif
return 0;
}

View File

@ -397,6 +397,7 @@ lrwxrwxrwx root/root usr/man/man3/BUF_MEM_free.3ssl.gz -> buffer.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/BUF_MEM_grow.3ssl.gz -> buffer.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/BUF_MEM_new.3ssl.gz -> buffer.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/BUF_strdup.3ssl.gz -> buffer.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/CONF_modules_finish.3ssl.gz -> CONF_modules_free.3ssl.gz
-rw-r--r-- root/root usr/man/man3/CONF_modules_free.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/CONF_modules_load.3ssl.gz -> CONF_modules_load_file.3ssl.gz
-rw-r--r-- root/root usr/man/man3/CONF_modules_load_file.3ssl.gz
@ -831,6 +832,7 @@ lrwxrwxrwx root/root usr/man/man3/SSL_SESSION_get_ex_data.3ssl.gz -> SSL_SESSION
lrwxrwxrwx root/root usr/man/man3/SSL_SESSION_get_timeout.3ssl.gz -> SSL_SESSION_get_time.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_SESSION_set_ex_data.3ssl.gz -> SSL_SESSION_get_ex_new_index.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_SESSION_set_time.3ssl.gz -> SSL_SESSION_get_time.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_SESSION_set_timeout.3ssl.gz -> SSL_SESSION_get_time.3ssl.gz
-rw-r--r-- root/root usr/man/man3/SSL_accept.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_add_client_CA.3ssl.gz -> SSL_CTX_set_client_CA_list.3ssl.gz
lrwxrwxrwx root/root usr/man/man3/SSL_add_session.3ssl.gz -> SSL_CTX_add_session.3ssl.gz

View File

@ -1,3 +1,3 @@
9d0df57845af8acd1027a7df5c18d017 mksslcert.sh
58daa890c3bc19bd6ce3451b2e5e335c openssl-0.9.8b-parallel-build.patch
8ed1853538e1d05a1f5ada61ebf8bffa openssl-0.9.8d.tar.gz
3a7ff24f6ea5cd711984722ad654b927 openssl-0.9.8e.tar.gz

View File

@ -3,7 +3,7 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=openssl
version=0.9.8d
version=0.9.8e
release=1
source=(http://www.openssl.org/source/$name-$version.tar.gz \
mksslcert.sh openssl-0.9.8b-parallel-build.patch)