[svn] r5712 - trunk/rpms/compface
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Sun Aug 12 13:43:21 CEST 2007
Author: hadams
Date: 2007-08-12 13:43:20 +0200 (Sun, 12 Aug 2007)
New Revision: 5712
Added:
trunk/rpms/compface/compface-1.5.2-build.patch
trunk/rpms/compface/compface-1.5.2-stack-smashing.patch
trunk/rpms/compface/compface-README.copyright
trunk/rpms/compface/compface-test.xbm
Removed:
trunk/rpms/compface/compface-1.4-errno.patch
trunk/rpms/compface/compface-1.4-makefile.patch
Modified:
trunk/rpms/compface/compface.spec
Log:
Updated to 1.5.2 for building claws-mail
Deleted: trunk/rpms/compface/compface-1.4-errno.patch
===================================================================
--- trunk/rpms/compface/compface-1.4-errno.patch 2007-08-12 10:33:04 UTC (rev 5711)
+++ trunk/rpms/compface/compface-1.4-errno.patch 2007-08-12 11:43:20 UTC (rev 5712)
@@ -1,22 +0,0 @@
-diff -Naupr compface-1.4.orig/cmain.c compface-1.4/cmain.c
---- compface-1.4.orig/cmain.c 2000-11-23 01:51:03.000000000 +0100
-+++ compface-1.4/cmain.c 2004-05-11 11:09:17.165276536 +0200
-@@ -21,6 +21,7 @@
-
- #ifdef STDC_HEADERS
- #include <stdlib.h>
-+#include <errno.h>
- #else /* Not STDC_HEADERS */
- extern void exit ();
- extern char *malloc ();
-diff -Naupr compface-1.4.orig/uncmain.c compface-1.4/uncmain.c
---- compface-1.4.orig/uncmain.c 2000-11-23 01:51:24.000000000 +0100
-+++ compface-1.4/uncmain.c 2004-05-11 11:09:39.804834800 +0200
-@@ -25,6 +25,7 @@
-
- #ifdef STDC_HEADERS
- #include <stdlib.h>
-+#include <errno.h>
- #else /* Not STDC_HEADERS */
- extern void exit ();
- extern char *malloc ();
Deleted: trunk/rpms/compface/compface-1.4-makefile.patch
===================================================================
--- trunk/rpms/compface/compface-1.4-makefile.patch 2007-08-12 10:33:04 UTC (rev 5711)
+++ trunk/rpms/compface/compface-1.4-makefile.patch 2007-08-12 11:43:20 UTC (rev 5712)
@@ -1,39 +0,0 @@
-diff -Naupr compface-1.4.orig/Makefile.in compface-1.4/Makefile.in
---- compface-1.4.orig/Makefile.in 2000-11-22 14:38:39.000000000 +0100
-+++ compface-1.4/Makefile.in 2004-05-11 11:55:55.234905296 +0200
-@@ -71,18 +71,23 @@ dist: $(DISTFILES)
- $(RM) -rf `cat .fname` .fname
-
- install: $(NAME) $(UNNAME) $(LIBNAME)
-- $(INSTALL_PROGRAM) $(srcdir)/$(NAME) $(EXECUTABLE)
-- -chmod 0755 $(EXECUTABLE)
-- -strip $(EXECUTABLE)
-- $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(UNEXECUTABLE)
-- -chmod 0755 $(UNEXECUTABLE)
-- -strip $(UNEXECUTABLE)
-- $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
-- cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
-- $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
-- cd $(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
-- for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(INCLUDEDIR)/$${hdr}; done
-- $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY)
-+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(BINDIR)
-+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(MAN1DIR)
-+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(MAN3DIR)
-+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(INCLUDEDIR)
-+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(LIBDIR)
-+ $(INSTALL_PROGRAM) $(srcdir)/$(NAME) $(DESTDIR)$(EXECUTABLE)
-+ -chmod 0755 $(DESTDIR)$(EXECUTABLE)
-+ -strip $(DESTDIR)$(EXECUTABLE)
-+ $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(DESTDIR)$(UNEXECUTABLE)
-+ -chmod 0755 $(DESTDIR)$(UNEXECUTABLE)
-+ -strip $(DESTDIR)$(UNEXECUTABLE)
-+ $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(DESTDIR)$(MAN1DIR)/$(NAME).1
-+ cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
-+ $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3
-+ cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
-+ for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done
-+ $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(DESTDIR)$(LIBRARY)
-
- shar :
- shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
Added: trunk/rpms/compface/compface-1.5.2-build.patch
===================================================================
--- trunk/rpms/compface/compface-1.5.2-build.patch (rev 0)
+++ trunk/rpms/compface/compface-1.5.2-build.patch 2007-08-12 11:43:20 UTC (rev 5712)
@@ -0,0 +1,81 @@
+o Build shared library, link tools against it
+o Make it possible to prevent stripping
+o Add DESTDIR support
+
+--- Makefile.in~ 2005-10-04 15:59:49.000000000 +0300
++++ Makefile.in 2006-08-02 22:23:07.000000000 +0300
+@@ -15,6 +15,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ SHELL = /bin/sh
++STRIP = strip
+
+ NAME = compface
+ UNNAME = uncompface
+@@ -25,6 +26,7 @@
+ UNEXECUTABLE = $(BINDIR)/$(UNNAMEEXE)
+ LIBNAME = lib$(NAME).a
+ LIBRARY = $(LIBDIR)/$(LIBNAME)
++SHLIBNAME = lib$(NAME).so
+ MAN1DIR = $(MANDIR)/man1
+ MAN3DIR = $(MANDIR)/man3
+ OBJECTS = arith.o file.o compress.o gen.o uncompface.o
+@@ -45,11 +47,11 @@
+
+ all: $(NAMEEXE) $(UNNAMEEXE)
+
+-$(NAMEEXE) : cmain.o compface.o $(LIBNAME)
+- $(CC) $(LDFLAGS) -o $@ cmain.o compface.o $(LIBNAME)
++$(NAMEEXE) : cmain.o compface.o $(SHLIBNAME)
++ $(CC) $(LDFLAGS) -o $@ cmain.o compface.o -L. -l$(NAME)
+
+-$(UNNAMEEXE) : uncmain.o $(LIBNAME)
+- $(CC) $(LDFLAGS) -o $@ uncmain.o $(LIBNAME)
++$(UNNAMEEXE) : uncmain.o $(SHLIBNAME)
++ $(CC) $(LDFLAGS) -o $@ uncmain.o -L. -l$(NAME)
+
+ $(LIBNAME) : $(OBJECTS)
+ ar rc $(LIBNAME) $(OBJECTS)
+@@ -73,25 +75,28 @@
+ tar chzf `cat .fname`.tar.gz `cat .fname`
+ $(RM) -rf `cat .fname` .fname
+
+-install: $(NAMEEXE) $(UNNAMEEXE) $(LIBNAME)
+- $(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR) $(INCLUDEDIR)
+- $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE)
+- -chmod 0755 $(EXECUTABLE)
+- -strip $(EXECUTABLE)
+- $(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(UNEXECUTABLE)
+- -chmod 0755 $(UNEXECUTABLE)
+- -strip $(UNEXECUTABLE)
+- $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
+- cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
+- $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
+- cd $(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
+- for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(INCLUDEDIR)/$${hdr}; done
+- $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY)
++install: $(NAMEEXE) $(UNNAMEEXE) $(SHLIBNAME)
++ $(INSTALL_PROGRAM) -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(MAN1DIR) $(DESTDIR)$(MAN3DIR) $(DESTDIR)$(INCLUDEDIR)
++ $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(DESTDIR)$(EXECUTABLE)
++ -$(STRIP) $(DESTDIR)$(EXECUTABLE)
++ $(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(DESTDIR)$(UNEXECUTABLE)
++ -$(STRIP) $(DESTDIR)$(UNEXECUTABLE)
++ $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(DESTDIR)$(MAN1DIR)/$(NAME).1
++ cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
++ $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3
++ cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
++ for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done
++ $(INSTALL_PROGRAM) $(srcdir)/$(SHLIBNAME) $(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1.0.0
++ $(LN_S) $(SHLIBNAME).1.0.0 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1
++ $(LN_S) $(SHLIBNAME).1 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME)
+
+ shar :
+ shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
+ compress $(NAME).sh
+
++$(SHLIBNAME): $(OBJECTS)
++ $(CC) -shared -Wl,-soname,$(SHLIBNAME).1 $(LDFLAGS) -o $(SHLIBNAME) $(OBJECTS)
++
+ .c.o:
+ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
+
Added: trunk/rpms/compface/compface-1.5.2-stack-smashing.patch
===================================================================
--- trunk/rpms/compface/compface-1.5.2-stack-smashing.patch (rev 0)
+++ trunk/rpms/compface/compface-1.5.2-stack-smashing.patch 2007-08-12 11:43:20 UTC (rev 5712)
@@ -0,0 +1,26 @@
+Prevent sscanf stack smashing, and fix two GCC warnings.
+
+diff -Nur compface-1.5.2-prepped/file.c compface-1.5.2-modified/file.c
+--- compface-1.5.2-prepped/file.c 2006-08-04 18:58:17.000000000 +0200
++++ compface-1.5.2-modified/file.c 2006-08-04 18:59:30.000000000 +0200
+@@ -80,7 +80,7 @@
+ static char table_inv[] = { 0,8,4,12,2,10,6,14,1,9, 5,13, 3,11, 7,15 };
+ static char table_nop[] = { 0,1,2, 3,4, 5,6, 7,8,9,10,11,12,13,14,15 };
+ char *table = table_nop; /* optionally invert bits in nibble */
+- register inc = 0; /* optionally swap nimmles */
++ register int inc = 0; /* optionally swap nimmles */
+ int bits;
+
+ t = s = fbuf;
+@@ -91,9 +91,9 @@
+ char type1[128];
+ char type2[128];
+ while (*s && *s++ != '\n');
+- if (sscanf(s, "#define %*s %d", &bits) == 1) if (bits == 48) {
++ if ((sscanf(s, "#define %*s %d", &bits) == 1) && (bits == 48)) {
+ while (*s && *s++ != '\n');
+- if (sscanf(s, "static %s %s", type1,type2)==2 &&
++ if (sscanf(s, "static %127s %127s", type1,type2)==2 &&
+ (!strcmp(type1, "char") ||
+ !strcmp(type2, "char"))) {
+ while (*s && *s++ != '\n');
Added: trunk/rpms/compface/compface-README.copyright
===================================================================
--- trunk/rpms/compface/compface-README.copyright (rev 0)
+++ trunk/rpms/compface/compface-README.copyright 2007-08-12 11:43:20 UTC (rev 5712)
@@ -0,0 +1,80 @@
+Extracted from Debian GNU/Linux's package:
+
+[...]
+
+Compface - 48x48x1 image compression and decompression
+Copyright (c) James Ashton 1990.
+Written 89/11/11
+
+Feel free to distribute this source at will so long as the above
+message and this message are included in full.
+
+This copyright message dosn't specify whether modified version is allowed,
+but the following mail from the author does allow them:
+
+> From: James Ashton <James.Ashton at syseng.anu.edu.au>
+> Subject: Re: Bug#72019: compface not DFSG
+> Date: Wed, 20 Sep 2000 09:48:34 +1100 (EST)
+>
+> >On Tue, Sep 19, 2000 at 08:58:43AM -0400, Raul Miller wrote:
+> >> Package: compface
+> >> Version: 1989.11.11-17.1
+> >> Severity: important
+> >>
+> >> compface's copyright doesn't grant permission to
+> >> distribute modified versions
+> >
+> >The compface copyright says:
+> >
+> >Feel free to distribute this source at will so long as the above
+> >message and this message are included in full.
+> >
+> >
+> >Which could be interpretated as it is allowed to distribute modified
+> >versions of it. James Ashton is the original author, would you care to
+> >clairify the matter, mr Ashton?
+>
+> I don't mind modified versions being distributed. Please included the
+> original copyright notices as specified and also prominently note, if
+> it is a modified version, the nature and author(s) of the
+> modifications.
+> --
+> James Ashton VK1XJA System Administrator
+> http://wwwsyseng.anu.edu.au/~jaa Department of Systems Engineering
+> Voice +61 2 6279 8675 Research School of Information Sciences and Engineering
+> FAX +61 2 6279 8688 Australian National University
+> Email James.Ashton at anu.edu.au Canberra ACT 0200 Australia
+>
+
+Another peoblem with the copyright of this source code is that the
+copyright message in the source files and in the readme file is conflicting.
+The following mail from the author should clear that up:
+
+> From: James Ashton <James.Ashton at syseng.anu.edu.au>
+> Subject: Re: libcompface license (again)
+> Date: Thu, 22 Feb 2001 09:32:23 +1100 (EST)
+>
+> >Hi,
+> >I'm maintaining the debian pkg of your compface lib, and I've talket to you
+> >before about it's license. And now ouer legal people have found another
+> >problem. The sourcefiles contains a diffrent copyright notice than the
+> >redmefile. They say:
+> >
+> >> * Permission is given to distribute these sources, as long as the
+> >> * copyright messages are not removed, and no monies are exchanged.=20
+> >
+> >The problem is the last part "no monies are exchanged". As you probably=20
+> >know we do allow third party companies to produce debian CDs and sell them.
+> >So this statement would inmply that we can't have your libcompface in
+> debian
+> >at all.
+>
+> I'm happy to remove the phrase no monies are exchanged' from the
+> source and allow distribution as per the README file. Do you need more
+> from me than just this email?
+> --
+> James Ashton VK1XJA System Administrator
+> http://wwwsyseng.anu.edu.au/~jaa Department of Systems Engineering
+> Voice +61 2 6125 8675 Research School of Information Sciences and Engineering
+> FAX +61 2 6125 8660 Australian National University
+> Email James.Ashton at anu.edu.au Canberra ACT 0200 Australia
Added: trunk/rpms/compface/compface-test.xbm
===================================================================
--- trunk/rpms/compface/compface-test.xbm (rev 0)
+++ trunk/rpms/compface/compface-test.xbm 2007-08-12 11:43:20 UTC (rev 5712)
@@ -0,0 +1,23 @@
+#define noname_width 48
+#define noname_height 48
+static char noname_bits[] = {
+ 0xFC,0xFF,0xFF,0xFF,0xFF,0x7F,0xFC,0xFF,0xFF,0xFF,0xFF,0x7F,0xFF,0xFF,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDF,0x56,0x95,0x24,0x00,0xE0,
+ 0xBF,0xBD,0x55,0xD5,0x6E,0xE5,0xEF,0xF7,0xFF,0x6F,0xBB,0xEB,0xAF,0xFF,0xFF,
+ 0xFF,0xFF,0xE7,0xDF,0xFF,0xDF,0xFE,0xFF,0xE7,0xFF,0xFF,0x0F,0x00,0xE0,0xEF,
+ 0xAF,0xFF,0x07,0x00,0xE0,0xE3,0xEF,0xFF,0x07,0x00,0xE0,0xE7,0xDF,0xFF,0x03,
+ 0x00,0xE0,0xE7,0xDF,0xFF,0x07,0x00,0xE0,0xEF,0xFF,0xFF,0x03,0x00,0xF0,0xE7,
+ 0xCF,0xFF,0x03,0x88,0xFC,0xE7,0xFF,0xFF,0x03,0xFC,0xFF,0xE7,0x8F,0xFF,0x03,
+ 0xFE,0xFF,0xE7,0xFF,0xFF,0x03,0xD4,0xFF,0xE7,0xD7,0xFF,0x03,0x00,0xFE,0xE7,
+ 0xEF,0xFF,0x01,0x00,0xFF,0xE7,0xCF,0xFF,0x01,0x00,0xFE,0xE7,0xDF,0xFF,0x01,
+ 0x00,0xFE,0xE7,0xDF,0xFF,0x01,0x00,0xFF,0xE7,0xEF,0xFF,0x00,0xA0,0xFF,0xE3,
+ 0xCF,0xFF,0x80,0xFF,0xFF,0xE7,0xDF,0xFF,0x00,0xFF,0xFF,0xE7,0xDF,0xFF,0x80,
+ 0xFF,0xFF,0xE7,0xEF,0xFF,0x80,0xFF,0xFF,0xC3,0xCF,0x7F,0x80,0xFF,0xFF,0xE7,
+ 0xAF,0xFF,0x80,0xFF,0xFF,0xE7,0xDF,0x7F,0x80,0xFF,0xFF,0xE7,0xAF,0x7F,0xC0,
+ 0xFF,0xFF,0xC3,0xD7,0x7F,0xC0,0xFF,0xFF,0xE7,0xEF,0x7F,0xC0,0xFF,0xFF,0xC7,
+ 0xCF,0x3F,0xC0,0xFF,0xFF,0xE7,0xAF,0x3F,0xC0,0xFF,0xFF,0xC3,0xDF,0x3F,0xE0,
+ 0xFF,0xFF,0xE7,0xCF,0x3F,0xC0,0xFF,0xFF,0xC7,0xDF,0x7F,0xF0,0xFF,0xFF,0xC7,
+ 0xCF,0xFF,0xFF,0xFF,0xFF,0xE3,0x9F,0xFF,0xFF,0xFF,0xFF,0xC7,0xAF,0x52,0x55,
+ 0x95,0x00,0xE0,0x2F,0x02,0x00,0x00,0x04,0xC0,0x4F,0x49,0x2A,0x01,0x10,0xE0,
+ 0xFF,0xFF,0xFF,0xFF,0xF7,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0xFF,0xFF,
+ 0xFF,0xFF,0x7F};
Modified: trunk/rpms/compface/compface.spec
===================================================================
--- trunk/rpms/compface/compface.spec 2007-08-12 10:33:04 UTC (rev 5711)
+++ trunk/rpms/compface/compface.spec 2007-08-12 11:43:20 UTC (rev 5712)
@@ -3,14 +3,17 @@
Summary: Programs for 48x48x1 image compression and decompression
Name: compface
-Version: 1.4
+Version: 1.5.2
Release: 1
License: MIT
Group: Applications/System
-URL: http://freshmeat.net/projects/compface/
-Source: http://www.ibiblio.org/pub/Linux/apps/graphics/convert/compface-%{version}.tar.gz
-Patch0: compface-1.4-errno.patch
-Patch1: compface-1.4-makefile.patch
+URL: http://www.ibiblio.org/pub/Linux/apps/graphics/convert/
+Source0: http://ftp.xemacs.org/pub/xemacs/aux/%{name}-%{version}.tar.gz
+Source1: compface-test.xbm
+Source2: compface-README.copyright
+Patch0: http://ftp.debian.org/debian/pool/main/libc/libcompface/libcompface_1.5.2-3.diff.gz
+Patch1: compface-1.5.2-stack-smashing.patch
+Patch2: %{name}-1.5.2-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
@@ -31,9 +34,10 @@
%prep
-%setup
-%patch0 -p1 -b .errno
-%patch1 -p1 -b .makefile
+%setup -q
+%patch0 -p1
+%patch1 -p1 -b .stack-smashing
+%patch2 -p0
%build
@@ -52,21 +56,26 @@
%files
%defattr(-, root, root, 0755)
-%doc ChangeLog README
+%doc ChangeLog README xbm2xface.pl
+%doc _extdoc/README.copyright
%{_bindir}/compface
%{_bindir}/uncompface
+%{_libdir}/libcompface.so.*
%{_mandir}/man1/compface.1*
%{_mandir}/man1/uncompface.1*
%files devel
-%defattr(-, root, root, 0755)
-%{_libdir}/libcompface.a
+%defattr(-,root,root,-)
%{_includedir}/compface.h
+%{_libdir}/libcompface.so
%{_mandir}/man3/compface.3*
%{_mandir}/man3/uncompface.3*
%changelog
+* Sun Aug 12 2007 Heiko Adams <info at fedora-blog.de> 1.5.2
+- Update to 1.5.2
+
* Tue May 11 2004 Matthias Saou <http://freshrpms.net/> 1.4-1
- Initial RPM release.
More information about the svn-commits
mailing list