Merge branch 'master' of git+ssh://git.gentoo.org/proj/releng

releases/weekly/portage/admincd/package.keywords/genkernel

@@ -0,0 +1 @@
+=sys-kernel/genkernel-3.4.52.3

releases/weekly/portage/cloud-stages/package.use/iputils

@@ -0,0 +1 @@
+net-misc/iputils -caps -filecaps

releases/weekly/portage/installcd/package.keywords/genkernel

@@ -0,0 +1 @@
+=sys-kernel/genkernel-3.4.52.3

releases/weekly/scripts/cloud-prep.sh

@@ -21,7 +21,7 @@ mkdir /boot/grub
 echo 'GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"' >> /etc/default/grub
 grub2-mkconfig -o /boot/grub/grub.cfg
 sed -r -i 's/loop[0-9]+p1/vda2/g' /boot/grub/grub.cfg
-sed -i 's/UUID=[a-z,0-9,-]*/\/dev\/vda2/g' /boot/grub/grub.cfg
+sed -i 's/root=.*\ ro/root=\/dev\/vda2\ ro/' /boot/grub/grub.cfg
 
 # And the fstab
 echo '/dev/vda2 / ext4 defaults 0 0' > /etc/fstab
@@ -68,12 +68,6 @@ sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf
 # clean up system
 passwd -d root
 passwd -l root
