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: 26-Sep-2005 17:03:58
Branch: HEAD Handle: 2005092616035800
Modified files:
openpkg-src/portfwd portfwd.patch portfwd.spec
Log:
cleanup sources
Summary:
Revision Changes Path
1.4 +82 -7 openpkg-src/portfwd/portfwd.patch
1.50 +1 -1 openpkg-src/portfwd/portfwd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/portfwd.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 portfwd.patch
--- openpkg-src/portfwd/portfwd.patch 3 Jul 2005 18:14:30 -0000 1.3
+++ openpkg-src/portfwd/portfwd.patch 26 Sep 2005 15:03:58 -0000 1.4
@@ -1,6 +1,50 @@
+Index: getopt/getopt.c
+--- getopt/getopt.c.orig 2002-09-07 04:27:51 +0200
++++ getopt/getopt.c 2005-09-26 17:01:03 +0200
+@@ -40,6 +40,7 @@
+ #endif
+
+ #include <stdio.h>
++#include <string.h>
+
+ /* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
+Index: src/Makefile.in
+--- src/Makefile.in.orig 2005-05-30 04:13:28 +0200
++++ src/Makefile.in 2005-09-26 17:02:12 +0200
+@@ -73,7 +73,7 @@
+ VERSION = @VERSION@
+ YACC = @YACC@
+
+-CFLAGS = -Wall -ggdb -O3 -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\"
++CFLAGS = -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\"
+ CXXFLAGS = $(CFLAGS)
+ INCLUDES = -I$(top_srcdir)/src
+
+Index: src/director.cc
+--- src/director.cc.orig 2005-05-30 04:13:28 +0200
++++ src/director.cc 2005-09-26 17:01:03 +0200
+@@ -195,7 +195,7 @@
+ address.len = 0;
+ address.addr = (char *) malloc(address_buf_size * sizeof(char *));
+ if (!address.addr) {
+- syslog(LOG_ERR, "director::director(): malloc(%d) failed",
address_buf_size);
++ syslog(LOG_ERR, "director::director(): malloc(%ld) failed",
address_buf_size);
+ exit(1);
+ }
+ }
+@@ -352,7 +352,7 @@
+ */
+
+ if (addr_buf_len > address_buf_size) {
+- syslog(LOG_ERR, "Insufficient space in local buffer for address
(local_buffer_size=%d < address_length=%d)", address_buf_size, addr_buf_len);
++ syslog(LOG_ERR, "Insufficient space in local buffer for address
(local_buffer_size=%ld < address_length=%ld)", (long)address_buf_size,
(long)addr_buf_len);
+ return -1;
+ }
+
Index: src/portfwd.cc
--- src/portfwd.cc.orig 2005-05-30 04:13:28 +0200
-+++ src/portfwd.cc 2005-07-03 20:10:59 +0200
++++ src/portfwd.cc 2005-09-26 17:01:03 +0200
@@ -37,6 +37,8 @@
int on_the_fly_dns = 0;
@@ -10,10 +54,12 @@
void usage(FILE *out)
{
-@@ -53,6 +55,7 @@
+@@ -52,7 +54,8 @@
+
" -f | --on-the-fly-dns\n"
" -g | --foreground\n"
- " -c <config-file> | --config <config-file>\n",
+- " -c <config-file> | --config <config-file>\n",
++ " -c <config-file> | --config <config-file>\n"
+ " -p <pid-file> | --pidfile <pid-file>\n",
prog);
}
@@ -71,7 +117,7 @@
exit(1);
Index: src/portfwd.h
--- src/portfwd.h.orig 2005-05-30 04:13:28 +0200
-+++ src/portfwd.h 2005-07-03 20:10:59 +0200
++++ src/portfwd.h 2005-09-26 17:01:03 +0200
@@ -18,6 +18,7 @@
extern int on_the_fly_dns;
@@ -80,9 +126,26 @@
#endif /* PORTFWD_H */
+Index: src/proto_map.cc
+--- src/proto_map.cc.orig 2004-01-28 20:14:10 +0100
++++ src/proto_map.cc 2005-09-26 17:01:03 +0200
+@@ -16,11 +16,11 @@
+ map_list = map_l;
+ fragile = 0; /* false */
+
+- ftp_actv = (int) actv;
++ ftp_actv = (actv != NULL);
+ if (ftp_actv)
+ actv_ip = *actv;
+
+- ftp_pasv = (int) pasv;
++ ftp_pasv = (pasv != NULL);
+ if (ftp_pasv)
+ pasv_ip = *pasv;
+
Index: src/util.cc
--- src/util.cc.orig 2005-05-30 04:13:28 +0200
-+++ src/util.cc 2005-07-03 20:10:59 +0200
++++ src/util.cc 2005-09-26 17:01:03 +0200
@@ -118,7 +118,7 @@
return 0;
}
@@ -115,7 +178,7 @@
*/
Index: src/util.h
--- src/util.h.orig 2005-05-30 04:13:28 +0200
-+++ src/util.h 2005-07-03 20:10:59 +0200
++++ src/util.h 2005-09-26 17:01:03 +0200
@@ -28,7 +28,7 @@
int cd_root();
@@ -125,9 +188,21 @@
void socket_close(int fd);
+Index: src/util.hpp
+--- src/util.hpp.orig 2001-05-15 02:25:01 +0200
++++ src/util.hpp 2005-09-26 17:01:03 +0200
+@@ -15,7 +15,7 @@
+ {
+ sample = new T[size];
+ if (!sample) {
+- syslog(LOG_EMERG, "%s:%s (%d x %d)\n", "safe_new()", "could not
allocate array", size, sizeof(T));
++ syslog(LOG_EMERG, "%s:%s (%ld x %ld)\n", "safe_new()", "could not
allocate array", (long)size, (long)sizeof(T));
+ exit(1);
+ }
+
Index: src/vector.hpp
--- src/vector.hpp.orig 2005-06-28 23:46:27 +0200
-+++ src/vector.hpp 2005-07-03 20:11:34 +0200
++++ src/vector.hpp 2005-09-26 17:01:03 +0200
@@ -55,8 +55,6 @@
T *begin_ptr() const;
T *past_end_ptr() const;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/portfwd.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 portfwd.spec
--- openpkg-src/portfwd/portfwd.spec 3 Jul 2005 18:14:30 -0000 1.49
+++ openpkg-src/portfwd/portfwd.spec 26 Sep 2005 15:03:58 -0000 1.50
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 0.28
-Release: 20050703
+Release: 20050926
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
