packages: radsecproxy/radsecproxy-docbook2x.patch, radsecproxy/radsecproxy....

[blues]

Author: blues                        Date: Mon Apr 30 10:38:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.6 - remove applied patches (fticks, visinst), update docbook2x patch

---- Files affected:
packages/radsecproxy:
   radsecproxy-docbook2x.patch (1.2 -> 1.3) , radsecproxy.spec (1.20 -> 1.21) , radsecproxy-fticks.patch (1.1 -> NONE)  (REMOVED), radsecproxy-visinst.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/radsecproxy/radsecproxy-docbook2x.patch
diff -u packages/radsecproxy/radsecproxy-docbook2x.patch:1.2 packages/radsecproxy/radsecproxy-docbook2x.patch:1.3
--- packages/radsecproxy/radsecproxy-docbook2x.patch:1.2	Tue Dec 20 12:45:39 2011
+++ packages/radsecproxy/radsecproxy-docbook2x.patch	Mon Apr 30 12:38:47 2012
@@ -1,16 +1,3 @@
---- ./configure.ac.org	2011-10-08 16:07:29.000000000 +0200
-+++ ./configure.ac	2011-12-20 12:15:02.046440193 +0100
-@@ -101,8 +101,8 @@ if test "x$dtls" = "xyes" ; then
-   TARGET_CFLAGS="$TARGET_CFLAGS -DRADPROT_DTLS"
- fi
-  
--AC_ARG_VAR([DOCBOOK2X_MAN], [docbook2x-man])
--AC_CHECK_PROG([DOCBOOK2X_MAN], [docbook2x-man], [yes])
-+AC_ARG_VAR([DOCBOOK2X_MAN], [docbook2X2man])
-+AC_CHECK_PROG([DOCBOOK2X_MAN], [docbook2X2man], [yes])
- AM_CONDITIONAL(HAVE_DOCBOOK2X_MAN, test "$DOCBOOK2X_MAN" = "yes")
- 
- AC_SUBST(TARGET_CFLAGS)
 --- ./Makefile.am.org	2011-10-08 15:33:24.000000000 +0200
 +++ ./Makefile.am	2011-12-20 12:31:21.988362106 +0100
 @@ -65,7 +65,7 @@ endif
@@ -22,3 +9,19 @@
  
  # Build HTML version of radsecproxy.conf.5.  NOTE: Only tested with
  # 'openjade' package installed on Ubuntu 9.10.
+--- ./configure.ac.org	2012-04-27 14:53:59.000000000 +0200
++++ ./configure.ac	2012-04-30 12:36:22.135875837 +0200
+@@ -116,10 +116,11 @@ AM_CONDITIONAL(ENABLE_EXPERIMENTAL_DYNDI
+                test "$enable_experimental_dyndisc" = "yes")
+ 
+ 
+-AC_ARG_VAR([DOCBOOK2X_MAN], [docbook2x-man])
+-AC_CHECK_PROG([DOCBOOK2X_MAN], [docbook2x-man], [yes])
++AC_ARG_VAR([DOCBOOK2X_MAN], [docbook2X2man])
++AC_CHECK_PROG([DOCBOOK2X_MAN], [docbook2X2man], [yes])
+ AM_CONDITIONAL(HAVE_DOCBOOK2X_MAN, test "$DOCBOOK2X_MAN" = "yes")
+ 
++
+ AC_SUBST(TARGET_CFLAGS)
+ AC_SUBST(TARGET_LDFLAGS)
+ AX_CHECK_SSL

================================================================
Index: packages/radsecproxy/radsecproxy.spec
diff -u packages/radsecproxy/radsecproxy.spec:1.20 packages/radsecproxy/radsecproxy.spec:1.21
--- packages/radsecproxy/radsecproxy.spec:1.20	Tue Dec 20 16:46:42 2011
+++ packages/radsecproxy/radsecproxy.spec	Mon Apr 30 12:38:48 2012
@@ -3,12 +3,12 @@
 # - own UID/GID
 Summary:	RADIUS proxy that in addition to to usual RADIUS UDP transport, also supports TLS (RadSec)
 Name:		radsecproxy
-Version:	1.5
-Release:	3
+Version:	1.6
+Release:	1
 License:	GPLv2+ or BSD-like
 Group:		Networking/Daemons/Radius
 Source0:	http://software.uninett.no/radsecproxy/%{name}-%{version}.tar.gz
-# Source0-md5:	c65742a1b471c572ca7f6d11000d41f5
+# Source0-md5:	8d17ba6b97feeaff8c4e4baf5aca256d
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.upstart
@@ -49,8 +49,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#patch1 -p1
+#patch2 -p1
 
 %build
 %{__aclocal}
@@ -121,6 +121,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2012/04/30 10:38:48  blues
+- 1.6 - remove applied patches (fticks, visinst), update docbook2x patch
+
 Revision 1.20  2011/12/20 15:46:42  blues
 - BR: nettle-devel (for fticks)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/radsecproxy/radsecproxy-docbook2x.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/radsecproxy/radsecproxy.spec?r1=1.20&r2=1.21