Pārlūkot izejas kodu

fix samba compile with GNU libc reported by Oliver, disable YP/automount for now

Waldemar Brodkorb 9 gadi atpakaļ
vecāks
revīzija
cbd602d1e2

+ 5 - 1
package/samba/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		samba
 PKG_VERSION:=		4.2.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		37eaa239c116dc2c22c29c5a2931eb178ed22e48b594687247446703119b4ac3
 PKG_DESCR:=		file and print server
 PKG_SECTION:=		net/fs
@@ -30,6 +30,10 @@ CONFIGURE_ARGS+=	--enable-fhs \
 			--cross-compile \
 			--cross-answers=$(WRKSRC)/cache.txt \
 			--hostcc=gcc \
+			--without-pie \
+			--without-relro \
+			--without-systemd \
+			--without-automount \
 			--without-pam \
 			--without-fam \
 			--without-dmapi \

+ 11 - 0
package/samba/patches/patch-lib_replace_wscript

@@ -0,0 +1,11 @@
+--- samba-4.2.1.orig/lib/replace/wscript	2015-04-15 20:00:13.000000000 +0200
++++ samba-4.2.1/lib/replace/wscript	2015-04-26 10:41:27.000000000 +0200
+@@ -66,8 +66,6 @@ def configure(conf):
+     conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
+     conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
+ 
+-    conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
+-
+     conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+     conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
+     conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')

+ 18 - 0
package/samba/patches/patch-source3_lib_util_c

@@ -0,0 +1,18 @@
+--- samba-4.2.1.orig/source3/lib/util.c	2015-01-16 09:18:39.000000000 +0100
++++ samba-4.2.1/source3/lib/util.c	2015-04-26 13:26:28.000000000 +0200
+@@ -562,6 +562,7 @@ char *get_mydnsdomname(TALLOC_CTX *ctx)
+ 	}
+ }
+ 
++#if 0
+ #if (defined(HAVE_NETGROUP) && defined(WITH_AUTOMOUNT))
+ /******************************************************************
+  Remove any mount options such as -rsize=2048,wsize=2048 etc.
+@@ -684,6 +685,7 @@ char *automount_lookup(TALLOC_CTX *ctx,
+ }
+ #endif /* WITH_NISPLUS_HOME */
+ #endif
++#endif
+ 
+ bool process_exists(const struct server_id pid)
+ {