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 openpkg-web Date: 28-Jul-2003 13:55:35
Branch: OPENPKG_1_STABLE HEAD Handle: 2003072812553401
Added files: (Branch: OPENPKG_1_STABLE)
openpkg-src/whoson fsl.whoson rc.whoson whoson.patch whoson.spec
Modified files:
openpkg-web news.txt
Log:
MFC: whoson package now became PLUS
Summary:
Revision Changes Path
1.5.2.1 +16 -0 openpkg-src/whoson/fsl.whoson
1.12.2.1 +44 -0 openpkg-src/whoson/rc.whoson
1.1.2.1 +90 -0 openpkg-src/whoson/whoson.patch
1.18.2.1 +140 -0 openpkg-src/whoson/whoson.spec
1.5860 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/whoson/fsl.whoson
============================================================================
$ cvs diff -u -r0 -r1.5.2.1 fsl.whoson
--- /dev/null 2003-07-28 13:55:35.000000000 +0200
+++ fsl.whoson 2003-07-28 13:55:35.000000000 +0200
@@ -0,0 +1,16 @@
+##
+## fsl.whoson -- OSSP fsl configuration
+##
+
+ident (whosond)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/whoson/log/whosond.log",
+ perm=0600
+ )
+ }
+};
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/whoson/rc.whoson
============================================================================
$ cvs diff -u -r0 -r1.12.2.1 rc.whoson
--- /dev/null 2003-07-28 13:55:35.000000000 +0200
+++ rc.whoson 2003-07-28 13:55:35.000000000 +0200
@@ -0,0 +1,44 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.whoson -- Run-Commands
+##
+
+%config
+ whoson_enable="$openpkg_rc_def"
+ whoson_log_prolog="true"
+ whoson_log_epilog="true"
+ whoson_log_numfiles="10"
+ whoson_log_minsize="1M"
+ whoson_log_complevel="9"
+
+%common
+ whoson_pidfile="@l_prefix@/var/whoson/whoson.pid"
+
+%start -u @l_susr@
+ rcService whoson enable yes || exit 0
+ @l_prefix@/sbin/whosond >$whoson_pidfile
+ exit 0
+
+%stop -u @l_susr@
+ rcService whoson enable yes || exit 0
+ kill -TERM `cat $whoson_pidfile`
+ rm -f $whoson_pidfile
+ exit 0
+
+%restart -u @l_susr@
+ rcService whoson enable yes || exit 0
+ kill -TERM `cat $whoson_pidfile`
+ sleep 2
+ rm -f $whoson_pidfile
+ @l_prefix@/sbin/whosond >$whoson_pidfile
+ exit 0
+
+%daily -u @l_susr@
+ rcService whoson enable yes || exit 0
+ shtool rotate -f \
+ -n ${whoson_log_numfiles} -s ${whoson_log_minsize} -d \
+ -z ${whoson_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -P "${whoson_log_prolog}" \
+ -E "${whoson_log_epilog}" \
+ @l_prefix@/var/whoson/log/whosond.log
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/whoson/whoson.patch
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 whoson.patch
--- /dev/null 2003-07-28 13:55:35.000000000 +0200
+++ whoson.patch 2003-07-28 13:55:35.000000000 +0200
@@ -0,0 +1,90 @@
+--- Makefile.in.dist Tue Apr 15 14:50:22 2003
++++ Makefile.in Tue Apr 15 14:50:58 2003
+@@ -698,10 +698,10 @@
+
+
+ install-data-hook:
+- if test -f $(DEFAULT_CONFIG); then \
+- $(ECHO) "$(DEFAULT_CONFIG) exists, not overwritten"; \
++ if test -f $(DESTDIR)$(DEFAULT_CONFIG); then \
++ $(ECHO) "$(DESTDIR)$(DEFAULT_CONFIG) exists, not overwritten"; \
+ else \
+- $(INSTALL_DATA) $(srcdir)/whoson.conf $(DEFAULT_CONFIG); \
++ $(INSTALL_DATA) $(srcdir)/whoson.conf $(DESTDIR)$(DEFAULT_CONFIG); \
+ fi; \
+ for f in $(MAN3XTRA); do \
+ rm -f $(DESTDIR)$(man3dir)/$$f; \
+--- whosond.c.dist Tue Apr 15 14:37:01 2003
++++ whosond.c Tue Apr 15 14:38:32 2003
+@@ -153,6 +153,8 @@
+ if (daemon) {
+ int child;
+ if ((child=fork()) > 0) {
++ printf("%d\n",child);
++ fflush(stdout);
+ sleep(1);
+ return 0;
+ } else if (child < 0) {
+--- whoson.conf.dist Tue Apr 15 15:16:43 2003
++++ whoson.conf Tue Apr 15 16:51:52 2003
+@@ -13,13 +13,13 @@
+ # stream socket. "port" is the name of the socket.
+
+ client unix
+- port=/var/run/whoson.s
++ [EMAIL PROTECTED]@/var/whoson/run/whoson.s
+
+ # Connect to the server running on the same machine via a unix domain
+ # datagram socket. "port" is the name of the socket.
+
+ client unixd
+- port=/var/run/whoson.d
++ [EMAIL PROTECTED]@/var/whoson/run/whoson.d
+ maxtries=5
+ inittimeout=100000
+
+@@ -39,7 +39,7 @@
+ # Connect to the server over the TCP protocol.
+
+ client tcp port=9876
+- address=194.67.3.216
++ address=127.0.0.1
+
+ # There may be any number of any type entries.
+ # Stream protocols (tcp and unix) allow for persistent connections
+@@ -62,23 +62,25 @@
+ port=9876
+ listenq=5
+ keepalive=150
+- allow=123.45.67.0/24 # Allow the the whole network
+- deny=123.45.67.89/32 # except these ..
+- deny=123.45.67.90/32 # .. two machines
+-server unix port=/var/run/whoson.s keepalive=150
++ #allow=123.45.67.0/24 # Allow the the whole network
++ #deny=123.45.67.89/32 # except these ..
++ #deny=123.45.67.90/32 # .. two machines
++ allow=127.0.0.1/32
++server unix [EMAIL PROTECTED]@/var/whoson/run/whoson.s keepalive=150
+ listenq=5
+-server unixd port=/var/run/whoson.d
++server unixd [EMAIL PROTECTED]@/var/whoson/run/whoson.d
+ server udp port=9876
+- allow=0.0.0.0/0 # open to the world. Don't do that!
++ #allow=0.0.0.0/0 # open to the world. Don't do that!
++ allow=127.0.0.1/32
+
+ # "global" pseudo server that does not listen; it is only used to set
+ # global configuration parameters. "ttl" - how many seconds
+ # inserted entries will live in the database if not deleted explicitely.
+
+ server global ttl=600 # 10 minutes
+- chroot=/some/empty/directory # chdir and chroot here
+- group=nobody # change group id and
+- user=nobody # user id after bind()ing
+- cachesize=100000 # max. number of entries to keep
++ [EMAIL PROTECTED]@/var/whoson/empty/ # chdir and chroot here
++ [EMAIL PROTECTED]@ # change group id and
++ [EMAIL PROTECTED]@ # user id after bind()ing
++ cachesize=100000 # max. number of entries to keep
+
+ # end of config
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/whoson/whoson.spec
============================================================================
$ cvs diff -u -r0 -r1.18.2.1 whoson.spec
--- /dev/null 2003-07-28 13:55:35.000000000 +0200
+++ whoson.spec 2003-07-28 13:55:35.000000000 +0200
@@ -0,0 +1,140 @@
+##
+## whoson.spec -- OpenPKG RPM Specification
+## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
+## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+## Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package information
+Name: whoson
+Summary: WHOSON daemon for POP before SMTP
+URL: http://whoson.sourceforge.net/
+Vendor: Eugene Crosser
+Packager: The OpenPKG Project
+Distribution: OpenPKG [PLUS]
+Group: Mail
+License: GPL
+Version: 2.02a
+Release: 1.20030728
+
+# package options
+%option with_fsl yes
+%option with_perl no
+
+# list of sources
+Source0:
http://osdn.dl.sourceforge.net/sourceforge/whoson/whoson-%{version}.tar.gz
+Source1: rc.whoson
+Source2: fsl.whoson
+Patch0: whoson.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot: %{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 1.20030724
+PreReq: OpenPKG, openpkg >= 1.20030724
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl >= 1.2.0
+PreReq: fsl >= 1.2.0
+%endif
+%if "%{with_perl}" == "yes"
+BuildPreReq: perl, perl-openpkg
+PreReq: perl, perl-openpkg
+%endif
+AutoReq: no
+AutoReqProv: no
+
+%description
+ Whoson (WHO iS ONline) is a proposed Internet protocol that
+ allows Internet server programs know if a particular (dynamically
+ allocated) IP address is currently allocated to a known (trusted)
+ user and, optionally, the identity of the said user.
+
+%prep
+ %setup -q
+ %patch -p0
+
+%build
+ %{l_shtool} subst %{l_value -s -a} \
+ whoson.conf
+
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
+ ./configure \
+ --prefix="%{l_prefix}" \
+ --with-config="%{l_prefix}/etc/whoson/whoson.conf" \
+ --enable-static \
+ --disable-shared
+ %{l_make} %{l_mflags -O}
+
+%install
+ rm -rf $RPM_BUILD_ROOT
+
+%if "%{with_perl}" == "yes"
+ ( cd WHOSON
+ %{l_prefix}/bin/perl-openpkg prolog
+ %{l_prefix}/bin/perl-openpkg install
+ %{l_prefix}/bin/perl-openpkg epilog
+ ) || exit $?
+%endif
+
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/whoson \
+ $RPM_BUILD_ROOT%{l_prefix}/var/whoson/run \
+ $RPM_BUILD_ROOT%{l_prefix}/var/whoson/log \
+ $RPM_BUILD_ROOT%{l_prefix}/var/whoson/empty
+
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+
+ # tidy installation area
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
+
+ # add startup script
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ %{SOURCE rc.whoson} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # install OSSP fsl configuration
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE fsl.whoson} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+ # determine installation files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.whoson' \
+ '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson' \
+ '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson/run' \
+ '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson/log' \
+ '%attr(0700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson/empty' \
+ '%config %{l_prefix}/etc/whoson/*'
+
+%files -f files
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5859 -r1.5860 news.txt
--- openpkg-web/news.txt 28 Jul 2003 11:54:28 -0000 1.5859
+++ openpkg-web/news.txt 28 Jul 2003 11:55:34 -0000 1.5860
@@ -1,3 +1,4 @@
+28-Jul-2003: New package: P<whoson-2.02a-1.20030728>
28-Jul-2003: Upgraded package: P<whoson-2.02a-20030728>
28-Jul-2003: Upgraded package: P<vim-6.2.56-1.20030728>
28-Jul-2003: Upgraded package: P<tftp-0.34-1.20030728>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]