rpms/drivel/F-7 drivel-2.1.0-beecrypt.patch, NONE, 1.1 drivel-nukemd5.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 drivel.spec, 1.8, 1.9 sources, 1.4, 1.5
Paul W. Frields (pfrields)
fedora-extras-commits at redhat.com
Sun Aug 19 21:33:07 UTC 2007
- Previous message (by thread): rpms/drivel/devel drivel-2.1.0-beecrypt.patch, NONE, 1.1 drivel.spec, 1.8, 1.9
- Next message (by thread): rpms/drivel/FC-6 drivel-2.1.0-beecrypt.patch, NONE, 1.1 drivel-nukemd5.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 drivel.spec, 1.8, 1.9 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pfrields
Update of /cvs/pkgs/rpms/drivel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32340
Modified Files:
.cvsignore drivel.spec sources
Added Files:
drivel-2.1.0-beecrypt.patch drivel-nukemd5.sh
Log Message:
Sync to devel branch, fixing both license tag and actual licensing problem
drivel-2.1.0-beecrypt.patch:
--- NEW FILE drivel-2.1.0-beecrypt.patch ---
diff -uNr drivel-orig/configure.ac drivel/configure.ac
--- drivel-orig/configure.ac 2006-03-18 13:31:51.000000000 -0500
+++ drivel/configure.ac 2007-08-17 16:30:43.000000000 -0400
@@ -29,7 +29,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 beecrypt/md5.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -42,6 +42,7 @@
AC_FUNC_MKTIME
AC_FUNC_STRFTIME
AC_CHECK_FUNCS([ftruncate gethostname localtime_r memset strcasecmp strerror strstr])
+AC_CHECK_LIB([beecrypt], [md5Reset])
# Pkg-config checks
BONOBO_ACTIVATION=2.0.0
diff -uNr drivel-orig/src/Makefile.am drivel/src/Makefile.am
--- drivel-orig/src/Makefile.am 2005-08-30 13:46:18.000000000 -0400
+++ drivel/src/Makefile.am 2007-08-17 16:26:36.000000000 -0400
@@ -52,7 +52,6 @@
query_music_players.h \
journal.h \
login.h \
- md5.h \
msg_queue.h \
network.h \
plugin.h \
@@ -75,7 +74,6 @@
journal.c \
login.c \
main.c \
- md5.c \
msg_queue.c \
network.c \
plugin.c \
diff -uNr drivel-orig/src/utils.c drivel/src/utils.c
--- drivel-orig/src/utils.c 2005-06-19 14:22:24.000000000 -0400
+++ drivel/src/utils.c 2007-08-17 16:26:36.000000000 -0400
@@ -28,9 +28,9 @@
#include <gtk/gtk.h>
#include <libgnomevfs/gnome-vfs-ops.h>
#include <libxml/parser.h>
+#include <beecrypt/md5.h>
#include "drivel.h"
-#include "md5.h"
#include "utils.h"
static gboolean
@@ -455,17 +455,17 @@
{
gint i;
guchar *md5_text;
- md5_state_t state;
- md5_byte_t digest[16];
+ md5Param 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, text, strlen (text));
- md5_finish (&state, digest);
+ md5Reset (&state);
+ md5Update (&state, text, strlen (text));
+ md5Digest (&state, digest);
/* put the hash in lower-case hex */
for (i = 0; i < 16; i++)
--- NEW FILE drivel-nukemd5.sh ---
#!/bin/sh
#
# Remove the MD5 implementation from drivel. A subsequent patch
# fixes the source to use the beecrypt MD5 implementation instead.
#
for i in src/md5.* ; do > $i ; done
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drivel/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 18 Jun 2006 23:54:28 -0000 1.4
+++ .cvsignore 19 Aug 2007 21:32:35 -0000 1.5
@@ -1 +1 @@
-drivel-cvs20060527.tar.bz2
+drivel-cvs20060527-nomd5.tar.bz2
Index: drivel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drivel/F-7/drivel.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- drivel.spec 5 Nov 2006 22:49:38 -0000 1.8
+++ drivel.spec 19 Aug 2007 21:32:35 -0000 1.9
@@ -4,12 +4,17 @@
Summary: A journal or "blog" client
Name: drivel
Version: 2.1.0
-Release: 0.4.%{cvsdate}cvs%{?dist}
-License: GPL
+Release: 0.5.%{cvsdate}cvs%{?dist}
+License: GPLv2+
Group: Applications/Internet
Url: http://www.dropline.net/drivel
-Source: %{name}-%{?cvsdate:cvs%{cvsdate}}%{!?cvsdate:%{version}}.tar.bz2
+# 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
+Source1: drivel-nukemd5.sh
Patch0: drivel-2.0.2-desktop.patch
+Patch1: drivel-2.1.0-beecrypt.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: scrollkeeper
BuildRequires: gtkspell-devel
@@ -28,6 +33,7 @@
BuildRequires: intltool
BuildRequires: desktop-file-utils
%{?cvsdate:BuildRequires: gnome-common}
+BuildRequires: beecrypt-devel
Requires: glib2 >= 2.4.0
Requires: gtk2 >= 2.4.0
Requires(pre): GConf2
@@ -43,6 +49,7 @@
%prep
%setup -q %{?cvsdate:-n %{name}}
%patch0 -p1
+%patch1 -p1
%build
%{?cvsdate:./autogen.sh}
@@ -120,6 +127,11 @@
%config %{_sysconfdir}/gconf/schemas/*
%changelog
+* 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}
+- Rebuild against beecrypt and fix BuildRequires
+
* Sun Nov 5 2006 Paul W. Frields <stickster at gmail.com> - 2.1.0-0.4.20060527cvs
- Rebuild against new libcurl
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drivel/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 18 Jun 2006 23:54:28 -0000 1.4
+++ sources 19 Aug 2007 21:32:35 -0000 1.5
@@ -1 +1 @@
-170dd3be3ca06de8f64f37bc76028526 drivel-cvs20060527.tar.bz2
+addc9d2ae40a908eeca8177671c65280 drivel-cvs20060527-nomd5.tar.bz2
- Previous message (by thread): rpms/drivel/devel drivel-2.1.0-beecrypt.patch, NONE, 1.1 drivel.spec, 1.8, 1.9
- Next message (by thread): rpms/drivel/FC-6 drivel-2.1.0-beecrypt.patch, NONE, 1.1 drivel-nukemd5.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 drivel.spec, 1.8, 1.9 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list