rpms/drivel/devel drivel-2.1.1-openssl.patch, NONE, 1.1 drivel-2.1.1-proxyuri.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 drivel.spec, 1.9, 1.10 sources, 1.5, 1.6 drivel-2.0.2-desktop.patch, 1.1, NONE drivel-2.1.0-beecrypt.patch, 1.1, NONE

Sun Dec 2 19:26:18 UTC 2007

Author: pfrields

Update of /cvs/pkgs/rpms/drivel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26781

Modified Files:
	.cvsignore drivel.spec sources 
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:
Update specfile and fix patches and support files as in F-7 and F-8 branches

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);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drivel/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Aug 2007 21:07:24 -0000	1.5
+++ .cvsignore	2 Dec 2007 19:25:44 -0000	1.6
@@ -1 +1 @@
-drivel-cvs20060527-nomd5.tar.bz2
+drivel-svn20071130-nomd5.tar.bz2


Index: drivel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drivel/devel/drivel.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- drivel.spec	19 Aug 2007 21:26:44 -0000	1.9
+++ drivel.spec	2 Dec 2007 19:25:44 -0000	1.10
@@ -1,20 +1,20 @@
 # Use this tag in interim until >2.0.2 release
-%define cvsdate 20060527
+%define cvsdate 20071130
 
 Summary: A journal or "blog" client
 Name: drivel
-Version: 2.1.0
-Release: 0.5.%{cvsdate}cvs%{?dist}
+Version: 2.1.1
+Release: 0.1.%{cvsdate}svn%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
 # This package differs from the upstream drivel tarball in that
 # the Aladdin-licensed MD5 implementation has been removed by
 # running drivel-nukemd5.sh in the unpacked source directory.
-Source0: %{name}-%{?cvsdate:cvs%{cvsdate}}%{!?cvsdate:%{version}}-nomd5.tar.bz2
+Source0: %{name}-%{?cvsdate:svn%{cvsdate}}%{!?cvsdate:%{version}}-nomd5.tar.bz2
 Source1: drivel-nukemd5.sh
-Patch0:	drivel-2.0.2-desktop.patch
-Patch1: drivel-2.1.0-beecrypt.patch
+Patch0: drivel-2.1.1-openssl.patch
+Patch1: drivel-2.1.1-proxyuri.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: scrollkeeper
 BuildRequires: gtkspell-devel 
@@ -33,7 +33,7 @@
 BuildRequires: intltool
 BuildRequires: desktop-file-utils
 %{?cvsdate:BuildRequires: gnome-common}
-BuildRequires: beecrypt-devel
+BuildRequires: openssl-devel
 Requires: glib2 >= 2.4.0
 Requires: gtk2 >= 2.4.0
 Requires(pre): GConf2
@@ -112,7 +112,6 @@
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO
 %{_bindir}/drivel
-%{_libdir}/drivel
 %{_datadir}/applications/gnome-drivel.desktop
 %{_datadir}/application-registry/drivel.applications
 %{_datadir}/drivel/
@@ -127,6 +126,11 @@
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Nov 30 2007 Paul W. Frields <stickster at gmail.com> - 2.1.1-0.1.20071130svn
+- Update to latest SVN
+- Use OpenSSL library instead of beecrypt for MD5
+- Patch proxy URI behavior
+
 * Sun Aug 19 2007 Paul W. Frields <stickster at gmail.com> - 2.1.0-0.5.20060527cvs
 - Fix license tag
 - Remove verboten Aladdin Free Software Licensed files md5.{c,h}


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drivel/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Aug 2007 21:07:24 -0000	1.5
+++ sources	2 Dec 2007 19:25:44 -0000	1.6
@@ -1 +1 @@
-addc9d2ae40a908eeca8177671c65280  drivel-cvs20060527-nomd5.tar.bz2
+bc2608ba17f9fbfd5649216f8e097fc3  drivel-svn20071130-nomd5.tar.bz2


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


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


