* [gentoo-commits] gentoo-x86 commit in net-misc/apt-cacher-ng/files: apt-cacher-ng-0.7.19-gentoo.diff
@ 2013-12-05 2:45 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson (robbat2) @ 2013-12-05 2:45 UTC (permalink / raw
To: gentoo-commits
robbat2 13/12/05 02:45:25
Added: apt-cacher-ng-0.7.19-gentoo.diff
Log:
Add in Gentoo mirror support to apt-cacher-ng, patch submitted to upstream as well.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.1 net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff?rev=1.1&content-type=text/plain
Index: apt-cacher-ng-0.7.19-gentoo.diff
===================================================================
Support Gentoo mirrors in apt-cacher-ng
Please note the use of a script to build the gentoo_mirrors file live; this
should probably be done when each release is being built.
The geo-balanced http://distfiles.gentoo.org/ mirror is NOT included in the
mirrors3.xml source, so it gets added manually.
The first 3 sed expresssions aren't actually required, but are useful in making
the output list understandable.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
diff -Nuar --exclude '*.gz' apt-cacher-ng-0.7.19.orig/conf/acng.conf apt-cacher-ng-0.7.19/conf/acng.conf
--- apt-cacher-ng-0.7.19.orig/conf/acng.conf 2013-07-28 11:09:43.000000000 -0700
+++ apt-cacher-ng-0.7.19/conf/acng.conf 2013-12-03 19:55:07.000000000 -0800
@@ -44,6 +44,7 @@
Remap-fedora: file:fedora_mirrors # Fedora Linux
Remap-epel: file:epel_mirrors # Fedora EPEL
Remap-slrep: file:sl_mirrors # Scientific Linux
+Remap-gentoo: file:gentoo_mirrors.gz http://distfiles.gentoo.org/ /gentoo ; file:backends_gentoo # Gentoo Archives
# This is usually not needed for security.debian.org because it's always the
# same DNS hostname. However, it might be enabled in order to use hooks,
diff -Nuar --exclude '*.gz' apt-cacher-ng-0.7.19.orig/conf/backends_gentoo.default apt-cacher-ng-0.7.19/conf/backends_gentoo.default
--- apt-cacher-ng-0.7.19.orig/conf/backends_gentoo.default 1969-12-31 16:00:00.000000000 -0800
+++ apt-cacher-ng-0.7.19/conf/backends_gentoo.default 2013-12-03 19:46:38.000000000 -0800
@@ -0,0 +1,4 @@
+# This is a configuration file. All lines starting with # are ignored.
+
+# gentoo mirrors use geodns to dispatch to the nearest location
+http://distfiles.gentoo.org/
diff -Nuar --exclude '*.gz' apt-cacher-ng-0.7.19.orig/conf/gentoo_mirrors.sh apt-cacher-ng-0.7.19/conf/gentoo_mirrors.sh
--- apt-cacher-ng-0.7.19.orig/conf/gentoo_mirrors.sh 1969-12-31 16:00:00.000000000 -0800
+++ apt-cacher-ng-0.7.19/conf/gentoo_mirrors.sh 2013-12-04 18:20:07.000000000 -0800
@@ -0,0 +1,11 @@
+#!/bin/sh
+# This fetchs the live Gentoo mirrors list
+# robbat2@gentoo.org - 2013/Dec/03
+OUTFILE=/etc/apt-cacher-ng/gentoo_mirrors
+wget --save-headers -q http://www.gentoo.org/main/en/mirrors3.xml -O - \
+ |sed -n \
+ -e '/^[A-Z]/{s,^,#,g;p}' \
+ -e '/<mirrorgroup/{s,^,\n#,g;p}' \
+ -e '/<name/{s,^,#,g;p}' \
+ -e '/<uri/{/protocol="http"/{s/.*<uri[^>]\+>//g;s/<\/uri>//g;p}}' \
+ | gzip -9 >${OUTFILE}.gz
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/apt-cacher-ng/files: apt-cacher-ng-0.7.19-gentoo.diff
@ 2013-12-05 12:03 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2013-12-05 12:03 UTC (permalink / raw
To: gentoo-commits
jer 13/12/05 12:03:19
Modified: apt-cacher-ng-0.7.19-gentoo.diff
Log:
Clean up.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.2 net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff?r1=1.1&r2=1.2
Index: apt-cacher-ng-0.7.19-gentoo.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/files/apt-cacher-ng-0.7.19-gentoo.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apt-cacher-ng-0.7.19-gentoo.diff 5 Dec 2013 02:45:25 -0000 1.1
+++ apt-cacher-ng-0.7.19-gentoo.diff 5 Dec 2013 12:03:19 -0000 1.2
@@ -11,9 +11,8 @@
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-diff -Nuar --exclude '*.gz' apt-cacher-ng-0.7.19.orig/conf/acng.conf apt-cacher-ng-0.7.19/conf/acng.conf
---- apt-cacher-ng-0.7.19.orig/conf/acng.conf 2013-07-28 11:09:43.000000000 -0700
-+++ apt-cacher-ng-0.7.19/conf/acng.conf 2013-12-03 19:55:07.000000000 -0800
+--- a/conf/acng.conf 2013-07-28 11:09:43.000000000 -0700
++++ b/conf/acng.conf 2013-12-03 19:55:07.000000000 -0800
@@ -44,6 +44,7 @@
Remap-fedora: file:fedora_mirrors # Fedora Linux
Remap-epel: file:epel_mirrors # Fedora EPEL
@@ -22,17 +21,15 @@
# This is usually not needed for security.debian.org because it's always the
# same DNS hostname. However, it might be enabled in order to use hooks,
-diff -Nuar --exclude '*.gz' apt-cacher-ng-0.7.19.orig/conf/backends_gentoo.default apt-cacher-ng-0.7.19/conf/backends_gentoo.default
---- apt-cacher-ng-0.7.19.orig/conf/backends_gentoo.default 1969-12-31 16:00:00.000000000 -0800
-+++ apt-cacher-ng-0.7.19/conf/backends_gentoo.default 2013-12-03 19:46:38.000000000 -0800
+--- a/conf/backends_gentoo.default 1969-12-31 16:00:00.000000000 -0800
++++ b/conf/backends_gentoo.default 2013-12-03 19:46:38.000000000 -0800
@@ -0,0 +1,4 @@
+# This is a configuration file. All lines starting with # are ignored.
+
+# gentoo mirrors use geodns to dispatch to the nearest location
+http://distfiles.gentoo.org/
-diff -Nuar --exclude '*.gz' apt-cacher-ng-0.7.19.orig/conf/gentoo_mirrors.sh apt-cacher-ng-0.7.19/conf/gentoo_mirrors.sh
---- apt-cacher-ng-0.7.19.orig/conf/gentoo_mirrors.sh 1969-12-31 16:00:00.000000000 -0800
-+++ apt-cacher-ng-0.7.19/conf/gentoo_mirrors.sh 2013-12-04 18:20:07.000000000 -0800
+--- a/conf/gentoo_mirrors.sh 1969-12-31 16:00:00.000000000 -0800
++++ b/conf/gentoo_mirrors.sh 2013-12-04 18:20:07.000000000 -0800
@@ -0,0 +1,11 @@
+#!/bin/sh
+# This fetchs the live Gentoo mirrors list
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/apt-cacher-ng/files: apt-cacher-ng-0.7.19-gentoo.diff
@ 2013-12-21 15:11 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2013-12-21 15:11 UTC (permalink / raw
To: gentoo-commits
jer 13/12/21 15:11:33
Removed: apt-cacher-ng-0.7.19-gentoo.diff
Log:
Remove USE=lzma: we install it already to unpack the tarball, and USE=-lzma is broken in this release.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-21 15:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-21 15:11 [gentoo-commits] gentoo-x86 commit in net-misc/apt-cacher-ng/files: apt-cacher-ng-0.7.19-gentoo.diff Jeroen Roovers (jer)
-- strict thread matches above, loose matches on Subject: below --
2013-12-05 12:03 Jeroen Roovers (jer)
2013-12-05 2:45 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox