diff --git a/network/portmap/config.patch b/network/portmap/config.patch deleted file mode 100644 index 4e4d17d47..000000000 --- a/network/portmap/config.patch +++ /dev/null @@ -1,46 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../portmap/config.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# 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. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./Makefile.orig Fri May 31 15:50:40 1996 -+++ ./Makefile Fri Apr 23 11:15:30 1999 -@@ -8,7 +8,7 @@ - # if you disagree. See `man 3 syslog' for examples. Some syslog versions - # do not provide this flexibility. - # --FACILITY=LOG_MAIL -+FACILITY=LOG_AUTH - - # To disable host access control, comment out the following macro definition. - # Note: host access control requires the strtok() and strchr() routines. -@@ -36,7 +36,7 @@ - # With verbose logging on, HP-UX 9.x and AIX 4.1 leave zombies behind when - # SIGCHLD is not ignored. Enable next macro for a fix. - # --# ZOMBIES = -DIGNORE_SIGCHLD # AIX 4.x, HP-UX 9.x -+ZOMBIES = -DIGNORE_SIGCHLD # AIX 4.x, HP-UX 9.x - - # Uncomment the following macro if your system does not have u_long. - # -@@ -46,7 +46,7 @@ - # libwrap.a object library. WRAP_DIR should specify the directory with - # that library. - --WRAP_DIR= ../tcp_wrappers -+WRAP_DIR= /usr/lib - - # Auxiliary object files that may be missing from your C library. - # diff --git a/network/portmap/errno-fix.patch b/network/portmap/errno-fix.patch deleted file mode 100644 index c47bc1b30..000000000 --- a/network/portmap/errno-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../portmap/errno-fix.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# 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. -# --- SDE-COPYRIGHT-NOTE-END --- - -diff -urN portmap_4-orig/Makefile portmap_4/Makefile ---- portmap_4-orig/Makefile 1996-05-31 15:50:40.000000000 +0200 -+++ portmap_4/Makefile 2003-03-05 16:04:05.000000000 +0100 -@@ -50,7 +50,8 @@ - - # Auxiliary object files that may be missing from your C library. - # --AUX = daemon.o strerror.o -+AUX = daemon.o -+#strerror.o - - # NEXTSTEP is a little different. The following seems to work with NS 3.2 - # -diff -urN portmap_4-orig/portmap.c portmap_4/portmap.c ---- portmap_4-orig/portmap.c 1996-05-31 15:52:59.000000000 +0200 -+++ portmap_4/portmap.c 2003-03-05 16:14:49.000000000 +0100 -@@ -85,6 +85,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -124,7 +125,7 @@ - static void callit(); - struct pmaplist *pmaplist; - int debugging = 0; --extern int errno; -+/*extern int errno;*/ - - #include "pmap_check.h" - diff --git a/network/portmap/perror.patch b/network/portmap/perror.patch deleted file mode 100644 index c2da9cf2c..000000000 --- a/network/portmap/perror.patch +++ /dev/null @@ -1,28 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../portmap/perror.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# 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. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./portmap.c.orig Fri May 31 15:52:59 1996 -+++ ./portmap.c Fri Apr 23 10:38:46 1999 -@@ -235,7 +235,7 @@ - /* need to override perror calls in rpc library */ - void - perror(what) -- const char *what; -+ __const char *what; - { - - syslog(LOG_ERR, "%s: %m", what); diff --git a/network/portmap/portmap.conf b/network/portmap/portmap.conf index f0eed0c3e..1ae0f2bc8 100644 --- a/network/portmap/portmap.conf +++ b/network/portmap/portmap.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../portmap/portmap.conf -# Copyright (C) 2008 The OpenSDE Project +# Copyright (C) 2008 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -14,14 +14,6 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -makeinstopt= -var_append makeopt ' ' 'WRAP_DIR=$libdir' - -pm_pd() { - install -m 755 -s pmap_dump /usr/sbin - install -m 755 -s pmap_set /usr/sbin - install -m 755 -s portmap /usr/sbin -} - -hook_add postdoc 5 pm_pd - +if ! pkginstalled tcp_wrappers; then + var_append makeopt ' ' "NO_TCP_WRAPPER=1" +fi diff --git a/network/portmap/portmap.desc b/network/portmap/portmap.desc index e10b01b86..61b904c70 100644 --- a/network/portmap/portmap.desc +++ b/network/portmap/portmap.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../portmap/portmap.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -21,15 +21,18 @@ [T] sensitive information via the portmapper. As an option, the program supports [T] access control in the style of the tcp wrapper (log_tcp) package. -[A] Wietse Venema +[U] http://neil.brown.name/portmap/ + +[A] Neil Brown (current maintainer) +[A] Wietse Venema (original author) [M] The OpenSDE Community [C] base/system [L] OpenSource [S] Stable -[V] 4 +[V] 6.0 [P] X -----5---9 189.400 -[D] 3932364683 portmap_4.tar.gz ftp://ftp.porcupine.org/pub/security/ +[D] 1124636635 portmap-6.0.tgz http://neil.brown.name/portmap/