packages: cvsnt/cvsnt-gcc4.patch, cvsnt/cvsnt-system-pcre.patch, cvsnt/cvsn...

arekm arekm at pld-linux.org
Sat Apr 10 13:20:29 CEST 2010 

Author: arekm                        Date: Sat Apr 10 11:20:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.5.05.3744

---- Files affected:
packages/cvsnt:
   cvsnt-gcc4.patch (1.4 -> 1.5) , cvsnt-system-pcre.patch (1.2 -> 1.3) , cvsnt.spec (1.43 -> 1.44) , cvsnt-crypt.patch (1.2 -> NONE)  (REMOVED), cvsnt-ipv6.patch (1.1 -> NONE)  (REMOVED), cvsnt-system-ltdl.patch (1.5 -> NONE)  (REMOVED), cvsnt-system-zlib.patch (1.1 -> NONE)  (REMOVED), cvsnt-visibility.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/cvsnt/cvsnt-gcc4.patch
diff -u packages/cvsnt/cvsnt-gcc4.patch:1.4 packages/cvsnt/cvsnt-gcc4.patch:1.5
--- packages/cvsnt/cvsnt-gcc4.patch:1.4	Fri Jul  3 15:35:27 2009
+++ packages/cvsnt/cvsnt-gcc4.patch	Sat Apr 10 13:20:23 2010
@@ -19,14 +19,4 @@
      
      if (last && (last != path))
          return last + 1;
---- cvsnt-2.5.04.3236/src/rcs.cpp~	2008-05-20 13:06:03.000000000 +0200
-+++ cvsnt-2.5.04.3236/src/rcs.cpp	2009-07-03 15:33:46.032338305 +0200
-@@ -5900,7 +5900,7 @@
- 		cvs::string fn;
- 		char *pathpos=NULL;
- 		if (rcsdiff_args.file!=NULL)
--			pathpos=strpbrk(PATCH_NULL(rcsdiff_args.file),"\\/");
-+			pathpos=strpbrk(PATCH_NULL((char *)rcsdiff_args.file),"\\/");
- 		if ((rcsdiff_args.file!=NULL)&&(pathpos!=NULL))
- 			cvs::sprintf(fn,80,"%s",rcsdiff_args.file);
- 		else
+

