OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Jan-2008 19:46:56
Branch: HEAD Handle: 2008011718465600
Modified files:
openpkg-src/whoson whoson.patch whoson.spec
Log:
upgrading package: whoson 2.03 -> 2.04
Summary:
Revision Changes Path
1.3 +48 -84 openpkg-src/whoson/whoson.patch
1.39 +3 -2 openpkg-src/whoson/whoson.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/whoson/whoson.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 whoson.patch
--- openpkg-src/whoson/whoson.patch 8 May 2004 21:58:58 -0000 1.2
+++ openpkg-src/whoson/whoson.patch 17 Jan 2008 18:46:56 -0000 1.3
@@ -1,105 +1,69 @@
-Index: Makefile.in
---- 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) {
+Index: WHOSON/Makefile.PL.in
+--- WHOSON/Makefile.PL.in.orig 2000-03-28 22:44:00 +0200
++++ WHOSON/Makefile.PL.in 2008-01-17 19:29:26 +0100
+@@ -6,7 +6,7 @@
+ WriteMakefile(
+ 'NAME' => 'WHOSON',
+ 'VERSION_FROM' => 'WHOSON.pm',
+- 'LIBS' => ['[EMAIL PROTECTED]@ -lwhoson'],
++ 'LIBS' => ['-L../.libs -lwhoson'],
+ 'DEFINE' => '',
+- 'INC' => '[EMAIL PROTECTED]@',
++ 'INC' => '-I..',
+ );
Index: whoson.conf
---- 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.
+--- whoson.conf.orig 2006-11-25 23:55:27 +0100
++++ whoson.conf 2008-01-17 19:42:05 +0100
+@@ -17,13 +17,13 @@
+ # This is the recommended method for localhost-only servers.
client unix
-- port=/var/run/whoson.s
+- port=/var/run/whoson/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
+ #client unixd
+-# port=/var/run/whoson/whoson.d
++# [EMAIL PROTECTED]@/var/whoson/run/whoson.d
+ # maxtries=5
+ # inittimeout=100000
+
+@@ -82,9 +82,9 @@
+ # 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/whoson.s keepalive=150
+server unix [EMAIL PROTECTED]@/var/whoson/run/whoson.s keepalive=150
listenq=5
--server unixd port=/var/run/whoson.d
+-server unixd port=/var/run/whoson/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.
+ allow=127.0.0.1/32
+ # allow=0.0.0.0/0 # open to the world. Don't do that!
+@@ -94,9 +94,9 @@
+ # entries will live in the database if not deleted explicitely.
server global ttl=600 # 10 minutes
-- chroot=/some/empty/directory # chdir and chroot here
+- chroot=/var/run/whoson # 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
+ cachesize=100000 # max. number of entries to keep
# end of config
-Index: WHOSON/Makefile.PL.in
---- WHOSON/Makefile.PL.in.orig 2004-05-08 23:49:45.000000000 +0200
-+++ WHOSON/Makefile.PL.in 2004-05-08 23:51:41.000000000 +0200
-@@ -6,7 +6,7 @@
- WriteMakefile(
- 'NAME' => 'WHOSON',
- 'VERSION_FROM' => 'WHOSON.pm',
-- 'LIBS' => ['[EMAIL PROTECTED]@ -lwhoson'],
-+ 'LIBS' => ['-L../.libs -lwhoson'],
- 'DEFINE' => '',
-- 'INC' => '[EMAIL PROTECTED]@',
-+ 'INC' => '-I..',
- );
+Index: whosond.c
+--- whosond.c.orig 2003-08-21 17:50:00 +0200
++++ whosond.c 2008-01-17 19:29:26 +0100
+@@ -158,6 +158,8 @@
+ if (daemon) {
+ int child;
+ if ((child=fork()) > 0) {
++ printf("%d\n",child);
++ fflush(stdout);
+ sleep(1);
+ return 0;
+ } else if (child < 0) {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/whoson/whoson.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 whoson.spec
--- openpkg-src/whoson/whoson.spec 1 Jan 2008 15:07:07 -0000 1.38
+++ openpkg-src/whoson/whoson.spec 17 Jan 2008 18:46:56 -0000 1.39
@@ -31,8 +31,8 @@
Class: PLUS
Group: Mail
License: GPL
-Version: 2.03
-Release: 20080101
+Version: 2.04
+Release: 20080117
# package options
%option with_fsl yes
@@ -87,6 +87,7 @@
LIBS="%{l_fsl_libs}" \
./configure \
--prefix="%{l_prefix}" \
+ --mandir="%{l_prefix}/man" \
--with-config="%{l_prefix}/etc/whoson/whoson.conf" \
--enable-static \
--disable-shared
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
