Changes - j0ke.net Open Build Service

Changes of Revision 8

[-] [+]	Changed	ucspi-tcp.spec
@@ -14,16 +14,17 @@ Name: ucspi-tcp Summary: tcpserver and tcpclient for building TCP client-server apps Version: 0.88 -Release: 2 +Release: 3 License: GNU Group: System/Daemons URL: http://cr.yp.to/ucspi-tcp.html Source: %{name}-%{version}.tar.bz2 Source1: %{name}-%{version}-man.tar.bz2 -Patch: %{name}-%{version}-ssl.diff +Patch0: %{name}-%{version}-ipv6.diff19 Patch1: %{name}-%{version}-rblsmtpd.diff Patch2: %{name}-%{version}-rblsmtpd-ignore-on-RELAYCLIENT.patch Patch3: %{name}-%{version}-rblspp.patch +Patch4: %{name}-%{version}-ssl.diff Buildroot: %{_tmppath}/%{name}-%{version} BuildRequires: openssl-devel mysql-devel zlib-devel Requires: daemontools >= 0.76 openssl mysql zlib glibc >= 2.3 @@ -79,11 +80,11 @@ %prep #---------------------------------------------------------------------------------- %setup -n %{name}-%{version} -a 1 -%patch -p1 +%patch0 -p1 %patch1 -p1 %patch2 -p0 %patch3 -p1 - +%patch4 -p1 #---------------------------------------------------------------------------------- %build #---------------------------------------------------------------------------------- @@ -147,8 +148,11 @@ #---------------------------------------------------------------------------------- %changelog #---------------------------------------------------------------------------------- -* Sat Feb 21 2009 Carsten Schoene <cs@linux-administrator.com> 0.88-2 +* Mon May 01 2009 Carsten Schoene <cs@linux-administrator.com> - 0.88-3 +- add fefe's ipv6 patch and modified SSL patch to work with it + +* Sat Feb 21 2009 Carsten Schoene <cs@linux-administrator.com> - 0.88-2 - add rblspp patch & subpackage -* Sat Sep 22 2007 - Christian Wittmer <rpm@scorpio-it.net> 0.88 - 1 +* Sat Sep 22 2007 - Christian Wittmer <rpm@scorpio-it.net> - 0.88-1 - first run
[-] [+]	Added	ucspi-tcp-0.88-ipv6.diff19 ^
@@ -0,0 +1,4899 @@ +diff -uNr ucspi-tcp-0.88.orig/FILES ucspi-tcp-0.88/FILES +--- ucspi-tcp-0.88.orig/FILES 2000-03-18 16:18:42.000000000 +0100 ++++ ucspi-tcp-0.88/FILES 2009-03-19 12:43:14.894761759 +0100 +@@ -216,3 +216,40 @@ + warn-auto.sh + warn-shsgr + x86cpuid.c ++dns_ip6.c ++dns_ipq6.c ++dns_nd6.c ++dns_sortip6.c ++fmt_xlong.c ++ip6_fmt.c ++ip6_scan.c ++scan_0x.c ++socket_accept6.c ++socket_bind6.c ++socket_conn6.c ++socket_local6.c ++socket_recv6.c ++socket_remote6.c ++socket_send6.c ++socket_tcp6.c ++timeoutconn6.c ++tryip6.c ++haveip6.h2 ++haveip6.h1 ++remoteinfo6.c ++addcr.1 ++argv0.1 ++date@.1 ++delcr.1 ++finger@.1 ++fixcr.1 ++http@.1 ++mconnect.1 ++recordio.1 ++tcp-environ.5 ++tcpcat.1 ++tcpclient.1 ++tcprules.1 ++tcprulescheck.1 ++tcpserver.1 ++who@.1 +diff -uNr ucspi-tcp-0.88.orig/Makefile ucspi-tcp-0.88/Makefile +--- ucspi-tcp-0.88.orig/Makefile 2000-03-18 16:18:42.000000000 +0100 ++++ ucspi-tcp-0.88/Makefile 2009-03-19 12:43:14.894761759 +0100 +@@ -76,12 +76,14 @@ + makelib byte_chr.o byte_copy.o byte_cr.o byte_diff.o byte_rchr.o \ + byte_zero.o case_diffb.o case_diffs.o fmt_ulong.o ip4_fmt.o \ + ip4_scan.o scan_ulong.o str_chr.o str_diff.o str_len.o str_start.o \ +-uint16_pack.o uint16_unpack.o uint32_pack.o uint32_unpack.o ++uint16_pack.o uint16_unpack.o uint32_pack.o uint32_unpack.o \ ++ip6_fmt.o scan_ip6.o scan_xlong.o fmt_xlong.o + ./makelib byte.a byte_chr.o byte_copy.o byte_cr.o \ + byte_diff.o byte_rchr.o byte_zero.o case_diffb.o \ + case_diffs.o fmt_ulong.o ip4_fmt.o ip4_scan.o scan_ulong.o \ + str_chr.o str_diff.o str_len.o str_start.o uint16_pack.o \ +- uint16_unpack.o uint32_pack.o uint32_unpack.o ++ uint16_unpack.o uint32_pack.o uint32_unpack.o ip6_fmt.o \ ++ scan_ip6.o scan_xlong.o fmt_xlong.o + + byte_chr.o: \ + compile byte_chr.c byte.h +@@ -181,11 +183,13 @@ + dns.a: \ + makelib dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o dns_ipq.o \ + dns_name.o dns_nd.o dns_packet.o dns_random.o dns_rcip.o dns_rcrw.o \ +-dns_resolve.o dns_sortip.o dns_transmit.o dns_txt.o ++dns_resolve.o dns_sortip.o dns_transmit.o dns_txt.o dns_ip6.o \ ++dns_sortip6.o dns_nd6.o dns_ipq6.o + ./makelib dns.a dns_dfd.o dns_domain.o dns_dtda.o dns_ip.o \ + dns_ipq.o dns_name.o dns_nd.o dns_packet.o dns_random.o \ + dns_rcip.o dns_rcrw.o dns_resolve.o dns_sortip.o \ +- dns_transmit.o dns_txt.o ++ dns_transmit.o dns_txt.o dns_ip6.o dns_sortip6.o dns_nd6.o \ ++ dns_ipq6.o + + dns_dfd.o: \ + compile dns_dfd.c error.h alloc.h byte.h dns.h stralloc.h gen_alloc.h \ +@@ -257,7 +261,7 @@ + dns_transmit.o: \ + compile dns_transmit.c socket.h uint16.h alloc.h error.h byte.h \ + readwrite.h uint16.h dns.h stralloc.h gen_alloc.h iopause.h taia.h \ +-tai.h uint64.h taia.h ++tai.h uint64.h taia.h uint32.h + ./compile dns_transmit.c + + dns_txt.o: \ +@@ -498,9 +502,15 @@ + remoteinfo.o: \ + compile remoteinfo.c fmt.h buffer.h socket.h uint16.h error.h \ + iopause.h taia.h tai.h uint64.h timeoutconn.h uint16.h remoteinfo.h \ +-stralloc.h gen_alloc.h uint16.h ++stralloc.h gen_alloc.h uint16.h uint32.h + ./compile remoteinfo.c + ++remoteinfo6.o: \ ++compile remoteinfo6.c fmt.h buffer.h socket.h uint16.h error.h \ ++iopause.h taia.h tai.h uint64.h timeoutconn.h uint16.h remoteinfo.h \ ++stralloc.h gen_alloc.h uint16.h uint32.h ++ ./compile remoteinfo6.c ++ + rts: \ + warn-auto.sh rts.sh conf-home + cat warn-auto.sh rts.sh \ +@@ -557,43 +567,43 @@ + rm -f trylsock.o trylsock + + socket_accept.o: \ +-compile socket_accept.c byte.h socket.h uint16.h ++compile socket_accept.c byte.h socket.h uint16.h uint32.h + ./compile socket_accept.c + + socket_bind.o: \ +-compile socket_bind.c byte.h socket.h uint16.h ++compile socket_bind.c byte.h socket.h uint16.h uint32.h + ./compile socket_bind.c + + socket_conn.o: \ +-compile socket_conn.c readwrite.h byte.h socket.h uint16.h ++compile socket_conn.c readwrite.h byte.h socket.h uint16.h uint32.h + ./compile socket_conn.c + + socket_delay.o: \ +-compile socket_delay.c socket.h uint16.h ++compile socket_delay.c socket.h uint16.h uint32.h + ./compile socket_delay.c + + socket_listen.o: \ +-compile socket_listen.c socket.h uint16.h ++compile socket_listen.c socket.h uint16.h uint32.h + ./compile socket_listen.c + + socket_local.o: \ +-compile socket_local.c byte.h socket.h uint16.h ++compile socket_local.c byte.h socket.h uint16.h uint32.h + ./compile socket_local.c + + socket_opts.o: \ +-compile socket_opts.c socket.h uint16.h ++compile socket_opts.c socket.h uint16.h uint32.h + ./compile socket_opts.c + + socket_remote.o: \ +-compile socket_remote.c byte.h socket.h uint16.h ++compile socket_remote.c byte.h socket.h uint16.h uint32.h + ./compile socket_remote.c + + socket_tcp.o: \ +-compile socket_tcp.c ndelay.h socket.h uint16.h ++compile socket_tcp.c ndelay.h socket.h uint16.h uint32.h + ./compile socket_tcp.c + + socket_udp.o: \ +-compile socket_udp.c ndelay.h socket.h uint16.h ++compile socket_udp.c ndelay.h socket.h uint16.h uint32.h + ./compile socket_udp.c + + str_chr.o: \ +@@ -710,9 +720,9 @@ + chmod 755 tcpcat + + tcpclient: \ +-load tcpclient.o remoteinfo.o timeoutconn.o dns.a time.a unix.a \ +-byte.a socket.lib +- ./load tcpclient remoteinfo.o timeoutconn.o dns.a time.a \ ++load tcpclient.o remoteinfo6.o dns.a time.a unix.a \ ++byte.a socket.lib byte.h timeoutconn6.o ++ ./load tcpclient remoteinfo6.o timeoutconn6.o dns.a time.a \ + unix.a byte.a `cat socket.lib` + + tcpclient.o: \ +@@ -720,7 +730,7 @@ + scan.h str.h ip4.h uint16.h socket.h uint16.h fd.h stralloc.h \ + gen_alloc.h buffer.h error.h strerr.h pathexec.h timeoutconn.h \ + uint16.h remoteinfo.h stralloc.h uint16.h dns.h stralloc.h iopause.h \ +-taia.h tai.h uint64.h taia.h ++taia.h tai.h uint64.h taia.h uint32.h + ./compile tcpclient.c + + tcprules: \ +@@ -742,9 +752,9 @@ + ./compile tcprulescheck.c + + tcpserver: \ +-load tcpserver.o rules.o remoteinfo.o timeoutconn.o cdb.a dns.a \ ++load tcpserver.o rules.o remoteinfo6.o timeoutconn6.o cdb.a dns.a \ + time.a unix.a byte.a socket.lib +- ./load tcpserver rules.o remoteinfo.o timeoutconn.o cdb.a \ ++ ./load tcpserver rules.o remoteinfo6.o timeoutconn6.o cdb.a \ + dns.a time.a unix.a byte.a `cat socket.lib` + + tcpserver.o: \ +@@ -753,7 +763,7 @@ + alloc.h buffer.h error.h strerr.h sgetopt.h subgetopt.h pathexec.h \ + socket.h uint16.h ndelay.h remoteinfo.h stralloc.h uint16.h rules.h \ + stralloc.h sig.h dns.h stralloc.h iopause.h taia.h tai.h uint64.h \ +-taia.h
[-] [+]	Changed	ucspi-tcp-0.88-ssl.diff ^
@@ -1,1597 +1,30 @@ -diff -ruN ucspi-tcp-0.88-orig/addcr.1 ucspi-tcp-0.88/addcr.1 ---- ucspi-tcp-0.88-orig/addcr.1 1970-01-01 01:00:00.000000000 +0100 -+++ ucspi-tcp-0.88/addcr.1 2005-12-05 12:24:50.000000000 +0100 -@@ -0,0 +1,22 @@ -+.TH addcr 1 -+.SH NAME -+addcr \- add a CR before each LF -+.SH SYNOPSIS -+.B addcr -+.SH DESCRIPTION -+.B addcr -+inserts CR at the end of each line of input. -+It does not insert CR at the end of a partial final line. -+.SH COMPATIBILITY -+Some vendors ship -+.B unix2dos -+or -+.B bsd2dos -+tools similar to -+.BR addcr . -+Those tools often blow up on long lines and nulls. -+.B addcr -+has no trouble with long lines and nulls. -+.SH "SEE ALSO" -+delcr(1), -+fixcrio(1) -diff -ruN ucspi-tcp-0.88-orig/argv0.1 ucspi-tcp-0.88/argv0.1 ---- ucspi-tcp-0.88-orig/argv0.1 1970-01-01 01:00:00.000000000 +0100 -+++ ucspi-tcp-0.88/argv0.1 2005-12-05 12:24:50.000000000 +0100 -@@ -0,0 +1,47 @@ -+.TH argv0 1 -+.SH NAME -+argv0 \- run a program with a specified 0th argument -+.SH SYNOPSIS -+.B argv0 -+.I realname -+.I zero -+[ -+.I arg ... -+] -+.SH DESCRIPTION -+.B argv0 -+runs -+the program stored as -+.I realname -+on disk, -+with the given -+arguments. -+It sets the 0th argument of -+the program to -+.IR zero . -+ -+For example, -+ -+.EX -+ argv0 /bin/csh -bin/csh -+.EE -+ -+runs -+.B /bin/csh -+with a 0th argument of -+.BR -bin/csh . -+.B csh -+will think it is a login shell -+and behave accordingly. -+ -+.B argv0 -+can be used to run some -+.B inetd -+wrappers under -+.BR tcpserver . -+.SH "SEE ALSO" -+csh(1), -+tcpserver(1), -+execve(2), -+execvp(3), -+inetd(8) -diff -ruN ucspi-tcp-0.88-orig/date@.1 ucspi-tcp-0.88/date@.1 ---- ucspi-tcp-0.88-orig/date@.1 1970-01-01 01:00:00.000000000 +0100 -+++ ucspi-tcp-0.88/date@.1 2005-12-05 12:24:50.000000000 +0100 -@@ -0,0 +1,32 @@ -+.TH date@ 1 -+.SH NAME -+date@ \- print the date on a host -+.SH SYNTAX -+.B date@ -+[ -+.I host -+] -+.SH DESCRIPTION -+.B date@ -+connects to TCP port 13 (Daytime) on -+.I host -+and prints any data it receives. -+It removes CR and converts unprintable characters to a visible format. -+ -+If -+.I host -+is not supplied, -+.B date@ -+connects to the local host. -+ -+Some computers respond to port 13 with a human-readable date. -+For example, they may be running -+ -+.EX -+ tcpserver 0 13 date & -+.EE -+.SH "SEE ALSO" -+cat(1), -+delcr(1), -+tcpclient(1), -+tcpserver(1) -diff -ruN ucspi-tcp-0.88-orig/delcr.1 ucspi-tcp-0.88/delcr.1 ---- ucspi-tcp-0.88-orig/delcr.1 1970-01-01 01:00:00.000000000 +0100 -+++ ucspi-tcp-0.88/delcr.1 2005-12-05 12:24:50.000000000 +0100 -@@ -0,0 +1,30 @@ -+.TH delcr 1 -+.SH NAME -+delcr \- remove a CR before each LF -+.SH SYNOPSIS -+.B delcr -+.SH DESCRIPTION -+.B delcr -+removes a CR at the end of each line of input, -+if a CR is present. -+It also removes a CR at the end of a partial final line. -+ -+The pipeline -+ -+.EX -+ addcr \| delcr -+.EE -+ -+prints an exact copy of its input. -+.SH COMPATIBILITY -+Some vendors ship -+.B dos2unix -+or -+.B dos2bsd -+tools similar to -+.BR delcr . -+Those tools often blow up on long lines and nulls. -+.B delcr -+has no trouble with long lines and nulls. -+.SH "SEE ALSO" -+addcr(1) -diff -ruN ucspi-tcp-0.88-orig/error.h ucspi-tcp-0.88/error.h ---- ucspi-tcp-0.88-orig/error.h 2000-03-18 16:18:42.000000000 +0100 -+++ ucspi-tcp-0.88/error.h 2005-12-05 12:24:50.000000000 +0100 -@@ -1,7 +1,7 @@ - #ifndef ERROR_H - #define ERROR_H - --extern int errno; -+#include <errno.h> - - extern int error_intr; - extern int error_nomem; -diff -ruN ucspi-tcp-0.88-orig/FILES ucspi-tcp-0.88/FILES ---- ucspi-tcp-0.88-orig/FILES 2000-03-18 16:18:42.000000000 +0100 -+++ ucspi-tcp-0.88/FILES 2005-12-05 12:24:50.000000000 +0100 -@@ -216,3 +216,19 @@ - warn-auto.sh - warn-shsgr - x86cpuid.c -+addcr.1 -+argv0.1 -+date@.1 -+delcr.1 -+finger@.1 -+fixcrio.1 -+http@.1 -+mconnect.1 -+recordio.1 -+tcpcat.1 -+tcpclient.1 -+tcprules.1 -+tcprulescheck.1 -+tcpserver.1 -+who@.1 -+tcp-environ.5 -diff -ruN ucspi-tcp-0.88-orig/finger@.1 ucspi-tcp-0.88/finger@.1 ---- ucspi-tcp-0.88-orig/finger@.1 1970-01-01 01:00:00.000000000 +0100 -+++ ucspi-tcp-0.88/finger@.1 2005-12-05 12:24:50.000000000 +0100 -@@ -0,0 +1,45 @@ -+.TH finger@ 1 -+.SH NAME -+finger@ \- get user information from a host -+.SH SYNTAX -+.B finger@ -+[ -+.I host -+[ -+.I user -+] -+] -+.SH DESCRIPTION -+.B finger@
[-] [+]	Added	ucspi-tcp-0.88-ssl.diff.orig ^
@@ -0,0 +1,2097 @@ +diff -ruN ucspi-tcp-0.88-orig/addcr.1 ucspi-tcp-0.88/addcr.1 +--- ucspi-tcp-0.88-orig/addcr.1 1970-01-01 01:00:00.000000000 +0100 ++++ ucspi-tcp-0.88/addcr.1 2005-12-05 12:24:50.000000000 +0100 +@@ -0,0 +1,22 @@ ++.TH addcr 1 ++.SH NAME ++addcr \- add a CR before each LF ++.SH SYNOPSIS ++.B addcr ++.SH DESCRIPTION ++.B addcr ++inserts CR at the end of each line of input. ++It does not insert CR at the end of a partial final line. ++.SH COMPATIBILITY ++Some vendors ship ++.B unix2dos ++or ++.B bsd2dos ++tools similar to ++.BR addcr . ++Those tools often blow up on long lines and nulls. ++.B addcr ++has no trouble with long lines and nulls. ++.SH "SEE ALSO" ++delcr(1), ++fixcrio(1) +diff -ruN ucspi-tcp-0.88-orig/argv0.1 ucspi-tcp-0.88/argv0.1 +--- ucspi-tcp-0.88-orig/argv0.1 1970-01-01 01:00:00.000000000 +0100 ++++ ucspi-tcp-0.88/argv0.1 2005-12-05 12:24:50.000000000 +0100 +@@ -0,0 +1,47 @@ ++.TH argv0 1 ++.SH NAME ++argv0 \- run a program with a specified 0th argument ++.SH SYNOPSIS ++.B argv0 ++.I realname ++.I zero ++[ ++.I arg ... ++] ++.SH DESCRIPTION ++.B argv0 ++runs ++the program stored as ++.I realname ++on disk, ++with the given ++arguments. ++It sets the 0th argument of ++the program to ++.IR zero . ++ ++For example, ++ ++.EX ++ argv0 /bin/csh -bin/csh ++.EE ++ ++runs ++.B /bin/csh ++with a 0th argument of ++.BR -bin/csh . ++.B csh ++will think it is a login shell ++and behave accordingly. ++ ++.B argv0 ++can be used to run some ++.B inetd ++wrappers under ++.BR tcpserver . ++.SH "SEE ALSO" ++csh(1), ++tcpserver(1), ++execve(2), ++execvp(3), ++inetd(8) +diff -ruN ucspi-tcp-0.88-orig/date@.1 ucspi-tcp-0.88/date@.1 +--- ucspi-tcp-0.88-orig/date@.1 1970-01-01 01:00:00.000000000 +0100 ++++ ucspi-tcp-0.88/date@.1 2005-12-05 12:24:50.000000000 +0100 +@@ -0,0 +1,32 @@ ++.TH date@ 1 ++.SH NAME ++date@ \- print the date on a host ++.SH SYNTAX ++.B date@ ++[ ++.I host ++] ++.SH DESCRIPTION ++.B date@ ++connects to TCP port 13 (Daytime) on ++.I host ++and prints any data it receives. ++It removes CR and converts unprintable characters to a visible format. ++ ++If ++.I host ++is not supplied, ++.B date@ ++connects to the local host. ++ ++Some computers respond to port 13 with a human-readable date. ++For example, they may be running ++ ++.EX ++ tcpserver 0 13 date & ++.EE ++.SH "SEE ALSO" ++cat(1), ++delcr(1), ++tcpclient(1), ++tcpserver(1) +diff -ruN ucspi-tcp-0.88-orig/delcr.1 ucspi-tcp-0.88/delcr.1 +--- ucspi-tcp-0.88-orig/delcr.1 1970-01-01 01:00:00.000000000 +0100 ++++ ucspi-tcp-0.88/delcr.1 2005-12-05 12:24:50.000000000 +0100 +@@ -0,0 +1,30 @@ ++.TH delcr 1 ++.SH NAME ++delcr \- remove a CR before each LF ++.SH SYNOPSIS ++.B delcr ++.SH DESCRIPTION ++.B delcr ++removes a CR at the end of each line of input, ++if a CR is present. ++It also removes a CR at the end of a partial final line. ++ ++The pipeline ++ ++.EX ++ addcr \| delcr ++.EE ++ ++prints an exact copy of its input. ++.SH COMPATIBILITY ++Some vendors ship ++.B dos2unix ++or ++.B dos2bsd ++tools similar to ++.BR delcr . ++Those tools often blow up on long lines and nulls. ++.B delcr ++has no trouble with long lines and nulls. ++.SH "SEE ALSO" ++addcr(1) +diff -ruN ucspi-tcp-0.88-orig/error.h ucspi-tcp-0.88/error.h +--- ucspi-tcp-0.88-orig/error.h 2000-03-18 16:18:42.000000000 +0100 ++++ ucspi-tcp-0.88/error.h 2005-12-05 12:24:50.000000000 +0100 +@@ -1,7 +1,7 @@ + #ifndef ERROR_H + #define ERROR_H + +-extern int errno; ++#include <errno.h> + + extern int error_intr; + extern int error_nomem; +diff -ruN ucspi-tcp-0.88-orig/FILES ucspi-tcp-0.88/FILES +--- ucspi-tcp-0.88-orig/FILES 2000-03-18 16:18:42.000000000 +0100 ++++ ucspi-tcp-0.88/FILES 2005-12-05 12:24:50.000000000 +0100 +@@ -216,3 +216,19 @@ + warn-auto.sh + warn-shsgr + x86cpuid.c ++addcr.1 ++argv0.1 ++date@.1 ++delcr.1 ++finger@.1 ++fixcrio.1 ++http@.1 ++mconnect.1 ++recordio.1 ++tcpcat.1 ++tcpclient.1 ++tcprules.1 ++tcprulescheck.1 ++tcpserver.1 ++who@.1 ++tcp-environ.5 +diff -ruN ucspi-tcp-0.88-orig/finger@.1 ucspi-tcp-0.88/finger@.1 +--- ucspi-tcp-0.88-orig/finger@.1 1970-01-01 01:00:00.000000000 +0100 ++++ ucspi-tcp-0.88/finger@.1 2005-12-05 12:24:50.000000000 +0100 +@@ -0,0 +1,45 @@ ++.TH finger@ 1 ++.SH NAME ++finger@ \- get user information from a host ++.SH SYNTAX ++.B finger@ ++[ ++.I host ++[ ++.I user ++] ++] ++.SH DESCRIPTION ++.B finger@