Development September 2016

development@lists.ipfire.org

11 participants
97 discussions

[PATCH] perl-XML-Parser: Trigger rebuild to link against new perl ABI.
by Stefan Schantl 05 Sep '16

05 Sep '16

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- perl-XML-Parser/perl-XML-Parser.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-XML-Parser/perl-XML-Parser.nm b/perl-XML-Parser/perl-XML-Parser.nm index 90fccd4..eae88d7 100644 --- a/perl-XML-Parser/perl-XML-Parser.nm +++ b/perl-XML-Parser/perl-XML-Parser.nm @@ -5,7 +5,7 @@ name = perl-XML-Parser version = 2.44 -release = 1.1 +release = 2 thisapp = XML-Parser-%{version} groups = Development/Libraries -- 2.7.4

1 0

[PATCH] tree: Update to 1.7.0
by Alexander Marx 05 Sep '16

05 Sep '16

Allow user/group names up to 32 characters before clipping. Made -i compress XML and JSON output as much as possible by eliminating extraneous whitespace. Added --caseinsensitive (renamed --ignore-case ala grep) flag so patterns match without regard to case, courtesy of Jason A Donenfeld. Added --matchdirs option courtesy of Brian Mattern & Jason A. Donenfeld <Jason(a)zx2c4.com>. Fixed possible buffer overflow on large uid/gids w/o user names/group names (Alexandre Wendling <alexandrerw(a)celepar.pr.gov.br>) Added JSON support courtesy of Florian Sesser <fs(a)it-agenten.com>. Fixed formatting error with HTML output when -L 1 specified. (Sascha Zorn <sascha.zorn(a)gmail.com>) Added file size sorting (Philipp M?ller <philippausmuensing(a)googlemail.com>) Added '--sort[=]<name>' option, ala ls. Fixed OS X makefile problems (Ryan Hollis <theryanhollis(a)gmail.com>) Fixed possible memory overflow in read_dir (path/lbuf not equal in size to pathsize/lbufsize.) (Han Hui <hanhui03(a)163.com>) Fix S_ISDOOR/S_IFDOOR spelling mistake for Solaris. (Tim Mooney <Tim.Mooney(a)ndsu.edu>) Make tree more reliably detect UTF-8 locales. (Mantas Mikulnas <grawity(a)gmail.com> and others.) Return non-zero exit status on option errors, print usage to stdout when not an error, add the posix '--' option terminator, Change -S description to mean CP437 (console) output codes, not ASCII. (Ivan Shmakov <oneingray(a)gmail.com>) Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- tree/patches/tree-args.patch | 12 ------------ tree/patches/tree-no-color-by-default.patch | 13 ------------- tree/patches/tree-no-strip.patch | 21 --------------------- tree/patches/tree-preserve-timestamps.patch | 15 --------------- tree/tree.nm | 2 +- 5 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 tree/patches/tree-args.patch delete mode 100644 tree/patches/tree-no-color-by-default.patch delete mode 100644 tree/patches/tree-no-strip.patch delete mode 100644 tree/patches/tree-preserve-timestamps.patch diff --git a/tree/patches/tree-args.patch b/tree/patches/tree-args.patch deleted file mode 100644 index 5fa5dd2..0000000 --- a/tree/patches/tree-args.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up tree-1.6.0/tree.c.args tree-1.6.0/tree.c ---- tree-1.6.0/tree.c.args 2013-04-11 11:53:47.676572649 +0100 -+++ tree-1.6.0/tree.c 2013-04-11 11:56:10.962350448 +0100 -@@ -536,6 +536,8 @@ void usage(int n) - " --filelimit # Do not descend dirs with more than # files in them.\n" - " --timefmt <f> Print and format time according to the format <f>.\n" - " -o filename Output to file instead of stdout.\n" -+ " --du Print directory sizes.\n" -+ " --prune Prune empty directories from the output.\n" - " -------- File options ---------\n" - " -q Print non-printable characters as '?'.\n" - " -N Print non-printable characters as is.\n" diff --git a/tree/patches/tree-no-color-by-default.patch b/tree/patches/tree-no-color-by-default.patch deleted file mode 100644 index 374add4..0000000 --- a/tree/patches/tree-no-color-by-default.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up tree-1.6.0/tree.c.no-color-by-default tree-1.6.0/tree.c ---- tree-1.6.0/tree.c.no-color-by-default 2011-06-27 16:14:14.190548385 +0100 -+++ tree-1.6.0/tree.c 2011-06-27 16:14:27.257295243 +0100 -@@ -79,7 +79,8 @@ int main(int argc, char **argv) - q = p = dtotal = ftotal = 0; - aflag = dflag = fflag = lflag = pflag = sflag = Fflag = uflag = gflag = FALSE; - Dflag = qflag = Nflag = Qflag = Rflag = hflag = Hflag = siflag = cflag = FALSE; -- noindent = force_color = nocolor = xdev = noreport = nolinks = FALSE; -+ noindent = force_color = xdev = noreport = nolinks = FALSE; -+ nocolor = TRUE; - dirsfirst = nosort = inodeflag = devflag = Xflag = FALSE; - duflag = pruneflag = FALSE; - flimit = 0; diff --git a/tree/patches/tree-no-strip.patch b/tree/patches/tree-no-strip.patch deleted file mode 100644 index 5f46ada..0000000 --- a/tree/patches/tree-no-strip.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up tree-1.6.0/Makefile.no-strip tree-1.6.0/Makefile ---- tree-1.6.0/Makefile.no-strip 2011-06-24 15:25:27.000000000 +0100 -+++ tree-1.6.0/Makefile 2011-07-04 11:11:17.662036666 +0100 -@@ -32,7 +32,7 @@ OBJS=tree.o unix.o html.o xml.o hash.o c - # Linux defaults: - #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --LDFLAGS=-s -+LDFLAGS= - - # Uncomment for FreeBSD: - #CFLAGS=-O2 -Wall -fomit-frame-pointer -@@ -97,7 +97,7 @@ install: tree - install -d $(BINDIR) - install -d $(MANDIR) - if [ -e $(TREE_DEST) ]; then \ -- install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ -+ install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ - fi - install doc/$(MAN) $(MANDIR)/$(MAN) - diff --git a/tree/patches/tree-preserve-timestamps.patch b/tree/patches/tree-preserve-timestamps.patch deleted file mode 100644 index 2e432a5..0000000 --- a/tree/patches/tree-preserve-timestamps.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up tree-1.6.0/Makefile.preserve-timestamps tree-1.6.0/Makefile ---- tree-1.6.0/Makefile.preserve-timestamps 2011-06-27 16:11:26.000000000 +0100 -+++ tree-1.6.0/Makefile 2011-06-27 16:12:36.394443602 +0100 -@@ -97,9 +97,9 @@ install: tree - install -d $(BINDIR) - install -d $(MANDIR) - if [ -e $(TREE_DEST) ]; then \ -- install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ -+ install -p $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ - fi -- install doc/$(MAN) $(MANDIR)/$(MAN) -+ install -p doc/$(MAN) $(MANDIR)/$(MAN) - - distclean: - if [ -f tree.o ]; then rm *.o; fi diff --git a/tree/tree.nm b/tree/tree.nm index 710ef4c..5f5583e 100644 --- a/tree/tree.nm +++ b/tree/tree.nm @@ -4,7 +4,7 @@ ############################################################################### name = tree -version = 1.6.0 +version = 1.7.0 release = 1 groups = Applications/File -- 2.6.3

