SOURCES: ncpfs.LDFLAGS.patch (NEW), ncpfs.offsetof.patch (NEW), nc...

[pascalek]

Author: pascalek                     Date: Fri Jun 15 21:38:41 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- initial revision

---- Files affected:
SOURCES:
   ncpfs.LDFLAGS.patch (NONE -> 1.1)  (NEW), ncpfs.offsetof.patch (NONE -> 1.1)  (NEW), ncpfs.pam_ncp_auth.syslog.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/ncpfs.LDFLAGS.patch
diff -u /dev/null SOURCES/ncpfs.LDFLAGS.patch:1.1
--- /dev/null	Fri Jun 15 23:38:41 2007
+++ SOURCES/ncpfs.LDFLAGS.patch	Fri Jun 15 23:38:36 2007
@@ -0,0 +1,80 @@
+ lib/Makefile.in   |    5 +++--
+ sutil/Makefile.in |   11 +++++++----
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+--- ncpfs-2.2.6.orig/lib/Makefile.in
++++ ncpfs-2.2.6/lib/Makefile.in
+@@ -21,6 +21,7 @@ STATIC_NCPLIB := libncp.$(libext)
+ STATIC_NCPLIB_BIN := $(STATIC_NCPLIB)
+ 
+ CCFLAGS += -I.
++PIE_FLAGS := -fpie
+ PIC_FLAGS := -fPIC
+ NWCOMPAT := 1
+ 
+@@ -57,7 +58,7 @@ NDS_CFLAGS := $(BASE_CFLAGS) -DPORTABLE 
+ CFLAGS_ncplib.o   := -DNWSFIND=\"$(bindir)/nwsfind\"
+ CFLAGS_cfgfile.o  := -DGLOBALCFGFILE=\"$(sysconfdir)/ncpfs.conf\"
+ 
+-STATIC_CFLAGS    := $(CFLAGS) $(CCFLAGS) $(REENTRANT_CFLAGS) @FFUNCTION_SECTIONS@
++STATIC_CFLAGS    := $(CFLAGS) $(CCFLAGS) $(REENTRANT_CFLAGS) $(PIE_FLAGS) @FFUNCTION_SECTIONS@
+ SHARED_CFLAGS    := $(CFLAGS) $(CCFLAGS) $(REENTRANT_CFLAGS) $(PIC_FLAGS) $(SHARED_VLINK_CFLAGS)
+ 
+ .PHONY : all dep install install-dev clean mrproper distclean
+@@ -127,7 +128,7 @@ $(SHARED_NCPLIB): $(SHARED_NCPLIB_BIN)
+ 	ln -sf $< $@
+ 
+ $(SHARED_NCPLIB_BIN): $(SHARED_O_OBJ) ${this_srcdir}/libncp.vers
+-	$(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} -lc
++	$(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS}
+ 
+ install_static: $(STATIC_NCPLIB_BIN)
+ 	$(INSTALL) -d $(DESTDIR)$(libadir)
+--- ncpfs-2.2.6.orig/sutil/Makefile.in
++++ ncpfs-2.2.6/sutil/Makefile.in
+@@ -18,6 +18,9 @@ LIBS = @INTLLIBS@ @LIBICONV@ @LIBS@
+ # environ in ncpmount
+ CCFLAGS += -D_GNU_SOURCE
+ 
++PIE_CFLAGS = -fpie
++PIE_LDFLAGS = -pie
++
+ O_UTILS := nwsfind.o
+ ifeq ($(USE_KERNEL),1)
+ O_UTILS += ncpmount.o ncpumount.o
+@@ -58,7 +61,7 @@ endif
+ install-dev:
+ 
+ $(O_UTILS): %.o: %.c
+-	$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
++	$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) $(PIE_CFLAGS) -o $@ -c $<
+ 
+ $(O_UTILS:.o=.d): %.d: %.c
+ 	set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \
+@@ -70,7 +73,7 @@ ncplogin: ncpm_common.o mount_login.o
+ ncpmap: ncpm_common.o
+ 
+ ncpmap.o: %.o: ncplogin.c
+-	$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
++	$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) $(PIE_CFLAGS) -o $@ -c $<
+ 
+ ncpmap.d: %.d: ncplogin.c
+ 	set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \
+@@ -78,7 +81,7 @@ ncpmap.d: %.d: ncplogin.c
+ 		[ -s $@ ] || rm -f $@
+ 
+ ncpm_common.o mount_login.o: %.o: %.c
+-	$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $<
++	$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) $(PIE_CFLAGS) -o $@ -c $<
+ 
+ ncpm_common.d mount_login.d: %.d: %.c
+ 	set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \
+@@ -86,7 +89,7 @@ ncpm_common.d mount_login.d: %.d: %.c
+ 		[ -s $@ ] || rm -f $@
+ 
+ $(UTILS): %: %.o ../lib/libncp.$(libext)
+-	$(CC) @GC_SECTIONS at -o $@ $^ ${LIBS}
++	$(CC) @GC_SECTIONS at -o $@ $^ $(PIE_LDFLAGS) ${LIBS}
+ 
+ ../lib/libncp.$(libext):
+ 	make -C ../lib libncp.$(libext)

================================================================
Index: SOURCES/ncpfs.offsetof.patch
diff -u /dev/null SOURCES/ncpfs.offsetof.patch:1.1
--- /dev/null	Fri Jun 15 23:38:41 2007
+++ SOURCES/ncpfs.offsetof.patch	Fri Jun 15 23:38:36 2007
@@ -0,0 +1,17 @@
+linux/stddef.h was included by accident. use private offsetof macro
+
+---
+ sutil/ncpm_common.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: ncpfs-2.2.6/sutil/ncpm_common.h
+===================================================================
+--- ncpfs-2.2.6.orig/sutil/ncpm_common.h
++++ ncpfs-2.2.6/sutil/ncpm_common.h
+@@ -122,5 +122,6 @@ int proc_aftermount(const struct ncp_mou
+ int proc_ncpm_umount(const char* dir);
+ 
+ #define UNUSED(x)	x __attribute__((unused))
++#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+ 
+ #endif	/* __NCPM_COMMON_H__ */

================================================================
Index: SOURCES/ncpfs.pam_ncp_auth.syslog.patch
diff -u /dev/null SOURCES/ncpfs.pam_ncp_auth.syslog.patch:1.1
--- /dev/null	Fri Jun 15 23:38:41 2007
+++ SOURCES/ncpfs.pam_ncp_auth.syslog.patch	Fri Jun 15 23:38:36 2007
@@ -0,0 +1,19 @@
+pam_ncp_auth.c: In function 'nw_cleanup_conn':
+pam_ncp_auth.c:284: warning: implicit declaration of function 'syslog'
+pam_ncp_auth.c:284: error: 'LOG_NOTICE' undeclared (first use in this function)
+
+ contrib/pam/pam_ncp_auth.c |    1 +
+ 1 files changed, 1 insertion(+)
+
+Index: ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c
+===================================================================
+--- ncpfs-2.2.6.orig/contrib/pam/pam_ncp_auth.c
++++ ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c
+@@ -266,6 +266,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <syslog.h>
+ 
+ #include "support.h"
+ 
================================================================