Hello community, here is the log from the commit of package emil for openSUSE:Factory checked in at Tue Jun 2 16:57:52 CEST 2009. -------- --- emil/emil.changes 2007-03-29 11:36:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/emil/emil.changes 2009-06-02 13:54:45.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 2 13:52:54 CEST 2009 - crrodriguez@suse.de + +- fix build + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- emil-2.1.0-beta9-destdir.patch emil-2.1.0-beta9-getline.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emil.spec ++++++ --- /var/tmp/diff_new_pack.M15539/_old 2009-06-02 16:57:37.000000000 +0200 +++ /var/tmp/diff_new_pack.M15539/_new 2009-06-02 16:57:37.000000000 +0200 @@ -1,28 +1,38 @@ # # spec file for package emil (Version 2.1.0beta9) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: emil BuildRequires: bison ed flex -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Productivity/Networking/Email/Utilities -Autoreqprov: on +AutoReqProv: on Version: 2.1.0beta9 -Release: 853 +Release: 946 Summary: E-Mail Filter Source: ftp://ftp.uu.se/pub/unix/networking/mail/emil/emil-2.1.0-beta9.tar.gz Patch: emil-2.1.0-beta9.diff Patch1: ftp://ftp.uu.se/pub/unix/networking/mail/emil/emil-2.1.0-beta9.patch1 Patch2: warn.patch Patch3: emil-2.1.0-beta9-flex.patch +Patch4: emil-2.1.0-beta9-getline.patch +Patch5: emil-2.1.0-beta9-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,18 +49,21 @@ Torbjorn Wictorin <Torbjorn Wictorin@its.uu.se> %prep -%setup -n emil-2.1.0-beta9 +%setup -q -n emil-2.1.0-beta9 %patch %patch1 %patch2 %patch3 +%patch4 +%patch5 %build -CFLAGS=$RPM_OPT_FLAGS ./configure --prefix=/usr --mandir='${prefix}/share/man' -make SENDMAILPATH=/usr/sbin/sendmail +autoreconf -fiv +%configure +%{__make} %{?jobs:-j%jobs} SENDMAILPATH=/usr/sbin/sendmail %install -make prefix=$RPM_BUILD_ROOT/usr install +%makeinstall %clean rm -rf $RPM_BUILD_ROOT @@ -58,49 +71,51 @@ %files %defattr(-,root,root) /usr/bin/emil -/usr/lib/charsets.cpl -%config /usr/lib/emil.cf +%{_libdir}/charsets.cpl +%config %{_libdir}/emil.cf %{_mandir}/man8/emil.8.gz %{_mandir}/man8/emil.cf.8.gz %changelog -* Thu Mar 29 2007 - schwab@suse.de +* Tue Jun 02 2009 crrodriguez@suse.de +- fix build +* Thu Mar 29 2007 schwab@suse.de - Add flex and bison to BuildRequires. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Jul 06 2005 - schwab@suse.de +* Wed Jul 06 2005 schwab@suse.de - Fix missing declarations. -* Fri Aug 27 2004 - schwab@suse.de +* Fri Aug 27 2004 schwab@suse.de - Fix for new flex. -* Sat Apr 17 2004 - schwab@suse.de +* Sat Apr 17 2004 schwab@suse.de - Pacify autobuild. -* Thu Mar 25 2004 - mmj@suse.de +* Thu Mar 25 2004 mmj@suse.de - Fix sendmail path -* Fri Mar 05 2004 - schwab@suse.de +* Fri Mar 05 2004 schwab@suse.de - Remove fixed sized buffers. -* Sun Jan 11 2004 - adrian@suse.de +* Sun Jan 11 2004 adrian@suse.de - build as user -* Fri Aug 01 2003 - coolo@suse.de +* Fri Aug 01 2003 coolo@suse.de - don't strip explictly -* Tue Apr 22 2003 - coolo@suse.de +* Tue Apr 22 2003 coolo@suse.de - use BuildRoot -* Tue Sep 17 2002 - ro@suse.de +* Tue Sep 17 2002 ro@suse.de - removed bogus self-provides -* Sat Jan 26 2002 - schwab@suse.de +* Sat Jan 26 2002 schwab@suse.de - Fix for bison 1.32. -* Mon Sep 25 2000 - schwab@suse.de +* Mon Sep 25 2000 schwab@suse.de - Add group tag. -* Thu Jan 20 2000 - schwab@suse.de +* Thu Jan 20 2000 schwab@suse.de - /usr/man -> /usr/share/man -* Wed Sep 22 1999 - schwab@suse.de +* Wed Sep 22 1999 schwab@suse.de - buffer overflow fixes from Thomas -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Mon Aug 30 1999 - schwab@suse.de +* Mon Aug 30 1999 schwab@suse.de - specfile cleanup - apply patch from ftp://ftp.uu.se/pub/unix/networking/mail/emil/emil-2.1.0-beta9.patch1 -* Fri Sep 25 1998 - ro@suse.de +* Fri Sep 25 1998 ro@suse.de - moved initialisation of file* into main -* Thu Jan 02 1997 - florian@suse.de +* Thu Jan 02 1997 florian@suse.de - Update auf neue Version 2.1.0-beta9. ++++++ emil-2.1.0-beta9-destdir.patch ++++++ Index: Makefile.in =================================================================== --- Makefile.in.orig 2009-06-02 13:34:20.000000000 +0200 +++ Makefile.in 2009-06-02 13:47:39.000000000 +0200 @@ -212,14 +212,14 @@ test: ./emiltest Misc; install: installdirs - $(INSTALL_PROGRAM) emil $(bindir)/emil - $(INSTALL_DATA) emil.cf $(MAINCF) - $(INSTALL_DATA) charset/charsets.cpl $(CHARFILE) - $(INSTALL_DATA) emil.$(manext) $(mandir)/man$(manext) - $(INSTALL_DATA) emil.cf.$(manext) $(mandir)/man$(manext) + $(INSTALL_PROGRAM) emil $(DESTDIR)$(bindir)/emil + $(INSTALL_DATA) emil.cf $(DESTDIR)$(MAINCF) + $(INSTALL_DATA) charset/charsets.cpl $(DESTDIR)$(CHARFILE) + $(INSTALL_DATA) emil.$(manext) $(DESTDIR)$(mandir)/man$(manext) + $(INSTALL_DATA) emil.cf.$(manext) $(DESTDIR)$(mandir)/man$(manext) installdirs: - $(srcdir)/mkinstalldirs $(bindir) $(libdir) $(mandir)/man$(manext) + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man$(manext) uninstall: if test -f $(bindir)/emil ; then \ ++++++ emil-2.1.0-beta9-getline.patch ++++++ Index: func.h =================================================================== --- func.h.orig 2009-06-02 13:34:20.000000000 +0200 +++ func.h 2009-06-02 13:34:44.000000000 +0200 @@ -166,7 +166,7 @@ int check_encoding(struct message *) int boundary_check(struct message *); int is_bound(struct data *, char *); struct message * copy_mstruct(struct message *, int); -int getline(struct data *); +int emil_getline(struct data *); int set_end_by_boundary(struct message *, char *); int set_end_by_lines(struct message *, int); Index: message.c =================================================================== --- message.c.orig 1996-06-04 15:36:59.000000000 +0200 +++ message.c 2009-06-02 13:35:38.000000000 +0200 @@ -93,7 +93,7 @@ move_past_boundary(struct message *m, ch /* Find start boundary */ while (is_bound(inbuf, boundary) != TRUE) { - if ((linelen = getline(inbuf)) == 0) + if ((linelen = emil_getline(inbuf)) == 0) { #ifdef DEBUG if (edebug) @@ -115,7 +115,7 @@ move_past_boundary(struct message *m, ch inbuf->loffset += 1; } /* Move past boundary */ - inbuf->offset += getline(inbuf); + inbuf->offset += emil_getline(inbuf); inbuf->loffset += 1; #ifdef DEBUG if (edebug) @@ -388,13 +388,13 @@ copy_mstruct(struct message *m, int forc /* * int - * getline(inbuf) + * emil_getline(inbuf) * * Move pointer to next line of inbuf. Return line length. */ int -getline(struct data *inbuf) +emil_getline(struct data *inbuf) { unsigned char *tmp; if (inbuf == NULL || inbuf->contents == NULL || @@ -423,7 +423,7 @@ set_end_by_boundary(struct message *m, c loffset = inbuf->loffset; while (is_bound(inbuf, boundary) != TRUE) { - if ((linelen = getline(inbuf)) == 0) + if ((linelen = emil_getline(inbuf)) == 0) { if (m->parent) inbuf->bodyend = m->parent->sd->bodyend; @@ -471,7 +471,7 @@ set_end_by_lines(struct message *m, int offset = inbuf->offset; loffset = inbuf->loffset; lineend = loffset + lines; - while ((linelen = getline(inbuf)) != 0 && lineend > inbuf->loffset) + while ((linelen = emil_getline(inbuf)) != 0 && lineend > inbuf->loffset) { inbuf->offset += linelen; inbuf->loffset += 1; Index: header.c =================================================================== --- header.c.orig 1996-06-04 15:36:56.000000000 +0200 +++ header.c 2009-06-02 13:34:50.000000000 +0200 @@ -75,7 +75,7 @@ load_header(struct message *m) { buf = indata->contents + indata->offset; - if ((linelen = getline(indata)) == 0) + if ((linelen = emil_getline(indata)) == 0) { /* End of data, illegal header */ indata->offset = startoffset; /* Rewind */ Index: mimeparse.c =================================================================== --- mimeparse.c.orig 2009-06-02 13:34:20.000000000 +0200 +++ mimeparse.c 2009-06-02 13:37:27.000000000 +0200 @@ -226,10 +226,10 @@ parse_mime_siblings(struct message *m) move_past_boundary(m, m->sd->endbound); for (;;) { - tttt = getline(m->sd); + tttt = emil_getline(m->sd); #ifdef DEBUG if (edebug) - fprintf(stderr," getline = %d\n", tttt); + fprintf(stderr," emil_getline = %d\n", tttt); #endif if (tttt == 1) { @@ -252,7 +252,7 @@ parse_mime_siblings(struct message *m) m->sd->offset = m->sd->bodyend; - if (getline(m->sd) == 0) + if (emil_getline(m->sd) == 0) return(OK); if (m->sd->offset < m->sd->end) { Index: out.c =================================================================== --- out.c.orig 1996-06-04 15:37:00.000000000 +0200 +++ out.c 2009-06-02 13:38:35.000000000 +0200 @@ -143,7 +143,7 @@ void print_body(struct data *d, struct m #endif } d->offset = d->bodystart; - while ((len = getline(d)) != 0) + while ((len = emil_getline(d)) != 0) { line->end = 0; append_data(line, (d->contents + d->offset), len, MED_BUF); Index: rfc822parse.c =================================================================== --- rfc822parse.c.orig 1996-06-04 15:37:01.000000000 +0200 +++ rfc822parse.c 2009-06-02 13:39:22.000000000 +0200 @@ -86,7 +86,7 @@ parse_rfc822_message(struct message *m) /* Loop through rest of the message */ - while ((linelen = getline(inbuf)) != 0) + while ((linelen = emil_getline(inbuf)) != 0) { if (inbuf->bodyend <= inbuf->offset && inbuf->lineend <= inbuf->loffset) Index: uuencode.c =================================================================== --- uuencode.c.orig 2009-06-02 13:34:20.000000000 +0200 +++ uuencode.c 2009-06-02 13:39:55.000000000 +0200 @@ -295,7 +295,7 @@ decode_uuencode(struct message *m) /* Check for end */ if (strncmp(inb, "end", 3) == 0) { - inbuf->offset += getline(inbuf); + inbuf->offset += emil_getline(inbuf); inbuf->loffset += 1; inbuf->bodyend = inbuf->offset; if (process) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org