From c1a150a2e506d75ba4d0be0f9051484a87fac033 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Apr 23 2018 08:35:42 +0000 Subject: Obsoleted by mirrormanager2 --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index fad3777..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -mirrormanager-1.3.6.tar.bz2 -/mirrormanager-1.3.7.tar.bz2 -/mirrormanager-1.4.0.tar.xz -/mirrormanager-1.4.1.tar.xz -/mirrormanager-1.4.2.tar.xz -/mirrormanager-1.4.3.tar.xz -/mirrormanager-1.4.4.tar.xz diff --git a/0001-Move-report_mirror-to-JSON.patch b/0001-Move-report_mirror-to-JSON.patch deleted file mode 100644 index 1290b51..0000000 --- a/0001-Move-report_mirror-to-JSON.patch +++ /dev/null @@ -1,56 +0,0 @@ -From bb9823aa104fced6239dc8161bd1dfe10daa1404 Mon Sep 17 00:00:00 2001 -From: Patrick Uiterwijk -Date: Thu, 23 Jun 2016 13:34:28 +0000 -Subject: [PATCH] Move report_mirror to JSON - -This allows us to disable the pickle checkin in the near future. - -Related: CVE-2016-1000003 -Signed-off-by: Patrick Uiterwijk ---- - client/report_mirror | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/client/report_mirror b/client/report_mirror -index 00813be..7c32ff2 100755 ---- a/client/report_mirror -+++ b/client/report_mirror -@@ -1,7 +1,7 @@ - #!/usr/bin/python - - import os, sys --import pickle -+import json - import ConfigParser - import pprint - import xmlrpclib -@@ -160,7 +160,7 @@ def get_stats(conf, section): - try: - f = open(fn, 'r') - contents = contents + f.readlines() -- statsdata[name] = pickle.dumps(contents, -1) -+ statsdata[name] = json.dumps(contents, -1) - f.close() - except: - pass -@@ -250,7 +250,7 @@ def main(): - get_exclude_dir_patterns_from_file(options) - if options.input: - infile = open(options.input, 'rb') -- item.config = pickle.load(infile) -+ item.config = json.load(infile) - infile.close() - if not config(options.config, item, crawl=False): - sys.exit(1) -@@ -258,7 +258,7 @@ def main(): - if not config(options.config, item, crawl=True): - sys.exit(1) - -- p = pickle.dumps(item.config, -1) -+ p = json.dumps(item.config, -1) - - if options.debug: - pp = pprint.PrettyPrinter(indent=4) --- -2.8.2 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..ed8f946 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Obsoleted by mirrormanager2 diff --git a/mirrormanager.spec b/mirrormanager.spec deleted file mode 100644 index 9dff603..0000000 --- a/mirrormanager.spec +++ /dev/null @@ -1,296 +0,0 @@ -Name: mirrormanager -Version: 1.4.4 -Release: 8%{?dist} -Summary: Fedora mirror management system -BuildArch: noarch - -Group: Applications/Internet -License: MIT and GPLv2 -URL: http://fedorahosted.org/mirrormanager -Source0: https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.xz -# for tempfile.SpooledTemporaryFile at least. RHEL6 has python 2.6 anyhow. -BuildRequires: perl-generators -BuildRequires: python >= 2.6 -Requires: TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14, python-fedora-turbogears, py-radix, mod_wsgi, python-TurboMail -Requires: supervisor -Requires(pre): shadow-utils - -Patch0: 0001-Move-report_mirror-to-JSON.patch - -%description -MirrorManager tracks all the content provided on a master mirror -server, and that of all public and private mirrors of that content. -This package contains the application server, database schema and -hosted tools. - -%package client -Requires: python -Summary: Fedora mirror management system downstream mirror tools -Group: Applications/Internet - -%description client -Client-side, run on each downstream mirror, to report back to the -MirrorManager database a description of the content carried by that -mirror. - -%package maps -# separate subpackage because python-basemap-data is 143MB -Requires: %{name} = %{version}-%{release} -Requires: python-basemap >= 0.99.4, python-basemap-data >= 0.99.4 -Summary: MirrorManager map generator -Group: Applications/Internet - -%description maps -The MirrorManager map generator creates a world map PNG noting public mirrors. - -%prep -%setup -q -%patch0 -p1 - -%build - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT CONFFILE="%{_sysconfdir}/%{name}/prod.cfg" PROGRAMDIR="%{_datadir}/%{name}/server" SBINDIR="%{_sbindir}" - - - -%pre -getent group mirrormanager >/dev/null || groupadd -r mirrormanager -getent passwd mirrormanager >/dev/null || \ - useradd -r -g mirrormanager -d /var/lib/mirrormanager -s /sbin/nologin \ - -c "MirrorManager" mirrormanager -exit 0 - - -%files -%defattr(-,root,root,-) -%{_datadir}/%{name} -%exclude %{_datadir}/%{name}/server/generate-worldmap -%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/lib/%{name}/ -%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/lib/%{name}/catwalk-session/ -%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/run/%{name}/ -%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/log/%{name}/ -%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/log/%{name}/crawler/ -%attr(-,mirrormanager,mirrormanager) %dir %{_localstatedir}/lock/%{name}/ -%attr(-,mirrormanager,mirrormanager) %dir %{_sysconfdir}/%{name}/ -%attr(-,mirrormanager,mirrormanager) %{_sysconfdir}/tmpfiles.d/%{name}.conf -%attr(-,mirrormanager,mirrormanager) %config(noreplace) /etc/mirrormanager/prod.cfg -%attr(-,mirrormanager,mirrormanager) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%attr(-,mirrormanager,mirrormanager) %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrormanager.conf -%attr(-,mirrormanager,mirrormanager) %config(noreplace) %{_sysconfdir}/httpd/conf.d/mirrorlist-server.conf -%attr(-,mirrormanager,mirrormanager) %config(noreplace) %{_sysconfdir}/supervisord.d/mirrorlist-server.ini -%dir /etc/rpmlint/ -%config(noreplace) /etc/rpmlint/%{name}.config -%doc LICENSES LICENSE-MIT-X11 LICENSE-GPLv2 -%doc server/*.cfg server/prod.cfg.example README.rpm_setup cron/mirrormanager.cron - -%files client -%defattr(-,root,root,-) -%{_bindir}/report_mirror -%dir %{_sysconfdir}/%{name}-client -%config(noreplace) %{_sysconfdir}/%{name}-client/report_mirror.conf -%doc LICENSE-MIT-X11 client/README - -%files maps -%defattr(-,root,root,-) -%{_datadir}/%{name}/server/generate-worldmap -%doc LICENSES LICENSE-GPLv2 - -%changelog -* Thu Feb 08 2018 Fedora Release Engineering - 1.4.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.4.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.4.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jun 23 2016 Patrick Uiterwijk - 1.4.4-5 -- Move the checkin script to use json instead of pickle (CVE-2016-1000003) - -* Thu Feb 04 2016 Fedora Release Engineering - 1.4.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.4.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Jan 21 2014 Matt Domsch - 1.4.4-1 -- upstream bugfix release - -* Wed Dec 18 2013 Matt Domsch - 1.4.3-1 -- upstream bugfix release -- Reduce Fedora-isms to make it more usable for other distributions - -* Tue Jul 23 2013 Matt Domsch - 1.4.2-1 -- upstream bugfix release - -* Mon Jun 17 2013 Matt Domsch - 1.4.1-1 -- upstream 1.4.1 pure bugfix release - -* Fri Jun 14 2013 Matt Domsch - 1.4.0-1 -- upstream 1.4.0 release - -* Fri Jan 25 2013 Matt Domsch - 1.4.0-0.1 -- initial 1.4 branch for testing - -* Sat Jun 9 2012 Matt Domsch -- move -maps to separate subpackage - -* Thu Nov 25 2010 Matt Domsch -- add tmpfiles.d file (BZ636623) - -* Sat Sep 11 2010 Matt Domsch - 1.3.7-1 -Matt Domsch: - mirrorlist_server: always output a metalink header - crawler: fix indentation, causing crawler to fail - -* Sat Jul 31 2010 Matt Domsch - 1.3.6-1 -Matt Domsch (8): - mirrorlist_server: add mm0:private attribute to in metalinks - add repomaps for RHEL - category named "RHEL", not "Red Hat Enterprise Linux". Fix references. - repomap: remove extra -beta on prefixes - umdl: set Repository.name = directory.name to be guaranteed unique - remove robots.txt and favicon.ico. These should come from the hosting organization, not MM. - crawler: don't close sys.stdout as logfile, leave that for sys.exit() - -* Wed May 26 2010 Matt Domsch - 1.3.5-1 -- Adrian Reber (1): - mirrorlist_server: handle bad client IP address input -- Matt Domsch (18): - spec: require python-basemap-data too - makefile: add git-sign-push target to remind me - crawler: implement canary mode - crawler: crawl private i2 hosts that also say i2_clients are ok - crawler: send email when marking a whole host not up2date - mirrorlist_server: ignore SIGHUP in child - it'll exit soon enough - mirrorlist_server: increase socket request queue length to 300 (still limited by kernel options to 128) - mirrorlist_server: set request_queue_size earlier - mirrorlist_server: don't ignore SIGCHLD - mirrorlist tester: more printing, run forever - mirrorlist_client: sanitize input into UTF-8 - mirrorlist_client: add 60sec timeout to reading from the server - mirrorlist_client: use select() waiting on the response from mirrorlist_server - mirrorlist_client: a better way to handle socket timeouts - mirrorlist_client: leave query params as utf8 - mirrorlist_server: handle more failures gracefully - mirrorlist_client: add mirrorlist_client.noreverseproxy config parameter - umdl: don't use move_repository_from_development() - -* Mon Apr 26 2010 Matt Domsch - 1.3.4-1 -- Adrian Reber (2): - umdl: fix failure when updating from rsync listings. - umdl: time.mktime() might return floats -- BJ Dierkes (1): - Fix confirm delete method in webui. -- Matt Domsch (34): - mrr: add --updates-only option - controllers: add mirroradmins query - umdl: fix crash in _get_version_from_path() - umdl: avoid disappering files - report_mirror: handle server HTTP 503 errors - generate-worldmap: update for newer python-basemap - autodetect development/13/ style directories and create appropriate Repositories - umdl: recognize moving Repository objects from development/13 to releases/13/ - mrr: genericize --from and --to version values - get_internet2_netblocks: fix URL due to upstream directory change - Put titles on publiclist pages - expose crawler logs via apache directory listing - add crawler log link on host page - apache: ensure aliases to special areas come before the WSGI alias - remove python-fedora deprecation warning - add config option report_problems_to_email, display on publiclist footer. - ageFileDetails(): account for propogation delays - add max_propogation_days config option - spec: require python-basemap > 0.99.4 so generate-worldmap works - mirrorlist-server: use WSGIDaemonProcess for mirrorlist_client.wsgi - mirrormanager.wsgi run 4 instances per app server (up from 2) - -* Mon Oct 26 2009 Matt Domsch - 1.3.3-2 -- add patch to fix confirm delete from webui - -* Mon Sep 28 2009 Matt Domsch - 1.3.3-1 -- initial setup patches from BJ Dierkes - - simpler mirrormanager.initial, README.rpm_setup, prod.cfg - - add user mirrormanager and group mirrormanager, content permissions - -* Mon Sep 28 2009 Matt Domsch - 1.3.2-1 -- add BGP ASN lookups - -* Fri Sep 18 2009 Matt Domsch - 1.3.1-1 -- fix publiclist html -- fix Host netblock creation via web UI - -* Mon Sep 7 2009 Matt Domsch - 1.3.0-1 -- add CSRF protection, add Requires: python-fedora -- add IPv6 capability -- switch DNS lookups to use python-dns -- other misc bugfixes - -* Thu Jul 9 2009 Matt Domsch - 1.2.12-1 -- bug fixes post F11 release - -* Mon Apr 20 2009 Mike McGrath 1.2.11-2 -- Added psmisc Requires - -* Tue Apr 7 2009 Matt Domsch - 1.2.11-1 -- fix quite a few bugs from previous version - -* Mon Apr 6 2009 Matt Domsch - 1.2.10-1 -- improved crawler repomd.xml verification -- improved publiclist generation -- fix categorymap logic -- WSGI-ify web application -- vastly speed up report_mirror (no more stat()s on every file) -- vastly speed up umdl -- add rsyncFilter - -* Mon Feb 23 2009 Matt Domsch - 1.2.9-1 -- Adrian Reber: - mirrorlist-server: check values returned by geoip before printing - mirrorlist-server: ignore SIGCHLD to not have zombie processes - server: also use project name and URL from config file for publiclist - server: removed debug messages to decrease MM's verbosity - server: make it work with Fedora's 10 python version -- Jeroen van Meeuwen: - Strip duplicate // from the path requested -- Matt Domsch: - revert publiclist_host() changes from 6a056929007b9b6bdf35367818e1212895c5bdec - which weren't any faster and yet generated incorrect results. - add item to TODO - add push-mirroring doc - mirrorlist: add trailing / to returned URLs to directories. - Better handle Host creation form validation failure error case. - -* Tue Dec 2 2008 Matt Domsch - 1.2.8-1 -- don't place metalink-downloaded files deep in a directory tree - -* Mon Dec 1 2008 Matt Domsch - 1.2.7-1 -- Adrian Reber - add mirrorlist_statistics.py -- Matt Domsch - fix metalinks, cleanup publiclist a bit, add s390x - cleanup license files - -* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 1.2.6-2 -- Rebuild for Python 2.6 - -* Mon Oct 13 2008 Matt Domsch - 1.2.6-1 -- even more bugfixes - -* Sat Oct 4 2008 Matt Domsch - 1.2.5-1 -- more bugfixes - -* Fri Oct 3 2008 Matt Domsch - 1.2.4-1 -- more bugfixes - -* Sun Sep 28 2008 Matt Domsch - 1.2.3-1 -- lots of bugfixes - -* Fri Sep 26 2008 Matt Domsch - 1.2.2-1 -- initial package attempt diff --git a/sources b/sources deleted file mode 100644 index 30e332d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -04a23bde3fafdfa86daeb7efd8ea069a mirrormanager-1.4.4.tar.xz