1 0

[PATCH] traceroute: Update to 2.1
by Alexander Marx 05 Sep '16

05 Sep '16

The main significant change is new adaptive algorithm for waiting. Traditional traceroute implementation always waited the whole timeout (default 5.0 second) for any probe. But if we already have some replies from the same hop, or even from some next hop, we can use the round trip time of such a reply as a hint to determine the actual reasonable amount of time to wait. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- traceroute/traceroute.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traceroute/traceroute.nm b/traceroute/traceroute.nm index 5d3a7f8..44c4ecc 100644 --- a/traceroute/traceroute.nm +++ b/traceroute/traceroute.nm @@ -4,7 +4,7 @@ ############################################################################### name = traceroute -version = 2.0.12 +version = 2.1.0 release = 1 groups = Application/Internet -- 2.6.3

1 0

[PATCH] tmux: Update to 2.2
by Alexander Marx 05 Sep '16

05 Sep '16

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- tmux/tmux.nm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tmux/tmux.nm b/tmux/tmux.nm index ac3a556..2a58b69 100644 --- a/tmux/tmux.nm +++ b/tmux/tmux.nm @@ -4,7 +4,7 @@ ############################################################################### name = tmux -version = 2.0 +version = 2.2 release = 1 groups = Application/System @@ -19,7 +19,7 @@ description programs such as GNU Screen. end -source_dl = http://downloads.sourceforge.net/%{name}/ +source_dl = https://github.com/tmux/tmux/releases/download/%{version} build requires -- 2.6.3

