rpms/iksemel/devel .cvsignore, 1.2, 1.3 iksemel-64bit.patch, 1.1, 1.2 iksemel-gcrypt-sha.patch, 1.1, 1.2 iksemel.spec, 1.6, 1.7 sources, 1.2, 1.3
Jeffrey C. Ollie (jcollie)
fedora-extras-commits at redhat.com
Sun Aug 26 04:19:40 UTC 2007
Author: jcollie
Update of /cvs/pkgs/rpms/iksemel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18599
Modified Files:
.cvsignore iksemel-64bit.patch iksemel-gcrypt-sha.patch
iksemel.spec sources
Log Message:
Update to 1.3 plus much much more.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iksemel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 28 Jul 2006 18:11:51 -0000 1.2
+++ .cvsignore 26 Aug 2007 04:19:07 -0000 1.3
@@ -1 +1 @@
-iksemel-1.2.tar.gz
+iksemel-1.3.tar.gz
iksemel-64bit.patch:
Index: iksemel-64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iksemel/devel/iksemel-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iksemel-64bit.patch 16 Nov 2006 21:09:49 -0000 1.1
+++ iksemel-64bit.patch 26 Aug 2007 04:19:07 -0000 1.2
@@ -1,6 +1,17 @@
---- iksemel-1.2/test/tst-sax.c~ 2006-11-16 21:49:22.000000000 +0100
-+++ iksemel-1.2/test/tst-sax.c 2006-11-16 21:49:22.000000000 +0100
-@@ -282,71 +282,71 @@
+From f8ded248e18fc748137ff076e130be1dc94d96f0 Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Sat, 25 Aug 2007 22:40:49 -0500
+Subject: [PATCH] Fix 64bit issues in self-tests.
+
+---
+ test/tst-sax.c | 44 ++++++++++++++++++++++----------------------
+ 1 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/test/tst-sax.c b/test/tst-sax.c
+index 77a5c13..40e3a3f 100644
+--- a/test/tst-sax.c
++++ b/test/tst-sax.c
+@@ -282,71 +282,71 @@ int
main (int argc, char *argv[])
{
document ("<lonely/>");
@@ -94,3 +105,6 @@
test ();
document ("<test>\xFF</test>");
+--
+1.5.2.4
+
iksemel-gcrypt-sha.patch:
Index: iksemel-gcrypt-sha.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iksemel/devel/iksemel-gcrypt-sha.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iksemel-gcrypt-sha.patch 28 Jul 2006 18:11:51 -0000 1.1
+++ iksemel-gcrypt-sha.patch 26 Aug 2007 04:19:07 -0000 1.2
@@ -1,19 +1,42 @@
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am (revision 154)
-+++ src/Makefile.am (working copy)
-@@ -25,5 +25,5 @@
+From 2d3927c90fc299911d52672fe91d981e59b8d0f9 Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Sat, 25 Aug 2007 22:31:07 -0500
+Subject: [PATCH] Strip out internal SHA code and use functions from gcrypt.
+
+---
+ configure.ac | 1 +
+ src/Makefile.am | 4 +-
+ src/sha.c | 108 ++++++++-----------------------------------------------
+ 3 files changed, 18 insertions(+), 95 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 91e69e3..d7c6285 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,6 +46,7 @@ AC_CHECK_FUNCS(getopt_long)
+ AC_CHECK_FUNCS(getaddrinfo)
+
+ AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
++AM_PATH_LIBGCRYPT(,AC_DEFINE(HAVE_LIBGCRYPT,,"Use libgcrypt"))
+
+ dnl Check -Wall flag of GCC
+ if test "x$GCC" = "xyes"; then
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 20ca263..923b28b 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,5 +25,5 @@ libiksemel_la_SOURCES = \
base64.c
- libiksemel_la_LDFLAGS = -version-info 3:0:0 -no-undefined
+ libiksemel_la_LDFLAGS = -version-info 4:0:1 -no-undefined
-libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS)
-libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS)
+libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
+libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS) $(LIBGCRYPT_LIBS)
-Index: src/sha.c
-===================================================================
---- src/sha.c (revision 154)
-+++ src/sha.c (working copy)
+diff --git a/src/sha.c b/src/sha.c
+index 330e1b0..0bde079 100644
+--- a/src/sha.c
++++ b/src/sha.c
@@ -4,17 +4,13 @@
** modify it under the terms of GNU Lesser General Public License.
*/
@@ -27,23 +50,23 @@
-static void sha_calculate (iksha *sha);
-
struct iksha_struct {
-- unsigned long hash[5];
-- unsigned long buf[80];
+- unsigned int hash[5];
+- unsigned int buf[80];
- int blen;
-- unsigned long lenhi, lenlo;
+- unsigned int lenhi, lenlo;
+ gcry_md_hd_t c;
};
iksha *
-@@ -32,56 +28,37 @@
+@@ -32,56 +28,37 @@ void
iks_sha_reset (iksha *sha)
{
memset (sha, 0, sizeof (iksha));
-- sha->hash[0] = 0x67452301L;
-- sha->hash[1] = 0xefcdab89L;
-- sha->hash[2] = 0x98badcfeL;
-- sha->hash[3] = 0x10325476L;
-- sha->hash[4] = 0xc3d2e1f0L;
+- sha->hash[0] = 0x67452301;
+- sha->hash[1] = 0xefcdab89;
+- sha->hash[2] = 0x98badcfe;
+- sha->hash[3] = 0x10325476;
+- sha->hash[4] = 0xc3d2e1f0;
+ gcry_md_open(&sha->c, GCRY_MD_SHA1, 0);
}
@@ -90,7 +113,7 @@
- for (i=0; i<5; i++)
+ for (i=0; i<20; i++)
{
-- sprintf (hash, "%08lx", sha->hash[i]);
+- sprintf (hash, "%08x", sha->hash[i]);
- hash += 8;
+ sprintf (hash, "%02x", bin[i]);
+ hash += 2;
@@ -104,7 +127,7 @@
iks_free (sha);
}
-@@ -95,58 +72,3 @@
+@@ -95,58 +72,3 @@ iks_sha (const char *data, char *hash)
iks_sha_print (sha, hash);
iks_free (sha);
}
@@ -116,7 +139,7 @@
-
- for (i=0; i<len; i++) {
- sha->buf[sha->blen / 4] <<= 8;
-- sha->buf[sha->blen / 4] |= (unsigned long)data[i];
+- sha->buf[sha->blen / 4] |= (unsigned int)data[i];
- if ((++sha->blen) % 64 == 0) {
- sha_calculate (sha);
- sha->blen = 0;
@@ -141,7 +164,7 @@
-sha_calculate (iksha *sha)
-{
- int i;
-- unsigned long A, B, C, D, E, TMP;
+- unsigned int A, B, C, D, E, TMP;
-
- for (i=16; i<80; i++)
- sha->buf[i] = SRL (sha->buf[i-3] ^ sha->buf[i-8] ^ sha->buf[i-14] ^ sha->buf[i-16], 1);
@@ -152,10 +175,10 @@
- D = sha->hash[3];
- E = sha->hash[4];
-
-- SHA (0, 19, ((C^D)&B)^D, 0x5a827999L);
-- SHA (20, 39, B^C^D, 0x6ed9eba1L);
-- SHA (40, 59, (B&C)|(D&(B|C)), 0x8f1bbcdcL);
-- SHA (60, 79, B^C^D, 0xca62c1d6L);
+- SHA (0, 19, ((C^D)&B)^D, 0x5a827999);
+- SHA (20, 39, B^C^D, 0x6ed9eba1);
+- SHA (40, 59, (B&C)|(D&(B|C)), 0x8f1bbcdc);
+- SHA (60, 79, B^C^D, 0xca62c1d6);
-
- sha->hash[0] += A;
- sha->hash[1] += B;
@@ -163,15 +186,6 @@
- sha->hash[3] += D;
- sha->hash[4] += E;
-}
-Index: configure.ac
-===================================================================
---- configure.ac (revision 154)
-+++ configure.ac (working copy)
-@@ -46,6 +46,7 @@
- AC_CHECK_FUNCS(getaddrinfo)
-
- AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
-+AM_PATH_LIBGCRYPT(,AC_DEFINE(HAVE_LIBGCRYPT,,"Use libgcrypt"))
-
- dnl Check -Wall flag of GCC
- if test "x$GCC" = "xyes"; then
+--
+1.5.2.4
+
Index: iksemel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iksemel/devel/iksemel.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iksemel.spec 16 Nov 2006 21:57:08 -0000 1.6
+++ iksemel.spec 26 Aug 2007 04:19:07 -0000 1.7
@@ -1,12 +1,12 @@
Name: iksemel
-Version: 1.2
-Release: 13%{?dist}
+Version: 1.3
+Release: 1%{?dist}
Summary: An XML parser library designed for Jabber applications
Group: System Environment/Libraries
-License: LGPL
-URL: http://iksemel.jabberstudio.org/
-Source0: http://files.jabberstudio.org/iksemel/iksemel-%{version}.tar.gz
+License: LGPLv2+
+URL: http://code.google.com/p/iksemel/
+Source0: http://iksemel.googlecode.com/files/iksemel-%{version}.tar.gz
Patch0: iksemel-gcrypt-sha.patch
Patch1: iksemel-64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,8 +17,6 @@
BuildRequires: automake
BuildRequires: libtool
BuildRequires: texinfo
-# BR this because gnutls config script needs it (BZ#200493)
-BuildRequires: pkgconfig
%description
@@ -49,7 +47,7 @@
%prep
%setup0 -q
-%patch0 -p0
+%patch0 -p1
%patch1 -p1
# force rebuilding of the info file
@@ -75,9 +73,7 @@
mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
%check
-%ifnarch ppc
make check
-%endif
%clean
rm -rf %{buildroot}
@@ -118,6 +114,14 @@
%{_bindir}/iksroster
%changelog
+* Sat Aug 25 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.3-1
+- Update to 1.3
+- Don't need to BR pkgconfig because gnutls-devel now requires it properly.
+- Update license.
+- Run "make check" on PPC
+- Update patches so that they apply to 1.3
+- Update URLs
+
* Thu Nov 16 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2-13
- ppp != ppc
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iksemel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 28 Jul 2006 18:11:51 -0000 1.2
+++ sources 26 Aug 2007 04:19:07 -0000 1.3
@@ -1 +1 @@
-82e7c8fdb6211839246b788c040a796b iksemel-1.2.tar.gz
+36ab2d9f11980a19217b6f79a19ef8e7 iksemel-1.3.tar.gz
More information about the fedora-extras-commits
mailing list