Selaa lähdekoodia

move delegate to bleeding edge, gaining gcc4 support

Thomas Lotterer 20 vuotta sitten
vanhempi
commit
503cf0a45a
2 muutettua tiedostoa jossa 19 lisäystä ja 35 poistoa
  1. 0 16
      delegate/delegate.patch
  2. 19 19
      delegate/delegate.spec

+ 0 - 16
delegate/delegate.patch

@@ -31,22 +31,6 @@ Index: src/dget.c
  const char *strid_find(int tab,int hx,int id);
  int connect2server(Connection *Conn,PCStr(proto),PCStr(host),int port);
  
-Index: src/ftp.c
---- src/ftp.c.orig	2005-03-14 10:21:33 +0100
-+++ src/ftp.c	2005-07-25 19:53:26 +0200
-@@ -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
 --- src/smtpgate.c.orig	2005-02-28 23:38:56 +0100
 +++ src/smtpgate.c	2005-07-25 19:53:26 +0200

+ 19 - 19
delegate/delegate.spec

@@ -32,11 +32,11 @@ Distribution: OpenPKG
 Class:        BASE
 Group:        Network
 License:      Freely distributable
-Version:      8.11.5
-Release:      20050725
+Version:      9.0.4
+Release:      20050926
 
 #   list of sources
-Source0:      ftp://ftp:openpkg-dev%40openpkg.org@ftp.delegate.org/pub/DeleGate/delegate%{version}.tar.gz
+Source0:      ftp://ftp:openpkg-dev%40openpkg.org@ftp.delegate.org/pub/DeleGate/alpha/delegate%{version}.tar.gz
 Source1:      rc.delegate
 Source2:      delegated.cf
 Patch0:       delegate.patch
@@ -62,7 +62,7 @@ AutoReqProv:  no
 %track
     prog delegate = {
         version   = %{version}
-        url       = ftp://ftp.delegate.org/pub/DeleGate/
+        url       = ftp://ftp.delegate.org/pub/DeleGate/alpha/
         regex     = delegate(\d+\.\d+\.\d+)\.tar\.(gz|bz2)
     }
 
@@ -70,21 +70,21 @@ AutoReqProv:  no
     %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"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_CONFIG[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/etc/delegate/delegated.cf"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_DGROOT[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_VARDIR[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_ACTDIR[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/act"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_PIDFILE[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/delegate.pid"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_LOGDIR[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_ABORTLOG[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log/abort.log"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_LOGFILE[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log/common.log"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_ERRORLOG[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log/error.log"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_PROTOLOG[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log/proto.log"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_TRACELOG[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/log/trace.log"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_WORKDIR[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/work"\;;' \
-        -e 's;^\([ 	]*char[ 	]\{1,\}\*DELEGATE_TMPDIR[ 	]\{1,\}=\).*$;\1 "%{l_prefix}/var/delegate/tmp"\;;' \
+        -e 's;^\(const char \*DELEGATE_OWNER *=\) *.*$;\1 "%{l_rusr}/%{l_rgrp}"\;;' \
+        -e 's;^\(const char \*DELEGATE_ETCDIR *=\) *.*$;\1 "%{l_prefix}/etc/delegate"\;;' \
+        -e 's;^\(const char \*DELEGATE_CONFIG *=\) *.*$;\1 "%{l_prefix}/etc/delegate/delegated.cf"\;;' \
+        -e 's;^\(const char \*DELEGATE_DGROOT *=\) *.*$;\1 "%{l_prefix}/var/delegate"\;;' \
+        -e 's;^\(const char \*DELEGATE_VARDIR *=\) *.*$;\1 "%{l_prefix}/var/delegate"\;;' \
+        -e 's;^\(const char \*DELEGATE_ACTDIR *=\) *.*$;\1 "%{l_prefix}/var/delegate/act"\;;' \
+        -e 's;^\(const char \*DELEGATE_PIDFILE *=\) *.*$;\1 "%{l_prefix}/var/delegate/delegate.pid"\;;' \
+        -e 's;^\(const char \*DELEGATE_LOGDIR *=\) *.*$;\1 "%{l_prefix}/var/delegate/log"\;;' \
+        -e 's;^\(const char \*DELEGATE_ABORTLOG *=\) *.*$;\1 "%{l_prefix}/var/delegate/log/abort.log"\;;' \
+        -e 's;^\(const char \*DELEGATE_LOGFILE *=\) *.*$;\1 "%{l_prefix}/var/delegate/log/common.log"\;;' \
+        -e 's;^\(const char \*DELEGATE_ERRORLOG *=\) *.*$;\1 "%{l_prefix}/var/delegate/log/error.log"\;;' \
+        -e 's;^\(const char \*DELEGATE_PROTOLOG *=\) *.*$;\1 "%{l_prefix}/var/delegate/log/proto.log"\;;' \
+        -e 's;^\(const char \*DELEGATE_TRACELOG *=\) *.*$;\1 "%{l_prefix}/var/delegate/log/trace.log"\;;' \
+        -e 's;^\(const char \*DELEGATE_WORKDIR *=\) *.*$;\1 "%{l_prefix}/var/delegate/work"\;;' \
+        -e 's;^\(const char \*DELEGATE_TMPDIR *=\) *.*$;\1 "%{l_prefix}/var/delegate/tmp"\;;' \
         src/conf.c
 
 %build