1 0

[PATCH] tinc: Update to 1.0.28
by Alexander Marx 05 Sep '16

05 Sep '16

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- tinc/tinc.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinc/tinc.nm b/tinc/tinc.nm index c1a8624..111e5fa 100644 --- a/tinc/tinc.nm +++ b/tinc/tinc.nm @@ -4,7 +4,7 @@ ############################################################################### name = tinc -version = 1.0.23 +version = 1.0.28 release = 1 groups = Networking/Tools -- 2.6.3

1 0

[PATCH] tcpdump: Update to 4.7.4
by Alexander Marx 05 Sep '16

05 Sep '16

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- tcpdump/tcpdump.nm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm index 40a5cd7..68fc555 100644 --- a/tcpdump/tcpdump.nm +++ b/tcpdump/tcpdump.nm @@ -4,8 +4,8 @@ ############################################################################### name = tcpdump -version = 4.3.0 -release = 2 +version = 4.7.4 +release = 1 groups = Networking/Sniffer url = http://www.tcpdump.org/ -- 2.6.3

1 0

[PATCH] swig: update to 3.0.10
by Alexander Marx 05 Sep '16

05 Sep '16

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- swig/patches/swig-1.3.23-pylib.patch | 29 ------------ swig/patches/swig200-rh623854.patch | 92 ------------------------------------ swig/swig.nm | 2 +- 3 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 swig/patches/swig-1.3.23-pylib.patch delete mode 100644 swig/patches/swig200-rh623854.patch diff --git a/swig/patches/swig-1.3.23-pylib.patch b/swig/patches/swig-1.3.23-pylib.patch deleted file mode 100644 index 85fa1e3..0000000 --- a/swig/patches/swig-1.3.23-pylib.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- SWIG-1.3.23/configure.in.pylib 2004-11-02 00:45:57.000000000 +0100 -+++ SWIG-1.3.23/configure.in 2004-11-23 12:20:12.552926982 +0100 -@@ -574,9 +574,11 @@ - - # Set the include directory - -+ PYLIB=`$PYTHON -c "import sys; print sys.path[[1]]"` -+ - AC_MSG_CHECKING(for Python header files) - if test -r $PYPREFIX/include/$PYVERSION/Python.h; then -- PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config" -+ PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYLIB/config" - fi - if test -z "$PYINCLUDE"; then - if test -r $PYPREFIX/include/Py/Python.h; then -@@ -587,13 +589,6 @@ - - # Set the library directory blindly. This probably won't work with older versions - AC_MSG_CHECKING(for Python library) -- dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR" -- for i in $dirs; do -- if test -d $PYEPREFIX/$PYLIBDIR/$i; then -- PYLIB="$PYEPREFIX/$PYLIBDIR/$i" -- break -- fi -- done - if test -z "$PYLIB"; then - AC_MSG_RESULT(Not found) - else diff --git a/swig/patches/swig200-rh623854.patch b/swig/patches/swig200-rh623854.patch deleted file mode 100644 index 5665252..0000000 --- a/swig/patches/swig200-rh623854.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.swg ---- swig-2.0.0/Lib/python/pyrun.swg.rh623854 2010-02-28 00:26:02.000000000 +0100 -+++ swig-2.0.0/Lib/python/pyrun.swg 2010-08-17 16:32:16.581604656 +0200 -@@ -45,8 +45,18 @@ - #define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg - #define SWIG_ErrorType(code) SWIG_Python_ErrorType(code) - #define SWIG_Error(code, msg) SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) --#define SWIG_fail goto fail -+#define SWIG_fail goto fail - -+/* -+ * Python 2.7 and newer and Python 3.1 and newer should use Capsules API instead of -+ * CObjects API. -+ */ -+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \ -+ (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0)) -+#define USE_CAPSULES -+#define TYPE_POINTER_NAME \ -+ ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME) -+#endif - - /* Runtime API implementation */ - -@@ -1356,8 +1366,12 @@ SWIG_Python_GetModule(void) { - #ifdef SWIG_LINK_RUNTIME - type_pointer = SWIG_ReturnGlobalTypeList((void *)0); - #else -+#ifdef USE_CAPSULES -+ type_pointer = PyCapsule_Import(TYPE_POINTER_NAME, 0); -+#else - type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, - (char*)"type_pointer" SWIG_TYPE_TABLE_NAME); -+#endif - if (PyErr_Occurred()) { - PyErr_Clear(); - type_pointer = (void *)0; -@@ -1402,9 +1416,14 @@ PyModule_AddObject(PyObject *m, char *na - SWIGRUNTIME void - SWIG_Python_DestroyModule(void *vptr) - { -+ size_t i; -+#ifdef USE_CAPSULES -+ swig_module_info *swig_module = -+ (swig_module_info *) PyCapsule_GetPointer((PyObject *)vptr, TYPE_POINTER_NAME); -+#else - swig_module_info *swig_module = (swig_module_info *) vptr; -+#endif - swig_type_info **types = swig_module->types; -- size_t i; - for (i =0; i < swig_module->size; ++i) { - swig_type_info *ty = types[i]; - if (ty->owndata) { -@@ -1426,9 +1445,18 @@ SWIG_Python_SetModule(swig_module_info * - PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, - swig_empty_runtime_method_table); - #endif -+#ifdef USE_CAPSULES -+ PyObject *pointer = PyCapsule_New((void *)swig_module, TYPE_POINTER_NAME, -+ (PyCapsule_Destructor)SWIG_Python_DestroyModule); -+#else - PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); -+#endif - if (pointer && module) { -+#ifdef USE_CAPSULES -+ PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer); -+#else - PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); -+#endif - } else { - Py_XDECREF(pointer); - } -@@ -1449,12 +1477,20 @@ SWIG_Python_TypeQuery(const char *type) - PyObject *obj = PyDict_GetItem(cache, key); - swig_type_info *descriptor; - if (obj) { -+#ifdef USE_CAPSULES -+ descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, type); -+#else - descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj); -+#endif - } else { - swig_module_info *swig_module = SWIG_Python_GetModule(); - descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type); - if (descriptor) { -+#ifdef USE_CAPSULES -+ obj = PyCapsule_New(descriptor, type, NULL); -+#else - obj = PyCObject_FromVoidPtr(descriptor, NULL); -+#endif - PyDict_SetItem(cache, key, obj); - Py_DECREF(obj); - } diff --git a/swig/swig.nm b/swig/swig.nm index e3e68cc..675dc1f 100644 --- a/swig/swig.nm +++ b/swig/swig.nm @@ -4,7 +4,7 @@ ############################################################################### name = swig -version = 2.0.1 +version = 3.0.10 release = 1 groups = Development/Tools -- 2.6.3

