[maemo-commits] [maemo-commits] r14884 - in projects/haf/trunk/apt: . cmdline debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-12-06 18:21:49 +0200 (Thu, 06 Dec 2007)
New Revision: 14884

Added:
   projects/haf/trunk/apt/ignoretimeconflict.patch
Modified:
   projects/haf/trunk/apt/README.maemo
   projects/haf/trunk/apt/cmdline/apt-key
   projects/haf/trunk/apt/debian/changelog
   projects/haf/trunk/apt/debian/rules
Log:
  * Applied ignoretimeconflict.patch


Modified: projects/haf/trunk/apt/README.maemo
===================================================================
--- projects/haf/trunk/apt/README.maemo	2007-12-06 16:13:54 UTC (rev 14883)
+++ projects/haf/trunk/apt/README.maemo	2007-12-06 16:21:49 UTC (rev 14884)
@@ -21,3 +21,7 @@
 - mmap.patch
 
 Make it work in filesystems that don't support writable mmaps.
+
+- ignoretimeconflict.patch
+
+Don't fail to add or use keys when the clock is wrong.

Modified: projects/haf/trunk/apt/cmdline/apt-key
===================================================================
--- projects/haf/trunk/apt/cmdline/apt-key	2007-12-06 16:13:54 UTC (rev 14883)
+++ projects/haf/trunk/apt/cmdline/apt-key	2007-12-06 16:21:49 UTC (rev 14884)
@@ -59,7 +59,7 @@
 
 case "$command" in
     add)
-        $GPG --quiet --batch --import "$1"
+        $GPG --quiet --batch --ignore-time-conflict --import "$1"
         echo "OK"
         ;;
     del|rm|remove)

Modified: projects/haf/trunk/apt/debian/changelog
===================================================================
--- projects/haf/trunk/apt/debian/changelog	2007-12-06 16:13:54 UTC (rev 14883)
+++ projects/haf/trunk/apt/debian/changelog	2007-12-06 16:21:49 UTC (rev 14884)
@@ -3,6 +3,7 @@
   * Applied maemostrip.diff
   * Applied http-tablet-identification.patch
   * Applied mmap.patch
+  * Applied ignoretimeconflict.patch
   
  -- Marius Vollmer <mvo at zagadka.de>  Thu, 06 Dec 2007 17:15:19 +0200
 

Modified: projects/haf/trunk/apt/debian/rules
===================================================================
--- projects/haf/trunk/apt/debian/rules	2007-12-06 16:13:54 UTC (rev 14883)
+++ projects/haf/trunk/apt/debian/rules	2007-12-06 16:21:49 UTC (rev 14884)
@@ -213,6 +213,9 @@
 	cp share/debian-archive.gpg debian/$@/usr/share/$@
 	cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
 #	head -n 500 ChangeLog > debian/ChangeLog
+	mkdir -p debian/$@/etc/apt/apt.conf.d
+	echo 'Acquire::gpgv::Options {"--ignore-time-conflict";};' \
+	     >debian/$@/etc/apt/apt.conf.d/50gpgv
 
 	# make rosetta happy and remove pot files in po/ (but leave stuff
 	# in po/domains/* untouched) and cp *.po into each domain dir

Added: projects/haf/trunk/apt/ignoretimeconflict.patch
===================================================================
--- projects/haf/trunk/apt/ignoretimeconflict.patch	2007-12-06 16:13:54 UTC (rev 14883)
+++ projects/haf/trunk/apt/ignoretimeconflict.patch	2007-12-06 16:21:49 UTC (rev 14884)
@@ -0,0 +1,27 @@
+Index: debian/rules
+===================================================================
+--- debian/rules	(revision 14878)
++++ debian/rules	(working copy)
+@@ -213,6 +213,9 @@
+ 	cp share/debian-archive.gpg debian/$@/usr/share/$@
+ 	cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
+ #	head -n 500 ChangeLog > debian/ChangeLog
++	mkdir -p debian/$@/etc/apt/apt.conf.d
++	echo 'Acquire::gpgv::Options {"--ignore-time-conflict";};' \
++	     >debian/$@/etc/apt/apt.conf.d/50gpgv
+ 
+ 	# make rosetta happy and remove pot files in po/ (but leave stuff
+ 	# in po/domains/* untouched) and cp *.po into each domain dir
+Index: cmdline/apt-key
+===================================================================
+--- cmdline/apt-key	(revision 14875)
++++ cmdline/apt-key	(working copy)
+@@ -59,7 +59,7 @@
+ 
+ case "$command" in
+     add)
+-        $GPG --quiet --batch --import "$1"
++        $GPG --quiet --batch --ignore-time-conflict --import "$1"
+         echo "OK"
+         ;;
+     del|rm|remove)