[csw-devel] SF.net SVN: gar:[17800] csw/mgar/pkg/vsftpd/trunk

[chninkel at users.sourceforge.net]

Revision: 17800
          http://gar.svn.sourceforge.net/gar/?rev=17800&view=rev
Author:   chninkel
Date:     2012-04-21 12:19:34 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
vsftpd/trunk: updated depandancy name and Makefile patch

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW
    csw/mgar/pkg/vsftpd/trunk/files/csw_build_system.patch

Added Paths:
-----------
    csw/mgar/pkg/vsftpd/trunk/files/avoid_pam_conv_warning.patch

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2012-04-21 00:12:25 UTC (rev 17799)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2012-04-21 12:19:34 UTC (rev 17800)
@@ -31,8 +31,8 @@
 
 PACKAGES = CSWvsftpd
 
-RUNTIME_DEP_PKGS  = CSWtcpwrap 
-RUNTIME_DEP_PKGS += CSWosslrt 
+RUNTIME_DEP_PKGS  = CSWlibwrap1
+RUNTIME_DEP_PKGS += CSWlibssl0-9-8
 
 # Reference to DTD path, can be safely ignored
 CHECKPKG_OVERRIDES_CSWvsftpd += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswvsftpd.xml
@@ -91,6 +91,10 @@
 # vsftpd makfile
 PATCHFILES += destdir.patch
 
+# patch to avoid an incompatible pointer type
+# error when compiling under Solaris with -Werror
+PATCHFILES += avoid_pam_conv_warning.patch
+
 # Documentation files
 DOCFILES  = AUDIT BENCHMARKS BUGS COPYING COPYRIGHT Changelog FAQ INSTALL LICENSE REFS
 DOCFILES += REWARD SIZE SPEED TODO TUNING README README.ssl README.security

Added: csw/mgar/pkg/vsftpd/trunk/files/avoid_pam_conv_warning.patch
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/avoid_pam_conv_warning.patch	                        (rev 0)
+++ csw/mgar/pkg/vsftpd/trunk/files/avoid_pam_conv_warning.patch	2012-04-21 12:19:34 UTC (rev 17800)
@@ -0,0 +1,30 @@
+--- vsftpd-3.0.0.orig/sysdeputil.c	Fri Mar 26 04:25:33 2010
++++ vsftpd-3.0.0/sysdeputil.c		Fri Apr 20 23:50:22 2012
+@@ -313,8 +313,13 @@
+ 
+ static pam_handle_t* s_pamh;
+ static struct mystr s_pword_str;
++#if defined(sun) && defined(__SVR4) 
++static int pam_conv_func(int nmsg, struct pam_message** p_msg,
++                         struct pam_response** p_reply, void* p_addata);
++#else
+ static int pam_conv_func(int nmsg, const struct pam_message** p_msg,
+                          struct pam_response** p_reply, void* p_addata);
++#endif
+ static void vsf_auth_shutdown(void);
+ 
+ int
+@@ -442,8 +447,13 @@
+ }
+ 
+ static int
++#if defined(sun) && defined(__SVR4) 
++pam_conv_func(int nmsg, struct pam_message** p_msg,
++              struct pam_response** p_reply, void* p_addata)
++#else
+ pam_conv_func(int nmsg, const struct pam_message** p_msg,
+               struct pam_response** p_reply, void* p_addata)
++#endif
+ {
+   int i;
+   struct pam_response* p_resps = 0;

Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2012-04-21 00:12:25 UTC (rev 17799)
+++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2012-04-21 12:19:34 UTC (rev 17800)
@@ -1,6 +1,11 @@
 vsftpd (3.0.0,REV=2012.04.20) unstable
 
   * New upstream release.
+  * Added avoid_pam_conv_warning.patch to avoid an incompatible
+    pointer type error.
+  * Updated dependancy name:
+     CSWtcpwrap -> CSWlibwrap1
+     CSWosslrt -> CSWlibssl0-9-8
 
  -- Yann Rouillard <yann at opencsw.org>  Fri, 20 Apr 2012 22:52:55 +0200
 

Modified: csw/mgar/pkg/vsftpd/trunk/files/csw_build_system.patch
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/csw_build_system.patch	2012-04-21 00:12:25 UTC (rev 17799)
+++ csw/mgar/pkg/vsftpd/trunk/files/csw_build_system.patch	2012-04-21 12:19:34 UTC (rev 17800)
@@ -1,18 +1,19 @@
-diff --speed-large-files --minimal -Nru vsftpd-2.0.4.orig/Makefile vsftpd-2.0.4/Makefile
---- vsftpd-2.0.4.orig/Makefile	2006-04-12 18:18:06.382923000 -0400
-+++ vsftpd-2.0.4/Makefile	2006-04-12 18:17:58.522360000 -0400
-@@ -1,9 +1,9 @@
+--- vsftpd-3.0.0.orig/Makefile	Tue Apr  3 09:21:18 2012
++++ vsftpd-3.0.0/Makefile	Sat Apr 21 13:59:59 2012
+@@ -1,16 +1,8 @@
  # Makefile for systems with GNU tools
 -CC 	=	gcc
-+
 -INSTALL	=	install
-+
 -IFLAGS  = -idirafter dummyinc
-+
  #CFLAGS = -g
--CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
-+
+-CFLAGS	=	-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \
+-	-Wall -W -Wshadow -Werror -Wformat-security \
+-	-D_FORTIFY_SOURCE=2 \
+-	#-pedantic -Wconversion
  
  LIBS	=	`./vsf_findlibs.sh`
--LINK	=	-Wl,-s
-+LINK	=	-Wl,-s $(LDFLAGS)
+ LINK	=	-Wl,-s
+-LDFLAGS	=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
+ 
+ OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
+ 		tunables.o ftpdataio.o secbuf.o ls.o \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.