From 3fc669438f6b82652894a741f97d1a501862cce8 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Wed, 22 Mar 2006 21:51:07 +0000 Subject: [PATCH] Andreas V. Meier: update p3nfs(5.19) [2006031820221507025] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7285 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/avm/p3nfs/lxhdr_hotfix.patch | 36 ---------------- package/avm/p3nfs/noclient.patch | 26 ++++++++++++ package/avm/p3nfs/noserialcheck.patch | 59 ++++++++------------------- package/avm/p3nfs/p3nfs.conf | 23 ----------- package/avm/p3nfs/p3nfs.desc | 4 +- 5 files changed, 44 insertions(+), 104 deletions(-) delete mode 100644 package/avm/p3nfs/lxhdr_hotfix.patch create mode 100644 package/avm/p3nfs/noclient.patch delete mode 100644 package/avm/p3nfs/p3nfs.conf diff --git a/package/avm/p3nfs/lxhdr_hotfix.patch b/package/avm/p3nfs/lxhdr_hotfix.patch deleted file mode 100644 index 232f46b9c..000000000 --- a/package/avm/p3nfs/lxhdr_hotfix.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/avm/p3nfs/lxhdr_hotfix.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./nfsd/nfs_prot.h.orig 2005-08-17 13:11:29.000000000 +0200 -+++ ./nfsd/nfs_prot.h 2005-08-17 13:17:27.000000000 +0200 -@@ -1,3 +1,14 @@ -+ -+// glibc defines them. this results in compiler errors -+// in the kernel string.h header... -+#undef strpbrk -+#undef strsep -+#undef strspn -+#undef strcspn -+#undef strcmp -+#undef strncmp -+#undef strchr -+ - #ifdef hpux - #include - #include diff --git a/package/avm/p3nfs/noclient.patch b/package/avm/p3nfs/noclient.patch new file mode 100644 index 000000000..798cdcc79 --- /dev/null +++ b/package/avm/p3nfs/noclient.patch @@ -0,0 +1,26 @@ +diff -ruN p3nfs-5.19/Makefile.in p3nfs-5.19-new/Makefile.in +--- p3nfs-5.19/Makefile.in 2005-11-24 15:30:55.000000000 +0100 ++++ p3nfs-5.19-new/Makefile.in 2006-02-22 10:45:56.000000000 +0100 +@@ -14,7 +14,6 @@ + + all clean distclean:: + cd server; $(MAKE) $@ +- cd client/epoc32/nfsapp; $(MAKE) $@ + + install:: + mkdir -p $(BINDIR) +@@ -23,7 +22,6 @@ + cp doc/p3nfsd.1 $(MANDIR) + mkdir -p $(DOCDIR) + cp doc/* $(DOCDIR) +- cp bin/*.sis client/*/opl/*.opl client/epoc16/nfsc/nfsc.app $(DOCDIR) + + + uninstall:: +@@ -42,6 +40,5 @@ + distclean:: + rm -f p3nfs-$(VERSION).tar.gz + rm -f Makefile server/Makefile utils/Makefile +- rm -f client/epoc32/nfsapp/Makefile + rm -f config.cache config.status config.log *.orig + rm -f utils/p3nfs.spec doc/p3nfsd.1 diff --git a/package/avm/p3nfs/noserialcheck.patch b/package/avm/p3nfs/noserialcheck.patch index d85d2318f..f09c3eef4 100644 --- a/package/avm/p3nfs/noserialcheck.patch +++ b/package/avm/p3nfs/noserialcheck.patch @@ -1,31 +1,15 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/avm/p3nfs/noserialcheck.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -ruN p3nfs-5.18/configure p3nfs-5.18-new/configure ---- p3nfs-5.18/configure 2005-05-05 09:12:44.000000000 +0200 -+++ p3nfs-5.18-new/configure 2005-05-18 12:32:21.000000000 +0200 -@@ -3367,18 +3367,20 @@ +diff -ruN p3nfs-5.19/configure p3nfs-5.19-new/configure +--- p3nfs-5.19/configure 2006-02-13 14:56:32.000000000 +0100 ++++ p3nfs-5.19-new/configure 2006-02-13 15:13:56.000000000 +0100 +@@ -3364,24 +3364,6 @@ + done + test -z "$MTAB" && { echo "mtab not found... " 1>&2; CFLAGS="${CFLAGS} -DDONT_UPDATE_MTAB";} - - echo "$as_me:$LINENO: checking for default serial line" >&5 +- +- +-echo "$as_me:$LINENO: checking for default serial line" >&5 -echo $ECHO_N "checking for default serial line... $ECHO_C" >&6 --for i in /dev/tty0p0 /dev/tty00 /dev/ttyS0 /dev/term/a /dev/ttyfa /dev/ttya /dev/tty0 /dev/ttyf1 /dev/cuaa1 ; do +-for i in /dev/tty0p0 /dev/tty00 /dev/ttyS0 /dev/ttys0 /dev/term/a /dev/ttyfa /dev/ttya /dev/tty0 /dev/ttyf1 /dev/cuaa1 ; do - if test -c $i ; then - DDEV=$i - echo "$as_me:$LINENO: result: $i" >&5 @@ -36,20 +20,9 @@ diff -ruN p3nfs-5.18/configure p3nfs-5.18-new/configure -test -z "$DDEV" && { { echo "$as_me:$LINENO: error: serial device not found... Try harder." >&5 -echo "$as_me: error: serial device not found... Try harder." >&2;} - { (exit 1); exit 1; }; } -+echo $ECHO_N "ROCK: default serial line is /dev/tts/0 $ECHO_T" >&6 -+DDEV=/dev/tts/0 -+# echo $ECHO_N "checking for default serial line... $ECHO_C" >&6 -+# for i in /dev/tty0p0 /dev/tty00 /dev/ttyS0 /dev/term/a /dev/ttyfa /dev/ttya /dev/tty0 /dev/ttyf1 /dev/cuaa1 ; do -+# if test -c $i ; then -+# DDEV=$i -+# echo "$as_me:$LINENO: result: $i" >&5 -+# echo "${ECHO_T}$i" >&6 -+# break -+# fi -+# done -+# test -z "$DDEV" && { { echo "$as_me:$LINENO: error: serial device not found... Try harder." >&5 -+# echo "$as_me: error: serial device not found... Try harder." >&2;} -+# { (exit 1); exit 1; }; } - - - +- +- +- + echo "$as_me:$LINENO: checking EPOCR5 SDK" >&5 + echo $ECHO_N "checking EPOCR5 SDK... $ECHO_C" >&6 + if test -d /local/symbian_sdk_5.0 ; then HAVE_EPOCR5=epocR5; fi diff --git a/package/avm/p3nfs/p3nfs.conf b/package/avm/p3nfs/p3nfs.conf deleted file mode 100644 index f682f6c52..000000000 --- a/package/avm/p3nfs/p3nfs.conf +++ /dev/null @@ -1,23 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/avm/p3nfs/p3nfs.conf -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -autogen=1 diff --git a/package/avm/p3nfs/p3nfs.desc b/package/avm/p3nfs/p3nfs.desc index 73faed2f1..0b0a6fdfa 100644 --- a/package/avm/p3nfs/p3nfs.desc +++ b/package/avm/p3nfs/p3nfs.desc @@ -39,8 +39,8 @@ [L] GPL [S] Beta -[V] 5.18 +[V] 5.19 [P] X -----5---9 241.500 -[D] 826169557 p3nfs-5.18.tar.gz http://www.koeniglich.de/packages/ +[D] 2424387892 p3nfs-5.19.tar.gz http://www.koeniglich.de/packages/