Christian Weisgerber <[EMAIL PROTECTED]> wrote:
> > This is a patch to stop snownews segfaulting on amd64 when it reloads
> > a feed. It's from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=333959
> > Tested on amd64 and i386. I'd like to test it on alpha but don't have
> > one to hand.
> >
> > Index: patches/patch-md5_h
>
> How about just using the MD5* functions from libc instead of fixing
> that re-implementation?
And here's the corresponding patch.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/snownews/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 3 Nov 2005 00:52:44 -0000 1.10
+++ Makefile 19 Feb 2006 20:17:14 -0000
@@ -2,6 +2,7 @@
COMMENT= "text mode rss newsreader"
DISTNAME= snownews-1.5.7
+PKGNAME= ${DISTNAME}p0
CATEGORIES= www
MASTER_SITES= ${HOMEPAGE}download/
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/snownews/patches/patch-Makefile,v
retrieving revision 1.8
diff -u -r1.8 patch-Makefile
--- patches/patch-Makefile 3 Nov 2005 00:52:45 -0000 1.8
+++ patches/patch-Makefile 19 Feb 2006 20:17:14 -0000
@@ -1,12 +1,21 @@
$OpenBSD: patch-Makefile,v 1.8 2005/11/03 00:52:45 cathcart Exp $
---- Makefile.orig Wed Sep 29 11:28:31 2004
-+++ Makefile Tue Oct 12 22:52:36 2004
+--- Makefile.orig Sun Jun 5 11:50:22 2005
++++ Makefile Thu Feb 16 22:15:51 2006
@@ -1,4 +1,4 @@
-CC= gcc
+#CC= gcc
MAKE= make
INSTALL= install
LOCALEPATH= $(PREFIX)/share/locale
+@@ -8,7 +8,7 @@ LOCALEPATH= $(PREFIX)/share/locale
+ include platform_settings
+
+ ### Object files ###
+-OBJFILES= main.o netio.o interface.o xmlparse.o updatecheck.o conversions.o
dialog.o ui-support.o categories.o about.o cookies.o setup.o net-support.o
digcalc.o md5.o filters.o io-internal.o os-support.o zlib_interface.o support.o
++OBJFILES= main.o netio.o interface.o xmlparse.o updatecheck.o conversions.o
dialog.o ui-support.o categories.o about.o cookies.o setup.o net-support.o
digcalc.o filters.o io-internal.o os-support.o zlib_interface.o support.o
+
+ VERSION= `grep VERSION version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
+ DISTDIR= snownews-$(VERSION)
@@ -42,11 +42,11 @@ locales:
done
@@ -21,12 +30,12 @@
sed s/VERSION/$(VERSION)/ > $(MAN)/$$L/snownews.1; \
done
-@@ -60,7 +60,7 @@ install-bin: snownews
+@@ -59,7 +59,7 @@ install-bin: snownews
if [ ! -d "$(DESTDIR)$(PREFIX)/bin" ]; then \
mkdir -p $(DESTDIR)$(PREFIX)/bin; \
fi
- $(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin
+ $(INSTALL) snownews $(DESTDIR)$(PREFIX)/bin
$(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin
-
- install-locales: locales
+ if [ ! -f "$(DESTDIR)$(PREFIX)/bin/snow2opml" ]; then \
+ ln -sf $(DESTDIR)$(PREFIX)/bin/opml2snow
$(DESTDIR)$(PREFIX)/bin/snow2opml; \
Index: patches/patch-conversions_c
===================================================================
RCS file: patches/patch-conversions_c
diff -N patches/patch-conversions_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-conversions_c 19 Feb 2006 20:17:14 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+--- conversions.c.orig Thu Feb 16 22:14:10 2006
++++ conversions.c Thu Feb 16 22:17:11 2006
+@@ -24,6 +24,7 @@
+ *
+ */
+
++#include <sys/types.h>
+ #include <string.h>
+ #include <iconv.h>
+ #include <stdio.h>
+@@ -33,6 +34,7 @@
+ #include <errno.h>
+ #include <libxml/HTMLparser.h>
+ #include <langinfo.h>
++#include <md5.h>
+
+ /* I have no idea what needs to be defined to get strptime() on glibc.
+ * This is stolen from somewhere else and it works for me(tm).
+@@ -49,7 +51,6 @@
+ #include "interface.h"
+ #include "ui-support.h"
+ #include "setup.h"
+-#include "md5.h"
+ #include "digcalc.h"
+
+ extern struct entity *first_entity;
Index: patches/patch-digcalc_c
===================================================================
RCS file: patches/patch-digcalc_c
diff -N patches/patch-digcalc_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-digcalc_c 19 Feb 2006 20:17:14 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- digcalc.c.orig Thu Feb 16 22:13:28 2006
++++ digcalc.c Thu Feb 16 22:13:48 2006
+@@ -14,8 +14,8 @@
+ * MD5 implementation rather than using RSA's.
+ */
+
+-#include "md5.h"
+-
++#include <sys/types.h>
++#include <md5.h>
+ #include <string.h>
+ #include "digcalc.h"
+
--
Christian "naddy" Weisgerber [EMAIL PROTECTED]
