pyrox.dev / nixpkgs
lol
fork atom

samba: split 4.x-no-persistent-install.patch

reason: Second hunk does not work on 4.8-master

authored by Luke Adams and committed by Rok Garbas d937ea31 d085af7b

+16 -15
unified split
+15
pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch
···
··· 1 + diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript 2 + --- samba-4.4.6/dynconfig/wscript 2016-01-26 14:45:46.000000000 +0300 3 + +++ samba-4.4.6-new/dynconfig/wscript 2016-10-15 22:21:18.159705132 +0300 4 + @@ -416,11 +416,3 @@ 5 + public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir), 6 + header_path='samba', 7 + cflags=cflags) 8 + - 9 + - # install some extra empty directories 10 + - bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}"); 11 + - bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}") 12 + - bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}"); 13 + - 14 + - # these might be on non persistent storage 15 + - bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
-15
pkgs/servers/samba/4.x-no-persistent-install.patch
··· 37 # Unit tests 38 ctdb_unit_tests = [ 39 'db_hash_test', 40 - diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript 41 - --- samba-4.4.6/dynconfig/wscript 2016-01-26 14:45:46.000000000 +0300 42 - +++ samba-4.4.6-new/dynconfig/wscript 2016-10-15 22:21:18.159705132 +0300 43 - @@ -416,11 +416,3 @@ 44 - public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir), 45 - header_path='samba', 46 - cflags=cflags) 47 - - 48 - - # install some extra empty directories 49 - - bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}"); 50 - - bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}") 51 - - bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}"); 52 - - 53 - - # these might be on non persistent storage 54 - - bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
··· 37 # Unit tests 38 ctdb_unit_tests = [ 39 'db_hash_test',
+1
pkgs/servers/samba/4.x.nix
··· 31 patches = 32 [ ./4.x-no-persistent-install.patch 33 ./patch-source3__libads__kerberos_keytab.c.patch 34 ]; 35 36 buildInputs =
··· 31 patches = 32 [ ./4.x-no-persistent-install.patch 33 ./patch-source3__libads__kerberos_keytab.c.patch 34 + ./4.x-no-persistent-install-dynconfig.patch 35 ]; 36 37 buildInputs =