[svn] r6101 - trunk/rpms/proxytunnel

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-01-18 20:21:34 +0100 (Fri, 18 Jan 2008)
New Revision: 6101

Added:
   trunk/rpms/proxytunnel/proxytunnel-1.8.0-makefile.patch
Modified:
   trunk/rpms/proxytunnel/proxytunnel.spec
Log:
Updates

Added: trunk/rpms/proxytunnel/proxytunnel-1.8.0-makefile.patch
===================================================================
--- trunk/rpms/proxytunnel/proxytunnel-1.8.0-makefile.patch	                        (rev 0)
+++ trunk/rpms/proxytunnel/proxytunnel-1.8.0-makefile.patch	2008-01-18 19:21:34 UTC (rev 6101)
@@ -0,0 +1,65 @@
+--- Makefile.orig	2007-12-30 15:15:40.000000000 +0100
++++ Makefile	2008-01-18 20:25:55.568273800 +0100
+@@ -4,25 +4,33 @@
+ 
+ CC ?= cc
+ CFLAGS ?= -Wall -O2 -ggdb
+-CFLAGS += -DHAVE_GETOPT_LONG 	# Comment on non-gnu systems
+-CFLAGS += -DUSE_SSL 		# Comment if you don't have/want ssl
++
++OPTFLAGS = -DREV=$(shell ./getrev.sh)
++
++# Comment on non-gnu systems
++OPTFLAGS += -DHAVE_GETOPT_LONG
++
++# Comment if you don't have/want ssl
++OPTFLAGS += -DUSE_SSL
++
+ # Most systems
+-CFLAGS += -DSETPROCTITLE -DSPT_TYPE=2
+-REV = $(shell ./getrev.sh)
+-CFLAGS += -DREV=$(REV)
++OPTFLAGS += -DSETPROCTITLE -DSPT_TYPE=2
+ 
+-# Testing new flags
+-CFLAGS += -DSO_REUSEPORT	# Comment if you don't have this flag
++# Comment if you don't have this flag
++OPTFLAGS += -DSO_REUSEPORT
+ 
+ # System dependant blocks... if your system is listed below, uncomment
+ # the relevant lines
+ 
+ # OpenBSD
+-#CFLAGS += -DHAVE_SYS_PSTAT_H
++#OPTFLAGS += -DHAVE_SYS_PSTAT_H
++
+ # DARWIN
+-#CFLAGS += -DDARWIN
++#OPTFLAGS += -DDARWIN
++
+ # CYGWIN
+-#CFLAGS += -DCYGWIN
++#OPTFLAGS += -DCYGWIN
++
+ # SOLARIS
+ #LDFLAGS += -lsocket -lnsl
+ #LDFLAGS += -L/usr/local/ssl/lib	# Path to your SSL lib dir
+@@ -61,12 +69,14 @@
+ 	ptstream.o
+ 
+ proxytunnel: $(OBJ)
+-	$(CC) -o $(PROGNAME) $(CFLAGS) $(OBJ) $(LDFLAGS)
++	$(CC) -o $(PROGNAME) $(CFLAGS) $(OPTFLAGS) $(OBJ) $(LDFLAGS)
+ 
+-clean:		
++clean:
+ 	@rm -f $(PROGNAME) $(OBJ)
+ 
+ install:
+-		install -Dp -m0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
+-		install -Dp -m0644 $(PROGNAME).1 $(DESTDIR)$(MANDIR)/man1/$(PROGNAME).1
++	install -Dp -m0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
++	install -Dp -m0644 $(PROGNAME).1 $(DESTDIR)$(MANDIR)/man1/$(PROGNAME).1
+ 
++.c.o:
++	$(CC) $(CFLAGS) $(OPTFLAGS) -c -o $@ $<

Modified: trunk/rpms/proxytunnel/proxytunnel.spec
===================================================================
--- trunk/rpms/proxytunnel/proxytunnel.spec	2008-01-18 16:44:22 UTC (rev 6100)
+++ trunk/rpms/proxytunnel/proxytunnel.spec	2008-01-18 19:21:34 UTC (rev 6101)
@@ -4,13 +4,14 @@
 
 Summary: Punching holes in HTTP(S) proxy's
 Name: proxytunnel
-Version: 1.7.0
+Version: 1.8.0
 Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://proxytunnel.sourceforge.net/
 
 Source: http://dl.sf.net/proxytunnel/proxytunnel-%{version}.tgz
+Patch0: proxytunnel-1.8.0-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: openssl-devel
@@ -34,10 +35,12 @@
 
 %prep
 %setup
+%patch0 -p0 -b .orig
 
 %build
-%{__make} %{?_smp_mflags} \
-	CFLAGS="%{optflags} -DHAVE_GETOPT_LONG -DUSE_SSL -DSETPROCTITLE -DSPT_TYPE=2 -I/usr/kerberos/include"
+### FIXME: Bug causes proxytunnel to malfunction on EL5 (gcc4 with -D_FORTIFY_SOURCE=2 or -fstack-protector)
+#%{__make} %{?_smp_mflags} CFLAGS="%{optflags}"
+%{__make} %{?_smp_mflags} CFLAGS="-Wall -O2 -I/usr/kerberos/include"
 
 %install
 %{__rm} -rf %{buildroot}
@@ -48,11 +51,14 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGES CREDITS LICENSE.txt README
+%doc CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README TODO
 %doc %{_mandir}/man1/proxytunnel.1*
 %{_bindir}/proxytunnel
 
 %changelog
+* Fri Jan 18 2008 Dag Wieers <dag at wieers.com> - 1.8.0-1
+- Updated to release 1.8.0.
+
 * Fri Mar 16 2007 Dag Wieers <dag at wieers.com> - 1.7.0-1
 - Updated to release 1.7.0.