1 0

[PATCH] eudev: update init script
by Marcel Lorenz 04 Sep '16

04 Sep '16

Removes the not more needed "copy static device nodes" from initscript Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- src/initscripts/init.d/udev | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev index 6cf8771..9afedbf 100644 --- a/src/initscripts/init.d/udev +++ b/src/initscripts/init.d/udev @@ -55,9 +55,6 @@ case "${1}" in # the kernel call out to any binary in response to them echo > /proc/sys/kernel/hotplug - # Copy static device nodes to /dev - cp -a /lib/udev/devices/* /dev - # Start the udev daemon to continually watch for, and act on, # uevents /sbin/udevd --daemon -- 2.9.3

1 0

[PATCH] libtdb: Update to 1.3.11
by Alexander Marx 04 Sep '16

04 Sep '16

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- libtdb/libtdb.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libtdb/libtdb.nm b/libtdb/libtdb.nm index 806c880..855025d 100644 --- a/libtdb/libtdb.nm +++ b/libtdb/libtdb.nm @@ -4,7 +4,7 @@ ############################################################################### name = libtdb -version = 1.3.9 +version = 1.3.11 release = 1 groups = System/Libraries -- 2.6.3

1 0

[PATCH] Samba4: New package samba-4.4.0
by Alexander Marx 04 Sep '16

