This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 5dfd48b62a7311f71a1df527c5a10a0300547f7d (commit) via c9486337df42b75de2bfc6f9c30f1eaa3490648d (commit) via 651b9950836b146380a7e9e7292b88e289a2dc2a (commit) via 093d622fa33bdde440a58c2227de08cf585ad896 (commit) from 324fc6cfd0bb039abea43734ba6a274b6419d3ec (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 5dfd48b62a7311f71a1df527c5a10a0300547f7d Merge: c948633 651b995 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 28 18:20:08 2012 +0200
Merge remote-tracking branch 'stevee/coreutils'
commit c9486337df42b75de2bfc6f9c30f1eaa3490648d Merge: 324fc6c 093d622 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Apr 28 18:19:27 2012 +0200
Merge remote-tracking branch 'maniacikarus/samba'
commit 651b9950836b146380a7e9e7292b88e289a2dc2a Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Apr 28 15:59:17 2012 +0200
coreutils: Remove non working tests from testsuite.
There are problems with selinux enabled kernels and build in an chroot environment like we do. So we we have to disable/remove these tests:
Disabled tests: * cp/cp-a-selinux * id/no-context * install/install-C-selinux * misc/id-context
Fixes #10077.
commit 093d622fa33bdde440a58c2227de08cf585ad896 Author: Christian Schmidt christian.schmidt@ipfire.org Date: Sat Apr 28 09:19:05 2012 +0200
samba: Added samba systemd files and a default config.
-----------------------------------------------------------------------
Summary of changes: coreutils/coreutils.nm | 9 +- .../patches/coreutils-ipfire-disabled-tests.patch | 32 ++ samba/samba.nm | 7 +- samba/samba.pamd | 6 + samba/smb.conf | 320 ++++++++++++++++++++ .../systemd/nmb.service | 5 +- samba/systemd/smb.service | 12 + samba/systemd/winbind.service | 11 + 8 files changed, 394 insertions(+), 8 deletions(-) create mode 100644 coreutils/patches/coreutils-ipfire-disabled-tests.patch create mode 100644 samba/samba.pamd create mode 100644 samba/smb.conf copy keepalived/systemd/keepalived.service => samba/systemd/nmb.service (55%) create mode 100644 samba/systemd/smb.service create mode 100644 samba/systemd/winbind.service
Difference in files: diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index 3b04de3..df4ca91 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -5,7 +5,7 @@
name = coreutils version = 8.16 -release = 3 +release = 4
groups = System/Base url = http://www.gnu.org/software/coreutils/ @@ -55,10 +55,9 @@ build autoconf --force end
- # FIXME broken - #test - # make check - #end + test + make check + end
make_install_targets += install-man
diff --git a/coreutils/patches/coreutils-ipfire-disabled-tests.patch b/coreutils/patches/coreutils-ipfire-disabled-tests.patch new file mode 100644 index 0000000..92b51c2 --- /dev/null +++ b/coreutils/patches/coreutils-ipfire-disabled-tests.patch @@ -0,0 +1,32 @@ +diff -Nur a/tests/Makefile.am b/tests/Makefile.am +--- a/tests/Makefile.am 2012-03-24 19:22:13.000000000 +0100 ++++ b/tests/Makefile.am 2012-04-28 15:42:22.861910633 +0200 +@@ -24,7 +24,6 @@ + + root_tests = \ + chown/basic \ +- cp/cp-a-selinux \ + cp/preserve-gid \ + cp/special-bits \ + cp/cp-mv-enotsup-xattr \ +@@ -195,7 +194,6 @@ + misc/groups-version \ + misc/head-c \ + misc/head-pos \ +- misc/id-context \ + misc/id-groups \ + misc/md5sum \ + misc/md5sum-bsd \ +@@ -408,12 +406,10 @@ + du/trailing-slash \ + du/two-args \ + id/gnu-zero-uids \ +- id/no-context \ + install/basic-1 \ + install/create-leading \ + install/d-slashdot \ + install/install-C \ +- install/install-C-selinux \ + install/strip-program \ + install/trap \ + ln/backup-1 \ diff --git a/samba/samba.nm b/samba/samba.nm index 6403e4c..fcf8641 100644 --- a/samba/samba.nm +++ b/samba/samba.nm @@ -5,7 +5,7 @@
name = samba version = 3.6.4 -release = 1 +release = 2
maintainer = Christian Schmidt christian.schmidt@ipfire.org groups = Networking/Daemons @@ -83,11 +83,16 @@ build 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
packages package %{name} + prerequires = systemd-units + configfiles = /etc/smb.conf + requires += %{name}-libs = %{thisver} + end
package %{name}-libs template LIBS diff --git a/samba/samba.pamd b/samba/samba.pamd new file mode 100644 index 0000000..66cd2a9 --- /dev/null +++ b/samba/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/samba/smb.conf b/samba/smb.conf new file mode 100644 index 0000000..fe0d921 --- /dev/null +++ b/samba/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/samba/systemd/nmb.service b/samba/systemd/nmb.service new file mode 100644 index 0000000..0dca74c --- /dev/null +++ b/samba/systemd/nmb.service @@ -0,0 +1,11 @@ +[Unit] +Description=Samba NMB Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/nmbd.pid +ExecStart=/usr/sbin/nmbd + +[Install] +WantedBy=multi-user.target diff --git a/samba/systemd/smb.service b/samba/systemd/smb.service new file mode 100644 index 0000000..4f09a4d --- /dev/null +++ b/samba/systemd/smb.service @@ -0,0 +1,12 @@ +[Unit] +Description=Samba SMB Daemon +After=syslog.target network.target nmb.service winbind.service + +[Service] +Type=forking +PIDFile=/run/smbd.pid +LimitNOFILE=16384 +ExecStart=/usr/sbin/smbd + +[Install] +WantedBy=multi-user.target diff --git a/samba/systemd/winbind.service b/samba/systemd/winbind.service new file mode 100644 index 0000000..39cbf53 --- /dev/null +++ b/samba/systemd/winbind.service @@ -0,0 +1,11 @@ +[Unit] +Description=Samba Winbind Daemon +After=syslog.target network.target nmb.service + +[Service] +Type=forking +PIDFile=/run/winbindd.pid +ExecStart=/usr/sbin/winbindd + +[Install] +WantedBy=multi-user.target
hooks/post-receive -- IPFire 3.x development tree