[maemo-commits] [maemo-commits] r14867 - in projects/haf/trunk/apt-https: . debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-12-06 15:46:53 +0200 (Thu, 06 Dec 2007)
New Revision: 14867

Modified:
   projects/haf/trunk/apt-https/Makefile.am
   projects/haf/trunk/apt-https/configure.ac
   projects/haf/trunk/apt-https/debian/changelog
   projects/haf/trunk/apt-https/debian/control
   projects/haf/trunk/apt-https/maemo-mini-curl.c
Log:
  * Disabled maemo-cert-gui, including all its certificate checks.
    It has bitrotted away.


Modified: projects/haf/trunk/apt-https/Makefile.am
===================================================================
--- projects/haf/trunk/apt-https/Makefile.am	2007-12-05 15:38:41 UTC (rev 14866)
+++ projects/haf/trunk/apt-https/Makefile.am	2007-12-06 13:46:53 UTC (rev 14867)
@@ -4,7 +4,8 @@
 methoddir = $(libdir)/apt/methods
 
 method_PROGRAMS = https
-bin_PROGRAMS = maemo-mini-curl maemo-mini-curl-cert-gui.launch
+#bin_PROGRAMS = maemo-mini-curl maemo-mini-curl-cert-gui.launch
+bin_PROGRAMS = maemo-mini-curl
 
 https_SOURCES = https.cc
 https_CXXFLAGS = $(HTTPS_CFLAGS)
@@ -14,15 +15,15 @@
 maemo_mini_curl_CFLAGS = $(MINICURL_CFLAGS)
 maemo_mini_curl_LDFLAGS = $(MINICURL_LIBS) -lcurl
 
-maemo_mini_curl_cert_gui_launch_SOURCES = maemo-cert-gui.c
-maemo_mini_curl_cert_gui_launch_CFLAGS = $(CERTGUI_CFLAGS) $(CFLAGS_LAUNCHER)
-maemo_mini_curl_cert_gui_launch_LDFLAGS = $(CERTGUI_LIBS)$ $(LDFLAGS_LAUNCHER)
+#maemo_mini_curl_cert_gui_launch_SOURCES = maemo-cert-gui.c
+#maemo_mini_curl_cert_gui_launch_CFLAGS = $(CERTGUI_CFLAGS) $(CFLAGS_LAUNCHER)
+#maemo_mini_curl_cert_gui_launch_LDFLAGS = $(CERTGUI_LIBS)$ $(LDFLAGS_LAUNCHER)
 
 deb:
 	./make-package $(PACKAGE) $(VERSION) .
 
 EXTRA_DIST = make-package
 
-install-exec-local:
-	rm -f $(DESTDIR)$(bindir)/maemo-mini-curl-cert-gui
-	ln -s /usr/bin/maemo-invoker $(DESTDIR)$(bindir)/maemo-mini-curl-cert-gui
+#install-exec-local:
+#	rm -f $(DESTDIR)$(bindir)/maemo-mini-curl-cert-gui
+#	ln -s /usr/bin/maemo-invoker $(DESTDIR)$(bindir)/maemo-mini-curl-cert-gui

Modified: projects/haf/trunk/apt-https/configure.ac
===================================================================
--- projects/haf/trunk/apt-https/configure.ac	2007-12-05 15:38:41 UTC (rev 14866)
+++ projects/haf/trunk/apt-https/configure.ac	2007-12-06 13:46:53 UTC (rev 14867)
@@ -24,9 +24,9 @@
 AC_SUBST(MINICURL_CFLAGS)
 AC_SUBST(MINICURL_LIBS)
 
-PKG_CHECK_MODULES(CERTGUI, cst gtk+-2.0 hildon-libs osso-applet-certman libosso openssl)
-AC_SUBST(CERTGUI_CFLAGS)
-AC_SUBST(CERTGUI_LIBS)
+#PKG_CHECK_MODULES(CERTGUI, cst gtk+-2.0 hildon-libs osso-applet-certman libosso openssl)
+#AC_SUBST(CERTGUI_CFLAGS)
+#AC_SUBST(CERTGUI_LIBS)
 
 AC_CONFIG_FILES([Makefile])
 

Modified: projects/haf/trunk/apt-https/debian/changelog
===================================================================
--- projects/haf/trunk/apt-https/debian/changelog	2007-12-05 15:38:41 UTC (rev 14866)
+++ projects/haf/trunk/apt-https/debian/changelog	2007-12-06 13:46:53 UTC (rev 14867)
@@ -1,6 +1,7 @@
-apt-https (2.5.1+B1) unstable; urgency=low
+apt-https (2.5.2) unstable; urgency=low
 
-  * Recompiled for new libapt-pkg.
+  * Disabled maemo-cert-gui, including all its certificate checks.
+    It has bitrotted away.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 05 Dec 2007 17:38:16 +0200
 

Modified: projects/haf/trunk/apt-https/debian/control
===================================================================
--- projects/haf/trunk/apt-https/debian/control	2007-12-05 15:38:41 UTC (rev 14866)
+++ projects/haf/trunk/apt-https/debian/control	2007-12-06 13:46:53 UTC (rev 14867)
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Marius Vollmer <marius.vollmer at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libapt-pkg-dev, libcurl3-dev, libcst-dev, libosso-certman-dev, libosso-dev, libssl-dev
+Build-Depends: debhelper (>= 4.0.0), libapt-pkg-dev, libcurl3-dev, libssl-dev
 Standards-Version: 3.6.0
 
 Package: apt-https

Modified: projects/haf/trunk/apt-https/maemo-mini-curl.c
===================================================================
--- projects/haf/trunk/apt-https/maemo-mini-curl.c	2007-12-05 15:38:41 UTC (rev 14866)
+++ projects/haf/trunk/apt-https/maemo-mini-curl.c	2007-12-06 13:46:53 UTC (rev 14867)
@@ -41,6 +41,7 @@
 static int
 ssl_app_verify_callback (X509_STORE_CTX *ctx, void *unused)
 {
+#if 0
   // Run maemo-mini-curl-cert-gui to verify the certificate and
   // possibly ask the user what to do.
 
@@ -88,6 +89,13 @@
  out:
   perror (name);
   return 0;
+#else
+  /* This artificial intelligence algorithm simulates the response of
+     the average user to a "Invalid certificate received." dialog.
+     Scientific tests have shown that it is highly accurate.
+   */
+  return 1;
+#endif
 }
 
 static CURLcode