OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Matthias Kurz
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jun-2005 14:59:53
Branch: HEAD Handle: 2005060713595300
Added files:
openpkg-src/delegate delegate.patch
Modified files:
openpkg-src/delegate delegate.spec
Log:
modifying package: delegate-8.11.4 20050520 -> 20050607
Summary:
Revision Changes Path
1.2 +159 -0 openpkg-src/delegate/delegate.patch
1.85 +5 -3 openpkg-src/delegate/delegate.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/delegate/delegate.patch
============================================================================
$ cvs diff -u -r0 -r1.2 delegate.patch
--- /dev/null 2005-06-07 14:59:44 +0200
+++ delegate.patch 2005-06-07 14:59:53 +0200
@@ -0,0 +1,159 @@
+Index: maker/_-poll.c
+===================================================================
+RCS file: /cvs/opkg/vendor_stuff/delegate/maker/_-poll.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 _-poll.c
+--- maker/_-poll.c 6 Jun 2005 15:53:41 -0000 1.1.1.1
++++ maker/_-poll.c 7 Jun 2005 06:55:38 -0000
+@@ -10,8 +10,8 @@
+ #include <errno.h>
+ #include "vsocket.h"
+ #include "yselect.h" /* FD_SETSIZE */
+-int syslog_ERROR(const char fmt*,...);
+-int syslog_DEBUG(const char fmt*,...);
++int syslog_ERROR(const char *fmt,...);
++int syslog_DEBUG(const char *fmt,...);
+
+ static int _gotRESET = -1;
+ int connRESETbypeer(){ return _gotRESET; }
+Index: src/X.c
+===================================================================
+RCS file: /cvs/opkg/vendor_stuff/delegate/src/X.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 X.c
+--- src/X.c 6 Jun 2005 15:53:39 -0000 1.1.1.1
++++ src/X.c 7 Jun 2005 06:55:38 -0000
+@@ -24,6 +24,13 @@
+ #include "delegate.h"
+ #include "fpoll.h"
+ #include "proc.h"
++
++/* #undef CS unconditionally
++ * real problem exists under Solaris (10) that defines CS in
++ * /usr/include/sys/ucontext.h which is included together with stdlib.h
++ */
++#undef CS
++
+ void DBGMSG(PCStr(fmt),...);
+
+ static jmp_buf tel_env;
+Index: src/dget.c
+===================================================================
+RCS file: /cvs/opkg/vendor_stuff/delegate/src/dget.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 dget.c
+--- src/dget.c 6 Jun 2005 15:53:39 -0000 1.1.1.1
++++ src/dget.c 7 Jun 2005 06:55:38 -0000
+@@ -27,6 +27,12 @@
+ #include "file.h"
+ #include "auth.h"
+
++/* #undef ERR unconditionally
++ * real problem exists under Solaris (10) that defines ERR in
++ * /usr/include/sys/regset.h which is included together with stdlib.h
++ */
++#undef ERR
++
+ const char *strid_find(int tab,int hx,int id);
+ int connect2server(Connection *Conn,PCStr(proto),PCStr(host),int port);
+
+Index: src/ftp.c
+===================================================================
+RCS file: /cvs/opkg/vendor_stuff/delegate/src/ftp.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 ftp.c
+--- src/ftp.c 6 Jun 2005 15:53:40 -0000 1.1.1.1
++++ src/ftp.c 7 Jun 2005 06:55:38 -0000
+@@ -33,6 +33,12 @@
+ #include "auth.h"
+ #include "proc.h"
+
++/* #undef FS unconditionally
++ * real problem exists under Solaris (10) that defines FS in
++ * /usr/include/sys/ucontext.h which is included together with stdlib.h
++ */
++#undef FS
++
+ int connect_ftp_data(Connection*Conn,PCStr(port),int
cntrlsock,PCStr(lhost),int lport);
+ void putFileInHTTP(FILE *tc,PCStr(path),PCStr(file));
+ FILE *dirtar_fopen(PCStr(path));
+Index: src/smtpgate.c
+===================================================================
+RCS file: /cvs/opkg/vendor_stuff/delegate/src/smtpgate.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 smtpgate.c
+--- src/smtpgate.c 6 Jun 2005 15:53:40 -0000 1.1.1.1
++++ src/smtpgate.c 7 Jun 2005 06:55:38 -0000
+@@ -49,6 +49,12 @@
+ #include "file.h"
+ #include "auth.h"
+
++/* #undef FS unconditionally
++ * real problem exists under Solaris (10) that defines FS in
++ * /usr/include/sys/ucontext.h which is included together with stdlib.h
++ */
++#undef FS
++
+ #define LNSIZE 1024
+ #define lfprintf SMTP_lfprintf
+ void SMTP_lfprintf(FILE *log,FILE *tosc,PCStr(fmt),...);
+Index: src/telnet.c
+===================================================================
+RCS file: /cvs/opkg/vendor_stuff/delegate/src/telnet.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 telnet.c
+--- src/telnet.c 6 Jun 2005 15:53:40 -0000 1.1.1.1
++++ src/telnet.c 7 Jun 2005 06:55:38 -0000
+@@ -28,6 +28,12 @@
+ #include "auth.h"
+ #include "proc.h"
+
++/* #undef CS unconditionally
++ * real problem exists under Solaris (10) that defines CS in
++ * /usr/include/sys/ucontext.h which is included together with stdlib.h
++ */
++#undef CS
++
+ extern int IO_TIMEOUT;
+
+ int makeXproxy(Connection
*Conn,PVStr(pxdisplay),PCStr(display),PVStr(pxhost),PCStr(relhost),PCStr(me),int
timeo);
+Index: src/urlfind.c
+===================================================================
+RCS file: /cvs/opkg/vendor_stuff/delegate/src/urlfind.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 urlfind.c
+--- src/urlfind.c 6 Jun 2005 15:53:40 -0000 1.1.1.1
++++ src/urlfind.c 7 Jun 2005 06:55:38 -0000
+@@ -25,6 +25,12 @@
+ #include "ystring.h"
+ #include "dglib.h"
+
++/* #undef ERR unconditionally
++ * real problem exists under Solaris (10) that defines ERR in
++ * /usr/include/sys/regset.h which is included together with stdlib.h
++ */
++#undef ERR
++
+ static const char *usage = "\
+ Usage: urlfind URL\n\
+ -- Find recursively in URL space.\n\
+Index: teleport/vehicle.c
+===================================================================
+RCS file: /cvs/opkg/vendor_stuff/delegate/teleport/vehicle.c,v
+retrieving revision 1.1.1.1
+diff -u -u -r1.1.1.1 vehicle.c
+--- teleport/vehicle.c 6 Jun 2005 15:53:40 -0000 1.1.1.1
++++ teleport/vehicle.c 7 Jun 2005 06:55:38 -0000
+@@ -21,6 +21,12 @@
+ #include <stdio.h>
+ #include "teleport.h"
+
++/* #undef ERR unconditionally
++ * real problem exists under Solaris (10) that defines ERR in
++ * /usr/include/sys/regset.h which is included together with stdlib.h
++ */
++#undef ERR
++
+ #define TP_INVITE "INVITE"
+ #define TP_ROUTE "ROUTE"
+ #define IMSIZE (1024*8)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/delegate/delegate.spec
============================================================================
$ cvs diff -u -r1.84 -r1.85 delegate.spec
--- openpkg-src/delegate/delegate.spec 20 May 2005 07:23:05 -0000
1.84
+++ openpkg-src/delegate/delegate.spec 7 Jun 2005 12:59:53 -0000
1.85
@@ -33,12 +33,13 @@
Group: Network
License: Freely distributable
Version: 8.11.4
-Release: 20050520
+Release: 20050607
# list of sources
Source0: ftp://ftp:[EMAIL
PROTECTED]/pub/DeleGate/delegate%{version}.tar.gz
Source1: rc.delegate
Source2: delegated.cf
+Patch0: delegate.patch
# build information
Prefix: %{l_prefix}
@@ -67,6 +68,7 @@
%prep
%setup -q -n delegate%{version}
+ %patch -p0
%{l_shtool} subst \
-e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_OWNER[
]\{1,\}=\).*$;\1 "%{l_rusr}/%{l_rgrp}"\;;' \
-e 's;^\([ ]*char[ ]\{1,\}\*DELEGATE_ETCDIR[
]\{1,\}=\).*$;\1 "%{l_prefix}/etc/delegate"\;;' \
@@ -99,7 +101,7 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/delegate \
$RPM_BUILD_ROOT%{l_prefix}/sbin \
- $RPM_BUILD_ROOT%{l_prefix}/share/delegate
+ $RPM_BUILD_ROOT%{l_prefix}/share/delegate/docs
%{l_shtool} mkdir -f -p -m 700 \
$RPM_BUILD_ROOT%{l_prefix}/var/delegate/act \
$RPM_BUILD_ROOT%{l_prefix}/var/delegate/adm \
@@ -110,7 +112,7 @@
%{l_shtool} install -c -s -m 755 \
src/delegated $RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_shtool} install -c -m 644 \
- doc/Manual.htm $RPM_BUILD_ROOT%{l_prefix}/share/delegate/manual.html
+ doc/Manual.htm
$RPM_BUILD_ROOT%{l_prefix}/share/delegate/docs/manual.html
# install default configuration
%{l_shtool} install -c -m 644 %{l_value -s -a} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
