summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-01-03 18:36:23 +0000
committerMichał Górny <mgorny@gentoo.org>2015-01-03 18:36:23 +0000
commit408ad0f0dd1c7920c4c6ba8855cfae92f61954eb (patch)
tree4533d4b637e5abfa820e9b9640af84a0fb50519d /net-fs
parentFix a FPE (diff)
downloadhistorical-408ad0f0dd1c7920c4c6ba8855cfae92f61954eb.tar.gz
historical-408ad0f0dd1c7920c4c6ba8855cfae92f61954eb.tar.bz2
historical-408ad0f0dd1c7920c4c6ba8855cfae92f61954eb.zip
Support linking against libsystemd, bug #526362.
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/samba/ChangeLog6
-rw-r--r--net-fs/samba/Manifest33
-rw-r--r--net-fs/samba/files/samba-4.1.14-libsystemd.patch51
-rw-r--r--net-fs/samba/samba-4.1.14.ebuild4
4 files changed, 76 insertions, 18 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 6df0fe658162..0db5a348c322 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-fs/samba
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.702 2015/01/03 17:28:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.703 2015/01/03 18:36:21 mgorny Exp $
+
+ 03 Jan 2015; Michał Górny <mgorny@gentoo.org>
+ +files/samba-4.1.14-libsystemd.patch, samba-4.1.14.ebuild:
+ Support linking against libsystemd, bug #526362.
03 Jan 2015; Michał Górny <mgorny@gentoo.org> samba-4.1.14.ebuild:
Make systemd library support optional, bug #512510.
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 07a3d69d7c28..1badbfb4e6a0 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -33,6 +33,7 @@ AUX nmbd.service 224 SHA256 a5e25c11714206c4fb129333dd45152c5753716c6445cbe78c28
AUX samba-3.4.2-lib.tevent.python.mk 177 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153 SHA512 0bd691d7678737fa815da9e1934db056fa833aa6d6d2d48cf8da559987a899ae4c5ac18e4b3594d634363f515028a3d30711484dbda578aa7506fbe2df55197c WHIRLPOOL 061b3e33b327563f52648931428cce433505353e73bf9851abb33f4f13e7c723c17c3413442dd343477bb0c49fd3284c0155ff59829df448952a6e1d07475251
AUX samba-4.0.19-automagic_aio_fix.patch 2020 SHA256 99a67b4e8a5847ac416ceadb4d97bf004019d0ab4e75663443b3bee071665fbf SHA512 2a694760a82f484d454be988bc614e90fd8feb67db6b08e3770e45f322964ffa03e2840e70a7981cb60764a8bd3a8c1be7f22fc26a8de2438cdd94de43556626 WHIRLPOOL d0c25b7f1b557a995a668e11c9e9ca75203673b91aee12fad8e9ec35e576cbada71adc4515d0501f63801edf7bf3696673442811d99b425a603656bbe8d333c6
AUX samba-4.1.0-remove-dmapi-automagic.patch 2755 SHA256 debf37a220205526ec54b121f23d1be93d8595fff54184099ae647759876eedd SHA512 dcd96d1ce66918072de7c60e116cb01320b5b8ac5f06856d3298628b31c69a8fdd00771100540889b57c8a4a38a142d56b145a05950617488849243cd7b339b4 WHIRLPOOL 81c31a4c8cc011327c8e7d16bf15e3fd96a36c47dd985bd146c2559c20102517b2aa643ce24a64c52331fc4ec0858299cf3cf8d705a34e22ca94b093c4101c7e
+AUX samba-4.1.14-libsystemd.patch 2343 SHA256 a04576719ea11d1609a537a5cd365b60a3a2080538c4ada05636a88ac345ac2d SHA512 7951a563019ad6b858710b61366164a1c6d919fade03c528af13df13f153580c12a0e570c341e872e7aaec22f30e6b93b7ac2c4a34d5d272876e320d09a35979 WHIRLPOOL 29169bb5925a583a05dc00acfe9c405f9ee8f264de9d375413dcdedce0d8884c9d2d1f8091e5a15accfd986c7f1dcb4564e3499269a302b9e14d951a60e2e659
AUX samba-4.1.14-named.conf.dlz.patch 505 SHA256 a59037c7d1f2d567a4505ac01259500e62e5244312acd273bfb5ad61869e9326 SHA512 de95a8d6e6b15bdb82dff649095fae12615ecf0b93da4163eaf8033660939fb2104b7eb9b5a9f223ffd4947cc9e39ee794ffe1434554731a931cdd0fd39dbd33 WHIRLPOOL 6382dfa2c97a1e537981b80faa8bda5a6ab7fa7db131bf46b85a490ad6da4f6e11fbc54ed7bf8b4b56cedd93e4ab6d5a913ae1977b5cf6723a37cde5ff145f52
AUX samba-4.x-readline63_typedef_fix.patch 932 SHA256 a97b47021c0b38ee1db12b2d3a9cbd73fb4ceb60a616cb38c2be52b02f9d6d0c SHA512 a074eb59a2915d2f60bed79f3ba118b72cdba78a13f5d1fa1a79c346aab21c3676a803aae2b18414bebf42891e064fdbb22b57b37d76a90ba59ccfb012170707 WHIRLPOOL adbbd60446eb1d9534868902f4ce310165b9b93a6a4a8a9ac97803e07ddb789f35c598f977d876913f7f2b62ac0ade570dfe2e5f52439fafb966f54eb89cde4f
AUX samba.conf 32 SHA256 d578d8d4f86c61f4055164d0065b117c7345f7531a7759b78fba80dbb94c5c25 SHA512 b5d8905fb72d517d78274e4a928263bed3c57ed1cdbda773caf5cd5f7531da5c21ef9a310084d3d399c9c636be0c8424e5fc010336560ca5b41b40616398c9dd WHIRLPOOL 652b5254e0ffe78dc4c58901b35683f1c98e057da6d83e53610e5688b948623415000141d4d627f0752941558ca88d6e2cf6af411e5a8fc9fb8dfbd49e0a8e5c
@@ -58,26 +59,26 @@ EBUILD samba-3.6.24.ebuild 13517 SHA256 34686659fa4f283611d0469bf778aed6160a7910
EBUILD samba-4.0.22.ebuild 4749 SHA256 63cb2fd163a098360152cc9f769e154c194aabbb115f780c13c98249a1649d13 SHA512 f026b6c3a0435183153cef7c86133b10a39b1cd4ee0b6c621072ba1eed234fb7a1f9c45a19c863d3075ee86386d13a223662346726070fc10c09f514afd54cf7 WHIRLPOOL cb5464a87c62a5063fc31ceb9e40661e0602476228312bdf6b720bddde056353988548ded2c17c5141ab00700d4651bef3d3a5d023356a1d20c8bbec0bf3f62e
EBUILD samba-4.0.23.ebuild 4756 SHA256 1d7cead76a54c2dbdb406a1f3a124406a1b37393aefac081602f7f9cc5c7a8e7 SHA512 0bf396d8089cc98f3419775246db482bd8ab4da300064471e3a7fba95bbd6eb678e5929f07b074a33c81301e60776a21888968acc799e3558ab0c9721c872d6f WHIRLPOOL 688a81ff0ec14c09f54e85bcad1415fc8760ae0f0275d67f79d37fbb51c9c9e97c989cfb9729dcdb2607826b7f54f1270495e36c05d38d7f76ca2cce25df0e64
EBUILD samba-4.1.13.ebuild 4665 SHA256 c8d18fe7ae10142bba4b1f0aeb28aff7aaf323d9f0865775d39c985971bce00a SHA512 4721c5787a52b671725952ab762cbc4d40057b18c106130a83f8e0a710fbe9626c34934d397453633e18f0b902498aebe28edfce85227a8b3d1d9033dadcef1a WHIRLPOOL 39524ddee01558cfb671ecb1d24f84dd71bf1964e91b490e0c00ab3ba0057496e24ccd5867c7f99083db580e5cd25b15ab1e5950fd143d0d68940450af3927fb
-EBUILD samba-4.1.14.ebuild 4682 SHA256 d0ebb8d5200f0e96f232b7bfe7081b35789e84ca1eafe1b79b6023e536810958 SHA512 39c98d91389dc7d5875bd840978d14cffac50ff4849dae17b2af822d96667939a92b5f29c070dc9b7df52b3b4fcfa7b53a9fe8fb4f5b9b270c9a3ca58ceb58f2 WHIRLPOOL 5d885ebd269d78dbab33953be11a30707edd2cda20599df0c038ff9255a5783b19ade2b1c7d75a640874894a97bb378faea71a2ac7e25333fa7dc5ee674923a1
-MISC ChangeLog 8399 SHA256 e245c516ebd5177d5857f27aaeb6c0a0f13b283baf0dc73f56848570c5301cc9 SHA512 dce205ca3f4b50cd30cc862b38b2a43d592e506da6ecffb34c93acc33e7d93254fc7b3ca02a910c7a9766917f766ae224616067d0af81d19a9c69600de6509a9 WHIRLPOOL decb722d2d67e15a5179fcb6d54404b5ae23fd1df19c41a65fef9488e505a3c9d6e28efcb7a95c4922a1882f99ab5447240bb8bc7abcda3d8b30c5d057d65483
+EBUILD samba-4.1.14.ebuild 4793 SHA256 136952154b5f16735bebcdb7e4636079d46c3b49c0287d70950148c7d87cb084 SHA512 3c88ab57fed4c13f188c1301f41ceb88a423690c2220f4db98ae29070fcf02dfbb37d76f28f19b8fa5bc97228388ac5d72f3170c890237e2da398c0eb3b80e04 WHIRLPOOL e605ef7a9d9b1ec8f771faf6270add767e261df68fe22c07a9dbb18c5d3ca9db99d1aab29fd44880fc98c1aa0cc7991e75ba42976f59d46627b77d63777016c4
+MISC ChangeLog 8562 SHA256 43bc2532bba2053b3287d2ce9b5d23b75f7e23595d1e29eb97b675a0906535c5 SHA512 31c5dc797e00ab1b08db42d310a4241dd501f6399adfc6a999e58be10682b4849632f4980c606dbb15a87bcc96161cc1cb3cf646b69b8a98d2f9980bb721012e WHIRLPOOL 31bdc5f852543dfd7ea6712de8362b1a37e06947989dec8d9231210aa7596ba38d20d52959185e5eee5b6604e8340a95a65752d0e9c55cf4bacbb5c3a7d6a0ed
MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQJ8BAEBCABmBQJUqCanXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUqDamXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8VsQAJdkhV3OE3vqO4sCPYp0yCXl
-7ag6NdSP2YOzQrKwkXIHK8z5vLKoP2bYeoR5dCb461ZIWLB+6qKmgletyecT/sRy
-zKB1J6AjNXAg2UxsfMgeCc6OarknBPbkwbFnV93y8RTy3P4w1lT3UGrqN7XEQn7F
-Gbh3xAmC3C0ZZQkiLxJkZUi35zFAPWDTo4cTE5xzGBMZLBSZJpWLjMPSZklg9eBR
-BybmXS+OA946prAyBuDswAhpJhtAbn2ddhnuWCrQkrD7rDwfKXXwBAc4Bcb2wVJH
-hcDum9c5GCi2x6eC4YwNPCl9LFoDStykDYLnGNvzdDHPl1oLA8qaGG6ovqKNLYeF
-2HUrTyOBcwAn0dvZZBbkSeLZQQPyZgzg5HJ31Nm+7XV2Ph3dNBOtp649wK8WKVAp
-2Op5yoXRi5F8giVN1kmyy58mx2Mp+iL+WMiURCJil/zqOfjmhhHIvieymgetpjhh
-yOhIhIocBhg5x3SFY76PQStzqisMo2iGsSI282IZDWa3uQYLDMkYS+q7D7XKVmCg
-wcodi11Wr6v4FdDekHQFsnJvrxT8qz8gNzFyxH/R7ab2i//LJBmzmjyQQ5Z92Ctd
-hXoNaXT4uM01DLpKSZ9Le1UxnlYhSSi7O8JWtsarlSUEqMCzIRUKCIwS9DrkjkoF
-xLs+brYg3ourswhTWYT1
-=mOoZ
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODuQP/0N3Dl4VSbYGrWIjr/6V1iW1
+cNGJyDKz7PXVoCY2vgwfu3u8hAnKmNlEhN0CIcT4HtFDzK78+AHU3msQl1iMvQho
+BtLuKa65OuRD6yTuM+BvQ8+4glhrTAoZr/F2OgR+Q365Xwy6RQHgtUIL2ClqqY8h
+s+xdSVEfuJ1FeC5yBRFt3kubRNiJD6EgbSZgaMQ34Vc+tMbLznUVghAFP7gmSBk1
+Ssu/x7mk26Ek31itrO8SSjcM6GotDm84Yodm3HerPY8eU/7EScL4rYy6SC0k3HDs
+ukD1yMd6G3a7XN3j3nmSRqFWKZyDfXrxYc+GlTiy8TDyQOSOL1/LgoV8MYVs1fEs
+mTPD7k8kh2TJrD6Xfs7oA0D3qoG+iu/vRfR1F9R3Fh7CaJaiajlELUqud6kztTry
+j47gr5oS10ImdQEUYFLmwweeOBdII9be0/5s68IEVHrllL0q0mCbuc35RxrLVLnu
+31XaqMvH/LXhM/yZHwV6e6ZCdnQp5zMk42ubD1QRnSFnI//xsVHP5Rx8vYyiqh+V
+74WneT07Lgzcq3mEQcYp2wapxTs6sTRR3PfIoiCeU9k0wFFcITjhHG51wNYXfXrh
+ELFi813DKcIPzlRqM56FSG3doV5wpjQ5zoiQK/Gxf/6bAWjjuYJDHeM2S/2hZxb+
+27rrcacqWEM+kA4PgUfS
+=Wb9P
-----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/samba-4.1.14-libsystemd.patch b/net-fs/samba/files/samba-4.1.14-libsystemd.patch
new file mode 100644
index 000000000000..94b30c00e162
--- /dev/null
+++ b/net-fs/samba/files/samba-4.1.14-libsystemd.patch
@@ -0,0 +1,51 @@
+From 0f9b06ade820ce165015526220569db81e00150b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 3 Jan 2015 18:59:48 +0100
+Subject: [PATCH] Support libsystemd, renamed from libsystemd-daemon
+
+---
+ lib/util/wscript_build | 2 +-
+ wscript | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/util/wscript_build b/lib/util/wscript_build
+index f161f96..6b6b511 100755
+--- a/lib/util/wscript_build
++++ b/lib/util/wscript_build
+@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('samba-util',
+ server_id.c dprintf.c parmlist.c bitmap.c pidfile.c
+ tevent_debug.c util_process.c memcache.c''',
+ deps='DYNCONFIG',
+- public_deps='talloc tevent execinfo uid_wrapper pthread LIBCRYPTO charset util_setid systemd-daemon',
++ public_deps='talloc tevent execinfo uid_wrapper pthread LIBCRYPTO charset util_setid systemd systemd-daemon',
+ public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
+ header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
+ local_include=False,
+diff --git a/wscript b/wscript
+index f389f90..3c4fa21 100644
+--- a/wscript
++++ b/wscript
+@@ -183,9 +183,12 @@ def configure(conf):
+ conf.env['ENABLE_PIE'] = True
+
+ if Options.options.enable_systemd != False:
++ conf.check_cfg(package='libsystemd', args='--cflags --libs',
++ msg='Checking for libsystemd', uselib_store="SYSTEMD")
+ conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs',
+ msg='Checking for libsystemd-daemon', uselib_store="SYSTEMD-DAEMON")
+ conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon')
++ conf.CHECK_LIB('systemd', shlib=True)
+ conf.CHECK_LIB('systemd-daemon', shlib=True)
+
+ if conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H'):
+@@ -193,6 +196,7 @@ def configure(conf):
+ conf.env['ENABLE_SYSTEMD'] = True
+ else:
+ conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY')
++ conf.SET_TARGET_TYPE('systemd', 'EMPTY')
+ conf.undefine('HAVE_SYSTEMD')
+
+ conf.SAMBA_CONFIG_H('include/config.h')
+--
+2.2.1
+
diff --git a/net-fs/samba/samba-4.1.14.ebuild b/net-fs/samba/samba-4.1.14.ebuild
index 74d4208637d5..b9a3d90c8522 100644
--- a/net-fs/samba/samba-4.1.14.ebuild
+++ b/net-fs/samba/samba-4.1.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild,v 1.2 2015/01/03 17:28:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild,v 1.3 2015/01/03 18:36:21 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_{6,7} )
@@ -70,6 +70,8 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
PATCHES=(
"${FILESDIR}/${PN}-4.1.14-named.conf.dlz.patch"
"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
+ # support libsystemd (instead of libsystemd-daemon), bug #526362
+ "${FILESDIR}/${PN}-4.1.14-libsystemd.patch"
)
WAF_BINARY="${S}/buildtools/bin/waf"