- Merge upstream changes

- Add Xavier Toth patches

.cvsignore

@@ -149,3 +149,4 @@ serefpolicy-3.5.4.tgz
 serefpolicy-3.5.5.tgz
 serefpolicy-3.5.6.tgz
 serefpolicy-3.5.7.tgz
+serefpolicy-3.5.8.tgz

modules-targeted.conf

@@ -30,7 +30,7 @@ alsa = base
 #
 # ada executable
 # 
-ada = base
+ada = module
 
 # Layer: modules
 # Module: awstats
@@ -44,7 +44,7 @@ awstats = module
 #
 # Automated backup program.
 # 
-amanda = base
+amanda = module
 
 # Layer: services
 # Module: amavis
@@ -65,7 +65,7 @@ anaconda = base
 #
 # Apache web server
 # 
-apache = base
+apache = module
 
 # Layer: services
 # Module: apm
@@ -87,7 +87,7 @@ application = base
 #
 # Ethernet activity monitor.
 # 
-arpwatch = base
+arpwatch = module
 
 # Layer: services
 # Module: audioentropy
@@ -115,28 +115,28 @@ automount = base
 #
 # mDNS/DNS-SD daemon implementing Apple ZeroConf architecture
 # 
-avahi = base
+avahi = module
 
 # Layer: services
 # Module: bind
 #
 # Berkeley internet name domain DNS server.
 # 
-bind = base
+bind = module
 
 # Layer: services
 # Module: dnsmasq
 #
 # A lightweight DHCP and caching DNS server.
 # 
-dnsmasq = base
+dnsmasq = module
 
 # Layer: services
 # Module: bluetooth
 #
 # Bluetooth tools and system services.
 # 
-bluetooth = base
+bluetooth = module
 
 # Layer: kernel
 # Module: bootloader
@@ -151,8 +151,7 @@ bootloader = base
 #
 # Canna - kana-kanji conversion server
 # 
-canna = base
+canna = module
-
 
 # Layer: services
 # Module: ccs
@@ -195,7 +194,7 @@ cipe = module
 #
 # Comsat, a biff server.
 # 
-comsat = base
+comsat = module
 
 # Layer: services
 # Module: clamav
@@ -254,21 +253,21 @@ cpucontrol = base
 #
 # Periodic execution of scheduled commands.
 # 
-cron = base
+cron = module 
 
 # Layer: services
 # Module: cups
 #
 # Common UNIX printing system
 # 
-cups = base
+cups = module
 
 # Layer: services
 # Module: cvs
 #
 # Concurrent versions system
 # 
-cvs = base
+cvs = module
 
 # Layer: services
 # Module: cyphesis
@@ -282,7 +281,7 @@ cyphesis = module
 #
 # Cyrus is an IMAP service intended to be run on sealed servers
 # 
-cyrus = base
+cyrus = module
 
 # Layer: system
 # Module: daemontools
@@ -296,7 +295,7 @@ daemontools = module
 #
 # Dictionary server for the SKK Japanese input method system.
 # 
-dbskk = base
+dbskk = module
 
 # Layer: services
 # Module: dbus
@@ -305,7 +304,6 @@ dbskk = base
 # 
 dbus = base
 
-
 # Layer: services
 # Module: dcc
 #
@@ -340,7 +338,7 @@ dhcp = base
 #
 # Dictionary daemon
 # 
-dictd = base
+dictd = module
 
 # Layer: services
 # Module: distcc
@@ -390,7 +388,7 @@ gpg = off
 #
 # General Purpose Mouse driver
 # 
-gpm = base
+gpm = module
 
 # Layer: apps
 # Module: ethereal
@@ -411,7 +409,7 @@ fail2ban = module
 #
 # Remote-mail retrieval and forwarding utility
 # 
-fetchmail = base
+fetchmail = module
 
 # Layer: kernel
 # Module: files
@@ -434,7 +432,7 @@ filesystem = base
 #
 # Finger user information service.
 # 
-finger = base
+finger = module
 
 # Layer: admin
 # Module: firstboot
@@ -456,7 +454,7 @@ fstools = base
 #
 # File transfer protocol service
 # 
-ftp = base
+ftp = module
 
 # Layer: apps
 # Module: games
@@ -521,7 +519,7 @@ hotplug = base
 #
 # Port of Apple Rendezvous multicast DNS
 # 