-rm -R -f /usr/portage/distfiles/*
+for i in $(find /var/log -type f); do truncate -s 0 $i; done
-rm -f /etc/ssh/ssh_host_*
+# remove foreign manpages
-rm -f /root/.bash_history
+find /usr/share/man/ -mindepth 1  -maxdepth 1 -path "/usr/share/man/man*" -prune -o -exec rm -rf {} \;
-rm -f /root/.nano_history
-rm -f /root/.lesshst
-rm -f /root/.ssh/known_hosts
-rm -f /usr/src/linux
-for i in $(find /var/log -type f); do echo > $i; done
-for i in $(find /tmp -type f); do rm -f $i; done

releases/weekly/specs/alpha/installcd-stage1.spec

@@ -51,7 +51,7 @@ livecd/packages:
 	net-misc/rdate
 #	net-misc/vconfig
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 #	net-wireless/ipw2100-firmware
 #	net-wireless/ipw2200-firmware

releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec

@@ -115,7 +115,7 @@ livecd/packages:
 	net-misc/wget
 	net-misc/whois
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 	net-wireless/b43-fwcutter
 ### Masked (~amd64)

releases/weekly/specs/amd64/hardened/admincd-stage1.spec

@@ -118,7 +118,7 @@ livecd/packages:
 	net-misc/wget
 	net-misc/whois
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 	net-wireless/b43-fwcutter
 ### Masked (~amd64)

releases/weekly/specs/amd64/hardened/stage4-cloud.spec

@@ -52,7 +52,37 @@ stage4/rcadd:
 	syslog-ng|default
 
 boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
+boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
+
+# all of the cleanup...
+stage4/unmerge:
+	sys-kernel/genkernel
+	sys-kernel/gentoo-sources
+
+stage4/empty:
+	/root/.ccache
+	/tmp
+	/usr/portage/distfiles
+	/usr/src
+	/var/cache/edb/dep
+	/var/cache/genkernel
+	/var/empty
+	/var/run
+	/var/state
+	/var/tmp
+
+stage4/rm:
+	/etc/*-
+	/etc/*.old
+	/etc/ssh/ssh_host_*
+	/root/.*history
+	/root/.lesshst
+	/root/.ssh/known_hosts
+	/root/.viminfo
+	# Remove any generated stuff by genkernel
+	/usr/share/genkernel
+	# This is 3MB of crap for each copy
+	/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz

releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec

@@ -52,7 +52,37 @@ stage4/rcadd:
 	syslog-ng|default
 
 boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
+boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-hardened.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
+
+# all of the cleanup...
+stage4/unmerge:
+	sys-kernel/genkernel
+	sys-kernel/gentoo-sources
+
+stage4/empty:
+	/root/.ccache
+	/tmp
+	/usr/portage/distfiles
+	/usr/src
+	/var/cache/edb/dep
+	/var/cache/genkernel
+	/var/empty
+	/var/run
+	/var/state
+	/var/tmp
+
+stage4/rm:
+	/etc/*-
+	/etc/*.old
+	/etc/ssh/ssh_host_*
+	/root/.*history
+	/root/.lesshst
+	/root/.ssh/known_hosts
+	/root/.viminfo
+	# Remove any generated stuff by genkernel
+	/usr/share/genkernel
+	# This is 3MB of crap for each copy
+	/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz

releases/weekly/specs/amd64/installcd-stage1.spec

@@ -56,7 +56,7 @@ livecd/packages:
 	net-misc/rsync
 	net-misc/vconfig
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 	net-wireless/b43-fwcutter
 ### Masked (~keywords)

releases/weekly/specs/amd64/livecd-stage1.spec

@@ -73,7 +73,7 @@ livecd/packages:
 	net-misc/whois
 	net-p2p/bittorrent
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 	net-wireless/b43-fwcutter
 ### Masked (~amd64)

releases/weekly/specs/amd64/livedvd-stage1.spec

@@ -167,7 +167,7 @@ livecd/packages:
 	net-p2p/limewire
 	net-print/cups
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 ### Masked (~amd64)
 #	net-wireless/aircrack-ng

releases/weekly/specs/amd64/stage4-cloud.spec

@@ -9,6 +9,7 @@ portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
 
 stage4/use:
 	bash-completion
+	bindist
 	bzip2
 	idm
 	ipv6
@@ -26,6 +27,7 @@ stage4/packages:
 	app-portage/eix
 	app-portage/gentoolkit
 	net-misc/dhcpcd
+	net-misc/iputils
 	sys-boot/grub
 	sys-apps/dmidecode
 	sys-apps/gptfdisk
@@ -53,6 +55,36 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
+
+# all of the cleanup...
+stage4/unmerge:
+	sys-kernel/genkernel
+	sys-kernel/gentoo-sources
+
+stage4/empty:
+	/root/.ccache
+	/tmp
+	/usr/portage/distfiles
+	/usr/src
+	/var/cache/edb/dep
+	/var/cache/genkernel
+	/var/empty
+	/var/run
+	/var/state
+	/var/tmp
+
+stage4/rm:
+	/etc/*-
+	/etc/*.old
+	/etc/ssh/ssh_host_*
+	/root/.*history
+	/root/.lesshst
+	/root/.ssh/known_hosts
+	/root/.viminfo
+	# Remove any generated stuff by genkernel
+	/usr/share/genkernel
+	# This is 3MB of crap for each copy
+	/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz

releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec

@@ -53,6 +53,36 @@ stage4/rcadd:
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.18.12.config
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
+
+# all of the cleanup...
+stage4/unmerge:
+	sys-kernel/genkernel
+	sys-kernel/gentoo-sources
+
+stage4/empty:
+	/root/.ccache
+	/tmp
+	/usr/portage/distfiles
+	/usr/src
+	/var/cache/edb/dep
+	/var/cache/genkernel
+	/var/empty
+	/var/run
+	/var/state
+	/var/tmp
+
+stage4/rm:
+	/etc/*-
+	/etc/*.old
+	/etc/ssh/ssh_host_*
+	/root/.*history
+	/root/.lesshst
+	/root/.ssh/known_hosts
+	/root/.viminfo
+	# Remove any generated stuff by genkernel
+	/usr/share/genkernel
+	# This is 3MB of crap for each copy
+	/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz

releases/weekly/specs/hppa/installcd-stage1.spec

@@ -48,7 +48,7 @@ livecd/packages:
 	net-misc/rdate
 	net-misc/vconfig
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	sys-apps/ethtool
 	sys-apps/hdparm
 	sys-apps/hwsetup

releases/weekly/specs/hppa/installcd-stage2-minimal.spec

@@ -110,7 +110,7 @@ livecd/unmerge:
 	dev-util/pkgconfig
 	net-misc/netifrc
 	net-misc/rsync
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	perl-core/PodParser
 	perl-core/Test-Harness
 	sys-apps/debianutils

releases/weekly/specs/ia64/installcd-stage1.spec

@@ -49,7 +49,7 @@ livecd/packages:
 	net-misc/rdate
 #	net-misc/vconfig
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 # Not keyworded
 #	net-proxy/tsocks
 #	net-wireless/ipw2100-firmware

releases/weekly/specs/ppc/ppc64/installcd-stage1.spec

@@ -53,7 +53,7 @@ livecd/packages:
 	net-misc/iputils
 	net-misc/ntp
 	net-misc/rdate
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-wireless/b43-fwcutter
 	net-wireless/bcm43xx-fwcutter
 	net-wireless/wireless-tools

releases/weekly/specs/s390/s390/netboot/netboot.spec

@@ -22,6 +22,7 @@ netboot2/use:
  shadow
  readline
  ssl
+ unicode
 
 netboot2/packages:
 	sys-apps/s390-tools

releases/weekly/specs/s390/s390x/netboot/netboot.spec

@@ -22,6 +22,7 @@ netboot2/use:
  shadow
  readline
  ssl
+ unicode
 
 netboot2/packages:
 	sys-apps/s390-tools

releases/weekly/specs/sparc/sparc64/installcd-stage1.spec

@@ -57,7 +57,7 @@ livecd/packages:
 	net-misc/vconfig
 	net-proxy/dante
 # Not keyworded
-#	net-proxy/ntlmaps
+##	net-proxy/ntlmaps
 	net-proxy/tsocks
 #	net-wireless/ipw2100-firmware
 #	net-wireless/ipw2200-firmware

releases/weekly/specs/x86/hardened/admincd-stage1.spec

@@ -118,7 +118,7 @@ livecd/packages:
 	net-misc/wget
 	net-misc/whois
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 	net-wireless/b43-fwcutter
 ### Masked (~amd64)

releases/weekly/specs/x86/hardened/installcd-stage1.spec

@@ -50,7 +50,7 @@ livecd/packages:
 	net-misc/rdate
 	net-misc/vconfig
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 	net-wireless/ipw2100-firmware
 	net-wireless/ipw2200-firmware

releases/weekly/specs/x86/i686/livecd-stage1.spec

@@ -72,7 +72,7 @@ livecd/packages:
 	net-misc/whois
 	net-p2p/bittorrent
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 ### Masked by ~x86
 #	net-wireless/b43-fwcutter

releases/weekly/specs/x86/i686/livedvd-stage1.spec

@@ -161,7 +161,7 @@ livecd/packages:
 	net-p2p/limewire
 	net-print/cups
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 	net-wireless/aircrack-ng
 	net-wireless/airsnort

releases/weekly/specs/x86/installcd-stage1.spec

@@ -54,7 +54,7 @@ livecd/packages:
 	net-misc/rsync
 	net-misc/vconfig
 	net-proxy/dante
-	net-proxy/ntlmaps
+#	net-proxy/ntlmaps
 	net-proxy/tsocks
 	net-wireless/b43-fwcutter
 ### Masked (~keywords)