Create device file with the correct major number (#148503).

Package-Manager: portage-2.1.1

3 files changed, 18 insertions, 179 deletions

diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index b4c22d2ee6a8..82da4fc7dcc8 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -17,10 +17,10 @@ AUX slmodem-2.9.11-modem-makefile.patch 685 RMD160 dd8cd679c2afd7fd8ae7e1e1af5de
 MD5 a1cd437eecc5e84a38cc22929ea9f817 files/slmodem-2.9.11-modem-makefile.patch 685
 RMD160 dd8cd679c2afd7fd8ae7e1e1af5defe14514bfc4 files/slmodem-2.9.11-modem-makefile.patch 685
 SHA256 770f23caf7ebeebd03a0ab6a2e2e02740db9dd848ee104fb67033281690655a5 files/slmodem-2.9.11-modem-makefile.patch 685
-AUX slmodem-2.9.11.init 2182 RMD160 bbacb69c48be43feff80eb0e6936ab293d9f66d9 SHA1 53ebf95ee488553bef54df4e823934b803f8fe01 SHA256 af9974afbcede01304f2367e9163a59db2ecca0e0fca7406e72f402968829e51
-MD5 67168d0e7a1be3e5041ec3cb8dabb50d files/slmodem-2.9.11.init 2182
-RMD160 bbacb69c48be43feff80eb0e6936ab293d9f66d9 files/slmodem-2.9.11.init 2182
-SHA256 af9974afbcede01304f2367e9163a59db2ecca0e0fca7406e72f402968829e51 files/slmodem-2.9.11.init 2182
+AUX slmodem-2.9.11.init 2258 RMD160 692339982d8b09870c81ab04b9e07a7e7397b028 SHA1 6b683d06c456c9d912fc5a48dd7763115ae176fe SHA256 5649c0a14df8b7513dde484a1d0445cb13fde3f5e02118baadff7962099aa710
+MD5 f466bf22d970d1f4ea3df4c9a5573bdb files/slmodem-2.9.11.init 2258
+RMD160 692339982d8b09870c81ab04b9e07a7e7397b028 files/slmodem-2.9.11.init 2258
+SHA256 5649c0a14df8b7513dde484a1d0445cb13fde3f5e02118baadff7962099aa710 files/slmodem-2.9.11.init 2258
 AUX slmodem-2.9.11.modules 106 RMD160 41b949de0d6a2c47d0227c97b065336cc54ed50e SHA1 933fbb37e99e26b838d508c177cf69097903c36b SHA256 0ae1432fbae6e517190a841a6ae09806f24c16614e845d2e814a568285d96a7f
 MD5 e91d1df68be76c531a8514dba77c1886 files/slmodem-2.9.11.modules 106
 RMD160 41b949de0d6a2c47d0227c97b065336cc54ed50e files/slmodem-2.9.11.modules 106
@@ -35,18 +35,18 @@ RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 files/slusb.hotplug 262
 SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed files/slusb.hotplug 262
 DIST slmodem-2.9.11-20051101.tar.gz 833644 RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 SHA1 bacd94800a83c86cc872c6afa75dfb3c90828815 SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172
 DIST ungrab-winmodem.tar.gz 1872 RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf SHA1 d8c48969fd840b4f7b15f9d6b269470a44e4eed0 SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11
-EBUILD slmodem-2.9.11_pre20051101-r1.ebuild 4658 RMD160 bf204ef5043d87f897bcb15ebc2aabd22574b167 SHA1 3fec984c543212f099129e54de92bd3f20b91011 SHA256 16a1403d5f1d6463072075c5b2ad261ecb423359ff6d403908ce9f9b3aa64fee
-MD5 1093ad539022b86d041f909accc97038 slmodem-2.9.11_pre20051101-r1.ebuild 4658
-RMD160 bf204ef5043d87f897bcb15ebc2aabd22574b167 slmodem-2.9.11_pre20051101-r1.ebuild 4658
-SHA256 16a1403d5f1d6463072075c5b2ad261ecb423359ff6d403908ce9f9b3aa64fee slmodem-2.9.11_pre20051101-r1.ebuild 4658
+EBUILD slmodem-2.9.11_pre20051101-r2.ebuild 4658 RMD160 45e469f617c3846c24c6c53c0e2bc619f3865c07 SHA1 ae733bd66a1c6697ca829ab70bb8b06b594ccc03 SHA256 f5786a3baa6d4f843d259577168284e77ee374f732d26441116c506f5e65ea4f
+MD5 e8e5a97195f13b58271200770c469144 slmodem-2.9.11_pre20051101-r2.ebuild 4658
+RMD160 45e469f617c3846c24c6c53c0e2bc619f3865c07 slmodem-2.9.11_pre20051101-r2.ebuild 4658
+SHA256 f5786a3baa6d4f843d259577168284e77ee374f732d26441116c506f5e65ea4f slmodem-2.9.11_pre20051101-r2.ebuild 4658
 EBUILD slmodem-2.9.11_pre20051101.ebuild 4619 RMD160 cfed55daf1c5d6fdd7607d2b5c28736fc4ceed49 SHA1 85d4c940fc793b0cbbdb25d814cdd60de7ed76e5 SHA256 71c708a1b978333292b311f357f08b44b6e4c434c755859f615757e873964813
 MD5 efea4cd18104c7257dd76d8b7830a418 slmodem-2.9.11_pre20051101.ebuild 4619
 RMD160 cfed55daf1c5d6fdd7607d2b5c28736fc4ceed49 slmodem-2.9.11_pre20051101.ebuild 4619
 SHA256 71c708a1b978333292b311f357f08b44b6e4c434c755859f615757e873964813 slmodem-2.9.11_pre20051101.ebuild 4619
-MISC ChangeLog 15354 RMD160 c95d142549ab3471c259ea1b44a4f1d999ed3a37 SHA1 a9ceb0670764652ded32bb35eef491339bbf0558 SHA256 c58488cc793f682b6b5e241c63f462ac67491344720d9cf3d8d8eee49a15de8e
-MD5 f5485d29b23b3cb27bd6812b2f742d84 ChangeLog 15354
-RMD160 c95d142549ab3471c259ea1b44a4f1d999ed3a37 ChangeLog 15354
-SHA256 c58488cc793f682b6b5e241c63f462ac67491344720d9cf3d8d8eee49a15de8e ChangeLog 15354
+MISC ChangeLog 15619 RMD160 511f99d5b25845cfbd3d0461ca59e6c43a749b64 SHA1 87e2c28bf784cf1aa8bd948f2a09b2e2eb8a285b SHA256 cbe18d796fcf45609fb54564f8329cfb5d6295a4cb76e28e68a6b577d2e21aa5
+MD5 3286f7136655a762226c8edac1edeade ChangeLog 15619
+RMD160 511f99d5b25845cfbd3d0461ca59e6c43a749b64 ChangeLog 15619
+SHA256 cbe18d796fcf45609fb54564f8329cfb5d6295a4cb76e28e68a6b577d2e21aa5 ChangeLog 15619
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -54,13 +54,13 @@ SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata
 MD5 bd3432246edbc20a20719bef640eb9ca files/digest-slmodem-2.9.11_pre20051101 512
 RMD160 13e9984479cbd18a496255c6cc317da7cfd48e47 files/digest-slmodem-2.9.11_pre20051101 512
 SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/digest-slmodem-2.9.11_pre20051101 512
-MD5 bd3432246edbc20a20719bef640eb9ca files/digest-slmodem-2.9.11_pre20051101-r1 512
-RMD160 13e9984479cbd18a496255c6cc317da7cfd48e47 files/digest-slmodem-2.9.11_pre20051101-r1 512
-SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/digest-slmodem-2.9.11_pre20051101-r1 512
+MD5 bd3432246edbc20a20719bef640eb9ca files/digest-slmodem-2.9.11_pre20051101-r2 512
+RMD160 13e9984479cbd18a496255c6cc317da7cfd48e47 files/digest-slmodem-2.9.11_pre20051101-r2 512
+SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/digest-slmodem-2.9.11_pre20051101-r2 512
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFBoAH3sf9c6kjmR8RAotkAJ4lDVpFmaYNqOUhIiWhL7fypw+JOwCgkoYL
-zcwFn3feffJM3CZcL6LzSUo=
-=U3ma
+iD8DBQFFE9fU3sf9c6kjmR8RAqqQAJ99dpD9VgsOu3ONhYGUmh3RAzii4ACgwTPx
+IPaB1h0kjr4XUbvwcW/Ckww=
+=aAd6
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r1 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r1
deleted file mode 100644
index 047a97ea184a..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56bb1ddf621b2fe26caf746aed0ac26f slmodem-2.9.11-20051101.tar.gz 833644
-RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 slmodem-2.9.11-20051101.tar.gz 833644
-SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172 slmodem-2.9.11-20051101.tar.gz 833644
-MD5 a23326976632fe7774e110cbc0636f70 ungrab-winmodem.tar.gz 1872
-RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf ungrab-winmodem.tar.gz 1872
-SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11 ungrab-winmodem.tar.gz 1872
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r1.ebuild
deleted file mode 100644
index 01386c8c57ae..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r1.ebuild,v 1.3 2006/09/12 09:38:02 mrness Exp $
-
-inherit eutils linux-mod multilib
-
-DESCRIPTION="Driver for Smart Link modem"
-HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
-SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P/_pre/-}.tar.gz
-	http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem.tar.gz"
-
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa usb"
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-	amd64? ( app-emulation/emul-linux-x86-soundlibs )"
-
-QA_EXECSTACK="usr/sbin/slmodem_test usr/sbin/slmodemd"
-
-S=${WORKDIR}/${P/_pre/-}
-
-pkg_setup() {
-	use amd64 && multilib_toolchain_setup x86
-
-	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem)"
-	if ! use amd64; then
-		MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)"
-		if use usb; then
-			MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
-			CONFIG_CHECK="USB"
-		fi
-	fi
-	BUILD_TARGETS="all"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \
-		"${WORKDIR}/ungrab-winmodem/Makefile"
-	convert_to_m "${WORKDIR}/ungrab-winmodem/Makefile"
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
-	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.18.patch"
-	cd drivers
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
-	convert_to_m Makefile
-	sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c
-	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \
-		amrmo_init.c old_st7554.c
-}
-
-src_compile() {
-	local MAKE_PARAMS=""
-	if use alsa || use amd64; then
-		MAKE_PARAMS="SUPPORT_ALSA=1"
-	fi
-	emake ${MAKE_PARAMS} modem || die "failed to build modem"
-
-	use amd64 && multilib_toolchain_setup amd64
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	newsbin modem/modem_test slmodem_test
-	dosbin modem/slmodemd
-	dodir /var/lib/slmodem
-	fowners root:dialout /var/lib/slmodem
-	keepdir /var/lib/slmodem
-
-	newconfd "${FILESDIR}/${PN}-2.9.conf" ${PN}
-	newinitd "${FILESDIR}/${PN}-2.9.11.init" ${PN}
-
-	# configure for alsa - or not for alsa
-	if use alsa; then
-		sed -i -e "s/# MODULE=alsa/MODULE=alsa/" \
-			-e "s/# HW_SLOT=modem:1/HW_SLOT=modem:1/" "${D}/etc/conf.d/slmodem"
-	else
-		sed -i "s/# MODULE=slamr/MODULE=slamr/" "${D}/etc/conf.d/slmodem"
-	fi
-
-
-	# Add module aliases and install hotplug script
-	insinto /etc/modules.d/; newins "${FILESDIR}/${PN}-2.9.11.modules" ${PN}
-	if use usb; then
-		exeinto /etc/hotplug/usb; newexe "${FILESDIR}/slusb.hotplug" slusb
-	fi
-
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> "${D}/etc/hotplug/blacklist.d/${PN}"
-
-	# Add configuration for devfs, udev
-	if [ -e "${ROOT}/dev/.devfsd" ] ; then
-		insinto /etc/devfs.d/; newins "${FILESDIR}/${PN}-2.9.devfs" ${PN}
-	elif [ -e "${ROOT}/dev/.udev" ] ; then
-		dodir /etc/udev/rules.d/
-		echo 'KERNEL=="slamr", NAME="slamr0" GROUP="dialout"' > \
-			 "${D}/etc/udev/rules.d/55-${PN}.rules"
-		if use usb; then
-			echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout"' >> \
-				 "${D}/etc/udev/rules.d/55-${PN}.rules"
-		fi
-	fi
-
-	dodoc Changes README "${WORKDIR}/ungrab-winmodem/Readme.txt"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Make some devices if we aren't using devfs or udev
-	if [ -e "${ROOT}/dev/.devfsd" ]; then
-		ebegin "Restarting devfsd to reread devfs rules"
-			killall -HUP devfsd
-		eend $?
-
-	elif [ -e "${ROOT}/dev/.udev" ]; then
-		ebegin "Restarting udev to reread udev rules"
-			udevstart
-		eend $?
-	else
-		cd "${S}/drivers"
-		make DESTDIR="${ROOT}" install-devices
-	fi
-
-	if [ ! -e "${ROOT}/dev/ppp" ]; then
-		mknod "${ROOT}/dev/ppp" c 108 0
-	fi
-
-	ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist"
-	einfo "You must edit /etc/conf.d/${PN} for your configuration"
-	einfo "To add slmodem to your startup - type : rc-update add slmodem default"
-
-	if use alsa; then
-		einfo "I hope you have already added alsa to your startup: "
-		einfo "otherwise type: rc-update add alsasound boot"
-		einfo
-		einfo "If you need to use snd-intel8x0m from the kernel"
-		einfo "compile it as a module and edit /etc/modules.d/alsa"
-		einfo 'to: "alias snd-card-(number) snd-intel8x0m"'
-	fi
-
-	einfo "You need to be in the uucp AND dialout group to make calls as a user."
-	einfo
-	einfo "If you see the following in dmesg:"
-	echo slamr: device 10b9:5457 is grabbed by driver serial
-	einfo "you need to modprobe ungrab-winmodem before slamr"
-}