From 21ddf341b497f3d52e7958983a27fd8b8f62dade Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 25 Mar 2008 17:43:52 +0000 Subject: [PATCH 1/1] - kill really unneccessary poldek configs - kill rpmlist.d (poldek can solve deps itself) Changed files: util-vserver-pld.patch -> 1.25 --- util-vserver-pld.patch | 597 ----------------------------------------- 1 file changed, 597 deletions(-) diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch index 872a401..ed008dc 100644 --- a/util-vserver-pld.patch +++ b/util-vserver-pld.patch @@ -48,104 +48,6 @@ +issue +rpm-base +vserver-packages ---- util-vserver-0.30.214.org/distrib/pld-ac/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/poldek/aliases.conf 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,30 @@ -+# System wide aliases -+# ls -+ll = ls -l -+llu = ls -lu -+llU = ls -lU -+lli = ls -lI -+ -+# install -+freshen = install -FN -+upgrade = install -F -+ -+# for backward compatybility, greedy is on by default now -+greedy-upgrade = install -FG -+ -+just-install = install -IN -+ -+# search -+what-requires = search -r -+what-provides = search -p -+rsearch = search --perlre -+ -+exit = quit -+ -+# for fun -+#ls = uninstall kernel -+ -+less = !less -+grep = !grep -+awk = !awk -+ ---- util-vserver-0.30.214.org/distrib/pld-ac/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/poldek/fetch.conf 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,62 @@ -+# Configuration of poldek external file getters. Each [fetcher] section -+# declares one external downloader. The syntax is: -+# [fetcher] -+# name = NAME -+# proto = PROTOCOL[ ,PROTOCOL... ] -+# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO -+# Possible parameters are: -+# -+#[fetcher] -+# Unique name of the fetcher. This is an optional parameter, if not set then -+# name is taken from the "cmd" parameter value as "$(basename $cmd)". -+#name = foo -+ -+# Protocol or protocols supported by fetcher. Name of the protocol can be -+# completely arbitrary, i.e. if you can handle protocol "foo" by writing -+# a script which takes URLs in form 'foo://'. -+#proto = foo,bar -+ -+# Parameter specifies an external command and its invoking syntax. -+# The syntax of "cmd" is: -+# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n] -+# Where COMMAND is the name or full path of command, OPTION is command specific -+# options. Macro '%d' is replaced with cache directory, '%D' is replaced with -+# 'cache directory/file basename', and '%p' with file basename, %P with file full -+# path (URL). Optional suffix 'n' with %p and %P means that command can be -+# invoked with multiple files at once. -+#cmd = foogetter.sh -N %D %Pn -+ -+##Configured fetchers -+[fetcher] -+proto = cdrom -+cmd = vfjuggle %d %Pn -+ -+[fetcher] -+proto = http,ftp,https -+cmd = wget -N --dot-style=binary -P %d %Pn -+ -+[fetcher] -+proto = http,ftp -+cmd = snarf %P %D -+ -+[fetcher] -+proto = https -+cmd = curl %P -o %D -+ -+[fetcher] -+proto = rsync -+cmd = rsync -v %P %d -+ -+[fetcher] -+proto = smb -+cmd = vfsmb -v %P %d -+ -+#[fetcher] -+#proto = ssh -+#cmd = vfssh.sh %d %Pn -+ -+#[fetcher] -+#proto = foo -+#cmd = foo.sh %d %Pn -+ -+ --- util-vserver-0.30.214.org/distrib/pld-ac/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 +++ util-vserver-0.30.214/distrib/pld-ac/poldek/pld-source.conf 2007-11-15 23:20:48.181172125 +0100 @@ -0,0 +1,44 @@ @@ -378,94 +280,6 @@ + +# Taking into account package Conflicts. +#conflicts = yes ---- util-vserver-0.30.214.org/distrib/pld-ac/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/poldek/source.conf 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,85 @@ -+# Sample poldek sources configuration -+# Every source is configured in his own [source] section. -+# Possible parameters are: -+# -+#[source] -+# Unique name of the repository. -+#name = foo -+ -+# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum' -+# and 'dir' as listed by --stl switch. -+#type = pndir -+ -+# This parameter sets index original type i.e type of repository -+# from what this repository is created. Default is 'dir' - means -+# that directory of packages is scanned. -+#original type = dir -+ -+# Unique name of the repository. May be either path or URL. -+#path = /some/url/or/dir -+ -+# If package index and packages are stored in different locations then -+# prefix stands for packages path. -+#prefix = /some/url/or/dir -+ -+# Controls visibility of multiple package instances with different EVR. -+# If on, only one, highest version will be visible. -+#douniq = no -+ -+# Repository priority. If the same packages (equal names and EVR) -+# are available in more than one source then package from highest -+# prioritized source are taken. Priority is numeric value. Lower number -+# means higher priority, and negative priorities are allowed. -+# Priority is numeric value. -+#pri = 0 -+ -+# Controling if repository index will be implicit loaded. Set it off if -+# the index should be loaded on demand only, i.e. if specified directly -+# by --sn option. -+#auto = yes -+ -+# Controls if repository index will be implicit updated. Set it off if -+# the index should be updated on demand only, i.e. if specified directly -+# by --sn option. -+#autoup = yes -+ -+# Packages PGP/GPG signatures (if any) will be verified before their -+# installation. -+#signed = no -+ -+# Have the same meaning as [global] parameter. Example: -+# hold = kernel* dev -+#hold = -+ -+# Have the same meaning as [global] parameter. Example: -+# ignore = kernel*smp* dev -+#ignore = -+ -+# Parameter have the same meaning as [global] parameter. -+# exclude path = usr/share/doc:usr/share/man:usr/src -+#exclude path = -+ -+# Preferred language of package descriptions. If not set, taken from locale -+# settings. Example: -+# lang = pl_PL:lt_LT -+#lang = -+ -+[source] -+name = home -+type = dir -+path = $HOME/rpm/RPMS -+auto = no -+autoup = no -+ -+#[source] -+#type = pndir -+#name = foo -+#path = ftp://ftp.foo.bar.org/RPMS/ -+#pri = -10 -+#auto = no -+#autoup = no -+#signed = yes -+#hold = kernel* -+#ignore = kernel*-smp-* -+#dscr = pl_PL -+ --- util-vserver-0.30.214.org/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100 +++ util-vserver-0.30.214/distrib/pld-ac/rpm/macros 2007-11-15 23:20:48.181172125 +0100 @@ -0,0 +1,4 @@ @@ -473,19 +287,6 @@ +# you have to use at least one language beside 'C' +%_install_langs C:en:pl +%_netsharedpath /dev ---- util-vserver-0.30.214.org/distrib/pld-ac/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ac/rpmlist.d/00.lst 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,10 @@ -+basesystem-*.rpm -+dev-*.rpm -+FHS-*.rpm -+glibc-misc-*.rpm -+glibc-[0-9]*.rpm -+libgcc-[0-9]*.rpm -+setup-*.rpm -+issue-[0-9]*.rpm -+rpm-base-*.rpm -+vserver-packages-*.rpm --- util-vserver-0.30.214.org/distrib/pld-th/pkgs/01 1970-01-01 01:00:00.000000000 +0100 +++ util-vserver-0.30.214/distrib/pld-th/pkgs/01 2007-11-15 23:20:48.181172125 +0100 @@ -0,0 +1,5 @@ @@ -494,104 +295,6 @@ +issue +rpm-base +vserver-packages ---- util-vserver-0.30.214.org/distrib/pld-th/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/poldek/aliases.conf 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,30 @@ -+# System wide aliases -+# ls -+ll = ls -l -+llu = ls -lu -+llU = ls -lU -+lli = ls -lI -+ -+# install -+freshen = install -FN -+upgrade = install -F -+ -+# for backward compatybility, greedy is on by default now -+greedy-upgrade = install -FG -+ -+just-install = install -IN -+ -+# search -+what-requires = search -r -+what-provides = search -p -+rsearch = search --perlre -+ -+exit = quit -+ -+# for fun -+#ls = uninstall kernel -+ -+less = !less -+grep = !grep -+awk = !awk -+ ---- util-vserver-0.30.214.org/distrib/pld-th/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/poldek/fetch.conf 2007-11-15 23:20:48.181172125 +0100 -@@ -0,0 +1,62 @@ -+# Configuration of poldek external file getters. Each [fetcher] section -+# declares one external downloader. The syntax is: -+# [fetcher] -+# name = NAME -+# proto = PROTOCOL[ ,PROTOCOL... ] -+# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO -+# Possible parameters are: -+# -+#[fetcher] -+# Unique name of the fetcher. This is an optional parameter, if not set then -+# name is taken from the "cmd" parameter value as "$(basename $cmd)". -+#name = foo -+ -+# Protocol or protocols supported by fetcher. Name of the protocol can be -+# completely arbitrary, i.e. if you can handle protocol "foo" by writing -+# a script which takes URLs in form 'foo://'. -+#proto = foo,bar -+ -+# Parameter specifies an external command and its invoking syntax. -+# The syntax of "cmd" is: -+# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n] -+# Where COMMAND is the name or full path of command, OPTION is command specific -+# options. Macro '%d' is replaced with cache directory, '%D' is replaced with -+# 'cache directory/file basename', and '%p' with file basename, %P with file full -+# path (URL). Optional suffix 'n' with %p and %P means that command can be -+# invoked with multiple files at once. -+#cmd = foogetter.sh -N %D %Pn -+ -+##Configured fetchers -+[fetcher] -+proto = cdrom -+cmd = vfjuggle %d %Pn -+ -+[fetcher] -+proto = http,ftp,https -+cmd = wget -N --dot-style=binary -P %d %Pn -+ -+[fetcher] -+proto = http,ftp -+cmd = snarf %P %D -+ -+[fetcher] -+proto = https -+cmd = curl %P -o %D -+ -+[fetcher] -+proto = rsync -+cmd = rsync -v %P %d -+ -+[fetcher] -+proto = smb -+cmd = vfsmb -v %P %d -+ -+#[fetcher] -+#proto = ssh -+#cmd = vfssh.sh %d %Pn -+ -+#[fetcher] -+#proto = foo -+#cmd = foo.sh %d %Pn -+ -+ --- util-vserver-0.30.214.org/distrib/pld-th/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 +++ util-vserver-0.30.214/distrib/pld-th/poldek/pld-source.conf 2007-11-15 23:20:48.181172125 +0100 @@ -0,0 +1,51 @@ @@ -831,94 +534,6 @@ + +# Taking into account package Conflicts. +#conflicts = yes ---- util-vserver-0.30.214.org/distrib/pld-th/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/poldek/source.conf 2007-11-15 23:20:48.184505622 +0100 -@@ -0,0 +1,85 @@ -+# Sample poldek sources configuration -+# Every source is configured in his own [source] section. -+# Possible parameters are: -+# -+#[source] -+# Unique name of the repository. -+#name = foo -+ -+# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum' -+# and 'dir' as listed by --stl switch. -+#type = pndir -+ -+# This parameter sets index original type i.e type of repository -+# from what this repository is created. Default is 'dir' - means -+# that directory of packages is scanned. -+#original type = dir -+ -+# Unique name of the repository. May be either path or URL. -+#path = /some/url/or/dir -+ -+# If package index and packages are stored in different locations then -+# prefix stands for packages path. -+#prefix = /some/url/or/dir -+ -+# Controls visibility of multiple package instances with different EVR. -+# If on, only one, highest version will be visible. -+#douniq = no -+ -+# Repository priority. If the same packages (equal names and EVR) -+# are available in more than one source then package from highest -+# prioritized source are taken. Priority is numeric value. Lower number -+# means higher priority, and negative priorities are allowed. -+# Priority is numeric value. -+#pri = 0 -+ -+# Controling if repository index will be implicit loaded. Set it off if -+# the index should be loaded on demand only, i.e. if specified directly -+# by --sn option. -+#auto = yes -+ -+# Controls if repository index will be implicit updated. Set it off if -+# the index should be updated on demand only, i.e. if specified directly -+# by --sn option. -+#autoup = yes -+ -+# Packages PGP/GPG signatures (if any) will be verified before their -+# installation. -+#signed = no -+ -+# Have the same meaning as [global] parameter. Example: -+# hold = kernel* dev -+#hold = -+ -+# Have the same meaning as [global] parameter. Example: -+# ignore = kernel*smp* dev -+#ignore = -+ -+# Parameter have the same meaning as [global] parameter. -+# exclude path = usr/share/doc:usr/share/man:usr/src -+#exclude path = -+ -+# Preferred language of package descriptions. If not set, taken from locale -+# settings. Example: -+# lang = pl_PL:lt_LT -+#lang = -+ -+[source] -+name = home -+type = dir -+path = $HOME/rpm/RPMS -+auto = no -+autoup = no -+ -+#[source] -+#type = pndir -+#name = foo -+#path = ftp://ftp.foo.bar.org/RPMS/ -+#pri = -10 -+#auto = no -+#autoup = no -+#signed = yes -+#hold = kernel* -+#ignore = kernel*-smp-* -+#dscr = pl_PL -+ --- util-vserver-0.30.214.org/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100 +++ util-vserver-0.30.214/distrib/pld-th/rpm/macros 2007-11-15 23:20:48.184505622 +0100 @@ -0,0 +1,4 @@ @@ -926,19 +541,6 @@ +# you have to use at least one language beside 'C' +%_install_langs C:en:pl +%_netsharedpath /dev ---- util-vserver-0.30.214.org/distrib/pld-th/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-th/rpmlist.d/00.lst 2007-11-15 23:20:48.184505622 +0100 -@@ -0,0 +1,10 @@ -+basesystem-*.rpm -+dev-*.rpm -+FHS-*.rpm -+glibc-misc-*.rpm -+glibc-[0-9]*.rpm -+libgcc-[0-9]*.rpm -+setup-*.rpm -+issue-[0-9]*.rpm -+rpm-base-*.rpm -+vserver-packages-*.rpm --- util-vserver-0.30.214.org/distrib/pld-ti/pkgs/01 1970-01-01 01:00:00.000000000 +0100 +++ util-vserver-0.30.214/distrib/pld-ti/pkgs/01 2007-11-15 23:20:48.217840583 +0100 @@ -0,0 +1,5 @@ @@ -947,104 +549,6 @@ +issue +rpm-base +vserver-packages ---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/aliases.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/poldek/aliases.conf 2007-11-15 23:20:48.217840583 +0100 -@@ -0,0 +1,30 @@ -+# System wide aliases -+# ls -+ll = ls -l -+llu = ls -lu -+llU = ls -lU -+lli = ls -lI -+ -+# install -+freshen = install -FN -+upgrade = install -F -+ -+# for backward compatybility, greedy is on by default now -+greedy-upgrade = install -FG -+ -+just-install = install -IN -+ -+# search -+what-requires = search -r -+what-provides = search -p -+rsearch = search --perlre -+ -+exit = quit -+ -+# for fun -+#ls = uninstall kernel -+ -+less = !less -+grep = !grep -+awk = !awk -+ ---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/fetch.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/poldek/fetch.conf 2007-11-15 23:20:48.217840583 +0100 -@@ -0,0 +1,62 @@ -+# Configuration of poldek external file getters. Each [fetcher] section -+# declares one external downloader. The syntax is: -+# [fetcher] -+# name = NAME -+# proto = PROTOCOL[ ,PROTOCOL... ] -+# cmd = CMD [OPTION...] DESTINATION-MACRO URL-MACRO -+# Possible parameters are: -+# -+#[fetcher] -+# Unique name of the fetcher. This is an optional parameter, if not set then -+# name is taken from the "cmd" parameter value as "$(basename $cmd)". -+#name = foo -+ -+# Protocol or protocols supported by fetcher. Name of the protocol can be -+# completely arbitrary, i.e. if you can handle protocol "foo" by writing -+# a script which takes URLs in form 'foo://'. -+#proto = foo,bar -+ -+# Parameter specifies an external command and its invoking syntax. -+# The syntax of "cmd" is: -+# cmd = COMMAND [ OPTION... ] {%d,%D} {%p,%P}[n] -+# Where COMMAND is the name or full path of command, OPTION is command specific -+# options. Macro '%d' is replaced with cache directory, '%D' is replaced with -+# 'cache directory/file basename', and '%p' with file basename, %P with file full -+# path (URL). Optional suffix 'n' with %p and %P means that command can be -+# invoked with multiple files at once. -+#cmd = foogetter.sh -N %D %Pn -+ -+##Configured fetchers -+[fetcher] -+proto = cdrom -+cmd = vfjuggle %d %Pn -+ -+[fetcher] -+proto = http,ftp,https -+cmd = wget -N --dot-style=binary -P %d %Pn -+ -+[fetcher] -+proto = http,ftp -+cmd = snarf %P %D -+ -+[fetcher] -+proto = https -+cmd = curl %P -o %D -+ -+[fetcher] -+proto = rsync -+cmd = rsync -v %P %d -+ -+[fetcher] -+proto = smb -+cmd = vfsmb -v %P %d -+ -+#[fetcher] -+#proto = ssh -+#cmd = vfssh.sh %d %Pn -+ -+#[fetcher] -+#proto = foo -+#cmd = foo.sh %d %Pn -+ -+ --- util-vserver-0.30.214.org/distrib/pld-ti/poldek/pld-source.conf 1970-01-01 01:00:00.000000000 +0100 +++ util-vserver-0.30.214/distrib/pld-ti/poldek/pld-source.conf 2007-11-15 23:20:48.217840583 +0100 @@ -0,0 +1,46 @@ @@ -1279,94 +783,6 @@ + +# Taking into account package Conflicts. +#conflicts = yes ---- util-vserver-0.30.214.org/distrib/pld-ti/poldek/source.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/poldek/source.conf 2007-11-15 23:20:48.217840583 +0100 -@@ -0,0 +1,85 @@ -+# Sample poldek sources configuration -+# Every source is configured in his own [source] section. -+# Possible parameters are: -+# -+#[source] -+# Unique name of the repository. -+#name = foo -+ -+# Type of repository index. Permitted values are 'pndir', 'pdir', 'apt', 'yum' -+# and 'dir' as listed by --stl switch. -+#type = pndir -+ -+# This parameter sets index original type i.e type of repository -+# from what this repository is created. Default is 'dir' - means -+# that directory of packages is scanned. -+#original type = dir -+ -+# Unique name of the repository. May be either path or URL. -+#path = /some/url/or/dir -+ -+# If package index and packages are stored in different locations then -+# prefix stands for packages path. -+#prefix = /some/url/or/dir -+ -+# Controls visibility of multiple package instances with different EVR. -+# If on, only one, highest version will be visible. -+#douniq = no -+ -+# Repository priority. If the same packages (equal names and EVR) -+# are available in more than one source then package from highest -+# prioritized source are taken. Priority is numeric value. Lower number -+# means higher priority, and negative priorities are allowed. -+# Priority is numeric value. -+#pri = 0 -+ -+# Controling if repository index will be implicit loaded. Set it off if -+# the index should be loaded on demand only, i.e. if specified directly -+# by --sn option. -+#auto = yes -+ -+# Controls if repository index will be implicit updated. Set it off if -+# the index should be updated on demand only, i.e. if specified directly -+# by --sn option. -+#autoup = yes -+ -+# Packages PGP/GPG signatures (if any) will be verified before their -+# installation. -+#signed = no -+ -+# Have the same meaning as [global] parameter. Example: -+# hold = kernel* dev -+#hold = -+ -+# Have the same meaning as [global] parameter. Example: -+# ignore = kernel*smp* dev -+#ignore = -+ -+# Parameter have the same meaning as [global] parameter. -+# exclude path = usr/share/doc:usr/share/man:usr/src -+#exclude path = -+ -+# Preferred language of package descriptions. If not set, taken from locale -+# settings. Example: -+# lang = pl_PL:lt_LT -+#lang = -+ -+[source] -+name = home -+type = dir -+path = $HOME/rpm/RPMS -+auto = no -+autoup = no -+ -+#[source] -+#type = pndir -+#name = foo -+#path = ftp://ftp.foo.bar.org/RPMS/ -+#pri = -10 -+#auto = no -+#autoup = no -+#signed = yes -+#hold = kernel* -+#ignore = kernel*-smp-* -+#dscr = pl_PL -+ --- util-vserver-0.30.214.org/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100 +++ util-vserver-0.30.214/distrib/pld-ti/rpm/macros 2007-11-15 23:20:48.221174080 +0100 @@ -0,0 +1,4 @@ @@ -1374,19 +790,6 @@ +# you have to use at least one language beside 'C' +%_install_langs C:en:pl +%_netsharedpath /dev ---- util-vserver-0.30.214.org/distrib/pld-ti/rpmlist.d/00.lst 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.214/distrib/pld-ti/rpmlist.d/00.lst 2007-11-15 23:20:48.221174080 +0100 -@@ -0,0 +1,10 @@ -+basesystem-*.rpm -+dev-*.rpm -+FHS-*.rpm -+glibc-misc-*.rpm -+glibc-[0-9]*.rpm -+libgcc-[0-9]*.rpm -+setup-*.rpm -+issue-[0-9]*.rpm -+rpm-base-*.rpm -+vserver-packages-*.rpm --- util-vserver-0.30.214.org/scripts/functions 2007-09-02 22:06:41.000000000 +0200 +++ util-vserver-0.30.214/scripts/functions 2007-11-15 23:20:48.221174080 +0100 @@ -403,6 +403,20 @@ -- 2.44.0