04 Sep '16

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- samba/samba.nm | 26 ++-- samba4/samba.nm | 109 ++++++++++++++ samba4/samba.pamd | 6 + samba4/smb.conf | 320 +++++++++++++++++++++++++++++++++++++++++ samba4/systemd/nmb.service | 10 ++ samba4/systemd/smb.service | 11 ++ samba4/systemd/winbind.service | 10 ++ 7 files changed, 479 insertions(+), 13 deletions(-) create mode 100644 samba4/samba.nm create mode 100644 samba4/samba.pamd create mode 100644 samba4/smb.conf create mode 100644 samba4/systemd/nmb.service create mode 100644 samba4/systemd/smb.service create mode 100644 samba4/systemd/winbind.service diff --git a/samba/samba.nm b/samba/samba.nm index 39f4c84..9a1ef37 100644 --- a/samba/samba.nm +++ b/samba/samba.nm @@ -4,7 +4,7 @@ ############################################################################### name = samba -version = 3.6.16 +version = 4.4.0 release = 1 groups = Networking/Daemons @@ -35,8 +35,9 @@ build autoconf automake avahi-devel - cups-devel + #cups-devel gettext + gnutls-devel ncurses-devel libacl-devel libcap-devel @@ -49,25 +50,21 @@ build zlib-devel end - DIR_APP = %{DIR_SRC}/%{thisapp}/source3 + DIR_APP = %{DIR_SRC}/%{thisapp}/ configure_options += \ + --enable-fhs \ --prefix=%{prefix} \ --localstatedir=/var \ --with-lockdir=%{sharedstatedir}/samba \ - --with-piddir=%{rundir} \ - --with-mandir=%{mandir} \ + --with-piddir=/var/run/samba \ --with-privatedir=%{sharedstatedir}/samba/private \ --with-logfilebase=/var/log/samba \ --with-modulesdir=%{libdir}/samba \ --with-configdir=%{sysconfdir}/samba \ --with-pammodulesdir=/%{lib}/security \ - --with-swatdir=%{datadir}/swat \ --with-automount \ - --with-libsmbclient \ - --with-libsmbsharemodes \ --with-pam \ - --with-pam_smbpass \ --with-quotas \ --with-sendfile-support \ --with-syslog \ @@ -75,10 +72,6 @@ build --with-winbind \ --with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash - make_build_targets += \ - pch \ - all modules - install_cmds mkdir -pv %{BUILDROOT}%{sysconfdir}/samba echo "127.0.0.1 localhost" > %{BUILDROOT}%{sysconfdir}/samba/lmhosts @@ -86,6 +79,13 @@ build end end +quality-agent + whitelist_rpath + %{libdir}/samba + end +end + + packages package %{name} prerequires = systemd-units diff --git a/samba4/samba.nm b/samba4/samba.nm new file mode 100644 index 0000000..9a1ef37 --- /dev/null +++ b/samba4/samba.nm @@ -0,0 +1,109 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = samba +version = 4.4.0 +release = 1 + +groups = Networking/Daemons +url = http://www.samba.org/ +license = GPLv3+ and LGPLv3+ +summary = Server and Client software to interoperate with Windows machines. + +description + Samba is the suite of programs by which a lot of PC-related machines + share files, printers, and other information (such as lists of + available files and printers). The Windows NT, OS/2, and Linux + operating systems support this natively, and add-on packages can + enable the same thing for DOS, Windows, VMS, UNIX of all kinds, MVS, + and more. This package provides an SMB/CIFS server that can be used to + provide network services to SMB/CIFS clients. + Samba uses NetBIOS over TCP/IP (NetBT) protocols and does NOT + need the NetBEUI (Microsoft Raw NetBIOS frame) protocol. +end + +source_dl = http://www.samba.org/samba/ftp/stable/ + +CFLAGS += \ + -D_FILE_OFFSET_BITS=64 \ + -D_GNU_SOURCE -DLDAP_DEPRECATED + +build + requires + autoconf + automake + avahi-devel + #cups-devel + gettext + gnutls-devel + ncurses-devel + libacl-devel + libcap-devel + openldap-devel + openssl-devel + pam-devel + popt-devel + readline-devel + which + zlib-devel + end + + DIR_APP = %{DIR_SRC}/%{thisapp}/ + + configure_options += \ + --enable-fhs \ + --prefix=%{prefix} \ + --localstatedir=/var \ + --with-lockdir=%{sharedstatedir}/samba \ + --with-piddir=/var/run/samba \ + --with-privatedir=%{sharedstatedir}/samba/private \ + --with-logfilebase=/var/log/samba \ + --with-modulesdir=%{libdir}/samba \ + --with-configdir=%{sysconfdir}/samba \ + --with-pammodulesdir=/%{lib}/security \ + --with-automount \ + --with-pam \ + --with-quotas \ + --with-sendfile-support \ + --with-syslog \ + --with-utmp \ + --with-winbind \ + --with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash + + install_cmds + mkdir -pv %{BUILDROOT}%{sysconfdir}/samba + echo "127.0.0.1 localhost" > %{BUILDROOT}%{sysconfdir}/samba/lmhosts + cp -vf %{DIR_SOURCE}/smb.conf %{BUILDROOT}/%{sysconfdir}/%{name} + end +end + +quality-agent + whitelist_rpath + %{libdir}/samba + end +end + + +packages + package %{name} + prerequires = systemd-units + configfiles = /etc/smb.conf + requires += %{name}-libs = %{thisver} + end + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + + requires += %{name}-libs = %{thisver} + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/samba4/samba.pamd b/samba4/samba.pamd new file mode 100644 index 0000000..66cd2a9 --- /dev/null +++ b/samba4/samba.pamd @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth required pam_nologin.so +auth include password-auth +account include password-auth +session include password-auth +password include password-auth diff --git a/samba4/smb.conf b/samba4/smb.conf new file mode 100644 index 0000000..fe0d921 --- /dev/null +++ b/samba4/smb.conf @@ -0,0 +1,320 @@ +# This is the main Samba configuration file. For detailed information about the +# options listed here, refer to the smb.conf(5) manual page. Samba has a huge +# number of configurable options, most of which are not shown in this example. +# +# The Official Samba 3.2.x HOWTO and Reference Guide contains step-by-step +# guides for installing, configuring, and using Samba: +# http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf +# +# The Samba-3 by Example guide has working examples for smb.conf. This guide is +# generated daily: http://www.samba.org/samba/docs/Samba-Guide.pdf +# +# In this file, lines starting with a semicolon (;) or a hash (#) are +# comments and are ignored. This file uses hashes to denote commentary and +# semicolons for parts of the file you may wish to configure. +# +# Note: Run the "testparm" command after modifying this file to check for basic +# syntax errors. +# +#--------------- +# Security-Enhanced Linux (SELinux) Notes: +# +# Turn the samba_domain_controller Boolean on to allow Samba to use the useradd +# and groupadd family of binaries. Run the following command as the root user to +# turn this Boolean on: +# setsebool -P samba_domain_controller on +# +# Turn the samba_enable_home_dirs Boolean on if you want to share home +# directories via Samba. Run the following command as the root user to turn this +# Boolean on: +# setsebool -P samba_enable_home_dirs on +# +# If you create a new directory, such as a new top-level directory, label it +# with samba_share_t so that SELinux allows Samba to read and write to it. Do +# not label system directories, such as /etc/ and /home/, with samba_share_t, as +# such directories should already have an SELinux label. +# +# Run the "ls -ldZ /path/to/directory" command to view the current SELinux +# label for a given directory. +# +# Set SELinux labels only on files and directories you have created. Use the +# chcon command to temporarily change a label: +# chcon -t samba_share_t /path/to/directory +# +# Changes made via chcon are lost when the file system is relabeled or commands +# such as restorecon are run. +# +# Use the samba_export_all_ro or samba_export_all_rw Boolean to share system +# directories. To share such directories and only allow read-only permissions: +# setsebool -P samba_export_all_ro on +# To share such directories and allow read and write permissions: +# setsebool -P samba_export_all_rw on +# +# To run scripts (preexec/root prexec/print command/...), copy them to the +# /var/lib/samba/scripts/ directory so that SELinux will allow smbd to run them. +# Note that if you move the scripts to /var/lib/samba/scripts/, they retain +# their existing SELinux labels, which may be labels that SELinux does not allow +# smbd to run. Copying the scripts will result in the correct SELinux labels. +# Run the "restorecon -R -v /var/lib/samba/scripts" command as the root user to +# apply the correct SELinux labels to these files. +# +#-------------- +# +#======================= Global Settings ===================================== + +[global] + +# ----------------------- Network-Related Options ------------------------- +# +# workgroup = the Windows NT domain name or workgroup name, for example, MYGROUP. +# +# server string = the equivalent of the Windows NT Description field. +# +# netbios name = used to specify a server name that is not tied to the hostname. +# +# interfaces = used to configure Samba to listen on multiple network interfaces. +# If you have multiple interfaces, you can use the "interfaces =" option to +# configure which of those interfaces Samba listens on. Never omit the localhost +# interface (lo). +# +# hosts allow = the hosts allowed to connect. This option can also be used on a +# per-share basis. +# +# hosts deny = the hosts not allowed to connect. This option can also be used on +# a per-share basis. +# +# max protocol = used to define the supported protocol. The default is NT1. You +# can set it to SMB2 if you want experimental SMB2 support. +# + workgroup = MYGROUP + server string = Samba Server Version %v + +; netbios name = MYSERVER + +; interfaces = lo eth0 192.168.12.2/24 192.168.13.2/24 +; hosts allow = 127. 192.168.12. 192.168.13. + +; max protocol = SMB2 + +# --------------------------- Logging Options ----------------------------- +# +# log file = specify where log files are written to and how they are split. +# +# max log size = specify the maximum size log files are allowed to reach. Log +# files are rotated when they reach the size specified with "max log size". +# + + # log files split per-machine: + log file = /var/log/samba/log.%m + # maximum size of 50KB per log file, then rotate: + max log size = 50 + +# ----------------------- Standalone Server Options ------------------------ +# +# security = the mode Samba runs in. This can be set to user, share +# (deprecated), or server (deprecated). +# +# passdb backend = the backend used to store user information in. New +# installations should use either tdbsam or ldapsam. No additional configuration +# is required for tdbsam. The "smbpasswd" utility is available for backwards +# compatibility. +# + + security = user + passdb backend = tdbsam + + +# ----------------------- Domain Members Options ------------------------ +# +# security = must be set to domain or ads. +# +# passdb backend = the backend used to store user information in. New +# installations should use either tdbsam or ldapsam. No additional configuration +# is required for tdbsam. The "smbpasswd" utility is available for backwards +# compatibility. +# +# realm = only use the realm option when the "security = ads" option is set. +# The realm option specifies the Active Directory realm the host is a part of. +# +# password server = only use this option when the "security = server" +# option is set, or if you cannot use DNS to locate a Domain Controller. The +# argument list can include My_PDC_Name, [My_BDC_Name], and [My_Next_BDC_Name]: +# +# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name] +# +# Use "password server = *" to automatically locate Domain Controllers. + +; security = domain +; passdb backend = tdbsam +; realm = MY_REALM + +; password server = <NT-Server-Name> + +# ----------------------- Domain Controller Options ------------------------ +# +# security = must be set to user for domain controllers. +# +# passdb backend = the backend used to store user information in. New +# installations should use either tdbsam or ldapsam. No additional configuration +# is required for tdbsam. The "smbpasswd" utility is available for backwards +# compatibility. +# +# domain master = specifies Samba to be the Domain Master Browser, allowing +# Samba to collate browse lists between subnets. Do not use the "domain master" +# option if you already have a Windows NT domain controller performing this task. +# +# domain logons = allows Samba to provide a network logon service for Windows +# workstations. +# +# logon script = specifies a script to run at login time on the client. These +# scripts must be provided in a share named NETLOGON. +# +# logon path = specifies (with a UNC path) where user profiles are stored. +# +# +; security = user +; passdb backend = tdbsam + +; domain master = yes +; domain logons = yes + + # the following login script name is determined by the machine name + # (%m): +; logon script = %m.bat + # the following login script name is determined by the UNIX user used: +; logon script = %u.bat +; logon path = \\%L\Profiles\%u + # use an empty path to disable profile support: +; logon path = + + # various scripts can be used on a domain controller or a stand-alone + # machine to add or delete corresponding UNIX accounts: + +; add user script = /usr/sbin/useradd "%u" -n -g users +; add group script = /usr/sbin/groupadd "%g" +; add machine script = /usr/sbin/useradd -n -c "Workstation (%u)" -M -d /nohome -s /bin/false "%u" +; delete user script = /usr/sbin/userdel "%u" +; delete user from group script = /usr/sbin/userdel "%u" "%g" +; delete group script = /usr/sbin/groupdel "%g" + + +# ----------------------- Browser Control Options ---------------------------- +# +# local master = when set to no, Samba does not become the master browser on +# your network. When set to yes, normal election rules apply. +# +# os level = determines the precedence the server has in master browser +# elections. The default value should be reasonable. +# +# preferred master = when set to yes, Samba forces a local browser election at +# start up (and gives itself a slightly higher chance of winning the election). +# +; local master = no +; os level = 33 +; preferred master = yes + +#----------------------------- Name Resolution ------------------------------- +# +# This section details the support for the Windows Internet Name Service (WINS). +# +# Note: Samba can be either a WINS server or a WINS client, but not both. +# +# wins support = when set to yes, the NMBD component of Samba enables its WINS +# server. +# +# wins server = tells the NMBD component of Samba to be a WINS client. +# +# wins proxy = when set to yes, Samba answers name resolution queries on behalf +# of a non WINS capable client. For this to work, there must be at least one +# WINS server on the network. The default is no. +# +# dns proxy = when set to yes, Samba attempts to resolve NetBIOS names via DNS +# nslookups. + +; wins support = yes +; wins server = w.x.y.z +; wins proxy = yes + +; dns proxy = yes + +# --------------------------- Printing Options ----------------------------- +# +# The options in this section allow you to configure a non-default printing +# system. +# +# load printers = when set you yes, the list of printers is automatically +# loaded, rather than setting them up individually. +# +# cups options = allows you to pass options to the CUPS library. Setting this +# option to raw, for example, allows you to use drivers on your Windows clients. +# +# printcap name = used to specify an alternative printcap file. +# + + load printers = yes + cups options = raw + +; printcap name = /etc/printcap + # obtain a list of printers automatically on UNIX System V systems: +; printcap name = lpstat +; printing = cups + +# --------------------------- File System Options --------------------------- +# +# The options in this section can be un-commented if the file system supports +# extended attributes, and those attributes are enabled (usually via the +# "user_xattr" mount option). These options allow the administrator to specify +# that DOS attributes are stored in extended attributes and also make sure that +# Samba does not change the permission bits. +# +# Note: These options can be used on a per-share basis. Setting them globally +# (in the [global] section) makes them the default for all shares. + +; map archive = no +; map hidden = no +; map read only = no +; map system = no +; store dos attributes = yes + + +#============================ Share Definitions ============================== + +[homes] + comment = Home Directories + browseable = no + writable = yes +; valid users = %S +; valid users = MYDOMAIN\%S + +[printers] + comment = All Printers + path = /var/spool/samba + browseable = no + guest ok = no + writable = no + printable = yes + +# Un-comment the following and create the netlogon directory for Domain Logons: +; [netlogon] +; comment = Network Logon Service +; path = /var/lib/samba/netlogon +; guest ok = yes +; writable = no +; share modes = no + +# Un-comment the following to provide a specific roving profile share. +# The default is to use the user's home directory: +; [Profiles] +; path = /var/lib/samba/profiles +; browseable = no +; guest ok = yes + +# A publicly accessible directory that is read only, except for users in the +# "staff" group (which have write permissions): +; [public] +; comment = Public Stuff +; path = /home/samba +; public = yes +; writable = yes +; printable = no +; write list = +staff diff --git a/samba4/systemd/nmb.service b/samba4/systemd/nmb.service new file mode 100644 index 0000000..b0b447e --- /dev/null +++ b/samba4/systemd/nmb.service @@ -0,0 +1,10 @@ +[Unit] +Description=Samba NMB Daemon +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/nmbd + +[Install] +WantedBy=multi-user.target diff --git a/samba4/systemd/smb.service b/samba4/systemd/smb.service new file mode 100644 index 0000000..b62df5c --- /dev/null +++ b/samba4/systemd/smb.service @@ -0,0 +1,11 @@ +[Unit] +Description=Samba SMB Daemon +After=syslog.target network.target nmb.service winbind.service + +[Service] +Type=forking +LimitNOFILE=16384 +ExecStart=/usr/sbin/smbd + +[Install] +WantedBy=multi-user.target diff --git a/samba4/systemd/winbind.service b/samba4/systemd/winbind.service new file mode 100644 index 0000000..5ae1c2f --- /dev/null +++ b/samba4/systemd/winbind.service @@ -0,0 +1,10 @@ +[Unit] +Description=Samba Winbind Daemon +After=syslog.target network.target nmb.service + +[Service] +Type=forking +ExecStart=/usr/sbin/winbindd + +[Install] +WantedBy=multi-user.target -- 2.6.3

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development September 2016