rpms/drivel/F-7 drivel-2.1.1-openssl.patch, NONE, 1.1 drivel-2.1.1-proxyuri.patch, NONE, 1.1 drivel-2.0.2-desktop.patch, 1.1, NONE drivel-2.1.0-beecrypt.patch, 1.1, NONE

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/pkgs/rpms/drivel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25924

Added Files:
	drivel-2.1.1-openssl.patch drivel-2.1.1-proxyuri.patch 
Removed Files:
	drivel-2.0.2-desktop.patch drivel-2.1.0-beecrypt.patch 
Log Message:
- Drop unnecessary .desktop patch (upstream subsumed)
- Use OpenSSL instead of beecrypt for MD5
- Fix proxy URI behavior



drivel-2.1.1-openssl.patch:

--- NEW FILE drivel-2.1.1-openssl.patch ---
diff -uNr drivel-orig/configure.ac drivel/configure.ac
--- drivel-orig/configure.ac	2007-11-30 20:10:52.000000000 -0500
+++ drivel/configure.ac	2007-12-02 13:27:31.000000000 -0500
@@ -28,7 +28,7 @@
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h libintl.h stdlib.h string.h strings.h sys/time.h unistd.h])
+AC_CHECK_HEADERS([fcntl.h libintl.h stdlib.h string.h strings.h sys/time.h unistd.h openssl/md5.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -41,6 +41,7 @@
 AC_FUNC_MKTIME
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS([ftruncate gethostname localtime_r memset strcasecmp strerror strstr])
+AC_CHECK_LIB([openssl], [MD5_Init])
 
 # Pkg-config checks
 BONOBO_ACTIVATION=2.0.0
diff -uNr drivel-orig/src/Makefile.am drivel/src/Makefile.am
--- drivel-orig/src/Makefile.am	2007-11-30 20:10:54.000000000 -0500
+++ drivel/src/Makefile.am	2007-12-02 13:28:01.000000000 -0500
@@ -42,7 +42,6 @@
 	query_music_players.h \
 	journal.h \
 	login.h \
-	md5.h \
 	msg_queue.h \
 	network.h \
 	tray.h \
@@ -64,7 +63,6 @@
 	journal.c \
 	login.c \
 	main.c \
-	md5.c \
 	msg_queue.c \
 	network.c \
 	tray.c \
diff -uNr drivel-orig/src/utils.c drivel/src/utils.c
--- drivel-orig/src/utils.c	2007-11-30 20:10:54.000000000 -0500
+++ drivel/src/utils.c	2007-12-02 13:31:35.000000000 -0500
@@ -27,9 +27,9 @@
 #include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libxml/parser.h>
+#include <openssl/md5.h>
 
 #include "drivel.h"
-#include "md5.h"
 #include "utils.h"
 
 static gboolean
@@ -454,17 +454,17 @@
 {
 	gint i;
 	guchar *md5_text;
-	md5_state_t state;
-	md5_byte_t digest[16];
+	MD5_CTX state;
+	unsigned char digest[16];
 	
 	g_return_val_if_fail (text, NULL);
 	
 	md5_text = g_new0 (guchar, (16 * 2 + 1));
 	
 	/* md5-hash the text */
-	md5_init (&state);
-	md5_append (&state, (guchar *)text, strlen (text));
-	md5_finish (&state, digest);
+	MD5_Init (&state);
+	MD5_Update (&state, text, strlen (text));
+	MD5_Final (digest, &state);
 
 	/* put the hash in lower-case hex */
 	for (i = 0; i < 16; i++)

drivel-2.1.1-proxyuri.patch:

--- NEW FILE drivel-2.1.1-proxyuri.patch ---
--- drivel-svn20070817/src/network.c	2007-08-17 13:27:05.000000000 -0400
+++ drivel/src/network.c	2007-08-17 18:26:46.000000000 -0400
@@ -179,12 +179,16 @@
 	if (dc->proxy && dc->proxy_url)
 	{
 		gchar *text_uri;
+		gchar *text_uri_proto;
 
 		debug ("Setting up proxy server:");
 		if (!dc->proxy_port)
 			dc->proxy_port = 8080;
-		
-		text_uri = g_strdup_printf ("%s:%d", dc->proxy_url, dc->proxy_port);
+		if (dc->proxy_auth)
+		  text_uri_proto = g_strdup_printf ("https://");
+		else
+		  text_uri_proto = g_strdup_printf ("http://");
+		text_uri = g_strdup_printf ("%s%s:%d", text_uri_proto, dc->proxy_url, dc->proxy_port);
 		debug (text_uri);
 		proxy_uri = soup_uri_new (text_uri);
 		g_free (text_uri);


--- drivel-2.0.2-desktop.patch DELETED ---


--- drivel-2.1.0-beecrypt.patch DELETED ---