================================================================
Index: packages/cvsnt/cvsnt-system-pcre.patch
diff -u packages/cvsnt/cvsnt-system-pcre.patch:1.2 packages/cvsnt/cvsnt-system-pcre.patch:1.3
--- packages/cvsnt/cvsnt-system-pcre.patch:1.2	Sun Mar 30 12:09:05 2008
+++ packages/cvsnt/cvsnt-system-pcre.patch	Sat Apr 10 13:20:23 2010
@@ -1,31 +1,18 @@
-diff -urN cvsnt-2.5.04.2980.org/configure.in cvsnt-2.5.04.2980/configure.in
---- cvsnt-2.5.04.2980.org/configure.in	2008-02-14 05:26:00.000000000 +0100
-+++ cvsnt-2.5.04.2980/configure.in	2008-03-30 11:45:04.690572767 +0200
-@@ -424,10 +424,11 @@
- else
-   # Check for pcre posix library
-   saved_libs="$LIBS"
--  LIBS=""
--  AC_SEARCH_LIBS(pcre_compile, pcreposix, [AC_MSG_CHECKING([for PCRE posix library])
--       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pcreposix.h>]], [[int i;]])],[ac_cv_have_pcre="yes"],[])
--       AC_MSG_RESULT($ac_cv_have_pcre)], ac_cv_have_pcre="no")
-+  LIBS="-lpcreposix"
-+  AC_MSG_CHECKING([for PCRE posix library])
-+  AC_TRY_LINK([#include <pcreposix.h>], [regcomp(0, 0, 0);],
-+       [ac_cv_have_pcre="yes"],[ac_cv_have_pcre="no"])
-+  AC_MSG_RESULT([$ac_cv_have_pcre])
-   PCRE_LIBS="$LIBS"
-   LIBS="$saved_libs"
- fi
-diff -urN cvsnt-2.5.04.2980.org/Makefile.am cvsnt-2.5.04.2980/Makefile.am
---- cvsnt-2.5.04.2980.org/Makefile.am	2008-02-17 07:53:22.000000000 +0100
-+++ cvsnt-2.5.04.2980/Makefile.am	2008-03-30 11:43:13.315248392 +0200
-@@ -23,7 +23,7 @@
- if WITH_PCRE
-   PCRE_SUBDIR =
- else
--  PCRE_SUBDIR = pcre
-+  PCRE_SUBDIR = 
- endif
+--- cvsnt-2.5.05.3744/configure.in~	2009-11-24 15:52:22.000000000 +0100
++++ cvsnt-2.5.05.3744/configure.in	2010-04-10 12:34:00.151348422 +0200
+@@ -370,10 +370,11 @@
  
- if WITH_LOCKSERVER
+ # Check for pcre posix library
+ saved_libs="$LIBS"
+-LIBS=""
+-AC_SEARCH_LIBS(pcre_compile, pcreposix, [AC_MSG_CHECKING([for PCRE posix library])
+-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pcreposix.h>]], [[int i;]])],[ac_cv_have_pcre="yes"],[])
+-     AC_MSG_RESULT($ac_cv_have_pcre)], ac_cv_have_pcre="no")
++LIBS="-lpcreposix"
++AC_MSG_CHECKING([for PCRE posix library])
++AC_TRY_LINK([#include <pcreposix.h>], [regcomp(0, 0, 0);],
++	[ac_cv_have_pcre="yes"],[ac_cv_have_pcre="no"])
++AC_MSG_RESULT([$ac_cv_have_pcre])
+ PCRE_LIBS="$LIBS"
+ LIBS="$saved_libs"
+ AC_SUBST(PCRE_LIBS)

================================================================
Index: packages/cvsnt/cvsnt.spec
diff -u packages/cvsnt/cvsnt.spec:1.43 packages/cvsnt/cvsnt.spec:1.44
--- packages/cvsnt/cvsnt.spec:1.43	Mon Aug 17 21:34:11 2009
+++ packages/cvsnt/cvsnt.spec	Sat Apr 10 13:20:23 2010
@@ -22,27 +22,22 @@
 Summary:	Concurrent Versioning System
 Summary(pl.UTF-8):	Concurrent Versioning System
 Name:		cvsnt
-# 2.5.04 is current stable series (2.5.05 is not)
-Version:	2.5.04.3510
+# http://www.cvsnt.org/archive/2.5_stable tell which version is stable
+Version:	2.5.05.3744
 Release:	1
 License:	GPL v2+/LGPL v2+
 Group:		Development/Version Control
 Source0:	http://www.cvsnt.org/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	e4919c2d6d4b9795dc3a5cfa3a44836c
+# Source0-md5:	64aa0fc627893cc66182023b936260da
 Source1:	%{name}.inetd
 Source2:	%{name}-cvslockd.init
 Source3:	%{name}.pam
-Patch0:		%{name}-system-ltdl.patch
-Patch1:		%{name}-system-pcre.patch
-Patch2:		%{name}-system-zlib.patch
-Patch3:		%{name}-system-ntlm.patch
-Patch4:		%{name}-crypt.patch
-Patch5:		%{name}-build.patch
-Patch6:		%{name}-nospam.patch
-Patch7:		%{name}-ipv6.patch
-Patch8:		%{name}-fixes.patch
-Patch9:		%{name}-gcc4.patch
-Patch10:	%{name}-visibility.patch
+Patch0:		%{name}-system-pcre.patch
+Patch1:		%{name}-system-ntlm.patch
+Patch2:		%{name}-build.patch
+Patch3:		%{name}-nospam.patch
+Patch4:		%{name}-fixes.patch
+Patch5:		%{name}-gcc4.patch
 URL:		http://www.cvsnt.org/
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake >= 1:1.7.9
@@ -213,15 +208,10 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p0
 
-rm -rf pcre libltdl zlib protocols/ntlm
+rm -r protocols/ntlm
 
 %build
 %{__libtoolize}
@@ -306,7 +296,7 @@
 %files
 %defattr(644,root,root,755)
 %doc doc/html_cvsclient
-%doc AUTHORS FAQ README
+%doc AUTHORS README
 %doc triggers/examples/*.txt
 %dir %{_sysconfdir}/cvsnt
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/cvsnt
@@ -390,10 +380,10 @@
 %attr(755,root,root) %{_libdir}/cvsnt/protocols/sspi.so
 %{_libdir}/cvsnt/protocols/sspi.la
 
-%files protocol-sync
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/cvsnt/protocols/sync.so
-%{_libdir}/cvsnt/protocols/sync.la
+#%files protocol-sync
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/cvsnt/protocols/sync.so
+#%{_libdir}/cvsnt/protocols/sync.la
 
 %files rcs
 %defattr(644,root,root,755)
@@ -407,6 +397,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2010/04/10 11:20:23  arekm
+- up to 2.5.05.3744
+
 Revision 1.43  2009/08/17 19:34:11  arekm
 - up to 2.5.04.3510 (visibility disabled - broken)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cvsnt/cvsnt-gcc4.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cvsnt/cvsnt-system-pcre.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cvsnt/cvsnt.spec?r1=1.43&r2=1.44&f=u

More information about the pld-cvs-commit mailing list