OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Jul-2004 10:28:19
Branch: OPENPKG_2_1_SOLID Handle: 2004070509281800
Modified files: (Branch: OPENPKG_2_1_SOLID)
openpkg-src/portsentry portsentry.patch portsentry.spec
Log:
MFC: upgrade to latest version from CURRENT
Summary:
Revision Changes Path
1.1.6.1 +142 -27 openpkg-src/portsentry/portsentry.patch
1.47.2.2 +6 -11 openpkg-src/portsentry/portsentry.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/portsentry/portsentry.patch
============================================================================
$ cvs diff -u -r1.1 -r1.1.6.1 portsentry.patch
--- openpkg-src/portsentry/portsentry.patch 18 Jul 2003 10:34:36 -0000 1.1
+++ openpkg-src/portsentry/portsentry.patch 5 Jul 2004 08:28:18 -0000 1.1.6.1
@@ -1,6 +1,114 @@
---- portsentry.c.dist 2003-07-18 12:06:57.000000000 +0200
-+++ portsentry.c 2003-07-18 12:14:26.000000000 +0200
-@@ -50,7 +50,7 @@
+Index: Makefile
+--- Makefile.orig 2003-05-23 20:10:13 +0200
++++ Makefile 2004-07-05 09:59:10 +0200
+@@ -115,90 +115,90 @@
+ SYSTYPE=bsd
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -DBSD44 -o ./portsentry ./portsentry.c \
+- ./portsentry_io.c ./portsentry_util.c
++ ./portsentry_io.c ./portsentry_util.c $(LIBS)
+
+
+ openbsd:
+ SYSTYPE=openbsd
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -DBSD44 -o ./portsentry ./portsentry.c \
+- ./portsentry_io.c ./portsentry_util.c
++ ./portsentry_io.c ./portsentry_util.c $(LIBS)
+
+
+ freebsd:
+ SYSTYPE=freebsd
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -DBSD44 -o ./portsentry ./portsentry.c \
+- ./portsentry_io.c ./portsentry_util.c
++ ./portsentry_io.c ./portsentry_util.c $(LIBS)
+
+ osx:
+ SYSTYPE=osx
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -DBSD44 -o ./portsentry ./portsentry.c \
+- ./portsentry_io.c ./portsentry_util.c
++ ./portsentry_io.c ./portsentry_util.c $(LIBS)
+
+
+ netbsd:
+ SYSTYPE=netbsd
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -DBSD44 -o ./portsentry ./portsentry.c \
+- ./portsentry_io.c ./portsentry_util.c
++ ./portsentry_io.c ./portsentry_util.c $(LIBS)
+
+
+ bsdi:
+ SYSTYPE=bsdi
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -DBSD44 -o ./portsentry ./portsentry.c \
+- ./portsentry_io.c ./portsentry_util.c
++ ./portsentry_io.c ./portsentry_util.c $(LIBS)
+
+
+ generic:
+ SYSTYPE=generic
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -o ./portsentry ./portsentry.c ./portsentry_io.c \
+- ./portsentry_util.c
++ ./portsentry_util.c $(LIBS)
+
+
+ hpux:
+ SYSTYPE=hpux
+ @echo "Making $(SYSTYPE)"
+ $(CC) -Ae -DHPUX -o ./portsentry ./portsentry.c ./portsentry_io.c \
+- ./portsentry_util.c
++ ./portsentry_util.c $(LIBS)
+
+
+ hpux-gcc:
+ SYSTYPE=hpux-gcc
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -DHPUX -o ./portsentry ./portsentry.c
./portsentry_io.c \
+- ./portsentry_util.c
++ ./portsentry_util.c $(LIBS)
+
+
+ solaris:
+ SYSTYPE=solaris
+ @echo "Making $(SYSTYPE)"
+ $(CC) -lnsl -lsocket -lresolv -lc -o ./portsentry ./portsentry.c
./portsentry_io.c \
+- ./portsentry_util.c
++ ./portsentry_util.c $(LIBS)
+
+
+ aix:
+ SYSTYPE=aix
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -o ./portsentry ./portsentry.c ./portsentry_io.c \
+- ./portsentry_util.c
++ ./portsentry_util.c $(LIBS)
+
+
+ osf:
+ SYSTYPE=osf
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -taso -ldb -o ./portsentry ./portsentry.c
./portsentry_io.c \
+- ./portsentry_util.c
++ ./portsentry_util.c $(LIBS)
+
+
+ irix:
+ SYSTYPE=irix
+ @echo "Making $(SYSTYPE)"
+ $(CC) $(CFLAGS) -O -n32 -mips3 -o ./portsentry ./portsentry.c
./portsentry_io.c \
+- ./portsentry_util.c
++ ./portsentry_util.c $(LIBS)
+
+
+ # NeXTSTEP Users. NeXT used to work, but we changed the log function and
+Index: portsentry.c
+--- portsentry.c.orig 2003-05-23 20:10:13 +0200
++++ portsentry.c 2004-07-05 09:59:34 +0200
+@@ -41,7 +41,7 @@
int
main (int argc, char *argv[])
{
@@ -9,7 +117,7 @@
{
Usage ();
Exit (ERROR);
-@@ -100,7 +100,7 @@
+@@ -91,7 +91,7 @@
Exit (ERROR);
}
#ifndef NODAEMON
@@ -18,7 +126,13 @@
{
Log ("adminalert: ERROR: could not go into daemon mode. Shutting down.\n");
printf ("ERROR: could not go into daemon mode. Shutting down.\n");
-@@ -1594,10 +1594,10 @@
+@@ -1581,15 +1581,14 @@
+ Usage (void)
+ {
+ printf ("PortSentry - Port Scan Detector.\n");
+- printf ("Copyright 1997-2003 Craig H. Rowland <craigrowland at users dot
+-sourceforget dot net>\n");
++ printf ("Copyright 1997-2003 Craig H. Rowland <craigrowland at users dot
sourceforget dot net>\n");
printf ("Licensing restrictions apply. Please see documentation\n");
printf ("Version: %s\n\n", VERSION);
#ifdef SUPPORT_STEALTH
@@ -31,20 +145,10 @@
#endif
printf ("*** PLEASE READ THE DOCS BEFORE USING *** \n\n");
}
---- portsentry_io.h.dist 2003-07-18 12:07:02.000000000 +0200
-+++ portsentry_io.h 2003-07-18 12:14:38.000000000 +0200
-@@ -31,7 +31,7 @@
- void Log (char *,...);
- void Exit (int);
- void Start (void);
--int DaemonSeed (void);
-+int DaemonSeed (char *pidfile);
- int NeverBlock (char *, char *);
- int CheckConfig (void);
- int OpenTCPSocket (void);
---- portsentry_io.c.dist 2003-07-18 12:07:11.000000000 +0200
-+++ portsentry_io.c 2003-07-18 12:32:39.000000000 +0200
-@@ -30,6 +30,8 @@
+Index: portsentry_io.c
+--- portsentry_io.c.orig 2003-05-23 20:10:13 +0200
++++ portsentry_io.c 2004-07-05 09:59:10 +0200
+@@ -21,6 +21,8 @@
#include "portsentry_io.h"
#include "portsentry_util.h"
@@ -53,22 +157,21 @@
/* Main logging function to surrogate syslog */
void
Log (char *logentry, ...)
-@@ -54,6 +56,14 @@
+@@ -45,6 +47,13 @@
{
- Log ("securityalert: Psionic PortSentry is shutting down\n");
- Log ("adminalert: Psionic PortSentry is shutting down\n");
+ Log ("securityalert: PortSentry is shutting down\n");
+ Log ("adminalert: PortSentry is shutting down\n");
+
+ if (rmpidfile) {
-+ Log ("adminalert: Psionic PortSentry removes '%s'\n", rmpidfile);
++ Log ("adminalert: PortSentry removes '%s'\n", rmpidfile);
+ if (unlink(rmpidfile))
-+ Log ("adminalert: Psionic PortSentry cannot remove pidfile (%s)\n",
-+ strerror(errno));
++ Log ("adminalert: PortSentry cannot remove pidfile (%s)\n", strerror(errno));
+ }
+
exit (status);
}
-@@ -72,9 +82,10 @@
+@@ -63,9 +72,10 @@
/* The daemonizing code copied from Advanced Programming */
/* in the UNIX Environment by W. Richard Stevens with minor changes */
int
@@ -80,7 +183,7 @@
signal (SIGALRM, SIG_IGN);
signal (SIGHUP, SIG_IGN);
-@@ -89,6 +100,15 @@
+@@ -80,6 +90,15 @@
else if (childpid > 0)
exit (0);
@@ -96,3 +199,15 @@
setsid ();
chdir ("/");
umask (077);
+Index: portsentry_io.h
+--- portsentry_io.h.orig 2003-05-23 20:10:13 +0200
++++ portsentry_io.h 2004-07-05 09:59:10 +0200
+@@ -22,7 +22,7 @@
+ void Log (char *,...);
+ void Exit (int);
+ void Start (void);
+-int DaemonSeed (void);
++int DaemonSeed (char *pidfile);
+ int NeverBlock (char *, char *);
+ int CheckConfig (void);
+ int OpenTCPSocket (void);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/portsentry/portsentry.spec
============================================================================
$ cvs diff -u -r1.47.2.1 -r1.47.2.2 portsentry.spec
--- openpkg-src/portsentry/portsentry.spec 2 Jul 2004 15:27:20 -0000
1.47.2.1
+++ openpkg-src/portsentry/portsentry.spec 5 Jul 2004 08:28:18 -0000
1.47.2.2
@@ -26,21 +26,21 @@
# package information
Name: portsentry
Summary: Port Scanning Detection Daemon
-URL: http://www.psionic.com/products/portsentry.html
+URL: http://sourceforge.net/projects/sentrytools/
Vendor: Psionic Software, Inc
Packager: The OpenPKG Project
Distribution: OpenPKG
Class: BASE
Group: Security
License: Open Source
-Version: 1.1
+Version: 1.2
Release: 2.1.0
# package options
%option with_fsl yes
# list of sources
-Source0: http://www.psionic.com/downloads/portsentry-%{version}.tar.gz
+Source0:
http://osdn.dl.sourceforge.net/sentrytools/portsentry-%{version}.tar.gz
Source1: rc.portsentry
Source2: fsl.portsentry
Patch0: portsentry.patch
@@ -64,19 +64,14 @@
%track
prog portsentry = {
- disabled
- comment = "rse: download URL not browsable, no other working possibility"
version = %{version}
- url = http://www.psionic.com/products/portsentry.html
- regex = ??
+ url = http://prdownloads.sourceforge.net/sentrytools/
+ regex = portsentry-(__VER__)\.tar\.gz
}
%prep
- %setup -q
+ %setup -q -n portsentry_beta
%patch -p0
- %{l_shtool} subst \
- -e 's;portsentry_util.c$;portsentry_util.c $(LIBS);' \
- Makefile
%build
%{l_shtool} subst \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