-howl = base
+howl = module
 
 # Layer: services
 # Module: inetd
@@ -542,7 +540,7 @@ init = base
 #
 # Internet News NNTP server
 # 
-inn = base
+inn = module
 
 # Layer: system
 # Module: iptables
@@ -592,14 +590,14 @@ i18n_input = off
 #
 # java executable
 # 
-java = base
+java = module
 
 # Layer: services
 # Module: kerberos
 #
 # MIT Kerberos admin and KDC
 # 
-kerberos = base
+kerberos = module
 
 # Layer: kernel
 # Module: kernel
@@ -614,7 +612,7 @@ kernel = base
 #
 # KDE Talk daemon
 # 
-ktalk = base
+ktalk = module
 
 # Layer: admin
 # Module: kudzu
@@ -629,7 +627,7 @@ kudzu = base
 #
 # OpenLDAP directory server
 # 
-ldap = base
+ldap = module
 
 # Layer: system
 # Module: libraries
@@ -685,7 +683,7 @@ logwatch = base
 #
 # Line printer daemon
 # 
-lpd = base
+lpd = module
 
 # Layer: system
 # Module: lvm
@@ -694,14 +692,12 @@ lpd = base
 # 
 lvm = base
 
-
 # Layer: services
 # Module: mailman
 #
 # Mailman is for managing electronic mail discussion and e-newsletter lists
 # 
-mailman = base
+mailman = module
-
 
 # Layer: services
 # Module: mailscanner
@@ -803,7 +799,7 @@ mta = base
 #
 # Policy for MySQL
 # 
-mysql = base
+mysql = module
 
 # Layer: services
 # Module: nagios
@@ -831,7 +827,7 @@ networkmanager = base
 #
 # Policy for NIS (YP) servers and clients
 # 
-nis = base
+nis = module
 
 
 # Layer: services
@@ -847,7 +843,7 @@ nscd = base
 #
 # Network time protocol daemon
 # 
-ntp = base
+ntp = module
 
 # Layer: services
 # Module: nx
@@ -876,7 +872,7 @@ openct = off
 #
 # Policy for OPENVPN full-featured SSL VPN solution
 # 
-openvpn = base
+openvpn = module
 
 
 # Layer: service
@@ -905,43 +901,42 @@ pcmcia = base
 #
 # The Open Group Pegasus CIM/WBEM Server.
 # 
-pegasus = base
+pegasus = module
 
 # Layer: services
 # Module: postgresql
 #
 # PostgreSQL relational database
 # 
-postgresql = base
+postgresql = module
 
 # Layer: services
 # Module: portmap
 #
 # RPC port mapping service.
 # 
-portmap = base
+portmap = module
-
 
 # Layer: services
 # Module: postfix
 #
 # Postfix email server
 # 
-postfix = base
+postfix = module
 
 o# Layer: services
 # Module: postgrey
 #
 # email scanner
 # 
-postgrey = base
+postgrey = module
 
 # Layer: services
 # Module: ppp
 #
 # Point to Point Protocol daemon creates links in ppp networks
 # 
-ppp = base
+ppp = module
 
 # Layer: admin
 # Module: prelink
@@ -955,14 +950,14 @@ prelink = base
 #
 # Procmail mail delivery agent
 # 
-procmail = base
+procmail = module
 
 # Layer: services
 # Module: privoxy
 #
 # Privacy enhancing web proxy.
 # 
-privoxy = base
+privoxy = module
 
 # Layer: services
 # Module: publicfile
@@ -1005,22 +1000,14 @@ raid = base
 #
 # RADIUS authentication and accounting server.
 # 
-radius = base
+radius = module
-
-# Layer: services
-# Module: radius
-#
-# RADIUS authentication and accounting server.
-# 
-radius = base
-
 
 # Layer: services
 # Module: radvd
 #
 # IPv6 router advertisement daemon
 # 
-radvd = base
+radvd = module
 
 # Layer: services
 # Module: razor
@@ -1048,14 +1035,14 @@ rhgb = base
 #
 # Network router discovery daemon
 # 
-rdisc = base
+rdisc = module
 
 # Layer: services
 # Module: remotelogin
 #
 # Policy for rshd, rlogind, and telnetd.
 # 
-remotelogin = base
+remotelogin = module
 
 # Layer: services
 # Module: ricci
