[paketler-commits] r36058 - in 2007/system/base/tcp-wrappers: . files

[paketler-commits at pardus.org.tr]

Author: cartman
Date: Wed Dec  5 14:22:45 2007
New Revision: 36058

Added:
   2007/system/base/tcp-wrappers/files/hosts.allow
   2007/system/base/tcp-wrappers/files/hosts.deny
Removed:
   2007/system/base/tcp-wrappers/files/hosts.allow.example
Modified:
   2007/system/base/tcp-wrappers/actions.py
   2007/system/base/tcp-wrappers/pspec.xml
Log:
merge

Modified: 2007/system/base/tcp-wrappers/actions.py
=================================================================
--- 2007/system/base/tcp-wrappers/actions.py	(original)
+++ 2007/system/base/tcp-wrappers/actions.py	Wed Dec  5 14:22:45 2007
@@ -5,15 +5,6 @@
 # Licensed under the GNU General Public License, version 2.
 # See the file http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
-# Not : Makefile.Pardus yaması actions.py
-# dosyasının pspec.xml dosyasında belirtilen yamaların
-# uygulandıktan sonra işletilmesi nedeni ile dahil edilmiştir.
-# daha sonraki paketleyiciler için yamayı oluşturmak için
-# kullanılan sed ifadesi şu şekildedir.
-# sed -i -e "s:-O:\${PARDUS_CFLAGS}:" -e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" Makefile
-# Daha sonraki versiyonu paketlerken MINOR, REL ve WorkDir değişkenlerini
-# sürüme göre değiştirmeyi unutmayın.
-
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
@@ -33,26 +24,18 @@
 
     shelltools.export("PARDUS_CFLAGS", "%s" % get.CFLAGS())
 
-    args = "REAL_DAEMON_DIR=%s \
-            PARDUS_OPT=\"-DHAVE_WEAKSYMS -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len\" \
-            MAJOR=0 MINOR=%s REL=%s" % ( get.sbinDIR(), MINOR, REL )
+    args = 'REAL_DAEMON_DIR=%s \
+            PARDUS_OPT="-DHAVE_WEAKSYMS -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" \
+            MAJOR=0 MINOR=%s REL=%s' % ( get.sbinDIR(), MINOR, REL )
 
     autotools.make("%s config-check" % args)
     autotools.make("%s linux" % args)
 
 def install():
-    pisitools.dosym("hosts_access.5", "/usr/share/man/man5/hosts.allow.5")
-    pisitools.dosym("hosts_access.5", "/usr/share/man/man5/hosts.deny.5")
-
-    pisitools.dosbin("tcpd")
-    pisitools.dosbin("tcpdchk")
-    pisitools.dosbin("tcpdmatch")
-    pisitools.dosbin("safe_finger")
-    pisitools.dosbin("try-from")
-
-    pisitools.doman("*.3", "*.5", "*.8")
+    for app in ["tcpd","tcpdchk","tcpdmatch","safe_finger","try-from"]:
+        pisitools.dosbin(app)
 
-    pisitools.insinto("/usr/include/", "tcpd.h")
+    pisitools.insinto("/usr/include", "tcpd.h")
 
     pisitools.dolib_a("libwrap.a")
 
@@ -64,4 +47,8 @@
 
     libtools.gen_usr_ldscript("libwrap.so")
 
-    pisitools.dodoc("BLURB", "CHANGES", "DISCLAIMER", "README*", "hosts.allow.example")
+    pisitools.dosym("hosts_access.5", "/usr/share/man/man5/hosts.allow.5")
+    pisitools.dosym("hosts_access.5", "/usr/share/man/man5/hosts.deny.5")
+
+    pisitools.doman("*.3", "*.5", "*.8")
+    pisitools.dodoc("BLURB", "CHANGES", "DISCLAIMER", "README*")

Modified: 2007/system/base/tcp-wrappers/pspec.xml
=================================================================
--- 2007/system/base/tcp-wrappers/pspec.xml	(original)
+++ 2007/system/base/tcp-wrappers/pspec.xml	Wed Dec  5 14:22:45 2007
@@ -40,12 +40,24 @@
             <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="library">/lib</Path>
+            <Path fileType="config">/etc</Path>
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="/etc/hosts.allow">hosts.allow</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/etc/hosts.deny">hosts.deny</AdditionalFile>
+        </AdditionalFiles>
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2007-12-05</Date>
+            <Version>7.6</Version>
+            <Comment>Hosts allow/deny files added</Comment>
+            <Name>Ali Erdinç Köroğlu</Name>
+            <Email>erdinc at pardus.org.tr</Email>
+        </Update>
         <Update release="3">
             <Date>2007-09-05</Date>
             <Version>7.6</Version>