commit: a3b4786a56411de219a5f4512ff84d6ed5d854e3 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Dec 20 03:14:41 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Dec 20 03:15:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b4786a
sys-apps/hwsetup: Remove Closes: https://bugs.gentoo.org/755617 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> sys-apps/hwsetup/Manifest | 1 - sys-apps/hwsetup/files/1.2-3-fastprobe.patch | 74 ------------------------ sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch | 62 -------------------- sys-apps/hwsetup/files/1.2-7-gentoo.patch | 20 ------- sys-apps/hwsetup/files/1.2-7-openchrome.patch | 11 ---- sys-apps/hwsetup/files/1.2-strip.patch | 11 ---- sys-apps/hwsetup/hwsetup-1.2-r3.ebuild | 69 ---------------------- sys-apps/hwsetup/metadata.xml | 8 --- 8 files changed, 256 deletions(-) diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest deleted file mode 100644 index 7acdb97c1da..00000000000 --- a/sys-apps/hwsetup/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST hwsetup_1.2-7.tar.gz 10706 BLAKE2B 2d0e005629f631aa3ef22f44122cf934d23929c89ee4ca7240dcdd9c2898e622a78e494a057b9eed96045e8b1a7b54252f402311360e84d57007876cd9a5f630 SHA512 ef252c748ecf1fc17d107fa413a76df5d9daab84b10eb1ca2c5c320207e0be522c4ae6204c1c85c613403e40312c9c876bcab04eeaa1a2e1724b7bb1c6d41a1e diff --git a/sys-apps/hwsetup/files/1.2-3-fastprobe.patch b/sys-apps/hwsetup/files/1.2-3-fastprobe.patch deleted file mode 100644 index 600b8c4002d..00000000000 --- a/sys-apps/hwsetup/files/1.2-3-fastprobe.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/hwsetup.c -+++ b/hwsetup.c -@@ -140,14 +140,15 @@ - - int syntax(char *option) - { -- printf(VERSION); -+ puts(VERSION); - if(option) fprintf(stderr,"hwsetup: Unknown option '%s'\n\n",option); -- printf("Usage: hwsetup\n" -- " -v be verbose\n" -- " -p print rotating prompt\n" -- " -a ignore audio devices\n" -- " -s ignore scsi controllers\n" -- " -n probe only, don't configure anything.\n"); -+ puts("Usage: hwsetup\n" -+ "\t\t-v\tbe verbose\n" -+ "\t\t-p\tprint rotating prompt\n" -+ "\t\t-a\tignore audio devices\n" -+ "\t\t-s\tignore scsi controllers\n" -+ "\t\t-n\tprobe only, don't configure anything.\n" -+ "\t\t-f\trun a fast probe."); - return option?1:0; - } - -@@ -425,7 +426,7 @@ - { - signal(SIGALRM,SIG_IGN); - fprintf(stderr,"\nWARNING: Autodetection seems to hang,\n" -- "please check your computers BIOS settings.\n"); -+ "please check your computer's BIOS settings.\n"); - fflush(stderr); - if(wpid) { kill(wpid,SIGTERM); usleep(2500000); kill(wpid,SIGKILL); wpid=0; } - exit(1); /* exit program */ -@@ -591,12 +592,13 @@ - return 0; - } - --int hw_setup(enum deviceClass dc, int verbose, int probeonly, int skip) -+int hw_setup(enum deviceClass dc, int verbose, int probeonly, int skip, int fastprobe) - { - int i,mouse=0,cdrom=0,modem=0,scanner=0; -+ int probeopt=fastprobe?PROBE_SAFE:PROBE_ALL; - struct device **currentDevs, *d, *serialmouse=NULL, *usbmouse=NULL; - if(verbose&VERBOSE_PROMPT) wpid=startwheel(); -- currentDevs=probeDevices(dc,BUS_UNSPEC,PROBE_ALL); -+ currentDevs=probeDevices(dc,BUS_UNSPEC,probeopt); - if(verbose&VERBOSE_PROMPT&&wpid>0) { kill(wpid,SIGTERM); wpid=0; usleep(160000); write(2,"\033[0m Done.\n",11); } - if(currentDevs==NULL) return -1; - check_proc_modules(); /* Get currently loaded module list */ -@@ -650,7 +652,7 @@ - - int main(int argc, char **argv) - { -- int i, verbose=0, probeonly=0, skip=0; -+ int i, verbose=0, probeonly=0, skip=0, fast=0; - enum deviceClass dc=CLASS_UNSPEC; - for(i=1;i<argc;i++) - { -@@ -659,6 +661,7 @@ - else if(!strcasecmp(argv[i],"-a")) skip|=SKIP_AUDIO; - else if(!strcasecmp(argv[i],"-s")) skip|=SKIP_SCSI; - else if(!strcasecmp(argv[i],"-n")) probeonly=1; -+ else if(!strcasecmp(argv[i],"-f")) fast=1; - else return syntax(argv[i]); - } - /* Allow SIGTERM, SIGINT: rmmod depends on this. */ -@@ -667,5 +670,5 @@ - #ifdef BLACKLIST - gen_blacklist(); - #endif -- return hw_setup(dc,verbose,probeonly,skip); -+ return hw_setup(dc,verbose,probeonly,skip,fast); - } diff --git a/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch b/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch deleted file mode 100644 index efbe0f6abfe..00000000000 --- a/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/hwsetup.c -+++ b/hwsetup.c -@@ -51,13 +51,40 @@ - /* Do not, under any circumstances, load these modules automatically, */ - /* even if in pcitable. (libkudzu may ignore this, and the KNOPPIX */ - /* autoconfig scripts may probe them, too) */ --char *blacklist[] = -+char *blacklist[200][200] = - { "apm","agpgart","yenta_socket","i82092","i82365","tcic", - "pcmcia_core","ds","ohci1394","hisax", "hisax_fcpcipnp", - "hisax_isac","hisax_st5481", - /* Winmodems, unusable, can block sound slot */ - "snd-atiixp-modem", "snd-intel8x0m","snd-via82xx-modem" - }; -+ -+int blacklistsize = 13; -+void gen_blacklist(){ -+ int n = 13; -+ int size = 0; -+ char *comment; -+ char module[1024]; -+ FILE *stream; -+ -+ if((stream = fopen ("/usr/share/hwdata/blacklist", "r")) != (FILE *)0) { -+ while((fgets(module, 1023, stream)) != (char *)0 ) { -+ -+ comment = strchr(module, '#'); -+ if (comment != 0) *comment = '\0'; -+ comment = strchr(module, '\n'); -+ if (comment != 0) *comment = '\0'; -+ size = strlen(module); -+ if (size < 2) continue; -+ strcat (module , " \0"); -+ strcpy(blacklist[n] , module); -+ n++; -+ if ( n == 200 ) break; -+ //printf(module); -+ } -+ blacklistsize = n; -+ } -+} - #endif - - /* If a conflicting module in a row is already loaded, the new module will not be probed anymore */ -@@ -547,7 +574,7 @@ - char *cc; - if((m==NULL)||(!strcmp("unknown",m))||(!strcmp("ignore",m))|| check_loaded(m)) return 0; - #ifdef BLACKLIST -- for(i=0;i<(sizeof(blacklist)/sizeof(char*));i++) -+ for(i=0;i<blacklistsize;i++) - { - if(!modcmp(blacklist[i],m)) - { -@@ -781,5 +808,8 @@ - /* Allow SIGTERM, SIGINT: rmmod depends on this. */ - signal(SIGTERM,SIG_DFL); signal(SIGINT,SIG_DFL); - signal(SIGALRM,alarm_handler); alarm(MAX_TIME); -+#ifdef BLACKLIST -+ gen_blacklist(); -+#endif - return hw_setup(dc,verbose,probeonly,skip); - } diff --git a/sys-apps/hwsetup/files/1.2-7-gentoo.patch b/sys-apps/hwsetup/files/1.2-7-gentoo.patch deleted file mode 100644 index e4fc590393f..00000000000 --- a/sys-apps/hwsetup/files/1.2-7-gentoo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/hwsetup.c -+++ b/hwsetup.c -@@ -388,7 +388,7 @@ - sprintf(fullpath,"%.90s%.32s",xpath,server[i]); - if(!exists(fullpath)) continue; - strncpy(xi.xserver,server[i],sizeof(xi.xserver)); -- } -+ } - } - } - if((xpos=strstr(d->driver,xorg))!=NULL) /* Check for Xorg */ -@@ -653,7 +653,7 @@ - int writeconfig(char *name,struct device *d,int verbose) - { - FILE *f,*k; -- const char *kconfig="/etc/sysconfig/knoppix"; -+ const char *kconfig="/etc/sysconfig/gentoo"; - char *desc; - unlink(name); - if((f=fopen(name,"w"))==NULL) diff --git a/sys-apps/hwsetup/files/1.2-7-openchrome.patch b/sys-apps/hwsetup/files/1.2-7-openchrome.patch deleted file mode 100644 index fb80f9dfcb1..00000000000 --- a/sys-apps/hwsetup/files/1.2-7-openchrome.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hwsetup.c -+++ b/hwsetup.c -@@ -456,7 +456,7 @@ - else if(strcasestr(xi.xdesc,"Newport")) strcpy(xi.xmodule,"newport"); - else if(strcasestr(xi.xdesc,"Siliconmotion")||strcasestr(xi.xdesc,"Silicon Motion")) strcpy(xi.xmodule,"siliconmotion"); - else if(strcasestr(xi.xdesc,"Chips")) strcpy(xi.xmodule,"chips"); -- else if(strcasestr(xi.xdesc,"VIA ")) strcpy(xi.xmodule,"via"); -+ else if(strcasestr(xi.xdesc,"VIA ")) strcpy(xi.xmodule,"openchrome"); - } - else strcpy(xi.xmodule,xvesa4); - } diff --git a/sys-apps/hwsetup/files/1.2-strip.patch b/sys-apps/hwsetup/files/1.2-strip.patch deleted file mode 100644 index 17de636a5dc..00000000000 --- a/sys-apps/hwsetup/files/1.2-strip.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ - # define BLACKLIST to avoid loading potentially dangerous modules - CFLAGS=-DBLACKLIST -Wall -fPIC - OPT=-O2 --LDFLAGS=-s -+#LDFLAGS=-s - LIBS=-lkudzu -lpci - CC=gcc - diff --git a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild deleted file mode 100644 index c535829a9ff..00000000000 --- a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs flag-o-matic - -MY_PV=${PV}-7 -DESCRIPTION="Hardware setup program from Knoppix - used only on LiveCD" -HOMEPAGE="http://www.knopper.net/"; -SRC_URI="http://debian-knoppix.alioth.debian.org/sources/${PN}_${MY_PV}.tar.gz"; -#http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 -mips ppc ppc64 sparc x86" -IUSE="zlib" - -COMMON_DEPEND=" - sys-apps/pciutils[zlib?] - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${COMMON_DEPEND} - sys-libs/libkudzu -" -RDEPEND=" - ${COMMON_DEPEND} - sys-apps/hwdata-gentoo -" - -pkg_setup() { - ewarn "This package is designed for use on the LiveCD only and will do " - ewarn "unspeakably horrible and unexpected things on a normal system." - ewarn "YOU HAVE BEEN WARNED!!!" -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${MY_PV}-dyn_blacklist.patch \ - "${FILESDIR}"/${PV}-3-fastprobe.patch \ - "${FILESDIR}"/${MY_PV}-gentoo.patch \ - "${FILESDIR}"/${PV}-strip.patch \ - "${FILESDIR}"/${MY_PV}-openchrome.patch -} - -src_configure() { - if use zlib ; then - sed -i \ - -e '/^LIBS=/s,-lpci,-lz -lpci,g' \ - Makefile - fi -} - -src_compile() { - emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man - dosbin ${PN} - keepdir /etc/sysconfig -} - -pkg_postinst() { - ewarn "This package is intended for use on the Gentoo release media. If" - ewarn "you are not building a CD, remove this package. It will not work" - ewarn "properly on a running system, as Gentoo does not use any of the" - ewarn "Knoppix-style detection except for CD builds." -} diff --git a/sys-apps/hwsetup/metadata.xml b/sys-apps/hwsetup/metadata.xml deleted file mode 100644 index 06ddf117247..00000000000 --- a/sys-apps/hwsetup/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Release Engineering</name> -</maintainer> -</pkgmetadata>
