From d4a6102776c6d2805eab93035737191612294218 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Mar 23 2006 06:33:58 +0000 Subject: - Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead. - Don't import the "Old RHL key" by default. Wed Mar 22 2006 Panu Matilainen - 0.5.15lorg333-pre2 - set distroverpkg to fedora-release - add distro version and arch independent default source list entries for fedora core, extras + updates - remove old nasty fedora.us-time hacks from post scriptlets --- diff --git a/.cvsignore b/.cvsignore index 27e2802..b807d78 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apt-0.5.15lorg3-pre1.tar.bz2 +apt-0.5.15lorg3-pre2.tar.bz2 diff --git a/apt.spec b/apt.spec index 81b74e0..9fab35b 100644 --- a/apt.spec +++ b/apt.spec @@ -6,12 +6,12 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3 -Release: 0.2.pre1%{?dist} +Release: 0.2.pre2%{?dist} Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm License: GPL -Source0: http://laiskiainen.org/apt/testing/apt-0.5.15lorg3-pre1.tar.bz2 +Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}-pre2.tar.bz2 # user editable template configs Source1: apt.conf @@ -33,19 +33,15 @@ Source50: preserve-conf.lua Source51: upgradevirt.lua # 100-149 for sources.list.d -# no default entry for fedora at all +Source100: fedora-core.list +Source101: fedora-extras.list +Source102: fedora-updates.list # 150-199 for apt.conf.d # "factory defaults" for Fedora Core + Extras Source150: default.conf -# 200-249 for trusted gpg keys -# Fedora key -Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b -# "Old" RHL key -Source202: gpg-pubkey-db42a60e-37ea5438 -# Fedora Extras key -Source203: gpg-pubkey-1ac70ce6-41bebeef +# 200-249 for additional trusted gpg keys # 250-299 for vendor.list.d Source250: fedora-vendor.list @@ -74,6 +70,7 @@ Requires: gnupg Requires: bzip2 # wget needed by the mirror-selector script Requires: wget +Requires: fedora-release >= 5 Requires(post): chkconfig Requires(post): ldconfig Requires(preun): chkconfig @@ -129,7 +126,7 @@ RHL/RHEL/FC distributions. %prep -%setup -q -n %{name}-%{version}-pre1 +%setup -q -n %{name}-%{version}-pre2 # fix docs to reference correct paths perl -pi -e \ @@ -181,6 +178,11 @@ install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/ +# Default source list entries +for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do + install -pm 644 $source $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d/ +done + # install config parts install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/ install -pm 644 %{SOURCE250} \ @@ -188,9 +190,10 @@ install -pm 644 %{SOURCE250} \ # GPG keys mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ -for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203} ; do - install -pm 644 $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ -done +ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \ + $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b +ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \ + $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef # Lua scripts mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts @@ -227,22 +230,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT - -%pre -if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then - mv -f %{_sysconfdir}/apt/apt.conf %{_sysconfdir}/apt/apt.conf.rpmsave - echo "NOTE: Default configuration changed!" - echo "If you have made any changes to the configuration locally," - echo "Merge your local customizations from %{_sysconfdir}/apt/apt.conf.rpmsave" - echo "to %{_sysconfdir}/apt/apt.conf" -fi - %post /sbin/ldconfig -if [ ! -f %{_sysconfdir}/apt/apt.conf ] ; then - echo "// User customizable configuration goes here" \ - > %{_sysconfdir}/apt/apt.conf -fi /sbin/chkconfig --add apt %preun @@ -322,6 +311,17 @@ fi %changelog +* Wed Mar 22 2006 Ville Skyttä - 0.5.15lorg3-0.2.pre2 +- Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead. +- Don't import the "Old RHL key" by default. + +* Wed Mar 22 2006 Panu Matilainen +- 0.5.15lorg3-pre2 +- set distroverpkg to fedora-release +- add distro version and arch independent default source list entries for + fedora core, extras + updates +- remove old nasty fedora.us-time hacks from post scriptlets + * Sun Mar 19 2006 Ville Skyttä - 0.5.15lorg3-0.2.pre1 - Fix Allow-Duplicated* default.conf bugs introduced in previous version. diff --git a/default.conf b/default.conf index 180fd0a..39d0534 100644 --- a/default.conf +++ b/default.conf @@ -17,6 +17,7 @@ APT { AllNames "false"; } + DistroVerPkg "fedora-release"; }; RPM diff --git a/fedora-core.list b/fedora-core.list new file mode 100644 index 0000000..5030a48 --- /dev/null +++ b/fedora-core.list @@ -0,0 +1,8 @@ +# Fedora Core +repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/os/ + +# Debug packages +# repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/debug/ + +# sources +#repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/source/SRPMS/ diff --git a/fedora-extras.list b/fedora-extras.list new file mode 100644 index 0000000..2337623 --- /dev/null +++ b/fedora-extras.list @@ -0,0 +1,8 @@ +# Fedora Extras +repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/ + +# Debug packages +# repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/debug/ + +# Sources +#repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/SRPMS/ diff --git a/fedora-updates.list b/fedora-updates.list new file mode 100644 index 0000000..c005c74 --- /dev/null +++ b/fedora-updates.list @@ -0,0 +1,8 @@ +# Fedora Core +repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/ + +# Debug packages +#repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/debug/ + +# sources +#repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/SRPMS/ diff --git a/gpg-pubkey-1ac70ce6-41bebeef b/gpg-pubkey-1ac70ce6-41bebeef deleted file mode 100644 index e89f164..0000000 --- a/gpg-pubkey-1ac70ce6-41bebeef +++ /dev/null @@ -1,35 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.0.7 (GNU/Linux) - -mQGiBEG+vu8RBACyH3cUSp+DXbyIvZ075bGDhjhRCf8m44UW2cCQdO/45CJBkRnC -AA6SHthCrXCVKIuuo1jSwy8kMXt1P/7IpF6Tc8ZMzcHKTyNetuuD/A7oavgnrJNb -QVTScqbD6VrvjUAPpDz5TMPqMMFYwylp+ySKMQpoPOYoqdNE3XwnA5vOywCg44+S -KDWIV0j5xCeIAoa47VmgF2cEAK/FIZRkbb7+i2Fob1mxKsnuLN/xx67aBpU2w7HO -scVnkke08lRestDVk/6xb+lrq+gVLdNBfAANBrOcwRv2heu+Zu3PZGuC166/JWFM -kx5a9TkI0zQAw72LqKeX4VDBRz5fUoIs/C+3aGc5Mh+h8fZYjJGf0kr/90rnd/0e -WqsBA/9ONArdHN44aICt7xku/t98p9Da04A7kRYTHlLrBk5i0U4JJXKei7ZAzNi4 -Or//8ATepQdsBMCJVx1Ss/vJKxupLG9Mw43nbNuA5SmOSPnAoyglYadKyaUXBbVj -mkqf9ZkjOMfD5u9PEWMWMq3f8uf05qxsrBDeiyc7Fk0jBYTvnrQ4RmVkb3JhIFBy -ZSBFeHRyYXMgUmVsZWFzZSA8cHJlLWV4dHJhc0BmZWRvcmFwcm9qZWN0Lm9yZz6I -XgQTEQIAHgUCQb6+7wIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCC7ZUEGscM -5uAMAKC+XaPSCYIpdcmJYEe9rNxYMz/hLwCeOyBYUYA2L0WnbfXuNafRqwta/s2I -RgQSEQIABgUCQgD+/AAKCRC0QmnQTypv0lVYAJoCLolPSuAj873GbV2+m3Bj6sS/ -UACeNcDmIWeruRld83uSQcx4xJyEOUa0KUZlZG9yYSBQcm9qZWN0IDxmZWRvcmEt -ZXh0cmFzQHJlZGhhdC5jb20+iF4EExECAB4FAkIAeFQCGwMGCwkIBwMCAxUCAwMW -AgECHgECF4AACgkQgu2VBBrHDOYu8wCffLm57mvcYApV7eqvHXr29gNAbLwAoJVq -JWvgBIvg8/4MiqwKAQ1MDkIUiEYEEhECAAYFAkIA/wQACgkQtEJp0E8qb9LQJACf -c0LteS513+5O6erQO7RBUxC/NI4AniDHK+Ogf5l5Gs2ciwD+WApsZ4mPtDBGZWRv -cmEgUHJvamVjdCA8ZmVkb3JhLWV4dHJhc0BmZWRvcmFwcm9qZWN0Lm9yZz6IXgQT -EQIAHgUCQgB4iQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCC7ZUEGscM5gZ7 -AJ9n8CYN6nvMqxCbQQZwvs7e/J4//QCeM3nDwC5EfEbEtOHPIYAqTf3IQZaIRgQS -EQIABgUCQgD/BAAKCRC0QmnQTypv0qKuAJ0cnqk9BbbblRSBbn72bK/BAquzywCe -M7S0C6rfrYlfOjQHQdVB5GitT9u5AQ0EQb6+8RAEAJmsZ5apOFz0Fj6RwX0D+nOU -Atdzd3zpTNzu4j8+L750ePutjuwizEmCxKycchuG+gGasLmdxY+xk5AUB7gLt4ms -eKsWyHvQt+H4wG8jjOjHWXlaJkZaYQUxpVPd6/11hkoqpodJ9ckfoIJnpUJWDcd3 -HTW7jdq+ZtBXjQlwvh3HAAMHA/9g50+hqjn23d91SaFTkvaAySZYHEF/xm5sOV1X -Z37XNFdl7JRl6BN7y59PE9Nk6qP4yHqH1G2YNDL3BmejChMF5GmEqluNdnvfFvwk -yqPvE7qCv8BhktPqsnrpFmtfeDFI4vztD08oab9LdkDvQwLHBZpc+wCb4VJzOkaZ -7e7VP4hJBBgRAgAJBQJBvr7xAhsMAAoJEILtlQQaxwzmxdYAn3X4X/ENC3V4yPDR -7X6oVeIVr5fvAJ4n5vY10NpvYKV5arzKd8DSW2m5Bg== -=N/fy ------END PGP PUBLIC KEY BLOCK----- diff --git a/gpg-pubkey-4f2a6fd2-3f9d9d3b b/gpg-pubkey-4f2a6fd2-3f9d9d3b deleted file mode 100644 index 17d4ec7..0000000 --- a/gpg-pubkey-4f2a6fd2-3f9d9d3b +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.0.7 (GNU/Linux) - -mQGiBD+dnTsRBACwnlz4AhctOLlVBAsq+RaU82nb5P3bD1YJJpsAce1Ckd2sBUOJ -D11NUCqH8c7EctOquOZ5zTcWxHiWWbLyKQwUw2SUvnWa5SSbi8kI8q9MTPsPvhwt -gMrQMLenMO+nsrxrSaG6XcD+ssfJNxC7NQVCQAj3pvvg9rKi3ygsM7CXHwCghgsq -X6TOr55HE90DbEsoq3b/jjsD/i8aIZ6urUgrpAkQslcakXdJLKgSdwjRUgVZgvYZ -b7kAx1iPq0t/AhB3NJw3zW4AAKJohGg3xj5K4V8PJEZrSIpoRYlF43Kqlfu2p5gh -WT89SP4YAlWPeTqf0+dTYUYz3b144k2ZFOdRuXIRxunoYNAUr9oMrxBXbJ/eY+0U -QX3pBACYzKizyY4JJgd0zFJmNkcdK9nzcm+btYFnYQo33w5GSE686UNr+9yiXt9t -mPRvNEbj3u+xoAX8B/5k3aZ5NbUhV64/VcKlUdRIxNlFCG7I9KgxeHWAYwi7yqOG -XM3T/v6o7GLdQEB0ChFqS7kUlqmwLV+C3QhlrFe/Cuk26i+Q6rQiRmVkb3JhIFBy -b2plY3QgPGZlZG9yYUByZWRoYXQuY29tPohbBBMRAgAbBQI/nZ07BgsJCAcDAgMV -AgMDFgIBAh4BAheAAAoJELRCadBPKm/S2PAAnRTlhorITphab+oxAHtbxZF9BVyD -AJ9WOVaZUG53IWWIAXOGv3j/cmr3lohGBBMRAgAGBQI/nZ22AAoJECGRgM3bQqYO -R5QAoIp1G+omVktq/snxpmz5UeHjlSYjAKCRr/ea/L7S7ZTxB18cf1TYfad1x4hG -BBARAgAGBQI/ntjgAAoJECnVuiSN9W0FUSUAoJnrone4J0o1HMkRz+6g9KVuO2Fy -AJ0XyebOzVmI9U5OyOfnNmYV0wnQcrkBDQQ/nZ08EAQAugOfLWJbKwMA9vg2mJU5 -94TZU0HRJkx/fqYhx0YxWWRpzplrEyvcDXuYcWi1Hwh0tD86T4fR5GV6joWiWClz -D+Hwhhb6gcSdeSGlGLlZAvWYtFSHWiv+3LaI9w8Vtczl99Bh2WiMDNDDGw0RQg6Z -aftldLSe4j1pffpFGQ8SuisAAwUEAKVxqLT7fC5xQ6oclcZ+PhoDlePQ1BiTS7tu -GM07bFF4nNvY91LL7S31pooz3XbGSWP8jxzSv1Fw35YhSmWGOBOEXluqMbVQGJJ5 -m8fqJOjC0imbfeWgr/T7zLrJeiljDxvX+6TyawyWQngF6v1Hq6FRV0O0bOp9Npt5 -zqCbDGs/iEYEGBECAAYFAj+dnTwACgkQtEJp0E8qb9L//gCcDVYnDegNCOxDn1se -dDwxw+0h8OcAn1CZHof15QqxnTwEnvwF2QeOI5dn -=mJAx ------END PGP PUBLIC KEY BLOCK----- diff --git a/gpg-pubkey-db42a60e-37ea5438 b/gpg-pubkey-db42a60e-37ea5438 deleted file mode 100644 index 075b958..0000000 --- a/gpg-pubkey-db42a60e-37ea5438 +++ /dev/null @@ -1,34 +0,0 @@ -The following public key can be used to verify RPM packages built and -signed by Red Hat Software using `rpm -K' using the GNU GPG package. -Questions about this key should be sent to security@redhat.com. - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.0.0 (GNU/Linux) -Comment: For info see http://www.gnupg.org - -mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8 -HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM -GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV -EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS -ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP -lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW -XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb -E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES -PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg -SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID -FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB -XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U -lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+ -5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3 -Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI -hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+ -JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9 -E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK -ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8 -BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5 -4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY -FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk -OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h -VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA== -=3AHZ ------END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index e7986b0..282fe3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c6b3f37374d266e89805a2912d11fb6 apt-0.5.15lorg3-pre1.tar.bz2 +530456d62eb62d980ebb0d057260a7f1 apt-0.5.15lorg3-pre2.tar.bz2