commit
8bc47ab453
|
@ -1,21 +1,28 @@
|
|||
{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl, acl, ed, glibc }:
|
||||
{ fetchurl, stdenv, autoreconfHook, pkgconfig, perl, python
|
||||
, db, libgcrypt, avahi, libiconv, pam, openssl, acl
|
||||
, ed, glibc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec{
|
||||
name = "netatalk-3.1.7";
|
||||
name = "netatalk-3.1.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2";
|
||||
sha256 = "0wf09fyqzza024qr1s26z5x7rsvh9zb4pv598gw7gm77wjcr6174";
|
||||
sha256 = "3434472ba96d3bbe3b024274438daad83b784ced720f7662a4c1d0a1078799a6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ];
|
||||
patches = [
|
||||
./no-suid.patch
|
||||
./omitLocalstatedirCreation.patch
|
||||
];
|
||||
|
||||
patches = ./omitLocalstatedirCreation.patch;
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig perl python python.pkgs.wrapPython ];
|
||||
|
||||
buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-bdb=${db}"
|
||||
"--with-openssl=${openssl.dev}"
|
||||
"--with-ssl-dir=${openssl.dev}"
|
||||
"--with-lockfile=/run/lock/netatalk"
|
||||
"--localstatedir=/var/lib"
|
||||
];
|
||||
|
@ -36,6 +43,11 @@ stdenv.mkDerivation rec{
|
|||
EOF
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
buildPythonPath ${python.pkgs.dbus-python}
|
||||
patchPythonScript $out/bin/afpstats
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
|
|
11
pkgs/tools/filesystems/netatalk/no-suid.patch
Normal file
11
pkgs/tools/filesystems/netatalk/no-suid.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
|
||||
index 578eac1..d17aa22 100644
|
||||
--- a/bin/afppasswd/Makefile.am
|
||||
+++ b/bin/afppasswd/Makefile.am
|
||||
@@ -16,5 +16,5 @@ AM_CFLAGS = @SSL_CFLAGS@ -I$(top_srcdir)/sys \
|
||||
|
||||
install-exec-hook:
|
||||
if HAVE_OPENSSL
|
||||
- chmod u+s $(DESTDIR)$(bindir)/afppasswd
|
||||
+# chmod u+s $(DESTDIR)$(bindir)/afppasswd
|
||||
endif
|
|
@ -1,35 +1,19 @@
|
|||
diff -ur netatalk-3.1.7-old/config/Makefile.in netatalk-3.1.7-new/config/Makefile.in
|
||||
--- netatalk-3.1.7-old/config/Makefile.in 2014-08-29 03:33:35.000000000 -0700
|
||||
+++ netatalk-3.1.7-new/config/Makefile.in 2015-08-13 20:52:35.000000000 -0700
|
||||
@@ -699,7 +699,7 @@
|
||||
|
||||
info-am:
|
||||
|
||||
-install-data-am: install-data-local install-dbusserviceDATA
|
||||
+install-data-am: install-dbusserviceDATA
|
||||
|
||||
install-dvi: install-dvi-recursive
|
||||
|
||||
@@ -754,7 +754,7 @@
|
||||
cscopelist cscopelist-recursive ctags ctags-recursive \
|
||||
distclean distclean-generic distclean-libtool distclean-tags \
|
||||
distdir dvi dvi-am html html-am info info-am install \
|
||||
- install-am install-data install-data-am install-data-local \
|
||||
+ install-am install-data install-data-am \
|
||||
install-dbusserviceDATA install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-man install-pdf \
|
||||
@@ -782,12 +782,6 @@
|
||||
# install configuration files
|
||||
diff --git a/config/Makefile.am b/config/Makefile.am
|
||||
index c98a2ab..58b7f0a 100644
|
||||
--- a/config/Makefile.am
|
||||
+++ b/config/Makefile.am
|
||||
@@ -36,10 +36,10 @@ endif
|
||||
#
|
||||
|
||||
-install-data-local: install-config-files
|
||||
install-data-local: install-config-files
|
||||
- mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/
|
||||
- mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/
|
||||
- $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/
|
||||
- $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/
|
||||
-
|
||||
+# mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/
|
||||
+# mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/
|
||||
+# $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/
|
||||
+# $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/
|
||||
|
||||
uninstall-local:
|
||||
@for f in $(CONFFILES) $(GENFILES); do \
|
||||
echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
|
||||
|
||||
|
|
Loading…
Reference in a new issue