@@ -1069,7 +1056,7 @@ ricci = module
 #
 # Remote login daemon
 # 
-rlogin = base
+rlogin = module
 
 # Layer: services
 # Module: roundup
@@ -1098,14 +1085,14 @@ rpm = base
 #
 # Remote shell service.
 # 
-rshd = base
+rshd = module
 
 # Layer: services
 # Module: rsync
 #
 # Fast incremental file transfer for synchronization
 # 
-rsync = base
+rsync = module
 
 # Layer: services
 # Module: rwho
@@ -1119,7 +1106,7 @@ rwho = module
 #
 # SASL authentication server
 # 
-sasl = base
+sasl = module
 
 # Layer: services
 # Module: sendmail
@@ -1135,7 +1122,7 @@ sendmail = base
 # name  Service  Switch  daemon for resolving names
 # from Windows NT servers.
 # 
-samba = base
+samba = module
 
 # Layer: apps
 # Module: screen
@@ -1181,7 +1168,6 @@ setroubleshoot = base
 # 
 slrnpull = off
 
-
 # Layer: apps
 # Module: slocate
 #
@@ -1201,21 +1187,21 @@ smartmon = module
 #
 # Simple network management protocol services
 # 
-snmp = base
+snmp = module
 
 # Layer: services
 # Module: spamassassin
 #
 # Filter used for removing unsolicited email.
 # 
-spamassassin = base
+spamassassin = module
 
 # Layer: services
 # Module: squid
 #
 # Squid caching http proxy server
 # 
-squid = base
+squid = module
 
 # Layer: services
 # Module: ssh
@@ -1236,7 +1222,7 @@ storage = base
 #
 # SSL Tunneling Proxy
 # 
-stunnel = base
+stunnel = module
 
 # Layer: admin
 # Module: su
@@ -1265,14 +1251,14 @@ sysnetwork = base
 #
 # Policy for sysstat. Reports on various system states
 # 
-sysstat = base
+sysstat = module
 
 # Layer: services
 # Module: tcpd
 #
 # Policy for TCP daemon.
 # 
-tcpd = base
+tcpd = module
 
 # Layer: system
 # Module: udev
@@ -1300,7 +1286,7 @@ unconfined = module
 #
 # wine executable
 # 
-wine = base
+wine = module
 
 # Layer: admin
 # Module: tzdata
@@ -1356,7 +1342,7 @@ usernetctl = module
 #
 # virtualization software
 # 
-xen = base
+xen = module
 
 # Layer: services
 # Module: virt
@@ -1384,7 +1370,7 @@ brctl = base
 #
 # Telnet daemon
 # 
-telnet = base
+telnet = module
 
 # Layer: services
 # Module: timidity
@@ -1398,14 +1384,14 @@ timidity = off
 #
 # Trivial file transfer protocol daemon
 # 
-tftp = base
+tftp = module
 
 # Layer: services
 # Module: uucp
 #
 # Unix to Unix Copy
 # 
-uucp = base
+uucp = module
 
 # Layer: services
 # Module: vbetool 
@@ -1419,14 +1405,14 @@ vbetool = base
 #
 # Web server log analysis
 # 
-webalizer = base
+webalizer = module
 
 # Layer: services
 # Module: xfs
 #
 # X Windows Font Server
 # 
-xfs = base
+xfs = module
 
 # Layer: services
 # Module: xserver
@@ -1440,7 +1426,7 @@ xserver = base
 #
 # Zebra border gateway protocol network routing service
 # 
-zebra = base
+zebra = module
 
 # Layer: admin
 # Module: usermanage
@@ -1511,14 +1497,7 @@ apcupsd = module
 #
 # Policy for aide
 # 
-aide = base
+aide = module
-
-# Layer: services
-# Module: aide
-#
-# Policy for aide
-# 
-aide = base
 
 # Layer: services
 # Module: w3c
@@ -1630,7 +1609,7 @@ kerneloops = module
 #
 # openoffice executable
 # 
-openoffice = base
+openoffice = module
 
 # Layer: apps
 # Module: podsleuth

sources

@@ -1 +1 @@
-08cbc69d40ae75771c6201f2812a2eba  serefpolicy-3.5.7.tgz
+1b4c8999f49501d5bcfc81fb2498b2e6  serefpolicy-3.5.8.tgz