Merge remote-tracking branch 'maniacikarus/samba'

diff --git a/authconfig/authconfig.nm b/authconfig/authconfig.nm
index e23aa668922cf7f1079b560486b68b304260818b..ff6b878003bdd91bee84493b76be1cf27553fbc0 100644 (file)
--- a/authconfig/authconfig.nm
+++ b/authconfig/authconfig.nm
@@ -5,7 +5,7 @@
 
 name       = authconfig
 version    = 6.2.2
-release    = 2
+release    = 3
 
 groups     = System/Base
 url        = https://fedorahosted.org/authconfig
@@ -72,7 +72,10 @@ end
 
 packages
        package %{name}
-               requires += newt-python
+               requires
+                       libpwquality
+                       newt-python
+               end
        end
 
        package %{name}-devel

diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm
index bf873ec8219fb19f7d0a3b7b4e902db7b99ca07d..53d74bcf4e41b29937b1577949298a9d165eeb8a 100644 (file)
--- a/c_icap/c_icap.nm
+++ b/c_icap/c_icap.nm
@@ -5,7 +5,7 @@
 
 name       = c_icap
 version    = 0.1.7
-release    = 1
+release    = 2
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -49,6 +49,7 @@ end
 
 packages
        package %{name}
+               requires = %{name}_modules
        end
 
        package %{name}-debuginfo

diff --git a/clamav/clamav.nm b/clamav/clamav.nm
index ae809ebae2da14ca1cab39ec42c135ca09817104..2bb9ca646b0c73e81600e985474d15c47ebf2d25 100644 (file)
--- a/clamav/clamav.nm
+++ b/clamav/clamav.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = clamav
-version    = 0.97
-release    = 3
+version    = 0.97.4
+release    = 1
 
 groups     = System Environment/Daemons
 url        = http://www.clamav.net
@@ -64,10 +64,17 @@ end
 
 packages
        package %{name}
+               requires
+                       %{name}-libs = %{thisver}
+               end
        end
 
        package %{name}-libs
                template LIBS
+
+               requires
+                       %{name}-databases = %{thisver}
+               end
        end
 
        package %{name}-devel
@@ -77,4 +84,15 @@ packages
        package %{name}-debuginfo
                template DEBUGINFO
        end
+
+       package %{name}-databases
+               summary = Clamav Virus Databases.
+               description
+                       Shipped virus databases needed for virus scanning.
+               end
+
+               files
+                       %{localstatedir}/lib/%{name}
+               end
+       end
 end

diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm
index 507891a9e9bb7d7915ef0b221deb2cebfd304f06..246ad17a1ec53f3fe028e8da4591de7729a4455a 100644 (file)
--- a/dhcp/dhcp.nm
+++ b/dhcp/dhcp.nm
@@ -5,7 +5,7 @@
 
 name       = dhcp
 version    = 4.2.2
-release    = 1
+release    = 2
 
 groups     = Networking/Daemons
 url        = http://isc.org/products/DHCP/

diff --git a/dhcp/systemd/dhclient@.service b/dhcp/systemd/dhclient@.service
new file mode 100644 (file)
index 0000000..c3afc93
--- /dev/null
+++ b/dhcp/systemd/dhclient@.service
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=dhclient on %I
+BindTo=dev-%I.device
+After=dev-%I.device network.service
+Requires=network.service
+
+[Service]
+ExecStart=/usr/sbin/dhclient %I
+UtmpIdentifier=%I
+KillMode=process

diff --git a/libpwquality/libpwquality.nm b/libpwquality/libpwquality.nm
new file mode 100644 (file)
index 0000000..5cc4f6e
--- /dev/null
+++ b/libpwquality/libpwquality.nm
@@ -0,0 +1,57 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = libpwquality
+version    = 1.0.0
+release    = 1
+
+groups     = System/Base
+url        = https://fedorahosted.org/libpwquality/
+license    = BSD or GPL+
+summary    = A library for password generation and password quality checking.
+
+description
+       This is a library for password quality checks and generation of random 
+       passwords that pass the checks. This library uses the cracklib and 
+       cracklib dictionaries to perform some of the checks.
+end
+
+source_dl  = http://fedorahosted.org/releases/l/i/libpwquality/
+sources    = %{thisapp}.tar.bz2
+
+build
+       requires
+               cracklib-devel
+               gettext
+               pam-devel
+               python-devel
+       end
+end
+
+packages
+       package %{name}
+
+       package python-%{name}
+               summary = Python bindings for the libpwquality library.
+               description
+                       This is pwquality Python module that provides Python bindings
+                       for the libpwquality library. These bindings can be used
+                       for easy password quality checking and generation of random
+                       pronounceable passwords from Python applications.
+               end
+
+               files
+                       %{libdir}/python*
+               end
+       end
+
+       package %{name}-devel
+               template DEVEL
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end

diff --git a/mc/mc.nm b/mc/mc.nm
index 1b26b167f6def29450535d4739ee2ea57951378a..fcba89f9f4cf01d890be90abfd21075537dd6c9c 100644 (file)
--- a/mc/mc.nm
+++ b/mc/mc.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = mc
-version    = 4.8.2
+version    = 4.8.3
 release    = 1
 
 groups     = Applications/System