[CVS] OpenPKG: openpkg-src/portfwd/ portfwd.patch portfwd.spec
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: 23-Oct-2007 10:05:14
Branch: HEAD Handle: 2007102309051301
Modified files:
openpkg-src/portfwd portfwd.patch portfwd.spec
Log:
upgrading package: portfwd 0.28 -> 0.29
Summary:
RevisionChanges Path
1.5 +9 -26 openpkg-src/portfwd/portfwd.patch
1.58+2 -2 openpkg-src/portfwd/portfwd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/portfwd.patch
$ cvs diff -u -r1.4 -r1.5 portfwd.patch
--- openpkg-src/portfwd/portfwd.patch 26 Sep 2005 15:03:58 - 1.4
+++ openpkg-src/portfwd/portfwd.patch 23 Oct 2007 08:05:13 - 1.5
@@ -1,6 +1,6 @@
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
getopt/getopt.c 2007-10-23 08:55:09 +0200
@@ -40,6 +40,7 @@
#endif
@@ -11,7 +11,7 @@
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
src/Makefile.in 2007-10-23 08:55:09 +0200
@@ -73,7 +73,7 @@
VERSION = @VERSION@
YACC = @YACC@
@@ -23,7 +23,7 @@
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
src/director.cc 2007-10-23 08:55:09 +0200
@@ -195,7 +195,7 @@
address.len = 0;
address.addr = (char *) malloc(address_buf_size * sizeof(char *));
@@ -44,7 +44,7 @@
Index: src/portfwd.cc
--- src/portfwd.cc.orig 2005-05-30 04:13:28 +0200
-+++ src/portfwd.cc 2005-09-26 17:01:03 +0200
src/portfwd.cc 2007-10-23 08:55:09 +0200
@@ -37,6 +37,8 @@
int on_the_fly_dns = 0;
@@ -117,7 +117,7 @@
exit(1);
Index: src/portfwd.h
--- src/portfwd.h.orig 2005-05-30 04:13:28 +0200
-+++ src/portfwd.h2005-09-26 17:01:03 +0200
src/portfwd.h2007-10-23 08:55:09 +0200
@@ -18,6 +18,7 @@
extern int on_the_fly_dns;
@@ -126,26 +126,9 @@
#endif /* PORTFWD_H */
-Index: src/proto_map.cc
src/proto_map.cc.orig2004-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-09-26 17:01:03 +0200
src/util.cc 2007-10-23 08:55:09 +0200
@@ -118,7 +118,7 @@
return 0;
}
@@ -178,7 +161,7 @@
*/
Index: src/util.h
--- src/util.h.orig 2005-05-30 04:13:28 +0200
-+++ src/util.h 2005-09-26 17:01:03 +0200
src/util.h 2007-10-23 08:55:09 +0200
@@ -28,7 +28,7 @@
int cd_root();
@@ -190,7 +173,7 @@
Index: src/util.hpp
--- src/util.hpp.orig2001-05-15 02:25:01 +0200
-+++ src/util.hpp 2005-09-26 17:01:03 +0200
src/util.hpp 2007-10-23 08:55:09 +0200
@@ -15,7 +15,7 @@
{
sample = new T[size];
@@ -202,7 +185,7 @@
Index: src/vector.hpp
--- src/vector.hpp.orig 2005-06-28 23:46:27 +0200
-+++ src/vector.hpp 2005-09-26 17:01:03 +0200
src/vector.hpp 2007-10-23 08:55:09 +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.57 -r1.58 portfwd.spec
--- openpkg-src/portfwd/portfwd.spec 20 Jul 2007 20:17:58 - 1.57
+++ openpkg-src/portfwd/portfwd.spec 23 Oct 2007 08:05:14 - 1.58
@@ -32,8 +32,8 @@
Class:BASE
Group:Network
License: GPL
-Version: 0.28
-Release: 20070720
+Version: 0.29
+Release: 20071023
# package options
%option with_fsl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/portfwd/ portfwd.patch portfwd.spec
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:
RevisionChanges 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 - 1.3
+++ openpkg-src/portfwd/portfwd.patch 26 Sep 2005 15:03:58 - 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
++#include
+
+ /* 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 \n",
+- " -c | --config \n",
++ " -c | --config \n"
+ " -p | --pidfile \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.h2005-07-03 20:10:59 +0200
src/portfwd.h2005-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.orig2004-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.orig2001-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) {
+-s
[CVS] OpenPKG: openpkg-src/portfwd/ portfwd.patch portfwd.spec
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: 03-Jul-2005 20:14:30
Branch: HEAD Handle: 2005070319143000
Modified files:
openpkg-src/portfwd portfwd.patch portfwd.spec
Log:
upgrading package: portfwd 0.27 -> 0.28
Summary:
RevisionChanges Path
1.3 +28 -23 openpkg-src/portfwd/portfwd.patch
1.49+2 -7 openpkg-src/portfwd/portfwd.spec
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/portfwd.patch
$ cvs diff -u -r1.2 -r1.3 portfwd.patch
--- openpkg-src/portfwd/portfwd.patch 21 Jun 2004 16:01:17 - 1.2
+++ openpkg-src/portfwd/portfwd.patch 3 Jul 2005 18:14:30 - 1.3
@@ -1,6 +1,7 @@
src/portfwd.cc.dist 2003-07-23 13:30:00.0 +0200
-+++ src/portfwd.cc 2003-07-23 14:22:44.0 +0200
-@@ -36,6 +36,8 @@
+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
+@@ -37,6 +37,8 @@
int on_the_fly_dns = 0;
int foreground = 0;
@@ -9,7 +10,7 @@
void usage(FILE *out)
{
-@@ -52,6 +54,7 @@
+@@ -53,6 +55,7 @@
" -f | --on-the-fly-dns\n"
" -g | --foreground\n"
" -c | --config \n",
@@ -17,7 +18,7 @@
prog);
}
-@@ -81,14 +84,16 @@
+@@ -82,14 +85,16 @@
{"on-the-fly-dns", 0, 0, 'f'},
{"foreground", 0, 0, 'g'},
{"config", 1, 0, 'c'},
@@ -35,7 +36,7 @@
if (opt == -1)
break;
-@@ -124,6 +129,13 @@
+@@ -125,6 +130,13 @@
}
*config = optarg;
break;
@@ -49,7 +50,7 @@
case '?':
usage(stderr);
exit(1);
-@@ -245,6 +257,9 @@
+@@ -246,6 +258,9 @@
closelog();
@@ -59,7 +60,7 @@
exit(0);
}
-@@ -290,7 +305,7 @@
+@@ -291,7 +306,7 @@
* Go to background.
*/
if (!foreground) {
@@ -68,9 +69,10 @@
if (dmz) {
syslog(LOG_ERR, "daemonize() failed: %d", dmz);
exit(1);
src/portfwd.h.dist 2003-07-23 13:32:46.0 +0200
-+++ src/portfwd.h2003-07-23 13:32:56.0 +0200
-@@ -20,6 +20,7 @@
+Index: src/portfwd.h
+--- src/portfwd.h.orig 2005-05-30 04:13:28 +0200
src/portfwd.h2005-07-03 20:10:59 +0200
+@@ -18,6 +18,7 @@
extern int on_the_fly_dns;
extern int foreground;
@@ -78,9 +80,10 @@
#endif /* PORTFWD_H */
src/util.cc.dist 2003-07-23 13:40:04.0 +0200
-+++ src/util.cc 2003-07-23 14:15:35.0 +0200
-@@ -135,7 +135,7 @@
+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
+@@ -118,7 +118,7 @@
return 0;
}
@@ -89,7 +92,7 @@
{
ONVERBOSE(syslog(LOG_INFO, "Daemonizing"));
-@@ -163,6 +163,20 @@
+@@ -146,6 +146,20 @@
return -1;
}
@@ -110,25 +113,27 @@
/*
* Parent exits
*/
src/util.h.dist 2003-07-23 14:09:04.0 +0200
-+++ src/util.h 2003-07-23 14:09:13.0 +0200
-@@ -29,7 +29,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
+@@ -28,7 +28,7 @@
+
int cd_root();
- void close_fds(int first_fd);
int std_to_null();
-int daemonize();
+int daemonize(const char *pidfile);
void socket_close(int fd);
src/vector.hpp.dist 2002-09-06 20:04:04.0 +0200
-+++ src/vector.hpp 2004-06-21 17:57:30.0 +0200
-@@ -51,8 +51,6 @@
+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
+@@ -55,8 +55,6 @@
T *begin_ptr() const;
T *past_end_ptr() const;
static T *next_ptr(T *i);
-
-- friend std::ostream& operator << (std::ostream& out, const vector& v);
+- friend std::ostream& operator << (std::ostream& out, const vector&
v);
};
template
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/portfwd.spec
$ cvs diff -u -r1.48 -r1.49 portfwd.spec
--- openpkg-src/portfwd/portfwd.spec 30 May 2005 13:41:29 - 1.48
+++ openpkg-src/portfwd/portfwd.spec 3 Jul 2005 18:14:30 - 1.49
@@ -32,8 +32,8 @@
Class:PLUS
Group:Network
[CVS] OpenPKG: openpkg-src/portfwd/ portfwd.patch portfwd.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 21-Jun-2004 18:01:18 Branch: HEAD Handle: -NONE- Modified files: openpkg-src/portfwd portfwd.patch portfwd.spec Log: remove unused friend which is causing problems (and hope it is not needed by foreign classes) Summary: RevisionChanges Path 1.2 +0 -0 openpkg-src/portfwd/portfwd.patch 1.43+0 -0 openpkg-src/portfwd/portfwd.spec patch -p0 <<'@@ .' Index: openpkg-src/portfwd/portfwd.patch $ cvs diff -u -r1.1 -r1.2 portfwd.patch --- openpkg-src/portfwd/portfwd.patch 23 Jul 2003 12:25:25 - 1.1 +++ openpkg-src/portfwd/portfwd.patch 21 Jun 2004 16:01:17 - 1.2 @@ -121,3 +121,14 @@ void socket_close(int fd); +--- src/vector.hpp.dist 2002-09-06 20:04:04.0 +0200 src/vector.hpp 2004-06-21 17:57:30.0 +0200 +@@ -51,8 +51,6 @@ + T *begin_ptr() const; + T *past_end_ptr() const; + static T *next_ptr(T *i); +- +- friend std::ostream& operator << (std::ostream& out, const vector& v); + }; + + template @@ . patch -p0 <<'@@ .' Index: openpkg-src/portfwd/portfwd.spec $ cvs diff -u -r1.42 -r1.43 portfwd.spec --- openpkg-src/portfwd/portfwd.spec 7 Feb 2004 17:58:02 - 1.42 +++ openpkg-src/portfwd/portfwd.spec 21 Jun 2004 16:01:17 - 1.43 @@ -34,7 +34,7 @@ Group:Network License: GPL Version: 0.26 -Release: 20040207 +Release: 20040621 # package options %option with_fsl yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
