From svn at tinysofa.org  Wed Jun  2 10:26:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Jun 2004 20:26:39 +1000 (EST)
Subject: [tinysofa-svn] 
	r1837 - in tinysofa/snapshot/apache/current: sources specs
Message-ID: <20040602102639.74D354E8008@minbar.tinysofa.org>

Author: omar
Date: 2004-06-02 20:26:38 +1000 (Wed, 02 Jun 2004)
New Revision: 1837

Added:
   tinysofa/snapshot/apache/current/sources/httpd-2.0.49-CAN-2004-0488.patch
Modified:
   tinysofa/snapshot/apache/current/specs/apache.spec
Log:
apache:
  * Add httpd-2.0.49-CAN-2004-0488.patch to fix vuln CAN #2004-0488.


Added: tinysofa/snapshot/apache/current/sources/httpd-2.0.49-CAN-2004-0488.patch
===================================================================
--- tinysofa/snapshot/apache/current/sources/httpd-2.0.49-CAN-2004-0488.patch	2004-05-31 14:26:54 UTC (rev 1836)
+++ tinysofa/snapshot/apache/current/sources/httpd-2.0.49-CAN-2004-0488.patch	2004-06-02 10:26:38 UTC (rev 1837)
@@ -0,0 +1,38 @@
+===================================================================
+RCS file: /home/cvspublic/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
+retrieving revision 1.105
+retrieving revision 1.106
+diff -u -r1.105 -r1.106
+--- httpd-2.0/modules/ssl/ssl_engine_kernel.c	2004/03/05 02:44:40	1.105
++++ httpd-2.0/modules/ssl/ssl_engine_kernel.c	2004/05/25 12:09:01	1.106
+@@ -807,7 +807,6 @@
+     SSLConnRec *sslconn = myConnConfig(r->connection);
+     SSLSrvConfigRec *sc = mySrvConfig(r->server);
+     SSLDirConfigRec *dc = myDirConfig(r);
+-    char buf1[MAX_STRING_LEN], buf2[MAX_STRING_LEN];
+     char *clientdn;
+     const char *auth_line, *username, *password;
+ 
+@@ -886,14 +885,16 @@
+      * adding the string "xxj31ZMTZzkVA" as the password in the user file.
+      * This is just the crypted variant of the word "password" ;-)
+      */
+-    apr_snprintf(buf1, sizeof(buf1), "%s:password", clientdn);
+-    ssl_util_uuencode(buf2, buf1, FALSE);
+-
+-    apr_snprintf(buf1, sizeof(buf1), "Basic %s", buf2);
+-    apr_table_set(r->headers_in, "Authorization", buf1);
++    auth_line = apr_pstrcat(r->pool, "Basic ", 
++                            ap_pbase64encode(r->pool, 
++                                             apr_pstrcat(r->pool, clientdn, 
++                                                         ":password", NULL)),
++                            NULL);
++    apr_table_set(r->headers_in, "Authorization", auth_line);
+ 
+     ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
+-                 "Faking HTTP Basic Auth header: \"Authorization: %s\"", buf1);
++                 "Faking HTTP Basic Auth header: \"Authorization: %s\"",
++                 auth_line);
+ 
+     return DECLINED;
+ }

Modified: tinysofa/snapshot/apache/current/specs/apache.spec
===================================================================
--- tinysofa/snapshot/apache/current/specs/apache.spec	2004-05-31 14:26:54 UTC (rev 1836)
+++ tinysofa/snapshot/apache/current/specs/apache.spec	2004-06-02 10:26:38 UTC (rev 1837)
@@ -5,10 +5,11 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 8ts
+Release: 9ok
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
+Patch1: httpd-2.0.49-CAN-2004-0488.patch
 Source3: httpd.init
 Source4: httpd.log
 Source5: gendummycerts
@@ -126,6 +127,7 @@
 %prep
 %setup -q -n httpd-%{apache_version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 CFLAGS=${RPM_OPT_FLAGS} ./configure \
@@ -395,6 +397,9 @@
 
 
 %changelog
+* Wed Jun 02 2004 Omar Kilani <omar at tinysofa dot org> 2.0.49-9ok
+- Added httpd-2.0.49-CAN-2004-0488.patch to fix vuln CAN #2004-0488.
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.0.49-8ts
 - current (2.0.49-9jh) integrated as 2.0.49-8ts for release 1.0-U1
 


From svn at tinysofa.org  Wed Jun  2 10:27:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Jun 2004 20:27:06 +1000 (EST)
Subject: [tinysofa-svn] 
	r1838 - in tinysofa/snapshot/apache: current/specs releases/2.0.49
	releases/2.0.49/9ts/specs
Message-ID: <20040602102706.0B6E64E8008@minbar.tinysofa.org>

Author: omar
Date: 2004-06-02 20:27:05 +1000 (Wed, 02 Jun 2004)
New Revision: 1838

Added:
   tinysofa/snapshot/apache/releases/2.0.49/9ts/
Modified:
   tinysofa/snapshot/apache/current/specs/apache.spec
   tinysofa/snapshot/apache/releases/2.0.49/9ts/specs/apache.spec
Log:
apache:
  * integrate current (2.0.49-9ok) as releases/2.0.49/9ts

Modified: tinysofa/snapshot/apache/current/specs/apache.spec
===================================================================
--- tinysofa/snapshot/apache/current/specs/apache.spec	2004-06-02 10:26:38 UTC (rev 1837)
+++ tinysofa/snapshot/apache/current/specs/apache.spec	2004-06-02 10:27:05 UTC (rev 1838)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 9ok
+Release: 9ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
@@ -397,6 +397,9 @@
 
 
 %changelog
+* Wed Jun 02 2004 tsintegrate <release at tinysofa dot org> 2.0.49-9ts
+- current (2.0.49-9ok) integrated as 2.0.49-9ts for release 1.0-U1
+
 * Wed Jun 02 2004 Omar Kilani <omar at tinysofa dot org> 2.0.49-9ok
 - Added httpd-2.0.49-CAN-2004-0488.patch to fix vuln CAN #2004-0488.
 

Copied: tinysofa/snapshot/apache/releases/2.0.49/9ts (from rev 1837, tinysofa/snapshot/apache/current)

Modified: tinysofa/snapshot/apache/releases/2.0.49/9ts/specs/apache.spec
===================================================================
--- tinysofa/snapshot/apache/current/specs/apache.spec	2004-06-02 10:26:38 UTC (rev 1837)
+++ tinysofa/snapshot/apache/releases/2.0.49/9ts/specs/apache.spec	2004-06-02 10:27:05 UTC (rev 1838)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 9ok
+Release: 9ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
@@ -397,6 +397,9 @@
 
 
 %changelog
+* Wed Jun 02 2004 tsintegrate <release at tinysofa dot org> 2.0.49-9ts
+- current (2.0.49-9ok) integrated as 2.0.49-9ts for release 1.0-U1
+
 * Wed Jun 02 2004 Omar Kilani <omar at tinysofa dot org> 2.0.49-9ok
 - Added httpd-2.0.49-CAN-2004-0488.patch to fix vuln CAN #2004-0488.
 


From svn at tinysofa.org  Wed Jun  2 10:27:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Jun 2004 20:27:07 +1000 (EST)
Subject: [tinysofa-svn] r1839 - tinysofa/snapshot/apache
Message-ID: <20040602102707.800CF4E8008@minbar.tinysofa.org>

Author: omar
Date: 2004-06-02 20:27:07 +1000 (Wed, 02 Jun 2004)
New Revision: 1839

Removed:
   tinysofa/snapshot/apache/pristine/
Log:
apache:
  * removing pristine (2.0.49-8ts)


From svn at tinysofa.org  Wed Jun  2 10:27:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Jun 2004 20:27:10 +1000 (EST)
Subject: [tinysofa-svn] r1840 - tinysofa/snapshot/apache
Message-ID: <20040602102710.0BB1D4E8008@minbar.tinysofa.org>

Author: omar
Date: 2004-06-02 20:27:09 +1000 (Wed, 02 Jun 2004)
New Revision: 1840

Added:
   tinysofa/snapshot/apache/pristine/
Log:
apache:
  * retarget pristine (2.0.49-8ts) to releases/2.0.49/9ts

Copied: tinysofa/snapshot/apache/pristine (from rev 1838, tinysofa/snapshot/apache/releases/2.0.49/9ts)


From svn at tinysofa.org  Wed Jun  2 10:49:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Jun 2004 20:49:27 +1000 (EST)
Subject: [tinysofa-svn] 
	r1841 - in tinysofa/snapshot/kerberos5/current: sources specs
Message-ID: <20040602104927.C5DA24E8008@minbar.tinysofa.org>

Author: omar
Date: 2004-06-02 20:49:27 +1000 (Wed, 02 Jun 2004)
New Revision: 1841

Added:
   tinysofa/snapshot/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
Modified:
   tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec
Log:
kerberos5:
  * Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln.


Added: tinysofa/snapshot/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
===================================================================
--- tinysofa/snapshot/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch	2004-06-02 10:27:09 UTC (rev 1840)
+++ tinysofa/snapshot/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch	2004-06-02 10:49:27 UTC (rev 1841)
@@ -0,0 +1,164 @@
+diff -urN krb5-1.3.3/src/lib/krb5/os/an_to_ln.c krb5-1.3.3.MITKRB5-SA-2004-001/src/lib/krb5/os/an_to_ln.c
+--- krb5-1.3.3/src/lib/krb5/os/an_to_ln.c	2002-09-04 05:29:34.000000000 +1000
++++ krb5-1.3.3.MITKRB5-SA-2004-001/src/lib/krb5/os/an_to_ln.c	2004-06-02 20:45:37.000000000 +1000
+@@ -270,9 +270,14 @@
+  * If no regcomp() then just return the input string verbatim in the output
+  * string.
+  */
+-static void
++#define use_bytes(x) \
++    out_used += (x); \
++    if (out_used > MAX_FORMAT_BUFFER) goto mem_err
++
++static int
+ do_replacement(char *regexp, char *repl, int doall, char *in, char *out)
+ {
++    size_t out_used = 0;
+ #if	HAVE_REGCOMP
+     regex_t	match_exp;
+     regmatch_t	match_match;
+@@ -287,17 +292,22 @@
+ 	do {
+ 	    if (!regexec(&match_exp, cp, 1, &match_match, 0)) {
+ 		if (match_match.rm_so) {
++		    use_bytes(match_match.rm_so);
+ 		    strncpy(op, cp, match_match.rm_so);
+ 		    op += match_match.rm_so;
+ 		}
++		use_bytes(strlen(repl));
+ 		strncpy(op, repl, MAX_FORMAT_BUFFER - 1 - (op - out));
+ 		op += strlen(op);
+ 		cp += match_match.rm_eo;
+-		if (!doall)
++		if (!doall) {
++		    use_bytes(strlen(cp));
+ 		    strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
++		}
+ 		matched = 1;
+ 	    }
+ 	    else {
++		use_bytes(strlen(cp));
+ 		strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
+ 		matched = 0;
+ 	    }
+@@ -322,17 +332,21 @@
+ 	    sdispl = (size_t) (loc1 - cp);
+ 	    edispl = (size_t) (loc2 - cp);
+ 	    if (sdispl) {
++		use_bytes(sdispl);
+ 		strncpy(op, cp, sdispl);
+ 		op += sdispl;
+ 	    }
++	    use_bytes(strlen(repl));
+ 	    strncpy(op, repl, MAX_FORMAT_BUFFER - 1 - (op - out));
+ 	    op += strlen(repl);
+ 	    cp += edispl;
+ 	    if (!doall)
++		use_bytes(strlen(cp));
+ 		strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
+ 	    matched = 1;
+ 	}
+ 	else {
++	    use_bytes(strlen(cp));
+ 	    strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
+ 	    matched = 0;
+ 	}
+@@ -340,7 +354,15 @@
+ #else	/* HAVE_REGEXP_H */
+     memcpy(out, in, MAX_FORMAT_BUFFER);
+ #endif	/* HAVE_REGCOMP */
++    return 1;
++ mem_err:
++#ifdef HAVE_REGCMP
++    	regfree(&match_exp);
++#endif
++	return 0;
++	
+ }
++#undef use_bytes
+ 
+ /*
+  * aname_replacer()	- Perform the specified substitutions on the input
+@@ -412,7 +434,12 @@
+ 
+ 		    /* Do the replacemenbt */
+ 		    memset(out, '\0', MAX_FORMAT_BUFFER);
+-		    do_replacement(rule, repl, doglobal, in, out);
++		    if (!do_replacement(rule, repl, doglobal, in, out)) {
++			free(rule);
++		    free(repl);
++			kret = KRB5_LNAME_NOTRANS;
++			break;
++		    }
+ 		    free(rule);
+ 		    free(repl);
+ 
+@@ -459,6 +486,7 @@
+     char		*fprincname;
+     char		*selstring = 0;
+     int			num_comps, compind;
++    size_t selstring_used;
+     char		*cout;
+     krb5_data		*datap;
+     char		*outstring;
+@@ -479,6 +507,7 @@
+ 		     */
+ 		    current = strchr(current, ':');
+ 		    selstring = (char *) malloc(MAX_FORMAT_BUFFER);
++		    selstring_used = 0;
+ 		    if (current && selstring) {
+ 			current++;
+ 			cout = selstring;
+@@ -497,6 +526,14 @@
+ 								  aname,
+ 								  compind-1))
+ 				    ) {
++				    if ((datap->length < MAX_FORMAT_BUFFER)
++					&&  (selstring_used+datap->length
++					     < MAX_FORMAT_BUFFER)) {
++					selstring_used += datap->length;
++				    } else {
++					kret = ENOMEM;
++					goto errout;
++				    }
+ 				    strncpy(cout,
+ 					    datap->data,
+ 					    (unsigned) datap->length);
+@@ -527,7 +564,7 @@
+ 			else
+ 			    kret = KRB5_CONFIG_BADFORMAT;
+ 
+-			if (kret)
++			errout: if (kret)
+ 			    free(selstring);
+ 		    }
+ 		}
+@@ -643,7 +680,7 @@
+     const char		*hierarchy[5];
+     char		**mapping_values;
+     int			i, nvalid;
+-    char		*cp;
++    char		*cp, *s;
+     char		*typep, *argp;
+     unsigned int        lnsize;
+ 
+@@ -677,11 +714,14 @@
+ 
+ 		    /* Just use the last one. */
+ 		    /* Trim the value. */
+-		    cp = &mapping_values[nvalid-1]
+-			[strlen(mapping_values[nvalid-1])];
+-		    while (isspace((int) (*cp))) cp--;
+-		    cp++;
+-		    *cp = '\0';
++		    s = mapping_values[nvalid-1];
++		    cp = s + strlen(s);
++		    while (cp > s) {
++			cp--;
++			if (!isspace((int)(*cp)))
++			    break;
++			*cp = '\0';
++		    }
+ 
+ 		    /* Copy out the value if there's enough room */
+ 		    if (strlen(mapping_values[nvalid-1])+1 <= (size_t) lnsize)

Modified: tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec
===================================================================
--- tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec	2004-06-02 10:27:09 UTC (rev 1840)
+++ tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec	2004-06-02 10:49:27 UTC (rev 1841)
@@ -1,9 +1,10 @@
 Summary: Kerberos is a network authentication protocol.
 Name: kerberos5
 Version: 1.3.3
-Release: 2ts
+Release: 3ok
 Group: tinysofa official
 Source0: krb5-%{version}.tar.gz
+Patch0: krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
 URL: http://web.mit.edu/kerberos
 License: Distributable
 Requires: libcom_err libtermcap ncurses
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q -n krb5-%{version}
+%patch0 -p1
 
 %build
 pushd src
@@ -75,6 +77,9 @@
 %attr(755,root,root) %{_libdir}/*.so
 
 %changelog
+* Wed Jun 02 2004 Omar Kilani <omar at tinysofa dot org> 1.3.3-3ok
+- Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln.
+
 * Mon May 24 2004 tsintegrate <release at tinysofa dot org> 1.3.3-2ts
 - current (1.3.3-2jh) integrated as 1.3.3-2ts for release 1.0-U1
 


From svn at tinysofa.org  Wed Jun  2 10:49:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Jun 2004 20:49:49 +1000 (EST)
Subject: [tinysofa-svn] 
	r1842 - in tinysofa/snapshot/kerberos5: current/specs
	releases/1.3.3 releases/1.3.3/3ts/specs
Message-ID: <20040602104949.443984E8008@minbar.tinysofa.org>

Author: omar
Date: 2004-06-02 20:49:49 +1000 (Wed, 02 Jun 2004)
New Revision: 1842

Added:
   tinysofa/snapshot/kerberos5/releases/1.3.3/3ts/
Modified:
   tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec
   tinysofa/snapshot/kerberos5/releases/1.3.3/3ts/specs/kerberos5.spec
Log:
kerberos5:
  * integrate current (1.3.3-3ok) as releases/1.3.3/3ts

Modified: tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec
===================================================================
--- tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec	2004-06-02 10:49:27 UTC (rev 1841)
+++ tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec	2004-06-02 10:49:49 UTC (rev 1842)
@@ -1,7 +1,7 @@
 Summary: Kerberos is a network authentication protocol.
 Name: kerberos5
 Version: 1.3.3
-Release: 3ok
+Release: 3ts
 Group: tinysofa official
 Source0: krb5-%{version}.tar.gz
 Patch0: krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
@@ -77,6 +77,9 @@
 %attr(755,root,root) %{_libdir}/*.so
 
 %changelog
+* Wed Jun 02 2004 tsintegrate <release at tinysofa dot org> 1.3.3-3ts
+- current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1
+
 * Wed Jun 02 2004 Omar Kilani <omar at tinysofa dot org> 1.3.3-3ok
 - Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln.
 

Copied: tinysofa/snapshot/kerberos5/releases/1.3.3/3ts (from rev 1841, tinysofa/snapshot/kerberos5/current)

Modified: tinysofa/snapshot/kerberos5/releases/1.3.3/3ts/specs/kerberos5.spec
===================================================================
--- tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec	2004-06-02 10:49:27 UTC (rev 1841)
+++ tinysofa/snapshot/kerberos5/releases/1.3.3/3ts/specs/kerberos5.spec	2004-06-02 10:49:49 UTC (rev 1842)
@@ -1,7 +1,7 @@
 Summary: Kerberos is a network authentication protocol.
 Name: kerberos5
 Version: 1.3.3
-Release: 3ok
+Release: 3ts
 Group: tinysofa official
 Source0: krb5-%{version}.tar.gz
 Patch0: krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
@@ -77,6 +77,9 @@
 %attr(755,root,root) %{_libdir}/*.so
 
 %changelog
+* Wed Jun 02 2004 tsintegrate <release at tinysofa dot org> 1.3.3-3ts
+- current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1
+
 * Wed Jun 02 2004 Omar Kilani <omar at tinysofa dot org> 1.3.3-3ok
 - Add krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch to fix vuln.
 


From svn at tinysofa.org  Wed Jun  2 10:49:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Jun 2004 20:49:50 +1000 (EST)
Subject: [tinysofa-svn] r1843 - tinysofa/snapshot/kerberos5
Message-ID: <20040602104950.886224E8008@minbar.tinysofa.org>

Author: omar
Date: 2004-06-02 20:49:50 +1000 (Wed, 02 Jun 2004)
New Revision: 1843

Removed:
   tinysofa/snapshot/kerberos5/pristine/
Log:
kerberos5:
  * removing pristine (1.3.3-2ts)


From svn at tinysofa.org  Wed Jun  2 10:49:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Jun 2004 20:49:51 +1000 (EST)
Subject: [tinysofa-svn] r1844 - tinysofa/snapshot/kerberos5
Message-ID: <20040602104951.E4E4B4E8008@minbar.tinysofa.org>

Author: omar
Date: 2004-06-02 20:49:51 +1000 (Wed, 02 Jun 2004)
New Revision: 1844

Added:
   tinysofa/snapshot/kerberos5/pristine/
Log:
kerberos5:
  * retarget pristine (1.3.3-2ts) to releases/1.3.3/3ts

Copied: tinysofa/snapshot/kerberos5/pristine (from rev 1842, tinysofa/snapshot/kerberos5/releases/1.3.3/3ts)


From svn at tinysofa.org  Wed Jun  2 13:54:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  2 Jun 2004 23:54:15 +1000 (EST)
Subject: [tinysofa-svn] 
	r1845 - tinysofa/snapshot/tinysofa-utils/current/sources
Message-ID: <20040602135415.558324E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-02 23:54:14 +1000 (Wed, 02 Jun 2004)
New Revision: 1845

Modified:
   tinysofa/snapshot/tinysofa-utils/current/sources/tsbuild
   tinysofa/snapshot/tinysofa-utils/current/sources/tsrep
Log:
tinysofa-utils:
  * Make copy_built and clean_environment run only if build is successful. (bg)
  * s/tsbuild/tsrep/ in tsrep.


Modified: tinysofa/snapshot/tinysofa-utils/current/sources/tsbuild
===================================================================
--- tinysofa/snapshot/tinysofa-utils/current/sources/tsbuild	2004-06-02 10:49:51 UTC (rev 1844)
+++ tinysofa/snapshot/tinysofa-utils/current/sources/tsbuild	2004-06-02 13:54:14 UTC (rev 1845)
@@ -246,8 +246,8 @@
     else:
       log('name = ', package, ', success = True')
 
-    self.copy_built(tmp_path)
-    self.clean_environment(tmp_path)
+      self.copy_built(tmp_path)
+      self.clean_environment(tmp_path)
 
 def usage():
   print "Usage:\n\ttsbuild command [options]\n"

Modified: tinysofa/snapshot/tinysofa-utils/current/sources/tsrep
===================================================================
--- tinysofa/snapshot/tinysofa-utils/current/sources/tsrep	2004-06-02 10:49:51 UTC (rev 1844)
+++ tinysofa/snapshot/tinysofa-utils/current/sources/tsrep	2004-06-02 13:54:14 UTC (rev 1845)
@@ -61,10 +61,10 @@
     try:
       cmd = getattr(self, 'cmd_' + args[0])
       print 'Usage:'
-      print '\ttsbuild', cmd.__doc__
+      print '\ttsrep', cmd.__doc__
     except:
       print 'Usage:'
-      print '\ttsbuild', self.cmd_help.__doc__
+      print '\ttsrep', self.cmd_help.__doc__
 
   def cmd_create_pkg_tree(self, args):
     "create_pkg_tree package_name [target_path]\n\t\ncreates a tinysofa package tree for package_name, in target_path if specified"
@@ -266,7 +266,7 @@
         self.cmd_update([package])
 
 def usage():
-  print "Usage:\n\ttsbuild command [options]\n"
+  print "Usage:\n\ttsrep command [options]\n"
   print 'Valid commands are:'
   RepositorySystem.COMMANDS.sort()
   for c in RepositorySystem.COMMANDS:


From svn at tinysofa.org  Wed Jun  2 16:19:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 02:19:51 +1000 (EST)
Subject: [tinysofa-svn] r1846 - contrib/xorg-x11
Message-ID: <20040602161951.CB0894E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-03 02:19:51 +1000 (Thu, 03 Jun 2004)
New Revision: 1846

Added:
   contrib/xorg-x11/pristine/
Log:
contrib/xorg-x11:
  * Re-target pristine.


Copied: contrib/xorg-x11/pristine (from rev 1845, contrib/xorg-x11/releases/6.7.0/1ok)


From svn at tinysofa.org  Wed Jun  2 16:21:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 02:21:50 +1000 (EST)
Subject: [tinysofa-svn] r1847 - contrib/xorg-x11
Message-ID: <20040602162150.B075E4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-03 02:21:50 +1000 (Thu, 03 Jun 2004)
New Revision: 1847

Added:
   contrib/xorg-x11/current/
Log:
contrib/xorg-x11:
  * Re-target current.


Copied: contrib/xorg-x11/current (from rev 1846, contrib/xorg-x11/pristine)


From svn at tinysofa.org  Wed Jun  2 16:24:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 02:24:28 +1000 (EST)
Subject: [tinysofa-svn] r1848 - contrib/xorg-x11/current/specs
Message-ID: <20040602162428.9287F4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-03 02:24:28 +1000 (Thu, 03 Jun 2004)
New Revision: 1848

Modified:
   contrib/xorg-x11/current/specs/xorg-x11.spec
Log:
contrib/xorg-x11:
  * No stack protector.


Modified: contrib/xorg-x11/current/specs/xorg-x11.spec
===================================================================
--- contrib/xorg-x11/current/specs/xorg-x11.spec	2004-06-02 16:21:50 UTC (rev 1847)
+++ contrib/xorg-x11/current/specs/xorg-x11.spec	2004-06-02 16:24:28 UTC (rev 1848)
@@ -24,7 +24,7 @@
 # Use very future proofed version number, until we know what upstream version
 # will really be.
 Version: 6.7.0
-Release: 1ok
+Release: 3ok
 #.%{cvs_release}
 
 %define build_maintainer_mode	%( hostname -f |grep -q capslock.lan && echo 1 || echo 0)
@@ -238,7 +238,7 @@
 License: MIT/X11, and others
 Group: tinysofa contrib
 URL: http://xorg.freedesktop.org
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: flex >= 2.5.4a
 # Perl is used both by xorg-x11 during build (bdftruncate.pl) and by my specfile
@@ -294,14 +294,6 @@
 Requires: %{_sysconfdir}/pam.d/system-auth
 # FIXME: xrdb needs /lib/cpp at runtime (should be changed to use /usr/bin/cpp)
 Requires: %{_bindir}/cpp, %{_x11bindir}/xauth
-# kernel-drm requirement is so DRI works properly.  The kernel RPM package
-# should have a "Provides: kernel-drm = 4.2.0".  Future kernels that provide
-# new kernel-drm, should list all supported DRM interfaces with multiple
-# Provides: lines.  The 4.2.0 DRM is backward compatible with XFree86 4.1.0
-# also.                                                 <mharris at redhat.com>
-%if %{with_DRI}
-Requires: kernel-drm = 4.3.0
-%endif
 
 # Obsolete all old XFree86 3.3.x packages, and other legacy packages
 Obsoletes: XFree86-ATI, XFree86-Alliance, XFree86-ChipsTechnologies
@@ -1249,6 +1241,7 @@
 
 # FIXME: Hack to remove -g from RPM_OPT_FLAGS until XFree86 can be built
 # with new rpm/gdb -debuginfo goodness
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?no_stack_protector}"
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-g/}
 
 cat > xc/config/cf/host.def << EOF
@@ -3387,6 +3380,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Thu Jun 03 2004 Omar Kilani <omar at tinysofa dot org> 6.7.0-3ok
+- No stack protector.
+
 * Thu May 20 2004 Omar Kilani <omar at tinysofa dot org> 6.7.0-1ok
 - tinysofa contrib.
 - fixed a bunch of deps to match tinysofa.


From svn at tinysofa.org  Wed Jun  2 16:27:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 02:27:10 +1000 (EST)
Subject: [tinysofa-svn] 
	r1849 - in contrib/xorg-x11: current/specs releases/6.7.0
	releases/6.7.0/2ok/specs
Message-ID: <20040602162710.44C024E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-03 02:27:09 +1000 (Thu, 03 Jun 2004)
New Revision: 1849

Added:
   contrib/xorg-x11/releases/6.7.0/2ok/
Modified:
   contrib/xorg-x11/current/specs/xorg-x11.spec
   contrib/xorg-x11/releases/6.7.0/2ok/specs/xorg-x11.spec
Log:
xorg-x11:
  * integrate current (6.7.0-3ok) as releases/6.7.0/2ok

Modified: contrib/xorg-x11/current/specs/xorg-x11.spec
===================================================================
--- contrib/xorg-x11/current/specs/xorg-x11.spec	2004-06-02 16:24:28 UTC (rev 1848)
+++ contrib/xorg-x11/current/specs/xorg-x11.spec	2004-06-02 16:27:09 UTC (rev 1849)
@@ -24,7 +24,7 @@
 # Use very future proofed version number, until we know what upstream version
 # will really be.
 Version: 6.7.0
-Release: 3ok
+Release: 2ok
 #.%{cvs_release}
 
 %define build_maintainer_mode	%( hostname -f |grep -q capslock.lan && echo 1 || echo 0)
@@ -3380,6 +3380,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Thu Jun 03 2004 tscontrib <contrib at tinysofa dot org> 6.7.0-2ok
+- current (6.7.0-3ok) integrated as 6.7.0-2ok for release 1.0 contrib
+
 * Thu Jun 03 2004 Omar Kilani <omar at tinysofa dot org> 6.7.0-3ok
 - No stack protector.
 

Copied: contrib/xorg-x11/releases/6.7.0/2ok (from rev 1848, contrib/xorg-x11/current)

Modified: contrib/xorg-x11/releases/6.7.0/2ok/specs/xorg-x11.spec
===================================================================
--- contrib/xorg-x11/current/specs/xorg-x11.spec	2004-06-02 16:24:28 UTC (rev 1848)
+++ contrib/xorg-x11/releases/6.7.0/2ok/specs/xorg-x11.spec	2004-06-02 16:27:09 UTC (rev 1849)
@@ -24,7 +24,7 @@
 # Use very future proofed version number, until we know what upstream version
 # will really be.
 Version: 6.7.0
-Release: 3ok
+Release: 2ok
 #.%{cvs_release}
 
 %define build_maintainer_mode	%( hostname -f |grep -q capslock.lan && echo 1 || echo 0)
@@ -3380,6 +3380,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Thu Jun 03 2004 tscontrib <contrib at tinysofa dot org> 6.7.0-2ok
+- current (6.7.0-3ok) integrated as 6.7.0-2ok for release 1.0 contrib
+
 * Thu Jun 03 2004 Omar Kilani <omar at tinysofa dot org> 6.7.0-3ok
 - No stack protector.
 


From svn at tinysofa.org  Wed Jun  2 16:27:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 02:27:12 +1000 (EST)
Subject: [tinysofa-svn] r1850 - contrib/xorg-x11
Message-ID: <20040602162712.A72CC4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-03 02:27:12 +1000 (Thu, 03 Jun 2004)
New Revision: 1850

Removed:
   contrib/xorg-x11/pristine/
Log:
xorg-x11:
  * removing pristine (6.7.0-1ok)


From svn at tinysofa.org  Wed Jun  2 16:27:19 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 02:27:19 +1000 (EST)
Subject: [tinysofa-svn] r1851 - contrib/xorg-x11
Message-ID: <20040602162719.222074E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-03 02:27:18 +1000 (Thu, 03 Jun 2004)
New Revision: 1851

Added:
   contrib/xorg-x11/pristine/
Log:
xorg-x11:
  * retarget pristine (6.7.0-1ok) to releases/6.7.0/2ok

Copied: contrib/xorg-x11/pristine (from rev 1849, contrib/xorg-x11/releases/6.7.0/2ok)


From svn at tinysofa.org  Wed Jun  2 16:41:01 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 02:41:01 +1000 (EST)
Subject: [tinysofa-svn] r1852 - contrib/webmin/current/spec
Message-ID: <20040602164101.A96A84E8038@minbar.tinysofa.org>

Author: bg
Date: 2004-06-03 02:41:01 +1000 (Thu, 03 Jun 2004)
New Revision: 1852

Added:
   contrib/webmin/current/spec/webmin-1.140.spec
Log:
added the spec file


Added: contrib/webmin/current/spec/webmin-1.140.spec
===================================================================
--- contrib/webmin/current/spec/webmin-1.140.spec	2004-06-02 16:27:18 UTC (rev 1851)
+++ contrib/webmin/current/spec/webmin-1.140.spec	2004-06-02 16:41:01 UTC (rev 1852)
@@ -0,0 +1,126 @@
+Summary:  A web-based administration interface for Unix systems.
+Name:     webmin
+Version:  1.140
+Release:  2bg
+Requires: perl
+License:  Freeware
+Group:    tinysofa contrib
+URL:      http://www.webmin.com
+Source:   http://www.webmin.com/download/%{name}-%{version}.tar.gz
+Source1:  webmin-1.140-tinysofa.tgz
+Patch0:   webmin-1.140-tinysofa.patch
+Patch1:   webmin-1.140-tinysofa-pam.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildArch: noarch
+
+
+%description
+A web-based administration interface for Unix systems. Using Webmin you can
+configure DNS, Samba, NFS, local/remote filesystems and more using your
+web browser.
+
+After installation, enter the URL http://localhost:10000/ into your
+browser and login as root with your root password.
+
+
+%prep
+%setup -q -a 1
+%patch0 -p1 
+%patch1 -p1 
+# fix perl path
+(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
+
+
+%build
+rm -f mount/freebsd-mounts*
+rm -f mount/openbsd-mounts*
+rm -f mount/macos-mounts*
+rm -f webmin-gentoo-init
+chmod -R og-w .
+
+
+%install
+[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libexecdir}/webmin
+mkdir -p %{buildroot}%{_initdir}
+mkdir -p %{buildroot}%{_sysconfdir}/pam.d
+mkdir -p %{buildroot}%{_localstatedir}/webmin/
+cp -rp * %{buildroot}%{_libexecdir}/webmin
+cp webmin-init   %{buildroot}%{_initdir}/webmin
+cp webmin-pam    %{buildroot}%{_sysconfdir}/pam.d/webmin
+echo rpm >%{buildroot}%{_libexecdir}/webmin/install-type
+
+
+%clean
+[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
+
+
+%post
+inetd=`grep "^inetd=" /etc/webmin/miniserv.conf 2>/dev/null | sed -e 's/inetd=//g'`
+if [ "$1" != 1 ]; then
+	# Upgrading the RPM, so stop the old webmin properly
+	if [ "$inetd" != "1" ]; then
+		/etc/init.d/webmin stop >/dev/null 2>&1
+	fi
+fi
+cd %{_libexecdir}/webmin
+config_dir=%{_sysconfdir}/webmin
+var_dir=%{_localstatedir}/webmin
+perl=/usr/bin/perl
+autoos=3
+port=10000
+login=root
+crypt=x
+host=`hostname`
+ssl=1
+atboot=1
+nochown=1
+autothird=1
+noperlpath=1
+nouninstall=1
+nostart=1
+export config_dir var_dir perl autoos port login crypt host ssl nochown autothird noperlpath nouninstall nostart allow
+./setup.sh > %{_localstatedir}/webmin/webmin-setup.out 2>&1
+rm -f /var/lock/subsys/webmin
+
+
+%preun
+if [ "$1" = 0 ]; then
+  grep root=%{_libexecdir}/webmin %{_sysconfdir}/webmin/miniserv.conf >/dev/null 2>&1
+  if [ "$?" = 0 ]; then
+    # RPM is being removed, and no new version of webmin
+    # has taken it's place. Run uninstalls and stop the server
+    echo "Running uninstall scripts .."
+    (cd %{_libexecdir}/webmin ; WEBMIN_CONFIG=%{_sysconfdir}/webmin WEBMIN_VAR=%{_localstatedir}/webmin LANG= %{_libexecdir}/webmin/run-uninstalls.pl)
+    %{_initdir}/webmin stop >/dev/null 2>&1
+    /bin/true
+  fi
+fi
+
+
+%postun
+if [ "$1" = 0 ]; then
+  grep root=%{_libexecdir}/webmin %{_sysconfdir}/webmin/miniserv.conf >/dev/null 2>&1
+  if [ "$?" = 0 ]; then
+    # RPM is being removed, and no new version of webmin
+    # has taken it's place. Delete the config files
+    rm -rf %{_sysconfdir}/webmin %{_localstatedir}/webmin
+  fi
+fi
+
+
+%files
+%defattr(-,root,root)
+%{_libexecdir}/webmin
+%{_initdir}/webmin
+%config %{_sysconfdir}/pam.d/webmin
+%dir %{_localstatedir}/webmin
+
+%changelog
+* Wed May 26 2004 Goetz Bock <bg at tinysofa dot org> 1.140-2bg
+- imported into tinysofa contrib
+
+* Tue May 18 2004 Goetz Bock <gbo at all dash connect dot net> 1.140-1bg
+- build for tinysofa enterprise server 1.0
+- rewrote spec file, based on the offered rpm
+- added patches/files to make tinysofa known to webmin, and fixed pam


From svn at tinysofa.org  Wed Jun  2 21:23:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 07:23:35 +1000 (EST)
Subject: [tinysofa-svn] r1853 - contrib/exim/current/specs
Message-ID: <20040602212335.2A3F84E8038@minbar.tinysofa.org>

Author: gda
Date: 2004-06-03 07:23:34 +1000 (Thu, 03 Jun 2004)
New Revision: 1853

Modified:
   contrib/exim/current/specs/exim.spec
Log:
New exiscan version

Modified: contrib/exim/current/specs/exim.spec
===================================================================
--- contrib/exim/current/specs/exim.spec	2004-06-02 16:41:01 UTC (rev 1852)
+++ contrib/exim/current/specs/exim.spec	2004-06-02 21:23:34 UTC (rev 1853)
@@ -1,10 +1,10 @@
-%define ExiscanVersion 21
+%define ExiscanVersion 22
 %define doc_version 4.30
 
 Summary: Exim is an full featured, secure and easy to configure MTA
 Name:    exim
 Version: 4.34
-Release: 3bg
+Release: 4gd
 URL:     http://www.exim.org
 Source0: ftp://ftp.exim.org/pub/exim/exim4/exim-%{version}.tar.bz2
 Source1: exim.conf
@@ -237,6 +237,9 @@
 
 
 %changelog
+* Wed Jun  2 2004 Gerald Dachs <gda at tinysofa dot org> 4.34-4gd
+- new exiscan patch
+
 * Sun May 23 2004 Goetz Bock <bg at tinysofa dot org> 4.34-4bg
 - build for tinysofa contrib
 - fixed MAKEFILE to include proper dirs for MySQL. This is a quick fix and


From svn at tinysofa.org  Wed Jun  2 21:24:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 07:24:28 +1000 (EST)
Subject: [tinysofa-svn] r1854 - contrib/exim/current/sources
Message-ID: <20040602212428.DFCE14E8038@minbar.tinysofa.org>

Author: gda
Date: 2004-06-03 07:24:28 +1000 (Thu, 03 Jun 2004)
New Revision: 1854

Added:
   contrib/exim/current/sources/exiscan-acl-4.34-22.patch.bz2
Log:
New exiscan version

Added: contrib/exim/current/sources/exiscan-acl-4.34-22.patch.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/exim/current/sources/exiscan-acl-4.34-22.patch.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


From svn at tinysofa.org  Wed Jun  2 21:37:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 07:37:45 +1000 (EST)
Subject: [tinysofa-svn] r1855 - in contrib/exim: pristine/specs release/4.34
Message-ID: <20040602213745.040B34E8038@minbar.tinysofa.org>

Author: gda
Date: 2004-06-03 07:37:44 +1000 (Thu, 03 Jun 2004)
New Revision: 1855

Added:
   contrib/exim/release/4.34/4gd/
Modified:
   contrib/exim/pristine/specs/exim.spec
Log:
New exiscan version

Modified: contrib/exim/pristine/specs/exim.spec
===================================================================
--- contrib/exim/pristine/specs/exim.spec	2004-06-02 21:24:28 UTC (rev 1854)
+++ contrib/exim/pristine/specs/exim.spec	2004-06-02 21:37:44 UTC (rev 1855)
@@ -1,10 +1,10 @@
-%define ExiscanVersion 21
+%define ExiscanVersion 22
 %define doc_version 4.30
 
 Summary: Exim is an full featured, secure and easy to configure MTA
 Name:    exim
 Version: 4.34
-Release: 3bg
+Release: 4gd
 URL:     http://www.exim.org
 Source0: ftp://ftp.exim.org/pub/exim/exim4/exim-%{version}.tar.bz2
 Source1: exim.conf
@@ -237,6 +237,9 @@
 
 
 %changelog
+* Wed Jun  2 2004 Gerald Dachs <gda at tinysofa dot org> 4.34-4gd
+- new exiscan patch
+
 * Sun May 23 2004 Goetz Bock <bg at tinysofa dot org> 4.34-4bg
 - build for tinysofa contrib
 - fixed MAKEFILE to include proper dirs for MySQL. This is a quick fix and


From svn at tinysofa.org  Wed Jun  2 21:53:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  3 Jun 2004 07:53:12 +1000 (EST)
Subject: [tinysofa-svn] r1856 - contrib/exim/release/4.34/4gd
Message-ID: <20040602215312.ED7DB4E8038@minbar.tinysofa.org>

Author: gda
Date: 2004-06-03 07:53:12 +1000 (Thu, 03 Jun 2004)
New Revision: 1856

Added:
   contrib/exim/release/4.34/4gd/sources/
   contrib/exim/release/4.34/4gd/specs/
Log:
New exiscan version


From svn at tinysofa.org  Fri Jun  4 06:33:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Jun 2004 16:33:31 +1000 (EST)
Subject: [tinysofa-svn] r1858 - tinysofa/snapshot/release/current/specs
Message-ID: <20040604063331.C449E4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-04 16:33:31 +1000 (Fri, 04 Jun 2004)
New Revision: 1858

Modified:
   tinysofa/snapshot/release/current/specs/release.spec
Log:
Touch file.


Modified: tinysofa/snapshot/release/current/specs/release.spec
===================================================================
--- tinysofa/snapshot/release/current/specs/release.spec	2004-06-02 21:57:30 UTC (rev 1857)
+++ tinysofa/snapshot/release/current/specs/release.spec	2004-06-04 06:33:31 UTC (rev 1858)
@@ -7,6 +7,7 @@
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
+Requres: softwareupdater
 
 %description
 A package just to identify the release of the distribution.


From svn at tinysofa.org  Fri Jun  4 06:42:58 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Jun 2004 16:42:58 +1000 (EST)
Subject: [tinysofa-svn] r1859 - tinysofa/snapshot/release/current/specs
Message-ID: <20040604064258.6E2294E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-04 16:42:58 +1000 (Fri, 04 Jun 2004)
New Revision: 1859

Modified:
   tinysofa/snapshot/release/current/specs/release.spec
Log:
release:
  * change Requres: -> Requires:


Modified: tinysofa/snapshot/release/current/specs/release.spec
===================================================================
--- tinysofa/snapshot/release/current/specs/release.spec	2004-06-04 06:33:31 UTC (rev 1858)
+++ tinysofa/snapshot/release/current/specs/release.spec	2004-06-04 06:42:58 UTC (rev 1859)
@@ -7,7 +7,7 @@
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
-Requres: softwareupdater
+Requires: softwareupdater
 
 %description
 A package just to identify the release of the distribution.


From svn at tinysofa.org  Fri Jun  4 07:04:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Jun 2004 17:04:07 +1000 (EST)
Subject: [tinysofa-svn] r1860 - tinysofa/snapshot
Message-ID: <20040604070407.DD7AF4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-04 17:04:07 +1000 (Fri, 04 Jun 2004)
New Revision: 1860

Added:
   tinysofa/snapshot/repsys/
Log:
Created package directory for repsys.


From svn at tinysofa.org  Fri Jun  4 07:04:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Jun 2004 17:04:29 +1000 (EST)
Subject: [tinysofa-svn] r1861 - in tinysofa/snapshot/repsys: . current
Message-ID: <20040604070429.E414C4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-04 17:04:29 +1000 (Fri, 04 Jun 2004)
New Revision: 1861

Added:
   tinysofa/snapshot/repsys/current/
   tinysofa/snapshot/repsys/current/sources/
   tinysofa/snapshot/repsys/current/specs/
Log:
Created package structure for repsys.


From svn at tinysofa.org  Fri Jun  4 11:00:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri,  4 Jun 2004 21:00:24 +1000 (EST)
Subject: [tinysofa-svn] r1863 - tinysofa/snapshot/rpm/current/sources
Message-ID: <20040604110024.9E5B54E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-04 21:00:24 +1000 (Fri, 04 Jun 2004)
New Revision: 1863

Modified:
   tinysofa/snapshot/rpm/current/sources/tinysofa.macros
Log:
- update tinysofa macros


Modified: tinysofa/snapshot/rpm/current/sources/tinysofa.macros
===================================================================
--- tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-04 08:52:38 UTC (rev 1862)
+++ tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-04 11:00:24 UTC (rev 1863)
@@ -2,6 +2,9 @@
 # tinysofa additional macros
 #
 
+%_initdir		%{_sysconfdir}/init.d
+
+
 %make %{__make} %{?_smp_mflags}
 
 %makeinstall_std make DESTDIR="%{buildroot}" install
@@ -41,12 +44,14 @@
 #
 %service_requires PreReq: /sbin/chkconfig, /sbin/restart_maybe, /sbin/service
 %service_post() /sbin/chkconfig --add %{1} \
-/sbin/restart_maybe %{1} > /dev/null
+/sbin/restart_maybe %{1} > /dev/null \
+%{nil}
 
 %service_preun() if [ "$1" = 0 ]; then \
 	/sbin/service %{1} stop > /dev/null 2>&1 || : \
 	/sbin/chkconfig --del %{1} || : \
-fi
+fi \
+%{nil}
 
 #-----------------------------------------------------------------------
 # user and group management
@@ -75,6 +80,8 @@
 %info_post /usr/sbin/htmlinfo_update.sh
 %info_postun /usr/sbin/htmlinfo_update.sh
 
+%makeinfo_html makeinfo --html --no-split 
+
 %nuke_info %{__rm} -rf "%{buildroot}%{_infodir}"
 
 %install_info() %{__mkdir_p} %{buildroot}%{_htmldir}/%{name} \
@@ -164,6 +171,21 @@
 %{nil}
 
 #------------------------------------------------------------------------------
+# Define pre for %clean and %install stages
+#
+
+# disable automatic cleaning in %clean section for now
+#%__spec_clean_pre \
+#	%clean_buildroot \
+#	%{___build_pre} \
+#%{nil}
+
+%__spec_install_pre \
+	%clean_buildroot \
+	%{___build_pre} \
+%{nil}
+
+#------------------------------------------------------------------------------
 # Repackage settings.
 #
 %_repackage_dir         /var/tmp
@@ -231,11 +253,13 @@
 echo "%{1}" >> ${FNAME} \
 cat ${FNAME} > /etc/ld.so.conf \
 rm -f ${FNAME} \
+%{nil}
 
 %postun_ld_so_conf() if [ $1 = 0 ]; then \
 	FNAME=`mktemp /etc/ld.so.conf.XXXXXX` \
 	grep -v "^%{1}$" /etc/ld.so.conf > ${FNAME} \
 	cat ${FNAME} > /etc/ld.so.conf \
 	rm -f ${FNAME} \
-fi
+fi \
+%{nil}
 


From svn at tinysofa.org  Fri Jun  4 16:09:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 02:09:32 +1000 (EST)
Subject: [tinysofa-svn] 
	r1864 - in tinysofa/snapshot/kerberos5/current: sources specs
Message-ID: <20040604160932.E8E104E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-05 02:09:32 +1000 (Sat, 05 Jun 2004)
New Revision: 1864

Modified:
   tinysofa/snapshot/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
   tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec
Log:
- update krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch


Modified: tinysofa/snapshot/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
===================================================================
--- tinysofa/snapshot/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch	2004-06-04 11:00:24 UTC (rev 1863)
+++ tinysofa/snapshot/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch	2004-06-04 16:09:32 UTC (rev 1864)
@@ -1,6 +1,5 @@
-diff -urN krb5-1.3.3/src/lib/krb5/os/an_to_ln.c krb5-1.3.3.MITKRB5-SA-2004-001/src/lib/krb5/os/an_to_ln.c
---- krb5-1.3.3/src/lib/krb5/os/an_to_ln.c	2002-09-04 05:29:34.000000000 +1000
-+++ krb5-1.3.3.MITKRB5-SA-2004-001/src/lib/krb5/os/an_to_ln.c	2004-06-02 20:45:37.000000000 +1000
+--- krb5-1.3.3/src/lib/krb5/os/an_to_ln.c	2002-09-03 22:29:34.000000000 +0300
++++ krb5-1.3.3.MITKRB5-SA-2004-001/src/lib/krb5/os/an_to_ln.c	2004-06-04 19:00:57.000000000 +0300
 @@ -270,9 +270,14 @@
   * If no regcomp() then just return the input string verbatim in the output
   * string.
@@ -41,7 +40,7 @@
  		strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
  		matched = 0;
  	    }
-@@ -322,17 +332,21 @@
+@@ -322,17 +332,22 @@
  	    sdispl = (size_t) (loc1 - cp);
  	    edispl = (size_t) (loc2 - cp);
  	    if (sdispl) {
@@ -53,9 +52,11 @@
  	    strncpy(op, repl, MAX_FORMAT_BUFFER - 1 - (op - out));
  	    op += strlen(repl);
  	    cp += edispl;
- 	    if (!doall)
+-	    if (!doall)
++	    if (!doall) {
 +		use_bytes(strlen(cp));
  		strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
++	    }
  	    matched = 1;
  	}
  	else {
@@ -63,7 +64,7 @@
  	    strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
  	    matched = 0;
  	}
-@@ -340,7 +354,15 @@
+@@ -340,7 +355,15 @@
  #else	/* HAVE_REGEXP_H */
      memcpy(out, in, MAX_FORMAT_BUFFER);
  #endif	/* HAVE_REGCOMP */
@@ -79,7 +80,7 @@
  
  /*
   * aname_replacer()	- Perform the specified substitutions on the input
-@@ -412,7 +434,12 @@
+@@ -412,7 +435,12 @@
  
  		    /* Do the replacemenbt */
  		    memset(out, '\0', MAX_FORMAT_BUFFER);
@@ -93,7 +94,7 @@
  		    free(rule);
  		    free(repl);
  
-@@ -459,6 +486,7 @@
+@@ -459,6 +487,7 @@
      char		*fprincname;
      char		*selstring = 0;
      int			num_comps, compind;
@@ -101,7 +102,7 @@
      char		*cout;
      krb5_data		*datap;
      char		*outstring;
-@@ -479,6 +507,7 @@
+@@ -479,6 +508,7 @@
  		     */
  		    current = strchr(current, ':');
  		    selstring = (char *) malloc(MAX_FORMAT_BUFFER);
@@ -109,7 +110,7 @@
  		    if (current && selstring) {
  			current++;
  			cout = selstring;
-@@ -497,6 +526,14 @@
+@@ -497,6 +527,14 @@
  								  aname,
  								  compind-1))
  				    ) {
@@ -124,7 +125,7 @@
  				    strncpy(cout,
  					    datap->data,
  					    (unsigned) datap->length);
-@@ -527,7 +564,7 @@
+@@ -527,7 +565,7 @@
  			else
  			    kret = KRB5_CONFIG_BADFORMAT;
  
@@ -133,7 +134,7 @@
  			    free(selstring);
  		    }
  		}
-@@ -643,7 +680,7 @@
+@@ -643,7 +681,7 @@
      const char		*hierarchy[5];
      char		**mapping_values;
      int			i, nvalid;
@@ -142,7 +143,7 @@
      char		*typep, *argp;
      unsigned int        lnsize;
  
-@@ -677,11 +714,14 @@
+@@ -677,11 +715,14 @@
  
  		    /* Just use the last one. */
  		    /* Trim the value. */

Modified: tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec
===================================================================
--- tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec	2004-06-04 11:00:24 UTC (rev 1863)
+++ tinysofa/snapshot/kerberos5/current/specs/kerberos5.spec	2004-06-04 16:09:32 UTC (rev 1864)
@@ -1,7 +1,7 @@
 Summary: Kerberos is a network authentication protocol.
 Name: kerberos5
 Version: 1.3.3
-Release: 3ts
+Release: 4jh
 Group: tinysofa official
 Source0: krb5-%{version}.tar.gz
 Patch0: krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
@@ -77,6 +77,9 @@
 %attr(755,root,root) %{_libdir}/*.so
 
 %changelog
+* Fri Jun  4 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.3.3-4jh
+- update krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
+
 * Wed Jun 02 2004 tsintegrate <release at tinysofa dot org> 1.3.3-3ts
 - current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1
 


From svn at tinysofa.org  Fri Jun  4 17:06:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 03:06:02 +1000 (EST)
Subject: [tinysofa-svn] 
	r1865 - in tinysofa/snapshot/ed/current: sources specs
Message-ID: <20040604170602.12AF64E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-05 03:06:01 +1000 (Sat, 05 Jun 2004)
New Revision: 1865

Added:
   tinysofa/snapshot/ed/current/sources/ed-security.patch
Removed:
   tinysofa/snapshot/ed/current/sources/ed-mkstemp.patch
Modified:
   tinysofa/snapshot/ed/current/specs/ed.spec
Log:
- new spec file derived from  Conectiva
- use more rpm macros


Deleted: tinysofa/snapshot/ed/current/sources/ed-mkstemp.patch
===================================================================
--- tinysofa/snapshot/ed/current/sources/ed-mkstemp.patch	2004-06-04 16:09:32 UTC (rev 1864)
+++ tinysofa/snapshot/ed/current/sources/ed-mkstemp.patch	2004-06-04 17:06:01 UTC (rev 1865)
@@ -1,31 +0,0 @@
---- ed-0.2/buf.c.orig	Wed Nov 29 14:45:10 2000
-+++ ed-0.2/buf.c	Wed Nov 29 15:13:16 2000
-@@ -200,15 +200,15 @@
- int
- open_sbuf ()
- {
--  char *mktemp ();
-   int u;
-+  int filedes;
- 
-   isbinary = newline_added = 0;
-   u = umask(077);
-   strcpy (sfn, "/tmp/ed.XXXXXX");
--  if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL)
-+  if ((filedes=mkstemp(sfn)) == -1 || (sfp=fdopen(filedes, "w+")) == NULL)
-     {
--      fprintf (stderr, "%s: %s\n", sfn, strerror (errno));
-+      fprintf (stderr, "%s\n", strerror (errno));
-       sprintf (errmsg, "Cannot open temp file");
-       umask(u);
-       return ERR;
-@@ -226,7 +226,7 @@
-     {
-       if (fclose (sfp) < 0)
- 	{
--	  fprintf (stderr, "%s: %s\n", sfn, strerror (errno));
-+	  fprintf (stderr, "%s\n", strerror (errno));
- 	  sprintf (errmsg, "Cannot close temp file");
- 	  return ERR;
- 	}
-

Added: tinysofa/snapshot/ed/current/sources/ed-security.patch
===================================================================
--- tinysofa/snapshot/ed/current/sources/ed-security.patch	2004-06-04 16:09:32 UTC (rev 1864)
+++ tinysofa/snapshot/ed/current/sources/ed-security.patch	2004-06-04 17:06:01 UTC (rev 1865)
@@ -0,0 +1,51 @@
+--- org/ed-0.2/buf.c	Sat Nov 19 13:37:59 1994
++++ ed-0.2/buf.c	Mon Nov 27 00:06:51 2000
+@@ -194,21 +194,17 @@
+ 
+ extern int newline_added;
+ 
+-char sfn[15] = "";		/* scratch file name */
+-
+ /* open_sbuf: open scratch file */
+ int
+ open_sbuf ()
+ {
+-  char *mktemp ();
+   int u;
+ 
+   isbinary = newline_added = 0;
+   u = umask(077);
+-  strcpy (sfn, "/tmp/ed.XXXXXX");
+-  if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL)
++  if ((sfp = tmpfile()) == NULL)
+     {
+-      fprintf (stderr, "%s: %s\n", sfn, strerror (errno));
++      fprintf (stderr, "%s\n", strerror (errno));
+       sprintf (errmsg, "Cannot open temp file");
+       umask(u);
+       return ERR;
+@@ -226,14 +222,14 @@
+     {
+       if (fclose (sfp) < 0)
+ 	{
+-	  fprintf (stderr, "%s: %s\n", sfn, strerror (errno));
++	  fprintf (stderr, "Cannot close temp file: %s\n", strerror (errno));
+ 	  sprintf (errmsg, "Cannot close temp file");
+ 	  return ERR;
+ 	}
+       sfp = NULL;
+-      unlink (sfn);
+     }
+   sfseek = seek_write = 0;
++
+   return 0;
+ }
+ 
+@@ -246,7 +242,6 @@
+   if (sfp)
+     {
+       fclose (sfp);
+-      unlink (sfn);
+     }
+   exit (n);
+ }

Modified: tinysofa/snapshot/ed/current/specs/ed.spec
===================================================================
--- tinysofa/snapshot/ed/current/specs/ed.spec	2004-06-04 16:09:32 UTC (rev 1864)
+++ tinysofa/snapshot/ed/current/specs/ed.spec	2004-06-04 17:06:01 UTC (rev 1865)
@@ -1,14 +1,19 @@
-Summary: The GNU line editor.
 Name: ed
 Version: 0.2
-Release: 29ts
+Release: 30jh
+Summary: The GNU line editor
+Summary(pt_BR): Editor de linhas da GNU
+Summary(es): Editor de l?eas de la GNU
+Summary(de): GNU-Zeileneditor
+Summary(fr): ?iteur ligne de GNU
+Summary(tr): GNU sat? d?enleyici
+Group: tinysofa/main
 License: GPL
-Group: tinysofa official
-Source: ftp://ftp.gnu.org/gnu/ed/ed-%{version}.tar.gz
-Patch0: ed-mkstemp.patch
-Prereq: htmlinfo
-BuildRequires: texinfo
-BuildRoot: %{_tmppath}/%{name}-root
+URL: http://www.gnu.org/software/ed
+Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.gz
+Patch: ed-security.patch
+%info_requires
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 Ed is a line-oriented text editor, used to create, display, and modify
@@ -20,99 +25,94 @@
 general, however, you probably don't need to install it and you probably
 won't use it.
 
+%description -l pt_BR
+Este ?o GNU editor de linha. ?uma implementa?o de um dos primeiros
+editores para *nix. Alguns programas contam com ele, mas no geral
+voc?provavelmente n? ir?*precisar* dele.
+                                                                                
+%description -l es
+Este es GNU editor de l?ea. Es un soporte a uno de los primeros
+editores para *nix. Algunos de los programas cuentan con ?, pero
+de manera general, es muy probable que no lo *necesites*.
+                                                                                
+%description -l de
+Dies ist der GNU-Zeileneditor, eine Implementierung einer
+der ersten Editoren unter *nix. Manche Programme verlassen sich darauf,
+i.a. *brauchen* Sie ihn wahrscheinlich nicht.
+
+%description -l fr
+?iteur ligne de GNU. C'est une implantation de l'un des premiers
+?iteurs d'*nix. Certains programmes en ont besoin, mais en
+g??al, vous n'en aurez probablement pas l'utilit?
+                                                                                
+%description -l tr
+yaz??lar hala bu programa gereksinim duymaktad?lar.
+
 %prep
 %setup -q
+%patch -p1
 
-%patch0 -p1
+rm -f ed.info
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --exec-prefix=/
+CFLAGS="${CFLAGS:-%optflags}" \
+./configure --prefix=%{_prefix} --exec-prefix=/
+%make
 
-make LDFLAGS=-s
-makeinfo --html --no-split ed.texinfo
-
 %install
-make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s prefix=$RPM_BUILD_ROOT/usr \
-     exec_prefix=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/usr/share/{html/ed,man}
-cp -a $RPM_BUILD_ROOT/usr/man/* $RPM_BUILD_ROOT/usr/share/man
-rm -rf $RPM_BUILD_ROOT/usr/man
-install -m 644 ed.html $RPM_BUILD_ROOT/usr/share/html/ed/
+make prefix=%{buildroot}%{_prefix} \
+     exec_prefix=%{buildroot}/ \
+     mandir=%{buildroot}%{_mandir}/man1 \
+     infodir=%{buildroot}%{_infodir} install
 
-strip $RPM_BUILD_ROOT/bin/ed
+%install_info ed.texinfo
+%nuke_info
 
-rm -rf $RPM_BUILD_ROOT/usr/info
+chmod 644 NEWS POSIX README THANKS
 
 %post
-/usr/sbin/htmlinfo_update.sh
+%info_post
 
 %postun
-/usr/sbin/htmlinfo_update.sh
+%info_postun
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %doc NEWS POSIX README THANKS
 /bin/ed
 /bin/red
-/usr/share/html/ed
-/usr/share/man/man1/*
+%{_htmldir}/%{name}
+%{_mandir}/man1/ed.1*
+%{_mandir}/man1/red.1*
 
+%clean
+%clean_buildroot
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.2-29ts
-- current (0.2-28ts) integrated as 0.2-29ts for release 1.0-U1
+* Thu Jun  4 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.2-30jh
+- new spec file derived from Conectiva
+- use more rpm macros
 
-* Wed Dec  3 2003 Erlend Midttun <erlendbm at trustix dot org> 0.2-25tr
-- Big rebuild
+* Mon Feb 16 2004 Wanderlei Antonio Cavassin <cavassin at conectiva.com.br>
++ 2004-02-16 19:04:55 (49582)
+- Allow ed.info to be rebuilt.
 
-* Mon Jun 23 2003 Erlend Midttun <erlendbm at trustix dot com> 0.2-24tr
-- Added %defattr.
+* Mon Feb 16 2004 Wanderlei Antonio Cavassin <cavassin at conectiva.com.br>
++ 2004-02-16 17:29:09 (49558)
+- Add patch to sources.
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 0.2-23tr
-- Big rebuild
+* Mon Feb 16 2004 Wanderlei Antonio Cavassin <cavassin at conectiva.com.br>
++ 2004-02-16 17:27:51 (49557)
+- Using info macros. Got patch from PLD with info entry.
 
-* Fri Jun 13 2003 Erlend Midttun <erlendbm at trustix dot com> 0.2-22em
-- Now own /usr/share/html/ed.
+* Thu Jan 01 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-01 19:21:14 (42737)
+- Added BuildRequires
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 0.2-21em
-- Rebuilt against glibc 2.3.2.
+* Wed Aug 28 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-28 18:23:32 (4064)
+- Imported package from 7.0.
 
-* Thu Oct 24 2002 Christian H. Toldnes <christht at trustix dot com> 0.2-20ct
-- Replaced info stuff with htmlinfo
-
-* Tue Jul 23 2002 Daniel Meyer <eagle at trustix dot org> 0.2-19dm
-- rebuild for Trustix Secure Linux 2.0
-
-* Wed Dec 13 2000 Oystein Viggen <oysteivi at trustix dot com>
-- use mkstemp instead of mktemp
-
-* Mon Feb 28 2000 Lars Gaarden <larsg at trustix dot com>
-- moved man and info pages to /usr/share, FHS
-
-* Thu Feb 03 2000 Preston Brown <pbrown at redhat.com>
-- rebuild to gzip man pages.
-
-* Tue Mar 23 1999 Jeff Johnson <jbj at redhat.com>
-- fix %post syntax error (#1689).
-
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
-- auto rebuild in the new build environment (release 11)
-
-* Wed Feb 24 1999 Preston Brown <pbrown at redhat.com>
-- Injected new description and group.
-
-* Fri Dec 18 1998 Preston Brown <pbrown at redhat.com>
-- bumped spec number for initial rh 6.0 build
-
-* Mon Apr 27 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
-
-* Fri Oct 17 1997 Donnie Barnes <djb at redhat.com>
-- added install-info support
-- added BuildRoot
-- correct URL in Source line
-
-* Mon Jun 02 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
\ No newline at end of file
+* Tue Aug 27 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-27 18:50:23 (387)
+- Imported package from 6.0.


From svn at tinysofa.org  Fri Jun  4 20:10:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 06:10:55 +1000 (EST)
Subject: [tinysofa-svn] 
	r1866 - in tinysofa/snapshot/vim/current: sources specs
Message-ID: <20040604201055.45AE84E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-05 06:10:55 +1000 (Sat, 05 Jun 2004)
New Revision: 1866

Added:
   tinysofa/snapshot/vim/current/sources/xxd-locale.patch
Modified:
   tinysofa/snapshot/vim/current/specs/vim.spec
Log:
- integrate some changes from Conectiva spec
- use more rpm macros
- add xxd locale patch
- enable large file support now correctly


Added: tinysofa/snapshot/vim/current/sources/xxd-locale.patch
===================================================================
--- tinysofa/snapshot/vim/current/sources/xxd-locale.patch	2004-06-04 17:06:01 UTC (rev 1865)
+++ tinysofa/snapshot/vim/current/sources/xxd-locale.patch	2004-06-04 20:10:55 UTC (rev 1866)
@@ -0,0 +1,31 @@
+--- vim60ag/src/xxd/xxd.c.37073	Mon May 21 16:17:29 2001
++++ vim60ag/src/xxd/xxd.c	Mon May 21 16:32:12 2001
+@@ -81,6 +81,7 @@
+ #if __MWERKS__ && !defined(BEBOX)
+ # include <unix.h>	/* for fdopen() on MAC */
+ #endif
++#include <locale.h>
+ 
+ /*  This corrects the problem of missing prototypes for certain functions
+  *  in some GNU installations (e.g. SunOS 4.1.x).
+@@ -424,6 +425,11 @@
+   long length = -1, n = 0, seekoff = 0;
+   char l[LLEN+1];
+   char *pname, *pp;
++  char *lang=getenv("LANG");
++  if(!lang) lang=getenv("LC_ALL");
++  if(!lang) lang=getenv("LC_CTYPE");
++  if(lang)
++	  setlocale(LC_ALL, lang);
+ 
+ #ifdef AMIGA
+   /* This program doesn't work when started from the Workbench */
+@@ -728,7 +734,7 @@
+ #else
+ 	  (e > 31 && e < 127)
+ #endif
+-	  ? e : '.';
++	  ? e : isalnum(e) ? e : '.';
+       if (e)
+         nonzero++;
+       n++;

Modified: tinysofa/snapshot/vim/current/specs/vim.spec
===================================================================
--- tinysofa/snapshot/vim/current/specs/vim.spec	2004-06-04 17:06:01 UTC (rev 1865)
+++ tinysofa/snapshot/vim/current/specs/vim.spec	2004-06-04 20:10:55 UTC (rev 1866)
@@ -4,10 +4,10 @@
 %define patchlevel 532
 %define shortname vim62
 Version: %srcversion.%patchlevel
-Release: 1jh
+Release: 2jh
 License: Charityware
-Group: tinysofa official
-Source0: ftp://ftp.nl.vim.org/pub/vim/unix/vim-%{srcversion}.tar.bz2
+Group: tinysofa/main
+Source0: ftp://ftp.nl.vim.org/pub/vim/unix/%{name}-%{srcversion}.tar.bz2
 Source1: vimrc
 Patch1: vim-6.2.001-100.patch
 Patch2: vim-6.2.101-200.patch
@@ -15,11 +15,13 @@
 Patch4: vim-6.2.301-400.patch
 Patch5: vim-6.2.401-500.patch
 Patch6: vim-6.2.501-532.patch
+Patch1000: xxd-locale.patch
 Requires: gawk
 BuildRequires: python-devel perl sed
 BuildRequires: libacl-devel
 BuildRequires: ncurses-devel libtermcap-devel
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 VIM (VIsual editor iMproved) is an updated and improved version of the vi
@@ -27,20 +29,32 @@
 very popular.  VIM improves on vi by adding new features: multiple windows,
 multi-level undo, block highlighting and more.
 
+%description -l pt_BR
+O editor Vim (Vi Enhanced) ?um vers? atualizada e com novas caracter?ticas domundialmente famoso 'vi' que acompanha praticamente todos os sistemas UN*X. Ele
+possibilita trabalhar com m?tiplas janelas, v?ios n?eis de desfazer, blocos
+enfatizados, e muitas outras caracter?ticas do 'vi'.
+
+%description -l es
+El editor Visual Mejorado es una versi? actualizada y con nuevas
+caracter?ticas adicionales del mundialmente famoso 'vi' que acompa?
+pr?ticamente todos los sistemas UN*X. Posibilita trabajar con
+m?tiples ventanas, varios niveles de deshacer, bloques enfatizados,
+y otras muchas caracter?ticas del 'vi'.
+
 %package doc
 Summary: Online documentation for the VIM editor.
-Group: tinysofa official
+Group: tinysofa/main
 
 %description doc
 This is the online documentation for the VIM editor.  These files can
 be accessed via :help in the editor as well as plain text files under
-/usr/share/vim/%{shortname}/doc
+%{_datadir}/vim/%{shortname}/doc
 
 Install this package if you want online documentation for the VIM editor.
 
 %package syntax
 Summary: Syntax files addon to the VIM editor.
-Group: tinysofa official
+Group: tinysofa/main
 Requires: vim = %{version}
 
 %description syntax
@@ -49,9 +63,17 @@
 
 Install this package if you want syntax support in the VIM editor.
 
+%description -l pt_BR syntax
+Arquivos para destacar a sintaxe de linguagens de programa?o quando editados novim.
+
+%description -l es syntax
+Archivos para destacar la sintaxis de lenguajes de programaci?,
+cuando editados en vim.
+
+
 %package tools
 Summary: Various support the VIM editor.
-Group: tinysofa official
+Group: tinysofa/main
 Requires: vim = %{version}
 
 %description tools
@@ -59,21 +81,40 @@
 by default but may still be of use. This package also includes different
 color-schemes, plugins and macros.
 
+
 %prep
 %setup -q -n %{shortname}
 
 # All the patches does not apply clean as they contain patches for files
 # not in the Source0. That's why -t option is used for patch.
 cd src
-for f in %{PATCH1} %{PATCH2} %{PATCH3} %{PATCH4} %{PATCH5} %{PATCH6}; do
+for f in \
+		%{PATCH1} \
+		%{PATCH2} \
+		%{PATCH3} \
+		%{PATCH4} \
+		%{PATCH5} \
+		%{PATCH6} \
+		;do
 	echo "Applying patch $f"
 	patch -p1 -s -t < $f | grep FAILED && exit 1 || :
 done
+cd -
 
+%patch1000 -p1
+
+# fix rogue dependencies from sample code
+chmod -x runtime/tools/mve.awk
+find . -name \*.paths | xargs rm -f
+
+
 %build
 cd src
 
-CFLAGS=`echo "$RPM_OPT_FLAGS" | sed -e 's/-D_FILE_OFFSET_BITS=64//'` \
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+
+CFLAGS="${CFLAGS:-%optflags}" \
 ./configure --prefix=%{_prefix} \
 	--exec-prefix=/ \
 	--enable-multibyte \
@@ -81,41 +122,44 @@
 	--enable-gui=no \
 	--mandir=%{_mandir} \
 	--with-tlib=ncurses
-make 
+%make
 
-%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/bin
 
+%install
 cd src
 make prefix=$RPM_BUILD_ROOT%{_prefix} \
 	exec_prefix=$RPM_BUILD_ROOT/ \
 	MANDIR=$RPM_BUILD_ROOT%{_mandir} install
 
-pushd $RPM_BUILD_ROOT/bin
+mkdir -p %{buildroot}%{_bindir}
+pushd %{buildroot}/bin
 ln -sf vim vi
-mv xxd ../usr/bin
+mv xxd %{buildroot}%{_bindir}
 popd
 
-make installmacros DESTDIR=$RPM_BUILD_ROOT
+make installmacros DESTDIR=%{buildroot}
 
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/vim
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/vim
 
 cd ..
 # Split into packages
-find $RPM_BUILD_ROOT/usr/share/vim/%{shortname} -type f > filelist.all
-sed -e "s|$RPM_BUILD_ROOT||" filelist.all | egrep -v '/tools(/|$)' > filelist.nottols
-egrep -v '/(colors|compiler|ftplugin|indent|macros|plugin|syntax)(/|$)' filelist.nottols > filelist.nosyntax
+find %{buildroot}%{_datadir}/vim/%{shortname} -type f > filelist.all
+sed -e "s|%{buildroot}||" filelist.all | \
+	egrep -v '/tools(/|$)' > filelist.nottols
+egrep -v '/(colors|compiler|ftplugin|indent|macros|plugin|syntax)(/|$)' \
+	filelist.nottols > filelist.nosyntax
 egrep -v '/doc(/|$)' filelist.nosyntax > filelist.left
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files -f filelist.left
 %defattr(-,root,root)
 %doc README*.txt
 %doc runtime/termcap
-%config /usr/share/vim/vimrc
+%config %{_datadir}/vim/vimrc
 /bin/vim
 /bin/ex
 /bin/view
@@ -124,7 +168,7 @@
 /bin/vimtutor
 /bin/vi
 /bin/vimdiff
-/usr/bin/xxd
+%{_bindir}/xxd
 %{_mandir}/man1/vim.1*
 %{_mandir}/man1/vimtutor.1*
 %{_mandir}/man1/vimdiff.1*
@@ -134,419 +178,41 @@
 %{_mandir}/man1/rview.1*
 %{_mandir}/man1/xxd.1*
 %{_mandir}/man1/evim.1*
-%dir /usr/share/vim
-%dir /usr/share/vim/%{shortname}
-%dir /usr/share/vim/%{shortname}/keymap
-%dir /usr/share/vim/%{shortname}/lang
-%dir /usr/share/vim/%{shortname}/print
-%dir /usr/share/vim/%{shortname}/tutor
-%dir /usr/share/vim/%{shortname}/syntax
-/usr/share/vim/%{shortname}/syntax/nosyntax.vim
+%dir %{_datadir}/vim
+%dir %{_datadir}/vim/%{shortname}
+%dir %{_datadir}/vim/%{shortname}/keymap
+%dir %{_datadir}/vim/%{shortname}/lang
+%dir %{_datadir}/vim/%{shortname}/print
+%dir %{_datadir}/vim/%{shortname}/tutor
+%dir %{_datadir}/vim/%{shortname}/syntax
+%{_datadir}/vim/%{shortname}/syntax/nosyntax.vim
 
 %files doc
 %defattr(-,root,root)
-/usr/share/vim/%{shortname}/doc
+%{_datadir}/vim/%{shortname}/doc
 
 %files syntax
 %defattr(-,root,root)
-/usr/share/vim/%{shortname}/syntax/2html.vim
-/usr/share/vim/%{shortname}/syntax/a65.vim
-/usr/share/vim/%{shortname}/syntax/aap.vim
-/usr/share/vim/%{shortname}/syntax/abaqus.vim
-/usr/share/vim/%{shortname}/syntax/abc.vim
-/usr/share/vim/%{shortname}/syntax/abel.vim
-/usr/share/vim/%{shortname}/syntax/acedb.vim
-/usr/share/vim/%{shortname}/syntax/ada.vim
-/usr/share/vim/%{shortname}/syntax/aflex.vim
-/usr/share/vim/%{shortname}/syntax/ahdl.vim
-/usr/share/vim/%{shortname}/syntax/amiga.vim
-/usr/share/vim/%{shortname}/syntax/aml.vim
-/usr/share/vim/%{shortname}/syntax/ampl.vim
-/usr/share/vim/%{shortname}/syntax/ant.vim
-/usr/share/vim/%{shortname}/syntax/antlr.vim
-/usr/share/vim/%{shortname}/syntax/apache.vim
-/usr/share/vim/%{shortname}/syntax/apachestyle.vim
-/usr/share/vim/%{shortname}/syntax/art.vim
-/usr/share/vim/%{shortname}/syntax/asm.vim
-/usr/share/vim/%{shortname}/syntax/asm68k.vim
-/usr/share/vim/%{shortname}/syntax/asmh8300.vim
-/usr/share/vim/%{shortname}/syntax/asn.vim
-/usr/share/vim/%{shortname}/syntax/aspperl.vim
-/usr/share/vim/%{shortname}/syntax/aspvbs.vim
-/usr/share/vim/%{shortname}/syntax/atlas.vim
-/usr/share/vim/%{shortname}/syntax/automake.vim
-/usr/share/vim/%{shortname}/syntax/ave.vim
-/usr/share/vim/%{shortname}/syntax/awk.vim
-/usr/share/vim/%{shortname}/syntax/ayacc.vim
-/usr/share/vim/%{shortname}/syntax/b.vim
-/usr/share/vim/%{shortname}/syntax/baan.vim
-/usr/share/vim/%{shortname}/syntax/basic.vim
-/usr/share/vim/%{shortname}/syntax/bc.vim
-/usr/share/vim/%{shortname}/syntax/bdf.vim
-/usr/share/vim/%{shortname}/syntax/bib.vim
-/usr/share/vim/%{shortname}/syntax/bindzone.vim
-/usr/share/vim/%{shortname}/syntax/blank.vim
-/usr/share/vim/%{shortname}/syntax/btm.vim
-/usr/share/vim/%{shortname}/syntax/c.vim
-/usr/share/vim/%{shortname}/syntax/catalog.vim
-/usr/share/vim/%{shortname}/syntax/cdl.vim
-/usr/share/vim/%{shortname}/syntax/cf.vim
-/usr/share/vim/%{shortname}/syntax/cfg.vim
-/usr/share/vim/%{shortname}/syntax/ch.vim
-/usr/share/vim/%{shortname}/syntax/change.vim
-/usr/share/vim/%{shortname}/syntax/changelog.vim
-/usr/share/vim/%{shortname}/syntax/chaskell.vim
-/usr/share/vim/%{shortname}/syntax/cheetah.vim
-/usr/share/vim/%{shortname}/syntax/cl.vim
-/usr/share/vim/%{shortname}/syntax/clean.vim
-/usr/share/vim/%{shortname}/syntax/clipper.vim
-/usr/share/vim/%{shortname}/syntax/cobol.vim
-/usr/share/vim/%{shortname}/syntax/colortest.vim
-/usr/share/vim/%{shortname}/syntax/conf.vim
-/usr/share/vim/%{shortname}/syntax/config.vim
-/usr/share/vim/%{shortname}/syntax/cpp.vim
-/usr/share/vim/%{shortname}/syntax/crontab.vim
-/usr/share/vim/%{shortname}/syntax/cs.vim
-/usr/share/vim/%{shortname}/syntax/csc.vim
-/usr/share/vim/%{shortname}/syntax/csh.vim
-/usr/share/vim/%{shortname}/syntax/csp.vim
-/usr/share/vim/%{shortname}/syntax/css.vim
-/usr/share/vim/%{shortname}/syntax/cterm.vim
-/usr/share/vim/%{shortname}/syntax/ctrlh.vim
-/usr/share/vim/%{shortname}/syntax/cupl.vim
-/usr/share/vim/%{shortname}/syntax/cuplsim.vim
-/usr/share/vim/%{shortname}/syntax/cvs.vim
-/usr/share/vim/%{shortname}/syntax/cvsrc.vim
-/usr/share/vim/%{shortname}/syntax/cweb.vim
-/usr/share/vim/%{shortname}/syntax/cynlib.vim
-/usr/share/vim/%{shortname}/syntax/cynpp.vim
-/usr/share/vim/%{shortname}/syntax/dcd.vim
-/usr/share/vim/%{shortname}/syntax/dcl.vim
-/usr/share/vim/%{shortname}/syntax/debchangelog.vim
-/usr/share/vim/%{shortname}/syntax/debcontrol.vim
-/usr/share/vim/%{shortname}/syntax/def.vim
-/usr/share/vim/%{shortname}/syntax/desc.vim
-/usr/share/vim/%{shortname}/syntax/diff.vim
-/usr/share/vim/%{shortname}/syntax/diva.vim
-/usr/share/vim/%{shortname}/syntax/dns.vim
-/usr/share/vim/%{shortname}/syntax/docbk.vim
-/usr/share/vim/%{shortname}/syntax/docbksgml.vim
-/usr/share/vim/%{shortname}/syntax/docbkxml.vim
-/usr/share/vim/%{shortname}/syntax/dosbatch.vim
-/usr/share/vim/%{shortname}/syntax/dosini.vim
-/usr/share/vim/%{shortname}/syntax/dot.vim
-/usr/share/vim/%{shortname}/syntax/dracula.vim
-/usr/share/vim/%{shortname}/syntax/dsl.vim
-/usr/share/vim/%{shortname}/syntax/dtd.vim
-/usr/share/vim/%{shortname}/syntax/dtml.vim
-/usr/share/vim/%{shortname}/syntax/dylan.vim
-/usr/share/vim/%{shortname}/syntax/dylanintr.vim
-/usr/share/vim/%{shortname}/syntax/dylanlid.vim
-/usr/share/vim/%{shortname}/syntax/ecd.vim
-/usr/share/vim/%{shortname}/syntax/edif.vim
-/usr/share/vim/%{shortname}/syntax/eiffel.vim
-/usr/share/vim/%{shortname}/syntax/elf.vim
-/usr/share/vim/%{shortname}/syntax/elmfilt.vim
-/usr/share/vim/%{shortname}/syntax/erlang.vim
-/usr/share/vim/%{shortname}/syntax/esqlc.vim
-/usr/share/vim/%{shortname}/syntax/eterm.vim
-/usr/share/vim/%{shortname}/syntax/exim.vim
-/usr/share/vim/%{shortname}/syntax/expect.vim
-/usr/share/vim/%{shortname}/syntax/exports.vim
-/usr/share/vim/%{shortname}/syntax/fetchmail.vim
-/usr/share/vim/%{shortname}/syntax/fgl.vim
-/usr/share/vim/%{shortname}/syntax/focexec.vim
-/usr/share/vim/%{shortname}/syntax/form.vim
-/usr/share/vim/%{shortname}/syntax/forth.vim
-/usr/share/vim/%{shortname}/syntax/fortran.vim
-/usr/share/vim/%{shortname}/syntax/foxpro.vim
-/usr/share/vim/%{shortname}/syntax/fstab.vim
-/usr/share/vim/%{shortname}/syntax/fvwm.vim
-/usr/share/vim/%{shortname}/syntax/fvwm2m4.vim
-/usr/share/vim/%{shortname}/syntax/gdb.vim
-/usr/share/vim/%{shortname}/syntax/gdmo.vim
-/usr/share/vim/%{shortname}/syntax/gedcom.vim
-/usr/share/vim/%{shortname}/syntax/gkrellmrc.vim
-/usr/share/vim/%{shortname}/syntax/gnuplot.vim
-/usr/share/vim/%{shortname}/syntax/gp.vim
-/usr/share/vim/%{shortname}/syntax/gpg.vim
-/usr/share/vim/%{shortname}/syntax/groff.vim
-/usr/share/vim/%{shortname}/syntax/grub.vim
-/usr/share/vim/%{shortname}/syntax/gsp.vim
-/usr/share/vim/%{shortname}/syntax/gtkrc.vim
-/usr/share/vim/%{shortname}/syntax/haskell.vim
-/usr/share/vim/%{shortname}/syntax/hb.vim
-/usr/share/vim/%{shortname}/syntax/help.vim
-/usr/share/vim/%{shortname}/syntax/hercules.vim
-/usr/share/vim/%{shortname}/syntax/hex.vim
-/usr/share/vim/%{shortname}/syntax/hitest.vim
-/usr/share/vim/%{shortname}/syntax/hog.vim
-/usr/share/vim/%{shortname}/syntax/html.vim
-/usr/share/vim/%{shortname}/syntax/htmlcheetah.vim
-/usr/share/vim/%{shortname}/syntax/htmlm4.vim
-/usr/share/vim/%{shortname}/syntax/htmlos.vim
-/usr/share/vim/%{shortname}/syntax/ia64.vim
-/usr/share/vim/%{shortname}/syntax/icon.vim
-/usr/share/vim/%{shortname}/syntax/idl.vim
-/usr/share/vim/%{shortname}/syntax/idlang.vim
-/usr/share/vim/%{shortname}/syntax/indent.vim
-/usr/share/vim/%{shortname}/syntax/inform.vim
-/usr/share/vim/%{shortname}/syntax/inittab.vim
-/usr/share/vim/%{shortname}/syntax/ipfilter.vim
-/usr/share/vim/%{shortname}/syntax/ishd.vim
-/usr/share/vim/%{shortname}/syntax/iss.vim
-/usr/share/vim/%{shortname}/syntax/ist.vim
-/usr/share/vim/%{shortname}/syntax/jal.vim
-/usr/share/vim/%{shortname}/syntax/jam.vim
-/usr/share/vim/%{shortname}/syntax/jargon.vim
-/usr/share/vim/%{shortname}/syntax/java.vim
-/usr/share/vim/%{shortname}/syntax/javacc.vim
-/usr/share/vim/%{shortname}/syntax/javascript.vim
-/usr/share/vim/%{shortname}/syntax/jess.vim
-/usr/share/vim/%{shortname}/syntax/jgraph.vim
-/usr/share/vim/%{shortname}/syntax/jproperties.vim
-/usr/share/vim/%{shortname}/syntax/jsp.vim
-/usr/share/vim/%{shortname}/syntax/kix.vim
-/usr/share/vim/%{shortname}/syntax/kscript.vim
-/usr/share/vim/%{shortname}/syntax/kwt.vim
-/usr/share/vim/%{shortname}/syntax/lace.vim
-/usr/share/vim/%{shortname}/syntax/latte.vim
-/usr/share/vim/%{shortname}/syntax/lex.vim
-/usr/share/vim/%{shortname}/syntax/lftp.vim
-/usr/share/vim/%{shortname}/syntax/lhaskell.vim
-/usr/share/vim/%{shortname}/syntax/lifelines.vim
-/usr/share/vim/%{shortname}/syntax/lilo.vim
-/usr/share/vim/%{shortname}/syntax/lisp.vim
-/usr/share/vim/%{shortname}/syntax/lite.vim
-/usr/share/vim/%{shortname}/syntax/logtalk.vim
-/usr/share/vim/%{shortname}/syntax/lotos.vim
-/usr/share/vim/%{shortname}/syntax/lout.vim
-/usr/share/vim/%{shortname}/syntax/lpc.vim
-/usr/share/vim/%{shortname}/syntax/lprolog.vim
-/usr/share/vim/%{shortname}/syntax/lscript.vim
-/usr/share/vim/%{shortname}/syntax/lss.vim
-/usr/share/vim/%{shortname}/syntax/lua.vim
-/usr/share/vim/%{shortname}/syntax/lynx.vim
-/usr/share/vim/%{shortname}/syntax/m4.vim
-/usr/share/vim/%{shortname}/syntax/mail.vim
-/usr/share/vim/%{shortname}/syntax/mailcap.vim
-/usr/share/vim/%{shortname}/syntax/make.vim
-/usr/share/vim/%{shortname}/syntax/man.vim
-/usr/share/vim/%{shortname}/syntax/manual.vim
-/usr/share/vim/%{shortname}/syntax/maple.vim
-/usr/share/vim/%{shortname}/syntax/masm.vim
-/usr/share/vim/%{shortname}/syntax/mason.vim
-/usr/share/vim/%{shortname}/syntax/master.vim
-/usr/share/vim/%{shortname}/syntax/matlab.vim
-/usr/share/vim/%{shortname}/syntax/mel.vim
-/usr/share/vim/%{shortname}/syntax/mf.vim
-/usr/share/vim/%{shortname}/syntax/mgp.vim
-/usr/share/vim/%{shortname}/syntax/mib.vim
-/usr/share/vim/%{shortname}/syntax/mma.vim
-/usr/share/vim/%{shortname}/syntax/mmix.vim
-/usr/share/vim/%{shortname}/syntax/modconf.vim
-/usr/share/vim/%{shortname}/syntax/model.vim
-/usr/share/vim/%{shortname}/syntax/modsim3.vim
-/usr/share/vim/%{shortname}/syntax/modula2.vim
-/usr/share/vim/%{shortname}/syntax/modula3.vim
-/usr/share/vim/%{shortname}/syntax/monk.vim
-/usr/share/vim/%{shortname}/syntax/moo.vim
-/usr/share/vim/%{shortname}/syntax/mp.vim
-/usr/share/vim/%{shortname}/syntax/msidl.vim
-/usr/share/vim/%{shortname}/syntax/msql.vim
-/usr/share/vim/%{shortname}/syntax/mush.vim
-/usr/share/vim/%{shortname}/syntax/muttrc.vim
-/usr/share/vim/%{shortname}/syntax/mysql.vim
-/usr/share/vim/%{shortname}/syntax/named.vim
-/usr/share/vim/%{shortname}/syntax/nasm.vim
-/usr/share/vim/%{shortname}/syntax/nastran.vim
-/usr/share/vim/%{shortname}/syntax/natural.vim
-/usr/share/vim/%{shortname}/syntax/ncf.vim
-/usr/share/vim/%{shortname}/syntax/nqc.vim
-/usr/share/vim/%{shortname}/syntax/nroff.vim
-/usr/share/vim/%{shortname}/syntax/nsis.vim
-/usr/share/vim/%{shortname}/syntax/objc.vim
-/usr/share/vim/%{shortname}/syntax/objcpp.vim
-/usr/share/vim/%{shortname}/syntax/ocaml.vim
-/usr/share/vim/%{shortname}/syntax/occam.vim
-/usr/share/vim/%{shortname}/syntax/omnimark.vim
-/usr/share/vim/%{shortname}/syntax/openroad.vim
-/usr/share/vim/%{shortname}/syntax/opl.vim
-/usr/share/vim/%{shortname}/syntax/ora.vim
-/usr/share/vim/%{shortname}/syntax/papp.vim
-/usr/share/vim/%{shortname}/syntax/pascal.vim
-/usr/share/vim/%{shortname}/syntax/pcap.vim
-/usr/share/vim/%{shortname}/syntax/pccts.vim
-/usr/share/vim/%{shortname}/syntax/perl.vim
-/usr/share/vim/%{shortname}/syntax/pf.vim
-/usr/share/vim/%{shortname}/syntax/pfmain.vim
-/usr/share/vim/%{shortname}/syntax/php.vim
-/usr/share/vim/%{shortname}/syntax/phtml.vim
-/usr/share/vim/%{shortname}/syntax/pic.vim
-/usr/share/vim/%{shortname}/syntax/pike.vim
-/usr/share/vim/%{shortname}/syntax/pilrc.vim
-/usr/share/vim/%{shortname}/syntax/pine.vim
-/usr/share/vim/%{shortname}/syntax/plm.vim
-/usr/share/vim/%{shortname}/syntax/plp.vim
-/usr/share/vim/%{shortname}/syntax/plsql.vim
-/usr/share/vim/%{shortname}/syntax/po.vim
-/usr/share/vim/%{shortname}/syntax/pod.vim
-/usr/share/vim/%{shortname}/syntax/postscr.vim
-/usr/share/vim/%{shortname}/syntax/pov.vim
-/usr/share/vim/%{shortname}/syntax/povini.vim
-/usr/share/vim/%{shortname}/syntax/ppd.vim
-/usr/share/vim/%{shortname}/syntax/ppwiz.vim
-/usr/share/vim/%{shortname}/syntax/procmail.vim
-/usr/share/vim/%{shortname}/syntax/progress.vim
-/usr/share/vim/%{shortname}/syntax/prolog.vim
-/usr/share/vim/%{shortname}/syntax/psf.vim
-/usr/share/vim/%{shortname}/syntax/ptcap.vim
-/usr/share/vim/%{shortname}/syntax/purifylog.vim
-/usr/share/vim/%{shortname}/syntax/python.vim
-/usr/share/vim/%{shortname}/syntax/qf.vim
-/usr/share/vim/%{shortname}/syntax/quake.vim
-/usr/share/vim/%{shortname}/syntax/r.vim
-/usr/share/vim/%{shortname}/syntax/radiance.vim
-/usr/share/vim/%{shortname}/syntax/ratpoison.vim
-/usr/share/vim/%{shortname}/syntax/rc.vim
-/usr/share/vim/%{shortname}/syntax/rcs.vim
-/usr/share/vim/%{shortname}/syntax/rcslog.vim
-/usr/share/vim/%{shortname}/syntax/readline.vim
-/usr/share/vim/%{shortname}/syntax/rebol.vim
-/usr/share/vim/%{shortname}/syntax/registry.vim
-/usr/share/vim/%{shortname}/syntax/remind.vim
-/usr/share/vim/%{shortname}/syntax/resolv.vim
-/usr/share/vim/%{shortname}/syntax/rexx.vim
-/usr/share/vim/%{shortname}/syntax/rib.vim
-/usr/share/vim/%{shortname}/syntax/robots.vim
-/usr/share/vim/%{shortname}/syntax/rpcgen.vim
-/usr/share/vim/%{shortname}/syntax/rpl.vim
-/usr/share/vim/%{shortname}/syntax/rtf.vim
-/usr/share/vim/%{shortname}/syntax/ruby.vim
-/usr/share/vim/%{shortname}/syntax/samba.vim
-/usr/share/vim/%{shortname}/syntax/sas.vim
-/usr/share/vim/%{shortname}/syntax/sather.vim
-/usr/share/vim/%{shortname}/syntax/scheme.vim
-/usr/share/vim/%{shortname}/syntax/scilab.vim
-/usr/share/vim/%{shortname}/syntax/screen.vim
-/usr/share/vim/%{shortname}/syntax/sdl.vim
-/usr/share/vim/%{shortname}/syntax/sed.vim
-/usr/share/vim/%{shortname}/syntax/sendpr.vim
-/usr/share/vim/%{shortname}/syntax/sgml.vim
-/usr/share/vim/%{shortname}/syntax/sgmldecl.vim
-/usr/share/vim/%{shortname}/syntax/sgmllnx.vim
-/usr/share/vim/%{shortname}/syntax/sh.vim
-/usr/share/vim/%{shortname}/syntax/sicad.vim
-/usr/share/vim/%{shortname}/syntax/simula.vim
-/usr/share/vim/%{shortname}/syntax/sinda.vim
-/usr/share/vim/%{shortname}/syntax/sindacmp.vim
-/usr/share/vim/%{shortname}/syntax/sindaout.vim
-/usr/share/vim/%{shortname}/syntax/skill.vim
-/usr/share/vim/%{shortname}/syntax/sl.vim
-/usr/share/vim/%{shortname}/syntax/slang.vim
-/usr/share/vim/%{shortname}/syntax/slrnrc.vim
-/usr/share/vim/%{shortname}/syntax/slrnsc.vim
-/usr/share/vim/%{shortname}/syntax/sm.vim
-/usr/share/vim/%{shortname}/syntax/smarty.vim
-/usr/share/vim/%{shortname}/syntax/smil.vim
-/usr/share/vim/%{shortname}/syntax/smith.vim
-/usr/share/vim/%{shortname}/syntax/sml.vim
-/usr/share/vim/%{shortname}/syntax/snnsnet.vim
-/usr/share/vim/%{shortname}/syntax/snnspat.vim
-/usr/share/vim/%{shortname}/syntax/snnsres.vim
-/usr/share/vim/%{shortname}/syntax/snobol4.vim
-/usr/share/vim/%{shortname}/syntax/spec.vim
-/usr/share/vim/%{shortname}/syntax/specman.vim
-/usr/share/vim/%{shortname}/syntax/spice.vim
-/usr/share/vim/%{shortname}/syntax/splint.vim
-/usr/share/vim/%{shortname}/syntax/spup.vim
-/usr/share/vim/%{shortname}/syntax/spyce.vim
-/usr/share/vim/%{shortname}/syntax/sql.vim
-/usr/share/vim/%{shortname}/syntax/sqlforms.vim
-/usr/share/vim/%{shortname}/syntax/sqlj.vim
-/usr/share/vim/%{shortname}/syntax/sqr.vim
-/usr/share/vim/%{shortname}/syntax/squid.vim
-/usr/share/vim/%{shortname}/syntax/sshconfig.vim
-/usr/share/vim/%{shortname}/syntax/sshdconfig.vim
-/usr/share/vim/%{shortname}/syntax/st.vim
-/usr/share/vim/%{shortname}/syntax/stp.vim
-/usr/share/vim/%{shortname}/syntax/strace.vim
-/usr/share/vim/%{shortname}/syntax/svn.vim
-/usr/share/vim/%{shortname}/syntax/syncolor.vim
-/usr/share/vim/%{shortname}/syntax/synload.vim
-/usr/share/vim/%{shortname}/syntax/syntax.vim
-/usr/share/vim/%{shortname}/syntax/tads.vim
-/usr/share/vim/%{shortname}/syntax/tags.vim
-/usr/share/vim/%{shortname}/syntax/tak.vim
-/usr/share/vim/%{shortname}/syntax/takcmp.vim
-/usr/share/vim/%{shortname}/syntax/takout.vim
-/usr/share/vim/%{shortname}/syntax/tasm.vim
-/usr/share/vim/%{shortname}/syntax/tcl.vim
-/usr/share/vim/%{shortname}/syntax/terminfo.vim
-/usr/share/vim/%{shortname}/syntax/tex.vim
-/usr/share/vim/%{shortname}/syntax/texinfo.vim
-/usr/share/vim/%{shortname}/syntax/texmf.vim
-/usr/share/vim/%{shortname}/syntax/tf.vim
-/usr/share/vim/%{shortname}/syntax/tidy.vim
-/usr/share/vim/%{shortname}/syntax/tilde.vim
-/usr/share/vim/%{shortname}/syntax/tli.vim
-/usr/share/vim/%{shortname}/syntax/trasys.vim
-/usr/share/vim/%{shortname}/syntax/tsalt.vim
-/usr/share/vim/%{shortname}/syntax/tsscl.vim
-/usr/share/vim/%{shortname}/syntax/tssgm.vim
-/usr/share/vim/%{shortname}/syntax/tssop.vim
-/usr/share/vim/%{shortname}/syntax/uc.vim
-/usr/share/vim/%{shortname}/syntax/uil.vim
-/usr/share/vim/%{shortname}/syntax/valgrind.vim
-/usr/share/vim/%{shortname}/syntax/vb.vim
-/usr/share/vim/%{shortname}/syntax/verilog.vim
-/usr/share/vim/%{shortname}/syntax/vgrindefs.vim
-/usr/share/vim/%{shortname}/syntax/vhdl.vim
-/usr/share/vim/%{shortname}/syntax/vim.vim
-/usr/share/vim/%{shortname}/syntax/viminfo.vim
-/usr/share/vim/%{shortname}/syntax/virata.vim
-/usr/share/vim/%{shortname}/syntax/vrml.vim
-/usr/share/vim/%{shortname}/syntax/vsejcl.vim
-/usr/share/vim/%{shortname}/syntax/wdiff.vim
-/usr/share/vim/%{shortname}/syntax/web.vim
-/usr/share/vim/%{shortname}/syntax/webmacro.vim
-/usr/share/vim/%{shortname}/syntax/wget.vim
-/usr/share/vim/%{shortname}/syntax/whitespace.vim
-/usr/share/vim/%{shortname}/syntax/winbatch.vim
-/usr/share/vim/%{shortname}/syntax/wml.vim
-/usr/share/vim/%{shortname}/syntax/wsh.vim
-/usr/share/vim/%{shortname}/syntax/wvdial.vim
-/usr/share/vim/%{shortname}/syntax/xdefaults.vim
-/usr/share/vim/%{shortname}/syntax/xf86conf.vim
-/usr/share/vim/%{shortname}/syntax/xhtml.vim
-/usr/share/vim/%{shortname}/syntax/xkb.vim
-/usr/share/vim/%{shortname}/syntax/xmath.vim
-/usr/share/vim/%{shortname}/syntax/xml.vim
-/usr/share/vim/%{shortname}/syntax/xmodmap.vim
-/usr/share/vim/%{shortname}/syntax/xpm.vim
-/usr/share/vim/%{shortname}/syntax/xpm2.vim
-/usr/share/vim/%{shortname}/syntax/xs.vim
-/usr/share/vim/%{shortname}/syntax/xsd.vim
-/usr/share/vim/%{shortname}/syntax/xslt.vim
-/usr/share/vim/%{shortname}/syntax/xxd.vim
-/usr/share/vim/%{shortname}/syntax/yacc.vim
-/usr/share/vim/%{shortname}/syntax/z8a.vim
-/usr/share/vim/%{shortname}/syntax/zsh.vim
-/usr/share/vim/%{shortname}/syntax/README.txt
+%{_datadir}/vim/%{shortname}/syntax/*
 
-
 %files tools
 %defattr(-,root,root)
-/usr/share/vim/%{shortname}/tools
-/usr/share/vim/%{shortname}/colors
-/usr/share/vim/%{shortname}/compiler
-/usr/share/vim/%{shortname}/ftplugin
-/usr/share/vim/%{shortname}/indent
-/usr/share/vim/%{shortname}/macros
-/usr/share/vim/%{shortname}/plugin
+%{_datadir}/vim/%{shortname}/tools
+%{_datadir}/vim/%{shortname}/colors
+%{_datadir}/vim/%{shortname}/compiler
+%{_datadir}/vim/%{shortname}/ftplugin
+%{_datadir}/vim/%{shortname}/indent
+%{_datadir}/vim/%{shortname}/macros
+%{_datadir}/vim/%{shortname}/plugin
 
 
 %changelog
+* Fri Jun  4 2004 Jaakko Heinonen <jh at tinysofa dot org> 6.2.532-2jh
+- integrate some changes from Conectiva spec
+- use more rpm macros
+- add xxd locale patch
+- enable large file support now correctly
+
 * Sun May 31 2004 Jaakko Heinonen <jh at tinysofa dot org> 6.2.532-1jh
 - enable multibyte support
 - enable UTF-8 encoding in default vimrc conditionally


From svn at tinysofa.org  Sat Jun  5 02:31:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 12:31:35 +1000 (EST)
Subject: [tinysofa-svn] 
	r1867 - in tinysofa/snapshot/zlib/current: sources specs
Message-ID: <20040605023135.B834B4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 12:31:35 +1000 (Sat, 05 Jun 2004)
New Revision: 1867

Removed:
   tinysofa/snapshot/zlib/current/sources/zlib-1.1.3-glibc.patch
Modified:
   tinysofa/snapshot/zlib/current/specs/zlib.spec
Log:
- Based on Conectiva libz1 package.
- Use rpm macros.


Deleted: tinysofa/snapshot/zlib/current/sources/zlib-1.1.3-glibc.patch
===================================================================
--- tinysofa/snapshot/zlib/current/sources/zlib-1.1.3-glibc.patch	2004-06-04 20:10:55 UTC (rev 1866)
+++ tinysofa/snapshot/zlib/current/sources/zlib-1.1.3-glibc.patch	2004-06-05 02:31:35 UTC (rev 1867)
@@ -1,11 +0,0 @@
---- zlib-1.1.3/Makefile.in.glibc	Wed Sep  9 11:48:46 1998
-+++ zlib-1.1.3/Makefile.in	Wed Sep  9 11:49:04 1998
-@@ -80,7 +80,7 @@
- 	rm -f _match.s
- 
- $(SHAREDLIB).$(VER): $(OBJS)
--	$(LDSHARED) -o $@ $(OBJS)
-+	$(LDSHARED) -o $@ $(OBJS) -lc
- 	rm -f $(SHAREDLIB) $(SHAREDLIB).1
- 	ln -s $@ $(SHAREDLIB)
- 	ln -s $@ $(SHAREDLIB).1

Modified: tinysofa/snapshot/zlib/current/specs/zlib.spec
===================================================================
--- tinysofa/snapshot/zlib/current/specs/zlib.spec	2004-06-04 20:10:55 UTC (rev 1866)
+++ tinysofa/snapshot/zlib/current/specs/zlib.spec	2004-06-05 02:31:35 UTC (rev 1867)
@@ -1,13 +1,26 @@
-Summary: The zlib compression and decompression library.
+%define with_devel 1
+
+%define libname %{mklibname z}
+%define libname_devel %{mklibname z -d}
+%define libname_static_devel %{mklibname z -d -s}
+
 Name: zlib
 Version: 1.2.1
-Release: 5ts
-Group: tinysofa official
-Source: http://www.gzip.org/zlib/zlib-%{version}.tar.bz2
-Patch0: zlib-1.1.3-glibc.patch
-Url: http://www.gzip.org/zlib/
+Release: 6ok
+Summary: The zlib compression and decompression library.
+Summary(pt_BR): Biblioteca para compress?o e descompress?o
+Summary(es): Biblioteca para compresi?n y descompresi?n
+Group: tinysofa/libraries
+Group(pt_BR): tinysofa/bibliotecas
+Group(es): tinysofa/bibliotecas
 License: BSD
-BuildRoot: %{_tmppath}/%{name}-root
+URL: http://www.gzip.org/zlib/
+Source: ftp://ftp.info-zip.org/pub/infozip/zlib/%{name}-%{version}.tar.bz2
+BuildRequires: binutils
+BuildRequires: gcc
+BuildRequires: glibc-devel
+BuildRequires: make
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 
 %description
 The zlib compression library provides in-memory compression and
@@ -17,107 +30,208 @@
 the same stream interface.  The zlib library is used by many different
 system programs.
 
-%package devel
+%description -l pt_BR
+A biblioteca de compress?o 'zlib' oferece fun??es de compress?o e descompress?o
+em mem?ria, incluindo checagem da integridade de dados n?o comprimidos. Essa
+vers?o da biblioteca suporta somente um m?todo de compress?o (defla??o) mas
+outros algoritmos podem ser adicionados mais tarde e ter?o a mesma interface.
+Essa biblioteca ? usada por v?rios programas de sistema.
+
+%description -l es
+La biblioteca de compresi?n 'zlib' nos ofrece funciones de compresi?n y
+descompresi?n en memoria, incluyendo chequeo de la integridad de datos no
+comprimidos. Esta versi?n de la biblioteca soporta solamente un m?todo de
+compresi?n (deflaci?n) pero otros algoritmos pueden ser a?adidos m?s tarde y
+tendr?n la misma interface. Esta biblioteca se usa por varios programas de
+sistema.
+
+%package -n %{libname}
+Summary: The zlib compression and decompression library.
+Summary(pt_BR): Biblioteca para compress?o e descompress?o
+Summary(es): Biblioteca para compresi?n y descompresi?n
+Group: tinysofa/libraries
+Group(pt_BR): tinysofa/bibliotecas
+Group(es): tinysofa/bibliotecas
+%rename zlib
+
+%description -n %{libname}
+The zlib compression library provides in-memory compression and
+decompression functions, including integrity checks of the uncompressed
+data.  This version of the library supports only one compression method
+(deflation), but other algorithms may be added later, which will have
+the same stream interface.  The zlib library is used by many different
+system programs.
+
+%description -n %{libname} -l pt_BR
+A biblioteca de compress?o 'zlib' oferece fun??es de compress?o e descompress?o
+em mem?ria, incluindo checagem da integridade de dados n?o comprimidos. Essa
+vers?o da biblioteca suporta somente um m?todo de compress?o (defla??o) mas
+outros algoritmos podem ser adicionados mais tarde e ter?o a mesma interface.
+Essa biblioteca ? usada por v?rios programas de sistema.
+
+%description -n %{libname} -l es
+La biblioteca de compresi?n 'zlib' nos ofrece funciones de compresi?n y
+descompresi?n en memoria, incluyendo chequeo de la integridad de datos no
+comprimidos. Esta versi?n de la biblioteca soporta solamente un m?todo de
+compresi?n (deflaci?n) pero otros algoritmos pueden ser a?adidos m?s tarde y
+tendr?n la misma interface. Esta biblioteca se usa por varios programas de
+sistema.
+
+%if %{with_devel}
+%package -n %{libname_devel}
 Summary: Header files and libraries for developing apps which will use zlib.
-Group: tinysofa official
-Requires: zlib
+Summary(pt_BR): Bibliotecas e arquivos de inclus?o para desenvolvimento zlib
+Summary(es): Bibliotecas y archivos de inclusi?n para desarrollo zlib
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+PreReq: %{libname} = %{version}
+%rename zlib-devel
 
-%description devel
-The zlib-devel package contains the header files and libraries needed
+%description -n %{libname_devel}
+The libzlib-devel package contains the header files and libraries needed
 to develop programs that use the zlib compression and decompression
 library.
 
-Install the zlib-devel package if you want to develop applications that
+Install the libzlib-devel package if you want to develop applications that
 will use the zlib library.
 
+%description -l pt_BR -n %{libname_devel}
+A biblioteca de compress?o zlib prov? fun??es de compress?o e descompress?o em
+mem?ria, incluindo checagens de integridade para os dados descomprimidos.  Esta
+vers?o da biblioteca suporta somente um m?todo de compress?o (deflation) mas
+outros algoritmos podem ser adicionados no futuro e ter?o a mesma interface
+stream.
+
+Este pacote cont?m os arquivos de inclus?o e bibliotecas necess?rios ao
+desenvolvimento de programas que usam zlib.
+
+%description -l es -n %{libname_devel}
+La biblioteca de compresi?n zlib provee funciones de compresi?n y descompresi?n
+en memoria, incluye chequeos de integridad para los datos descomprimidos.  Esta
+versi?n de la biblioteca soporta solamente un m?todo de compresi?n (deflation)
+pero otros algoritmos pueden ser a?adidos en el futuro y tendr?n la misma
+interface stream.  Este paquete contiene los archivos de inclusi?n y
+bibliotecas necesarios al desarrollo de programas que usan zlib.
+
+%package -n %{libname_static_devel}
+Summary: Static libraries for zlib development
+Summary(pt_BR): Bibliotecas est?ticas para desenvolvimento com a zlib
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+Requires: %{libname_devel} = %{version}-%{release}
+
+%description -n %{libname_static_devel}
+Static libraries for zlib development
+
+%description -l pt_BR -n %{libname_static_devel}
+Bibliotecas est?ticas para desenvolvimento com a zlib
+%endif
+
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 
 %build
-# We do it all in install
+export CFLAGS="%{optflags} -fPIC -O3 -funroll-loops"
+./configure --shared --prefix=%{_prefix} --libdir=%{_libdir}
+%make
+# now build the static lib
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
+%make
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr
+mkdir -p %{buildroot}%{_prefix}
 
-./configure --shared --prefix=/usr
-make CFLAGS="$RPM_OPT_FLAGS -fPIC -DUSE_MMAP"
-make install prefix=$RPM_BUILD_ROOT/usr
+./configure --shared --prefix=%{_prefix} --libdir=%{_libdir}
+make install prefix=%{buildroot}%{_prefix} libdir=%{buildroot}%{_libdir}
 
-./configure --prefix=/usr
-make CFLAGS="$RPM_OPT_FLAGS -DUSE_MMAP"
-make install prefix=$RPM_BUILD_ROOT/usr
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
+make install prefix=%{buildroot}%{_prefix} libdir=%{buildroot}%{_libdir}
 
-install -m644 zutil.h $RPM_BUILD_ROOT/usr/include/zutil.h
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/man3
-install -m644 zlib.3 $RPM_BUILD_ROOT/usr/share/man/man3
+install -m644 zutil.h %{buildroot}%{_includedir}/zutil.h
+mkdir -p %{buildroot}%{_mandir}/man3
+install -m644 zlib.3 %{buildroot}%{_mandir}/man3
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files
-%defattr(-,root,root)
-/usr/lib/libz.so.*
+%files -n %{libname}
+%defattr(0644,root,root)
+%{_libdir}/libz.so.*
 
-%files devel
-%defattr(-,root,root)
-%doc README ChangeLog algorithm.txt
-/usr/lib/*.so
-/usr/include/*
-%attr(644,root,root) /usr/lib/*.a
-/usr/share/man/man3/zlib.3*
+%if %{with_devel}
+%files -n %{libname_devel}
+%defattr(0644,root,root,0755)
+%doc algorithm.txt ChangeLog FAQ README 
+%{_libdir}/libz.so
+%{_includedir}/*
+%{_mandir}/man3/zlib.3*
 
-%changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.2.1-5ts
-- current (1.2.1-5jh) integrated as 1.2.1-5ts for release 1.0-U1
+%files -n %{libname_static_devel}
+%defattr(0644,root,root,0755)
+%{_libdir}/libz.a
+%endif
 
-* Mon May 10 2004  Jaakko Heinonen <jh at tinysofa dot org> 1.2.1-5jh
-- fixed permissions for libz.a
 
-* Wed Nov 26 2003 Erlend Midttun <erlendbm at trustix dot com> 1.2.1-1tr
-- New upstream(!).
+%changelog
+* Thu Jun 03 2004 Omar Kilani <omar at tinysofa dot org> 1.2.1-8ok
+- tinysofa.
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 1.1.4-5tr
-- Big rebuild
+* Fri Jan 09 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-09 21:40:42 (43990)
+- Complete the rename to libz1
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 1.1.4-4em
-- Rebuilt with glibc-2.3.2.
+* Fri Jan 09 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-09 21:36:15 (43989)
+- Rename the spec
 
-* Thu Feb 27 2003 Christian H. Toldnes <christht at trustix dot com> 1.1.4-3ct
-- Added better %clean and %install section
+* Fri Jan 09 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-09 21:35:27 (43988)
+- Follow the Conectiva Linux guidelines for library naming.
 
-* Tue Jul 11 2002 Nico Erfurth <masta at trustix dot org>
-- Added LFS-Support
+* Fri Jan 09 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-09 21:23:03 (43980)
+- New upstream release: 1.2.1
 
-* Thu Mar 14 2002 Erlend Midttun <erlendbm at trustix dot com>
-- Upgraded to 1.1.4 to fix double free security issue.
+* Fri Jan 09 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-09 21:14:56 (43979)
+- Made the devel packages be selectable at build time
 
-* Tue Jan 25 2000 Tore Olsen <toreo at trustix dot com>
-- moved /usr/man to /usr/share/man for FHS compliance
+* Fri Jan 09 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-09 21:12:37 (43978)
+- Added BuildRequires
+- -devel packages shouldn't have %%{release} in its PreReq
+- use make -j
+- Removed misfiled "spanish" translations
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
-- auto rebuild in the new build environment (release 5)
+* Wed Jul 30 2003 Claudio Matsuoka <claudio at conectiva.com>
++ 2003-07-30 15:50:59 (33576)
+- fixed configuration to honour optflags
 
-* Wed Sep 09 1998 Cristian Gafton <gafton at redhat.com>
-- link against glibc
+* Fri Feb 28 2003 Ademar de Souza Reis Jr. <ademar at conectiva.com.br>
++ 2003-02-28 15:47:32 (26074)
+- Added a patch for a vsnprintf() buffer overflow vulnerability.
+  Patch made by Kelledin <kelledin at users.sourceforge.net> and modified by
+  the OpenPKG project.
+- Minor spec cleanup
 
-* Mon Jul 27 1998 Jeff Johnson <jbj at redhat.com>
-- upgrade to 1.1.3
+* Tue Sep 03 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-09-03 16:43:05 (14148)
+- Imported package from snapshot.
 
-* Fri May 08 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
+* Thu Aug 29 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-29 19:31:43 (10362)
+- Imported package from 8.0.
 
-* Wed Apr 08 1998 Cristian Gafton <gafton at redhat.com>
-- upgraded to 1.1.2
-- buildroot
+* Wed Aug 28 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-28 21:42:57 (7046)
+- Imported package from 7.0.
 
-* Tue Oct 07 1997 Donnie Barnes <djb at redhat.com>
-- added URL tag (down at the moment so it may not be correct)
-- made zlib-devel require zlib
-
-* Thu Jun 19 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
\ No newline at end of file
+* Tue Aug 27 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-27 20:08:58 (2195)
+- Imported package from 6.0.


From svn at tinysofa.org  Sat Jun  5 02:35:58 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 12:35:58 +1000 (EST)
Subject: [tinysofa-svn] r1868 - tinysofa/snapshot/rpm/current/specs
Message-ID: <20040605023558.F23294E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 12:35:58 +1000 (Sat, 05 Jun 2004)
New Revision: 1868

Modified:
   tinysofa/snapshot/rpm/current/specs/rpm.spec
Log:
- Use libz instead of libzlib.


Modified: tinysofa/snapshot/rpm/current/specs/rpm.spec
===================================================================
--- tinysofa/snapshot/rpm/current/specs/rpm.spec	2004-06-05 02:31:35 UTC (rev 1867)
+++ tinysofa/snapshot/rpm/current/specs/rpm.spec	2004-06-05 02:35:58 UTC (rev 1868)
@@ -90,7 +90,7 @@
 BuildRequires: %{mklibname beecrypt -d -s}
 BuildRequires: %{mklibname bzip2 -d -s} >= 0.9.0c-2
 BuildRequires: libtool >= 1.3.5
-BuildRequires: %{mklibname zlib -d -s}
+BuildRequires: %{mklibname z -d -s}
 BuildRequires: make
 %if %{with apidocs}
 BuildRequires: doxygen


From svn at tinysofa.org  Sat Jun  5 02:36:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 12:36:51 +1000 (EST)
Subject: [tinysofa-svn] r1869 - tinysofa/snapshot
Message-ID: <20040605023651.33ABC4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 12:36:51 +1000 (Sat, 05 Jun 2004)
New Revision: 1869

Added:
   tinysofa/snapshot/links/
Log:
Created package directory for links.


From svn at tinysofa.org  Sat Jun  5 02:37:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 12:37:12 +1000 (EST)
Subject: [tinysofa-svn] r1870 - in tinysofa/snapshot/links: . current
Message-ID: <20040605023712.9CE8D4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 12:37:12 +1000 (Sat, 05 Jun 2004)
New Revision: 1870

Added:
   tinysofa/snapshot/links/current/
   tinysofa/snapshot/links/current/sources/
   tinysofa/snapshot/links/current/specs/
Log:
Created package structure for links.


From svn at tinysofa.org  Sat Jun  5 02:46:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 12:46:35 +1000 (EST)
Subject: [tinysofa-svn] 
	r1871 - in tinysofa/snapshot/links/current: sources specs
Message-ID: <20040605024635.678524E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 12:46:35 +1000 (Sat, 05 Jun 2004)
New Revision: 1871

Added:
   tinysofa/snapshot/links/current/sources/links-2.1pre15.tar.bz2
   tinysofa/snapshot/links/current/sources/links.cfg
   tinysofa/snapshot/links/current/specs/links.spec
Log:
- Based on Conectiva package.
- Disable X support.
- Update to 2.1pre15.
- Use tinysofa rpm macros.


Added: tinysofa/snapshot/links/current/sources/links-2.1pre15.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/links/current/sources/links-2.1pre15.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/snapshot/links/current/sources/links.cfg
===================================================================
--- tinysofa/snapshot/links/current/sources/links.cfg	2004-06-05 02:37:12 UTC (rev 1870)
+++ tinysofa/snapshot/links/current/sources/links.cfg	2004-06-05 02:46:35 UTC (rev 1871)
@@ -0,0 +1,4 @@
+# links global configuration file
+terminal "rxvt" 1 0 1 ISO-8859-1
+terminal "xterm" 1 0 1 ISO-8859-1
+terminal "linux" 1 0 1 ISO-8859-1

Added: tinysofa/snapshot/links/current/specs/links.spec
===================================================================
--- tinysofa/snapshot/links/current/specs/links.spec	2004-06-05 02:37:12 UTC (rev 1870)
+++ tinysofa/snapshot/links/current/specs/links.spec	2004-06-05 02:46:35 UTC (rev 1871)
@@ -0,0 +1,126 @@
+%define ename links
+
+Name: links
+Version: 2.1pre15
+Release: 1ok
+License: GPL
+Summary: Links is a text-only browser very similar to lynx.
+Summary(pt_BR): O links ? um browser para modo texto, similar ao lynx.
+Summary(es): El links es un browser para modo texto, similar a lynx.
+Group: tinysofa/main
+Group(pt_BR): tinysofa/main
+Group(es): tinysofa/main
+URL: http://atrey.karlin.mff.cuni.cz/~clock/twibright/links
+Source: ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/links/%{name}-%{version}.tar.bz2
+Source1: %{ename}.cfg
+BuildRequires: openssl-devel >= 0.9.7
+BuildRequires: %{mklibname z -d}
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Conflicts: elinks
+%rename lynx
+
+%description
+Links is a text WWW browser, similar to Lynx. Links displays tables, downloads
+on background and uses HTTP/1.1 keepalive connections.
+
+%description -l pt_BR
+Links ? um browser WWW modo texto, similar ao Lynx.
+O Links exibe tabelas, baixa arquivos em segundo plano,
+e usa as conex?es HTTP/1.1 keepalive.
+
+%description -l es
+Links es un browser WWW modo texto, similar al Lynx. El links muestra tablas,
+hace baja archivos en segundo plano, y usa conexiones HTTP/1.1 keepalive.
+
+%prep
+%setup -q 
+
+%build
+%configure --enable-javascript --without-svgalib
+make
+
+%install
+rm -rf %{buildroot}
+%makeinstall
+
+mkdir -p %{buildroot}%{_sysconfdir}
+install -m644 %{_sourcedir}/%{ename}.cfg  %{buildroot}%{_sysconfdir}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS BUGS COPYING INSTALL NEWS README
+%{_bindir}/%{ename}
+%{_mandir}/man1/%{ename}*
+%config(noreplace) %{_sysconfdir}/%{ename}.cfg
+
+
+
+%changelog
+* Fri Apr 16 2004 Wanderlei Antonio Cavassin <cavassin at conectiva.com.br>
++ 2004-04-16 20:31:20 (57230)
+- Oops, removed just menu dir creation, not /etc.
+
+* Fri Apr 16 2004 Wanderlei Antonio Cavassin <cavassin at conectiva.com.br>
++ 2004-04-16 19:19:45 (57225)
+- Removed old menu entries.
+
+* Fri Apr 16 2004 Wanderlei Antonio Cavassin <cavassin at conectiva.com.br>
++ 2004-04-16 18:42:10 (57220)
+- disable svgalb support
+
+* Tue Mar 02 2004 Ednilson Miura <miura at conectiva.com>
++ 2004-03-02 14:31:47 (50744)
+- Recompiled against kernel 2.6 to enable framebuffer support again
+
+* Fri Jan 16 2004 Ednilson Miura <miura at conectiva.com>
++ 2004-01-16 13:20:58 (45119)
+- New upstream release
+
+* Fri Nov 07 2003 Ednilson Miura <miura at conectiva.com>
++ 2003-11-07 18:54:05 (39140)
+- Added missing tarbal
+
+* Fri Nov 07 2003 Ednilson Miura <miura at conectiva.com>
++ 2003-11-07 18:36:56 (39139)
+- New upstream release
+
+* Thu Jun 05 2003 Ednilson Miura <miura at conectiva.com>
++ 2003-06-05 17:49:00 (31922)
+- New upstream release
+
+* Thu Apr 03 2003 Ednilson Miura <miura at conectiva.com>
++ 2003-04-03 09:06:33 (29389)
+- New upstream release
+  A few cosmetical changes in specfile
+
+* Wed Jan 08 2003 Andreas Hasenack <andreas at conectiva.com.br>
++ 2003-01-08 10:34:54 (21399)
+- force rebuild with openssl 0.9.7
+
+
+* Tue Nov 19 2002 Ednilson Miura <miura at conectiva.com>
++ 2002-11-19 08:12:03 (19291)
+- new upstream release
+
+* Wed Oct 30 2002 Andreas Hasenack <andreas at conectiva.com.br>
++ 2002-10-30 17:38:29 (18432)
+- only use svga if building for the %%{ix86} arch
+
+* Sun Oct 27 2002 Claudio Matsuoka <claudio at conectiva.com>
++ 2002-10-27 14:24:55 (18261)
+- fixed typo in buildrequires line
+
+* Wed Oct 09 2002 Ednilson Miura <miura at conectiva.com>
++ 2002-10-09 16:25:44 (17429)
+- Added more packages to buildrequires
+
+* Wed Oct 09 2002 Ednilson Miura <miura at conectiva.com>
++ 2002-10-09 11:55:19 (17389)
+- Fixed source name and some buildrequires.
+
+* Tue Oct 08 2002 Ednilson Miura <miura at conectiva.com>
++ 2002-10-08 19:06:13 (17369)
+- First build for Conectiva Linux


From svn at tinysofa.org  Sat Jun  5 02:50:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 12:50:28 +1000 (EST)
Subject: [tinysofa-svn] r1872 - tinysofa/snapshot
Message-ID: <20040605025028.58C584E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 12:50:28 +1000 (Sat, 05 Jun 2004)
New Revision: 1872

Removed:
   tinysofa/snapshot/lynx/
Log:
- Replaced with links.



From svn at tinysofa.org  Sat Jun  5 02:58:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 12:58:17 +1000 (EST)
Subject: [tinysofa-svn] r1873 - tinysofa/snapshot/gettext/current/specs
Message-ID: <20040605025817.0BDBE4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 12:58:16 +1000 (Sat, 05 Jun 2004)
New Revision: 1873

Modified:
   tinysofa/snapshot/gettext/current/specs/gettext.spec
Log:
- Based on Conectiva package.
- Used tinysofa rpm macros.
- Clean up BuildRequires.


Modified: tinysofa/snapshot/gettext/current/specs/gettext.spec
===================================================================
--- tinysofa/snapshot/gettext/current/specs/gettext.spec	2004-06-05 02:50:28 UTC (rev 1872)
+++ tinysofa/snapshot/gettext/current/specs/gettext.spec	2004-06-05 02:58:16 UTC (rev 1873)
@@ -1,171 +1,270 @@
-Summary: GNU libraries and utilities for producing multi-lingual messages.
+%ifarch ia64
+%define optflags -O1
+%endif
+
+%define makeinfo_flags --no-validate --force -I gettext-runtime/doc
+
 Name: gettext
 Version: 0.14.1
-Release: 7ts
+Release: 8ok
+Summary: Libraries and utilties for program national language support
+Summary(pt_BR): Bibliotecas e utilit?rios para o programa de suporte de l?nguas locais.
+Summary(es): Bibliotecas y utilitarios para el programa de soporte a lenguas locales.
+Group: tinysofa/main
+Group(pt_BR): tinysofa/main
+Group(es): tinysofa/main
 License: GPL
-Group: tinysofa official
-Source: ftp://ftp.gnu.org/gnu/gettext-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: gcc-c++-devel
-Requires: gcc-c++-runtime
+URL: http://www.gnu.org/software/gettext
+Source0: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
+BuildRequires: autoconf
+BuildRequires: automake >= 1.5
+BuildRequires: binutils
+BuildRequires: bison
+BuildRequires: byacc
+BuildRequires: coreutils
+BuildRequires: diffutils
+BuildRequires: flex
+BuildRequires: gawk
+BuildRequires: gcc
+BuildRequires: glibc-devel
+BuildRequires: grep
+BuildRequires: groff
+BuildRequires: gzip
+BuildRequires: libtool
+BuildRequires: make
+BuildRequires: gawk
+BuildRequires: mktemp
+BuildRequires: patch
+BuildRequires: sed
+BuildRequires: tar
+BuildRequires: texinfo
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
-The GNU gettext package provides a set of tools and documentation for
-producing multi-lingual messages in programs.  Tools include a set of
-conventions about how programs should be written to support message
-catalogs, a directory and file naming organization for the message
-catalogs, a runtime library which supports the retrieval of translated
-messages, and stand-alone programs for handling the translatable and
-the already translated strings.  Gettext provides an easy to use
-library and tools for creating, using, and modifying natural language
-catalogs and is a powerful and simple method for internationalizing
-programs.
+The gettext library provides an easy to use library and tools for creating,
+using, and modifying natural language catalogs. It is a powerfull and simple
+method for internationalizing programs.
 
-If you would like to internationalize or incorporate multi-lingual
-messages into programs that you're developing, you should install
-gettext.
+%description -l pt_BR
+A biblioteca gettext oferece uma biblioteca f?cil de usar e ferramentas para
+cria??o, uso e modifica??o de cat?logos de linguagem natural. Ele ? um poderoso
+e simples m?todo de internacionaliza??o de programas.
 
+%description -l es
+La biblioteca gettext nos ofrece una biblioteca f?cil de usar y herramientas
+para creaci?n, uso y modificaci?n de cat?logos de lenguaje natural. Es un
+potente y sencillo m?todo de internacionalizaci?n de programas.
+
+%package devel
+Summary: Tools and libraries for development with gettext
+Summary(pt_BR): Utilit?rios e bibliotecas para desenvolvimento com gettext
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+PreReq: %{name} = %{version}
+
+%description devel
+This package provides the tools needed for developing with gettext library. It
+also contains headers and libraries for it.
+
+%description -l pt_BR devel
+Este pacote cont?m as ferramentas necess?rias para o desenvolvimento com a
+biblioteca gettext. Cont?m tamb?m os cabe?alhos e as bibliotecas para isto.
+
+%package doc
+Summary: Documentation for the gettext.
+Summary(pt_BR): Documenta??o para o gettext.
+Group: tinysofa/documentation
+Group(pt_BR): tinysofa/documenta??o
+Group(es): tinysofa/documentaci?n
+
+%description doc
+This package provides documentation for gettext.
+
+%description doc -l pt_BR
+Este pacote cont?m a documenta??o do getext.
+
 %prep
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr \
-	--enable-shared --with-included-gettext \
-        --mandir=$RPM_BUILD_ROOT/%{_mandir} %{_target_platform}
-make
+export EMACS=%{_bindir}/emacs
+%configure --disable-shared --with-included-gettext --with-pic-=yes
+make -j ${NRPROC:-1}
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
+rm -rf %{buildroot}
+%makeinstall	lispdir=%{buildroot}%{_datadir}/emacs/site-lisp \
+		aclocaldir=%{buildroot}%{_datadir}/aclocal
 
-# Fix busted no-emacs install for $lispdir/po-mode.el
-make install \
-	prefix=$RPM_BUILD_ROOT/usr
-
-pushd $RPM_BUILD_ROOT
-rm -f ./usr/share/info/dir ./usr/include/libintl.h
-strip ./usr/bin/* || :
+pushd %{buildroot}
+mkdir -p %{buildroot}/bin
+mv %{buildroot}%{_bindir}/gettext %{buildroot}/bin
+ln -sf /bin/gettext %{buildroot}%{_bindir}/gettext
 popd
 
-rm -rf $RPM_BUILD_ROOT/usr/info
-rm -rf $RPM_BUILD_ROOT/usr/share/info
-rm -rf $RPM_BUILD_ROOT/usr/share/doc
+# Check procedures
+# 1 of 180 tests failed (version 0.12.1)
+#make check 
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+# remove unwanted unpackaged files
+rm -f %{buildroot}%{_libdir}/*.a
+rm -f %{buildroot}%{_libdir}/libintl.la
+rm -f %{buildroot}%{_includedir}/{libintl,libgettext,autosprintf,gettext-po}.h
+rm -f %{buildroot}%{_datadir}/locale/locale.alias
+rm -f %{buildroot}%{_infodir}/dir
+# Avaialable in the emacs-el package
+rm -rf %{buildroot}%{_datadir}/emacs/site-lisp/
 
-%files
-%defattr(-,root,root)
-/usr/bin/*
-%doc %{_mandir}/*/*
-/usr/share/gettext
-/usr/share/locale/*/LC_MESSAGES/*
-/usr/share/aclocal/*
-%{_includedir}/autosprintf.h
-%{_includedir}/gettext-po.h
-%attr(755,root,root) %{_libdir}/lib*.so*
-%attr(755,root,root) %{_libdir}/lib*.la
-%attr(644,root,root) %{_libdir}/lib*.a
-%dir %{_libdir}/gettext
-%{_libdir}/gettext/hostname
-%{_libdir}/gettext/urlget
-%{_libdir}/gettext/user-email
-%{_libdir}/gettext/project-id
+%install_info gettext-tools/doc/gettext.texi
+%nuke_info
 
-# glibc wins!
-%exclude %{_datadir}/locale/locale.alias
+%i18n_pkgs gettext
 
-%changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.14.1-7ts
-- current (0.14.1-7ok) integrated as 0.14.1-7ts for release 1.0-U1
+%post doc
+%info_post
 
-* Fri May 14 2004 Omar Kilani <omar at tinysofa dot org> 0.14.1-7ok
-- Own %{_libdir}/gettext.
+%postun doc
+%info_postun
 
-* Tue May 11 2004 Omar Kilani <omar at tinysofa dot org>
-- Add BuildRequires gcc-c++-devel.
-- Add Requires gcc-c++-runtime.
+%clean
+rm -rf %{buildroot}
 
-* Sun May 09 2004 Omar Kilani <omar at tinysofa dot org> 0.14.1-6ts
-- Rebuild.
+%files
+%defattr(0755,root,root,0755)
+/bin/gettext
+%{_bindir}/gettext
+%{_bindir}/ngettext
 
-* Sat May  8 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.14.1-5jh
-- fixed the permissions of the library files
+%files devel
+%defattr(0755,root,root,0755)
+%{_bindir}/autopoint
+%{_bindir}/gettextize
+%{_bindir}/envsubst
+%{_bindir}/gettext.sh
+%{_bindir}/msg*
+%{_bindir}/xgettext
+%defattr(0644,root,root,0755)
+%{_libdir}/libasprintf.la
+%{_libdir}/libgettextlib.la
+%{_libdir}/libgettextpo.la
+%{_libdir}/libgettextsrc.la
+%dir %{_datadir}/gettext
+%{_datadir}/gettext/*
+%{_datadir}/aclocal/*.m4
+%dir %{_libdir}/gettext/
+%{_libdir}/gettext/*
 
-* Sat Feb  7 2004 Omar Kilani <ok at trustix dot org> 0.14.1-1ok
-- New upstream.
+%files doc
+%defattr(0644,root,root,0755)
+%dir %{_defaultdocdir}/gettext/
+%{_defaultdocdir}/gettext/*
+%dir %{_defaultdocdir}/libasprintf/
+%{_defaultdocdir}/libasprintf/*
+%{_mandir}/man1/*1*
+%{_mandir}/man3/*3*
+%{_htmldir}/%{name}
 
-* Sun Jan 25 2004 Erlend Midttun <erlendbm at trustix dot org> 0.13.1-1tr
-- New upstream.
 
-* Wed Dec  3 2003 Erlend Midttun <erlendbm at trustix dot com> 0.13-1tr
-- New upstream.
+%changelog
+* Thu Jan 22 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-22 18:59:31 (46285)
+- Removed the i18n-all package, now its one package per lang, using %%i18n_pkgs
+- %%remove_info already checks $1
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 0.11.5-3tr
-- Big rebuild
+* Sun Jan 18 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-18 21:37:17 (45700)
+- Remove unwanted unpackaged %%{_infodir}/dir
+- Ad to %%files devel %%{_libdir}/gettext/*
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 0.11.5-2em
-- Rebuilt against glibc 2.3.2.
+* Sun Jan 18 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-18 21:28:02 (45699)
+- Revert to the old style: --disable-shared, to make a long story short the
+  complications generated by trying to move the libs to /lib that made it
+  non-trivial to build packages such as rpm4.2.1 give me the willies about
+  doing this at this point, so if somebody wants to mrlify this, please first
+  test it will all packages, i.e. do it very early in a next devel cycle.
 
-* Tue Sep 11 2002 Gerald Dachs <gda at trustix dot org> 0.11.5-1gd
-- new version 0.11.5
+* Sun Jan 18 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-18 12:21:53 (45593)
+- Left only the bare minimum in the base package
+- Move the base package libs to /lib, to be able to use gettext before /usr
+  is mounted (Closes: #10254)
 
-* Mon Sep 10 2002 Gerald Dachs <gda at trustix dot org> 0.11.4-1gd
-- new version 0.11.4
+* Sun Jan 18 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-18 09:55:46 (45547)
+- Move libgettextlib-0.12.1.so and libgettextsrc-0.12.1.so to the main package
 
-* Mon Jan 29 2001 Olaf Trygve Berglihn <olafb at trustix dot com>
-- Fixed preun to only delete info-files if not upgrading.
+* Thu Jan 15 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-15 08:50:04 (44753)
+- Moved %%{_libdir}/libgettextpo*.so.* to the main package (we need a libintl2
+  package...) to the main package, so as not to make gettext depend on
+  gettext-devel
 
-* Mon Feb 28 2000 Lars Gaarden <larsg at trustix dot com>
-- moved info files to /usr/share/info, FHS
+* Wed Jan 14 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-14 22:45:39 (44733)
+- If %%{build_emacs_po_mode} is not enabled, remove its files
 
-* Wed Sep 22 1999 Cristian Gafton <gafton at redhat.com>
-- updated msghack not to merge in fuzzies in the master catalogs
+* Wed Jan 14 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-14 22:27:51 (44727)
+- Disable the build of the emacs-po-mode, this is already provided my emacs
 
-* Thu Aug 26 1999 Cristian Gafton <gafton at redhat.com>
-- updated msghack to understand --append
+* Wed Jan 14 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-14 21:49:35 (44720)
+- Removed unwanted unpackaged files
 
-* Wed Aug 11 1999 Cristian Gafton <gafton at redhat.com>
-- updated msghack to correctly deal with sorting files
+* Wed Jan 14 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-14 20:47:57 (44710)
+- Created the i18n-all package
+- BuildRequires: s/emacs-nox/emacs/g, I have to teach maragato about
+  apt-cache whatdepends the-packages-to-be-happily-killed... ;)
 
-* Thu May 06 1999 Cristian Gafton <gafton at redhat.com>
-- msghack updates
+* Tue Nov 11 2003 Ricardo Erbano <erbano at conectiva.com>
++ 2003-11-11 09:46:51 (39528)
+- Fixed group description
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
-- auto rebuild in the new build environment (release 8)
+* Wed Oct 01 2003 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2003-10-01 12:27:12 (36926)
+- s/claims/complains/g
 
-* Mon Mar 08 1999 Cristian Gafton <gafton at redhat.com>
-- added patch for misc hacks to facilitate rpm translations
+* Wed Oct 01 2003 Marcelo Ricardo Leitner <mrl at conectiva.com.br>
++ 2003-10-01 12:23:30 (36925)
+- Split into -devel and -devel-static
+- Re-enabled shared libraries
+- Added work-around for lib recompiling at make install
+- Use cp to join the docs, not mv
 
-* Thu Dec 03 1998 Cristian Gafton <gafton at redhat.com>
-- patch to allow to build on ARM
+* Tue Sep 30 2003 Marcelo Ricardo Leitner <mrl at conectiva.com.br>
++ 2003-09-30 15:05:37 (36909)
+- New upstream: 0.12.1 Closes: #9388
+- Removed all already in code patches.
 
-* Wed Sep 30 1998 Jeff Johnson <jbj at redhat.com>
-- add Emacs po-mode.el files.
+* Fri Sep 12 2003 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2003-09-12 12:57:39 (35714)
+- BuildRequires coreutils, not fileutils
 
-* Sun Sep 13 1998 Cristian Gafton <gafton at redhat.com>
-- include the aclocal support files
+* Sat Sep 06 2003 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2003-09-06 00:07:30 (35324)
+- o minor spec cleanups: one line per BuildRequires, sorted
 
-* Fri Sep  3 1998 Bill Nottingham <notting at redhat.com>
-- remove devel package (functionality is in glibc)
+* Fri Dec 27 2002 Ricardo Erbano <erbano at conectiva.com>
++ 2002-12-27 19:46:29 (20874)
+- Now all files need to build are in BuildRequires
+- Created sub-package gettext-doc and put missing manpage files into
+- Closes: #7289, gettext: not building on Alpha and Sparc
 
-* Tue Sep  1 1998 Jeff Johnson <jbj at redhat.com>
-- update to 0.10.35.
+* Tue Sep 03 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-09-03 14:40:41 (11615)
+- Imported package from snapshot.
 
-* Mon Jun 29 1998 Jeff Johnson <jbj at redhat.com>
-- add gettextize.
-- create devel package for libintl.a and libgettext.h.
+* Thu Aug 29 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-29 17:45:45 (7925)
+- Imported package from 8.0.
 
-* Mon Apr 27 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
+* Wed Aug 28 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-28 18:34:39 (4324)
+- Imported package from 7.0.
 
-* Sun Nov 02 1997 Cristian Gafton <gafton at redhat.com>
-- added info handling
-- added misc-patch (skip emacs-lisp modofications)
-
-* Sat Nov 01 1997 Erik Troan <ewt at redhat.com>
-- removed locale.aliases as we get it from glibc now
-- uses a buildroot
-
-* Mon Jun 02 1997 Erik Troan <ewt at redhat.com>
-- Built against glibc
\ No newline at end of file
+* Tue Aug 27 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-27 18:59:03 (567)
+- Imported package from 6.0.


From svn at tinysofa.org  Sat Jun  5 02:59:58 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 12:59:58 +1000 (EST)
Subject: [tinysofa-svn] 
	r1874 - in tinysofa/snapshot/beecrypt/current: sources specs
Message-ID: <20040605025958.9BE454E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 12:59:58 +1000 (Sat, 05 Jun 2004)
New Revision: 1874

Added:
   tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-tinysofa.patch
Removed:
   tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-rh.patch
Modified:
   tinysofa/snapshot/beecrypt/current/specs/beecrypt.spec
Log:
- Based on Conectiva package.
- Use tinysofa rpm macros.
- Add tinysofa patch.


Deleted: tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-rh.patch
===================================================================
--- tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-rh.patch	2004-06-05 02:58:16 UTC (rev 1873)
+++ tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-rh.patch	2004-06-05 02:59:58 UTC (rev 1874)
@@ -1,19 +0,0 @@
---- beecrypt-3.1.0/python/Makefile.am.rh	2003-08-17 02:46:57.000000000 -0400
-+++ beecrypt-3.1.0/python/Makefile.am	2003-12-22 21:56:47.764588621 -0500
-@@ -1,14 +1,12 @@
--# Makefile for rpm library.
--
- AUTOMAKE_OPTIONS = 1.4 foreign
- 
- LINT = splint
- 
--PYVER= 2.2
-+PYVER= 2.3
- 
- SUBDIRS = test
- 
--pylibdir = $(shell python -c 'import sys; print sys.path[1]')
-+pylibdir = $(shell python -c 'import sys; print sys.path[2]')
- pyincdir = $(prefix)/include/python${PYVER}
- 
- EXTRA_DIST = debug-py.c

Added: tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-tinysofa.patch
===================================================================
--- tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-tinysofa.patch	2004-06-05 02:58:16 UTC (rev 1873)
+++ tinysofa/snapshot/beecrypt/current/sources/beecrypt-3.1.0-tinysofa.patch	2004-06-05 02:59:58 UTC (rev 1874)
@@ -0,0 +1,20 @@
+--- beecrypt-3.1.0/python/Makefile.am.rh	2003-08-17 02:46:57.000000000 -0400
++++ beecrypt-3.1.0/python/Makefile.am	2003-12-22 21:56:47.764588621 -0500
+@@ -1,14 +1,12 @@
+-# Makefile for rpm library.
+-
+ AUTOMAKE_OPTIONS = 1.4 foreign
+ 
+ LINT = splint
+ 
+-PYVER= 2.2
++PYVER= 2.3
+ 
+ SUBDIRS = test
+ 
+-pylibdir = $(shell python -c 'import sys; print sys.path[1]')
++pylibdir = $(libdir)/python${PYVER}
+-pyincdir = $(prefix)/include/python${PYVER}
++pyincdir = $(includedir)/python${PYVER}
+ 
+ EXTRA_DIST = debug-py.c

Modified: tinysofa/snapshot/beecrypt/current/specs/beecrypt.spec
===================================================================
--- tinysofa/snapshot/beecrypt/current/specs/beecrypt.spec	2004-06-05 02:58:16 UTC (rev 1873)
+++ tinysofa/snapshot/beecrypt/current/specs/beecrypt.spec	2004-06-05 02:59:58 UTC (rev 1874)
@@ -1,210 +1,163 @@
-%define	with_python		--with-python
-%define	with_python_version	2.3%{nil}
+%define	with_python	1
 
-Summary: An open source cryptography library.
+%define beecrypt_pyname %{mkpyname %{name}}
+
 Name: beecrypt
 Version: 3.1.0
-Release: 5ts
-Group: tinysofa official
+Release: 6ok
+Group: tinysofa/libraries
+Group(pt_BR): tinysofa/bibliotecas
+Group(es): tinysofa/bibliotecas
+Summary: Open source cryptography library
+Summary(pt_BR): Biblioteca open source para criptografia
 License: LGPL
 URL: http://sourceforge.net/projects/beecrypt
-Source0: http://prdownloads.sourceforge.net/beecrypt/%{name}-3.1.0.tar.gz
-Patch0: beecrypt-3.1.0-rh.patch
-%if %{?with_python:1}0
-BuildRequires: python
-BuildPreReq: python-devel >= %{with_python_version}
-%endif
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: gcc-c++-runtime
+Source0: http://prdownloads.sourceforge.net/beecrypt/beecrypt-%{version}.tar.gz
+Patch0: beecrypt-3.1.0-tinysofa.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: autoconf automake libtool
-BuildRequires: gcc-c++-devel
-
 %description
 Beecrypt is a general-purpose cryptography library.
 
-%package devel
-Summary: Files needed for developing applications with beecrypt.
-Group: tinysofa official
-Requires: %{name} = %{version}-%{release}
+%description -l pt_BR
+Beecrypt ? uma biblioteca de criptografia de prop?sito geral.
 
-%description devel
+%package -n %{libname}
+Group: tinysofa/libraries
+Group(pt_BR): tinysofa/bibliotecas
+Group(es): tinysofa/bibliotecas
+Summary: Open source cryptography library
+Summary(pt_BR): Biblioteca open source para criptografia
+%rename beecrypt
+
+%description -n %{libname}
+Beecrypt is a general-purpose cryptography library.
+
+%description -n %{libname} -l pt_BR
+Beecrypt ? uma biblioteca de criptografia de prop?sito geral.
+
+%package -n %{libname_devel}
+Summary: Files needed for developing applications with beecrypt
+Summary(pt_BR): Arquivos necess?rios para desenvolver aplica??es com o beecrypt
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+Requires: %{libname} = %{version}-%{release}
+%rename beecrypt-devel
+
+%description -n %{libname_devel}
 Beecrypt is a general-purpose cryptography library.  This package contains
 files needed for developing applications with beecrypt.
 
-%if %{?with_python:1}0
-%package python
-Summary: Files needed for python applications using beecrypt.
-Group: tinysofa official
-Requires: python >= %{with_python_version}
-Requires: %{name} = %{version}-%{release}
+%description -n %{libname_devel} -l pt_BR
+Beecrypt ? uma biblioteca de criptografia de prop?sito geral. Esse pacote
+cont?m os arquivos necess?rios para desenvolver aplica??es com o beecrypt.
 
-%description python
+%package -n %{libname_static_devel}
+Summary: Files needed for developing applications with beecrypt statically
+Summary(pt_BR): Arquivos necess?rios para desenvolver aplica??es est?ticas com o beecrypt
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+Requires: %{libname_devel} = %{version}-%{release}
+
+%description -n %{libname_static_devel}
+Beecrypt is a general-purpose cryptography library. This package contains
+files needed for developing applications with beecrypt statically.
+
+%description -n %{libname_static_devel} -l pt_BR
+Beecrypt ? uma biblioteca de criptografia de prop?sito geral. Esse pacote
+cont?m os arquivos necess?rios para desenvolver aplica??es com o beecrypt
+estaticamente.
+
+%if %{with_python}
+%package -n %{beecrypt_pyname}
+Summary: Files needed for python applications using beecrypt
+Summary(pt_BR): Arquivos necess?rios para aplica??es python usando o beecrypt
+Group: tinysofa/python
+Group(pt_BR): tinysofa/python
+Group(es): tinysofa/python
+Requires: %{libname} = %{version}-%{release}
+%py_requires -d
+
+%description -n %{beecrypt_pyname}
 Beecrypt is a general-purpose cryptography library.  This package contains
 files needed for using python with beecrypt.
+
+%description -n %{beecrypt_pyname} -l pt_BR
+Beecrypt ? uma biblioteca de criptografia de prop?sito geral. Esse pacote
+cont?m os arquivos necess?rios para desenvolver aplica??es em Python
+com o beecrypt.
 %endif
 
 %prep
-%setup -q
-%patch0 -p1 -b .rh
+%setup -q -n beecrypt-%{version}
+%patch0 -p1 -b .tinysofa
 
+%build
 ./autogen.sh
+%configure --enable-shared --enable-static %{?with_python:--with-python} \
 
-%build
-
-%configure --enable-shared --enable-static %{?with_python}
-
 make
 
 %install
-rm -fr $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -fr %{buildroot}
+make install DESTDIR=%{buildroot}
 
-# XXX nuke unpackaged files, artifacts from using libtool to produce module
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/python%{with_python_version}/site-packages/_bc.*a
+# Nuke unpackaged files, artifacts from using libtool to produce module
+rm -f %{buildroot}%{py_sitedir}/_bc.*a
 
-# XXX delete next line to build with legacy, non-check aware, rpmbuild.
-#%check
+#%%check
 #make check || :
 #cat /proc/cpuinfo
 #make bench || :
 
 %clean
-rm -fr $RPM_BUILD_ROOT
+rm -fr %{buildroot}
 
-%post -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
-%files
-%defattr(-,root,root)
+%files -n %{libname}
+%defattr(0644,root,root,0755)
 %doc README BENCHMARKS
 %{_libdir}/*.so.*
 
-%files devel
-%defattr(-,root,root)
+%files -n %{libname_devel}
+%defattr(0644,root,root,0755)
 %doc BUGS
-%{_includedir}/%{name}
-%{_libdir}/*.a
+%{_includedir}/beecrypt
 %{_libdir}/*.la
 %{_libdir}/*.so
 
-%if %{?with_python:1}0
-%files python
-%defattr(-,root,root)
-%{_libdir}/python%{with_python_version}/site-packages/_bc.so
+%files -n %{libname_static_devel}
+%defattr(0644,root,root,0755)
+%{_libdir}/*.a
+
+%if %{with_python}
+%files -n %{beecrypt_pyname}
+%defattr(0644,root,root,0755)
+%{py_sitedir}/_bc.so
 %endif
 
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 3.1.0-5ts
-- current (3.1.0-4ts) integrated as 3.1.0-5ts for release 1.0-U1
+* Fri Jun 04 2004 Omar Kilani <omar at tinysofa dot org> 3.1.0-6ok
+- tinysofa.
 
-* Tue May 11 2004 Omar Kilani <omar at tinysofa dot org> 3.1.0-4ts
-- Add BuildRequires autoconf, automake, libtool.
-- Add BuildRequires python for python subpackage.
-- Add BuildRequires gcc-c++-devel.
-- Add Requires gcc-c++-runtime.
+* Fri Nov 28 2003 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2003-11-28 10:41:52 (40617)
+- Fixing requires from %%{name} to libbeecrypt%%{libver}.
 
-* Tue Mar 30 2004 Omar Kilani <omar at tinysofa dot org> 3.1.0-4ts
-- Python 2.3.
+* Fri Nov 28 2003 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2003-11-28 10:29:51 (40614)
+- Adjusting file modes.
 
-* Fri Mar 26 2004 Omar Kilani <omar at tinysofa dot org> 3.1.0-3ts
-- tinysofaise.
+* Fri Nov 28 2003 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2003-11-28 10:23:55 (40612)
+- Adding beecrypt package to distribution.
 
-* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Mon Dec 22 2003 Jeff Johnson <jbj at jbj.org> 3.1.0-1
-- upgrade to 3.1.0.
-- recompile against python-2.3.3.
-
-* Mon Jun 30 2003 Jeff Johnson <jbj at redhat.com> 3.0.1-0.20030630
-- upstream fixes for DSA and ppc64.
-
-* Mon Jun 23 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-2
-- upgrade to 3.0.0 final.
-- fix for DSA (actually, modulo inverse) sometimes failing.
-
-* Fri Jun 20 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-1.20030619
-- avoid asm borkage on ppc64.
-
-* Thu Jun 19 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-1.20030618
-- rebuild for release bump.
-
-* Tue Jun 17 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-1.20030616
-- try to out smart libtool a different way.
-- use $bc_target_cpu, not $bc_target_arch, to detect /usr/lib64.
-
-* Mon Jun 16 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-1.20030615
-- use -mcpu=powerpc64 on ppc64.
-
-* Fri Jun 13 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-1.20030613
-- upgrade to latest snapshot.
-
-* Fri Jun  6 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-1.20030605
-- rebuild into another tree.
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Tue Jun  3 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-0.20030603
-- update to 3.0.0 snapshot, fix mpmod (and DSA) on 64b platforms.
-
-* Mon Jun  2 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-0.20030602
-- update to 3.0.0 snapshot, merge patches, fix gcd rshift and ppc problems.
-
-* Thu May 29 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-0.20030529
-- update to 3.0.0 snapshot, fix ia64/x86_64 build problems.
-
-* Wed May 28 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-0.20030528
-- upgrade to 3.0.0 snapshot, adding rpm specific base64.[ch] changes.
-- add PYTHONPATH=.. so that "make check" can test the just built _bc.so module.
-- grab cpuinfo and run "make bench".
-- continue ignoring "make check" failures, LD_LIBRARY_PATH needed for _bc.so.
-- skip asm build failure on ia64 for now.
-- ignore "make bench" exit codes too, x86_64 has AES segfault.
-
-* Wed May 21 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-0.20030521
-- upgrade to 3.0.0 snapshot, including python subpackage.
-- ignore "make check" failure for now.
-
-* Fri May 16 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-0.20030516
-- upgrade to 3.0.0 snapshot, including ia64 and x86_64 fixes.
-- add %%check.
-- ignore "make check" failure on ia64 for now.
-
-* Mon May 12 2003 Jeff Johnson <jbj at redhat.com> 3.0.0-0.20030512
-- upgrade to 3.0.0 snapshot.
-- add doxygen doco.
-- use /dev/urandom as default entropy source.
-- avoid known broken compilation for now.
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Tue Nov 19 2002 Tim Powers <timp at redhat.com>
-- rebuild on all arches
-
-* Fri Aug  2 2002 Jeff Johnson <jbj at redhat.com> 2.2.0-6
-- install types.h (#68999).
-
-* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Wed Jun  5 2002 Jeff Johnson <jbj at redhat.com>
-- run ldconfig when installing/erasing (#65974).
-
-* Thu May 23 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Mon May 13 2002 Jeff Johnson <jbj at redhat.com>
-- upgrade to latest 2.2.0 (from cvs.rpm.org).
-
-* Mon Jan 21 2002 Jeff Johnson <jbj at redhat.com>
-- use the same beecrypt-2.2.0 that rpm is using internally.
-
-* Thu Jan 10 2002 Nalin Dahyabhai <nalin at redhat.com> 2.1.0-1
-- initial package
\ No newline at end of file
+* Wed Nov 26 2003 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2003-11-26 16:17:23 (40557)
+- Created package structure for beecrypt.


From svn at tinysofa.org  Sat Jun  5 03:04:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 13:04:33 +1000 (EST)
Subject: [tinysofa-svn] 
	r1875 - in tinysofa/snapshot/bzip2/current: sources specs
Message-ID: <20040605030433.AB5A24E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 13:04:33 +1000 (Sat, 05 Jun 2004)
New Revision: 1875

Added:
   tinysofa/snapshot/bzip2/current/sources/bzip2-1.0.2-saneso.patch
Removed:
   tinysofa/snapshot/bzip2/current/sources/bzip2-1.0.2-dest.patch
   tinysofa/snapshot/bzip2/current/sources/bzip2-makeinstall.patch
Modified:
   tinysofa/snapshot/bzip2/current/specs/bzip2.spec
Log:
- Based on Conectiva package.
- Used tinysofa rpm macros.
- Creates output libbz2, libbz2-devel, libbz2-static-devel.


Deleted: tinysofa/snapshot/bzip2/current/sources/bzip2-1.0.2-dest.patch
===================================================================
--- tinysofa/snapshot/bzip2/current/sources/bzip2-1.0.2-dest.patch	2004-06-05 02:59:58 UTC (rev 1874)
+++ tinysofa/snapshot/bzip2/current/sources/bzip2-1.0.2-dest.patch	2004-06-05 03:04:33 UTC (rev 1875)
@@ -1,84 +0,0 @@
-diff -Nur bzip2-1.0.2/Makefile bzip2-1.0.2.changed/Makefile
---- bzip2-1.0.2/Makefile	Mon Jun  3 09:33:08 2002
-+++ bzip2-1.0.2.changed/Makefile	Mon Jun  3 09:32:55 2002
-@@ -58,43 +58,43 @@
- 	@cat words3
- 
- install: bzip2 bzip2recover
--	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
--	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
--	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
--	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
--	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
--	cp -f bzip2 $(PREFIX)/bin/bzip2
--	cp -f bzip2 $(PREFIX)/bin/bunzip2
--	cp -f bzip2 $(PREFIX)/bin/bzcat
--	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
--	chmod a+x $(PREFIX)/bin/bzip2
--	chmod a+x $(PREFIX)/bin/bunzip2
--	chmod a+x $(PREFIX)/bin/bzcat
--	chmod a+x $(PREFIX)/bin/bzip2recover
--	cp -f bzip2.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzip2.1
--	cp -f bzlib.h $(PREFIX)/include
--	chmod a+r $(PREFIX)/include/bzlib.h
--	cp -f libbz2.a $(PREFIX)/lib
--	chmod a+r $(PREFIX)/lib/libbz2.a
--	cp -f bzgrep $(PREFIX)/bin/bzgrep
--	ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
--	ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
--	chmod a+x $(PREFIX)/bin/bzgrep
--	cp -f bzmore $(PREFIX)/bin/bzmore
--	ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
--	chmod a+x $(PREFIX)/bin/bzmore
--	cp -f bzdiff $(PREFIX)/bin/bzdiff
--	ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
--	chmod a+x $(PREFIX)/bin/bzdiff
--	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzgrep.1
--	chmod a+r $(PREFIX)/man/man1/bzmore.1
--	chmod a+r $(PREFIX)/man/man1/bzdiff.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
--	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
--	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-+	if ( test ! -d $(DESTDIR)/$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)/$(PREFIX)/bin ; fi
-+	if ( test ! -d $(DESTDIR)/$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)/$(PREFIX)/lib ; fi
-+	if ( test ! -d $(DESTDIR)/$(PREFIX)/share/man ) ; then mkdir -p $(DESTDIR)/$(PREFIX)/share/man ; fi
-+	if ( test ! -d $(DESTDIR)/$(PREFIX)/share/man/man1 ) ; then mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man1 ; fi
-+	if ( test ! -d $(DESTDIR)/$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)/$(PREFIX)/include ; fi
-+	cp -f bzip2 $(DESTDIR)/$(PREFIX)/bin/bzip2
-+	cp -f bzip2 $(DESTDIR)/$(PREFIX)/bin/bunzip2
-+	cp -f bzip2 $(DESTDIR)/$(PREFIX)/bin/bzcat
-+	cp -f bzip2recover $(DESTDIR)/$(PREFIX)/bin/bzip2recover
-+	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzip2
-+	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bunzip2
-+	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzcat
-+	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzip2recover
-+	cp -f bzip2.1 $(DESTDIR)/$(PREFIX)/share/man/man1
-+	chmod a+r $(DESTDIR)/$(PREFIX)/share/man/man1/bzip2.1
-+	cp -f bzlib.h $(DESTDIR)/$(PREFIX)/include
-+	chmod a+r $(DESTDIR)/$(PREFIX)/include/bzlib.h
-+	cp -f libbz2.a $(DESTDIR)/$(PREFIX)/lib
-+	chmod a+r $(DESTDIR)/$(PREFIX)/lib/libbz2.a
-+	cp -f bzgrep $(DESTDIR)/$(PREFIX)/bin/bzgrep
-+	ln $(DESTDIR)/$(PREFIX)/bin/bzgrep $(DESTDIR)/$(PREFIX)/bin/bzegrep
-+	ln $(DESTDIR)/$(PREFIX)/bin/bzgrep $(DESTDIR)/$(PREFIX)/bin/bzfgrep
-+	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzgrep
-+	cp -f bzmore $(DESTDIR)/$(PREFIX)/bin/bzmore
-+	ln $(DESTDIR)/$(PREFIX)/bin/bzmore $(DESTDIR)/$(PREFIX)/bin/bzless
-+	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzmore
-+	cp -f bzdiff $(DESTDIR)/$(PREFIX)/bin/bzdiff
-+	ln $(DESTDIR)/$(PREFIX)/bin/bzdiff $(DESTDIR)/$(PREFIX)/bin/bzcmp
-+	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzdiff
-+	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)/$(PREFIX)/share/man/man1
-+	chmod a+r $(DESTDIR)/$(PREFIX)/share/man/man1/bzgrep.1
-+	chmod a+r $(DESTDIR)/$(PREFIX)/share/man/man1/bzmore.1
-+	chmod a+r $(DESTDIR)/$(PREFIX)/share/man/man1/bzdiff.1
-+	echo ".so man1/bzgrep.1" > $(DESTDIR)/$(PREFIX)/share/man/man1/bzegrep.1
-+	echo ".so man1/bzgrep.1" > $(DESTDIR)/$(PREFIX)/share/man/man1/bzfgrep.1
-+	echo ".so man1/bzmore.1" > $(DESTDIR)/$(PREFIX)/share/man/man1/bzless.1
-+	echo ".so man1/bzdiff.1" > $(DESTDIR)/$(PREFIX)/share/man/man1/bzcmp.1
- 
- distclean: clean
- clean: 

Added: tinysofa/snapshot/bzip2/current/sources/bzip2-1.0.2-saneso.patch
===================================================================
--- tinysofa/snapshot/bzip2/current/sources/bzip2-1.0.2-saneso.patch	2004-06-05 02:59:58 UTC (rev 1874)
+++ tinysofa/snapshot/bzip2/current/sources/bzip2-1.0.2-saneso.patch	2004-06-05 03:04:33 UTC (rev 1875)
@@ -0,0 +1,11 @@
+--- bzip2-1.0.2/Makefile-libbz2_so.saneso	Wed Jan 30 15:44:10 2002
++++ bzip2-1.0.2/Makefile-libbz2_so	Wed Jan 30 15:44:26 2002
+@@ -20,7 +20,7 @@
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.2 $(OBJS)
++	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.2 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.2
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.2 libbz2.so.1.0

Deleted: tinysofa/snapshot/bzip2/current/sources/bzip2-makeinstall.patch
===================================================================
--- tinysofa/snapshot/bzip2/current/sources/bzip2-makeinstall.patch	2004-06-05 02:59:58 UTC (rev 1874)
+++ tinysofa/snapshot/bzip2/current/sources/bzip2-makeinstall.patch	2004-06-05 03:04:33 UTC (rev 1875)
@@ -1,49 +0,0 @@
---- bzip2-1.0.2/Makefile.orig	2003-05-20 12:47:18.000000000 +0200
-+++ bzip2-1.0.2/Makefile	2003-05-20 12:55:51.000000000 +0200
-@@ -63,34 +63,22 @@
- 	if ( test ! -d $(DESTDIR)/$(PREFIX)/share/man ) ; then mkdir -p $(DESTDIR)/$(PREFIX)/share/man ; fi
- 	if ( test ! -d $(DESTDIR)/$(PREFIX)/share/man/man1 ) ; then mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man1 ; fi
- 	if ( test ! -d $(DESTDIR)/$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)/$(PREFIX)/include ; fi
--	cp -f bzip2 $(DESTDIR)/$(PREFIX)/bin/bzip2
--	cp -f bzip2 $(DESTDIR)/$(PREFIX)/bin/bunzip2
--	cp -f bzip2 $(DESTDIR)/$(PREFIX)/bin/bzcat
--	cp -f bzip2recover $(DESTDIR)/$(PREFIX)/bin/bzip2recover
--	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzip2
--	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bunzip2
--	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzcat
--	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzip2recover
--	cp -f bzip2.1 $(DESTDIR)/$(PREFIX)/share/man/man1
--	chmod a+r $(DESTDIR)/$(PREFIX)/share/man/man1/bzip2.1
--	cp -f bzlib.h $(DESTDIR)/$(PREFIX)/include
--	chmod a+r $(DESTDIR)/$(PREFIX)/include/bzlib.h
--	cp -f libbz2.a $(DESTDIR)/$(PREFIX)/lib
--	chmod a+r $(DESTDIR)/$(PREFIX)/lib/libbz2.a
--	cp -f bzgrep $(DESTDIR)/$(PREFIX)/bin/bzgrep
-+	install -m755 bzip2-shared $(DESTDIR)/$(PREFIX)/bin/bzip2
-+	ln $(DESTDIR)/$(PREFIX)/bin/bzip2 $(DESTDIR)/$(PREFIX)/bin/bunzip2
-+	ln $(DESTDIR)/$(PREFIX)/bin/bzip2 $(DESTDIR)/$(PREFIX)/bin/bzcat
-+
-+	install -m755 bzip2recover $(DESTDIR)/$(PREFIX)/bin/bzip2recover
-+	install -m644 bzip2.1 $(DESTDIR)/$(PREFIX)/share/man/man1
-+	install -m644 bzlib.h $(DESTDIR)/$(PREFIX)/include
-+	install -m644 libbz2.a $(DESTDIR)/$(PREFIX)/lib
-+	install -m755 bzgrep $(DESTDIR)/$(PREFIX)/bin/bzgrep
- 	ln $(DESTDIR)/$(PREFIX)/bin/bzgrep $(DESTDIR)/$(PREFIX)/bin/bzegrep
- 	ln $(DESTDIR)/$(PREFIX)/bin/bzgrep $(DESTDIR)/$(PREFIX)/bin/bzfgrep
--	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzgrep
--	cp -f bzmore $(DESTDIR)/$(PREFIX)/bin/bzmore
-+	install -m755 bzmore $(DESTDIR)/$(PREFIX)/bin/bzmore
- 	ln $(DESTDIR)/$(PREFIX)/bin/bzmore $(DESTDIR)/$(PREFIX)/bin/bzless
--	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzmore
--	cp -f bzdiff $(DESTDIR)/$(PREFIX)/bin/bzdiff
-+	install -m755 bzdiff $(DESTDIR)/$(PREFIX)/bin/bzdiff
- 	ln $(DESTDIR)/$(PREFIX)/bin/bzdiff $(DESTDIR)/$(PREFIX)/bin/bzcmp
--	chmod a+x $(DESTDIR)/$(PREFIX)/bin/bzdiff
--	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)/$(PREFIX)/share/man/man1
--	chmod a+r $(DESTDIR)/$(PREFIX)/share/man/man1/bzgrep.1
--	chmod a+r $(DESTDIR)/$(PREFIX)/share/man/man1/bzmore.1
--	chmod a+r $(DESTDIR)/$(PREFIX)/share/man/man1/bzdiff.1
-+	install -m644 bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)/$(PREFIX)/share/man/man1
- 	echo ".so man1/bzgrep.1" > $(DESTDIR)/$(PREFIX)/share/man/man1/bzegrep.1
- 	echo ".so man1/bzgrep.1" > $(DESTDIR)/$(PREFIX)/share/man/man1/bzfgrep.1
- 	echo ".so man1/bzmore.1" > $(DESTDIR)/$(PREFIX)/share/man/man1/bzless.1

Modified: tinysofa/snapshot/bzip2/current/specs/bzip2.spec
===================================================================
--- tinysofa/snapshot/bzip2/current/specs/bzip2.spec	2004-06-05 02:59:58 UTC (rev 1874)
+++ tinysofa/snapshot/bzip2/current/specs/bzip2.spec	2004-06-05 03:04:33 UTC (rev 1875)
@@ -1,175 +1,234 @@
-Summary: A file compression utility.
+%define libname 		%{mklibname bz2}
+%define libname_devel	 	%{mklibname bz2 -d}
+%define libname_static_devel 	%{mklibname bz2 -d -s}
+
 Name: bzip2
 Version: 1.0.2
-Release: 14ts
-License: GPL
-Group: tinysofa official
-Source: ftp://sourceware.redhat.com/pub/bzip2/v102/bzip2-%{version}.tar.gz
-Patch0: bzip2-1.0.2-dest.patch
-Patch1: bzip2-makeinstall.patch
-BuildRequires: libtool
-BuildRoot: %{_tmppath}/%{name}-root
+Release: 15ok
+Summary: Extremely powerful file compression utility
+Summary(pt_BR): Compactador de arquivo extremamente poderoso
+Summary(es): Un compresor de archivos con un nuevo algoritmo
+Group: tinysofa/main
+Group(pt_BR): tinysofa/main
+Group(es): tinysofa/main
+License: BSD
+URL: http://sources.redhat.com/bzip2/
+Source: ftp://sources.redhat.com/pub/bzip2/v102/%{name}-%{version}.tar.gz
+Patch: bzip2-1.0.2-saneso.patch
+Requires: %{libname} >= 1.0.1
+Provides: %{_bindir}/bzip2
+BuildRequires: binutils
+BuildRequires: gcc
+BuildRequires: glibc-devel
+BuildRequires: make
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
-Bzip2 is a freely available, patent-free, high quality data compressor.
-Bzip2 compresses files to within 10 to 15 percent of the capabilities 
-of the best techniques available.  However, bzip2 has the added benefit 
-of being approximately two times faster at compression and six times 
-faster at decompression than those techniques.  Bzip2 is not the 
-fastest compression utility, but it does strike a balance between speed 
-and compression capability.
+bzip2 compresses files using the Burrows-Wheeler block-sorting text compression
+algorithm, and Huffman coding. Compression is generally considerably better
+than that achieved by more conventional LZ77/LZ78-based compressors, and
+approaches the performance of the PPM family of statistical compressors.
 
-Install bzip2 if you need a compression utility.
+The command-line options are deliberately very similar to those of GNU Gzip,
+but they are not identical.
 
-%package libs
-Group: tinysofa official
-Summary: Runtime libraries of bzip2
+%description -l pt_BR
+O bzip2 ? um programa de compress?o/descompress?o. Tipicamente o arquivo
+compactado fica 20 a 30 por cento menor do que se fosse compactado com o gzip.
 
-%description libs
-These library provides the same compression-algorithm as the bzip2-tools.
+Note que o bzip2 n?o entende os arquivos do bzip original, nem os arquivos do
+gzip.
 
-%package devel
-Group: tinysofa official
-Summary: Development-package for
-Requires: bzip2-libs >= %{version}
+%description -l es
+Bzip2 es un programa de compresi?n/descompresi?n. T?picamente el archivo
+compactado queda entre 20 la 30 por ciento menor de que se fuera compactado con
+gzip. Observa que bzip2 no entiende los archivos del bzip original, ni los
+archivos del gzip.
 
-%description devel
-The headerfiles for libbzip2 and the bzip2.a file, to build your own
-applications, based an the bzip2-compression.
+%package -n %{libname}
+Summary: bzip2 shared libraries
+Summary(pt_BR): Bibliotecas compartilhadas do bzip2
+Group: tinysofa/libraries
+Group(es): tinysofa/bibliotecas
+Group(pt_BR): tinysofa/bibliotecas
+Provides: libbz2.a
+Provides: libbz2.so
+Conflicts: bzip2 < 1.0.1
+%rename bzip2-libs
 
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%description -n %{libname}
+Bzip2  compresses  files  using the Burrows-Wheeler block-sorting text
+compression algorithm, and Huffman coding. Compression is generally
+considerably better than that achieved by more conventional LZ77/LZ78-based
+compressors, and approaches the performance of the PPM family of statistical
+compressors.
 
-%build
+Shared libraries.
 
-# Supporting LargeFiles if available
-if [ %{LargeFileSupport} == '1' ]; then
-  RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
-fi
+%description -l pt_BR -n %{libname}
+A libbz2 ? um biblioteca de compress?o/descompress?o. Tipicamente o arquivo
+compactado fica 20 a 30 por cento menor do que se fosse compactado com o gzip.
 
-make CFLAGS="$RPM_OPT_FLAGS $LARGEFILES"
-make -f Makefile-libbz2_so CFLAGS="$RPM_OPT_FLAGS $LARGEFILES"
+%package -n %{libname_devel}
+Summary: Header files and libraries needed for bzip2 development
+Summary(pt_BR): Arquivos de inclus?o e biblioteca de desenvolvimento para o bzip2
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+PreReq: %{libname} = %{version}
+Conflicts: bzip2 < 1.0.1
+%rename bzip2-devel
 
-%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+%description -n %{libname_devel}
+This package includes the header files and libraries needed for
+developing programs using bzip2
 
-make install DESTDIR="$RPM_BUILD_ROOT"
+%description -l pt_BR -n %{libname_devel}
+Este pacote inclui arquivos de inclus?o e biblioteca necess?rio para o
+desenvolvimento de programas que usam o bzip2.
 
-install -m 755 libbz2.so.1.0.2 $RPM_BUILD_ROOT/%{_prefix}/lib/
+%package -n %{libname_static_devel}
+Summary: Static libraries for bzip2 development
+Summary(pt_BR): Bibliotecas est?ticas para desenvolvimento com a bzip2
+Summary(es): Static libraries for bzip2 development
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+Requires: %{libname_devel} = %{version}-%{release}
+Conflicts: bzip2 < 1.0.1
 
-cat > $RPM_BUILD_ROOT%{_prefix}/bin/bzless <<EOF
-#!/bin/sh
-%{_prefix}/bin/bunzip2 -c "\$@" | /usr/bin/less
-EOF
+%description -n %{libname_static_devel}
+Static libraries for bzip2 development
 
-ln -s libbz2.so.%{version} ${RPM_BUILD_ROOT}%{_prefix}/lib/libbz2.so
+%description -l pt_BR -n %{libname_static_devel}
+Bibliotecas est?ticas para desenvolvimento com a bzip2.
 
-%post -p /sbin/ldconfig
+%package doc
+Summary: Extra documentation about bzip2
+Summary(pt_BR): Documenta??o adicional sobre o bzip2
+Group: tinysofa/documentation
+Group(pt_BR): tinysofa/documenta??o
+Group(es): tinysofa/documentaci?n
 
-%postun -p /sbin/ldconfig
+%description doc
+Extra documentation about bzip2
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+%description -l pt_BR doc
+Documenta??o adicional sobre o bzip2
 
-%files
-%defattr(-,root,root)
-%doc  README *.html
-%{_prefix}/bin/*
-%{_mandir}/man1/*
+%prep
+%setup -q
+%patch -p1
 
-%files libs
-%defattr(-,root,root)
-%{_prefix}/lib/libbz2.so.*
+%build
+make -f Makefile-libbz2_so CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \
+        CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -fpic -fPIC" \
+        %{?_smp_mflags} all
+rm -f *.o
+make CC=%{__cc} AR=%{__ar} RANLIB=%{__ranlib} \
+        CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \
+        %{?_smp_mflags} all
 
-%files devel
-%defattr(-,root,root)
-%{_prefix}/include/bzlib.h
-%{_prefix}/lib/libbz2.a
-%{_prefix}/lib/libbz2.so
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/{%{_bindir},%{_mandir}/man1,%{_libdir},%{_includedir}}
+install -m 755 bzlib.h %{buildroot}/%{_includedir}
+install -m 755 libbz2.so.1.0.2 %{buildroot}/%{_libdir}
+install -m 755 libbz2.a %{buildroot}/%{_libdir}
+install -m 755 bzip2-shared  %{buildroot}/%{_bindir}/bzip2
+install -m 755 bzip2recover bzgrep bzdiff bzmore %{buildroot}/%{_bindir}/
+install -m 644 bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 %{buildroot}/%{_mandir}/man1/
+ln -s bzip2 %{buildroot}/%{_bindir}/bunzip2
+ln -s bzip2 %{buildroot}/%{_bindir}/bzcat
+ln -s bzdiff %{buildroot}/%{_bindir}/bzcmp
+ln -s bzmore %{buildroot}/%{_bindir}/bzless
+ln -s libbz2.so.1.0.2 %{buildroot}/%{_libdir}/libbz2.so.1
+ln -s libbz2.so.1 %{buildroot}/%{_libdir}/libbz2.so
+ln -s bzip2.1 %{buildroot}/%{_mandir}/man1/bzip2recover.1
+ln -s bzip2.1 %{buildroot}/%{_mandir}/man1/bunzip2.1
+ln -s bzip2.1 %{buildroot}/%{_mandir}/man1/bzcat.1
+ln -s bzdiff.1 %{buildroot}/%{_mandir}/man1/bzcmp.1
+ln -s bzmore.1 %{buildroot}/%{_mandir}/man1/bzless.1
 
-%changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.0.2-14ts
-- current (1.0.2-13ts) integrated as 1.0.2-14ts for release 1.0-U1
+( cd %{buildroot}%{_prefix}
+  cat > bin/bzless <<EOF
+#!/bin/sh
+%{_bindir}/bunzip2 -c "\$@" | %{_bindir}/less
+EOF
+  chmod 755 bin/bzless
+)
 
-* Wed Dec  3 2003 Erlend Midttun <erlendbm at trustix dot org> 1.0.2-10tr
-- Big rebuild
+%post -n %{libname} -p /sbin/ldconfig
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 1.0.2-9tr
-- Big rebuild
+%postun -n %{libname} -p /sbin/ldconfig
 
-* Tue May 20 2003 Tore Olsen <toreo at trustix dot com> 1.0.2-8to
-- Install dynamically linked bzip2.
-- Link binaries instead of having multiple copies.
-- Added libbz2.so to devel package.
+%clean
+rm -rf %{buildroot}
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 1.0.2-7em
-- Rebuilt against glibc-2.3.2.
+%files
+%defattr(0644,root,root,0755)
+%doc LICENSE README
+%{_mandir}/man1/*
+%defattr(0755,root,root,0755)
+%{_bindir}/*
 
-* Thu Jun 27 2002 Nico Erfurth <ne at perlgolf.de> 1.0.2-6ne
-- Moved libbz2.a to bzip2-devel
+%files -n %{libname}
+%defattr(0644,root,root,0755)
+%{_libdir}/libbz2.so.*
 
-* Thu Jun 27 2002 Nico Erfurth <ne at perlgolf.de> 1.0.2-5ne
-- Implemented usage of macros for LFS
-- splitted the package into runtime/libs/devel
-- removed the useless install-call for libbz2.a it's installed
-  by make install
+%files -n %{libname_devel}
+%defattr(0644,root,root,0755)
+%{_includedir}/*
+%{_libdir}/libbz2.so
 
-* Wed Jun 26 2002 Roland Kruse <rolandk at trustix dot com> 1.0.2-4rk
-- Install libbz2.a
-- Add symlink libbz2.so.1 -> libbz2.so.1.0.2
+%files -n %{libname_static_devel}
+%defattr(0644,root,root,0755)
+%{_libdir}/libbz2.a
 
-* Thu Jun 20 2002 Nico Erfurth <ne at perlgolf.de> 1.0.2-3ne
-- Fixed Source0 must be v102 instead of v100
-- Added LargeFile-support if glibc2.2 or higher is used
+%files doc
+%defattr(0644,root,root,0755)
+%doc *.html CHANGES README.COMPILATION.PROBLEMS Y2K_INFO
 
-* Wed Jun  5 2002 Christian H. Toldnes <christht at trustix dot com>
-- Forceinstall libbz2.so.1.0.2, due to sucky Makefiles.
 
-* Mon Jun  3 2002 Christian H. Toldnes <christht at trustix dot com>
-- Upgrade to 1.0.2
 
-* Wed Nov  1 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Seems like we lost shared libraries along the way.
+%changelog
+* Fri Jun 04 2004 Omar Kilani <omar at tinysofa dot org>
+- tinysofa.
 
-* Tue Sep 12 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Upgrade to 1.0.1
+* Thu Dec 25 2003 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2003-12-25 20:24:51 (42301)
+- Add the bzip2-1.0.2-saneso.patch patch from recent rh
 
-* Fri Jan 21 2000 Tore Olsen <toreo at trustix dot com>
-- upgrade to 0.9.5d
-- remade shlib patch and moved man pages to /usr/share (FHS compliance)
+* Thu Dec 25 2003 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2003-12-25 20:03:17 (42300)
+- Obsoletes bzip2-libs
+- Use the build process in recent bzip2 rh specs
+- Remove "translations" to spanish
 
-* Tue Aug 10 1999 Jeff Johnson <jbj at redhat.com>
-- upgrade to 0.9.5c.
+* Sun Sep 07 2003 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2003-09-07 11:38:03 (35378)
+- Use plain %%configure, not libtoolize, autoconf, etc, etc
 
-* Mon Aug  9 1999 Bill Nottingham <notting at redhat.com>
-- install actual bzip2 binary, not libtool cruft.
+* Sun Sep 07 2003 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2003-09-07 11:25:44 (35377)
+- Remove %%{release} from -devel
 
-* Sun Aug  8 1999 Jeff Johnson <jbj at redhat.com>
-- run ldconfig to get shared library.
+* Thu Apr 10 2003 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2003-04-10 14:01:28 (29670)
+- Update Source and URL to new location, sourceware.cygnus is no more.
 
-* Mon Aug  2 1999 Jeff Johnson <jbj at redhat.com>
-- create shared libbz1.so.* library.
+* Tue Sep 03 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-09-03 14:20:48 (11231)
+- Imported package from snapshot.
 
-* Sun Apr  4 1999 Jeff Johnson <jbj at redhat.com>
-- update to bzip2-0.9.0c.
+* Thu Aug 29 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-29 17:23:38 (7421)
+- Imported package from 8.0.
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
-- auto rebuild in the new build environment (release 4)
+* Wed Aug 28 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-28 18:11:54 (3778)
+- Imported package from 7.0.
 
-* Thu Dec 17 1998 Cristian Gafton <gafton at redhat.com>
-- build against glibc 2.1
-
-* Wed Sep 30 1998 Cristian Gafton <gafton at redhat.com>
-- force compilation with egcs to avoid gcc optimization bug (thank God 
-  we haven't been beaten by it)
-
-* Wed Sep 09 1998 Cristian Gafton <gafton at redhat.com>
-- version 0.9.0b
-
-* Tue Sep 08 1998 Cristian Gafton <gafton at redhat.com>
-- updated to 0.9.0
-
-* Thu Apr 09 1998 Cristian Gafton <gafton at redhat.com>
-- first build for Manhattan
\ No newline at end of file
+* Tue Aug 27 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-27 18:43:44 (227)
+- Imported package from 6.0.


From svn at tinysofa.org  Sat Jun  5 03:06:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 13:06:22 +1000 (EST)
Subject: [tinysofa-svn] r1876 - tinysofa/snapshot/rpm/current/specs
Message-ID: <20040605030622.43C084E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 13:06:22 +1000 (Sat, 05 Jun 2004)
New Revision: 1876

Modified:
   tinysofa/snapshot/rpm/current/specs/rpm.spec
Log:
- Use libbz2 instead of libbzip2.


Modified: tinysofa/snapshot/rpm/current/specs/rpm.spec
===================================================================
--- tinysofa/snapshot/rpm/current/specs/rpm.spec	2004-06-05 03:04:33 UTC (rev 1875)
+++ tinysofa/snapshot/rpm/current/specs/rpm.spec	2004-06-05 03:06:22 UTC (rev 1876)
@@ -88,7 +88,7 @@
 BuildRequires: gettext-devel
 BuildRequires: glibc-devel
 BuildRequires: %{mklibname beecrypt -d -s}
-BuildRequires: %{mklibname bzip2 -d -s} >= 0.9.0c-2
+BuildRequires: %{mklibname bz2 -d -s} >= 0.9.0c-2
 BuildRequires: libtool >= 1.3.5
 BuildRequires: %{mklibname z -d -s}
 BuildRequires: make
@@ -96,7 +96,7 @@
 BuildRequires: doxygen
 %endif
 %if %{with bzip2}
-BuildRequires: %{mklibname bzip2 -d} >= 0.9.0c
+BuildRequires: %{mklibname bz2 -d} >= 0.9.0c
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 


From svn at tinysofa.org  Sat Jun  5 03:07:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat,  5 Jun 2004 13:07:55 +1000 (EST)
Subject: [tinysofa-svn] r1877 - tinysofa/snapshot/elfutils/current/specs
Message-ID: <20040605030755.20CE94E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-05 13:07:54 +1000 (Sat, 05 Jun 2004)
New Revision: 1877

Modified:
   tinysofa/snapshot/elfutils/current/specs/elfutils.spec
Log:
- Based on Conectiva package.
- Uses tinysofa rpm macros.
- Fix library packages per tinysofa policy.


Modified: tinysofa/snapshot/elfutils/current/specs/elfutils.spec
===================================================================
--- tinysofa/snapshot/elfutils/current/specs/elfutils.spec	2004-06-05 03:06:22 UTC (rev 1876)
+++ tinysofa/snapshot/elfutils/current/specs/elfutils.spec	2004-06-05 03:07:54 UTC (rev 1877)
@@ -1,81 +1,191 @@
-%define gpl 0
-Summary: A collection of utilities and DSOs to handle compiled objects.
+%define _gnu %{nil}
+%define _programprefix eu-
+
+%define libelf			 %{mklibname %{name}-libelf}
+%define libelf_devel		 %{mklibname %{name}-libelf -d}
+%define libelf_static_devel	 %{mklibname %{name}-libelf -d -s}
+
 Name: elfutils
 Version: 0.95
-Release: 1ts
-%if %{gpl}
-Copyright: GPL
-%else
-Copyright: OSL
-%endif
-Group: tinysofa official
-#URL: file://home/devel/drepper/
+Release: 2ok
+License: OSL
+Summary: Collection of utilities and libraries to handle compiled objects
+Summary(pt_BR): Cole??o de utilit?rios e bibliotecas para gerenciar objetos compilados
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+URL: http://packages.debian.org/unstable/devel/elfutils.html
 Source: elfutils-%{version}.tar.gz
-Obsoletes: libelf libelf-devel
-Requires: elfutils-libelf = %{version}-%{release}
-%if %{gpl}
-Requires: binutils >= 2.14
-%endif
-
-# ExcludeArch: xxx
-
-BuildRoot: %{_tmppath}/%{name}-root
+Requires: %{libelf} = %{version}-%{release}
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: gcc >= 3.2
 BuildRequires: sharutils
+BuildRoot: %{_tmppath}/%{name}-root
 
-%define _gnu %{nil}
-%define _programprefix eu-
-
 %description
 Elfutils is a collection of utilities, including ld (a linker),
 nm (for listing symbols from object files), size (for listing the
 section sizes of an object or archive file), strip (for discarding
-symbols), readelf (to see the raw ELF file structures), and elflint
+symbols), readline (to see the raw ELF file structures), and elflint
 (to check for well-formed ELF files).  Also included are numerous
 helper libraries which implement DWARF, ELF, and machine-specific ELF
 handling.
 
-%package devel
-Summary: Development libraries to handle compiled objects.
-Group: tinysofa official
-Requires: elfutils = %{version}-%{release}
-Requires: elfutils-libelf-devel = %{version}-%{release}
+%description -l pt_BR
+Elfutils ? uma cole??o de utilit?rios, incluindo ld (um linker),
+nm (para listar s?mbolos de arquivos objetos), size (para listar
+o tamanho das se??es de um objeto ou archive file), strip (para
+descartar s?mbolos), readline (para ver as estruturas do arquivo ELF),
+e elflint (para verificar a validade dos arquivos ELF). Tamb?m
+incluidas est?o diversas bibliotecas auxiliares que implementam
+DWARF, ELF, e manipula??o de arquivos ELF espec?fica da arquitetura.
 
-%description devel
-The elfutils-devel package contains the libraries to create
-applications for handling compiled objects.  libebl provides some
-higher-level ELF access functionality.  libdw provides access to
-the DWARF debugging information.  libasm provides a programmable
-assembler interface.
+%package -n %{libname}
+Summary: Shared libraries to handle compiled objects
+Summary(pt_BR): Bibliotecas para manipular objetos compilados
+Group: tinysofa/libraries
+Group(pt_BR): tinysofa/bibliotecas
+Group(es): tinysofa/bibliotecas
 
-%package libelf
-Summary: Library to read and write ELF files.
-Group: tinysofa official
+%description -n %{libname}
+Elfutils is a collection of utilities, including ld (a linker),
+nm (for listing symbols from object files), size (for listing the
+section sizes of an object or archive file), strip (for discarding
+symbols), readline (to see the raw ELF file structures), and elflint
+(to check for well-formed ELF files).  Also included are numerous
+helper libraries which implement DWARF, ELF, and machine-specific ELF
+handling.
 
-%description libelf
-The elfutils-libelf package provides a DSO which allows reading and
+%description -n %{libname} -l pt_BR
+Elfutils ? uma cole??o de utilit?rios, incluindo ld (um linker),
+nm (para listar s?mbolos de arquivos objetos), size (para listar
+o tamanho das se??es de um objeto ou archive file), strip (para
+descartar s?mbolos), readline (para ver as estruturas do arquivo ELF),
+e elflint (para verificar a validade dos arquivos ELF). Tamb?m
+incluidas est?o diversas bibliotecas auxiliares que implementam
+DWARF, ELF, e manipula??o de arquivos ELF espec?fica da arquitetura.
+
+%package -n %{libname_devel}
+Summary: Development libraries to handle compiled objects
+Summary(pt_BR): Bibliotecas de desenvolvimento para manipular objetos compilados
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+Requires: %{libname} = %{version}-%{release}
+%rename elfutils-devel
+
+%description -n %{libname_devel}
+Elfutils is a collection of utilities, including ld (a linker),
+nm (for listing symbols from object files), size (for listing the
+section sizes of an object or archive file), strip (for discarding
+symbols), readline (to see the raw ELF file structures), and elflint
+(to check for well-formed ELF files).  Also included are numerous
+helper libraries which implement DWARF, ELF, and machine-specific ELF
+handling.
+
+%description -n %{libname_devel} -l pt_BR
+Elfutils ? uma cole??o de utilit?rios, incluindo ld (um linker),
+nm (para listar s?mbolos de arquivos objetos), size (para listar
+o tamanho das se??es de um objeto ou archive file), strip (para
+descartar s?mbolos), readline (para ver as estruturas do arquivo ELF),
+e elflint (para verificar a validade dos arquivos ELF). Tamb?m
+incluidas est?o diversas bibliotecas auxiliares que implementam
+DWARF, ELF, e manipula??o de arquivos ELF espec?fica da arquitetura.
+
+%package -n %{libname_static_devel}
+Summary: Static development libraries to handle compiled objects
+Summary(pt_BR): Bibliotecas est?ticas de desenvolvimento para manipular objetos compilados
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+Requires: %{libname_devel} = %{version}-%{release}
+
+%description -n %{libname_static_devel}
+Elfutils is a collection of utilities, including ld (a linker),
+nm (for listing symbols from object files), size (for listing the
+section sizes of an object or archive file), strip (for discarding
+symbols), readline (to see the raw ELF file structures), and elflint
+(to check for well-formed ELF files).  Also included are numerous
+helper libraries which implement DWARF, ELF, and machine-specific ELF
+handling.
+
+%description -n %{libname_static_devel} -l pt_BR
+Elfutils ? uma cole??o de utilit?rios, incluindo ld (um linker),
+nm (para listar s?mbolos de arquivos objetos), size (para listar
+o tamanho das se??es de um objeto ou archive file), strip (para
+descartar s?mbolos), readline (para ver as estruturas do arquivo ELF),
+e elflint (para verificar a validade dos arquivos ELF). Tamb?m
+incluidas est?o diversas bibliotecas auxiliares que implementam
+DWARF, ELF, e manipula??o de arquivos ELF espec?fica da arquitetura.
+
+%package -n %{libelf}
+Summary: Library to read and write ELF files
+Summary(pt_BR): Biblioteca para ler e escrever arquivos ELF
+Group: tinysofa/libraries
+Group(pt_BR): tinysofa/bibliotecas
+Group(es): tinysofa/bibliotecas
+%rename elfutils-libelf
+
+%description -n %{libelf}
+This package provides a library which allows reading and
 writing ELF files on a high level.  Third party programs depend on
 this package to read internals of ELF files.  The programs of the
 elfutils package use it also to generate new ELF files.
 
-%package libelf-devel
-Summary: Development support for libelf
-Group: tinysofa official
-Requires: elfutils-libelf = %{version}-%{release}
-Conflicts: libelf-devel
+%description -n %{libelf} -l pt_BR
+Este pacote prov? uma biblioteca que permite ler e escrever arquivos
+ELF em um alto n?vel. Outros programas dependem deste pacote para
+acessar as estruturas internas dos arquivos ELF. Os programas do
+pacote elfutils principal tamb?m usam ele para gerar novos arquivos ELF.
 
-%description libelf-devel
-The elfutils-libelf-devel package contains the libraries to create
-applications for handling compiled objects.  libelf allows you to
-access the internals of the ELF object file format, so you can see the
-different sections of an ELF file.
+%package -n %{libelf_devel}
+Summary: Development library to read and write ELF files
+Summary(pt_BR): Bibliotecas de desenvolvimento para ler e escrever arquivos ELF
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+Requires: %{libelf} = %{version}-%{release}
+%rename elfutils-libelf-devel
 
+%description -n %{libelf_devel}
+This package provides a library which allows reading and
+writing ELF files on a high level.  Third party programs depend on
+this package to read internals of ELF files.  The programs of the
+elfutils package use it also to generate new ELF files.
+
+%description -n %{libelf_devel} -l pt_BR
+Este pacote prov? uma biblioteca que permite ler e escrever arquivos
+ELF em um alto n?vel. Outros programas dependem deste pacote para
+acessar as estruturas internas dos arquivos ELF. Os programas do
+pacote elfutils principal tamb?m usam ele para gerar novos arquivos ELF.
+
+%package -n %{libelf_static_devel}
+Summary: Static development library to read and write ELF files
+Summary(pt_BR): Bibliotecas est?ticas de desenvolvimento para ler e escrever arquivos ELF
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+Requires: %{libelf_devel} = %{version}-%{release}
+
+%description -n %{libelf_static_devel}
+This package provides a library which allows reading and
+writing ELF files on a high level.  Third party programs depend on
+this package to read internals of ELF files.  The programs of the
+elfutils package use it also to generate new ELF files.
+
+%description -n %{libelf_static_devel} -l pt_BR
+Este pacote prov? uma biblioteca que permite ler e escrever arquivos
+ELF em um alto n?vel. Outros programas dependem deste pacote para
+acessar as estruturas internas dos arquivos ELF. Os programas do
+pacote elfutils principal tamb?m usam ele para gerar novos arquivos ELF.
+
 %prep
 %setup -q
 
 %build
 mkdir build-%{_target_platform}
-cd build-%{_target_platform}
+pushd build-%{_target_platform}
 ../configure \
   --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
   --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
@@ -83,260 +193,95 @@
   --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
   --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
   --infodir=%{_infodir} --program-prefix=%{_programprefix} --enable-shared
-cd ..
+popd
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_prefix}
 
-cd build-%{_target_platform}
+pushd build-%{_target_platform}
 #make check
 %makeinstall
+popd
 
-chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/lib*.so*
-%if !%{gpl}
-chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so*
-%endif
-
-cd ..
-
-%if !%{gpl}
-# XXX Nuke unpackaged files
-{ cd ${RPM_BUILD_ROOT}
-  rm -f .%{_bindir}/eu-ld
-  rm -f .%{_includedir}/elfutils/libasm.h
-  rm -f .%{_includedir}/elfutils/libdw.h
-  rm -f .%{_libdir}/libasm-%{version}.so
-  rm -f .%{_libdir}/libasm.a
-  rm -f .%{_libdir}/libdw.so
-  rm -f .%{_libdir}/libdw.a
-}
-%endif
-
-#%check
-#cd build-%{_target_platform}
-#make check
-
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%post libelf -p /sbin/ldconfig
+%post -n %{libelf} -p /sbin/ldconfig
 
-%postun libelf -p /sbin/ldconfig
+%postun -n %{libelf} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
 %doc README TODO
-%if %{gpl}
-%doc fake-src/FULL
-%endif
+%defattr(0755,root,root)
 %{_bindir}/eu-elflint
+%{_bindir}/eu-ld
 %{_bindir}/eu-nm
 %{_bindir}/eu-readelf
 %{_bindir}/eu-size
 %{_bindir}/eu-strip
-%if !%{gpl}
-#%{_bindir}/eu-ld
-#%{_libdir}/libasm-%{version}.so
+
+%files -n %{libname}
+%{_libdir}/libasm-%{version}.so
 %{_libdir}/libdw-%{version}.so
-#%{_libdir}/libasm*.so.*
+%{_libdir}/libasm*.so.*
 %{_libdir}/libdw*.so.*
 %dir %{_libdir}/elfutils
 %{_libdir}/elfutils/lib*.so
-%endif
 
-%files devel
-%defattr(-,root,root)
+%files -n %{libname_devel}
+%defattr(0644,root,root,0755)
 %{_includedir}/dwarf.h
-%dir %{_includedir}/elfutils
-%{_includedir}/elfutils/elf-knowledge.h
-%if !%{gpl}
-%{_includedir}/elfutils/libebl.h
-#%{_libdir}/libasm.a
+%{_includedir}/gelf.h
+%{_includedir}/nlist.h
+%dir %{_includedir}/elfutils/
+%{_includedir}/elfutils/*
+%{_libdir}/libasm.so
+%{_libdir}/libdw.so
+
+%files -n %{libname_static_devel}
+%defattr(0644,root,root,0755)
+%{_libdir}/libasm.a
 %{_libdir}/libebl.a
-#%{_libdir}/libdw.a
-#%{_libdir}/libasm.so
-#%{_libdir}/libdw.so
-%endif
+%{_libdir}/libelf.a
 
-%files libelf
-%defattr(-,root,root)
+%files -n %{libelf}
+%defattr(0644,root,root,0755)
 %{_libdir}/libelf-%{version}.so
 %{_libdir}/libelf*.so.*
 
-%files libelf-devel
-%defattr(-,root,root)
-%{_includedir}/libelf.h
-%{_includedir}/gelf.h
-%{_includedir}/nlist.h
-%{_libdir}/libelf.a
+%files -n %{libelf_devel}
+%defattr(0644,root,root,0755)
 %{_libdir}/libelf.so
+%{_includedir}/libelf.h
 
+%files -n %{libelf_static_devel}
+%defattr(0644,root,root,0755)
+%{_libdir}/libdw.a
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.95-1ts
-- current (0.95-1ok) integrated as 0.95-1ts for release 1.0-U1
+* Fri Jun 04 2004 Omar Kilani <omar at tinysofa dot org> 0.95-2ok
+- tinysofa.
 
-* Thu May 13 2004 Omar Kilani <omar at tinysofa dot org> 0.95-1ok
-- New Upstream.
+* Fri Dec 26 2003 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2003-12-26 09:23:34 (42341)
+- Added missing Requires to -devel in -devel-static, the later alone is not
+  useful as one needs the headers.
+- Added libdwarf.a to -devel-static package
 
-* Fri Mar 26 2004 Omar Kilani <omar at tinysofa dot org> 0.94-3ts
-- tinysofaise.
+* Fri Nov 28 2003 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2003-11-28 10:40:18 (40616)
+- Fixing file modes.
 
-* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
+* Fri Nov 28 2003 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2003-11-28 10:26:12 (40613)
+- Adding elfutils package.
 
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Fri Jan 16 2004 Jakub Jelinek <jakub at redhat.com> 0.94-1
-- upgrade to 0.94
-
-* Fri Jan 16 2004 Jakub Jelinek <jakub at redhat.com> 0.93-1
-- upgrade to 0.93
-
-* Thu Jan  8 2004 Jakub Jelinek <jakub at redhat.com> 0.92-1
-- full version
-- macroized spec file for GPL or OSL builds
-- include only libelf under GPL plus wrapper scripts
-
-* Wed Jan  7 2004 Jakub Jelinek <jakub at redhat.com> 0.91-2
-- macroized spec file for GPL or OSL builds
-
-* Wed Jan  7 2004 Ulrich Drepper <drepper at redhat.com>
-- split elfutils-devel into two packages.
-
-* Wed Jan  7 2004 Jakub Jelinek <jakub at redhat.com> 0.91-1
-- include only libelf under GPL plus wrapper scripts
-
-* Tue Dec 23 2003 Jeff Johnson <jbj at redhat.com> 0.89-3
-- readelf, not readline, in %%description (#111214).
-
-* Fri Sep 26 2003 Bill Nottingham <notting at redhat.com> 0.89-1
-- update to 0.89 (fix eu-strip)
-
-* Tue Sep 23 2003 Jakub Jelinek <jakub at redhat.com> 0.86-3
-- update to 0.86 (fix eu-strip on s390x/alpha)
-- libebl is an archive now; remove references to DSO
-
-* Mon Jul 14 2003 Jeff Johnson <jbj at redhat.com> 0.84-3
-- upgrade to 0.84 (readelf/elflint improvements, rawhide bugs fixed).
-
-* Fri Jul 11 2003 Jeff Johnson <jbj at redhat.com> 0.83-3
-- upgrade to 0.83 (fix invalid ELf handle on *.so strip, more).
-
-* Wed Jul  9 2003 Jeff Johnson <jbj at redhat.com> 0.82-3
-- upgrade to 0.82 (strip tests fixed on big-endian).
-
-* Tue Jul  8 2003 Jeff Johnson <jbj at redhat.com> 0.81-3
-- upgrade to 0.81 (strip excludes unused symtable entries, test borked).
-
-* Thu Jun 26 2003 Jeff Johnson <jbj at redhat.com> 0.80-3
-- upgrade to 0.80 (debugedit changes for kernel in progress).
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Wed May 21 2003 Jeff Johnson <jbj at redhat.com> 0.79-2
-- upgrade to 0.79 (correct formats for size_t, more of libdw "works").
-
-* Mon May 19 2003 Jeff Johnson <jbj at redhat.com> 0.78-2
-- upgrade to 0.78 (libdwarf bugfix, libdw additions).
-
-* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
-- debuginfo rebuild
-
-* Thu Feb 20 2003 Jeff Johnson <jbj at redhat.com> 0.76-2
-- use the correct way of identifying the section via the sh_info link.
-
-* Sat Feb 15 2003 Jakub Jelinek <jakub at redhat.com> 0.75-2
-- update to 0.75 (eu-strip -g fix)
-
-* Tue Feb 11 2003 Jakub Jelinek <jakub at redhat.com> 0.74-2
-- update to 0.74 (fix for writing with some non-dirty sections)
-
-* Thu Feb  6 2003 Jeff Johnson <jbj at redhat.com> 0.73-3
-- another -0.73 update (with sparc fixes).
-- do "make check" in %%check, not %%install, section.
-
-* Mon Jan 27 2003 Jeff Johnson <jbj at redhat.com> 0.73-2
-- update to 0.73 (with s390 fixes).
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Wed Jan 22 2003 Jakub Jelinek <jakub at redhat.com> 0.72-4
-- fix arguments to gelf_getsymshndx and elf_getshstrndx
-- fix other warnings
-- reenable checks on s390x
-
-* Sat Jan 11 2003 Karsten Hopp <karsten at redhat.de> 0.72-3
-- temporarily disable checks on s390x, until someone has
-  time to look at it
-
-* Thu Dec 12 2002 Jakub Jelinek <jakub at redhat.com> 0.72-2
-- update to 0.72
-
-* Wed Dec 11 2002 Jakub Jelinek <jakub at redhat.com> 0.71-2
-- update to 0.71
-
-* Wed Dec 11 2002 Jeff Johnson <jbj at redhat.com> 0.69-4
-- update to 0.69.
-- add "make check" and segfault avoidance patch.
-- elfutils-libelf needs to run ldconfig.
-
-* Tue Dec 10 2002 Jeff Johnson <jbj at redhat.com> 0.68-2
-- update to 0.68.
-
-* Fri Dec  6 2002 Jeff Johnson <jbj at redhat.com> 0.67-2
-- update to 0.67.
-
-* Tue Dec  3 2002 Jeff Johnson <jbj at redhat.com> 0.65-2
-- update to 0.65.
-
-* Mon Dec  2 2002 Jeff Johnson <jbj at redhat.com> 0.64-2
-- update to 0.64.
-
-* Sun Dec 1 2002 Ulrich Drepper <drepper at redhat.com> 0.64
-- split packages further into elfutils-libelf
-
-* Sat Nov 30 2002 Jeff Johnson <jbj at redhat.com> 0.63-2
-- update to 0.63.
-
-* Fri Nov 29 2002 Ulrich Drepper <drepper at redhat.com> 0.62
-- Adjust for dropping libtool
-
-* Sun Nov 24 2002 Jeff Johnson <jbj at redhat.com> 0.59-2
-- update to 0.59
-
-* Thu Nov 14 2002 Jeff Johnson <jbj at redhat.com> 0.56-2
-- update to 0.56
-
-* Thu Nov  7 2002 Jeff Johnson <jbj at redhat.com> 0.54-2
-- update to 0.54
-
-* Sun Oct 27 2002 Jeff Johnson <jbj at redhat.com> 0.53-2
-- update to 0.53
-- drop x86_64 hack, ICE fixed in gcc-3.2-11.
-
-* Sat Oct 26 2002 Jeff Johnson <jbj at redhat.com> 0.52-3
-- get beehive to punch a rhpkg generated package.
-
-* Wed Oct 23 2002 Jeff Johnson <jbj at redhat.com> 0.52-2
-- build in 8.0.1.
-- x86_64: avoid gcc-3.2 ICE on x86_64 for now.
-
-* Tue Oct 22 2002 Ulrich Drepper <drepper at redhat.com> 0.52
-- Add libelf-devel to conflicts for elfutils-devel
-
-* Mon Oct 21 2002 Ulrich Drepper <drepper at redhat.com> 0.50
-- Split into runtime and devel package
-
-* Fri Oct 18 2002 Ulrich Drepper <drepper at redhat.com> 0.49
-- integrate into official sources
-
-* Wed Oct 16 2002 Jeff Johnson <jbj at redhat.com> 0.46-1
-- Swaddle.
\ No newline at end of file
+* Fri Nov 28 2003 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2003-11-28 08:16:41 (40601)
+- Created package structure for elfutils.


From svn at tinysofa.org  Sat Jun  5 14:41:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Jun 2004 00:41:35 +1000 (EST)
Subject: [tinysofa-svn] 
	r1879 - in tinysofa/snapshot/lilo/current: sources specs
Message-ID: <20040605144135.C01304E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-06 00:41:34 +1000 (Sun, 06 Jun 2004)
New Revision: 1879

Added:
   tinysofa/snapshot/lilo/current/sources/keytab-lilo.c
   tinysofa/snapshot/lilo/current/sources/lilo-22.3.3-page.patch
   tinysofa/snapshot/lilo/current/sources/lilo-22.5.8-lvm_ioctl_fixup.patch
Modified:
   tinysofa/snapshot/lilo/current/specs/lilo.spec
Log:
- rework lilo spec file from Conectiva and Fedora spec files


Added: tinysofa/snapshot/lilo/current/sources/keytab-lilo.c
===================================================================
--- tinysofa/snapshot/lilo/current/sources/keytab-lilo.c	2004-06-05 03:29:21 UTC (rev 1878)
+++ tinysofa/snapshot/lilo/current/sources/keytab-lilo.c	2004-06-05 14:41:34 UTC (rev 1879)
@@ -0,0 +1,217 @@
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+
+#define TABLE_SIZE 65536
+
+static char *map_names[]={
+	"plain","shift","ctrl","altgr","shift_ctrl",
+	"altgr_ctrl","alt","shift_alt","ctrl_alt", NULL
+};
+
+static char *def_map="us";
+static char *def_ext=".map";
+static char *prog;
+static int table[TABLE_SIZE];
+
+struct hexbuf
+{
+	int ct;
+	int buf[1024];
+};
+
+struct map
+{
+	struct hexbuf maps[9];
+};
+
+static struct map kbd;
+static struct map def;
+
+static void usage(void)
+{
+	fprintf(stderr, "usage: %s [ -p old_code=new_code ] ...\n"
+		"%*s[path]default_layout[.map] ] "
+		"[path]kbd_layout[.map]\n",
+		prog, strlen(prog)-8, "");
+	exit(1); 
+}
+
+
+static void hexify(struct hexbuf *hb, char *p)
+{
+	while(*p)
+	{
+		char *n;
+		while(*p && isspace(*p))
+			p++;
+		if(!*p)
+			return;
+		if(strncmp(p,"0x",2))
+		{
+			fprintf(stderr, "%s: bad format.\n", prog);
+			exit(1);
+		}
+		n=p+2;
+		p=strchr(p,',');
+		if(p!=NULL)
+			*p++=0;
+		if(sscanf(n, "%x", &hb->buf[hb->ct++])!=1)
+		{
+			fprintf(stderr, "%s: bad format.\n", prog);
+			exit(1);
+		}
+	}
+}
+	
+static int which_map(char *p)
+{
+	int i;
+	for(i=0;i<9;i++)
+	{
+		if(strcmp(p, map_names[i])==0)
+			return i;
+	}
+	fprintf(stderr, "%s: bad map name '%s'.\n", prog, p);
+	exit(1);
+}
+
+
+
+
+static void load_map(struct map *m, char *map)
+{
+	int empty;
+	char *map_ext;
+	char buf[1024];
+	FILE *file;
+	int n = 0;
+	struct hexbuf *current;
+
+	if(map==NULL)
+		map=def_map;
+	if(strchr(map,'.'))
+		map_ext="";
+	else
+		map_ext=def_ext;
+		
+	fprintf(stderr, "going to run loadkeys\n");
+	snprintf(buf, 1024, "loadkeys -m \"%s%s\"", map, map_ext);
+	fprintf(stderr, "buf is %s\n", buf);
+	
+	file=popen(buf, "r");
+	if(file==NULL)
+	{
+		perror("loadkeys");
+		exit(1);
+	}
+	
+	current=NULL;
+	empty = 1;
+	
+	while(fgets(buf, 1024, file)!=NULL)
+	{
+		char *dp=buf;
+		if(strncmp(dp, "static ", 7)==0)
+			dp+=7;
+		if(strncmp(dp, "u_short ", 8)==0)
+		{
+			if(current)
+			{
+				fprintf(stderr, "%s: active at beginning of map.\n", prog);
+				exit(1);
+			}
+			else
+			{
+				char *ep=strchr(dp+8,'_');
+				*ep=0;
+				current = &m->maps[which_map(dp+8)];
+				continue;
+			}
+		}
+		if(strncmp(buf, "};",2)==0)
+		{
+			current=NULL;
+		}
+		if(current==NULL)
+			continue;
+		hexify(current, buf);
+		empty = 0;
+	}
+	pclose(file);
+	if(empty)
+	{
+		fprintf(stderr, "%s: Keymap is empty\n", prog);
+		exit(1);
+	}
+}
+
+
+static void build_table(char *maps[])
+{
+ 	int set = 0;
+	char *map;
+ 	int i=0,j;
+ 	static unsigned int tmp[9*256];
+ 	
+ 	for(i=0;maps[i]!=NULL;i++)
+ 	{
+		struct hexbuf *hb = &def.maps[i];
+		int code = set;
+		for (j=0;j<256;j++)
+		{
+			if(tmp[code]==0)
+				tmp[code] = hb->buf[j];
+			code++;
+		}
+		set += 256;
+	}
+	set = 0;
+	
+	i=0;
+	for(i=0;maps[i]!=NULL; i++)
+	{
+		struct hexbuf *hb = &kbd.maps[i];
+		int code = set;
+		for(j=0;j<256;j++)
+		{
+			if(table[tmp[code]]==0)
+				table[tmp[code]] = hb->buf[j];
+			code++;
+		}
+		set += 256;
+	}
+	table[0] = 0;
+}
+
+int main(int argc, char *argv[])
+{
+	int i;
+	prog=argv[0];
+	argv++;
+	/*
+	 *	Load user set keyvals
+	 */
+	while(argv[0] && strcmp(argv[0],"-p")==0)
+	{
+		int o,n;
+		argv++;
+		if(argv[0]==NULL || sscanf(argv[0], "%d=%d", &o, &n)!=2)
+			usage();
+		if(o < TABLE_SIZE)
+			table[o]=n;
+		argv++;
+	}
+	
+	if(argv[0]==NULL)
+		usage();
+	load_map(&def,argv[1] ? argv[0] : NULL);
+	load_map(&kbd,argv[1] ? argv[1] : argv[0]);
+	
+	build_table(map_names);
+	for (i = 0; i < 256; i++) {
+		printf("%c",table[i] ? table[i] : i);
+	}
+	return 0;
+}

Added: tinysofa/snapshot/lilo/current/sources/lilo-22.3.3-page.patch
===================================================================
--- tinysofa/snapshot/lilo/current/sources/lilo-22.3.3-page.patch	2004-06-05 03:29:21 UTC (rev 1878)
+++ tinysofa/snapshot/lilo/current/sources/lilo-22.3.3-page.patch	2004-06-05 14:41:34 UTC (rev 1879)
@@ -0,0 +1,20 @@
+--- lilo-22.3.3/boot.c.page	2002-04-08 00:45:34.000000000 -0300
++++ lilo-22.3.3/boot.c	2004-04-16 21:20:08.532020594 -0300
+@@ -19,6 +19,7 @@
+ #include <errno.h>
+ #include <a.out.h>
+ #include <sys/stat.h>
++#include <asm/page.h>
+ 
+ #include "config.h"
+ #include "common.h"
+--- lilo-22.3.3/partition.c.page	2002-04-19 01:45:30.000000000 -0300
++++ lilo-22.3.3/partition.c	2004-04-16 21:22:43.065215302 -0300
+@@ -23,6 +23,7 @@
+ #include <linux/unistd.h>
+ #include <limits.h>
+ #include <linux/fs.h>
++#include <asm/page.h>
+ #include <time.h>
+ #include "config.h"
+ #include "lilo.h"

Added: tinysofa/snapshot/lilo/current/sources/lilo-22.5.8-lvm_ioctl_fixup.patch
===================================================================
--- tinysofa/snapshot/lilo/current/sources/lilo-22.5.8-lvm_ioctl_fixup.patch	2004-06-05 03:29:21 UTC (rev 1878)
+++ tinysofa/snapshot/lilo/current/sources/lilo-22.5.8-lvm_ioctl_fixup.patch	2004-06-05 14:41:34 UTC (rev 1879)
@@ -0,0 +1,22 @@
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff lilo-orig/geometry.c lilo-22.5.8/geometry.c
+--- lilo-orig/geometry.c	2004-02-03 20:07:37.000000000 +0100
++++ lilo-22.5.8/geometry.c	2004-02-03 20:09:49.000000000 +0100
+@@ -93,10 +93,16 @@ struct lv_bmap {
+ };
+ 
+ #ifndef LV_BMAP
+-#define LV_BMAP				_IOWR(0xfe, 0x30, 1)
++#ifndef _IOWR_BAD
++#define _IOWR_BAD(a,b,c)	_IOWR(a,b,c)
++#endif
++#define LV_BMAP				_IOWR_BAD(0xfe, 0x30, 1)
+ #endif
+ #ifndef LVM_GET_IOP_VERSION
+-#define LVM_GET_IOP_VERSION		_IOR(0xfe, 0x98, 1)
++#ifndef _IOR_BAD
++#define _IOR_BAD(a,b,c)	_IOR(a,b,c)
++#endif
++#define LVM_GET_IOP_VERSION		_IOR_BAD(0xfe, 0x98, 1)
+ #endif
+ #endif
+ 

Modified: tinysofa/snapshot/lilo/current/specs/lilo.spec
===================================================================
--- tinysofa/snapshot/lilo/current/specs/lilo.spec	2004-06-05 03:29:21 UTC (rev 1878)
+++ tinysofa/snapshot/lilo/current/specs/lilo.spec	2004-06-05 14:41:34 UTC (rev 1879)
@@ -1,66 +1,104 @@
 %define upstreamversion 22.3.2
 
-Summary: The boot loader for Linux and other operating systems.
+Summary: The boot loader for Linux and other operating systems
+Summary(pt_BR): Carregador de boot para Linux e outros sistemas operacionais
+Summary(es): Cargador de arranque para Linux y otros sistemas operativos
 Name: lilo
 Version: 0.%{upstreamversion}
-Release: 10ts
+Release: 11jh
 License: MIT
-Group: tinysofa official
-Source: http://home.san.rr.com/johninsd/pub/linux/lilo/lilo-%{upstreamversion}.tar.gz
+Group: tinysofa/main
+Source: http://www.ibiblio.org/pub/Linux/system/boot/lilo/%{name}-%{upstreamversion}.tar.gz
+Source2: keytab-lilo.c
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Patch0: lilo-nolatexdoc.patch
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: ld-linux.so.2 libc.so.6 /bin/sh
-Buildrequires: perl, dev86, nasm
-Autoreq: 0
+Patch1: lilo-22.5.8-lvm_ioctl_fixup.patch
+Patch2: lilo-22.3.3-page.patch
+PreReq: /sbin/grubby
+BuildRequires: dev86, nasm
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Exclusivearch: i386 i586
 
+
 %description
 LILO (LInux LOader) is a basic system program which boots your Linux
 system.  LILO loads the Linux kernel from a floppy or a hard drive,
 boots the kernel and passes control of the system to the kernel.  LILO
-can also boot other operating systems.
+can also boot other operating systems, including the BSD variants, DOS
+and OS/2.
 
-%package perl
-Summary: The script of lilo that requires perl
-Group: tinysofa official
-Requires: perl
-Autoreq: 0
+%description -l pt_BR
+Lilo ?spons? pelo carregamento do kernel Linux de um disquete
+ou do disco r?o, dando a ele o controle do sistema. Ele pode
+tamb?er usado para "bootar" v?s outros sistemas operacionais,
+incluindo variantes de BSD, DOS e OS/2.
 
-%description perl
-This package contains the perl script lilo-keymap.pl. They
-have been separated into their own package so that rpm doesn't require
-perl.
+%description -l es
+Lilo es responsable de cargar el kernel Linux de un disquete o
+del disco duro, d?dole el control del sistema. Puede tambi? ser
+usado para "bootar" varios otros sistemas operativos, incluyendo
+variantes de BSD, DOS y OS/2.
 
+%package doc
+Summary: Documentation on lilo
+Summary(pt_BR): Documenta?o sobre o lilo
+Summary(es): Documentaci? sobre lilo
+Group: tinysofa/documentation
+
+%description doc
+Documentation on lilo
+
+%description -l pt_BR doc
+Documenta?o sobre o lilo
+
+%description -l es doc
+Documentaci? sobre lilo
+
+
 %prep
 %setup -q -n lilo-%{upstreamversion}
 %patch0 -p1 
+%patch1 -p1 -b .lvm_ioctl-fixup
+%patch2 -p1 -b .page
 
-%build
 # we need a hack to properly use CFLAGS
 sed -e "s/^CFLAGS=/CFLAGS=$RPM_OPT_FLAGS /" < Makefile > Makefile.new
 mv Makefile.new Makefile
-make
-make -C doc 
+
+%build
+%make
+%make -C doc 
 rm -f doc/*.aux doc/*.log doc/*.toc
 
+gcc $RPM_OPT_FLAGS -o keytab-lilo %{SOURCE2}
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/man{5,8}
-make install ROOT=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/usr/sbin $RPM_BUILD_ROOT/usr/bin
-install -m 644 manPages/lilo.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 644 manPages/mkrescue.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 644 manPages/lilo.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
+mkdir -p %{buildroot}/%{_mandir}
+make install ROOT=%{buildroot} MAN_DIR=%{_mandir}
 
-rm -rf $RPM_BUILD_ROOT/usr/man
+# this pulls in a perl dependency with it we don't want
+rm -f %{buildroot}%{_sbindir}/keytab-lilo.pl
+chmod 0644 keytab-lilo.pl
 
-%post
-test -f /etc/lilo.conf && lilo || :
+install -D -m 755 keytab-lilo %{buildroot}%{_bindir}/keytab-lilo
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+%post
+# this doesn't seem to woek yet
+#if [ -f "%{_sysconfdir}/lilo.conf" ]; then
+#	inst=$(/sbin/grubby --bootloader-probe | grep lilo)
+#	if [ -n "$inst" ]; then
+#		/sbin/lilo > /dev/null
+#	fi
+#fi
+if [ -f "%{_sysconfdir}/lilo.conf" ]; then
+	/sbin/lilo > /dev/null
+fi
+
 %files
-%defattr(-,root,root)
+%defattr(644,root,root)
 %doc CHANGES COPYING INCOMPAT QuickInst README README.bitmaps
 %doc README.common.problems README.disk README.pseudo README.raid1
 # %doc doc
@@ -68,99 +106,13 @@
 /usr/share/man/man5/lilo.conf.5*
 /usr/share/man/man8/lilo.8*
 /usr/share/man/man8/mkrescue.8*
+%defattr(-,root,root)
 /sbin/mkrescue
 /sbin/lilo
+%{_bindir}/keytab-lilo
 
-%files perl
-%defattr(-,root,root)
-/usr/bin/keytab-lilo.pl
 
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.22.3.2-10ts
-- current (0.22.3.2-9ts) integrated as 0.22.3.2-10ts for release 1.0-U1
+* Sat Jun  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.22.3.2-11jh
+- rework lilo spec file from Conectiva and Fedora spec files
 
-* Mon Dec 15 2003 Erlend Midttun <erlendbm at trustix dot org> 0.22.3.2-6tr
-- Rebuilt.
-
-* Mon Jun 23 2003 Erlend Midttun <erlendbm at trustix dot com> 0.22.3.2-5tr
-- Added %defattr.
-
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 0.22.3.2-4tr
-- Big rebuild
-
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 0.22.3.2-3em
-- Rebuilt against glibc 2.3.2.
-
-* Tue Aug 29 2002 Goetz Bock <bock at trustix dot org> 22.3.2-2bg
-- added dev86 and nasm to build requirements
-- removed perl for CFlags hack, still required for README generation
-- thanks to -DBUILDIN, there are no more files in /boot, or /etc
-
-* Tue Aug  6 2002 Christian H. Toldnes <christht at trustix dot com> 22.3.2-1ct
-- New upstream version.
-- Built for TSL 2.0
-
-* Fri Jun 15 2001 Erlend Midttun <erlendbm at trustix dot com>
-- Fixed man pages missing as reported Jan?ke R?nnblom.
-
-* Wed Jun  6 2001 Oystein Viggen <oysteivi at trustix dot com>
-- New upstream version: 21.7.5
-
-* Wed Mar  7 2001 Alexander Reelsen <ar at trustix dot com>
-- Picked up 21.7
-
-* Fri Jan 19 2001 Erlend Midttun <erlendbm at trustix dot com>
-- Added post section to rerun lilo if we have a lilo.conf.  Needed to do
-  auto updates.
-
-* Wed Nov 29 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Fixed Group setting.
-
-* Fri Jul 21 2000 Oystein Viggen <oysteivi at trustix dot com>
-- Version 0.21.5
-- Used a nice perl hack to get RPM_OPT_FLAGS in with the other CFLAGS
-
-* Fri Apr 28 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Updated to version 0.21.4.2 adding support for many nice features
-
-* Tue Mar 21 2000 Lars Gaarden <larsg at trustix dot com>
-- does not build latex documentation
-
-* Thu Jan 20 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Moved the keytable-part out into a separate package.  Done to avoid needing
-  perl in a minimal system.
-
-* Tue Sep 21 1999 Doug Ledford <dledford at redhat.com>
-- Remove the EBDA patch from zab and put in the EBDA patch
-  from the VA Research RPM.  This fixes the EBDA issues.
-- Added ONE_SHOT to the compile options so that the lilo
-  prompt won't timeout once you hit a key at the boot prompt
-
-* Sat Sep 11 1999 Cristian Gafton <gafton at redhat.com>
-- don't run lilo in the %post (why was that necesary?)
-
-* Tue Apr 13 1999 Matt Wilson <msw at redhat.com>
-- added patch to make Compaq SmartArrays bootable
-
-* Wed Mar 24 1999 Bill Nottingham <notting at redhat.com>
-- add EBDA patch from zab
-
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
-- auto rebuild in the new build environment (release 4)
-
-* Thu Mar 18 1999 Cristian Gafton <gafton at redhat.com>
-- add keytab-lilo.pl to the file list
-
-* Sun Dec  6 1998 Matt Wilson <msw at redhat.com>
-- updated to release 0.21
-- patched to build on 2.1.x kernels
-
-* Thu May 07 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
-
-* Sun Oct 19 1997 Erik Troan <ewt at redhat.com>
-- updated to release 0.20
-- uses a build root
-
-* Tue Jul 08 1997 Erik Troan <ewt at redhat.com>
-- built against glibc


From svn at tinysofa.org  Sat Jun  5 14:43:19 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Jun 2004 00:43:19 +1000 (EST)
Subject: [tinysofa-svn] r1880 - tinysofa/snapshot/lilo/current/specs
Message-ID: <20040605144319.18D304E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-06 00:43:18 +1000 (Sun, 06 Jun 2004)
New Revision: 1880

Modified:
   tinysofa/snapshot/lilo/current/specs/lilo.spec
Log:
- fix a typo


Modified: tinysofa/snapshot/lilo/current/specs/lilo.spec
===================================================================
--- tinysofa/snapshot/lilo/current/specs/lilo.spec	2004-06-05 14:41:34 UTC (rev 1879)
+++ tinysofa/snapshot/lilo/current/specs/lilo.spec	2004-06-05 14:43:18 UTC (rev 1880)
@@ -86,7 +86,7 @@
 %clean_buildroot
 
 %post
-# this doesn't seem to woek yet
+# this doesn't seem to work yet
 #if [ -f "%{_sysconfdir}/lilo.conf" ]; then
 #	inst=$(/sbin/grubby --bootloader-probe | grep lilo)
 #	if [ -n "$inst" ]; then


From svn at tinysofa.org  Sat Jun  5 15:11:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Jun 2004 01:11:44 +1000 (EST)
Subject: [tinysofa-svn] 
	r1881 - in tinysofa/snapshot/slocate/current: sources specs
Message-ID: <20040605151144.50A8C4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-06 01:11:44 +1000 (Sun, 06 Jun 2004)
New Revision: 1881

Added:
   tinysofa/snapshot/slocate/current/sources/slocate-2.5-info.patch
   tinysofa/snapshot/slocate/current/sources/slocate-2.5-segfault.patch
   tinysofa/snapshot/slocate/current/sources/slocate-2.6-can-2003-0848.patch
   tinysofa/snapshot/slocate/current/sources/slocate-2.6-manpage.patch
   tinysofa/snapshot/slocate/current/sources/slocate-2.6-uchar.patch
   tinysofa/snapshot/slocate/current/sources/slocate-2.7-fts.patch
   tinysofa/snapshot/slocate/current/sources/slocate-wht.patch
Modified:
   tinysofa/snapshot/slocate/current/specs/slocate.spec
Log:
- use correct CFLAGS
- integrate changes from Conectiva and Fedora spec files
- use tinysofa macros
- get patches from Fedora


Added: tinysofa/snapshot/slocate/current/sources/slocate-2.5-info.patch
===================================================================
--- tinysofa/snapshot/slocate/current/sources/slocate-2.5-info.patch	2004-06-05 14:43:18 UTC (rev 1880)
+++ tinysofa/snapshot/slocate/current/sources/slocate-2.5-info.patch	2004-06-05 15:11:44 UTC (rev 1881)
@@ -0,0 +1,47 @@
+--- slocate-2.5/main.c.info	Sat Dec 30 02:35:30 2000
++++ slocate-2.5/main.c	Mon Feb 26 12:39:46 2001
+@@ -158,6 +158,9 @@
+ 
+ int decode_db(char *database, char *str);
+ 
++int SPECDIR=0;
++int ROOTDIR=0;   
++
+ /* Usage */
+ 
+ void
+@@ -361,8 +364,14 @@
+ 		else {
+ 			if (res_errno == -1)
+ 			    report_error(WARNING,QUIET,"%s: this is not a valid slocate database: %s\n",progname,part);
+-			else
+-			    report_error(WARNING,QUIET,"%s: could not open database: %s: %s\n",progname,part,strerror(res_errno));
++			else {
++				if (!ROOTDIR) {
++					report_error(WARNING,QUIET,"%s: could not open database: %s: %s\n",progname,part,strerror(res_errno));
++					if (!ROOTDIR && !SPECDIR)
++					  report_error(WARNING,QUIET,"You need to run the 'updatedb' command (as root) to create the database.\n");
++				}
++				
++			}
+ 		}
+ 		/* Get next path */
+ 		part = strtok(NULL, ":");
+@@ -1104,6 +1113,8 @@
+ 	
+ 	if ((fd = open(database,O_RDONLY)) == -1) {
+ 		report_error(WARNING,QUIET,"%s: decode_db(): %s: %s\n",progname,database,strerror(errno));
++		if (!ROOTDIR && !SPECDIR)
++		  report_error(WARNING,QUIET,"You need to run the 'updatedb' command (as root) to create the database.\n");
+ 		return(0);
+ 	}
+ 	
+@@ -1305,8 +1316,6 @@
+ 	extern char *optarg;
+ 	extern int optind, opterr, optopt;
+ 	char *p;
+-	int SPECDIR=0;
+-	int ROOTDIR=0;   
+ 	char *spec_dir=NULL;
+ 	char *database;
+ 	int i=0;

Added: tinysofa/snapshot/slocate/current/sources/slocate-2.5-segfault.patch
===================================================================
--- tinysofa/snapshot/slocate/current/sources/slocate-2.5-segfault.patch	2004-06-05 14:43:18 UTC (rev 1880)
+++ tinysofa/snapshot/slocate/current/sources/slocate-2.5-segfault.patch	2004-06-05 15:11:44 UTC (rev 1881)
@@ -0,0 +1,10 @@
+--- slocate-2.5/misc.c.segv	Tue Feb  6 11:27:53 2001
++++ slocate-2.5/misc.c	Tue Feb  6 11:28:00 2001
+@@ -89,6 +89,7 @@
+ 
+ 			/* realloc more memory if more of the file is expected. */
+ 			fbuf = realloc(fbuf,tot_size+ALLOC_SIZE);
++			tot_size+=ALLOC_SIZE;
+ 
+ 			/* If realloc failes report and exit. */
+ 			if (!fbuf) {

Added: tinysofa/snapshot/slocate/current/sources/slocate-2.6-can-2003-0848.patch
===================================================================
--- tinysofa/snapshot/slocate/current/sources/slocate-2.6-can-2003-0848.patch	2004-06-05 14:43:18 UTC (rev 1880)
+++ tinysofa/snapshot/slocate/current/sources/slocate-2.6-can-2003-0848.patch	2004-06-05 15:11:44 UTC (rev 1881)
@@ -0,0 +1,92 @@
+CAN-2003-0848: 'slocate' sgid privileges are now dropped when
+searching databases that are not part of the 'slocate' group. This
+will prevent malicious user supplied databases from giving access to
+the 'slocate' group.  Patch from Kevin Lindsay <klindsay at debian.org>  
+
+--- slocate-2.6.orig/main.c
++++ slocate-2.6/main.c
+@@ -339,6 +339,9 @@
+ 	char *part;
+ 	int i;
+ 	int res_errno;
++	char *tmp_ptr = NULL;
++	int last_sgid = 0;
++	struct stat db_stat;
+ 
+ 	/* Make sure path is not empty */
+ 	if (!path || strlen(path) == 0) return;
+@@ -382,6 +385,28 @@
+ 
+ 	/* Null terminate array */
+ 	SLOCATE_PATH[i] = NULL;
++	
++	/* Sort sgid slocate db's to the top */
++	for (i = 0; SLOCATE_PATH[i]; i++) {
++		if (stat(SLOCATE_PATH[i], &db_stat) == -1)
++		    report_error(FATAL, QUIET, "%s: Could not stat DB: %s: %s\n", progname, SLOCATE_PATH[i], strerror(errno));
++
++		if (db_stat.st_gid != SLOC_GID)
++		    continue;
++		
++		if (i != last_sgid) {
++			tmp_ptr = SLOCATE_PATH[last_sgid];
++			SLOCATE_PATH[last_sgid] = SLOCATE_PATH[i];
++			SLOCATE_PATH[i] = tmp_ptr;
++		}
++		
++		last_sgid += 1;
++		
++	}
++	
++	/* for (i = 0; SLOCATE_PATH[i]; i++)
++	    printf("%s\n", SLOCATE_PATH[i]); */
++
+ }
+ 
+ /* Parse Dash */
+@@ -1152,6 +1177,22 @@
+ 	char *cp=NULL;
+ #endif
+ 	char *bucket_of_holding=NULL;
++	gid_t cur_gid;
++	struct stat db_stat;
++
++	cur_gid = getegid();
++
++	if (stat(database, &db_stat) == -1)
++	    report_error(FATAL, QUIET, "%s: Could not stat '%d': %s\n", progname, strerror(errno));
++	
++	/* If the database's file group is not apart of the 'slocate' group,
++	 * drop privileges. When multiple databases are specified, the ones
++	 * apart of the 'slocate' group will be searched first before the
++	 * privileges are dropped. */       
++	if (cur_gid == SLOC_GID && db_stat.st_gid != SLOC_GID) {
++		if (setgid(GID) == -1)
++		    report_error(FATAL, QUIET, "%s: Could not drop privileges.", progname);
++	}
+ 
+ 	if ((fd = open(database,O_RDONLY)) == -1) {
+ 		report_error(WARNING,QUIET,"%s: decode_db(): %s: %s\n",progname,database,strerror(errno));
+@@ -1395,6 +1450,9 @@
+ 	/* Get user IDs */
+ 	UID = getuid();        
+ 	GID = getgid();
++			
++	/* Get the 'slocate' group GID */
++	SLOC_GID = get_gid(GRPFILE);
+ 
+ 	/* Add the LOCATE_PATH environment variable to the list of databases to search in */
+ 	parse_decode_path(getenv("LOCATE_PATH"));
+@@ -1519,11 +1577,7 @@
+ 	 * with the -d option, etc */
+ 
+ 	if (ADD_SLOCATEDB)
+-	    parse_decode_path(SLOCATEDB);
+-
+-	/* Get the 'slocate' group GID */
+-	SLOC_GID = get_gid(GRPFILE);
+-	
++	    parse_decode_path(SLOCATEDB);	
+ 	
+ 	/* if the -U option has been used, start to create the database at specified path */
+ 	if (SPECDIR)

Added: tinysofa/snapshot/slocate/current/sources/slocate-2.6-manpage.patch
===================================================================
--- tinysofa/snapshot/slocate/current/sources/slocate-2.6-manpage.patch	2004-06-05 14:43:18 UTC (rev 1880)
+++ tinysofa/snapshot/slocate/current/sources/slocate-2.6-manpage.patch	2004-06-05 15:11:44 UTC (rev 1881)
@@ -0,0 +1,40 @@
+--- slocate-2.6/doc/slocate.1.linux.org	Fri Jun  1 20:44:40 2001
++++ slocate-2.6/doc/slocate.1.linux	Fri Jun  1 22:30:51 2001
+@@ -2,17 +2,17 @@
+ .SH NAME
+ slocate \- Security Enhanced version of the GNU Locate
+ .SH SYNOPSIS
++.PP
+ slocate [\-qi] [\-d <path>] [\-\-database=<path>] <search string>
+-.br
++.PP
+ slocate [\-i] [\-r <regexp>] [\-\-regexp=<regexp>]
+-.br
++.PP
+ slocate [\-qv] [\-o <file>] [\-\-output=<file>]
++.PP
+ slocate [\-e <dir1,dir2,...>] [\-f <fstype1,...>] <[\-l <level>] [\-c] <[\-U <path>] [\-u]>
+-.br
++.PP
+ slocate [\-Vh] [\-\-version] [\-\-help]
+-.br
+-.br
+- 
++
+ .SH DESCRIPTION
+    Secure Locate provides a secure way to index and quickly search for 
+ files on your system. It uses incremental encoding just like GNU locate 
+@@ -64,11 +64,11 @@
+ .TP
+ .I \-o <file>
+ .I \-\-output=<file>
+-Specfies the database to create.
++Specifies the database to create.
+ .TP
+ .I \-d <path>
+ .I \-\-database=<path>
+-Specfies the path of databases to search in.
++Specifies the path of databases to search in.
+ .TP
+ .I \-h
+ .I \-\-help

Added: tinysofa/snapshot/slocate/current/sources/slocate-2.6-uchar.patch
===================================================================
--- tinysofa/snapshot/slocate/current/sources/slocate-2.6-uchar.patch	2004-06-05 14:43:18 UTC (rev 1880)
+++ tinysofa/snapshot/slocate/current/sources/slocate-2.6-uchar.patch	2004-06-05 15:11:44 UTC (rev 1881)
@@ -0,0 +1,16 @@
+diff -ru slocate-2.6/main.c /usr/src/redhat/BUILD/slocate-2.6/main.c
+--- slocate-2.6/main.c	2003-04-03 22:18:12.000000000 -0500
++++ /usr/src/redhat/BUILD/slocate-2.6/main.c	2003-04-03 14:47:38.000000000 -0500
+@@ -1247,8 +1247,11 @@
+ 
+ 		if (code_num == SLOC_ESC) {
+ 			code_num = get_short(&begin_ptr);
+-		} else if (code_num > 127)
++		} else if (code_num > 127) {
+ 		    code_num = code_num - 256;
++		    if (code_num == SLOC_ESC) 
++			code_num = get_short(&begin_ptr);
++		}
+ 
+ 		code_ptr += code_num;
+ 

Added: tinysofa/snapshot/slocate/current/sources/slocate-2.7-fts.patch
===================================================================
--- tinysofa/snapshot/slocate/current/sources/slocate-2.7-fts.patch	2004-06-05 14:43:18 UTC (rev 1880)
+++ tinysofa/snapshot/slocate/current/sources/slocate-2.7-fts.patch	2004-06-05 15:11:44 UTC (rev 1881)
@@ -0,0 +1,22 @@
+--- slocate-2.7/configure.in.fts	2003-01-25 00:06:14.000000000 +0100
++++ slocate-2.7/configure.in	2004-03-29 14:20:58.125594734 +0200
+@@ -41,7 +41,7 @@
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(fcntl.h unistd.h fts.h)
++AC_CHECK_HEADERS(fcntl.h unistd.h)
+ AM_CONDITIONAL(SL_FTS, test "$ac_cv_header_fts_h" = "no")
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+--- slocate-2.7/configure.fts	2003-01-25 00:15:25.000000000 +0100
++++ slocate-2.7/configure	2004-03-29 14:19:50.416423822 +0200
+@@ -3231,7 +3231,7 @@
+ 
+ 
+ 
+-for ac_header in fcntl.h unistd.h fts.h
++for ac_header in fcntl.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then

Added: tinysofa/snapshot/slocate/current/sources/slocate-wht.patch
===================================================================
--- tinysofa/snapshot/slocate/current/sources/slocate-wht.patch	2004-06-05 14:43:18 UTC (rev 1880)
+++ tinysofa/snapshot/slocate/current/sources/slocate-wht.patch	2004-06-05 15:11:44 UTC (rev 1881)
@@ -0,0 +1,11 @@
+--- ./sl_fts.c.jj	Thu Jul  1 03:00:31 1999
++++ ./sl_fts.c	Wed Aug 23 17:10:35 2000
+@@ -819,7 +819,7 @@ fts_stat(sp, dp, p, follow)
+ 	/* If user needs stat info, stat buffer already allocated. */
+ 	sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
+ 
+-#ifdef DT_WHT
++#if defined DT_WHT && defined S_IFWHT
+ #ifndef __FreeBSD__
+ 	/*
+ 	 * Whited-out files don't really exist.  However, there's stat(2) file

Modified: tinysofa/snapshot/slocate/current/specs/slocate.spec
===================================================================
--- tinysofa/snapshot/slocate/current/specs/slocate.spec	2004-06-05 14:43:18 UTC (rev 1880)
+++ tinysofa/snapshot/slocate/current/specs/slocate.spec	2004-06-05 15:11:44 UTC (rev 1881)
@@ -1,15 +1,21 @@
 Summary: Finds files on a system via a central database.
 Name: slocate
 Version: 2.7
-Release: 6ts
+Release: 8jh
 License: GPL
 Group: tinysofa official
 Source: ftp://ftp.geekreview.org/slocate/src/%{name}-%{version}.tar.gz
 Source3: slocate-updatedb.conf
 Source4: slocate-updatedb.sh
 Patch0: slocate-nicecron.patch
-Prereq: shadow-utils
-BuildRoot: %{_tmppath}/%{name}-root
+Patch1: slocate-wht.patch
+Patch2: slocate-2.5-info.patch
+Patch3: slocate-2.6-can-2003-0848.patch
+Patch4: slocate-2.6-manpage.patch
+Patch5: slocate-2.6-uchar.patch
+Patch6: slocate-2.7-fts.patch
+%useradd_requires
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf automake libtool
 
 %description
@@ -20,57 +26,76 @@
 
 %prep
 %setup -q
+
+gunzip doc/*.gz
+
 %patch0 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
-NOCONFIGURE=yes ./autogen.sh
-export NO64FLAGS=$(echo $RPM_OPT_FLAGS | sed "s|-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1||")
-CFLAGS="$NO64FLAGS" AUTOMAKE=automake ./configure \
-	--prefix=%{_prefix} \
-	--mandir=%{_mandir}
-make CFLAGS="$NO64FLAGS"
+autoreconf -f -i
+CFLAGS="$RPM_OPT_FLAGS -fsigned-char -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64" \
+%configure
+%make
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
-mkdir -p $RPM_BUILD_ROOT/var/lib/slocate
+%{__mkdir_p} %{buildroot}%{_bindir} \
+	%{buildroot}%{_mandir}/man1 \
+	%{buildroot}%{_sysconfdir}/cron.daily \
+	%{buildroot}%{_localstatedir}/lib/slocate
 
-install -m 755 slocate $RPM_BUILD_ROOT/usr/bin
-ln -sf slocate $RPM_BUILD_ROOT/usr/bin/locate
-install doc/slocate.1.linux.gz $RPM_BUILD_ROOT%{_mandir}/man1/slocate.1
-install doc/updatedb.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
-ln -sf slocate.1 $RPM_BUILD_ROOT%{_mandir}/man1/locate.1
-ln -sf slocate $RPM_BUILD_ROOT/usr/bin/updatedb
-install -m 755 slocate.cron $RPM_BUILD_ROOT/etc/cron.daily
+install -m 755 slocate %{buildroot}%{_bindir}
+ln -sf slocate %{buildroot}%{_bindir}/locate
+install doc/slocate.1.linux %{buildroot}%{_mandir}/man1/slocate.1
+install doc/updatedb.1 %{buildroot}%{_mandir}/man1
+ln -sf slocate.1 %{buildroot}%{_mandir}/man1/locate.1
+ln -sf slocate %{buildroot}%{_bindir}/updatedb
+install -m 755 slocate.cron %{buildroot}%{_sysconfdir}/cron.daily
 
 # our wonderful updatedb wrapper script
-install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/updatedb.conf
-rm -f $RPM_BUILD_ROOT/%{_bindir}/updatedb
-install -m755 %{SOURCE4} $RPM_BUILD_ROOT/%{_bindir}/updatedb
+install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/updatedb.conf
+rm -f %{buildroot}%{_bindir}/updatedb
+install -m755 %{SOURCE4} %{buildroot}%{_bindir}/updatedb
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
 %pre
-groupadd -g 16 slocate >/dev/null 2>/dev/null || :
+%post_groupadd slocate 16
 
 %preun
 if [ "$1" = "0" ]; then 
-  [ -f /var/lib/slocate/slocate.db ] && rm -f /var/lib/slocate/slocate.db || :
+  db=%{_localstatedir}/lib/slocate/slocate.db
+  if [ -f "$db" ]; then
+    rm -f "$db"
+  fi
 fi
 
 %files
-%defattr(-,root,root,755)
-%doc AUTHORS COPYING ChangeLog INSTALL README LICENSE MIRRORS NEWS README
+%defattr(644,root,root,755)
+%doc AUTHORS COPYING ChangeLog INSTALL README LICENSE MIRRORS NEWS
 %attr(2755,root,slocate) %{_bindir}/*locate
 %attr(-,root,root) %{_bindir}/updatedb
-%{_mandir}/man1/*
-%dir %attr(750,root,slocate) /var/lib/slocate
-%config /etc/cron.daily/*
-%config(noreplace) /etc/updatedb.conf
+%dir %attr(750,root,slocate) %{_localstatedir}/lib/slocate
+%config %attr(755,root,root) %{_sysconfdir}/cron.daily/*
+%config(noreplace) %{_sysconfdir}/updatedb.conf
+%attr(644,root,root) %{_mandir}/man1/*
 
 %changelog
+* Sat Jun  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.7-8jh
+- use correct CFLAGS
+- integrate changes from Conectiva and Fedora spec files
+- use tinysofa macros
+- get patches from Fedora
+
+* Thu May 20 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.7-7jh
+- fix manual page permissions
+
 * Thu May 20 2004 tsintegrate <release at tinysofa.org> 2.7-6ts
 - current (2.7-6jh) integrated as 2.7-6ts for release 1.0-U1
 


From svn at tinysofa.org  Sat Jun  5 16:23:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Jun 2004 02:23:46 +1000 (EST)
Subject: [tinysofa-svn] r1882 - tinysofa/snapshot/rpm/current/sources
Message-ID: <20040605162346.41D794E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-06 02:23:46 +1000 (Sun, 06 Jun 2004)
New Revision: 1882

Modified:
   tinysofa/snapshot/rpm/current/sources/tinysofa.macros
Log:
- more tinysofa macros tuning


Modified: tinysofa/snapshot/rpm/current/sources/tinysofa.macros
===================================================================
--- tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-05 15:11:44 UTC (rev 1881)
+++ tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-05 16:23:46 UTC (rev 1882)
@@ -56,17 +56,18 @@
 #-----------------------------------------------------------------------
 # user and group management
 #
-%useradd_requires PreReq: shadow-tools
+%useradd_requires PreReq: shadow-utils
+%accountman_requires %useradd_requires
 
 # usage:
 # %post_useradd username uid initial_gid
-%post_useradd() /usr/sbin/useradd -r -u %{2} -g %{3} %{1}
-%post_userdel() /usr/sbin/userdel %{1} > /dev/null 2>&1 || :
+%useradd() /usr/sbin/useradd -r -u %{2} -g %{3} %{1}
+%userdel() /usr/sbin/userdel %{1} > /dev/null 2>&1 || :
 
 # usage:
 # %post_groupadd groupname gid
-%post_groupadd() /usr/sbin/groupadd -r -g %{2} %{1}
-%post_groupdel() /usr/sbin/groupdel %{1} > /dev/null 2>&1 || :
+%groupadd() /usr/sbin/groupadd -r -g %{2} %{1}
+%groupdel() /usr/sbin/groupdel %{1} > /dev/null 2>&1 || :
 
 #-----------------------------------------------------------------------
 # info pages


From svn at tinysofa.org  Sat Jun  5 16:28:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Jun 2004 02:28:47 +1000 (EST)
Subject: [tinysofa-svn] r1883 - tinysofa/snapshot/slocate/current/specs
Message-ID: <20040605162847.C9FA54E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-06 02:28:47 +1000 (Sun, 06 Jun 2004)
New Revision: 1883

Modified:
   tinysofa/snapshot/slocate/current/specs/slocate.spec
Log:
- account management macro updates


Modified: tinysofa/snapshot/slocate/current/specs/slocate.spec
===================================================================
--- tinysofa/snapshot/slocate/current/specs/slocate.spec	2004-06-05 16:23:46 UTC (rev 1882)
+++ tinysofa/snapshot/slocate/current/specs/slocate.spec	2004-06-05 16:28:47 UTC (rev 1883)
@@ -14,7 +14,7 @@
 Patch4: slocate-2.6-manpage.patch
 Patch5: slocate-2.6-uchar.patch
 Patch6: slocate-2.7-fts.patch
-%useradd_requires
+%accoutman_requires
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf automake libtool
 
@@ -66,7 +66,7 @@
 %clean_buildroot
 
 %pre
-%post_groupadd slocate 16
+%groupadd slocate 16
 
 %preun
 if [ "$1" = "0" ]; then 


From svn at tinysofa.org  Sat Jun  5 17:10:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Jun 2004 03:10:35 +1000 (EST)
Subject: [tinysofa-svn] 
	r1884 - in tinysofa/snapshot/lftp/current: sources specs
Message-ID: <20040605171035.235A44E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-06 03:10:34 +1000 (Sun, 06 Jun 2004)
New Revision: 1884

Added:
   tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2
   tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2.asc
Removed:
   tinysofa/snapshot/lftp/current/sources/lftp-3.0.4.tar.bz2
   tinysofa/snapshot/lftp/current/sources/lftp-3.0.4.tar.bz2.asc
Modified:
   tinysofa/snapshot/lftp/current/specs/lftp.spec
Log:
- 3.0.5
- separate i18n package
- use new rpm macros


Deleted: tinysofa/snapshot/lftp/current/sources/lftp-3.0.4.tar.bz2
===================================================================
(Binary files differ)

Deleted: tinysofa/snapshot/lftp/current/sources/lftp-3.0.4.tar.bz2.asc
===================================================================
--- tinysofa/snapshot/lftp/current/sources/lftp-3.0.4.tar.bz2.asc	2004-06-05 16:28:47 UTC (rev 1883)
+++ tinysofa/snapshot/lftp/current/sources/lftp-3.0.4.tar.bz2.asc	2004-06-05 17:10:34 UTC (rev 1884)
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.1 (SunOS)
-
-iD8DBQBAsiQYqCS7afKpmhgRArxdAJwIjJWsshLuXMz27IqidTShwbj8rACfV5rz
-isrBV+XAw7tvp0e5qEPtI04=
-=6bEu
------END PGP SIGNATURE-----

Added: tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2.asc
===================================================================
--- tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2.asc	2004-06-05 16:28:47 UTC (rev 1883)
+++ tinysofa/snapshot/lftp/current/sources/lftp-3.0.5.tar.bz2.asc	2004-06-05 17:10:34 UTC (rev 1884)
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.1 (SunOS)
+
+iD8DBQBAuzdPqCS7afKpmhgRAgx4AJ4nAIoN11apXe7mBPQq8iC7PlY0RQCbBjk8
+m67fPsF8V8xcTfpO74XENag=
+=+fov
+-----END PGP SIGNATURE-----

Modified: tinysofa/snapshot/lftp/current/specs/lftp.spec
===================================================================
--- tinysofa/snapshot/lftp/current/specs/lftp.spec	2004-06-05 16:28:47 UTC (rev 1883)
+++ tinysofa/snapshot/lftp/current/specs/lftp.spec	2004-06-05 17:10:34 UTC (rev 1884)
@@ -1,13 +1,13 @@
 Summary: A sophisticated file transfer program
 Name: lftp 
-Version: 3.0.4
+Version: 3.0.5
 Release: 1jh
 License: GPL
 Group: tinysofa official
 Source0: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2
 Source1: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2.asc
 URL: http://lftp.yar.ru/
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel
 BuildRequires: gcc-c++-devel
 BuildRequires: libtool
@@ -33,8 +33,8 @@
 make
 
 %install
-rm -rf %{buildroot}
-%makeinstall 
+%makeinstall
+
 rm -f %{buildroot}%{_libdir}/lftp/%{version}/*.la
 chmod 0755 %{buildroot}%{_libdir}/lftp/*
 chmod 0755 %{buildroot}%{_libdir}/lftp/%{version}/*.so
@@ -42,12 +42,12 @@
 # Remove files from %{buildroot} that we aren't shipping.
 rm -f %{buildroot}%{_libdir}/lftp/%{version}/*.a
 
-%find_lang %{name}
+%i18n_pkgs lftp
 
 %clean
-rm -rf %{buildroot}
+%clean_buildroot
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
 %doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO
 %config %{_sysconfdir}/lftp.conf
@@ -67,6 +67,11 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Sat Jun  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.0.5-1jh
+- 3.0.5
+- separate i18n package
+- use new rpm macros
+
 * Thu May 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.0.4-1jh
 - 3.0.4
 


From svn at tinysofa.org  Sat Jun  5 17:12:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun,  6 Jun 2004 03:12:34 +1000 (EST)
Subject: [tinysofa-svn] r1885 - tinysofa/snapshot/lftp/current/specs
Message-ID: <20040605171234.4B6DB4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-06 03:12:34 +1000 (Sun, 06 Jun 2004)
New Revision: 1885

Modified:
   tinysofa/snapshot/lftp/current/specs/lftp.spec
Log:
- fix Group


Modified: tinysofa/snapshot/lftp/current/specs/lftp.spec
===================================================================
--- tinysofa/snapshot/lftp/current/specs/lftp.spec	2004-06-05 17:10:34 UTC (rev 1884)
+++ tinysofa/snapshot/lftp/current/specs/lftp.spec	2004-06-05 17:12:34 UTC (rev 1885)
@@ -3,7 +3,7 @@
 Version: 3.0.5
 Release: 1jh
 License: GPL
-Group: tinysofa official
+Group: tinysofa/main
 Source0: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2
 Source1: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2.asc
 URL: http://lftp.yar.ru/


From svn at tinysofa.org  Sun Jun  6 18:51:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  7 Jun 2004 04:51:51 +1000 (EST)
Subject: [tinysofa-svn] 
	r1886 - in tinysofa/snapshot/vsftpd/current: sources specs
Message-ID: <20040606185151.596354E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-07 04:51:50 +1000 (Mon, 07 Jun 2004)
New Revision: 1886

Modified:
   tinysofa/snapshot/vsftpd/current/sources/vsftpd.init
   tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec
Log:
- use new rpm macros
- use INITLOCK variable in init script


Modified: tinysofa/snapshot/vsftpd/current/sources/vsftpd.init
===================================================================
--- tinysofa/snapshot/vsftpd/current/sources/vsftpd.init	2004-06-05 17:12:34 UTC (rev 1885)
+++ tinysofa/snapshot/vsftpd/current/sources/vsftpd.init	2004-06-06 18:51:50 UTC (rev 1886)
@@ -46,7 +46,7 @@
             /usr/sbin/vsftpd $site &
             RETVAL=$?
             if [ $RETVAL -eq 0 ] ; then
-                touch /var/lock/subsys/vsftpd 
+                touch ${INITLOCK:-/mnt/lockdev}/${prog}
                 success "$STRING"
             else
                 failure "$STRING"
@@ -66,7 +66,7 @@
     killproc $prog
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
-        rm -f /var/lock/subsys/vsftpd
+        rm -f ${INITLOCK:-/mnt/lockdev}/${prog}
         rm -f /var/run/vsftpd.pid
         success "$STRING"
     else
@@ -90,7 +90,7 @@
         RETVAL=$?
         ;;
   condrestart)
-        if [ -f /var/lock/subsys/$prog ]; then
+        if [ -f ${INITLOCK:-/mnt/lockdev}/${prog} ]; then
             stop
             start
             RETVAL=$?

Modified: tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec
===================================================================
--- tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec	2004-06-05 17:12:34 UTC (rev 1885)
+++ tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec	2004-06-06 18:51:50 UTC (rev 1886)
@@ -1,23 +1,25 @@
 Summary: vsftpd - Very Secure Ftp Daemon
-Name:    vsftpd
+Name: vsftpd
 Version: 1.2.2
-Release: 2ts
+Release: 3jh
 License: GPL
 Group: tinysofa official
-URL:     http://vsftpd.beasts.org/
-Source:  ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
+URL: http://vsftpd.beasts.org/
+Source: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
 Source1: vsftpd.xinetd
 Source2: vsftpd.pam
 Source3: vsftpd.user_list
 Source4: vsftpd.init
 Source5: vsftpd.logrotate
 Source6: vsftpd.conf
-Patch2:  vsftpd-1.2.0-tcp_wrappers.patch
-BuildRoot: %{_tmppath}/%{name}-root
+Patch1: vsftpd-1.2.0-tcp_wrappers.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: tcp_wrappers
 Requires: anonftp, logrotate
+%service_requires
 Provides: ftpserver
 
+
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
 scratch.
@@ -25,50 +27,49 @@
 It is configured to not allow write access or non-anonymous user 
 login.
 
+
 %prep
 %setup -q
-%patch2 -p1
+%patch1 -p1
 cp %{SOURCE1} .
 
+
 %build
-make CFLAGS="$RPM_OPT_FLAGS -pipe" \
-	LINK="" \
-	%{?_smp_mflags}
+%make CFLAGS="$RPM_OPT_FLAGS -pipe" LINK=""
 
+
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT/%{_sbindir}
 install -d -m 755 $RPM_BUILD_ROOT/%{_initdir}
 install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/{vsftpd,pam.d}
 install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/{logrotate.d,xinetd.d}
 install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
-install -d -m 755 $RPM_BUILD_ROOT/var/log
-install -d -m 755 $RPM_BUILD_ROOT/var/lib/vsftp
-install -d -m 700 $RPM_BUILD_ROOT/var/lib/vsftp/chroot
+install -d -m 755 $RPM_BUILD_ROOT/%{_localstatedir}/log
+install -d -m 755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/vsftp
+install -d -m 700 $RPM_BUILD_ROOT/%{_localstatedir}/lib/vsftp/chroot
 install -m 755 vsftpd  $RPM_BUILD_ROOT/%{_sbindir}/vsftpd
 install -m 644 vsftpd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
 install -m 644 vsftpd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/xinetd.d/vsftpd
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/vsftpd
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/vsftpd
 install -m 600 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/vsftpd.user_list
 install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initdir}/vsftpd
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vsftpd
 install -m 600 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/vsftpd/vsftpd.conf
-touch -m 600 $RPM_BUILD_ROOT/var/log/vsftpd
+touch -m 600 $RPM_BUILD_ROOT/%{_localstatedir}/log/vsftpd
 
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post
-/sbin/chkconfig --add vsftpd
+%service_post vsftpd
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/service vsftpd stop > /dev/null 2>&1
-    /sbin/chkconfig --del vsftpd
-fi
+%service_preun vsftpd
 
+
 %files
 %defattr(-,root,root)
 %doc FAQ BUGS AUDIT Changelog LICENSE README README.security 
@@ -82,13 +83,18 @@
 %config(noreplace) %{_sysconfdir}/pam.d/vsftpd
 %config(noreplace) %{_sysconfdir}/logrotate.d/vsftpd
 %config(noreplace) %{_sysconfdir}/xinetd.d/vsftpd
-%dir %attr(755,root,root) /var/lib/vsftp
-%dir %attr(700,root,root) /var/lib/vsftp/chroot
+%dir %attr(755,root,root) %{_localstatedir}/lib/vsftp
+%dir %attr(700,root,root) %{_localstatedir}/lib/vsftp/chroot
 %{_mandir}/man5/vsftpd.conf.*
 %{_mandir}/man8/vsftpd.*
-%{_var}/log/vsftpd
+%{_localstatedir}/log/vsftpd
 
+
 %changelog
+* Sun Jun  6 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.2-3jh
+- use new rpm macros
+- use INITLOCK variable in init script
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.2.2-2ts
 - current (1.2.2-1ts) integrated as 1.2.2-2ts for release 1.0-U1
 
@@ -127,4 +133,4 @@
 
 * Tue Aug 05 2003 Omar Kilani <ok at mailcall dot com dot au> 1.2.0-1tr
 - Modify spec, PAM, init, to suit TSL 2.0
-- based on redhat's 1.2.0-2
\ No newline at end of file
+- based on redhat's 1.2.0-2


From svn at tinysofa.org  Sun Jun  6 19:05:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  7 Jun 2004 05:05:44 +1000 (EST)
Subject: [tinysofa-svn] 
	r1887 - in tinysofa/snapshot/mod_php4: current/sources
	current/specs releases releases/4.3.7 releases/4.3.7/1gd
	releases/4.3.7/1gd/sources
Message-ID: <20040606190544.6E7424E8038@minbar.tinysofa.org>

Author: gda
Date: 2004-06-07 05:05:44 +1000 (Mon, 07 Jun 2004)
New Revision: 1887

Added:
   tinysofa/snapshot/mod_php4/releases/4.3.7/
   tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/
   tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/sources/
   tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/sources/php-httpd.conf
   tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/sources/php.ini
   tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/specs/
Removed:
   tinysofa/snapshot/mod_php4/current/sources/php-4.3.6.tar.bz2
Modified:
   tinysofa/snapshot/mod_php4/current/specs/mod_php4.spec
Log:
New upstrem

Deleted: tinysofa/snapshot/mod_php4/current/sources/php-4.3.6.tar.bz2
===================================================================
(Binary files differ)

Modified: tinysofa/snapshot/mod_php4/current/specs/mod_php4.spec
===================================================================
--- tinysofa/snapshot/mod_php4/current/specs/mod_php4.spec	2004-06-06 18:51:50 UTC (rev 1886)
+++ tinysofa/snapshot/mod_php4/current/specs/mod_php4.spec	2004-06-06 19:05:44 UTC (rev 1887)
@@ -6,8 +6,8 @@
 
 Summary: The PHP4 HTML-embedded scripting language for use with Apache.
 Name: mod_php4
-Version: 4.3.6
-Release: 2ts
+Version: 4.3.7
+Release: 1gd
 Group: tinysofa official
 Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 Source1: php.ini
@@ -332,6 +332,9 @@
 /usr/share/php4/sysvshm.so
 
 %changelog
+* Sun Jun  6 2004 Gerald Dachs <gda at tinysofa dot org> 4.3.7-1gd
+- New upstream
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.3.6-2ts
 - current (4.3.6-1ts) integrated as 4.3.6-2ts for release 1.0-U1
 
@@ -556,4 +559,4 @@
 - improvements; builds with apache-devel package installed.
 
 * Tue Sep 01 1998 Preston Brown <pbrown at redhat.com>
-- Made initial cut for PHP3.
\ No newline at end of file
+- Made initial cut for PHP3.

Copied: tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/sources/php-httpd.conf (from rev 1885, tinysofa/snapshot/mod_php4/releases/4.3.6/2ts/sources/php-httpd.conf)

Copied: tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/sources/php.ini (from rev 1885, tinysofa/snapshot/mod_php4/releases/4.3.6/2ts/sources/php.ini)


From svn at tinysofa.org  Sun Jun  6 19:14:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  7 Jun 2004 05:14:43 +1000 (EST)
Subject: [tinysofa-svn] r1888 - tinysofa/snapshot/which/current/specs
Message-ID: <20040606191443.108574E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-07 05:14:42 +1000 (Mon, 07 Jun 2004)
New Revision: 1888

Modified:
   tinysofa/snapshot/which/current/specs/which.spec
Log:
- new spec file integrated from Conectiva
- use tinysofa rpm macros


Modified: tinysofa/snapshot/which/current/specs/which.spec
===================================================================
--- tinysofa/snapshot/which/current/specs/which.spec	2004-06-06 19:05:44 UTC (rev 1887)
+++ tinysofa/snapshot/which/current/specs/which.spec	2004-06-06 19:14:42 UTC (rev 1888)
@@ -1,129 +1,98 @@
 Summary: Displays where a particular program in your path is located.
+Summary(pt_BR): Localiza um programa que est?em um dos diret?ios de seu PATH. Mostra rota completa.
+Summary(es): Localiza un programa que est?en uno de los directorios de su PATH. Ense? ruta completa.
 Name: which
 Version: 2.16
 Release: 5ts
-License: distributable
-Group: tinysofa official
-Source0: ftp://ftp.gnu.org/gnu/which/which-%{version}.tar.gz
+License: GPL
+Group: tinysofa/main
+Source0: ftp://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz
 Source1: which-2.sh
 Source2: which-2.csh
-Prereq: htmlinfo
-BuildRequires: texinfo
+%info_requires
 BuildRoot: %{_tmppath}/%{name}-root
 
+
 %description
 The which command shows the full pathname of a specified program, if
 the specified program is in your PATH.
 
+%description -l pt_BR
+D?a ele um nome de programa, e ele lhe dir?se est?no seu 'PATH'.
+Por exemplo, 'which ls' poderia imprimir '/bin/ls', porque o programa
+ls, que est?em um dos diret?ios listados na vari?el de ambiente
+PATH, est?localizado no diret?io /bin.
+                                                                                
+%description -l es
+Tu le das un nombre de programa, y el te dir?si est?en su 'PATH'.
+Por ejemplo, 'which ls' podr? imprimir '/bin/ls', porque el programa
+ls, que est?en uno de los directorios listados en la variable de
+ambiente PATH, est?localizado en el directorio /bin.
+
+
 %prep
 %setup -q
 
+
 %build
 %configure
-make
-makeinfo --html --no-split --force which.texinfo || : 
+%make
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/share/{man,html/which}
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-install -m644 which.html $RPM_BUILD_ROOT/usr/share/html/which/
-install -m 755 $RPM_SOURCE_DIR/which-2.sh $RPM_SOURCE_DIR/which-2.csh \
-	$RPM_BUILD_ROOT/etc/profile.d
+%{__mkdir_p} %{buildroot}%{_mandir} \
+	%{buildroot}%{_sysconfdir}/profile.d
 
-rm -rf $RPM_BUILD_ROOT/usr/share/info
+%makeinstall_std DESTDIR=$RPM_BUILD_ROOT install
 
+%install_info which.texinfo
+%nuke_info
+
+install -m 755 %{_sourcedir}/which-2.sh %{_sourcedir}/which-2.csh \
+	%{buildroot}%{_sysconfdir}/profile.d
+
+
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post 
-/usr/sbin/htmlinfo_update.sh
+%info_post
  
 %postun
-if [ $1 = 0 ]; then
-	/usr/sbin/htmlinfo_update.sh
-fi
+%info_postun
 
+
 %files
 %defattr(-,root,root)
 %doc EXAMPLES README README.alias
-/usr/bin/which
-%config(noreplace) /etc/profile.d/which-2.*
+%{_bindir}/which
+%config(noreplace) %{_sysconfdir}/profile.d/which-2.*
 %{_mandir}/man1/which.1*
-/usr/share/html/which
+%{_htmldir}/%{name}
 
-%changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.16-5ts
-- current (2.16-4ts) integrated as 2.16-5ts for release 1.0-U1
 
-* Sun Dec  7 2003 Erlend Midttun <erlendbm at trustix dot org> 2.16-1tr
-- New upstream.
-
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 2.14-5tr
-- Big rebuild
-
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 2.14-4em
-- Rebuilt against glibc 2.3.2.
-
-* Thu Feb 27 2003 Christian H. Toldnes <christht at tihlde.org> 2.14-3ct
-- Added better removel of $RPM_BUILD_ROOT
-
-* Fri Nov  1 2002 Christian H. Toldnes <christht at trustix dot com> 2.14-2ct
-- Replaced info stuff with the new htmlinfo setup.
-
-* Sat Jul 27 2002 Gerald Dachs <gda at trustix dot org> 2.14-1gd
-- new upstream version
-
-* Thu Jul 25 2002 Nico Erfurth <masta at trustix dot org> 2.13-1ne
-- new upstream version
-- changed which-2.sh to work with shell-functions
-- added which.info to the filelist
-
-* Wed Jul 24 2002 Daniel Meyer <eagle at trustix dot org> 2.12-4dm
-- rebuild for Trustix Secure Linux 2.0
-
-* Tue Sep 12 2000 Per Ivar Paulsen <perp at trustix dot com>
-- Moved man, some fixes.
-
-* Fri Jan 14 2000 Carlo Wood <carlo at gnu.org>
-- Started counting at 0 for Source0: ...
-- Changed it into TWO Source: lines.
-- Added a Source line for which-2.{sh.csh}.
-
-* Fri Sep 24 1999 Carlo Wood <carlo at gnu.org>
-- There should not be a reason anymore to include README.alias in the rpm docs.
-- Don't install as root.root in RPM_BUILD_ROOT, in order to allow to build
-  rpm as non-root.
-- Bug fix
-- Added /etc/profile.d for automatic alias inclusion.
-
-* Wed Aug 25 1999 Carlo Wood <carlo at gnu.org>
-- Added README.alias.
-
-* Wed Aug 11 1999 Carlo Wood <carlo at gnu.org>
-- Typo in comment.
-
-* Thu May 27 1999 Carlo Wood <carlo at gnu.org>
-- Typo fix
-- Moved maintainer targets from makefile to Makefile.am.
-
-* Tue May 18 1999 Carlo Wood <carlo at gnu.org>
-- Typo in appended changelog.
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.16-5ts
-- current (2.16-4ts) integrated as 2.16-5ts for release 1.0-U1
+* Sun Jun  6 2004 Jaakko Heinonen <jh at tinysofa dot org>
+- use tinysofa rpm macros
 
-  which is generated from the CVS log of `which-2.0.spec.in'.
-- Generate which-2.spec from which-2.spec.in with automatic VERSION
-  and CHANGELOG substitution.
+* Tue Dec 30 2003 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2003-12-30 18:14:37 (42619)
+- New upstream release: 2.16
 
-* Tue May 14 1999 Carlo Wood <carlo at gnu.org>
-- Moved assignment of CFLAGS to the configure line, using RPM_OPT_FLAGS now.
-- Corrected Source: line to point to ftp.gnu.org.
+* Tue Sep 03 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-09-03 16:32:04 (13947)
+- Imported package from snapshot.
 
-* Sat Apr 17 1999 Carlo Wood <carlo at gnu.org>
-- Started to use automake and autoconf
+* Thu Aug 29 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-29 19:23:40 (10183)
+- Imported package from 8.0.
 
-* Fri Apr 09 1999 Carlo Wood <carlo at gnu.org>
-- Renamed which-2.0.spec to which-2.spec
+* Wed Aug 28 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-28 21:31:39 (6768)
+- Imported package from 7.0.
+
+* Tue Aug 27 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-27 20:04:58 (2091)
+- Imported package from 6.0.


From svn at tinysofa.org  Sun Jun  6 19:15:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  7 Jun 2004 05:15:28 +1000 (EST)
Subject: [tinysofa-svn] 
	r1889 - in tinysofa/snapshot/mod_php4: current/sources
	releases/4.3.7/1gd/sources releases/4.3.7/1gd/specs
Message-ID: <20040606191528.468D84E8038@minbar.tinysofa.org>

Author: gda
Date: 2004-06-07 05:15:28 +1000 (Mon, 07 Jun 2004)
New Revision: 1889

Added:
   tinysofa/snapshot/mod_php4/current/sources/php-4.3.7.tar.bz2
   tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/sources/php-4.3.7.tar.bz2
   tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/specs/mod_php4.spec
Log:
New upstrem

Added: tinysofa/snapshot/mod_php4/current/sources/php-4.3.7.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/mod_php4/current/sources/php-4.3.7.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/sources/php-4.3.7.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/sources/php-4.3.7.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/specs/mod_php4.spec
===================================================================
--- tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/specs/mod_php4.spec	2004-06-06 19:14:42 UTC (rev 1888)
+++ tinysofa/snapshot/mod_php4/releases/4.3.7/1gd/specs/mod_php4.spec	2004-06-06 19:15:28 UTC (rev 1889)
@@ -0,0 +1,562 @@
+#ugly hack
+#%define _noVersionedDependencies 1
+
+#php 4.3.2 doesn't allow to use openssl shared
+%define _openssl_shared 0
+
+Summary: The PHP4 HTML-embedded scripting language for use with Apache.
+Name: mod_php4
+Version: 4.3.7
+Release: 1gd
+Group: tinysofa official
+Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
+Source1: php.ini
+Source2: php-httpd.conf
+License: GPL
+BuildRoot: %{_tmppath}/%{name}-root
+Requires: webserver, gmp, openssl, bzip2, zlib, rpm >= 3.0.6, db4
+Obsoletes: mod_php3
+BuildRequires: apache apache-devel >= 2 apr-util-devel apr-devel
+BuildRequires: postgresql-devel, mysql-devel, uw-imap-devel, openldap-devel
+BuildRequires: zlib-devel, gmp-devel, flex, bison, byacc, bzip2-devel
+BuildRequires: cyrus-imapd-devel, libpng-devel, libjpeg-devel
+BuildRequires: cyrus-sasl-devel, readline-devel, db4-devel
+BuildRequires: rpm-build >= 4.0.4-22gd pam-devel ncurses-devel
+Provides: php = %{version}
+%if !%{_openssl_shared}
+Obsoletes: mod_php4-openssl
+%endif
+
+%description
+PHP is an HTML-embedded scripting language.  PHP attempts to make it
+easy for developers to write dynamically generated web pages.  PHP
+also offers built-in database integration for several commercial
+and non-commercial database management systems, so writing a
+database-enabled web page with PHP is fairly simple.  The most
+common use of PHP coding is probably as a replacement for CGI
+scripts.  The mod_php module enables the Apache web server to
+understand and process the embedded PHP language in web pages.
+
+%package cli 
+Summary: CLI/PHP4 support
+Group: tinysofa official
+Requires: mod_php4, db4
+%description cli 
+This package contains a standalone PHP binary. 
+
+The CLI (command line interface) SAPI has been introduced
+with a goal of making PHP better at supporting the creation of 
+stand alone applications.
+
+%if %{_openssl_shared}
+%package openssl 
+Summary: OpenSSL/PHP4 support
+Group: tinysofa official
+Requires: mod_php4
+%description openssl 
+OpenSSL support module for PHP4
+
+Uncomment "extension=openssl.so" in order to activate this module
+%endif
+
+%package exif
+Summary: Exif/PHP4 support
+Group: tinysofa official
+Requires: mod_php4
+%description exif 
+EXIF support module for PHP4
+
+Uncomment "extension=exif.so" in order to activate this module
+
+%package gd
+Summary: GD/PHP4 support
+Group: tinysofa official
+Requires: mod_php4
+%description gd 
+GD support module for PHP4
+
+Uncomment "extension=gd.so" in order to activate this module
+
+%package imap
+Summary: IMAP/PHP4 support
+Group: tinysofa official
+BuildRequires: uw-imap-devel openssl-devel
+Requires: openssl mod_php4
+%description imap
+IMAP support module for PHP4
+
+Uncomment "extension=imap.so" in order to activate this module
+
+%package ldap
+Summary: LDAP/PHP4 support
+Group: tinysofa official
+Requires: openldap mod_php4
+BuildRequires: openldap-devel 
+%description ldap
+LDAP support module for PHP4
+
+Uncomment "extension=ldap.so" in order to activate this module
+
+%package mysql
+Summary: MySQL/PHP4 support
+Group: tinysofa official
+Requires: mysql-libs zlib-devel mod_php4
+%description mysql
+MySQL support module for PHP4
+
+Uncomment "extension=mysql.so" in order to activate this module
+
+%package pgsql
+Summary: PostgreSQL/PHP4 support
+Group: tinysofa official
+Requires: postgresql-libs mod_php4
+%description pgsql
+PostgreSQL support module for PHP4
+
+Uncomment "extension=pgsql.so" in order to activate this module
+
+%package devel
+Summary: PHP C/C++ development
+Group: tinysofa official
+
+%description devel
+PHP 4 C/C++ development environment
+  
+%package test
+Summary: PHP C/C++ development
+Group: tinysofa official
+Requires: %{name}
+
+%description test
+PHP 4 test suite.
+  
+%package domxml 
+Summary: OpenSSL/PHP4 support
+Group: tinysofa official
+BuildRequires: libxml2-devel 
+Requires: libxml2 mod_php4
+
+%description domxml 
+The mod_php4-domxml package is a dynamic shared object (DSO) that adds
+DOMXML support to PHP. PHP is an HTML-embedded scripting language.
+If you need DOMXML support for PHP applications, you will need to
+install this package in addition to the php package.
+
+Uncomment "extension=domxml.so" in order to activate this module
+
+%package sysv
+Summary: SYSV SEM and SHM/PHP4 support
+Group: tinysofa official
+Requires: mod_php4
+%description sysv
+Semaphore functions using System V semaphores for PHP.
+Shared memory functions using System V IPC for PHP.
+
+Uncomment "extension=shmop.so" in order to activate the shared memory
+operations module.
+
+Uncomment "extension=sysvsem.so" in order to activate the SYSV Semaphore 
+module.
+
+Uncomment "extension=sysvshm.so" in order to activate the SYSV shared memory 
+module.
+
+%prep
+%setup -q -n php-%{version}
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr \
+	--with-apxs2=/usr/sbin/apxs \
+	--with-config-file-path=/etc/httpd \
+	--with-regex=php \
+	--with-exec-dir=/usr/bin \
+	--enable-safe-mode \
+	--enable-dba \
+	--with-db4 \
+        --enable-bcmath \
+        --enable-debugger \
+        --enable-magic-quotes \
+        --enable-track-vars \
+	--enable-memory-limit \
+	--enable-ftp \
+	--enable-exif=shared,/usr \
+	--enable-sysvshm=shared,/usr \
+	--enable-sysvsem=shared,/usr \
+	--enable-shmop=shared,/usr \
+	--disable-debug \
+	--disable-rpath \
+	--with-bz2 \
+	--with-pear \
+	--with-readline \
+	--with-gmp \
+	--with-zlib=/usr \
+	--with-imap-ssl \
+	--with-gd=shared \
+	--with-jpeg-dir=/usr \
+	--with-png-dir=/usr \
+	--with-imap=shared,/usr \
+	--with-ldap=shared,/usr \
+	--with-mysql=shared,/usr \
+	--with-pgsql=shared,/usr \
+%if %{_openssl_shared}
+	--with-openssl=shared,/usr \
+%else
+	--with-openssl=/usr \
+%endif
+	--with-dom=shared,/usr \
+        --with-gettext
+
+make
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
+mkdir -p $RPM_BUILD_ROOT/usr/lib/apache
+mkdir -p $RPM_BUILD_ROOT/etc/httpd
+mkdir -p $RPM_BUILD_ROOT/usr/share/php4/
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+install -s -m 755 .libs/libphp4.so $RPM_BUILD_ROOT/usr/lib/apache
+install -s -m 755 sapi/cli/php $RPM_BUILD_ROOT/usr/bin
+
+#ugly hack, apxs pretends on changing the httpd.conf, so
+#we give it a minimalistic one :)
+mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf
+cat <<EOF >$RPM_BUILD_ROOT/etc/httpd/conf/httpd.conf
+
+LoadModule
+EOF
+
+make install INSTALL_ROOT=$RPM_BUILD_ROOT
+
+# now we don't need our fake httpd.conf anymore
+rm -rf $RPM_BUILD_ROOT/etc/httpd/conf
+
+strip modules/*.so
+cp modules/*.so $RPM_BUILD_ROOT/usr/share/php4/
+
+mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/php.ini
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/httpd/conf.d/httpd-mod_php4.conf
+
+# Wonder why these are located here
+rm -rf $RPM_BUILD_ROOT/usr/lib/php/extensions
+rm -rf $RPM_BUILD_ROOT/usr/lib/php/.??*
+
+# Not to mention why this ended up here
+mkdir -p -m 755 $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
+mv $RPM_BUILD_ROOT/usr/lib/php/doc/* $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/
+
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mv $RPM_BUILD_ROOT/usr/man/man1/php.1* $RPM_BUILD_ROOT%{_mandir}/man1
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+/usr/lib/apache/libphp4.so
+%config(noreplace) /etc/httpd/php.ini
+%config(noreplace) /etc/httpd/conf.d/httpd-mod_php4.conf
+%doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS
+%doc README.EXTENSIONS README.EXT_SKEL README.PARAMETER_PARSING_API
+%doc README.SELF-CONTAINED-EXTENSIONS README.STREAMS README.SUBMITTING_PATCH
+%doc README.TESTING README.UNIX-BUILD-SYSTEM TODO
+/usr/bin/pear
+/usr/bin/php-config
+/usr/bin/phpextdist
+/usr/bin/phpize
+%dir /usr/lib/php
+/usr/lib/php/*.php
+/usr/lib/php/Archive
+/usr/lib/php/Console
+/usr/lib/php/DB
+/usr/lib/php/Mail
+/usr/lib/php/Net
+/usr/lib/php/OS
+/usr/lib/php/PEAR
+/usr/lib/php/XML
+/usr/lib/php/build
+/usr/lib/php/data
+%{_mandir}/man1/php.1*
+%exclude /usr/etc/pear.conf
+
+%files gd
+%defattr(-,root,root)
+/usr/share/php4/gd.so
+
+%files cli
+%defattr(-,root,root)
+/usr/bin/php
+
+%files exif 
+%defattr(-,root,root)
+/usr/share/php4/exif.so
+
+%if %{_openssl_shared}
+%files openssl
+%defattr(-,root,root)
+/usr/share/php4/openssl.so
+%endif
+
+%files imap
+%defattr(-,root,root)
+/usr/share/php4/imap.so
+
+%files ldap
+%defattr(-,root,root)
+/usr/share/php4/ldap.so
+
+%files mysql
+%defattr(-,root,root)
+/usr/share/php4/mysql.so
+
+%files pgsql
+%defattr(-,root,root)
+/usr/share/php4/pgsql.so
+
+%files devel
+%defattr(-,root,root)
+/usr/include/php
+
+%files test
+%defattr(-,root,root)
+/usr/lib/php/test
+
+%files domxml
+%defattr(-,root,root)
+/usr/share/php4/domxml.so
+
+%files sysv
+%defattr(-,root,root)
+/usr/share/php4/shmop.so
+/usr/share/php4/sysvsem.so
+/usr/share/php4/sysvshm.so
+
+%changelog
+* Sun Jun  6 2004 Gerald Dachs <gda at tinysofa dot org> 4.3.7-1gd
+- New upstream
+
+* Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.3.6-2ts
+- current (4.3.6-1ts) integrated as 4.3.6-2ts for release 1.0-U1
+
+* Wed May 12 2004 Omar Kilani <omar at tinysofa dot org> 
+- Add BuildRequires: apache apr-util-devel apr-devel
+- Add BuildRequires: bison, byacc
+- Add BuildRequires: pam-devel ncurses-devel
+
+* Fri Apr 16 2004 Omar Kilani <omar at tinysofa dot org> 4.3.6-1ts
+- New upstream.
+
+* Fri Apr 02 2004 Omar Kilani <omar at tinysofa dot org> 4.3.5-4ts
+- Create a new sysv subpackage for shared memory and semaphores.
+- By request of Morten Nilsen. :)
+
+* Fri Apr 02 2004 Omar Kilani <omar at tinysofa dot org> 4.3.5-3ts
+- Rebuild.
+- Fix man page problem.
+
+* Fri Apr 02 2004 Omar Kilani <omar at tinysofa dot org> 4.3.5-2ts
+- Rebuild.
+
+* Thu Apr 01 2004 Omar Kilani <omar at tinysofa dot org> 4.3.5-1ts
+- New upstream.
+
+* Sun Mar 14 2004 Chr. Toldnes <christht at trustix dot org> 4.3.4-8tr
+- removed cyrus support, does not build with new cyrus.
+
+* Mon Mar  1 2004 Erlend Midttun <erlendbm at trustix dot org> 4.3.4-6tr
+- Added the missing extensions.
+
+* Wed Dec  3 2003 Erlend Midttun <erlendbm at trustix dot org> 4.3.4-4tr
+- Stricter defaults in php.ini.
+
+* Wed Nov 19 2003 Tor Hveem <torh at trustix dot org> 4.3.4-3th
+- Readd a BuildReq
+- Renamed libpng12 Req to libpng
+- Tried removing the _noVersionedDependencies hack
+
+* Tue Nov 18 2003 Tor Hveem <torh at trustix dot org> 4.3.4-2th
+- Rebuild for apache with LFS
+
+* Wed Nov  5 2003 Gerald Dachs <gda at trustix dot org> 4.3.4-1gd
+- New upstream version
+- build requires rpm-build >= 4.0.4-22gd
+
+* Tue Sep 16 2003 Tor Hveem <torh at trustix dot org> 4.3.3-1th
+- New upstream
+- Fixed docs and tests paths
+- Fixed some bogus BuildReq's
+
+* Fri Sep 12 2003 Gerald Dachs <gda at trustix dot org> 4.3.2-9gd
+- enabled db4 support
+
+* Mon Jun 23 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.2-8tr
+- Added %defattr
+
+* Sat Jun 21 2003 Gerald Dachs <gda at trustix dot org> 4.3.2-7gd
+- Added --with-gettext
+ 
+* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.2-6tr
+- Big rebuild
+
+* Wed Jun 11 2003 Gerald Dachs <gda at trustix dot org> 4.3.2-5gd
+- buildrequries cyrus-sasl-devel, readline-devel
+
+* Wed Jun 11 2003 Gerald Dachs <gda at trustix dot org> 4.3.2-4gd
+- use --with-regex=php now, removed patch0
+
+* Sat Jun  7 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.2-3em
+- Fix file conflict on /usr/bin/php.
+
+* Sun Jun  1 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.2-2em
+- Removed libapr-devel
+
+* Sat Jun  1 2003 Gerald Dachs <gda at trustix dot org> 4.3.2-1gd
+- New upstream version.
+- openssl linked static, because of bug in php
+- hack for pleasing apxs with a fake httpd.conf
+- made patch to allow to use --with-regex=system
+
+* Wed May 28 2003 Gerald Dachs <gda at trustix dot org> 4.3.1-8gd
+- Added package domxml
+
+* Fri May 23 2003 Tor Hveem <torh at trustix dot org> 4.3.1-7th
+- Missing BuildReq readline-devel, libpng-devel, libjpeg-devel, mysql-devel
+- Added --with-cyrus
+- Added package gd
+
+* Thu May 15 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.1-6em
+- Moved docs
+
+* Wed Apr 30 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.1-5em
+- Major cleanup.
+
+* Wed Apr 30 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.1-4em
+- mod_php4-pgsql requires postgresql-libs and not postgresql.
+
+* Mon Apr 28 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.1-3em
+- Rebuild against new mysql.
+
+* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.1-2em
+- Rebuilt against glibc 2.3.2.
+
+* Thu Mar 20 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.1-1em
+- New upstream version.
+
+* Fri Feb 28 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.0-6em
+- Fixed entension dir.
+
+* Wed Feb 19 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.0-5em
+- Added conf file.
+
+* Sat Jan 18 2003 Gerald Dachs <gda at trustix dot org> 4.3.0-4gd
+- rebuilt against openssl 0.9.7
+
+* Sat Jan 11 2003 Tor Hveem <torh at trustix dot org> 4.3.0-3th
+- added packages: openssl, cli, exif
+
+* Fri Jan  3 2003 Erlend Midttun <erlendbm at trustix dot com> 4.3.0-2em
+- Changed Req: imap to BuildReq: uw-imap-devel on -imap package
+- New and improved php.ini file.  Slightly modified php.ini-recommended.
+
+* Sat Dec 28 2002 Tor Hveem <torh at trustix dot org> 4.3.0-1th
+- New upstream version: 4.3.0
+- Removed tsrm patch
+- Added new build requirements bzip2-devel, libapr-devel
+- Readded imap module
+
+* Thu Sep 26 2002 Erlend Midttun <erlendbm at trustix dot com> 4.2.3-2em
+- Added buildreq flex.
+
+* Wed Sep 11 2002 Erlend Midttun <erlendbm at trustix dot com> 4.2.3-1em
+- New PHP.
+- Now required Apache 2.
+
+* Mon Mar 25 2002 Christian H. Toldnes <christht at trustix dot com>
+- The old rfc1867.c didn't fix it. Applied a new patch.
+
+* Thu Feb 28 2002 Christian H. Toldnes <christht at trustix dot com>
+- Applied securitypatch. (rfc1867.c)
+
+* Wed Sep 26 2001 Erlend Midttun <erlendbm at trustix dot com>
+- Seems the previous mailsec patch was broken, trying again.
+
+* Thu Jul 26 2001 Erlend Midttun <erlendbm at trustix dot com>
+- Fixed a few dependencies.
+
+* Thu Jul 19 2001 Oystein Viggen <oysteivi at trustix dot com>
+- Add a fix from cvs to stop mail() from breaking safe mode.
+
+* Mon Jul 16 2001 Oystein Viggen <oysteivi at trustix dot com>
+- 4.0.6 didn't fix memlimit.  Added patch from the php team.
+
+* Mon Jul  9 2001 Oystein Viggen <oysteivi at trustix dot com>
+- Because of build problems, imap is no longer built as a module.
+
+* Tue Jul  3 2001 Oystein Viggen <oysteivi at trustix dot com>
+- define _noVersionedDependencies
+
+* Mon Jul  2 2001 Oystein Viggen <oysteivi at trustix dot com>
+- New upstream version: 4.0.6
+- This new version fixes a bug with --enable-memory-limit
+
+* Mon Jun 11 2001 Oystein Viggen <oysteivi at trustix dot com>
+- New upstream version: 4.0.5
+
+* Mon Mar 19 2001 Alexander Reelsen <ar at trustix dot com>
+- Picked up 4.0.4pl1
+- Created dynamic modules (and own packages) for imap, ldap, mysql and pgsql
+
+* Wed Oct 18 2000 Per Ivar Paulsen <perp at trustix dot com>
+- Update to 3.0.17. Removed syslog patch
+
+* Wed May 3 2000 Per Ivar Paulsen <perp at trustix dot com>
+- Update to php 3.0.16
+
+* Sat Feb 26 2000 Lars Gaarden <larsg at trustix dot com>
+- Picked up php 3.0.15
+
+* Fri Feb 25 2000 Lars Gaarden <larsg at trustix dot com>
+- Added Provides: php
+
+* Tue Jan 25 2000 Per Ivar Paulsen <perp at trustix dot com>
+- picked up php 3.0.14.
+- Initial release for the Trustix Secure Linux distribution.
+- Added noreplace.
+- Moved man and info pages to /usr/share adhering to FHS
+- TODO: add better default configuration
+
+* Wed Jan 6 2000 Per Ivar Paulsen <perp at paulsen.org>
+- picked up php 3.0.13. And updated manual
+
+* Fri Apr 16 1999 Preston Brown <pbrown at redhat.com>
+- pick up php3.ini
+
+* Wed Mar 24 1999 Preston Brown <pbrown at redhat.com>
+- build against apache 1.3.6
+
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+- auto rebuild in the new build environment (release 2)
+
+* Mon Mar 08 1999 Preston Brown <pbrown at redhat.com>
+- upgraded to 3.0.7.
+
+* Wed Feb 24 1999 Preston Brown <pbrown at redhat.com>
+- Injected new description and group.
+
+* Sun Feb 07 1999 Preston Brown <pbrown at redhat.com>
+- upgrade to php 3.0.6, built against apache 1.3.4
+
+* Mon Oct 12 1998 Cristian Gafton <gafton at redhat.com>
+- rebuild for apache 1.3.3
+
+* Thu Oct 08 1998 Preston Brown <pbrown at redhat.com>
+- updated to 3.0.5, fixes nasty bugs in 3.0.4.
+
+* Sun Sep 27 1998 Cristian Gafton <gafton at redhat.com>
+- updated to 3.0.4 and recompiled for apache 1.3.2
+
+* Thu Sep 03 1998 Preston Brown <pbrown at redhat.com>
+- improvements; builds with apache-devel package installed.
+
+* Tue Sep 01 1998 Preston Brown <pbrown at redhat.com>
+- Made initial cut for PHP3.


From svn at tinysofa.org  Sun Jun  6 19:20:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  7 Jun 2004 05:20:16 +1000 (EST)
Subject: [tinysofa-svn] r1890 - tinysofa/snapshot/which/current/specs
Message-ID: <20040606192016.8A5804E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-07 05:20:16 +1000 (Mon, 07 Jun 2004)
New Revision: 1890

Modified:
   tinysofa/snapshot/which/current/specs/which.spec
Log:
- remove unneeded arguments from %makeinstall_std


Modified: tinysofa/snapshot/which/current/specs/which.spec
===================================================================
--- tinysofa/snapshot/which/current/specs/which.spec	2004-06-06 19:15:28 UTC (rev 1889)
+++ tinysofa/snapshot/which/current/specs/which.spec	2004-06-06 19:20:16 UTC (rev 1890)
@@ -43,7 +43,7 @@
 %{__mkdir_p} %{buildroot}%{_mandir} \
 	%{buildroot}%{_sysconfdir}/profile.d
 
-%makeinstall_std DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall_std
 
 %install_info which.texinfo
 %nuke_info


From svn at tinysofa.org  Mon Jun  7 13:35:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  7 Jun 2004 23:35:57 +1000 (EST)
Subject: [tinysofa-svn] r1891 - tinysofa/snapshot/lilo/current/specs
Message-ID: <20040607133557.E7ED74E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-07 23:35:57 +1000 (Mon, 07 Jun 2004)
New Revision: 1891

Modified:
   tinysofa/snapshot/lilo/current/specs/lilo.spec
Log:
- install /boot/chain.b, /boot/os2_d.b and /boot/boot.b
- detect lilo installation with grubby


Modified: tinysofa/snapshot/lilo/current/specs/lilo.spec
===================================================================
--- tinysofa/snapshot/lilo/current/specs/lilo.spec	2004-06-06 19:20:16 UTC (rev 1890)
+++ tinysofa/snapshot/lilo/current/specs/lilo.spec	2004-06-07 13:35:57 UTC (rev 1891)
@@ -5,7 +5,7 @@
 Summary(es): Cargador de arranque para Linux y otros sistemas operativos
 Name: lilo
 Version: 0.%{upstreamversion}
-Release: 11jh
+Release: 12jh
 License: MIT
 Group: tinysofa/main
 Source: http://www.ibiblio.org/pub/Linux/system/boot/lilo/%{name}-%{upstreamversion}.tar.gz
@@ -14,7 +14,7 @@
 Patch0: lilo-nolatexdoc.patch
 Patch1: lilo-22.5.8-lvm_ioctl_fixup.patch
 Patch2: lilo-22.3.3-page.patch
-PreReq: /sbin/grubby
+PreReq: /sbin/grubby grep
 BuildRequires: dev86, nasm
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Exclusivearch: i386 i586
@@ -39,22 +39,7 @@
 usado para "bootar" varios otros sistemas operativos, incluyendo
 variantes de BSD, DOS y OS/2.
 
-%package doc
-Summary: Documentation on lilo
-Summary(pt_BR): Documenta?o sobre o lilo
-Summary(es): Documentaci? sobre lilo
-Group: tinysofa/documentation
 
-%description doc
-Documentation on lilo
-
-%description -l pt_BR doc
-Documenta?o sobre o lilo
-
-%description -l es doc
-Documentaci? sobre lilo
-
-
 %prep
 %setup -q -n lilo-%{upstreamversion}
 %patch0 -p1 
@@ -65,6 +50,7 @@
 sed -e "s/^CFLAGS=/CFLAGS=$RPM_OPT_FLAGS /" < Makefile > Makefile.new
 mv Makefile.new Makefile
 
+
 %build
 %make
 %make -C doc 
@@ -73,7 +59,7 @@
 gcc $RPM_OPT_FLAGS -o keytab-lilo %{SOURCE2}
 
 %install
-mkdir -p %{buildroot}/%{_mandir}
+mkdir -p %{buildroot}/%{_mandir} %{buildroot}/usr
 make install ROOT=%{buildroot} MAN_DIR=%{_mandir}
 
 # this pulls in a perl dependency with it we don't want
@@ -82,21 +68,24 @@
 
 install -D -m 755 keytab-lilo %{buildroot}%{_bindir}/keytab-lilo
 
+install -D -m 644 boot-menu.b %{buildroot}/boot/boot.b
+install -D -m 644 os2_d.b %{buildroot}/boot/os2_d.b
+install -D -m 644 chain.b %{buildroot}/boot/chain.b
+
+
 %clean
 %clean_buildroot
 
+
 %post
-# this doesn't seem to work yet
-#if [ -f "%{_sysconfdir}/lilo.conf" ]; then
-#	inst=$(/sbin/grubby --bootloader-probe | grep lilo)
-#	if [ -n "$inst" ]; then
-#		/sbin/lilo > /dev/null
-#	fi
-#fi
 if [ -f "%{_sysconfdir}/lilo.conf" ]; then
-	/sbin/lilo > /dev/null
+	inst=$(/sbin/grubby --bootloader-probe | grep lilo)
+	if [ -n "$inst" ]; then
+		/sbin/lilo > /dev/null
+	fi
 fi
 
+
 %files
 %defattr(644,root,root)
 %doc CHANGES COPYING INCOMPAT QuickInst README README.bitmaps
@@ -106,6 +95,9 @@
 /usr/share/man/man5/lilo.conf.5*
 /usr/share/man/man8/lilo.8*
 /usr/share/man/man8/mkrescue.8*
+/boot/boot.b
+/boot/chain.b
+/boot/os2_d.b
 %defattr(-,root,root)
 /sbin/mkrescue
 /sbin/lilo


From svn at tinysofa.org  Mon Jun  7 13:58:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon,  7 Jun 2004 23:58:40 +1000 (EST)
Subject: [tinysofa-svn] 
	r1892 - in tinysofa/snapshot/rpm/current: sources specs
Message-ID: <20040607135840.83B1B4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-07 23:58:40 +1000 (Mon, 07 Jun 2004)
New Revision: 1892

Added:
   tinysofa/snapshot/rpm/current/sources/rpm4.2.2-tinysofa-initrddir.patch
Modified:
   tinysofa/snapshot/rpm/current/sources/GROUPS.tinysofa
   tinysofa/snapshot/rpm/current/sources/tinysofa.macros
   tinysofa/snapshot/rpm/current/specs/rpm.spec
Log:
- Merge static-devel packages with devel packages.
- Use initrddir instead of initdir, remove initdir definition.
- Add tinysofa/java group.
- Add libreadline-devel BuildRequires.


Modified: tinysofa/snapshot/rpm/current/sources/GROUPS.tinysofa
===================================================================
--- tinysofa/snapshot/rpm/current/sources/GROUPS.tinysofa	2004-06-07 13:35:57 UTC (rev 1891)
+++ tinysofa/snapshot/rpm/current/sources/GROUPS.tinysofa	2004-06-07 13:58:40 UTC (rev 1892)
@@ -1,5 +1,5 @@
 tinysofa/main
-tinysofa/internationalisation
+tinysofa/i18n
 tinysofa/development
 tinysofa/libraries
 tinysofa/documentation
@@ -7,9 +7,10 @@
 tinysofa/perl
 tinysofa/dotnet
 tinysofa/ruby
+tinysofa/java
 tinysofa/extra
 tinysofa/contrib/main
-tinysofa/contrib/internationalisation
+tinysofa/contrib/i18n
 tinysofa/contrib/development
 tinysofa/contrib/libraries
 tinysofa/contrib/documentation
@@ -17,4 +18,5 @@
 tinysofa/contrib/perl
 tinysofa/contrib/dotnet
 tinysofa/contrib/ruby
+tinysofa/contrib/java
 tinysofa/contrib/extra

Added: tinysofa/snapshot/rpm/current/sources/rpm4.2.2-tinysofa-initrddir.patch
===================================================================
--- tinysofa/snapshot/rpm/current/sources/rpm4.2.2-tinysofa-initrddir.patch	2004-06-07 13:35:57 UTC (rev 1891)
+++ tinysofa/snapshot/rpm/current/sources/rpm4.2.2-tinysofa-initrddir.patch	2004-06-07 13:58:40 UTC (rev 1892)
@@ -0,0 +1,12 @@
+diff -urN rpm-4.2.2/platform.in rpm-4.2.2.initrddir/platform.in
+--- rpm-4.2.2/platform.in	2004-06-07 23:48:08.000000000 +1000
++++ rpm-4.2.2.initrddir/platform.in	2004-06-07 23:49:48.000000000 +1000
+@@ -28,7 +28,7 @@
+ %_oldincludedir		@oldincludedir@
+ %_infodir		@infodir@
+ %_mandir		@mandir@
+-%_initrddir		%{_sysconfdir}/rc.d/init.d
++%_initrddir		%{_sysconfdir}/init.d
+ 
+ %_defaultdocdir		@DEFAULTDOCDIR@
+ 

Modified: tinysofa/snapshot/rpm/current/sources/tinysofa.macros
===================================================================
--- tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-07 13:35:57 UTC (rev 1891)
+++ tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-07 13:58:40 UTC (rev 1892)
@@ -2,9 +2,6 @@
 # tinysofa additional macros
 #
 
-%_initdir		%{_sysconfdir}/init.d
-
-
 %make %{__make} %{?_smp_mflags}
 
 %makeinstall_std make DESTDIR="%{buildroot}" install

Modified: tinysofa/snapshot/rpm/current/specs/rpm.spec
===================================================================
--- tinysofa/snapshot/rpm/current/specs/rpm.spec	2004-06-07 13:35:57 UTC (rev 1891)
+++ tinysofa/snapshot/rpm/current/specs/rpm.spec	2004-06-07 13:58:40 UTC (rev 1892)
@@ -8,7 +8,6 @@
 
 %define popt_libname			%mklibname popt
 %define popt_libname_devel		%mklibname popt -d
-%define popt_libname_static_devel	%mklibname popt -d -s
 
 %define rpm_pyname	%mkpyname rpm
 
@@ -17,7 +16,7 @@
 
 Name: rpm
 Version: 4.2.2
-Release: 14ok
+Release: 15ok
 License: GPL
 Summary: RPM Package Manager
 Summary(pt_BR): Gerenciador de pacotes RPM
@@ -77,20 +76,21 @@
 Patch31: rpm4.2.2-tinysofa-installplatform-arch.patch
 Patch32: rpm4.2.2-tinysofa-umask.patch
 Patch33: rpm4.2.2-tinysofa-buildarchtranslate.patch
+Patch34: rpm4.2.2-tinysofa-initrddir.patch
 
 Requires: %{popt_libname} = %{popt_version}-%{release}
 BuildRequires: autoconf >= 2.13
 BuildRequires: automake >= 1.4
 BuildRequires: binutils
-BuildRequires: %{mklibname elfutils -d -s}
-BuildRequires: %{mklibname elfutils-libelf -d -s}
+BuildRequires: %{mklibname elfutils -d}
+BuildRequires: %{mklibname elfutils-libelf -d}
 BuildRequires: gcc
 BuildRequires: gettext-devel
 BuildRequires: glibc-devel
-BuildRequires: %{mklibname beecrypt -d -s}
-BuildRequires: %{mklibname bz2 -d -s} >= 0.9.0c-2
+BuildRequires: %{mklibname beecrypt -d}
 BuildRequires: libtool >= 1.3.5
-BuildRequires: %{mklibname z -d -s}
+BuildRequires: %{mklibname z -d}
+BuildRequires: %{mklibname readline -d}
 BuildRequires: make
 %if %{with apidocs}
 BuildRequires: doxygen
@@ -177,20 +177,6 @@
 creaci?n de administradores gr?ficos de paquetes y otras herramientas que
 necesiten un conocimiento profundo de paquetes RPM.
 
-%package -n %{libname_static_devel}
-Summary: Static libraries for developing RPM applications.
-Summary(pt_BR): Bibliotecas est?ticas para o desenvolvimento de aplica??es RPM
-Group: tinysofa/development
-Group(pt_BR): tinysofa/desenvolvimento
-Group(es): tinysofa/desarrollo
-#Requires: %{libname_devel} = %{version}-%{release}
-
-%description -n %{libname_static_devel}
-Static libraries for development.
-
-%description -l pt_BR -n %{libname_static_devel}
-Bibliotecas est?ticas para desenvolvimento.
-
 %package -n rpm-build
 Summary: Scripts and executable programs used to build packages.
 Summary(pt_BR): Scripts e programas execut?veis usados para construir pacotes
@@ -347,22 +333,6 @@
 %description -l es -n %{popt_libname_devel}
 Biblioteca de desarrollo de popt.
 
-%package -n %{popt_libname_static_devel}
-Version: %{popt_version}
-Summary: Static libraries for developing POPT applications
-Summary(pt_BR): Bibliotecas est?ticas para o desenvolvimento de aplica??es POPT
-License: LGPL
-Group: tinysofa/development
-Group(pt_BR): tinysofa/desenvolvimento
-Group(es): tinysofa/desarrollo
-Requires: %{popt_libname_devel} = %{popt_version}-%{release}
-
-%description -n %{popt_libname_static_devel}
-Static libraries for development.
-
-%description -l pt_BR -n %{popt_libname_static_devel}
-Bibliotecas est?ticas para desenvolvimento com o popt.
-
 %package -n %{popt_libname}-doc
 Summary: Popt extra documentation
 Summary(pt_BR): Documenta??o adicional do popt
@@ -416,6 +386,7 @@
 %patch31 -p1 -b .tinysofa-installplatform-arch
 %patch32 -p1 -b .tinysofa-umask
 %patch33 -p1 -b .tinysofa-buildarchtranslate
+%patch34 -p1 -b .tinysofa-initrddir
 
 cp %{_sourcedir}/rpm-es_ES.po po/es_ES.po
 cp %{_sourcedir}/rpm-pt_BR.po po/pt_BR.po
@@ -684,9 +655,6 @@
 %{_libdir}/librpmdb.so
 %{_mandir}/man8/rpmcache.8*
 %{_mandir}/man8/rpmgraph.8*
-
-%files -n %{libname_static_devel}
-%defattr(0644,root,root,0755)
 %{_libdir}/librpm.a
 %{_libdir}/librpmbuild.a
 %{_libdir}/librpmdb.a
@@ -702,9 +670,6 @@
 %{_includedir}/popt.h
 %{_libdir}/libpopt.la
 %{_libdir}/libpopt.so
-
-%files -n %{popt_libname_static_devel}
-%defattr(0644,root,root,0755)
 %{_libdir}/libpopt.a
 
 %files -n %{popt_libname}-doc


From svn at tinysofa.org  Mon Jun  7 15:39:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 01:39:59 +1000 (EST)
Subject: [tinysofa-svn] r1893 - tinysofa/snapshot/lilo/current/specs
Message-ID: <20040607153959.716754E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-08 01:39:59 +1000 (Tue, 08 Jun 2004)
New Revision: 1893

Modified:
   tinysofa/snapshot/lilo/current/specs/lilo.spec
Log:
- don't use %{upstreamversion}


Modified: tinysofa/snapshot/lilo/current/specs/lilo.spec
===================================================================
--- tinysofa/snapshot/lilo/current/specs/lilo.spec	2004-06-07 13:58:40 UTC (rev 1892)
+++ tinysofa/snapshot/lilo/current/specs/lilo.spec	2004-06-07 15:39:59 UTC (rev 1893)
@@ -1,14 +1,12 @@
-%define upstreamversion 22.3.2
-
 Summary: The boot loader for Linux and other operating systems
 Summary(pt_BR): Carregador de boot para Linux e outros sistemas operacionais
 Summary(es): Cargador de arranque para Linux y otros sistemas operativos
 Name: lilo
-Version: 0.%{upstreamversion}
-Release: 12jh
+Version: 22.3.2
+Release: 1jh
 License: MIT
 Group: tinysofa/main
-Source: http://www.ibiblio.org/pub/Linux/system/boot/lilo/%{name}-%{upstreamversion}.tar.gz
+Source: http://www.ibiblio.org/pub/Linux/system/boot/lilo/%{name}-%{version}.tar.gz
 Source2: keytab-lilo.c
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Patch0: lilo-nolatexdoc.patch
@@ -41,7 +39,7 @@
 
 
 %prep
-%setup -q -n lilo-%{upstreamversion}
+%setup -q
 %patch0 -p1 
 %patch1 -p1 -b .lvm_ioctl-fixup
 %patch2 -p1 -b .page


From svn at tinysofa.org  Mon Jun  7 15:55:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 01:55:05 +1000 (EST)
Subject: [tinysofa-svn] r1894 - tinysofa/snapshot/hwdata/current/sources
Message-ID: <20040607155505.6DF6D4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-08 01:55:05 +1000 (Tue, 08 Jun 2004)
New Revision: 1894

Modified:
   tinysofa/snapshot/hwdata/current/sources/hwdata-pcitable
Log:
- add module name for VIA VT6420 SATA RAID Controller


Modified: tinysofa/snapshot/hwdata/current/sources/hwdata-pcitable
===================================================================
--- tinysofa/snapshot/hwdata/current/sources/hwdata-pcitable	2004-06-07 15:39:59 UTC (rev 1893)
+++ tinysofa/snapshot/hwdata/current/sources/hwdata-pcitable	2004-06-07 15:55:05 UTC (rev 1894)
@@ -1945,7 +1945,7 @@
 0x1106	0x3133	"unknown"	"VIA Technologies|VT3133 Host Bridge"
 0x1106	0x3147	"unknown"	"VIA Technologies|VT8233A ISA Bridge"
 0x1106	0x3148	"unknown"	"VIA Technologies|P4M266 Host Bridge"
-0x1106	0x3149	"unknown"	"VIA Technologies|VIA VT6420 SATA RAID Controller"
+0x1106	0x3149	"sata_via"	"VIA Technologies|VIA VT6420 SATA RAID Controller"
 0x1106	0x3156	"unknown"	"VIA Technologies|P/KN266 Host Bridge"
 0x1106	0x3164	"unknown"	"VIA Technologies|VT6410 ATA133 RAID controller"
 0x1106	0x3168	"unknown"	"VIA Technologies|VT8374 P4X400 Host Controller/AGP Bridge"


From svn at tinysofa.org  Mon Jun  7 18:37:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 04:37:39 +1000 (EST)
Subject: [tinysofa-svn] 
	r1895 - in tinysofa/snapshot/python/current: sources specs
Message-ID: <20040607183739.E8AA34E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-08 04:37:39 +1000 (Tue, 08 Jun 2004)
New Revision: 1895

Added:
   tinysofa/snapshot/python/current/sources/JapaneseCodecs-1.4.9.tar.gz
   tinysofa/snapshot/python/current/sources/Python-2.3.4.tar.bz2
   tinysofa/snapshot/python/current/sources/japanese-codecs-lib64.patch
   tinysofa/snapshot/python/current/sources/python-2.3.2-lib64.patch
   tinysofa/snapshot/python/current/sources/python-2.3.4-lib64-regex.patch
Removed:
   tinysofa/snapshot/python/current/sources/Python-2.3.3.tar.bz2
   tinysofa/snapshot/python/current/sources/html-2.3.3.tar.bz2
   tinysofa/snapshot/python/current/sources/python-2.2.2-ftpuri.patch
Modified:
   tinysofa/snapshot/python/current/specs/python.spec
Log:
- new upstream (2.3.4)
- python-jp-codecs package
- use more macros
- integrate recent Fedora changes
- integrate some doc package file list from Conectica spec file
- use new macros and groups


Added: tinysofa/snapshot/python/current/sources/JapaneseCodecs-1.4.9.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/python/current/sources/JapaneseCodecs-1.4.9.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/snapshot/python/current/sources/Python-2.3.3.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/snapshot/python/current/sources/Python-2.3.4.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/python/current/sources/Python-2.3.4.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/snapshot/python/current/sources/html-2.3.3.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/snapshot/python/current/sources/japanese-codecs-lib64.patch
===================================================================
--- tinysofa/snapshot/python/current/sources/japanese-codecs-lib64.patch	2004-06-07 15:55:05 UTC (rev 1894)
+++ tinysofa/snapshot/python/current/sources/japanese-codecs-lib64.patch	2004-06-07 18:37:39 UTC (rev 1895)
@@ -0,0 +1,18 @@
+--- JapaneseCodecs-1.4.9/setup.py.lib64-j	Mon Feb 10 12:44:55 2003
++++ JapaneseCodecs-1.4.9/setup.py	Mon Feb 10 12:45:26 2003
+@@ -25,12 +25,12 @@
+ import os, sys
+ 
+ if os.sep == '/':
+-    sitedir = os.path.join("lib", "python" + sys.version[:3], "site-packages")
++    sitedir = os.path.join("lib64", "python" + sys.version[:3], "site-packages")
+ elif os.sep == ':':
+-    sitedir = os.path.join("lib", "site-packages")
++    sitedir = os.path.join("lib64", "site-packages")
+ else:
+     if sys.version_info[0:3] >= (2, 2, 0):
+-        sitedir = os.path.join("lib", "site-packages")
++        sitedir = os.path.join("lib64", "site-packages")
+     else:
+         sitedir = "."
+ 

Deleted: tinysofa/snapshot/python/current/sources/python-2.2.2-ftpuri.patch
===================================================================
--- tinysofa/snapshot/python/current/sources/python-2.2.2-ftpuri.patch	2004-06-07 15:55:05 UTC (rev 1894)
+++ tinysofa/snapshot/python/current/sources/python-2.2.2-ftpuri.patch	2004-06-07 18:37:39 UTC (rev 1895)
@@ -1,12 +0,0 @@
---- Python-2.2.2/Lib/urllib2.py.ftprfc	2003-02-20 20:09:59.000000000 -0500
-+++ Python-2.2.2/Lib/urllib2.py	2003-02-20 20:11:02.000000000 -0500
-@@ -921,8 +921,8 @@
-         except socket.error, msg:
-             raise URLError(msg)
-         path, attrs = splitattr(req.get_selector())
--        path = unquote(path)
-         dirs = path.split('/')
-+        dirs = map(unquote, dirs)
-         dirs, file = dirs[:-1], dirs[-1]
-         if dirs and not dirs[0]:
-             dirs = dirs[1:]

Added: tinysofa/snapshot/python/current/sources/python-2.3.2-lib64.patch
===================================================================
--- tinysofa/snapshot/python/current/sources/python-2.3.2-lib64.patch	2004-06-07 15:55:05 UTC (rev 1894)
+++ tinysofa/snapshot/python/current/sources/python-2.3.2-lib64.patch	2004-06-07 18:37:39 UTC (rev 1895)
@@ -0,0 +1,232 @@
+--- Python-2.3.2/Lib/distutils/command/install.py.lib64	2002-11-19 08:12:28.000000000 -0500
++++ Python-2.3.2/Lib/distutils/command/install.py	2003-11-07 12:04:05.000000000 -0500
+@@ -39,14 +39,14 @@
+ INSTALL_SCHEMES = {
+     'unix_prefix': {
+         'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
++        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
+         'headers': '$base/include/python$py_version_short/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
+     'unix_home': {
+         'purelib': '$base/lib/python',
+-        'platlib': '$base/lib/python',
++        'platlib': '$base/lib64/python',
+         'headers': '$base/include/python/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+--- Python-2.3.2/Lib/distutils/sysconfig.py.lib64	2003-02-10 09:02:33.000000000 -0500
++++ Python-2.3.2/Lib/distutils/sysconfig.py	2003-11-07 12:04:05.000000000 -0500
+@@ -100,7 +100,7 @@
+ 
+     if os.name == "posix":
+         libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
++                                 "lib64", "python" + get_python_version())
+         if standard_lib:
+             return libpython
+         else:
+--- Python-2.3.2/Lib/site.py.lib64	2003-07-18 13:45:33.000000000 -0400
++++ Python-2.3.2/Lib/site.py	2003-11-07 12:04:05.000000000 -0500
+@@ -167,9 +167,14 @@
+             sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
+         elif os.sep == '/':
+             sitedirs = [os.path.join(prefix,
++                                     "lib64",
++                                     "python" + sys.version[:3],
++                                     "site-packages"),
++                        os.path.join(prefix,
+                                      "lib",
+                                      "python" + sys.version[:3],
+                                      "site-packages"),
++                        os.path.join(prefix, "lib64", "site-python"),
+                         os.path.join(prefix, "lib", "site-python")]
+         else:
+             sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
+--- Python-2.3.2/Modules/getpath.c.lib64	2002-12-31 07:45:12.000000000 -0500
++++ Python-2.3.2/Modules/getpath.c	2003-11-07 12:04:05.000000000 -0500
+@@ -112,8 +112,8 @@
+ #endif
+ 
+ #ifndef PYTHONPATH
+-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
+-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
++#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
++              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
+ #endif
+ 
+ #ifndef LANDMARK
+@@ -124,7 +124,7 @@
+ static char exec_prefix[MAXPATHLEN+1];
+ static char progpath[MAXPATHLEN+1];
+ static char *module_search_path = NULL;
+-static char lib_python[] = "lib/python" VERSION;
++static char lib_python[] = "lib64/python" VERSION;
+ 
+ static void
+ reduce(char *dir)
+@@ -492,7 +492,7 @@
+     }
+     else
+         strncpy(zip_path, PREFIX, MAXPATHLEN);
+-    joinpath(zip_path, "lib/python00.zip");
++    joinpath(zip_path, "lib64/python00.zip");
+     bufsz = strlen(zip_path);	/* Replace "00" with version */
+     zip_path[bufsz - 6] = VERSION[0];
+     zip_path[bufsz - 5] = VERSION[2];
+@@ -502,7 +502,7 @@
+             fprintf(stderr,
+                 "Could not find platform dependent libraries <exec_prefix>\n");
+         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
+-        joinpath(exec_prefix, "lib/lib-dynload");
++        joinpath(exec_prefix, "lib64/lib-dynload");
+     }
+     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
+ 
+--- Python-2.3.2/Modules/Setup.dist.lib64	2003-11-07 12:04:05.000000000 -0500
++++ Python-2.3.2/Modules/Setup.dist	2003-11-07 12:04:05.000000000 -0500
+@@ -343,7 +343,7 @@
+ # *** Uncomment and edit to reflect your Tcl/Tk versions:
+ 	-ltk -ltcl \
+ # *** Uncomment and edit to reflect where your X11 libraries are:
+-	-L/usr/X11R6/lib \
++	-L/usr/X11R6/lib64 \
+ # *** Or uncomment this for Solaris:
+ #	-L/usr/openwin/lib \
+ # *** Uncomment these for TOGL extension only:
+@@ -416,7 +416,7 @@
+ # and the subdirectory of PORT where you built it.
+ DBLIBVER=4.2
+ DBINC=/usr/include/db4
+-DBLIB=/usr/lib
++DBLIB=/usr/lib64
+ _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+ 
+ # Historical Berkeley DB 1.85
+@@ -462,7 +462,7 @@
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.cdrom.com/pub/infozip/zlib/
+-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
+ 
+ # Interface to the Expat XML parser
+ #
+--- Python-2.3.2/setup.py.lib64	2003-09-21 21:19:45.000000000 -0400
++++ Python-2.3.2/setup.py	2003-11-07 12:04:05.000000000 -0500
+@@ -241,7 +241,7 @@
+ 
+     def detect_modules(self):
+         # Ensure that /usr/local is always used
+-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
+         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ 
+         # fink installs lots of goodies in /sw/... - make sure we
+@@ -264,7 +264,7 @@
+         # lib_dirs and inc_dirs are used to search for files;
+         # if a file is found in one of those directories, it can
+         # be assumed that no additional -I,-L directives are needed.
+-        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
++        lib_dirs = self.compiler.library_dirs + ['/lib64', '/usr/lib64']
+         inc_dirs = self.compiler.include_dirs + ['/usr/include']
+         exts = []
+ 
+@@ -413,11 +413,11 @@
+             elif self.compiler.find_library_file(lib_dirs, 'curses'):
+                 readline_libs.append('curses')
+             elif self.compiler.find_library_file(lib_dirs +
+-                                               ['/usr/lib/termcap'],
++                                               ['/usr/lib64/termcap'],
+                                                'termcap'):
+                 readline_libs.append('termcap')
+             exts.append( Extension('readline', ['readline.c'],
+-                                   library_dirs=['/usr/lib/termcap'],
++                                   library_dirs=['/usr/lib64/termcap'],
+                                    libraries=readline_libs) )
+         if platform not in ['mac']:
+                 # crypt module.
+@@ -446,8 +446,8 @@
+             if krb5_h:
+                 ssl_incs += krb5_h
+         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
+-                                     ['/usr/local/ssl/lib',
+-                                      '/usr/contrib/ssl/lib/'
++                                     ['/usr/local/ssl/lib64',
++                                      '/usr/contrib/ssl/lib64/'
+                                      ] )
+ 
+         if (ssl_incs is not None and
+@@ -481,12 +481,12 @@
+         # order you wish to search - e.g., search for db4 before db3
+         db_try_this = {
+             'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
+-                    'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
+-                                '/usr/local/BerkeleyDB.4.1/lib',
+-                                '/usr/local/BerkeleyDB.4.0/lib',
+-                                '/usr/local/lib',
++                    'libdirs': ('/usr/local/BerkeleyDB.4.2/lib64',
++                                '/usr/local/BerkeleyDB.4.1/lib64',
++                                '/usr/local/BerkeleyDB.4.0/lib64',
++                                '/usr/local/lib64',
+                                 '/opt/sfw',
+-                                '/sw/lib',
++                                '/sw/lib64',
+                                 ),
+                     'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
+                                 '/usr/local/include/db42',
+@@ -499,12 +499,12 @@
+                                 '/usr/include/db4',
+                                 )},
+             'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',),
+-                    'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
+-                                '/usr/local/BerkeleyDB.3.2/lib',
+-                                '/usr/local/BerkeleyDB.3.1/lib',
+-                                '/usr/local/lib',
+-                                '/opt/sfw/lib',
+-                                '/sw/lib',
++                    'libdirs': ('/usr/local/BerkeleyDB.3.3/lib64',
++                                '/usr/local/BerkeleyDB.3.2/lib64',
++                                '/usr/local/BerkeleyDB.3.1/lib64',
++                                '/usr/local/lib64',
++                                '/opt/sfw/lib64',
++                                '/sw/lib64',
+                                 ),
+                     'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
+                                 '/usr/local/BerkeleyDB.3.2/include',
+@@ -981,14 +981,14 @@
+             added_lib_dirs.append('/usr/openwin/lib')
+         elif os.path.exists('/usr/X11R6/include'):
+             include_dirs.append('/usr/X11R6/include')
+-            added_lib_dirs.append('/usr/X11R6/lib')
++            added_lib_dirs.append('/usr/X11R6/lib64')
+         elif os.path.exists('/usr/X11R5/include'):
+             include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
++            added_lib_dirs.append('/usr/X11R5/lib64')
+         else:
+             # Assume default location for X11
+             include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
++            added_lib_dirs.append('/usr/X11/lib64')
+ 
+         # If Cygwin, then verify that X is installed before proceeding
+         if platform == 'cygwin':
+--- Python-2.3.2/Makefile.pre.in.lib64	2003-11-07 12:07:49.000000000 -0500
++++ Python-2.3.2/Makefile.pre.in	2003-11-07 12:08:11.000000000 -0500
+@@ -79,11 +79,11 @@
+ 
+ # Expanded directories
+ BINDIR=		$(exec_prefix)/bin
+-LIBDIR=		$(exec_prefix)/lib
++LIBDIR=		$(exec_prefix)/lib64
+ MANDIR=		@mandir@
+ INCLUDEDIR=	@includedir@
+ CONFINCLUDEDIR=	$(exec_prefix)/include
+-SCRIPTDIR=	$(prefix)/lib
++SCRIPTDIR=	$(prefix)/lib64
+ 
+ # Detailed destination directories
+ BINLIBDEST=	$(LIBDIR)/python$(VERSION)

Added: tinysofa/snapshot/python/current/sources/python-2.3.4-lib64-regex.patch
===================================================================
--- tinysofa/snapshot/python/current/sources/python-2.3.4-lib64-regex.patch	2004-06-07 15:55:05 UTC (rev 1894)
+++ tinysofa/snapshot/python/current/sources/python-2.3.4-lib64-regex.patch	2004-06-07 18:37:39 UTC (rev 1895)
@@ -0,0 +1,18 @@
+--- Python-2.3.4/Lib/test/test_re.py			2004-04-20 23:32:33.000000000 +0200
++++ Python-2.3.4/Lib/test/test_re.py.lib64-regex	2004-05-29 17:36:52.000000000 +0200
+@@ -497,6 +497,15 @@
+         self.assert_(re.compile('bug_926075') is not
+                      re.compile(eval("u'bug_926075'")))
+ 
++    def test_bug_931848(self):
++        try:
++            unicode
++        except NameError:
++            pass
++        pattern = eval('u"[\u002E\u3002\uFF0E\uFF61]"')
++        self.assertEqual(re.compile(pattern).split("a.b.c"),
++                         ['a','b','c'])
++
+ def run_re_tests():
+     from test.re_tests import benchmarks, tests, SUCCEED, FAIL, SYNTAX_ERROR
+     if verbose:

Modified: tinysofa/snapshot/python/current/specs/python.spec
===================================================================
--- tinysofa/snapshot/python/current/specs/python.spec	2004-06-07 15:55:05 UTC (rev 1894)
+++ tinysofa/snapshot/python/current/specs/python.spec	2004-06-07 18:37:39 UTC (rev 1895)
@@ -2,47 +2,46 @@
 %define python python
 
 %define pybasever 2.3
+%define jp_codecs 1.4.9
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
-Version: %{pybasever}.3
-Release: 8ts
+Version: %{pybasever}.4
+Release: 1jh
 License: PSF - see LICENSE
-Group: tinysofa official
+Group: tinysofa/python
 Provides: python-abi = %{pybasever}
-Obsoletes: python-modules
-Provides: python-modules = %{version}
-Obsoletes: python-gdbm
-Provides: python-gdbm = %{version}
-Obsoletes: python-dbm
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
-Source2: html-%{version}.tar.bz2
 Source3: modulator
 Source4: pynche
+Source5: http://www.python.jp/pub/JapaneseCodecs/JapaneseCodecs-%{jp_codecs}.tar.gz
 Source6: http://gigue.peabody.jhu.edu/~mdboom/omi/source/shm_source/shmmodule.c
 
 Patch0: python-2.3-config.patch
 Patch3: Python-2.2.1-pydocnogui.patch
 Patch4: python-2.3-nowhatsnew.patch
-Patch10: python-2.2.2-urllib2-nonanonftp.patch
-Patch11: python-2.2.2-ftpuri.patch
+Patch7: python-2.3.4-lib64-regex.patch
+Patch8: python-2.3.2-lib64.patch
+Patch9: japanese-codecs-lib64.patch
 Patch12: python-2.3.2-nomkhowto.patch
-Patch13: python-2.3.3-cache_ftp.patch
-Patch14: python-2.3.3-tinysofa-distutils.patch
+Patch100: python-2.3.3-tinysofa-distutils.patch
 
-Obsoletes: python2 
+Obsoletes: python2 python-modules python-gdbm python-dbm
 Provides: python2 = %{version}
+Provides: python-modules = %{version}
+Provides: python-gdbm = %{version}
 BuildPrereq: db4-devel
 Obsoletes: Distutils
 Provides: Distutils
 
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
 BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
-BuildPrereq: gcc-c++-devel glibc-devel gdbm-devel
+BuildPrereq: glibc-devel gcc-c++-devel
 BuildPrereq: gzip tar findutils pkgconfig
 URL: http://www.python.org/
 
+
 %description
 Python is an interpreted, interactive, object-oriented programming
 language often compared to Tcl, Perl, Scheme or Java. Python includes
@@ -60,9 +59,22 @@
 Note that documentation for Python is provided in the python-docs
 package.
 
+%package jp-codecs
+Summary: Japanese Codecs for Python Unicode Support
+Group: tinysofa/python
+Requires: %{name} = %{version}-%{release}
+License: a variant of the BSD license
+
+%description jp-codecs
+This package provides Unicode codecs that make Python aware of Japanese
+character encodings such as EUC-JP, Shift_JIS and ISO-2022-JP.  By using this
+package, Japanese characters can be treated as a character string instead of a
+byte sequence.
+
 %package devel
 Summary: The libraries and header files needed for Python development.
-Group: tinysofa official
+Group: tinysofa/development
+Requires: %{name} = %{version}-%{release}
 Obsoletes: python2-devel
 Provides: python2-devel = %{version}
 
@@ -79,8 +91,8 @@
 
 %package tools
 Summary: A collection of development tools included with Python.
-Group: tinysofa official
-Requires: %{name} = %{version}
+Group: tinysofa/development
+Requires: %{name} = %{version}-%{release}
 Obsoletes: python2-tools
 Provides: python2-tools = %{version}
 
@@ -88,13 +100,15 @@
 The Python package includes several development tools that are used
 to build python programs.
 
-%package docs
+%package doc
 Summary: Documentation for the Python programming language.
-Group: tinysofa official
+Group: tinysofa/documentation
+Requires: %{name} = %{version}
 Obsoletes: python2-docs
 Provides: python2-docs = %{version}
+%rename python-docs
 
-%description docs
+%description doc
 The python-docs package contains documentation on the Python
 programming language and interpreter.  The documentation is provided
 in ASCII text files and in LaTeX source files.
@@ -102,17 +116,20 @@
 Install the python-docs package if you'd like to use the documentation
 for the Python language.
 
+
 %prep
-%setup -q -n Python-%{version}
+%setup -q -n Python-%{version} -a 5
 
 %patch0 -p1 -b .rhconfig
 %patch3 -p1 -b .no_gui
 %patch4 -p1
-%patch10 -p1 -b .nonanonftp
-%patch11 -p1 -b .ftpuri
+%if %{_lib} == lib64
+%patch7 -p1 -b .lib64-regex
+%patch8 -p1 -b .lib64
+%patch9 -p0 -b .lib64-j
+%endif
 %patch12 -p1 -b .nomkhowto
-%patch13 -p1 -b .cache_ftp
-%patch14 -p1 -b .tinysofa-distutils
+%patch100 -p1
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -131,9 +148,10 @@
 
 %build
 topdir=`pwd`
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC %{?no_stack_protector}"
-export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC %{?no_stack_protector}"
-export OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC %{?no_stack_protector}"
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?no_stack_protector}"
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
+export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
+export OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
 export LINKCC="gcc"
 if pkg-config openssl ; then
 	export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
@@ -143,9 +161,9 @@
 export CC=gcc
 %configure --enable-ipv6 --enable-unicode=%{unicode}
 
-make OPT="$CFLAGS" %{?_smp_mflags}
+%make OPT="$CFLAGS"
 $topdir/python Tools/scripts/pathfix.py -i "/usr/bin/env python%{pybasever}" .
-make OPT="$CFLAGS" %{?_smp_mflags}
+%make OPT="$CFLAGS"
 
 %ifarch i386
 pushd Doc
@@ -155,72 +173,98 @@
 %endif
 
 %install
-[ -d $RPM_BUILD_ROOT ] && rm -fr $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr $RPM_BUILD_ROOT%{_mandir}
+%{__mkdir_p} %{buildroot}/usr %{buildroot}%{_mandir}
 
-%makeinstall DESTDIR=/ MANDIR=$RPM_BUILD_ROOT%{_mandir} INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} SCRIPTDIR=$RPM_BUILD_ROOT%{_libdir} build_root=$RPM_BUILD_ROOT
+# Clean up patched .py files that are saved as .lib64
+for f in distutils/command/install distutils/sysconfig; do
+    rm -f Lib/$f.py.lib64
+done
+
+%makeinstall \
+	DESTDIR=/ \
+	MANDIR=%{buildroot}%{_mandir} \
+	INCLUDEDIR=%{buildroot}%{_includedir} \
+	LIBDIR=%{buildroot}%{_libdir} \
+	SCRIPTDIR=%{buildroot}%{_libdir} \
+	build_root=%{buildroot}
+
 # Fix the interpreter path in binaries installed by distutils 
 # (which changes them by itself)
 # Make sure we preserve the file permissions
-for fixed in $RPM_BUILD_ROOT/usr/bin/pydoc; do
+for fixed in %{buildroot}/usr/bin/pydoc; do
     sed 's,#!.*/python$,#!/usr/bin/env python%{pybasever},' $fixed > $fixed- \
         && cat $fixed- > $fixed && rm -f $fixed-
 done
 
-ln -s python $RPM_BUILD_ROOT/usr/bin/python2
+ln -s python %{buildroot}%{_bindir}/python2
 
 # tools
 
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages
+mkdir -p %{buildroot}%{_libdir}/python%{pybasever}/site-packages
 
 #modulator
-install -m 755 $RPM_SOURCE_DIR/modulator ${RPM_BUILD_ROOT}/usr/bin/modulator
+install -m 755 $RPM_SOURCE_DIR/modulator %{buildroot}%{_bindir}/modulator
 cp -r Tools/modulator \
-  ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages/
+  %{buildroot}%{_libdir}/python%{pybasever}/site-packages/
 
 #pynche
-install -m 755 $RPM_SOURCE_DIR/pynche ${RPM_BUILD_ROOT}/usr/bin/pynche
+install -m 755 $RPM_SOURCE_DIR/pynche %{buildroot}%{_bindir}/pynche
 rm -f Tools/pynche/*.pyw
 cp -r Tools/pynche \
-  ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages/
+  %{buildroot}%{_libdir}/python%{pybasever}/site-packages/
 
 mv Tools/modulator/README Tools/modulator/README.modulator
 mv Tools/pynche/README Tools/pynche/README.pynche
 
 #gettext
-install -m755  Tools/i18n/pygettext.py $RPM_BUILD_ROOT/usr/bin/
-install -m755  Tools/i18n/msgfmt.py $RPM_BUILD_ROOT/usr/bin/
+install -m755  Tools/i18n/pygettext.py %{buildroot}%{_bindir}
+install -m755  Tools/i18n/msgfmt.py %{buildroot}%{_bindir}
 
 # Get rid of crap
-find $RPM_BUILD_ROOT/ -name "*~"|xargs rm -f
-find $RPM_BUILD_ROOT/ -name ".cvsignore"|xargs rm -f
+find %{buildroot}/ -name "*~"|xargs rm -f
+find %{buildroot}/ -name ".cvsignore"|xargs rm -f
 find . -name "*~"|xargs rm -f
 find . -name ".cvsignore"|xargs rm -f
 #zero length
-rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/site-packages/modulator/Templates/copyright
+rm -f %{buildroot}%{_libdir}/python%{pybasever}/site-packages/modulator/Templates/copyright
 
 # Clean up the testsuite - we don't need compiled files for it
-find $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/test \
+find %{buildroot}%{_libdir}/python%{pybasever}/test \
     -name "*.pyc" -o -name "*.pyo" | xargs rm -f
-rm -f $RPM_BUILD_ROOT%{_libdir}/python2.2/LICENSE.txt
+rm -f %{buildroot}%{_libdir}/python2.2/LICENSE.txt
 
+
+# Japanese codecs
+pushd JapaneseCodecs-%{jp_codecs}
+PYTHONHOME=$RPM_BUILD_ROOT/usr $RPM_BUILD_ROOT/%{_bindir}/%{python} setup.py \
+install \
+--install-scripts=%{buildroot}%{_prefix}/bin \
+--install-purelib=%{buildroot}%{_libdir}/python%{pybasever}/site-packages \
+--install-platlib=%{buildroot}%{_libdir}/python%{pybasever}/lib-dynload \
+--install-data=%{buildroot}%{_exec_prefix} \
+--root=/
+popd
+
+
 %clean
-rm -fr $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-, root, root)
 %doc LICENSE README
-/usr/bin/python*
+%{_bindir}/python*
 %{_mandir}/*/*
 
 %dir %{_libdir}/python%{pybasever}
-%dir %{_libdir}/python%{pybasever}/lib-dynload
 %dir %{_libdir}/python%{pybasever}/site-packages
 %{_libdir}/python%{pybasever}/site-packages/README
 %{_libdir}/python%{pybasever}/LICENSE.txt
 %{_libdir}/python%{pybasever}/*.py*
 %{_libdir}/python%{pybasever}/*.doc
 %{_libdir}/python%{pybasever}/bsddb
+%dir %{_libdir}/python%{pybasever}/config
+%{_libdir}/python%{pybasever}/config/Makefile
 %{_libdir}/python%{pybasever}/curses
 %{_libdir}/python%{pybasever}/distutils
 %{_libdir}/python%{pybasever}/encodings
@@ -232,9 +276,15 @@
 %{_libdir}/python%{pybasever}/compiler
 %{_libdir}/python%{pybasever}/plat-linux2
 %{_libdir}/python%{pybasever}/hotshot
-%attr(755,root,root) %{_libdir}/python%{pybasever}/lib-dynload
+%dir %{_libdir}/python%{pybasever}/lib-dynload
+%attr(755,root,root) %{_libdir}/python%{pybasever}/lib-dynload/*.so
 %exclude %{_libdir}/python%{pybasever}/lib-tk
 
+%files jp-codecs
+%defattr(644,root,root,755)
+%{_libdir}/python%{pybasever}/site-packages/japanese.pth
+%{_libdir}/python%{pybasever}/lib-dynload/japanese
+
 %files devel
 %defattr(-,root,root)
 /usr/include/*
@@ -247,38 +297,45 @@
 %doc Tools/pynche/README.pynche
 %{_libdir}/python%{pybasever}/site-packages/modulator
 %{_libdir}/python%{pybasever}/site-packages/pynche
-/usr/bin/idle*
-/usr/bin/modulator*
-/usr/bin/pynche*
-/usr/bin/pygettext*.py
-/usr/bin/msgfmt*.py
-/usr/bin/pydoc
+%{_bindir}/idle*
+%{_bindir}/modulator*
+%{_bindir}/pynche*
+%{_bindir}/pygettext*.py
+%{_bindir}/msgfmt*.py
+%{_bindir}/pydoc
 
-%files docs
-%defattr(-,root,root,755)
+%files doc
+%defattr(644,root,root,755)
 %doc Misc/NEWS  Misc/README Misc/cheatsheet 
 %doc Misc/HISTORY Doc/html
+%doc Misc/ACKS
+%doc Misc/RFD
+%doc Misc/find_recursionlimit.py
+%doc Misc/python-mode.el
+%doc Misc/setuid-prog.c
+%doc Misc/indent.pro
+%doc Misc/cheatsheet
+%doc Misc/vgrindefs
+%doc Misc/gdbinit
+%doc LICENSE
+%doc Demo
 
+
 %changelog
-* Tue May 25 2004 tsintegrate <release at tinysofa dot org> 2.3.3-8ts
-- current (2.3.3-8ok) integrated as 2.3.3-8ts for release 1.0-U1
+* Fri Jun  4 2004 Mihai Ibanescu <misa at redhat.com> 2.3.4-1
+- Updated to 2.3.4-1 with Robert Scheck's help (bug #124764)
+- Added BuildRequires: tix-devel (bug #124918)
 
-* Tue May 25 2004 Omar Kilani <omar at tinysofa dot org> 2.3.3-8ok
-- Build without stack protector.
+* Fri May  7 2004 Mihai Ibanescu <misa at redhat.com> 2.3.3-6
+- Correct fix for #122304 from upstream:
+  http://sourceforge.net/tracker/?func=detail&atid=105470&aid=931848&group_id=5470
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.3.3-7ts
-- current (2.3.3-7jh) integrated as 2.3.3-7ts for release 1.0-U1
+* Thu May  6 2004 Mihai Ibanescu <misa at redhat.com> 2.3.3-4
+- Fix for bug #122304 : splitting the domain name fails on 64-bit arches
+- Fix for bug #120879 : including Makefile into the main package
 
-* Wed May 12 2004 Omar Kilani <omar at tinysofa dot org>
-- Fix BuildRequires gcc-c++-devel.
-- Add BuildRequires gdbm-devel.
+- Requires XFree86-devel instead of -libs (see bug #118442)
 
-* Mon May 10 2004  Jaakko Heinonen <jh at tinysofa dot org> 2.3.3-7jh
-- 755 permissions for .so libraries
-
-* Thu Apr 01 2004 Omar Kilani <omar at tinysofa dot org> 2.3.3-5ts
-- Added cache ftp patch.
-
 * Tue Mar 16 2004 Mihai Ibanescu <misa at redhat.com> 2.3.3-3
 - Requires XFree86-devel instead of -libs (see bug #118442)
 


From svn at tinysofa.org  Mon Jun  7 19:14:11 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 05:14:11 +1000 (EST)
Subject: [tinysofa-svn] r1896 - tinysofa/snapshot/python/current/specs
Message-ID: <20040607191411.AC8B94E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-08 05:14:11 +1000 (Tue, 08 Jun 2004)
New Revision: 1896

Modified:
   tinysofa/snapshot/python/current/specs/python.spec
Log:
- add proper html documentation to doc package


Modified: tinysofa/snapshot/python/current/specs/python.spec
===================================================================
--- tinysofa/snapshot/python/current/specs/python.spec	2004-06-07 18:37:39 UTC (rev 1895)
+++ tinysofa/snapshot/python/current/specs/python.spec	2004-06-07 19:14:11 UTC (rev 1896)
@@ -12,6 +12,7 @@
 Group: tinysofa/python
 Provides: python-abi = %{pybasever}
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
+Source2: python-doc-html-2.3.4.tar.bz2
 Source3: modulator
 Source4: pynche
 Source5: http://www.python.jp/pub/JapaneseCodecs/JapaneseCodecs-%{jp_codecs}.tar.gz
@@ -38,7 +39,7 @@
 BuildPrereq: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
 BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
 BuildPrereq: glibc-devel gcc-c++-devel
-BuildPrereq: gzip tar findutils pkgconfig
+BuildPrereq: bzip2 gzip tar findutils pkgconfig
 URL: http://www.python.org/
 
 
@@ -146,6 +147,11 @@
 shm shmmodule.c
 EOF
 
+# Unpack html documentation
+bzip2 -dc %{SOURCE2} | tar xf -
+mv Python-Docs-%{version} html/
+
+
 %build
 topdir=`pwd`
 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?no_stack_protector}"
@@ -306,8 +312,7 @@
 
 %files doc
 %defattr(644,root,root,755)
-%doc Misc/NEWS  Misc/README Misc/cheatsheet 
-%doc Misc/HISTORY Doc/html
+%doc Misc/NEWS  Misc/README Misc/cheatsheet Misc/HISTORY
 %doc Misc/ACKS
 %doc Misc/RFD
 %doc Misc/find_recursionlimit.py
@@ -319,6 +324,7 @@
 %doc Misc/gdbinit
 %doc LICENSE
 %doc Demo
+%doc html/
 
 
 %changelog


From svn at tinysofa.org  Mon Jun  7 19:15:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 05:15:25 +1000 (EST)
Subject: [tinysofa-svn] r1897 - tinysofa/snapshot/python/current/sources
Message-ID: <20040607191525.33A404E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-08 05:15:25 +1000 (Tue, 08 Jun 2004)
New Revision: 1897

Added:
   tinysofa/snapshot/python/current/sources/python-doc-html-2.3.4.tar.bz2
Log:
- add html documentation source


Added: tinysofa/snapshot/python/current/sources/python-doc-html-2.3.4.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/python/current/sources/python-doc-html-2.3.4.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


From svn at tinysofa.org  Tue Jun  8 06:37:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 16:37:10 +1000 (EST)
Subject: [tinysofa-svn] r1898 - contrib tinysofa/snapshot
Message-ID: <20040608063710.3E5364E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-08 16:37:09 +1000 (Tue, 08 Jun 2004)
New Revision: 1898

Added:
   contrib/proftpd/
Removed:
   tinysofa/snapshot/proftpd/
Log:
- move proftpd to contrib.


Copied: contrib/proftpd (from rev 1897, tinysofa/snapshot/proftpd)


From svn at tinysofa.org  Tue Jun  8 06:37:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 16:37:10 +1000 (EST)
Subject: [tinysofa-svn] r1898 - contrib tinysofa/snapshot
Message-ID: <20040608063710.6116A4E81BB@minbar.tinysofa.org>

Author: omar
Date: 2004-06-08 16:37:09 +1000 (Tue, 08 Jun 2004)
New Revision: 1898

Added:
   contrib/proftpd/
Removed:
   tinysofa/snapshot/proftpd/
Log:
- move proftpd to contrib.


Copied: contrib/proftpd (from rev 1897, tinysofa/snapshot/proftpd)


From svn at tinysofa.org  Tue Jun  8 06:38:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 16:38:07 +1000 (EST)
Subject: [tinysofa-svn] r1899 - contrib
Message-ID: <20040608063807.8C4FA4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-08 16:38:07 +1000 (Tue, 08 Jun 2004)
New Revision: 1899

Added:
   contrib/lynx/
Log:
- add lynx to contrib.


Copied: contrib/lynx (from rev 1871, tinysofa/snapshot/lynx)


From svn at tinysofa.org  Tue Jun  8 07:15:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 17:15:28 +1000 (EST)
Subject: [tinysofa-svn] r1900 - tinysofa/snapshot/gdbm/current/specs
Message-ID: <20040608071528.4F8134E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-08 17:15:28 +1000 (Tue, 08 Jun 2004)
New Revision: 1900

Modified:
   tinysofa/snapshot/gdbm/current/specs/gdbm.spec
Log:
- Based on Conectiva package.
- Split into libgdbm, libgdbm-devel.
- Use rpm macros.


Modified: tinysofa/snapshot/gdbm/current/specs/gdbm.spec
===================================================================
--- tinysofa/snapshot/gdbm/current/specs/gdbm.spec	2004-06-08 06:38:07 UTC (rev 1899)
+++ tinysofa/snapshot/gdbm/current/specs/gdbm.spec	2004-06-08 07:15:28 UTC (rev 1900)
@@ -1,18 +1,29 @@
-%{expand: %%global _includedir %{_includedir}/gdbm}
-
-Summary: A GNU set of database routines which use extensible hashing.
 Name: gdbm
 Version: 1.8.3
-Release: 6ts
-Source: ftp://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz
-Patch0: gdbm-1.8.0-jbj.patch
-Patch1: gdbm-1.8.3-Makefile.in.patch
+Release: 8ok
+Summary: A GNU set of database routines which use extensible hashing
+Summary(pt_BR): Biblioteca de banco de dados GNU para C
+Summary(es): Biblioteca de banco de datos GNU para C
+Group: tinysofa/libraries
+Group(pt_BR): tinysofa/libraries
+Group(es): tinysofa/libraries
 License: GPL
-Group: tinysofa official
-Prefix: %{_prefix}
-BuildRequires: texinfo libtool autoconf automake gcc-c++-devel
-BuildRoot: %{_tmppath}/%{name}-root
+URL: http://www.gnu.org/software/gdbm
+Source: ftp://ftp.gnu.org/gnu/gdbm/%{name}-%{version}.tar.gz
+Patch0: %{name}-1.8.0-jbj.patch
+Patch1: %{name}-1.8.3-Makefile.in.patch
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: binutils
+BuildRequires: gcc
+BuildRequires: glibc-devel
+BuildRequires: libtool
+BuildRequires: make
+%info_requires
+%rename gdbm
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
 %description
 Gdbm is a GNU database indexing library, including routines
 which use extensible hashing.  Gdbm works in a similar way to standard UNIX
@@ -21,141 +32,186 @@
 applications which will use such a database.
 
 If you're a C developer and your programs need access to simple database
-routines, you should install gdbm.  You'll also need to install gdbm-devel.
+routines, you should install gdbm. You'll also need to install gdbm-devel.
 
-%package devel
+%description -l pt_BR
+Esta ? uma biblioteca para banco de dados indexados. ? ?til para aqueles que
+desenvolvem aplica??es em C que tenham que fazer acesso a banco de dados de
+forma simples e eficiente.
+
+%description -l es
+Esta es una biblioteca para banco de datos indexados. Es ?til para aquellos que
+desarrollan aplicaciones en C, que tienen de hacer acceso a banco de datos de
+forma simple y eficiente.
+
+%package -n %{libname}
+Summary: A GNU set of database routines which use extensible hashing
+Summary(pt_BR): Biblioteca de banco de dados GNU para C
+Summary(es): Biblioteca de banco de datos GNU para C
+Group: tinysofa/libraries
+Group(pt_BR): tinysofa/libraries
+Group(es): tinysofa/libraries
+%rename gdbm
+
+%description -n %{libname}
+Gdbm is a GNU database indexing library, including routines
+which use extensible hashing.  Gdbm works in a similar way to standard UNIX
+dbm routines.  Gdbm is useful for developers who write C applications and
+need access to a simple and efficient database or who are building C
+applications which will use such a database.
+
+If you're a C developer and your programs need access to simple database
+routines, you should install gdbm. You'll also need to install gdbm-devel.
+
+%description -n %{libname} -l pt_BR
+Esta ? uma biblioteca para banco de dados indexados. ? ?til para aqueles que
+desenvolvem aplica??es em C que tenham que fazer acesso a banco de dados de
+forma simples e eficiente.
+
+%description -n %{libname} -l es
+Esta es una biblioteca para banco de datos indexados. Es ?til para aquellos que
+desarrollan aplicaciones en C, que tienen de hacer acceso a banco de datos de
+forma simple y eficiente.
+
+%package -n %{libname_devel}
 Summary: Development libraries and header files for the gdbm library.
-Group: tinysofa official
-Prereq: htmlinfo
-Requires: gdbm
+Summary(pt_BR): Bibliotecas e arquivos de inclus?o para desenvolvimento utilizando gdbm
+Summary(es): Bibliotecas y archivos de inclusi?n para desarrollo utilizando gdbm
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+%rename gdbm-devel
+PreReq: %{libname} = %{version}
 
-%description devel
+%description -n %{libname_devel}
 Gdbm-devel contains the development libraries and header files
-for gdbm, the GNU database system.  These libraries and header files are
+for gdbm, the GNU database system. These libraries and header files are
 necessary if you plan to do development using the gdbm database.
 
 Install gdbm-devel if you are developing C programs which will use the
-gdbm database library.  You'll also need to install the gdbm package.
+gdbm database library. You'll also need to install the gdbm package.
 
+%description -l pt_BR -n %{libname_devel}
+Estas s?o as bibliotecas e arquivos de inclus?o para desenvolvimento gdbm, que ?
+o sistema de banco de dados GNU. S?o necess?rias se voc? pretende desenvolver
+usando o banco de dados gdbm.
+
+%description -l es -n %{libname_devel}
+Estas son las bibliotecas y archivos de inclusi?n para desarrollo gdbm, que es
+el sistema de banco de datos GNU. Son necesarias si pretendes desarrollar usando
+el banco de datos gdbm.
+
 %prep
 %setup -q
-%patch0 -p 1
-%patch1 -p 1
+%patch0 -p1 -b .jbj
+%patch1 -p1 -b .noowngrp
 
 %build
-
-libtoolize --force --copy
+libtoolize --copy --force
 aclocal
-autoreconf
+autoconf
+# XXX --includedir doesn't work
+./configure --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir}
+make includedir=%{_includedir}/gdbm libdir=%{_libdir}
 
-%configure
-# We need to override libdir, which for whatever reason is set to $(prefix)/lib
-# instead of the value passed to configure above.
-make libdir=%{_libdir}
-
-makeinfo --html --no-split gdbm.texinfo
-
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p -m 755 $RPM_BUILD_ROOT/usr/share/html/gdbm
-install -m 644 gdbm.html $RPM_BUILD_ROOT/usr/share/html/gdbm/
+# XXX --includedir dinna work
+make prefix=%{buildroot}%{_prefix} \
+     infodir=%{buildroot}%{_infodir} \
+     man3dir=%{buildroot}%{_mandir}/man3 \
+     libdir=%{buildroot}%{_libdir} \
+     includedir=%{buildroot}%{_includedir}/gdbm install install-compat
 
-%makeinstall install-compat
+( cd %{buildroot}
+   ln -sf gdbm/gdbm.h .%{_includedir}/gdbm.h
+#  ln -sf libgdbm.so.2.0.0 .%{_libdir}/libgdbm.so
+#  gzip -9nf .%{_infodir}/gdbm*info*
+)
 
-ln -sf gdbm/gdbm.h $RPM_BUILD_ROOT/%{_oldincludedir}/gdbm.h
-#ln -sf libgdbm.so.2.0.0 $RPM_BUILD_ROOT/%{_libdir}/libgdbm.so
+# remove unwanted unpackaged files
+rm -f %{buildroot}%{_libdir}/libgdbm_compat.*
 
-rm -rf $RPM_BUILD_ROOT/usr/share/info
+%install_info gdbm.texinfo
+%nuke_info
 
-%post -p /sbin/ldconfig
-
-%post devel
-/usr/sbin/htmlinfo_update.sh
-
-%postun -p /sbin/ldconfig
-
-%postun devel
-/usr/sbin/htmlinfo_update.sh
-
-%files
-%defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/libgdbm.so.*
-%attr(755,root,root) %{_libdir}/libgdbm_compat.so.*
-
-%files devel
-%defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/libgdbm.so
-%attr(755,root,root) %{_prefix}/lib/libgdbm.la
-%attr(644,root,root) %{_prefix}/lib/libgdbm.a
-%attr(755,root,root) %{_prefix}/lib/libgdbm_compat.so
-%attr(755,root,root) %{_prefix}/lib/libgdbm_compat.la
-%attr(644,root,root) %{_prefix}/lib/libgdbm_compat.a
-%{_oldincludedir}/gdbm.h
-%{_includedir}
-%dir %{_prefix}/share/html/gdbm
-%{_prefix}/share/html/gdbm/gdbm.html
-%{_mandir}/man3/*
-
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.8.3-6ts
-- current (1.8.3-6ok) integrated as 1.8.3-6ts for release 1.0-U1
+%post -n %{libname} -p /sbin/ldconfig
 
-* Tue May 18 2004 Omar Kilani <omar at tinysofa dot org>
-- Add BuildRequires gcc-c++-devel.
+%postun -n %{libname} -p /sbin/ldconfig
 
-* Fri May 14 2004 Jaakko Heinonen <jh at tinysofa dot org>
-- make package build as non-root
-- integrate changes from Red Hat spec file
-- specify permissions for library files
+%post -n %{libname_devel}
+%info_post
 
-* Mon Dec 15 2003 Erlend Midttun <erlendbm at trustix dot org> 1.8.3-2tr
-- Now with gdbm.h as well.
+%postun -n %{libname_devel}
+if [ $1 = 0 ]; then
+  %info_postun
+fi
 
-* Fri Dec  5 2003 Erlend Midttun <erlendbm at trustix dot org> 1.8.3-1tr
-- New upstream.
+%files -n %{libname}
+%defattr(0644,root,root,0755)
+%doc COPYING NEWS README
+%{_libdir}/libgdbm.so.*
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 1.8.0-8tr
-- Big rebuild
+%files -n %{libname_devel}
+%defattr(0644,root,root,0755)
+%doc ChangeLog
+%{_includedir}/gdbm
+%{_includedir}/gdbm.h
+%{_libdir}/libgdbm.la
+%{_libdir}/libgdbm.so
+%{_htmldir}/%{name}
+%{_mandir}/man3/gdbm.3*
+%{_libdir}/libgdbm.a
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 1.8.0-7em
-- Rebuilt against glibc 2.3.2.
 
-* Fri Oct 25 2002 Christian H. Toldnes <christht at trusstix.com> 1.8.0-6ct
-- Replaced info stuff with htmlinfo
 
-* Tue Jul 23 2002 Daniel Meyer <eagle at trustix dot org> 1.8.0-5dm
-- rebuild for Trustix Secure Linux 2.0
+%changelog
+* Tue Jan 20 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-20 15:04:49 (45888)
+- Complete the rename
 
-* Mon Jan 24 2000 Tore Olsen <toreo at trustix dot com>
-- moved man and info directories to /usr/share for FHS compliance.
+* Tue Jan 20 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-20 14:58:58 (45886)
+- Rename the specfile
 
-* Tue Aug 10 1999 Jeff Johnson <jbj at redhat.com>
-- make sure created database header is initialized (#4457).
+* Tue Jan 20 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-20 14:58:17 (45885)
+- Follow the Conectiva Linux guidelines for package naming.
 
-* Tue Jun  1 1999 Jeff Johnson <jbj at redhat.com>
-- update to 1.8.0.
-- repackage to include /usr/include/gdbm/*dbm.h compatibility includes.
+* Fri Jan 02 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-02 20:07:06 (42844)
+- %%soname must be equal to 3, libgdbm2 package created for transition period.
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
-- auto rebuild in the new build environment (release 19)
+* Fri Jan 02 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-02 14:14:02 (42833)
+- Added some Provides gdbm{-devel{-static}} to ease migration to new naming
 
-* Thu Dec 17 1998 Cristian Gafton <gafton at redhat.com>
-- build against glibc 2.1
+* Fri Jan 02 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-02 14:08:46 (42831)
+- Ooops, fix cut'n'paste error in the summaries for the libgdbm2 package
+- Added missing Obsoletes gdbm < %%{version}-%%{release} in the libgdbm2 package
 
-* Thu May 07 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
+* Fri Jan 02 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-02 14:05:45 (42829)
+- New upstream release: 1.8.3
+- Follow Conectiva Linux library naming guidelines
+- redo the no_own_grp patch
+- Use -p in scriptlets where possible
 
-* Thu Apr 30 1998 Cristian Gafton <gafton at redhat.com>
-- gdbm-devel moved to Development/Libraries
+* Tue Sep 03 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-09-03 14:39:54 (11596)
+- Imported package from snapshot.
 
-* Wed Apr 08 1998 Cristian Gafton <gafton at redhat.com>
-- buildroot and built for Manhattan
+* Thu Aug 29 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-29 17:44:50 (7902)
+- Imported package from 8.0.
 
-* Tue Oct 14 1997 Donnie Barnes <djb at redhat.com>
-- spec file cleanups
+* Wed Aug 28 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-28 18:33:43 (4300)
+- Imported package from 7.0.
 
-* Thu Jun 12 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
\ No newline at end of file
+* Tue Aug 27 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-27 18:58:11 (551)
+- Imported package from 6.0.


From svn at tinysofa.org  Tue Jun  8 07:17:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 17:17:03 +1000 (EST)
Subject: [tinysofa-svn] 
	r1901 - in tinysofa/snapshot/readline/current: sources specs
Message-ID: <20040608071703.3CCDB4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-08 17:17:03 +1000 (Tue, 08 Jun 2004)
New Revision: 1901

Added:
   tinysofa/snapshot/readline/current/sources/readline-4.2-outdated.patch
   tinysofa/snapshot/readline/current/sources/readline-4.2-resize.patch
   tinysofa/snapshot/readline/current/sources/readline-4.3-fixendkey.patch
   tinysofa/snapshot/readline/current/sources/readline-4.3-guard.patch
Modified:
   tinysofa/snapshot/readline/current/specs/readline.spec
Log:
- Based on Conectiva package.
- Use rpm macros.
- Split into libreadline, libreadline-devel.
- Add patches to fix resize problems, overflow problems, end key problems.


Added: tinysofa/snapshot/readline/current/sources/readline-4.2-outdated.patch
===================================================================
--- tinysofa/snapshot/readline/current/sources/readline-4.2-outdated.patch	2004-06-08 07:15:28 UTC (rev 1900)
+++ tinysofa/snapshot/readline/current/sources/readline-4.2-outdated.patch	2004-06-08 07:17:03 UTC (rev 1901)
@@ -0,0 +1,10 @@
+--- readline-4.1/doc/readline.3.outdated	Tue Jan 30 15:48:32 2001
++++ readline-4.1/doc/readline.3	Tue Jan 30 15:51:52 2001
+@@ -1203,3 +1204,7 @@
+ .SH BUGS
+ .PP
+ It's too big and too slow.
++.PP
++The info file is much more up-to-date.  This man page conflicts with it in
++a few places, but the conflicts will be resolved in a future release of
++readline.

Added: tinysofa/snapshot/readline/current/sources/readline-4.2-resize.patch
===================================================================
--- tinysofa/snapshot/readline/current/sources/readline-4.2-resize.patch	2004-06-08 07:15:28 UTC (rev 1900)
+++ tinysofa/snapshot/readline/current/sources/readline-4.2-resize.patch	2004-06-08 07:17:03 UTC (rev 1901)
@@ -0,0 +1,10 @@
+--- readline-4.1/readline.c.orig	Thu Mar 22 00:17:35 2018
++++ readline-4.1/readline.c	Tue Mar 20 00:04:46 2018
+@@ -372,6 +372,7 @@
+   while (rl_done == 0)
+     {
+ #endif
++      rl_resize_terminal();
+       lk = _rl_last_command_was_kill;
+ 
+       code = setjmp (readline_top_level);

Added: tinysofa/snapshot/readline/current/sources/readline-4.3-fixendkey.patch
===================================================================
--- tinysofa/snapshot/readline/current/sources/readline-4.3-fixendkey.patch	2004-06-08 07:15:28 UTC (rev 1900)
+++ tinysofa/snapshot/readline/current/sources/readline-4.3-fixendkey.patch	2004-06-08 07:17:03 UTC (rev 1901)
@@ -0,0 +1,11 @@
+--- ./terminal.c.fixendkey	2002-03-04 18:23:09.000000000 +0100
++++ ./terminal.c	2002-07-23 21:45:01.000000000 +0200
+@@ -313,7 +313,7 @@
+   { "ei", &_rl_term_ei },
+   { "ic", &_rl_term_ic },
+   { "im", &_rl_term_im },
+-  { "kH", &_rl_term_kH },	/* home down ?? */
++  { "@", &_rl_term_kH },	/* home down ?? */
+   { "kI", &_rl_term_kI },	/* insert */
+   { "kd", &_rl_term_kd },
+   { "ke", &_rl_term_ke },	/* end keypad mode */

Added: tinysofa/snapshot/readline/current/sources/readline-4.3-guard.patch
===================================================================
--- tinysofa/snapshot/readline/current/sources/readline-4.3-guard.patch	2004-06-08 07:15:28 UTC (rev 1900)
+++ tinysofa/snapshot/readline/current/sources/readline-4.3-guard.patch	2004-06-08 07:17:03 UTC (rev 1901)
@@ -0,0 +1,12 @@
+--- readline-2.2.1/text.c.guard	Thu Apr  2 11:16:12 1998
++++ readline-2.2.1/text.c	Fri Apr  9 20:50:55 1999
+@@ -1100,6 +1100,9 @@
+       else
+ 	rl_point = end;
+     }
++  /* check for arithmetic overflow */
++  if (rl_point < 0)
++    rl_point = 0;
+   return 0;
+ }
+ 

Modified: tinysofa/snapshot/readline/current/specs/readline.spec
===================================================================
--- tinysofa/snapshot/readline/current/specs/readline.spec	2004-06-08 07:15:28 UTC (rev 1900)
+++ tinysofa/snapshot/readline/current/specs/readline.spec	2004-06-08 07:17:03 UTC (rev 1901)
@@ -1,177 +1,218 @@
-Summary: A library for reading and returning lines from a terminal.
+%define with_devel 1
+
 Name: readline
 Version: 4.3
-Release: 7ts
+Release: 8ok
+Summary: A library for reading and returning lines from a terminal
+Summary(pt_BR): Biblioteca para leitura de linhas de um terminal
+Summary(es): Biblioteca para lectura de l?neas de un terminal
+Group: tinysofa/libraries
+Group(pt_BR): tinysofa/bibliotecas
+Group(es): tinysofa/bibliotecas
 License: GPL
-Group: tinysofa official
-Source: ftp://ftp.gnu.org/pub/gnu/readline/readline-%{version}.tar.gz
-Patch0: readline-4.1-outdated.patch
-Patch1: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-001
-Patch2: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-002
-Patch3: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-003
-Patch4: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-004
-Patch5: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-005
-Prereq: /sbin/ldconfig htmlinfo
-BuildRoot: %{_tmppath}/%{name}-root
+Source: ftp://ftp.gnu.org/gnu/%{name}-%{version}.tar.gz
+Patch0: ftp://ftp.gnu.org/gnu/readline/readline-4.3-patches/readline43-001
+Patch1: ftp://ftp.gnu.org/gnu/readline/readline-4.3-patches/readline43-002
+Patch2: ftp://ftp.gnu.org/gnu/readline/readline-4.3-patches/readline43-003
+Patch3: ftp://ftp.gnu.org/gnu/readline/readline-4.3-patches/readline43-004
+Patch4: ftp://ftp.gnu.org/gnu/readline/readline-4.3-patches/readline43-005
+Patch5: %{name}-4.2-outdated.patch
+Patch6: %{name}-4.2-resize.patch
+Patch7: %{name}-4.3-fixendkey.patch
+Patch8: %{name}-4.3-guard.patch
+PreReq: /sbin/ldconfig
+%info_requires
+BuildRequires: binutils
+BuildRequires: coreutils
+BuildRequires: gcc
+BuildRequires: glibc-devel
+BuildRequires: make
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
-The readline library reads a line from the terminal and returns it,
-allowing the user to edit the line with standard emacs editing keys.
-The readline library allows programmers to provide an easy to use and
-more intuitive interface for users.
+The readline library reads a line from the terminal and returns it, allowing
+the user to edit the line with standard emacs editing keys. The readline
+library allows programmers to provide an easy to use and more intuitive
+interface for users.
 
-If you want to develop programs that will use the readline library,
-you'll also need to install the readline-devel package.
+If you want to develop programs that will use the readline library, you'll also
+need to install the readline-devel package.
 
-%package devel
-Summary: Development files for programs which will use the readline library.
-Group: tinysofa official
-Requires: readline = %{version}
+%description -l pt_BR
+A biblioteca "readline" ler? uma linha do terminal e ir? retorn?-la, permitindo
+ao usu?rio editar a linha com as teclas de edi??o padr?o emacs. Ele permite ao
+programador dar ao usu?rio uma interface mais f?cil de usar e mais intuitiva.
 
-%description devel
-The readline library will read a line from the terminal and return it.
-Use of the readline library allows programmers to provide an easy
-to use and more intuitive interface for users.
+%description -l es
+La biblioteca "readline" leer? una l?nea del terminal y la recuperar?,
+permitiendo al usuario editar la l?nea con las teclas de edici?n padr?n emacs.
+Permite al programador dar al usuario una interface m?s f?cil de usar y m?s
+intuitiva.
 
-If you want to develop programs which will use the readline library,
-you'll need to have the readline-devel package installed.  You'll also
-need to have the readline package installed.
+%package -n %{libname}
+Summary: A library for reading and returning lines from a terminal
+Summary(pt_BR): Biblioteca para leitura de linhas de um terminal
+Summary(es): Biblioteca para lectura de l?neas de un terminal
+Group: tinysofa/libraries
+Group(pt_BR): tinysofa/bibliotecas
+Group(es): tinysofa/bibliotecas
+%rename readline
 
-%prep
-%setup -q
-%patch0 -p1 -b .outdated
-%patch1 -p0 -b .readline43-001
-%patch2 -p0 -b .readline43-002
-%patch3 -p0 -b .readline43-003
-%patch4 -p0 -b .readline43-004
-%patch5 -p0 -b .readline43-005
+%description -n %{libname}
+The readline library reads a line from the terminal and returns it, allowing
+the user to edit the line with standard emacs editing keys. The readline
+library allows programmers to provide an easy to use and more intuitive
+interface for users.
 
-%build
-%configure --prefix=/usr
-make static shared
+If you want to develop programs that will use the readline library, you'll also
+need to install the readline-devel package.
 
-%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p $RPM_BUILD_ROOT/usr/share/html/{readline,history,rluserman}
-make install install-shared \
-	prefix=$RPM_BUILD_ROOT/%{_prefix} \
-	libdir=$RPM_BUILD_ROOT/%{_prefix}/lib \
-	includedir=$RPM_BUILD_ROOT/%{_prefix}/include \
-	mandir=$RPM_BUILD_ROOT/%{_mandir} \
-	infodir=$RPM_BUILD_ROOT/%{_infodir}
+%description -n %{libname} -l pt_BR
+A biblioteca "readline" ler? uma linha do terminal e ir? retorn?-la, permitindo
+ao usu?rio editar a linha com as teclas de edi??o padr?o emacs. Ele permite ao
+programador dar ao usu?rio uma interface mais f?cil de usar e mais intuitiva.
 
-install -m 644 doc/readline.html $RPM_BUILD_ROOT/usr/share/html/readline/
-install -m 644 doc/history.html $RPM_BUILD_ROOT/usr/share/html/history/
-install -m 644 doc/rluserman.html $RPM_BUILD_ROOT/usr/share/html/rluserman/
-( cd $RPM_BUILD_ROOT
-  ln -sf libreadline.so.%{version} ./%{_prefix}/lib/libreadline.so
-  ln -sf libhistory.so.%{version} ./%{_prefix}/lib/libhistory.so
-  ln -sf libreadline.so.%{version} ./%{_prefix}/lib/libreadline.so.4
-  ln -sf libhistory.so.%{version} ./%{_prefix}/lib/libhistory.so.4
-)
- 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%description -n %{libname} -l es
+La biblioteca "readline" leer? una l?nea del terminal y la recuperar?,
+permitiendo al usuario editar la l?nea con las teclas de edici?n padr?n emacs.
+Permite al programador dar al usuario una interface m?s f?cil de usar y m?s
+intuitiva.
 
-%post
-/sbin/ldconfig
-/usr/sbin/htmlinfo_update.sh
+%if %{with_devel}
+%package -n %{libname_devel}
+Summary: Development files for programs which will use the readline library
+Summary(pt_BR): Arquivo para desenvolver programas que utilizam a readline
+Summary(es): Archivo para desarrollar programas que utilicen la biblioteca readline
+Group: tinysofa/development
+Group(pt_BR): tinysofa/desenvolvimento
+Group(es): tinysofa/desarrollo
+PreReq: %{libname} = %{version}
+%rename readline-devel
 
-%postun -p /sbin/ldconfig
-/usr/sbin/htmlinfo_update.sh
+%description -n %{libname_devel}
+The readline library will read a line from the terminal and return it. Use of
+the readline library allows programmers to provide an easy to use and more
+intuitive interface for users.
 
+If you want to develop programs which will use the readline library, you'll
+need to have the readline-devel package installed. You'll also need to have the
+readline package installed.
 
-%files
-%defattr(-,root,root)
-%{_mandir}/*/*
-%dir %{_prefix}/share/html/readline
-%dir %{_prefix}/share/html/history
-%dir %{_prefix}/share/html/rluserman
-%{_prefix}/share/html/readline/*
-%{_prefix}/share/html/history/*
-%{_prefix}/share/html/rluserman/*
-%attr(755,root,root) %{_prefix}/lib/lib*.so.*
-%exclude %{_infodir}
+%description -n %{libname_devel} -l pt_BR
+A biblioteca readline ler? uma linha do terminal e a retornar?, usando prompt
+como prompt. Se prompt ? nulo, nenhum prompt ? mostrado. A linha retornada ?
+alocada com malloc(3), devendo o chamador liber?-la quando terminar. A linha
+retornada tem o salto de linha final removido, desta forma somente o texto da
+linha ? disponibilizado.
 
-%files devel
-%defattr(-,root,root)
-%{_prefix}/include/readline
-%attr(644,root,root) %{_prefix}/lib/lib*.a
-%attr(755,root,root) %{_prefix}/lib/lib*.so
+%description -n %{libname_devel} -l es
+La biblioteca readline leer? una l?nea del terminal y la recuperar?, usando
+prompt como prompt. Si prompt es nulo, ning?n prompt se ense?a. La l?nea
+recuperada es alocada con malloc(3), debiendo el llamador liberarla cuando
+terminar. La l?nea recuperada tiene el salto de l?nea final quitado, de esta
+forma solamente el texto de la l?nea se pone a disposici?n.
+%endif
 
-%changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.3-7ts
-- current (4.3-7jh) integrated as 4.3-7ts for release 1.0-U1
+%prep
+%setup -q
+%patch0 -p0 -b .001
+%patch1 -p0 -b .002
+%patch2 -p0 -b .003
+%patch3 -p0 -b .004
+%patch4 -p0 -b .005
+%patch5 -p1 -b .outdated
+%patch6 -p1 -b .resize
+%patch7 -p1 -b .fixendkey
+%patch8 -p1 -b .guard
 
-* Mon May 17 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.3-7jh
-- fix non-root build
-- include patches from Fedora
+%build
+autoconf
+%configure --with-curses=ncurses
+%make static shared
 
-* Sun May  9 2004 Omar Kilani <omar at tinysofa dot org> 4.3-6ts
-- Rebuild.
+%install
+%clean_buildroot
+%makeinstall
 
-* Fri May  7 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.3-5jh
-- fixed permissions for so files
-- removed obsolete file removal
+%{__mkdir_p} "%{buildroot}%{_htmldir}/%{name}"
+install -m 644 doc/readline.html "%{buildroot}%{_htmldir}/%{name}/readline.html"
+install -m 644 doc/history.html "%{buildroot}%{_htmldir}/%{name}/history.html"
+install -m 644 doc/rluserman.html "%{buildroot}%{_htmldir}/%{name}/rluserman.html"
+%nuke_info
 
-* Mon Dec  8 2003 Erlend Midttun <erlendbm at trustix dot org> 4.3-1tr
-- New upstream.
+%if ! %{with_devel}
+rm -rf %{buildroot}%{_includedir}/readline/
+rm -f %{buildroot}%{_libdir}/libhistory.a
+rm -f %{buildroot}%{_libdir}/libreadline.a
+rm -f %{buildroot}%{_mandir}/man3/history*
+rm -f %{buildroot}%{_mandir}/man3/readline*
+%endif
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 4.2-5tr
-- Big rebuild
+%clean
+%clean_buildroot
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix.com> 4.2-4em
-- Rebuilt against glibc 2.3.2.
+%post -n %{libname}
+/sbin/ldconfig
+%info_post
 
-* Fri Oct 25 2002 Christian H. Toldnes <christht at trustix.com> 4.2-3ct
-- Replaced info stuff with htmlinfo
+%postun -n %{libname}
+/sbin/ldconfig
+%info_postun
 
-* Wed Jul 24 2002 Daniel Meyer <eagle at trustix.org> 4.2-2dm
-- rebuild for Trustix Secure Linux 2.0
+%files -n %{libname}
+%defattr(0644,root,root,0755)
+%{_libdir}/lib*.so.*
+%{_htmldir}/%{name}
 
-* Mon Jun 11 2001 Erlend Midttun <erlendbm at trustix.com>
-- New upstream version.
+%if %{with_devel}
+%files -n %{libname_devel}
+%defattr(0644,root,root,0755)
+%dir %{_includedir}/%{name}
+%{_mandir}/man3/history.3*
+%{_mandir}/man3/readline.3*
+%{_includedir}/%{name}/*.h
+%{_libdir}/lib*.so
+%{_libdir}/lib*.a
+%endif
 
-* Wed Sep 13 2000 Per Ivar Paulsen <perp at trustix.com>
-- Picked up 4.1
 
-* Sun Feb 27 2000 Lars Gaarden <larsg at trustix.com>
-- missed libhistory.so.4 and libreadline.so.4
-- dangling symlinks to *.so.3.0
+%changelog
+* Thu Jan 22 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-22 17:39:25 (46234)
+- %%remove_info already checks $1
+- Added missing BuildRequires
 
-* Tue Jan 25 2000 Tore Olsen <toreo at trustix.com>
-- upgraded to 4.0
-- moved /usr/{man,info} to /usr/share/{man,info} for FHS compliance
+* Wed Jan 14 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-14 12:04:05 (44507)
+- Devel packages shouldn't have %%{release} in its PreReq
 
-* Fri Apr 09 1999 Michael K. Johnson <johnsonm at redhat.com>
-- added guard patch from Taneli Huuskonen <huuskone at cc.helsinki.fi>
+* Wed Jan 14 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-14 11:41:01 (44503)
+- Enable the devel package build
 
-* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
-- auto rebuild in the new build environment (release 4)
+* Wed Jan 14 2004 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
++ 2004-01-14 11:39:34 (44502)
+- Added upstream patches
+- Removed the segfault-fix patch, it is one of the newly added upstream patches
+- Made the devel packages be selectable at build time
+- Removed unwanted unpackaged files
+- Added BuildRequires
+- Use info macros for installing/removing info pages
+- Use -p in scriptlets
+- Removed misfiled "spanish" translations
 
-* Sun Jul 26 1998 Jeff Johnson <jbj at redhat.com>
-- updated to 2.2.1
+* Tue Jan 13 2004 Ricardo Erbano <erbano at conectiva.com>
++ 2004-01-13 15:46:30 (44399)
+- Removed unpackaged file to fix rpm build error
 
-* Wed May 06 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
+* Tue Sep 03 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-09-03 16:03:51 (13428)
+- Imported package from snapshot.
 
-* Wed May 06 1998 Cristian Gafton <gafton at redhat.com>
-- don't package /usr/info/dir
+* Wed Aug 28 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-28 21:06:59 (6150)
+- Imported package from 7.0.
 
-* Thu Apr 30 1998 Cristian Gafton <gafton at redhat.com>
-- devel package moved to Development/Libraries
-
-* Tue Apr 21 1998 Cristian Gafton <gafton at redhat.com>
-- updated to 2.2
-
-* Tue Oct 14 1997 Donnie Barnes <djb at redhat.com>
-- spec file cleanups
-
-* Fri Oct 10 1997 Erik Troan <ewt at redhat.com>
-- added proper sonames
-
-* Tue Jul 08 1997 Erik Troan <ewt at redhat.com>
-- updated to readline 2.1
-
-* Tue Jun 03 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
\ No newline at end of file
+* Tue Aug 27 2002 Gustavo Niemeyer <niemeyer at conectiva.com>
++ 2002-08-27 19:48:39 (1647)
+- Imported package from 6.0.


From svn at tinysofa.org  Tue Jun  8 08:27:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue,  8 Jun 2004 18:27:17 +1000 (EST)
Subject: [tinysofa-svn] r1902 - tinysofa/snapshot/gcc/current/specs
Message-ID: <20040608082717.4D6C04E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-08 18:27:17 +1000 (Tue, 08 Jun 2004)
New Revision: 1902

Modified:
   tinysofa/snapshot/gcc/current/specs/gcc.spec
Log:
- Clean up spec file.
- Use tinysofa rpm macros.


Modified: tinysofa/snapshot/gcc/current/specs/gcc.spec
===================================================================
--- tinysofa/snapshot/gcc/current/specs/gcc.spec	2004-06-08 07:17:03 UTC (rev 1901)
+++ tinysofa/snapshot/gcc/current/specs/gcc.spec	2004-06-08 08:27:17 UTC (rev 1902)
@@ -1,13 +1,13 @@
 %define gcc_release 3.3
 %define gcc_version 3.3.3
 %define stdcpp_version 5.0
-%define package_libstdcpp %{mklibname stdc++}
 %define gcj_version 4
-%define package_libgcj %{mklibname gcj}
 
 %define gcccvs 0
 %define cvsdate 20040312
 
+%define makeinfo_flags -Igcc/doc/include
+
 %if %{gcccvs}
 %define gccdir gcc-%{gcc_version}-%{cvsdate}
 %else
@@ -31,13 +31,18 @@
 
 %define package_gcc gcc
 %define package_gpp g++
+%define package_libstdcpp %{mklibname stdc++}
+%define package_libstdcpp_devel %{mklibname stdc++ -d}
 %define package_cpp cpp
 %define cpp_program %{package_cpp}
 %define package_libgcc %{mklibname gcc}
 %define package_g77 g77
 %define package_libf2c %{mklibname f2c}
 %define package_objc objc
+%define package_libobjc %{mklibname objc}
 %define package_java gcj
+%define package_libgcj %{mklibname gcj}
+%define package_libgcj_devel %{mklibname gcj -d}
 
 %if ! %{build_standard}
 %define build_g77 0
@@ -54,7 +59,7 @@
 
 Name: gcc
 Version: %{gcc_version}
-Release: 8ok
+Release: 9ok
 Summary: The GNU Compiler Collection (GCC)
 Summary(pt_BR): O Conjunto de Compiladores GNU (GCC)
 Group: tinysofa/development
@@ -84,11 +89,11 @@
 
 BuildRequires: autoconf
 BuildRequires: bison
-BuildRequires: texinfo
 BuildRequires: perl
 %if %{run_tests}
 BuildRequires: dejagnu
 %endif
+%info_requires
 
 %if %{build_standard}
 Requires: %{package_libgcc} = %{version}
@@ -125,7 +130,7 @@
 Group: tinysofa/libraries
 Group(pt_BR): tinysofa/bibliotecas
 Group(es): tinysofa/bibliotecas
-Conflicts: libstdc++ <= 3.1-3cl
+Conflicts: libstdc++ <= 3.1
 %rename gcc-runtime
 
 %description -n %{package_libgcc}
@@ -149,7 +154,7 @@
 Conflicts: g++ = %{version}
 %endif
 Requires: %{package_libstdcpp}
-Requires: %{package_libstdcpp}-devel
+Requires: %{package_libstdcpp_devel}
 %rename gcc-c++-devel
 
 %description -n %{package_gpp}
@@ -196,7 +201,7 @@
 
 #--------------------------------------------------------------
 
-%package -n %{package_libstdcpp}-devel
+%package -n %{package_libstdcpp_devel}
 Summary: Header files and libraries for C++ development
 Summary(pt_BR): Arquivos de inclus?o e bibliotecas para o desenvolvimento em C++
 Summary(es): Archivos de inclusi?n y bibliotecas para desarrollo C++
@@ -214,16 +219,16 @@
 Obsoletes: libstdc++-devel <= %{version}-%{release}
 %endif
 
-%description -n %{package_libstdcpp}-devel
+%description -n %{package_libstdcpp_devel}
 This is the GNU implementation of the standard C++ libraries.  This
 package includes the header files and libraries needed for C++
 development. This includes SGI's implementation of the STL.
 
-%description -l pt_BR -n %{package_libstdcpp}-devel
+%description -l pt_BR -n %{package_libstdcpp_devel}
 Este pacote inclui os arquivos de inclus?o e bibliotecas necess?rias para
 desenvolvimento de programas C++.
 
-%description -l es -n %{package_libstdcpp}-devel
+%description -l es -n %{package_libstdcpp_devel}
 Este es el soporte de las bibliotecas padr?n del lenguaje C++. Este paquete
 incluye los archivos de inclusi?n y bibliotecas necesarios para desarrollo de
 programas en lenguaje C++.
@@ -238,7 +243,7 @@
 Group(pt_BR): tinysofa/desenvolvimento
 Group(es): tinysofa/desarrollo
 Requires: %{package_gcc} = %{version}
-Requires: info
+%info_requires
 
 %description -n %{package_g77}
 The gcc-g77 package provides support for compiling Fortran 77
@@ -294,54 +299,55 @@
 #------------------------------------------------------------------
 
 %if %{build_objc}
-%package -n objc
+%package -n %{package_objc}
 Summary: The default GNU Objective C for this architecture.
 Summary(pt_BR): GNU Objective C default para esta arquitetura.
 Group: tinysofa/development
 Group(es): tinysofa/desarrollo
 Group(pt_BR): tinysofa/desenvolvimento
 Requires: %{package_gcc} = %{version}
-Requires: libobjc
+Requires: %{package_libobjc} = %{version}
 Provides: gobjc
 Obsoletes: gobjc
 
-%description -n objc
+%description -n %{package_objc}
 This is the recommended GNU Objective C version for this architecture.
 
-%description -n objc -l pt_BR
+%description -n %{package_objc} -l pt_BR
 Esta ? a vers?o do GNU Objective C recomendada para esta arquitetura.
 
 #--------------------------------------------------------------------
 
-%package -n libobjc
+%package -n %{package_libobjc}
 Summary: The library for the GNU Objective C compiler
 Summary(pt_BR): Bibilioteca para o compilador GNU Objective C
 Group: tinysofa/libraries
 Group(pt_BR): tinysofa/bibliotecas
 Group(es): tinysofa/bibliotecas
 
-%description -n libobjc
+%description -n %{package_libobjc}
 The library for the GNU Objective C compiler.
 
-%description -n libobjc -l pt_BR
+%description -n %{package_libobjc} -l pt_BR
 Bibilioteca para o compilador GNU Objective C.
 %endif
 
 #---------------------------------------------------------------------
 
 %if %{build_java}
-%package -n gcj
+%package -n %{package_java}
 Summary: The GNU Java Compiler
 Summary(pt_BR): Compilador Java GNU
 Group: tinysofa/development
 Group(es): tinysofa/desarrollo
 Group(pt_BR): tinysofa/desenvolvimento
 Requires: %{package_gcc} = %{version}
+%info_requires
 
-%description -n gcj
+%description -n %{package_java}
 The GNU Java Compiler.
 
-%description -n gcj -l pt_BR
+%description -n %{package_java} -l pt_BR
 Compilador Java GNU.
 
 #----------------------------------------------------------------------
@@ -361,19 +367,19 @@
 
 #---------------------------------------------------------------
 
-%package -n libgcj-devel
+%package -n %{package_libgcj_devel}
 Summary: Header files and libraries for Java
 Summary(pt_BR): Arquivos de inclus?o e bibliotecas para Java
 Group: tinysofa/development
 Group(pt_BR): tinysofa/desenvolvimento
 Group(es): tinysofa/desarrollo
-Requires: gcj = %{version}
-Requires: %{package_libgcj}
+Requires: %{package_java} = %{version}
+Requires: %{package_libgcj} = %{version}
 
-%description -n libgcj-devel
+%description -n %{package_libgcj_devel}
 Header files and libraries for Java.
 
-%description -l pt_BR -n libgcj-devel
+%description -n %{package_libgcj_devel} -l pt_BR 
 Arquivos de inclus?o e bibliotecas para Java.
 %endif
 
@@ -466,9 +472,10 @@
 
 %install
 rm -rf %{buildroot}
+
 cd %{OBJDIR}
 
-make DESTDIR=%{buildroot} install
+%makeinstall_std
 
 %if %{build_standard}
 mkdir -p %{buildroot}/lib
@@ -523,22 +530,32 @@
 %i18n_pkgs %{package_libgcc}
 %endif
 
+pushd %{_builddir}/%{name}-%{version}
+%install_info -n gcc gcc/doc/gcc.texi
+%install_info -n gccint gcc/doc/gccint.texi
+%install_info -n cpp gcc/doc/cpp.texi
+%install_info -n cppinternals gcc/doc/cppinternals.texi
+%if %{build_g77}
+%install_info -n g77 gcc/f/g77.texi
+%endif
+%if %{build_java}
+%install_info -n gcj gcc/java/gcj.texi
+%install_info -n fastjar fastjar/fastjar.texi
+%endif
+popd
+
+%nuke_info
+
 %clean
 rm -rf %{buildroot}
 
 %if %{build_standard}
 %post -n %{package_gcc}
-%install_info -n gcc
-%install_info -n gccint
-%install_info -n cpp
-%install_info -n cppinternals
+%info_post
 
-%preun -n %{package_gcc}
+%postun -n %{package_gcc}
 if [ $1 = 0 ]; then
-	%remove_info -n gcc
-	%remove_info -n gccint
-	%remove_info -n cpp
-	%remove_info -n cppinternals
+  %info_postun
 fi
 %endif
 
@@ -547,19 +564,24 @@
 %postun -n %{package_libstdcpp} -p /sbin/ldconfig
 
 %if %{build_java}
+%post -n %{package_java}
+%info_post
+
+%postun -n %{package_java}
+%info_postun
+
 %post -n %{package_libgcj} -p /sbin/ldconfig
 
 %postun -n %{package_libgcj} -p /sbin/ldconfig
+
 %endif
 
 %if %{build_g77}
 %post -n g77
-%install_info -n g77
+%info_post
 
-%preun -n g77
-if [ $1 = 0 ]; then
-	%remove_info -n g77
-fi
+%postun -n g77
+%info_postun
 %endif
 
 %files
@@ -573,8 +595,8 @@
 %{_bindir}/gcov
 /lib/cpp
 %{_mandir}/man1/cpp.1*
-%{_infodir}/cpp.info*
-%{_infodir}/cppinternals.info*
+%{_htmldir}/cpp*/*.html
+%{_htmldir}/gcc*/*.html
 %else
 %{_bindir}/%{package_gcc}
 %endif
@@ -621,7 +643,6 @@
 %{gcc_lib}/include/syslimits.h
 %{gcc_lib}/include/varargs.h
 %if %{build_standard}
-%{_infodir}/gcc*
 %{_mandir}/man1/gcc.1*
 %{_mandir}/man1/gcov.1*
 %{_mandir}/man7/fsf-funding.7*
@@ -654,7 +675,7 @@
 %defattr(0644,root,root,0755)
 %{_libdir}/libstdc++.so.*
 
-%files -n %{package_libstdcpp}-devel
+%files -n %{package_libstdcpp_devel}
 %defattr(0644,root,root,0755)
 %{_libdir}/libstdc++.a
 %{_libdir}/libstdc++.la
@@ -672,7 +693,7 @@
 %defattr(-,root,root)
 %{_bindir}/g77
 %{gcc_lib}/f771
-%{_infodir}/g77*
+%{_htmldir}/g77/*.html
 %{_mandir}/man1/g77.1*
 %{_libdir}/libfrtbegin.a
 %{_libdir}/libg2c.a
@@ -687,7 +708,7 @@
 %endif
 
 %if %{build_objc}
-%files -n objc
+%files -n %{package_objc}
 %defattr(-,root,root)
 %{gcc_lib}/cc1obj
 %{gcc_lib}/include/objc
@@ -695,13 +716,13 @@
 %{_libdir}/libobjc.la
 %{_libdir}/libobjc.so
 
-%files -n libobjc
+%files -n %{package_libobjc}
 %defattr(-,root,root)
 %{_libdir}/libobjc.so.*
 %endif
 
 %if %{build_java}
-%files -n gcj
+%files -n %{package_java}
 %defattr(-,root,root)
 %{gcc_lib}/jc1
 %{gcc_lib}/jvgenmain
@@ -718,8 +739,8 @@
 %{_bindir}/jv-scan
 %{_bindir}/rmic
 %{_bindir}/rmiregistry
-%{_infodir}/gcj*
-%{_infodir}/fastjar*
+%{_htmldir}/gcj/*.html
+%{_htmldir}/fastjar/*.html
 %{_mandir}/man1/gcj.1*
 %{_mandir}/man1/gcjh.1*
 %{_mandir}/man1/gij.1*
@@ -741,7 +762,7 @@
 %{_libdir}/lib-org-xml-sax.so.*
 %{_libdir}/lib-org-w3c-dom.so.*
 
-%files -n libgcj-devel
+%files -n %{package_libgcj_devel}
 %defattr(0644,root,root,0755)
 %{_libdir}/libgcj.so
 %{_libdir}/libgcj.a


From svn at tinysofa.org  Tue Jun  8 15:18:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 01:18:22 +1000 (EST)
Subject: [tinysofa-svn] r1904 - tinysofa/snapshot/zlib/current/specs
Message-ID: <20040608151822.31E614E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-09 01:18:22 +1000 (Wed, 09 Jun 2004)
New Revision: 1904

Modified:
   tinysofa/snapshot/zlib/current/specs/zlib.spec
Log:
- Merge -static-devel with -devel.


Modified: tinysofa/snapshot/zlib/current/specs/zlib.spec
===================================================================
--- tinysofa/snapshot/zlib/current/specs/zlib.spec	2004-06-08 12:07:38 UTC (rev 1903)
+++ tinysofa/snapshot/zlib/current/specs/zlib.spec	2004-06-08 15:18:22 UTC (rev 1904)
@@ -2,7 +2,6 @@
 
 %define libname %{mklibname z}
 %define libname_devel %{mklibname z -d}
-%define libname_static_devel %{mklibname z -d -s}
 
 Name: zlib
 Version: 1.2.1
@@ -114,21 +113,6 @@
 interface stream.  Este paquete contiene los archivos de inclusi?n y
 bibliotecas necesarios al desarrollo de programas que usan zlib.
 
-%package -n %{libname_static_devel}
-Summary: Static libraries for zlib development
-Summary(pt_BR): Bibliotecas est?ticas para desenvolvimento com a zlib
-Group: tinysofa/development
-Group(pt_BR): tinysofa/desenvolvimento
-Group(es): tinysofa/desarrollo
-Requires: %{libname_devel} = %{version}-%{release}
-
-%description -n %{libname_static_devel}
-Static libraries for zlib development
-
-%description -l pt_BR -n %{libname_static_devel}
-Bibliotecas est?ticas para desenvolvimento com a zlib
-%endif
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -171,13 +155,8 @@
 %{_libdir}/libz.so
 %{_includedir}/*
 %{_mandir}/man3/zlib.3*
-
-%files -n %{libname_static_devel}
-%defattr(0644,root,root,0755)
 %{_libdir}/libz.a
-%endif
 
-
 %changelog
 * Thu Jun 03 2004 Omar Kilani <omar at tinysofa dot org> 1.2.1-8ok
 - tinysofa.


From svn at tinysofa.org  Tue Jun  8 15:19:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 01:19:53 +1000 (EST)
Subject: [tinysofa-svn] r1905 - tinysofa/snapshot/bzip2/current/specs
Message-ID: <20040608151953.D5E924E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-09 01:19:53 +1000 (Wed, 09 Jun 2004)
New Revision: 1905

Modified:
   tinysofa/snapshot/bzip2/current/specs/bzip2.spec
Log:
- Merge -static-devel with -devel.


Modified: tinysofa/snapshot/bzip2/current/specs/bzip2.spec
===================================================================
--- tinysofa/snapshot/bzip2/current/specs/bzip2.spec	2004-06-08 15:18:22 UTC (rev 1904)
+++ tinysofa/snapshot/bzip2/current/specs/bzip2.spec	2004-06-08 15:19:53 UTC (rev 1905)
@@ -1,6 +1,5 @@
 %define libname 		%{mklibname bz2}
 %define libname_devel	 	%{mklibname bz2 -d}
-%define libname_static_devel 	%{mklibname bz2 -d -s}
 
 Name: bzip2
 Version: 1.0.2
@@ -87,22 +86,6 @@
 Este pacote inclui arquivos de inclus?o e biblioteca necess?rio para o
 desenvolvimento de programas que usam o bzip2.
 
-%package -n %{libname_static_devel}
-Summary: Static libraries for bzip2 development
-Summary(pt_BR): Bibliotecas est?ticas para desenvolvimento com a bzip2
-Summary(es): Static libraries for bzip2 development
-Group: tinysofa/development
-Group(pt_BR): tinysofa/desenvolvimento
-Group(es): tinysofa/desarrollo
-Requires: %{libname_devel} = %{version}-%{release}
-Conflicts: bzip2 < 1.0.1
-
-%description -n %{libname_static_devel}
-Static libraries for bzip2 development
-
-%description -l pt_BR -n %{libname_static_devel}
-Bibliotecas est?ticas para desenvolvimento com a bzip2.
-
 %package doc
 Summary: Extra documentation about bzip2
 Summary(pt_BR): Documenta??o adicional sobre o bzip2
@@ -180,17 +163,12 @@
 %defattr(0644,root,root,0755)
 %{_includedir}/*
 %{_libdir}/libbz2.so
-
-%files -n %{libname_static_devel}
-%defattr(0644,root,root,0755)
 %{_libdir}/libbz2.a
 
 %files doc
 %defattr(0644,root,root,0755)
 %doc *.html CHANGES README.COMPILATION.PROBLEMS Y2K_INFO
 
-
-
 %changelog
 * Fri Jun 04 2004 Omar Kilani <omar at tinysofa dot org>
 - tinysofa.


From svn at tinysofa.org  Tue Jun  8 16:46:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 02:46:44 +1000 (EST)
Subject: [tinysofa-svn] r1906 - tinysofa/snapshot/rpm/current/sources
Message-ID: <20040608164644.D82464E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-09 02:46:44 +1000 (Wed, 09 Jun 2004)
New Revision: 1906

Modified:
   tinysofa/snapshot/rpm/current/sources/tinysofa.macros
Log:
- update %install_info
- update %useradd


Modified: tinysofa/snapshot/rpm/current/sources/tinysofa.macros
===================================================================
--- tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-08 15:19:53 UTC (rev 1905)
+++ tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-08 16:46:44 UTC (rev 1906)
@@ -58,7 +58,8 @@
 
 # usage:
 # %post_useradd username uid initial_gid
-%useradd() /usr/sbin/useradd -r -u %{2} -g %{3} %{1}
+%useradd(c:d:s:) /usr/sbin/useradd -r -u %{2} -g %{3} %{1} %{-c:-c "%{-c*}"} %{-d:-d "%{-d*}"} %{-s:-s "%{-s*}"}
+
 %userdel() /usr/sbin/userdel %{1} > /dev/null 2>&1 || :
 
 # usage:
@@ -82,8 +83,8 @@
 
 %nuke_info %{__rm} -rf "%{buildroot}%{_infodir}"
 
-%install_info() %{__mkdir_p} %{buildroot}%{_htmldir}/%{name} \
-  %makeinfo_html %{?makeinfo_flags:%{makeinfo_flags}} -o %{buildroot}%{_htmldir}/%{name}/%{name}.html %{1} \
+%install_info(n:) %{__mkdir_p} "%{buildroot}%{_htmldir}/%{-n*}%{!-n:%{name}}" \
+  %makeinfo_html %{?makeinfo_flags:%{makeinfo_flags}} -o "%{buildroot}%{_htmldir}/%{-n*}%{!-n:%{name}}/%{-n*}%{!-n:%{name}}.html" %{1} \
   %{nil}
 
 #-----------------------------------------------------------------------


From svn at tinysofa.org  Tue Jun  8 17:34:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 03:34:10 +1000 (EST)
Subject: [tinysofa-svn] r1907 - tinysofa/snapshot/rpm/current/sources
Message-ID: <20040608173410.296164E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-09 03:34:09 +1000 (Wed, 09 Jun 2004)
New Revision: 1907

Modified:
   tinysofa/snapshot/rpm/current/sources/tinysofa.macros
Log:
- add %{nil}s to %groupadd and %useradd


Modified: tinysofa/snapshot/rpm/current/sources/tinysofa.macros
===================================================================
--- tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-08 16:46:44 UTC (rev 1906)
+++ tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-08 17:34:09 UTC (rev 1907)
@@ -58,13 +58,15 @@
 
 # usage:
 # %post_useradd username uid initial_gid
-%useradd(c:d:s:) /usr/sbin/useradd -r -u %{2} -g %{3} %{1} %{-c:-c "%{-c*}"} %{-d:-d "%{-d*}"} %{-s:-s "%{-s*}"}
+%useradd(c:d:s:) /usr/sbin/useradd -r -u %{2} -g %{3} %{1} %{-c:-c "%{-c*}"} %{-d:-d "%{-d*}"} %{-s:-s "%{-s*}"} \
+%{nil}
 
 %userdel() /usr/sbin/userdel %{1} > /dev/null 2>&1 || :
 
 # usage:
 # %post_groupadd groupname gid
-%groupadd() /usr/sbin/groupadd -r -g %{2} %{1}
+%groupadd() /usr/sbin/groupadd -r -g %{2} %{1} \
+%{nil}
 %groupdel() /usr/sbin/groupdel %{1} > /dev/null 2>&1 || :
 
 #-----------------------------------------------------------------------


From svn at tinysofa.org  Tue Jun  8 17:51:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 03:51:10 +1000 (EST)
Subject: [tinysofa-svn] r1908 - tinysofa/snapshot/rpm/current/sources
Message-ID: <20040608175110.4A5374E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-09 03:51:10 +1000 (Wed, 09 Jun 2004)
New Revision: 1908

Modified:
   tinysofa/snapshot/rpm/current/sources/tinysofa.macros
Log:
- %useradd and %groupadd updates


Modified: tinysofa/snapshot/rpm/current/sources/tinysofa.macros
===================================================================
--- tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-08 17:34:09 UTC (rev 1907)
+++ tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-08 17:51:10 UTC (rev 1908)
@@ -58,14 +58,14 @@
 
 # usage:
 # %post_useradd username uid initial_gid
-%useradd(c:d:s:) /usr/sbin/useradd -r -u %{2} -g %{3} %{1} %{-c:-c "%{-c*}"} %{-d:-d "%{-d*}"} %{-s:-s "%{-s*}"} \
+%useradd(c:d:s:) /usr/sbin/useradd -r -u %{2} -g %{3} %{1} %{-c:-c "%{-c*}"} %{-d:-d "%{-d*}"} %{-s:-s "%{-s*}"} > /dev/null 2>&1 || : \
 %{nil}
 
 %userdel() /usr/sbin/userdel %{1} > /dev/null 2>&1 || :
 
 # usage:
 # %post_groupadd groupname gid
-%groupadd() /usr/sbin/groupadd -r -g %{2} %{1} \
+%groupadd() /usr/sbin/groupadd -r -g %{2} %{1} /dev/null 2>&1 || : \
 %{nil}
 %groupdel() /usr/sbin/groupdel %{1} > /dev/null 2>&1 || :
 


From svn at tinysofa.org  Tue Jun  8 20:02:14 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 06:02:14 +1000 (EST)
Subject: [tinysofa-svn] r1910 - tinysofa/snapshot/sysklogd/current/specs
Message-ID: <20040608200214.CA5A74E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-09 06:02:14 +1000 (Wed, 09 Jun 2004)
New Revision: 1910

Modified:
   tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec
Log:
- fix group


Modified: tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec
===================================================================
--- tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec	2004-06-08 20:00:12 UTC (rev 1909)
+++ tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec	2004-06-08 20:02:14 UTC (rev 1910)
@@ -3,7 +3,7 @@
 Version: 1.4.1
 Release: 36jh
 Copyright: GPL
-Group: tinysofa/base
+Group: tinysofa/main
 Source: sysklogd-%{version}rh.tar.gz
 Source1: syslog.init
 Source2: syslog.sysconfig


From svn at tinysofa.org  Tue Jun  8 20:24:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 06:24:17 +1000 (EST)
Subject: [tinysofa-svn] r1912 - tinysofa/snapshot/bind/current/sources
Message-ID: <20040608202417.7282E4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-09 06:24:17 +1000 (Wed, 09 Jun 2004)
New Revision: 1912

Modified:
   tinysofa/snapshot/bind/current/sources/named.init
Log:
- fix lock file name


Modified: tinysofa/snapshot/bind/current/sources/named.init
===================================================================
--- tinysofa/snapshot/bind/current/sources/named.init	2004-06-08 20:15:21 UTC (rev 1911)
+++ tinysofa/snapshot/bind/current/sources/named.init	2004-06-08 20:24:17 UTC (rev 1912)
@@ -58,13 +58,13 @@
 		else
 			echo_success
 			echo
-			touch $INITLOCK/${name}
+			touch $INITLOCK/${prog}
 			exit 0
 		fi
 	else
 		echo_success
 		echo
-		touch $INITLOCK/${name}
+		touch $INITLOCK/${prog}
 		exit 0
 	fi
         ;;
@@ -78,7 +78,7 @@
                 exit 1
         fi
 	echo
-        rm -f $INITLOCK/${name}
+        rm -f $INITLOCK/${prog}
         ;;
   status)
   	if status named; then
@@ -107,7 +107,7 @@
 	exit 0
 	;;
   condrestart)
-	if [ -e $INITLOCK/${name} ]; then
+	if [ -e $INITLOCK/${prog} ]; then
 		restart
 	fi
 	;;


From svn at tinysofa.org  Tue Jun  8 21:31:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 07:31:27 +1000 (EST)
Subject: [tinysofa-svn] r1913 - tinysofa/snapshot/sysklogd/current/specs
Message-ID: <20040608213127.946874E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-09 07:31:27 +1000 (Wed, 09 Jun 2004)
New Revision: 1913

Modified:
   tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec
Log:
- change ownership of the created logfiles


Modified: tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec
===================================================================
--- tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec	2004-06-08 20:24:17 UTC (rev 1912)
+++ tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec	2004-06-08 21:31:27 UTC (rev 1913)
@@ -69,7 +69,8 @@
 for n in /var/log/{messages,secure,maillog,spooler}; do
 	[ -f $n ] && continue
 	touch $n
-	chmod 600 $n
+	%{__chmod} 640 $n
+	%{__chown} syslog.syslog $n
 done
 
 


From svn at tinysofa.org  Wed Jun  9 06:30:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 16:30:10 +1000 (EST)
Subject: [tinysofa-svn] r1914 - tinysofa/snapshot/rpm/current/sources
Message-ID: <20040609063010.857774E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-09 16:30:09 +1000 (Wed, 09 Jun 2004)
New Revision: 1914

Modified:
   tinysofa/snapshot/rpm/current/sources/tinysofa.macros
Log:
- add %service_postun()
- update %service_post
- nukes usage of /sbin/restart_maybe


Modified: tinysofa/snapshot/rpm/current/sources/tinysofa.macros
===================================================================
--- tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-08 21:31:27 UTC (rev 1913)
+++ tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-09 06:30:09 UTC (rev 1914)
@@ -39,9 +39,12 @@
 #-----------------------------------------------------------------------
 # services
 #
-%service_requires PreReq: /sbin/chkconfig, /sbin/restart_maybe, /sbin/service
-%service_post() /sbin/chkconfig --add %{1} \
-/sbin/restart_maybe %{1} > /dev/null \
+%service_requires PreReq: /sbin/chkconfig, /sbin/service
+
+# note that service shouldn't be restarted in %post
+# use %service_postun for that
+%service_post(o) /sbin/chkconfig --add %{1} \
+/sbin/chkconfig %{1} %{-o:on}%{!-o:off} \
 %{nil}
 
 %service_preun() if [ "$1" = 0 ]; then \
@@ -50,6 +53,11 @@
 fi \
 %{nil}
 
+%service_postun() if [ "$1" -ge "1" ]; then \
+	/sbin/service %{1} try-restart > /dev/null 2>&1 \
+fi \
+%{nil}
+
 #-----------------------------------------------------------------------
 # user and group management
 #


From svn at tinysofa.org  Wed Jun  9 07:42:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 17:42:06 +1000 (EST)
Subject: [tinysofa-svn] r1915 - tinysofa/snapshot/rpm/current/sources
Message-ID: <20040609074206.1EC004E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-09 17:42:05 +1000 (Wed, 09 Jun 2004)
New Revision: 1915

Modified:
   tinysofa/snapshot/rpm/current/sources/tinysofa.macros
Log:
- fix %service_post
- fix %groupadd
- add %copy_htmlinfo


Modified: tinysofa/snapshot/rpm/current/sources/tinysofa.macros
===================================================================
--- tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-09 06:30:09 UTC (rev 1914)
+++ tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-09 07:42:05 UTC (rev 1915)
@@ -44,7 +44,9 @@
 # note that service shouldn't be restarted in %post
 # use %service_postun for that
 %service_post(o) /sbin/chkconfig --add %{1} \
-/sbin/chkconfig %{1} %{-o:on}%{!-o:off} \
+if [ $1 -le 1 ]; then \
+	/sbin/chkconfig %{1} %{-o:on}%{!-o:off} \
+fi \
 %{nil}
 
 %service_preun() if [ "$1" = 0 ]; then \
@@ -73,7 +75,7 @@
 
 # usage:
 # %post_groupadd groupname gid
-%groupadd() /usr/sbin/groupadd -r -g %{2} %{1} /dev/null 2>&1 || : \
+%groupadd() /usr/sbin/groupadd -r -g %{2} %{1} > /dev/null 2>&1 || : \
 %{nil}
 %groupdel() /usr/sbin/groupdel %{1} > /dev/null 2>&1 || :
 
@@ -97,6 +99,10 @@
   %makeinfo_html %{?makeinfo_flags:%{makeinfo_flags}} -o "%{buildroot}%{_htmldir}/%{-n*}%{!-n:%{name}}/%{-n*}%{!-n:%{name}}.html" %{1} \
   %{nil}
 
+%copy_htmlinfo(n:) %{__mkdir_p} "%{buildroot}%{_htmldir}/%{-n*}%{!-n:%{name}}" \
+%{__install} -m 644 %{1} "%{buildroot}%{_htmldir}/%{-n*}%{!-n:%{name}}/" \
+%{nil}
+
 #-----------------------------------------------------------------------
 # More useful perl macros (from Raul Dias <rsd at swi.com.br>)
 # perl_epoch from Arnaldo Carvalho de Melo <acme at conectiva.com.br>


From svn at tinysofa.org  Wed Jun  9 09:45:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 19:45:57 +1000 (EST)
Subject: [tinysofa-svn] r1916 - tinysofa/snapshot/sysklogd/current/specs
Message-ID: <20040609094557.62C274E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-09 19:45:57 +1000 (Wed, 09 Jun 2004)
New Revision: 1916

Modified:
   tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec
Log:
- add try-restart target for init script
- add trigger for old package
- turn service on as default
- do service restart in %postun


Modified: tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec
===================================================================
--- tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec	2004-06-09 07:42:05 UTC (rev 1915)
+++ tinysofa/snapshot/sysklogd/current/specs/sysklogd.spec	2004-06-09 09:45:57 UTC (rev 1916)
@@ -65,7 +65,7 @@
 %post
 %groupadd syslog 60
 %useradd syslog 60 syslog -d /var/log -s /bin/false
-%service_post syslog
+%service_post -o syslog
 for n in /var/log/{messages,secure,maillog,spooler}; do
 	[ -f $n ] && continue
 	touch $n
@@ -77,7 +77,16 @@
 %preun
 %service_preun syslog
 
+%postun
+%service_postun syslog
 
+%triggerpostun -- sysklogd < 1.4.1-36
+if [ -d /var/log/cron ] && [ ! -e /var/log/cron.old ]; then
+	%{__mv} -f /var/log/cron /var/log/cron.old
+fi
+%service_postun syslog
+
+
 %files
 %defattr(-,root,root)
 %doc ANNOUNCE CHANGES README* NEWS INSTALL redhat/ChangeLog


From svn at tinysofa.org  Wed Jun  9 10:48:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 20:48:13 +1000 (EST)
Subject: [tinysofa-svn] 
	r1917 - in tinysofa/snapshot/squid/current: sources specs
Message-ID: <20040609104813.8CE8E4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-09 20:48:13 +1000 (Wed, 09 Jun 2004)
New Revision: 1917

Added:
   tinysofa/snapshot/squid/current/sources/squid-2.5.STABLE5-CAN-2004-0541.patch
Modified:
   tinysofa/snapshot/squid/current/specs/squid.spec
Log:
- Add squid-2.5.STABLE5-CAN-2004-0541.patch to fix vuln.


Added: tinysofa/snapshot/squid/current/sources/squid-2.5.STABLE5-CAN-2004-0541.patch
===================================================================
--- tinysofa/snapshot/squid/current/sources/squid-2.5.STABLE5-CAN-2004-0541.patch	2004-06-09 09:45:57 UTC (rev 1916)
+++ tinysofa/snapshot/squid/current/sources/squid-2.5.STABLE5-CAN-2004-0541.patch	2004-06-09 10:48:13 UTC (rev 1917)
@@ -0,0 +1,77 @@
+Index: libntlmssp.c
+===================================================================
+RCS file: /server/cvs-server/squid/squid/helpers/ntlm_auth/SMB/libntlmssp.c,v
+retrieving revision 1.7
+diff -u -3 -p -u -r1.7 libntlmssp.c
+--- libntlmssp.c	30 Nov 2001 09:50:28 -0000	1.7
++++ libntlmssp.c	20 May 2004 22:31:33 -0000
+@@ -161,7 +161,10 @@ make_challenge(char *domain, char *domai
+ #define min(A,B) (A<B?A:B)
+ 
+ int ntlm_errno;
+-static char credentials[1024];	/* we can afford to waste */
++#define MAX_USERNAME_LEN 255
++#define MAX_DOMAIN_LEN 255
++#define MAX_PASSWD_LEN 31
++static char credentials[MAX_USERNAME_LEN+MAX_DOMAIN_LEN+2];	/* we can afford to waste */
+ 
+ 
+ /* Fetches the user's credentials from the challenge.
+@@ -197,7 +200,7 @@ char *
+ ntlm_check_auth(ntlm_authenticate * auth, int auth_length)
+ {
+     int rv;
+-    char pass[25] /*, encrypted_pass[40] */;
++    char pass[MAX_PASSWD_LEN+1];
+     char *domain = credentials;
+     char *user;
+     lstring tmp;
+@@ -215,8 +218,13 @@ ntlm_check_auth(ntlm_authenticate * auth
+ 	ntlm_errno = NTLM_LOGON_ERROR;
+ 	return NULL;
+     }
++    if (tmp.l > MAX_DOMAIN_LEN) {
++	debug("Domain string exceeds %d bytes, rejecting\n", MAX_DOMAIN_LEN);
++	ntlm_errno = NTLM_LOGON_ERROR;
++	return NULL;
++    }
+     memcpy(domain, tmp.str, tmp.l);
+-    user = domain + tmp.l;
++    user = domain + tmp.l + 1;
+     *user++ = '\0';
+ 
+ /*      debug("fetching user name\n"); */
+@@ -226,20 +234,30 @@ ntlm_check_auth(ntlm_authenticate * auth
+ 	ntlm_errno = NTLM_LOGON_ERROR;
+ 	return NULL;
+     }
++    if (tmp.l > MAX_USERNAME_LEN) {
++	debug("Username string exceeds %d bytes, rejecting\n", MAX_USERNAME_LEN);
++	ntlm_errno = NTLM_LOGON_ERROR;
++	return NULL;
++    }
+     memcpy(user, tmp.str, tmp.l);
+     *(user + tmp.l) = '\0';
+ 
+ 		
+-		/* Authenticating against the NT response doesn't seem to work... */
++    /* Authenticating against the NT response doesn't seem to work... */
+     tmp = ntlm_fetch_string((char *) auth, auth_length, &auth->lmresponse);
+     if (tmp.str == NULL || tmp.l == 0) {
+ 	fprintf(stderr, "No auth at all. Returning no-auth\n");
+ 	ntlm_errno = NTLM_LOGON_ERROR;
+ 	return NULL;
+     }
+-		
++    if (tmp.l > MAX_PASSWD_LEN) {
++	debug("Password string exceeds %d bytes, rejecting\n", MAX_PASSWD_LEN);
++	ntlm_errno = NTLM_LOGON_ERROR;
++	return NULL;
++    }
++
+     memcpy(pass, tmp.str, tmp.l);
+-    pass[25] = '\0';
++    pass[min(MAX_PASSWD_LEN,tmp.l)] = '\0';
+ 
+ #if 1
+ 		debug ("Empty LM pass detection: user: '%s', ours:'%s', his: '%s'"

Modified: tinysofa/snapshot/squid/current/specs/squid.spec
===================================================================
--- tinysofa/snapshot/squid/current/specs/squid.spec	2004-06-09 09:45:57 UTC (rev 1916)
+++ tinysofa/snapshot/squid/current/specs/squid.spec	2004-06-09 10:48:13 UTC (rev 1917)
@@ -9,6 +9,7 @@
 Source3: squid.logrotate
 Patch1: squid-2.5-config.patch
 Patch2: squid-2.5.STABLE5-icap.patch
+Patch3: squid-2.5.STABLE5-CAN-2004-0541.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Prereq: chkconfig logrotate shadow-utils tinysofa-utils
 BuildRequires: perl openssl-devel pam-devel kerberos5-devel libcom_err-devel
@@ -31,6 +32,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Fix path
 perl -pi -e 's/\/usr\/local\/bin\/perl/\/usr\/bin\/perl/' `find . -type f`
@@ -215,6 +217,9 @@
 %attr(750,squid,squid) %dir /var/spool/squid
 
 %changelog
+* Wed Jun 09 2004 Omar Kilani <omar at tinysofa dot org> 2.5.STABLE5-6ok
+- Add squid-2.5.STABLE5-CAN-2004-0541.patch to fix vuln.
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.5.STABLE5-5ts
 - current (2.5.STABLE5-5jh) integrated as 2.5.STABLE5-5ts for release 1.0-U1
 


From svn at tinysofa.org  Wed Jun  9 10:55:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 20:55:29 +1000 (EST)
Subject: [tinysofa-svn] r1918 - tinysofa/snapshot/squid/current/sources
Message-ID: <20040609105529.B0D1A4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-09 20:55:29 +1000 (Wed, 09 Jun 2004)
New Revision: 1918

Modified:
   tinysofa/snapshot/squid/current/sources/squid-2.5.STABLE5-CAN-2004-0541.patch
Log:
- Re-diff patch to be -p1 compatible.


Modified: tinysofa/snapshot/squid/current/sources/squid-2.5.STABLE5-CAN-2004-0541.patch
===================================================================
--- tinysofa/snapshot/squid/current/sources/squid-2.5.STABLE5-CAN-2004-0541.patch	2004-06-09 10:48:13 UTC (rev 1917)
+++ tinysofa/snapshot/squid/current/sources/squid-2.5.STABLE5-CAN-2004-0541.patch	2004-06-09 10:55:29 UTC (rev 1918)
@@ -1,11 +1,7 @@
-Index: libntlmssp.c
-===================================================================
-RCS file: /server/cvs-server/squid/squid/helpers/ntlm_auth/SMB/libntlmssp.c,v
-retrieving revision 1.7
-diff -u -3 -p -u -r1.7 libntlmssp.c
---- libntlmssp.c	30 Nov 2001 09:50:28 -0000	1.7
-+++ libntlmssp.c	20 May 2004 22:31:33 -0000
-@@ -161,7 +161,10 @@ make_challenge(char *domain, char *domai
+diff -urN squid-2.5.STABLE5/helpers/ntlm_auth/SMB/libntlmssp.c squid-2.5.STABLE5.CAN-2004-0541/helpers/ntlm_auth/SMB/libntlmssp.c
+--- squid-2.5.STABLE5/helpers/ntlm_auth/SMB/libntlmssp.c	2004-06-09 20:52:40.000000000 +1000
++++ squid-2.5.STABLE5.CAN-2004-0541/helpers/ntlm_auth/SMB/libntlmssp.c	2004-06-09 20:53:41.000000000 +1000
+@@ -161,7 +161,10 @@
  #define min(A,B) (A<B?A:B)
  
  int ntlm_errno;
@@ -17,7 +13,7 @@
  
  
  /* Fetches the user's credentials from the challenge.
-@@ -197,7 +200,7 @@ char *
+@@ -197,7 +200,7 @@
  ntlm_check_auth(ntlm_authenticate * auth, int auth_length)
  {
      int rv;
@@ -26,7 +22,7 @@
      char *domain = credentials;
      char *user;
      lstring tmp;
-@@ -215,8 +218,13 @@ ntlm_check_auth(ntlm_authenticate * auth
+@@ -215,8 +218,13 @@
  	ntlm_errno = NTLM_LOGON_ERROR;
  	return NULL;
      }
@@ -41,7 +37,7 @@
      *user++ = '\0';
  
  /*      debug("fetching user name\n"); */
-@@ -226,20 +234,30 @@ ntlm_check_auth(ntlm_authenticate * auth
+@@ -226,20 +234,30 @@
  	ntlm_errno = NTLM_LOGON_ERROR;
  	return NULL;
      }


From svn at tinysofa.org  Wed Jun  9 10:55:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 20:55:53 +1000 (EST)
Subject: [tinysofa-svn] r1919 - in tinysofa/snapshot/squid: current/specs
	releases/2.5.STABLE5 releases/2.5.STABLE5/6ts/specs
Message-ID: <20040609105553.DC37E4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-09 20:55:53 +1000 (Wed, 09 Jun 2004)
New Revision: 1919

Added:
   tinysofa/snapshot/squid/releases/2.5.STABLE5/6ts/
Modified:
   tinysofa/snapshot/squid/current/specs/squid.spec
   tinysofa/snapshot/squid/releases/2.5.STABLE5/6ts/specs/squid.spec
Log:
squid:
  * integrate current (2.5.STABLE5-5ts) as releases/2.5.STABLE5/6ts

Modified: tinysofa/snapshot/squid/current/specs/squid.spec
===================================================================
--- tinysofa/snapshot/squid/current/specs/squid.spec	2004-06-09 10:55:29 UTC (rev 1918)
+++ tinysofa/snapshot/squid/current/specs/squid.spec	2004-06-09 10:55:53 UTC (rev 1919)
@@ -1,7 +1,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE5
-Release: 5ts
+Release: 6ts
 License: GPL
 Group: tinysofa official
 Source: http://www.squid-cache.org/Versions/v2/2.5/squid-%{version}.tar.bz2
@@ -217,6 +217,9 @@
 %attr(750,squid,squid) %dir /var/spool/squid
 
 %changelog
+* Wed Jun 09 2004 tsintegrate <release at tinysofa dot org> 2.5.STABLE5-6ts
+- current (2.5.STABLE5-5ts) integrated as 2.5.STABLE5-6ts for release 1.0-U1
+
 * Wed Jun 09 2004 Omar Kilani <omar at tinysofa dot org> 2.5.STABLE5-6ok
 - Add squid-2.5.STABLE5-CAN-2004-0541.patch to fix vuln.
 

Copied: tinysofa/snapshot/squid/releases/2.5.STABLE5/6ts (from rev 1918, tinysofa/snapshot/squid/current)

Modified: tinysofa/snapshot/squid/releases/2.5.STABLE5/6ts/specs/squid.spec
===================================================================
--- tinysofa/snapshot/squid/current/specs/squid.spec	2004-06-09 10:55:29 UTC (rev 1918)
+++ tinysofa/snapshot/squid/releases/2.5.STABLE5/6ts/specs/squid.spec	2004-06-09 10:55:53 UTC (rev 1919)
@@ -1,7 +1,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE5
-Release: 5ts
+Release: 6ts
 License: GPL
 Group: tinysofa official
 Source: http://www.squid-cache.org/Versions/v2/2.5/squid-%{version}.tar.bz2
@@ -217,6 +217,9 @@
 %attr(750,squid,squid) %dir /var/spool/squid
 
 %changelog
+* Wed Jun 09 2004 tsintegrate <release at tinysofa dot org> 2.5.STABLE5-6ts
+- current (2.5.STABLE5-5ts) integrated as 2.5.STABLE5-6ts for release 1.0-U1
+
 * Wed Jun 09 2004 Omar Kilani <omar at tinysofa dot org> 2.5.STABLE5-6ok
 - Add squid-2.5.STABLE5-CAN-2004-0541.patch to fix vuln.
 


From svn at tinysofa.org  Wed Jun  9 10:55:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 20:55:55 +1000 (EST)
Subject: [tinysofa-svn] r1920 - tinysofa/snapshot/squid
Message-ID: <20040609105555.7790E4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-09 20:55:55 +1000 (Wed, 09 Jun 2004)
New Revision: 1920

Removed:
   tinysofa/snapshot/squid/pristine/
Log:
squid:
  * removing pristine (2.5.STABLE5-5ts)


From svn at tinysofa.org  Wed Jun  9 10:55:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 20:55:56 +1000 (EST)
Subject: [tinysofa-svn] r1921 - tinysofa/snapshot/squid
Message-ID: <20040609105556.B61814E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-09 20:55:56 +1000 (Wed, 09 Jun 2004)
New Revision: 1921

Added:
   tinysofa/snapshot/squid/pristine/
Log:
squid:
  * retarget pristine (2.5.STABLE5-5ts) to releases/2.5.STABLE5/6ts

Copied: tinysofa/snapshot/squid/pristine (from rev 1919, tinysofa/snapshot/squid/releases/2.5.STABLE5/6ts)


From svn at tinysofa.org  Wed Jun  9 12:36:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed,  9 Jun 2004 22:36:54 +1000 (EST)
Subject: [tinysofa-svn] r1922 - tinysofa/snapshot/sysklogd/current/sources
Message-ID: <20040609123654.8D4C34E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-09 22:36:53 +1000 (Wed, 09 Jun 2004)
New Revision: 1922

Modified:
   tinysofa/snapshot/sysklogd/current/sources/syslog.init
Log:
- add try-restart target to init script


Modified: tinysofa/snapshot/sysklogd/current/sources/syslog.init
===================================================================
--- tinysofa/snapshot/sysklogd/current/sources/syslog.init	2004-06-09 10:55:56 UTC (rev 1921)
+++ tinysofa/snapshot/sysklogd/current/sources/syslog.init	2004-06-09 12:36:53 UTC (rev 1922)
@@ -112,11 +112,11 @@
   restart|reload)
   	restart
 	;;
-  condrestart)
+  condrestart|try-restart)
   	[ -f ${INITLOCK:-/mnt/lockdev}/syslog ] && restart || :
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+	echo $"Usage: $0 {start|stop|status|restart|try-restart}"
 	exit 1
 esac
 


From svn at tinysofa.org  Wed Jun  9 15:54:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Jun 2004 01:54:32 +1000 (EST)
Subject: [tinysofa-svn] 
	r1923 - in tinysofa/snapshot/bind/current: sources specs
Message-ID: <20040609155432.21B234E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-10 01:54:31 +1000 (Thu, 10 Jun 2004)
New Revision: 1923

Added:
   tinysofa/snapshot/bind/current/sources/named.sysconfig
Modified:
   tinysofa/snapshot/bind/current/sources/named.init
   tinysofa/snapshot/bind/current/specs/bind.spec
Log:
- new init script based on Red Hat one
- add sysconfig configuration file
- fix groups
- do service restart in %postun


Modified: tinysofa/snapshot/bind/current/sources/named.init
===================================================================
--- tinysofa/snapshot/bind/current/sources/named.init	2004-06-09 12:36:53 UTC (rev 1922)
+++ tinysofa/snapshot/bind/current/sources/named.init	2004-06-09 15:54:31 UTC (rev 1923)
@@ -1,119 +1,131 @@
-#!/bin/sh
+#!/bin/bash
 #
-# named           This script manager named (server DNS BIND).
+# named           This shell script takes care of starting and stopping
+#                 named (BIND DNS server).
 #
-# chkconfig: 345 13 87
+# chkconfig: - 55 45
 # description: named (BIND) is a Domain Name Server (DNS) \
 # that is used to resolve host names to IP addresses.
 # probe: true
 
-TEXTDOMAIN=initscripts
+# Source function library.
 . /etc/init.d/functions
 
-JAIL=/var/lib/named
+# Source networking configuration.
+[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network
 
-if [ ! -f /etc/sysconfig/network ]; then
-    exit 0
-fi
-. /etc/sysconfig/network
-
+RETVAL=0
 prog="named"
 
-[ ${NETWORKING} = "no" ] && exit 0
+PATH=/bin:/sbin:/usr/bin
 
-[ -f /usr/sbin/named ] || exit 0
+# Check that networking is up.
+[ "${NETWORKING}" = "no" ] && exit 0
 
-[ -f $JAIL/etc/named.conf ] || { 
-	echo "File %s not found\n" "$JAIL/etc/named.conf"
-	exit 1
-}
+[ -r /etc/sysconfig/named ] && . /etc/sysconfig/named
 
-case "$1" in
-  start)
-	# if running with kernel 2.6, we need to load the capability module
-	if uname -r | grep -qE '^2\.6'; then
-		if ! lsmod | grep -q capability; then
-			if [ -f "/lib/modules/`uname -r`/kernel/security/capability.ko" ]; then
-				modprobe capability
-			else
-				echo $"Warning, no capability kernel module found, is it builtin?"
-				echo $"Service will not start without capabilities."
-			fi
-		fi
+[ -x /usr/sbin/named ] || exit 0 
+
+[ -r ${ROOTDIR}/etc/named.conf ] || exit 0 
+
+
+start() {
+        # Start daemons.
+	if [ -n "`pidof named`" ]; then
+		echo -n $"$prog: already running"
+		return 1
 	fi
-	echo -n $"Starting $prog: "
+        echo -n $"Starting $prog: "
+	if [ -n "${ROOTDIR}" -a "x${ROOTDIR}" != "x/" ]; then
+		OPTIONS="${OPTIONS} -t ${ROOTDIR}"
+	fi
+	daemon /usr/sbin/named -u named ${OPTIONS}
+	RETVAL=$?
+
+	sleep 1
+
 	# /usr/sbin/named doesn't return proper exit codes
-	daemon /usr/sbin/named -u named -t $JAIL
-	# how much should we sleep...?
-	sleep 1s
 	if [ -z "`pidof named`" ]; then
 		# named isn't running...
 		# try again
-		sleep 3s
+		sleep 3
 		if [ -z "`pidof named`" ]; then
-			# ok, give up
 			echo_failure
-			echo
-			exit 1
-		else
-			echo_success
-			echo
-			touch $INITLOCK/${prog}
-			exit 0
+			RETVAL=1
 		fi
-	else
-		echo_success
-		echo
-		touch $INITLOCK/${prog}
-		exit 0
 	fi
-        ;;
-  stop)
-	echo -n $"Stopping $prog: "
-  	if `status named > /dev/null 2> /dev/null`; then
-                /usr/sbin/rndc flush
-                killproc named
-        else
-                echo_failure
-                exit 1
-        fi
+		
+	[ $RETVAL -eq 0 ] && touch ${INITLOCK}/${prog}
 	echo
-        rm -f $INITLOCK/${prog}
-        ;;
-  status)
-  	if status named; then
-		/usr/sbin/rndc status
-	fi
-	exit $?
-	;;
-  restart)
-# FIXME: rndc restart is not yet implemented! (9.2.2), so we force it
-#	/usr/sbin/rndc restart
-	$0 stop
-	$0 start
-	exit $?
-	;;
-  reload)
-	echo -n $"Reloading $prog: "
-	/usr/sbin/rndc reload || /usr/bin/kill -HUP `/sbin/pidof -o %PPID named`
+	return $RETVAL
+}
+stop() {
+        # Stop daemons.
+        echo -n $"Stopping $prog: "
+	/usr/sbin/rndc stop
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && rm -f  ${INITLOCK}/${prog} || {
+        	killproc named
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && rm -f  ${INITLOCK}/${prog}
+		echo
+		return $RETVAL 
+	}
+	success
+        echo
+	return $RETVAL
+}
+rhstatus() {
+	/usr/sbin/rndc status
+	return $?
+}	
+restart() {
+	stop
+# wait a couple of seconds for the named to finish closing down
+	sleep 2
+	start
+}	
+reload() {
+        echo -n $"Reloading $prog: "
+	/usr/sbin/rndc reload >/dev/null 2>&1 || /usr/bin/kill -HUP `pidof -o %PPID named`
 	[ "$?" -eq 0 ] && success $"$prog reload" || failure $"$prog reload"
-	echo
-	exit $?
-	;; 
-  probe)
+        echo
+	return $?
+}
+probe() {
 	# named knows how to reload intelligently; we don't want linuxconf
 	# to offer to restart every time
 	/usr/sbin/rndc reload >/dev/null 2>&1 || echo start
-	exit 0
-	;;
-  condrestart)
-	if [ -e $INITLOCK/${prog} ]; then
+	return $?
+}  
+
+# See how we were called.
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	status)
+		rhstatus
+		;;
+	restart)
 		restart
-	fi
-	;;
-  *)
-        "Usage: $0 {start|stop|status|reload|restart|condrestart}"
-        exit 1
+		;;
+	condrestart|try-restart)
+		if [ -e  ${INITLOCK}/${prog} ]; then restart; fi
+		;;
+	reload)
+		reload
+		;;
+	probe)
+		probe
+		;;
+	*)
+        	echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|probe}"
+		exit 1
 esac
 
-exit 0
+exit $?
+

Added: tinysofa/snapshot/bind/current/sources/named.sysconfig
===================================================================
--- tinysofa/snapshot/bind/current/sources/named.sysconfig	2004-06-09 12:36:53 UTC (rev 1922)
+++ tinysofa/snapshot/bind/current/sources/named.sysconfig	2004-06-09 15:54:31 UTC (rev 1923)
@@ -0,0 +1,6 @@
+# Currently, you can use the following options:
+ROOTDIR="/var/lib/named"
+#
+#
+# OPTIONS="whatever" -- These additional options will be passed to named
+#                       at startup. Don't add -t here, use ROOTDIR instead.

Modified: tinysofa/snapshot/bind/current/specs/bind.spec
===================================================================
--- tinysofa/snapshot/bind/current/specs/bind.spec	2004-06-09 12:36:53 UTC (rev 1922)
+++ tinysofa/snapshot/bind/current/specs/bind.spec	2004-06-09 15:54:31 UTC (rev 1923)
@@ -13,6 +13,7 @@
 Source0: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.gz
 Source1: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.gz.asc
 Source2: named.conf.non-root.example
+Source3: named.sysconfig
 Source4: nslookup.8.gz
 #Source5: resolver.5.gz
 Source6: named.conf.5.gz
@@ -132,7 +133,7 @@
 Summary: BIND dynamic libraries
 Summary(pt_BR): Bibliotecas din?micas usadas pelo BIND
 Group: tinysofa/main
-Conflicts: bind-utils <= %{epoch}:9.1.3-2cl
+Conflicts: bind-utils <= %{epoch}:9.1.3
 
 %description libs
 This package contains dynamic libraries used by several programs
@@ -144,7 +145,7 @@
 
 %package light
 Summary: Bind lightweight daemon.
-Group: tinysofa official
+Group: tinysofa/extra
 Requires: %{name}-libs = %{epoch}:%{version}
  
 %description light
@@ -156,7 +157,7 @@
 
 %package light-devel
 Summary: Include files and libraries needed for BIND Light DNS development.
-Group: tinysofa official
+Group: tinysofa/development
 Requires: %{name}-light = %{epoch}:%{version}
  
 %description light-devel
@@ -253,6 +254,11 @@
 # install some tips
 install %{_sourcedir}/named.conf.non-root.example %{_builddir}/%{name}-%{version}/
 
+# install sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+install -m 644  %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/named
+
+
 # install chroot
 mkdir -p %{buildroot}%{jail}
 # the /dev/{null,random} devices will have to be created in some %%post
@@ -358,13 +364,13 @@
 		&& mv -f %{_sysconfdir}/sysconfig/syslog.tmp \
 			%{_sysconfdir}/sysconfig/syslog \
 		|| rm -f %{_sysconfdir}/sysconfig/syslog.tmp
-	/sbin/service syslog restart
+	/sbin/service syslog restart > /dev/null
 fi
 
 %service_post named
 
 %preun
-%service_preun
+%service_preun named
 
 # chroot stuff
 rm -f %{jail}/dev/null %{jail}/dev/log %{jail}/dev/random %{jail}%{_sysconfdir}/localtime
@@ -375,15 +381,18 @@
 
 
 %postun
+%service_postun named
 if [ $1 = 0 ]; then
 	%userdel named
 	%groupdel named
 	# remove syslog configuration
-	cat %{_sysconfdir}/sysconfig/syslog | sed -e 's, *%{jail}/dev/log *,,g' > \
+	cat %{_sysconfdir}/sysconfig/syslog | \
+		sed -e 's, *%{jail}/dev/log *,,g' > \
 		%{_sysconfdir}/sysconfig/syslog.tmp
 	if [ -s "%{_sysconfdir}/sysconfig/syslog.tmp" ]; then
-		cat %{_sysconfdir}/sysconfig/syslog.tmp > %{_sysconfdir}/sysconfig/syslog
-		/sbin/service syslog restart
+		cat %{_sysconfdir}/sysconfig/syslog.tmp > \
+			%{_sysconfdir}/sysconfig/syslog
+		/sbin/service syslog restart > /dev/null
 	else
 		echo "Warning, could not remove named socket from %{_sysconfdir}/sysconfig/syslog"
 	fi
@@ -411,6 +420,7 @@
 %{_mandir}/man8/named.8*
 %{_mandir}/man8/rndc-confgen.8*
 %{_mandir}/man8/rndc.8*
+%config(noreplace) %{_sysconfdir}/sysconfig/named
 %defattr(0755,root,root,0755)
 %{_initrddir}/named
 %{_sbindir}/dnssec-keygen


From svn at tinysofa.org  Wed Jun  9 17:21:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Jun 2004 03:21:50 +1000 (EST)
Subject: [tinysofa-svn] 
	r1924 - in tinysofa/snapshot/fcron/current: sources specs
Message-ID: <20040609172150.B904F4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-10 03:21:50 +1000 (Thu, 10 Jun 2004)
New Revision: 1924

Modified:
   tinysofa/snapshot/fcron/current/sources/fcron.init
   tinysofa/snapshot/fcron/current/specs/fcron.spec
Log:
- redo spec file
- use tinysofa macros
- add try-restart target to init script


Modified: tinysofa/snapshot/fcron/current/sources/fcron.init
===================================================================
--- tinysofa/snapshot/fcron/current/sources/fcron.init	2004-06-09 15:54:31 UTC (rev 1923)
+++ tinysofa/snapshot/fcron/current/sources/fcron.init	2004-06-09 17:21:50 UTC (rev 1924)
@@ -53,9 +53,15 @@
 	killall -HUP fcron
 	RETVAL=$?
 	;;        
+  condrestart|try-restart)
+	if [ -f ${INITLOCK:-/mnt/lockdev}/fcron ]; then
+		restart
+	fi
+	;;
   *)
-	echo "Usage: fcron {start|stop|status|restart}"
+	echo "Usage: fcron {start|stop|status|restart|try-restart}"
 	exit 1
 esac
 
 exit $RETVAL
+

Modified: tinysofa/snapshot/fcron/current/specs/fcron.spec
===================================================================
--- tinysofa/snapshot/fcron/current/specs/fcron.spec	2004-06-09 15:54:31 UTC (rev 1923)
+++ tinysofa/snapshot/fcron/current/specs/fcron.spec	2004-06-09 17:21:50 UTC (rev 1924)
@@ -1,16 +1,18 @@
-Summary:   Fcron is a task scheduler.
+Summary: The fcron daemon for executing specified programs at set times
 Name: fcron
 Version: 2.9.4
 Release: 10jh
 License: GPL
-Group: tinysofa official
+Group: tinysofa/main
 Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz
-Source2: fcron.init
-Source3: fcrontab-default
+Source1: fcron.init
+Source2: fcrontab-default
 Patch0: fcron-2.9.4-selinux.patch
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Provides: crond
-PreReq: crontabs shadow-utils tinysofa-utils chkconfig initscripts
+PreReq: crontabs initscripts
+%accountman_requires
+%service_requires
 BuildRequires: autoconf postfix vim
 
 %description
@@ -22,101 +24,94 @@
 not running neither all the time nor regularly (contrary to anacrontab).
 
 In other words, fcron does both the job of Vixie Cron and anacron, but does
-even more and better :)) ...
+even more and better.
 
+
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .selinux
 
+
 %build
 autoconf
-%configure --prefix=%{_prefix} \
+%configure \
+	--prefix=%{_prefix} \
 	--mandir=%{_mandir} \
 	--with-sendmail=/usr/sbin/sendmail \
-%if %{use_selinux}
+%if %{with_selinux}
 	--with-selinux=yes
 %endif
 	--with-pam=no \
 	--with-answer-all=no
-make OPTIM="${RPM_OPT_FLAGS}"
 
+%make OPTIM="%{optflags}"
+
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%{__mkdir_p} \
+	%{buildroot}%{_prefix}/bin \
+	%{buildroot}%{_docdir} \
+	%{buildroot}%{_sbindir} \
+	%{buildroot}%{_mandir}/man{1,3,5,8} \
+	%{buildroot}%{_initrddir}
 
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/bin
-mkdir -p ${RPM_BUILD_ROOT}%{_docdir}
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,3,5,8}
-mkdir -p ${RPM_BUILD_ROOT}/etc/init.d/
-#mkdir -p ${RPM_BUILD_ROOT}/var/spool/fcron
-
-make install \
-	ETC=${RPM_BUILD_ROOT}%{_sysconfdir} \
-	DESTBIN=${RPM_BUILD_ROOT}%{_prefix}/bin \
-	DESTSBIN=${RPM_BUILD_ROOT}%{_sbindir} \
-	DESTMAN=${RPM_BUILD_ROOT}%{_mandir} \
-	DESTDOC=${RPM_BUILD_ROOT}%{_docdir} \
-	FCRONTABS=${RPM_BUILD_ROOT}/var/spool/fcron \
+%makeinstall \
+	ETC=%{buildroot}%{_sysconfdir} \
+	DESTBIN=%{buildroot}%{_prefix}/bin \
+	DESTSBIN=%{buildroot}%{_sbindir} \
+	DESTMAN=%{buildroot}%{_mandir} \
+	DESTDOC=%{buildroot}%{_docdir} \
+	FCRONTABS=%{buildroot}%{_localstatedir}/spool/fcron \
 	BINMODE=511 \
 	ROOTNAME=`id -un` \
 	ROOTGROUP=`id -gn` \
 	USERNAME=`id -un` \
 	GROUPNAME=`id -gn`
 
-chmod u+r ${RPM_BUILD_ROOT}%{_sbindir}/fcron
+chmod u+r %{buildroot}%{_sbindir}/fcron
 
-install -c -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}%{_initdir}/fcron
-install -c -m 755 convert-fcrontab ${RPM_BUILD_ROOT}%{_bindir}
+install -c -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/fcron
+install -c -m 755 convert-fcrontab %{buildroot}%{_bindir}
 
-pushd $RPM_BUILD_ROOT%{_prefix}/bin
+pushd %{buildroot}%{_prefix}/bin
   ln -s fcrontab crontab
 popd
 
-pushd $RPM_BUILD_ROOT%{_mandir}/man1
+pushd %{buildroot}%{_mandir}/man1
   ln -s fcrontab.1 crontab.1
 popd
 
-install -m 644 %{SOURCE3} fcrontab-default
+install -m 644 %{SOURCE2} fcrontab-default
 
+
 %pre
-# create user and group if not yet created:
-if ! getent group fcron >/dev/null 2>/dev/null; then
-        /usr/sbin/groupadd -g 108 fcron
-fi
-if ! getent passwd fcron >/dev/null 2>/dev/null; then
-        /usr/sbin/useradd -d /no/dir \
-	-s /bin/false -c "fcron user" -g fcron -u 108 fcron
-fi
+%groupadd fcron 108
+%useradd fcron 108 fcron -s /bin/false -c fcron
 
 %post
 if [ "$1" = 1 ]; then
-	if [ ! -f /var/spool/fcron/systab ]; then
+	if [ ! -f %{_localstatedir}/spool/fcron/systab ]; then
 		# install default crontab:
-		/usr/bin/fcrontab -u systab \
+		%{_bindir}/fcrontab -u systab \
 		 %{_docdir}/%{name}-%{version}/fcrontab-default >/dev/null 2>&1
 	fi
 fi
 
-/sbin/chkconfig --add fcron
-# Force a startup
-/sbin/chkconfig fcron on
-/sbin/restart_maybe fcron
+%service_post -o fcron
 
 %preun
-if [ "$1" = "0" ]; then
-  /sbin/chkconfig --del fcron
-fi
+%service_preun fcron
 
+%postun
+%service_postun fcron
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
-%defattr(-,root,root)
+%defattr(644,root,root,755)
 %doc doc/txt/changes.txt doc/txt/faq.txt doc/txt/gpl.txt doc/txt/install.txt doc/txt/readme.txt doc/txt/relnotes.txt doc/txt/thanks.txt doc/txt/todo.txt fcrontab-default
-%attr(640,root,fcron) %config %{_sysconfdir}/fcron.conf
-%attr(640,root,fcron) %config %{_sysconfdir}/fcron.allow
-%attr(640,root,fcron) %config %{_sysconfdir}/fcron.deny
-%{_initdir}/fcron
 %{_mandir}/man8/fcron.8*
 %{_mandir}/man1/fcrontab.1*
 %{_mandir}/man1/fcrondyn.1*
@@ -124,14 +119,20 @@
 %{_mandir}/man5/fcrontab.5*
 %{_mandir}/man5/fcron.conf.5*
 %{_mandir}/man3/bitstring.3*
-%attr(6111,root,root) %{_bindir}/convert-fcrontab
-%attr(6111,root,root) %{_bindir}/fcronsighup
-%attr(6111,fcron,fcron) %{_bindir}/fcrontab
-%attr(6111,fcron,fcron) %{_bindir}/fcrondyn
+%defattr(-,root,root)
+%attr(640,root,fcron) %config %{_sysconfdir}/fcron.conf
+%attr(640,root,fcron) %config %{_sysconfdir}/fcron.allow
+%attr(640,root,fcron) %config %{_sysconfdir}/fcron.deny
+%{_initrddir}/fcron
+%attr(6755,root,root) %{_bindir}/convert-fcrontab
+%attr(6755,root,root) %{_bindir}/fcronsighup
+%attr(6755,fcron,fcron) %{_bindir}/fcrontab
+%attr(6755,fcron,fcron) %{_bindir}/fcrondyn
 %{_bindir}/crontab
-%attr(110,root,root) %{_sbindir}/fcron
-%attr(770,fcron,fcron) /var/spool/fcron
+%attr(750,root,root) %{_sbindir}/fcron
+%dir %attr(770,fcron,fcron) %{_localstatedir}/spool/fcron
 
+
 %changelog
 * Tue May 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.9.4-10jh
 - prerequire initscripts


From svn at tinysofa.org  Wed Jun  9 18:25:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Jun 2004 04:25:12 +1000 (EST)
Subject: [tinysofa-svn] r1925 - tinysofa/snapshot/rpm/current/sources
Message-ID: <20040609182512.0E6114E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-10 04:25:11 +1000 (Thu, 10 Jun 2004)
New Revision: 1925

Modified:
   tinysofa/snapshot/rpm/current/sources/tinysofa.macros
Log:
- add -f flag to %groupadd()


Modified: tinysofa/snapshot/rpm/current/sources/tinysofa.macros
===================================================================
--- tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-09 17:21:50 UTC (rev 1924)
+++ tinysofa/snapshot/rpm/current/sources/tinysofa.macros	2004-06-09 18:25:11 UTC (rev 1925)
@@ -75,7 +75,7 @@
 
 # usage:
 # %post_groupadd groupname gid
-%groupadd() /usr/sbin/groupadd -r -g %{2} %{1} > /dev/null 2>&1 || : \
+%groupadd() /usr/sbin/groupadd -r -f -g %{2} %{1} > /dev/null 2>&1 || : \
 %{nil}
 %groupdel() /usr/sbin/groupdel %{1} > /dev/null 2>&1 || :
 


From svn at tinysofa.org  Wed Jun  9 18:27:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Jun 2004 04:27:28 +1000 (EST)
Subject: [tinysofa-svn] r1926 - tinysofa/snapshot/dev/current/specs
Message-ID: <20040609182728.440EF4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-10 04:27:28 +1000 (Thu, 10 Jun 2004)
New Revision: 1926

Modified:
   tinysofa/snapshot/dev/current/specs/dev.spec
Log:
- use tinysofa macros
- use new groups


Modified: tinysofa/snapshot/dev/current/specs/dev.spec
===================================================================
--- tinysofa/snapshot/dev/current/specs/dev.spec	2004-06-09 18:25:11 UTC (rev 1925)
+++ tinysofa/snapshot/dev/current/specs/dev.spec	2004-06-09 18:27:28 UTC (rev 1926)
@@ -1,13 +1,13 @@
 Name: dev
 Version: 3.3.13
-Release: 3jh
-Group: tinysofa official
+Release: 4jh
+Group: tinysofa/main
 License: GPL
 Summary: The most commonly-used entries in the /dev directory.
 URL: http://www.lanana.org/docs/device-list/
-Prereq: /usr/sbin/groupadd, /usr/sbin/useradd
+%accountman_requires
 Prereq: sed, mktemp, coreutils
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildConflicts: rpm < 4.0.3-0.71, rpm-build < 4.0.3-0.71
 
 %description
@@ -23,7 +23,7 @@
 Source: MAKEDEV-%{version}-1.tar.gz
 Patch: MAKEDEV-vcsa.patch
 Patch1: MAKEDEV-ubd.patch
-Group: tinysofa official
+Group: tinysofa/main
 Summary: A program used for creating device files in /dev.
 
 %description make
@@ -62,7 +62,6 @@
 	-c $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d \
 	-d $RPM_BUILD_ROOT/dev -M $@ | sed "s|$RPM_BUILD_ROOT||g" >> manifest
 }
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && %{__rm} -rf -- "%{buildroot}"
 rm -f  manifest
 
 %ifnarch s390 s390x
@@ -218,7 +217,7 @@
 
 
 %clean
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && %{__rm} -rf -- "%{buildroot}"
+%clean_buildroot
 
 %pre make
 if [ -r /proc/mounts ] ; then
@@ -250,7 +249,7 @@
 	fi
 fi
 [ -d /dev ] || /bin/mkdir /dev
-/usr/sbin/groupadd -g 19 -r -f floppy > /dev/null 2>/dev/null
+%groupadd floppy 19
 #/usr/sbin/useradd -c "virtual console memory owner" -u 69 \
 #	-s /sbin/nologin -r -d /dev vcsa 2> /dev/null
 #exit 0


From svn at tinysofa.org  Wed Jun  9 18:30:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Jun 2004 04:30:08 +1000 (EST)
Subject: [tinysofa-svn] r1927 - tinysofa/snapshot/vsftpd/current/specs
Message-ID: <20040609183008.B43384E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-10 04:30:08 +1000 (Thu, 10 Jun 2004)
New Revision: 1927

Modified:
   tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec
Log:
- restart service in %postun


Modified: tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec
===================================================================
--- tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec	2004-06-09 18:27:28 UTC (rev 1926)
+++ tinysofa/snapshot/vsftpd/current/specs/vsftpd.spec	2004-06-09 18:30:08 UTC (rev 1927)
@@ -69,7 +69,10 @@
 %preun
 %service_preun vsftpd
 
+%postun
+%service_postun vsftpd
 
+
 %files
 %defattr(-,root,root)
 %doc FAQ BUGS AUDIT Changelog LICENSE README README.security 


From svn at tinysofa.org  Wed Jun  9 18:45:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Jun 2004 04:45:46 +1000 (EST)
Subject: [tinysofa-svn] 
	r1928 - in tinysofa/snapshot/ftp/current: sources specs
Message-ID: <20040609184546.AD5304E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-10 04:45:46 +1000 (Thu, 10 Jun 2004)
New Revision: 1928

Added:
   tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17-acct.patch
   tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17-pre20000412.pasv-security.patch
   tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17.tar.bz2
   tinysofa/snapshot/ftp/current/sources/netkit-ftp.usagi-ipv6.patch
Removed:
   tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.15-man.patch
   tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17.tar.gz
Modified:
   tinysofa/snapshot/ftp/current/specs/ftp.spec
Log:
- new spec file from Fedora
- add Fedora patches
- use .tar.bz2 source


Deleted: tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.15-man.patch
===================================================================
--- tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.15-man.patch	2004-06-09 18:30:08 UTC (rev 1927)
+++ tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.15-man.patch	2004-06-09 18:45:46 UTC (rev 1928)
@@ -1,12 +0,0 @@
-diff -Nru netkit-ftp-0.15.old/configure netkit-ftp-0.15/configure
---- netkit-ftp-0.15.old/configure	Sun Aug  1 08:00:12 1999
-+++ netkit-ftp-0.15/configure	Fri Jan 21 08:00:13 2000
-@@ -49,7 +49,7 @@
- fi
- 
- BINDIR="$EXECPREFIX/bin"
--MANDIR="$PREFIX/man"
-+MANDIR="$PREFIX/share/man"
- 
- echo "Directories: $BINDIR $MANDIR "
- 

Added: tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17-acct.patch
===================================================================
--- tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17-acct.patch	2004-06-09 18:30:08 UTC (rev 1927)
+++ tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17-acct.patch	2004-06-09 18:45:46 UTC (rev 1928)
@@ -0,0 +1,12 @@
+--- netkit-ftp-0.17/ftp/ftp.c.acct	Sun Jan 21 00:08:29 2001
++++ netkit-ftp-0.17/ftp/ftp.c	Sun Jan 21 00:09:04 2001
+@@ -254,7 +254,8 @@
+ 	if (n == CONTINUE) {
+ 		aflag++;
+ 		/* fflush(stdout); */
+-		zacct = getpass("Account:");
++		if(zacct==NULL)
++			zacct = getpass("Account:");
+ 		n = command("ACCT %s", zacct);
+ 	}
+ 	if (n != COMPLETE) {

Added: tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17-pre20000412.pasv-security.patch
===================================================================
--- tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17-pre20000412.pasv-security.patch	2004-06-09 18:30:08 UTC (rev 1927)
+++ tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17-pre20000412.pasv-security.patch	2004-06-09 18:45:46 UTC (rev 1928)
@@ -0,0 +1,49 @@
+diff -urN netkit-ftp-0.17-pre20000412/ftp/ftp.1 netkit-ftp-0.17-pre20000412.new/ftp/ftp.1
+--- netkit-ftp-0.17-pre20000412/ftp/ftp.1	Thu Apr 13 03:56:03 2000
++++ netkit-ftp-0.17-pre20000412.new/ftp/ftp.1	Wed Aug 16 14:13:10 2000
+@@ -62,8 +62,10 @@
+ Use passive mode for data transfers. Allows use of ftp in environments
+ where a firewall prevents connections from the outside world back to
+ the client machine. Requires that the ftp server support the PASV
+-command. This is the default if invoked as
+-.Nm pftp.
++command. This is the default now for
++.Nm all
++clients (ftp and pftp) due to security concerns using the PORT transfer mode.
++The flag is kept for compatibility only and has no effect anymore.
+ .It Fl i
+ Turns off interactive prompting during multiple file transfers.
+ .It Fl n
+diff -urN netkit-ftp-0.17-pre20000412/ftp/ftp.c netkit-ftp-0.17-pre20000412.new/ftp/ftp.c
+--- netkit-ftp-0.17-pre20000412/ftp/ftp.c	Mon Dec 13 21:33:20 1999
++++ netkit-ftp-0.17-pre20000412.new/ftp/ftp.c	Wed Aug 16 14:12:50 2000
+@@ -883,7 +883,7 @@
+ 	}
+ 	if (fstat(fileno(fout), &st) < 0 || st.st_blksize == 0)
+ 		st.st_blksize = BUFSIZ;
+-	if (st.st_blksize > bufsize) {
++	if ((unsigned)st.st_blksize > bufsize) {
+ 		if (buf)
+ 			(void) free(buf);
+ 		buf = malloc((unsigned)st.st_blksize);
+diff -urN netkit-ftp-0.17-pre20000412/ftp/main.c netkit-ftp-0.17-pre20000412.new/ftp/main.c
+--- netkit-ftp-0.17-pre20000412/ftp/main.c	Sat Oct  2 15:25:23 1999
++++ netkit-ftp-0.17-pre20000412.new/ftp/main.c	Wed Aug 16 13:58:57 2000
+@@ -87,7 +87,7 @@
+ usage(void)
+ {
+ 	printf("\n\tUsage: { ftp | pftp } [-pinegvtd] [hostname]\n");
+-	printf("\t   -p: enable passive mode (default for pftp)\n");
++	printf("\t   -p: enable passive mode (default for ftp and pftp)\n");
+ 	printf("\t   -i: turn off prompting during mget\n");
+ 	printf("\t   -n: inhibit auto-login\n");
+ 	printf("\t   -e: disable readline support, if present\n");
+@@ -118,7 +118,7 @@
+ 	doglob = 1;
+ 	interactive = 1;
+ 	autologin = 1;
+-	passivemode = 0;
++	passivemode = 1;
+ 
+         cp = strrchr(argv[0], '/');
+         cp = (cp == NULL) ? argv[0] : cp+1;

Added: tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/snapshot/ftp/current/sources/netkit-ftp-0.17.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/snapshot/ftp/current/sources/netkit-ftp.usagi-ipv6.patch
===================================================================
--- tinysofa/snapshot/ftp/current/sources/netkit-ftp.usagi-ipv6.patch	2004-06-09 18:30:08 UTC (rev 1927)
+++ tinysofa/snapshot/ftp/current/sources/netkit-ftp.usagi-ipv6.patch	2004-06-09 18:45:46 UTC (rev 1928)
@@ -0,0 +1,925 @@
+diff -uNr netkit-ftp-0.17/CVS/Entries netkit-ftp/CVS/Entries
+diff -uNr netkit-ftp-0.17/ChangeLog netkit-ftp/ChangeLog
+--- netkit-ftp-0.17/ChangeLog	Sun Jul 23 04:38:08 2000
++++ netkit-ftp/ChangeLog	Tue Nov 28 03:50:10 2000
+@@ -1,3 +1,6 @@
++28-Nov-2000:
++	IPv6 support. (Hiroyuki YAMAMORI <h-yamamo at db3.so-net.ne.jp>)
++
+ 8-Jul-2000:
+ 	Fix misused printf-function call (not %n-exploitable though).
+ 
+diff -uNr netkit-ftp-0.17/configure netkit-ftp/configure
+--- netkit-ftp-0.17/configure	Sat Jul 29 21:00:28 2000
++++ netkit-ftp/configure	Sat Jan 27 06:14:54 2001
+@@ -24,6 +24,7 @@
+     --binmode=mode        Mode for binaries [755]
+     --manmode=mode        Mode for manual pages [644]
+     --with-c-compiler=cc  Program for compiling C source [guessed]
++    --enable-ipv6         Enable IPv6 support
+ EOF
+ 	exit 0;;
+ 	--verbose) ;;
+@@ -39,6 +40,11 @@
+ 	--manmode=*) MANMODE=`echo $1 | sed 's/^[^=]*=//'` ;;
+ 	--with-c-compiler=*) CC=`echo $1 | sed 's/^[^=]*=//'` ;;
+ 	--without-readline|--disable-readline) WITHOUT_READLINE=1;;
++
++	--disable-ipv6) ENABLE_IPV6=no;;
++	--enable-ipv6=*) ENABLE_IPV6=`echo $1 | sed 's/^[^=]*=//'`;;
++	--enable-ipv6) ENABLE_IPV6=yes;;
++
+ 	*) echo "Unrecognized option: $1"; exit 1;;
+ esac 
+ shift
+@@ -142,6 +148,42 @@
+ 
+ LDFLAGS=
+ LIBS=
++
++rm -f __conftest*
++
++##################################################
++## Enable IPv6
++echo -n "Whether to enable IPv6 support... "
++if [ x"$ENABLE_IPV6" = x"yes" ]; then
++    echo yes
++    CFLAGS="$CFLAGS -DINET6"
++else
++    echo no
++fi
++
++rm -f __conftest*
++
++## Search IPv6 Library / Headers
++if [ x"$ENABLE_IPV6" = x"yes" ]; then
++    echo -n "Search for IPv6 library... "
++    inet6libdirs="/usr/local/v6/lib /usr/local/lib /usr /usr/inet6/lib"
++    inet6libs="inet6"
++    inet6found=no
++    for inet6libdir in $inet6libdirs; do
++        for inet6lib in $inet6libs; do
++            if [ -d $inet6libdir ] && [ -f $inet6libdir/lib$inet6lib.a ]; then
++                inet6found=yes
++                break 2
++            fi
++        done
++    done
++    if [ x"$inet6found" = x"yes" ]; then
++        echo "$inet6libdir/lib$inet6lib.a"
++        LIBS="$LIBS -L$inet6libdir -l$inet6lib"
++    else
++        echo "not found"
++    fi
++fi
+ 
+ rm -f __conftest*
+ 
+diff -uNr netkit-ftp-0.17/ftp/CVS/Entries netkit-ftp/ftp/CVS/Entries
+--- netkit-ftp-0.17/ftp/CVS/Entries	Thu Jan  1 02:00:00 1970
++++ netkit-ftp/ftp/CVS/Entries	Mon Feb 19 06:50:49 2001
+@@ -0,0 +1,16 @@
++/.cvsignore/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/Makefile/1.4/Sat Jan 27 05:57:08 2001//
++/cmds.c/1.3/Fri Jan 12 21:36:27 2001//
++/cmds.h/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/cmdtab.c/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/domacro.c/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/ftp.1/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/ftp.c/1.11/Sun Feb 11 12:26:59 2001//
++/ftp_var.h/1.3/Fri Jan 12 21:36:27 2001//
++/glob.c/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/glob.h/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/main.c/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/netrc.5/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/pathnames.h/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/ruserpass.c/1.1.1.1/Fri Nov  3 19:18:15 2000//
++D
+diff -uNr netkit-ftp-0.17/ftp/CVS/Repository netkit-ftp/ftp/CVS/Repository
+--- netkit-ftp-0.17/ftp/CVS/Repository	Thu Jan  1 02:00:00 1970
++++ netkit-ftp/ftp/CVS/Repository	Mon Feb 19 06:50:49 2001
+@@ -0,0 +1 @@
++usagi/src/netkit-ftp/ftp
+diff -uNr netkit-ftp-0.17/ftp/CVS/Root netkit-ftp/ftp/CVS/Root
+--- netkit-ftp-0.17/ftp/CVS/Root	Thu Jan  1 02:00:00 1970
++++ netkit-ftp/ftp/CVS/Root	Mon Feb 19 06:50:49 2001
+@@ -0,0 +1 @@
++:pserver:anoncvs at anoncvs.linux-ipv6.org:/cvsroot/usagi
+diff -uNr netkit-ftp-0.17/ftp/Makefile netkit-ftp/ftp/Makefile
+--- netkit-ftp-0.17/ftp/Makefile	Sun Aug  1 09:00:12 1999
++++ netkit-ftp/ftp/Makefile	Sat Jan 27 07:57:08 2001
+@@ -16,10 +16,13 @@
+ cmds.o glob.o: glob.h
+ 
+ install: ftp
++	install -d $(INSTALLROOT)$(BINDIR)
+ 	install -s -m$(BINMODE) ftp $(INSTALLROOT)$(BINDIR)
+ 	ln -sf ftp $(INSTALLROOT)$(BINDIR)/pftp
++	install -d $(INSTALLROOT)$(MANDIR)/man1
+ 	install -m$(MANMODE) ftp.1 $(INSTALLROOT)$(MANDIR)/man1
+ 	ln -sf ftp.1 $(INSTALLROOT)$(MANDIR)/man1/pftp.1
++	install -d $(INSTALLROOT)$(MANDIR)/man5
+ 	install -m$(MANMODE) netrc.5 $(INSTALLROOT)$(MANDIR)/man5
+ 
+ clean:
+diff -uNr netkit-ftp-0.17/ftp/cmds.c netkit-ftp/ftp/cmds.c
+--- netkit-ftp-0.17/ftp/cmds.c	Sun Jul 23 04:36:59 2000
++++ netkit-ftp/ftp/cmds.c	Fri Jan 12 23:36:27 2001
+@@ -1,3 +1,5 @@
++/* $USAGI$ */
++
+ /*
+  * Copyright (c) 1985, 1989 Regents of the University of California.
+  * All rights reserved.
+@@ -35,7 +37,7 @@
+  * from: @(#)cmds.c	5.26 (Berkeley) 3/5/91
+  */
+ char cmds_rcsid[] = 
+-   "$Id: cmds.c,v 1.33 2000/07/23 01:36:59 dholland Exp $";
++   "$Id: cmds.c,v 1.3 2001/01/12 21:36:27 sekiya Exp $";
+ 
+ /*
+  * FTP User Program -- Command Routines.
+@@ -190,7 +192,7 @@
+ setpeer(int argc, char *argv[])
+ {
+ 	char *host;
+-	unsigned short port;
++	char *port;
+ 
+ 	if (connected) {
+ 		printf("Already connected to %s, use close first.\n",
+@@ -205,22 +207,17 @@
+ 		code = -1;
+ 		return;
+ 	}
+-	port = ftp_port;
++	port = NULL;
+ 	if (argc > 2) {
+-		port = atoi(argv[2]);
+-		if (port < 1) {
+-			printf("%s: bad port number-- %s\n", argv[1], argv[2]);
+-			printf ("usage: %s host-name [port]\n", argv[0]);
+-			code = -1;
+-			return;
+-		}
+-		port = htons(port);
++		port = argv[2];
+ 	}
+ 	host = hookup(argv[1], port);
+ 	if (host) {
+ 		int overbose;
+ 
+ 		connected = 1;
++		try_epsv = 1;
++		try_eprt = 1;
+ 		/*
+ 		 * Set up defaults for FTP.
+ 		 */
+diff -uNr netkit-ftp-0.17/ftp/cmdtab.c netkit-ftp/ftp/cmdtab.c
+--- netkit-ftp-0.17/ftp/cmdtab.c	Tue Sep 28 18:36:05 1999
++++ netkit-ftp/ftp/cmdtab.c	Fri Nov  3 21:18:15 2000
+@@ -35,7 +35,7 @@
+  * from: @(#)cmdtab.c	5.10 (Berkeley) 6/1/90
+  */
+ char cmdtab_rcsid[] = 
+-  "$Id: cmdtab.c,v 1.8 1999/09/28 15:36:05 dholland Exp $";
++  "$Id: cmdtab.c,v 1.1.1.1 2000/11/03 19:18:15 mk Exp $";
+ 
+ #include <string.h>   /* for NULL */
+ #include "ftp_var.h"
+diff -uNr netkit-ftp-0.17/ftp/domacro.c netkit-ftp/ftp/domacro.c
+--- netkit-ftp-0.17/ftp/domacro.c	Thu Aug 15 02:27:28 1996
++++ netkit-ftp/ftp/domacro.c	Fri Nov  3 21:18:15 2000
+@@ -35,7 +35,7 @@
+  * from: @(#)domacro.c	1.8 (Berkeley) 9/28/90
+  */
+ char domacro_rcsid[] = 
+-  "$Id: domacro.c,v 1.4 1996/08/14 23:27:28 dholland Exp $";
++  "$Id: domacro.c,v 1.1.1.1 2000/11/03 19:18:15 mk Exp $";
+ 
+ #include <errno.h>
+ #include <ctype.h>
+diff -uNr netkit-ftp-0.17/ftp/ftp.1 netkit-ftp/ftp/ftp.1
+--- netkit-ftp-0.17/ftp/ftp.1	Mon Jul 31 02:56:59 2000
++++ netkit-ftp/ftp/ftp.1	Fri Nov  3 21:18:15 2000
+@@ -30,7 +30,7 @@
+ .\" SUCH DAMAGE.
+ .\"
+ .\"	from: @(#)ftp.1	6.18 (Berkeley) 7/30/91
+-.\"	$Id: ftp.1,v 1.14 2000/07/30 23:56:59 dholland Exp $
++.\"	$Id: ftp.1,v 1.1.1.1 2000/11/03 19:18:15 mk Exp $
+ .\"
+ .Dd August 15, 1999
+ .Dt FTP 1
+diff -uNr netkit-ftp-0.17/ftp/ftp.c netkit-ftp/ftp/ftp.c
+--- netkit-ftp-0.17/ftp/ftp.c	Mon Dec 13 22:33:20 1999
++++ netkit-ftp/ftp/ftp.c	Sun Feb 11 14:26:59 2001
+@@ -1,3 +1,34 @@
++/* $USAGI$ */
++
++/*
++ * Copyright (C) 1997 and 1998 WIDE Project.
++ * All rights reserved.
++ * 
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. Neither the name of the project nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ * 
++ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
+ /*
+  * Copyright (c) 1985, 1989 Regents of the University of California.
+  * All rights reserved.
+@@ -35,7 +66,7 @@
+  * From: @(#)ftp.c	5.38 (Berkeley) 4/22/91
+  */
+ char ftp_rcsid[] = 
+-  "$Id: ftp.c,v 1.25 1999/12/13 20:33:20 dholland Exp $";
++  "$Id: ftp.c,v 1.11 2001/02/11 12:26:59 yoshfuji Exp $";
+ 
+ #include <sys/param.h>
+ #include <sys/stat.h>
+@@ -63,14 +94,38 @@
+ #include "ftp_var.h"
+ #include "cmds.h"
+ 
++#ifdef _USAGI
++#include "version.h"
++#else
+ #include "../version.h"
++#endif
++
++union sockunion {
++	struct sockinet {
++		u_short	si_family;
++		u_short	si_port;
++	} su_si;
++	struct	sockaddr		su_sa;
++	struct	sockaddr_in  		su_sin;
++#ifdef INET6
++	struct	sockaddr_in6 		su_sin6;
++#endif
++};
++#define	su_family	su_sa.sa_family
++#define	su_port		su_si.si_port
++
++#ifdef INET6
++#define ex_af2prot(a) (a == AF_INET ? 1 : (a == AF_INET6 ? 2 : 0))
++#else
++#define ex_af2prot(a) (a == AF_INET ? 1 : 0)
++#endif
+ 
+ int data = -1;
+ off_t restart_point = 0;
+ 
+-static struct sockaddr_in hisctladdr;
+-static struct sockaddr_in data_addr;
+-static struct sockaddr_in myctladdr;
++static union sockunion hisctladdr;
++static union sockunion data_addr;
++static union sockunion myctladdr;
+ static int ptflag = 0;
+ static sigjmp_buf recvabort;
+ static sigjmp_buf sendabort;
+@@ -96,79 +151,119 @@
+ static FILE *dataconn(const char *);
+ 
+ char *
+-hookup(char *host, int port)
++hookup(const char *host, const char *port)
+ {
+-	register struct hostent *hp = 0;
+-	int s, tos;
++	int s, tos, error;
+ 	socklen_t len;
+ 	static char hostnamebuf[256];
+-
++	struct addrinfo hints, *res, *res0;
++	char hbuf[MAXHOSTNAMELEN], pbuf[NI_MAXSERV];
++	char *cause = "ftp: unknown";
++
++	if (port) {
++		strncpy(pbuf, port, sizeof(pbuf) - 1);
++		pbuf[sizeof(pbuf) - 1] = '\0';
++	} else {
++		sprintf(pbuf, "%d", ntohs(ftp_port));
++	}
+ 	memset(&hisctladdr, 0, sizeof(hisctladdr));
+-	if (inet_aton(host, &hisctladdr.sin_addr)) {
+-		hisctladdr.sin_family = AF_INET;
+-		strncpy(hostnamebuf, host, sizeof(hostnamebuf));
+-		hostnamebuf[sizeof(hostnamebuf)-1]=0;
+-	} 
+-	else {
+-		hp = gethostbyname(host);
+-		if (hp == NULL) {
+-			fprintf(stderr, "ftp: %s: ", host);
+-			herror((char *)NULL);
+-			code = -1;
+-			return((char *) 0);
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_flags = AI_CANONNAME;
++	hints.ai_socktype = SOCK_STREAM;
++	error = getaddrinfo(host, pbuf, &hints, &res0);
++	if (error) {
++		if (port) {
++			strcpy(hbuf, " ");
++		} else {
++			hbuf[0] = '\0';
++			pbuf[0] = '\0';
+ 		}
+-		hisctladdr.sin_family = hp->h_addrtype;
+-		if (hp->h_length > (int)sizeof(hisctladdr.sin_addr)) {
+-			hp->h_length = sizeof(hisctladdr.sin_addr);
+-		}
+-		memcpy(&hisctladdr.sin_addr, hp->h_addr_list[0], hp->h_length);
+-		(void) strncpy(hostnamebuf, hp->h_name, sizeof(hostnamebuf));
+-		hostnamebuf[sizeof(hostnamebuf)-1] = 0;
+-	}
+-	hostname = hostnamebuf;
+-	s = socket(hisctladdr.sin_family, SOCK_STREAM, 0);
+-	if (s < 0) {
+-		perror("ftp: socket");
++		fprintf(stderr, "ftp: %s%s%s: %s\n", host, hbuf, pbuf,
++						gai_strerror(error));
+ 		code = -1;
+ 		return (0);
+ 	}
+-	hisctladdr.sin_port = port;
+-	while (connect(s, (struct sockaddr *)&hisctladdr, sizeof (hisctladdr)) < 0) {
+-		if (hp && hp->h_addr_list[1]) {
+-			int oerrno = errno;
+-
+-			fprintf(stderr, "ftp: connect to address %s: ",
+-				inet_ntoa(hisctladdr.sin_addr));
+-			errno = oerrno;
+-			perror((char *) 0);
+-			hp->h_addr_list++;
+-			memcpy(&hisctladdr.sin_addr, hp->h_addr_list[0], 
+-			       hp->h_length);
+-			fprintf(stdout, "Trying %s...\n",
+-				inet_ntoa(hisctladdr.sin_addr));
+-			(void) close(s);
+-			s = socket(hisctladdr.sin_family, SOCK_STREAM, 0);
+-			if (s < 0) {
+-				perror("ftp: socket");
+-				code = -1;
+-				return (0);
++
++	if (res0->ai_canonname) {
++		struct addrinfo h, *a;
++		memset(&h, 0, sizeof(h));
++		h.ai_family = PF_UNSPEC;
++		h.ai_socktype = SOCK_STREAM;
++		h.ai_flags = AI_NUMERICHOST;
++		if (!getaddrinfo(res0->ai_canonname, NULL, &h, &a)) {
++			strncpy(hostnamebuf, res0->ai_canonname, sizeof(hostnamebuf));
++			freeaddrinfo(a);
++		} else
++			strncpy(hostnamebuf, host, sizeof(hostnamebuf));
++	}
++	else
++		strncpy(hostnamebuf, host, sizeof(hostnamebuf));
++	hostnamebuf[sizeof(hostnamebuf) - 1] = '\0';
++	hostname = hostnamebuf;
++	
++	s = -1;
++	for (res = res0; res; res = res->ai_next) {
++		if (!ex_af2prot(res->ai_family)) {
++			cause = "ftp: mismatch address family";
++			errno = EPROTONOSUPPORT;
++			continue;
++		}
++		if ((size_t)res->ai_addrlen > sizeof(hisctladdr)) {
++			cause = "ftp: mismatch struct sockaddr size";
++			errno = EPROTO;
++			continue;
++		}
++		if (getnameinfo(res->ai_addr, res->ai_addrlen,
++				hbuf, sizeof(hbuf), NULL, 0,
++				NI_NUMERICHOST))
++			strcpy(hbuf, "???");
++		if (res0->ai_next)	/* if we have multiple possibilities */
++			fprintf(stdout, "Trying %s...\n", hbuf);
++		s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
++		if (s < 0) {
++			cause = "ftp: socket";
++			continue;
++		}
++		while ((error = connect(s, res->ai_addr, res->ai_addrlen)) < 0
++				&& errno == EINTR) {
++			;
++		}
++		if (error) {
++			/* this "if" clause is to prevent print warning twice */
++			if (res->ai_next) {
++				fprintf(stderr,
++					"ftp: connect to address %s", hbuf);
++				perror("");
+ 			}
++			cause = "ftp: connect";
++			close(s);
++			s = -1;
+ 			continue;
+ 		}
+-		perror("ftp: connect");
++		/* finally we got one */
++		break;
++	}
++	if (s < 0) {
++		perror(cause);
+ 		code = -1;
+-		goto bad;
++		freeaddrinfo(res0);
++		return NULL;
+ 	}
+-	len = sizeof (myctladdr);
++	len = res->ai_addrlen;
++	memcpy(&hisctladdr, res->ai_addr, len);
++	freeaddrinfo(res0);
+ 	if (getsockname(s, (struct sockaddr *)&myctladdr, &len) < 0) {
+ 		perror("ftp: getsockname");
+ 		code = -1;
+ 		goto bad;
+ 	}
+ #ifdef IP_TOS
++	if (hisctladdr.su_family == AF_INET)
++	{
+ 	tos = IPTOS_LOWDELAY;
+ 	if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
+ 		perror("ftp: setsockopt TOS (ignored)");
++	}
+ #endif
+ 	cin = fdopen(s, "r");
+ 	cout = fdopen(s, "w");
+@@ -182,7 +277,7 @@
+ 		goto bad;
+ 	}
+ 	if (verbose)
+-		printf("Connected to %s.\n", hostname);
++		printf("Connected to %s (%s).\n", hostname, hbuf);
+ 	if (getreply(0) > 2) { 	/* read startup message from server */
+ 		if (cin)
+ 			(void) fclose(cin);
+@@ -392,8 +487,10 @@
+ 			}
+ 			if (dig < 4 && isdigit(c))
+ 				code = code * 10 + (c - '0');
+-			if (!pflag && code == 227)
++			if (!pflag && (code == 227 || code == 228))
+ 				pflag = 1;
++			else if (!pflag && code == 229)
++				pflag = 100;
+ 			if (dig > 4 && pflag == 1 && isdigit(c))
+ 				pflag = 2;
+ 			if (pflag == 2) {
+@@ -405,6 +502,8 @@
+ 					pflag = 3;
+ 				}
+ 			}
++			if (pflag == 100 && c == '(')
++				pflag = 2;
+ 			if (dig == 4 && c == '-') {
+ 				if (continuation)
+ 					code = 0;
+@@ -1083,15 +1182,25 @@
+ static int
+ initconn(void)
+ {
+-	register char *p, *a;
++	u_char *p, *a;
+ 	int result, tmpno = 0;
+ 	socklen_t len;
+ 	int on = 1;
+-	int tos;
+-	u_long a1,a2,a3,a4,p1,p2;
+-
++	int tos, error = 0;
++	u_int ad[16], po[2], af, alen, plen;
++	char *pasvcmd = NULL;
++	char hbuf[MAXHOSTNAMELEN], pbuf[NI_MAXSERV];
++
++#ifdef INET6
++	if (myctladdr.su_family == AF_INET6
++	 && (IN6_IS_ADDR_LINKLOCAL(&myctladdr.su_sin6.sin6_addr)
++	  || IN6_IS_ADDR_SITELOCAL(&myctladdr.su_sin6.sin6_addr))) {
++		fprintf(stderr, "use of scoped address can be troublesome\n");
++	}
++#endif
+ 	if (passivemode) {
+-		data = socket(AF_INET, SOCK_STREAM, 0);
++		data_addr = hisctladdr;
++		data = socket(data_addr.su_family, SOCK_STREAM, 0);
+ 		if (data < 0) {
+ 			perror("ftp: socket");
+ 			return(1);
+@@ -1100,52 +1209,201 @@
+ 		    setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,
+ 			       sizeof (on)) < 0)
+ 			perror("ftp: setsockopt (ignored)");
+-		if (command("PASV") != COMPLETE) {
++		switch (data_addr.su_family) {
++		case AF_INET:
++#if 0
++			if (try_epsv) {
++				result = command(pasvcmd = "EPSV 1");
++				if (code / 10 == 22 && code != 229) {
++					fprintf(stderr,
++				  "wrong server: return code must be 229\n");
++					result = COMPLETE + 1;
++				}
++			} else {
++#endif
++			result = COMPLETE + 1;
++
++			if (result != COMPLETE) {
++				try_epsv = 0;
++				result = command(pasvcmd = "PASV");
++			}
++			break;
++#ifdef INET6
++		case AF_INET6:
++			if (try_epsv) {
++				result = command(pasvcmd = "EPSV 2");
++				if (code / 10 == 22 && code != 229) {
++					fprintf(stderr,
++				  "wrong server: return code must be 229\n");
++					result = COMPLETE + 1;
++				}
++			} else {
++				result = COMPLETE + 1;
++			}
++			if (result != COMPLETE) {
++				try_epsv = 0;
++				result = command(pasvcmd = "LPSV");
++			}
++			break;
++#endif
++		default:
++			result = COMPLETE + 1;
++			break;
++		}
++		if (result != COMPLETE) {
+ 			printf("Passive mode refused.\n");
+-			return(1);
++			goto bad;
+ 		}
+ 
++#define pack2(var) \
++	(((var[0] & 0xff) << 8) | ((var[1] & 0xff) << 0))
++#define pack4(var) \
++	((((var)[0] & 0xff) << 24) | (((var)[1] & 0xff) << 16) | \
++	 (((var)[2] & 0xff) << 8) | (((var)[3] & 0xff) << 0))
++
+ 		/*
+ 		 * What we've got at this point is a string of comma separated
+ 		 * one-byte unsigned integer values, separated by commas.
+-		 * The first four are the an IP address. The fifth is the MSB
+-		 * of the port number, the sixth is the LSB. From that we'll
+-		 * prepare a sockaddr_in.
+ 		 */
+-
+-		if (sscanf(pasv,"%ld,%ld,%ld,%ld,%ld,%ld",
+-			   &a1,&a2,&a3,&a4,&p1,&p2)
+-		    != 6) 
+-		{
+-			printf("Passive mode address scan failure. Shouldn't happen!\n");
+-			return(1);
++		error = 0;
++		if (strcmp(pasvcmd, "PASV") == 0) {
++			if (data_addr.su_family != AF_INET) {
++				error = 2;
++				goto psv_done;
++			}
++			if (code / 10 == 22 && code != 227) {
++				error = 227;
++				goto psv_done;
++			}
++			if (sscanf(pasv, "%u,%u,%u,%u,%u,%u",
++					&ad[0], &ad[1], &ad[2], &ad[3],
++					&po[0], &po[1]) != 6) {
++				error = 1;
++				goto psv_done;
++			}
++			data_addr.su_sin.sin_addr.s_addr = htonl(pack4(ad));
++			data_addr.su_port = htons(pack2(po));
++		} else
++		    if (strcmp(pasvcmd, "LPSV") == 0) {
++			if (code / 10 == 22 && code != 228) {
++				error = 228;
++				goto psv_done;
++			}
++			switch (data_addr.su_family) {
++			case AF_INET:
++				if (sscanf(pasv, "%u,%u,%u,%u,%u,%u,%u,%u,%u",
++						&af, &alen,
++						&ad[0], &ad[1], &ad[2], &ad[3],
++						&plen, &po[0], &po[1]) != 9) {
++					error = 1;
++					goto psv_done;
++				}
++				if (af != 4 || alen != 4 || plen != 2) {
++					error = 2;
++					goto psv_done;
++				}
++				data_addr.su_sin.sin_addr.s_addr =
++							htonl(pack4(ad));
++				data_addr.su_port = htons(pack2(po));
++				break;
++#ifdef INET6
++			case AF_INET6:
++				if (sscanf(pasv,
++	"%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u",
++				  &af, &alen,
++				  &ad[0], &ad[1], &ad[2], &ad[3],
++				  &ad[4], &ad[5], &ad[6], &ad[7],
++				  &ad[8], &ad[9], &ad[10], &ad[11],
++				  &ad[12], &ad[13], &ad[14], &ad[15],
++				  &plen, &po[0], &po[1]) != 21) {
++					error = 1;
++					goto psv_done;
++				}
++				if (af != 6 || alen != 16 || plen != 2) {
++					error = 2;
++					goto psv_done;
++				}
++				data_addr.su_sin6.sin6_addr.s6_addr32[0] =
++							htonl(pack4(ad));
++				data_addr.su_sin6.sin6_addr.s6_addr32[1] =
++							htonl(pack4(ad+4));
++				data_addr.su_sin6.sin6_addr.s6_addr32[2] =
++							htonl(pack4(ad+8));
++				data_addr.su_sin6.sin6_addr.s6_addr32[3] =
++							htonl(pack4(ad+12));
++				data_addr.su_port = htons(pack2(po));
++				break;
++#endif
++			default:
++				error = 1;
++			}
++		} else if (strncmp(pasvcmd, "EPSV", 4) == 0) {
++			char delim[4];
++			u_int epsvpo;
++
++			if (code / 10 == 22 && code != 229) {
++				error = 229;
++				goto psv_done;
++			}
++			if (sscanf(pasv, "%c%c%c%u%c", &delim[0], &delim[1],
++					&delim[2], &epsvpo, &delim[3]) != 5) {
++				error = 1;
++				goto psv_done;
++			}
++			if (delim[0] != delim[1] || delim[0] != delim[2]
++			 || delim[0] != delim[3]) {
++				error = 1;
++				goto psv_done;
++			}
++			data_addr.su_port = htons(epsvpo);
++		} else {
++			error = 1;
++		}
++psv_done:
++		switch (error) {
++		case 0:
++			break;
++		case 1:
++			fprintf(stderr,
++		  "Passive mode address scan failure. Shouldn't happen!\n");
++			goto bad;
++		case 2:
++			fprintf(stderr,
++			  "Passive mode AF mismatch. Shouldn't happen!\n");
++			goto bad;
++		case 227:
++		case 228:
++		case 229:
++			fprintf(stderr,
++			  "wrong server: return code must be %d\n", error);
++			goto bad;
++		default:
++			fprintf(stderr, "Bug\n");
+ 		}
+ 
+-		data_addr.sin_family = AF_INET;
+-		data_addr.sin_addr.s_addr = htonl((a1 << 24) | (a2 << 16) |
+-						  (a3 << 8) | a4);
+-		data_addr.sin_port = htons((p1 << 8) | p2);
+-
+ 		if (connect(data, (struct sockaddr *) &data_addr,
+ 		    sizeof(data_addr))<0) {
+ 			perror("ftp: connect");
+ 			return(1);
+ 		}
+ #ifdef IP_TOS
++		if (data_addr.su_family == AF_INET)
++		{
+ 		tos = IPTOS_THROUGHPUT;
+ 		if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&tos,
+ 		    sizeof(tos)) < 0)
+ 			perror("ftp: setsockopt TOS (ignored)");
++		}
+ #endif
+ 		return(0);
+ 	}
+ noport:
+ 	data_addr = myctladdr;
+ 	if (sendport)
+-		data_addr.sin_port = 0;	/* let system pick one */ 
++		data_addr.su_port = 0;	/* let system pick one */ 
+ 	if (data != -1)
+ 		(void) close(data);
+-	data = socket(AF_INET, SOCK_STREAM, 0);
++	data = socket(data_addr.su_family, SOCK_STREAM, 0);
+ 	if (data < 0) {
+ 		perror("ftp: socket");
+ 		if (tmpno)
+@@ -1172,13 +1430,47 @@
+ 	if (listen(data, 1) < 0)
+ 		perror("ftp: listen");
+ 	if (sendport) {
+-		a = (char *)&data_addr.sin_addr;
+-		p = (char *)&data_addr.sin_port;
+-#define	UC(b)	(((int)b)&0xff)
+-		result =
+-		    command("PORT %d,%d,%d,%d,%d,%d",
+-		      UC(a[0]), UC(a[1]), UC(a[2]), UC(a[3]),
+-		      UC(p[0]), UC(p[1]));
++		af = ex_af2prot(data_addr.su_family);
++		if (try_eprt && af > 1) {      /* only IPv6 */
++			if (getnameinfo((struct sockaddr *)&data_addr, len,
++					hbuf, sizeof(hbuf), pbuf, sizeof(pbuf),
++					NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
++				result = command("EPRT |%d|%s|%s|",
++							af, hbuf, pbuf);
++				if (result != COMPLETE) {
++					try_eprt = 0;
++				}
++			} else {
++				result = ERROR;
++			}
++		} else {
++			result = COMPLETE + 1;
++		}
++		if (result == COMPLETE)
++			goto prt_done;
++
++		p = (u_char *)&data_addr.su_port;
++		switch (data_addr.su_family) {
++		case AF_INET:
++			a = (u_char *)&data_addr.su_sin.sin_addr;
++			result = command("PORT %u,%u,%u,%u,%u,%u",
++				a[0], a[1], a[2], a[3], p[0], p[1]);
++			break;
++#ifdef INET6
++		case AF_INET6:
++			a = (u_char *)&data_addr.su_sin6.sin6_addr;
++			result = command(
++	"LPRT 6,16,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,2,%d,%d",
++				a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7],
++				a[8], a[9],a[10],a[11],a[12],a[13],a[14],a[15],
++				p[0], p[1]);
++			break;
++#endif
++		default:
++			result = COMPLETE + 1; /* xxx */
++		}
++
++	prt_done:
+ 		if (result == ERROR && sendport == -1) {
+ 			sendport = 0;
+ 			tmpno = 1;
+@@ -1189,9 +1481,12 @@
+ 	if (tmpno)
+ 		sendport = 1;
+ #ifdef IP_TOS
++	if (data_addr.su_family == AF_INET)
++	{
+ 	on = IPTOS_THROUGHPUT;
+ 	if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0)
+ 		perror("ftp: setsockopt TOS (ignored)");
++	}
+ #endif
+ 	return (0);
+ bad:
+@@ -1204,7 +1499,7 @@
+ static FILE *
+ dataconn(const char *lmode)
+ {
+-	struct sockaddr_in from;
++	union sockunion from;
+ 	int s, tos;
+ 	socklen_t fromlen = sizeof(from);
+ 
+@@ -1220,9 +1515,12 @@
+ 	(void) close(data);
+ 	data = s;
+ #ifdef IP_TOS
++	if (from.su_family == AF_INET)
++	{
+ 	tos = IPTOS_THROUGHPUT;
+ 	if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
+ 		perror("ftp: setsockopt TOS (ignored)");
++	}
+ #endif
+ 	return (fdopen(data, lmode));
+ }
+@@ -1284,8 +1582,8 @@
+ 	static struct comvars {
+ 		int connect;
+ 		char name[MAXHOSTNAMELEN];
+-		struct sockaddr_in mctl;
+-		struct sockaddr_in hctl;
++		union sockunion mctl;
++		union sockunion hctl;
+ 		FILE *in;
+ 		FILE *out;
+ 		int tpe;
+@@ -1323,7 +1621,7 @@
+ 	connected = op->connect;
+ 	if (hostname) {
+ 		(void) strncpy(ip->name, hostname, sizeof(ip->name) - 1);
+-		ip->name[strlen(ip->name)] = '\0';
++		ip->name[sizeof(ip->name) - 1] = '\0';
+ 	} 
+ 	else {
+ 		ip->name[0] = 0;
+@@ -1352,18 +1650,18 @@
+ 	ip->ntflg = ntflag;
+ 	ntflag = op->ntflg;
+ 	(void) strncpy(ip->nti, ntin, 16);
+-	(ip->nti)[strlen(ip->nti)] = '\0';
++	(ip->nti)[16] = '\0';		/* shouldn't use strlen */
+ 	(void) strcpy(ntin, op->nti);
+ 	(void) strncpy(ip->nto, ntout, 16);
+-	(ip->nto)[strlen(ip->nto)] = '\0';
++	(ip->nto)[16] = '\0';
+ 	(void) strcpy(ntout, op->nto);
+ 	ip->mapflg = mapflag;
+ 	mapflag = op->mapflg;
+ 	(void) strncpy(ip->mi, mapin, MAXPATHLEN - 1);
+-	(ip->mi)[strlen(ip->mi)] = '\0';
++	(ip->mi)[MAXPATHLEN - 1] = '\0';
+ 	(void) strcpy(mapin, op->mi);
+ 	(void) strncpy(ip->mo, mapout, MAXPATHLEN - 1);
+-	(ip->mo)[strlen(ip->mo)] = '\0';
++	(ip->mo)[MAXPATHLEN - 1] = '\0';
+ 	(void) strcpy(mapout, op->mo);
+ 	(void) signal(SIGINT, oldintr);
+ 	if (abrtflag) {
+diff -uNr netkit-ftp-0.17/ftp/ftp_var.h netkit-ftp/ftp/ftp_var.h
+--- netkit-ftp-0.17/ftp/ftp_var.h	Sat Oct  2 21:39:17 1999
++++ netkit-ftp/ftp/ftp_var.h	Fri Jan 12 23:36:27 2001
+@@ -1,3 +1,5 @@
++/* $USAGI$ */
++
+ /*
+  * Copyright (c) 1985, 1989 Regents of the University of California.
+  * All rights reserved.
+@@ -31,7 +33,7 @@
+  * SUCH DAMAGE.
+  *
+  *	from: @(#)ftp_var.h	5.9 (Berkeley) 6/1/90
+- *	$Id: ftp_var.h,v 1.12 1999/10/02 18:39:17 dholland Exp $
++ *	$Id: ftp_var.h,v 1.3 2001/01/12 21:36:27 sekiya Exp $
+  */
+ 
+ /*
+@@ -112,6 +114,8 @@
+ Extern int	mflag;		/* flag: if != 0, then active multi command */
+ 
+ Extern int	options;	/* used during socket creation */
++Extern int	try_epsv;	/* try EPSV for this session */
++Extern int	try_eprt;	/* try EPRT for this session */
+ 
+ /*
+  * Format of command table.
+@@ -140,7 +144,7 @@
+ Extern char macbuf[4096];
+ #define MACBUF_SIZE 4096
+ 
+-char *hookup(char *host, int port);
++char *hookup(const char *host, const char *port);
+ struct cmd *getcmd(const char *);
+ char **makeargv(int *pargc, char **parg);
+ int dologin(const char *host);

Modified: tinysofa/snapshot/ftp/current/specs/ftp.spec
===================================================================
--- tinysofa/snapshot/ftp/current/specs/ftp.spec	2004-06-09 18:30:08 UTC (rev 1927)
+++ tinysofa/snapshot/ftp/current/specs/ftp.spec	2004-06-09 18:45:46 UTC (rev 1928)
@@ -1,14 +1,15 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 11ts
+Release: 12jh
 License: BSD
-Group: tinysofa official
-Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ftp-%{version}.tar.gz
-Patch0: netkit-ftp-0.15-man.patch
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: libtermcap-devel perl
-Requires: libtermcap
+Group: tinysofa/main
+Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
+Patch1: netkit-ftp-0.17-pre20000412.pasv-security.patch
+Patch2: netkit-ftp-0.17-acct.patch
+Patch3: netkit-ftp.usagi-ipv6.patch
+BuildRoot: /var/tmp/%{name}-%{version}-root
+BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl
 
 %description
 The ftp package provides the standard UNIX command-line FTP (File
@@ -18,57 +19,121 @@
 If your system is on a network, you should install ftp in order to do
 file transfers.
 
+
 %prep
 %setup -q -n netkit-ftp-%{version}
-%patch0 -p1 -b .share
+%patch1 -p1
+%patch2 -p1 -b .acct
+%patch3 -p1 -b .ipv6
 
+
 %build
-sh configure
-perl -pi -e 's,-O2,\$(RPM_OPT_FLAGS),' MCONFIG
+sh configure --with-c-compiler=gcc --enable-ipv6
+perl -pi -e '
+    s,^CC=.*$,CC=cc,;
+    s,-O2,\$(RPM_OPT_FLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64,;
+    s,^BINDIR=.*$,BINDIR=%{_bindir},;
+    s,^MANDIR=.*$,MANDIR=%{_mandir},;
+    s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
+    ' MCONFIG
 
-make
+%make
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/man/man1}
+%{__mkdir_p} \
+	%{buildroot}%{_bindir} \
+	%{buildroot}%{_mandir}/man1 \
+	%{buildroot}%{_mandir}/man5
 
-make INSTALLROOT=$RPM_BUILD_ROOT install
+make INSTALLROOT=%{buildroot} install
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
-/usr/bin/ftp
-/usr/bin/pftp
-/usr/share/man/man1/ftp.1*
-/usr/share/man/man1/pftp.1*
+%{_bindir}/ftp
+%{_bindir}/pftp
+%{_mandir}/man1/ftp.*
+%{_mandir}/man1/pftp.*
+%{_mandir}/man5/netrc.*
 
-%exclude %{_mandir}/man5
 
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.17-11ts
-- current (0.17-10ts) integrated as 0.17-11ts for release 1.0-U1
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Tue May 11 2004 Omar Kilani <omar at tinysofa dot org>
-- Add BuildRequires: libtermcap-devel perl
-- Add Requires: libtermcap
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Nov 26 2003 Erlend Midttun <erlendbm at trustix dot com> 0.17-7tr
-- Big rebuild
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 0.17-6tr
-- Big rebuild
+* Fri Dec 13 2002 Elliot Lee <sopwith at redhat.com>
+- Rebuild
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 0.17-5em
-- Rebuilt against glibc 2.3.2.
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
 
-* Wed Jul 24 2002 Daniel Meyer <eagle at trustix dot org> 0.17-4dm
-- rebuild for Trustix Secure Linux 2.0
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
 
-* Fri Sep 15 2000 Per Ivar Paulsen <perp at trustix dot com>
-- Picked up 0.17
+* Fri Apr 12 2002 Bernhard Rosenkraenzer <bero at redhat.com> 0.17-13
+- Recompile with support for files > 2 GB
 
+* Mon Jun 25 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.17-12
+- Add some Build dependencies (#45007)
+
+* Fri May 18 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.17-11
+- Actually apply Patch #3
+
+* Fri May 11 2001 Bernhard Rosenkraenzer <bero at redhat.com> 0.17-10
+- Rebuild with new readline
+
+* Sun Apr 15 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Add IPv6 patch (RFE #35642)
+
+* Wed Apr  4 2001 Jakub Jelinek <jakub at redhat.com>
+- don't let configure to guess compiler, it can pick up egcs
+
+* Sun Jan 21 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update to 0.17 final
+- Fix up ACCT support in netrc (Bug #17353)
+
+* Wed Aug 16 2000 Philipp Knirsch <pknirsch at redhat.com>
+- Switched the default transfer protocol from PORT to PASV as proposed on
+  bugzilla (#16134)
+- Fixed a small compiler warning in ftp.c line 886
+
+* Fri Jul 14 2000 Jeff Johnson <jbj at redhat.com>
+- add netrc man page (#7443).
+- fix possible buffer overflows in ftp client.
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Sun Jun 18 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging.
+- update to 0.17-pre20000412.
+
+* Wed Apr  5 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- rebuild with current libreadline
+
+* Fri Mar 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 0.17
+
+* Fri Feb  4 2000 Bill Nottingham <notting at redhat.com>
+- handle compressed man pages
+
+* Tue Jan  4 2000 Bill Nottingham <notting at redhat.com>
+- the ftp client does not require inetd
+
+* Wed Dec 22 1999 Jeff Johnson <jbj at redhat.com>
+- update to 0.16.
+
 * Mon Aug 30 1999 Jeff Johnson <jbj at redhat.com>
 - update to 0.15.
 - enable readline support (#3796).
@@ -83,4 +148,4 @@
 - build root
 
 * Mon Apr 27 1998 Prospector System <bugs at redhat.com>
-- translations modified for de, fr, tr
\ No newline at end of file
+- translations modified for de, fr, tr


From svn at tinysofa.org  Wed Jun  9 19:08:23 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Jun 2004 05:08:23 +1000 (EST)
Subject: [tinysofa-svn] 
	r1929 - in tinysofa/snapshot/rsync/current: sources specs
Message-ID: <20040609190823.4CC254E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-10 05:08:23 +1000 (Thu, 10 Jun 2004)
New Revision: 1929

Added:
   tinysofa/snapshot/rsync/current/sources/rsync-2.6.2-lastdir-corruption.patch
Modified:
   tinysofa/snapshot/rsync/current/sources/rsyncd.conf
   tinysofa/snapshot/rsync/current/specs/rsync.spec
Log:
- new spec file from Fedora
- keep package split
- add rsync-2.6.2-lastdir-corruption.patch


Added: tinysofa/snapshot/rsync/current/sources/rsync-2.6.2-lastdir-corruption.patch
===================================================================
--- tinysofa/snapshot/rsync/current/sources/rsync-2.6.2-lastdir-corruption.patch	2004-06-09 18:45:46 UTC (rev 1928)
+++ tinysofa/snapshot/rsync/current/sources/rsync-2.6.2-lastdir-corruption.patch	2004-06-09 19:08:23 UTC (rev 1929)
@@ -0,0 +1,19 @@
+--- rsync-2.6.2/flist.c.lastdir-corruption	2004-05-25 07:30:03.211152824 +0100
++++ rsync-2.6.2/flist.c	2004-05-25 07:31:29.930604449 +0100
+@@ -539,6 +539,7 @@
+ 		rdev_major = 0;
+ 		uid = 0, gid = 0;
+ 		*lastname = '\0';
++		lastdir_len = -1;
+ 		return;
+ 	}
+ 
+@@ -745,7 +746,7 @@
+ 	char *basename, *dirname, *bp;
+ 	unsigned short flags = 0;
+ 
+-	if (!flist)	/* lastdir isn't valid if flist is NULL */
++	if (!flist || !flist->count)	/* lastdir isn't valid if flist is NULL */
+ 		lastdir_len = -1;
+ 
+ 	if (strlcpy(thisname, fname, sizeof thisname)

Modified: tinysofa/snapshot/rsync/current/sources/rsyncd.conf
===================================================================
--- tinysofa/snapshot/rsync/current/sources/rsyncd.conf	2004-06-09 18:45:46 UTC (rev 1928)
+++ tinysofa/snapshot/rsync/current/sources/rsyncd.conf	2004-06-09 19:08:23 UTC (rev 1929)
@@ -1,5 +1,5 @@
 transfer logging = yes
-log file = /var/log/rsync/rsync
+log file = /var/log/rsync
 pid file = /var/run/rsyncd.pid 
 timeout = 600
 

Modified: tinysofa/snapshot/rsync/current/specs/rsync.spec
===================================================================
--- tinysofa/snapshot/rsync/current/specs/rsync.spec	2004-06-09 18:45:46 UTC (rev 1928)
+++ tinysofa/snapshot/rsync/current/specs/rsync.spec	2004-06-09 19:08:23 UTC (rev 1929)
@@ -1,120 +1,266 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.2
-Release: 2ts
-License: GPL
-Group: tinysofa official
-Source:	ftp://ftp.samba.org/pub/rsync/rsync-%{version}.tar.gz
+Release: 3jh
+Group: tinysofa/main
+# TAG: for pre versions use
+#Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre-2.tar.gz
+Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
 Source1: rsyncd.xinetd
 Source2: rsyncd.logrotate
 Source3: rsyncd.conf
+
 Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+License: GPL
 
+Patch1: rsync-2.6.2-lastdir-corruption.patch
+
 %description
-Rsync uses a quick and reliable algorithm to very quickly bring
-remote and host files into sync.  Rsync is fast because it just
-sends the differences in the files over the network (instead of
-sending the complete files). Rsync is often used as a very powerful
-mirroring process or just as a more capable replacement for the
-rcp command.  A technical report which describes the rsync algorithm
-is included in this package.
+Rsync uses a reliable algorithm to bring remote and host files into
+sync very quickly. Rsync is fast because it just sends the differences
+in the files over the network instead of sending the complete
+files. Rsync is often used as a very powerful mirroring process or
+just as a more capable replacement for the rcp command. A technical
+report which describes the rsync algorithm is included in this
+package.
 
-Install rsync if you need a powerful mirroring program.
-
 %package server
 Summary: The server part of rsync
-Group: tinysofa official
+Group: tinysofa/main
 Requires: rsync xinetd
 
 %description server
 This is the server part of the rsync package.
-
+                                                                                
 Install this package if you want to provide a rsync server.
 
+
 %prep
+# TAG: for pre versions use
+# % setup -q -n %{version}pre-2
 %setup -q
 
+%patch1 -p1 -b .lastdir-corruption
+
+
 %build
-
 %configure
 
-make CCOPTFLAGS="$RPM_OPT_FLAGS"
+%make
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/bin
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/man/man1
+%makeinstall
 
-# The server files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{xinetd.d,logrotate.d}
-mkdir -p $RPM_BUILD_ROOT/var/log/rsync
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/rsync
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rsync
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rsyncd.conf
-touch $RPM_BUILD_ROOT/var/log/rsync/rsync
+%{__mkdir_p} \
+	%{buildroot}%{_sysconfdir}/xinetd.d \
+	%{buildroot}%{_localstatedir}/log \
+	%{buildroot}%{_sysconfdir}/logrotate.d
+	
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xinetd.d/rsync
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/rsync
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rsyncd.conf
+touch %{buildroot}%{_localstatedir}/log/rsync
 
-strip rsync
-%makeinstall
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %doc COPYING README tech_report.tex
-%{_prefix}/bin/rsync
-%{_prefix}/share/man/man1/rsync.1*
-%{_prefix}/share/man/man5/rsyncd.conf.5*
+%{_bindir}/rsync
+%{_mandir}/man1/rsync.1*
 
 %files server
 %defattr(-,root,root)
-%config(noreplace) /etc/xinetd.d/rsync
-%config(noreplace) /etc/logrotate.d/rsync
-%config(noreplace) /etc/rsyncd.conf
-%dir %attr(750,root,root) /var/log/rsync
-%attr(640,root,root) /var/log/rsync/*
+%config(noreplace) %{_sysconfdir}/xinetd.d/rsync
+%config(noreplace) %{_sysconfdir}/logrotate.d/rsync
+%config(noreplace) %{_sysconfdir}/rsyncd.conf
+%dir %attr(750,root,root) %{_localstatedir}/log/rsync
+%{_mandir}/man5/rsyncd.conf.5*
 
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.6.2-2ts
-- current (2.6.2-1ts) integrated as 2.6.2-2ts for release 1.0-U1
+* Tue May 25 2004 Mark McLoughlin <markmc at redhat.com> - 2.6.2-1
+- Backport fix for crasher when passing multiple directories of the same
+  length (bug #123708)
 
-* Sun May  2 2004 Omar Kilani <omar at tinysofa dot org> 2.6.2-1ts
-- New upstream: 2.6.2
+* Fri Apr 30 2004 Jay Fenlason <fenlason at redhat.com> 2.6.2-0
+- New upstream version to correct the problems with 2.6.1.
+  This obsoletes all the patches to 2.6.1
 
-* Tue Apr 27 2004 Omar Kilani <omar at tinysofa dot org> 2.6.1-1ts
-- New upstream: 2.6.1
+* Thu Apr 29 2004 Jay Fenlason <fenlason at redhat.com> 2.6.1-1
+- Rsync 2.6.1 final.
+- Add a patch from Wayne Davison <wayned at samba.org> that fixes a
+  use of uninitilized memory in the map_uid and map_gid functions.
+- Add another patch from Wayne Davidson that fixes the -R option.
+- Add a patch (extracted from a patch by Sami Farin
+  <safari-rsync at safari.iki.fi>) to not ignore the return value
+  of close().
 
-* Tue Feb 10 2004 Chr. Toldnes <christht at trustix dot org> 2.6.0-1tr
+* Thu Mar 25 2004 Jay Fenlason <fenlason at redhat.com> 2.6.1-0.pre1
 - New upstream version
 
-* Thu Dec  4 2003 Erlend Midttun <erlendbm at trustix dot org> 2.5.7-1tr
-- New upstream with security fix.
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Thu Oct  2 2003 Chr. Toldnes <christht at tawie dot org> 2.5.6-1tsl
-- New upstream version fixes memory problems.
+* Mon Jan  5 2004 Jay Fenlason <fenlason at redhat.com> 2.6.0-0
+- New upstream version, obsoletes the rsync-2.5.6-signal.patch
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 2.5.5-4tr
-- Big rebuild
+* Wed Dec  3 2003 Bill Nottingham <notting at redhat.com> 2.5.7-2
+- rebuild
 
-* Tue Jun 10 2003 Erlend Midttun <erlendbm at trustix dot com> 2.5.5-3em
-- Added -server package.
+* Wed Dec  3 2003 Bill Nottingham <notting at redhat.com> 2.5.7-1
+- update to 2.5.7
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 2.5.5-2em
-- Rebuilt against glibc 2.3.2.
+* Tue Aug 05 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-20
+- rebuild in new build env
 
-* Fri Sep 13 2002 Erlend Midttun <erlendbm at trustix dot com> 2.5.5-1tr
-- Picked up 2.5.5.  Fixes a few issues.
+* Tue Aug 05 2003 Lon Hohberger <lhh at redhat.com> 2.5.6-19
+- spec file fix
 
-* Fri Mar 15 2002 Christian H. Toldnes <christht at trustix dot com>
-- New upstream version: 2.5.4 to fix zlibs double free() problem.
+* Tue Aug 05 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-18
+- rebuild in new build env
 
-* Mon Jan 28 2002 Christian H. Toldnes <christht at trustix dot com>
-- Patched against several bugs, one known to be security related.
+* Tue Aug 05 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-17
+- fixed spec - added patch0 to prep.
 
-* Wed Sep 13 2000 Per Ivar Paulsen <perp at trustix dot com>
-- Picked up 2.4.6
+* Tue Aug 05 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-16
+- rebuild in new build env
 
+* Mon Aug 04 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-15
+- add rsync-2.5.6-signal.patch to fix kernel warnings that
+  appear because socket.c sets SIGCHLD to SIG_IGN and then
+  calls wait.  This is in response to bug#98740.  This patch
+  *has* been committed to CVS upstream and will be in
+  upstream rsync-2.5.7.
+
+* Fri Jun 13 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-14
+- build scratch - for compile warnings
+
+* Fri Jun 13 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-13
+- build scratch - for compile warnings
+
+* Thu Jun 12 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-12
+- rebuild in new build env
+
+* Thu Jun 12 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-11
+- removed rsync-2.5.6-sign.patch.  Upstream code
+  incorporates signed vs unsigned changes.
+
+* Wed Jun 11 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-10_CVSHEAD_signpatch
+- build scratch - added rsync-2.5.6-sign.patch.
+
+* Wed Jun 11 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-9_CVSHEAD_nopatches
+- build scratch.
+
+* Wed Jun 11 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-8
+- build scratch - deleted rsync-2.5.6-sign.patch.
+
+* Mon Jun 09 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-7
+- rebuild in new build env
+
+* Thu Jun 05 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-6
+- removed patch rsync-2.5.4-maxdel.patch
+- removed patch rsync-2.4.6-segv.patch
+   - current 2.5.6 properly handles (no segfault) the situation
+     (rsync '[a]') that caused a need for this patch.
+- added patch rsync-2.5.6-sign.patch, which is a working
+  subset of patches (that still apply) included in the original
+  rsync-2.5.4-moresignage.patch
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Mon Mar 11 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-4
+- rebuild in new build env
+
+* Mon Mar 11 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-3
+- fixed changelog comments
+
+* Mon Mar 10 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-2
+- rebuild in new build env
+
+* Mon Mar 10 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.6-1
+- update to 2.5.6 from upstream
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Fri Jan 17 2003 Hardy Merrill <hmerrill at redhat.com> 2.5.5-3
+- fix spelling mistake in rsync.xinetd.  #66036 & dup #75006
+
+* Wed Dec 11 2002 Tim Powers <timp at redhat.com> 2.5.5-2
+- rebuild on all arches
+
+* Mon Jun 24 2002 Bill Nottingham <notting at redhat.com> 2.5.5-1
+- update to 2.5.5
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Apr 10 2002 Bill Nottingham <notting at redhat.com> 2.5.4-2
+- upstream patches: fix accidental use of --whole-file, fix
+  minor memory leak, and bad worst-case child kill behavior
+- make passing -e to rsync:// URLs not cause an error exit (#62489)
+
+* Wed Mar 13 2002 Bill Nottingham <notting at redhat.com> 2.5.4-1
+- update to 2.5.4, do assorted patchmerging
+
+* Wed Feb 20 2002 Bill Nottingham <notting at redhat.com>
+- fix --address (#60127)
+- call setgroups before dropping privs (<mkp at samba.org>)
+
+* Mon Jan 28 2002 Bill Nottingham <notting at redhat.com>
+- fix some errors in the unsigned patch
+
+* Sun Jan 27 2002 Bill Nottingham <notting at redhat.com>
+- rebuild to get proper LFS_CFLAGS
+
+* Wed Jan 23 2002 Bill Nottingham <notting at redhat.com>
+- fix some signed/unsigned issues (<krahmer at suse.de>)
+- tweak ipv6 patch (#55337, <john.l.villalovos at intel.com>)
+- make xinetd file %config(noreplace)
+
+* Fri Aug 17 2001 Bill Nottingham <notting at redhat.com>
+- fix segfault on weird arguments (#51801)
+
+* Tue Jul 24 2001 Bill Nottingham <notting at redhat.com>
+- IPv6 patch (<pekkas at netcore.fi>) (#47780)
+
+* Tue Jun 19 2001 Bill Nottingham <notting at redhat.com>
+- add patch to fix hangs at end of sync, and other odd behaviors (#42111)
+
+* Sat Sep 30 2000 Florian La Roche <Florian.LaRoche at redhat.de>
+- add xinetd configuration
+
+* Tue Sep 26 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 2.4.6
+
+* Mon Jul 31 2000 Bill Nottingham <notting at redhat.com>
+- update to 2.4.4 - fixes yet another problem with rsh transport
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Sat Jun 10 2000 Bill Nottingham <notting at redhat.com>
+- rebuild in new build env.
+
+* Mon Apr 10 2000 Bill Nottingham <notting at redhat.com>
+- update to 2.4.3
+
+* Tue Apr  4 2000 Bill Nottingham <notting at redhat.com>
+- update to 2.4.2
+
+* Tue Mar  7 2000 Bill Nottingham <notting at redhat.com>
+- fix maxdelete behavior so it isn't sent to older servers.
+
 * Mon Jan 31 2000 Jeff Johnson <jbj at redhat.com>
 - update to 2.4.1.
 
@@ -155,8 +301,8 @@
   showing no packager nor signature but giving 
   "Source RPM: rsync-1.6.3-1.src.rpm".
 - Changes from 1.6.2-1 packaging: added '$RPM_OPT_FLAGS' to make, strip
-  to '%build', removed '%prefix'.
+  to 'build', removed 'prefix'.
 
 * Thu Apr 10 1997 Michael De La Rue <miked at ed.ac.uk>
 - rsync-1.6.2-1 packaged.  (This entry by jam to credit Michael for the
-  previous package(s).)
\ No newline at end of file
+  previous package(s).)


From svn at tinysofa.org  Wed Jun  9 19:50:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Jun 2004 05:50:16 +1000 (EST)
Subject: [tinysofa-svn] r1930 - tinysofa/snapshot/python/current/specs
Message-ID: <20040609195016.157494E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-10 05:50:15 +1000 (Thu, 10 Jun 2004)
New Revision: 1930

Modified:
   tinysofa/snapshot/python/current/specs/python.spec
Log:
- minor spec file cleanup


Modified: tinysofa/snapshot/python/current/specs/python.spec
===================================================================
--- tinysofa/snapshot/python/current/specs/python.spec	2004-06-09 19:08:23 UTC (rev 1929)
+++ tinysofa/snapshot/python/current/specs/python.spec	2004-06-09 19:50:15 UTC (rev 1930)
@@ -39,7 +39,7 @@
 BuildPrereq: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
 BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
 BuildPrereq: glibc-devel gcc-c++-devel
-BuildPrereq: bzip2 gzip tar findutils pkgconfig
+BuildPrereq: gzip tar findutils pkgconfig
 URL: http://www.python.org/
 
 
@@ -119,7 +119,7 @@
 
 
 %prep
-%setup -q -n Python-%{version} -a 5
+%setup -q -n Python-%{version} -a 2 -a 5
 
 %patch0 -p1 -b .rhconfig
 %patch3 -p1 -b .no_gui
@@ -147,8 +147,6 @@
 shm shmmodule.c
 EOF
 
-# Unpack html documentation
-bzip2 -dc %{SOURCE2} | tar xf -
 mv Python-Docs-%{version} html/
 
 


From svn at tinysofa.org  Thu Jun 10 09:06:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 10 Jun 2004 19:06:46 +1000 (EST)
Subject: [tinysofa-svn] r1931 - in tinysofa/snapshot: . tftp tftp/current
	tftp/current/sources tftp/current/specs
Message-ID: <20040610090646.E695D4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-10 19:06:45 +1000 (Thu, 10 Jun 2004)
New Revision: 1931

Added:
   tinysofa/snapshot/tftp/
   tinysofa/snapshot/tftp/current/
   tinysofa/snapshot/tftp/current/sources/
   tinysofa/snapshot/tftp/current/sources/tftp-0.28-malta.patch
   tinysofa/snapshot/tftp/current/sources/tftp-hpa-0.36.tar.gz
   tinysofa/snapshot/tftp/current/sources/tftp-xinetd
   tinysofa/snapshot/tftp/current/specs/
   tinysofa/snapshot/tftp/current/specs/tftp.spec
   tinysofa/snapshot/tftp/releases/
Log:
- Add tftp package


Added: tinysofa/snapshot/tftp/current/sources/tftp-0.28-malta.patch
===================================================================
--- tinysofa/snapshot/tftp/current/sources/tftp-0.28-malta.patch	2004-06-09 19:50:15 UTC (rev 1930)
+++ tinysofa/snapshot/tftp/current/sources/tftp-0.28-malta.patch	2004-06-10 09:06:45 UTC (rev 1931)
@@ -0,0 +1,23 @@
+--- tftp-hpa-0.28/tftpd/tftpd.c.malta	Tue Nov 20 11:45:12 2001
++++ tftp-hpa-0.28/tftpd/tftpd.c	Wed Jun 19 09:36:59 2002
+@@ -1043,6 +1043,7 @@ tftp_sendfile(struct formats *pf, struct
+     timeout = 0;
+     (void) sigsetjmp(timeoutbuf,1);
+     
++send_data:
+     if (send(peer, dp, size + 4, 0) != size + 4) {
+       syslog(LOG_ERR, "tftpd: write: %m");
+       goto abort;
+@@ -1074,6 +1075,12 @@ tftp_sendfile(struct formats *pf, struct
+ 	 * packet in response to an invalid ACK.  Doing so
+ 	 * would cause the Sorcerer's Apprentice bug.
+ 	 */
++
++	/* WE HAVE TO DO THIS. OTHERWISE, IT WON'T WORK WITH THE TFTP
++	   CLIENT ON THE MIPS MALTA BOARD.  H.J.  */
++	if (ap->th_block == (block -1)) {
++		goto send_data;
++	}
+       }
+       
+     }

Added: tinysofa/snapshot/tftp/current/sources/tftp-hpa-0.36.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/tftp/current/sources/tftp-hpa-0.36.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/snapshot/tftp/current/sources/tftp-xinetd
===================================================================
--- tinysofa/snapshot/tftp/current/sources/tftp-xinetd	2004-06-09 19:50:15 UTC (rev 1930)
+++ tinysofa/snapshot/tftp/current/sources/tftp-xinetd	2004-06-10 09:06:45 UTC (rev 1931)
@@ -0,0 +1,18 @@
+# default: off
+# description: The tftp server serves files using the trivial file transfer \
+#	protocol.  The tftp protocol is often used to boot diskless \
+#	workstations, download configuration files to network-aware printers, \
+#	and to start the installation process for some operating systems.
+service tftp
+{
+	socket_type		= dgram
+	protocol		= udp
+	wait			= yes
+	user			= root
+	server			= /usr/sbin/in.tftpd
+	server_args		= -s /tftpboot -u tftpd
+	disable			= yes
+	per_source		= 11
+	cps			= 100 2
+	flags			= IPv4
+}

Added: tinysofa/snapshot/tftp/current/specs/tftp.spec
===================================================================
--- tinysofa/snapshot/tftp/current/specs/tftp.spec	2004-06-09 19:50:15 UTC (rev 1930)
+++ tinysofa/snapshot/tftp/current/specs/tftp.spec	2004-06-10 09:06:45 UTC (rev 1931)
@@ -0,0 +1,246 @@
+%define tftp_hpa_version 0.36
+
+Summary: The client for the Trivial File Transfer Protocol (TFTP).
+Name: tftp
+Version: %{tftp_hpa_version}
+Release: 1jh
+Copyright: BSD
+Group: tinysofa/extra
+Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz
+Source2: tftp-xinetd
+Patch: tftp-0.28-malta.patch
+BuildPreReq: tcp_wrappers
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+The Trivial File Transfer Protocol (TFTP) is normally used only for
+booting diskless workstations.  The tftp package provides the user
+interface for TFTP, which allows users to transfer files to and from a
+remote machine.  This program and TFTP provide very little security,
+and should not be enabled unless it is expressly needed.
+
+%package server
+Group: tinysofa/extra
+Summary: The server for the Trivial File Transfer Protocol (TFTP).
+PreReq: /sbin/service
+Requires: xinetd
+Obsoletes: iputils-tftpd
+
+%description server
+The Trivial File Transfer Protocol (TFTP) is normally used only for
+booting diskless workstations.  The tftp-server package provides the
+server for TFTP, which allows users to transfer files to and from a
+remote machine. TFTP provides very little security, and should not be
+enabled unless it is expressly needed.  The TFTP server is run from
+/etc/xinetd.d/tftp, and is disabled by default on Red Hat Linux systems.
+
+
+%prep
+%setup -q -n tftp-hpa-%{version} 
+%patch -p1 -b .malta
+
+%build
+%configure
+%make
+
+
+%install
+%{__mkdir_p} \
+	%{buildroot}%{_bindir} \
+	%{buildroot}%{_mandir}/man{1,8} \
+	%{buildroot}%{_sbindir}
+
+make install \
+	INSTALLROOT=%{buildroot} \
+	SBINDIR=%{_sbindir} \
+	MANDIR=%{_mandir}
+
+install -m 755 -d %{buildroot}%{_sysconfdir}/xinetd.d/ \
+	%{buildroot}/tftpboot
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/tftp
+
+
+%pre server
+%groupadd tftpd 112
+%useradd tftpd 112 tftpd -d /tftpboot -s /bin/false
+
+%post server
+/sbin/service xinetd reload > /dev/null 2>&1 || :
+
+%postun server
+if [ $1 = 0 ]; then
+	/sbin/service xinetd reload > /dev/null 2>&1 || :
+fi
+
+
+%clean
+%clean_buildroot
+
+
+%files
+%defattr(-,root,root)
+%{_bindir}/tftp
+%{_mandir}/man1/*
+
+%files server
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/xinetd.d/tftp
+%dir /tftpboot
+%{_sbindir}/in.tftpd
+%{_mandir}/man8/*
+
+
+%changelog
+* Thu Jun 03 2004 Elliot Lee <sopwith at redhat.com> 0.36-1
+- Update version
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Fri Apr 11 2003 Elliot Lee <sopwith at redhat.com>
+- 0.33
+- Add /tftpboot directory (#88204)
+
+* Mon Feb 24 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Sun Feb 23 2003 Tim Powers <timp at redhat.com>
+- add BuildPreReq on tcp_wrappers
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Mon Nov 11 2002 Elliot Lee <sopwith at redhat.com> 0.32-1
+- Update to 0.32
+
+* Wed Oct 23 2002 Elliot Lee <sopwith at redhat.com> 0.30-1
+- Fix #55789
+- Update to 0.30
+
+* Thu Jun 27 2002 Elliot Lee <sopwith at redhat.com>
+- Try applying HJ's patch from #65476
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon Jun 17 2002 Elliot Lee <sopwith at redhat.com>
+- Update to 0.29
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Tue Dec 18 2001 Elliot Lee <sopwith at redhat.com> 0.17-15
+- Add patch4: netkit-tftp-0.17-defaultport.patch for bug #57562
+- Update to tftp-hpa-0.28 (bug #56131)
+- Remove include/arpa/tftp.h to fix #57259
+- Add resource limits in tftp-xinetd (#56722)
+
+* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
+- Bump release + rebuild.
+
+* Tue Jun 12 2001 Helge Deller <hdeller at redhat.de> (0.17-13)
+- updated tftp-hpa source to tftp-hpa-0.17
+- tweaked specfile with different defines for tftp-netkit and tftp-hpa version
+- use hpa's tftpd.8 man page instead of the netkits one
+
+* Mon May 07 2001 Helge Deller <hdeller at redhat.de>
+- rebuilt in 7.1.x
+
+* Wed Apr 18 2001 Helge Deller <hdeller at redhat.de>
+- fix tftp client's put problems (#29529)
+- update to tftp-hpa-0.16
+
+* Wed Apr  4 2001 Jakub Jelinek <jakub at redhat.com>
+- don't let configure to guess compiler, it can pick up egcs
+
+* Thu Feb 08 2001 Helge Deller <hdeller at redhat.de>
+- changed "wait" in xinetd file to "yes" (hpa-tftpd forks and exits) (#26467)
+- fixed hpa-tftpd to handle files greater than 32MB (#23725)
+- added "-l" flag to hpa-tftpd for file-logging (#26467)
+- added description for "-l" to the man-page 
+
+* Thu Feb 08 2001 Helge Deller <hdeller at redhat.de>
+- updated tftp client to 0.17 stable (#19640),
+- drop dependency on xinetd for tftp client (#25051),
+
+* Wed Jan 17 2001 Jeff Johnson <jbj at redhat.com>
+- xinetd shouldn't wait on tftp (which forks) (#23923).
+
+* Sat Jan  6 2001 Jeff Johnson <jbj at redhat.com>
+- fix to permit tftp put's (#18128).
+- startup as root with chroot to /tftpboot with early reversion to nobody
+  is preferable to starting as nobody w/o ability to chroot.
+- %%post is needed by server, not client. Add %%postun for erasure as well.
+
+* Wed Aug 23 2000 Nalin Dahyabhai <nalin at redhat.com>
+- default to being disabled
+
+* Thu Aug 17 2000 Jeff Johnson <jbj at redhat.com>
+- correct group.
+
+* Tue Jul 25 2000 Nalin Dahyabhai <nalin at redhat.com>
+- change user from root to nobody
+
+* Sat Jul 22 2000 Jeff Johnson <jbj at redhat.com>
+- update to tftp-hpa-0.14 (#14003).
+- add server_args (#14003).
+- remove -D_BSD_SOURCE (#14003).
+
+* Fri Jul 21 2000 Nalin Dahyabhai <nalin at redhat.com>
+- cook up an xinetd config file for tftpd
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Sun Jun 18 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging.
+- update to 0.17.
+
+* Fri May  5 2000 Matt Wilson <msw at redhat.com>
+- use _BSD_SOURCE for hpa's tftpd so we get BSD signal semantics.
+
+* Fri Feb 11 2000 Bill Nottingham <notting at redhat.com>
+- fix description
+
+* Wed Feb  9 2000 Jeff Johnson <jbj at redhat.com>
+- compress man pages (again).
+
+* Wed Feb 02 2000 Cristian Gafton <gafton at redhat.com>
+- man pages are compressed
+- fix description and summary
+
+* Tue Jan  4 2000 Bill Nottingham <notting at redhat.com>
+- split client and server
+
+* Tue Dec 21 1999 Jeff Johnson <jbj at redhat.com>
+- update to 0.16.
+
+* Sat Aug 28 1999 Jeff Johnson <jbj at redhat.com>
+- update to 0.15.
+
+* Wed Apr  7 1999 Jeff Johnson <jbj at redhat.com>
+- tftpd should truncate file when overwriting (#412)
+
+* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
+- auto rebuild in the new build environment (release 22)
+
+* Mon Mar 15 1999 Jeff Johnson <jbj at redhat.com>
+- compile for 6.0.
+
+* Fri Aug  7 1998 Jeff Johnson <jbj at redhat.com>
+- build root
+
+* Mon Apr 27 1998 Prospector System <bugs at redhat.com>
+- translations modified for de, fr, tr
+
+* Mon Sep 22 1997 Erik Troan <ewt at redhat.com>
+- added check for getpwnam() failure
+
+* Tue Jul 15 1997 Erik Troan <ewt at redhat.com>
+- initial build


From svn at tinysofa.org  Thu Jun 10 21:00:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 11 Jun 2004 07:00:17 +1000 (EST)
Subject: [tinysofa-svn] r1934 - tinysofa/snapshot/tftp/current/specs
Message-ID: <20040610210017.D2B6B4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-11 07:00:17 +1000 (Fri, 11 Jun 2004)
New Revision: 1934

Modified:
   tinysofa/snapshot/tftp/current/specs/tftp.spec
Log:
- remove %description reference to Red Hat


Modified: tinysofa/snapshot/tftp/current/specs/tftp.spec
===================================================================
--- tinysofa/snapshot/tftp/current/specs/tftp.spec	2004-06-10 18:37:25 UTC (rev 1933)
+++ tinysofa/snapshot/tftp/current/specs/tftp.spec	2004-06-10 21:00:17 UTC (rev 1934)
@@ -32,7 +32,7 @@
 server for TFTP, which allows users to transfer files to and from a
 remote machine. TFTP provides very little security, and should not be
 enabled unless it is expressly needed.  The TFTP server is run from
-/etc/xinetd.d/tftp, and is disabled by default on Red Hat Linux systems.
+/etc/xinetd.d/tftp, and is disabled by default.
 
 
 %prep


From svn at tinysofa.org  Fri Jun 11 14:22:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Jun 2004 00:22:34 +1000 (EST)
Subject: [tinysofa-svn] r1935 - tinysofa/snapshot/bind/current/specs
Message-ID: <20040611142234.ECC294E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-12 00:22:33 +1000 (Sat, 12 Jun 2004)
New Revision: 1935

Modified:
   tinysofa/snapshot/bind/current/specs/bind.spec
Log:
- fix hardcoded library paths in -light-devel


Modified: tinysofa/snapshot/bind/current/specs/bind.spec
===================================================================
--- tinysofa/snapshot/bind/current/specs/bind.spec	2004-06-10 21:00:17 UTC (rev 1934)
+++ tinysofa/snapshot/bind/current/specs/bind.spec	2004-06-11 14:22:33 UTC (rev 1935)
@@ -476,9 +476,9 @@
 
 %files light-devel
 %defattr(-,root,root)
-%attr(644,root,root) /usr/lib/liblwres.a
-%attr(755,root,root) /usr/lib/liblwres.la
-%attr(755,root,root) /usr/lib/liblwres.so
+%attr(644,root,root) %{_libdir}/liblwres.a
+%attr(755,root,root) %{_libdir}/liblwres.la
+%attr(755,root,root) %{_libdir}/liblwres.so
 %{_includedir}/lwres
 %{_mandir}/man3/*
 


From svn at tinysofa.org  Sat Jun 12 08:48:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sat, 12 Jun 2004 18:48:13 +1000 (EST)
Subject: [tinysofa-svn] r1937 - tinysofa/snapshot/bc/current/specs
Message-ID: <20040612084813.3F34A4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-12 18:48:13 +1000 (Sat, 12 Jun 2004)
New Revision: 1937

Modified:
   tinysofa/snapshot/bc/current/specs/bc.spec
Log:
- install info pages
- use tinysofa macros and groups


Modified: tinysofa/snapshot/bc/current/specs/bc.spec
===================================================================
--- tinysofa/snapshot/bc/current/specs/bc.spec	2004-06-12 08:36:00 UTC (rev 1936)
+++ tinysofa/snapshot/bc/current/specs/bc.spec	2004-06-12 08:48:13 UTC (rev 1937)
@@ -1,16 +1,17 @@
 Summary: GNU's bc (a numeric processing language) and dc (a calculator).
 Name: bc
 Version: 1.06
-Release: 11ts
+Release: 12jh
 License: GPL
-Group: tinysofa official
+Group: tinysofa/main
 Source: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.gz
 Patch: bc-1.06-readline.patch
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: flex
 BuildRequires: readline, readline-devel
 BuildRequires: ncurses, ncurses-devel
 BuildRequires: libtermcap, libtermcap-devel
+%info_requires
 
 
 %description
@@ -28,27 +29,36 @@
 
 
 %build
-# CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --with-readline
 %configure --with-readline
-make %{?_smp_mflags}
+%make
 
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 %makeinstall
 
+%install_info -n dc doc/dc.texi
+%install_info -n bc doc/bc.texi
+%nuke_info
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
 
+%post
+%info_post
+
+%postun
+%info_postun
+
+
 %files
 %defattr(-,root,root)
 %{_bindir}/dc
 %{_bindir}/bc
 %{_mandir}/man1/bc.1*
 %{_mandir}/man1/dc.1*
-%exclude %{_infodir}
+%{_htmldir}
 
 
 %changelog
@@ -127,4 +137,4 @@
 - upgraded from 1.03 to 1.04
 
 * Mon Jun 02 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
\ No newline at end of file
+- built against glibc


From svn at tinysofa.org  Sat Jun 12 14:20:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Jun 2004 00:20:56 +1000 (EST)
Subject: [tinysofa-svn] 
	r1939 - tinysofa/snapshot/reiserfsprogs/current/specs
Message-ID: <20040612142056.B34404E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-13 00:20:56 +1000 (Sun, 13 Jun 2004)
New Revision: 1939

Modified:
   tinysofa/snapshot/reiserfsprogs/current/specs/reiserfsprogs.spec
Log:
- new spec file based on Fedora
- use tinysofa macros and groups
- clean up spec file


Modified: tinysofa/snapshot/reiserfsprogs/current/specs/reiserfsprogs.spec
===================================================================
--- tinysofa/snapshot/reiserfsprogs/current/specs/reiserfsprogs.spec	2004-06-12 14:03:52 UTC (rev 1938)
+++ tinysofa/snapshot/reiserfsprogs/current/specs/reiserfsprogs.spec	2004-06-12 14:20:56 UTC (rev 1939)
@@ -1,87 +1,143 @@
-Summary: ReiserFS utilities and programs
 Name: reiserfsprogs
 Version: 3.6.17
-Release: 1ts
-Source: ftp://ftp.namesys.com/pub/reiserfsprogs/%{name}-%{version}.tar.gz
+Release: 2jh
+Summary: Tools for creating, repairing, and debugging ReiserFS filesystems.
+URL: http://www.namesys.com/
+Source: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
 License: GPL
-Group: tinysofa official
-BuildRoot: %{_tmppath}/%{name}-root
+Group: tinysofa/main
 Prefix: %{_prefix}
-URL: http://www.namesys.com
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+# Not big-endian safe as of 2002-12-11 -ECL
+ExclusiveArch: %{ix86} ia64 alpha x86_64
+BuildRequires: findutils
 
 %description
-The reiserfsprogs package contains programs for creating (mkreiserfs),
-checking and correcting any inconsistencies (reiserfsck) and resizing
-(resize_reiserfs) of a reiserfs filesystem.
+The %{name} package contains a number of utilities for
+creating, checking, modifying, and correcting any inconsistencies in
+ReiserFS filesystems, including reiserfsck (used to repair filesystem
+inconsistencies), mkreiserfs (used to initialize a partition to
+contain an empty ReiserFS filesystem), debugreiserfs (used to examine
+the internal structure of a filesystem, to manually repair a corrupted
+filesystem, or to create test cases for reiserfsck), and some other
+ReiserFS filesystem utilities.
 
+You should install the %{name} package if you want to use
+ReiserFS on any of your partitions.
+
+
 %prep
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 %setup -q
 
+
 %build
-%configure --sbindir=/sbin
-make
+export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
+find . -name "config.cache" |xargs rm -f
+%configure --prefix=/ --sbindir=/
+%make
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT sbindir=/sbin
-cd $RPM_BUILD_ROOT/sbin
-ln -s mkreiserfs mkfs.reiserfs
-ln -s reiserfsck fsck.reiserfs
+%makeinstall_std sbindir=/sbin
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+( cd $RPM_BUILD_ROOT/sbin
+  ln -fs mkreiserfs mkfs.reiserfs
+  ln -fs reiserfsck fsck.reiserfs )
 
+
 %files
 %defattr(-,root,root)
-/sbin/*
-%{_mandir}/man8/*
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+%doc README
+/sbin/debugreiserfs
+/sbin/mkreiserfs
+/sbin/reiserfsck
+/sbin/resize_reiserfs
+/sbin/reiserfstune
+/sbin/mkfs.reiserfs
+/sbin/fsck.reiserfs
+%{_mandir}/*/*
 
+%clean
+%clean_buildroot
+
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 3.6.17-1ts
-- current (3.6.17-1ok) integrated as 3.6.17-1ts for release 1.0-U1
+* Wed Jun 09 2004 Florian La Roche <Florian.LaRoche at redhat.de>
+- 3.6.17
 
-* Fri May 14 2004 Omar Kilani <omar at tinysofa dot org> 3.6.17-1ok
-- New Upstream.
+* Sat Mar 06 2004 Florian La Roche <Florian.LaRoche at redhat.de>
+- Use %%ix86 macro, this got dropped with my previous update
 
-* Thu Mar 25 2004 Omar Kilani <omar at tinysofa dot org> 3.6.14-1ok
-- New upstream.
+* Thu Mar 04 2004 Florian La Roche <Florian.LaRoche at redhat.de>
+- 3.6.13
 
-* Wed Feb 11 2004 Omar Kilani <ok at trustix dot org> 3.6.12-ok
-- New upstream.
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Tue Dec  9 2003 Erlend Midttun <erlendbm at trustix dot org> 3.6.11-1tr
-- New upstream.
+* Thu Aug 28 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to 3.6.11
 
-* Thu Nov 20 2003 Erlend Midttun <erlendbm at trustix dot com> 3.x.1b-8tr
-- Fix group.
+* Sat May 31 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to 3.6.8
 
-* Fri Aug  1 2003 Erlend Midttun <erlendbm at trustix dot com> 3.x.1b-7tr
-- Fixed typo in summary.
+* Wed Apr 30 2003 Elliot Lee <sopwith at redhat.com> 2:3.6.4-6
+- Change ExcludeArch to ExclusiveArch to better handle the future of computing
 
-* Mon Jun 23 2003 Erlend Midttun <erlendbm at trustix dot com> 3.x.1b-6tr
-- Make %%setup quiet.
+* Thu Feb 06 2003 Phil Knirsch <pknirsch at redhat.com> 2:3.6.4-5
+- Bumped release and rebuilt
+- Removed s390 and s390x again until i get around fixing the bitops related
+  stuff (which is borken on big-endian).
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 3.x.1b-5tr
-- Big rebuild
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com> 2:3.6.4-4
+- rebuilt
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 3.x.1b-4em
-- Rebuilt against glibc 2.3.2.
+* Sun Dec 01 2002 Elliot Lee <sopwith at redhat.com> 2:3.6.4-3
+- For real
 
-* Tue Jul 09 2002 Goetz Bock <bock at trustix dot org> 3.x.1b-3bg
-- back to reiserfsprogs, to conform to e2fsprogs
+* Wed Nov 27 2002 Tim Powers <timp at redhat.com> 2:3.6.4-2
+- build on all arches
 
-* Mon Jul 08 2002 Goetz Bock <bock at trustix dot org> 3.x.1b-2bg
-- changed name to reiserfs-utils, for anaconda
-- cleaned up the makefile a little
+* Mon Nov 11 2002 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to 3.6.4
 
-* Mon Jun 10 2002 Goetz Bock <bock at trustix dot org> 3.x.1b-1bg
-- new upstream version: 3.x.1b
-- removed patch to default to v1 format
+* Fri Jul 19 2002 Florian La Roche <Florian.LaRoche at redhat.de>
+- also compile on mainframe
+- update epoch
 
-* Fri Jun  8 2001 Goetz Bock <bock at blacknet.de> 3.x.0j-0tr1bn
-- changed default format to v1
+* Mon Jul 15 2002 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to version 3.6.2, all additional patches are not needed anymore
 
-* Sat Apr 14 2001 Goetz Bock <bock at blacknet.de> 3.x.0j-0tr0bn
-- initial version
\ No newline at end of file
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Tue Jan 15 2002 Tim Powers <timp at ragnarok.devel.redhat.com>
+- rebuilt with tool toolchain
+
+* Tue Jan 15 2002 Tim Powers <timp at redhat.com>
+- rebuilt, for some reason the build date for the binary is not
+  matching the build date for the SRPM.
+
+* Wed Apr 25 2001 Bernhard Rosenkraenzer <bero at redhat.com> 3.x.0j-1
+- Update to 3.x.0j
+
+* Mon Mar  5 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update to 3.x.0f, many important fixes in fsck
+- Add missing README (#30556)
+- Use -v2 by default in mkreiserfs (#30556)
+
+* Tue Feb 07 2001 Than Ngo <than at redhat.com>
+- added Missing symlinks for mkfs and fsck commands (Bug #26359)
+
+* Tue Jan 23 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- initial RPM
+- changes from base package:
+  - Fix a security problem (yet another tmp file issue)
+  - Fix an fd leak
+  - Get rid of the config.cache file, it contains broken settings
+  - Install man pages
+  - Fix locations of binaries, installing this stuff to "bin" is
+    not really a good idea
+  - Fix build on alpha and ia64


From svn at tinysofa.org  Sat Jun 12 14:24:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Jun 2004 00:24:12 +1000 (EST)
Subject: [tinysofa-svn] 
	r1940 - tinysofa/snapshot/reiserfsprogs/current/specs
Message-ID: <20040612142412.8BE324E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-13 00:24:12 +1000 (Sun, 13 Jun 2004)
New Revision: 1940

Modified:
   tinysofa/snapshot/reiserfsprogs/current/specs/reiserfsprogs.spec
Log:
- fix %configure --sbindir


Modified: tinysofa/snapshot/reiserfsprogs/current/specs/reiserfsprogs.spec
===================================================================
--- tinysofa/snapshot/reiserfsprogs/current/specs/reiserfsprogs.spec	2004-06-12 14:20:56 UTC (rev 1939)
+++ tinysofa/snapshot/reiserfsprogs/current/specs/reiserfsprogs.spec	2004-06-12 14:24:12 UTC (rev 1940)
@@ -33,7 +33,7 @@
 %build
 export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 find . -name "config.cache" |xargs rm -f
-%configure --prefix=/ --sbindir=/
+%configure --prefix=/ --sbindir=/sbin
 %make
 
 


From svn at tinysofa.org  Sat Jun 12 15:32:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 13 Jun 2004 01:32:55 +1000 (EST)
Subject: [tinysofa-svn] 
	r1941 - in tinysofa/snapshot/dhcp/current: sources specs
Message-ID: <20040612153255.F109E4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-13 01:32:55 +1000 (Sun, 13 Jun 2004)
New Revision: 1941

Added:
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0-alignment.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0-jbuild.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-inherit-leases.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-pie.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-staticroutes.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-dhcpctlman.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13.tar.gz
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl1-minires.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl1-miscfixes.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-initialize.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-selinux.patch
   tinysofa/snapshot/dhcp/current/sources/dhcpd-manpage.patch
   tinysofa/snapshot/dhcp/current/sources/dhcrelay.init
Removed:
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-buildroot.patch
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2.tar.gz
Modified:
   tinysofa/snapshot/dhcp/current/sources/dhcpd.conf.sample
   tinysofa/snapshot/dhcp/current/sources/dhcpd.init
   tinysofa/snapshot/dhcp/current/specs/dhcp.spec
Log:
- new upstream
- integrate changes from Fedora
- keep ts package split
- provide working dhcrelay support
- use tinysofa macros and groups
- use init scripts derived from Fedora


Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0-alignment.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0-alignment.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0-alignment.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,24 @@
+--- dhcp-3.0pl1/common/packet.c.sopwith	2002-07-12 16:41:48.000000000 -0400
++++ dhcp-3.0pl1/common/packet.c	2002-07-12 17:45:52.000000000 -0400
+@@ -227,8 +227,8 @@
+ 	unsigned char *data;
+ 	unsigned buflen;
+ {
+-  struct ip *ip;
+-  struct udphdr *udp;
++  struct ip ipdat, *ip = &ipdat;
++  struct udphdr udpdat, *udp = &udpdat;
+   u_int32_t ip_len = (buf [bufix] & 0xf) << 2;
+   u_int32_t sum, usum;
+   static int ip_packets_seen;
+@@ -241,8 +241,8 @@
+   unsigned ulen;
+   int ignore = 0;
+ 
+-  ip = (struct ip *)(buf + bufix);
+-  udp = (struct udphdr *)(buf + bufix + ip_len);
++  memcpy(ip, (struct ip *)(buf + bufix), sizeof(ipdat));
++  memcpy(udp, (struct udphdr *)(buf + bufix + ip_len), sizeof(udpdat));
+ 
+ #ifdef USERLAND_FILTER
+   /* Is it a UDP packet? */

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0-jbuild.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0-jbuild.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0-jbuild.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,37 @@
+--- dhcp-3.0/Makefile.sopwith	Thu Dec 20 19:28:07 2001
++++ dhcp-3.0/Makefile	Thu Dec 20 19:28:30 2001
+@@ -43,7 +43,7 @@
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make all); \
++	   (cd work.$$sysname; $(MAKE) all); \
+ 	fi
+ 
+ install:
+@@ -51,7 +51,7 @@
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make install); \
++	   (cd work.$$sysname; $(MAKE) install); \
+ 	fi
+ 
+ depend:
+@@ -59,7 +59,7 @@
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make depend); \
++	   (cd work.$$sysname; $(MAKE) depend); \
+ 	fi
+ 
+ clean:
+@@ -91,6 +91,6 @@
+ 	 if [ ! -d work.$$sysname ]; then \
+ 	   echo No build directory for $$sysname - please run ./configure.; \
+ 	else \
+-	   (cd work.$$sysname; make links); \
++	   (cd work.$$sysname; $(MAKE) links); \
+ 	fi
+ 

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,146 @@
+--- dhcp-3.0.1rc12/client/scripts/linux.RHscript	2002-11-14 20:09:09.000000000 -0500
++++ dhcp-3.0.1rc12/client/scripts/linux	2004-01-24 08:49:54.829793151 -0500
+@@ -19,12 +19,32 @@
+ # address if it is not supplied. This might be much more easily done
+ # by the dhclient C code, and passed on.
+ 
+-# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious
+-# of the $1 in its args.
+-
++function save_previous() {
++  if [ -e $1 -a ! -e $1.predhclient ]; then
++    mv $1 $1.predhclient 
++  fi
++}
+ make_resolv_conf() {
+-  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+-    echo search $new_domain_name >/etc/resolv.conf
++  if [ "${PEERDNS}" == "no" ]; then  
++      return 
++  fi
++
++  if [ x$reason == xRENEW ]; then 
++      if [ "$new_domain_name" == "$old_domain_name" ] && [ "$new_domain_servers" == "$old_domain_servers" ]; then
++	  return
++      fi
++  fi
++
++  if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then
++    save_previous /etc/resolv.conf
++    echo '; generated by /sbin/dhclient-script' > /etc/resolv.conf
++    if [ -n "$SEARCH" ]; then
++ 	echo search $SEARCH >> /etc/resolv.conf
++    else
++	if [ -n "$new_domain_name" ]; then
++ 	    echo search $new_domain_name >> /etc/resolv.conf
++        fi
++    fi
+     chmod 644 /etc/resolv.conf
+     for nameserver in $new_domain_name_servers; do
+       echo nameserver $nameserver >>/etc/resolv.conf
+@@ -53,6 +73,25 @@
+   fi
+ fi
+ 
++# Import Red Hat Linux configuration
++cd /etc/sysconfig/network-scripts;
++. /etc/sysconfig/network-scripts/network-functions
++. /etc/rc.d/init.d/functions
++
++[ -f ../network ] && . ../network
++[ -f ../networking/network ] && . ../networking/network
++
++CONFIG=$interface
++
++need_config ${CONFIG}
++
++[ -f "${CONFIG}" ] || {
++    echo $"$0: configuration for $interface not found." >&2
++    exit_with_hooks 1
++}   
++
++source_config
++
+ release=`uname -r`
+ release=`expr $release : '\(.*\)\..*'`
+ relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
+@@ -106,13 +145,52 @@
+   
+ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+    [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
+-  current_hostname=`hostname`
+-  if [ x$current_hostname = x ] || \
+-     [ x$current_hostname = x$old_host_name ]; then
+-    if [ x$current_hostname = x ] || \
+-       [ x$new_host_name != x$old_host_name ]; then
++
++  if [ "${PEERNIS}" = no ]; then
++    :
++  elif [ -n "$new_nis_domain" ]; then
++	domainname "$new_nis_domain"
++	save_previous /etc/yp.conf
++	echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
++	if [ -n "$new_nis_servers" ]; then
++	    for I in $new_nis_servers; do
++		echo "domain $new_nis_domain server $I" >> /etc/yp.conf
++	    done
++	else
++	    echo "domain $new_nis_domain broadcast" >> /etc/yp.conf
++	fi
++  elif [ -n "$new_nis_servers" ]; then
++      save_previous /etc/yp.conf
++      echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
++      for I in $new_nis_servers; do
++	  echo "ypserver $I" >> /etc/yp.conf
++      done
++  fi
++
++  if [ "${PEERNTP}" = no ]; then
++    :
++  elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
++      save_previous /etc/ntp.conf
++      cat <<EOF > /etc/ntp.conf
++# generated by /sbin/dhclient-script
++restrict default ignore
++restrict 127.0.0.1
++driftfile /var/lib/ntp/drift
++broadcastdelay 0.008
++authenticate yes
++keys /etc/ntp/keys
++EOF
++      save_previous /etc/ntp/step-tickers
++      echo '# generated by /sbin/dhclient-script' > /etc/ntp/step-tickers
++      for I in $new_ntp_servers; do
++          echo "restrict $I nomodify notrap noquery" >> /etc/ntp.conf
++	  echo "server $I" >> /etc/ntp.conf
++	  echo "$I" >> /etc/ntp/step-tickers
++      done
++  fi
++
++  if [ -n "$new_host_name" ] && need_hostname; then
+       hostname $new_host_name
+-    fi
+   fi
+     
+   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+@@ -174,8 +252,7 @@
+   ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg
+   set $new_routers
+-  ############## what is -w in ping?
+-  if ping -q -c 1 $1; then
++  if ping -q -c 1 -w 10 $1; then
+     if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+       ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+@@ -188,7 +265,9 @@
+     for router in $new_routers; do
+       route add default gw $router
+     done
+-    make_resolv_conf
++    if [ "${PEERDNS}" != "no" ]; then 
++      make_resolv_conf
++    fi
+     exit_with_hooks 0
+   fi
+   ifconfig $interface inet 0 down

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-inherit-leases.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-inherit-leases.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-inherit-leases.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,44 @@
+--- dhcp-3.0.1rc12/client/scripts/linux.inherit-leases	2004-06-10 13:08:54.816030416 -0400
++++ dhcp-3.0.1rc12/client/scripts/linux	2004-06-10 13:18:39.232185656 -0400
+@@ -123,16 +123,18 @@
+     # Bring down alias interface. Its routes will disappear too.
+     ifconfig $interface:0- inet 0
+   fi
+-  if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
+-   then
++  if [ x$keep_old_ip == xyes ]; then
++    ifconfig $interface up
++  elif [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )   then
+     ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
+ 		broadcast 255.255.255.255 up
+-    # Add route to make broadcast work. Do not omit netmask.
+-    route add default dev $interface netmask 0.0.0.0
+   else
+     ifconfig $interface 0 up
+   fi
+ 
++  # Add route to make broadcast work. Do not omit netmask.
++  route add default dev $interface netmask 0.0.0.0
++
+   # We need to give the kernel some time to get the interface up.
+   sleep 1
+ 
+--- dhcp-3.0.1rc12/client/dhclient.c.inherit-leases	2004-06-10 13:08:54.709046680 -0400
++++ dhcp-3.0.1rc12/client/dhclient.c	2004-06-10 13:08:54.891019016 -0400
+@@ -387,6 +387,16 @@
+ 				continue;
+ 			script_init (ip -> client,
+ 				     "PREINIT", (struct string_list *)0);
++			if (/* Has an active lease */
++			    ip -> client -> active &&
++			    !ip -> client -> active -> is_bootp &&
++			    ip -> client -> active -> expiry > cur_time &&
++			    /* Which is same as current ip */
++			    ip -> primary_address.s_addr != 0 &&
++			    ip -> client -> active -> address.len == 4 &&
++			    memcmp (ip -> client -> active -> address.iabuf,
++				    &ip->primary_address, 4) == 0)
++				client_envadd (ip -> client, "", "keep_old_ip", "%s", "yes");
+ 			if (ip -> client -> alias)
+ 				script_write_params (ip -> client, "alias_",
+ 						     ip -> client -> alias);

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-pie.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-pie.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-pie.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,10 @@
+--- dhcp-3.0.1rc12/server/Makefile.dist.pie	2002-11-17 03:29:30.000000000 +0100
++++ dhcp-3.0.1rc12/server/Makefile.dist	2004-05-17 16:13:30.085925200 +0200
+@@ -98,6 +98,6 @@
+ 		-e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 >dhcpd.leases.man5
+ 
+ dhcpd:	$(OBJS) $(COBJ) $(DHCPLIB)
+-	$(CC) $(LFLAGS) -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS)
++	$(CC) $(LFLAGS) -pie -o dhcpd $(OBJS) $(DHCPLIB) $(LIBS)
+ 
+ # Dependencies (semi-automatically-generated)

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-staticroutes.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-staticroutes.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-staticroutes.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,21 @@
+--- dhcp-3.0.1rc12/client/scripts/linux.staticroutes	2004-03-25 14:53:20.740651072 -0500
++++ dhcp-3.0.1rc12/client/scripts/linux	2004-03-25 14:53:20.747650008 -0500
+@@ -217,6 +217,18 @@
+     for router in $new_routers; do
+       route add default gw $router
+     done
++    # static routes
++    if [ "x$new_static_routes" != x ]; then
++      len=`echo $new_static_routes | awk '{print NF}'`
++      i=1
++      while [ $i -lt $len ]; do
++        target=`echo $new_static_routes | awk "{print \\$$i}"`
++        let i=i+1
++        gateway=`echo $new_static_routes | awk "{print \\$$i}"`
++        let i=i+1
++        route add -host $target gw $gateway $interface
++      done
++    fi
+   fi
+   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+    then

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-dhcpctlman.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-dhcpctlman.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-dhcpctlman.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,32 @@
+Patch solving "Unexpected stderr output from "man 3 dhcpctl" command" (#69731)
+
+Adapted by Robert Scheck for dhcp >= 3.0.1rc13
+
+--- dhcp-3.0.1rc13/dhcpctl/dhcpctl.3			2004-01-09 00:48:46.000000000 +0100
++++ dhcp-3.0.1rc13/dhcpctl/dhcpctl.3.dhcpctlman		2004-05-13 23:03:49.000000000 +0200
+@@ -23,7 +23,8 @@
+ .\"
+ .\"
+ .Sh SYNOPSIS
+-.Fd #include <dhcpctl/dhcpctl.h>
++.Fd #include <dhcpctl.h>
++.sp
+ .Ft dhcpctl_status
+ .Fo dhcpctl_initialize
+ .Fa void
+@@ -404,7 +405,7 @@
+ #include <netinet/in.h>
+ 
+ #include <isc/result.h>
+-#include <dhcpctl/dhcpctl.h>
++#include <dhcpctl.h>
+ 
+ int main (int argc, char **argv) {
+ 	dhcpctl_data_string ipaddrstring = NULL;
+@@ -464,5 +465,5 @@
+ .Em dhcpctl
+ was written by Ted Lemon of Nominum, Inc.  Information about Nominum
+ and support contracts for DHCP and BIND can be found at
+-http://www.nominum.com.
++.Em http://www.nominum.com.
+ This preliminary documentation was written by James Brister of Nominum, Inc.

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl1-minires.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl1-minires.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl1-minires.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,15 @@
+--- dhcp-3.0pl1/minires/ns_name.c~	2000-02-02 02:28:14.000000000 -0500
++++ dhcp-3.0pl1/minires/ns_name.c	2003-01-08 04:25:23.000000000 -0500
+@@ -255,6 +255,11 @@
+ 	dn = dst;
+ 	eom = dst + dstsiz;
+ 
++	if (dn >= eom) {
++ 		errno = EMSGSIZE;
++ 		return (-1);
++ 	}
++
+ 	while ((n = *cp++) != 0) {
+ 		if ((n & NS_CMPRSFLGS) != 0) {
+ 			/* Some kind of compression pointer. */
+ 		

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl1-miscfixes.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl1-miscfixes.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl1-miscfixes.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,40 @@
+--- dhcp-3.0pl1/client/clparse.c.sopwith	2002-08-26 06:58:04.000000000 -0400
++++ dhcp-3.0pl1/client/clparse.c	2002-08-26 06:59:57.000000000 -0400
+@@ -60,6 +60,9 @@
+ 	DHO_DOMAIN_NAME,
+ 	DHO_DOMAIN_NAME_SERVERS,
+ 	DHO_HOST_NAME,
++	DHO_NIS_DOMAIN,
++	DHO_NIS_SERVERS,
++	DHO_NTP_SERVERS,
+ 	0
+ };
+ 
+--- dhcp-3.0pl1/client/dhclient.conf.5.sopwith	2002-08-26 07:02:27.000000000 -0400
++++ dhcp-3.0pl1/client/dhclient.conf.5	2002-08-26 07:03:28.000000000 -0400
+@@ -191,7 +191,8 @@
+ options.   Only the option names should be specified in the request
+ statement - not option parameters.   By default, the DHCP server
+ requests the subnet-mask, broadcast-address, time-offset, routers,
+-domain-name, domain-name-servers and host-name options. 
++domain-name, domain-name-servers, host-name, nis-domain, nis-servers,
++and ntp-servers options.
+ .PP
+ In some cases, it may be desirable to send no parameter request list
+ at all.   To do this, simply write the request statement but specify
+--- dhcp-3.0pl1/dst/Makefile.dist.sopwith	2002-08-26 07:10:48.000000000 -0400
++++ dhcp-3.0pl1/dst/Makefile.dist	2002-08-26 07:18:07.000000000 -0400
+@@ -26,7 +26,12 @@
+ 
+ all:	libdst.a
+ 
+-install:
++install: all
++	if [ ! -d $(DESTDIR)$(LIBDIR) ]; then \
++		mkdir $(DESTDIR)$(LIBDIR); chmod 755 $(DESTDIR)$(LIBDIR); \
++	fi
++	$(INSTALL) libdst.a $(DESTDIR)$(LIBDIR)
++	$(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libdst.a
+ 
+ libdst.a:	$(OBJ)
+ 	rm -f dst.a

Deleted: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-buildroot.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-buildroot.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-buildroot.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -1,31 +0,0 @@
-diff -urN dhcp-3.0pl2/Makefile.conf dhcp-3.0pl2-new/Makefile.conf
---- dhcp-3.0pl2/Makefile.conf	2001-06-26 20:31:36.000000000 +0200
-+++ dhcp-3.0pl2-new/Makefile.conf	2004-02-11 11:13:01.695515240 +0100
-@@ -340,6 +340,27 @@
- #SCRIPT=linux
- ##--linux-2.2--
- 
-+# Linux 2.4
-+#--linux-2.4--
-+COPTS = -DLINUX_MAJOR=2 -DLINUX_MINOR=4 \
-+        $(BINDDEF) $(CC_OPTIONS)
-+CF = cf/linux.h
-+ADMMANDIR = /usr/share/man/man8
-+ADMMANEXT = .8
-+FFMANDIR = /usr/share/man/man5
-+FFMANEXT = .5
-+LIBMANDIR = /usr/share/man/man3
-+LIBMANEXT = .3
-+USRMANDIR = /usr/share/man/man1
-+USRMANEXT = .1
-+MANCAT = man
-+VARRUN = /var/run
-+VARDB = /var/state/dhcp
-+LIBDIR= /usr/lib/
-+INCDIR= /usr/include
-+SCRIPT=linux
-+#--linux-2.4--
-+
- ## SCO UnixWare 7
- ##--uw7--
- #CF = cf/uw7.h

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-initialize.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-initialize.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-initialize.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,10 @@
+--- dhcp-3.0pl2/common/packet.c.initialize	2004-01-21 15:04:27.424131872 -0500
++++ dhcp-3.0pl2/common/packet.c	2004-01-21 15:05:33.257662255 -0500
+@@ -149,6 +149,7 @@
+ 	struct ip ip;
+ 	struct udphdr udp;
+ 
++	memset( &ip, sizeof ip, 0);
+ 	/* Fill out the IP header */
+ 	IP_V_SET (&ip, 4);
+ 	IP_HL_SET (&ip, 20);

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-selinux.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-selinux.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2-selinux.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,11 @@
+--- dhcp-3.0pl2/client/dhclient.c.selinux	2003-10-08 09:59:43.000000000 -0400
++++ dhcp-3.0pl2/client/dhclient.c	2004-01-05 09:10:35.065642283 -0500
+@@ -2559,6 +2559,8 @@
+ 			wstatus = 0;
+ 		}
+ 	} else {
++	        if (leaseFile)
++		  fclose (leaseFile);
+ 		execve (scriptName, argv, envp);
+ 		log_error ("execve (%s, ...): %m", scriptName);
+ 		exit (0);

Deleted: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0pl2.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/snapshot/dhcp/current/sources/dhcpd-manpage.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcpd-manpage.patch	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcpd-manpage.patch	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,52 @@
+*** dhcp-3.0pl1/server/dhcpd.conf.5~	2003-03-05 00:59:56.000000000 -0500
+--- dhcp-3.0pl1/server/dhcpd.conf.5	2003-03-05 01:00:36.000000000 -0500
+***************
+*** 1106,1116 ****
+  one for the zone containing A records that will be updates and one for
+  the zone containing PTR records - for ISC BIND, something like this:
+  .PP
+  .nf
+  key DHCP_UPDATER {
+!   algorithm HMAC-MD5.SIG-ALG.REG.INT;
+    secret pRP5FapFoJ95JEL06sv4PQ==;
+  };
+  
+  zone "example.org" {
+  	type master;
+--- 1106,1116 ----
+  one for the zone containing A records that will be updates and one for
+  the zone containing PTR records - for ISC BIND, something like this:
+  .PP
+  .nf
+  key DHCP_UPDATER {
+!   algorithm hmac-md5;
+    secret pRP5FapFoJ95JEL06sv4PQ==;
+  };
+  
+  zone "example.org" {
+  	type master;
+***************
+*** 1129,1139 ****
+  these zones.   To do so, you need to add something like this to your
+  dhcpd.conf file:
+  .PP
+  .nf
+  key DHCP_UPDATER {
+!   algorithm HMAC-MD5.SIG-ALG.REG.INT;
+    secret pRP5FapFoJ95JEL06sv4PQ==;
+  };
+  
+  zone EXAMPLE.ORG. {
+    primary 127.0.0.1;
+--- 1129,1139 ----
+  these zones.   To do so, you need to add something like this to your
+  dhcpd.conf file:
+  .PP
+  .nf
+  key DHCP_UPDATER {
+!   algorithm hmac-md5;
+    secret pRP5FapFoJ95JEL06sv4PQ==;
+  };
+  
+  zone EXAMPLE.ORG. {
+    primary 127.0.0.1;

Modified: tinysofa/snapshot/dhcp/current/sources/dhcpd.conf.sample
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcpd.conf.sample	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcpd.conf.sample	2004-06-12 15:32:55 UTC (rev 1941)
@@ -1,12 +1,8 @@
-# Do not claim to rule this network.  You want to change this if you really
-# want it to work.
-not authoritative;
+ddns-update-style interim;
+ignore client-updates;
 
-# Do not try to update DNS by default
-ddns-update-style none;
-
-# The subnets
 subnet 192.168.0.0 netmask 255.255.255.0 {
+
 # --- default gateway
 	option routers			192.168.0.1;
 	option subnet-mask		255.255.255.0;
@@ -15,14 +11,14 @@
 	option domain-name		"domain.org";
 	option domain-name-servers	192.168.1.1;
 
-	option time-offset		-5;
+	option time-offset		-18000;	# Eastern Standard Time
 #	option ntp-servers		192.168.1.1;
 #	option netbios-name-servers	192.168.1.1;
 # --- Selects point-to-point node (default is hybrid). Don't change this unless
 # -- you understand Netbios very well
 #	option netbios-node-type 2;
 
-	range dynamic-bootp 192.168.0.128 192.168.0.255;
+	range dynamic-bootp 192.168.0.128 192.168.0.254;
 	default-lease-time 21600;
 	max-lease-time 43200;
 

Modified: tinysofa/snapshot/dhcp/current/sources/dhcpd.init
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcpd.init	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcpd.init	2004-06-12 15:32:55 UTC (rev 1941)
@@ -7,11 +7,16 @@
 # description: dhcpd provide access to Dynamic Host Control Protocol.
 
 # Source function library.
-. /etc/init.d/functions
+if [ -f /etc/init.d/functions ]; then
+  . /etc/init.d/functions
+elif [ -f /etc/rc.d/init.d/functions ]; then
+  . /etc/rc.d/init.d/functions
+else
+  exit 0
+fi
 
 # Source networking configuration.
 . /etc/sysconfig/network
-# Source command line options:
 . /etc/sysconfig/dhcpd
 
 # Check that networking is up.
@@ -19,38 +24,77 @@
 
 [ -f /usr/sbin/dhcpd ] || exit 0
 [ -f /etc/dhcpd.conf ] || exit 0
+[ -f /var/state/dhcp/dhcpd.leases ] || touch /var/state/dhcp/dhcpd.leases
 
 RETVAL=0
+prog="dhcpd"
 
-# See how we were called.
-case "$1" in
-  start)
+configtest()
+{
+	local retval TEMP=/tmp/dhcpd$$.err
+
+	/usr/sbin/dhcpd -t 2>$TEMP
+	retval=$?
+	if [ $retval -ne 0 ]
+	then
+		cat $TEMP
+		rm -f $TEMP
+	fi
+
+	return $retval
+}
+
+start() {
 	# Start daemons.
-	echo -n "Starting dhcpd: "
+	echo -n $"Starting $prog: "
 	daemon /usr/sbin/dhcpd ${DHCPDARGS}
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch ${INITLOCK:-/mnt/lockdev}/dhcpd
-	;;
-  stop)
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcpd
+	return $RETVAL
+}
+
+stop() {
 	# Stop daemons.
-	echo -n "Shutting down dhcpd: "
+	echo -n $"Shutting down $prog: "
 	killproc dhcpd
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f ${INITLOCK:-/mnt/lockdev}/dhcpd
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dhcpd
+	return $RETVAL
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
 	;;
+  stop)
+	stop
+	;;
   restart|reload)
-	$0 stop
-	$0 start
+	configtest || exit $?
+	stop
+	start
 	RETVAL=$?
 	;;
+  condrestart|try-restart)
+	if [ -f /var/lock/subsys/dhcpd ]; then
+	    stop
+	    start
+	    RETVAL=$?
+	fi
+	;;
+  configtest)
+	configtest
+	RETVAL=$?
+	;;
   status)
 	status dhcpd
 	RETVAL=$?
 	;;
   *)
-	echo "Usage: dhcpd {start|stop|restart|status}"
+	echo $"Usage: $0 {start|stop|restart|try-restart|configtest|status}"
 	exit 1
 esac
 

Added: tinysofa/snapshot/dhcp/current/sources/dhcrelay.init
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcrelay.init	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/sources/dhcrelay.init	2004-06-12 15:32:55 UTC (rev 1941)
@@ -0,0 +1,88 @@
+#!/bin/sh
+#
+# dhcrelay      This shell script takes care of starting and stopping
+#               dhcrelay.
+#
+# chkconfig: - 66 34
+# description: dhcrelay provides a relay for Dynamic Host Control Protocol.
+
+# Source function library.
+if [ -f /etc/init.d/functions ]; then
+  . /etc/init.d/functions
+elif [ -f /etc/rc.d/init.d/functions ]; then
+  . /etc/rc.d/init.d/functions
+else
+  exit 0
+fi
+
+# Source networking configuration.
+. /etc/sysconfig/network
+
+# Source dhcrelay configuration. We can't default a DHCPSERVERS entry!
+if [ -f /etc/sysconfig/dhcrelay ] ; then
+	. /etc/sysconfig/dhcrelay
+	[ -n "$DHCPSERVERS" ] || exit 0
+else
+	exit 0
+fi
+
+# Check that networking is up.
+[ ${NETWORKING} = "no" ] && exit 0
+
+[ -f /usr/sbin/dhcrelay ] || exit 0
+
+RETVAL=0
+prog="dhcrelay"
+
+start() {
+	# Start daemons.
+	echo -n $"Starting $prog: "
+	daemon /usr/sbin/dhcrelay \
+		$([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) \
+		$DHCPSERVERS
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcrelay
+	return $RETVAL
+}
+
+stop() {
+	# Stop daemons.
+	echo -n $"Shutting down $prog: "
+	killproc dhcrelay
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dhcrelay
+	return $RETVAL
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	stop
+	start
+	RETVAL=$?
+	;;
+  condrestart|try-restart)
+	if [ -f /var/lock/subsys/dhcrelay ]; then
+	    stop
+	    start
+	    RETVAL=$?
+	fi
+	;;
+  status)
+	status dhcrelay
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart|try-restart|status}"
+	exit 1
+esac
+
+exit $RETVAL

Modified: tinysofa/snapshot/dhcp/current/specs/dhcp.spec
===================================================================
--- tinysofa/snapshot/dhcp/current/specs/dhcp.spec	2004-06-12 14:24:12 UTC (rev 1940)
+++ tinysofa/snapshot/dhcp/current/specs/dhcp.spec	2004-06-12 15:32:55 UTC (rev 1941)
@@ -1,16 +1,28 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name: dhcp
-Version: 3.0pl2
-Release: 14ts
+Version: 3.0.1rc13
+Release: 1jh
 License: distributable
-Group: tinysofa official
+Group: tinysofa/main
+URL: http://isc.org/products/DHCP/
 Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
 Source1: dhcpd.conf.sample
 Source2: dhcpd.init
-Patch0: dhcp-3.0pl2-buildroot.patch
+Source3: dhcrelay.init
+Patch: dhcp-3.0-alignment.patch
+Patch100: dhcp-3.0-jbuild.patch
+Patch102: dhcp-3.0.1rc13-dhcpctlman.patch
+Patch103: dhcp-3.0pl1-miscfixes.patch
+Patch106: dhcp-3.0pl1-minires.patch
+Patch109: dhcpd-manpage.patch
+Patch113: dhcp-3.0pl2-selinux.patch
+Patch114: dhcp-3.0pl2-initialize.patch
+Patch115: dhcp-3.0.1rc12-RHscript.patch
+Patch116: dhcp-3.0.1rc12-staticroutes.patch
+Patch117: dhcp-3.0.1rc12-pie.patch
+Patch118: dhcp-3.0.1rc12-inherit-leases.patch
 Obsoletes: dhcpd
-BuildRoot: %{_tmppath}/%{name}-root
-PreReq: /sbin/restart_maybe /sbin/chkconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: groff
 
 %description
@@ -27,7 +39,7 @@
 
 %package common
 Summary:        The ISC DHCP (Dynamic Host Configuration Protocol) server
-Group: tinysofa official
+Group: tinysofa/main
 
 %description common
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
@@ -39,12 +51,11 @@
 
 You will also need to install the dhcp-client or pump which provides 
 the DHCP client daemon, on  client machines. If you want the DHCP server 
-and/or relay, you will also need to install the dhcp-server and/or 
-dhcp-relay packages.
+and/or relay, you will also need to install the dhcp-server.
 
 %package client
 Summary: The ISC DHCP (Dynamic Host Configuration Protocol) client
-Group: tinysofa official
+Group: tinysofa/main
 Requires: dhcp-common = %{version}
 
 %description client
@@ -58,9 +69,9 @@
 
 %package server
 Summary:        The ISC DHCP (Dynamic Host Configuration Protocol) server
-Group: tinysofa official
+Group: tinysofa/extra
 Requires:       dhcp-common = %version
-PreReq: /sbin/restart_maybe /sbin/chkconfig
+%service_requires
 Obsoletes:      dhcp
 
 %description server
@@ -73,7 +84,7 @@
 
 %package devel
 Summary:        Development headers and libraries for the dhcpctl API 
-Group: tinysofa official
+Group: tinysofa/development
 Requires:       dhcp-common = %version
 
 %description devel
@@ -83,70 +94,110 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -p1 -b .alignment
+%patch100 -p1 -b .jbuild
+%patch102 -p1 -b .dhcpctlman
+%patch103 -p1 -b .miscfixes
+%patch106 -p1 -b .minires
+%patch109 -p1 -b .dhcpdman
+%patch113 -p1 -b .selinux
+%patch114 -p1 -b .initialize
+%patch115 -p1 -b .RHscript
+%patch116 -p1 -b .staticroutes
+#%patch117 -p1 -b .pie
+%patch118 -p1 -b .inherit-leases
 
 cp %SOURCE1 .
 
+cat << __EOF__ > site.conf
+VARDB=%{_localstatedir}/lib/dhcp
+ADMMANDIR=%{_mandir}/man8
+FFMANDIR=%{_mandir}/man5
+LIBMANDIR=%{_mandir}/man3
+USRMANDIR=%{_mandir}/man1
+LIBDIR=%{_libdir}
+INCDIR=%{_includedir}
+__EOF__
+
+
 %build
-./configure
-make CC="gcc -pipe" DEBUG="$RPM_OPT_FLAGS"
+cat << EOF >findptrsize.c
+#include <stdio.h>
+int main(void) { printf("%%d\n", sizeof(void *)); return 0; }
+__EOF__
+cc -o findptrsize findptrsize.c
+[ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT"
 
+%ifarch s390 s390x
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC"
+%else
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpic"
+%endif
+./configure --copts "$RPM_OPT_FLAGS"
+
+%make
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p $RPM_BUILD_ROOT
+%makeinstall_std
 
-make install DESTDIR=$RPM_BUILD_ROOT
-strip $RPM_BUILD_ROOT/usr/sbin/* || :
+%{__mkdir_p} \
+	%{buildroot}%{_initrddir} \
+	%{buildroot}%{_sysconfdir}/sysconfig \
+	%{buildroot}%{_localstatedir}/state/dhcp \
 
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-install -m 0755 %SOURCE2 $RPM_BUILD_ROOT/etc/init.d/dhcpd
+install -m 0755 %SOURCE2 %{buildroot}%{_initrddir}/dhcpd
+install -m 0755 %SOURCE3 %{buildroot}%{_initrddir}/dhcrelay
 
-#Install the example configuration file at the configuration location as well
-install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/etc/dhcpd.conf
+# Install the example configuration file at the configuration location as well
+install -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/dhcpd.conf
 
-mkdir -p -m 755 $RPM_BUILD_ROOT/var/state/dhcp
-touch $RPM_BUILD_ROOT/var/state/dhcp/dhcpd.leases
-touch $RPM_BUILD_ROOT/var/state/dhcp/dhclient.leases
+touch %{buildroot}%{_localstatedir}/state/dhcp/dhcpd.leases
+touch %{buildroot}%{_localstatedir}/state/dhcp/dhclient.leases
 
-
-mkdir -p %{buildroot}/etc/sysconfig
-cat << __EOF__ > ${RPM_BUILD_ROOT}/etc/sysconfig/dhcpd
+cat << __EOF__ > %{buildroot}%{_sysconfdir}/sysconfig/dhcpd
 # Command line options here
 DHCPDARGS=""
 __EOF__
 
+cat << __EOF__ > %{buildroot}%{_sysconfdir}/sysconfig/dhcrelay
+# Command line options here
+INTERFACES=""
+DHCPSERVERS=""
+__EOF__
+
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+%clean_buildroot
 
 %post server
-# Restart service after upgrade.
-/sbin/chkconfig --add dhcpd
-/sbin/restart_maybe dhcpd
+%service_post dhcpd
+%service_post dhcrelay
 
 %preun server
-if [ $1 = 0 ]; then	# execute this only if we are NOT doing an upgrade
-   #Stop service if it's running
-   if [ -f /mnt/lockdev/dhcpd ]; then
-       %{_initdir}/dhcpd stop
-   fi
+%service_preun dhcpd
+%service_preun dhcrelay
 
-   /sbin/chkconfig --del dhcpd 
-fi
+%postun server
+%service_postun dhcpd
+%service_postun dhcrelay
 
+
 %files common
 %defattr(-,root,root)
-%doc CHANGES README RELNOTES dhcpd.conf.sample
-%doc doc
-%dir /var/state/dhcp
+%doc README RELNOTES dhcpd.conf.sample
+%doc doc/*
+%dir %{_localstatedir}/state/dhcp
 
 %files server
 %defattr(-,root,root)
 %{_sbindir}/dhcpd
 %{_bindir}/omshell
-%config(noreplace) /var/state/dhcp/dhcpd.leases
+%config(noreplace) %{_localstatedir}/state/dhcp/dhcpd.leases
 %config(noreplace) %{_sysconfdir}/sysconfig/dhcpd
-/etc/init.d/dhcpd
-%config(noreplace) /etc/dhcpd.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/dhcrelay
+%{_initrddir}/dhcpd
+%{_initrddir}/dhcrelay
+%config(noreplace) %{_sysconfdir}/dhcpd.conf
 %{_sbindir}/dhcrelay
 
 %defattr(644,root,root,755)
@@ -159,7 +210,6 @@
 %{_mandir}/man5/dhcp-eval.5*
 %{_mandir}/man8/dhcpd.8*
 
-
 %files client
 %defattr(-,root,root)
 %doc client/dhclient.conf
@@ -173,7 +223,6 @@
 %{_mandir}/man8/dhclient.8*
 %{_mandir}/man8/dhclient-script.8*
 
-
 %files devel
 %defattr(-,root,root)
 %attr(644,root,root) %{_mandir}/man3/*


From svn at tinysofa.org  Mon Jun 14 16:13:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 15 Jun 2004 02:13:24 +1000 (EST)
Subject: [tinysofa-svn] 
	r1942 - in tinysofa/snapshot/libcap/current: sources specs
Message-ID: <20040614161324.094CD4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-15 02:13:23 +1000 (Tue, 15 Jun 2004)
New Revision: 1942

Added:
   tinysofa/snapshot/libcap/current/sources/libcap-1.10-alpha.patch
   tinysofa/snapshot/libcap/current/sources/libcap-1.10-ia64.patch
   tinysofa/snapshot/libcap/current/sources/libcap-1.10-shared.patch
   tinysofa/snapshot/libcap/current/sources/libcap-1.10-userland.patch
   tinysofa/snapshot/libcap/current/sources/libcap-1.10.tar.bz2
Removed:
   tinysofa/snapshot/libcap/current/sources/libcap-1.10.tar.gz
Modified:
   tinysofa/snapshot/libcap/current/specs/libcap.spec
Log:
- new package from Fedora


Added: tinysofa/snapshot/libcap/current/sources/libcap-1.10-alpha.patch
===================================================================
--- tinysofa/snapshot/libcap/current/sources/libcap-1.10-alpha.patch	2004-06-12 15:32:55 UTC (rev 1941)
+++ tinysofa/snapshot/libcap/current/sources/libcap-1.10-alpha.patch	2004-06-14 16:13:23 UTC (rev 1942)
@@ -0,0 +1,11 @@
+--- libcap-1.10/libcap/_makenames.c.foo	Fri Nov  9 16:38:45 2001
++++ libcap-1.10/libcap/_makenames.c	Fri Nov  9 16:39:30 2001
+@@ -9,7 +9,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <linux/capability.h>
++#include "include/sys/capability.h"
+ 
+ /*
+  * #include 'sed' generated array

Added: tinysofa/snapshot/libcap/current/sources/libcap-1.10-ia64.patch
===================================================================
--- tinysofa/snapshot/libcap/current/sources/libcap-1.10-ia64.patch	2004-06-12 15:32:55 UTC (rev 1941)
+++ tinysofa/snapshot/libcap/current/sources/libcap-1.10-ia64.patch	2004-06-14 16:13:23 UTC (rev 1942)
@@ -0,0 +1,32 @@
+--- libcap-1.10/libcap/cap_sys.c.ia64	Mon May 21 16:23:27 2001
++++ libcap-1.10/libcap/cap_sys.c	Mon May 21 16:24:09 2001
+@@ -11,14 +11,6 @@
+ #define __LIBRARY__
+ #include <linux/unistd.h>
+ 
+-_syscall2(int, capget,
+-	  cap_user_header_t, header,
+-	  cap_user_data_t, data)
+-
+-_syscall2(int, capset,
+-	  cap_user_header_t, header,
+-	  const cap_user_data_t, data)
+-
+ /*
+  * $Log: cap_sys.c,v $
+  * Revision 1.1.1.1  1999/04/17 22:16:31  morgan
+--- libcap-1.10/Make.Rules.ia64	Mon May 21 16:22:08 2001
++++ libcap-1.10/Make.Rules	Mon May 21 16:22:32 2001
+@@ -44,10 +44,10 @@
+ CC=gcc
+ COPTFLAGS=-O2
+ DEBUG=-g #-DDEBUG
+-WARNINGS=-ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
++WARNINGS=-D_POSIX_SOURCE -Wall -Wwrite-strings \
+         -Wpointer-arith -Wcast-qual -Wcast-align \
+         -Wtraditional -Wstrict-prototypes -Wmissing-prototypes \
+-        -Wnested-externs -Winline -Wshadow -pedantic
++        -Wnested-externs -Winline -Wshadow
+ LD=ld
+ LDFLAGS=-s #-g
+ 

Added: tinysofa/snapshot/libcap/current/sources/libcap-1.10-shared.patch
===================================================================
--- tinysofa/snapshot/libcap/current/sources/libcap-1.10-shared.patch	2004-06-12 15:32:55 UTC (rev 1941)
+++ tinysofa/snapshot/libcap/current/sources/libcap-1.10-shared.patch	2004-06-14 16:13:23 UTC (rev 1942)
@@ -0,0 +1,17 @@
+--- libcap-1.11/libcap/Makefile.shared	1999-04-17 18:16:31.000000000 -0400
++++ libcap-1.11/libcap/Makefile	2002-07-19 06:24:23.000000000 -0400
+@@ -56,12 +56,12 @@ cap_names.sed: Makefile /usr/include/lin
+ #	@sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define CAP_\([^ \t]*\)[ \t]*\([^ \t]*\)/  \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed
+ 
+ $(MINLIBNAME): $(OBJS)
+-	$(LD) -soname $(MAJLIBNAME) -x -shared -o $@ $(OBJS)
++	$(CC) -Wl,-soname,$(MAJLIBNAME) -Wl,-x -shared -o $@ $(OBJS)
+ 	ln -sf $(MINLIBNAME) $(MAJLIBNAME)
+ 	ln -sf $(MAJLIBNAME) $(LIBNAME)
+ 
+ %.o: %.c $(INCLS)
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) -fpic -c $< -o $@
+ 
+ install: all
+ 	mkdir -p -m 0755 $(INCDIR)/sys

Added: tinysofa/snapshot/libcap/current/sources/libcap-1.10-userland.patch
===================================================================
--- tinysofa/snapshot/libcap/current/sources/libcap-1.10-userland.patch	2004-06-12 15:32:55 UTC (rev 1941)
+++ tinysofa/snapshot/libcap/current/sources/libcap-1.10-userland.patch	2004-06-14 16:13:23 UTC (rev 1942)
@@ -0,0 +1,19 @@
+--- libcap-1.10/libcap/include/sys/capability.h.foo	Fri Nov  9 16:26:25 2001
++++ libcap-1.10/libcap/include/sys/capability.h	Fri Nov  9 16:28:47 2001
+@@ -21,6 +21,16 @@
+  */
+ 
+ #include <sys/types.h>
++#include <stdint.h>
++
++/*
++ * Make sure we can be included from userland by preventing
++ * capability.h from including other kernel headers
++ */
++#define _LINUX_TYPES_H
++#define _LINUX_FS_H
++typedef uint32_t __u32;
++
+ #include <linux/capability.h>
+ 
+ /*

Added: tinysofa/snapshot/libcap/current/sources/libcap-1.10.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/libcap/current/sources/libcap-1.10.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/snapshot/libcap/current/sources/libcap-1.10.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/snapshot/libcap/current/specs/libcap.spec
===================================================================
--- tinysofa/snapshot/libcap/current/specs/libcap.spec	2004-06-12 15:32:55 UTC (rev 1941)
+++ tinysofa/snapshot/libcap/current/specs/libcap.spec	2004-06-14 16:13:23 UTC (rev 1942)
@@ -1,76 +1,141 @@
-Summary: P:SIX.1e capability suite
 Name: libcap
 Version: 1.10
-Release: 10ts
-License: GPL
-Group: tinysofa official
-Source: ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.2/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
+Release: 11jh
+Summary: Library for getting and setting POSIX.1e capabilities
+Source: ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/%{name}-%{version}.tar.bz2
+License: BSD-like and LGPL
+Patch: libcap-1.10-ia64.patch
+Patch1: libcap-1.10-userland.patch
+Patch2: libcap-1.10-shared.patch
+Patch3: libcap-1.10-alpha.patch
+Group: tinysofa/main
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
-The POSIX.1e capability library for Linux. This package contains the
-getcap and setcap binaries and manual pages.
+libcap is a library for getting and setting POSIX.1e (formerly POSIX 6)
+draft 15 capabilities.
 
+
 %package devel
-Summary: Header files and development dovumentation for libcap
-Group: tinysofa official
-Requires: %{name} = %{version}
+Summary: Development files for libcap
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
-Header files and development dovumentation for libcap.
+Development files (Headers, libraries for static linking, etc) for libcap.
 
+libcap is a library for getting and setting POSIX.1e (formerly POSIX 6)
+draft 15 capabilities.
+
+Install libcap-devel if you want to develop or compile applications using
+libcap.
+
+
 %prep
 %setup -q
+# FIXME: Is this really required still?
+%patch -p1 -b .ia64
+%ifarch alpha
+# FIXME: Is this really required still?
+%patch3 -p1 -b .alpha
+%endif
+%patch1 -p1 -b .userland
+%patch2 -p1 -b .shared
 
+
 %build
-make "COPTFLAGS=$RPM_OPT_FLAGS"
+%make PREFIX=%{_prefix} LIBDIR=%{_libdir} 
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
+%makeinstall FAKEROOT=${RPM_BUILD_ROOT} \
+             LIBDIR=${RPM_BUILD_ROOT}/%{_lib} \
+             SBINDIR=${RPM_BUILD_ROOT}/%{_sbindir} \
+             INCDIR=${RPM_BUILD_ROOT}/%{_includedir} \
+             MANDIR=${RPM_BUILD_ROOT}/%{_mandir}/ \
+             COPTFLAG="$RPM_OPT_FLAGS"
 
-make install \
-	FAKEROOT=$RPM_BUILD_ROOT \
-	MANDIR=$RPM_BUILD_ROOT%{_mandir}
+chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.*
 
-strip -s $RPM_BUILD_ROOT/lib/lib*so.*.*
 
-%post   -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(755,root,root)
-/lib/lib*.so.*.*
-/sbin/*
+/%{_lib}/*.so.*
+%{_sbindir}/*
 
 %files devel
 %defattr(644,root,root)
-%doc README
-/lib/lib*.so
-%{_mandir}/man[23]/*
-%{_includedir}/sys/capability.h
+%{_includedir}/*
+/%{_lib}/*.so
+%{_mandir}/man2/*
+%{_mandir}/man3/*
 
+
+%clean
+%clean_buildroot
+
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.10-10ts
-- current (1.10-9ts) integrated as 1.10-10ts for release 1.0-U1
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Fri Dec 12 2003 Erlend Midttun <erlendbm at trustix dot org> 1.10-6tr
-- Big rebuild
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 1.10-5tr
-- Big rebuild
+* Tue Jan 27 2004 Karsten Hopp <karsten at redhat.de> 1.10-17
+- use _manpath
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 1.10-4em
-- Rebuilt against glibc 2.3.2.
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Thu Aug 15 2002 Christian H. Toldnes <christht at trustix dot com> 1.10-3ct
-- Minor .spec cleanu for tsl 2.0
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
 
-* Tue Jun  5 2001 Oystein Viggen <oysteivi at trustix dot com>
-- Include .so in -devel package
-- Set correct package groups
+* Sat Jan  4 2003 Jeff Johnson <jbj at redhat.com> 1.10-14
+- set execute bits on library so that requires are generated.
 
-* Tue Mar 20 2001 Alexander Reelsen <ar at trustix dot com>
-- Adapted for TSL
\ No newline at end of file
+* Thu Nov 21 2002 Mike A. Harris <mharris at redhat.com> 1.10-13
+- Removed %%name macro sillyness from package Summary, description text, etc.
+- Removed archaic Prefix: tag
+- lib64 fixes everywhere to use _lib, _libdir, etc
+- Removed deletion of RPM_BUILD_DIR from %%clean section
+- Added -q flag to setup macro
+- Severely cleaned up spec file, and removed usage of perl
+
+* Fri Jul 19 2002 Jakub Jelinek <jakub at redhat.com> 1.10-12
+- CFLAGS was using COPTFLAG variable, not COPTFLAGS
+- build with -fpic
+- apply the IA-64 patch everywhere, use capget/capset from glibc,
+  not directly as _syscall (as it is broken on IA-32 with -fpic)
+- reenable alpha
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed May 29 2002 Bernhard Rosenkraenzer <bero at redhat.com> 1.10-10
+- Exclude alpha for now, apparent gcc bug.
+
+* Fri Nov  9 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.10-6
+- Fix sys/capabilities.h header (#55727)
+- Move to /lib, some applications seem to be using this rather early
+  (#55733)
+
+* Mon Jul 16 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+- Add post,postun scripts
+
+* Tue Jul 10 2001 Jakub Jelinek <jakub at redhat.com>
+- don't build libcap.so.1 with ld -shared, but gcc -shared
+
+* Wed Jun 20 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+- Rebuild - it was missing for alpha
+
+* Wed Jun 06 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- add s390/s390x support
+
+* Thu May 17 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.10-1
+- initial RPM
+- fix build on ia64


From svn at tinysofa.org  Mon Jun 14 16:41:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 15 Jun 2004 02:41:24 +1000 (EST)
Subject: [tinysofa-svn] 
	r1944 - in tinysofa/snapshot/mdadm/current: sources specs
Message-ID: <20040614164124.A97014E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-15 02:41:24 +1000 (Tue, 15 Jun 2004)
New Revision: 1944

Removed:
   tinysofa/snapshot/mdadm/current/sources/md.initd
   tinysofa/snapshot/mdadm/current/sources/md.sysconfig
Modified:
   tinysofa/snapshot/mdadm/current/sources/mdmonitor.init
   tinysofa/snapshot/mdadm/current/specs/mdadm.spec
Log:
- clean up spec file
- use tinysofa macros and groups
- remove unused source files


Deleted: tinysofa/snapshot/mdadm/current/sources/md.initd
===================================================================
--- tinysofa/snapshot/mdadm/current/sources/md.initd	2004-06-14 16:30:19 UTC (rev 1943)
+++ tinysofa/snapshot/mdadm/current/sources/md.initd	2004-06-14 16:41:24 UTC (rev 1944)
@@ -1,166 +0,0 @@
-#! /bin/sh
-#
-# md            assembly and activate multiple devices (aka MD)
-#
-# Author:       Goetz Bock <bock at trustix.org>
-#
-# chkconfig: - 06 94
-# description: assembly and activate multiple devices
-#
-### BEGIN INIT INFO
-# Required-Start:    rootfsrw
-# Default-Start:     2 3 4 5 
-# Default-Stop:      0 1 6
-# Short-Description: assembly and activate multiple devices
-### END INIT INFO
-
-# source functions script
-. /etc/sysconfig/rc
-. $rc_functions
-
-# source config file
-[ -f /etc/sysconfig/md ] && . /etc/sysconfig/md
-
-# options to use
-mdadmoptions=${mdadmoptions:-}
-
-# where to find the md administration tool
-MDADM=${MDADM:-/sbin/mdadm}
-
-
-# activate MD
-start () # {{{
-{
-    error=0
-
-    if [ "${MD:-yes}" = "yes" ]; then
-        if [ ! -x $MDADM ]; then
-            STRING=$"Activating Multiple Devices: $MDADM missing"
-            echo -n $STRING
-            skipped "$STRING"
-            echo
-            return 5
-        fi
-
-        if [ ! -f /proc/mdstat ]; then
-            STRING=$"Loading MD module"
-            echo -n $STRING
-
-            m=${MDMODULES:-"md"}
-            for i in $m ; do
-                modprobe $i || error=1
-            done
-
-            if [ "$error" = "0" ]; then
-                success "$STRING"
-                echo
-            else
-                failure "$STRING"
-                echo
-                return 7
-            fi
-        fi
-    else
-        # STRING=$"Activating Multiple Devices"
-        # echo -n $STRING
-        # skipped "$STRING"
-        # echo
-
-        return 6
-    fi
-
-    if [ " $MDIDS" = " " ] ; then
-        STRING=$"Activating all configured Multiple Device"
-        $MDADM $mdadmoptions -As > /dev/null
-        if [ "$?" = "0" ]; then
-            echo -n $STRING
-            success "$STRING"
-        else
-            echo -n $STRING
-            failure "$STRING"
-            error=1
-        fi
-        echo
-    else
-        for i in $MDIDS ; do
-            done=1
-            STRING=$"Activating Multiple Device $i"
-            $MDADM $mdadmoptions -As $i 2>&1 > /dev/null
-            if [ "$?" = "0" ]; then
-                echo -n $STRING
-                success "$STRING"
-            else
-                echo -n $STRING
-                failure "$STRING"
-                error=1
-            fi
-            echo
-        done
-    fi
-
-    [ "$error" = "1" ] && return 2
-
-    return 0
-} # }}}
-
-
-# stop MD
-stop ()  # {{{
-{ 
-    error=0
-
-    if [ -f /proc/mdstat ]; then
-        m=`cat /proc/mdstat | grep active | sed -e "s/ .*//"`
-
-        for i in $m; do
-            STRING=$"Deactivating Multiple Device /dev/$i"
-            $MDADM $mdadmoptions -S /dev/$i > /dev/null
-            if [ "$?" = "0" ]; then
-                echo -n $STRING
-                success "$STRING"
-            else
-                echo -n $STRING
-                failure "$STRING"
-                error=1
-            fi
-            echo
-        done
-
-        [ "$error" = "1" ] && exit 2;
-    else
-        STRING=$"Deactivating Multiple Devices"
-        echo -n $STRING
-        skipped "$STRING"
-        echo
-    fi
-
-    return 0
-} # }}}
-
-case "$1" in
-    start)
-        # we need a rw rootfs
-        need rootfsrw || exit_if_fatal_error
-
-        start
-        rc=$?
-        
-        pexit $rc md
-    ;;
-    stop)
-        stop
-
-        remove md
-    ;;
-    *)
-        echo "Usage: $0 {start|stop}"
-        exit 3
-    ;;
-esac
-
-exit 0
-
-# Modeline {{{
-# vim:syntax=sh ts=4 sw=4 et:
-# vim60:fdm=marker fdl=0 fdc=3 vb t_vb=:
-# }}}

Deleted: tinysofa/snapshot/mdadm/current/sources/md.sysconfig
===================================================================
--- tinysofa/snapshot/mdadm/current/sources/md.sysconfig	2004-06-14 16:30:19 UTC (rev 1943)
+++ tinysofa/snapshot/mdadm/current/sources/md.sysconfig	2004-06-14 16:41:24 UTC (rev 1944)
@@ -1,6 +0,0 @@
-# do you want MD
-MD=no
-# modules to load for multiple devices
-#MDMODULES="md"
-# MD IDs to activate
-#MDIDS=""

Modified: tinysofa/snapshot/mdadm/current/sources/mdmonitor.init
===================================================================
--- tinysofa/snapshot/mdadm/current/sources/mdmonitor.init	2004-06-14 16:30:19 UTC (rev 1943)
+++ tinysofa/snapshot/mdadm/current/sources/mdmonitor.init	2004-06-14 16:41:24 UTC (rev 1944)
@@ -27,7 +27,7 @@
 
 usage ()
 {
-    echo "Usage: service $prog {start|stop|status|restart|condrestart}"
+    echo "Usage: service $prog {start|stop|status|restart|try-restart}"
     RETVAL=1
 }
 
@@ -78,7 +78,7 @@
     stop) stop ;;
     status) status mdadm ;;
     restart|reload) restart ;;
-    condrestart) condrestart ;;
+    condrestart|try-restart) condrestart ;;
     *) usage ;;
 esac
 

Modified: tinysofa/snapshot/mdadm/current/specs/mdadm.spec
===================================================================
--- tinysofa/snapshot/mdadm/current/specs/mdadm.spec	2004-06-14 16:30:19 UTC (rev 1943)
+++ tinysofa/snapshot/mdadm/current/specs/mdadm.spec	2004-06-14 16:41:24 UTC (rev 1944)
@@ -1,20 +1,18 @@
 Summary: mdadm is used for controlling Linux md devices (aka RAID arrays)
 Name: mdadm
 Version: 1.5.0
-Release: 5ts
+Release: 6jh
 Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
-Source1: md.initd
-Source2: md.sysconfig
-Source3: mdmonitor.init
+Source1: mdmonitor.init
 Patch0: mdadm-1.5.0-email.patch
 URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/
 License: GPL
-Group: tinysofa official
-BuildRoot: %{_tmppath}/%{name}-root
+Group: tinysofa/main
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: mdctl
 BuildRequires: groff
 Requires: smtpdaemon
-PreReq: /sbin/chkconfig, /sbin/restart_maybe, /sbin/service
+%service_requires
 
 %description 
 mdadm is a program that can be used to create, manage, and monitor
@@ -38,35 +36,35 @@
 
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=%{_sbindir} install
+%makeinstall_std MANDIR=%{_mandir} BINDIR=%{_sbindir}
 
 install -D -m 600 mdadm.conf-example $RPM_BUILD_ROOT/%{_sysconfdir}/mdadm.conf
+install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
 
-install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initdir}/mdmonitor
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %doc TODO ChangeLog mdadm.conf-example COPYING
 %{_sbindir}/mdadm
-%{_initdir}/mdmonitor
+%{_initrddir}/mdmonitor
 %config(noreplace,missingok) %attr(600,root,root) %{_sysconfdir}/mdadm.conf
-#%config(noreplace) /etc/sysconfig/md
 %{_mandir}/man*/md*
 
+
 %post
-/sbin/chkconfig --add mdmonitor
-/sbin/restart_maybe mdmonitor
+%service_post mdmonitor
 
 %preun
-if [ "$1" = 0 ]; then
-	/sbin/service mdmonitor stop > /dev/null 2>&1 || :
-	/sbin/chkconfig --del mdmonitor || :
-fi
+%service_preun mdmonitor
 
+%postun
+%service_postun mdmonitor
+
+
 %changelog
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.5.0-5ts
 - current (1.5.0-5jh) integrated as 1.5.0-5ts for release 1.0-U1
@@ -148,4 +146,4 @@
 - updated for 0.7, fixed /usr/share/doc and added manpage
 
 * Tue Aug 07 2001 Danilo Godec <danci at agenda.si>
-- initial RPM build
\ No newline at end of file
+- initial RPM build


From svn at tinysofa.org  Tue Jun 15 18:12:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Jun 2004 04:12:10 +1000 (EST)
Subject: [tinysofa-svn] r1945 - in contrib: . dovecot dovecot/current
	dovecot/current/sources dovecot/current/specs
Message-ID: <20040615181210.60C384E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-16 04:12:09 +1000 (Wed, 16 Jun 2004)
New Revision: 1945

Added:
   contrib/dovecot/
   contrib/dovecot/current/
   contrib/dovecot/current/sources/
   contrib/dovecot/current/sources/dovecot-0.99.10.5.tar.gz
   contrib/dovecot/current/sources/dovecot-conf.patch
   contrib/dovecot/current/sources/dovecot.init
   contrib/dovecot/current/sources/dovecot.pam
   contrib/dovecot/current/specs/
   contrib/dovecot/current/specs/dovecot.spec
   contrib/dovecot/releases/
Log:
- add dovecot package


Added: contrib/dovecot/current/sources/dovecot-0.99.10.5.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/dovecot/current/sources/dovecot-0.99.10.5.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/dovecot/current/sources/dovecot-conf.patch
===================================================================
--- contrib/dovecot/current/sources/dovecot-conf.patch	2004-06-14 16:41:24 UTC (rev 1944)
+++ contrib/dovecot/current/sources/dovecot-conf.patch	2004-06-15 18:12:09 UTC (rev 1945)
@@ -0,0 +1,67 @@
+--- dovecot-0.99.10.5/dovecot-example.conf.config	2003-12-20 06:14:19.000000000 +0200
++++ dovecot-0.99.10.5/dovecot-example.conf	2004-06-15 20:51:10.000000000 +0300
+@@ -4,7 +4,7 @@
+ # any of the lines. Exception to this are paths, they're just examples
+ # with real defaults being based on configure options. The paths listed here
+ # are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+-# --with-ssldir=/etc/ssl
++# --with-ssldir=/usr/share/ssl
+ 
+ # Base directory where to store runtime data.
+ #base_dir = /var/run/dovecot/
+@@ -33,8 +33,8 @@
+ # dropping root privileges, so keep the key file unreadable by anyone but
+ # root. Included doc/mkcert.sh can be used to easily generate self-signed
+ # certificate, just make sure to update the domains in dovecot-openssl.cnf
+-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
+-#ssl_key_file = /etc/ssl/private/dovecot.pem
++#ssl_cert_file = /usr/share/ssl/certs/dovecot.pem
++#ssl_key_file = /usr/share/ssl/private/dovecot.pem
+ 
+ # SSL parameter file. Master process generates this file for login processes.
+ # It contains Diffie Hellman and RSA parameters.
+@@ -67,7 +67,7 @@
+ # Directory where authentication process places authentication UNIX sockets
+ # which login needs to be able to connect to. The sockets are created when
+ # running as root, so you don't have to worry about permissions.
+-#login_dir = /var/run/dovecot/login
++login_dir = /var/run/dovecot-login
+ 
+ # chroot login process to the login_dir. Only reason not to do this is if you
+ # wish to run the whole Dovecot without roots.
+@@ -187,7 +187,7 @@
+ #   mbox:~/mail/:INBOX=/var/mail/%u
+ #   mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
+ #
+-#default_mail_env = 
++default_mail_env = maildir:/home/users/%u/Maildir
+ 
+ # Space-separated list of fields to cache for all mails. Currently these
+ # fields are allowed followed by a list of commands they speed up:
+@@ -288,7 +288,7 @@
+ # with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl
+ # and flock. Some operating systems don't allow using both of them
+ # simultaneously, eg. BSDs. If dotlock is used, it's always created first.
+-#mbox_locks = dotlock fcntl
++mbox_locks = fcntl
+ 
+ # Should we create dotlock file even when we want only a read-lock? Setting
+ # this to yes hurts the performance when the mailbox is accessed simultaneously
+@@ -381,6 +381,7 @@
+ #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
+ #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
+ auth_userdb = passwd
++# auth_userdb = pgsql /usr/local/etc/dovecot-pgsql.conf
+ 
+ # Where password database is kept:
+ #   passwd: /etc/passwd or similiar, using getpwnam()
+@@ -390,7 +391,8 @@
+ #   vpopmail: vpopmail authentication
+ #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
+ #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
+-auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
++# auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
++auth_passdb = pam
+ 
+ #auth_executable = /usr/libexec/dovecot/dovecot-auth
+ 

Added: contrib/dovecot/current/sources/dovecot.init
===================================================================
--- contrib/dovecot/current/sources/dovecot.init	2004-06-14 16:41:24 UTC (rev 1944)
+++ contrib/dovecot/current/sources/dovecot.init	2004-06-15 18:12:09 UTC (rev 1945)
@@ -0,0 +1,72 @@
+#!/bin/bash
+#
+#	/etc/rc.d/init.d/dovecot
+#
+# Starts the dovecot daemon
+#
+# chkconfig: - 54 54
+# description: Dovecot Imap Server
+# processname: dovecot
+
+# Source function library.
+if [ -f /etc/init.d/functions ]; then
+  . /etc/init.d/functions
+elif [ -f /etc/rc.d/init.d/functions ]; then
+  . /etc/rc.d/init.d/functions
+else
+  exit 0
+fi
+
+test -x /usr/sbin/dovecot || exit 0
+
+RETVAL=0
+prog="dovecot IMAP"
+
+start() {
+        echo -n $"Starting $prog: "
+	daemon /usr/sbin/dovecot
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch ${INITLOCK:-/var/log/subsys}/dovecot
+	echo
+}
+
+stop() {
+	echo -n $"Stopping $prog: "
+	killproc /usr/sbin/dovecot
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && rm -f ${INITLOCK:-/var/log/subsys}/dovecot
+	echo
+}
+
+#
+#	See how we were called.
+#
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  reload|restart)
+	stop
+	start
+	RETVAL=$?
+	;;
+  condrestart|try-restart)
+	if [ -f ${INITLOCK:-/var/log/subsys}/dovecot ]; then
+	    stop
+	    start
+	fi
+	;;
+  status)
+	status /usr/sbin/dovecot
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $0 {try-restart|start|stop|restart|reload|status}"
+	exit 1
+esac
+
+exit $RETVAL
+


Property changes on: contrib/dovecot/current/sources/dovecot.init
___________________________________________________________________
Name: svn:executable
   + *

Added: contrib/dovecot/current/sources/dovecot.pam
===================================================================
--- contrib/dovecot/current/sources/dovecot.pam	2004-06-14 16:41:24 UTC (rev 1944)
+++ contrib/dovecot/current/sources/dovecot.pam	2004-06-15 18:12:09 UTC (rev 1945)
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       required     pam_nologin.so
+auth       required     pam_stack.so service=system-auth
+account    required     pam_stack.so service=system-auth
+session    required     pam_stack.so service=system-auth

Added: contrib/dovecot/current/specs/dovecot.spec
===================================================================
--- contrib/dovecot/current/specs/dovecot.spec	2004-06-14 16:41:24 UTC (rev 1944)
+++ contrib/dovecot/current/specs/dovecot.spec	2004-06-15 18:12:09 UTC (rev 1945)
@@ -0,0 +1,221 @@
+Summary: Dovecot Secure imap server
+Name: dovecot
+Version: 0.99.10.5
+Release: 1jh
+License: GPL
+Group: tinysofa/contrib/main
+Source: %{name}-%{version}.tar.gz
+Source1: dovecot.init
+Source2: dovecot.pam
+Patch100: dovecot-conf.patch
+
+# Patches 500+ from upstream fixes
+URL: http://dovecot.procontrol.fi/
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: openssl-devel
+BuildRequires: openldap-devel
+BuildRequires: pam-devel
+BuildRequires: pkgconfig
+BuildRequires: zlib-devel
+Prereq: openssl
+%service_requires
+
+%description
+Dovecot is an IMAP server for Linux/UNIX-like systems, written with security 
+primarily in mind.  It also contains a small POP3 server.  It supports mail 
+in either of maildir or mbox formats.
+
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch100 -p1 -b .config
+
+
+%build
+%configure \
+	--with-ssl=openssl \
+	--with-ssldir=/usr/share/ssl \
+	--with-ldap
+
+%make
+
+
+%install
+%makeinstall
+
+%{__mkdir_p} \
+	%{buildroot}%{_sysconfdir} \
+	%{buildroot}%{_initrddir} \
+	%{buildroot}%{_sysconfdir}/pam.d \
+	%{buildroot}%{_datadir}/ssl/{certs,private} \
+	%{buildroot}%{_localstatedir}/run/dovecot \
+	%{buildroot}%{_localstatedir}/run/dovecot-login
+
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}
+
+install -m 644 dovecot-example.conf %{buildroot}%{_sysconfdir}/dovecot.conf
+install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/dovecot
+
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/dovecot
+
+# generate ghost .pem file
+touch %{buildroot}%{_datadir}/ssl/{certs,private}/dovecot.pem
+chmod 600 %{buildroot}%{_datadir}/ssl/{certs,private}/dovecot.pem
+
+# the dovecot make install installs docs.  blah.
+rm -rf %{buildroot}%{_docdir}/%{name}
+rm -f %{buildroot}%{_sysconfdir}/dovecot-example.conf
+
+
+%pre
+%groupadd dovecot 97
+%useradd dovecot 97 dovecot -s /sbin/nologin -d /usr/libexec/dovecot
+
+%post
+%service_post dovecot
+
+# create a ssl cert
+if [ ! -f %{_datadir}/ssl/certs/dovecot.pem ]; then
+	pushd %{_datadir}/ssl &>/dev/null
+	umask 077
+	cat << EOF | openssl req -new -x509 -days 365 -nodes -out certs/dovecot.pem -keyout private/dovecot.pem &>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+localhost.localdomain
+root at localhost.localdomain
+EOF
+
+	chown root:root private/dovecot.pem certs/dovecot.pem
+	chmod 600 private/dovecot.pem certs/dovecot.pem
+	popd &>/dev/null
+fi
+exit 0
+
+%preun
+if [ $1 = 0 ]; then
+	%userdel dovecot
+	%groupdel dovecot
+fi
+%service_preun dovecot
+
+%postun
+%service_postun dovecot
+
+
+%clean
+%clean_buildroot
+
+%files
+%defattr(-,root,root)
+%doc doc/*.txt doc/dovecot-openssl.cnf doc/mkcert.sh INSTALL AUTHORS ChangeLog COPYING TODO README NEWS COPYING.LGPL
+%config(noreplace) %{_sysconfdir}/dovecot.conf
+%config %{_initrddir}/dovecot
+%config %{_sysconfdir}/pam.d/dovecot
+%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_datadir}/ssl/certs/dovecot.pem
+%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_datadir}/ssl/private/dovecot.pem
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/*
+%{_sbindir}/dovecot
+%dir /var/run/dovecot
+%attr(0750,root,dovecot) %dir /var/run/dovecot-login
+
+
+%changelog
+* Tue Jun 15 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.99.10.5-1jh
+- port to tinysofa
+
+* Thu May 27 2004 David Woodhouse <dwmw2 at redhat.com> 0.99.10.5-1
+- Update to 0.99.10.5 to fix maildir segfaults (#123022)
+
+* Fri May 07 2004 Warren Togami <wtogami at redhat.com> 0.99.10.4-4
+- default auth config that is actually usable
+- Timo Sirainen (author) suggested functionality fixes
+  maildir, imap-fetch-body-section, customflags-fix
+
+* Mon Feb 23 2004 Tim Waugh <twaugh at redhat.com>
+- Use ':' instead of '.' as separator for chown.
+
+* Tue Feb 17 2004 Jeremy Katz <katzj at redhat.com> - 0.99.10.4-3
+- restart properly if it dies (#115594)
+
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Mon Nov 24 2003 Jeremy Katz <katzj at redhat.com> 0.99.10.4-1
+- update to 0.99.10.4
+
+* Mon Oct  6 2003 Jeremy Katz <katzj at redhat.com> 0.99.10-7
+- another patch from upstream to fix returning invalid data on partial 
+  BODY[part] fetches
+- patch to avoid confusion of draft/deleted in indexes
+
+* Tue Sep 23 2003 Jeremy Katz <katzj at redhat.com> 0.99.10-6
+- add some patches from upstream (#104288)
+
+* Thu Sep  4 2003 Jeremy Katz <katzj at redhat.com> 0.99.10-5
+- fix startup with 2.6 with patch from upstream (#103801)
+
+* Tue Sep  2 2003 Jeremy Katz <katzj at redhat.com> 0.99.10-4
+- fix assert in search code (#103383)
+
+* Tue Jul 22 2003 Nalin Dahyabhai <nalin at redhat.com> 0.99.10-3
+- rebuild
+
+* Thu Jul 17 2003 Bill Nottingham <notting at redhat.com> 0.99.10-2
+- don't run by default
+
+* Thu Jun 26 2003 Jeremy Katz <katzj at redhat.com> 0.99.10-1
+- 0.99.10
+
+* Mon Jun 23 2003 Jeremy Katz <katzj at redhat.com> 0.99.10-0.2
+- 0.99.10-rc2 (includes ssl detection fix)
+- a few tweaks from fedora
+  - noreplace the config file
+  - configure --with-ldap to get LDAP enabled
+
+* Mon Jun 23 2003 Jeremy Katz <katzj at redhat.com> 0.99.10-0.1
+- 0.99.10-rc1
+- add fix for ssl detection
+- add zlib-devel to BuildRequires
+- change pam service name to dovecot
+- include pam config
+
+* Thu May  8 2003 Jeremy Katz <katzj at redhat.com> 0.99.9.1-1
+- update to 0.99.9.1
+- add patch from upstream to fix potential bug when fetching with 
+  CR+LF linefeeds
+- tweak some things in the initscript and config file noticed by the 
+  fedora folks
+
+* Sun Mar 16 2003 Jeremy Katz <katzj at redhat.com> 0.99.8.1-2
+- fix ssl dir
+- own /var/run/dovecot/login with the correct perms
+- fix chmod/chown in post
+
+* Fri Mar 14 2003 Jeremy Katz <katzj at redhat.com> 0.99.8.1-1
+- update to 0.99.8.1
+
+* Tue Mar 11 2003 Jeremy Katz <katzj at redhat.com> 0.99.8-2
+- add a patch to fix quoting problem from CVS
+
+* Mon Mar 10 2003 Jeremy Katz <katzj at redhat.com> 0.99.8-1
+- 0.99.8
+- add some buildrequires
+- fixup to build with openssl 0.9.7
+- now includes a pop3 daemon (off by default)
+- clean up description and %%preun
+- add dovecot user (uid/gid of 97)
+- add some buildrequires
+- move the ssl cert to %{_datadir}/ssl/certs
+- create a dummy ssl cert in %post
+- own /var/run/dovecot
+- make the config file a source so we get default mbox locks of fcntl
+
+* Sun Dec  1 2002 Seth Vidal <skvidal at phy.duke.edu>
+- 0.99.4 and fix startup so it starts imap-master not vsftpd :)
+
+* Tue Nov 26 2002 Seth Vidal <skvidal at phy.duke.edu>
+- first build


From svn at tinysofa.org  Tue Jun 15 19:46:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Jun 2004 05:46:41 +1000 (EST)
Subject: [tinysofa-svn] r1946 - contrib/rdiff-backup
Message-ID: <20040615194641.1FF314E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-16 05:46:40 +1000 (Wed, 16 Jun 2004)
New Revision: 1946

Added:
   contrib/rdiff-backup/current/
Log:
- copy 0.12.6-2jh to current


Copied: contrib/rdiff-backup/current (from rev 1945, contrib/rdiff-backup/releases/0.12.6/2jh)


From svn at tinysofa.org  Tue Jun 15 19:56:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Jun 2004 05:56:43 +1000 (EST)
Subject: [tinysofa-svn] r1947 - contrib/rdiff-backup
Message-ID: <20040615195643.BFE604E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-16 05:56:43 +1000 (Wed, 16 Jun 2004)
New Revision: 1947

Added:
   contrib/rdiff-backup/pristine/
Log:
- target pristine


Copied: contrib/rdiff-backup/pristine (from rev 1946, contrib/rdiff-backup/releases/0.12.6/2jh)


From svn at tinysofa.org  Tue Jun 15 19:57:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Jun 2004 05:57:50 +1000 (EST)
Subject: [tinysofa-svn] r1948 - contrib/irssi
Message-ID: <20040615195750.9F88D4E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-16 05:57:50 +1000 (Wed, 16 Jun 2004)
New Revision: 1948

Added:
   contrib/irssi/pristine/
Log:
- target pristine


Copied: contrib/irssi/pristine (from rev 1947, contrib/irssi/releases/0.8.9/1ok)


From svn at tinysofa.org  Tue Jun 15 20:12:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 16 Jun 2004 06:12:15 +1000 (EST)
Subject: [tinysofa-svn] 
	r1949 - in contrib/rdiff-backup/current: sources specs
Message-ID: <20040615201215.9B2474E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-16 06:12:15 +1000 (Wed, 16 Jun 2004)
New Revision: 1949

Added:
   contrib/rdiff-backup/current/sources/rdiff-backup-0.12.7.tar.gz
Removed:
   contrib/rdiff-backup/current/sources/rdiff-backup-0.12.6.tar.gz
Modified:
   contrib/rdiff-backup/current/specs/rdiff-backup.spec
Log:
- new upstream
- use new macros and groups


Deleted: contrib/rdiff-backup/current/sources/rdiff-backup-0.12.6.tar.gz
===================================================================
(Binary files differ)

Added: contrib/rdiff-backup/current/sources/rdiff-backup-0.12.7.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/rdiff-backup/current/sources/rdiff-backup-0.12.7.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/rdiff-backup/current/specs/rdiff-backup.spec
===================================================================
--- contrib/rdiff-backup/current/specs/rdiff-backup.spec	2004-06-15 19:57:50 UTC (rev 1948)
+++ contrib/rdiff-backup/current/specs/rdiff-backup.spec	2004-06-15 20:12:15 UTC (rev 1949)
@@ -1,19 +1,15 @@
-%define PYTHON_VERSION %(python -c 'import sys; sys.stdout.write(".".join(map(str,sys.version_info[:2])))')
-%define NEXT_PYTHON_VERSION %(python -c 'import sys; sys.stdout.write(str(sys.version_info[0])); sys.stdout.write("."); sys.stdout.write(str(sys.version_info[1]+1))')
-
-Version:	0.12.6
+Version:	0.12.7
 Summary:	Convenient and transparent local/remote incremental mirror/backup
 Name:		rdiff-backup
-Release:	2jh
+Release:	1jh
 URL:		http://rdiff-backup.stanford.edu/
 Source:		http://rdiff-backup.stanford.edu/OLD/%{version}/%{name}-%{version}.tar.gz
 License:	GPL
-Group:		tinysofa contrib
-BuildRoot:	%{_tmppath}/%{name}-root
-Requires:	python >= %{PYTHON_VERSION}, python < %{NEXT_PYTHON_VERSION}
-BuildRequires:	python-devel >= 2.2, librsync-devel >= 0.9.6
+Group:		tinysofa/contrib/extra
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+%py_requires -d
+BuildRequires:	librsync-devel >= 0.9.6
 
-
 %description
 rdiff-backup is a script, written in Python, that backs up one
 directory to another and is intended to be run periodically (nightly
@@ -36,20 +32,18 @@
 
 
 %install
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && %{__rm} -rf -- "%{buildroot}"
-
 %{__python} setup.py install --root %{buildroot}
 
 
 %clean
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && %{__rm} -rf -- "%{buildroot}"
+%clean_buildroot
 
 
 %files
 %defattr(-,root,root)
 %{_bindir}/rdiff-backup
 %{_mandir}/man1/rdiff-backup*
-%{_libdir}/python%{PYTHON_VERSION}/site-packages/rdiff_backup
+%{py_sitedir}/rdiff_backup
 %doc CHANGELOG COPYING FAQ.html examples.html README
 
 


From svn at tinysofa.org  Thu Jun 17 14:40:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 00:40:27 +1000 (EST)
Subject: [tinysofa-svn] 
	r1950 - in tinysofa/snapshot/dhcp/current: sources specs
Message-ID: <20040617144027.D74474E8038@minbar.tinysofa.org>

Author: jh
Date: 2004-06-18 00:40:27 +1000 (Fri, 18 Jun 2004)
New Revision: 1950

Modified:
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch
   tinysofa/snapshot/dhcp/current/specs/dhcp.spec
Log:
- no need to generate /etc/ntp/step-tickers for tinysofa


Modified: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch	2004-06-15 20:12:15 UTC (rev 1949)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch	2004-06-17 14:40:27 UTC (rev 1950)
@@ -108,12 +108,12 @@
 +authenticate yes
 +keys /etc/ntp/keys
 +EOF
-+      save_previous /etc/ntp/step-tickers
-+      echo '# generated by /sbin/dhclient-script' > /etc/ntp/step-tickers
++      #save_previous /etc/ntp/step-tickers
++      #echo '# generated by /sbin/dhclient-script' > /etc/ntp/step-tickers
 +      for I in $new_ntp_servers; do
 +          echo "restrict $I nomodify notrap noquery" >> /etc/ntp.conf
 +	  echo "server $I" >> /etc/ntp.conf
-+	  echo "$I" >> /etc/ntp/step-tickers
++	  #echo "$I" >> /etc/ntp/step-tickers
 +      done
 +  fi
 +

Modified: tinysofa/snapshot/dhcp/current/specs/dhcp.spec
===================================================================
--- tinysofa/snapshot/dhcp/current/specs/dhcp.spec	2004-06-15 20:12:15 UTC (rev 1949)
+++ tinysofa/snapshot/dhcp/current/specs/dhcp.spec	2004-06-17 14:40:27 UTC (rev 1950)
@@ -1,7 +1,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name: dhcp
 Version: 3.0.1rc13
-Release: 1jh
+Release: 2jh
 License: distributable
 Group: tinysofa/main
 URL: http://isc.org/products/DHCP/


From svn at tinysofa.org  Thu Jun 17 14:51:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 00:51:44 +1000 (EST)
Subject: [tinysofa-svn] r1951 - tinysofa/releases/1.0
Message-ID: <20040617145144.EA2884E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 00:51:44 +1000 (Fri, 18 Jun 2004)
New Revision: 1951

Added:
   tinysofa/releases/1.0/snapshot/
Log:
- Create 1.0 release tree for 1.0 maintainence.


Copied: tinysofa/releases/1.0/snapshot (from rev 1859, tinysofa/snapshot)


From svn at tinysofa.org  Thu Jun 17 14:54:18 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 00:54:18 +1000 (EST)
Subject: [tinysofa-svn] r1952 - tinysofa/releases
Message-ID: <20040617145418.0DDDA4E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 00:54:17 +1000 (Fri, 18 Jun 2004)
New Revision: 1952

Removed:
   tinysofa/releases/1.0/
Log:
- Do this properly.



From svn at tinysofa.org  Thu Jun 17 14:54:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 00:54:32 +1000 (EST)
Subject: [tinysofa-svn] r1953 - tinysofa/releases
Message-ID: <20040617145432.2AE004E8038@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 00:54:31 +1000 (Fri, 18 Jun 2004)
New Revision: 1953

Added:
   tinysofa/releases/1.0/
Log:
- Do this properly.


Copied: tinysofa/releases/1.0 (from rev 1859, tinysofa/snapshot)


From svn at tinysofa.org  Thu Jun 17 15:32:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 01:32:47 +1000 (EST)
Subject: [tinysofa-svn] 
	r1954 - in tinysofa/releases/1.0/kerberos5/current: sources specs
Message-ID: <20040617153247.2038E4E81BF@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 01:32:46 +1000 (Fri, 18 Jun 2004)
New Revision: 1954

Modified:
   tinysofa/releases/1.0/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
   tinysofa/releases/1.0/kerberos5/current/specs/kerberos5.spec
Log:
- Update krb5 MIT patch.


Modified: tinysofa/releases/1.0/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
===================================================================
--- tinysofa/releases/1.0/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch	2004-06-17 14:54:31 UTC (rev 1953)
+++ tinysofa/releases/1.0/kerberos5/current/sources/krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch	2004-06-17 15:32:46 UTC (rev 1954)
@@ -1,6 +1,5 @@
-diff -urN krb5-1.3.3/src/lib/krb5/os/an_to_ln.c krb5-1.3.3.MITKRB5-SA-2004-001/src/lib/krb5/os/an_to_ln.c
---- krb5-1.3.3/src/lib/krb5/os/an_to_ln.c	2002-09-04 05:29:34.000000000 +1000
-+++ krb5-1.3.3.MITKRB5-SA-2004-001/src/lib/krb5/os/an_to_ln.c	2004-06-02 20:45:37.000000000 +1000
+--- krb5-1.3.3/src/lib/krb5/os/an_to_ln.c	2002-09-03 22:29:34.000000000 +0300
++++ krb5-1.3.3.MITKRB5-SA-2004-001/src/lib/krb5/os/an_to_ln.c	2004-06-04 19:00:57.000000000 +0300
 @@ -270,9 +270,14 @@
   * If no regcomp() then just return the input string verbatim in the output
   * string.
@@ -41,7 +40,7 @@
  		strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
  		matched = 0;
  	    }
-@@ -322,17 +332,21 @@
+@@ -322,17 +332,22 @@
  	    sdispl = (size_t) (loc1 - cp);
  	    edispl = (size_t) (loc2 - cp);
  	    if (sdispl) {
@@ -53,9 +52,11 @@
  	    strncpy(op, repl, MAX_FORMAT_BUFFER - 1 - (op - out));
  	    op += strlen(repl);
  	    cp += edispl;
- 	    if (!doall)
+-	    if (!doall)
++	    if (!doall) {
 +		use_bytes(strlen(cp));
  		strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
++	    }
  	    matched = 1;
  	}
  	else {
@@ -63,7 +64,7 @@
  	    strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
  	    matched = 0;
  	}
-@@ -340,7 +354,15 @@
+@@ -340,7 +355,15 @@
  #else	/* HAVE_REGEXP_H */
      memcpy(out, in, MAX_FORMAT_BUFFER);
  #endif	/* HAVE_REGCOMP */
@@ -79,7 +80,7 @@
  
  /*
   * aname_replacer()	- Perform the specified substitutions on the input
-@@ -412,7 +434,12 @@
+@@ -412,7 +435,12 @@
  
  		    /* Do the replacemenbt */
  		    memset(out, '\0', MAX_FORMAT_BUFFER);
@@ -93,7 +94,7 @@
  		    free(rule);
  		    free(repl);
  
-@@ -459,6 +486,7 @@
+@@ -459,6 +487,7 @@
      char		*fprincname;
      char		*selstring = 0;
      int			num_comps, compind;
@@ -101,7 +102,7 @@
      char		*cout;
      krb5_data		*datap;
      char		*outstring;
-@@ -479,6 +507,7 @@
+@@ -479,6 +508,7 @@
  		     */
  		    current = strchr(current, ':');
  		    selstring = (char *) malloc(MAX_FORMAT_BUFFER);
@@ -109,7 +110,7 @@
  		    if (current && selstring) {
  			current++;
  			cout = selstring;
-@@ -497,6 +526,14 @@
+@@ -497,6 +527,14 @@
  								  aname,
  								  compind-1))
  				    ) {
@@ -124,7 +125,7 @@
  				    strncpy(cout,
  					    datap->data,
  					    (unsigned) datap->length);
-@@ -527,7 +564,7 @@
+@@ -527,7 +565,7 @@
  			else
  			    kret = KRB5_CONFIG_BADFORMAT;
  
@@ -133,7 +134,7 @@
  			    free(selstring);
  		    }
  		}
-@@ -643,7 +680,7 @@
+@@ -643,7 +681,7 @@
      const char		*hierarchy[5];
      char		**mapping_values;
      int			i, nvalid;
@@ -142,7 +143,7 @@
      char		*typep, *argp;
      unsigned int        lnsize;
  
-@@ -677,11 +714,14 @@
+@@ -677,11 +715,14 @@
  
  		    /* Just use the last one. */
  		    /* Trim the value. */

Modified: tinysofa/releases/1.0/kerberos5/current/specs/kerberos5.spec
===================================================================
--- tinysofa/releases/1.0/kerberos5/current/specs/kerberos5.spec	2004-06-17 14:54:31 UTC (rev 1953)
+++ tinysofa/releases/1.0/kerberos5/current/specs/kerberos5.spec	2004-06-17 15:32:46 UTC (rev 1954)
@@ -77,6 +77,9 @@
 %attr(755,root,root) %{_libdir}/*.so
 
 %changelog
+* Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
+- Update MIT patch to latest version of vuln fix.
+
 * Wed Jun 02 2004 tsintegrate <release at tinysofa dot org> 1.3.3-3ts
 - current (1.3.3-3ok) integrated as 1.3.3-3ts for release 1.0-U1
 


From svn at tinysofa.org  Thu Jun 17 15:40:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 01:40:59 +1000 (EST)
Subject: [tinysofa-svn] 
	r1955 - in tinysofa/releases/1.0/kernel/current: sources specs
Message-ID: <20040617154059.4E5D14E81BF@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 01:40:59 +1000 (Fri, 18 Jun 2004)
New Revision: 1955

Added:
   tinysofa/releases/1.0/kernel/current/sources/linux-2.4.27-bk-1.1456.patch.bz2
Removed:
   tinysofa/releases/1.0/kernel/current/sources/2.4.27-1.1410.patch.bz2
Modified:
   tinysofa/releases/1.0/kernel/current/specs/kernel.spec
Log:
- Update to 2.4.27-pre6.
- Fix CAN-2004-0554.


Deleted: tinysofa/releases/1.0/kernel/current/sources/2.4.27-1.1410.patch.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.0/kernel/current/sources/linux-2.4.27-bk-1.1456.patch.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/kernel/current/sources/linux-2.4.27-bk-1.1456.patch.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.0/kernel/current/specs/kernel.spec	2004-06-17 15:32:46 UTC (rev 1954)
+++ tinysofa/releases/1.0/kernel/current/specs/kernel.spec	2004-06-17 15:40:59 UTC (rev 1955)
@@ -52,7 +52,7 @@
 # -------
 #
 
-Patch0: 2.4.27-1.1410.patch.bz2
+Patch0: linux-2.4.27-bk-1.1456.patch.bz2
 
 #
 # Bug fixes
@@ -563,6 +563,10 @@
 %endif
 
 %changelog
+* Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
+- Update to 2.4.27-pre6, ChangeSet 1.1456.
+- Fixes CAN-2004-0554.
+
 * Thu May 20 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.4.26-7jh
 - fix /usr/share/man/man8/ksymoops.8.gz permissions
 


From svn at tinysofa.org  Thu Jun 17 15:44:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 01:44:41 +1000 (EST)
Subject: [tinysofa-svn] r1956 - tinysofa/releases/1.0
Message-ID: <20040617154441.68D024E81BF@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 01:44:41 +1000 (Fri, 18 Jun 2004)
New Revision: 1956

Added:
   tinysofa/releases/1.0/links/
Log:
- Add links to 1.0-U2.


Copied: tinysofa/releases/1.0/links (from rev 1955, tinysofa/snapshot/links)


From svn at tinysofa.org  Thu Jun 17 15:45:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 01:45:05 +1000 (EST)
Subject: [tinysofa-svn] r1957 - tinysofa/releases/1.0
Message-ID: <20040617154505.B10184E81BF@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 01:45:05 +1000 (Fri, 18 Jun 2004)
New Revision: 1957

Removed:
   tinysofa/releases/1.0/lynx/
Log:
- Remove lynx from 1.0-U2.



From svn at tinysofa.org  Thu Jun 17 15:51:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 01:51:07 +1000 (EST)
Subject: [tinysofa-svn] r1958 - tinysofa/releases/1.0/links/current/specs
Message-ID: <20040617155107.005324E81BF@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 01:51:07 +1000 (Fri, 18 Jun 2004)
New Revision: 1958

Modified:
   tinysofa/releases/1.0/links/current/specs/links.spec
Log:
- Fix spec for 1.0-U2.


Modified: tinysofa/releases/1.0/links/current/specs/links.spec
===================================================================
--- tinysofa/releases/1.0/links/current/specs/links.spec	2004-06-17 15:45:05 UTC (rev 1957)
+++ tinysofa/releases/1.0/links/current/specs/links.spec	2004-06-17 15:51:07 UTC (rev 1958)
@@ -5,33 +5,21 @@
 Release: 1ok
 License: GPL
 Summary: Links is a text-only browser very similar to lynx.
-Summary(pt_BR): O links ? um browser para modo texto, similar ao lynx.
-Summary(es): El links es un browser para modo texto, similar a lynx.
-Group: tinysofa/main
-Group(pt_BR): tinysofa/main
-Group(es): tinysofa/main
+Group: tinysofa official
 URL: http://atrey.karlin.mff.cuni.cz/~clock/twibright/links
 Source: ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/links/%{name}-%{version}.tar.bz2
 Source1: %{ename}.cfg
 BuildRequires: openssl-devel >= 0.9.7
-BuildRequires: %{mklibname z -d}
+BuildRequires: zlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Conflicts: elinks
-%rename lynx
+Provides: lynx
+Obsoletes: lynx
 
 %description
 Links is a text WWW browser, similar to Lynx. Links displays tables, downloads
 on background and uses HTTP/1.1 keepalive connections.
 
-%description -l pt_BR
-Links ? um browser WWW modo texto, similar ao Lynx.
-O Links exibe tabelas, baixa arquivos em segundo plano,
-e usa as conex?es HTTP/1.1 keepalive.
-
-%description -l es
-Links es un browser WWW modo texto, similar al Lynx. El links muestra tablas,
-hace baja archivos en segundo plano, y usa conexiones HTTP/1.1 keepalive.
-
 %prep
 %setup -q 
 


From svn at tinysofa.org  Thu Jun 17 16:04:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 02:04:53 +1000 (EST)
Subject: [tinysofa-svn] 
	r1959 - in tinysofa/releases/1.0/apache/current: sources specs
Message-ID: <20040617160453.240604E8308@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 02:04:50 +1000 (Fri, 18 Jun 2004)
New Revision: 1959

Modified:
   tinysofa/releases/1.0/apache/current/sources/httpd.log
   tinysofa/releases/1.0/apache/current/specs/apache.spec
Log:
- Fix logrotate script.


Modified: tinysofa/releases/1.0/apache/current/sources/httpd.log
===================================================================
--- tinysofa/releases/1.0/apache/current/sources/httpd.log	2004-06-17 15:51:07 UTC (rev 1958)
+++ tinysofa/releases/1.0/apache/current/sources/httpd.log	2004-06-17 16:04:50 UTC (rev 1959)
@@ -1,16 +1,8 @@
-/var/log/httpd/access_log {
+/var/log/httpd/*log {
     missingok
     notifempty
+    sharedscripts
     postrotate
-	/usr/bin/killall -HUP httpd
+        /bin/kill -USR1 `cat /var/run/httpd.pid 2>/dev/null` 2> /dev/null || true
     endscript
 }
-
-/var/log/httpd/error_log {
-    missingok
-    notifempty
-    postrotate
-	/usr/bin/killall -HUP httpd
-    endscript
-}
-

Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-17 15:51:07 UTC (rev 1958)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-17 16:04:50 UTC (rev 1959)
@@ -397,6 +397,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
+- Fix logrotate script.
+
 * Wed Jun 02 2004 tsintegrate <release at tinysofa dot org> 2.0.49-9ts
 - current (2.0.49-9ok) integrated as 2.0.49-9ts for release 1.0-U1
 


From svn at tinysofa.org  Thu Jun 17 16:10:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 02:10:53 +1000 (EST)
Subject: [tinysofa-svn] 
	r1960 - in tinysofa/releases/1.0/swup/current: sources specs
Message-ID: <20040617161053.C8BE74E8308@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 02:10:50 +1000 (Fri, 18 Jun 2004)
New Revision: 1960

Added:
   tinysofa/releases/1.0/swup/current/sources/swup-2.4.6-multi-providers.patch
Modified:
   tinysofa/releases/1.0/swup/current/specs/swup.spec
Log:
- Add multi-providers patch.


Added: tinysofa/releases/1.0/swup/current/sources/swup-2.4.6-multi-providers.patch
===================================================================
--- tinysofa/releases/1.0/swup/current/sources/swup-2.4.6-multi-providers.patch	2004-06-17 16:04:50 UTC (rev 1959)
+++ tinysofa/releases/1.0/swup/current/sources/swup-2.4.6-multi-providers.patch	2004-06-17 16:10:50 UTC (rev 1960)
@@ -0,0 +1,28 @@
+diff -urN swup-2.4.6/swup/resolver.py swup-2.4.6-multi-providers/swup/resolver.py
+--- swup-2.4.6/swup/resolver.py	2004-05-12 23:34:35.000000000 +1000
++++ swup-2.4.6-multi-providers/swup/resolver.py	2004-06-18 02:09:05.000000000 +1000
+@@ -540,15 +540,15 @@
+                             if install_flag == OK:
+                                 pkg_found = True
+                                 continue
+-                            #
+-                            # Not excluded, prefect! :)
+-                            #
+-                            reqname = resname
+-                            reqversion = resver
+-                            reqrelease = resrel
+-                            requri = resuri
+-                            pkg_found = True
+-                            continue
++                        #
++                        # Not excluded, prefect! :)
++                        #
++                        reqname = resname
++                        reqversion = resver
++                        reqrelease = resrel
++                        requri = resuri
++                        pkg_found = True
++                        continue
+                     
+                     isinstalled = self.is_installed(resname, '>=',
+                                                     resver, resrel)

Modified: tinysofa/releases/1.0/swup/current/specs/swup.spec
===================================================================
--- tinysofa/releases/1.0/swup/current/specs/swup.spec	2004-06-17 16:04:50 UTC (rev 1959)
+++ tinysofa/releases/1.0/swup/current/specs/swup.spec	2004-06-17 16:10:50 UTC (rev 1960)
@@ -6,6 +6,7 @@
 Group: tinysofa official
 Source0: %{name}-%{version}.tar.bz2
 Patch0: swup-2.4.3-public-key-error.patch
+Patch1: swup-2.4.6-multi-providers.patch
 ExclusiveOs: Linux
 Requires: rpm, rpm-python, gnupg, swupconf, sysklogd
 PreReq: python >= 2.2
@@ -56,6 +57,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT}
@@ -142,6 +144,9 @@
 %ghost /etc/cron.weekly/swup.cron
 
 %changelog
+* Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
+- Add swup-2.4.6-multi-providers.patch from jh.
+
 * Mon May 24 2004 tsintegrate <release at tinysofa dot org> 2.4.6-1ts
 - current (2.4.6-1th) integrated as 2.4.6-1ts for release 1.0-U1
 


From svn at tinysofa.org  Thu Jun 17 16:15:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 02:15:35 +1000 (EST)
Subject: [tinysofa-svn] 
	r1961 - in tinysofa/releases/1.0/mod_php4/current: sources specs
Message-ID: <20040617161535.7C4854E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 02:15:35 +1000 (Fri, 18 Jun 2004)
New Revision: 1961

Added:
   tinysofa/releases/1.0/mod_php4/current/sources/php-4.3.7.tar.bz2
Removed:
   tinysofa/releases/1.0/mod_php4/current/sources/php-4.3.6.tar.bz2
Modified:
   tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec
Log:
- New upstream 4.3.7.


Deleted: tinysofa/releases/1.0/mod_php4/current/sources/php-4.3.6.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.0/mod_php4/current/sources/php-4.3.7.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/mod_php4/current/sources/php-4.3.7.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-17 16:10:50 UTC (rev 1960)
+++ tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-17 16:15:35 UTC (rev 1961)
@@ -6,7 +6,7 @@
 
 Summary: The PHP4 HTML-embedded scripting language for use with Apache.
 Name: mod_php4
-Version: 4.3.6
+Version: 4.3.7
 Release: 2ts
 Group: tinysofa official
 Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
@@ -556,4 +556,4 @@
 - improvements; builds with apache-devel package installed.
 
 * Tue Sep 01 1998 Preston Brown <pbrown at redhat.com>
-- Made initial cut for PHP3.
\ No newline at end of file
+- Made initial cut for PHP3.


From svn at tinysofa.org  Thu Jun 17 16:22:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 02:22:07 +1000 (EST)
Subject: [tinysofa-svn] 
	r1962 - in tinysofa/releases/1.0/rsync/current: sources specs
Message-ID: <20040617162207.751C64E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 02:22:07 +1000 (Fri, 18 Jun 2004)
New Revision: 1962

Added:
   tinysofa/releases/1.0/rsync/current/sources/rsync-2.6.2-lastdir-corruption.patch
Modified:
   tinysofa/releases/1.0/rsync/current/specs/rsync.spec
Log:
- Add lastdir corroption bug fix.


Added: tinysofa/releases/1.0/rsync/current/sources/rsync-2.6.2-lastdir-corruption.patch
===================================================================
--- tinysofa/releases/1.0/rsync/current/sources/rsync-2.6.2-lastdir-corruption.patch	2004-06-17 16:15:35 UTC (rev 1961)
+++ tinysofa/releases/1.0/rsync/current/sources/rsync-2.6.2-lastdir-corruption.patch	2004-06-17 16:22:07 UTC (rev 1962)
@@ -0,0 +1,19 @@
+--- rsync-2.6.2/flist.c.lastdir-corruption	2004-05-25 07:30:03.211152824 +0100
++++ rsync-2.6.2/flist.c	2004-05-25 07:31:29.930604449 +0100
+@@ -539,6 +539,7 @@
+ 		rdev_major = 0;
+ 		uid = 0, gid = 0;
+ 		*lastname = '\0';
++		lastdir_len = -1;
+ 		return;
+ 	}
+ 
+@@ -745,7 +746,7 @@
+ 	char *basename, *dirname, *bp;
+ 	unsigned short flags = 0;
+ 
+-	if (!flist)	/* lastdir isn't valid if flist is NULL */
++	if (!flist || !flist->count)	/* lastdir isn't valid if flist is NULL */
+ 		lastdir_len = -1;
+ 
+ 	if (strlcpy(thisname, fname, sizeof thisname)

Modified: tinysofa/releases/1.0/rsync/current/specs/rsync.spec
===================================================================
--- tinysofa/releases/1.0/rsync/current/specs/rsync.spec	2004-06-17 16:15:35 UTC (rev 1961)
+++ tinysofa/releases/1.0/rsync/current/specs/rsync.spec	2004-06-17 16:22:07 UTC (rev 1962)
@@ -8,6 +8,7 @@
 Source1: rsyncd.xinetd
 Source2: rsyncd.logrotate
 Source3: rsyncd.conf
+Patch: rsync-2.6.2-lastdir-corruption.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 
@@ -159,4 +161,4 @@
 
 * Thu Apr 10 1997 Michael De La Rue <miked at ed.ac.uk>
 - rsync-1.6.2-1 packaged.  (This entry by jam to credit Michael for the
-  previous package(s).)
\ No newline at end of file
+  previous package(s).)


From svn at tinysofa.org  Thu Jun 17 16:24:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 02:24:47 +1000 (EST)
Subject: [tinysofa-svn] r1963 - tinysofa/releases/1.0/hwdata/current/sources
Message-ID: <20040617162447.EB3834E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 02:24:47 +1000 (Fri, 18 Jun 2004)
New Revision: 1963

Modified:
   tinysofa/releases/1.0/hwdata/current/sources/hwdata-pcitable
Log:
- Add sata_via to pcitable.


Modified: tinysofa/releases/1.0/hwdata/current/sources/hwdata-pcitable
===================================================================
--- tinysofa/releases/1.0/hwdata/current/sources/hwdata-pcitable	2004-06-17 16:22:07 UTC (rev 1962)
+++ tinysofa/releases/1.0/hwdata/current/sources/hwdata-pcitable	2004-06-17 16:24:47 UTC (rev 1963)
@@ -1945,7 +1945,7 @@
 0x1106	0x3133	"unknown"	"VIA Technologies|VT3133 Host Bridge"
 0x1106	0x3147	"unknown"	"VIA Technologies|VT8233A ISA Bridge"
 0x1106	0x3148	"unknown"	"VIA Technologies|P4M266 Host Bridge"
-0x1106	0x3149	"unknown"	"VIA Technologies|VIA VT6420 SATA RAID Controller"
+0x1106	0x3149	"sata_via"	"VIA Technologies|VIA VT6420 SATA RAID Controller"
 0x1106	0x3156	"unknown"	"VIA Technologies|P/KN266 Host Bridge"
 0x1106	0x3164	"unknown"	"VIA Technologies|VT6410 ATA133 RAID controller"
 0x1106	0x3168	"unknown"	"VIA Technologies|VT8374 P4X400 Host Controller/AGP Bridge"


From svn at tinysofa.org  Thu Jun 17 16:42:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 02:42:36 +1000 (EST)
Subject: [tinysofa-svn] 
	r1964 - in tinysofa/releases/1.0/postgresql/current: sources specs
Message-ID: <20040617164236.BA28F4E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 02:42:36 +1000 (Fri, 18 Jun 2004)
New Revision: 1964

Added:
   tinysofa/releases/1.0/postgresql/current/sources/postgresql-7.4.3.tar.bz2
Removed:
   tinysofa/releases/1.0/postgresql/current/sources/postgresql-7.4.2.tar.bz2
Modified:
   tinysofa/releases/1.0/postgresql/current/specs/postgresql.spec
Log:
- New Upstream: 7.4.3.


Deleted: tinysofa/releases/1.0/postgresql/current/sources/postgresql-7.4.2.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.0/postgresql/current/sources/postgresql-7.4.3.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/postgresql/current/sources/postgresql-7.4.3.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.0/postgresql/current/specs/postgresql.spec
===================================================================
--- tinysofa/releases/1.0/postgresql/current/specs/postgresql.spec	2004-06-17 16:24:47 UTC (rev 1963)
+++ tinysofa/releases/1.0/postgresql/current/specs/postgresql.spec	2004-06-17 16:42:36 UTC (rev 1964)
@@ -7,7 +7,7 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 7.4.2
+Version: 7.4.3
 Release: 5ts
 License: BSD
 Group: tinysofa official
@@ -919,4 +919,4 @@
 - Fixed the server postinstall problems.
 
 * Mon Jan 08 2001 Lamar Owen <lamar at postgresql.org>
-- First 7.1 beta test-build
\ No newline at end of file
+- First 7.1 beta test-build


From svn at tinysofa.org  Thu Jun 17 16:45:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 02:45:51 +1000 (EST)
Subject: [tinysofa-svn] 
	r1965 - in tinysofa/releases/1.0/iptables/current: sources specs
Message-ID: <20040617164551.688B64E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 02:45:51 +1000 (Fri, 18 Jun 2004)
New Revision: 1965

Added:
   tinysofa/releases/1.0/iptables/current/sources/iptables-1.2.10.tar.bz2
Removed:
   tinysofa/releases/1.0/iptables/current/sources/iptables-1.2.9.tar.bz2
Modified:
   tinysofa/releases/1.0/iptables/current/specs/iptables.spec
Log:
- New Upstream: 1.2.10.


Added: tinysofa/releases/1.0/iptables/current/sources/iptables-1.2.10.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/iptables/current/sources/iptables-1.2.10.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.0/iptables/current/sources/iptables-1.2.9.tar.bz2
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.0/iptables/current/specs/iptables.spec
===================================================================
--- tinysofa/releases/1.0/iptables/current/specs/iptables.spec	2004-06-17 16:42:36 UTC (rev 1964)
+++ tinysofa/releases/1.0/iptables/current/specs/iptables.spec	2004-06-17 16:45:51 UTC (rev 1965)
@@ -1,6 +1,6 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities.
-Version: 1.2.9
+Version: 1.2.10
 Release: 5ts
 Source: http://www.netfilter.org/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
@@ -143,4 +143,4 @@
 - New upstream version.
 
 * Mon Jun 24 2002 Roland Kruse <rolandk at trustix dot com> 1.2.6a-1rk
-- Initial TSL package.
\ No newline at end of file
+- Initial TSL package.


From svn at tinysofa.org  Thu Jun 17 16:53:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 02:53:17 +1000 (EST)
Subject: [tinysofa-svn] 
	r1966 - in tinysofa/releases/1.0/lftp/current: sources specs
Message-ID: <20040617165317.09D664E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 02:53:16 +1000 (Fri, 18 Jun 2004)
New Revision: 1966

Added:
   tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.6.tar.bz2
   tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.6.tar.bz2.asc
Removed:
   tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.4.tar.bz2
   tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.4.tar.bz2.asc
Modified:
   tinysofa/releases/1.0/lftp/current/specs/lftp.spec
Log:
- New upstream: 3.0.6.


Deleted: tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.4.tar.bz2
===================================================================
(Binary files differ)

Deleted: tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.4.tar.bz2.asc
===================================================================
--- tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.4.tar.bz2.asc	2004-06-17 16:45:51 UTC (rev 1965)
+++ tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.4.tar.bz2.asc	2004-06-17 16:53:16 UTC (rev 1966)
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.1 (SunOS)
-
-iD8DBQBAsiQYqCS7afKpmhgRArxdAJwIjJWsshLuXMz27IqidTShwbj8rACfV5rz
-isrBV+XAw7tvp0e5qEPtI04=
-=6bEu
------END PGP SIGNATURE-----

Added: tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.6.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.6.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.6.tar.bz2.asc
===================================================================
--- tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.6.tar.bz2.asc	2004-06-17 16:45:51 UTC (rev 1965)
+++ tinysofa/releases/1.0/lftp/current/sources/lftp-3.0.6.tar.bz2.asc	2004-06-17 16:53:16 UTC (rev 1966)
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.1 (SunOS)
+
+iD8DBQBAysBMqCS7afKpmhgRAtHeAJoDL+7g5/HEyLCswC3mhLifLgZSjwCcCI0Z
+wZrrQJOcROZQaNuTbKCjE3Q=
+=PHya
+-----END PGP SIGNATURE-----

Modified: tinysofa/releases/1.0/lftp/current/specs/lftp.spec
===================================================================
--- tinysofa/releases/1.0/lftp/current/specs/lftp.spec	2004-06-17 16:45:51 UTC (rev 1965)
+++ tinysofa/releases/1.0/lftp/current/specs/lftp.spec	2004-06-17 16:53:16 UTC (rev 1966)
@@ -1,6 +1,6 @@
 Summary: A sophisticated file transfer program
 Name: lftp 
-Version: 3.0.4
+Version: 3.0.6
 Release: 1jh
 License: GPL
 Group: tinysofa official


From svn at tinysofa.org  Thu Jun 17 16:55:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 02:55:07 +1000 (EST)
Subject: [tinysofa-svn] 
	r1967 - in tinysofa/releases/1.0/m4/current: sources specs
Message-ID: <20040617165507.01EA24E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 02:55:07 +1000 (Fri, 18 Jun 2004)
New Revision: 1967

Added:
   tinysofa/releases/1.0/m4/current/sources/m4-1.4.1.tar.gz
Removed:
   tinysofa/releases/1.0/m4/current/sources/m4-1.4.tar.gz
Modified:
   tinysofa/releases/1.0/m4/current/specs/m4.spec
Log:
- New upstream: 1.4.1.


Added: tinysofa/releases/1.0/m4/current/sources/m4-1.4.1.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/m4/current/sources/m4-1.4.1.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.0/m4/current/sources/m4-1.4.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.0/m4/current/specs/m4.spec
===================================================================
--- tinysofa/releases/1.0/m4/current/specs/m4.spec	2004-06-17 16:53:16 UTC (rev 1966)
+++ tinysofa/releases/1.0/m4/current/specs/m4.spec	2004-06-17 16:55:07 UTC (rev 1967)
@@ -1,6 +1,6 @@
 Summary: The GNU macro processor.
 Name: m4
-Version: 1.4
+Version: 1.4.1
 Release: 26ts
 License: GPL
 Group: tinysofa official


From svn at tinysofa.org  Thu Jun 17 16:59:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 02:59:38 +1000 (EST)
Subject: [tinysofa-svn] 
	r1968 - in tinysofa/releases/1.0/sed/current: sources specs
Message-ID: <20040617165938.CD3E74E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 02:59:38 +1000 (Fri, 18 Jun 2004)
New Revision: 1968

Added:
   tinysofa/releases/1.0/sed/current/sources/sed-4.1.tar.gz
Removed:
   tinysofa/releases/1.0/sed/current/sources/sed-4.0.9.tar.gz
Modified:
   tinysofa/releases/1.0/sed/current/specs/sed.spec
Log:
- New upstream: 4.1.


Deleted: tinysofa/releases/1.0/sed/current/sources/sed-4.0.9.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.0/sed/current/sources/sed-4.1.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/sed/current/sources/sed-4.1.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.0/sed/current/specs/sed.spec
===================================================================
--- tinysofa/releases/1.0/sed/current/specs/sed.spec	2004-06-17 16:55:07 UTC (rev 1967)
+++ tinysofa/releases/1.0/sed/current/specs/sed.spec	2004-06-17 16:59:38 UTC (rev 1968)
@@ -1,6 +1,6 @@
 Summary: A GNU stream text editor.
 Name: sed
-Version: 4.0.9
+Version: 4.1
 Release: 5ts
 License: GPL
 Group: tinysofa official
@@ -110,4 +110,4 @@
 - added BuildRoot
 
 * Mon Jun 02 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
\ No newline at end of file
+- built against glibc


From svn at tinysofa.org  Thu Jun 17 17:44:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 03:44:33 +1000 (EST)
Subject: [tinysofa-svn] 
	r1969 - in tinysofa/releases/1.0/setup/current: sources specs
Message-ID: <20040617174433.779B44E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 03:44:33 +1000 (Fri, 18 Jun 2004)
New Revision: 1969

Added:
   tinysofa/releases/1.0/setup/current/sources/setup-2.2.5-sieve.patch
Modified:
   tinysofa/releases/1.0/setup/current/specs/setup.spec
Log:
- Add patch for sieve.


Added: tinysofa/releases/1.0/setup/current/sources/setup-2.2.5-sieve.patch
===================================================================
--- tinysofa/releases/1.0/setup/current/sources/setup-2.2.5-sieve.patch	2004-06-17 16:59:38 UTC (rev 1968)
+++ tinysofa/releases/1.0/setup/current/sources/setup-2.2.5-sieve.patch	2004-06-17 17:44:33 UTC (rev 1969)
@@ -0,0 +1,12 @@
+diff -urN setup-2.2.5/services setup-2.2.5-sieve/services
+--- setup-2.2.5/services	2003-12-11 23:14:36.000000000 +1100
++++ setup-2.2.5-sieve/services	2004-06-18 03:43:24.000000000 +1000
+@@ -120,6 +120,8 @@
+ irc		194/udp
+ smux		199/tcp				# SNMP Unix Multiplexer
+ smux		199/udp
++sieve		200/tcp				# Cyrus sieve
++sieve		200/udp
+ at-rtmp		201/tcp				# AppleTalk routing
+ at-rtmp		201/udp
+ at-nbp		202/tcp				# AppleTalk name binding

Modified: tinysofa/releases/1.0/setup/current/specs/setup.spec
===================================================================
--- tinysofa/releases/1.0/setup/current/specs/setup.spec	2004-06-17 16:59:38 UTC (rev 1968)
+++ tinysofa/releases/1.0/setup/current/specs/setup.spec	2004-06-17 17:44:33 UTC (rev 1969)
@@ -5,6 +5,7 @@
 License: public domain
 Group: tinysofa official
 Source: setup-%{version}.tar.gz
+Patch: setup-2.2.5-sieve.patch
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
 Conflicts: initscripts < 4.26
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"


From svn at tinysofa.org  Thu Jun 17 18:08:11 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 04:08:11 +1000 (EST)
Subject: [tinysofa-svn] r1970 - tinysofa/releases/1.0/iptables/current/specs
Message-ID: <20040617180811.B4E154E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 04:08:11 +1000 (Fri, 18 Jun 2004)
New Revision: 1970

Modified:
   tinysofa/releases/1.0/iptables/current/specs/iptables.spec
Log:
- Disable stack protector.


Modified: tinysofa/releases/1.0/iptables/current/specs/iptables.spec
===================================================================
--- tinysofa/releases/1.0/iptables/current/specs/iptables.spec	2004-06-17 17:44:33 UTC (rev 1969)
+++ tinysofa/releases/1.0/iptables/current/specs/iptables.spec	2004-06-17 18:08:11 UTC (rev 1970)
@@ -47,7 +47,7 @@
 %setup -q
 
 %build
-OPT="$RPM_OPT_FLAGS"
+OPT="$RPM_OPT_FLAGS %{?no_stack_protector}"
 perl -pi -e 's/_EXP//' Makefile
 make COPT_FLAGS="$OPT" LIBDIR=/lib DO_IPV6=1 KERNEL_DIR=/usr
 
@@ -97,6 +97,10 @@
 
 
 %changelog
+* Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
+- New upstream: 1.2.10.
+- Disable stack protector -- jh.
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.2.9-5ts
 - current (1.2.9-4ts) integrated as 1.2.9-5ts for release 1.0-U1
 


From svn at tinysofa.org  Thu Jun 17 18:10:18 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 04:10:18 +1000 (EST)
Subject: [tinysofa-svn] r1971 - tinysofa/releases/1.0/setup/current/sources
Message-ID: <20040617181018.2C95F4E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 04:10:17 +1000 (Fri, 18 Jun 2004)
New Revision: 1971

Modified:
   tinysofa/releases/1.0/setup/current/sources/setup-2.2.5-sieve.patch
Log:
- sieve is 2000, not 200.


Modified: tinysofa/releases/1.0/setup/current/sources/setup-2.2.5-sieve.patch
===================================================================
--- tinysofa/releases/1.0/setup/current/sources/setup-2.2.5-sieve.patch	2004-06-17 18:08:11 UTC (rev 1970)
+++ tinysofa/releases/1.0/setup/current/sources/setup-2.2.5-sieve.patch	2004-06-17 18:10:17 UTC (rev 1971)
@@ -1,12 +1,12 @@
 diff -urN setup-2.2.5/services setup-2.2.5-sieve/services
 --- setup-2.2.5/services	2003-12-11 23:14:36.000000000 +1100
-+++ setup-2.2.5-sieve/services	2004-06-18 03:43:24.000000000 +1000
-@@ -120,6 +120,8 @@
- irc		194/udp
- smux		199/tcp				# SNMP Unix Multiplexer
- smux		199/udp
-+sieve		200/tcp				# Cyrus sieve
-+sieve		200/udp
- at-rtmp		201/tcp				# AppleTalk routing
- at-rtmp		201/udp
- at-nbp		202/tcp				# AppleTalk name binding
++++ setup-2.2.5-sieve/services	2004-06-18 04:09:46.000000000 +1000
+@@ -431,6 +431,8 @@
+ rndc		953/udp				# rndc control sockets (BIND 9)
+ skkserv		1178/tcp			# SKK Japanese input method
+ xtel		1313/tcp			# french minitel
++sieve		2000/tcp			# Cyrus sieve
++sieve		2000/udp
+ cfinger		2003/tcp			# GNU Finger
+ ninstall	2150/tcp			# ninstall service
+ ninstall	2150/udp			# ninstall service


From svn at tinysofa.org  Thu Jun 17 18:16:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 04:16:44 +1000 (EST)
Subject: [tinysofa-svn] 
	r1972 - in tinysofa/releases/1.0/swupconf/current: sources specs
Message-ID: <20040617181644.CD1F94E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 04:16:44 +1000 (Fri, 18 Jun 2004)
New Revision: 1972

Added:
   tinysofa/releases/1.0/swupconf/current/sources/swupconf-1.2.tar.bz2
Removed:
   tinysofa/releases/1.0/swupconf/current/sources/swupconf-1.1.tar.bz2
Modified:
   tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec
Log:
- Only enable tinysofa.http and ibiblio.ftp.


Deleted: tinysofa/releases/1.0/swupconf/current/sources/swupconf-1.1.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.0/swupconf/current/sources/swupconf-1.2.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/swupconf/current/sources/swupconf-1.2.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec
===================================================================
--- tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec	2004-06-17 18:10:17 UTC (rev 1971)
+++ tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec	2004-06-17 18:16:44 UTC (rev 1972)
@@ -1,6 +1,6 @@
 Summary: swup configuration files for tinysofa
 Name: swupconf
-Version: 1.1
+Version: 1.2
 Release: 1ts
 License: GPL
 Group: tinysofa official


From svn at tinysofa.org  Thu Jun 17 19:18:42 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 05:18:42 +1000 (EST)
Subject: [tinysofa-svn] 
	r1973 - in tinysofa/releases/1.0/slocate/current: sources specs
Message-ID: <20040617191842.844274E830A@minbar.tinysofa.org>

Author: jh
Date: 2004-06-18 05:18:42 +1000 (Fri, 18 Jun 2004)
New Revision: 1973

Added:
   tinysofa/releases/1.0/slocate/current/sources/slocate-2.5-info.patch
   tinysofa/releases/1.0/slocate/current/sources/slocate-2.5-segfault.patch
   tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-can-2003-0848.patch
   tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-manpage.patch
   tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-uchar.patch
   tinysofa/releases/1.0/slocate/current/sources/slocate-2.7-fts.patch
   tinysofa/releases/1.0/slocate/current/sources/slocate-wht.patch
Modified:
   tinysofa/releases/1.0/slocate/current/specs/slocate.spec
Log:
- backport slocate from snapshot


Added: tinysofa/releases/1.0/slocate/current/sources/slocate-2.5-info.patch
===================================================================
--- tinysofa/releases/1.0/slocate/current/sources/slocate-2.5-info.patch	2004-06-17 18:16:44 UTC (rev 1972)
+++ tinysofa/releases/1.0/slocate/current/sources/slocate-2.5-info.patch	2004-06-17 19:18:42 UTC (rev 1973)
@@ -0,0 +1,47 @@
+--- slocate-2.5/main.c.info	Sat Dec 30 02:35:30 2000
++++ slocate-2.5/main.c	Mon Feb 26 12:39:46 2001
+@@ -158,6 +158,9 @@
+ 
+ int decode_db(char *database, char *str);
+ 
++int SPECDIR=0;
++int ROOTDIR=0;   
++
+ /* Usage */
+ 
+ void
+@@ -361,8 +364,14 @@
+ 		else {
+ 			if (res_errno == -1)
+ 			    report_error(WARNING,QUIET,"%s: this is not a valid slocate database: %s\n",progname,part);
+-			else
+-			    report_error(WARNING,QUIET,"%s: could not open database: %s: %s\n",progname,part,strerror(res_errno));
++			else {
++				if (!ROOTDIR) {
++					report_error(WARNING,QUIET,"%s: could not open database: %s: %s\n",progname,part,strerror(res_errno));
++					if (!ROOTDIR && !SPECDIR)
++					  report_error(WARNING,QUIET,"You need to run the 'updatedb' command (as root) to create the database.\n");
++				}
++				
++			}
+ 		}
+ 		/* Get next path */
+ 		part = strtok(NULL, ":");
+@@ -1104,6 +1113,8 @@
+ 	
+ 	if ((fd = open(database,O_RDONLY)) == -1) {
+ 		report_error(WARNING,QUIET,"%s: decode_db(): %s: %s\n",progname,database,strerror(errno));
++		if (!ROOTDIR && !SPECDIR)
++		  report_error(WARNING,QUIET,"You need to run the 'updatedb' command (as root) to create the database.\n");
+ 		return(0);
+ 	}
+ 	
+@@ -1305,8 +1316,6 @@
+ 	extern char *optarg;
+ 	extern int optind, opterr, optopt;
+ 	char *p;
+-	int SPECDIR=0;
+-	int ROOTDIR=0;   
+ 	char *spec_dir=NULL;
+ 	char *database;
+ 	int i=0;

Added: tinysofa/releases/1.0/slocate/current/sources/slocate-2.5-segfault.patch
===================================================================
--- tinysofa/releases/1.0/slocate/current/sources/slocate-2.5-segfault.patch	2004-06-17 18:16:44 UTC (rev 1972)
+++ tinysofa/releases/1.0/slocate/current/sources/slocate-2.5-segfault.patch	2004-06-17 19:18:42 UTC (rev 1973)
@@ -0,0 +1,10 @@
+--- slocate-2.5/misc.c.segv	Tue Feb  6 11:27:53 2001
++++ slocate-2.5/misc.c	Tue Feb  6 11:28:00 2001
+@@ -89,6 +89,7 @@
+ 
+ 			/* realloc more memory if more of the file is expected. */
+ 			fbuf = realloc(fbuf,tot_size+ALLOC_SIZE);
++			tot_size+=ALLOC_SIZE;
+ 
+ 			/* If realloc failes report and exit. */
+ 			if (!fbuf) {

Added: tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-can-2003-0848.patch
===================================================================
--- tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-can-2003-0848.patch	2004-06-17 18:16:44 UTC (rev 1972)
+++ tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-can-2003-0848.patch	2004-06-17 19:18:42 UTC (rev 1973)
@@ -0,0 +1,92 @@
+CAN-2003-0848: 'slocate' sgid privileges are now dropped when
+searching databases that are not part of the 'slocate' group. This
+will prevent malicious user supplied databases from giving access to
+the 'slocate' group.  Patch from Kevin Lindsay <klindsay at debian.org>  
+
+--- slocate-2.6.orig/main.c
++++ slocate-2.6/main.c
+@@ -339,6 +339,9 @@
+ 	char *part;
+ 	int i;
+ 	int res_errno;
++	char *tmp_ptr = NULL;
++	int last_sgid = 0;
++	struct stat db_stat;
+ 
+ 	/* Make sure path is not empty */
+ 	if (!path || strlen(path) == 0) return;
+@@ -382,6 +385,28 @@
+ 
+ 	/* Null terminate array */
+ 	SLOCATE_PATH[i] = NULL;
++	
++	/* Sort sgid slocate db's to the top */
++	for (i = 0; SLOCATE_PATH[i]; i++) {
++		if (stat(SLOCATE_PATH[i], &db_stat) == -1)
++		    report_error(FATAL, QUIET, "%s: Could not stat DB: %s: %s\n", progname, SLOCATE_PATH[i], strerror(errno));
++
++		if (db_stat.st_gid != SLOC_GID)
++		    continue;
++		
++		if (i != last_sgid) {
++			tmp_ptr = SLOCATE_PATH[last_sgid];
++			SLOCATE_PATH[last_sgid] = SLOCATE_PATH[i];
++			SLOCATE_PATH[i] = tmp_ptr;
++		}
++		
++		last_sgid += 1;
++		
++	}
++	
++	/* for (i = 0; SLOCATE_PATH[i]; i++)
++	    printf("%s\n", SLOCATE_PATH[i]); */
++
+ }
+ 
+ /* Parse Dash */
+@@ -1152,6 +1177,22 @@
+ 	char *cp=NULL;
+ #endif
+ 	char *bucket_of_holding=NULL;
++	gid_t cur_gid;
++	struct stat db_stat;
++
++	cur_gid = getegid();
++
++	if (stat(database, &db_stat) == -1)
++	    report_error(FATAL, QUIET, "%s: Could not stat '%d': %s\n", progname, strerror(errno));
++	
++	/* If the database's file group is not apart of the 'slocate' group,
++	 * drop privileges. When multiple databases are specified, the ones
++	 * apart of the 'slocate' group will be searched first before the
++	 * privileges are dropped. */       
++	if (cur_gid == SLOC_GID && db_stat.st_gid != SLOC_GID) {
++		if (setgid(GID) == -1)
++		    report_error(FATAL, QUIET, "%s: Could not drop privileges.", progname);
++	}
+ 
+ 	if ((fd = open(database,O_RDONLY)) == -1) {
+ 		report_error(WARNING,QUIET,"%s: decode_db(): %s: %s\n",progname,database,strerror(errno));
+@@ -1395,6 +1450,9 @@
+ 	/* Get user IDs */
+ 	UID = getuid();        
+ 	GID = getgid();
++			
++	/* Get the 'slocate' group GID */
++	SLOC_GID = get_gid(GRPFILE);
+ 
+ 	/* Add the LOCATE_PATH environment variable to the list of databases to search in */
+ 	parse_decode_path(getenv("LOCATE_PATH"));
+@@ -1519,11 +1577,7 @@
+ 	 * with the -d option, etc */
+ 
+ 	if (ADD_SLOCATEDB)
+-	    parse_decode_path(SLOCATEDB);
+-
+-	/* Get the 'slocate' group GID */
+-	SLOC_GID = get_gid(GRPFILE);
+-	
++	    parse_decode_path(SLOCATEDB);	
+ 	
+ 	/* if the -U option has been used, start to create the database at specified path */
+ 	if (SPECDIR)

Added: tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-manpage.patch
===================================================================
--- tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-manpage.patch	2004-06-17 18:16:44 UTC (rev 1972)
+++ tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-manpage.patch	2004-06-17 19:18:42 UTC (rev 1973)
@@ -0,0 +1,40 @@
+--- slocate-2.6/doc/slocate.1.linux.org	Fri Jun  1 20:44:40 2001
++++ slocate-2.6/doc/slocate.1.linux	Fri Jun  1 22:30:51 2001
+@@ -2,17 +2,17 @@
+ .SH NAME
+ slocate \- Security Enhanced version of the GNU Locate
+ .SH SYNOPSIS
++.PP
+ slocate [\-qi] [\-d <path>] [\-\-database=<path>] <search string>
+-.br
++.PP
+ slocate [\-i] [\-r <regexp>] [\-\-regexp=<regexp>]
+-.br
++.PP
+ slocate [\-qv] [\-o <file>] [\-\-output=<file>]
++.PP
+ slocate [\-e <dir1,dir2,...>] [\-f <fstype1,...>] <[\-l <level>] [\-c] <[\-U <path>] [\-u]>
+-.br
++.PP
+ slocate [\-Vh] [\-\-version] [\-\-help]
+-.br
+-.br
+- 
++
+ .SH DESCRIPTION
+    Secure Locate provides a secure way to index and quickly search for 
+ files on your system. It uses incremental encoding just like GNU locate 
+@@ -64,11 +64,11 @@
+ .TP
+ .I \-o <file>
+ .I \-\-output=<file>
+-Specfies the database to create.
++Specifies the database to create.
+ .TP
+ .I \-d <path>
+ .I \-\-database=<path>
+-Specfies the path of databases to search in.
++Specifies the path of databases to search in.
+ .TP
+ .I \-h
+ .I \-\-help

Added: tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-uchar.patch
===================================================================
--- tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-uchar.patch	2004-06-17 18:16:44 UTC (rev 1972)
+++ tinysofa/releases/1.0/slocate/current/sources/slocate-2.6-uchar.patch	2004-06-17 19:18:42 UTC (rev 1973)
@@ -0,0 +1,16 @@
+diff -ru slocate-2.6/main.c /usr/src/redhat/BUILD/slocate-2.6/main.c
+--- slocate-2.6/main.c	2003-04-03 22:18:12.000000000 -0500
++++ /usr/src/redhat/BUILD/slocate-2.6/main.c	2003-04-03 14:47:38.000000000 -0500
+@@ -1247,8 +1247,11 @@
+ 
+ 		if (code_num == SLOC_ESC) {
+ 			code_num = get_short(&begin_ptr);
+-		} else if (code_num > 127)
++		} else if (code_num > 127) {
+ 		    code_num = code_num - 256;
++		    if (code_num == SLOC_ESC) 
++			code_num = get_short(&begin_ptr);
++		}
+ 
+ 		code_ptr += code_num;
+ 

Added: tinysofa/releases/1.0/slocate/current/sources/slocate-2.7-fts.patch
===================================================================
--- tinysofa/releases/1.0/slocate/current/sources/slocate-2.7-fts.patch	2004-06-17 18:16:44 UTC (rev 1972)
+++ tinysofa/releases/1.0/slocate/current/sources/slocate-2.7-fts.patch	2004-06-17 19:18:42 UTC (rev 1973)
@@ -0,0 +1,22 @@
+--- slocate-2.7/configure.in.fts	2003-01-25 00:06:14.000000000 +0100
++++ slocate-2.7/configure.in	2004-03-29 14:20:58.125594734 +0200
+@@ -41,7 +41,7 @@
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(fcntl.h unistd.h fts.h)
++AC_CHECK_HEADERS(fcntl.h unistd.h)
+ AM_CONDITIONAL(SL_FTS, test "$ac_cv_header_fts_h" = "no")
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+--- slocate-2.7/configure.fts	2003-01-25 00:15:25.000000000 +0100
++++ slocate-2.7/configure	2004-03-29 14:19:50.416423822 +0200
+@@ -3231,7 +3231,7 @@
+ 
+ 
+ 
+-for ac_header in fcntl.h unistd.h fts.h
++for ac_header in fcntl.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then

Added: tinysofa/releases/1.0/slocate/current/sources/slocate-wht.patch
===================================================================
--- tinysofa/releases/1.0/slocate/current/sources/slocate-wht.patch	2004-06-17 18:16:44 UTC (rev 1972)
+++ tinysofa/releases/1.0/slocate/current/sources/slocate-wht.patch	2004-06-17 19:18:42 UTC (rev 1973)
@@ -0,0 +1,11 @@
+--- ./sl_fts.c.jj	Thu Jul  1 03:00:31 1999
++++ ./sl_fts.c	Wed Aug 23 17:10:35 2000
+@@ -819,7 +819,7 @@ fts_stat(sp, dp, p, follow)
+ 	/* If user needs stat info, stat buffer already allocated. */
+ 	sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
+ 
+-#ifdef DT_WHT
++#if defined DT_WHT && defined S_IFWHT
+ #ifndef __FreeBSD__
+ 	/*
+ 	 * Whited-out files don't really exist.  However, there's stat(2) file

Modified: tinysofa/releases/1.0/slocate/current/specs/slocate.spec
===================================================================
--- tinysofa/releases/1.0/slocate/current/specs/slocate.spec	2004-06-17 18:16:44 UTC (rev 1972)
+++ tinysofa/releases/1.0/slocate/current/specs/slocate.spec	2004-06-17 19:18:42 UTC (rev 1973)
@@ -1,15 +1,21 @@
 Summary: Finds files on a system via a central database.
 Name: slocate
 Version: 2.7
-Release: 6ts
+Release: 8jh
 License: GPL
 Group: tinysofa official
 Source: ftp://ftp.geekreview.org/slocate/src/%{name}-%{version}.tar.gz
 Source3: slocate-updatedb.conf
 Source4: slocate-updatedb.sh
 Patch0: slocate-nicecron.patch
-Prereq: shadow-utils
-BuildRoot: %{_tmppath}/%{name}-root
+Patch1: slocate-wht.patch
+Patch2: slocate-2.5-info.patch
+Patch3: slocate-2.6-can-2003-0848.patch
+Patch4: slocate-2.6-manpage.patch
+Patch5: slocate-2.6-uchar.patch
+Patch6: slocate-2.7-fts.patch
+PreReq: shadow-utils
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf automake libtool
 
 %description
@@ -20,57 +26,77 @@
 
 %prep
 %setup -q
+
+gunzip doc/*.gz
+
 %patch0 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
-NOCONFIGURE=yes ./autogen.sh
-export NO64FLAGS=$(echo $RPM_OPT_FLAGS | sed "s|-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1||")
-CFLAGS="$NO64FLAGS" AUTOMAKE=automake ./configure \
-	--prefix=%{_prefix} \
-	--mandir=%{_mandir}
-make CFLAGS="$NO64FLAGS"
+autoreconf -f -i
+CFLAGS="$RPM_OPT_FLAGS -fsigned-char -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64" \
+%configure
+make
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
-mkdir -p $RPM_BUILD_ROOT/var/lib/slocate
+%{__rm} -rf "%{buildroot}"
 
-install -m 755 slocate $RPM_BUILD_ROOT/usr/bin
-ln -sf slocate $RPM_BUILD_ROOT/usr/bin/locate
-install doc/slocate.1.linux.gz $RPM_BUILD_ROOT%{_mandir}/man1/slocate.1
-install doc/updatedb.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
-ln -sf slocate.1 $RPM_BUILD_ROOT%{_mandir}/man1/locate.1
-ln -sf slocate $RPM_BUILD_ROOT/usr/bin/updatedb
-install -m 755 slocate.cron $RPM_BUILD_ROOT/etc/cron.daily
+%{__mkdir_p} %{buildroot}%{_bindir} \
+	%{buildroot}%{_mandir}/man1 \
+	%{buildroot}%{_sysconfdir}/cron.daily \
+	%{buildroot}%{_localstatedir}/lib/slocate
 
+install -m 755 slocate %{buildroot}%{_bindir}
+ln -sf slocate %{buildroot}%{_bindir}/locate
+install doc/slocate.1.linux %{buildroot}%{_mandir}/man1/slocate.1
+install doc/updatedb.1 %{buildroot}%{_mandir}/man1
+ln -sf slocate.1 %{buildroot}%{_mandir}/man1/locate.1
+ln -sf slocate %{buildroot}%{_bindir}/updatedb
+install -m 755 slocate.cron %{buildroot}%{_sysconfdir}/cron.daily
+
 # our wonderful updatedb wrapper script
-install -m644 %{SOURCE3} $RPM_BUILD_ROOT/etc/updatedb.conf
-rm -f $RPM_BUILD_ROOT/%{_bindir}/updatedb
-install -m755 %{SOURCE4} $RPM_BUILD_ROOT/%{_bindir}/updatedb
+install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/updatedb.conf
+rm -f %{buildroot}%{_bindir}/updatedb
+install -m755 %{SOURCE4} %{buildroot}%{_bindir}/updatedb
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf "%{buildroot}"
 
 %pre
 groupadd -g 16 slocate >/dev/null 2>/dev/null || :
 
 %preun
 if [ "$1" = "0" ]; then 
-  [ -f /var/lib/slocate/slocate.db ] && rm -f /var/lib/slocate/slocate.db || :
+  db=%{_localstatedir}/lib/slocate/slocate.db
+  if [ -f "$db" ]; then
+    rm -f "$db"
+  fi
 fi
 
 %files
-%defattr(-,root,root,755)
-%doc AUTHORS COPYING ChangeLog INSTALL README LICENSE MIRRORS NEWS README
+%defattr(644,root,root,755)
+%doc AUTHORS COPYING ChangeLog INSTALL README LICENSE MIRRORS NEWS
 %attr(2755,root,slocate) %{_bindir}/*locate
 %attr(-,root,root) %{_bindir}/updatedb
-%{_mandir}/man1/*
-%dir %attr(750,root,slocate) /var/lib/slocate
-%config /etc/cron.daily/*
-%config(noreplace) /etc/updatedb.conf
+%dir %attr(750,root,slocate) %{_localstatedir}/lib/slocate
+%config %attr(755,root,root) %{_sysconfdir}/cron.daily/*
+%config(noreplace) %{_sysconfdir}/updatedb.conf
+%attr(644,root,root) %{_mandir}/man1/*
 
 %changelog
+* Sat Jun  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.7-8jh
+- use correct CFLAGS
+- integrate changes from Conectiva and Fedora spec files
+- get patches from Fedora
+
+* Thu May 20 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.7-7jh
+- fix manual page permissions
+
 * Thu May 20 2004 tsintegrate <release at tinysofa.org> 2.7-6ts
 - current (2.7-6jh) integrated as 2.7-6ts for release 1.0-U1
 


From svn at tinysofa.org  Thu Jun 17 19:21:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 05:21:27 +1000 (EST)
Subject: [tinysofa-svn] r1974 - tinysofa/snapshot/slocate/current/specs
Message-ID: <20040617192127.300DF4E830A@minbar.tinysofa.org>

Author: jh
Date: 2004-06-18 05:21:26 +1000 (Fri, 18 Jun 2004)
New Revision: 1974

Modified:
   tinysofa/snapshot/slocate/current/specs/slocate.spec
Log:
- change group
- increase release


Modified: tinysofa/snapshot/slocate/current/specs/slocate.spec
===================================================================
--- tinysofa/snapshot/slocate/current/specs/slocate.spec	2004-06-17 19:18:42 UTC (rev 1973)
+++ tinysofa/snapshot/slocate/current/specs/slocate.spec	2004-06-17 19:21:26 UTC (rev 1974)
@@ -1,9 +1,9 @@
 Summary: Finds files on a system via a central database.
 Name: slocate
 Version: 2.7
-Release: 8jh
+Release: 9jh
 License: GPL
-Group: tinysofa official
+Group: tinysofa/main
 Source: ftp://ftp.geekreview.org/slocate/src/%{name}-%{version}.tar.gz
 Source3: slocate-updatedb.conf
 Source4: slocate-updatedb.sh


From svn at tinysofa.org  Thu Jun 17 19:36:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 05:36:16 +1000 (EST)
Subject: [tinysofa-svn] 
	r1975 - in tinysofa/releases/1.0/python/current: sources specs
Message-ID: <20040617193616.95F934E830A@minbar.tinysofa.org>

Author: jh
Date: 2004-06-18 05:36:16 +1000 (Fri, 18 Jun 2004)
New Revision: 1975

Added:
   tinysofa/releases/1.0/python/current/sources/JapaneseCodecs-1.4.9.tar.gz
   tinysofa/releases/1.0/python/current/sources/Python-2.3.4.tar.bz2
   tinysofa/releases/1.0/python/current/sources/japanese-codecs-lib64.patch
   tinysofa/releases/1.0/python/current/sources/python-2.3.2-lib64.patch
   tinysofa/releases/1.0/python/current/sources/python-2.3.4-lib64-regex.patch
   tinysofa/releases/1.0/python/current/sources/python-doc-html-2.3.4.tar.bz2
Removed:
   tinysofa/releases/1.0/python/current/sources/Python-2.3.3.tar.bz2
   tinysofa/releases/1.0/python/current/sources/html-2.3.3.tar.bz2
   tinysofa/releases/1.0/python/current/sources/python-2.2.2-ftpuri.patch
   tinysofa/releases/1.0/python/current/sources/python-2.2.2-urllib2-nonanonftp.patch
Modified:
   tinysofa/releases/1.0/python/current/specs/python.spec
Log:
- backport python package from snapshot


Added: tinysofa/releases/1.0/python/current/sources/JapaneseCodecs-1.4.9.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/python/current/sources/JapaneseCodecs-1.4.9.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.0/python/current/sources/Python-2.3.3.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.0/python/current/sources/Python-2.3.4.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/python/current/sources/Python-2.3.4.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.0/python/current/sources/html-2.3.3.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.0/python/current/sources/japanese-codecs-lib64.patch
===================================================================
--- tinysofa/releases/1.0/python/current/sources/japanese-codecs-lib64.patch	2004-06-17 19:21:26 UTC (rev 1974)
+++ tinysofa/releases/1.0/python/current/sources/japanese-codecs-lib64.patch	2004-06-17 19:36:16 UTC (rev 1975)
@@ -0,0 +1,18 @@
+--- JapaneseCodecs-1.4.9/setup.py.lib64-j	Mon Feb 10 12:44:55 2003
++++ JapaneseCodecs-1.4.9/setup.py	Mon Feb 10 12:45:26 2003
+@@ -25,12 +25,12 @@
+ import os, sys
+ 
+ if os.sep == '/':
+-    sitedir = os.path.join("lib", "python" + sys.version[:3], "site-packages")
++    sitedir = os.path.join("lib64", "python" + sys.version[:3], "site-packages")
+ elif os.sep == ':':
+-    sitedir = os.path.join("lib", "site-packages")
++    sitedir = os.path.join("lib64", "site-packages")
+ else:
+     if sys.version_info[0:3] >= (2, 2, 0):
+-        sitedir = os.path.join("lib", "site-packages")
++        sitedir = os.path.join("lib64", "site-packages")
+     else:
+         sitedir = "."
+ 

Deleted: tinysofa/releases/1.0/python/current/sources/python-2.2.2-ftpuri.patch
===================================================================
--- tinysofa/releases/1.0/python/current/sources/python-2.2.2-ftpuri.patch	2004-06-17 19:21:26 UTC (rev 1974)
+++ tinysofa/releases/1.0/python/current/sources/python-2.2.2-ftpuri.patch	2004-06-17 19:36:16 UTC (rev 1975)
@@ -1,12 +0,0 @@
---- Python-2.2.2/Lib/urllib2.py.ftprfc	2003-02-20 20:09:59.000000000 -0500
-+++ Python-2.2.2/Lib/urllib2.py	2003-02-20 20:11:02.000000000 -0500
-@@ -921,8 +921,8 @@
-         except socket.error, msg:
-             raise URLError(msg)
-         path, attrs = splitattr(req.get_selector())
--        path = unquote(path)
-         dirs = path.split('/')
-+        dirs = map(unquote, dirs)
-         dirs, file = dirs[:-1], dirs[-1]
-         if dirs and not dirs[0]:
-             dirs = dirs[1:]

Deleted: tinysofa/releases/1.0/python/current/sources/python-2.2.2-urllib2-nonanonftp.patch
===================================================================
--- tinysofa/releases/1.0/python/current/sources/python-2.2.2-urllib2-nonanonftp.patch	2004-06-17 19:21:26 UTC (rev 1974)
+++ tinysofa/releases/1.0/python/current/sources/python-2.2.2-urllib2-nonanonftp.patch	2004-06-17 19:36:16 UTC (rev 1975)
@@ -1,47 +0,0 @@
---- Python-2.2.2/Lib/urllib2.py.ftp	2003-01-02 16:58:12.000000000 -0500
-+++ Python-2.2.2/Lib/urllib2.py	2003-01-02 16:58:48.000000000 -0500
-@@ -120,7 +120,7 @@
- # not sure how many of these need to be gotten rid of
- from urllib import unwrap, unquote, splittype, splithost, \
-      addinfourl, splitport, splitgophertype, splitquery, \
--     splitattr, ftpwrapper, noheaders
-+     splitattr, ftpwrapper, noheaders, splituser, splitpasswd
- 
- # support for proxies via environment variables
- from urllib import getproxies
-@@ -902,21 +902,30 @@
-         host = req.get_host()
-         if not host:
-             raise IOError, ('ftp error', 'no host given')
--        # XXX handle custom username & password
-+        host, port = splitport(host)
-+        if port is None:
-+            port = ftplib.FTP_PORT
-+
-+        # username/password handling
-+        user, host = splituser(host)
-+        if user:
-+            user, passwd = splitpasswd(user)
-+        else:
-+            passwd = None
-+        host = unquote(host)
-+        user = unquote(user or '')
-+        passwd = unquote(passwd or '')
-+        
-         try:
-             host = socket.gethostbyname(host)
-         except socket.error, msg:
-             raise URLError(msg)
--        host, port = splitport(host)
--        if port is None:
--            port = ftplib.FTP_PORT
-         path, attrs = splitattr(req.get_selector())
-         path = unquote(path)
-         dirs = path.split('/')
-         dirs, file = dirs[:-1], dirs[-1]
-         if dirs and not dirs[0]:
-             dirs = dirs[1:]
--        user = passwd = '' # XXX
-         try:
-             fw = self.connect_ftp(user, passwd, host, port, dirs)
-             type = file and 'I' or 'D'

Added: tinysofa/releases/1.0/python/current/sources/python-2.3.2-lib64.patch
===================================================================
--- tinysofa/releases/1.0/python/current/sources/python-2.3.2-lib64.patch	2004-06-17 19:21:26 UTC (rev 1974)
+++ tinysofa/releases/1.0/python/current/sources/python-2.3.2-lib64.patch	2004-06-17 19:36:16 UTC (rev 1975)
@@ -0,0 +1,232 @@
+--- Python-2.3.2/Lib/distutils/command/install.py.lib64	2002-11-19 08:12:28.000000000 -0500
++++ Python-2.3.2/Lib/distutils/command/install.py	2003-11-07 12:04:05.000000000 -0500
+@@ -39,14 +39,14 @@
+ INSTALL_SCHEMES = {
+     'unix_prefix': {
+         'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
++        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
+         'headers': '$base/include/python$py_version_short/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
+     'unix_home': {
+         'purelib': '$base/lib/python',
+-        'platlib': '$base/lib/python',
++        'platlib': '$base/lib64/python',
+         'headers': '$base/include/python/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+--- Python-2.3.2/Lib/distutils/sysconfig.py.lib64	2003-02-10 09:02:33.000000000 -0500
++++ Python-2.3.2/Lib/distutils/sysconfig.py	2003-11-07 12:04:05.000000000 -0500
+@@ -100,7 +100,7 @@
+ 
+     if os.name == "posix":
+         libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
++                                 "lib64", "python" + get_python_version())
+         if standard_lib:
+             return libpython
+         else:
+--- Python-2.3.2/Lib/site.py.lib64	2003-07-18 13:45:33.000000000 -0400
++++ Python-2.3.2/Lib/site.py	2003-11-07 12:04:05.000000000 -0500
+@@ -167,9 +167,14 @@
+             sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
+         elif os.sep == '/':
+             sitedirs = [os.path.join(prefix,
++                                     "lib64",
++                                     "python" + sys.version[:3],
++                                     "site-packages"),
++                        os.path.join(prefix,
+                                      "lib",
+                                      "python" + sys.version[:3],
+                                      "site-packages"),
++                        os.path.join(prefix, "lib64", "site-python"),
+                         os.path.join(prefix, "lib", "site-python")]
+         else:
+             sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
+--- Python-2.3.2/Modules/getpath.c.lib64	2002-12-31 07:45:12.000000000 -0500
++++ Python-2.3.2/Modules/getpath.c	2003-11-07 12:04:05.000000000 -0500
+@@ -112,8 +112,8 @@
+ #endif
+ 
+ #ifndef PYTHONPATH
+-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
+-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
++#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
++              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
+ #endif
+ 
+ #ifndef LANDMARK
+@@ -124,7 +124,7 @@
+ static char exec_prefix[MAXPATHLEN+1];
+ static char progpath[MAXPATHLEN+1];
+ static char *module_search_path = NULL;
+-static char lib_python[] = "lib/python" VERSION;
++static char lib_python[] = "lib64/python" VERSION;
+ 
+ static void
+ reduce(char *dir)
+@@ -492,7 +492,7 @@
+     }
+     else
+         strncpy(zip_path, PREFIX, MAXPATHLEN);
+-    joinpath(zip_path, "lib/python00.zip");
++    joinpath(zip_path, "lib64/python00.zip");
+     bufsz = strlen(zip_path);	/* Replace "00" with version */
+     zip_path[bufsz - 6] = VERSION[0];
+     zip_path[bufsz - 5] = VERSION[2];
+@@ -502,7 +502,7 @@
+             fprintf(stderr,
+                 "Could not find platform dependent libraries <exec_prefix>\n");
+         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
+-        joinpath(exec_prefix, "lib/lib-dynload");
++        joinpath(exec_prefix, "lib64/lib-dynload");
+     }
+     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
+ 
+--- Python-2.3.2/Modules/Setup.dist.lib64	2003-11-07 12:04:05.000000000 -0500
++++ Python-2.3.2/Modules/Setup.dist	2003-11-07 12:04:05.000000000 -0500
+@@ -343,7 +343,7 @@
+ # *** Uncomment and edit to reflect your Tcl/Tk versions:
+ 	-ltk -ltcl \
+ # *** Uncomment and edit to reflect where your X11 libraries are:
+-	-L/usr/X11R6/lib \
++	-L/usr/X11R6/lib64 \
+ # *** Or uncomment this for Solaris:
+ #	-L/usr/openwin/lib \
+ # *** Uncomment these for TOGL extension only:
+@@ -416,7 +416,7 @@
+ # and the subdirectory of PORT where you built it.
+ DBLIBVER=4.2
+ DBINC=/usr/include/db4
+-DBLIB=/usr/lib
++DBLIB=/usr/lib64
+ _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+ 
+ # Historical Berkeley DB 1.85
+@@ -462,7 +462,7 @@
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.cdrom.com/pub/infozip/zlib/
+-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
+ 
+ # Interface to the Expat XML parser
+ #
+--- Python-2.3.2/setup.py.lib64	2003-09-21 21:19:45.000000000 -0400
++++ Python-2.3.2/setup.py	2003-11-07 12:04:05.000000000 -0500
+@@ -241,7 +241,7 @@
+ 
+     def detect_modules(self):
+         # Ensure that /usr/local is always used
+-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
+         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ 
+         # fink installs lots of goodies in /sw/... - make sure we
+@@ -264,7 +264,7 @@
+         # lib_dirs and inc_dirs are used to search for files;
+         # if a file is found in one of those directories, it can
+         # be assumed that no additional -I,-L directives are needed.
+-        lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
++        lib_dirs = self.compiler.library_dirs + ['/lib64', '/usr/lib64']
+         inc_dirs = self.compiler.include_dirs + ['/usr/include']
+         exts = []
+ 
+@@ -413,11 +413,11 @@
+             elif self.compiler.find_library_file(lib_dirs, 'curses'):
+                 readline_libs.append('curses')
+             elif self.compiler.find_library_file(lib_dirs +
+-                                               ['/usr/lib/termcap'],
++                                               ['/usr/lib64/termcap'],
+                                                'termcap'):
+                 readline_libs.append('termcap')
+             exts.append( Extension('readline', ['readline.c'],
+-                                   library_dirs=['/usr/lib/termcap'],
++                                   library_dirs=['/usr/lib64/termcap'],
+                                    libraries=readline_libs) )
+         if platform not in ['mac']:
+                 # crypt module.
+@@ -446,8 +446,8 @@
+             if krb5_h:
+                 ssl_incs += krb5_h
+         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
+-                                     ['/usr/local/ssl/lib',
+-                                      '/usr/contrib/ssl/lib/'
++                                     ['/usr/local/ssl/lib64',
++                                      '/usr/contrib/ssl/lib64/'
+                                      ] )
+ 
+         if (ssl_incs is not None and
+@@ -481,12 +481,12 @@
+         # order you wish to search - e.g., search for db4 before db3
+         db_try_this = {
+             'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
+-                    'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
+-                                '/usr/local/BerkeleyDB.4.1/lib',
+-                                '/usr/local/BerkeleyDB.4.0/lib',
+-                                '/usr/local/lib',
++                    'libdirs': ('/usr/local/BerkeleyDB.4.2/lib64',
++                                '/usr/local/BerkeleyDB.4.1/lib64',
++                                '/usr/local/BerkeleyDB.4.0/lib64',
++                                '/usr/local/lib64',
+                                 '/opt/sfw',
+-                                '/sw/lib',
++                                '/sw/lib64',
+                                 ),
+                     'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
+                                 '/usr/local/include/db42',
+@@ -499,12 +499,12 @@
+                                 '/usr/include/db4',
+                                 )},
+             'db3': {'libs': ('db-3.3', 'db-3.2', 'db-3.1', 'db3',),
+-                    'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
+-                                '/usr/local/BerkeleyDB.3.2/lib',
+-                                '/usr/local/BerkeleyDB.3.1/lib',
+-                                '/usr/local/lib',
+-                                '/opt/sfw/lib',
+-                                '/sw/lib',
++                    'libdirs': ('/usr/local/BerkeleyDB.3.3/lib64',
++                                '/usr/local/BerkeleyDB.3.2/lib64',
++                                '/usr/local/BerkeleyDB.3.1/lib64',
++                                '/usr/local/lib64',
++                                '/opt/sfw/lib64',
++                                '/sw/lib64',
+                                 ),
+                     'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
+                                 '/usr/local/BerkeleyDB.3.2/include',
+@@ -981,14 +981,14 @@
+             added_lib_dirs.append('/usr/openwin/lib')
+         elif os.path.exists('/usr/X11R6/include'):
+             include_dirs.append('/usr/X11R6/include')
+-            added_lib_dirs.append('/usr/X11R6/lib')
++            added_lib_dirs.append('/usr/X11R6/lib64')
+         elif os.path.exists('/usr/X11R5/include'):
+             include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
++            added_lib_dirs.append('/usr/X11R5/lib64')
+         else:
+             # Assume default location for X11
+             include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
++            added_lib_dirs.append('/usr/X11/lib64')
+ 
+         # If Cygwin, then verify that X is installed before proceeding
+         if platform == 'cygwin':
+--- Python-2.3.2/Makefile.pre.in.lib64	2003-11-07 12:07:49.000000000 -0500
++++ Python-2.3.2/Makefile.pre.in	2003-11-07 12:08:11.000000000 -0500
+@@ -79,11 +79,11 @@
+ 
+ # Expanded directories
+ BINDIR=		$(exec_prefix)/bin
+-LIBDIR=		$(exec_prefix)/lib
++LIBDIR=		$(exec_prefix)/lib64
+ MANDIR=		@mandir@
+ INCLUDEDIR=	@includedir@
+ CONFINCLUDEDIR=	$(exec_prefix)/include
+-SCRIPTDIR=	$(prefix)/lib
++SCRIPTDIR=	$(prefix)/lib64
+ 
+ # Detailed destination directories
+ BINLIBDEST=	$(LIBDIR)/python$(VERSION)

Added: tinysofa/releases/1.0/python/current/sources/python-2.3.4-lib64-regex.patch
===================================================================
--- tinysofa/releases/1.0/python/current/sources/python-2.3.4-lib64-regex.patch	2004-06-17 19:21:26 UTC (rev 1974)
+++ tinysofa/releases/1.0/python/current/sources/python-2.3.4-lib64-regex.patch	2004-06-17 19:36:16 UTC (rev 1975)
@@ -0,0 +1,18 @@
+--- Python-2.3.4/Lib/test/test_re.py			2004-04-20 23:32:33.000000000 +0200
++++ Python-2.3.4/Lib/test/test_re.py.lib64-regex	2004-05-29 17:36:52.000000000 +0200
+@@ -497,6 +497,15 @@
+         self.assert_(re.compile('bug_926075') is not
+                      re.compile(eval("u'bug_926075'")))
+ 
++    def test_bug_931848(self):
++        try:
++            unicode
++        except NameError:
++            pass
++        pattern = eval('u"[\u002E\u3002\uFF0E\uFF61]"')
++        self.assertEqual(re.compile(pattern).split("a.b.c"),
++                         ['a','b','c'])
++
+ def run_re_tests():
+     from test.re_tests import benchmarks, tests, SUCCEED, FAIL, SYNTAX_ERROR
+     if verbose:

Added: tinysofa/releases/1.0/python/current/sources/python-doc-html-2.3.4.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/python/current/sources/python-doc-html-2.3.4.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.0/python/current/specs/python.spec
===================================================================
--- tinysofa/releases/1.0/python/current/specs/python.spec	2004-06-17 19:21:26 UTC (rev 1974)
+++ tinysofa/releases/1.0/python/current/specs/python.spec	2004-06-17 19:36:16 UTC (rev 1975)
@@ -2,47 +2,47 @@
 %define python python
 
 %define pybasever 2.3
+%define jp_codecs 1.4.9
 
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
-Version: %{pybasever}.3
-Release: 8ts
+Version: %{pybasever}.4
+Release: 1jh
 License: PSF - see LICENSE
 Group: tinysofa official
 Provides: python-abi = %{pybasever}
-Obsoletes: python-modules
-Provides: python-modules = %{version}
-Obsoletes: python-gdbm
-Provides: python-gdbm = %{version}
-Obsoletes: python-dbm
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
-Source2: html-%{version}.tar.bz2
+Source2: python-doc-html-2.3.4.tar.bz2
 Source3: modulator
 Source4: pynche
+Source5: http://www.python.jp/pub/JapaneseCodecs/JapaneseCodecs-%{jp_codecs}.tar.gz
 Source6: http://gigue.peabody.jhu.edu/~mdboom/omi/source/shm_source/shmmodule.c
 
 Patch0: python-2.3-config.patch
 Patch3: Python-2.2.1-pydocnogui.patch
 Patch4: python-2.3-nowhatsnew.patch
-Patch10: python-2.2.2-urllib2-nonanonftp.patch
-Patch11: python-2.2.2-ftpuri.patch
+Patch7: python-2.3.4-lib64-regex.patch
+Patch8: python-2.3.2-lib64.patch
+Patch9: japanese-codecs-lib64.patch
 Patch12: python-2.3.2-nomkhowto.patch
-Patch13: python-2.3.3-cache_ftp.patch
-Patch14: python-2.3.3-tinysofa-distutils.patch
+Patch100: python-2.3.3-tinysofa-distutils.patch
 
-Obsoletes: python2 
+Obsoletes: python2 python-modules python-gdbm python-dbm
 Provides: python2 = %{version}
+Provides: python-modules = %{version}
+Provides: python-gdbm = %{version}
 BuildPrereq: db4-devel
 Obsoletes: Distutils
 Provides: Distutils
 
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: readline-devel, libtermcap-devel, openssl-devel, gmp-devel
 BuildPrereq: ncurses-devel, gdbm-devel, zlib-devel, expat-devel
-BuildPrereq: gcc-c++-devel glibc-devel gdbm-devel
+BuildPrereq: glibc-devel gcc-c++-devel
 BuildPrereq: gzip tar findutils pkgconfig
 URL: http://www.python.org/
 
+
 %description
 Python is an interpreted, interactive, object-oriented programming
 language often compared to Tcl, Perl, Scheme or Java. Python includes
@@ -60,9 +60,22 @@
 Note that documentation for Python is provided in the python-docs
 package.
 
+%package jp-codecs
+Summary: Japanese Codecs for Python Unicode Support
+Group: tinysofa official
+Requires: %{name} = %{version}-%{release}
+License: a variant of the BSD license
+
+%description jp-codecs
+This package provides Unicode codecs that make Python aware of Japanese
+character encodings such as EUC-JP, Shift_JIS and ISO-2022-JP.  By using this
+package, Japanese characters can be treated as a character string instead of a
+byte sequence.
+
 %package devel
 Summary: The libraries and header files needed for Python development.
 Group: tinysofa official
+Requires: %{name} = %{version}-%{release}
 Obsoletes: python2-devel
 Provides: python2-devel = %{version}
 
@@ -80,7 +93,7 @@
 %package tools
 Summary: A collection of development tools included with Python.
 Group: tinysofa official
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Obsoletes: python2-tools
 Provides: python2-tools = %{version}
 
@@ -88,13 +101,16 @@
 The Python package includes several development tools that are used
 to build python programs.
 
-%package docs
+%package doc
 Summary: Documentation for the Python programming language.
 Group: tinysofa official
+Requires: %{name} = %{version}
 Obsoletes: python2-docs
 Provides: python2-docs = %{version}
+Obsoletes: python2-docs
+Provides: python2-docs = %{version}
 
-%description docs
+%description doc
 The python-docs package contains documentation on the Python
 programming language and interpreter.  The documentation is provided
 in ASCII text files and in LaTeX source files.
@@ -102,17 +118,20 @@
 Install the python-docs package if you'd like to use the documentation
 for the Python language.
 
+
 %prep
-%setup -q -n Python-%{version}
+%setup -q -n Python-%{version} -a 2 -a 5
 
 %patch0 -p1 -b .rhconfig
 %patch3 -p1 -b .no_gui
 %patch4 -p1
-%patch10 -p1 -b .nonanonftp
-%patch11 -p1 -b .ftpuri
+%if %{_lib} == lib64
+%patch7 -p1 -b .lib64-regex
+%patch8 -p1 -b .lib64
+%patch9 -p0 -b .lib64-j
+%endif
 %patch12 -p1 -b .nomkhowto
-%patch13 -p1 -b .cache_ftp
-%patch14 -p1 -b .tinysofa-distutils
+%patch100 -p1
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -129,11 +148,15 @@
 shm shmmodule.c
 EOF
 
+mv Python-Docs-%{version} html/
+
+
 %build
 topdir=`pwd`
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC %{?no_stack_protector}"
-export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC %{?no_stack_protector}"
-export OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC %{?no_stack_protector}"
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?no_stack_protector}"
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
+export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
+export OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC"
 export LINKCC="gcc"
 if pkg-config openssl ; then
 	export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
@@ -143,9 +166,9 @@
 export CC=gcc
 %configure --enable-ipv6 --enable-unicode=%{unicode}
 
-make OPT="$CFLAGS" %{?_smp_mflags}
+make OPT="$CFLAGS"
 $topdir/python Tools/scripts/pathfix.py -i "/usr/bin/env python%{pybasever}" .
-make OPT="$CFLAGS" %{?_smp_mflags}
+make OPT="$CFLAGS"
 
 %ifarch i386
 pushd Doc
@@ -155,72 +178,100 @@
 %endif
 
 %install
-[ -d $RPM_BUILD_ROOT ] && rm -fr $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr $RPM_BUILD_ROOT%{_mandir}
+rm -fr "%{buildroot}"
 
-%makeinstall DESTDIR=/ MANDIR=$RPM_BUILD_ROOT%{_mandir} INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} SCRIPTDIR=$RPM_BUILD_ROOT%{_libdir} build_root=$RPM_BUILD_ROOT
+%{__mkdir_p} %{buildroot}/usr %{buildroot}%{_mandir}
+
+# Clean up patched .py files that are saved as .lib64
+for f in distutils/command/install distutils/sysconfig; do
+    rm -f Lib/$f.py.lib64
+done
+
+%makeinstall \
+	DESTDIR=/ \
+	MANDIR=%{buildroot}%{_mandir} \
+	INCLUDEDIR=%{buildroot}%{_includedir} \
+	LIBDIR=%{buildroot}%{_libdir} \
+	SCRIPTDIR=%{buildroot}%{_libdir} \
+	build_root=%{buildroot}
+
 # Fix the interpreter path in binaries installed by distutils 
 # (which changes them by itself)
 # Make sure we preserve the file permissions
-for fixed in $RPM_BUILD_ROOT/usr/bin/pydoc; do
+for fixed in %{buildroot}/usr/bin/pydoc; do
     sed 's,#!.*/python$,#!/usr/bin/env python%{pybasever},' $fixed > $fixed- \
         && cat $fixed- > $fixed && rm -f $fixed-
 done
 
-ln -s python $RPM_BUILD_ROOT/usr/bin/python2
+ln -s python %{buildroot}%{_bindir}/python2
 
 # tools
 
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages
+mkdir -p %{buildroot}%{_libdir}/python%{pybasever}/site-packages
 
 #modulator
-install -m 755 $RPM_SOURCE_DIR/modulator ${RPM_BUILD_ROOT}/usr/bin/modulator
+install -m 755 $RPM_SOURCE_DIR/modulator %{buildroot}%{_bindir}/modulator
 cp -r Tools/modulator \
-  ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages/
+  %{buildroot}%{_libdir}/python%{pybasever}/site-packages/
 
 #pynche
-install -m 755 $RPM_SOURCE_DIR/pynche ${RPM_BUILD_ROOT}/usr/bin/pynche
+install -m 755 $RPM_SOURCE_DIR/pynche %{buildroot}%{_bindir}/pynche
 rm -f Tools/pynche/*.pyw
 cp -r Tools/pynche \
-  ${RPM_BUILD_ROOT}%{_libdir}/python%{pybasever}/site-packages/
+  %{buildroot}%{_libdir}/python%{pybasever}/site-packages/
 
 mv Tools/modulator/README Tools/modulator/README.modulator
 mv Tools/pynche/README Tools/pynche/README.pynche
 
 #gettext
-install -m755  Tools/i18n/pygettext.py $RPM_BUILD_ROOT/usr/bin/
-install -m755  Tools/i18n/msgfmt.py $RPM_BUILD_ROOT/usr/bin/
+install -m755  Tools/i18n/pygettext.py %{buildroot}%{_bindir}
+install -m755  Tools/i18n/msgfmt.py %{buildroot}%{_bindir}
 
 # Get rid of crap
-find $RPM_BUILD_ROOT/ -name "*~"|xargs rm -f
-find $RPM_BUILD_ROOT/ -name ".cvsignore"|xargs rm -f
+find %{buildroot}/ -name "*~"|xargs rm -f
+find %{buildroot}/ -name ".cvsignore"|xargs rm -f
 find . -name "*~"|xargs rm -f
 find . -name ".cvsignore"|xargs rm -f
 #zero length
-rm -f $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/site-packages/modulator/Templates/copyright
+rm -f %{buildroot}%{_libdir}/python%{pybasever}/site-packages/modulator/Templates/copyright
 
 # Clean up the testsuite - we don't need compiled files for it
-find $RPM_BUILD_ROOT%{_libdir}/python%{pybasever}/test \
+find %{buildroot}%{_libdir}/python%{pybasever}/test \
     -name "*.pyc" -o -name "*.pyo" | xargs rm -f
-rm -f $RPM_BUILD_ROOT%{_libdir}/python2.2/LICENSE.txt
+rm -f %{buildroot}%{_libdir}/python2.2/LICENSE.txt
 
+
+# Japanese codecs
+pushd JapaneseCodecs-%{jp_codecs}
+PYTHONHOME=$RPM_BUILD_ROOT/usr $RPM_BUILD_ROOT/%{_bindir}/%{python} setup.py \
+install \
+--install-scripts=%{buildroot}%{_prefix}/bin \
+--install-purelib=%{buildroot}%{_libdir}/python%{pybasever}/site-packages \
+--install-platlib=%{buildroot}%{_libdir}/python%{pybasever}/lib-dynload \
+--install-data=%{buildroot}%{_exec_prefix} \
+--root=/
+popd
+
+
 %clean
-rm -fr $RPM_BUILD_ROOT
+rm -fr "%{buildroot}"
 
+
 %files
 %defattr(-, root, root)
 %doc LICENSE README
-/usr/bin/python*
+%{_bindir}/python*
 %{_mandir}/*/*
 
 %dir %{_libdir}/python%{pybasever}
-%dir %{_libdir}/python%{pybasever}/lib-dynload
 %dir %{_libdir}/python%{pybasever}/site-packages
 %{_libdir}/python%{pybasever}/site-packages/README
 %{_libdir}/python%{pybasever}/LICENSE.txt
 %{_libdir}/python%{pybasever}/*.py*
 %{_libdir}/python%{pybasever}/*.doc
 %{_libdir}/python%{pybasever}/bsddb
+%dir %{_libdir}/python%{pybasever}/config
+%{_libdir}/python%{pybasever}/config/Makefile
 %{_libdir}/python%{pybasever}/curses
 %{_libdir}/python%{pybasever}/distutils
 %{_libdir}/python%{pybasever}/encodings
@@ -232,9 +283,15 @@
 %{_libdir}/python%{pybasever}/compiler
 %{_libdir}/python%{pybasever}/plat-linux2
 %{_libdir}/python%{pybasever}/hotshot
-%attr(755,root,root) %{_libdir}/python%{pybasever}/lib-dynload
+%dir %{_libdir}/python%{pybasever}/lib-dynload
+%attr(755,root,root) %{_libdir}/python%{pybasever}/lib-dynload/*.so
 %exclude %{_libdir}/python%{pybasever}/lib-tk
 
+%files jp-codecs
+%defattr(644,root,root,755)
+%{_libdir}/python%{pybasever}/site-packages/japanese.pth
+%{_libdir}/python%{pybasever}/lib-dynload/japanese
+
 %files devel
 %defattr(-,root,root)
 /usr/include/*
@@ -247,38 +304,51 @@
 %doc Tools/pynche/README.pynche
 %{_libdir}/python%{pybasever}/site-packages/modulator
 %{_libdir}/python%{pybasever}/site-packages/pynche
-/usr/bin/idle*
-/usr/bin/modulator*
-/usr/bin/pynche*
-/usr/bin/pygettext*.py
-/usr/bin/msgfmt*.py
-/usr/bin/pydoc
+%{_bindir}/idle*
+%{_bindir}/modulator*
+%{_bindir}/pynche*
+%{_bindir}/pygettext*.py
+%{_bindir}/msgfmt*.py
+%{_bindir}/pydoc
 
-%files docs
-%defattr(-,root,root,755)
-%doc Misc/NEWS  Misc/README Misc/cheatsheet 
-%doc Misc/HISTORY Doc/html
+%files doc
+%defattr(644,root,root,755)
+%doc Misc/NEWS  Misc/README Misc/cheatsheet Misc/HISTORY
+%doc Misc/ACKS
+%doc Misc/RFD
+%doc Misc/find_recursionlimit.py
+%doc Misc/python-mode.el
+%doc Misc/setuid-prog.c
+%doc Misc/indent.pro
+%doc Misc/cheatsheet
+%doc Misc/vgrindefs
+%doc Misc/gdbinit
+%doc LICENSE
+%doc Demo
+%doc html/
 
+
 %changelog
-* Tue May 25 2004 tsintegrate <release at tinysofa dot org> 2.3.3-8ts
-- current (2.3.3-8ok) integrated as 2.3.3-8ts for release 1.0-U1
+* Thu Jun 17 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.3.4-1jh
+- new upstream (2.3.4)
+- python-jp-codecs package
+- add proper html documentation to doc package
+- integrate recent Fedora changes
 
-* Tue May 25 2004 Omar Kilani <omar at tinysofa dot org> 2.3.3-8ok
-- Build without stack protector.
+* Fri Jun  4 2004 Mihai Ibanescu <misa at redhat.com> 2.3.4-1
+- Updated to 2.3.4-1 with Robert Scheck's help (bug #124764)
+- Added BuildRequires: tix-devel (bug #124918)
 
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.3.3-7ts
-- current (2.3.3-7jh) integrated as 2.3.3-7ts for release 1.0-U1
+* Fri May  7 2004 Mihai Ibanescu <misa at redhat.com> 2.3.3-6
+- Correct fix for #122304 from upstream:
+  http://sourceforge.net/tracker/?func=detail&atid=105470&aid=931848&group_id=5470
 
-* Wed May 12 2004 Omar Kilani <omar at tinysofa dot org>
-- Fix BuildRequires gcc-c++-devel.
-- Add BuildRequires gdbm-devel.
+* Thu May  6 2004 Mihai Ibanescu <misa at redhat.com> 2.3.3-4
+- Fix for bug #122304 : splitting the domain name fails on 64-bit arches
+- Fix for bug #120879 : including Makefile into the main package
 
-* Mon May 10 2004  Jaakko Heinonen <jh at tinysofa dot org> 2.3.3-7jh
-- 755 permissions for .so libraries
+- Requires XFree86-devel instead of -libs (see bug #118442)
 
-* Thu Apr 01 2004 Omar Kilani <omar at tinysofa dot org> 2.3.3-5ts
-- Added cache ftp patch.
-
 * Tue Mar 16 2004 Mihai Ibanescu <misa at redhat.com> 2.3.3-3
 - Requires XFree86-devel instead of -libs (see bug #118442)
 


From svn at tinysofa.org  Fri Jun 18 05:12:58 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:12:58 +1000 (EST)
Subject: [tinysofa-svn] 
	r1976 - in tinysofa/releases/1.0/glib/current: sources specs
Message-ID: <20040618051258.741124E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:12:58 +1000 (Fri, 18 Jun 2004)
New Revision: 1976

Added:
   tinysofa/releases/1.0/glib/current/sources/glib-2.4.2.tar.bz2
Removed:
   tinysofa/releases/1.0/glib/current/sources/glib-2.4.1.tar.bz2
Modified:
   tinysofa/releases/1.0/glib/current/specs/glib.spec
Log:
- New upstream: 2.4.2.


Deleted: tinysofa/releases/1.0/glib/current/sources/glib-2.4.1.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.0/glib/current/sources/glib-2.4.2.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/glib/current/sources/glib-2.4.2.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.0/glib/current/specs/glib.spec
===================================================================
--- tinysofa/releases/1.0/glib/current/specs/glib.spec	2004-06-17 19:36:16 UTC (rev 1975)
+++ tinysofa/releases/1.0/glib/current/specs/glib.spec	2004-06-18 05:12:58 UTC (rev 1976)
@@ -1,6 +1,6 @@
 Summary: A library of handy utility functions.
 Name: glib
-Version: 2.4.1
+Version: 2.4.2
 Release: 1ts
 License: LGPL
 Group: tinysofa official


From svn at tinysofa.org  Fri Jun 18 05:40:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:40:51 +1000 (EST)
Subject: [tinysofa-svn] r1979 - tinysofa/releases/1.0/apache
Message-ID: <20040618054051.793BD4E82BA@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:40:51 +1000 (Fri, 18 Jun 2004)
New Revision: 1979

Removed:
   tinysofa/releases/1.0/apache/pristine/
Log:
apache:
  * removing pristine (2.0.49-9ts)


From svn at tinysofa.org  Fri Jun 18 05:40:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:40:50 +1000 (EST)
Subject: [tinysofa-svn] 
	r1978 - in tinysofa/releases/1.0/apache: current/specs
	releases/2.0.49 releases/2.0.49/10ts/specs
Message-ID: <20040618054050.6350F4E82BA@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:40:50 +1000 (Fri, 18 Jun 2004)
New Revision: 1978

Added:
   tinysofa/releases/1.0/apache/releases/2.0.49/10ts/
Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
   tinysofa/releases/1.0/apache/releases/2.0.49/10ts/specs/apache.spec
Log:
apache:
  * integrate current (2.0.49-9ts) as releases/2.0.49/10ts

Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-18 05:40:50 UTC (rev 1978)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 9ts
+Release: 10ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
@@ -397,6 +397,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0.49-10ts
+- current (2.0.49-9ts) integrated as 2.0.49-10ts for release 1.0-U2
+
 * Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
 - Fix logrotate script.
 

Copied: tinysofa/releases/1.0/apache/releases/2.0.49/10ts (from rev 1977, tinysofa/releases/1.0/apache/current)

Modified: tinysofa/releases/1.0/apache/releases/2.0.49/10ts/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/apache/releases/2.0.49/10ts/specs/apache.spec	2004-06-18 05:40:50 UTC (rev 1978)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 9ts
+Release: 10ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
@@ -397,6 +397,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0.49-10ts
+- current (2.0.49-9ts) integrated as 2.0.49-10ts for release 1.0-U2
+
 * Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
 - Fix logrotate script.
 


From svn at tinysofa.org  Fri Jun 18 05:40:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:40:53 +1000 (EST)
Subject: [tinysofa-svn] r1980 - tinysofa/releases/1.0/apache
Message-ID: <20040618054053.1406F4E82BA@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:40:52 +1000 (Fri, 18 Jun 2004)
New Revision: 1980

Added:
   tinysofa/releases/1.0/apache/pristine/
Log:
apache:
  * retarget pristine (2.0.49-9ts) to releases/2.0.49/10ts

Copied: tinysofa/releases/1.0/apache/pristine (from rev 1978, tinysofa/releases/1.0/apache/releases/2.0.49/10ts)


From svn at tinysofa.org  Fri Jun 18 05:41:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:10 +1000 (EST)
Subject: [tinysofa-svn] 
	r1981 - in tinysofa/releases/1.0/dev: current/specs releases/3.3.13
	releases/3.3.13/3ts/specs
Message-ID: <20040618054110.D18134E82BA@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:10 +1000 (Fri, 18 Jun 2004)
New Revision: 1981

Added:
   tinysofa/releases/1.0/dev/releases/3.3.13/3ts/
Modified:
   tinysofa/releases/1.0/dev/current/specs/dev.spec
   tinysofa/releases/1.0/dev/releases/3.3.13/3ts/specs/dev.spec
Log:
dev:
  * integrate current (3.3.13-3jh) as releases/3.3.13/3ts

Modified: tinysofa/releases/1.0/dev/current/specs/dev.spec
===================================================================
--- tinysofa/releases/1.0/dev/current/specs/dev.spec	2004-06-18 05:40:52 UTC (rev 1980)
+++ tinysofa/releases/1.0/dev/current/specs/dev.spec	2004-06-18 05:41:10 UTC (rev 1981)
@@ -1,6 +1,6 @@
 Name: dev
 Version: 3.3.13
-Release: 3jh
+Release: 3ts
 Group: tinysofa official
 License: GPL
 Summary: The most commonly-used entries in the /dev directory.
@@ -322,6 +322,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 3.3.13-3ts
+- current (3.3.13-3jh) integrated as 3.3.13-3ts for release 1.0-U2
+
 * Thu May 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.3.13-3jh
 - add MAKEDEV-ubd.patch to create more ubd devices
 - remove some devices which are not likely used

Copied: tinysofa/releases/1.0/dev/releases/3.3.13/3ts (from rev 1977, tinysofa/releases/1.0/dev/current)

Modified: tinysofa/releases/1.0/dev/releases/3.3.13/3ts/specs/dev.spec
===================================================================
--- tinysofa/releases/1.0/dev/current/specs/dev.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/dev/releases/3.3.13/3ts/specs/dev.spec	2004-06-18 05:41:10 UTC (rev 1981)
@@ -1,6 +1,6 @@
 Name: dev
 Version: 3.3.13
-Release: 3jh
+Release: 3ts
 Group: tinysofa official
 License: GPL
 Summary: The most commonly-used entries in the /dev directory.
@@ -322,6 +322,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 3.3.13-3ts
+- current (3.3.13-3jh) integrated as 3.3.13-3ts for release 1.0-U2
+
 * Thu May 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.3.13-3jh
 - add MAKEDEV-ubd.patch to create more ubd devices
 - remove some devices which are not likely used


From svn at tinysofa.org  Fri Jun 18 05:41:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:12 +1000 (EST)
Subject: [tinysofa-svn] r1982 - tinysofa/releases/1.0/dev
Message-ID: <20040618054112.6DE284E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:12 +1000 (Fri, 18 Jun 2004)
New Revision: 1982

Removed:
   tinysofa/releases/1.0/dev/pristine/
Log:
dev:
  * removing pristine (3.3.13-2ts)


From svn at tinysofa.org  Fri Jun 18 05:41:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:13 +1000 (EST)
Subject: [tinysofa-svn] r1983 - tinysofa/releases/1.0/dev
Message-ID: <20040618054113.B98874E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:13 +1000 (Fri, 18 Jun 2004)
New Revision: 1983

Added:
   tinysofa/releases/1.0/dev/pristine/
Log:
dev:
  * retarget pristine (3.3.13-2ts) to releases/3.3.13/3ts

Copied: tinysofa/releases/1.0/dev/pristine (from rev 1981, tinysofa/releases/1.0/dev/releases/3.3.13/3ts)


From svn at tinysofa.org  Fri Jun 18 05:41:26 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:26 +1000 (EST)
Subject: [tinysofa-svn] 
	r1984 - in tinysofa/releases/1.0/dev86: current/specs releases
	releases/0.16.15 releases/0.16.15/1ts/specs
Message-ID: <20040618054126.6A89C4E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:21 +1000 (Fri, 18 Jun 2004)
New Revision: 1984

Added:
   tinysofa/releases/1.0/dev86/releases/0.16.15/
   tinysofa/releases/1.0/dev86/releases/0.16.15/1ts/
Modified:
   tinysofa/releases/1.0/dev86/current/specs/dev86.spec
   tinysofa/releases/1.0/dev86/releases/0.16.15/1ts/specs/dev86.spec
Log:
dev86:
  * integrate current (0.16.15-1jh) as releases/0.16.15/1ts

Modified: tinysofa/releases/1.0/dev86/current/specs/dev86.spec
===================================================================
--- tinysofa/releases/1.0/dev86/current/specs/dev86.spec	2004-06-18 05:41:13 UTC (rev 1983)
+++ tinysofa/releases/1.0/dev86/current/specs/dev86.spec	2004-06-18 05:41:21 UTC (rev 1984)
@@ -1,7 +1,7 @@
 Summary: A real mode 80x86 assembler and linker.
 Name: dev86
 Version: 0.16.15
-Release: 1jh
+Release: 1ts
 License: GPL
 Group: tinysofa official
 Source: http://www.cix.co.uk/~mayday/Dev86src-%{version}.tar.gz
@@ -68,6 +68,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 0.16.15-1ts
+- current (0.16.15-1jh) integrated as 0.16.15-1ts for release 1.0-U2
+
 * Tue May 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.16.5-1jh
 - new upstream
 - spec file cleanup

Copied: tinysofa/releases/1.0/dev86/releases/0.16.15/1ts (from rev 1977, tinysofa/releases/1.0/dev86/current)

Modified: tinysofa/releases/1.0/dev86/releases/0.16.15/1ts/specs/dev86.spec
===================================================================
--- tinysofa/releases/1.0/dev86/current/specs/dev86.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/dev86/releases/0.16.15/1ts/specs/dev86.spec	2004-06-18 05:41:21 UTC (rev 1984)
@@ -1,7 +1,7 @@
 Summary: A real mode 80x86 assembler and linker.
 Name: dev86
 Version: 0.16.15
-Release: 1jh
+Release: 1ts
 License: GPL
 Group: tinysofa official
 Source: http://www.cix.co.uk/~mayday/Dev86src-%{version}.tar.gz
@@ -68,6 +68,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 0.16.15-1ts
+- current (0.16.15-1jh) integrated as 0.16.15-1ts for release 1.0-U2
+
 * Tue May 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 0.16.5-1jh
 - new upstream
 - spec file cleanup


From svn at tinysofa.org  Fri Jun 18 05:41:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:27 +1000 (EST)
Subject: [tinysofa-svn] r1985 - tinysofa/releases/1.0/dev86
Message-ID: <20040618054127.9B8254E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:27 +1000 (Fri, 18 Jun 2004)
New Revision: 1985

Removed:
   tinysofa/releases/1.0/dev86/pristine/
Log:
dev86:
  * removing pristine (0.16.0-13ts)


From svn at tinysofa.org  Fri Jun 18 05:41:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:28 +1000 (EST)
Subject: [tinysofa-svn] r1986 - tinysofa/releases/1.0/dev86
Message-ID: <20040618054128.8D1334E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:28 +1000 (Fri, 18 Jun 2004)
New Revision: 1986

Added:
   tinysofa/releases/1.0/dev86/pristine/
Log:
dev86:
  * retarget pristine (0.16.0-13ts) to releases/0.16.15/1ts

Copied: tinysofa/releases/1.0/dev86/pristine (from rev 1984, tinysofa/releases/1.0/dev86/releases/0.16.15/1ts)


From svn at tinysofa.org  Fri Jun 18 05:41:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:35 +1000 (EST)
Subject: [tinysofa-svn] 
	r1987 - in tinysofa/releases/1.0/fcron: current/specs
	releases/2.9.4 releases/2.9.4/10ts/specs
Message-ID: <20040618054135.7EA234E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:35 +1000 (Fri, 18 Jun 2004)
New Revision: 1987

Added:
   tinysofa/releases/1.0/fcron/releases/2.9.4/10ts/
Modified:
   tinysofa/releases/1.0/fcron/current/specs/fcron.spec
   tinysofa/releases/1.0/fcron/releases/2.9.4/10ts/specs/fcron.spec
Log:
fcron:
  * integrate current (2.9.4-10jh) as releases/2.9.4/10ts

Modified: tinysofa/releases/1.0/fcron/current/specs/fcron.spec
===================================================================
--- tinysofa/releases/1.0/fcron/current/specs/fcron.spec	2004-06-18 05:41:28 UTC (rev 1986)
+++ tinysofa/releases/1.0/fcron/current/specs/fcron.spec	2004-06-18 05:41:35 UTC (rev 1987)
@@ -1,7 +1,7 @@
 Summary:   Fcron is a task scheduler.
 Name: fcron
 Version: 2.9.4
-Release: 10jh
+Release: 10ts
 License: GPL
 Group: tinysofa official
 Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz
@@ -133,6 +133,9 @@
 %attr(770,fcron,fcron) /var/spool/fcron
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.9.4-10ts
+- current (2.9.4-10jh) integrated as 2.9.4-10ts for release 1.0-U2
+
 * Tue May 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.9.4-10jh
 - prerequire initscripts
 

Copied: tinysofa/releases/1.0/fcron/releases/2.9.4/10ts (from rev 1977, tinysofa/releases/1.0/fcron/current)

Modified: tinysofa/releases/1.0/fcron/releases/2.9.4/10ts/specs/fcron.spec
===================================================================
--- tinysofa/releases/1.0/fcron/current/specs/fcron.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/fcron/releases/2.9.4/10ts/specs/fcron.spec	2004-06-18 05:41:35 UTC (rev 1987)
@@ -1,7 +1,7 @@
 Summary:   Fcron is a task scheduler.
 Name: fcron
 Version: 2.9.4
-Release: 10jh
+Release: 10ts
 License: GPL
 Group: tinysofa official
 Source0: http://fcron.free.fr/%{name}-%{version}.src.tar.gz
@@ -133,6 +133,9 @@
 %attr(770,fcron,fcron) /var/spool/fcron
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.9.4-10ts
+- current (2.9.4-10jh) integrated as 2.9.4-10ts for release 1.0-U2
+
 * Tue May 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.9.4-10jh
 - prerequire initscripts
 


From svn at tinysofa.org  Fri Jun 18 05:41:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:36 +1000 (EST)
Subject: [tinysofa-svn] r1988 - tinysofa/releases/1.0/fcron
Message-ID: <20040618054136.88EC64E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:36 +1000 (Fri, 18 Jun 2004)
New Revision: 1988

Removed:
   tinysofa/releases/1.0/fcron/pristine/
Log:
fcron:
  * removing pristine (2.9.4-9ts)


From svn at tinysofa.org  Fri Jun 18 05:41:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:37 +1000 (EST)
Subject: [tinysofa-svn] r1989 - tinysofa/releases/1.0/fcron
Message-ID: <20040618054137.A6FA64E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:37 +1000 (Fri, 18 Jun 2004)
New Revision: 1989

Added:
   tinysofa/releases/1.0/fcron/pristine/
Log:
fcron:
  * retarget pristine (2.9.4-9ts) to releases/2.9.4/10ts

Copied: tinysofa/releases/1.0/fcron/pristine (from rev 1987, tinysofa/releases/1.0/fcron/releases/2.9.4/10ts)


From svn at tinysofa.org  Fri Jun 18 05:41:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:44 +1000 (EST)
Subject: [tinysofa-svn] 
	r1990 - in tinysofa/releases/1.0/hwdata: current/specs
	releases/0.44 releases/0.44/19ts/specs
Message-ID: <20040618054144.452804E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:43 +1000 (Fri, 18 Jun 2004)
New Revision: 1990

Added:
   tinysofa/releases/1.0/hwdata/releases/0.44/19ts/
Modified:
   tinysofa/releases/1.0/hwdata/current/specs/hwdata.spec
   tinysofa/releases/1.0/hwdata/releases/0.44/19ts/specs/hwdata.spec
Log:
hwdata:
  * integrate current (0.44-18ts) as releases/0.44/19ts

Modified: tinysofa/releases/1.0/hwdata/current/specs/hwdata.spec
===================================================================
--- tinysofa/releases/1.0/hwdata/current/specs/hwdata.spec	2004-06-18 05:41:37 UTC (rev 1989)
+++ tinysofa/releases/1.0/hwdata/current/specs/hwdata.spec	2004-06-18 05:41:43 UTC (rev 1990)
@@ -1,7 +1,7 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
 Version: 0.44
-Release: 18ts
+Release: 19ts
 License: GPL
 Group: tinysofa official
 Source: hwdata-%{version}.tar.gz
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 0.44-19ts
+- current (0.44-18ts) integrated as 0.44-19ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.44-18ts
 - current (0.44-17ts) integrated as 0.44-18ts for release 1.0-U1
 
@@ -206,4 +209,4 @@
 - return of XFree86-3.3.x
 
 * Wed Jan 30 2002 Bill Nottingham <notting at redhat.com> 0.1-1
-- initial build
\ No newline at end of file
+- initial buil

Copied: tinysofa/releases/1.0/hwdata/releases/0.44/19ts (from rev 1977, tinysofa/releases/1.0/hwdata/current)

Modified: tinysofa/releases/1.0/hwdata/releases/0.44/19ts/specs/hwdata.spec
===================================================================
--- tinysofa/releases/1.0/hwdata/current/specs/hwdata.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/hwdata/releases/0.44/19ts/specs/hwdata.spec	2004-06-18 05:41:43 UTC (rev 1990)
@@ -1,7 +1,7 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
 Version: 0.44
-Release: 18ts
+Release: 19ts
 License: GPL
 Group: tinysofa official
 Source: hwdata-%{version}.tar.gz
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 0.44-19ts
+- current (0.44-18ts) integrated as 0.44-19ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.44-18ts
 - current (0.44-17ts) integrated as 0.44-18ts for release 1.0-U1
 
@@ -206,4 +209,4 @@
 - return of XFree86-3.3.x
 
 * Wed Jan 30 2002 Bill Nottingham <notting at redhat.com> 0.1-1
-- initial build
\ No newline at end of file
+- initial buil


From svn at tinysofa.org  Fri Jun 18 05:41:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:45 +1000 (EST)
Subject: [tinysofa-svn] r1991 - tinysofa/releases/1.0/hwdata
Message-ID: <20040618054145.751D24E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:45 +1000 (Fri, 18 Jun 2004)
New Revision: 1991

Removed:
   tinysofa/releases/1.0/hwdata/pristine/
Log:
hwdata:
  * removing pristine (0.44-18ts)


From svn at tinysofa.org  Fri Jun 18 05:41:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:49 +1000 (EST)
Subject: [tinysofa-svn] r1992 - tinysofa/releases/1.0/hwdata
Message-ID: <20040618054149.A8A564E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:46 +1000 (Fri, 18 Jun 2004)
New Revision: 1992

Added:
   tinysofa/releases/1.0/hwdata/pristine/
Log:
hwdata:
  * retarget pristine (0.44-18ts) to releases/0.44/19ts

Copied: tinysofa/releases/1.0/hwdata/pristine (from rev 1990, tinysofa/releases/1.0/hwdata/releases/0.44/19ts)


From svn at tinysofa.org  Fri Jun 18 05:41:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:41:59 +1000 (EST)
Subject: [tinysofa-svn] 
	r1993 - in tinysofa/releases/1.0/iptables: current/specs releases
	releases/1.2.10 releases/1.2.10/1ts/specs
Message-ID: <20040618054159.03D924E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:41:58 +1000 (Fri, 18 Jun 2004)
New Revision: 1993

Added:
   tinysofa/releases/1.0/iptables/releases/1.2.10/
   tinysofa/releases/1.0/iptables/releases/1.2.10/1ts/
Modified:
   tinysofa/releases/1.0/iptables/current/specs/iptables.spec
   tinysofa/releases/1.0/iptables/releases/1.2.10/1ts/specs/iptables.spec
Log:
iptables:
  * integrate current (1.2.10-5ts) as releases/1.2.10/1ts

Modified: tinysofa/releases/1.0/iptables/current/specs/iptables.spec
===================================================================
--- tinysofa/releases/1.0/iptables/current/specs/iptables.spec	2004-06-18 05:41:46 UTC (rev 1992)
+++ tinysofa/releases/1.0/iptables/current/specs/iptables.spec	2004-06-18 05:41:58 UTC (rev 1993)
@@ -1,7 +1,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities.
 Version: 1.2.10
-Release: 5ts
+Release: 1ts
 Source: http://www.netfilter.org/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables6.init
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.2.10-1ts
+- current (1.2.10-5ts) integrated as 1.2.10-1ts for release 1.0-U2
+
 * Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
 - New upstream: 1.2.10.
 - Disable stack protector -- jh.

Copied: tinysofa/releases/1.0/iptables/releases/1.2.10/1ts (from rev 1977, tinysofa/releases/1.0/iptables/current)

Modified: tinysofa/releases/1.0/iptables/releases/1.2.10/1ts/specs/iptables.spec
===================================================================
--- tinysofa/releases/1.0/iptables/current/specs/iptables.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/iptables/releases/1.2.10/1ts/specs/iptables.spec	2004-06-18 05:41:58 UTC (rev 1993)
@@ -1,7 +1,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities.
 Version: 1.2.10
-Release: 5ts
+Release: 1ts
 Source: http://www.netfilter.org/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables6.init
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.2.10-1ts
+- current (1.2.10-5ts) integrated as 1.2.10-1ts for release 1.0-U2
+
 * Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
 - New upstream: 1.2.10.
 - Disable stack protector -- jh.


From svn at tinysofa.org  Fri Jun 18 05:42:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:00 +1000 (EST)
Subject: [tinysofa-svn] r1994 - tinysofa/releases/1.0/iptables
Message-ID: <20040618054200.6F4934E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:00 +1000 (Fri, 18 Jun 2004)
New Revision: 1994

Removed:
   tinysofa/releases/1.0/iptables/pristine/
Log:
iptables:
  * removing pristine (1.2.9-5ts)


From svn at tinysofa.org  Fri Jun 18 05:42:01 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:01 +1000 (EST)
Subject: [tinysofa-svn] r1995 - tinysofa/releases/1.0/iptables
Message-ID: <20040618054201.93C804E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:01 +1000 (Fri, 18 Jun 2004)
New Revision: 1995

Added:
   tinysofa/releases/1.0/iptables/pristine/
Log:
iptables:
  * retarget pristine (1.2.9-5ts) to releases/1.2.10/1ts

Copied: tinysofa/releases/1.0/iptables/pristine (from rev 1993, tinysofa/releases/1.0/iptables/releases/1.2.10/1ts)


From svn at tinysofa.org  Fri Jun 18 05:42:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:10 +1000 (EST)
Subject: [tinysofa-svn] 
	r1996 - in tinysofa/releases/1.0/kerberos5: current/specs
	releases/1.3.3 releases/1.3.3/4ts/specs
Message-ID: <20040618054210.4086B4E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:10 +1000 (Fri, 18 Jun 2004)
New Revision: 1996

Added:
   tinysofa/releases/1.0/kerberos5/releases/1.3.3/4ts/
Modified:
   tinysofa/releases/1.0/kerberos5/current/specs/kerberos5.spec
   tinysofa/releases/1.0/kerberos5/releases/1.3.3/4ts/specs/kerberos5.spec
Log:
kerberos5:
  * integrate current (1.3.3-3ts) as releases/1.3.3/4ts

Modified: tinysofa/releases/1.0/kerberos5/current/specs/kerberos5.spec
===================================================================
--- tinysofa/releases/1.0/kerberos5/current/specs/kerberos5.spec	2004-06-18 05:42:01 UTC (rev 1995)
+++ tinysofa/releases/1.0/kerberos5/current/specs/kerberos5.spec	2004-06-18 05:42:10 UTC (rev 1996)
@@ -1,7 +1,7 @@
 Summary: Kerberos is a network authentication protocol.
 Name: kerberos5
 Version: 1.3.3
-Release: 3ts
+Release: 4ts
 Group: tinysofa official
 Source0: krb5-%{version}.tar.gz
 Patch0: krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
@@ -77,6 +77,9 @@
 %attr(755,root,root) %{_libdir}/*.so
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.3.3-4ts
+- current (1.3.3-3ts) integrated as 1.3.3-4ts for release 1.0-U2
+
 * Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
 - Update MIT patch to latest version of vuln fix.
 

Copied: tinysofa/releases/1.0/kerberos5/releases/1.3.3/4ts (from rev 1977, tinysofa/releases/1.0/kerberos5/current)

Modified: tinysofa/releases/1.0/kerberos5/releases/1.3.3/4ts/specs/kerberos5.spec
===================================================================
--- tinysofa/releases/1.0/kerberos5/current/specs/kerberos5.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/kerberos5/releases/1.3.3/4ts/specs/kerberos5.spec	2004-06-18 05:42:10 UTC (rev 1996)
@@ -1,7 +1,7 @@
 Summary: Kerberos is a network authentication protocol.
 Name: kerberos5
 Version: 1.3.3
-Release: 3ts
+Release: 4ts
 Group: tinysofa official
 Source0: krb5-%{version}.tar.gz
 Patch0: krb5-1.3.3-MITKRB5-SA-2004-001-an_to_ln.patch
@@ -77,6 +77,9 @@
 %attr(755,root,root) %{_libdir}/*.so
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.3.3-4ts
+- current (1.3.3-3ts) integrated as 1.3.3-4ts for release 1.0-U2
+
 * Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
 - Update MIT patch to latest version of vuln fix.
 


From svn at tinysofa.org  Fri Jun 18 05:42:11 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:11 +1000 (EST)
Subject: [tinysofa-svn] r1997 - tinysofa/releases/1.0/kerberos5
Message-ID: <20040618054211.723D44E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:11 +1000 (Fri, 18 Jun 2004)
New Revision: 1997

Removed:
   tinysofa/releases/1.0/kerberos5/pristine/
Log:
kerberos5:
  * removing pristine (1.3.3-3ts)


From svn at tinysofa.org  Fri Jun 18 05:42:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:13 +1000 (EST)
Subject: [tinysofa-svn] r1998 - tinysofa/releases/1.0/kerberos5
Message-ID: <20040618054213.08DDD4E830A@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:12 +1000 (Fri, 18 Jun 2004)
New Revision: 1998

Added:
   tinysofa/releases/1.0/kerberos5/pristine/
Log:
kerberos5:
  * retarget pristine (1.3.3-3ts) to releases/1.3.3/4ts

Copied: tinysofa/releases/1.0/kerberos5/pristine (from rev 1996, tinysofa/releases/1.0/kerberos5/releases/1.3.3/4ts)


From svn at tinysofa.org  Fri Jun 18 05:42:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:24 +1000 (EST)
Subject: [tinysofa-svn] 
	r1999 - in tinysofa/releases/1.0/kernel: current/specs
	releases/2.4.26 releases/2.4.26/7ts/specs
Message-ID: <20040618054224.5BF1F4E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:24 +1000 (Fri, 18 Jun 2004)
New Revision: 1999

Added:
   tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/
Modified:
   tinysofa/releases/1.0/kernel/current/specs/kernel.spec
   tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/specs/kernel.spec
Log:
kernel:
  * integrate current (2.4.26-7jh) as releases/2.4.26/7ts

Modified: tinysofa/releases/1.0/kernel/current/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.0/kernel/current/specs/kernel.spec	2004-06-18 05:42:12 UTC (rev 1998)
+++ tinysofa/releases/1.0/kernel/current/specs/kernel.spec	2004-06-18 05:42:24 UTC (rev 1999)
@@ -19,7 +19,7 @@
 %define freeswanversion 2.05
 %define x509version 1.5.4
 Version: %{kversion}
-Release: 7jh
+Release: 7ts
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 License: GPL
 Group: tinysofa official
@@ -563,6 +563,9 @@
 %endif
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.4.26-7ts
+- current (2.4.26-7jh) integrated as 2.4.26-7ts for release 1.0-U2
+
 * Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
 - Update to 2.4.27-pre6, ChangeSet 1.1456.
 - Fixes CAN-2004-0554.

Copied: tinysofa/releases/1.0/kernel/releases/2.4.26/7ts (from rev 1977, tinysofa/releases/1.0/kernel/current)

Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/specs/kernel.spec
===================================================================
--- tinysofa/releases/1.0/kernel/current/specs/kernel.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/specs/kernel.spec	2004-06-18 05:42:24 UTC (rev 1999)
@@ -19,7 +19,7 @@
 %define freeswanversion 2.05
 %define x509version 1.5.4
 Version: %{kversion}
-Release: 7jh
+Release: 7ts
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 License: GPL
 Group: tinysofa official
@@ -563,6 +563,9 @@
 %endif
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.4.26-7ts
+- current (2.4.26-7jh) integrated as 2.4.26-7ts for release 1.0-U2
+
 * Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
 - Update to 2.4.27-pre6, ChangeSet 1.1456.
 - Fixes CAN-2004-0554.


From svn at tinysofa.org  Fri Jun 18 05:42:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:31 +1000 (EST)
Subject: [tinysofa-svn] r2000 - tinysofa/releases/1.0/kernel
Message-ID: <20040618054231.360234E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:30 +1000 (Fri, 18 Jun 2004)
New Revision: 2000

Removed:
   tinysofa/releases/1.0/kernel/pristine/
Log:
kernel:
  * removing pristine (2.4.26-6ts)


From svn at tinysofa.org  Fri Jun 18 05:42:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:35 +1000 (EST)
Subject: [tinysofa-svn] r2001 - tinysofa/releases/1.0/kernel
Message-ID: <20040618054235.7D9184E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:35 +1000 (Fri, 18 Jun 2004)
New Revision: 2001

Added:
   tinysofa/releases/1.0/kernel/pristine/
Log:
kernel:
  * retarget pristine (2.4.26-6ts) to releases/2.4.26/7ts

Copied: tinysofa/releases/1.0/kernel/pristine (from rev 1999, tinysofa/releases/1.0/kernel/releases/2.4.26/7ts)


From svn at tinysofa.org  Fri Jun 18 05:42:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:44 +1000 (EST)
Subject: [tinysofa-svn] 
	r2002 - in tinysofa/releases/1.0/lftp: current/specs releases
	releases/3.0.6 releases/3.0.6/1ts/specs
Message-ID: <20040618054244.5CCD34E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:44 +1000 (Fri, 18 Jun 2004)
New Revision: 2002

Added:
   tinysofa/releases/1.0/lftp/releases/3.0.6/
   tinysofa/releases/1.0/lftp/releases/3.0.6/1ts/
Modified:
   tinysofa/releases/1.0/lftp/current/specs/lftp.spec
   tinysofa/releases/1.0/lftp/releases/3.0.6/1ts/specs/lftp.spec
Log:
lftp:
  * integrate current (3.0.6-1jh) as releases/3.0.6/1ts

Modified: tinysofa/releases/1.0/lftp/current/specs/lftp.spec
===================================================================
--- tinysofa/releases/1.0/lftp/current/specs/lftp.spec	2004-06-18 05:42:35 UTC (rev 2001)
+++ tinysofa/releases/1.0/lftp/current/specs/lftp.spec	2004-06-18 05:42:44 UTC (rev 2002)
@@ -1,7 +1,7 @@
 Summary: A sophisticated file transfer program
 Name: lftp 
 Version: 3.0.6
-Release: 1jh
+Release: 1ts
 License: GPL
 Group: tinysofa official
 Source0: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2
@@ -67,6 +67,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 3.0.6-1ts
+- current (3.0.6-1jh) integrated as 3.0.6-1ts for release 1.0-U2
+
 * Thu May 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.0.4-1jh
 - 3.0.4
 

Copied: tinysofa/releases/1.0/lftp/releases/3.0.6/1ts (from rev 1977, tinysofa/releases/1.0/lftp/current)

Modified: tinysofa/releases/1.0/lftp/releases/3.0.6/1ts/specs/lftp.spec
===================================================================
--- tinysofa/releases/1.0/lftp/current/specs/lftp.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/lftp/releases/3.0.6/1ts/specs/lftp.spec	2004-06-18 05:42:44 UTC (rev 2002)
@@ -1,7 +1,7 @@
 Summary: A sophisticated file transfer program
 Name: lftp 
 Version: 3.0.6
-Release: 1jh
+Release: 1ts
 License: GPL
 Group: tinysofa official
 Source0: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2
@@ -67,6 +67,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 3.0.6-1ts
+- current (3.0.6-1jh) integrated as 3.0.6-1ts for release 1.0-U2
+
 * Thu May 27 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.0.4-1jh
 - 3.0.4
 


From svn at tinysofa.org  Fri Jun 18 05:42:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:45 +1000 (EST)
Subject: [tinysofa-svn] r2003 - tinysofa/releases/1.0/lftp
Message-ID: <20040618054245.9437E4E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:45 +1000 (Fri, 18 Jun 2004)
New Revision: 2003

Removed:
   tinysofa/releases/1.0/lftp/pristine/
Log:
lftp:
  * removing pristine (3.0.3-2ts)


From svn at tinysofa.org  Fri Jun 18 05:42:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:42:46 +1000 (EST)
Subject: [tinysofa-svn] r2004 - tinysofa/releases/1.0/lftp
Message-ID: <20040618054246.A59444E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:42:46 +1000 (Fri, 18 Jun 2004)
New Revision: 2004

Added:
   tinysofa/releases/1.0/lftp/pristine/
Log:
lftp:
  * retarget pristine (3.0.3-2ts) to releases/3.0.6/1ts

Copied: tinysofa/releases/1.0/lftp/pristine (from rev 2002, tinysofa/releases/1.0/lftp/releases/3.0.6/1ts)


From svn at tinysofa.org  Fri Jun 18 05:43:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:43:31 +1000 (EST)
Subject: [tinysofa-svn] r2005 - tinysofa/releases/1.0/links
Message-ID: <20040618054331.3B6244E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:43:31 +1000 (Fri, 18 Jun 2004)
New Revision: 2005

Added:
   tinysofa/releases/1.0/links/pristine/
Log:
- Pristine.


Copied: tinysofa/releases/1.0/links/pristine (from rev 1977, tinysofa/releases/1.0/links/current)


From svn at tinysofa.org  Fri Jun 18 05:44:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:20 +1000 (EST)
Subject: [tinysofa-svn] 
	r2011 - in tinysofa/releases/1.0/mod_php4: current/specs releases
	releases/4.3.7 releases/4.3.7/1ts/specs
Message-ID: <20040618054420.74B124E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:20 +1000 (Fri, 18 Jun 2004)
New Revision: 2011

Added:
   tinysofa/releases/1.0/mod_php4/releases/4.3.7/
   tinysofa/releases/1.0/mod_php4/releases/4.3.7/1ts/
Modified:
   tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec
   tinysofa/releases/1.0/mod_php4/releases/4.3.7/1ts/specs/mod_php4.spec
Log:
mod_php4:
  * integrate current (4.3.7-2ts) as releases/4.3.7/1ts

Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-18 05:44:10 UTC (rev 2010)
+++ tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-18 05:44:20 UTC (rev 2011)
@@ -7,7 +7,7 @@
 Summary: The PHP4 HTML-embedded scripting language for use with Apache.
 Name: mod_php4
 Version: 4.3.7
-Release: 2ts
+Release: 1ts
 Group: tinysofa official
 Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 Source1: php.ini
@@ -332,6 +332,9 @@
 /usr/share/php4/sysvshm.so
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 4.3.7-1ts
+- current (4.3.7-2ts) integrated as 4.3.7-1ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.3.6-2ts
 - current (4.3.6-1ts) integrated as 4.3.6-2ts for release 1.0-U1
 

Copied: tinysofa/releases/1.0/mod_php4/releases/4.3.7/1ts (from rev 1977, tinysofa/releases/1.0/mod_php4/current)

Modified: tinysofa/releases/1.0/mod_php4/releases/4.3.7/1ts/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/mod_php4/releases/4.3.7/1ts/specs/mod_php4.spec	2004-06-18 05:44:20 UTC (rev 2011)
@@ -7,7 +7,7 @@
 Summary: The PHP4 HTML-embedded scripting language for use with Apache.
 Name: mod_php4
 Version: 4.3.7
-Release: 2ts
+Release: 1ts
 Group: tinysofa official
 Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 Source1: php.ini
@@ -332,6 +332,9 @@
 /usr/share/php4/sysvshm.so
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 4.3.7-1ts
+- current (4.3.7-2ts) integrated as 4.3.7-1ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.3.6-2ts
 - current (4.3.6-1ts) integrated as 4.3.6-2ts for release 1.0-U1
 


From svn at tinysofa.org  Fri Jun 18 05:44:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:21 +1000 (EST)
Subject: [tinysofa-svn] r2012 - tinysofa/releases/1.0/mod_php4
Message-ID: <20040618054421.7E9FD4E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:21 +1000 (Fri, 18 Jun 2004)
New Revision: 2012

Removed:
   tinysofa/releases/1.0/mod_php4/pristine/
Log:
mod_php4:
  * removing pristine (4.3.6-2ts)


From svn at tinysofa.org  Fri Jun 18 05:44:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:22 +1000 (EST)
Subject: [tinysofa-svn] r2013 - tinysofa/releases/1.0/mod_php4
Message-ID: <20040618054422.CD26F4E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:22 +1000 (Fri, 18 Jun 2004)
New Revision: 2013

Added:
   tinysofa/releases/1.0/mod_php4/pristine/
Log:
mod_php4:
  * retarget pristine (4.3.6-2ts) to releases/4.3.7/1ts

Copied: tinysofa/releases/1.0/mod_php4/pristine (from rev 2011, tinysofa/releases/1.0/mod_php4/releases/4.3.7/1ts)


From svn at tinysofa.org  Fri Jun 18 05:43:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:43:47 +1000 (EST)
Subject: [tinysofa-svn] r2006 - tinysofa/releases/1.0/links/current/specs
Message-ID: <20040618054347.7D0D34E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:43:47 +1000 (Fri, 18 Jun 2004)
New Revision: 2006

Modified:
   tinysofa/releases/1.0/links/current/specs/links.spec
Log:
links:
  * integrate current (2.1pre15-1ok) as releases/2.1pre15/2ts

Modified: tinysofa/releases/1.0/links/current/specs/links.spec
===================================================================
--- tinysofa/releases/1.0/links/current/specs/links.spec	2004-06-18 05:43:31 UTC (rev 2005)
+++ tinysofa/releases/1.0/links/current/specs/links.spec	2004-06-18 05:43:47 UTC (rev 2006)
@@ -2,7 +2,7 @@
 
 Name: links
 Version: 2.1pre15
-Release: 1ok
+Release: 2ts
 License: GPL
 Summary: Links is a text-only browser very similar to lynx.
 Group: tinysofa official
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.1pre15-2ts
+- current (2.1pre15-1ok) integrated as 2.1pre15-2ts for release 1.0-U2
+
 * Fri Apr 16 2004 Wanderlei Antonio Cavassin <cavassin at conectiva.com.br>
 + 2004-04-16 20:31:20 (57230)
 - Oops, removed just menu dir creation, not /etc.


From svn at tinysofa.org  Fri Jun 18 05:43:48 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:43:48 +1000 (EST)
Subject: [tinysofa-svn] r2007 - tinysofa/releases/1.0/links
Message-ID: <20040618054348.62F8B4E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:43:48 +1000 (Fri, 18 Jun 2004)
New Revision: 2007

Removed:
   tinysofa/releases/1.0/links/pristine/
Log:
links:
  * removing pristine (2.1pre15-1ok)


From svn at tinysofa.org  Fri Jun 18 05:44:09 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:09 +1000 (EST)
Subject: [tinysofa-svn] r2009 - tinysofa/releases/1.0/m4
Message-ID: <20040618054409.982A44E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:09 +1000 (Fri, 18 Jun 2004)
New Revision: 2009

Removed:
   tinysofa/releases/1.0/m4/pristine/
Log:
m4:
  * removing pristine (1.4-26ts)


From svn at tinysofa.org  Fri Jun 18 05:44:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:10 +1000 (EST)
Subject: [tinysofa-svn] r2010 - tinysofa/releases/1.0/m4
Message-ID: <20040618054410.A989A4E830D@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:10 +1000 (Fri, 18 Jun 2004)
New Revision: 2010

Added:
   tinysofa/releases/1.0/m4/pristine/
Log:
m4:
  * retarget pristine (1.4-26ts) to releases/1.4.1/1ts

Copied: tinysofa/releases/1.0/m4/pristine (from rev 2008, tinysofa/releases/1.0/m4/releases/1.4.1/1ts)


From svn at tinysofa.org  Fri Jun 18 05:44:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:08 +1000 (EST)
Subject: [tinysofa-svn] 
	r2008 - in tinysofa/releases/1.0/m4: current/specs releases
	releases/1.4.1 releases/1.4.1/1ts/specs
Message-ID: <20040618054408.B9ADE4E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:08 +1000 (Fri, 18 Jun 2004)
New Revision: 2008

Added:
   tinysofa/releases/1.0/m4/releases/1.4.1/
   tinysofa/releases/1.0/m4/releases/1.4.1/1ts/
Modified:
   tinysofa/releases/1.0/m4/current/specs/m4.spec
   tinysofa/releases/1.0/m4/releases/1.4.1/1ts/specs/m4.spec
Log:
m4:
  * integrate current (1.4.1-26ts) as releases/1.4.1/1ts

Modified: tinysofa/releases/1.0/m4/current/specs/m4.spec
===================================================================
--- tinysofa/releases/1.0/m4/current/specs/m4.spec	2004-06-18 05:43:48 UTC (rev 2007)
+++ tinysofa/releases/1.0/m4/current/specs/m4.spec	2004-06-18 05:44:08 UTC (rev 2008)
@@ -1,7 +1,7 @@
 Summary: The GNU macro processor.
 Name: m4
 Version: 1.4.1
-Release: 26ts
+Release: 1ts
 License: GPL
 Group: tinysofa official
 Source: ftp://ftp.gnu.org/pub/gnu/m4/m4-%{version}.tar.gz
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.4.1-1ts
+- current (1.4.1-26ts) integrated as 1.4.1-1ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.4-26ts
 - current (1.4-25ts) integrated as 1.4-26ts for release 1.0-U1
 

Copied: tinysofa/releases/1.0/m4/releases/1.4.1/1ts (from rev 1977, tinysofa/releases/1.0/m4/current)

Modified: tinysofa/releases/1.0/m4/releases/1.4.1/1ts/specs/m4.spec
===================================================================
--- tinysofa/releases/1.0/m4/current/specs/m4.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/m4/releases/1.4.1/1ts/specs/m4.spec	2004-06-18 05:44:08 UTC (rev 2008)
@@ -1,7 +1,7 @@
 Summary: The GNU macro processor.
 Name: m4
 Version: 1.4.1
-Release: 26ts
+Release: 1ts
 License: GPL
 Group: tinysofa official
 Source: ftp://ftp.gnu.org/pub/gnu/m4/m4-%{version}.tar.gz
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.4.1-1ts
+- current (1.4.1-26ts) integrated as 1.4.1-1ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.4-26ts
 - current (1.4-25ts) integrated as 1.4-26ts for release 1.0-U1
 


From svn at tinysofa.org  Fri Jun 18 05:44:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:33 +1000 (EST)
Subject: [tinysofa-svn] 
	r2014 - in tinysofa/releases/1.0/mysql: current/specs
	releases/4.0.20 releases/4.0.20/3ts/specs
Message-ID: <20040618054433.37BE64E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:32 +1000 (Fri, 18 Jun 2004)
New Revision: 2014

Added:
   tinysofa/releases/1.0/mysql/releases/4.0.20/3ts/
Modified:
   tinysofa/releases/1.0/mysql/current/specs/mysql.spec
   tinysofa/releases/1.0/mysql/releases/4.0.20/3ts/specs/mysql.spec
Log:
mysql:
  * integrate current (4.0.20-3jh) as releases/4.0.20/3ts

Modified: tinysofa/releases/1.0/mysql/current/specs/mysql.spec
===================================================================
--- tinysofa/releases/1.0/mysql/current/specs/mysql.spec	2004-06-18 05:44:22 UTC (rev 2013)
+++ tinysofa/releases/1.0/mysql/current/specs/mysql.spec	2004-06-18 05:44:32 UTC (rev 2014)
@@ -2,7 +2,7 @@
 Name: mysql
 Group: tinysofa official
 Version: 4.0.20
-Release: 3jh
+Release: 3ts
 License: GPL / LGPL
 %define shared_libversion	12:0:0
 %define mysqld_user		mysql
@@ -354,6 +354,9 @@
 /usr/bin/mysqlmanagerc
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 4.0.20-3ts
+- current (4.0.20-3jh) integrated as 4.0.20-3ts for release 1.0-U2
+
 * Tue May 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.20-3jh
 - added PreReq: coreutils for mysql-libs
 

Copied: tinysofa/releases/1.0/mysql/releases/4.0.20/3ts (from rev 1977, tinysofa/releases/1.0/mysql/current)

Modified: tinysofa/releases/1.0/mysql/releases/4.0.20/3ts/specs/mysql.spec
===================================================================
--- tinysofa/releases/1.0/mysql/current/specs/mysql.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/mysql/releases/4.0.20/3ts/specs/mysql.spec	2004-06-18 05:44:32 UTC (rev 2014)
@@ -2,7 +2,7 @@
 Name: mysql
 Group: tinysofa official
 Version: 4.0.20
-Release: 3jh
+Release: 3ts
 License: GPL / LGPL
 %define shared_libversion	12:0:0
 %define mysqld_user		mysql
@@ -354,6 +354,9 @@
 /usr/bin/mysqlmanagerc
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 4.0.20-3ts
+- current (4.0.20-3jh) integrated as 4.0.20-3ts for release 1.0-U2
+
 * Tue May 25 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.0.20-3jh
 - added PreReq: coreutils for mysql-libs
 


From svn at tinysofa.org  Fri Jun 18 05:44:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:38 +1000 (EST)
Subject: [tinysofa-svn] r2015 - tinysofa/releases/1.0/mysql
Message-ID: <20040618054438.047894E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:34 +1000 (Fri, 18 Jun 2004)
New Revision: 2015

Removed:
   tinysofa/releases/1.0/mysql/pristine/
Log:
mysql:
  * removing pristine (4.0.20-2ts)


From svn at tinysofa.org  Fri Jun 18 05:44:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:41 +1000 (EST)
Subject: [tinysofa-svn] r2016 - tinysofa/releases/1.0/mysql
Message-ID: <20040618054441.B3DAC4E830B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:41 +1000 (Fri, 18 Jun 2004)
New Revision: 2016

Added:
   tinysofa/releases/1.0/mysql/pristine/
Log:
mysql:
  * retarget pristine (4.0.20-2ts) to releases/4.0.20/3ts

Copied: tinysofa/releases/1.0/mysql/pristine (from rev 2014, tinysofa/releases/1.0/mysql/releases/4.0.20/3ts)


From svn at tinysofa.org  Fri Jun 18 05:44:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:54 +1000 (EST)
Subject: [tinysofa-svn] r2019 - tinysofa/releases/1.0/postgresql
Message-ID: <20040618054454.78C844E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:54 +1000 (Fri, 18 Jun 2004)
New Revision: 2019

Added:
   tinysofa/releases/1.0/postgresql/pristine/
Log:
postgresql:
  * retarget pristine (7.4.2-5ts) to releases/7.4.3/1ts

Copied: tinysofa/releases/1.0/postgresql/pristine (from rev 2017, tinysofa/releases/1.0/postgresql/releases/7.4.3/1ts)


From svn at tinysofa.org  Fri Jun 18 05:44:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:49 +1000 (EST)
Subject: [tinysofa-svn] 
	r2017 - in tinysofa/releases/1.0/postgresql: current/specs releases
	releases/7.4.3 releases/7.4.3/1ts/specs
Message-ID: <20040618054449.CCAE74E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:49 +1000 (Fri, 18 Jun 2004)
New Revision: 2017

Added:
   tinysofa/releases/1.0/postgresql/releases/7.4.3/
   tinysofa/releases/1.0/postgresql/releases/7.4.3/1ts/
Modified:
   tinysofa/releases/1.0/postgresql/current/specs/postgresql.spec
   tinysofa/releases/1.0/postgresql/releases/7.4.3/1ts/specs/postgresql.spec
Log:
postgresql:
  * integrate current (7.4.3-5ts) as releases/7.4.3/1ts

Modified: tinysofa/releases/1.0/postgresql/current/specs/postgresql.spec
===================================================================
--- tinysofa/releases/1.0/postgresql/current/specs/postgresql.spec	2004-06-18 05:44:41 UTC (rev 2016)
+++ tinysofa/releases/1.0/postgresql/current/specs/postgresql.spec	2004-06-18 05:44:49 UTC (rev 2017)
@@ -8,7 +8,7 @@
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
 Version: 7.4.3
-Release: 5ts
+Release: 1ts
 License: BSD
 Group: tinysofa official
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -649,6 +649,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 7.4.3-1ts
+- current (7.4.3-5ts) integrated as 7.4.3-1ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 7.4.2-5ts
 - current (7.4.2-4ts) integrated as 7.4.2-5ts for release 1.0-U1
 

Copied: tinysofa/releases/1.0/postgresql/releases/7.4.3/1ts (from rev 1977, tinysofa/releases/1.0/postgresql/current)

Modified: tinysofa/releases/1.0/postgresql/releases/7.4.3/1ts/specs/postgresql.spec
===================================================================
--- tinysofa/releases/1.0/postgresql/current/specs/postgresql.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/postgresql/releases/7.4.3/1ts/specs/postgresql.spec	2004-06-18 05:44:49 UTC (rev 2017)
@@ -8,7 +8,7 @@
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
 Version: 7.4.3
-Release: 5ts
+Release: 1ts
 License: BSD
 Group: tinysofa official
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -649,6 +649,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 7.4.3-1ts
+- current (7.4.3-5ts) integrated as 7.4.3-1ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 7.4.2-5ts
 - current (7.4.2-4ts) integrated as 7.4.2-5ts for release 1.0-U1
 


From svn at tinysofa.org  Fri Jun 18 05:44:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:44:51 +1000 (EST)
Subject: [tinysofa-svn] r2018 - tinysofa/releases/1.0/postgresql
Message-ID: <20040618054451.9DEA94E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:44:51 +1000 (Fri, 18 Jun 2004)
New Revision: 2018

Removed:
   tinysofa/releases/1.0/postgresql/pristine/
Log:
postgresql:
  * removing pristine (7.4.2-5ts)


From svn at tinysofa.org  Fri Jun 18 05:45:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:45:02 +1000 (EST)
Subject: [tinysofa-svn] 
	r2020 - in tinysofa/releases/1.0/python: current/specs releases
	releases/2.3.4 releases/2.3.4/1ts/specs
Message-ID: <20040618054502.8ED734E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:45:02 +1000 (Fri, 18 Jun 2004)
New Revision: 2020

Added:
   tinysofa/releases/1.0/python/releases/2.3.4/
   tinysofa/releases/1.0/python/releases/2.3.4/1ts/
Modified:
   tinysofa/releases/1.0/python/current/specs/python.spec
   tinysofa/releases/1.0/python/releases/2.3.4/1ts/specs/python.spec
Log:
python:
  * integrate current (2.3.4-1jh) as releases/2.3.4/1ts

Modified: tinysofa/releases/1.0/python/current/specs/python.spec
===================================================================
--- tinysofa/releases/1.0/python/current/specs/python.spec	2004-06-18 05:44:54 UTC (rev 2019)
+++ tinysofa/releases/1.0/python/current/specs/python.spec	2004-06-18 05:45:02 UTC (rev 2020)
@@ -7,7 +7,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.4
-Release: 1jh
+Release: 1ts
 License: PSF - see LICENSE
 Group: tinysofa official
 Provides: python-abi = %{pybasever}
@@ -329,6 +329,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.3.4-1ts
+- current (2.3.4-1jh) integrated as 2.3.4-1ts for release 1.0-U2
+
 * Thu Jun 17 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.3.4-1jh
 - new upstream (2.3.4)
 - python-jp-codecs package

Copied: tinysofa/releases/1.0/python/releases/2.3.4/1ts (from rev 1977, tinysofa/releases/1.0/python/current)

Modified: tinysofa/releases/1.0/python/releases/2.3.4/1ts/specs/python.spec
===================================================================
--- tinysofa/releases/1.0/python/current/specs/python.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/python/releases/2.3.4/1ts/specs/python.spec	2004-06-18 05:45:02 UTC (rev 2020)
@@ -7,7 +7,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.4
-Release: 1jh
+Release: 1ts
 License: PSF - see LICENSE
 Group: tinysofa official
 Provides: python-abi = %{pybasever}
@@ -329,6 +329,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.3.4-1ts
+- current (2.3.4-1jh) integrated as 2.3.4-1ts for release 1.0-U2
+
 * Thu Jun 17 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.3.4-1jh
 - new upstream (2.3.4)
 - python-jp-codecs package


From svn at tinysofa.org  Fri Jun 18 05:45:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:45:05 +1000 (EST)
Subject: [tinysofa-svn] r2022 - tinysofa/releases/1.0/python
Message-ID: <20040618054505.6DB554E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:45:05 +1000 (Fri, 18 Jun 2004)
New Revision: 2022

Added:
   tinysofa/releases/1.0/python/pristine/
Log:
python:
  * retarget pristine (2.3.3-8ts) to releases/2.3.4/1ts

Copied: tinysofa/releases/1.0/python/pristine (from rev 2020, tinysofa/releases/1.0/python/releases/2.3.4/1ts)


From svn at tinysofa.org  Fri Jun 18 05:45:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:45:03 +1000 (EST)
Subject: [tinysofa-svn] r2021 - tinysofa/releases/1.0/python
Message-ID: <20040618054503.80D0C4E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:45:03 +1000 (Fri, 18 Jun 2004)
New Revision: 2021

Removed:
   tinysofa/releases/1.0/python/pristine/
Log:
python:
  * removing pristine (2.3.3-8ts)


From svn at tinysofa.org  Fri Jun 18 05:45:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:45:38 +1000 (EST)
Subject: [tinysofa-svn] r2023 - tinysofa/releases/1.0/release/current/specs
Message-ID: <20040618054538.88DD94E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:45:38 +1000 (Fri, 18 Jun 2004)
New Revision: 2023

Modified:
   tinysofa/releases/1.0/release/current/specs/release.spec
Log:
- Unhack.


Modified: tinysofa/releases/1.0/release/current/specs/release.spec
===================================================================
--- tinysofa/releases/1.0/release/current/specs/release.spec	2004-06-18 05:45:05 UTC (rev 2022)
+++ tinysofa/releases/1.0/release/current/specs/release.spec	2004-06-18 05:45:38 UTC (rev 2023)
@@ -7,9 +7,6 @@
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
-Requires: softwareupdater
-
-%description
 A package just to identify the release of the distribution.
 
 %prep


From svn at tinysofa.org  Fri Jun 18 05:46:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:46:37 +1000 (EST)
Subject: [tinysofa-svn] r2024 - tinysofa/releases/1.0/release/current/specs
Message-ID: <20040618054637.861DF4E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:46:37 +1000 (Fri, 18 Jun 2004)
New Revision: 2024

Modified:
   tinysofa/releases/1.0/release/current/specs/release.spec
Log:
- Unbreak.


Modified: tinysofa/releases/1.0/release/current/specs/release.spec
===================================================================
--- tinysofa/releases/1.0/release/current/specs/release.spec	2004-06-18 05:45:38 UTC (rev 2023)
+++ tinysofa/releases/1.0/release/current/specs/release.spec	2004-06-18 05:46:37 UTC (rev 2024)
@@ -7,6 +7,8 @@
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
+
+%description
 A package just to identify the release of the distribution.
 
 %prep


From svn at tinysofa.org  Fri Jun 18 05:49:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:49:43 +1000 (EST)
Subject: [tinysofa-svn] 
	r2025 - in tinysofa/releases/1.0/release: current/specs
	releases/1.0 releases/1.0/3ts/specs
Message-ID: <20040618054943.704FC4E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:49:43 +1000 (Fri, 18 Jun 2004)
New Revision: 2025

Added:
   tinysofa/releases/1.0/release/releases/1.0/3ts/
Modified:
   tinysofa/releases/1.0/release/current/specs/release.spec
   tinysofa/releases/1.0/release/releases/1.0/3ts/specs/release.spec
Log:
release:
  * integrate current (1.0-2ts) as releases/1.0/3ts

Modified: tinysofa/releases/1.0/release/current/specs/release.spec
===================================================================
--- tinysofa/releases/1.0/release/current/specs/release.spec	2004-06-18 05:46:37 UTC (rev 2024)
+++ tinysofa/releases/1.0/release/current/specs/release.spec	2004-06-18 05:49:43 UTC (rev 2025)
@@ -1,7 +1,7 @@
 Summary: tinysofa release file
 Name: release
 Version: 1.0
-Release: 2ts
+Release: 3ts
 License: GPL
 Group: tinysofa official
 BuildArch: noarch
@@ -41,5 +41,8 @@
 /etc/tinysofa-release
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.0-3ts
+- current (1.0-2ts) integrated as 1.0-3ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.0-2ts
 - current (1.0-1ts) integrated as 1.0-2ts for release 1.0-U1

Copied: tinysofa/releases/1.0/release/releases/1.0/3ts (from rev 2024, tinysofa/releases/1.0/release/current)

Modified: tinysofa/releases/1.0/release/releases/1.0/3ts/specs/release.spec
===================================================================
--- tinysofa/releases/1.0/release/current/specs/release.spec	2004-06-18 05:46:37 UTC (rev 2024)
+++ tinysofa/releases/1.0/release/releases/1.0/3ts/specs/release.spec	2004-06-18 05:49:43 UTC (rev 2025)
@@ -1,7 +1,7 @@
 Summary: tinysofa release file
 Name: release
 Version: 1.0
-Release: 2ts
+Release: 3ts
 License: GPL
 Group: tinysofa official
 BuildArch: noarch
@@ -41,5 +41,8 @@
 /etc/tinysofa-release
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.0-3ts
+- current (1.0-2ts) integrated as 1.0-3ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.0-2ts
 - current (1.0-1ts) integrated as 1.0-2ts for release 1.0-U1


From svn at tinysofa.org  Fri Jun 18 05:49:44 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:49:44 +1000 (EST)
Subject: [tinysofa-svn] r2026 - tinysofa/releases/1.0/release
Message-ID: <20040618054944.670EE4E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:49:44 +1000 (Fri, 18 Jun 2004)
New Revision: 2026

Removed:
   tinysofa/releases/1.0/release/pristine/
Log:
release:
  * removing pristine (1.0-2ts)


From svn at tinysofa.org  Fri Jun 18 05:49:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:49:45 +1000 (EST)
Subject: [tinysofa-svn] r2027 - tinysofa/releases/1.0/release
Message-ID: <20040618054945.B18294E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:49:45 +1000 (Fri, 18 Jun 2004)
New Revision: 2027

Added:
   tinysofa/releases/1.0/release/pristine/
Log:
release:
  * retarget pristine (1.0-2ts) to releases/1.0/3ts

Copied: tinysofa/releases/1.0/release/pristine (from rev 2025, tinysofa/releases/1.0/release/releases/1.0/3ts)


From svn at tinysofa.org  Fri Jun 18 05:49:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:49:53 +1000 (EST)
Subject: [tinysofa-svn] 
	r2028 - in tinysofa/releases/1.0/rsync: current/specs
	releases/2.6.2 releases/2.6.2/3ts/specs
Message-ID: <20040618054953.BBEE34E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:49:53 +1000 (Fri, 18 Jun 2004)
New Revision: 2028

Added:
   tinysofa/releases/1.0/rsync/releases/2.6.2/3ts/
Modified:
   tinysofa/releases/1.0/rsync/current/specs/rsync.spec
   tinysofa/releases/1.0/rsync/releases/2.6.2/3ts/specs/rsync.spec
Log:
rsync:
  * integrate current (2.6.2-2ts) as releases/2.6.2/3ts

Modified: tinysofa/releases/1.0/rsync/current/specs/rsync.spec
===================================================================
--- tinysofa/releases/1.0/rsync/current/specs/rsync.spec	2004-06-18 05:49:45 UTC (rev 2027)
+++ tinysofa/releases/1.0/rsync/current/specs/rsync.spec	2004-06-18 05:49:53 UTC (rev 2028)
@@ -1,7 +1,7 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.2
-Release: 2ts
+Release: 3ts
 License: GPL
 Group: tinysofa official
 Source:	ftp://ftp.samba.org/pub/rsync/rsync-%{version}.tar.gz
@@ -78,6 +78,9 @@
 %attr(640,root,root) /var/log/rsync/*
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.6.2-3ts
+- current (2.6.2-2ts) integrated as 2.6.2-3ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.6.2-2ts
 - current (2.6.2-1ts) integrated as 2.6.2-2ts for release 1.0-U1
 

Copied: tinysofa/releases/1.0/rsync/releases/2.6.2/3ts (from rev 1977, tinysofa/releases/1.0/rsync/current)

Modified: tinysofa/releases/1.0/rsync/releases/2.6.2/3ts/specs/rsync.spec
===================================================================
--- tinysofa/releases/1.0/rsync/current/specs/rsync.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/rsync/releases/2.6.2/3ts/specs/rsync.spec	2004-06-18 05:49:53 UTC (rev 2028)
@@ -1,7 +1,7 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.2
-Release: 2ts
+Release: 3ts
 License: GPL
 Group: tinysofa official
 Source:	ftp://ftp.samba.org/pub/rsync/rsync-%{version}.tar.gz
@@ -78,6 +78,9 @@
 %attr(640,root,root) /var/log/rsync/*
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.6.2-3ts
+- current (2.6.2-2ts) integrated as 2.6.2-3ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.6.2-2ts
 - current (2.6.2-1ts) integrated as 2.6.2-2ts for release 1.0-U1
 


From svn at tinysofa.org  Fri Jun 18 05:49:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:49:54 +1000 (EST)
Subject: [tinysofa-svn] r2029 - tinysofa/releases/1.0/rsync
Message-ID: <20040618054954.7F0954E830D@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:49:54 +1000 (Fri, 18 Jun 2004)
New Revision: 2029

Removed:
   tinysofa/releases/1.0/rsync/pristine/
Log:
rsync:
  * removing pristine (2.6.2-2ts)


From svn at tinysofa.org  Fri Jun 18 05:49:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:49:55 +1000 (EST)
Subject: [tinysofa-svn] r2030 - tinysofa/releases/1.0/rsync
Message-ID: <20040618054955.C47DF4E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:49:55 +1000 (Fri, 18 Jun 2004)
New Revision: 2030

Added:
   tinysofa/releases/1.0/rsync/pristine/
Log:
rsync:
  * retarget pristine (2.6.2-2ts) to releases/2.6.2/3ts

Copied: tinysofa/releases/1.0/rsync/pristine (from rev 2028, tinysofa/releases/1.0/rsync/releases/2.6.2/3ts)


From svn at tinysofa.org  Fri Jun 18 05:50:01 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:01 +1000 (EST)
Subject: [tinysofa-svn] 
	r2031 - in tinysofa/releases/1.0/sed: current/specs releases
	releases/4.1 releases/4.1/1ts/specs
Message-ID: <20040618055001.81B574E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:01 +1000 (Fri, 18 Jun 2004)
New Revision: 2031

Added:
   tinysofa/releases/1.0/sed/releases/4.1/
   tinysofa/releases/1.0/sed/releases/4.1/1ts/
Modified:
   tinysofa/releases/1.0/sed/current/specs/sed.spec
   tinysofa/releases/1.0/sed/releases/4.1/1ts/specs/sed.spec
Log:
sed:
  * integrate current (4.1-5ts) as releases/4.1/1ts

Modified: tinysofa/releases/1.0/sed/current/specs/sed.spec
===================================================================
--- tinysofa/releases/1.0/sed/current/specs/sed.spec	2004-06-18 05:49:55 UTC (rev 2030)
+++ tinysofa/releases/1.0/sed/current/specs/sed.spec	2004-06-18 05:50:01 UTC (rev 2031)
@@ -1,7 +1,7 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1
-Release: 5ts
+Release: 1ts
 License: GPL
 Group: tinysofa official
 Source0: ftp://ftp.gnu.org/gnu/sed/sed-%{version}.tar.gz
@@ -66,6 +66,9 @@
 /usr/share/man/man1/sed.1*
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 4.1-1ts
+- current (4.1-5ts) integrated as 4.1-1ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.0.9-5ts
 - current (4.0.9-4ts) integrated as 4.0.9-5ts for release 1.0-U1
 

Copied: tinysofa/releases/1.0/sed/releases/4.1/1ts (from rev 1977, tinysofa/releases/1.0/sed/current)

Modified: tinysofa/releases/1.0/sed/releases/4.1/1ts/specs/sed.spec
===================================================================
--- tinysofa/releases/1.0/sed/current/specs/sed.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/sed/releases/4.1/1ts/specs/sed.spec	2004-06-18 05:50:01 UTC (rev 2031)
@@ -1,7 +1,7 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1
-Release: 5ts
+Release: 1ts
 License: GPL
 Group: tinysofa official
 Source0: ftp://ftp.gnu.org/gnu/sed/sed-%{version}.tar.gz
@@ -66,6 +66,9 @@
 /usr/share/man/man1/sed.1*
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 4.1-1ts
+- current (4.1-5ts) integrated as 4.1-1ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.0.9-5ts
 - current (4.0.9-4ts) integrated as 4.0.9-5ts for release 1.0-U1
 


From svn at tinysofa.org  Fri Jun 18 05:50:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:06 +1000 (EST)
Subject: [tinysofa-svn] r2032 - tinysofa/releases/1.0/sed
Message-ID: <20040618055006.0663E4E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:02 +1000 (Fri, 18 Jun 2004)
New Revision: 2032

Removed:
   tinysofa/releases/1.0/sed/pristine/
Log:
sed:
  * removing pristine (4.0.9-5ts)


From svn at tinysofa.org  Fri Jun 18 05:50:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:07 +1000 (EST)
Subject: [tinysofa-svn] r2033 - tinysofa/releases/1.0/sed
Message-ID: <20040618055007.A65404E830C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:07 +1000 (Fri, 18 Jun 2004)
New Revision: 2033

Added:
   tinysofa/releases/1.0/sed/pristine/
Log:
sed:
  * retarget pristine (4.0.9-5ts) to releases/4.1/1ts

Copied: tinysofa/releases/1.0/sed/pristine (from rev 2031, tinysofa/releases/1.0/sed/releases/4.1/1ts)


From svn at tinysofa.org  Fri Jun 18 05:50:14 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:14 +1000 (EST)
Subject: [tinysofa-svn] 
	r2034 - in tinysofa/releases/1.0/setup: current/specs
	releases/2.2.5 releases/2.2.5/6ts/specs
Message-ID: <20040618055014.5DE9A4E8310@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:14 +1000 (Fri, 18 Jun 2004)
New Revision: 2034

Added:
   tinysofa/releases/1.0/setup/releases/2.2.5/6ts/
Modified:
   tinysofa/releases/1.0/setup/current/specs/setup.spec
   tinysofa/releases/1.0/setup/releases/2.2.5/6ts/specs/setup.spec
Log:
setup:
  * integrate current (2.2.5-5ts) as releases/2.2.5/6ts

Modified: tinysofa/releases/1.0/setup/current/specs/setup.spec
===================================================================
--- tinysofa/releases/1.0/setup/current/specs/setup.spec	2004-06-18 05:50:07 UTC (rev 2033)
+++ tinysofa/releases/1.0/setup/current/specs/setup.spec	2004-06-18 05:50:14 UTC (rev 2034)
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files.
 Name: setup
 Version: 2.2.5
-Release: 5ts
+Release: 6ts
 License: public domain
 Group: tinysofa official
 Source: setup-%{version}.tar.gz
@@ -58,6 +58,9 @@
 %exclude /etc/setup.spec
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.2.5-6ts
+- current (2.2.5-5ts) integrated as 2.2.5-6ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.2.5-5ts
 - current (2.2.5-4ts) integrated as 2.2.5-5ts for release 1.0-U1
 

Copied: tinysofa/releases/1.0/setup/releases/2.2.5/6ts (from rev 1977, tinysofa/releases/1.0/setup/current)

Modified: tinysofa/releases/1.0/setup/releases/2.2.5/6ts/specs/setup.spec
===================================================================
--- tinysofa/releases/1.0/setup/current/specs/setup.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/setup/releases/2.2.5/6ts/specs/setup.spec	2004-06-18 05:50:14 UTC (rev 2034)
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files.
 Name: setup
 Version: 2.2.5
-Release: 5ts
+Release: 6ts
 License: public domain
 Group: tinysofa official
 Source: setup-%{version}.tar.gz
@@ -58,6 +58,9 @@
 %exclude /etc/setup.spec
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.2.5-6ts
+- current (2.2.5-5ts) integrated as 2.2.5-6ts for release 1.0-U2
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.2.5-5ts
 - current (2.2.5-4ts) integrated as 2.2.5-5ts for release 1.0-U1
 


From svn at tinysofa.org  Fri Jun 18 05:50:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:15 +1000 (EST)
Subject: [tinysofa-svn] r2035 - tinysofa/releases/1.0/setup
Message-ID: <20040618055015.808B44E8310@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:15 +1000 (Fri, 18 Jun 2004)
New Revision: 2035

Removed:
   tinysofa/releases/1.0/setup/pristine/
Log:
setup:
  * removing pristine (2.2.5-5ts)


From svn at tinysofa.org  Fri Jun 18 05:50:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:16 +1000 (EST)
Subject: [tinysofa-svn] r2036 - tinysofa/releases/1.0/setup
Message-ID: <20040618055016.B6BB64E826C@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:16 +1000 (Fri, 18 Jun 2004)
New Revision: 2036

Added:
   tinysofa/releases/1.0/setup/pristine/
Log:
setup:
  * retarget pristine (2.2.5-5ts) to releases/2.2.5/6ts

Copied: tinysofa/releases/1.0/setup/pristine (from rev 2034, tinysofa/releases/1.0/setup/releases/2.2.5/6ts)


From svn at tinysofa.org  Fri Jun 18 05:50:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:22 +1000 (EST)
Subject: [tinysofa-svn] 
	r2037 - in tinysofa/releases/1.0/slocate: current/specs
	releases/2.7 releases/2.7/7ts/specs
Message-ID: <20040618055022.5E5894E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:22 +1000 (Fri, 18 Jun 2004)
New Revision: 2037

Added:
   tinysofa/releases/1.0/slocate/releases/2.7/7ts/
Modified:
   tinysofa/releases/1.0/slocate/current/specs/slocate.spec
   tinysofa/releases/1.0/slocate/releases/2.7/7ts/specs/slocate.spec
Log:
slocate:
  * integrate current (2.7-8jh) as releases/2.7/7ts

Modified: tinysofa/releases/1.0/slocate/current/specs/slocate.spec
===================================================================
--- tinysofa/releases/1.0/slocate/current/specs/slocate.spec	2004-06-18 05:50:16 UTC (rev 2036)
+++ tinysofa/releases/1.0/slocate/current/specs/slocate.spec	2004-06-18 05:50:22 UTC (rev 2037)
@@ -1,7 +1,7 @@
 Summary: Finds files on a system via a central database.
 Name: slocate
 Version: 2.7
-Release: 8jh
+Release: 7ts
 License: GPL
 Group: tinysofa official
 Source: ftp://ftp.geekreview.org/slocate/src/%{name}-%{version}.tar.gz
@@ -89,6 +89,9 @@
 %attr(644,root,root) %{_mandir}/man1/*
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.7-7ts
+- current (2.7-8jh) integrated as 2.7-7ts for release 1.0-U2
+
 * Sat Jun  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.7-8jh
 - use correct CFLAGS
 - integrate changes from Conectiva and Fedora spec files

Copied: tinysofa/releases/1.0/slocate/releases/2.7/7ts (from rev 1977, tinysofa/releases/1.0/slocate/current)

Modified: tinysofa/releases/1.0/slocate/releases/2.7/7ts/specs/slocate.spec
===================================================================
--- tinysofa/releases/1.0/slocate/current/specs/slocate.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/slocate/releases/2.7/7ts/specs/slocate.spec	2004-06-18 05:50:22 UTC (rev 2037)
@@ -1,7 +1,7 @@
 Summary: Finds files on a system via a central database.
 Name: slocate
 Version: 2.7
-Release: 8jh
+Release: 7ts
 License: GPL
 Group: tinysofa official
 Source: ftp://ftp.geekreview.org/slocate/src/%{name}-%{version}.tar.gz
@@ -89,6 +89,9 @@
 %attr(644,root,root) %{_mandir}/man1/*
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.7-7ts
+- current (2.7-8jh) integrated as 2.7-7ts for release 1.0-U2
+
 * Sat Jun  5 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.7-8jh
 - use correct CFLAGS
 - integrate changes from Conectiva and Fedora spec files


From svn at tinysofa.org  Fri Jun 18 05:50:23 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:23 +1000 (EST)
Subject: [tinysofa-svn] r2038 - tinysofa/releases/1.0/slocate
Message-ID: <20040618055023.876364E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:23 +1000 (Fri, 18 Jun 2004)
New Revision: 2038

Removed:
   tinysofa/releases/1.0/slocate/pristine/
Log:
slocate:
  * removing pristine (2.7-6ts)


From svn at tinysofa.org  Fri Jun 18 05:50:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:24 +1000 (EST)
Subject: [tinysofa-svn] r2039 - tinysofa/releases/1.0/slocate
Message-ID: <20040618055024.8BAA44E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:24 +1000 (Fri, 18 Jun 2004)
New Revision: 2039

Added:
   tinysofa/releases/1.0/slocate/pristine/
Log:
slocate:
  * retarget pristine (2.7-6ts) to releases/2.7/7ts

Copied: tinysofa/releases/1.0/slocate/pristine (from rev 2037, tinysofa/releases/1.0/slocate/releases/2.7/7ts)


From svn at tinysofa.org  Fri Jun 18 05:50:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:35 +1000 (EST)
Subject: [tinysofa-svn] 
	r2040 - in tinysofa/releases/1.0/swup: current/specs releases/2.4.6
	releases/2.4.6/2ts/specs
Message-ID: <20040618055035.BCE4E4E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:35 +1000 (Fri, 18 Jun 2004)
New Revision: 2040

Added:
   tinysofa/releases/1.0/swup/releases/2.4.6/2ts/
Modified:
   tinysofa/releases/1.0/swup/current/specs/swup.spec
   tinysofa/releases/1.0/swup/releases/2.4.6/2ts/specs/swup.spec
Log:
swup:
  * integrate current (2.4.6-1ts) as releases/2.4.6/2ts

Modified: tinysofa/releases/1.0/swup/current/specs/swup.spec
===================================================================
--- tinysofa/releases/1.0/swup/current/specs/swup.spec	2004-06-18 05:50:24 UTC (rev 2039)
+++ tinysofa/releases/1.0/swup/current/specs/swup.spec	2004-06-18 05:50:35 UTC (rev 2040)
@@ -1,7 +1,7 @@
 Summary: The secure software updater
 Name: swup
 Version: 2.4.6
-Release: 1ts
+Release: 2ts
 License: GPL
 Group: tinysofa official
 Source0: %{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 %ghost /etc/cron.weekly/swup.cron
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.4.6-2ts
+- current (2.4.6-1ts) integrated as 2.4.6-2ts for release 1.0-U2
+
 * Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
 - Add swup-2.4.6-multi-providers.patch from jh.
 

Copied: tinysofa/releases/1.0/swup/releases/2.4.6/2ts (from rev 1977, tinysofa/releases/1.0/swup/current)

Modified: tinysofa/releases/1.0/swup/releases/2.4.6/2ts/specs/swup.spec
===================================================================
--- tinysofa/releases/1.0/swup/current/specs/swup.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/swup/releases/2.4.6/2ts/specs/swup.spec	2004-06-18 05:50:35 UTC (rev 2040)
@@ -1,7 +1,7 @@
 Summary: The secure software updater
 Name: swup
 Version: 2.4.6
-Release: 1ts
+Release: 2ts
 License: GPL
 Group: tinysofa official
 Source0: %{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 %ghost /etc/cron.weekly/swup.cron
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.4.6-2ts
+- current (2.4.6-1ts) integrated as 2.4.6-2ts for release 1.0-U2
+
 * Fri Jun 18 2004 Omar Kilani <omar at tinysofa dot org>
 - Add swup-2.4.6-multi-providers.patch from jh.
 


From svn at tinysofa.org  Fri Jun 18 05:50:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:36 +1000 (EST)
Subject: [tinysofa-svn] r2041 - tinysofa/releases/1.0/swup
Message-ID: <20040618055036.F14FF4E826B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:36 +1000 (Fri, 18 Jun 2004)
New Revision: 2041

Removed:
   tinysofa/releases/1.0/swup/pristine/
Log:
swup:
  * removing pristine (2.4.6-1ts)


From svn at tinysofa.org  Fri Jun 18 05:50:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:38 +1000 (EST)
Subject: [tinysofa-svn] r2042 - tinysofa/releases/1.0/swup
Message-ID: <20040618055038.9DE574E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:38 +1000 (Fri, 18 Jun 2004)
New Revision: 2042

Added:
   tinysofa/releases/1.0/swup/pristine/
Log:
swup:
  * retarget pristine (2.4.6-1ts) to releases/2.4.6/2ts

Copied: tinysofa/releases/1.0/swup/pristine (from rev 2040, tinysofa/releases/1.0/swup/releases/2.4.6/2ts)


From svn at tinysofa.org  Fri Jun 18 05:50:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:45 +1000 (EST)
Subject: [tinysofa-svn] 
	r2043 - in tinysofa/releases/1.0/swupconf: current/specs releases
	releases/1.2 releases/1.2/1ts/specs
Message-ID: <20040618055045.C6DB24E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:45 +1000 (Fri, 18 Jun 2004)
New Revision: 2043

Added:
   tinysofa/releases/1.0/swupconf/releases/1.2/
   tinysofa/releases/1.0/swupconf/releases/1.2/1ts/
Modified:
   tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec
   tinysofa/releases/1.0/swupconf/releases/1.2/1ts/specs/swupconf.spec
Log:
swupconf:
  * integrate current (1.2-1ts) as releases/1.2/1ts

Modified: tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec
===================================================================
--- tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec	2004-06-18 05:50:38 UTC (rev 2042)
+++ tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec	2004-06-18 05:50:45 UTC (rev 2043)
@@ -39,6 +39,9 @@
 %config(noreplace) /etc/swup/gnupg/pubring.gpg
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.2-1ts
+- current (1.2-1ts) integrated as 1.2-1ts for release 1.0-U2
+
 * Mon May 24 2004 tsintegrate <release at tinysofa dot org> 1.1-1ts
 - current (1.1-2ok) integrated as 1.1-1ts for release 1.0-U1
 

Copied: tinysofa/releases/1.0/swupconf/releases/1.2/1ts (from rev 1977, tinysofa/releases/1.0/swupconf/current)

Modified: tinysofa/releases/1.0/swupconf/releases/1.2/1ts/specs/swupconf.spec
===================================================================
--- tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/swupconf/releases/1.2/1ts/specs/swupconf.spec	2004-06-18 05:50:45 UTC (rev 2043)
@@ -39,6 +39,9 @@
 %config(noreplace) /etc/swup/gnupg/pubring.gpg
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 1.2-1ts
+- current (1.2-1ts) integrated as 1.2-1ts for release 1.0-U2
+
 * Mon May 24 2004 tsintegrate <release at tinysofa dot org> 1.1-1ts
 - current (1.1-2ok) integrated as 1.1-1ts for release 1.0-U1
 


From svn at tinysofa.org  Fri Jun 18 05:50:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:46 +1000 (EST)
Subject: [tinysofa-svn] r2044 - tinysofa/releases/1.0/swupconf
Message-ID: <20040618055046.7D7504E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:46 +1000 (Fri, 18 Jun 2004)
New Revision: 2044

Removed:
   tinysofa/releases/1.0/swupconf/pristine/
Log:
swupconf:
  * removing pristine (1.1-1ts)


From svn at tinysofa.org  Fri Jun 18 05:50:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:47 +1000 (EST)
Subject: [tinysofa-svn] r2045 - tinysofa/releases/1.0/swupconf
Message-ID: <20040618055047.9D3DB4E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:47 +1000 (Fri, 18 Jun 2004)
New Revision: 2045

Added:
   tinysofa/releases/1.0/swupconf/pristine/
Log:
swupconf:
  * retarget pristine (1.1-1ts) to releases/1.2/1ts

Copied: tinysofa/releases/1.0/swupconf/pristine (from rev 2043, tinysofa/releases/1.0/swupconf/releases/1.2/1ts)


From svn at tinysofa.org  Fri Jun 18 05:50:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:56 +1000 (EST)
Subject: [tinysofa-svn] 
	r2046 - in tinysofa/releases/1.0/tinysofa-utils: current/sources
	current/specs releases/2.0 releases/2.0/4ts/sources
	releases/2.0/4ts/specs
Message-ID: <20040618055056.A7F5E4E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:56 +1000 (Fri, 18 Jun 2004)
New Revision: 2046

Added:
   tinysofa/releases/1.0/tinysofa-utils/releases/2.0/4ts/
Modified:
   tinysofa/releases/1.0/tinysofa-utils/current/sources/tsrep
   tinysofa/releases/1.0/tinysofa-utils/current/specs/tinysofa-utils.spec
   tinysofa/releases/1.0/tinysofa-utils/releases/2.0/4ts/sources/tsrep
   tinysofa/releases/1.0/tinysofa-utils/releases/2.0/4ts/specs/tinysofa-utils.spec
Log:
tinysofa-utils:
  * integrate current (2.0-3ts) as releases/2.0/4ts

Modified: tinysofa/releases/1.0/tinysofa-utils/current/sources/tsrep
===================================================================
--- tinysofa/releases/1.0/tinysofa-utils/current/sources/tsrep	2004-06-18 05:50:47 UTC (rev 2045)
+++ tinysofa/releases/1.0/tinysofa-utils/current/sources/tsrep	2004-06-18 05:50:56 UTC (rev 2046)
@@ -22,7 +22,7 @@
   print '[tsrep]', ' '.join(sargs)
 
 class RepositorySystem:
-  DEFAULT_PARENT = 'svn://svn.tinysofa.org/home/svn/repos/tinysofa'
+  DEFAULT_PARENT = 'https://svn.tinysofa.org/repos/tinysofa'
   DEFAULT_TREE = 'snapshot'
   DEFAULT_CLASS = 'current'
   COMMANDS = ['help', 'create_pkg_tree', 'create_srpm', 'create_srpm_all', 'generate_srpm', 'generate_srpm_all', 'update', 'update_all'] 

Modified: tinysofa/releases/1.0/tinysofa-utils/current/specs/tinysofa-utils.spec
===================================================================
--- tinysofa/releases/1.0/tinysofa-utils/current/specs/tinysofa-utils.spec	2004-06-18 05:50:47 UTC (rev 2045)
+++ tinysofa/releases/1.0/tinysofa-utils/current/specs/tinysofa-utils.spec	2004-06-18 05:50:56 UTC (rev 2046)
@@ -1,6 +1,6 @@
 Name: tinysofa-utils
 Version: 2.0
-Release: 3ts
+Release: 4ts
 URL: http://www.tinysofa.org
 Summary: tinysofa utilities
 Source0: tinysofa-utils-restart_maybe
@@ -54,6 +54,9 @@
 /usr/share/tinysofa-utils/tsrelease
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0-4ts
+- current (2.0-3ts) integrated as 2.0-4ts for release 1.0-U2
+
 * Mon May 24 2004 tsintegrate <release at tinysofa dot org> 2.0-3ts
 - current (2.0-3ok) integrated as 2.0-3ts for release 1.0-U1
 

Copied: tinysofa/releases/1.0/tinysofa-utils/releases/2.0/4ts (from rev 1977, tinysofa/releases/1.0/tinysofa-utils/current)

Modified: tinysofa/releases/1.0/tinysofa-utils/releases/2.0/4ts/sources/tsrep
===================================================================
--- tinysofa/releases/1.0/tinysofa-utils/current/sources/tsrep	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/tinysofa-utils/releases/2.0/4ts/sources/tsrep	2004-06-18 05:50:56 UTC (rev 2046)
@@ -22,7 +22,7 @@
   print '[tsrep]', ' '.join(sargs)
 
 class RepositorySystem:
-  DEFAULT_PARENT = 'svn://svn.tinysofa.org/home/svn/repos/tinysofa'
+  DEFAULT_PARENT = 'https://svn.tinysofa.org/repos/tinysofa'
   DEFAULT_TREE = 'snapshot'
   DEFAULT_CLASS = 'current'
   COMMANDS = ['help', 'create_pkg_tree', 'create_srpm', 'create_srpm_all', 'generate_srpm', 'generate_srpm_all', 'update', 'update_all'] 

Modified: tinysofa/releases/1.0/tinysofa-utils/releases/2.0/4ts/specs/tinysofa-utils.spec
===================================================================
--- tinysofa/releases/1.0/tinysofa-utils/current/specs/tinysofa-utils.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/tinysofa-utils/releases/2.0/4ts/specs/tinysofa-utils.spec	2004-06-18 05:50:56 UTC (rev 2046)
@@ -1,6 +1,6 @@
 Name: tinysofa-utils
 Version: 2.0
-Release: 3ts
+Release: 4ts
 URL: http://www.tinysofa.org
 Summary: tinysofa utilities
 Source0: tinysofa-utils-restart_maybe
@@ -54,6 +54,9 @@
 /usr/share/tinysofa-utils/tsrelease
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0-4ts
+- current (2.0-3ts) integrated as 2.0-4ts for release 1.0-U2
+
 * Mon May 24 2004 tsintegrate <release at tinysofa dot org> 2.0-3ts
 - current (2.0-3ok) integrated as 2.0-3ts for release 1.0-U1
 


From svn at tinysofa.org  Fri Jun 18 05:50:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:50:57 +1000 (EST)
Subject: [tinysofa-svn] r2047 - tinysofa/releases/1.0/tinysofa-utils
Message-ID: <20040618055057.73C694E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:50:57 +1000 (Fri, 18 Jun 2004)
New Revision: 2047

Removed:
   tinysofa/releases/1.0/tinysofa-utils/pristine/
Log:
tinysofa-utils:
  * removing pristine (2.0-3ts)


From svn at tinysofa.org  Fri Jun 18 05:51:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:51:02 +1000 (EST)
Subject: [tinysofa-svn] r2048 - tinysofa/releases/1.0/tinysofa-utils
Message-ID: <20040618055102.788CA4E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:51:01 +1000 (Fri, 18 Jun 2004)
New Revision: 2048

Added:
   tinysofa/releases/1.0/tinysofa-utils/pristine/
Log:
tinysofa-utils:
  * retarget pristine (2.0-3ts) to releases/2.0/4ts

Copied: tinysofa/releases/1.0/tinysofa-utils/pristine (from rev 2046, tinysofa/releases/1.0/tinysofa-utils/releases/2.0/4ts)


From svn at tinysofa.org  Fri Jun 18 05:51:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:51:13 +1000 (EST)
Subject: [tinysofa-svn] r2050 - tinysofa/releases/1.0/vim
Message-ID: <20040618055113.8ECF24E826B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:51:13 +1000 (Fri, 18 Jun 2004)
New Revision: 2050

Removed:
   tinysofa/releases/1.0/vim/pristine/
Log:
vim:
  * removing pristine (6.2.098-8ts)


From svn at tinysofa.org  Fri Jun 18 05:51:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:51:12 +1000 (EST)
Subject: [tinysofa-svn] 
	r2049 - in tinysofa/releases/1.0/vim: current/specs releases
	releases/6.2.532 releases/6.2.532/1ts/specs
Message-ID: <20040618055112.B853E4E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:51:12 +1000 (Fri, 18 Jun 2004)
New Revision: 2049

Added:
   tinysofa/releases/1.0/vim/releases/6.2.532/
   tinysofa/releases/1.0/vim/releases/6.2.532/1ts/
Modified:
   tinysofa/releases/1.0/vim/current/specs/vim.spec
   tinysofa/releases/1.0/vim/releases/6.2.532/1ts/specs/vim.spec
Log:
vim:
  * integrate current (6.2.532-1jh) as releases/6.2.532/1ts

Modified: tinysofa/releases/1.0/vim/current/specs/vim.spec
===================================================================
--- tinysofa/releases/1.0/vim/current/specs/vim.spec	2004-06-18 05:51:01 UTC (rev 2048)
+++ tinysofa/releases/1.0/vim/current/specs/vim.spec	2004-06-18 05:51:12 UTC (rev 2049)
@@ -4,7 +4,7 @@
 %define patchlevel 532
 %define shortname vim62
 Version: %srcversion.%patchlevel
-Release: 1jh
+Release: 1ts
 License: Charityware
 Group: tinysofa official
 Source0: ftp://ftp.nl.vim.org/pub/vim/unix/vim-%{srcversion}.tar.bz2
@@ -547,6 +547,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 6.2.532-1ts
+- current (6.2.532-1jh) integrated as 6.2.532-1ts for release 1.0-U2
+
 * Sun May 31 2004 Jaakko Heinonen <jh at tinysofa dot org> 6.2.532-1jh
 - enable multibyte support
 - enable UTF-8 encoding in default vimrc conditionally

Copied: tinysofa/releases/1.0/vim/releases/6.2.532/1ts (from rev 1977, tinysofa/releases/1.0/vim/current)

Modified: tinysofa/releases/1.0/vim/releases/6.2.532/1ts/specs/vim.spec
===================================================================
--- tinysofa/releases/1.0/vim/current/specs/vim.spec	2004-06-18 05:18:01 UTC (rev 1977)
+++ tinysofa/releases/1.0/vim/releases/6.2.532/1ts/specs/vim.spec	2004-06-18 05:51:12 UTC (rev 2049)
@@ -4,7 +4,7 @@
 %define patchlevel 532
 %define shortname vim62
 Version: %srcversion.%patchlevel
-Release: 1jh
+Release: 1ts
 License: Charityware
 Group: tinysofa official
 Source0: ftp://ftp.nl.vim.org/pub/vim/unix/vim-%{srcversion}.tar.bz2
@@ -547,6 +547,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 6.2.532-1ts
+- current (6.2.532-1jh) integrated as 6.2.532-1ts for release 1.0-U2
+
 * Sun May 31 2004 Jaakko Heinonen <jh at tinysofa dot org> 6.2.532-1jh
 - enable multibyte support
 - enable UTF-8 encoding in default vimrc conditionally


From svn at tinysofa.org  Fri Jun 18 05:51:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:51:15 +1000 (EST)
Subject: [tinysofa-svn] r2051 - tinysofa/releases/1.0/vim
Message-ID: <20040618055115.13F0D4E8269@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:51:14 +1000 (Fri, 18 Jun 2004)
New Revision: 2051

Added:
   tinysofa/releases/1.0/vim/pristine/
Log:
vim:
  * retarget pristine (6.2.098-8ts) to releases/6.2.532/1ts

Copied: tinysofa/releases/1.0/vim/pristine (from rev 2049, tinysofa/releases/1.0/vim/releases/6.2.532/1ts)


From svn at tinysofa.org  Fri Jun 18 05:53:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:53:24 +1000 (EST)
Subject: [tinysofa-svn] r2052 - tinysofa/releases/1.0/xfsdump
Message-ID: <20040618055324.013124E826B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:53:24 +1000 (Fri, 18 Jun 2004)
New Revision: 2052

Added:
   tinysofa/releases/1.0/xfsdump/pristine/
Log:
- Pristine.


Copied: tinysofa/releases/1.0/xfsdump/pristine (from rev 1977, tinysofa/releases/1.0/xfsdump/current)


From svn at tinysofa.org  Fri Jun 18 05:59:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 15:59:54 +1000 (EST)
Subject: [tinysofa-svn] 
	r2053 - in tinysofa/releases/1.0/linux-headers/current: sources
	specs
Message-ID: <20040618055954.181C84E826B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 15:59:53 +1000 (Fri, 18 Jun 2004)
New Revision: 2053

Added:
   tinysofa/releases/1.0/linux-headers/current/sources/kernel-headers-2.4.tar.bz2
Removed:
   tinysofa/releases/1.0/linux-headers/current/sources/kernel-headers-2.4.26.tar.bz2
Modified:
   tinysofa/releases/1.0/linux-headers/current/specs/linux-headers.spec
Log:
- Fix once and for all.


Deleted: tinysofa/releases/1.0/linux-headers/current/sources/kernel-headers-2.4.26.tar.bz2
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.0/linux-headers/current/sources/kernel-headers-2.4.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.0/linux-headers/current/sources/kernel-headers-2.4.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.0/linux-headers/current/specs/linux-headers.spec
===================================================================
--- tinysofa/releases/1.0/linux-headers/current/specs/linux-headers.spec	2004-06-18 05:53:24 UTC (rev 2052)
+++ tinysofa/releases/1.0/linux-headers/current/specs/linux-headers.spec	2004-06-18 05:59:53 UTC (rev 2053)
@@ -1,87 +1,273 @@
-Summary: The Linux kernel header files for the running system
+Summary: Header files for the Linux kernel for use by glibc
 Name: linux-headers
 Version: 2.4.26
-Release: 6ts
+Release: 7ts
 License: GPL
 Group: tinysofa official
-Source0: kernel-headers-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-root
-AutoReq: false
-PreReq: bash coreutils
+ExclusiveOS: Linux
 Provides: kernel-headers
+Prereq: coreutils initscripts bash
 
-%description
-Kernel-headers includes the C header files for the Linux kernel.  The
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%ifarch i386 i586 i686 athlon
+%define _arch i386
+%endif
+
+Source0: kernel-headers-2.4.tar.bz2
+
+
+%description 
+Kernel-headers includes the C header files that specify the interface
+between the Linux kernel and userspace libraries and programs.  The
 header files define structures and constants that are needed for
-building most standard programs.
+building most standard programs and are also needed for rebuilding the
+glibc package
 
+
+
 %prep
-# satisfy rpm
+%setup -q -c
 
+%build
+
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/include
+mkdir -p $RPM_BUILD_ROOT
+tar -cf -  usr | tar -xf - -C $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/usr/include/asm
 pushd $RPM_BUILD_ROOT/usr/include
-   tar -jxf %{SOURCE0}
+d1=asm-%{_arch}
+d2=asm
+%ifarch x86_64
+p1='defined __x86_64__'
+d2=asm-i386
+p2='defined __i386__'
+%endif
+%ifarch sparc sparc64
+d1=asm-sparc
+p1='defined __sparc__ && !defined __arch64__'
+d2=asm-sparc64
+p2='defined __sparc__ && defined __arch64__'
+%endif
+%ifarch ppc ppc64
+d1=asm-ppc
+p1='defined __powerpc__ && !defined __powerpc64__'
+d2=asm-ppc64
+p2='defined __powerpc64__'
+%endif
+%ifarch s390 s390x
+d1=asm-s390
+p1='defined __s390__ && !defined __s390x__'
+d2=asm-s390x
+p2='defined __s390x__'
+%endif
+for i in asm-*; do
+  case $i in $d1|$d2) ;; *) rm -rf $i;; esac
+done
+if [ "$d2" = "asm" ]; then
+  rm -rf asm
+  mv $d1 asm
+else
+  for f in `find $d1 $d2 -name \*.h -exec basename {} \; | sort -u`; do
+    F=`echo $f | tr a-z. A-Z_`
+    ( cat <<EOF
+#ifndef __ASM_STUB_${F}__
+# define __ASM_STUB_${F}__
+EOF
+      echo "# if $p1"
+      if [ -f $d1/$f ]; then
+	echo "#  include <$d1/$f>"
+      else
+	echo "#  error <$d1/$f> does not exist"
+      fi
+      echo "# endif"
+      echo "# if $p2"
+      if [ -f $d2/$f ]; then
+	echo "#  include <$d2/$f>"
+      else
+	echo "#  error <$d2/$f> does not exist"
+      fi
+      echo "# endif"
+      echo "#endif"
+    ) > asm/$f
+  done
+fi
 popd
 
-
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
-%pre
-# This will only work if these are files/symlinks
-test -L /usr/include/asm && rm -f /usr/include/asm || :
-test -L /usr/include/linux && rm -f /usr/include/linux || :
 
+%pre 
+[ -L /usr/include/linux ] && rm -f /usr/include/linux || :
+[ -L /usr/include/asm ] && rm -f /usr/include/asm || :
+%ifarch sparc
+[ -L /usr/include/asm-sparc ] && rm -f /usr/include/asm-sparc
+[ -L /usr/include/asm-sparc64 ] && rm -f /usr/include/asm-sparc64
+%endif
+exit 0
+
+%post
+exit 0
+
+###
+### file lists
+###
+
 %files
 %defattr(-,root,root)
-/usr/include/asm
 /usr/include/linux
+/usr/include/asm*
 
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.4.26-6ts
-- current (2.4.26-7ok) integrated as 2.4.26-6ts for release 1.0-U1
+* Wed Apr 21 2004 Jakub Jelinek <jakub at redhat.com> 2.4-8.46
+- ppc/ppc64 mq_* syscall numbers
 
-* Tue May 18 2004 Omar Kilani <omar at tinysofa dot org> 2.4.26-7ok
-- 2.4.26-7ok.
+* Fri Apr 16 2004 Jakub Jelinek <jakub at redhat.com> 2.4-8.45
+- update syscall numbers from latest kernel
+- remove ia32.h and ia32_unistd.h on x86-64
 
-* Fri Apr 09 2004 Omar Kilani <omar at tinysofa dot org> 2.4.26-1ts
-- New upstream.
+* Mon Mar 15 2004 Bill Nottingham <notting at redhat.com> 2.4-8.44
+- update wireless.h
 
-* Thu Feb 26 2004 Erlend Midttun <erlendbm at trustix dot org> 2.4.25-1tr
-- New upstream.
+* Tue Dec 09 2003 Arjan van de Ven <arjanv at redhat.com> 2.4-8.38
+- remove a lot of kernel-only crud
 
-* Fri Dec 12 2003 Erlend Midttun <erlendbm at trustix dot org> 2.4.20-6tr
-- Rebuilt,
+* Tue Dec  2 2003 Jeremy Katz <katzj at redhat.com> 2.4-8.37
+- add BLKGETSIZE64
 
-* Thu Jul  3 2003 Erlend Midttun <erlendbm at trustix dot com> 2.4.20-5tr
-- Fix modversions.h
+* Wed Oct 22 2003 Arjan van de Ven <arjanv at redhat.com> 2.4-8.35
+- fix broken shift_hz
+* Wed Sep 24 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.34
+- fix ppc64 sigcontext.h (#104915)
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 2.4.20-4tr
-- Big rebuild
+* Mon Sep  8 2003 Bill Nottingham <notting at redhat.com>
+- oops, bring arp_tables.h back
 
-* Mon May 26 2003 Erlend Midttun <erlendbm at trustix dot com> 2.4.20-3em
-- fileutils -> coreutils.
+* Wed Sep  3 2003 Bill Nottingham <notting at redhat.com>
+- remove some exports of __constant_hton*
 
-* Thu Apr 24 2003 Erlend Midttun <erlendbm at trustix dot com> 2.4.20-2em
-- Fix .h's
+* Sat Aug 23 2003 Arjan van de Ven <arjanv at redhat.com>
+- fix typo in netdevice.h as per #102951
 
-* Tue Apr 22 2003 Erlend Midttun <erlendbm at trustix dot com> 2.4.20-1em
-- New upstream.
-- Added more flexible version.h's.
+* Thu Aug 21 2003 Arjan van de Ven <arjanv at redhat.com>
+- update personality.h for the amd64 3Gb 32 bit personality
 
-* Wed Apr  9 2003 Gerald Dachs <gda at trustix dot org> 2.4.19-2gd
-- Added PreReq on fileutils
+* Tue Aug 19 2003 Arjan van de Ven <arjanv at redhat.com>
+- add asm/types.h to a few .h files that need it
+- remove unistd.h from linux/limits.h; it breaks samba builds
 
-* Thu Jan 16 2003 Erlend Midttun <erlendbm at trustix dot com> 2.4.19-1em
-- Renamed from kernel-headers to linux-headers.
+* Tue Aug 19 2003 Doug Ledford <dledford at redhat.com>
+- Add updated prctl.h file that includes process timing defines
 
-* Tue Nov  5 2002 Erlend Midttun <erlendbm at trustix dot com> 2.4.19-7em
-- Make sure /usr/include/{asm,linux} does not exist prior to install.
+* Sat Aug 16 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.27
+- add tgkill to unistd.h on ppc64, x86_64 and alpha
 
-* Tue Aug 27 2002 Erlend Midttun <erlendbm at trustix dot com> 2.4.19-6em
-- Make sure /usr/include/{asm,linux} does not exist prior to install.
+* Thu Jul 31 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.26
+- update ia64/sigcontext.h from 2.5.73+ (#101344)
 
-* Mon Aug 26 2002 Erlend Midttun <erlendbm at trustix dot com> 2.4.19-5em
-- Initial release.  Named -5em not to collide with the old
-  kernel-headers package.
+* Wed Jul 30 2003 Arjan van de Ven <arjanv at redhat.com> 2.4-8.25
+- make ppc64/uaccess.h match the upstream ABI
+
+* Mon Jul 28 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.24
+- rebuilt
+
+* Mon Jul 28 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.23
+- add tgkill to unistd.h on i386, ia64 and ppc32
+- remove __KERNEL_SYSCALLS__ cruft on ia64/ppc32
+
+* Mon Jul 14 2003 Arjan van de Ven <arjanv at redhat.com> 2.4-8.22
+- add arptables headers
+
+* Fri Jun 27 2003 Arjan van de Ven <arjanv at redhat.com> 2.4.8.20
+- update ptrace headers for amd64
+
+* Wed Jun 18 2003 Arjan van de Ven <arjanv at redhat.com> 2.4-8.19
+- update for new bonding interface
+
+* Fri Jun 06 2003 Arjan van de Ven <arjanv at redhat.com> 2.4-8.18
+- change syscall stubs to use the glibc ones
+
+* Thu Jun  5 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.17
+- rebuilt
+
+* Mon Jun  2 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.16
+- add new scsi majors to <linux/major.h> (#91696)
+
+* Fri May 30 2003 Arjan van de Ven <arjanv at redhat.com> 2.4-8.15
+- add amd64 nptl syscalls
+
+* Tue May 27 2003 Arjan van de Ven <arjanv at redhat.com> 2.4-8.14
+- unifdef'd a bunch of header files for __KERNEL__
+
+* Sun Apr 13 2003 Arjan van de Ven <arjanv at redhat.com> 2.4-8.13
+- remove more kernel private files
+
+* Fri Apr 11 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.12
+- update <linux/prctl.h> header
+- remove i386 <asm/io.h>, replace it with a warning and <sys/io.h> include
+  (Arjan van de Ven)
+
+* Mon Feb 10 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.11
+- update syscall numbers for all arches from 2.5.64 headers
+
+* Fri Feb  7 2003 Bill Nottingham <notting at redhat.com> 2.4-8.10
+- update more wireless headers
+
+* Wed Feb  5 2003 Bill Nottingham <notting at redhat.com> 2.4-8.9
+- update wireless headers
+
+* Thu Jan 30 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.7
+- make /usr/include/asm during build if it doesn't exist
+
+* Thu Jan 30 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.6
+- remove unpackaged file
+
+* Thu Jan 30 2003 Bill Nottingham <notting at redhat.com>
+- update netfilter headers
+
+* Thu Jan 30 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.5
+- don't include <linux/types.h> etc. in <asm-s390*/ptrace.h>
+
+* Thu Jan 16 2003 Jakub Jelinek <jakub at redhat.com> 2.4-8.4
+- updated s390 headers, added s390x headers
+- HTB in <linux/pkt_sched.h>
+- no -debuginfo subpackage
+
+* Thu Dec 12 2002 Jakub Jelinek <jakub at redhat.com> 2.4-8.3
+- update version.h from kernel-2.4.20-0.pp.6
+
+* Tue Nov 26 2002 Jakub Jelinek <jakub at redhat.com> 2.4-8.2
+- update unistd.h from kernel-2.4.19-0.pp.19
+
+* Thu Oct 10 2002 Jakub Jelinek <jakub at redhat.com>
+- generate stubs automatically
+- remove /usr/include/scsi from file list
+
+* Thu Oct 10 2002 Arjan van de Ven <arjanv at redhat.com
+- added support for mixed 32/64 headers
+
+* Tue Mar 21 2002 Arjan van de Ven <arjanv at redhat.com
+- update ethtool and other network ioctls
+
+* Tue Feb 10 2002 Arjan van de Ven <arjanv at redhat.com
+- removed autoconf.h content
+
+* Sun Feb 10 2002 Arjan van de Ven <arjanv at redhat.com
+- fix missing include that broke quota.h
+
+* Mon Jan 07 2002 Arjan van de Ven <arjanv at redhat.com
+- fix rhconfig.h include file to not care about /boot/kernel.h
+
+* Wed Jan 02 2002 Florian La Roche <Florian.LaRoche at redhat.de>
+- fix #warning in <asm-i386/rwlock.h> and <asm-i386/spinlock.h>
+
+* Thu Dec 6 2001 Arjan van de Ven <arjanv at redhat.com>
+- fix misplaced #endif
+
+* Tue Dec 4 2001 Arjan van de Ven <arjanv at redhat.com>
+- fix version.h to not include /boot/kernel.h
+
+* Wed Oct 31 2001 Arjan van de Ven <arjanv at redhat.com>
+- Initial packaging


From svn at tinysofa.org  Fri Jun 18 06:01:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 16:01:12 +1000 (EST)
Subject: [tinysofa-svn] 
	r2054 - in tinysofa/releases/1.0/linux-headers: current/specs
	releases/2.4.26 releases/2.4.26/7ts/specs
Message-ID: <20040618060112.0032F4E826B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 16:01:12 +1000 (Fri, 18 Jun 2004)
New Revision: 2054

Added:
   tinysofa/releases/1.0/linux-headers/releases/2.4.26/7ts/
Modified:
   tinysofa/releases/1.0/linux-headers/current/specs/linux-headers.spec
   tinysofa/releases/1.0/linux-headers/releases/2.4.26/7ts/specs/linux-headers.spec
Log:
linux-headers:
  * integrate current (2.4.26-7ts) as releases/2.4.26/7ts

Modified: tinysofa/releases/1.0/linux-headers/current/specs/linux-headers.spec
===================================================================
--- tinysofa/releases/1.0/linux-headers/current/specs/linux-headers.spec	2004-06-18 05:59:53 UTC (rev 2053)
+++ tinysofa/releases/1.0/linux-headers/current/specs/linux-headers.spec	2004-06-18 06:01:12 UTC (rev 2054)
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.4.26-7ts
+- current (2.4.26-7ts) integrated as 2.4.26-7ts for release 1.0-U2
+
 * Wed Apr 21 2004 Jakub Jelinek <jakub at redhat.com> 2.4-8.46
 - ppc/ppc64 mq_* syscall numbers
 

Copied: tinysofa/releases/1.0/linux-headers/releases/2.4.26/7ts (from rev 2053, tinysofa/releases/1.0/linux-headers/current)

Modified: tinysofa/releases/1.0/linux-headers/releases/2.4.26/7ts/specs/linux-headers.spec
===================================================================
--- tinysofa/releases/1.0/linux-headers/current/specs/linux-headers.spec	2004-06-18 05:59:53 UTC (rev 2053)
+++ tinysofa/releases/1.0/linux-headers/releases/2.4.26/7ts/specs/linux-headers.spec	2004-06-18 06:01:12 UTC (rev 2054)
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.4.26-7ts
+- current (2.4.26-7ts) integrated as 2.4.26-7ts for release 1.0-U2
+
 * Wed Apr 21 2004 Jakub Jelinek <jakub at redhat.com> 2.4-8.46
 - ppc/ppc64 mq_* syscall numbers
 


From svn at tinysofa.org  Fri Jun 18 06:01:14 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 16:01:14 +1000 (EST)
Subject: [tinysofa-svn] r2055 - tinysofa/releases/1.0/linux-headers
Message-ID: <20040618060114.1026E4E826B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 16:01:14 +1000 (Fri, 18 Jun 2004)
New Revision: 2055

Removed:
   tinysofa/releases/1.0/linux-headers/pristine/
Log:
linux-headers:
  * removing pristine (2.4.26-6ts)


From svn at tinysofa.org  Fri Jun 18 06:01:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 16:01:16 +1000 (EST)
Subject: [tinysofa-svn] r2056 - tinysofa/releases/1.0/linux-headers
Message-ID: <20040618060116.AEF504E826B@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 16:01:16 +1000 (Fri, 18 Jun 2004)
New Revision: 2056

Added:
   tinysofa/releases/1.0/linux-headers/pristine/
Log:
linux-headers:
  * retarget pristine (2.4.26-6ts) to releases/2.4.26/7ts

Copied: tinysofa/releases/1.0/linux-headers/pristine (from rev 2054, tinysofa/releases/1.0/linux-headers/releases/2.4.26/7ts)


From svn at tinysofa.org  Fri Jun 18 07:33:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 17:33:56 +1000 (EST)
Subject: [tinysofa-svn] r2057 - tinysofa/releases/1.0/kernel/current/sources
Message-ID: <20040618073356.434464E8385@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 17:33:55 +1000 (Fri, 18 Jun 2004)
New Revision: 2057

Modified:
   tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config
   tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config
   tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config
   tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config
   tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config
Log:
- Fix for new libata.


Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config
===================================================================
--- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config	2004-06-18 06:01:16 UTC (rev 2056)
+++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-BOOT.config	2004-06-18 07:33:55 UTC (rev 2057)
@@ -1005,3 +1005,5 @@
 CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_SCSI_SATA_NV=m

Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config
===================================================================
--- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config	2004-06-18 06:01:16 UTC (rev 2056)
+++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewall.config	2004-06-18 07:33:55 UTC (rev 2057)
@@ -1502,3 +1502,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_SCSI_SATA_NV=m

Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config
===================================================================
--- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config	2004-06-18 06:01:16 UTC (rev 2056)
+++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-firewallsmp.config	2004-06-18 07:33:55 UTC (rev 2057)
@@ -1507,3 +1507,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_SCSI_SATA_NV=m

Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config
===================================================================
--- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config	2004-06-18 06:01:16 UTC (rev 2056)
+++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586-smp.config	2004-06-18 07:33:55 UTC (rev 2057)
@@ -1281,3 +1281,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_SCSI_SATA_NV=m

Modified: tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config
===================================================================
--- tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config	2004-06-18 06:01:16 UTC (rev 2056)
+++ tinysofa/releases/1.0/kernel/current/sources/kernel-2.4.26-i586.config	2004-06-18 07:33:55 UTC (rev 2057)
@@ -1276,3 +1276,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_SCSI_SATA_NV=m


From svn at tinysofa.org  Fri Jun 18 07:36:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 18 Jun 2004 17:36:52 +1000 (EST)
Subject: [tinysofa-svn] 
	r2058 - in tinysofa/releases/1.0/kernel: pristine/sources
	releases/2.4.26/7ts/sources
Message-ID: <20040618073652.3D92D4E8385@minbar.tinysofa.org>

Author: omar
Date: 2004-06-18 17:36:51 +1000 (Fri, 18 Jun 2004)
New Revision: 2058

Modified:
   tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-BOOT.config
   tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewall.config
   tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewallsmp.config
   tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-smp.config
   tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586.config
   tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-BOOT.config
   tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-firewall.config
   tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-firewallsmp.config
   tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-smp.config
   tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586.config
Log:
- Update pristine and releases, since I don't want to increment release.


Modified: tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-BOOT.config
===================================================================
--- tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-BOOT.config	2004-06-18 07:33:55 UTC (rev 2057)
+++ tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-BOOT.config	2004-06-18 07:36:51 UTC (rev 2058)
@@ -1005,3 +1005,5 @@
 CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_SCSI_SATA_NV=m

Modified: tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewall.config
===================================================================
--- tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewall.config	2004-06-18 07:33:55 UTC (rev 2057)
+++ tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewall.config	2004-06-18 07:36:51 UTC (rev 2058)
@@ -1502,3 +1502,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_SCSI_SATA_NV=m

Modified: tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewallsmp.config
===================================================================
--- tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewallsmp.config	2004-06-18 07:33:55 UTC (rev 2057)
+++ tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-firewallsmp.config	2004-06-18 07:36:51 UTC (rev 2058)
@@ -1507,3 +1507,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_SCSI_SATA_NV=m

Modified: tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-smp.config
===================================================================
--- tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-smp.config	2004-06-18 07:33:55 UTC (rev 2057)
+++ tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586-smp.config	2004-06-18 07:36:51 UTC (rev 2058)
@@ -1281,3 +1281,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_SCSI_SATA_NV=m

Modified: tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586.config
===================================================================
--- tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586.config	2004-06-18 07:33:55 UTC (rev 2057)
+++ tinysofa/releases/1.0/kernel/pristine/sources/kernel-2.4.26-i586.config	2004-06-18 07:36:51 UTC (rev 2058)
@@ -1276,3 +1276,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_SCSI_SATA_NV=m

Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-BOOT.config
===================================================================
--- tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-BOOT.config	2004-06-18 07:33:55 UTC (rev 2057)
+++ tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-BOOT.config	2004-06-18 07:36:51 UTC (rev 2058)
@@ -1005,3 +1005,5 @@
 CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
+CONFIG_SCSI_SATA_NV=m
+# CONFIG_BLK_DEV_IDE_SATA is not set

Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-firewall.config
===================================================================
--- tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-firewall.config	2004-06-18 07:33:55 UTC (rev 2057)
+++ tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-firewall.config	2004-06-18 07:36:51 UTC (rev 2058)
@@ -1502,3 +1502,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+CONFIG_SCSI_SATA_NV=m
+# CONFIG_BLK_DEV_IDE_SATA is not set

Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-firewallsmp.config
===================================================================
--- tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-firewallsmp.config	2004-06-18 07:33:55 UTC (rev 2057)
+++ tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-firewallsmp.config	2004-06-18 07:36:51 UTC (rev 2058)
@@ -1507,3 +1507,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+CONFIG_SCSI_SATA_NV=m
+# CONFIG_BLK_DEV_IDE_SATA is not set

Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-smp.config
===================================================================
--- tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-smp.config	2004-06-18 07:33:55 UTC (rev 2057)
+++ tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586-smp.config	2004-06-18 07:36:51 UTC (rev 2058)
@@ -1281,3 +1281,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+CONFIG_SCSI_SATA_NV=m
+# CONFIG_BLK_DEV_IDE_SATA is not set

Modified: tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586.config
===================================================================
--- tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586.config	2004-06-18 07:33:55 UTC (rev 2057)
+++ tinysofa/releases/1.0/kernel/releases/2.4.26/7ts/sources/kernel-2.4.26-i586.config	2004-06-18 07:36:51 UTC (rev 2058)
@@ -1276,3 +1276,5 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 # CONFIG_FW_LOADER is not set
+CONFIG_SCSI_SATA_NV=m
+# CONFIG_BLK_DEV_IDE_SATA is not set


From svn at tinysofa.org  Mon Jun 21 10:29:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Jun 2004 20:29:39 +1000 (EST)
Subject: [tinysofa-svn] 
	r2059 - in tinysofa/releases/1.0/libpng/current: sources specs
Message-ID: <20040621102939.B276A4E8037@minbar.tinysofa.org>

Author: jh
Date: 2004-06-21 20:29:38 +1000 (Mon, 21 Jun 2004)
New Revision: 2059

Added:
   tinysofa/releases/1.0/libpng/current/sources/libpng-1.0.15-transfix.patch
Modified:
   tinysofa/releases/1.0/libpng/current/specs/libpng.spec
Log:
- add libpng-1.0.15-transfix.patch, fixes CAN-2002-1363


Added: tinysofa/releases/1.0/libpng/current/sources/libpng-1.0.15-transfix.patch
===================================================================
--- tinysofa/releases/1.0/libpng/current/sources/libpng-1.0.15-transfix.patch	2004-06-18 07:36:51 UTC (rev 2058)
+++ tinysofa/releases/1.0/libpng/current/sources/libpng-1.0.15-transfix.patch	2004-06-21 10:29:38 UTC (rev 2059)
@@ -0,0 +1,46 @@
+--- libpng-1.0.15/pngrtran.c.transfix	2004-06-14 09:44:56.000000000 -0400
++++ libpng-1.0.15/pngrtran.c	2004-06-14 09:48:10.000000000 -0400
+@@ -1889,8 +1889,8 @@
+          /* This changes the data from GG to GGXX */
+          if (flags & PNG_FLAG_FILLER_AFTER)
+          {
+-            png_bytep sp = row + (png_size_t)row_width;
+-            png_bytep dp = sp  + (png_size_t)row_width;
++            png_bytep sp = row + (png_size_t)row_width * 2;
++            png_bytep dp = sp  + (png_size_t)row_width * 2;
+             for (i = 1; i < row_width; i++)
+             {
+                *(--dp) = hi_filler;
+@@ -1907,8 +1907,8 @@
+          /* This changes the data from GG to XXGG */
+          else
+          {
+-            png_bytep sp = row + (png_size_t)row_width;
+-            png_bytep dp = sp  + (png_size_t)row_width;
++            png_bytep sp = row + (png_size_t)row_width * 2;
++            png_bytep dp = sp  + (png_size_t)row_width * 2;
+             for (i = 0; i < row_width; i++)
+             {
+                *(--dp) = *(--sp);
+@@ -1965,8 +1965,8 @@
+          /* This changes the data from RRGGBB to RRGGBBXX */
+          if (flags & PNG_FLAG_FILLER_AFTER)
+          {
+-            png_bytep sp = row + (png_size_t)row_width * 3;
+-            png_bytep dp = sp  + (png_size_t)row_width;
++            png_bytep sp = row + (png_size_t)row_width * 6;
++            png_bytep dp = sp  + (png_size_t)row_width * 2;
+             for (i = 1; i < row_width; i++)
+             {
+                *(--dp) = hi_filler;
+@@ -1987,8 +1987,8 @@
+          /* This changes the data from RRGGBB to XXRRGGBB */
+          else
+          {
+-            png_bytep sp = row + (png_size_t)row_width * 3;
+-            png_bytep dp = sp  + (png_size_t)row_width;
++            png_bytep sp = row + (png_size_t)row_width * 6;
++            png_bytep dp = sp  + (png_size_t)row_width * 2;
+             for (i = 0; i < row_width; i++)
+             {
+                *(--dp) = *(--sp);

Modified: tinysofa/releases/1.0/libpng/current/specs/libpng.spec
===================================================================
--- tinysofa/releases/1.0/libpng/current/specs/libpng.spec	2004-06-18 07:36:51 UTC (rev 2058)
+++ tinysofa/releases/1.0/libpng/current/specs/libpng.spec	2004-06-21 10:29:38 UTC (rev 2059)
@@ -1,11 +1,12 @@
 Summary: libpng, library for working with PNG files
 Name: libpng
 Version: 1.2.5
-Release: 11ts
+Release: 12jh
 License: OSI
 Group: tinysofa official
 Source: http://www.libpng.org/pub/png/src/libpng-1.2.5.tar.bz2
 Patch: libpng-1.2.5-can-2004-0421.patch
+Patch1: libpng-1.0.15-transfix.patch
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: zlib-devel
 Provides: libpng12
@@ -48,6 +49,7 @@
 %prep
 %setup -q -n libpng-%{version}
 %patch -p1
+%patch1 -p1 -b .transfix
 ln -s scripts/makefile.linux Makefile
 
 %build
@@ -111,6 +113,9 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jun 21 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.5-12jh
+- add libpng-1.0.15-transfix.patch, fixes CAN-2002-1363
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.2.5-11ts
 - current (1.2.5-10ts) integrated as 1.2.5-11ts for release 1.0-U1
 
@@ -141,4 +146,4 @@
 - New version.
 
 * Mon Apr 14 2003 Gerald Dachs <gda at trustix dot org> 1.0.15-1gd
-- initital release
\ No newline at end of file
+- initital release


From svn at tinysofa.org  Mon Jun 21 11:30:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Jun 2004 21:30:28 +1000 (EST)
Subject: [tinysofa-svn] 
	r2060 - in tinysofa/releases/1.0/libpng: current/specs
	releases/1.2.5 releases/1.2.5/12ts/specs
Message-ID: <20040621113028.A5D5B4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-21 21:30:28 +1000 (Mon, 21 Jun 2004)
New Revision: 2060

Added:
   tinysofa/releases/1.0/libpng/releases/1.2.5/12ts/
Modified:
   tinysofa/releases/1.0/libpng/current/specs/libpng.spec
   tinysofa/releases/1.0/libpng/releases/1.2.5/12ts/specs/libpng.spec
Log:
libpng:
  * integrate current (1.2.5-12jh) as releases/1.2.5/12ts

Modified: tinysofa/releases/1.0/libpng/current/specs/libpng.spec
===================================================================
--- tinysofa/releases/1.0/libpng/current/specs/libpng.spec	2004-06-21 10:29:38 UTC (rev 2059)
+++ tinysofa/releases/1.0/libpng/current/specs/libpng.spec	2004-06-21 11:30:28 UTC (rev 2060)
@@ -1,7 +1,7 @@
 Summary: libpng, library for working with PNG files
 Name: libpng
 Version: 1.2.5
-Release: 12jh
+Release: 12ts
 License: OSI
 Group: tinysofa official
 Source: http://www.libpng.org/pub/png/src/libpng-1.2.5.tar.bz2
@@ -113,6 +113,9 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jun 21 2004 tsintegrate <release at tinysofa dot org> 1.2.5-12ts
+- current (1.2.5-12jh) integrated as 1.2.5-12ts for release 1.0-U1
+
 * Mon Jun 21 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.5-12jh
 - add libpng-1.0.15-transfix.patch, fixes CAN-2002-1363
 

Copied: tinysofa/releases/1.0/libpng/releases/1.2.5/12ts (from rev 2059, tinysofa/releases/1.0/libpng/current)

Modified: tinysofa/releases/1.0/libpng/releases/1.2.5/12ts/specs/libpng.spec
===================================================================
--- tinysofa/releases/1.0/libpng/current/specs/libpng.spec	2004-06-21 10:29:38 UTC (rev 2059)
+++ tinysofa/releases/1.0/libpng/releases/1.2.5/12ts/specs/libpng.spec	2004-06-21 11:30:28 UTC (rev 2060)
@@ -1,7 +1,7 @@
 Summary: libpng, library for working with PNG files
 Name: libpng
 Version: 1.2.5
-Release: 12jh
+Release: 12ts
 License: OSI
 Group: tinysofa official
 Source: http://www.libpng.org/pub/png/src/libpng-1.2.5.tar.bz2
@@ -113,6 +113,9 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jun 21 2004 tsintegrate <release at tinysofa dot org> 1.2.5-12ts
+- current (1.2.5-12jh) integrated as 1.2.5-12ts for release 1.0-U1
+
 * Mon Jun 21 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.2.5-12jh
 - add libpng-1.0.15-transfix.patch, fixes CAN-2002-1363
 


From svn at tinysofa.org  Mon Jun 21 11:30:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Jun 2004 21:30:29 +1000 (EST)
Subject: [tinysofa-svn] r2061 - tinysofa/releases/1.0/libpng
Message-ID: <20040621113029.7415D4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-21 21:30:29 +1000 (Mon, 21 Jun 2004)
New Revision: 2061

Removed:
   tinysofa/releases/1.0/libpng/pristine/
Log:
libpng:
  * removing pristine (1.2.5-11ts)


From svn at tinysofa.org  Mon Jun 21 11:30:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 21 Jun 2004 21:30:31 +1000 (EST)
Subject: [tinysofa-svn] r2062 - tinysofa/releases/1.0/libpng
Message-ID: <20040621113031.A50AD4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-21 21:30:31 +1000 (Mon, 21 Jun 2004)
New Revision: 2062

Added:
   tinysofa/releases/1.0/libpng/pristine/
Log:
libpng:
  * retarget pristine (1.2.5-11ts) to releases/1.2.5/12ts

Copied: tinysofa/releases/1.0/libpng/pristine (from rev 2060, tinysofa/releases/1.0/libpng/releases/1.2.5/12ts)


From svn at tinysofa.org  Mon Jun 21 17:12:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Jun 2004 03:12:27 +1000 (EST)
Subject: [tinysofa-svn] r2063 - in contrib/subversion/current: sources specs
Message-ID: <20040621171227.D673E4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-22 03:12:27 +1000 (Tue, 22 Jun 2004)
New Revision: 2063

Added:
   contrib/subversion/current/sources/subversion-1.0.5.tar.bz2
Removed:
   contrib/subversion/current/sources/subversion-1.0.4.tar.bz2
Modified:
   contrib/subversion/current/specs/subversion.spec
Log:
- New upstream: 1.0.5.


Deleted: contrib/subversion/current/sources/subversion-1.0.4.tar.bz2
===================================================================
(Binary files differ)

Added: contrib/subversion/current/sources/subversion-1.0.5.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/subversion/current/sources/subversion-1.0.5.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/subversion/current/specs/subversion.spec
===================================================================
--- contrib/subversion/current/specs/subversion.spec	2004-06-21 11:30:31 UTC (rev 2062)
+++ contrib/subversion/current/specs/subversion.spec	2004-06-21 17:12:27 UTC (rev 2063)
@@ -5,8 +5,8 @@
 
 Summary:  A Concurrent Versioning system similar to but better than CVS.
 Name:     subversion
-Version:  1.0.4
-Release:  2bg
+Version:  1.0.5
+Release:  1ok
 License:  BSD
 Group:    tinysofa contrib 
 URL:      http://subversion.tigris.org


From svn at tinysofa.org  Mon Jun 21 17:13:09 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Jun 2004 03:13:09 +1000 (EST)
Subject: [tinysofa-svn] 
	r2064 - in contrib/subversion: current/specs releases
	releases/1.0.5 releases/1.0.5/1ok/specs
Message-ID: <20040621171309.A4A944E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-22 03:13:09 +1000 (Tue, 22 Jun 2004)
New Revision: 2064

Added:
   contrib/subversion/releases/1.0.5/
   contrib/subversion/releases/1.0.5/1ok/
Modified:
   contrib/subversion/current/specs/subversion.spec
   contrib/subversion/releases/1.0.5/1ok/specs/subversion.spec
Log:
subversion:
  * integrate current (1.0.5-1ok) as releases/1.0.5/1ok

Modified: contrib/subversion/current/specs/subversion.spec
===================================================================
--- contrib/subversion/current/specs/subversion.spec	2004-06-21 17:12:27 UTC (rev 2063)
+++ contrib/subversion/current/specs/subversion.spec	2004-06-21 17:13:09 UTC (rev 2064)
@@ -6,7 +6,7 @@
 Summary:  A Concurrent Versioning system similar to but better than CVS.
 Name:     subversion
 Version:  1.0.5
-Release:  1ok
+Release: 1ok
 License:  BSD
 Group:    tinysofa contrib 
 URL:      http://subversion.tigris.org
@@ -471,6 +471,9 @@
 
 
 %changelog
+* Tue Jun 22 2004 tscontrib <contrib at tinysofa dot org> 1.0.5-1ok
+- current (1.0.5-1ok) integrated as 1.0.5-1ok for release 1.0 contrib
+
 * Sun May 23 2004 Goetz Bock <bg at tinysofa dot org> 1.0.4-2bg
 - import into tinysofa contrib svn
 

Copied: contrib/subversion/releases/1.0.5/1ok (from rev 2063, contrib/subversion/current)

Modified: contrib/subversion/releases/1.0.5/1ok/specs/subversion.spec
===================================================================
--- contrib/subversion/current/specs/subversion.spec	2004-06-21 17:12:27 UTC (rev 2063)
+++ contrib/subversion/releases/1.0.5/1ok/specs/subversion.spec	2004-06-21 17:13:09 UTC (rev 2064)
@@ -6,7 +6,7 @@
 Summary:  A Concurrent Versioning system similar to but better than CVS.
 Name:     subversion
 Version:  1.0.5
-Release:  1ok
+Release: 1ok
 License:  BSD
 Group:    tinysofa contrib 
 URL:      http://subversion.tigris.org
@@ -471,6 +471,9 @@
 
 
 %changelog
+* Tue Jun 22 2004 tscontrib <contrib at tinysofa dot org> 1.0.5-1ok
+- current (1.0.5-1ok) integrated as 1.0.5-1ok for release 1.0 contrib
+
 * Sun May 23 2004 Goetz Bock <bg at tinysofa dot org> 1.0.4-2bg
 - import into tinysofa contrib svn
 


From svn at tinysofa.org  Mon Jun 21 17:13:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Jun 2004 03:13:10 +1000 (EST)
Subject: [tinysofa-svn] r2065 - contrib/subversion
Message-ID: <20040621171310.6F2984E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-22 03:13:10 +1000 (Tue, 22 Jun 2004)
New Revision: 2065

Removed:
   contrib/subversion/pristine/
Log:
subversion:
  * removing pristine (1.0.4-2bg)


From svn at tinysofa.org  Mon Jun 21 17:13:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Jun 2004 03:13:12 +1000 (EST)
Subject: [tinysofa-svn] r2066 - contrib/subversion
Message-ID: <20040621171312.1D8994E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-22 03:13:11 +1000 (Tue, 22 Jun 2004)
New Revision: 2066

Added:
   contrib/subversion/pristine/
Log:
subversion:
  * retarget pristine (1.0.4-2bg) to releases/1.0.5/1ok

Copied: contrib/subversion/pristine (from rev 2064, contrib/subversion/releases/1.0.5/1ok)


From svn at tinysofa.org  Mon Jun 21 17:16:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Jun 2004 03:16:36 +1000 (EST)
Subject: [tinysofa-svn] r2067 - contrib/swig/current/specs
Message-ID: <20040621171636.59DCC4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-22 03:16:36 +1000 (Tue, 22 Jun 2004)
New Revision: 2067

Modified:
   contrib/swig/current/specs/swig.spec
Log:
- Clean up.


Modified: contrib/swig/current/specs/swig.spec
===================================================================
--- contrib/swig/current/specs/swig.spec	2004-06-21 17:13:11 UTC (rev 2066)
+++ contrib/swig/current/specs/swig.spec	2004-06-21 17:16:36 UTC (rev 2067)
@@ -4,9 +4,8 @@
 Release: 4bg
 URL:     http://swig.sourceforge.net
 Source0: http://belnet.dl.sourceforge.net/sourceforge/swig/%{name}-%{version}.tar.gz
-Patch0:  swig-1.3.21-m4-install.patch
 License: BSD
-Group:   Trustix Contrib
+Group:   tinysofa contrib
 # BuildRequires: autoconf
 BuildRequires: gcc-c++-devel
 BuildRequires: python-devel
@@ -26,7 +25,7 @@
 # %package tcl
 # Summary:  SWIG library: tcl
 # Requires: %{name} = %{version}-%{release}
-# Group:    Trustix Contrib
+# Group:    tinysofa contrib
 # 
 # %description tcl
 # SWIG library: tcl.
@@ -35,7 +34,7 @@
 %package perl
 Summary:  SWIG library: perl
 Requires: %{name} = %{version}-%{release}
-Group:    Trustix Contrib
+Group:    tinysofa contrib
 
 %description perl
 SWIG library: perl.
@@ -44,7 +43,7 @@
 %package python
 Summary:  SWIG library: python
 Requires: %{name} = %{version}-%{release}
-Group:    Trustix Contrib
+Group:    tinysofa contrib
 
 %description python
 SWIG library: python.
@@ -53,7 +52,7 @@
 # %package guil
 # Summary:  SWIG library: guil
 # Requires: %{name} = %{version}-%{release}
-# Group:    Trustix Contrib
+# Group:    tinysofa contrib
 # 
 # %description guil
 # SWIG library: guil.
@@ -62,7 +61,7 @@
 # %package java
 # Summary:  SWIG library: java
 # Requires: %{name} = %{version}-%{release}
-# Group:    Trustix Contrib
+# Group:    tinysofa contrib
 # 
 # %description java
 # SWIG library: java.
@@ -71,7 +70,7 @@
 # %package mzscheme
 # Summary:  SWIG library: mzscheme
 # Requires: %{name} = %{version}-%{release}
-# Group:    Trustix Contrib
+# Group:    tinysofa contrib
 # 
 # %description mzscheme
 # SWIG library: mzscheme.
@@ -80,7 +79,7 @@
 # %package ruby
 # Summary:  SWIG library: ruby
 # Requires: %{name} = %{version}-%{release}
-# Group:    Trustix Contrib
+# Group:    tinysofa contrib
 # 
 # %description ruby
 # SWIG library: ruby.
@@ -89,7 +88,7 @@
 %package php4
 Summary:  SWIG library: php4
 Requires: %{name} = %{version}-%{release}
-Group:    Trustix Contrib
+Group:    tinysofa contrib
 
 %description php4
 SWIG library: php4.
@@ -98,7 +97,7 @@
 # %package ocaml
 # Summary:  SWIG library: ocaml
 # Requires: %{name} = %{version}-%{release}
-# Group:    Trustix Contrib
+# Group:    tinysofa contrib
 # 
 # %description ocaml
 # SWIG library: ocaml.
@@ -107,7 +106,7 @@
 # %package pike
 # Summary:  SWIG library: pike
 # Requires: %{name} = %{version}-%{release}
-# Group:    Trustix Contrib
+# Group:    tinysofa contrib
 # 
 # %description pike
 # SWIG library: pike.
@@ -116,7 +115,7 @@
 # %package chicken
 # Summary:  SWIG library: chicken
 # Requires: %{name} = %{version}-%{release}
-# Group:    Trustix Contrib
+# Group:    tinysofa contrib
 # 
 # %description chicken
 # SWIG library: chicken.
@@ -125,7 +124,7 @@
 # %package csharp
 # Summary:  SWIG library: csharp
 # Requires: %{name} = %{version}-%{release}
-# Group:    Trustix Contrib
+# Group:    tinysofa contrib
 # 
 # %description csharp
 # SWIG library: csharp.
@@ -133,9 +132,7 @@
 
 %prep
 %setup -q -n SWIG-%{version}
-%patch0 -p1
 
-
 %build
 %configure
 make


From svn at tinysofa.org  Mon Jun 21 17:17:26 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Jun 2004 03:17:26 +1000 (EST)
Subject: [tinysofa-svn] r2068 - contrib/webmin/current/spec
Message-ID: <20040621171726.21B764E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-22 03:17:25 +1000 (Tue, 22 Jun 2004)
New Revision: 2068

Added:
   contrib/webmin/current/spec/webmin.spec
Removed:
   contrib/webmin/current/spec/webmin-1.140.spec
Log:
- Move spec file.


Deleted: contrib/webmin/current/spec/webmin-1.140.spec
===================================================================
--- contrib/webmin/current/spec/webmin-1.140.spec	2004-06-21 17:16:36 UTC (rev 2067)
+++ contrib/webmin/current/spec/webmin-1.140.spec	2004-06-21 17:17:25 UTC (rev 2068)
@@ -1,126 +0,0 @@
-Summary:  A web-based administration interface for Unix systems.
-Name:     webmin
-Version:  1.140
-Release:  2bg
-Requires: perl
-License:  Freeware
-Group:    tinysofa contrib
-URL:      http://www.webmin.com
-Source:   http://www.webmin.com/download/%{name}-%{version}.tar.gz
-Source1:  webmin-1.140-tinysofa.tgz
-Patch0:   webmin-1.140-tinysofa.patch
-Patch1:   webmin-1.140-tinysofa-pam.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildArch: noarch
-
-
-%description
-A web-based administration interface for Unix systems. Using Webmin you can
-configure DNS, Samba, NFS, local/remote filesystems and more using your
-web browser.
-
-After installation, enter the URL http://localhost:10000/ into your
-browser and login as root with your root password.
-
-
-%prep
-%setup -q -a 1
-%patch0 -p1 
-%patch1 -p1 
-# fix perl path
-(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-
-
-%build
-rm -f mount/freebsd-mounts*
-rm -f mount/openbsd-mounts*
-rm -f mount/macos-mounts*
-rm -f webmin-gentoo-init
-chmod -R og-w .
-
-
-%install
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_libexecdir}/webmin
-mkdir -p %{buildroot}%{_initdir}
-mkdir -p %{buildroot}%{_sysconfdir}/pam.d
-mkdir -p %{buildroot}%{_localstatedir}/webmin/
-cp -rp * %{buildroot}%{_libexecdir}/webmin
-cp webmin-init   %{buildroot}%{_initdir}/webmin
-cp webmin-pam    %{buildroot}%{_sysconfdir}/pam.d/webmin
-echo rpm >%{buildroot}%{_libexecdir}/webmin/install-type
-
-
-%clean
-[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
-
-
-%post
-inetd=`grep "^inetd=" /etc/webmin/miniserv.conf 2>/dev/null | sed -e 's/inetd=//g'`
-if [ "$1" != 1 ]; then
-	# Upgrading the RPM, so stop the old webmin properly
-	if [ "$inetd" != "1" ]; then
-		/etc/init.d/webmin stop >/dev/null 2>&1
-	fi
-fi
-cd %{_libexecdir}/webmin
-config_dir=%{_sysconfdir}/webmin
-var_dir=%{_localstatedir}/webmin
-perl=/usr/bin/perl
-autoos=3
-port=10000
-login=root
-crypt=x
-host=`hostname`
-ssl=1
-atboot=1
-nochown=1
-autothird=1
-noperlpath=1
-nouninstall=1
-nostart=1
-export config_dir var_dir perl autoos port login crypt host ssl nochown autothird noperlpath nouninstall nostart allow
-./setup.sh > %{_localstatedir}/webmin/webmin-setup.out 2>&1
-rm -f /var/lock/subsys/webmin
-
-
-%preun
-if [ "$1" = 0 ]; then
-  grep root=%{_libexecdir}/webmin %{_sysconfdir}/webmin/miniserv.conf >/dev/null 2>&1
-  if [ "$?" = 0 ]; then
-    # RPM is being removed, and no new version of webmin
-    # has taken it's place. Run uninstalls and stop the server
-    echo "Running uninstall scripts .."
-    (cd %{_libexecdir}/webmin ; WEBMIN_CONFIG=%{_sysconfdir}/webmin WEBMIN_VAR=%{_localstatedir}/webmin LANG= %{_libexecdir}/webmin/run-uninstalls.pl)
-    %{_initdir}/webmin stop >/dev/null 2>&1
-    /bin/true
-  fi
-fi
-
-
-%postun
-if [ "$1" = 0 ]; then
-  grep root=%{_libexecdir}/webmin %{_sysconfdir}/webmin/miniserv.conf >/dev/null 2>&1
-  if [ "$?" = 0 ]; then
-    # RPM is being removed, and no new version of webmin
-    # has taken it's place. Delete the config files
-    rm -rf %{_sysconfdir}/webmin %{_localstatedir}/webmin
-  fi
-fi
-
-
-%files
-%defattr(-,root,root)
-%{_libexecdir}/webmin
-%{_initdir}/webmin
-%config %{_sysconfdir}/pam.d/webmin
-%dir %{_localstatedir}/webmin
-
-%changelog
-* Wed May 26 2004 Goetz Bock <bg at tinysofa dot org> 1.140-2bg
-- imported into tinysofa contrib
-
-* Tue May 18 2004 Goetz Bock <gbo at all dash connect dot net> 1.140-1bg
-- build for tinysofa enterprise server 1.0
-- rewrote spec file, based on the offered rpm
-- added patches/files to make tinysofa known to webmin, and fixed pam

Copied: contrib/webmin/current/spec/webmin.spec (from rev 1852, contrib/webmin/current/spec/webmin-1.140.spec)


From svn at tinysofa.org  Mon Jun 21 17:18:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Jun 2004 03:18:33 +1000 (EST)
Subject: [tinysofa-svn] r2069 - in contrib/webmin/current: . specs
Message-ID: <20040621171833.6CD044E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-22 03:18:33 +1000 (Tue, 22 Jun 2004)
New Revision: 2069

Added:
   contrib/webmin/current/specs/
   contrib/webmin/current/specs/webmin.spec
Removed:
   contrib/webmin/current/spec/
Log:
- Update.


Copied: contrib/webmin/current/specs (from rev 1852, contrib/webmin/current/spec)

Copied: contrib/webmin/current/specs/webmin.spec (from rev 2068, contrib/webmin/current/spec/webmin.spec)


From svn at tinysofa.org  Mon Jun 21 18:11:23 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Jun 2004 04:11:23 +1000 (EST)
Subject: [tinysofa-svn] r2070 - tinysofa/snapshot/dhcp/current/specs
Message-ID: <20040621181123.D558D4E8037@minbar.tinysofa.org>

Author: jh
Date: 2004-06-22 04:11:23 +1000 (Tue, 22 Jun 2004)
New Revision: 2070

Modified:
   tinysofa/snapshot/dhcp/current/specs/dhcp.spec
Log:
- fix pointer size detection


Modified: tinysofa/snapshot/dhcp/current/specs/dhcp.spec
===================================================================
--- tinysofa/snapshot/dhcp/current/specs/dhcp.spec	2004-06-21 17:18:33 UTC (rev 2069)
+++ tinysofa/snapshot/dhcp/current/specs/dhcp.spec	2004-06-21 18:11:23 UTC (rev 2070)
@@ -121,7 +121,7 @@
 
 
 %build
-cat << EOF >findptrsize.c
+cat << __EOF__ >findptrsize.c
 #include <stdio.h>
 int main(void) { printf("%%d\n", sizeof(void *)); return 0; }
 __EOF__


From svn at tinysofa.org  Mon Jun 21 19:25:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 22 Jun 2004 05:25:32 +1000 (EST)
Subject: [tinysofa-svn] 
	r2071 - in tinysofa/snapshot/dhcp/current: sources specs
Message-ID: <20040621192532.0E7DE4E8037@minbar.tinysofa.org>

Author: jh
Date: 2004-06-22 05:25:31 +1000 (Tue, 22 Jun 2004)
New Revision: 2071

Added:
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-ts-script.patch
Removed:
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch
Modified:
   tinysofa/snapshot/dhcp/current/specs/dhcp.spec
Log:
- fix dhclient script


Deleted: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch	2004-06-21 18:11:23 UTC (rev 2070)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc12-RHscript.patch	2004-06-21 19:25:31 UTC (rev 2071)
@@ -1,146 +0,0 @@
---- dhcp-3.0.1rc12/client/scripts/linux.RHscript	2002-11-14 20:09:09.000000000 -0500
-+++ dhcp-3.0.1rc12/client/scripts/linux	2004-01-24 08:49:54.829793151 -0500
-@@ -19,12 +19,32 @@
- # address if it is not supplied. This might be much more easily done
- # by the dhclient C code, and passed on.
- 
--# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious
--# of the $1 in its args.
--
-+function save_previous() {
-+  if [ -e $1 -a ! -e $1.predhclient ]; then
-+    mv $1 $1.predhclient 
-+  fi
-+}
- make_resolv_conf() {
--  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
--    echo search $new_domain_name >/etc/resolv.conf
-+  if [ "${PEERDNS}" == "no" ]; then  
-+      return 
-+  fi
-+
-+  if [ x$reason == xRENEW ]; then 
-+      if [ "$new_domain_name" == "$old_domain_name" ] && [ "$new_domain_servers" == "$old_domain_servers" ]; then
-+	  return
-+      fi
-+  fi
-+
-+  if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then
-+    save_previous /etc/resolv.conf
-+    echo '; generated by /sbin/dhclient-script' > /etc/resolv.conf
-+    if [ -n "$SEARCH" ]; then
-+ 	echo search $SEARCH >> /etc/resolv.conf
-+    else
-+	if [ -n "$new_domain_name" ]; then
-+ 	    echo search $new_domain_name >> /etc/resolv.conf
-+        fi
-+    fi
-     chmod 644 /etc/resolv.conf
-     for nameserver in $new_domain_name_servers; do
-       echo nameserver $nameserver >>/etc/resolv.conf
-@@ -53,6 +73,25 @@
-   fi
- fi
- 
-+# Import Red Hat Linux configuration
-+cd /etc/sysconfig/network-scripts;
-+. /etc/sysconfig/network-scripts/network-functions
-+. /etc/rc.d/init.d/functions
-+
-+[ -f ../network ] && . ../network
-+[ -f ../networking/network ] && . ../networking/network
-+
-+CONFIG=$interface
-+
-+need_config ${CONFIG}
-+
-+[ -f "${CONFIG}" ] || {
-+    echo $"$0: configuration for $interface not found." >&2
-+    exit_with_hooks 1
-+}   
-+
-+source_config
-+
- release=`uname -r`
- release=`expr $release : '\(.*\)\..*'`
- relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
-@@ -106,13 +145,52 @@
-   
- if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
-    [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
--  current_hostname=`hostname`
--  if [ x$current_hostname = x ] || \
--     [ x$current_hostname = x$old_host_name ]; then
--    if [ x$current_hostname = x ] || \
--       [ x$new_host_name != x$old_host_name ]; then
-+
-+  if [ "${PEERNIS}" = no ]; then
-+    :
-+  elif [ -n "$new_nis_domain" ]; then
-+	domainname "$new_nis_domain"
-+	save_previous /etc/yp.conf
-+	echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
-+	if [ -n "$new_nis_servers" ]; then
-+	    for I in $new_nis_servers; do
-+		echo "domain $new_nis_domain server $I" >> /etc/yp.conf
-+	    done
-+	else
-+	    echo "domain $new_nis_domain broadcast" >> /etc/yp.conf
-+	fi
-+  elif [ -n "$new_nis_servers" ]; then
-+      save_previous /etc/yp.conf
-+      echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
-+      for I in $new_nis_servers; do
-+	  echo "ypserver $I" >> /etc/yp.conf
-+      done
-+  fi
-+
-+  if [ "${PEERNTP}" = no ]; then
-+    :
-+  elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
-+      save_previous /etc/ntp.conf
-+      cat <<EOF > /etc/ntp.conf
-+# generated by /sbin/dhclient-script
-+restrict default ignore
-+restrict 127.0.0.1
-+driftfile /var/lib/ntp/drift
-+broadcastdelay 0.008
-+authenticate yes
-+keys /etc/ntp/keys
-+EOF
-+      #save_previous /etc/ntp/step-tickers
-+      #echo '# generated by /sbin/dhclient-script' > /etc/ntp/step-tickers
-+      for I in $new_ntp_servers; do
-+          echo "restrict $I nomodify notrap noquery" >> /etc/ntp.conf
-+	  echo "server $I" >> /etc/ntp.conf
-+	  #echo "$I" >> /etc/ntp/step-tickers
-+      done
-+  fi
-+
-+  if [ -n "$new_host_name" ] && need_hostname; then
-       hostname $new_host_name
--    fi
-   fi
-     
-   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
-@@ -174,8 +252,7 @@
-   ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 					$new_broadcast_arg
-   set $new_routers
--  ############## what is -w in ping?
--  if ping -q -c 1 $1; then
-+  if ping -q -c 1 -w 10 $1; then
-     if [ x$new_ip_address != x$alias_ip_address ] && \
- 			[ x$alias_ip_address != x ]; then
-       ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-@@ -188,7 +265,9 @@
-     for router in $new_routers; do
-       route add default gw $router
-     done
--    make_resolv_conf
-+    if [ "${PEERDNS}" != "no" ]; then 
-+      make_resolv_conf
-+    fi
-     exit_with_hooks 0
-   fi
-   ifconfig $interface inet 0 down

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-ts-script.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-ts-script.patch	2004-06-21 18:11:23 UTC (rev 2070)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-ts-script.patch	2004-06-21 19:25:31 UTC (rev 2071)
@@ -0,0 +1,151 @@
+--- dhcp-3.0.1rc13/client/scripts/linux.orig	2002-11-15 03:09:09.000000000 +0200
++++ dhcp-3.0.1rc13/client/scripts/linux	2004-06-21 22:11:47.000000000 +0300
+@@ -19,12 +19,32 @@
+ # address if it is not supplied. This might be much more easily done
+ # by the dhclient C code, and passed on.
+ 
+-# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious
+-# of the $1 in its args.
+-
++function save_previous() {
++  if [ -e $1 -a ! -e $1.predhclient ]; then
++    mv $1 $1.predhclient 
++  fi
++}
+ make_resolv_conf() {
+-  if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+-    echo search $new_domain_name >/etc/resolv.conf
++  if [ "${PEERDNS}" == "no" ]; then  
++      return 
++  fi
++
++  if [ x$reason == xRENEW ]; then 
++      if [ "$new_domain_name" == "$old_domain_name" ] && [ "$new_domain_servers" == "$old_domain_servers" ]; then
++	  return
++      fi
++  fi
++
++  if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then
++    save_previous /etc/resolv.conf
++    echo '; generated by /sbin/dhclient-script' > /etc/resolv.conf
++    if [ -n "$SEARCH" ]; then
++ 	echo search $SEARCH >> /etc/resolv.conf
++    else
++	if [ -n "$new_domain_name" ]; then
++ 	    echo search $new_domain_name >> /etc/resolv.conf
++        fi
++    fi
+     chmod 644 /etc/resolv.conf
+     for nameserver in $new_domain_name_servers; do
+       echo nameserver $nameserver >>/etc/resolv.conf
+@@ -53,6 +73,30 @@
+   fi
+ fi
+ 
++# Import Red Hat Linux configuration
++cd /etc/sysconfig/network-scripts;
++. /etc/sysconfig/network-scripts/network-functions
++
++if [ -f /etc/init.d/functions ]; then
++    . /etc/init.d/functions
++elif [ -f /etc/rc.d/init.d/functions ]; then
++    . /etc/rc.d/init.d/functions
++fi
++
++[ -f ../network ] && . ../network
++[ -f ../networking/network ] && . ../networking/network
++
++CONFIG=$interface
++
++need_config ${CONFIG}
++
++[ -f "${CONFIG}" ] || {
++    echo $"$0: configuration for $interface not found." >&2
++    exit_with_hooks 1
++}   
++
++source_config
++
+ release=`uname -r`
+ release=`expr $release : '\(.*\)\..*'`
+ relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
+@@ -106,13 +150,52 @@
+   
+ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+    [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
+-  current_hostname=`hostname`
+-  if [ x$current_hostname = x ] || \
+-     [ x$current_hostname = x$old_host_name ]; then
+-    if [ x$current_hostname = x ] || \
+-       [ x$new_host_name != x$old_host_name ]; then
++
++  if [ "${PEERNIS}" = no ]; then
++    :
++  elif [ -n "$new_nis_domain" ]; then
++	domainname "$new_nis_domain"
++	save_previous /etc/yp.conf
++	echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
++	if [ -n "$new_nis_servers" ]; then
++	    for I in $new_nis_servers; do
++		echo "domain $new_nis_domain server $I" >> /etc/yp.conf
++	    done
++	else
++	    echo "domain $new_nis_domain broadcast" >> /etc/yp.conf
++	fi
++  elif [ -n "$new_nis_servers" ]; then
++      save_previous /etc/yp.conf
++      echo '# generated by /sbin/dhclient-script' > /etc/yp.conf
++      for I in $new_nis_servers; do
++	  echo "ypserver $I" >> /etc/yp.conf
++      done
++  fi
++
++  if [ "${PEERNTP}" = no ]; then
++    :
++  elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
++      save_previous /etc/ntp.conf
++      cat <<EOF > /etc/ntp.conf
++# generated by /sbin/dhclient-script
++restrict default ignore
++restrict 127.0.0.1
++driftfile /var/lib/ntp/drift
++broadcastdelay 0.008
++authenticate yes
++keys /etc/ntp/keys
++EOF
++      #save_previous /etc/ntp/step-tickers
++      #echo '# generated by /sbin/dhclient-script' > /etc/ntp/step-tickers
++      for I in $new_ntp_servers; do
++          echo "restrict $I nomodify notrap noquery" >> /etc/ntp.conf
++	  echo "server $I" >> /etc/ntp.conf
++	  #echo "$I" >> /etc/ntp/step-tickers
++      done
++  fi
++
++  if [ -n "$new_host_name" ] && need_hostname; then
+       hostname $new_host_name
+-    fi
+   fi
+     
+   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+@@ -174,8 +257,7 @@
+   ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg
+   set $new_routers
+-  ############## what is -w in ping?
+-  if ping -q -c 1 $1; then
++  if ping -q -c 1 -w 10 $1; then
+     if [ x$new_ip_address != x$alias_ip_address ] && \
+ 			[ x$alias_ip_address != x ]; then
+       ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+@@ -188,7 +270,9 @@
+     for router in $new_routers; do
+       route add default gw $router
+     done
+-    make_resolv_conf
++    if [ "${PEERDNS}" != "no" ]; then 
++      make_resolv_conf
++    fi
+     exit_with_hooks 0
+   fi
+   ifconfig $interface inet 0 down

Modified: tinysofa/snapshot/dhcp/current/specs/dhcp.spec
===================================================================
--- tinysofa/snapshot/dhcp/current/specs/dhcp.spec	2004-06-21 18:11:23 UTC (rev 2070)
+++ tinysofa/snapshot/dhcp/current/specs/dhcp.spec	2004-06-21 19:25:31 UTC (rev 2071)
@@ -17,7 +17,7 @@
 Patch109: dhcpd-manpage.patch
 Patch113: dhcp-3.0pl2-selinux.patch
 Patch114: dhcp-3.0pl2-initialize.patch
-Patch115: dhcp-3.0.1rc12-RHscript.patch
+Patch115: dhcp-3.0.1rc13-ts-script.patch
 Patch116: dhcp-3.0.1rc12-staticroutes.patch
 Patch117: dhcp-3.0.1rc12-pie.patch
 Patch118: dhcp-3.0.1rc12-inherit-leases.patch
@@ -102,10 +102,10 @@
 %patch109 -p1 -b .dhcpdman
 %patch113 -p1 -b .selinux
 %patch114 -p1 -b .initialize
-%patch115 -p1 -b .RHscript
+%patch115 -p1 -b .ts-script
 %patch116 -p1 -b .staticroutes
 #%patch117 -p1 -b .pie
-%patch118 -p1 -b .inherit-leases
+#%patch118 -p1 -b .inherit-leases
 
 cp %SOURCE1 .
 


From svn at tinysofa.org  Tue Jun 22 14:09:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Jun 2004 00:09:07 +1000 (EST)
Subject: [tinysofa-svn] r2072 - contrib/unzip
Message-ID: <20040622140907.436904E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-23 00:09:06 +1000 (Wed, 23 Jun 2004)
New Revision: 2072

Added:
   contrib/unzip/current/
Log:
- Preparing new upstream.


Copied: contrib/unzip/current (from rev 2071, contrib/unzip/releases/5.50/1ok)


From svn at tinysofa.org  Tue Jun 22 14:13:04 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Jun 2004 00:13:04 +1000 (EST)
Subject: [tinysofa-svn] r2073 - in contrib/unzip/current: sources specs
Message-ID: <20040622141304.73CB64E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-23 00:13:04 +1000 (Wed, 23 Jun 2004)
New Revision: 2073

Added:
   contrib/unzip/current/sources/unzip551.tar.gz
Removed:
   contrib/unzip/current/sources/unzip550.tar.gz
Modified:
   contrib/unzip/current/specs/unzip.spec
Log:
- New upstream: 5.51.


Deleted: contrib/unzip/current/sources/unzip550.tar.gz
===================================================================
(Binary files differ)

Added: contrib/unzip/current/sources/unzip551.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/unzip/current/sources/unzip551.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: contrib/unzip/current/specs/unzip.spec
===================================================================
--- contrib/unzip/current/specs/unzip.spec	2004-06-22 14:09:06 UTC (rev 2072)
+++ contrib/unzip/current/specs/unzip.spec	2004-06-22 14:13:04 UTC (rev 2073)
@@ -1,10 +1,10 @@
 Summary: A utility for unpacking zip files.
 Name:    unzip
-Version: 5.50
+Version: 5.51
 Release: 1ok
 License: BSD
 Group: tinysofa contrib
-Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz
+Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip551.tar.gz
 Patch0: unzip542-rpmoptflags.patch
 Patch1: unzip-5.50-dotdot.patch
 URL: http://www.info-zip.org/pub/infozip/UnZip.html


From svn at tinysofa.org  Tue Jun 22 14:18:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Jun 2004 00:18:00 +1000 (EST)
Subject: [tinysofa-svn] r2074 - contrib/unzip/current/specs
Message-ID: <20040622141800.8D1494E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-23 00:18:00 +1000 (Wed, 23 Jun 2004)
New Revision: 2074

Modified:
   contrib/unzip/current/specs/unzip.spec
Log:
- Get rid of dotdot patch.


Modified: contrib/unzip/current/specs/unzip.spec
===================================================================
--- contrib/unzip/current/specs/unzip.spec	2004-06-22 14:13:04 UTC (rev 2073)
+++ contrib/unzip/current/specs/unzip.spec	2004-06-22 14:18:00 UTC (rev 2074)
@@ -6,7 +6,6 @@
 Group: tinysofa contrib
 Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip551.tar.gz
 Patch0: unzip542-rpmoptflags.patch
-Patch1: unzip-5.50-dotdot.patch
 URL: http://www.info-zip.org/pub/infozip/UnZip.html
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -24,7 +23,6 @@
 %prep
 %setup -q 
 %patch0 -p1
-%patch1 -p1
 ln -s unix/Makefile Makefile
 
 %build


From svn at tinysofa.org  Tue Jun 22 14:36:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Jun 2004 00:36:32 +1000 (EST)
Subject: [tinysofa-svn] 
	r2075 - tinysofa/releases/1.0/initscripts/current/sources
Message-ID: <20040622143632.7DC7B4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-23 00:36:32 +1000 (Wed, 23 Jun 2004)
New Revision: 2075

Modified:
   tinysofa/releases/1.0/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch
Log:
- Fix the LVM on RAID stuff, again.


Modified: tinysofa/releases/1.0/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch
===================================================================
--- tinysofa/releases/1.0/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch	2004-06-22 14:18:00 UTC (rev 2074)
+++ tinysofa/releases/1.0/initscripts/current/sources/initscripts-7.31.9-tinysofa.patch	2004-06-22 14:36:32 UTC (rev 2075)
@@ -366,8 +366,7 @@
 +                RAIDDEV="`basename $i`"
 +                RAIDSTAT=`grep "^$RAIDDEV : active" /proc/mdstat`
 +                if [ -z "$RAIDSTAT" ]; then
-+                        if ! grep -q "^$i" /etc/fstab || \
-+                             grep -q "^$i.*noauto" /etc/fstab; then
++                        if ! grep -q "^$i.*noauto" /etc/fstab; then
 +                                STRING="$STRING $RAIDDEV(skipped)"
 +                                echo -n "$RAIDDEV(skipped) "
 +                        else
@@ -385,6 +384,7 @@
 +        done
 +        [ $ERROR -eq 0 ] && success "$STRING" || failure "$STRING"
 +        echo
++
  
 -		echo $"Unmounting file systems"
 -		umount -a


From svn at tinysofa.org  Tue Jun 22 15:14:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Jun 2004 01:14:20 +1000 (EST)
Subject: [tinysofa-svn] r2076 - tinysofa/releases/1.0/swupconf/current/specs
Message-ID: <20040622151420.9AE8D4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-23 01:14:20 +1000 (Wed, 23 Jun 2004)
New Revision: 2076

Modified:
   tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec
Log:
- Don't replace conf.d files.


Modified: tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec
===================================================================
--- tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec	2004-06-22 14:36:32 UTC (rev 2075)
+++ tinysofa/releases/1.0/swupconf/current/specs/swupconf.spec	2004-06-22 15:14:20 UTC (rev 2076)
@@ -34,7 +34,7 @@
 %dir %attr(0755,root,root) /etc/swup/samples
 /etc/swup/samples
 %dir %attr(0755,root,root) /etc/swup/conf.d
-/etc/swup/conf.d
+%config(noreplace) /etc/swup/conf.d/*
 %dir %attr(0700,root,root) /etc/swup/gnupg
 %config(noreplace) /etc/swup/gnupg/pubring.gpg
 


From svn at tinysofa.org  Wed Jun 23 09:55:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 23 Jun 2004 19:55:39 +1000 (EST)
Subject: [tinysofa-svn] 
	r2077 - in tinysofa/snapshot/dhcp/current: sources specs
Message-ID: <20040623095539.39E044E8037@minbar.tinysofa.org>

Author: jh
Date: 2004-06-23 19:55:38 +1000 (Wed, 23 Jun 2004)
New Revision: 2077

Added:
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc14.tar.gz
Removed:
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13.tar.gz
Modified:
   tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-dhcpctlman.patch
   tinysofa/snapshot/dhcp/current/specs/dhcp.spec
Log:
- new upstream, includes security fixes


Modified: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-dhcpctlman.patch
===================================================================
--- tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-dhcpctlman.patch	2004-06-22 15:14:20 UTC (rev 2076)
+++ tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13-dhcpctlman.patch	2004-06-23 09:55:38 UTC (rev 2077)
@@ -23,10 +23,3 @@
  
  int main (int argc, char **argv) {
  	dhcpctl_data_string ipaddrstring = NULL;
-@@ -464,5 +465,5 @@
- .Em dhcpctl
- was written by Ted Lemon of Nominum, Inc.  Information about Nominum
- and support contracts for DHCP and BIND can be found at
--http://www.nominum.com.
-+.Em http://www.nominum.com.
- This preliminary documentation was written by James Brister of Nominum, Inc.

Deleted: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc13.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc14.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/dhcp/current/sources/dhcp-3.0.1rc14.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/snapshot/dhcp/current/specs/dhcp.spec
===================================================================
--- tinysofa/snapshot/dhcp/current/specs/dhcp.spec	2004-06-22 15:14:20 UTC (rev 2076)
+++ tinysofa/snapshot/dhcp/current/specs/dhcp.spec	2004-06-23 09:55:38 UTC (rev 2077)
@@ -1,7 +1,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name: dhcp
-Version: 3.0.1rc13
-Release: 2jh
+Version: 3.0.1rc14
+Release: 1jh
 License: distributable
 Group: tinysofa/main
 URL: http://isc.org/products/DHCP/


From svn at tinysofa.org  Wed Jun 23 14:38:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 00:38:22 +1000 (EST)
Subject: [tinysofa-svn] 
	r2078 - in tinysofa/snapshot/finger/current: sources specs
Message-ID: <20040623143822.9A3174E8037@minbar.tinysofa.org>

Author: jh
Date: 2004-06-24 00:38:21 +1000 (Thu, 24 Jun 2004)
New Revision: 2078

Added:
   tinysofa/snapshot/finger/current/sources/bsd-finger-0.16-allocbroken.patch
   tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-rfc742.patch
   tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-strip.patch
   tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-typo.patch
   tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-usagi-ipv6.patch
   tinysofa/snapshot/finger/current/sources/finger-xinetd
Modified:
   tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-exact.patch
   tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-time.patch
   tinysofa/snapshot/finger/current/specs/finger.spec
Log:
- rework finger package from Fedora


Added: tinysofa/snapshot/finger/current/sources/bsd-finger-0.16-allocbroken.patch
===================================================================
--- tinysofa/snapshot/finger/current/sources/bsd-finger-0.16-allocbroken.patch	2004-06-23 09:55:38 UTC (rev 2077)
+++ tinysofa/snapshot/finger/current/sources/bsd-finger-0.16-allocbroken.patch	2004-06-23 14:38:21 UTC (rev 2078)
@@ -0,0 +1,18 @@
+--- bsd-finger-0.16/finger/util.c.broken	Wed May 31 16:56:46 2000
++++ bsd-finger-0.16/finger/util.c	Wed May 31 16:57:45 2000
+@@ -350,6 +350,7 @@
+ 		eprintf("finger: Out of space.\n");
+ 		exit(1);
+ 	}
++	memset(p, 0, sizeof(PERSON));
+ 	return(p);
+ }
+ 
+@@ -362,6 +363,7 @@
+ 		eprintf("finger: Out of space.\n");
+ 		exit(1);
+ 	}
++	memset(w, 0, sizeof(WHERE));
+ 	if (pn->whead == NULL)
+ 		pn->whead = pn->wtail = w;
+ 	else {

Modified: tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-exact.patch
===================================================================
--- tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-exact.patch	2004-06-23 09:55:38 UTC (rev 2077)
+++ tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-exact.patch	2004-06-23 14:38:21 UTC (rev 2078)
@@ -1,5 +1,5 @@
---- bsd-finger-0.17/finger/finger.c.orig	Sun Nov 26 20:05:48 2000
-+++ bsd-finger-0.17/finger/finger.c	Sun Nov 26 20:09:35 2000
+--- bsd-finger-0.17-pre20000412/finger/finger.c.exact	Sat Dec 18 11:41:51 1999
++++ bsd-finger-0.17-pre20000412/finger/finger.c	Sun Aug 27 21:17:57 2000
 @@ -238,15 +238,14 @@
  	 * traverse the list of possible login names and check the login name
  	 * and real name against the name specified by the user.
@@ -17,9 +17,9 @@
 +				enter_person(pw);
 +				used[i] = 1;
  			}
++		}
 -	} else for (pw = getpwent(); pw; pw = getpwent())
-+		}
-+	if (!mflag) for (pw = getpwent(); pw; pw = getpwent())
++	if(!mflag) for (pw = getpwent(); pw; pw = getpwent())
  		for (i = 0; i < argc; i++)
  			if (used[i] >= 0 &&
  			    (!strcasecmp(pw->pw_name, argv[i]) ||

Added: tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-rfc742.patch
===================================================================
--- tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-rfc742.patch	2004-06-23 09:55:38 UTC (rev 2077)
+++ tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-rfc742.patch	2004-06-23 14:38:21 UTC (rev 2078)
@@ -0,0 +1,15 @@
+--- bsd-finger-0.17-pre20000412/fingerd/fingerd.c.rfc742	Sat Jul 22 14:58:58 2000
++++ bsd-finger-0.17-pre20000412/fingerd/fingerd.c	Sat Jul 22 15:01:31 2000
+@@ -214,7 +214,11 @@
+ 	av[k++] = "finger";
+ 	for (s = strtok(line, WS); s && k<ENTRIES; s = strtok(NULL, WS)) {
+ 		/* RFC742: "/[Ww]" == "-l" */
+-		if (!strncasecmp(s, "/w", 2)) memcpy(s, "-l", 2);
++		if (!strncasecmp(s, "/w", 2)) {
++		    if (k < ENTRIES - 1)
++			av[k++] = "-l";
++		    s += 2;
++		}
+ 		if (!forwarding) {
+ 		    t = strchr(s, '@');
+ 		    if (t) {

Added: tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-strip.patch
===================================================================
--- tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-strip.patch	2004-06-23 09:55:38 UTC (rev 2077)
+++ tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-strip.patch	2004-06-23 14:38:21 UTC (rev 2078)
@@ -0,0 +1,22 @@
+--- bsd-finger-0.17/finger/Makefile.strip	Wed Jun 19 15:22:39 2002
++++ bsd-finger-0.17/finger/Makefile	Wed Jun 19 15:25:11 2002
+@@ -11,7 +11,7 @@
+ 
+ install: finger
+ 	install -d $(INSTALLROOT)$(BINDIR)
+-	install -s -m$(BINMODE) finger $(INSTALLROOT)$(BINDIR)
++	install -m$(BINMODE) finger $(INSTALLROOT)$(BINDIR)
+ 	install -d $(INSTALLROOT)$(MANDIR)/man1
+ 	install -m$(MANMODE) finger.1 $(INSTALLROOT)$(MANDIR)/man1
+ 
+--- bsd-finger-0.17/fingerd/Makefile.strip	Wed Jun 19 15:22:39 2002
++++ bsd-finger-0.17/fingerd/Makefile	Wed Jun 19 15:25:27 2002
+@@ -10,7 +10,7 @@
+ 
+ install: fingerd
+ 	install -d $(INSTALLROOT)$(SBINDIR)
+-	install -s -m$(DAEMONMODE) fingerd $(INSTALLROOT)$(SBINDIR)/in.fingerd
++	install -m$(DAEMONMODE) fingerd $(INSTALLROOT)$(SBINDIR)/in.fingerd
+ 	install -d $(INSTALLROOT)$(MANDIR)/man8
+ 	install -m$(MANMODE) fingerd.8 $(INSTALLROOT)$(MANDIR)/man8/in.fingerd.8
+ 	ln -sf in.fingerd.8 $(INSTALLROOT)$(MANDIR)/man8/fingerd.8

Modified: tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-time.patch
===================================================================
--- tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-time.patch	2004-06-23 09:55:38 UTC (rev 2077)
+++ tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-time.patch	2004-06-23 14:38:21 UTC (rev 2078)
@@ -1,5 +1,5 @@
---- bsd-finger-0.17/finger/lprint.c.orig	Mon Aug 26 19:47:16 2002
-+++ bsd-finger-0.17/finger/lprint.c	Mon Aug 26 19:48:47 2002
+--- bsd-finger-0.17-pre20000412/finger/lprint.c.orig	Tue Sep 14 06:51:11 1999
++++ bsd-finger-0.17-pre20000412/finger/lprint.c	Sun Feb  4 17:57:08 2001
 @@ -48,7 +48,7 @@
  #include <sys/types.h>
  #include <sys/file.h>
@@ -9,8 +9,8 @@
  #include "finger.h"
  
  static void lprint(PERSON *pn);
---- bsd-finger-0.17/finger/sprint.c.orig	Mon Aug 26 19:49:43 2002
-+++ bsd-finger-0.17/finger/sprint.c	Mon Aug 26 19:49:23 2002
+--- bsd-finger-0.17-pre20000412/finger/sprint.c.orig	Sun Dec 12 13:59:33 1999
++++ bsd-finger-0.17-pre20000412/finger/sprint.c	Sun Feb  4 17:57:22 2001
 @@ -40,7 +40,7 @@
  #endif /* not lint */
  

Added: tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-typo.patch
===================================================================
--- tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-typo.patch	2004-06-23 09:55:38 UTC (rev 2077)
+++ tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-typo.patch	2004-06-23 14:38:21 UTC (rev 2078)
@@ -0,0 +1,54 @@
+--- bsd-finger-0.17/finger/finger.1.typo	2003-09-01 15:03:24.000000000 +0200
++++ bsd-finger-0.17/finger/finger.1	2003-09-01 16:10:57.000000000 +0200
+@@ -169,13 +169,13 @@
+ must be able to see the
+ .Pa .nofinger
+ file. This generally means that the home directory containing the file
+-must have the other-users-execute bit set (o+w). See
++must have the other-users-execute bit set (o+x). See
+ .Xr chmod 1 .
+ If you use this feature for privacy, please test it with ``finger
+ @localhost'' before relying on it, just in case.
+ .It ~/.plan
+ .It ~/.project
+-.It ~/.pgp
++.It ~/.pgpkey
+ These files are printed as part of a long-format request. The
+ .Pa .project
+ file is limited to one line; the
+--- bsd-finger-0.17/finger/net.c.typo	2003-09-01 15:03:24.000000000 +0200
++++ bsd-finger-0.17/finger/net.c	2003-09-01 15:03:24.000000000 +0200
+@@ -98,7 +98,7 @@
+ 	}
+ 	freeaddrinfo(res0);
+ 	if (s < 0) {
+-		eprintf("finger: cannot create socket / connet host\n");
++		eprintf("finger: cannot create socket / connect host\n");
+ 		return;
+ 	}
+ #else
+--- bsd-finger-0.17/fingerd/fingerd.8.typo	2003-09-01 15:03:24.000000000 +0200
++++ bsd-finger-0.17/fingerd/fingerd.8	2003-09-01 15:03:24.000000000 +0200
+@@ -98,11 +98,11 @@
+ connection.  A value of 0 waits forever.  The default is 60 seconds.
+ .Pp
+ Options to fingerd should be specified in 
+-.Pa /etc/inetd.conf .
++.Pa /etc/xinetd.d/finger .
+ .Pp
+ The finger protocol consists mostly of specifying command arguments.
+ The 
+-.Xr inetd 8
++.Xr xinetd 8
+ .Dq super-server
+ runs
+ .Nm fingerd
+@@ -143,7 +143,7 @@
+ If a name is ambiguous, all possible derivations are returned.
+ .Sh SEE ALSO
+ .Xr finger 1 ,
+-.Xr inetd 8
++.Xr xinetd 8
+ .Sh RESTRICTIONS
+ Connecting directly to the server from a
+ .Tn TIP

Added: tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-usagi-ipv6.patch
===================================================================
--- tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-usagi-ipv6.patch	2004-06-23 09:55:38 UTC (rev 2077)
+++ tinysofa/snapshot/finger/current/sources/bsd-finger-0.17-usagi-ipv6.patch	2004-06-23 14:38:21 UTC (rev 2078)
@@ -0,0 +1,473 @@
+diff -uNr bsd-finger-0.17/CVS/Entries bsd-finger/CVS/Entries
+--- bsd-finger-0.17/CVS/Entries	Thu Jan  1 02:00:00 1970
++++ bsd-finger/CVS/Entries	Fri Mar  9 00:00:29 2001
+@@ -0,0 +1,11 @@
++/.cvsignore/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/BUGS/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/ChangeLog/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/MCONFIG.in/1.3/Sat Jan 27 04:14:52 2001//
++/MRULES/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/Makefile/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/README/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/configure/1.5/Sat Jan 27 04:14:52 2001//
++/version.h/1.1.1.1/Fri Nov  3 19:18:15 2000//
++D/finger////
++D/fingerd////
+diff -uNr bsd-finger-0.17/CVS/Repository bsd-finger/CVS/Repository
+--- bsd-finger-0.17/CVS/Repository	Thu Jan  1 02:00:00 1970
++++ bsd-finger/CVS/Repository	Mon Feb 19 06:50:43 2001
+@@ -0,0 +1 @@
++usagi/src/bsd-finger
+diff -uNr bsd-finger-0.17/CVS/Root bsd-finger/CVS/Root
+--- bsd-finger-0.17/CVS/Root	Thu Jan  1 02:00:00 1970
++++ bsd-finger/CVS/Root	Mon Feb 19 06:50:43 2001
+@@ -0,0 +1 @@
++:pserver:anoncvs at anoncvs.linux-ipv6.org:/cvsroot/usagi
+diff -uNr bsd-finger-0.17/configure bsd-finger/configure
+--- bsd-finger-0.17/configure	Sat Jul 29 21:00:27 2000
++++ bsd-finger/configure	Sat Jan 27 06:14:52 2001
+@@ -25,6 +25,7 @@
+     --daemonmode=mode     Mode for daemon binaries [same as binmode]
+     --manmode=mode        Mode for manual pages [644]
+     --with-c-compiler=cc  Program for compiling C source [guessed]
++    --enable-ipv6         Enable IPv6 support
+ EOF
+ 	exit 0;;
+ 	--verbose) ;;
+@@ -40,6 +41,11 @@
+ 	--daemonmode=*) DAEMONMODE=`echo $1 | sed 's/^[^=]*=//'` ;;
+ 	--manmode=*) MANMODE=`echo $1 | sed 's/^[^=]*=//'` ;;
+ 	--with-c-compiler=*) CC=`echo $1 | sed 's/^[^=]*=//'` ;;
++
++	--disable-ipv6) ENABLE_IPV6=no;;
++	--enable-ipv6=*) ENABLE_IPV6=`echo $1 | sed 's/^[^=]*=//'`;;
++	--enable-ipv6) ENABLE_IPV6=yes;;
++
+ 	*) echo "Unrecognized option: $1"; exit 1;;
+ esac 
+ shift
+@@ -148,6 +154,42 @@
+ 
+ LDFLAGS=
+ LIBS=
++
++rm -f __conftest*
++
++##################################################
++## Enable IPv6
++echo -n "Whether to enable IPv6 support... "
++if [ x"$ENABLE_IPV6" = x"yes" ]; then
++    echo yes
++    CFLAGS="$CFLAGS -DINET6"
++else
++    echo no
++fi
++
++rm -f __conftest*
++
++## Search IPv6 Library / Headers
++if [ x"$ENABLE_IPV6" = x"yes" ]; then
++    echo -n "Search for IPv6 library... "
++    inet6libdirs="/usr/local/v6/lib /usr/local/lib /usr /usr/inet6/lib"
++    inet6libs="inet6"
++    inet6found=no
++    for inet6libdir in $inet6libdirs; do
++        for inet6lib in $inet6libs; do
++            if [ -d $inet6libdir ] && [ -f $inet6libdir/lib$inet6lib.a ]; then
++                inet6found=yes
++                break 2
++            fi
++        done
++    done
++    if [ x"$inet6found" = x"yes" ]; then
++        echo "$inet6libdir/lib$inet6lib.a"
++        LIBS="$LIBS -L$inet6libdir -l$inet6lib"
++    else
++        echo "not found"
++    fi
++fi
+ 
+ rm -f __conftest*
+ 
+diff -uNr bsd-finger-0.17/finger/CVS/Entries bsd-finger/finger/CVS/Entries
+--- bsd-finger-0.17/finger/CVS/Entries	Thu Jan  1 02:00:00 1970
++++ bsd-finger/finger/CVS/Entries	Mon Feb 19 06:50:43 2001
+@@ -0,0 +1,11 @@
++/.cvsignore/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/Makefile/1.4/Sat Jan 27 05:57:07 2001//
++/display.c/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/finger.1/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/finger.c/1.3/Sun Feb 11 09:33:52 2001//
++/finger.h/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/lprint.c/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/net.c/1.3/Fri Jan 26 18:08:21 2001//
++/sprint.c/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/util.c/1.1.1.1/Fri Nov  3 19:18:15 2000//
++D
+diff -uNr bsd-finger-0.17/finger/CVS/Repository bsd-finger/finger/CVS/Repository
+--- bsd-finger-0.17/finger/CVS/Repository	Thu Jan  1 02:00:00 1970
++++ bsd-finger/finger/CVS/Repository	Mon Feb 19 06:50:43 2001
+@@ -0,0 +1 @@
++usagi/src/bsd-finger/finger
+diff -uNr bsd-finger-0.17/finger/CVS/Root bsd-finger/finger/CVS/Root
+--- bsd-finger-0.17/finger/CVS/Root	Thu Jan  1 02:00:00 1970
++++ bsd-finger/finger/CVS/Root	Mon Feb 19 06:50:43 2001
+@@ -0,0 +1 @@
++:pserver:anoncvs at anoncvs.linux-ipv6.org:/cvsroot/usagi
+diff -uNr bsd-finger-0.17/finger/Makefile bsd-finger/finger/Makefile
+--- bsd-finger-0.17/finger/Makefile	Sun Dec 12 20:04:52 1999
++++ bsd-finger/finger/Makefile	Sat Jan 27 07:57:07 2001
+@@ -10,7 +10,9 @@
+ finger.o: ../version.h
+ 
+ install: finger
++	install -d $(INSTALLROOT)$(BINDIR)
+ 	install -s -m$(BINMODE) finger $(INSTALLROOT)$(BINDIR)
++	install -d $(INSTALLROOT)$(MANDIR)/man1
+ 	install -m$(MANMODE) finger.1 $(INSTALLROOT)$(MANDIR)/man1
+ 
+ clean:
+diff -uNr bsd-finger-0.17/finger/finger.1 bsd-finger/finger/finger.1
+--- bsd-finger-0.17/finger/finger.1	Mon Jul 31 02:56:57 2000
++++ bsd-finger/finger/finger.1	Fri Nov  3 21:18:15 2000
+@@ -30,7 +30,7 @@
+ .\" SUCH DAMAGE.
+ .\"
+ .\"	from: @(#)finger.1	6.14 (Berkeley) 7/27/91
+-.\"	$Id: finger.1,v 1.18 2000/07/30 23:56:57 dholland Exp $
++.\"	$Id: finger.1,v 1.1.1.1 2000/11/03 19:18:15 mk Exp $
+ .\"
+ .Dd August 15, 1999
+ .Dt FINGER 1
+diff -uNr bsd-finger-0.17/finger/finger.c bsd-finger/finger/finger.c
+--- bsd-finger-0.17/finger/finger.c	Sat Dec 18 18:41:51 1999
++++ bsd-finger/finger/finger.c	Sun Feb 11 11:33:52 2001
+@@ -1,3 +1,5 @@
++/* $USAGI$ */
++
+ /*
+  * Copyright (c) 1989 The Regents of the University of California.
+  * All rights reserved.
+@@ -46,7 +48,7 @@
+  * from: @(#)finger.c	5.22 (Berkeley) 6/29/90 
+  */
+ char finger_rcsid[] = \
+-  "$Id: finger.c,v 1.15 1999/12/18 16:41:51 dholland Exp $";
++  "$Id: finger.c,v 1.3 2001/02/11 09:33:52 yoshfuji Exp $";
+ 
+ /*
+  * Finger prints out information about users.  It is not portable since
+@@ -74,7 +76,11 @@
+ #include <time.h>
+ #include <getopt.h>
+ #include "finger.h"
++#ifdef _USAGI
++#include "version.h"
++#else
+ #include "../version.h"
++#endif
+ 
+ static void loginlist(void);
+ static void userlist(int argc, char *argv[]);
+@@ -92,8 +98,12 @@
+ 
+ int main(int argc, char *argv[]) {
+ 	int ch;
+-	struct sockaddr_in sin;
+-	socklen_t slen = sizeof(sin);
++#ifdef INET6
++	struct sockaddr_storage sa;
++#else
++	struct sockaddr sa;
++#endif
++	socklen_t slen = sizeof(sa);
+ 
+ 	while ((ch = getopt(argc, argv, "lmps")) != EOF) {
+ 		switch(ch) {
+@@ -119,7 +129,7 @@
+ 	argc -= optind;
+ 	argv += optind;
+ 
+-	if (getsockname(STDOUT_FILENO, (struct sockaddr *)&sin, &slen)==0) {
++	if (getsockname(STDOUT_FILENO, (struct sockaddr *)&sa, &slen)==0) {
+ 		/*
+ 		 * stdout is a socket. must be a network finger request,
+ 		 * so emit CRs with our LFs at the ends of lines.
+@@ -136,7 +146,7 @@
+ 	 * Also check stdin for nofinger processing, because of older
+ 	 * fingerds that make stdout a pipe for CRLF handling.
+ 	 */
+-	if (getsockname(STDIN_FILENO, (struct sockaddr *)&sin, &slen)==0) {
++	if (getsockname(STDIN_FILENO, (struct sockaddr *)&sa, &slen)==0) {
+ 		enable_nofinger = 1;
+ 	}	
+ 
+diff -uNr bsd-finger-0.17/finger/finger.h bsd-finger/finger/finger.h
+--- bsd-finger-0.17/finger/finger.h	Tue Sep 14 13:51:11 1999
++++ bsd-finger/finger/finger.h	Fri Nov  3 21:18:15 2000
+@@ -34,7 +34,7 @@
+  * SUCH DAMAGE.
+  *
+  *	from: @(#)finger.h	5.5 (Berkeley) 6/1/90
+- *	$Id: finger.h,v 1.7 1999/09/14 10:51:11 dholland Exp $
++ *	$Id: finger.h,v 1.1.1.1 2000/11/03 19:18:15 mk Exp $
+  */
+ 
+ #include <pwd.h>
+diff -uNr bsd-finger-0.17/finger/lprint.c bsd-finger/finger/lprint.c
+--- bsd-finger-0.17/finger/lprint.c	Tue Sep 14 13:51:11 1999
++++ bsd-finger/finger/lprint.c	Fri Nov  3 21:18:15 2000
+@@ -38,7 +38,7 @@
+  * from: @(#)lprint.c	5.13 (Berkeley) 10/31/90
+  */
+ char lprint_rcsid[] = 
+-  "$Id: lprint.c,v 1.11 1999/09/14 10:51:11 dholland Exp $";
++  "$Id: lprint.c,v 1.1.1.1 2000/11/03 19:18:15 mk Exp $";
+ 
+ #include <stdio.h>
+ #include <ctype.h>
+diff -uNr bsd-finger-0.17/finger/net.c bsd-finger/finger/net.c
+--- bsd-finger-0.17/finger/net.c	Tue Sep 14 13:51:11 1999
++++ bsd-finger/finger/net.c	Fri Jan 26 20:08:21 2001
+@@ -1,3 +1,5 @@
++/* $USAGI: net.c,v 1.2 2000/11/17 08:00:44 yoshfuji Exp $ */
++
+ /*
+  * Copyright (c) 1989 The Regents of the University of California.
+  * All rights reserved.
+@@ -36,7 +38,7 @@
+ 
+ #ifndef lint
+ /*static char sccsid[] = "from: @(#)net.c	5.5 (Berkeley) 6/1/90";*/
+-char net_rcsid[] = "$Id: net.c,v 1.9 1999/09/14 10:51:11 dholland Exp $";
++char net_rcsid[] = "$Id: net.c,v 1.3 2001/01/26 18:08:21 yoshfuji Exp $";
+ #endif /* not lint */
+ 
+ #include <sys/types.h>
+@@ -53,18 +55,53 @@
+ 
+ void netfinger(const char *name) {
+ 	register FILE *fp;
+-	struct in_addr defaddr;
+ 	register int c, sawret, ateol;
++#ifdef INET6
++	struct addrinfo hints, *res0, *res;
++	int gai;
++#else
++	struct in_addr defaddr;
+ 	struct hostent *hp, def;
+ 	struct servent *sp;
+ 	struct sockaddr_in sn;
++	char *alist[1];
++#endif
+ 	int s;
+-	char *alist[1], *host;
++	char *host;
+ 
+ 	host = strrchr(name, '@');
+ 	if (!host) return;
+ 	*host++ = '\0';
+ 
++#ifdef INET6
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_family = PF_UNSPEC;
++	hints.ai_socktype = SOCK_STREAM;
++	gai = getaddrinfo(host, "finger", &hints, &res0);
++	if (gai) {
++		eprintf("finger: %s: host '%s', service '%s'\n",
++			gai_strerror(gai), host, "finger");
++		return;
++	}
++	s = -1;
++	errno = 0;
++	for (res=res0; res; res=res->ai_next) {
++		s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
++		if (s < 0)
++			continue;
++		if (connect(s, res->ai_addr, res->ai_addrlen) < 0){
++			close(s);
++			s = -1;
++			continue;
++		}
++		break;
++	}
++	freeaddrinfo(res0);
++	if (s < 0) {
++		eprintf("finger: cannot create socket / connet host\n");
++		return;
++	}
++#else
+ 	memset(&sn, 0, sizeof(sn));
+ 
+ 	sp = getservbyname("finger", "tcp");
+@@ -106,6 +143,7 @@
+ 		close(s);
+ 		return;
+ 	}
++#endif
+ 
+ 	/* -l flag for remote fingerd  */
+ 	if (lflag) write(s, "/W ", 3);
+diff -uNr bsd-finger-0.17/finger/sprint.c bsd-finger/finger/sprint.c
+--- bsd-finger-0.17/finger/sprint.c	Sun Dec 12 20:59:33 1999
++++ bsd-finger/finger/sprint.c	Fri Nov  3 21:18:15 2000
+@@ -36,7 +36,7 @@
+ 
+ #ifndef lint
+ /*static char sccsid[] = "from: @(#)sprint.c	5.8 (Berkeley) 12/4/90";*/
+-char sprint_rcsid[] = "$Id: sprint.c,v 1.10 1999/12/12 18:59:33 dholland Exp $";
++char sprint_rcsid[] = "$Id: sprint.c,v 1.1.1.1 2000/11/03 19:18:15 mk Exp $";
+ #endif /* not lint */
+ 
+ #include <sys/types.h>
+diff -uNr bsd-finger-0.17/finger/util.c bsd-finger/finger/util.c
+--- bsd-finger-0.17/finger/util.c	Wed Sep 29 01:53:58 1999
++++ bsd-finger/finger/util.c	Fri Nov  3 21:18:15 2000
+@@ -36,7 +36,7 @@
+ 
+ #ifndef lint
+ /*static char sccsid[] = "from: @(#)util.c	5.14 (Berkeley) 1/17/91";*/
+-char util_rcsid[] = "$Id: util.c,v 1.18 1999/09/28 22:53:58 netbug Exp $";
++char util_rcsid[] = "$Id: util.c,v 1.1.1.1 2000/11/03 19:18:15 mk Exp $";
+ #endif /* not lint */
+ 
+ #include <sys/types.h>
+diff -uNr bsd-finger-0.17/fingerd/CVS/Entries bsd-finger/fingerd/CVS/Entries
+--- bsd-finger-0.17/fingerd/CVS/Entries	Thu Jan  1 02:00:00 1970
++++ bsd-finger/fingerd/CVS/Entries	Mon Feb 19 06:50:43 2001
+@@ -0,0 +1,6 @@
++/.cvsignore/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/Makefile/1.4/Sat Jan 27 05:57:07 2001//
++/fingerd.8/1.1.1.1/Fri Nov  3 19:18:15 2000//
++/fingerd.c/1.5/Sun Feb 11 09:33:52 2001//
++/pathnames.h/1.1.1.1/Fri Nov  3 19:18:15 2000//
++D
+diff -uNr bsd-finger-0.17/fingerd/CVS/Repository bsd-finger/fingerd/CVS/Repository
+--- bsd-finger-0.17/fingerd/CVS/Repository	Thu Jan  1 02:00:00 1970
++++ bsd-finger/fingerd/CVS/Repository	Mon Feb 19 06:50:43 2001
+@@ -0,0 +1 @@
++usagi/src/bsd-finger/fingerd
+diff -uNr bsd-finger-0.17/fingerd/CVS/Root bsd-finger/fingerd/CVS/Root
+--- bsd-finger-0.17/fingerd/CVS/Root	Thu Jan  1 02:00:00 1970
++++ bsd-finger/fingerd/CVS/Root	Mon Feb 19 06:50:43 2001
+@@ -0,0 +1 @@
++:pserver:anoncvs at anoncvs.linux-ipv6.org:/cvsroot/usagi
+diff -uNr bsd-finger-0.17/fingerd/Makefile bsd-finger/fingerd/Makefile
+--- bsd-finger-0.17/fingerd/Makefile	Sun Dec 12 20:04:57 1999
++++ bsd-finger/fingerd/Makefile	Sat Jan 27 07:57:07 2001
+@@ -9,7 +9,9 @@
+ fingerd.o: pathnames.h ../version.h
+ 
+ install: fingerd
++	install -d $(INSTALLROOT)$(SBINDIR)
+ 	install -s -m$(DAEMONMODE) fingerd $(INSTALLROOT)$(SBINDIR)/in.fingerd
++	install -d $(INSTALLROOT)$(MANDIR)/man8
+ 	install -m$(MANMODE) fingerd.8 $(INSTALLROOT)$(MANDIR)/man8/in.fingerd.8
+ 	ln -sf in.fingerd.8 $(INSTALLROOT)$(MANDIR)/man8/fingerd.8
+ 
+diff -uNr bsd-finger-0.17/fingerd/fingerd.8 bsd-finger/fingerd/fingerd.8
+--- bsd-finger-0.17/fingerd/fingerd.8	Mon Jul 31 02:56:57 2000
++++ bsd-finger/fingerd/fingerd.8	Fri Nov  3 21:18:15 2000
+@@ -30,7 +30,7 @@
+ .\" SUCH DAMAGE.
+ .\"
+ .\"     from: @(#)fingerd.8	6.4 (Berkeley) 3/16/91
+-.\"	$Id: fingerd.8,v 1.18 2000/07/30 23:56:57 dholland Exp $
++.\"	$Id: fingerd.8,v 1.1.1.1 2000/11/03 19:18:15 mk Exp $
+ .\"
+ .Dd August 29, 1996
+ .Dt FINGERD 8
+diff -uNr bsd-finger-0.17/fingerd/fingerd.c bsd-finger/fingerd/fingerd.c
+--- bsd-finger-0.17/fingerd/fingerd.c	Sun Dec 12 20:46:28 1999
++++ bsd-finger/fingerd/fingerd.c	Sun Feb 11 11:33:52 2001
+@@ -1,3 +1,5 @@
++/* $USAGI: fingerd.c,v 1.3 2000/11/17 08:13:01 yoshfuji Exp $ */
++
+ /*
+  * Copyright (c) 1983 The Regents of the University of California.
+  * All rights reserved.
+@@ -39,7 +41,7 @@
+  * from: @(#)fingerd.c	5.6 (Berkeley) 6/1/90"
+  */
+ char rcsid[] = 
+-  "$Id: fingerd.c,v 1.23 1999/12/12 18:46:28 dholland Exp $";
++  "$Id: fingerd.c,v 1.5 2001/02/11 09:33:52 yoshfuji Exp $";
+ 
+ #include <pwd.h>
+ #include <grp.h>
+@@ -57,7 +59,11 @@
+ #include <sys/wait.h>
+ 
+ #include "pathnames.h"
++#ifdef _USAGI
++#include "version.h"
++#else
+ #include "../version.h"
++#endif
+ 
+ #define	ENTRIES	50
+ #define WS " \t\r\n"
+@@ -111,7 +117,11 @@
+ 	int k, nusers;
+ 	char *s, *t;
+ 	const char *fingerpath = NULL;
+-	struct sockaddr_in sn;
++#ifdef INET6
++	struct sockaddr_storage sn;
++#else
++	struct sockaddr sn;
++#endif
+ 	socklen_t sval = sizeof(sn);
+ 
+ 
+@@ -182,18 +192,35 @@
+ 
+ 	if (welcome) {
+ 		char buf[256];
++#ifdef INET6
++		struct addrinfo hints, *res0;
++#else
+ 		struct hostent *hp;
++#endif
+ 		struct utsname utsname;
++		const char *cname = buf;
+ 
+ 		uname(&utsname);
+ 		gethostname(buf, sizeof(buf));
++#ifdef INET6
++		memset(&hints, 0, sizeof(hints));
++		hints.ai_family = PF_UNSPEC;
++		hints.ai_flags = AI_CANONNAME;
++		if (getaddrinfo(buf, NULL, &hints, &res0)) {
++			/* paranoia: dns spoofing? */
++			cname = res0->ai_canonname;
++		}
++#else
+ 		if ((hp = gethostbyname(buf))) {
+ 			/* paranoia: dns spoofing? */
+-			strncpy(buf, hp->h_name, sizeof(buf));
+-			buf[sizeof(buf)-1] = 0;
++			cname = hp->h_name;
+ 		}
++#endif
+ 		printf("\r\nWelcome to %s version %s at %s !\r\n\n",
+-				utsname.sysname, utsname.release, buf);
++				utsname.sysname, utsname.release, cname);
++#ifdef INET6
++		freeaddrinfo(res0);
++#endif
+ 		fflush(stdout);
+ 		switch (fork()) {
+ 		 case -1: /* fork failed, oh well */
+diff -uNr bsd-finger-0.17/fingerd/pathnames.h bsd-finger/fingerd/pathnames.h
+--- bsd-finger-0.17/fingerd/pathnames.h	Sun Jul 14 02:21:42 1996
++++ bsd-finger/fingerd/pathnames.h	Fri Nov  3 21:18:15 2000
+@@ -31,7 +31,7 @@
+  * SUCH DAMAGE.
+  *
+  *	from: @(#)pathnames.h	5.3 (Berkeley) 6/1/90
+- *	$Id: pathnames.h,v 1.3 1996/07/13 23:21:42 dholland Exp $
++ *	$Id: pathnames.h,v 1.1.1.1 2000/11/03 19:18:15 mk Exp $
+  */
+ 
+ /*

Added: tinysofa/snapshot/finger/current/sources/finger-xinetd
===================================================================
--- tinysofa/snapshot/finger/current/sources/finger-xinetd	2004-06-23 09:55:38 UTC (rev 2077)
+++ tinysofa/snapshot/finger/current/sources/finger-xinetd	2004-06-23 14:38:21 UTC (rev 2078)
@@ -0,0 +1,12 @@
+# default: on
+# description: The finger server answers finger requests. Finger is \
+#	a protocol that allows remote users to see information such \
+#	as login name and last login time for local users.
+service finger
+{
+	socket_type	= stream
+	wait		= no
+	user		= nobody
+	server		= /usr/sbin/in.fingerd
+	disable		= yes
+}

Modified: tinysofa/snapshot/finger/current/specs/finger.spec
===================================================================
--- tinysofa/snapshot/finger/current/specs/finger.spec	2004-06-23 09:55:38 UTC (rev 2077)
+++ tinysofa/snapshot/finger/current/specs/finger.spec	2004-06-23 14:38:21 UTC (rev 2078)
@@ -1,79 +1,181 @@
 Summary: The finger client.
 Name: finger
 Version: 0.17
-Release: 11ts
+Release: 12jh
 License: BSD
-Group: tinysofa official
-Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/finger/bsd-finger-%{version}.tar.gz
-Patch1: bsd-finger-0.16-pts.patch
-Patch2: bsd-finger-0.17-exact.patch
-Patch3: bsd-finger-0.16-configure.patch
-Patch4: bsd-finger-0.17-time.patch
-BuildRoot: %{_tmppath}/%{name}-root
+Group: tinysofa/main
+Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/bsd-finger-%{version}.tar.gz
+Source1: finger-xinetd
+Patch5: bsd-finger-0.16-pts.patch
+Patch7: bsd-finger-0.17-exact.patch
+Patch8: bsd-finger-0.16-allocbroken.patch
+Patch9: bsd-finger-0.17-rfc742.patch
+Patch10: bsd-finger-0.17-time.patch
+Patch11: bsd-finger-0.17-usagi-ipv6.patch
+Patch12: bsd-finger-0.17-typo.patch
+Patch13: bsd-finger-0.17-strip.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-
 %description
 Finger is a utility which allows users to see information about system
 users (login name, home directory, name, how long they've been logged
 in to the system, etc.).  The finger package includes a standard
 finger client.
 
-You should install finger if you'd like to retreive finger information
+You should install finger if you'd like to retrieve finger information
 from other systems.
 
+%package server
+Summary: The finger daemon.
+Group: System Environment/Daemons
+Requires: xinetd
+
+%description server
+Finger is a utility which allows users to see information about system
+users (login name, home directory, name, how long they've been logged
+in to the system, etc.).  The finger-server package includes a standard
+finger server. The server daemon (fingerd) runs from xinetd.
+
+You should install finger-server if your system is used by multiple users
+and you'd like finger information to be available.
+
+
 %prep
 %setup -q -n bsd-finger-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch5 -p1 -b .pts
+# XXX not applied
+%patch7 -p1 -b .exact
+%patch8 -p1
+%patch9 -p1 -b .rfc742
+%patch10 -p1 -b .time
+%patch11 -p1 -b .ipv6
+%patch12 -p1 -b .typo
+%patch13 -p1 -b .strip
 
+
 %build
-sh configure --prefix=/usr
-perl -pi -e 's,-O2,\$(RPM_OPT_FLAGS),' MCONFIG
+%configure --enable-ipv6
+perl -pi -e '
+    s,^CC=.*$,CC=cc,;
+    s,-O2,-fPIC \$(RPM_OPT_FLAGS),;
+    s,^BINDIR=.*$,BINDIR=%{_bindir},;
+    s,^MANDIR=.*$,MANDIR=%{_mandir},;
+    s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
+    s,^LDFLAGS=.*$,LDFLAGS=-pie,;
+    ' MCONFIG
 
-make
+%make
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/man/man1,share/man/man8,sbin}
+%{__mkdir_p} \
+	%{buildroot}%{_bindir} \
+	%{buildroot}%{_mandir}/man{1,8} \
+	%{buildroot}%{_sbindir} \
+	%{buildroot}%{_sysconfdir}/xinetd.d
 
-make INSTALLROOT=$RPM_BUILD_ROOT install
+install -m 644 %SOURCE1 %{buildroot}%{_sysconfdir}/xinetd.d/finger
 
+make INSTALLROOT=%{buildroot} install
+
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
-/usr/bin/finger
-/usr/share/man/man1/finger.1*
+%attr(0711,root,root)	%{_bindir}/finger
+%{_mandir}/man1/finger.1*
 
-# we don't want the server
-%exclude %{_sbindir}/in.fingerd
-%exclude %{_mandir}/man8/in.fingerd.8*
+%files server
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/xinetd.d/finger
+%attr(0711,root,root)	%{_sbindir}/in.fingerd
+%{_mandir}/man8/in.fingerd.8*
+%{_mandir}/man8/fingerd.8*
 
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.17-11ts
-- current (0.17-10ts) integrated as 0.17-11ts for release 1.0-U1
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Dec  8 2003 Erlend Midttun <erlendbm at trustix dot org> 0.17-7tr
-- Big rebuild
+* Wed Feb 25 2004 Phil Knirsch <pknirsch at redhat.com> 0.17-21
+- rebuilt
+- Made fingerd PIE.
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 0.17-6tr
-- Big rebuild
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Tue May 13 2003 Erlend Midttun <erlendbm at trustix dot com> 0.17-5em
-- Killed -server.
+* Mon Sep 01 2003 Phil Knirsch <pknirsch at redhat.com> 0.17-18.1
+- rebuilt
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 0.17-4em
-- Rebuilt against glibc 2.3.2.
+* Mon Sep 01 2003 Phil Knirsch <pknirsch at redhat.com> 0.17-18
+- Fixed manpage bug (#75705).
 
-* Mon Aug 26 2002 Gerald Dachs <gda at trustix dot org> 0.17-3gd
-- changed #include <sys/time.h> to #include <time.h> (patch4)	
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com> 0.17-17
+- rebuilt
 
-* Mon May 29 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Fixed paths
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com> 0.17-16
+- rebuilt
 
+* Wed Dec 11 2002 Tim Powers <timp at redhat.com> 0.17-15
+- rebuild on all arches
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 0.17-14
+- automated rebuild
+
+* Wed Jun 19 2002 Phil Knirsch <pknirsch at redhat.com> 0.17-13
+- Don't forcibly strip binaries
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu Jan 24 2002 Phil Knirsch <pknirsch at redhat.com>
+- Fixed various typos in manpage/app (#51891, #54916, #57588)
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Apr 18 2001 Crutcher Dunnavant <crutcher at redhat.com>
+- Approved
+- * Sun Mar 11 2001 Pekka Savola <pekkas at netcore.fi>
+- - Add IPv6 support from USAGI, update to 0.17 final (no changes)
+
+* Tue Feb 27 2001 Preston Brown <pbrown at redhat.com>
+- noreplace xinetd.d config file
+
+* Mon Feb 12 2001 Crutcher Dunnavant <crutcher at redhat.com>
+- time patch to handle time.h moving, credit to howarth at fuse.net
+- closes bug #26766
+
+* Fri Dec  1 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- make sure finger is turned off by default
+
+* Sun Aug 27 2000 Nalin Dahyabhai <nalin at redhat.com>
+- add patch to always call getpwnam() instead of just when -m is specified
+
+* Sat Jul 22 2000 Jeff Johnson <jbj at redhat.com>
+- fix RFC742 problem (again) (#6728).
+
+* Tue Jul 18 2000 Bill Nottingham <notting at redhat.com>
+- add description & default to xinetd file
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Sun Jun 18 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging.
+- update to 0.17.
+
+* Wed May 31 2000 Cristian Gafton <gafton at redhat.com>
+- fix the broken malloc code in finger client
+
+* Mon May 22 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+- converted to use /etc/xinetd.d
+
+* Tue May 16 2000 Chris Evans <chris at ferret.lmh.ox.ac.uk>
+- make some files mode -rwx--x--x as a security hardening measure 
+
 * Fri Feb 11 2000 Bill Nottingham <notting at redhat.com>
 - fix description
 
@@ -81,7 +183,7 @@
 - handle compressed manpages
 
 * Wed Feb 02 2000 Cristian Gafton <gafton at redhat.com>
-- fix decsription
+- fix description
 - man pages are compressed
 
 * Tue Jan  4 2000 Bill Nottingham <notting at redhat.com>
@@ -114,4 +216,4 @@
 - translations modified for de, fr, tr
 
 * Mon Sep 22 1997 Erik Troan <ewt at redhat.com>
-- added check for getpwnam() failure/
\ No newline at end of file
+- added check for getpwnam() failure


From svn at tinysofa.org  Wed Jun 23 14:49:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 00:49:39 +1000 (EST)
Subject: [tinysofa-svn] r2079 - tinysofa/snapshot/logrotate/current/specs
Message-ID: <20040623144939.77A764E8037@minbar.tinysofa.org>

Author: jh
Date: 2004-06-24 00:49:39 +1000 (Thu, 24 Jun 2004)
New Revision: 2079

Modified:
   tinysofa/snapshot/logrotate/current/specs/logrotate.spec
Log:
- rework logrotate from Fedora


Modified: tinysofa/snapshot/logrotate/current/specs/logrotate.spec
===================================================================
--- tinysofa/snapshot/logrotate/current/specs/logrotate.spec	2004-06-23 14:38:21 UTC (rev 2078)
+++ tinysofa/snapshot/logrotate/current/specs/logrotate.spec	2004-06-23 14:49:39 UTC (rev 2079)
@@ -1,14 +1,17 @@
+%if %{?with_selinux:0}%{!?with_selinux:1}
+%define with_selinux 0
+%endif
+
 Summary: Rotates, compresses, removes and mails system log files.
 Name: logrotate
 Version: 3.7
-Release: 6ts
+Release: 7jh
 License: GPL
-Group: tinysofa official
+Group: tinysofa/main
 Source: ftp://ftp.redhat.com/pub/redhat/code/logrotate/logrotate-%{version}.tar.gz
 Source1: logrotate.conf
 Patch0: logrotate-3.7-compressowner.patch
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: mailx
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 The logrotate utility is designed to simplify the administration of
@@ -21,39 +24,47 @@
 Install the logrotate package if you need a utility to deal with the log
 files on your system.
 
+
 %prep
 %setup -q
 %patch0 -p1
 
+
 %build
-%if %{use_selinux}
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes
-%else
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+%make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" \
+%if %{with_selinux}
+	WITH_SELINUX=yes
 %endif
 
+
 %install
-make PREFIX=$RPM_BUILD_ROOT MANDIR=/usr/share/man install
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
-mkdir -p $RPM_BUILD_ROOT/var/lib
+make PREFIX=%{buildroot} MANDIR=%{_mandir} install
 
-install -m 644 $RPM_SOURCE_DIR/logrotate.conf $RPM_BUILD_ROOT/etc/logrotate.conf
-install -m 755 examples/logrotate.cron $RPM_BUILD_ROOT/etc/cron.daily/logrotate
-touch $RPM_BUILD_ROOT/var/lib/logrotate.status
+%{__mkdir_p} \
+	%{buildroot}%{_sysconfdir}/logrotate.d \
+	%{buildroot}%{_sysconfdir}/cron.daily \
+	%{buildroot}%{_localstatedir}/lib
 
+install -m 644 $RPM_SOURCE_DIR/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.conf
+install -m 755 examples/logrotate.cron %{buildroot}%{_sysconfdir}/cron.daily/logrotate
+touch %{buildroot}%{_localstatedir}/lib/logrotate.status
+
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
-%attr(0755, root, root) /usr/sbin/logrotate
+%doc CHANGES
+%attr(0755, root, root) %{_sbindir}/logrotate
 %attr(0644, root, root) %{_mandir}/man8/logrotate.8*
-%attr(0755, root, root) /etc/cron.daily/logrotate
-%attr(0644, root, root) %config(noreplace) /etc/logrotate.conf
-%attr(0755, root, root) %dir /etc/logrotate.d
-%attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status
+%attr(0755, root, root) %{_sysconfdir}/cron.daily/logrotate
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/logrotate.conf
+%attr(0755, root, root) %dir %{_sysconfdir}/logrotate.d
+%attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
 
+
 %changelog
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 3.7-6ts
 - current (3.7-5ts) integrated as 3.7-6ts for release 1.0-U1


From svn at tinysofa.org  Wed Jun 23 15:10:04 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 01:10:04 +1000 (EST)
Subject: [tinysofa-svn] r2080 - tinysofa/snapshot/findutils/current/specs
Message-ID: <20040623151004.4FF894E8037@minbar.tinysofa.org>

Author: jh
Date: 2004-06-24 01:10:04 +1000 (Thu, 24 Jun 2004)
New Revision: 2080

Modified:
   tinysofa/snapshot/findutils/current/specs/findutils.spec
Log:
- rework findutils spec file


Modified: tinysofa/snapshot/findutils/current/specs/findutils.spec
===================================================================
--- tinysofa/snapshot/findutils/current/specs/findutils.spec	2004-06-23 14:49:39 UTC (rev 2079)
+++ tinysofa/snapshot/findutils/current/specs/findutils.spec	2004-06-23 15:10:04 UTC (rev 2080)
@@ -1,9 +1,9 @@
 Summary: The GNU versions of find utilities (find, xargs, and locate).
 Name: findutils
 Version: 4.1.20
-Release: 5ts
+Release: 6jh
 License: GPL
-Group: tinysofa official
+Group: tinysofa/main
 Source0: ftp://ftp.gnu.org/gnu/findutils/findutils-4.1.20.tar.gz
 Source1: updatedb.cron
 Source2: findutils-4.1.20-selinux.patch
@@ -11,9 +11,9 @@
 Patch2: findutils-4.1-getshort.patch
 Patch3: findutils-4.1.20-xargs_help_cr.patch
 Patch4: findutils-4.1.20-i.patch
-Prereq: htmlinfo
-BuildRequires: texinfo autoconf automake gettext
-BuildRoot: %{_tmppath}/%{name}-root
+%info_requires
+BuildRequires: autoconf automake gettext
+BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
 %description
 The findutils package contains programs which will help you locate
@@ -26,52 +26,45 @@
 You should install findutils because it includes tools that are very
 useful for finding things on your system.
 
+
 %prep
 %setup -q
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%if %{use_selinux}
+%if %{with_selinux}
 patch -p1 -i %{SOURCE2}
 %endif
 
+
 %build
 aclocal
 autoconf
 
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure \
-    --prefix=%{_prefix} \
-    --exec-prefix=%{_prefix} \
-    --disable-nls
-make
-cd doc
-makeinfo --html --no-split find.texi
+%configure --disable-nls
+%make
 
+
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/share/html/find
-make prefix=${RPM_BUILD_ROOT}%{_prefix} exec_prefix=${RPM_BUILD_ROOT}%{_prefix} install
-install -m644 doc/find.html $RPM_BUILD_ROOT%{_prefix}/share/html/find/
+%makeinstall
 
-{ cd $RPM_BUILD_ROOT
-  mkdir -p ./usr/share/man
-  mv ./usr/man/* ./usr/share/man
-  strip .%{_prefix}/bin/* || :
-}
+%install_info -n find doc/find.texi
+%nuke_info
 
-rm -rf $RPM_BUILD_ROOT/usr/info
 
 %post
-/usr/sbin/htmlinfo_update.sh
+%info_post
 
 %postun
-/usr/sbin/htmlinfo_update.sh
+%info_postun
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %doc NEWS README
@@ -83,7 +76,7 @@
 %{_mandir}/man1/find.1*
 %{_mandir}/man1/xargs.1*
 %{_mandir}/man5/locatedb.5*
-%{_datadir}/html/find
+%{_htmldir}/find
 
 # slocate wins! 
 %exclude %{_bindir}/locate
@@ -91,6 +84,7 @@
 %exclude %{_mandir}/man1/locate.1*
 %exclude %{_mandir}/man1/updatedb.1*
 
+
 %changelog
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.1.20-5ts
 - current (4.1.20-4ts) integrated as 4.1.20-5ts for release 1.0-U1
@@ -198,4 +192,4 @@
 - built with glibc
 
 * Mon Apr 21 1997 Michael K. Johnson <johnsonm at redhat.com>
-- fixed updatedb.cron
\ No newline at end of file
+- fixed updatedb.cron


From svn at tinysofa.org  Wed Jun 23 18:06:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 04:06:34 +1000 (EST)
Subject: [tinysofa-svn] 
	r2081 - in tinysofa/snapshot/file/current: sources specs
Message-ID: <20040623180634.B3D6F4E8037@minbar.tinysofa.org>

Author: jh
Date: 2004-06-24 04:06:34 +1000 (Thu, 24 Jun 2004)
New Revision: 2081

Added:
   tinysofa/snapshot/file/current/sources/file-4.02-zlib.patch
   tinysofa/snapshot/file/current/sources/file-selinux.patch
Modified:
   tinysofa/snapshot/file/current/specs/file.spec
Log:
- integrate patches from Fedora
- integrate spec file changes from Fedora


Added: tinysofa/snapshot/file/current/sources/file-4.02-zlib.patch
===================================================================
--- tinysofa/snapshot/file/current/sources/file-4.02-zlib.patch	2004-06-23 15:10:04 UTC (rev 2080)
+++ tinysofa/snapshot/file/current/sources/file-4.02-zlib.patch	2004-06-23 18:06:34 UTC (rev 2081)
@@ -0,0 +1,10 @@
+--- file-4.02/src/compress.c.zlib	2003-10-09 09:21:50.133068933 -0400
++++ file-4.02/src/compress.c	2003-10-09 09:22:05.259529599 -0400
+@@ -50,7 +50,6 @@
+ #ifdef HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+ #endif
+-#undef HAVE_LIBZ
+ #ifdef HAVE_LIBZ
+ #include <zlib.h>
+ #endif

Added: tinysofa/snapshot/file/current/sources/file-selinux.patch
===================================================================
--- tinysofa/snapshot/file/current/sources/file-selinux.patch	2004-06-23 15:10:04 UTC (rev 2080)
+++ tinysofa/snapshot/file/current/sources/file-selinux.patch	2004-06-23 18:06:34 UTC (rev 2081)
@@ -0,0 +1,19 @@
+--- file-4.02/magic/Magdir/policy.selinux	2003-08-28 14:36:54.000000000 -0400
++++ file-4.02/magic/Magdir/policy	2003-08-28 14:39:35.000000000 -0400
+@@ -0,0 +1,6 @@
++# SE Linux policy database
++0       lelong  0xf97cff8c      SE Linux policy
++>16     lelong  x               v%d
++>20     lelong  1 		MLS
++>24     lelong  x       	%d symbols
++>28     lelong  x       	%d ocons
+--- file-4.02/magic/Makefile.am.selinux	2003-08-28 14:41:58.000000000 -0400
++++ file-4.02/magic/Makefile.am	2003-08-28 14:45:15.000000000 -0400
+@@ -135,6 +135,7 @@
+ Magdir/pgp \
+ Magdir/pkgadd \
+ Magdir/plus5 \
++Magdir/policy \
+ Magdir/printer \
+ Magdir/project \
+ Magdir/psdbms \

Modified: tinysofa/snapshot/file/current/specs/file.spec
===================================================================
--- tinysofa/snapshot/file/current/specs/file.spec	2004-06-23 15:10:04 UTC (rev 2080)
+++ tinysofa/snapshot/file/current/specs/file.spec	2004-06-23 18:06:34 UTC (rev 2081)
@@ -1,11 +1,15 @@
+%define __libtoolize :
+
 Summary: A utility for determining file types.
 Name: file
 Version: 4.09
-Release: 2ts
+Release: 3jh
 License: distributable
-Group: tinysofa official
-Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
+Group: tinysofa/main
+Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
+Patch0: file-4.02-zlib.patch
+Patch1: file-selinux.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 The file command is used to identify a particular file according to the
@@ -18,8 +22,9 @@
 
 %package devel
 Summary: Development libraries for interface to the file(1) command
-Group: tinysofa official
-
+Group: tinysofa/development
+Requires: %{name}-%{version}
+                                                                                
 %description devel
 This package contains the development libraries for interface to the
 file(1) command.
@@ -27,88 +32,197 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .zlib
+%if use_selinux
+%patch1 -p1 -b .selinux
+%endif
 
 %build
+CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \
 %configure --enable-fsect-man5
-make
+%make
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/bin
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,3,5}
+%{__mkdir_p} \
+	%{buildroot}%{_bindir} \
+	%{buildroot}%{_mandir}/man1 \
+	%{buildroot}%{_mandir}/man3 \
+	%{buildroot}%{_mandir}/man5 \
+	%{buildroot}%{_datadir}/misc
 
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
+ln -s file/magic %{buildroot}%{_datadir}/magic
+ln -s file/magic.mime %{buildroot}%{_datadir}/magic.mime
 
+ln -s ../magic %{buildroot}%{_datadir}/misc/magic 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc LEGAL.NOTICE README
-%{_mandir}/man1/*
-%{_mandir}/man5/*
-%{_prefix}/bin/file
-%{_prefix}/lib/*.so.*
-%{_prefix}/share/file
+%{_bindir}/*
+%{_datadir}/magic*
+%{_datadir}/file/*
+%{_datadir}/misc/*
+%{_mandir}/man[15]/*
+%{_libdir}/libmagic.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_mandir}/man3/*
-%{_prefix}/include/magic.h
-%{_prefix}/lib/*.a
-%{_prefix}/lib/*.la
-%{_prefix}/lib/*.so
+%{_includedir}/magic.h
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_libdir}/*.so
 
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.09-2ts
-- current (4.09-1ts) integrated as 4.09-2ts for release 1.0-U1
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Thu Apr 08 2004 Omar Kilani <omar at tinysofa dot org> 4.09-1ts
-- New upstream.
+* Mon May 10 2004 Jakub Jelinek <jakub at redhat.com>
+- fix ELF note handling (#109495)
 
-* Thu Mar 25 2004 Omar Kilani <omar at tinysofa dot org> 4.08-1ts
-- New upstream.
+* Tue Mar 23 2004 Karsten Hopp <karsten at redhat.de> 4.07-3 
+- add docs (#115966)
 
-* Sat Feb  7 2004 Omar Kilani <ok at trustix dot org> 4.07-1ok
-- New upstream.
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Fri Dec  5 2003 Erlend Midttun <erlendbm at trustix dot org> 4.06-1tr
-- New upstream.
-- New devel package.
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 3.41-4tr
-- Big rebuild
+* Sun Jan 18 2004 Jeff Johnson <jbj at jbj.org> 4.07-1
+- upgrade to 4.07.
+- deal gracefully with unreadable files (#113207).
+- detect PO files (from Debian).
 
-* Thu Jun  5 2003 Erlend Midttun <erlendbm at trustix dot com> 3.41-3em
-- Now own just the man pages, and not the directories.
+* Tue Dec 16 2003 Jeff Johnson <jbj at jbj.org> 4.06-1
+- upgrade to file-4.06.
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 3.41-2em
-- Rebuilt against glibc 2.3.2.
+* Mon Nov 10 2003 Tim Waugh <twaugh at redhat.com> 4.02-4
+- Minimal fix for busy loop problem (bug #109495).
 
-* Wed Mar 19 2003 Erlend Midttun <erlendbm at trustix dot com> 3.41-1em
-- Upgrade to 3.41 to fix sec hole.
+* Mon Oct 13 2003 Jeff Johnson <jbj at jbj.org> 4.05-1
+- upgrade to 4.05.
 
-* Tue Aug  6 2002 Christian H. Toldnes <christht at trustix dot com> 3.37-1ct
-- Cleanup for tsl 2.0
-- Added LFS
-- Update to 3.37
+* Thu Oct  9 2003 Jeff Johnson <jbj at jbj.org> 4.02-3
+- use zlib rather than exec'ing gzip.
 
-* Wed Jun 13 2001 Oystein Viggen <oysteivi at trustix dot com>
-- Include extra magic files in /usr/share
+-* Thu Aug 28 2003 Dan Walsh <dwalsh at redhat.com>
+-- Add Selinux support.
 
-* Fri Jun  1 2001 Oystein Viggen <oysteivi at trustix dot com>
-- New upstream version: 3.35
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Mar  5 2001 Alexander Reelsen <ar at trustix dot com>
-- Picked up 3.33
+* Sat May 24 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- add ldconfig to post/postun
 
-* Fri Sep 15 2000 Oystein Viggen <oysteivi at trustix dot com>
-- Upgraded to version 3.32
-- removed some stale patches
+* Mon Apr 21 2003 Jeff Johnson <jbj at redhat.com> 4.02-1
+- upgrade to file-4.02.
 
-* Wed Feb  2 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Moved man pages
+* Thu Feb 27 2003 Jeff Johnson <jbj at redhat.com> 3.39-9
+- check size read from elf header (#85297).
 
+* Tue Feb 18 2003 Matt Wilson <msw at redhat.com> 3.39-8
+- add FHS compatibility symlink from /usr/share/misc/magic -> ../magic
+  (#84509)
+
+* Fri Feb 14 2003 Jeff Johnson <jbj at redhat.com> 3.39-7
+- the "real" fix to the vorbis/ogg magic details (#82810).
+
+* Mon Jan 27 2003 Jeff Johnson <jbj at redhat.com> 3.39-6
+- avoid vorbis/ogg magic details (#82810).
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com> 3.39-5
+- rebuilt
+
+* Sun Jan 12 2003 Nalin Dahyabhai <nalin at redhat.com> 3.39-4
+- PT_NOTE, take 3
+
+* Fri Jan 10 2003 Nalin Dahyabhai <nalin at redhat.com> 3.39-3
+- don't barf in ELF headers with align = 0
+
+* Tue Jan  7 2003 Nalin Dahyabhai <nalin at redhat.com> 3.39-2
+- don't get lost when looking at PT_NOTE sections
+
+* Sat Oct 26 2002 Jeff Johnson <jbj at redhat.com> 3.39-1
+- update to 3.39.
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon May  6 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.37-6
+- Don't use an old magic.mime 
+- Add mng detection (#64229)
+
+* Tue Feb 26 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.37-5
+- Rebuild
+
+* Mon Jan 14 2002 Trond Eivind Glomsr?d <teg at redhat.com> 3.37-4
+- Fix missing include of <stdint.h> (#58209)
+
+* Tue Dec 11 2001 Trond Eivind Glomsr?d <teg at redhat.com> 3.37-2
+- Add CFLAGS to handle large files (#53576)
+
+* Mon Dec 10 2001 Trond Eivind Glomsr?d <teg at redhat.com> 3.37-1
+- 3.37
+- s/Copyright/License/
+- build with --enable-fsect-man5, drop patch
+- disable two old patches
+
+* Fri Jul 06 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- revert a patch to Magdir/elf, which breaks many libtool scripts
+  in several rpm packages
+
+* Mon Jun 25 2001 Crutcher Dunnavant <crutcher at redhat.com>
+- iterate to 3.35
+
+* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
+- Bump release + rebuild.
+
+* Sun Nov 26 2000 Jeff Johnson <jbj at redhat.com>
+- update to 3.33.
+
+* Mon Aug 14 2000 Preston Brown <pbrown at redhat.com>
+- Bill made the patch but didn't apply it. :)
+
+* Mon Aug 14 2000 Bill Nottingham <notting at redhat.com>
+- 'ASCII text', not 'ASCII test' (#16168)
+
+* Mon Jul 31 2000 Jeff Johnson <jbj at redhat.com>
+- fix off-by-1 error when creating filename for use with -i.
+- include a copy of GNOME /etc/mime-types in %{_datadir}/magic.mime (#14741).
+
+* Sat Jul 22 2000 Jeff Johnson <jbj at redhat.com>
+- install magic as man5/magic.5 with other formats (#11172).
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Wed Jun 14 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging.
+
+* Tue Apr 14 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 3.30
+
+* Wed Feb 16 2000 Cristian Gafton <gafton at redhat.com>
+- add ia64 patch from rth
+
+* Mon Feb  7 2000 Bill Nottingham <notting at redhat.com>
+- handle compressed manpages
+- update to 3.28
+
 * Mon Aug 23 1999 Jeff Johnson <jbj at redhat.com>
 - identify ELF stripped files correctly (#4665).
 - use SPARC (not sparc) consistently throughout (#4665).
@@ -153,4 +267,4 @@
 - Fixed problems caused by 64 bit time_t.
 
 * Thu Mar 06 1997 Michael K. Johnson <johnsonm at redhat.com>
-- Improved recognition of Linux kernel images.
\ No newline at end of file
+- Improved recognition of Linux kernel images.


From svn at tinysofa.org  Wed Jun 23 18:42:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 04:42:55 +1000 (EST)
Subject: [tinysofa-svn] 
	r2082 - in tinysofa/snapshot/rp-pppoe/current: sources specs
Message-ID: <20040623184255.9B5A64E8037@minbar.tinysofa.org>

Author: jh
Date: 2004-06-24 04:42:55 +1000 (Thu, 24 Jun 2004)
New Revision: 2082

Added:
   tinysofa/snapshot/rp-pppoe/current/sources/rp-pppoe-try-restart.patch
Modified:
   tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec
Log:
- use macros
- add try-restart target to init script


Added: tinysofa/snapshot/rp-pppoe/current/sources/rp-pppoe-try-restart.patch
===================================================================
--- tinysofa/snapshot/rp-pppoe/current/sources/rp-pppoe-try-restart.patch	2004-06-23 18:06:34 UTC (rev 2081)
+++ tinysofa/snapshot/rp-pppoe/current/sources/rp-pppoe-try-restart.patch	2004-06-23 18:42:55 UTC (rev 2082)
@@ -0,0 +1,24 @@
+diff -urN rp-pppoe-3.5.orig/scripts/adsl-init.in rp-pppoe-3.5/scripts/adsl-init.in
+--- rp-pppoe-3.5.orig/scripts/adsl-init.in	2002-07-08 17:38:24.000000000 +0300
++++ rp-pppoe-3.5/scripts/adsl-init.in	2004-06-23 21:31:28.000000000 +0300
+@@ -54,12 +54,19 @@
+ 	$0 start
+ 	;;
+ 
++    condrestart|try-restart)
++	if [ -f /var/lock/subsys/adsl ]; then
++		$0 stop
++		$0 start
++	fi
++	;;
++
+     status)
+ 	$STATUS
+ 	;;
+ 
+     *)
+-        echo "Usage: adsl {start|stop|restart|status}"
++        echo "Usage: adsl {start|stop|restart|status|try-restart}"
+         exit 1
+ esac
+ 

Modified: tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec
===================================================================
--- tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec	2004-06-23 18:06:34 UTC (rev 2081)
+++ tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec	2004-06-23 18:42:55 UTC (rev 2082)
@@ -1,16 +1,17 @@
 Summary: PPP Over Ethernet (xDSL support)
 Name: rp-pppoe
 Version: 3.5
-Release: 13ts
+Release: 14jh
 License: GPL
-Group: tinysofa official
+Group: tinysofa/extra
 Source: http://www.roaringpenguin.com/pppoe/%{name}-%{version}.tar.gz
 Url: http://www.roaringpenguin.com/pppoe/
 Patch1: %{name}-3.5-makefile.patch
-BuildRoot: %{_tmppath}/%{name}-root
+Patch2: rp-pppoe-try-restart.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: perl
 Requires: ppp >= 2.3.7
-PreReq: chkconfig /sbin/restart_maybe
+%service_requires
 
 %description
 PPPoE (Point-to-Point Protocol over Ethernet) is a protocol used by
@@ -21,10 +22,13 @@
 modifications. It is fully compliant with RFC 2516, the official PPPoE
 specification.
 
+
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
+
 %build
 perl -pi -e "s/^# chkconfig:.*$/# chkconfig: - 11 89/" scripts/adsl-init.in
 perl -pi -e "s/rc\.d\/init\.d/init.d/g" scripts/adsl-init.in
@@ -32,45 +36,43 @@
 perl -pi -e "s/^DNSTYPE=SERVER/DNSTYPE=NOCHANGE/" configs/pppoe.conf
 cd src
 %configure
-make
+%make
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 cd src
 %makeinstall docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %post
-# Create new system startup links
-chkconfig --add adsl
-/sbin/restart_maybe adsl
+%service_post adsl
 
 %preun
-if [ $1 = 0 ]; then
-  /etc/init.d/adsl stop >&2
-  chkconfig --del adsl
-fi
+%service_preun adsl
 
+%postun
+%service_postun adsl
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README
-%config(noreplace) /etc/ppp/pppoe.conf
-%config(noreplace) /etc/ppp/pppoe-server-options
-%config(noreplace) /etc/ppp/firewall-masq
-%config(noreplace) /etc/ppp/firewall-standalone
-/etc/ppp/plugins/*
-/usr/sbin/pppoe
-/usr/sbin/pppoe-server
-/usr/sbin/pppoe-sniff
-/usr/sbin/pppoe-relay
-/usr/sbin/adsl-connect
-/usr/sbin/adsl-start
-/usr/sbin/adsl-stop
-/usr/sbin/adsl-setup
-/usr/sbin/adsl-status
+%config(noreplace) %{_sysconfdir}/ppp/pppoe.conf
+%config(noreplace) %{_sysconfdir}/ppp/pppoe-server-options
+%config(noreplace) %{_sysconfdir}/ppp/firewall-masq
+%config(noreplace) %{_sysconfdir}/ppp/firewall-standalone
+%{_sysconfdir}/ppp/plugins/*
+%{_sbindir}/pppoe
+%{_sbindir}/pppoe-server
+%{_sbindir}/pppoe-sniff
+%{_sbindir}/pppoe-relay
+%{_sbindir}/adsl-connect
+%{_sbindir}/adsl-start
+%{_sbindir}/adsl-stop
+%{_sbindir}/adsl-setup
+%{_sbindir}/adsl-status
 %{_mandir}/man5/pppoe.conf.5*
 %{_mandir}/man8/pppoe.8*
 %{_mandir}/man8/pppoe-server.8*
@@ -81,9 +83,13 @@
 %{_mandir}/man8/adsl-stop.8*
 %{_mandir}/man8/adsl-status.8*
 %{_mandir}/man8/adsl-setup.8*
-/etc/init.d/adsl
+%{_initrddir}/adsl
 
 %changelog
+* Wed Jun 23 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.5-14jh
+- use macros
+- add try-restart target to init script
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 3.5-13ts
 - current (3.5-12ts) integrated as 3.5-13ts for release 1.0-U1
 


From svn at tinysofa.org  Wed Jun 23 19:52:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 05:52:16 +1000 (EST)
Subject: [tinysofa-svn] r2083 - contrib/aide
Message-ID: <20040623195216.689554E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 05:52:16 +1000 (Thu, 24 Jun 2004)
New Revision: 2083

Added:
   contrib/aide/current/
Log:
add current


Copied: contrib/aide/current (from rev 2082, contrib/aide/releases/0.10/1ok/sources)


From svn at tinysofa.org  Wed Jun 23 19:55:48 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 05:55:48 +1000 (EST)
Subject: [tinysofa-svn] r2084 - in contrib/aide: . current pristine
Message-ID: <20040623195548.A9E164E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 05:55:48 +1000 (Thu, 24 Jun 2004)
New Revision: 2084

Added:
   contrib/aide/current/sources/
   contrib/aide/current/specs/
   contrib/aide/pristine/
   contrib/aide/pristine/sources/
   contrib/aide/pristine/specs/
Removed:
   contrib/aide/current/aide-0.10.tar.gz
   contrib/aide/current/aide.extra-0.10.tar.bz2
   contrib/aide/pristine/aide-0.10.tar.gz
   contrib/aide/pristine/aide.extra-0.10.tar.bz2
Log:
cleaned up aide


Deleted: contrib/aide/current/aide-0.10.tar.gz
===================================================================
(Binary files differ)

Deleted: contrib/aide/current/aide.extra-0.10.tar.bz2
===================================================================
(Binary files differ)

Copied: contrib/aide/current/sources (from rev 2083, contrib/aide/releases/0.10/1ok/sources)

Copied: contrib/aide/current/specs (from rev 2083, contrib/aide/releases/0.10/1ok/specs)

Copied: contrib/aide/pristine (from rev 2083, contrib/aide/current)

Deleted: contrib/aide/pristine/aide-0.10.tar.gz
===================================================================
(Binary files differ)

Deleted: contrib/aide/pristine/aide.extra-0.10.tar.bz2
===================================================================
(Binary files differ)

Copied: contrib/aide/pristine/sources (from rev 2083, contrib/aide/releases/0.10/1ok/sources)

Copied: contrib/aide/pristine/specs (from rev 2083, contrib/aide/releases/0.10/1ok/specs)


From svn at tinysofa.org  Wed Jun 23 19:57:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 05:57:32 +1000 (EST)
Subject: [tinysofa-svn] r2085 - contrib/arc
Message-ID: <20040623195732.851624E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 05:57:32 +1000 (Thu, 24 Jun 2004)
New Revision: 2085

Added:
   contrib/arc/current/
Log:
tagged current


Copied: contrib/arc/current (from rev 2084, contrib/arc/releases/5.21j/1ok)


From svn at tinysofa.org  Wed Jun 23 19:57:58 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 05:57:58 +1000 (EST)
Subject: [tinysofa-svn] r2086 - contrib/arc
Message-ID: <20040623195758.E03D54E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 05:57:58 +1000 (Thu, 24 Jun 2004)
New Revision: 2086

Added:
   contrib/arc/pristine/
Log:
tagged pristine


Copied: contrib/arc/pristine (from rev 2085, contrib/arc/releases/5.21j/1ok)


From svn at tinysofa.org  Wed Jun 23 19:59:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 05:59:15 +1000 (EST)
Subject: [tinysofa-svn] r2087 - contrib/bittorrent
Message-ID: <20040623195915.58C954E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 05:59:15 +1000 (Thu, 24 Jun 2004)
New Revision: 2087

Added:
   contrib/bittorrent/current/
Log:
tagged current

Copied: contrib/bittorrent/current (from rev 2086, contrib/bittorrent/releases/3.4.2/1ok)


From svn at tinysofa.org  Wed Jun 23 19:59:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 05:59:25 +1000 (EST)
Subject: [tinysofa-svn] r2088 - contrib/bittorrent
Message-ID: <20040623195925.7D6354E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 05:59:25 +1000 (Thu, 24 Jun 2004)
New Revision: 2088

Added:
   contrib/bittorrent/pristine/
Log:
tagged current

Copied: contrib/bittorrent/pristine (from rev 2087, contrib/bittorrent/releases/3.4.2/1ok)


From svn at tinysofa.org  Wed Jun 23 20:00:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:00:35 +1000 (EST)
Subject: [tinysofa-svn] r2089 - contrib/ccache
Message-ID: <20040623200035.3CC424E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:00:35 +1000 (Thu, 24 Jun 2004)
New Revision: 2089

Added:
   contrib/ccache/current/
Log:
tagged current

Copied: contrib/ccache/current (from rev 2088, contrib/ccache/releases/2.3/1ok)


From svn at tinysofa.org  Wed Jun 23 20:01:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:01:00 +1000 (EST)
Subject: [tinysofa-svn] r2090 - contrib/ccache
Message-ID: <20040623200100.5F4E44E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:01:00 +1000 (Thu, 24 Jun 2004)
New Revision: 2090

Added:
   contrib/ccache/pristine/
Log:
tagged pristine

Copied: contrib/ccache/pristine (from rev 2089, contrib/ccache/releases/2.3/1ok)


From svn at tinysofa.org  Wed Jun 23 20:03:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:03:35 +1000 (EST)
Subject: [tinysofa-svn] r2091 - contrib/dtach
Message-ID: <20040623200335.583D64E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:03:35 +1000 (Thu, 24 Jun 2004)
New Revision: 2091

Added:
   contrib/dtach/pristine/
Log:
tagged pristine

Copied: contrib/dtach/pristine (from rev 2090, contrib/dtach/releases/0.5/1jh)


From svn at tinysofa.org  Wed Jun 23 20:04:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:04:20 +1000 (EST)
Subject: [tinysofa-svn] r2092 - contrib/dtach
Message-ID: <20040623200420.B05634E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:04:20 +1000 (Thu, 24 Jun 2004)
New Revision: 2092

Added:
   contrib/dtach/current/
Log:
tagged current

Copied: contrib/dtach/current (from rev 2091, contrib/dtach/releases/0.5/1jh)


From svn at tinysofa.org  Wed Jun 23 20:07:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:07:10 +1000 (EST)
Subject: [tinysofa-svn] r2093 - contrib/fontconfig
Message-ID: <20040623200710.55CC44E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:07:10 +1000 (Thu, 24 Jun 2004)
New Revision: 2093

Added:
   contrib/fontconfig/current/
Log:
tagged current

Copied: contrib/fontconfig/current (from rev 2092, contrib/fontconfig/releases/2.2.1/1ok)


From svn at tinysofa.org  Wed Jun 23 20:07:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:07:35 +1000 (EST)
Subject: [tinysofa-svn] r2094 - contrib/fontconfig
Message-ID: <20040623200735.52DE84E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:07:35 +1000 (Thu, 24 Jun 2004)
New Revision: 2094

Added:
   contrib/fontconfig/pristine/
Log:
tagged pristine

Copied: contrib/fontconfig/pristine (from rev 2093, contrib/fontconfig/releases/2.2.1/1ok)


From svn at tinysofa.org  Wed Jun 23 20:08:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:08:25 +1000 (EST)
Subject: [tinysofa-svn] r2095 - contrib/freetype
Message-ID: <20040623200825.53A054E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:08:25 +1000 (Thu, 24 Jun 2004)
New Revision: 2095

Added:
   contrib/freetype/pristine/
Log:
tagged pristine

Copied: contrib/freetype/pristine (from rev 2094, contrib/freetype/releases/2.1.7/1ok)


From svn at tinysofa.org  Wed Jun 23 20:08:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:08:45 +1000 (EST)
Subject: [tinysofa-svn] r2096 - contrib/freetype
Message-ID: <20040623200845.379A54E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:08:45 +1000 (Thu, 24 Jun 2004)
New Revision: 2096

Added:
   contrib/freetype/current/
Log:
tagged current

Copied: contrib/freetype/current (from rev 2095, contrib/freetype/releases/2.1.7/1ok)


From svn at tinysofa.org  Wed Jun 23 20:09:30 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:09:30 +1000 (EST)
Subject: [tinysofa-svn] r2097 - contrib/lha
Message-ID: <20040623200930.521404E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:09:30 +1000 (Thu, 24 Jun 2004)
New Revision: 2097

Added:
   contrib/lha/current/
Log:
tagged current

Copied: contrib/lha/current (from rev 2096, contrib/lha/releases/1.14i/1ok)


From svn at tinysofa.org  Wed Jun 23 20:10:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:10:10 +1000 (EST)
Subject: [tinysofa-svn] r2098 - contrib/lha
Message-ID: <20040623201010.5AFA24E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:10:10 +1000 (Thu, 24 Jun 2004)
New Revision: 2098

Added:
   contrib/lha/pristine/
Log:
tagged pristine

Copied: contrib/lha/pristine (from rev 2097, contrib/lha/releases/1.14i/1ok)


From svn at tinysofa.org  Wed Jun 23 20:11:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:11:00 +1000 (EST)
Subject: [tinysofa-svn] r2099 - contrib/librsync
Message-ID: <20040623201100.356B04E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:11:00 +1000 (Thu, 24 Jun 2004)
New Revision: 2099

Added:
   contrib/librsync/pristine/
Log:
tagged pristine

Copied: contrib/librsync/pristine (from rev 2098, contrib/librsync/releases/0.9.6/3jh)


From svn at tinysofa.org  Wed Jun 23 20:11:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:11:40 +1000 (EST)
Subject: [tinysofa-svn] r2100 - contrib/librsync
Message-ID: <20040623201140.503424E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:11:40 +1000 (Thu, 24 Jun 2004)
New Revision: 2100

Added:
   contrib/librsync/current/
Log:
tagged current

Copied: contrib/librsync/current (from rev 2099, contrib/librsync/releases/0.9.6/3jh)


From svn at tinysofa.org  Wed Jun 23 20:24:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:24:55 +1000 (EST)
Subject: [tinysofa-svn] r2101 - contrib/lzo
Message-ID: <20040623202455.51DEA4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:24:55 +1000 (Thu, 24 Jun 2004)
New Revision: 2101

Added:
   contrib/lzo/current/
Log:
tagged current

Copied: contrib/lzo/current (from rev 2100, contrib/lzo/releases/1.08/1ok)


From svn at tinysofa.org  Wed Jun 23 20:25:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:25:05 +1000 (EST)
Subject: [tinysofa-svn] r2102 - contrib/lzo
Message-ID: <20040623202505.34CC44E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:25:05 +1000 (Thu, 24 Jun 2004)
New Revision: 2102

Added:
   contrib/lzo/pristine/
Log:
tagged pristine

Copied: contrib/lzo/pristine (from rev 2101, contrib/lzo/releases/1.08/1ok)


From svn at tinysofa.org  Wed Jun 23 20:25:30 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:25:30 +1000 (EST)
Subject: [tinysofa-svn] r2103 - contrib/dovecot
Message-ID: <20040623202530.45EFF4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:25:30 +1000 (Thu, 24 Jun 2004)
New Revision: 2103

Added:
   contrib/dovecot/pristine/
Log:
tagged pristine

Copied: contrib/dovecot/pristine (from rev 2102, contrib/dovecot/current)


From svn at tinysofa.org  Wed Jun 23 20:28:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:28:00 +1000 (EST)
Subject: [tinysofa-svn] r2104 - contrib/lzop
Message-ID: <20040623202800.2D30E4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:27:59 +1000 (Thu, 24 Jun 2004)
New Revision: 2104

Added:
   contrib/lzop/current/
Log:
tagged current

Copied: contrib/lzop/current (from rev 2103, contrib/lzop/releases/1.01/1ok)


From svn at tinysofa.org  Wed Jun 23 20:28:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:28:10 +1000 (EST)
Subject: [tinysofa-svn] r2105 - contrib/lzop
Message-ID: <20040623202810.165804E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:28:09 +1000 (Thu, 24 Jun 2004)
New Revision: 2105

Added:
   contrib/lzop/pristine/
Log:
tagged pristine

Copied: contrib/lzop/pristine (from rev 2104, contrib/lzop/releases/1.01/1ok)


From svn at tinysofa.org  Wed Jun 23 20:28:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:28:25 +1000 (EST)
Subject: [tinysofa-svn] r2106 - contrib/mhash
Message-ID: <20040623202825.351E04E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:28:25 +1000 (Thu, 24 Jun 2004)
New Revision: 2106

Added:
   contrib/mhash/current/
Log:
tagged current

Copied: contrib/mhash/current (from rev 2105, contrib/mhash/releases/0.9.1/1ok)


From svn at tinysofa.org  Wed Jun 23 20:28:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:28:35 +1000 (EST)
Subject: [tinysofa-svn] r2107 - contrib/mhash
Message-ID: <20040623202835.323634E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:28:35 +1000 (Thu, 24 Jun 2004)
New Revision: 2107

Added:
   contrib/mhash/pristine/
Log:
tagged pristine

Copied: contrib/mhash/pristine (from rev 2106, contrib/mhash/releases/0.9.1/1ok)


From svn at tinysofa.org  Wed Jun 23 20:28:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:28:45 +1000 (EST)
Subject: [tinysofa-svn] r2108 - contrib/smartmontools
Message-ID: <20040623202845.EF01A4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:28:45 +1000 (Thu, 24 Jun 2004)
New Revision: 2108

Added:
   contrib/smartmontools/current/
Log:
tagged current

Copied: contrib/smartmontools/current (from rev 2107, contrib/smartmontools/releases/5.31/1jh)


From svn at tinysofa.org  Wed Jun 23 20:28:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:28:55 +1000 (EST)
Subject: [tinysofa-svn] r2109 - contrib/smartmontools
Message-ID: <20040623202855.4B7534E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:28:55 +1000 (Thu, 24 Jun 2004)
New Revision: 2109

Added:
   contrib/smartmontools/pristine/
Log:
tagged pristine

Copied: contrib/smartmontools/pristine (from rev 2108, contrib/smartmontools/releases/5.31/1jh)


From svn at tinysofa.org  Wed Jun 23 20:29:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:29:10 +1000 (EST)
Subject: [tinysofa-svn] r2110 - contrib/sqlite
Message-ID: <20040623202910.2A7B84E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:29:09 +1000 (Thu, 24 Jun 2004)
New Revision: 2110

Added:
   contrib/sqlite/current/
Log:
tagged current

Copied: contrib/sqlite/current (from rev 2109, contrib/sqlite/releases/2.8.13/3ok)


From svn at tinysofa.org  Wed Jun 23 20:29:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:29:15 +1000 (EST)
Subject: [tinysofa-svn] r2111 - contrib/sqlite
Message-ID: <20040623202915.344064E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:29:15 +1000 (Thu, 24 Jun 2004)
New Revision: 2111

Added:
   contrib/sqlite/pristine/
Log:
tagged pristine

Copied: contrib/sqlite/pristine (from rev 2110, contrib/sqlite/releases/2.8.13/3ok)


From svn at tinysofa.org  Wed Jun 23 20:29:30 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:29:30 +1000 (EST)
Subject: [tinysofa-svn] r2112 - contrib/star
Message-ID: <20040623202930.442AB4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:29:30 +1000 (Thu, 24 Jun 2004)
New Revision: 2112

Added:
   contrib/star/current/
Log:
tagged current

Copied: contrib/star/current (from rev 2111, contrib/star/releases/1.5a40/1jh)


From svn at tinysofa.org  Wed Jun 23 20:29:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:29:40 +1000 (EST)
Subject: [tinysofa-svn] r2113 - contrib/star
Message-ID: <20040623202940.4BAD34E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:29:40 +1000 (Thu, 24 Jun 2004)
New Revision: 2113

Added:
   contrib/star/pristine/
Log:
tagged pristine

Copied: contrib/star/pristine (from rev 2112, contrib/star/releases/1.5a40/1jh)


From svn at tinysofa.org  Wed Jun 23 20:29:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:29:55 +1000 (EST)
Subject: [tinysofa-svn] r2114 - contrib/symlinks
Message-ID: <20040623202955.296D64E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:29:54 +1000 (Thu, 24 Jun 2004)
New Revision: 2114

Added:
   contrib/symlinks/current/
Log:
tagged current

Copied: contrib/symlinks/current (from rev 2113, contrib/symlinks/releases/1.2/1ok)


From svn at tinysofa.org  Wed Jun 23 20:30:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:30:05 +1000 (EST)
Subject: [tinysofa-svn] r2115 - contrib/symlinks
Message-ID: <20040623203005.374784E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:30:05 +1000 (Thu, 24 Jun 2004)
New Revision: 2115

Added:
   contrib/symlinks/pristine/
Log:
tagged pristine

Copied: contrib/symlinks/pristine (from rev 2114, contrib/symlinks/releases/1.2/1ok)


From svn at tinysofa.org  Wed Jun 23 20:30:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:30:15 +1000 (EST)
Subject: [tinysofa-svn] r2116 - contrib/tcl
Message-ID: <20040623203015.D8EC04E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:30:15 +1000 (Thu, 24 Jun 2004)
New Revision: 2116

Added:
   contrib/tcl/current/
Log:
tagged current

Copied: contrib/tcl/current (from rev 2115, contrib/tcl/releases/8.4.6/2ok)


From svn at tinysofa.org  Wed Jun 23 20:30:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:30:25 +1000 (EST)
Subject: [tinysofa-svn] r2117 - contrib/tcl
Message-ID: <20040623203025.44A504E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:30:25 +1000 (Thu, 24 Jun 2004)
New Revision: 2117

Added:
   contrib/tcl/pristine/
Log:
tagged pristine

Copied: contrib/tcl/pristine (from rev 2116, contrib/tcl/releases/8.4.6/2ok)


From svn at tinysofa.org  Wed Jun 23 20:30:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:30:45 +1000 (EST)
Subject: [tinysofa-svn] r2118 - contrib/unace
Message-ID: <20040623203045.437534E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:30:45 +1000 (Thu, 24 Jun 2004)
New Revision: 2118

Added:
   contrib/unace/current/
Log:
tagged current

Copied: contrib/unace/current (from rev 2117, contrib/unace/releases/2.5/1ok)


From svn at tinysofa.org  Wed Jun 23 20:30:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:30:55 +1000 (EST)
Subject: [tinysofa-svn] r2119 - contrib/unace
Message-ID: <20040623203055.2E8464E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:30:55 +1000 (Thu, 24 Jun 2004)
New Revision: 2119

Added:
   contrib/unace/pristine/
Log:
tagged pristine

Copied: contrib/unace/pristine (from rev 2118, contrib/unace/releases/2.5/1ok)


From svn at tinysofa.org  Wed Jun 23 20:31:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:31:15 +1000 (EST)
Subject: [tinysofa-svn] r2120 - contrib/unarj
Message-ID: <20040623203115.422CD4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:31:15 +1000 (Thu, 24 Jun 2004)
New Revision: 2120

Added:
   contrib/unarj/current/
Log:
tagged current

Copied: contrib/unarj/current (from rev 2119, contrib/unarj/releases/2.65/1ok)


From svn at tinysofa.org  Wed Jun 23 20:31:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:31:25 +1000 (EST)
Subject: [tinysofa-svn] r2121 - contrib/unarj
Message-ID: <20040623203125.42C484E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:31:25 +1000 (Thu, 24 Jun 2004)
New Revision: 2121

Added:
   contrib/unarj/pristine/
Log:
tagged pristine

Copied: contrib/unarj/pristine (from rev 2120, contrib/unarj/releases/2.65/1ok)


From svn at tinysofa.org  Wed Jun 23 20:31:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:31:45 +1000 (EST)
Subject: [tinysofa-svn] r2122 - contrib/unrar
Message-ID: <20040623203145.41ED64E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:31:45 +1000 (Thu, 24 Jun 2004)
New Revision: 2122

Added:
   contrib/unrar/current/
Log:
tagged current

Copied: contrib/unrar/current (from rev 2121, contrib/unrar/releases/3.3.6/1ok)


From svn at tinysofa.org  Wed Jun 23 20:31:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:31:55 +1000 (EST)
Subject: [tinysofa-svn] r2123 - contrib/unrar
Message-ID: <20040623203155.429C94E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:31:55 +1000 (Thu, 24 Jun 2004)
New Revision: 2123

Added:
   contrib/unrar/pristine/
Log:
tagged pristine

Copied: contrib/unrar/pristine (from rev 2122, contrib/unrar/releases/3.3.6/1ok)


From svn at tinysofa.org  Wed Jun 23 20:33:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:33:05 +1000 (EST)
Subject: [tinysofa-svn] r2124 - contrib/unzip
Message-ID: <20040623203305.483AE4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:33:05 +1000 (Thu, 24 Jun 2004)
New Revision: 2124

Added:
   contrib/unzip/pristine/
Log:
added pristine

Copied: contrib/unzip/pristine (from rev 2123, contrib/unzip/current)


From svn at tinysofa.org  Wed Jun 23 20:33:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:33:50 +1000 (EST)
Subject: [tinysofa-svn] r2125 - contrib/utempter
Message-ID: <20040623203350.47D764E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:33:50 +1000 (Thu, 24 Jun 2004)
New Revision: 2125

Added:
   contrib/utempter/current/
Log:
tagged current

Copied: contrib/utempter/current (from rev 2124, contrib/utempter/releases/0.5.5/1ok)


From svn at tinysofa.org  Wed Jun 23 20:34:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:34:00 +1000 (EST)
Subject: [tinysofa-svn] r2126 - contrib/utempter
Message-ID: <20040623203400.2C42A4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:33:59 +1000 (Thu, 24 Jun 2004)
New Revision: 2126

Added:
   contrib/utempter/pristine/
Log:
tagged pristine

Copied: contrib/utempter/pristine (from rev 2125, contrib/utempter/releases/0.5.5/1ok)


From svn at tinysofa.org  Wed Jun 23 20:34:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:34:50 +1000 (EST)
Subject: [tinysofa-svn] r2127 - contrib/zip
Message-ID: <20040623203450.4A0F34E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:34:50 +1000 (Thu, 24 Jun 2004)
New Revision: 2127

Added:
   contrib/zip/current/
Log:
tagged current

Copied: contrib/zip/current (from rev 2126, contrib/zip/releases/2.3/1ok)


From svn at tinysofa.org  Wed Jun 23 20:35:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:35:00 +1000 (EST)
Subject: [tinysofa-svn] r2128 - contrib/zip
Message-ID: <20040623203500.410264E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:35:00 +1000 (Thu, 24 Jun 2004)
New Revision: 2128

Added:
   contrib/zip/pristine/
Log:
tagged pristine

Copied: contrib/zip/pristine (from rev 2127, contrib/zip/releases/2.3/1ok)


From svn at tinysofa.org  Wed Jun 23 20:35:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:35:20 +1000 (EST)
Subject: [tinysofa-svn] r2129 - contrib/zisofs-tools
Message-ID: <20040623203520.097EA4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:35:19 +1000 (Thu, 24 Jun 2004)
New Revision: 2129

Added:
   contrib/zisofs-tools/current/
Log:
tagged current

Copied: contrib/zisofs-tools/current (from rev 2128, contrib/zisofs-tools/releases/1.0.4/1ok)


From svn at tinysofa.org  Wed Jun 23 20:35:30 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:35:30 +1000 (EST)
Subject: [tinysofa-svn] r2130 - contrib/zisofs-tools
Message-ID: <20040623203530.485314E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:35:30 +1000 (Thu, 24 Jun 2004)
New Revision: 2130

Added:
   contrib/zisofs-tools/pristine/
Log:
tagged pristine

Copied: contrib/zisofs-tools/pristine (from rev 2129, contrib/zisofs-tools/releases/1.0.4/1ok)


From svn at tinysofa.org  Wed Jun 23 20:36:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:36:00 +1000 (EST)
Subject: [tinysofa-svn] r2131 - contrib/zoo
Message-ID: <20040623203600.3FBEC4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:36:00 +1000 (Thu, 24 Jun 2004)
New Revision: 2131

Added:
   contrib/zoo/current/
Log:
tagged current

Copied: contrib/zoo/current (from rev 2130, contrib/zoo/releases/2.10/1ok)


From svn at tinysofa.org  Wed Jun 23 20:36:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 06:36:10 +1000 (EST)
Subject: [tinysofa-svn] r2132 - contrib/zoo
Message-ID: <20040623203610.37DCF4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 06:36:10 +1000 (Thu, 24 Jun 2004)
New Revision: 2132

Added:
   contrib/zoo/pristine/
Log:
tagged pristine

Copied: contrib/zoo/pristine (from rev 2131, contrib/zoo/releases/2.10/1ok)


From svn at tinysofa.org  Wed Jun 23 21:42:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 07:42:17 +1000 (EST)
Subject: [tinysofa-svn] r2133 - contrib/aide/current/specs
Message-ID: <20040623214217.E03374E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 07:42:17 +1000 (Thu, 24 Jun 2004)
New Revision: 2133

Modified:
   contrib/aide/current/specs/aide.spec
Log:
small specfile cleanups


Modified: contrib/aide/current/specs/aide.spec
===================================================================
--- contrib/aide/current/specs/aide.spec	2004-06-23 20:36:10 UTC (rev 2132)
+++ contrib/aide/current/specs/aide.spec	2004-06-23 21:42:17 UTC (rev 2133)
@@ -1,12 +1,12 @@
-Summary:  Advanced Intrusion Detection Environment
-Name:     aide
-Version:  0.10
-Release: 1ok
-License:  GPL
+Summary: Advanced Intrusion Detection Environment
+Name:    aide
+Version: 0.10
+Release: 2bg
+License: GPL
 Group: tinysofa contrib
-URL:      http://www.cs.tut.fi/~rammer/aide.html
-Source0:  %{name}-%{version}.tar.gz
-Source1:  %{name}.extra-0.10.tar.bz2
+URL:     http://www.cs.tut.fi/~rammer/aide.html
+Source0: %{name}-%{version}.tar.gz
+Source1: %{name}.extra-0.10.tar.bz2
 Requires: mhash
 BuildRequires: mhash-devel, zlib-devel
 BuildRequires: autoconf automake texinfo bison flex
@@ -38,6 +38,8 @@
 %setup -q -T -b 0
 %setup -q -T -D -a 1
 
+
+%build
 %configure --with-config_file=/etc/aide.conf \
            --with-gnu-regexp \
            --with-zlib \
@@ -49,28 +51,29 @@
 echo '#define DEFAULT_DB_OUT "/var/lib/aide/aide.db.new"' >> config.h.tmp
 mv -f config.h.tmp config.h
 
-%build
-CFLAGS="$RPM_OPT_FLAGS" make
+make
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}/etc/cron.daily
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5}
+[ -n "%buildroot" -a "%buildroot" != / ] && rm -rf %buildroot
+mkdir -p %{buildroot}/etc/cron.daily
+mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_mandir}/{man1,man5}
 
-make prefix=$RPM_BUILD_ROOT%{_prefix} \
-     bindir=${RPM_BUILD_ROOT}%{_sbindir} \
-     mandir=${RPM_BUILD_ROOT}%{_mandir} \
+make prefix=%buildroot%{_prefix} \
+     bindir=%{buildroot}%{_sbindir} \
+     mandir=%{buildroot}%{_mandir} \
      install-strip
 
-mkdir -p -m 700 ${RPM_BUILD_ROOT}/var/lib/aide
+mkdir -p -m 700 %{buildroot}/var/lib/aide
 
-install -m 700 ./extra/aide.check $RPM_BUILD_ROOT/etc/cron.daily
-install -m 700 ./extra/aide.conf $RPM_BUILD_ROOT/etc
+install -m 700 ./extra/aide.check %buildroot/etc/cron.daily
+install -m 700 ./extra/aide.conf %buildroot/etc
 
-chmod 700 $RPM_BUILD_ROOT/var/lib/aide
-chmod 700 $RPM_BUILD_ROOT/usr/sbin/*
+chmod 700 %buildroot/var/lib/aide
+chmod 700 %buildroot/usr/sbin/*
 
+
 %post
 cat << EOF
 *****************************************************
@@ -92,7 +95,7 @@
 EOF
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+[ -n "%buildroot" -a "%buildroot" != / ] && rm -rf %buildroot
 
 %files
 %defattr(-,root,root)
@@ -106,14 +109,18 @@
 %config(noreplace) %attr(0755,root,root) /etc/cron.daily/aide.check
 %config(noreplace) %attr(0400,root,root) /etc/aide.conf
 
+
 %changelog
+* Tue Jun 22 2004 Goetz Bock <bg at tinysofa dot org> 0.10-2bg
+- small specfile cleanups
+
 * Mon May  3 2004 Omar Kilani <omar at tinysofa dot org>
 - Rebuilt for tinysofa
 
 * Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
 - Rebuilt for TSL 2.1
 
-* Mon Dec 15 2003 Goetz Bock <bg at trustix dot org> 0.19-2bg
+* Mon Dec 15 2003 Goetz Bock <bg at trustix dot org> 0.10-2bg
 - rebuild for Contrib
 
 * Sun Dec 14 2003 Jeremy Miller <piranha at 602 dot org> 0.10-1jm


From svn at tinysofa.org  Wed Jun 23 21:43:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 07:43:24 +1000 (EST)
Subject: [tinysofa-svn] r2134 - contrib/aide
Message-ID: <20040623214324.4670A4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 07:43:24 +1000 (Thu, 24 Jun 2004)
New Revision: 2134

Removed:
   contrib/aide/pristine/
Log:
retag pristine, part1


From svn at tinysofa.org  Wed Jun 23 21:44:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 07:44:15 +1000 (EST)
Subject: [tinysofa-svn] r2135 - contrib/aide
Message-ID: <20040623214415.12FB14E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 07:44:14 +1000 (Thu, 24 Jun 2004)
New Revision: 2135

Added:
   contrib/aide/pristine/
Log:
retag pristine, part2

Copied: contrib/aide/pristine (from rev 2134, contrib/aide/current)


From svn at tinysofa.org  Wed Jun 23 21:45:11 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 07:45:11 +1000 (EST)
Subject: [tinysofa-svn] r2136 - contrib/aide/releases/0.10
Message-ID: <20040623214511.4BB354E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 07:45:11 +1000 (Thu, 24 Jun 2004)
New Revision: 2136

Added:
   contrib/aide/releases/0.10/2bg/
Log:
tag 0.10-2bg

Copied: contrib/aide/releases/0.10/2bg (from rev 2135, contrib/aide/current)


From svn at tinysofa.org  Wed Jun 23 21:48:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 07:48:22 +1000 (EST)
Subject: [tinysofa-svn] 
	r2137 - in contrib: . clamav clamav/current clamav/current/sources
	clamav/current/specs
Message-ID: <20040623214822.33D194E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 07:48:21 +1000 (Thu, 24 Jun 2004)
New Revision: 2137

Added:
   contrib/clamav/
   contrib/clamav/current/
   contrib/clamav/current/sources/
   contrib/clamav/current/sources/clamav-0.73.tar.gz
   contrib/clamav/current/sources/clamav.conf
   contrib/clamav/current/sources/clamd.logrotate
   contrib/clamav/current/sources/clamd.sh
   contrib/clamav/current/sources/freshclam.conf
   contrib/clamav/current/sources/freshclam.logrotate
   contrib/clamav/current/sources/freshclam.sh
   contrib/clamav/current/sources/freshclam.sysconfig
   contrib/clamav/current/specs/
   contrib/clamav/current/specs/clamav.spec
Log:
added aide 0.73-3bg

Added: contrib/clamav/current/sources/clamav-0.73.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/clamav/current/sources/clamav-0.73.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/clamav/current/sources/clamav.conf
===================================================================
--- contrib/clamav/current/sources/clamav.conf	2004-06-23 21:45:11 UTC (rev 2136)
+++ contrib/clamav/current/sources/clamav.conf	2004-06-23 21:48:21 UTC (rev 2137)
@@ -0,0 +1,231 @@
+##
+## Example config file for the Clam AV daemon
+## Please read the clamav.conf(5) manual before editing this file.
+##
+ 
+
+# Comment or remove the line below.
+#Example
+
+# Uncomment this option to enable logging.
+# LogFile must be writable for the user running the daemon.
+# Full path is required.
+LogFile /var/log/clamav/clamd.log
+
+# By default the log file is locked for writing - the lock protects against
+# running clamd multiple times (if want to run another clamd, please
+# copy the configuration file, change the LogFile variable, and run
+# the daemon with --config-file option). That's why you shouldn't uncomment
+# this option.
+#LogFileUnlock
+
+# Maximal size of the log file. Default is 1 Mb.
+# Value of 0 disables the limit.
+# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes)
+# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). To specify the size
+# in bytes just don't use modifiers.
+LogFileMaxSize 0
+
+# Log time with an each message.
+LogTime
+
+# Log also clean files. May be useful in debugging but will drastically
+# increase the log size.
+#LogClean
+
+# Use system logger (can work together with LogFile).
+LogSyslog
+
+# Specify the type of syslog messages - please refer to 'man syslog'
+# for facility names. Default is LOG_LOCAL6.
+#LogFacility LOG_MAIL
+
+# Enable verbose logging.
+#LogVerbose
+
+# This option allows you to save the process identifier of the listening
+# daemon (main thread).
+PidFile /var/run/clamav/clamd.pid
+
+# Optional path to the global temporary directory.
+# Default is system specific - usually /var/tmp or /tmp.
+#TemporaryDirectory /var/tmp
+
+# Path to the database directory.
+# Default is the hardcoded directory (mostly /usr/local/share/clamav,
+# but it depends on installation options).
+DataDirectory /var/lib/clamav
+ 
+# The daemon works in local or network mode. Currently the local mode is
+# recommended for security reasons.
+
+# Path to the local socket. The daemon doesn't change the mode of the
+# created file (portability reasons). You may want to create it in a directory
+# which is only accessible for a user running daemon.
+LocalSocket /var/run/clamav/clamd.sock
+
+# Remove stale socket after unclean shutdown.
+FixStaleSocket
+
+# TCP port address.
+#TCPSocket 3310
+
+# TCP address.
+# By default we bind to INADDR_ANY, probably not wise.
+# Enable the following to provide some degree of protection
+# from the outside world.
+#TCPAddr 127.0.0.1
+
+# Maximum length the queue of pending connections may grow to.
+# Default is 15.
+#MaxConnectionQueueLength 30
+
+# When activated, input stream (see STREAM command) will be saved to disk before
+# scanning - this allows scanning within archives.
+StreamSaveToDisk
+
+# Close the connection if this limit is exceeded.
+#StreamMaxLength 10M
+
+# Maximal number of a threads running at the same time.
+# Default is 5, and it should be sufficient for a typical workstation.
+# You may need to increase threads number for a server machine.
+MaxThreads 10
+
+# Thread (scanner - single task) will be stopped after this time (seconds).
+# Default is 180. Value of 0 disables the timeout. SECURITY HINT: Increase the
+# timeout instead of disabling it.
+#ThreadTimeout 500
+
+# Maximal depth the directories are scanned at.
+MaxDirectoryRecursion 15
+
+# Follow a directory symlinks.
+# SECURITY HINT: You should have enabled directory recursion limit to
+# avoid potential problems.
+#FollowDirectorySymlinks
+
+# Follow regular file symlinks.
+#FollowFileSymlinks
+
+# Do internal checks (eg. check the integrity of the database structures)
+# By default clamd checks itself every 3600 seconds (1 hour).
+#SelfCheck 600
+
+# Execute a command when virus is found. In the command string %v and %f will
+# be replaced by the virus name and the infected file name respectively.
+#
+# SECURITY WARNING: Make sure the virus event command cannot be exploited,
+#		    eg. by using some special file name when %f is used.
+#		    Always use a full path to the command.
+#		    Never delete/move files with this directive !
+#VirusEvent /usr/local/bin/send_sms 123456789 "VIRUS ALERT: %f: %v"
+
+# Run as selected user (clamd must be started by root).
+# By default it doesn't drop privileges.
+User amavis
+
+# Initialize the supplementary group access (for all groups in /etc/group
+# user is added in. clamd must be started by root).
+AllowSupplementaryGroups
+
+# Don't fork into background. Useful in debugging.
+#Foreground
+
+# Enable debug messages in libclamav.
+#Debug
+
+# Do not remove temporary files (for debug purposes).
+#LeaveTemporaryFiles
+
+##
+## Document scanning
+##
+
+# This option enables scanning of Microsoft Office document macros.
+ScanOLE2
+
+##
+## Mail support
+##
+
+# Uncomment this option if you are planning to scan mail files.
+ScanMail
+
+##
+## Archive support
+##
+
+
+# Comment this line to disable scanning of the archives.
+ScanArchive
+
+
+# By default the built-in RAR unpacker is disabled by default because the code
+# terribly leaks, however it's probably a good idea to enable it.
+#ScanRAR
+
+
+# Options below protect your system against Denial of Service attacks
+# with archive bombs.
+
+# Files in archives larger than this limit won't be scanned.
+# Value of 0 disables the limit.
+# WARNING: Due to the unrarlib implementation, whole files (one by one) in RAR
+#	   archives are decompressed to the memory. That's why never disable
+#	   this limit (but you may increase it of course!)
+ArchiveMaxFileSize 10M
+
+# Archives are scanned recursively - e.g. if Zip archive contains RAR file,
+# the RAR file will be decompressed, too (but only if recursion limit is set
+# at least to 1). With this option you may set the recursion level.
+# Value of 0 disables the limit.
+ArchiveMaxRecursion 5
+
+# Number of files to be scanned within archive.
+# Value of 0 disables the limit.
+ArchiveMaxFiles 1000
+
+# Mark potential archive bombs as viruses (0 disables the limit)
+ArchiveMaxCompressionRatio 200
+
+# Use slower decompression algorithm which uses less memory. This option 
+# affects bzip2 decompressor only.
+#ArchiveLimitMemoryUsage
+
+# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
+#ArchiveBlockEncrypted
+
+
+##
+## Clamuko settings
+## WARNING: This is experimental software. It is very likely it will hang
+##	    up your system !!!
+##
+
+# Enable Clamuko. Dazuko (/dev/dazuko) must be configured and running.
+#ClamukoScanOnAccess
+
+# Set access mask for Clamuko.
+ClamukoScanOnOpen
+ClamukoScanOnClose
+ClamukoScanOnExec
+
+# Set the include paths (all files in them will be scanned). You can have
+# multiple ClamukoIncludePath options, but each directory must be added
+# in a seperate option. All subdirectories are scanned, too.
+ClamukoIncludePath /home
+#ClamukoIncludePath /students
+
+# Set the exclude paths. All subdirectories are also excluded.
+#ClamukoExcludePath /home/guru
+
+# Limit the file size to be scanned (probably you don't want to scan your movie
+# files ;))
+# Value of 0 disables the limit. 1 Mb should be fine.
+ClamukoMaxFileSize 1M
+
+# Enable archive support. It uses the limits from clamd section.
+# (This option doesn't depend on ScanArchive, you can have archive support
+# in clamd disabled).
+ClamukoScanArchive

Added: contrib/clamav/current/sources/clamd.logrotate
===================================================================
--- contrib/clamav/current/sources/clamd.logrotate	2004-06-23 21:45:11 UTC (rev 2136)
+++ contrib/clamav/current/sources/clamd.logrotate	2004-06-23 21:48:21 UTC (rev 2137)
@@ -0,0 +1,13 @@
+#
+# Rotate Clam AV daemon log file
+#
+
+/var/log/clamav/clamd.log {
+    missingok
+    create 640 OWNER GROUP
+    notifempty
+    postrotate
+	/bin/kill -HUP `cat /var/run/clamav/clamd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}
+


Property changes on: contrib/clamav/current/sources/clamd.logrotate
___________________________________________________________________
Name: svn:executable
   + *

Added: contrib/clamav/current/sources/clamd.sh
===================================================================
--- contrib/clamav/current/sources/clamd.sh	2004-06-23 21:45:11 UTC (rev 2136)
+++ contrib/clamav/current/sources/clamd.sh	2004-06-23 21:48:21 UTC (rev 2137)
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# clamd		Script to start/stop clamd.
+#
+# chkconfig:	- 61 39
+# description:	clamd is an antivirus daemon.
+#
+# processname: clamd
+# config: /etc/clamav.conf
+# pidfile: /var/run/clamav/clamd.pid
+
+# Source function library
+. /etc/init.d/functions
+
+# Get network config
+. /etc/sysconfig/network
+
+test -f /etc/clamav.conf || exit 0
+
+RETVAL=0
+
+start() {
+	# Start daemon.
+	# Check if the service is already running?
+	if [ ! -f /var/lock/subsys/clamd ]; then
+		echo -n $"Starting Clam AV daemon:"
+		daemon /usr/sbin/clamd 
+		RETVAL=$?
+		echo
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd		
+	else
+		echo -n $"Clam AV is already running."
+		echo
+	fi
+	return $RETVAL
+}
+stop() {
+	# Stop daemon.
+	echo -n $"Stopping Clam AV daemon:"
+	killproc clamd
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/run/clamav/clamd.pid /var/lock/subsys/clamd
+	return $RETVAL
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	RETVAL=$?
+	;;
+  stop)
+	stop
+	RETVAL=$?
+	;;
+  restart)
+	stop
+	start
+	RETVAL=$?
+	;;
+  condrestart)
+	test -f /var/lock/subsys/clamd && $0 restart || :
+	RETVAL=$?
+	;;
+  status)
+	status clamd
+	RETVAL=$?
+	;;
+  reload)
+	killproc clamd -HUP
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+	exit 1
+esac
+
+exit $RETVAL
+


Property changes on: contrib/clamav/current/sources/clamd.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: contrib/clamav/current/sources/freshclam.conf
===================================================================
--- contrib/clamav/current/sources/freshclam.conf	2004-06-23 21:45:11 UTC (rev 2136)
+++ contrib/clamav/current/sources/freshclam.conf	2004-06-23 21:48:21 UTC (rev 2137)
@@ -0,0 +1,53 @@
+##
+## Example config file for freshclam
+## Please read the clamav.conf(5) manual before editing this file.
+## This file may be optionally merged with clamav.conf.
+##
+
+# It should match clamav.conf's directive ! (in most cases you shouldn't
+# change it)
+DatabaseDirectory /var/lib/clamav
+
+# Path to the log file (make sure it has proper permissions)
+UpdateLogFile /var/log/clamav/freshclam.log
+
+# Enable verbose logging.
+#LogVerbose
+
+# Use system logger (can work together with UpdateLogFile).
+LogSyslog
+
+# Specify the type of syslog messages - please refer to 'man syslog'
+# for facility names. Default is LOG_LOCAL6.
+#LogFacility LOG_MAIL
+
+# By default when freshclam is started by root it drops privileges and
+# switches to the "clamav" user. You can change this behaviour here.
+#DatabaseOwner clamav
+
+# The main database mirror is database.clamav.net (this is a round-robin
+# DNS that points to many mirrors on the world) and in most cases you
+# SHOULD NOT change it.
+DatabaseMirror database.clamav.net
+
+# How many attempts to make before giving up.
+MaxAttempts 3
+
+# How often check for a new database. We suggest checking for it every
+# two hours.
+Checks 12
+
+# Proxy settings
+#HTTPProxyServer myproxy.com
+#HTTPProxyPort 1234
+#HTTPProxyUsername myusername
+#HTTPProxyPassword mypass
+
+# Send the RELOAD command to clamd.
+#NotifyClamd [/optional/config/file/path]
+
+# Run command after database update.
+#OnUpdateExecute command
+
+# Run command if database update failed.
+#OnErrorExecute command

Added: contrib/clamav/current/sources/freshclam.logrotate
===================================================================
--- contrib/clamav/current/sources/freshclam.logrotate	2004-06-23 21:45:11 UTC (rev 2136)
+++ contrib/clamav/current/sources/freshclam.logrotate	2004-06-23 21:48:21 UTC (rev 2137)
@@ -0,0 +1,13 @@
+#
+# Rotate FreshClam daemon log file
+#
+
+/var/log/clamav/clamav-update.log {
+    missingok
+    create 640 OWNER GROUP
+    notifempty
+    postrotate
+	/bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}
+


Property changes on: contrib/clamav/current/sources/freshclam.logrotate
___________________________________________________________________
Name: svn:executable
   + *

Added: contrib/clamav/current/sources/freshclam.sh
===================================================================
--- contrib/clamav/current/sources/freshclam.sh	2004-06-23 21:45:11 UTC (rev 2136)
+++ contrib/clamav/current/sources/freshclam.sh	2004-06-23 21:48:21 UTC (rev 2137)
@@ -0,0 +1,81 @@
+#!/bin/sh
+#
+# freshclam      Start/Stop the freshclam.
+#
+# chkconfig: - 62 38
+# description: freshclam is an update daemon for Clam AV database.
+# processname: freshclam
+# config: /etc/sysconfig/freshclam
+# pidfile: /var/run/clamav/freshclam.pid
+#
+# (c) 2003/11/12 Petr at Kristof.CZ under GNU GPL 2.0+
+#
+
+# Source function library.
+. /etc/init.d/functions
+
+# Source our configuration file for these variables.
+if [ -f /etc/sysconfig/freshclam ] ; then
+	. /etc/sysconfig/freshclam
+fi
+
+RETVAL=0
+
+# Set up some common variables before we launch into what might be
+# considered boilerplate by now.
+prog=freshclam
+path=/usr/bin/freshclam
+
+ALLOPTIONS="--checks=$CHECKS --on-update-execute=$ONSUCCESS --on-
+error-execute=$ONERROR $FRESHOPTIONS"
+
+if [ $HTTPPROXY ] ; then
+   ALLOPTIONS=$ALLOPTIONS" --http-proxy=$HTTPPROXY --proxy-user=$PROXYUSER"
+fi
+
+
+start() {
+	echo -n $"Starting $prog: "
+	daemon $path -d $ALLOPTIONS
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+	return $RETVAL
+}
+
+stop() {
+	echo -n $"Stopping $prog: "
+	killproc $path
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+	return $RETVAL
+}	
+
+restart() {
+  	stop
+	start
+}	
+
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
+  restart)
+  	restart
+	;;
+  status)
+	status $path
+	;;
+  condrestart)
+  	[ -f /var/lock/subsys/$prog ] && restart || :
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|status|reload|restart|condrestart}"
+	exit 1
+esac
+
+exit $?


Property changes on: contrib/clamav/current/sources/freshclam.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: contrib/clamav/current/sources/freshclam.sysconfig
===================================================================
--- contrib/clamav/current/sources/freshclam.sysconfig	2004-06-23 21:45:11 UTC (rev 2136)
+++ contrib/clamav/current/sources/freshclam.sysconfig	2004-06-23 21:48:21 UTC (rev 2137)
@@ -0,0 +1,16 @@
+#
+# freshclam configuration
+#
+# Checks #n times per a day for the new database
+CHECKS="24"
+# Connect via a proxy server "proxy.company.com:port"
+HTTPPROXY=""
+# Proxy authorization "user:password"
+PROXYUSER=""
+# Execute command if error occured
+ONERROR=""
+# Execute command after succesful update
+ONSUCCESS=""
+# General options like "--verbose" or "--debug"
+OPTIONS=""
+#

Added: contrib/clamav/current/specs/clamav.spec
===================================================================
--- contrib/clamav/current/specs/clamav.spec	2004-06-23 21:45:11 UTC (rev 2136)
+++ contrib/clamav/current/specs/clamav.spec	2004-06-23 21:48:21 UTC (rev 2137)
@@ -0,0 +1,270 @@
+Summary: An antivirus toolkit for Unix
+Name:    clamav
+Version: 0.73
+Release: 3bg
+License: GPL
+Group:   tinysofa contrib
+URL:     http://www.clamav.net
+Source0: http://download.sf.net/clamav/%{name}-%{version}.tar.gz
+Source1: clamd.sh
+Source3: freshclam.sh
+Source5: freshclam.sysconfig
+Source6: clamd.logrotate
+Source7: freshclam.logrotate
+Source8: freshclam.conf
+Source10: clamav.conf
+BuildRequires: sed, zlib-devel, gmp-devel
+BuildRequires: zlib, gmp
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%define user_name  amavis
+%define user_id    257
+%define group_name amavis
+%define group_id   257
+
+
+
+%description
+Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of this
+software is the integration with mail servers (attachment scanning).
+The package provides a flexible and scalable multi-threaded daemon,
+a command line scanner, and a tool for automatic updating via Internet.
+The programs are based on a shared library distributed with package,
+which you can use with your own software.
+Most importantly, the virus database is kept up to date .
+
+
+%package devel
+Summary: Clamav - Development header files and libraries
+Group:   tinysofa contrib
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the development header files and libraries
+necessary to develope your own clamav based applications.
+
+
+%package doc
+Summary: Documentation for %{name}
+Requires: %{name}=%{version}-%{release}
+Group:    tinysofa contrib
+
+%description doc
+Documentation for %{name}.
+
+
+%prep
+%setup -q
+
+
+%build
+# # build might need the user/group
+# if [ -z "`getent group %{group_name}`" ] ; then
+#     /usr/sbin/groupadd -g %{group_id} %{group_name}
+# fi
+# if [ -z "`getent passwd %{user_name}`" ] ; then
+#     /usr/sbin/useradd -M -d /no/dir -g %{group_name} -s /bin/false \
+#                       -u %{user_id} %{user_name}
+# fi
+
+%configure \
+    --enable-debug \
+    --program-prefix=%{?_program_prefix} \
+    --enable-id-check \
+    --disable-clamav \
+    --with-user=%{user_name} \
+    --with-group=%{group_name} \
+    --with-dbdir=%{_localstatedir}/lib/clamav
+%{__make}
+
+
+%install
+[ -n "%buildroot" -a "%buildroot" != / ] && rm -rf %buildroot
+
+install -d %buildroot%{_initdir}/
+install -d %buildroot%{_sysconfdir}/sysconfig/
+install -d %buildroot%{_sysconfdir}/logrotate.d/
+install -d %buildroot%{_sysconfdir}/log.d/scripts/services/
+install -d %buildroot%{_sysconfdir}/log.d/conf/services/
+install -d %buildroot%{_localstatedir}/lib/clamav/
+install -d %buildroot%{_localstatedir}/log/clamav/
+install -d %buildroot%{_localstatedir}/run/clamav/
+
+%{__make} install DESTDIR=%buildroot
+
+rm -f %buildroot%{_mandir}/man8/clamav-milter.8*
+install %{SOURCE1} %buildroot%{_initdir}/clamd
+install %{SOURCE3} %buildroot%{_initdir}/freshclam
+install %{SOURCE5} %buildroot%{_sysconfdir}/sysconfig/freshclam
+
+# Make sure we create with the correct user/group
+sed -e 's/OWNER/%{user_name}/g' -e 's/GROUP/%{group_name}/g' %{SOURCE6} >\
+    %buildroot%{_sysconfdir}/logrotate.d/clamd
+sed -e 's/OWNER/%{user_name}/g' -e 's/GROUP/%{group_name}/g' %{SOURCE7} >\
+    %buildroot%{_sysconfdir}/logrotate.d/freshclam
+
+install %{SOURCE10} %buildroot%{_sysconfdir}/clamav.conf
+install %{SOURCE8} %buildroot%{_sysconfdir}/freshclam.conf
+
+mkdir -p %buildroot/%{_defaultdocdir}/%{name}-%{version}
+mkdir -p %buildroot/%{_defaultdocdir}/%{name}-%{version}/html
+DOC="AUTHORS BUGS COPYING ChangeLog FAQ INSTALL NEWS README TODO docs/*.pdf"
+for i in $DOC ; do
+  install -m644 $i %buildroot/%{_defaultdocdir}/%{name}-%{version}/
+done
+for i in "*.html" "*.css" "*.png" ; do
+  install -m644 docs/html/$i %buildroot/%{_defaultdocdir}/%{name}-%{version}/html
+done
+
+
+%clean
+[ -n "%buildroot" -a "%buildroot" != / ] && rm -rf %buildroot
+
+
+%pre
+if [ -z "`getent group %{group_name}`" ] ; then
+    /usr/sbin/groupadd -g %{group_id} %{group_name}
+fi
+if [ -z "`getent passwd %{user_name}`" ] ; then
+    /usr/sbin/useradd -M -d /no/dir -g %{group_name} -s /bin/false \
+                      -u %{user_id} %{user_name}
+fi
+
+%post
+/sbin/chkconfig --add clamd
+/sbin/chkconfig --add freshclam
+/sbin/restart_maybe clamd > /dev/null 2>&1
+/sbin/restart_maybe freshclam > /dev/null 2>&1
+
+%preun
+if [ $1 = 0 ]; then
+    service clamd stop > /dev/null 2>&1
+    service freshclam stop > /dev/null 2>&1
+    /sbin/chkconfig --del clamd
+    /sbin/chkconfig --del freshclam
+fi
+
+
+%files
+%defattr(-,root,root)
+%attr(0640,root,%{group_name}) %config %{_sysconfdir}/clamav.conf
+%attr(0640,root,%{group_name}) %config %{_sysconfdir}/freshclam.conf
+%attr(0640,root,%{group_name}) %config %{_sysconfdir}/sysconfig/freshclam
+%{_initdir}/clamd
+%{_initdir}/freshclam
+%{_sysconfdir}/logrotate.d/clamd
+%{_sysconfdir}/logrotate.d/freshclam
+%{_bindir}/*
+%{_sbindir}/clamd
+%{_libdir}/libclamav.so.*
+%attr(0755,%{user_name},%{group_name}) %dir %{_localstatedir}/lib/clamav/
+%attr(0644,%{user_name},%{group_name}) %config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/main.cvd
+%attr(0644,%{user_name},%{group_name}) %config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/daily.cvd
+%attr(0755,%{user_name},%{group_name}) %{_localstatedir}/log/clamav/
+%attr(0755,%{user_name},%{group_name}) %{_localstatedir}/run/clamav/
+%{_mandir}/man1/clamdscan.1*
+%{_mandir}/man1/clamscan.1*
+%{_mandir}/man1/freshclam.1*
+%{_mandir}/man1/sigtool.1*
+%{_mandir}/man5/clamav.conf.5*
+%{_mandir}/man5/freshclam.conf.5*
+%{_mandir}/man8/clamd.8*
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/libclamav.pc
+%{_includedir}/*.h
+
+%files doc
+%defattr(-,root,root)
+%docdir %{_defaultdocdir}/%{name}-%{version}
+%doc %{_defaultdocdir}/%{name}-%{version}/*
+
+
+%changelog
+* Tue Jun 22 2004 Goetz Bock <bg at tinysofa dot org> 0.73-3bg
+- tried to fix none root builds
+
+* Tue Jun 22 2004 Goetz Bock <bg at tinysofa dot org> 0.73-2bg
+- added gmp to get digital signature support
+
+* Mon Jun 21 2004 Goetz Bock <bg at tinysofa dot org> 0.73-1bg
+- new upstream: 0.73
+- build for tinysofa contrib
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Mon Mar  1 2004 Erlend Midttun <erlendbm at trustix dot org> 0.66-5em
+- Fixed user/group in logrotate.
+
+* Fri Feb 27 2004 Goetz Bock <bg at trustix dot org> 066-4bg
+- fixed user/group setup
+- added some build requirements
+
+* Sun Feb 15 2004 Erlend Midttun <erlendbm at trustix dot org> 0.66-3em
+- Now create log files in logrotate.
+- Added "notifempyty" as well.
+- Added %{_libdir}/*.so to -devel.
+
+* Fri Feb 13 2004 Gerald Dachs <gda at trustix dot org> 0.66-2gd
+- added DatabaseMirror for freshclam in clamav.conf
+
+* Fri Feb 13 2004 Gerald Dachs <gda at trustix dot org> 0.66-1gd
+- New upstream
+
+* Mon Feb  9 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Added strlen patch to prevent DoS.
+- Also fixed uid of logrotate.d/*.
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Take II, now with better adding of users and a better config file.
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Adapted to Trustix Contrib.
+
+* Sun Dec 7 2003 Petr Kri?tof <Petr at Kristof.CZ>
+- Fix Epoch dependencies by Eduardo Kaftanski <eduardo at linuxcenter.cl>
+
+* Sun Nov 23 2003 Petr Kri?tof <Petr at Kristof.CZ>
+- Update .spec file
+- Fix RH-7.3 program-prefix by Kenneth Porter <shiva at sewingwitch.com>
+- Rebuild on FC1
+
+* Sun Nov 16 2003 Petr Kri?tof <Petr at Kristof.CZ>
+- Fix doc errors
+- Fix dependencies
+- Patch for RH-7.3 by Lionel Bouton <Lionel.Bouton at inet6.fr>
+- Patch for RH-7.3 by Chris de Vidal <chris at devidal.tv>
+- Option --without-milter by J?n Ondrej (SAL) <ondrejj at salstar.sk>
+
+* Wed Nov 12 2003 Petr Kri?tof <Petr at Kristof.CZ>
+- Removed package db
+- Added LogWatch support
+- Added FreshClam support
+- Moved logfiles to own subdirectory
+- Update to 0.65
+
+* Wed Sep 10 2003 Petr Kri?tof <Petr at Kristof.CZ>
+- Option for build without clamavdb
+
+* Thu Jul 10 2003 Petr Kri?tof <Petr at Kristof.CZ>
+- Split package to clamav, db, milter, devel
+
+* Sun Jun 22 2003 Petr Kri?tof <Petr at Kristof.CZ>
+- Update to 0.60
+
+* Tue Jun 10 2003 Petr Kri?tof <Petr at Kristof.CZ>
+- Fixed post, preun, postun scripts
+- Update to 2003xxxx snapshots
+
+* Tue Feb 4 2003 Petr Kri?tof <Petr at Kristof.CZ>
+- Rebuild on RH-8.0
+
+* Sun Dec 1 2002 Petr Kri?tof <Petr at Kristof.CZ>
+- Based on PLD package
+- Initial RH-7.3 build
+


From svn at tinysofa.org  Wed Jun 23 21:50:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 07:50:27 +1000 (EST)
Subject: [tinysofa-svn] r2138 - in contrib/clamav: . releases releases/0.73
Message-ID: <20040623215027.3D03B4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 07:50:26 +1000 (Thu, 24 Jun 2004)
New Revision: 2138

Added:
   contrib/clamav/pristine/
   contrib/clamav/releases/
   contrib/clamav/releases/0.73/
   contrib/clamav/releases/0.73/3bg/
Log:
tagged pristine, release 0.73-3bg


Copied: contrib/clamav/pristine (from rev 2137, contrib/clamav/current)

Copied: contrib/clamav/releases/0.73/3bg (from rev 2137, contrib/clamav/current)


From svn at tinysofa.org  Wed Jun 23 21:56:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 07:56:28 +1000 (EST)
Subject: [tinysofa-svn] 
	r2139 - in contrib: . curl curl/new curl/new/sources curl/new/specs
Message-ID: <20040623215628.39BF34E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 07:56:28 +1000 (Thu, 24 Jun 2004)
New Revision: 2139

Added:
   contrib/curl/
   contrib/curl/new/
   contrib/curl/new/sources/
   contrib/curl/new/sources/curl-7.11.2.tar.bz2
   contrib/curl/new/specs/
   contrib/curl/new/specs/curl.spec
Log:
added curl 7.11.2-1bg


Added: contrib/curl/new/sources/curl-7.11.2.tar.bz2
===================================================================
(Binary files differ)


Property changes on: contrib/curl/new/sources/curl-7.11.2.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/curl/new/specs/curl.spec
===================================================================
--- contrib/curl/new/specs/curl.spec	2004-06-23 21:50:26 UTC (rev 2138)
+++ contrib/curl/new/specs/curl.spec	2004-06-23 21:56:28 UTC (rev 2139)
@@ -0,0 +1,112 @@
+Summary: get a file from a FTP, GOPHER or HTTP server.
+Name:    curl
+Version: 7.11.2
+Release: 1bg
+License: MIT/X derivate
+Group:   tinysofa contrib
+Source:  http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
+URL:     http://curl.haxx.se
+Requires: %{name}-libs = %{version}-%{release}
+BuildRequires: gcc-c++-devel
+BuildRequires: openssl-devel >= 0.9.5
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+
+%description
+curl is a client to get documents/files from servers, using any of the
+supported protocols. The command is designed to work without user
+interaction or any kind of interactivity.
+
+curl offers a busload of useful tricks like proxy support, user
+authentication, ftp upload, HTTP post, file transfer resume and more.
+
+
+%package devel
+Summary:  The includes, libs, and man pages to develop with libcurl
+Group:    tinysofa contrib
+Requires: %{name}-libs = %{version}-%{release}
+
+%description devel
+libcurl is the core engine of curl; this packages contains all the static
+libs, headers, and manual pages to develop applications using libcurl.
+
+
+%package libs
+Summary:  The curl library, to get files from a FTP, GOPHER or HTTP server.
+Group:    tinysofa contrib
+Requires: openssl >= 0.9.5
+
+%description libs
+libcurl is the core engine of curl; this packages contains only the libs.
+
+
+%prep
+%setup -q
+
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" %configure
+make 
+
+%install
+[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+
+%clean
+[ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
+
+
+%post libs
+/sbin/ldconfig
+
+
+%postun libs
+/sbin/ldconfig
+
+
+%files
+%defattr(-,root,root)
+%doc CHANGES COPYING README testcurl.sh docs/BUGS
+%doc docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/HISTORY docs/KNOWN_BUGS
+%doc docs/MANUAL docs/RESOURCES docs/SSLCERTS docs/THANKS docs/TODO
+%doc docs/VERSIONS docs/TheArtOfHttpScripting tests
+%attr(0755,root,root) %{_bindir}/curl
+%attr(0644,root,root) %{_mandir}/man1/curl.1*
+%{_datadir}/curl/curl-ca-bundle.crt
+
+%files libs
+%defattr(-,root,root)
+%{_libdir}/libcurl.so.*
+
+%files devel
+%defattr(-,root,root)
+%doc docs/BINDINGS docs/INTERNALS docs/examples/* docs/libcurl-the-guide
+%attr(0755,root,root) %{_bindir}/curl-config
+%attr(0644,root,root) %{_mandir}/man1/curl-config.1*
+%attr(0644,root,root) %{_mandir}/man3/*
+%attr(0644,root,root) %{_includedir}/curl/*
+%{_libdir}/libcurl.a
+%{_libdir}/libcurl.la
+%{_libdir}/libcurl.so
+
+
+%changelog
+* Fri May 28 2004 Goetz Bock <bg at tinysofa dot org> 7.11.2-1bg
+- new upstream: 7.11.2
+- build for tinysofa contrib
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Goetz Bock <bg at trustix dot org> 7.11.0-2bg
+- major specfile sanitazion
+- added some buildrequirements
+- splitted libs into own rpm
+
+* Sun Jan 25 2003 Michael Shuler <michael at unixtx.com> 7.11.0-1mas
+- http://curl.haxx.se/changes.html
+- new stable release curl-7.11.0 from the curl developers
+- Trustix Secure Linux 2.0 build
+* Wed Jan 7 2003 Michael Shuler <michael at unixtx.com> 7.10.8-1mas
+- Trustix Secure Linux 2.0 build


From svn at tinysofa.org  Wed Jun 23 21:57:04 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 07:57:04 +1000 (EST)
Subject: [tinysofa-svn] r2140 - contrib/curl
Message-ID: <20040623215704.AE39E4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 07:57:04 +1000 (Thu, 24 Jun 2004)
New Revision: 2140

Added:
   contrib/curl/current/
Removed:
   contrib/curl/new/
Log:
should be called current


Copied: contrib/curl/current (from rev 2139, contrib/curl/new)


From svn at tinysofa.org  Wed Jun 23 21:58:09 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 07:58:09 +1000 (EST)
Subject: [tinysofa-svn] r2141 - in contrib/curl: . releases releases/7.11.2
Message-ID: <20040623215809.661B44E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 07:58:09 +1000 (Thu, 24 Jun 2004)
New Revision: 2141

Added:
   contrib/curl/pristine/
   contrib/curl/releases/
   contrib/curl/releases/7.11.2/
   contrib/curl/releases/7.11.2/1bg/
Log:
tagged pristine and release 7.11.2-1bg


Copied: contrib/curl/pristine (from rev 2140, contrib/curl/current)

Copied: contrib/curl/releases/7.11.2/1bg (from rev 2140, contrib/curl/current)


From svn at tinysofa.org  Wed Jun 23 21:59:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 07:59:52 +1000 (EST)
Subject: [tinysofa-svn] r2142 - in contrib: . ettercap ettercap/current
	ettercap/current/sources ettercap/current/specs
Message-ID: <20040623215952.DB0BC4E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 07:59:52 +1000 (Thu, 24 Jun 2004)
New Revision: 2142

Added:
   contrib/ettercap/
   contrib/ettercap/current/
   contrib/ettercap/current/sources/
   contrib/ettercap/current/sources/ettercap-0.6.b.tar.gz
   contrib/ettercap/current/specs/
   contrib/ettercap/current/specs/ettercap.spec
Log:
added ettercap

Added: contrib/ettercap/current/sources/ettercap-0.6.b.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/ettercap/current/sources/ettercap-0.6.b.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/ettercap/current/specs/ettercap.spec
===================================================================
--- contrib/ettercap/current/specs/ettercap.spec	2004-06-23 21:58:09 UTC (rev 2141)
+++ contrib/ettercap/current/specs/ettercap.spec	2004-06-23 21:59:52 UTC (rev 2142)
@@ -0,0 +1,82 @@
+Summary: a ncurses-based sniffer/interceptor utility
+Name:    ettercap
+Version: 0.6.b
+Release: 1bg
+Group:   tinysofa contrib
+Source:  ettercap-%{version}.tar.gz
+URL:     http://ettercap.sourceforge.net
+License: GPL
+Requires: ncurses openssl
+BuildRequires: ncurses-devel openssl-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Prefix:   %{_prefix}
+
+%description
+ettercap is a network sniffer/interceptor/logger for ethernet LANs (both
+switched or not).  It supports active and passive dissection of many
+protocols (even ciphered ones, like SSH and HTTPS). Data injection in an
+established connection and filtering (substitute or drop a packet) on
+the fly is also possible, keeping the connection sincronized. Many
+sniffing modes were implemented to give you a powerful and complete
+sniffing suite.  Plugins are supported. It has the ability to check
+whether you are in a switched LAN or not, and to use OS fingerprints
+(active or passive) to let you know the geometry of the LAN.  The
+passive scan of the lan retrives infos about: hosts in the lan, open
+ports, services version, type of the host (gateway, router or simple
+host) and extimated distance in hop.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure \
+    --disable-debug \
+    --disable-gtk \
+    --enable-ncurses \
+    --enable-plugins
+
+make
+make plug-ins
+
+
+%install
+[ -n "%buildroot" -a "%buildroot" != / ] && rm -rf %buildroot
+make install DESTDIR=%buildroot
+make plug-ins_install DESTDIR=%buildroot
+
+# remove redundant documentation
+rm -r %buildroot/usr/share/doc/ettercap/
+
+%clean
+[ -n "%buildroot" -a "%buildroot" != / ] && rm -rf %buildroot
+
+%files
+%defattr(-,root,root)
+%doc COPYING README README.PLUGINS README.WIN32 HISTORY CHANGELOG AUTHORS
+%doc TODO TODO.WIN32 THANKS KNOWN-BUGS PORTINGS INSTALL
+%doc ./plugins/H01_zaratan/ZARATAN.HOWTO ./plugins/H09_roper/ROPER.HOWTO
+%doc ./plugins/H03_hydra1/HYDRA.HOWTO 
+%{_sbindir}/*
+%{_datadir}/ettercap/*
+%{_libdir}/ettercap/*
+%{_mandir}/man8/*
+
+
+%changelog
+* Tue Jun 22 2004 Goetz Bock <bg at tinysofa dot org> 0.6.b-1bg
+- build for tinysofa contrib
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Mon Aug 18 2003 Goetz Bock <bock at trustix dot org> 0.6.b-2bg
+- rebuild for Cloud (aka Trustix 2.0) - Contrib
+
+* Thu Jul 24 2003 Goetz Bock <bock at truitix dot org> 0.6.b-1bg
+- new upstream: 0.6.b
+
+* Mon Jul  7 2003 Goetz Bock <bock at trustix dot org> 0.6.a-1bg
+- initialy packed for TSL2.0
+- based on ettercap.spec.in included with the tar.gz


From svn at tinysofa.org  Wed Jun 23 22:00:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 08:00:41 +1000 (EST)
Subject: [tinysofa-svn] 
	r2143 - in contrib/ettercap: . releases releases/0.6.b
Message-ID: <20040623220041.2A1554E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 08:00:40 +1000 (Thu, 24 Jun 2004)
New Revision: 2143

Added:
   contrib/ettercap/pristine/
   contrib/ettercap/releases/
   contrib/ettercap/releases/0.6.b/
   contrib/ettercap/releases/0.6.b/1bg/
Log:
tagged pristine, release 0.6.b-1bg


Copied: contrib/ettercap/pristine (from rev 2142, contrib/ettercap/current)

Copied: contrib/ettercap/releases/0.6.b/1bg (from rev 2142, contrib/ettercap/current)


From svn at tinysofa.org  Wed Jun 23 22:01:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 08:01:16 +1000 (EST)
Subject: [tinysofa-svn] r2144 - in contrib: . firehol firehol/current
	firehol/current/sources firehol/current/specs
Message-ID: <20040623220116.3FB554E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 08:01:16 +1000 (Thu, 24 Jun 2004)
New Revision: 2144

Added:
   contrib/firehol/
   contrib/firehol/current/
   contrib/firehol/current/sources/
   contrib/firehol/current/sources/firehol-chkconfig.patch
   contrib/firehol/current/sources/firehol.conf
   contrib/firehol/current/sources/firehol.tar.gz
   contrib/firehol/current/specs/
   contrib/firehol/current/specs/firehol.spec
Log:
added firehol

Added: contrib/firehol/current/sources/firehol-chkconfig.patch
===================================================================
--- contrib/firehol/current/sources/firehol-chkconfig.patch	2004-06-23 22:00:40 UTC (rev 2143)
+++ contrib/firehol/current/sources/firehol-chkconfig.patch	2004-06-23 22:01:16 UTC (rev 2144)
@@ -0,0 +1,11 @@
+--- firehol/firehol.sh.orig	2003-08-16 02:41:02.000000000 +0200
++++ firehol/firehol.sh	2003-08-16 02:42:30.000000000 +0200
+@@ -2,7 +2,7 @@
+ #
+ # Startup script to implement /etc/firehol/firehol.conf pre-defined rules.
+ #
+-# chkconfig: 2345 99 92
++# chkconfig: - 11 90
+ #
+ # description: creates stateful iptables packet filtering firewalls.
+ #

Added: contrib/firehol/current/sources/firehol.conf
===================================================================
--- contrib/firehol/current/sources/firehol.conf	2004-06-23 22:00:40 UTC (rev 2143)
+++ contrib/firehol/current/sources/firehol.conf	2004-06-23 22:01:16 UTC (rev 2144)
@@ -0,0 +1,11 @@
+# 
+# Simple firehol config
+#
+
+version 5
+
+interface eth0 world
+    protection strong
+    server all accept
+    client all accept
+

Added: contrib/firehol/current/sources/firehol.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/firehol/current/sources/firehol.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/firehol/current/specs/firehol.spec
===================================================================
--- contrib/firehol/current/specs/firehol.spec	2004-06-23 22:00:40 UTC (rev 2143)
+++ contrib/firehol/current/specs/firehol.spec	2004-06-23 22:01:16 UTC (rev 2144)
@@ -0,0 +1,104 @@
+Summary: firewall script for iptables
+Name:    firehol
+Version: 1.194
+Release: 1bg
+Group:   tinysofa contrib
+Source:  http://firehol.sourceforge.net/firehol.tar.gz
+Source1: firehol.conf
+Patch0:  firehol-chkconfig.patch
+URL:     http://firehol.sf.net
+License: GPL
+Requires: iptables
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+FireHOL, an iptables stateful packet filtering firewall for humans!
+
+
+%prep
+%setup -q -n firehol
+%patch0 -p1
+
+
+%install
+[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_initdir}
+mkdir -p %{buildroot}/%{_mandir}/{man1,man5}
+install -m 750 -d %{buildroot}/%{_sysconfdir}/firehol
+install -m 755 firehol.sh %{buildroot}/%{_initdir}/firehol
+install -m 644 man/firehol.1  %{buildroot}/%{_mandir}/man1/
+install -m 644 man/firehol.conf.5 %{buildroot}/%{_mandir}/man5/
+install -m 640 %{SOURCE1} %{buildroot}/%{_sysconfdir}/firehol/firehol.conf
+
+
+%clean
+[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
+
+%post
+chkconfig --add firehol
+
+
+%preun
+if [ $1 = 0 ] ; then
+    %{_initdir}/firehol stop >&2
+    chkconfig --del firehol
+fi
+
+
+%files
+%defattr(-,root,root)
+%doc COPYING ChangeLog README TODO WhatIsNew
+%doc doc/* examples
+%config(noreplace) /etc/firehol/firehol.conf
+%dir /etc/firehol/
+%{_initdir}/firehol
+%{_mandir}/man1/firehol.1*
+%{_mandir}/man5/firehol.conf.5*
+
+
+%changelog
+* Wed Jun  9 2004 Goetz Bock <gbo at all-connect dot net> 1.194-1bg
+- new upstream: 1.194
+- build for tinysofa contrib
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Fri Feb 13 2004 Goetz Bock <bg at trustix dot org> 1.177-1bg
+- new upsream: 1.177
+
+* Fri Jan 23 2004 Goetz Bock <bg at trustix dot org> 1.176-1bg
+- new upstream: 1.176
+
+* Tue Oct 21 2003 Goetz Bock <bg at tawie dot org> 1.161-1bg
+- new upstream: 1.161 (preCVS)
+- includes physmatch (patch2)
+- added patch to fix mixup in private IP range (patch1)
+
+* Sat Oct 10 2003 Goetz Bock <bg at tawie dot org> 1.158-2bg
+- this time with the proper version of the archive
+
+* Tue Oct  9 2003 Goetz Bock <bg at tawie dot org> 1.158-1bg
+- new upstream: 1.158 (CVS)
+- includes sed and tftp patch (patch3 and patch1)
+
+* Sun Oct  5 2003 Goetz Bock <bg at tawie dot org> 1.155-1bg
+- new upstream: 1.155 (CVS)
+- added patch for physdev match support (Patch1)
+- added patch to streamline sed call (Patch2)
+
+* Thu Sep 18 2003 Goetz Bock <bock at trustix dot org> 1.154-2bg
+- added rules for tftp, take2
+
+* Thu Sep 18 2003 Goetz Bock <bock at trustix dot org> 1.154-1bg
+- new upstream: 1.154 (CVS)
+- added rules for tftp (patch1)
+
+* Mon Aug 18 2003 Goetz Bock <bock at trustix dot org> 1.147-2bg
+- rebuild for Cloud (aka Trustix 2.0) - Contrib
+
+* Sat Aug 16 2003 Goetz Bock <bock at trustix dot org> 1.147-1bg
+- initialy packed for Trustix Secure Linux 2.0 from daily snapshot
+


From svn at tinysofa.org  Wed Jun 23 22:02:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 08:02:10 +1000 (EST)
Subject: [tinysofa-svn] 
	r2145 - in contrib/firehol: . releases releases/1.194
Message-ID: <20040623220210.F15D14E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 08:02:10 +1000 (Thu, 24 Jun 2004)
New Revision: 2145

Added:
   contrib/firehol/pristine/
   contrib/firehol/releases/
   contrib/firehol/releases/1.194/
   contrib/firehol/releases/1.194/1bg/
Log:
tagged pristine, releases 1.194-1bg


Copied: contrib/firehol/pristine (from rev 2144, contrib/firehol/current)

Copied: contrib/firehol/releases/1.194/1bg (from rev 2144, contrib/firehol/current)


From svn at tinysofa.org  Wed Jun 23 22:02:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 08:02:53 +1000 (EST)
Subject: [tinysofa-svn] 
	r2146 - in contrib: . geoip geoip/current geoip/current/sources
	geoip/current/specs
Message-ID: <20040623220253.791C14E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 08:02:53 +1000 (Thu, 24 Jun 2004)
New Revision: 2146

Added:
   contrib/geoip/
   contrib/geoip/current/
   contrib/geoip/current/sources/
   contrib/geoip/current/sources/GeoIP-1.3.4.tar.gz
   contrib/geoip/current/specs/
   contrib/geoip/current/specs/geoip.spec
Log:
added geoip

Added: contrib/geoip/current/sources/GeoIP-1.3.4.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/geoip/current/sources/GeoIP-1.3.4.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/geoip/current/specs/geoip.spec
===================================================================
--- contrib/geoip/current/specs/geoip.spec	2004-06-23 22:02:10 UTC (rev 2145)
+++ contrib/geoip/current/specs/geoip.spec	2004-06-23 22:02:53 UTC (rev 2146)
@@ -0,0 +1,121 @@
+Summary: Library for geographical IP information
+Name:    geoip
+Version: 1.3.4
+Release: 1bg
+Group:   tinysofa contrib
+URL:     http://www.maxmind.com/geoip
+Source:  http://www.maxmind.com/download/geoip/api/c/GeoIP-%{version}.tar.gz
+License: GPL
+Requires: zlib-devel
+BuildRequires: zlib-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+%description
+GeoIP is a C library that enables the user to find the country that any
+IP address or hostname originates from.  It uses a file based database
+that is accurate as of March 2003.  This database simply contains IP blocks
+as keys, and countries as values.  This database should be more complete and
+accurate than using reverse DNS lookups. 
+
+
+%package devel
+Summary:  Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+Group:    tinysofa contrib
+
+%description devel
+Development files for %{name}, like header files, static libraries, linker
+files.
+
+
+%package tools
+Summary:  Utility programms using %{name}.
+Requires: %{name} = %{version}-%{release}
+Group:    tinysofa contrib
+
+%description tools
+Utility programms using %{name}. To e.g. look up the geographic information
+for a given IP, or to update your database.
+
+
+%package data
+Summary:  Geographic/IP data for %{name}.
+Requires: %{name} = %{version}-%{release}
+License:  free
+Group:    tinysofa contrib
+
+%description data
+This is the free version of the MaxMind GeoIP Country database. It's slightly
+out of date and therefor not totaly accurate.
+
+
+%prep
+%setup -q -n GeoIP-%{version}
+
+
+%build
+%configure
+make
+
+
+%install
+[ -n "%buildroot" -a "%buildroot" != / ] && rm -rf %buildroot
+make install DESTDIR=%buildroot
+
+
+%clean
+[ -n "%buildroot" -a "%buildroot" != / ] && rm -rf %buildroot
+
+
+%post
+/sbin/ldconfig
+
+
+%postun
+/sbin/ldconfig
+
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+%{_sysconfdir}/GeoIP.conf.default
+%config(noreplace) %{_sysconfdir}/GeoIP.conf
+%{_libdir}/libGeoIP.so.*
+%{_libdir}/libGeoIPUpdate.so.*
+%{_libdir}/libGeoIPBitReader.so.*
+
+%files devel
+%defattr(-,root,root)
+%{_libdir}/libGeoIP.so
+%{_libdir}/libGeoIP.la
+%{_libdir}/libGeoIP.a
+%{_libdir}/libGeoIPUpdate.so
+%{_libdir}/libGeoIPUpdate.la
+%{_libdir}/libGeoIPUpdate.a
+%{_libdir}/libGeoIPBitReader.so
+%{_libdir}/libGeoIPBitReader.la
+%{_libdir}/libGeoIPBitReader.a
+%{_includedir}/GeoIP.h
+%{_includedir}/GeoIPCity.h
+%{_includedir}/GeoIPBitReader.h
+%{_includedir}/GeoIPUpdate.h
+
+%files tools
+%defattr(-,root,root)
+%{_bindir}/geoiplookup
+%{_bindir}/geoipupdate
+%{_bindir}/geoipexport
+%{_bindir}/geoipexportlocations
+%{_mandir}/man1/geoipupdate.1*
+%{_mandir}/man1/geoiplookup.1*
+
+%files data
+%defattr(-,root,root)
+%dir %{_datadir}/GeoIP
+%{_datadir}/GeoIP/GeoIP.dat
+
+
+%changelog
+* Wed Jun 23 2004 Goetz Bock <bg at tinysofa dot org> 1.3.4-1bg
+- initial build for tinysofa contrib.
+


From svn at tinysofa.org  Wed Jun 23 22:04:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 08:04:05 +1000 (EST)
Subject: [tinysofa-svn] r2147 - in contrib/geoip: . releases releases/1.3.4
Message-ID: <20040623220405.044704E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 08:04:04 +1000 (Thu, 24 Jun 2004)
New Revision: 2147

Added:
   contrib/geoip/pristine/
   contrib/geoip/releases/
   contrib/geoip/releases/1.3.4/
   contrib/geoip/releases/1.3.4/1bg/
Log:
tagged pristine, release 1.3.4-1bg


Copied: contrib/geoip/pristine (from rev 2146, contrib/geoip/current)

Copied: contrib/geoip/releases/1.3.4/1bg (from rev 2146, contrib/geoip/current)


From svn at tinysofa.org  Wed Jun 23 22:13:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 08:13:22 +1000 (EST)
Subject: [tinysofa-svn] r2149 - in contrib: hddtemp hddtemp/releases
	hddtemp/releases/0.2.8.11 perl-net-ssleay perl-net-ssleay/releases
	perl-net-ssleay/releases/1.25 pound pound/releases
	pound/releases/1.7 pwgen pwgen/releases pwgen/releases/2.03 scponly
	scponly/releases scponly/releases/3.11 socat socat/releases
	socat/releases/1.3.2.2 sysklogd-conf-central
	sysklogd-conf-central/releases sysklogd-conf-central/releases/1.4.1
	vconfig vconfig/releases vconfig/releases/1.8 wipe wipe/releases
	wipe/releases/2.2.0 wol wol/releases wol/releases/0.7.1
Message-ID: <20040623221322.893014E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 08:13:22 +1000 (Thu, 24 Jun 2004)
New Revision: 2149

Added:
   contrib/hddtemp/pristine/
   contrib/hddtemp/releases/
   contrib/hddtemp/releases/0.2.8.11/
   contrib/hddtemp/releases/0.2.8.11/1bg/
   contrib/perl-net-ssleay/pristine/
   contrib/perl-net-ssleay/releases/
   contrib/perl-net-ssleay/releases/1.25/
   contrib/perl-net-ssleay/releases/1.25/1bg/
   contrib/pound/pristine/
   contrib/pound/releases/
   contrib/pound/releases/1.7/
   contrib/pound/releases/1.7/1bg/
   contrib/pwgen/pristine/
   contrib/pwgen/releases/
   contrib/pwgen/releases/2.03/
   contrib/pwgen/releases/2.03/1bg/
   contrib/scponly/pristine/
   contrib/scponly/releases/
   contrib/scponly/releases/3.11/
   contrib/scponly/releases/3.11/1bg/
   contrib/socat/pristine/
   contrib/socat/releases/
   contrib/socat/releases/1.3.2.2/
   contrib/socat/releases/1.3.2.2/1bg/
   contrib/sysklogd-conf-central/pristine/
   contrib/sysklogd-conf-central/releases/
   contrib/sysklogd-conf-central/releases/1.4.1/
   contrib/sysklogd-conf-central/releases/1.4.1/5bg/
   contrib/vconfig/pristine/
   contrib/vconfig/releases/
   contrib/vconfig/releases/1.8/
   contrib/vconfig/releases/1.8/1bg/
   contrib/wipe/pristine/
   contrib/wipe/releases/
   contrib/wipe/releases/2.2.0/
   contrib/wipe/releases/2.2.0/1bg/
   contrib/wipe/releases/2.20/
   contrib/wol/pristine/
   contrib/wol/releases/
   contrib/wol/releases/0.7.1/
   contrib/wol/releases/0.7.1/1bg/
Log:
tagged pristine and the current release


Copied: contrib/hddtemp/pristine (from rev 2148, contrib/hddtemp/current)

Copied: contrib/hddtemp/releases/0.2.8.11/1bg (from rev 2148, contrib/hddtemp/current)

Copied: contrib/perl-net-ssleay/pristine (from rev 2148, contrib/perl-net-ssleay/current)

Copied: contrib/perl-net-ssleay/releases/1.25/1bg (from rev 2148, contrib/perl-net-ssleay/current)

Copied: contrib/pound/pristine (from rev 2148, contrib/pound/current)

Copied: contrib/pound/releases/1.7/1bg (from rev 2148, contrib/pound/current)

Copied: contrib/pwgen/pristine (from rev 2148, contrib/pwgen/current)

Copied: contrib/pwgen/releases/2.03/1bg (from rev 2148, contrib/pwgen/current)

Copied: contrib/scponly/pristine (from rev 2148, contrib/scponly/current)

Copied: contrib/scponly/releases/3.11/1bg (from rev 2148, contrib/scponly/current)

Copied: contrib/socat/pristine (from rev 2148, contrib/socat/current)

Copied: contrib/socat/releases/1.3.2.2/1bg (from rev 2148, contrib/socat/current)

Copied: contrib/sysklogd-conf-central/pristine (from rev 2148, contrib/sysklogd-conf-central/current)

Copied: contrib/sysklogd-conf-central/releases/1.4.1/5bg (from rev 2148, contrib/sysklogd-conf-central/current)

Copied: contrib/vconfig/pristine (from rev 2148, contrib/vconfig/current)

Copied: contrib/vconfig/releases/1.8/1bg (from rev 2148, contrib/vconfig/current)

Copied: contrib/wipe/pristine (from rev 2148, contrib/wipe/current)

Copied: contrib/wipe/releases/2.2.0/1bg (from rev 2148, contrib/wipe/current)

Copied: contrib/wol/pristine (from rev 2148, contrib/wol/current)

Copied: contrib/wol/releases/0.7.1/1bg (from rev 2148, contrib/wol/current)


From svn at tinysofa.org  Wed Jun 23 22:13:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 08:13:49 +1000 (EST)
Subject: [tinysofa-svn] r2150 - contrib/wipe/releases
Message-ID: <20040623221349.EFEE64E8037@minbar.tinysofa.org>

Author: bg
Date: 2004-06-24 08:13:49 +1000 (Thu, 24 Jun 2004)
New Revision: 2150

Removed:
   contrib/wipe/releases/2.20/
Log:
removed wrong releases tag



From svn at tinysofa.org  Thu Jun 24 01:44:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 11:44:29 +1000 (EST)
Subject: [tinysofa-svn] r2151 - tinysofa/releases/1.0/apache/current/specs
Message-ID: <20040624014429.60DD04E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 11:44:28 +1000 (Thu, 24 Jun 2004)
New Revision: 2151

Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
Log:
- Add mod_auth_ldap.


Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-23 22:13:49 UTC (rev 2150)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 01:44:28 UTC (rev 2151)
@@ -26,11 +26,13 @@
 Requires: expat-libs
 Requires: apr
 Requires: apr-util
+RequiresL openldap-libs
 Prereq: /sbin/restart_maybe chkconfig
 BuildRequires: openssl-devel >= 0.9.6e
 BuildRequires: expat-devel, expat-libs
 BuildRequires: zlib-devel
 BuildRequires: gdbm-devel db4-devel mysql-devel
+BuildRequires: openldap-devel
 URL: http://www.apache.org/
 
 %description
@@ -137,6 +139,7 @@
 	--enable-mods-shared=max \
 	--enable-auth-dbm=shared \
         --enable-auth-digest=shared \
+        --enable-auth-ldap=shared \
 	--enable-file-cache=shared \
 	--enable-cache=shared \
 	--enable-disk-cache=shared \


From svn at tinysofa.org  Thu Jun 24 04:25:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 14:25:41 +1000 (EST)
Subject: [tinysofa-svn] 
	r2153 - in tinysofa/releases/1.0/apache: current/specs
	releases/2.0.49 releases/2.0.49/11ts/specs
Message-ID: <20040624042541.A54AA4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 14:25:41 +1000 (Thu, 24 Jun 2004)
New Revision: 2153

Added:
   tinysofa/releases/1.0/apache/releases/2.0.49/11ts/
Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
   tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec
Log:
apache:
  * integrate current (2.0.49-11ts) as releases/2.0.49/11ts

Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 04:20:42 UTC (rev 2152)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 04:25:41 UTC (rev 2153)
@@ -606,6 +606,9 @@
 
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-11ts
+- current (2.0.49-11ts) integrated as 2.0.49-11ts for release 1.0-U2
+
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0.49-10ts
 - current (2.0.49-9ts) integrated as 2.0.49-10ts for release 1.0-U2
 

Copied: tinysofa/releases/1.0/apache/releases/2.0.49/11ts (from rev 2152, tinysofa/releases/1.0/apache/current)

Modified: tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 04:20:42 UTC (rev 2152)
+++ tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec	2004-06-24 04:25:41 UTC (rev 2153)
@@ -606,6 +606,9 @@
 
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-11ts
+- current (2.0.49-11ts) integrated as 2.0.49-11ts for release 1.0-U2
+
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0.49-10ts
 - current (2.0.49-9ts) integrated as 2.0.49-10ts for release 1.0-U2
 


From svn at tinysofa.org  Thu Jun 24 04:25:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 14:25:43 +1000 (EST)
Subject: [tinysofa-svn] r2154 - tinysofa/releases/1.0/apache
Message-ID: <20040624042543.9E3334E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 14:25:43 +1000 (Thu, 24 Jun 2004)
New Revision: 2154

Removed:
   tinysofa/releases/1.0/apache/pristine/
Log:
apache:
  * removing pristine (2.0.49-10ts)


From svn at tinysofa.org  Thu Jun 24 04:25:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 14:25:46 +1000 (EST)
Subject: [tinysofa-svn] r2155 - tinysofa/releases/1.0/apache
Message-ID: <20040624042546.C24A34E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 14:25:46 +1000 (Thu, 24 Jun 2004)
New Revision: 2155

Added:
   tinysofa/releases/1.0/apache/pristine/
Log:
apache:
  * retarget pristine (2.0.49-10ts) to releases/2.0.49/11ts

Copied: tinysofa/releases/1.0/apache/pristine (from rev 2153, tinysofa/releases/1.0/apache/releases/2.0.49/11ts)


From svn at tinysofa.org  Thu Jun 24 04:26:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 14:26:03 +1000 (EST)
Subject: [tinysofa-svn] 
	r2156 - in tinysofa/releases/1.0/initscripts: current/specs
	releases/7.31.9 releases/7.31.9/4ts/specs
Message-ID: <20040624042603.C3F604E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 14:26:03 +1000 (Thu, 24 Jun 2004)
New Revision: 2156

Added:
   tinysofa/releases/1.0/initscripts/releases/7.31.9/4ts/
Modified:
   tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec
   tinysofa/releases/1.0/initscripts/releases/7.31.9/4ts/specs/initscripts.spec
Log:
initscripts:
  * integrate current (7.31.9-3ts) as releases/7.31.9/4ts

Modified: tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec
===================================================================
--- tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec	2004-06-24 04:25:46 UTC (rev 2155)
+++ tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec	2004-06-24 04:26:03 UTC (rev 2156)
@@ -3,7 +3,7 @@
 Version: 7.31.9
 License: GPL
 Group: tinysofa official
-Release: 3ts
+Release: 4ts
 Source: initscripts-%{version}.tar.bz2
 URL: http://rhlinux.redhat.com/initscripts/
 Patch0: initscripts-s390.patch
@@ -194,6 +194,9 @@
 %exclude /etc/sysconfig/network-scripts/ifdown-ippp
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 7.31.9-4ts
+- current (7.31.9-3ts) integrated as 7.31.9-4ts for release 1.0-U2
+
 * Tue May 25 2004 tsintegrate <release at tinysofa dot org> 7.31.9-3ts
 - current (7.31.9-3jh) integrated as 7.31.9-3ts for release 1.0-U1
 

Copied: tinysofa/releases/1.0/initscripts/releases/7.31.9/4ts (from rev 2152, tinysofa/releases/1.0/initscripts/current)

Modified: tinysofa/releases/1.0/initscripts/releases/7.31.9/4ts/specs/initscripts.spec
===================================================================
--- tinysofa/releases/1.0/initscripts/current/specs/initscripts.spec	2004-06-24 04:20:42 UTC (rev 2152)
+++ tinysofa/releases/1.0/initscripts/releases/7.31.9/4ts/specs/initscripts.spec	2004-06-24 04:26:03 UTC (rev 2156)
@@ -3,7 +3,7 @@
 Version: 7.31.9
 License: GPL
 Group: tinysofa official
-Release: 3ts
+Release: 4ts
 Source: initscripts-%{version}.tar.bz2
 URL: http://rhlinux.redhat.com/initscripts/
 Patch0: initscripts-s390.patch
@@ -194,6 +194,9 @@
 %exclude /etc/sysconfig/network-scripts/ifdown-ippp
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 7.31.9-4ts
+- current (7.31.9-3ts) integrated as 7.31.9-4ts for release 1.0-U2
+
 * Tue May 25 2004 tsintegrate <release at tinysofa dot org> 7.31.9-3ts
 - current (7.31.9-3jh) integrated as 7.31.9-3ts for release 1.0-U1
 


From svn at tinysofa.org  Thu Jun 24 04:26:04 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 14:26:04 +1000 (EST)
Subject: [tinysofa-svn] r2157 - tinysofa/releases/1.0/initscripts
Message-ID: <20040624042604.95AC24E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 14:26:04 +1000 (Thu, 24 Jun 2004)
New Revision: 2157

Removed:
   tinysofa/releases/1.0/initscripts/pristine/
Log:
initscripts:
  * removing pristine (7.31.9-3ts)


From svn at tinysofa.org  Thu Jun 24 04:26:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 14:26:06 +1000 (EST)
Subject: [tinysofa-svn] r2158 - tinysofa/releases/1.0/initscripts
Message-ID: <20040624042606.A184D4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 14:26:06 +1000 (Thu, 24 Jun 2004)
New Revision: 2158

Added:
   tinysofa/releases/1.0/initscripts/pristine/
Log:
initscripts:
  * retarget pristine (7.31.9-3ts) to releases/7.31.9/4ts

Copied: tinysofa/releases/1.0/initscripts/pristine (from rev 2156, tinysofa/releases/1.0/initscripts/releases/7.31.9/4ts)


From svn at tinysofa.org  Thu Jun 24 04:26:14 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 14:26:14 +1000 (EST)
Subject: [tinysofa-svn] 
	r2159 - in tinysofa/releases/1.0/mod_php4: current/specs
	releases/4.3.7 releases/4.3.7/2ts/specs
Message-ID: <20040624042614.B8A9E4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 14:26:14 +1000 (Thu, 24 Jun 2004)
New Revision: 2159

Added:
   tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/
Modified:
   tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec
   tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec
Log:
mod_php4:
  * integrate current (4.3.7-1ts) as releases/4.3.7/2ts

Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-24 04:26:06 UTC (rev 2158)
+++ tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-24 04:26:14 UTC (rev 2159)
@@ -7,7 +7,7 @@
 Summary: The PHP4 HTML-embedded scripting language for use with Apache.
 Name: mod_php4
 Version: 4.3.7
-Release: 1ts
+Release: 2ts
 Group: tinysofa official
 Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 Source1: php.ini
@@ -332,6 +332,9 @@
 /usr/share/php4/sysvshm.so
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 4.3.7-2ts
+- current (4.3.7-1ts) integrated as 4.3.7-2ts for release 1.0-U2
+
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 4.3.7-1ts
 - current (4.3.7-2ts) integrated as 4.3.7-1ts for release 1.0-U2
 

Copied: tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts (from rev 2152, tinysofa/releases/1.0/mod_php4/current)

Modified: tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-24 04:20:42 UTC (rev 2152)
+++ tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec	2004-06-24 04:26:14 UTC (rev 2159)
@@ -7,7 +7,7 @@
 Summary: The PHP4 HTML-embedded scripting language for use with Apache.
 Name: mod_php4
 Version: 4.3.7
-Release: 1ts
+Release: 2ts
 Group: tinysofa official
 Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 Source1: php.ini
@@ -332,6 +332,9 @@
 /usr/share/php4/sysvshm.so
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 4.3.7-2ts
+- current (4.3.7-1ts) integrated as 4.3.7-2ts for release 1.0-U2
+
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 4.3.7-1ts
 - current (4.3.7-2ts) integrated as 4.3.7-1ts for release 1.0-U2
 


From svn at tinysofa.org  Thu Jun 24 04:26:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 14:26:15 +1000 (EST)
Subject: [tinysofa-svn] r2160 - tinysofa/releases/1.0/mod_php4
Message-ID: <20040624042615.9B8CB4E8386@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 14:26:15 +1000 (Thu, 24 Jun 2004)
New Revision: 2160

Removed:
   tinysofa/releases/1.0/mod_php4/pristine/
Log:
mod_php4:
  * removing pristine (4.3.7-1ts)


From svn at tinysofa.org  Thu Jun 24 04:26:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 14:26:20 +1000 (EST)
Subject: [tinysofa-svn] r2161 - tinysofa/releases/1.0/mod_php4
Message-ID: <20040624042620.4FF344E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 14:26:20 +1000 (Thu, 24 Jun 2004)
New Revision: 2161

Added:
   tinysofa/releases/1.0/mod_php4/pristine/
Log:
mod_php4:
  * retarget pristine (4.3.7-1ts) to releases/4.3.7/2ts

Copied: tinysofa/releases/1.0/mod_php4/pristine (from rev 2159, tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts)


From svn at tinysofa.org  Thu Jun 24 05:12:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 15:12:46 +1000 (EST)
Subject: [tinysofa-svn] 
	r2162 - in tinysofa/releases/1.0/apache: current/specs
	pristine/specs releases/2.0.49/11ts/specs
Message-ID: <20040624051246.D74294E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 15:12:46 +1000 (Thu, 24 Jun 2004)
New Revision: 2162

Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
   tinysofa/releases/1.0/apache/pristine/specs/apache.spec
   tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec
Log:
- BR autoconf, automake.


Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 04:26:20 UTC (rev 2161)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 05:12:46 UTC (rev 2162)
@@ -125,6 +125,7 @@
 BuildRequires: gdbm-devel db4-devel mysql-devel
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
+BuildRequires: autoconf, automake
 URL: http://www.apache.org/
 
 %description

Modified: tinysofa/releases/1.0/apache/pristine/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/pristine/specs/apache.spec	2004-06-24 04:26:20 UTC (rev 2161)
+++ tinysofa/releases/1.0/apache/pristine/specs/apache.spec	2004-06-24 05:12:46 UTC (rev 2162)
@@ -125,6 +125,7 @@
 BuildRequires: gdbm-devel db4-devel mysql-devel
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
+BuildRequires: autoconf, automake
 URL: http://www.apache.org/
 
 %description

Modified: tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec	2004-06-24 04:26:20 UTC (rev 2161)
+++ tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec	2004-06-24 05:12:46 UTC (rev 2162)
@@ -125,6 +125,7 @@
 BuildRequires: gdbm-devel db4-devel mysql-devel
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
+BuildRequires: autoconf, automake
 URL: http://www.apache.org/
 
 %description


From svn at tinysofa.org  Thu Jun 24 05:29:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 15:29:22 +1000 (EST)
Subject: [tinysofa-svn] 
	r2163 - in tinysofa/releases/1.0/apache: current/specs
	pristine/specs releases/2.0.49/11ts/specs
Message-ID: <20040624052922.161E54E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 15:29:21 +1000 (Thu, 24 Jun 2004)
New Revision: 2163

Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
   tinysofa/releases/1.0/apache/pristine/specs/apache.spec
   tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec
Log:
- BR pcre-devel, R pcre.


Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 05:12:46 UTC (rev 2162)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 05:29:21 UTC (rev 2163)
@@ -118,6 +118,7 @@
 Requires: apr-util
 Requires: openldap-libs
 Requires: cyrus-sasl
+Requires: pcre
 Prereq: /sbin/restart_maybe chkconfig
 BuildRequires: openssl-devel >= 0.9.6e
 BuildRequires: expat-devel, expat-libs
@@ -126,6 +127,7 @@
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: autoconf, automake
+BuildRequires: pcre-devel
 URL: http://www.apache.org/
 
 %description

Modified: tinysofa/releases/1.0/apache/pristine/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/pristine/specs/apache.spec	2004-06-24 05:12:46 UTC (rev 2162)
+++ tinysofa/releases/1.0/apache/pristine/specs/apache.spec	2004-06-24 05:29:21 UTC (rev 2163)
@@ -118,6 +118,7 @@
 Requires: apr-util
 Requires: openldap-libs
 Requires: cyrus-sasl
+Requires: pcre
 Prereq: /sbin/restart_maybe chkconfig
 BuildRequires: openssl-devel >= 0.9.6e
 BuildRequires: expat-devel, expat-libs
@@ -126,6 +127,7 @@
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: autoconf, automake
+BuildRequires: pcre-devel
 URL: http://www.apache.org/
 
 %description

Modified: tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec	2004-06-24 05:12:46 UTC (rev 2162)
+++ tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec	2004-06-24 05:29:21 UTC (rev 2163)
@@ -118,6 +118,7 @@
 Requires: apr-util
 Requires: openldap-libs
 Requires: cyrus-sasl
+Requires: pcre
 Prereq: /sbin/restart_maybe chkconfig
 BuildRequires: openssl-devel >= 0.9.6e
 BuildRequires: expat-devel, expat-libs
@@ -126,6 +127,7 @@
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: autoconf, automake
+BuildRequires: pcre-devel
 URL: http://www.apache.org/
 
 %description


From svn at tinysofa.org  Thu Jun 24 09:28:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 19:28:57 +1000 (EST)
Subject: [tinysofa-svn] r2164 - tinysofa/releases/1.0/apache/current/specs
Message-ID: <20040624092857.C01C54E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 19:28:56 +1000 (Thu, 24 Jun 2004)
New Revision: 2164

Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
Log:
- Fix.


Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 05:29:21 UTC (rev 2163)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 09:28:56 UTC (rev 2164)
@@ -126,8 +126,8 @@
 BuildRequires: gdbm-devel db4-devel mysql-devel
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
-BuildRequires: autoconf, automake
 BuildRequires: pcre-devel
+BuildRequires: autoconf, automake, libtool
 URL: http://www.apache.org/
 
 %description
@@ -327,6 +327,10 @@
 
 autoheader && autoconf || exit 1
 
+pushd srclib/apr
+libtoolize --force
+popd
+
 CFLAGS=`echo "$RPM_OPT_FLAGS" | sed -e 's/-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1//'`
 CPPFLAGS="-DSSL_EXPERIMENTAL_ENGINE"
 export CFLAGS CPPFLAGS
@@ -609,9 +613,6 @@
 
 
 %changelog
-* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-11ts
-- current (2.0.49-11ts) integrated as 2.0.49-11ts for release 1.0-U2
-
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0.49-10ts
 - current (2.0.49-9ts) integrated as 2.0.49-10ts for release 1.0-U2
 


From svn at tinysofa.org  Thu Jun 24 09:29:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 19:29:27 +1000 (EST)
Subject: [tinysofa-svn] 
	r2165 - in tinysofa/releases/1.0/apache: pristine/specs
	releases/2.0.49/11ts/specs
Message-ID: <20040624092927.9B5DE4E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 19:29:27 +1000 (Thu, 24 Jun 2004)
New Revision: 2165

Modified:
   tinysofa/releases/1.0/apache/pristine/specs/apache.spec
   tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec
Log:
- Update.


Modified: tinysofa/releases/1.0/apache/pristine/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/pristine/specs/apache.spec	2004-06-24 09:28:56 UTC (rev 2164)
+++ tinysofa/releases/1.0/apache/pristine/specs/apache.spec	2004-06-24 09:29:27 UTC (rev 2165)
@@ -126,8 +126,8 @@
 BuildRequires: gdbm-devel db4-devel mysql-devel
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
-BuildRequires: autoconf, automake
 BuildRequires: pcre-devel
+BuildRequires: autoconf, automake, libtool
 URL: http://www.apache.org/
 
 %description
@@ -327,6 +327,10 @@
 
 autoheader && autoconf || exit 1
 
+pushd srclib/apr
+libtoolize --force
+popd
+
 CFLAGS=`echo "$RPM_OPT_FLAGS" | sed -e 's/-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1//'`
 CPPFLAGS="-DSSL_EXPERIMENTAL_ENGINE"
 export CFLAGS CPPFLAGS
@@ -609,9 +613,6 @@
 
 
 %changelog
-* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-11ts
-- current (2.0.49-11ts) integrated as 2.0.49-11ts for release 1.0-U2
-
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0.49-10ts
 - current (2.0.49-9ts) integrated as 2.0.49-10ts for release 1.0-U2
 

Modified: tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec	2004-06-24 09:28:56 UTC (rev 2164)
+++ tinysofa/releases/1.0/apache/releases/2.0.49/11ts/specs/apache.spec	2004-06-24 09:29:27 UTC (rev 2165)
@@ -126,8 +126,8 @@
 BuildRequires: gdbm-devel db4-devel mysql-devel
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
-BuildRequires: autoconf, automake
 BuildRequires: pcre-devel
+BuildRequires: autoconf, automake, libtool
 URL: http://www.apache.org/
 
 %description
@@ -327,6 +327,10 @@
 
 autoheader && autoconf || exit 1
 
+pushd srclib/apr
+libtoolize --force
+popd
+
 CFLAGS=`echo "$RPM_OPT_FLAGS" | sed -e 's/-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1//'`
 CPPFLAGS="-DSSL_EXPERIMENTAL_ENGINE"
 export CFLAGS CPPFLAGS
@@ -609,9 +613,6 @@
 
 
 %changelog
-* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-11ts
-- current (2.0.49-11ts) integrated as 2.0.49-11ts for release 1.0-U2
-
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0.49-10ts
 - current (2.0.49-9ts) integrated as 2.0.49-10ts for release 1.0-U2
 


From svn at tinysofa.org  Thu Jun 24 09:47:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 19:47:02 +1000 (EST)
Subject: [tinysofa-svn] 
	r2166 - in tinysofa/releases/1.0/mod_php4: current/specs
	pristine/specs releases/4.3.7/2ts/specs
Message-ID: <20040624094702.BA5194E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 19:47:02 +1000 (Thu, 24 Jun 2004)
New Revision: 2166

Modified:
   tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec
   tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec
   tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec
Log:
- Add pcre-devel.


Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-24 09:29:27 UTC (rev 2165)
+++ tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-24 09:47:02 UTC (rev 2166)
@@ -22,6 +22,7 @@
 BuildRequires: cyrus-imapd-devel, libpng-devel, libjpeg-devel
 BuildRequires: cyrus-sasl-devel, readline-devel, db4-devel
 BuildRequires: rpm-build >= 4.0.4-22gd pam-devel ncurses-devel
+BuildRequires: pcre-devel
 Provides: php = %{version}
 %if !%{_openssl_shared}
 Obsoletes: mod_php4-openssl

Modified: tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec	2004-06-24 09:29:27 UTC (rev 2165)
+++ tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec	2004-06-24 09:47:02 UTC (rev 2166)
@@ -22,6 +22,7 @@
 BuildRequires: cyrus-imapd-devel, libpng-devel, libjpeg-devel
 BuildRequires: cyrus-sasl-devel, readline-devel, db4-devel
 BuildRequires: rpm-build >= 4.0.4-22gd pam-devel ncurses-devel
+BuildRequires: pcre-devel
 Provides: php = %{version}
 %if !%{_openssl_shared}
 Obsoletes: mod_php4-openssl

Modified: tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec	2004-06-24 09:29:27 UTC (rev 2165)
+++ tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec	2004-06-24 09:47:02 UTC (rev 2166)
@@ -22,6 +22,7 @@
 BuildRequires: cyrus-imapd-devel, libpng-devel, libjpeg-devel
 BuildRequires: cyrus-sasl-devel, readline-devel, db4-devel
 BuildRequires: rpm-build >= 4.0.4-22gd pam-devel ncurses-devel
+BuildRequires: pcre-devel
 Provides: php = %{version}
 %if !%{_openssl_shared}
 Obsoletes: mod_php4-openssl


From svn at tinysofa.org  Thu Jun 24 10:06:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 20:06:37 +1000 (EST)
Subject: [tinysofa-svn] 
	r2167 - in tinysofa/releases/1.0/mod_php4: current/specs
	pristine/specs releases/4.3.7/2ts/specs
Message-ID: <20040624100637.8F7284E8037@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 20:06:36 +1000 (Thu, 24 Jun 2004)
New Revision: 2167

Modified:
   tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec
   tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec
   tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec
Log:
- Fix.


Modified: tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-24 09:47:02 UTC (rev 2166)
+++ tinysofa/releases/1.0/mod_php4/current/specs/mod_php4.spec	2004-06-24 10:06:36 UTC (rev 2167)
@@ -205,7 +205,8 @@
 	--with-openssl=/usr \
 %endif
 	--with-dom=shared,/usr \
-        --with-gettext
+        --with-gettext \
+	--with-pcre-regex=/usr
 
 make
 

Modified: tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec	2004-06-24 09:47:02 UTC (rev 2166)
+++ tinysofa/releases/1.0/mod_php4/pristine/specs/mod_php4.spec	2004-06-24 10:06:36 UTC (rev 2167)
@@ -205,7 +205,8 @@
 	--with-openssl=/usr \
 %endif
 	--with-dom=shared,/usr \
-        --with-gettext
+        --with-gettext \
+	--with-pcre-regex=/usr
 
 make
 

Modified: tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec
===================================================================
--- tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec	2004-06-24 09:47:02 UTC (rev 2166)
+++ tinysofa/releases/1.0/mod_php4/releases/4.3.7/2ts/specs/mod_php4.spec	2004-06-24 10:06:36 UTC (rev 2167)
@@ -205,7 +205,8 @@
 	--with-openssl=/usr \
 %endif
 	--with-dom=shared,/usr \
-        --with-gettext
+        --with-gettext \
+	--with-pcre-regex=/usr
 
 make
 


From svn at tinysofa.org  Thu Jun 24 10:52:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 20:52:08 +1000 (EST)
Subject: [tinysofa-svn] r2168 - tinysofa/snapshot/apache
Message-ID: <20040624105208.E270B4E8035@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 20:52:08 +1000 (Thu, 24 Jun 2004)
New Revision: 2168

Removed:
   tinysofa/snapshot/apache/current/
Log:
- Import from 1.0 branch.



From svn at tinysofa.org  Thu Jun 24 10:52:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 20:52:38 +1000 (EST)
Subject: [tinysofa-svn] r2169 - tinysofa/snapshot/apache
Message-ID: <20040624105238.773504E8035@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 20:52:38 +1000 (Thu, 24 Jun 2004)
New Revision: 2169

Added:
   tinysofa/snapshot/apache/current/
Log:
- Import from 1.0 branch.


Copied: tinysofa/snapshot/apache/current (from rev 2168, tinysofa/releases/1.0/apache/current)


From svn at tinysofa.org  Thu Jun 24 10:52:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 20:52:56 +1000 (EST)
Subject: [tinysofa-svn] r2170 - tinysofa/releases/1.0/apache
Message-ID: <20040624105256.ED4484E8035@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 20:52:56 +1000 (Thu, 24 Jun 2004)
New Revision: 2170

Removed:
   tinysofa/releases/1.0/apache/current/
Log:
- Go back.



From svn at tinysofa.org  Thu Jun 24 10:53:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 20:53:22 +1000 (EST)
Subject: [tinysofa-svn] r2171 - tinysofa/releases/1.0/apache
Message-ID: <20040624105322.2AAD34E8035@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 20:53:21 +1000 (Thu, 24 Jun 2004)
New Revision: 2171

Added:
   tinysofa/releases/1.0/apache/current/
Log:
- Go back.


Copied: tinysofa/releases/1.0/apache/current (from rev 2170, tinysofa/releases/1.0/apache/releases/2.0.49/10ts)


From svn at tinysofa.org  Thu Jun 24 10:54:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 20:54:52 +1000 (EST)
Subject: [tinysofa-svn] r2172 - tinysofa/releases/1.0/apache/current/specs
Message-ID: <20040624105452.7083B4E8035@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 20:54:52 +1000 (Thu, 24 Jun 2004)
New Revision: 2172

Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
Log:
- Add mod_auth_ldap.


Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 10:53:21 UTC (rev 2171)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 10:54:52 UTC (rev 2172)
@@ -137,6 +137,8 @@
 	--enable-mods-shared=max \
 	--enable-auth-dbm=shared \
         --enable-auth-digest=shared \
+        --enable-auth-ldap=shared \
+        --with-ldap \
 	--enable-file-cache=shared \
 	--enable-cache=shared \
 	--enable-disk-cache=shared \


From svn at tinysofa.org  Thu Jun 24 10:55:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 20:55:05 +1000 (EST)
Subject: [tinysofa-svn] 
	r2173 - in tinysofa/releases/1.0/apache: current/specs
	releases/2.0.49 releases/2.0.49/12ts/specs
Message-ID: <20040624105505.9761B4E8035@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 20:55:05 +1000 (Thu, 24 Jun 2004)
New Revision: 2173

Added:
   tinysofa/releases/1.0/apache/releases/2.0.49/12ts/
Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
   tinysofa/releases/1.0/apache/releases/2.0.49/12ts/specs/apache.spec
Log:
apache:
  * integrate current (2.0.49-10ts) as releases/2.0.49/12ts

Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 10:54:52 UTC (rev 2172)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 10:55:05 UTC (rev 2173)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 10ts
+Release: 12ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
@@ -399,6 +399,9 @@
 
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-12ts
+- current (2.0.49-10ts) integrated as 2.0.49-12ts for release 1.0-U2
+
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0.49-10ts
 - current (2.0.49-9ts) integrated as 2.0.49-10ts for release 1.0-U2
 

Copied: tinysofa/releases/1.0/apache/releases/2.0.49/12ts (from rev 2172, tinysofa/releases/1.0/apache/current)

Modified: tinysofa/releases/1.0/apache/releases/2.0.49/12ts/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 10:54:52 UTC (rev 2172)
+++ tinysofa/releases/1.0/apache/releases/2.0.49/12ts/specs/apache.spec	2004-06-24 10:55:05 UTC (rev 2173)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 10ts
+Release: 12ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
@@ -399,6 +399,9 @@
 
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-12ts
+- current (2.0.49-10ts) integrated as 2.0.49-12ts for release 1.0-U2
+
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0.49-10ts
 - current (2.0.49-9ts) integrated as 2.0.49-10ts for release 1.0-U2
 


From svn at tinysofa.org  Thu Jun 24 10:55:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 20:55:07 +1000 (EST)
Subject: [tinysofa-svn] r2174 - tinysofa/releases/1.0/apache/pristine
Message-ID: <20040624105507.21E114E8035@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 20:55:06 +1000 (Thu, 24 Jun 2004)
New Revision: 2174

Added:
   tinysofa/releases/1.0/apache/pristine/12ts/
Log:
apache:
  * retarget pristine (2.0.49-11ts) to releases/2.0.49/12ts

Copied: tinysofa/releases/1.0/apache/pristine/12ts (from rev 2173, tinysofa/releases/1.0/apache/releases/2.0.49/12ts)


From svn at tinysofa.org  Thu Jun 24 11:18:14 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 21:18:14 +1000 (EST)
Subject: [tinysofa-svn] 
	r2175 - in tinysofa/releases/1.0/apache: current/specs
	pristine/specs releases/2.0.49/12ts/specs
Message-ID: <20040624111814.9C14F4E8035@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 21:18:14 +1000 (Thu, 24 Jun 2004)
New Revision: 2175

Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
   tinysofa/releases/1.0/apache/pristine/specs/apache.spec
   tinysofa/releases/1.0/apache/releases/2.0.49/12ts/specs/apache.spec
Log:
- Fix buildrequires.


Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 10:55:06 UTC (rev 2174)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 11:18:14 UTC (rev 2175)
@@ -31,6 +31,7 @@
 BuildRequires: expat-devel, expat-libs
 BuildRequires: zlib-devel
 BuildRequires: gdbm-devel db4-devel mysql-devel
+BuildRequires: openldap-devel cyrus-sasl-devel
 URL: http://www.apache.org/
 
 %description

Modified: tinysofa/releases/1.0/apache/pristine/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/pristine/specs/apache.spec	2004-06-24 10:55:06 UTC (rev 2174)
+++ tinysofa/releases/1.0/apache/pristine/specs/apache.spec	2004-06-24 11:18:14 UTC (rev 2175)
@@ -1,15 +1,15 @@
 %define apr_version 0.9.5
-%define vstring tinysofa
-%define contentdir /home/httpd
 
 Summary: HTTP server daemon with SSL
 Name: apache
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 11ts
+Release: 12ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
+Patch0: apache_2.0.45-tinysofa.patch
+Patch1: httpd-2.0.49-CAN-2004-0488.patch
 Source3: httpd.init
 Source4: httpd.log
 Source5: gendummycerts
@@ -17,96 +17,6 @@
 Source7: httpd2-manual.conf
 Source8: SmallSSL.gif
 Source9: tinysofa-html.tar.gz
-
-Patch0: apache_2.0.45-tinysofa.patch
-
-# build/scripts patches
-Patch1: httpd-2.0.40-apctl.patch
-Patch2: httpd-2.0.36-apxs.patch
-Patch3: httpd-2.0.48-linkmods.patch
-Patch4: httpd-2.0.45-deplibs.patch
-Patch5: httpd-2.0.47-pie.patch
-Patch6: httpd-2.0.45-syspcre.patch
-Patch7: httpd-2.0.48-suexeclibs.patch
-Patch8: httpd-2.0.48-vpathinc.patch
-# Bug fixes
-Patch20: httpd-2.0.45-encode.patch
-Patch21: httpd-2.0.45-davetag.patch
-Patch22: httpd-2.0.47-ldapshm.patch
-Patch23: httpd-2.0.46-shmcb.patch
-Patch24: httpd-2.0.46-sslmutex.patch
-Patch25: httpd-2.0.46-md5dig.patch
-Patch26: httpd-2.0.48-proxy11.patch
-Patch27: httpd-2.0.48-sslpphrase.patch
-Patch28: httpd-2.0.48-worker.patch
-Patch29: httpd-2.0.48-workerhup.patch
-Patch30: httpd-2.0.48-davmisc.patch
-Patch31: httpd-2.0.48-limitxml.patch
-Patch32: httpd-2.0.48-vhost.patch
-Patch33: httpd-2.0.46-sslscache.patch
-Patch34: httpd-2.0.49-sslcleanup.patch
-Patch35: httpd-2.0.49-eocbucket.patch
-Patch36: httpd-2.0.49-nolcrash.patch
-Patch37: httpd-2.0.46-autoindex.patch
-Patch38: httpd-2.0.46-deflate2.patch
-Patch39: httpd-2.0.49-suexecsuid.patch
-Patch40: httpd-2.0.49-vhostaddr.patch
-# Features/functional changes
-Patch70: httpd-2.0.48-release.patch
-Patch71: httpd-2.0.40-xfsz.patch
-Patch72: httpd-2.0.40-pod.patch
-Patch73: httpd-2.0.40-noshmht.patch
-Patch74: httpd-2.0.45-export.patch
-Patch75: httpd-2.0.48-dynlimit.patch
-Patch76: httpd-2.0.48-dynamic.patch
-Patch77: httpd-2.0.48-sslstatus.patch
-Patch78: httpd-2.0.48-corelimit.patch
-Patch79: httpd-2.0.46-rolog.patch
-Patch80: httpd-2.0.48-distcache.patch
-Patch81: httpd-2.0.48-debuglog.patch
-Patch82: httpd-2.0.48-abench.patch
-Patch83: httpd-2.0.48-fdsetsize.patch
-Patch84: httpd-2.0.48-sslheader.patch
-Patch85: httpd-2.0.48-sslvars2.patch
-Patch86: httpd-2.0.48-rewritessl.patch
-Patch87: httpd-2.0.49-largefile.patch
-Patch88: httpd-2.0.46-cgibucket.patch
-Patch89: httpd-2.0.49-headerssl.patch
-Patch90: httpd-2.0.49-workerstack.patch
-# Security fixes
-Patch200: httpd-2.0.46-CAN-2004-0488.patch
-
-# apr fixes
-Patch400: apr-0.9.3-deplibs.patch
-Patch401: apr-0.9.3-config.patch
-Patch402: apr-0.9.3-testrand.patch
-Patch403: apr-0.9.3-noipv6.patch
-Patch404: apr-0.9.4-trimlibs.patch
-Patch405: apr-0.9.4-pthread.patch
-Patch406: apr-0.9.4-tests.patch
-Patch407: apr-0.9.4-tempdir.patch
-Patch408: apr-0.9.4-aprofft.patch
-Patch409: apr-0.9.4-dotdot.patch
-Patch410: apr-0.9.4-cflags.patch
-Patch411: apr-0.9.4-mmapzero.patch
-Patch412: apr-0.9.4-largefile.patch
-Patch413: apr-0.9.4-largecopy.patch
-Patch414: apr-0.9.4-gniv4map.patch
-Patch415: apr-0.9.4-time2038.patch
-Patch416: apr-0.9.4-mutextype.patch
-Patch417: apr-0.9.4-permbits.patch
-Patch418: apr-0.9.4-stacksize.patch
-
-# apr-util fixes
-Patch500: apr-util-0.9.3-deplibs.patch
-Patch501: apr-util-0.9.3-config.patch
-Patch502: apr-util-0.9.4-db4.patch
-Patch503: apr-util-0.9.4-gcc34.patch
-Patch504: apr-util-0.9.4-sdbm.patch
-Patch505: apr-util-0.9.4-sdbmnames.patch
-Patch506: apr-util-0.9.4-xlate.patch
-Patch507: apr-util-0.9.4-shapass.patch
-
 License: BSD-like
 Provides: apache-ssl securewebserver webserver apache
 BuildRoot: %{_tmppath}/%{name}-root
@@ -116,18 +26,12 @@
 Requires: expat-libs
 Requires: apr
 Requires: apr-util
-Requires: openldap-libs
-Requires: cyrus-sasl
-Requires: pcre
 Prereq: /sbin/restart_maybe chkconfig
 BuildRequires: openssl-devel >= 0.9.6e
 BuildRequires: expat-devel, expat-libs
 BuildRequires: zlib-devel
 BuildRequires: gdbm-devel db4-devel mysql-devel
-BuildRequires: openldap-devel
-BuildRequires: cyrus-sasl-devel
-BuildRequires: pcre-devel
-BuildRequires: autoconf, automake, libtool
+BuildRequires: openldap-devel cyrus-sasl-devel
 URL: http://www.apache.org/
 
 %description
@@ -203,7 +107,6 @@
 Group: tinysofa official
 Summary: Apache Portable Runtime Utility Library
 Version: %{apr_version}
-Requires: openldap-libs
 
 %description -n apr-util
 The mission of the Apache Portable Runtime (APR) is to provide a
@@ -224,137 +127,19 @@
 
 %prep
 %setup -q -n httpd-%{apache_version}
+%patch0 -p1
+%patch1 -p1
 
-%patch0 -p1 -b .tinysofa
-
-%patch1 -p1 -b .apctl
-%patch2 -p1 -b .apxs
-%patch3 -p1 -b .linkmods
-%patch4 -p1 -b .deplibs
-%patch6 -p1 -b .syspcre
-%patch7 -p1 -b .suexeclibs
-%patch8 -p1 -b .vpathinc
-
-# no -b to prevent droplets in install root
-%patch20 -p1
-%patch21 -p1 -b .davetag
-%patch22 -p1 -b .ldapshm
-%patch23 -p1 -b .shmcb
-%patch24 -p1 -b .sslmutex
-%patch25 -p1 -b .md5dig
-## %patch26 -p1 -b .proxy11 ### NEEDS MERGE
-%patch27 -p1 -b .sslpphrase
-%patch28 -p1 -b .worker
-%patch29 -p1 -b .workerhup
-%patch30 -p1 -b .davmisc
-%patch31 -p1 -b .limitxml
-%patch32 -p1 -b .vhost
-%patch33 -p1 -b .sslscache
-%patch34 -p1 -b .sslcleanup
-%patch35 -p1 -b .eocbucket
-%patch36 -p1 -b .nolcrash
-%patch37 -p1 -b .autoindex
-%patch38 -p1 -b .deflate2
-%patch39 -p1 -b .suexecsuid
-%patch40 -p1 -b .vhostaddr
-
-%patch71 -p0 -b .xfsz
-%patch72 -p1 -b .pod
-%patch73 -p1 -b .noshmht
-%patch74 -p1 -b .export
-%patch75 -p1 -b .dynlimit
-%patch76 -p1 -b .dynamic
-%patch77 -p1 -b .sslstatus
-%patch78 -p1 -b .corelimit
-%patch79 -p1 -b .rolog
-%patch80 -p1 -b .distcache
-%patch81 -p1 -b .debuglog
-%patch82 -p1 -b .abench
-%patch83 -p1 -b .fdsetsize
-%patch84 -p1 -b .sslheader
-%patch85 -p1 -b .sslvars2
-%patch86 -p1 -b .rewritessl
-%patch87 -p1 -b .largefile
-%patch88 -p1 -b .cgibucket
-%patch89 -p1 -b .headerssl
-%patch90 -p1 -b .workerstack
-
-%patch200 -p1 -b .can0488
-
-# Patch in vendor/release string
-sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
-
-# Touch mod_ssl expression parser sources to prevent regenerating it
-touch modules/ssl/ssl_expr_*.[chyl]
-
-pushd srclib/apr
-#%patch400 -p1 -b .deplibs
-#%patch401 -p1 -b .config
-%patch402 -p1 -b .testrand
-%patch403 -p1 -b .noipv6
-%patch404 -p1 -b .trimlibs
-#%patch405 -p1 -b .pthread
-%patch406 -p1 -b .tests
-%patch407 -p1 -b .tempdir
-#%patch408 -p1 -b .aprofft
-#%patch409 -p1 -b .dotdot
-#%patch410 -p1 -b .cflags
-#%patch411 -p1 -b .mmapzero
-%patch412 -p1 -b .largefile
-%patch413 -p1 -b .largecopy
-%patch414 -p1 -b .gniv4map
-%patch415 -p1 -b .time2038
-%patch416 -p1 -b .mutextype
-%patch417 -p1 -b .permbits
-%patch418 -p1 -b .stacksize
-popd
-
-pushd srclib/apr-util
-%patch500 -p1 -b .deplibs
-#%patch501 -p1 -b .config
-#%patch502 -p1 -b .db4
-#%patch503 -p1 -b .gcc34
-#%patch504 -p1 -b .sdbm
-#%patch505 -p1 -b .sdbmnames
-%patch506 -p1 -b .xlate
-%patch507 -p1 -b .shapass
-popd
-
 %build
-
-rm -rf srclib/pcre
-rm -f include/pcreposix.h
-
-autoheader && autoconf || exit 1
-
-pushd srclib/apr
-libtoolize --force
-popd
-
-CFLAGS=`echo "$RPM_OPT_FLAGS" | sed -e 's/-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1//'`
-CPPFLAGS="-DSSL_EXPERIMENTAL_ENGINE"
-export CFLAGS CPPFLAGS
-
-./configure \
+CFLAGS=${RPM_OPT_FLAGS} ./configure \
         %{_target_platform} \
 	--enable-layout=tinysofa \
-        --prefix=%{_sysconfdir}/httpd \
-        --exec-prefix=%{_prefix} \
-        --bindir=%{_bindir} \
-        --sbindir=%{_sbindir} \
-        --mandir=%{_mandir} \
-        --libdir=%{_libdir} \
-        --sysconfdir=%{_sysconfdir}/httpd/conf \
-        --includedir=%{_includedir}/apache \
-        --libexecdir=%{_libdir}/apache \
-        --datadir=%{contentdir} \
-        --with-installbuilddir=/home/httpd/build \
 	--enable-modules=all \
 	--enable-mods-shared=max \
 	--enable-auth-dbm=shared \
         --enable-auth-digest=shared \
         --enable-auth-ldap=shared \
-	--with-ldap \
+        --with-ldap \
 	--enable-file-cache=shared \
 	--enable-cache=shared \
 	--enable-disk-cache=shared \
@@ -372,7 +157,6 @@
 	--enable-proxy-ftp=shared \
 	--enable-proxy-http=shared \
 	--enable-ssl=shared \
-	--with-ssl \
 	--enable-bucketeer=shared \
 	--enable-http \
 	--enable-dav=shared \
@@ -574,8 +358,11 @@
 %{_includedir}/apache/mod_*
 %{_includedir}/apache/mpm*
 %{_includedir}/apache/os.h
+%{_includedir}/apache/pcre.h
+%{_includedir}/apache/pcreposix.h
 %{_includedir}/apache/rfc1413.h
 %{_includedir}/apache/scoreboard.h
+%{_includedir}/apache/ssl*
 %{_includedir}/apache/unixd.h
 %{_includedir}/apache/util_*
 /home/httpd/build
@@ -613,6 +400,9 @@
 
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-12ts
+- current (2.0.49-10ts) integrated as 2.0.49-12ts for release 1.0-U2
+
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.0.49-10ts
 - current (2.0.49-9ts) integrated as 2.0.49-10ts for release 1.0-U2
 

Modified: tinysofa/releases/1.0/apache/releases/2.0.49/12ts/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/releases/2.0.49/12ts/specs/apache.spec	2004-06-24 10:55:06 UTC (rev 2174)
+++ tinysofa/releases/1.0/apache/releases/2.0.49/12ts/specs/apache.spec	2004-06-24 11:18:14 UTC (rev 2175)
@@ -31,6 +31,7 @@
 BuildRequires: expat-devel, expat-libs
 BuildRequires: zlib-devel
 BuildRequires: gdbm-devel db4-devel mysql-devel
+BuildRequires: openldap-devel cyrus-sasl-devel
 URL: http://www.apache.org/
 
 %description


From svn at tinysofa.org  Thu Jun 24 12:55:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 22:55:40 +1000 (EST)
Subject: [tinysofa-svn] 
	r2176 - in tinysofa/releases/1.0/apache/current: sources specs
Message-ID: <20040624125540.79E494E8034@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 22:55:39 +1000 (Thu, 24 Jun 2004)
New Revision: 2176

Added:
   tinysofa/releases/1.0/apache/current/sources/apache-2.0.49-active_directory.patch
Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
Log:
- Add LDAP patches for Active Directory use.


Added: tinysofa/releases/1.0/apache/current/sources/apache-2.0.49-active_directory.patch
===================================================================
--- tinysofa/releases/1.0/apache/current/sources/apache-2.0.49-active_directory.patch	2004-06-24 11:18:14 UTC (rev 2175)
+++ tinysofa/releases/1.0/apache/current/sources/apache-2.0.49-active_directory.patch	2004-06-24 12:55:39 UTC (rev 2176)
@@ -0,0 +1,542 @@
+diff -u -r httpd-2.0.49/modules/experimental/mod_auth_ldap.c httpd-2.1/modules/experimental/mod_auth_ldap.c
+--- httpd-2.0.49/modules/experimental/mod_auth_ldap.c	2004-05-21 00:04:30.000000000 +0200
++++ httpd-2.1/modules/experimental/mod_auth_ldap.c	2004-05-20 23:48:48.000000000 +0200
+@@ -42,7 +42,7 @@
+ #include "http_request.h"
+ #include "util_ldap.h"
+ 
+-#ifndef APU_HAS_LDAP
++#if !APR_HAS_LDAP
+ #error mod_auth_ldap requires APR-util to have LDAP support built in
+ #endif
+ 
+@@ -113,7 +113,6 @@
+ static char* derive_codepage_from_lang (apr_pool_t *p, char *language)
+ {
+     int lang_len;
+-    int check_short = 0;
+     char *charset;
+     
+     if (!language)          /* our default codepage */
+@@ -330,7 +329,6 @@
+ 
+     /* sanity check - if server is down, retry it up to 5 times */
+     if (result == LDAP_SERVER_DOWN) {
+-        util_ldap_connection_destroy(ldc);
+         if (failures++ <= 5) {
+             goto start_over;
+         }
+@@ -475,8 +473,8 @@
+         method_restricted = 1;
+ 	
+         t = reqs[x].requirement;
+-        w = ap_getword_white(r->pool, &t);    
+-
++        w = ap_getword_white(r->pool, &t);
++    
+         if (strcmp(w, "valid-user") == 0) {
+             /*
+              * Valid user will always be true if we authenticated with ldap,
+@@ -953,6 +951,15 @@
+     }
+     */
+ 
++    /* make sure that mod_ldap (util_ldap) is loaded */
++    if (ap_find_linked_module("util_ldap.c") == NULL) {
++        ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
++                     "Module mod_ldap missing. Mod_ldap (aka. util_ldap) "
++                     "must be loaded in order for mod_auth_ldap to function properly");
++        return HTTP_INTERNAL_SERVER_ERROR;
++
++    }
++
+     if (!charset_confname) {
+         return OK;
+     }
+diff -u -r httpd-2.0.49/modules/experimental/NWGNUauthldap httpd-2.1/modules/experimental/NWGNUauthldap
+--- httpd-2.0.49/modules/experimental/NWGNUauthldap	2004-05-21 00:03:17.000000000 +0200
++++ httpd-2.1/modules/experimental/NWGNUauthldap	2004-05-20 23:44:17.000000000 +0200
+@@ -186,7 +186,6 @@
+ 	lldapsdk \
+ 	lldapssl \
+ 	lldapx \
+-	utilldap \
+ 	$(EOLIST)
+ 
+ #
+@@ -210,7 +209,8 @@
+ FILES_nlm_Ximports = \
+ 	util_ldap_connection_find \
+ 	util_ldap_connection_close \
+-	util_ldap_connection_destroy \
++	util_ldap_connection_unbind \
++	util_ldap_connection_cleanup \
+ 	util_ldap_cache_checkuserid \
+ 	util_ldap_cache_compare \
+ 	util_ldap_cache_comparedn \
+diff -u -r httpd-2.0.49/modules/experimental/NWGNUutilldap httpd-2.1/modules/experimental/NWGNUutilldap
+--- httpd-2.0.49/modules/experimental/NWGNUutilldap	2004-05-21 00:03:40.000000000 +0200
++++ httpd-2.1/modules/experimental/NWGNUutilldap	2004-05-20 23:47:02.000000000 +0200
+@@ -223,7 +223,8 @@
+ 	ldap_module \
+ 	util_ldap_connection_find \
+ 	util_ldap_connection_close \
+-	util_ldap_connection_destroy \
++	util_ldap_connection_unbind \
++	util_ldap_connection_cleanup \
+ 	util_ldap_cache_checkuserid \
+ 	util_ldap_cache_compare \
+ 	util_ldap_cache_comparedn \
+diff -u -r httpd-2.0.49/modules/experimental/README httpd-2.1/modules/experimental/README
+--- httpd-2.0.49/modules/experimental/README	2004-05-21 00:03:42.000000000 +0200
++++ httpd-2.1/modules/experimental/README	2004-02-21 13:09:44.000000000 +0200
+@@ -16,7 +16,7 @@
+ the example module did as the various callbacks were made.
+ 
+ To include the example module in your server add --enable-example to the
+-other ./configure arguments executed from the httpd-2.0 directory. After
++other ./configure arguments executed from the httpd-2.1 directory. After
+ that run 'make'.
+ 
+ To add another module of your own:
+diff -u -r httpd-2.0.49/modules/experimental/util_ldap.c httpd-2.1/modules/experimental/util_ldap.c
+--- httpd-2.0.49/modules/experimental/util_ldap.c	2004-05-21 00:06:25.000000000 +0200
++++ httpd-2.1/modules/experimental/util_ldap.c	2004-05-20 23:56:22.000000000 +0200
+@@ -38,7 +38,7 @@
+ #include <unistd.h>
+ #endif
+ 
+-#ifndef APU_HAS_LDAP
++#if !APR_HAS_LDAP
+ #error mod_ldap requires APR-util to have LDAP support built in
+ #endif
+ 
+@@ -88,6 +88,20 @@
+                           "\"http://www.w3.org/TR/REC-html40/frameset.dtd\">\n"
+ #endif
+ 
++
++static void util_ldap_strdup (char **str, const char *newstr)
++{
++    if (*str) {
++        free(*str);
++        *str = NULL;
++    }
++
++    if (newstr) {
++        *str = calloc(1, strlen(newstr)+1);
++        strcpy (*str, newstr);
++    }
++}
++
+ /*
+  * Status Handler
+  * --------------
+@@ -171,32 +185,52 @@
+ 
+ 
+ /*
+- * Destroys an LDAP connection by unbinding. This function is registered
+- * with the pool cleanup function - causing the LDAP connections to be
+- * shut down cleanly on graceful restart.
++ * Destroys an LDAP connection by unbinding and closing the connection to
++ * the LDAP server. It is used to bring the connection back to a known
++ * state after an error, and during pool cleanup.
+  */
+-LDAP_DECLARE_NONSTD(apr_status_t) util_ldap_connection_destroy(void *param)
++LDAP_DECLARE_NONSTD(apr_status_t) util_ldap_connection_unbind(void *param)
+ {
+     util_ldap_connection_t *ldc = param;
+ 
+-    /* unbinding from the LDAP server */
+-    if (ldc->ldap) {
+-        ldap_unbind_s(ldc->ldap);
++    if (ldc) {
++        if (ldc->ldap) {
++            ldap_unbind_s(ldc->ldap);
++            ldc->ldap = NULL;
++        }
+         ldc->bound = 0;
+-        ldc->ldap = NULL;
+     }
+ 
+-    /* release the lock we were using.  The lock should have
+-       already been released in the close connection call.  
+-       But just in case it wasn't, we first try to get the lock
+-       before unlocking it to avoid unlocking an unheld lock. 
+-       Unlocking an unheld lock causes problems on NetWare.  The
+-       other option would be to assume that close connection did
+-       its job. */
+-#if APR_HAS_THREADS
+-    apr_thread_mutex_trylock(ldc->lock);
+-    apr_thread_mutex_unlock(ldc->lock);
+-#endif
++    return APR_SUCCESS;
++}
++
++
++/*
++ * Clean up an LDAP connection by unbinding and unlocking the connection.
++ * This function is registered with the pool cleanup function - causing
++ * the LDAP connections to be shut down cleanly on graceful restart.
++ */
++LDAP_DECLARE_NONSTD(apr_status_t) util_ldap_connection_cleanup(void *param)
++{
++    util_ldap_connection_t *ldc = param;
++
++    if (ldc) {
++
++        /* unbind and disconnect from the LDAP server */
++        util_ldap_connection_unbind(ldc);
++
++        /* free the username and password */
++        if (ldc->bindpw) {
++            free((void*)ldc->bindpw);
++        }
++        if (ldc->binddn) {
++            free((void*)ldc->binddn);
++        }
++
++        /* unlock this entry */
++        util_ldap_connection_close(ldc);
++    
++    }
+ 
+     return APR_SUCCESS;
+ }
+@@ -290,11 +324,6 @@
+         /* always default to LDAP V3 */
+         ldap_set_option(ldc->ldap, LDAP_OPT_PROTOCOL_VERSION, &version);
+ 
+-
+-        /* add the cleanup to the pool */
+-        apr_pool_cleanup_register(ldc->pool, ldc,
+-                                  util_ldap_connection_destroy,
+-                                  apr_pool_cleanup_null);
+     }
+ 
+ 
+@@ -313,9 +342,6 @@
+             break;
+     }
+ 
+-    ldc->bound = 1;
+-    ldc->reason = "LDAP: connection open successful";
+-
+     /* free the handle if there was an error
+     */
+     if (LDAP_SUCCESS != result)
+@@ -325,6 +351,10 @@
+         ldc->bound = 0;
+         ldc->reason = "LDAP: ldap_simple_bind_s() failed";
+     }
++    else {
++        ldc->bound = 1;
++        ldc->reason = "LDAP: connection open successful";
++    }
+ 
+     return(result);
+ }
+@@ -362,18 +392,22 @@
+      */
+     for (l=st->connections,p=NULL; l; l=l->next) {
+ #if APR_HAS_THREADS
+-        if ( (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) &&
+-#else
+-        if (
++        if (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) {
+ #endif
+-            l->port == port
+-	    && strcmp(l->host, host) == 0
+-	    && ( (!l->binddn && !binddn) || (l->binddn && binddn && !strcmp(l->binddn, binddn)) )
+-	    && ( (!l->bindpw && !bindpw) || (l->bindpw && bindpw && !strcmp(l->bindpw, bindpw)) )
+-            && l->deref == deref
+-            && l->secure == secure 
+-            )
++        if ((l->port == port) && (strcmp(l->host, host) == 0) && 
++            ((!l->binddn && !binddn) || (l->binddn && binddn && !strcmp(l->binddn, binddn))) && 
++            ((!l->bindpw && !bindpw) || (l->bindpw && bindpw && !strcmp(l->bindpw, bindpw))) && 
++            (l->deref == deref) && (l->secure == secure)) {
++
+             break;
++        }
++#if APR_HAS_THREADS
++            /* If this connection didn't match the criteria, then we
++             * need to unlock the mutex so it is available to be reused.
++             */
++            apr_thread_mutex_unlock(l->lock);
++        }
++#endif
+         p = l;
+     }
+ 
+@@ -383,21 +417,25 @@
+     if (!l) {
+         for (l=st->connections,p=NULL; l; l=l->next) {
+ #if APR_HAS_THREADS
+-            if ( (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) &&
+-#else
+-            if (
++            if (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) {
++
+ #endif
+-                l->port == port
+-	        && strcmp(l->host, host) == 0
+-                && l->deref == deref
+-                && l->secure == secure
+-                ) {
++            if ((l->port == port) && (strcmp(l->host, host) == 0) && 
++                (l->deref == deref) && (l->secure == secure)) {
++
+                 /* the bind credentials have changed */
+                 l->bound = 0;
+-                l->binddn = apr_pstrdup(st->pool, binddn);
+-                l->bindpw = apr_pstrdup(st->pool, bindpw);
++                util_ldap_strdup((char**)&(l->binddn), binddn);
++                util_ldap_strdup((char**)&(l->bindpw), bindpw);
+                 break;
+             }
++#if APR_HAS_THREADS
++                /* If this connection didn't match the criteria, then we
++                 * need to unlock the mutex so it is available to be reused.
++                 */
++                apr_thread_mutex_unlock(l->lock);
++            }
++#endif
+             p = l;
+         }
+     }
+@@ -426,10 +464,15 @@
+         l->host = apr_pstrdup(st->pool, host);
+         l->port = port;
+         l->deref = deref;
+-        l->binddn = apr_pstrdup(st->pool, binddn);
+-        l->bindpw = apr_pstrdup(st->pool, bindpw);
++        util_ldap_strdup((char**)&(l->binddn), binddn);
++        util_ldap_strdup((char**)&(l->bindpw), bindpw);
+         l->secure = secure;
+ 
++        /* add the cleanup to the pool */
++        apr_pool_cleanup_register(l->pool, l,
++                                  util_ldap_connection_cleanup,
++                                  apr_pool_cleanup_null);
++
+         if (p) {
+             p->next = l;
+         }
+@@ -531,8 +574,8 @@
+     if ((result = ldap_search_ext_s(ldc->ldap, const_cast(reqdn), LDAP_SCOPE_BASE, 
+ 				    "(objectclass=*)", NULL, 1, 
+ 				    NULL, NULL, NULL, -1, &res)) == LDAP_SERVER_DOWN) {
+-        util_ldap_connection_close(ldc);
+         ldc->reason = "DN Comparison ldap_search_ext_s() failed with server down";
++        util_ldap_connection_unbind(ldc);
+         goto start_over;
+     }
+     if (result != LDAP_SUCCESS) {
+@@ -584,7 +627,7 @@
+     util_url_node_t curnode;
+     util_compare_node_t *compare_nodep;
+     util_compare_node_t the_compare_node;
+-    apr_time_t curtime;
++    apr_time_t curtime = 0; /* silence gcc -Wall */
+     int failures = 0;
+ 
+     util_ldap_state_t *st = 
+@@ -660,8 +703,8 @@
+     if ((result = ldap_compare_s(ldc->ldap, const_cast(dn), const_cast(attrib), const_cast(value)))
+         == LDAP_SERVER_DOWN) { 
+         /* connection failed - try again */
+-        util_ldap_connection_close(ldc);
+         ldc->reason = "ldap_compare_s() failed with server down";
++        util_ldap_connection_unbind(ldc);
+         goto start_over;
+     }
+ 
+@@ -781,6 +824,7 @@
+ 				    const_cast(filter), attrs, 0, 
+ 				    NULL, NULL, NULL, -1, &res)) == LDAP_SERVER_DOWN) {
+         ldc->reason = "ldap_search_ext_s() for user failed with server down";
++        util_ldap_connection_unbind(ldc);
+         goto start_over;
+     }
+ 
+@@ -809,7 +853,7 @@
+ 
+     /* Grab the dn, copy it into the pool, and free it again */
+     dn = ldap_get_dn(ldc->ldap, entry);
+-    *binddn = apr_pstrdup(st->pool, dn);
++    *binddn = apr_pstrdup(r->pool, dn);
+     ldap_memfree(dn);
+ 
+     /* 
+@@ -835,6 +879,7 @@
+          LDAP_SERVER_DOWN) {
+         ldc->reason = "ldap_simple_bind_s() to check user credentials failed with server down";
+         ldap_msgfree(res);
++        util_ldap_connection_unbind(ldc);
+         goto start_over;
+     }
+ 
+@@ -842,8 +887,18 @@
+     if (result != LDAP_SUCCESS) {
+         ldc->reason = "ldap_simple_bind_s() to check user credentials failed";
+         ldap_msgfree(res);
++        util_ldap_connection_unbind(ldc);
+         return result;
+     }
++    else {
++        /*
++         * We have just bound the connection to a different user and password
++         * combination, which might be reused unintentionally next time this
++         * connection is used from the connection pool. To ensure no confusion,
++         * we mark the connection as unbound.
++         */
++        ldc->bound = 0;
++    }
+ 
+     /*
+      * Get values for the provided attributes.
+@@ -873,22 +928,23 @@
+     /* 		
+      * Add the new username to the search cache.
+      */
+-    LDAP_CACHE_WRLOCK();
+-    the_search_node.username = filter;
+-    the_search_node.dn = *binddn;
+-    the_search_node.bindpw = bindpw;
+-    the_search_node.lastbind = apr_time_now();
+-    the_search_node.vals = vals;
+     if (curl) {
++        LDAP_CACHE_WRLOCK();
++        the_search_node.username = filter;
++        the_search_node.dn = *binddn;
++        the_search_node.bindpw = bindpw;
++        the_search_node.lastbind = apr_time_now();
++        the_search_node.vals = vals;
+         util_ald_cache_insert(curl->search_cache, &the_search_node);
++        LDAP_CACHE_UNLOCK();
+     }
+     ldap_msgfree(res);
+-    LDAP_CACHE_UNLOCK();
+ 
+     ldc->reason = "Authentication successful";
+     return LDAP_SUCCESS;
+ }
+ 
++
+ /*
+  * Reports if ssl support is enabled 
+  *
+@@ -916,8 +972,9 @@
+     st->cache_bytes = atol(bytes);
+ 
+     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->server, 
+-                      "[%d] ldap cache: Setting shared memory cache size to %d bytes.", 
+-                      getpid(), st->cache_bytes);
++                 "[%" APR_PID_T_FMT "] ldap cache: Setting shared memory "
++                 " cache size to %" APR_SIZE_T_FMT " bytes.", 
++                 getpid(), st->cache_bytes);
+ 
+     return NULL;
+ }
+@@ -1025,7 +1082,7 @@
+ }
+ 
+ 
+-const char *util_ldap_set_cert_type(cmd_parms *cmd, void *dummy, const char *Type)
++static const char *util_ldap_set_cert_type(cmd_parms *cmd, void *dummy, const char *Type)
+ {
+     util_ldap_state_t *st = 
+     (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config, 
+@@ -1073,19 +1130,16 @@
+ 
+ static apr_status_t util_ldap_cleanup_module(void *data)
+ {
++#if APR_HAS_LDAP_SSL && APR_HAS_NOVELL_LDAPSDK
+     server_rec *s = data;
+-
+     util_ldap_state_t *st = (util_ldap_state_t *)ap_get_module_config(
+-                                          s->module_config, &ldap_module);
++        s->module_config, &ldap_module);
++    
++    if (st->ssl_support)
++        ldapssl_client_deinit();
+ 
+-    #if APR_HAS_LDAP_SSL
+-        #if APR_HAS_NOVELL_LDAPSDK
+-            if (st->ssl_support)
+-                ldapssl_client_deinit();
+-        #endif
+-    #endif
+-   
+-    return(APR_SUCCESS);
++#endif
++    return APR_SUCCESS;
+ }
+ 
+ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, 
+@@ -1115,7 +1169,7 @@
+         s_vhost = s->next;
+         while (s_vhost) {
+             ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, result, s, 
+-                         "LDAP merging Shared Cache conf: shm=0x%x rmm=0x%x for VHOST: %s",
++                         "LDAP merging Shared Cache conf: shm=0x%pp rmm=0x%pp for VHOST: %s",
+                          st->cache_shm, st->cache_rmm, s_vhost->server_hostname);
+ 
+             st_vhost = (util_ldap_state_t *)ap_get_module_config(s_vhost->module_config, &ldap_module);
+diff -u -r httpd-2.0.49/modules/experimental/util_ldap_cache.c httpd-2.1/modules/experimental/util_ldap_cache.c
+--- httpd-2.0.49/modules/experimental/util_ldap_cache.c	2004-05-21 00:06:34.000000000 +0200
++++ httpd-2.1/modules/experimental/util_ldap_cache.c	2004-02-21 21:50:12.000000000 +0200
+@@ -25,7 +25,7 @@
+ #include "util_ldap.h"
+ #include "util_ldap_cache.h"
+ 
+-#ifdef APU_HAS_LDAP
++#if APR_HAS_LDAP
+ 
+ #if APR_HAS_SHARED_MEMORY
+ #define MODLDAP_SHMEM_CACHE "/tmp/mod_ldap_cache"
+@@ -292,4 +292,4 @@
+ }
+ 
+ 
+-#endif /* APU_HAS_LDAP */
++#endif /* APR_HAS_LDAP */
+diff -u -r httpd-2.0.49/modules/experimental/util_ldap_cache.h httpd-2.1/modules/experimental/util_ldap_cache.h
+--- httpd-2.0.49/modules/experimental/util_ldap_cache.h	2004-05-21 00:06:38.000000000 +0200
++++ httpd-2.1/modules/experimental/util_ldap_cache.h	2004-02-21 21:50:12.000000000 +0200
+@@ -21,7 +21,7 @@
+  */
+ 
+ /* this whole thing disappears if LDAP is not enabled */
+-#ifdef APU_HAS_LDAP
++#if APR_HAS_LDAP
+ 
+ 
+ /*
+@@ -195,5 +195,5 @@
+ char *util_ald_cache_display_stats(apr_pool_t *p, util_ald_cache_t *cache,
+                                  char *name);
+ 
+-#endif /* APU_HAS_LDAP */
++#endif /* APR_HAS_LDAP */
+ #endif /* APU_LDAP_CACHE_H */
+diff -u -r httpd-2.0.49/modules/experimental/util_ldap_cache_mgr.c httpd-2.1/modules/experimental/util_ldap_cache_mgr.c
+--- httpd-2.0.49/modules/experimental/util_ldap_cache_mgr.c	2004-05-21 00:06:40.000000000 +0200
++++ httpd-2.1/modules/experimental/util_ldap_cache_mgr.c	2004-02-21 21:50:12.000000000 +0200
+@@ -26,7 +26,7 @@
+ #include "util_ldap_cache.h"
+ #include <apr_strings.h>
+ 
+-#ifdef APU_HAS_LDAP
++#if APR_HAS_LDAP
+ 
+ /* only here until strdup is gone */
+ #include <string.h>
+@@ -515,4 +515,4 @@
+     return buf;
+ }
+ 
+-#endif /* APU_HAS_LDAP */
++#endif /* APR_HAS_LDAP */

Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 11:18:14 UTC (rev 2175)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 12:55:39 UTC (rev 2176)
@@ -10,6 +10,7 @@
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
 Patch1: httpd-2.0.49-CAN-2004-0488.patch
+Patch2: apache-2.0.49-active_directory.patch
 Source3: httpd.init
 Source4: httpd.log
 Source5: gendummycerts
@@ -129,6 +130,7 @@
 %setup -q -n httpd-%{apache_version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 CFLAGS=${RPM_OPT_FLAGS} ./configure \


From svn at tinysofa.org  Thu Jun 24 12:56:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 22:56:20 +1000 (EST)
Subject: [tinysofa-svn] 
	r2177 - in tinysofa/releases/1.0/apache: current/specs
	releases/2.0.49 releases/2.0.49/13ts/specs
Message-ID: <20040624125620.293854E8034@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 22:56:19 +1000 (Thu, 24 Jun 2004)
New Revision: 2177

Added:
   tinysofa/releases/1.0/apache/releases/2.0.49/13ts/
Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
   tinysofa/releases/1.0/apache/releases/2.0.49/13ts/specs/apache.spec
Log:
apache:
  * integrate current (2.0.49-12ts) as releases/2.0.49/13ts

Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 12:55:39 UTC (rev 2176)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 12:56:19 UTC (rev 2177)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 12ts
+Release: 13ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
@@ -402,6 +402,9 @@
 
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-13ts
+- current (2.0.49-12ts) integrated as 2.0.49-13ts for release 1.0-U2
+
 * Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-12ts
 - current (2.0.49-10ts) integrated as 2.0.49-12ts for release 1.0-U2
 

Copied: tinysofa/releases/1.0/apache/releases/2.0.49/13ts (from rev 2176, tinysofa/releases/1.0/apache/current)

Modified: tinysofa/releases/1.0/apache/releases/2.0.49/13ts/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-24 12:55:39 UTC (rev 2176)
+++ tinysofa/releases/1.0/apache/releases/2.0.49/13ts/specs/apache.spec	2004-06-24 12:56:19 UTC (rev 2177)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 12ts
+Release: 13ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
@@ -402,6 +402,9 @@
 
 
 %changelog
+* Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-13ts
+- current (2.0.49-12ts) integrated as 2.0.49-13ts for release 1.0-U2
+
 * Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-12ts
 - current (2.0.49-10ts) integrated as 2.0.49-12ts for release 1.0-U2
 


From svn at tinysofa.org  Thu Jun 24 12:56:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu, 24 Jun 2004 22:56:22 +1000 (EST)
Subject: [tinysofa-svn] r2178 - tinysofa/releases/1.0/apache/pristine
Message-ID: <20040624125622.39A5F4E8034@minbar.tinysofa.org>

Author: omar
Date: 2004-06-24 22:56:21 +1000 (Thu, 24 Jun 2004)
New Revision: 2178

Added:
   tinysofa/releases/1.0/apache/pristine/13ts/
Log:
apache:
  * retarget pristine (2.0.49-12ts) to releases/2.0.49/13ts

Copied: tinysofa/releases/1.0/apache/pristine/13ts (from rev 2177, tinysofa/releases/1.0/apache/releases/2.0.49/13ts)


From svn at tinysofa.org  Thu Jun 24 15:59:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Jun 2004 01:59:40 +1000 (EST)
Subject: [tinysofa-svn] 
	r2180 - in tinysofa/snapshot/groff/current: sources specs
Message-ID: <20040624155940.4491B4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-25 01:59:40 +1000 (Fri, 25 Jun 2004)
New Revision: 2180

Added:
   tinysofa/snapshot/groff/current/sources/nroff
Modified:
   tinysofa/snapshot/groff/current/specs/groff.spec
Log:
- add i18n support from Fedora


Added: tinysofa/snapshot/groff/current/sources/nroff
===================================================================
--- tinysofa/snapshot/groff/current/sources/nroff	2004-06-24 15:53:33 UTC (rev 2179)
+++ tinysofa/snapshot/groff/current/sources/nroff	2004-06-24 15:59:40 UTC (rev 2180)
@@ -0,0 +1,73 @@
+#!/bin/bash
+# Emulate nroff with groff.
+
+prog="$0"
+charset_in=iso-8859-1
+charset_out=`locale charmap 2>/dev/null`
+opts=
+
+for i
+do
+  case $1 in
+    -c)
+      opts="$opts -P-c" ;;
+    -h)
+      opts="$opts -P-h" ;;
+    -[eq] | -s* | -u* | -T* )
+      # ignore these options
+      ;;
+    -[mrnoT])
+      echo $"option $1 requires an argument" >&2
+      exit 1 ;;
+    -[iptSUC] | -[mrno]*)
+      opts="$opts $1" ;;
+    -v | --version)
+      echo $"GNU nroff (groff) with Red Hat i18n/l10n support"
+      exit 0 ;;
+    --legacy)
+      shift
+      charset_in=$1 ;;
+    --help)
+      echo $"usage: $prog [-cChipt] [-mNAME] [-nNUM] [--legacy CHARSET] [-oLIST] [-rCN] [FILE...]"
+      exit 0 ;;
+    --)
+      shift
+      break ;;
+    -)
+      break ;;
+    -*)
+      echo $"$prog: invalid option $1" >&2
+      exit 1 ;;
+    *)
+      break ;;
+  esac
+  shift
+done
+
+TMPFILE=$(mktemp /tmp/man.XXXXXX)
+trap "rm -f $TMPFILE" 0 1 2 3 15
+
+cat ${1+"$@"} > ${TMPFILE}
+
+if iconv -f utf-8 -t utf-8 -o /dev/null ${TMPFILE} 2>/dev/null
+then
+  charset_in=utf-8  
+else
+  echo XXX
+  echo XXX $"WARNING: old character encoding and/or character set"
+  echo XXX
+fi
+
+# en_US is chosen arbitrarily; any UTF-8 locale should work
+export LC_ALL=en_US.UTF-8
+
+# This shell script is intended for use with man, so warnings are
+# probably not wanted.  Also load nroff-style character definitions.
+
+/usr/bin/iconv -f ${charset_in} -t utf-8 ${TMPFILE} | \
+    /usr/bin/groff -mtty-char -Tutf8 $opts 2>/dev/null | \
+    /usr/bin/iconv -f utf-8 -t ${charset_out}//translit
+
+rm -f ${TMPFILE}
+
+# eof

Modified: tinysofa/snapshot/groff/current/specs/groff.spec
===================================================================
--- tinysofa/snapshot/groff/current/specs/groff.spec	2004-06-24 15:53:33 UTC (rev 2179)
+++ tinysofa/snapshot/groff/current/specs/groff.spec	2004-06-24 15:59:40 UTC (rev 2180)
@@ -1,14 +1,17 @@
 Summary: A document formatting system.
 Name: groff
 Version: 1.19.1
-Release: 1ts
+Release: 2jh
 License: GPL
-Group: tinysofa official
+Group: tinysofa/main
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
 Source1: troff-to-ps.fpi
+Source2: nroff
 Requires: mktemp gcc-c++-runtime
+Requires: /usr/bin/iconv
 BuildRequires: byacc gcc-c++-devel
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Provides: nroff-i18n
 Obsoletes: groff-tools
 
 %description
@@ -25,6 +28,7 @@
 %package perl
 Summary: Parts of the groff formatting system that require Perl.
 Group: tinysofa official
+Requires: perl
 
 %description perl
 groff-perl contains the parts of the groff text processor
@@ -33,22 +37,25 @@
 grog utility that can be used to automatically determine
 groff command-line options, and the troff-to-ps print filter.
 
+
 %prep
 %setup -q
 
+
 %build
 PATH=$PATH:/usr/X11R6/bin
-CXX='g++' CC='gcc' CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s\
-	 ./configure --prefix=/usr \
-		--enable-japanese
-make
+%configure --enable-japanese --enable-multibyte
 
+%make
+
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 PATH=$PATH:/usr/X11R6/bin
-mkdir -p $RPM_BUILD_ROOT/usr/share
-make install prefix=$RPM_BUILD_ROOT/usr
-mv $RPM_BUILD_ROOT/usr/man $RPM_BUILD_ROOT/usr/share
+
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_prefix}
+
+%makeinstall manroot=${RPM_BUILD_ROOT}/%{_mandir}
+
 ln -s s.tmac    ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gs.tmac
 ln -s mse.tmac  ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gmse.tmac
 ln -s m.tmac    ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gm.tmac
@@ -79,31 +86,36 @@
 install -m755 $RPM_SOURCE_DIR/troff-to-ps.fpi \
 	$RPM_BUILD_ROOT/usr/lib/rhs/rhs-printfilters
 
+install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/nroff
+
 #cd ..
 find $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT%{_mandir} -type f -o -type l | \
 	egrep -v 'afmtodit|grog|mdoc.samples|mmroff' | \
 	sed "s|$RPM_BUILD_ROOT||g" | sed "s|\.[0-9]|\.*|g" > groff-files
 
-rm -rf $RPM_BUILD_ROOT/usr/info
+%nuke_info
 rm -rf $RPM_BUILD_ROOT/usr/share/doc
 
+
 %files -f groff-files
 %defattr(-,root,root)
 /usr/share/groff
 
 %files perl
 %defattr(-,root,root)
-/usr/bin/grog
-/usr/bin/mmroff
-/usr/bin/afmtodit
+%{_bindir}/grog
+%{_bindir}/mmroff
+%{_bindir}/afmtodit
 %{_mandir}/man1/afmtodit.*
 %{_mandir}/man1/grog.*
 %{_mandir}/man1/mmroff.*
-/usr/lib/rhs/*/*
+%{_libdir}/rhs/*/*
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %changelog
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.19.1-1ts
 - current (1.19.1-1ok) integrated as 1.19.1-1ts for release 1.0-U1


From svn at tinysofa.org  Fri Jun 25 13:01:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Fri, 25 Jun 2004 23:01:24 +1000 (EST)
Subject: [tinysofa-svn] r2181 - tinysofa/snapshot/mod_php4/current/specs
Message-ID: <20040625130124.6635F4E8033@minbar.tinysofa.org>

Author: bg
Date: 2004-06-25 23:01:23 +1000 (Fri, 25 Jun 2004)
New Revision: 2181

Modified:
   tinysofa/snapshot/mod_php4/current/specs/mod_php4.spec
Log:
fixed the spec, to make the sub package need the proper version-release. 
and mod_php4-mysql does not need zlib-devel


Modified: tinysofa/snapshot/mod_php4/current/specs/mod_php4.spec
===================================================================
--- tinysofa/snapshot/mod_php4/current/specs/mod_php4.spec	2004-06-24 15:59:40 UTC (rev 2180)
+++ tinysofa/snapshot/mod_php4/current/specs/mod_php4.spec	2004-06-25 13:01:23 UTC (rev 2181)
@@ -7,7 +7,7 @@
 Summary: The PHP4 HTML-embedded scripting language for use with Apache.
 Name: mod_php4
 Version: 4.3.7
-Release: 1gd
+Release: 2bg
 Group: tinysofa official
 Source0: http://www.php.net/distributions/php-%{version}.tar.bz2
 Source1: php.ini
@@ -52,7 +52,7 @@
 %package openssl 
 Summary: OpenSSL/PHP4 support
 Group: tinysofa official
-Requires: mod_php4
+Requires: mod_php4 = %{version}-%{release}
 %description openssl 
 OpenSSL support module for PHP4
 
@@ -62,7 +62,7 @@
 %package exif
 Summary: Exif/PHP4 support
 Group: tinysofa official
-Requires: mod_php4
+Requires: mod_php4 = %{version}-%{release}
 %description exif 
 EXIF support module for PHP4
 
@@ -71,7 +71,7 @@
 %package gd
 Summary: GD/PHP4 support
 Group: tinysofa official
-Requires: mod_php4
+Requires: mod_php4 = %{version}-%{release}
 %description gd 
 GD support module for PHP4
 
@@ -81,7 +81,7 @@
 Summary: IMAP/PHP4 support
 Group: tinysofa official
 BuildRequires: uw-imap-devel openssl-devel
-Requires: openssl mod_php4
+Requires: openssl mod_php4 = %{version}-%{release}
 %description imap
 IMAP support module for PHP4
 
@@ -90,7 +90,7 @@
 %package ldap
 Summary: LDAP/PHP4 support
 Group: tinysofa official
-Requires: openldap mod_php4
+Requires: openldap mod_php4 = %{version}-%{release}
 BuildRequires: openldap-devel 
 %description ldap
 LDAP support module for PHP4
@@ -100,7 +100,7 @@
 %package mysql
 Summary: MySQL/PHP4 support
 Group: tinysofa official
-Requires: mysql-libs zlib-devel mod_php4
+Requires: mysql-libs mod_php4 = %{version}-%{release}
 %description mysql
 MySQL support module for PHP4
 
@@ -109,7 +109,7 @@
 %package pgsql
 Summary: PostgreSQL/PHP4 support
 Group: tinysofa official
-Requires: postgresql-libs mod_php4
+Requires: postgresql-libs mod_php4 = %{version}-%{release}
 %description pgsql
 PostgreSQL support module for PHP4
 
@@ -134,7 +134,7 @@
 Summary: OpenSSL/PHP4 support
 Group: tinysofa official
 BuildRequires: libxml2-devel 
-Requires: libxml2 mod_php4
+Requires: libxml2 mod_php4 = %{version}-%{release}
 
 %description domxml 
 The mod_php4-domxml package is a dynamic shared object (DSO) that adds
@@ -147,7 +147,7 @@
 %package sysv
 Summary: SYSV SEM and SHM/PHP4 support
 Group: tinysofa official
-Requires: mod_php4
+Requires: mod_php4 = %{version}-%{release}
 %description sysv
 Semaphore functions using System V semaphores for PHP.
 Shared memory functions using System V IPC for PHP.
@@ -261,7 +261,6 @@
 %doc README.SELF-CONTAINED-EXTENSIONS README.STREAMS README.SUBMITTING_PATCH
 %doc README.TESTING README.UNIX-BUILD-SYSTEM TODO
 /usr/bin/pear
-/usr/bin/php-config
 /usr/bin/phpextdist
 /usr/bin/phpize
 %dir /usr/lib/php
@@ -315,6 +314,7 @@
 
 %files devel
 %defattr(-,root,root)
+/usr/bin/php-config
 /usr/include/php
 
 %files test
@@ -332,6 +332,10 @@
 /usr/share/php4/sysvshm.so
 
 %changelog
+* Fri Jun 25 2004 Goetz Bock <bg at tinysofa dot org> 4.3.7-2bg
+- made the dynamic modules require the version of mod_php they were build from
+- the mysql modules does not need zlib-devel
+
 * Sun Jun  6 2004 Gerald Dachs <gda at tinysofa dot org> 4.3.7-1gd
 - New upstream
 


From svn at tinysofa.org  Sun Jun 27 12:45:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 22:45:00 +1000 (EST)
Subject: [tinysofa-svn] r2182 - tinysofa/snapshot/rp-pppoe/current/specs
Message-ID: <20040627124500.20F1E4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 22:44:59 +1000 (Sun, 27 Jun 2004)
New Revision: 2182

Modified:
   tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec
Log:
if ppp is not installed during build time, then the adsl scripts
  gets broken. Fixed build requirements accordingly.


Modified: tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec
===================================================================
--- tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec	2004-06-25 13:01:23 UTC (rev 2181)
+++ tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec	2004-06-27 12:44:59 UTC (rev 2182)
@@ -1,17 +1,16 @@
 Summary: PPP Over Ethernet (xDSL support)
 Name: rp-pppoe
 Version: 3.5
-Release: 14jh
+Release: 14gd
 License: GPL
-Group: tinysofa/extra
+Group: tinysofa official
 Source: http://www.roaringpenguin.com/pppoe/%{name}-%{version}.tar.gz
 Url: http://www.roaringpenguin.com/pppoe/
 Patch1: %{name}-3.5-makefile.patch
-Patch2: rp-pppoe-try-restart.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: perl
+BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: perl ppp >= 2.3.7
 Requires: ppp >= 2.3.7
-%service_requires
+PreReq: chkconfig /sbin/restart_maybe
 
 %description
 PPPoE (Point-to-Point Protocol over Ethernet) is a protocol used by
@@ -22,13 +21,10 @@
 modifications. It is fully compliant with RFC 2516, the official PPPoE
 specification.
 
-
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 
-
 %build
 perl -pi -e "s/^# chkconfig:.*$/# chkconfig: - 11 89/" scripts/adsl-init.in
 perl -pi -e "s/rc\.d\/init\.d/init.d/g" scripts/adsl-init.in
@@ -36,43 +32,45 @@
 perl -pi -e "s/^DNSTYPE=SERVER/DNSTYPE=NOCHANGE/" configs/pppoe.conf
 cd src
 %configure
-%make
+make
 
 %install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 cd src
 %makeinstall docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %post
-%service_post adsl
+# Create new system startup links
+chkconfig --add adsl
+/sbin/restart_maybe adsl
 
 %preun
-%service_preun adsl
+if [ $1 = 0 ]; then
+  /etc/init.d/adsl stop >&2
+  chkconfig --del adsl
+fi
 
-%postun
-%service_postun adsl
-
 %clean
-%clean_buildroot
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root)
 %doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README
-%config(noreplace) %{_sysconfdir}/ppp/pppoe.conf
-%config(noreplace) %{_sysconfdir}/ppp/pppoe-server-options
-%config(noreplace) %{_sysconfdir}/ppp/firewall-masq
-%config(noreplace) %{_sysconfdir}/ppp/firewall-standalone
-%{_sysconfdir}/ppp/plugins/*
-%{_sbindir}/pppoe
-%{_sbindir}/pppoe-server
-%{_sbindir}/pppoe-sniff
-%{_sbindir}/pppoe-relay
-%{_sbindir}/adsl-connect
-%{_sbindir}/adsl-start
-%{_sbindir}/adsl-stop
-%{_sbindir}/adsl-setup
-%{_sbindir}/adsl-status
+%config(noreplace) /etc/ppp/pppoe.conf
+%config(noreplace) /etc/ppp/pppoe-server-options
+%config(noreplace) /etc/ppp/firewall-masq
+%config(noreplace) /etc/ppp/firewall-standalone
+/etc/ppp/plugins/*
+/usr/sbin/pppoe
+/usr/sbin/pppoe-server
+/usr/sbin/pppoe-sniff
+/usr/sbin/pppoe-relay
+/usr/sbin/adsl-connect
+/usr/sbin/adsl-start
+/usr/sbin/adsl-stop
+/usr/sbin/adsl-setup
+/usr/sbin/adsl-status
 %{_mandir}/man5/pppoe.conf.5*
 %{_mandir}/man8/pppoe.8*
 %{_mandir}/man8/pppoe-server.8*
@@ -83,12 +81,12 @@
 %{_mandir}/man8/adsl-stop.8*
 %{_mandir}/man8/adsl-status.8*
 %{_mandir}/man8/adsl-setup.8*
-%{_initrddir}/adsl
+/etc/init.d/adsl
 
 %changelog
-* Wed Jun 23 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.5-14jh
-- use macros
-- add try-restart target to init script
+* Sat Jun 26 2004 Gerald Dachs <gda at tinysofa dot org> 3.5-14gd
+- if ppp is not installed during build time, then the adsl scripts
+  gets broken. Fixed build requirements accordingly.
 
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 3.5-13ts
 - current (3.5-12ts) integrated as 3.5-13ts for release 1.0-U1


From svn at tinysofa.org  Sun Jun 27 12:49:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 22:49:06 +1000 (EST)
Subject: [tinysofa-svn] r2183 - tinysofa/snapshot/rp-pppoe
Message-ID: <20040627124906.2939A4E8033@minbar.tinysofa.org>

Author: bg
Date: 2004-06-27 22:49:05 +1000 (Sun, 27 Jun 2004)
New Revision: 2183

Removed:
   tinysofa/snapshot/rp-pppoe/pristine/
Log:
retaggint pristine, part1


From svn at tinysofa.org  Sun Jun 27 13:13:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:13:59 +1000 (EST)
Subject: [tinysofa-svn] r2185 - contrib/amavisd-new
Message-ID: <20040627131359.B46EE4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:13:59 +1000 (Sun, 27 Jun 2004)
New Revision: 2185

Added:
   contrib/amavisd-new/pristine/
Log:
New in contrib


Copied: contrib/amavisd-new/pristine (from rev 2184, contrib/amavisd-new/current)


From svn at tinysofa.org  Sun Jun 27 13:14:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:14:54 +1000 (EST)
Subject: [tinysofa-svn] r2186 - contrib/amavisd-new
Message-ID: <20040627131454.B19AF4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:14:54 +1000 (Sun, 27 Jun 2004)
New Revision: 2186

Added:
   contrib/amavisd-new/releases/
Log:
New in contrib



From svn at tinysofa.org  Sun Jun 27 13:15:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:15:21 +1000 (EST)
Subject: [tinysofa-svn] r2187 - contrib/amavisd-new/releases
Message-ID: <20040627131521.6FBC14E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:15:21 +1000 (Sun, 27 Jun 2004)
New Revision: 2187

Added:
   contrib/amavisd-new/releases/0.0.20040623/
Log:
New in contrib



From svn at tinysofa.org  Sun Jun 27 13:15:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:15:46 +1000 (EST)
Subject: [tinysofa-svn] r2188 - contrib/amavisd-new/releases/0.0.20040623
Message-ID: <20040627131546.150224E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:15:45 +1000 (Sun, 27 Jun 2004)
New Revision: 2188

Added:
   contrib/amavisd-new/releases/0.0.20040623/1gd/
Log:
New in contrib


Copied: contrib/amavisd-new/releases/0.0.20040623/1gd (from rev 2187, contrib/amavisd-new/current)


From svn at tinysofa.org  Sun Jun 27 13:48:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:48:31 +1000 (EST)
Subject: [tinysofa-svn] r2189 - in contrib: . perl-unicode-string
	perl-unicode-string/current perl-unicode-string/current/sources
	perl-unicode-string/current/specs
Message-ID: <20040627134831.CFAB34E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:48:31 +1000 (Sun, 27 Jun 2004)
New Revision: 2189

Added:
   contrib/perl-unicode-string/
   contrib/perl-unicode-string/current/
   contrib/perl-unicode-string/current/sources/
   contrib/perl-unicode-string/current/sources/Unicode-String-2.07.tar.gz
   contrib/perl-unicode-string/current/specs/
   contrib/perl-unicode-string/current/specs/perl-unicode-string.spec
Log:
New in contrib


Added: contrib/perl-unicode-string/current/sources/Unicode-String-2.07.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-unicode-string/current/sources/Unicode-String-2.07.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-unicode-string/current/specs/perl-unicode-string.spec
===================================================================
--- contrib/perl-unicode-string/current/specs/perl-unicode-string.spec	2004-06-27 13:15:45 UTC (rev 2188)
+++ contrib/perl-unicode-string/current/specs/perl-unicode-string.spec	2004-06-27 13:48:31 UTC (rev 2189)
@@ -0,0 +1,73 @@
+%define __check_files %{nil}
+# Derived values
+%define module Unicode-String
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-unicode-string
+Version: 2.07
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Unicode-String-2.07.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	i586
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/i586-linux-thread-multi/auto
+%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode
+%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode/String
+%{siteperl}/i586-linux-thread-multi/auto/Unicode/String/String.so
+%{siteperl}/i586-linux-thread-multi/auto/Unicode/String/String.bs
+%dir %{siteperl}/i586-linux-thread-multi/Unicode
+%{siteperl}/i586-linux-thread-multi/Unicode/*.pm
+%{_mandir}/man3/*
+%doc Changes MANIFEST README  
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 2.07-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Fri Feb 13 2004 Gerald Dachs <gda at trustix dot org> 2.07-2gd
+- fixed permission on directories
+- added %doc to %files section
+- changed buildarch to i586
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 13:49:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:49:43 +1000 (EST)
Subject: [tinysofa-svn] r2190 - contrib/perl-unicode-string
Message-ID: <20040627134943.A660F4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:49:43 +1000 (Sun, 27 Jun 2004)
New Revision: 2190

Added:
   contrib/perl-unicode-string/pristine/
Log:
New in contrib


Copied: contrib/perl-unicode-string/pristine (from rev 2189, contrib/perl-unicode-string/current)


From svn at tinysofa.org  Sun Jun 27 13:50:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:50:27 +1000 (EST)
Subject: [tinysofa-svn] r2191 - contrib/perl-unicode-string
Message-ID: <20040627135027.0DF5A4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:50:26 +1000 (Sun, 27 Jun 2004)
New Revision: 2191

Added:
   contrib/perl-unicode-string/releases/
Log:
New in contrib



From svn at tinysofa.org  Sun Jun 27 13:51:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:51:16 +1000 (EST)
Subject: [tinysofa-svn] r2192 - contrib/perl-unicode-string/releases
Message-ID: <20040627135116.752964E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:51:16 +1000 (Sun, 27 Jun 2004)
New Revision: 2192

Added:
   contrib/perl-unicode-string/releases/2.07/
Log:
New in contrib



From svn at tinysofa.org  Sun Jun 27 13:52:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:52:33 +1000 (EST)
Subject: [tinysofa-svn] r2193 - contrib/perl-unicode-string/releases/2.07
Message-ID: <20040627135233.3E66D4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:52:33 +1000 (Sun, 27 Jun 2004)
New Revision: 2193

Added:
   contrib/perl-unicode-string/releases/2.07/16gd/
Log:
New in contrib


Copied: contrib/perl-unicode-string/releases/2.07/16gd (from rev 2192, contrib/perl-unicode-string/current)


From svn at tinysofa.org  Sun Jun 27 13:56:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:56:06 +1000 (EST)
Subject: [tinysofa-svn] 
	r2194 - in contrib: . perl-mime-tools perl-mime-tools/current
	perl-mime-tools/current/sources perl-mime-tools/current/specs
Message-ID: <20040627135606.A4A194E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:56:06 +1000 (Sun, 27 Jun 2004)
New Revision: 2194

Added:
   contrib/perl-mime-tools/
   contrib/perl-mime-tools/current/
   contrib/perl-mime-tools/current/sources/
   contrib/perl-mime-tools/current/sources/MIME-tools-6.200_02.tar.gz
   contrib/perl-mime-tools/current/specs/
   contrib/perl-mime-tools/current/specs/perl-mime-tools.spec
Log:
New in contrib


Added: contrib/perl-mime-tools/current/sources/MIME-tools-6.200_02.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-mime-tools/current/sources/MIME-tools-6.200_02.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-mime-tools/current/specs/perl-mime-tools.spec
===================================================================
--- contrib/perl-mime-tools/current/specs/perl-mime-tools.spec	2004-06-27 13:52:33 UTC (rev 2193)
+++ contrib/perl-mime-tools/current/specs/perl-mime-tools.spec	2004-06-27 13:56:06 UTC (rev 2194)
@@ -0,0 +1,79 @@
+%define __check_files %{nil}
+# Derived values
+%define module  MIME-tools
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-mime-tools
+Version: 6.200_02
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/E/ER/ERYQ/MIME-tools-6.200_02.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl perl-io-stringy perl-mailtools
+BuildRequires:	perl-unicode-map >= 0.112, perl-unicode-string >= 2.06
+Requires:       perl-io-stringy perl-mailtools
+Requires:	perl-unicode-map >= 0.112, perl-unicode-string >= 2.06
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/MIME
+%{siteperl}/MIME/*.pm
+%dir %{siteperl}/MIME/Decoder
+%{siteperl}/MIME/Decoder/*.pm
+%dir %{siteperl}/MIME/Parser
+%{siteperl}/MIME/Parser/*.pm
+%dir %{siteperl}/MIME/Field
+%{siteperl}/MIME/Field/*.pm
+%dir %{siteperl}/MIME/Tools
+%{siteperl}/MIME/Tools/*.pm
+%{siteperl}/MIME/Tools/*.pod
+%{_mandir}/man3/*
+%doc COPYING README-OR-DIE examples testmsgs INSTALLING MANIFEST README   
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 6.200_02-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Fri Feb 13 2004 Gerald Dachs <gda at trustix dot org> 6.200_02-2gd
+- fixed permission on directories
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 13:56:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:56:59 +1000 (EST)
Subject: [tinysofa-svn] r2195 - contrib/perl-mime-tools
Message-ID: <20040627135659.66DAF4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:56:59 +1000 (Sun, 27 Jun 2004)
New Revision: 2195

Added:
   contrib/perl-mime-tools/pristine/
Log:
New in contrib


Copied: contrib/perl-mime-tools/pristine (from rev 2194, contrib/perl-mime-tools/current)


From svn at tinysofa.org  Sun Jun 27 13:57:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:57:33 +1000 (EST)
Subject: [tinysofa-svn] r2196 - contrib/perl-mime-tools
Message-ID: <20040627135733.2A9754E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:57:32 +1000 (Sun, 27 Jun 2004)
New Revision: 2196

Added:
   contrib/perl-mime-tools/releases/
Log:
New in contrib



From svn at tinysofa.org  Sun Jun 27 13:58:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:58:08 +1000 (EST)
Subject: [tinysofa-svn] r2197 - contrib/perl-mime-tools/releases
Message-ID: <20040627135808.231274E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:58:07 +1000 (Sun, 27 Jun 2004)
New Revision: 2197

Added:
   contrib/perl-mime-tools/releases/6.200_02/
Log:
New in contrib



From svn at tinysofa.org  Sun Jun 27 13:58:48 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Sun, 27 Jun 2004 23:58:48 +1000 (EST)
Subject: [tinysofa-svn] r2198 - contrib/perl-mime-tools/releases/6.200_02
Message-ID: <20040627135848.1BAD44E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-27 23:58:47 +1000 (Sun, 27 Jun 2004)
New Revision: 2198

Added:
   contrib/perl-mime-tools/releases/6.200_02/16gd/
Log:
New in contrib


Copied: contrib/perl-mime-tools/releases/6.200_02/16gd (from rev 2197, contrib/perl-mime-tools/current)


From svn at tinysofa.org  Sun Jun 27 14:02:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:02:07 +1000 (EST)
Subject: [tinysofa-svn] 
	r2199 - in contrib: . perl-archive-zip perl-archive-zip/current
	perl-archive-zip/current/sources perl-archive-zip/current/specs
Message-ID: <20040627140207.59D9E4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:02:07 +1000 (Mon, 28 Jun 2004)
New Revision: 2199

Added:
   contrib/perl-archive-zip/
   contrib/perl-archive-zip/current/
   contrib/perl-archive-zip/current/sources/
   contrib/perl-archive-zip/current/sources/Archive-Zip-1.09.tar.gz
   contrib/perl-archive-zip/current/specs/
   contrib/perl-archive-zip/current/specs/perl-archive-zip.spec
Log:
New in contrib


Added: contrib/perl-archive-zip/current/sources/Archive-Zip-1.09.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-archive-zip/current/sources/Archive-Zip-1.09.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-archive-zip/current/specs/perl-archive-zip.spec
===================================================================
--- contrib/perl-archive-zip/current/specs/perl-archive-zip.spec	2004-06-27 13:58:47 UTC (rev 2198)
+++ contrib/perl-archive-zip/current/specs/perl-archive-zip.spec	2004-06-27 14:02:07 UTC (rev 2199)
@@ -0,0 +1,69 @@
+%define __check_files %{nil}
+# Derived values
+%define module Archive-Zip
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-archive-zip
+Version: 1.09
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/N/NE/NEDKONZ/Archive-Zip-1.09.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl
+Requires:	perl-io-zlib
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/Archive
+%{siteperl}/Archive/*
+%{_mandir}/man3/*
+/usr/bin/crc32
+%doc Changes INSTALL MANIFEST README TODO docs examples
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 1.09-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 1.09-2gd
+- fixed permission on directory
+- added docs
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 14:05:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:05:53 +1000 (EST)
Subject: [tinysofa-svn] r2200 - contrib/perl-archive-zip
Message-ID: <20040627140553.405CF4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:05:53 +1000 (Mon, 28 Jun 2004)
New Revision: 2200

Added:
   contrib/perl-archive-zip/pristine/
Log:
New in contrib


Copied: contrib/perl-archive-zip/pristine (from rev 2199, contrib/perl-archive-zip/current)


From svn at tinysofa.org  Sun Jun 27 14:06:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:06:27 +1000 (EST)
Subject: [tinysofa-svn] r2201 - contrib/perl-archive-zip
Message-ID: <20040627140627.3A4C34E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:06:27 +1000 (Mon, 28 Jun 2004)
New Revision: 2201

Added:
   contrib/perl-archive-zip/releases/
Log:
New in contrib



From svn at tinysofa.org  Sun Jun 27 14:06:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:06:54 +1000 (EST)
Subject: [tinysofa-svn] r2202 - contrib/perl-archive-zip/releases
Message-ID: <20040627140654.8D8264E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:06:54 +1000 (Mon, 28 Jun 2004)
New Revision: 2202

Added:
   contrib/perl-archive-zip/releases/1.09/
Log:
New in contrib



From svn at tinysofa.org  Sun Jun 27 14:07:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:07:36 +1000 (EST)
Subject: [tinysofa-svn] r2203 - contrib/perl-archive-zip/releases/1.09
Message-ID: <20040627140736.A7CFC4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:07:36 +1000 (Mon, 28 Jun 2004)
New Revision: 2203

Added:
   contrib/perl-archive-zip/releases/1.09/16gd/
Log:
New in contrib


Copied: contrib/perl-archive-zip/releases/1.09/16gd (from rev 2202, contrib/perl-archive-zip/current)


From svn at tinysofa.org  Sun Jun 27 14:09:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:09:36 +1000 (EST)
Subject: [tinysofa-svn] r2204 - in contrib: . perl-digest-perl-md5
	perl-digest-perl-md5/current perl-digest-perl-md5/current/sources
	perl-digest-perl-md5/current/specs
Message-ID: <20040627140936.2F6584E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:09:35 +1000 (Mon, 28 Jun 2004)
New Revision: 2204

Added:
   contrib/perl-digest-perl-md5/
   contrib/perl-digest-perl-md5/current/
   contrib/perl-digest-perl-md5/current/sources/
   contrib/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.5.tar.gz
   contrib/perl-digest-perl-md5/current/specs/
   contrib/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec
Log:
New in contrib


Added: contrib/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.5.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-digest-perl-md5/current/sources/Digest-Perl-MD5-1.5.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec
===================================================================
--- contrib/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec	2004-06-27 14:07:36 UTC (rev 2203)
+++ contrib/perl-digest-perl-md5/current/specs/perl-digest-perl-md5.spec	2004-06-27 14:09:35 UTC (rev 2204)
@@ -0,0 +1,70 @@
+%define __check_files %{nil}
+# Derived values
+%define module Digest-Perl-MD5
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-digest-perl-md5
+Version: 1.5
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.5.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+perl -pi -e 's|/usr/local/bin/perl|/usr/bin/perl|' `find . -type f -print`
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/Digest
+%dir %{siteperl}/Digest/Perl
+%{siteperl}/Digest/Perl/MD5.pm
+%{_mandir}/man3/Digest::Perl::MD5.3.gz
+%doc CHANGES  INSTALL  MANIFEST
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 1.5-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 1.5-2gd
+- fixed permission on directory
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 14:10:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:10:22 +1000 (EST)
Subject: [tinysofa-svn] r2205 - contrib/perl-digest-perl-md5
Message-ID: <20040627141022.EB7E44E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:10:22 +1000 (Mon, 28 Jun 2004)
New Revision: 2205

Added:
   contrib/perl-digest-perl-md5/pristine/
Log:
New in contrib


Copied: contrib/perl-digest-perl-md5/pristine (from rev 2204, contrib/perl-digest-perl-md5/current)


From svn at tinysofa.org  Sun Jun 27 14:10:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:10:51 +1000 (EST)
Subject: [tinysofa-svn] r2206 - contrib/perl-digest-perl-md5
Message-ID: <20040627141051.8BF704E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:10:51 +1000 (Mon, 28 Jun 2004)
New Revision: 2206

Added:
   contrib/perl-digest-perl-md5/releases/
Log:
New in contrib



From svn at tinysofa.org  Sun Jun 27 14:11:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:11:39 +1000 (EST)
Subject: [tinysofa-svn] r2207 - contrib/perl-digest-perl-md5/releases
Message-ID: <20040627141139.E07ED4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:11:39 +1000 (Mon, 28 Jun 2004)
New Revision: 2207

Added:
   contrib/perl-digest-perl-md5/releases/1.5/
Log:
New in contrib



From svn at tinysofa.org  Sun Jun 27 14:12:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:12:27 +1000 (EST)
Subject: [tinysofa-svn] r2208 - contrib/perl-digest-perl-md5/releases/1.5
Message-ID: <20040627141227.BEAA04E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:12:27 +1000 (Mon, 28 Jun 2004)
New Revision: 2208

Added:
   contrib/perl-digest-perl-md5/releases/1.5/16gd/
Log:
New in contrib


Copied: contrib/perl-digest-perl-md5/releases/1.5/16gd (from rev 2207, contrib/perl-digest-perl-md5/current)


From svn at tinysofa.org  Sun Jun 27 14:21:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:21:00 +1000 (EST)
Subject: [tinysofa-svn] 
	r2209 - in contrib: . perl-net-server perl-net-server/current
	perl-net-server/current/sources perl-net-server/current/specs
Message-ID: <20040627142100.7D2C94E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:21:00 +1000 (Mon, 28 Jun 2004)
New Revision: 2209

Added:
   contrib/perl-net-server/
   contrib/perl-net-server/current/
   contrib/perl-net-server/current/sources/
   contrib/perl-net-server/current/sources/Net-Server-0.86.tar.gz
   contrib/perl-net-server/current/specs/
   contrib/perl-net-server/current/specs/perl-net-server.spec
Log:
New in contrib


Added: contrib/perl-net-server/current/sources/Net-Server-0.86.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-net-server/current/sources/Net-Server-0.86.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-net-server/current/specs/perl-net-server.spec
===================================================================
--- contrib/perl-net-server/current/specs/perl-net-server.spec	2004-06-27 14:12:27 UTC (rev 2208)
+++ contrib/perl-net-server/current/specs/perl-net-server.spec	2004-06-27 14:21:00 UTC (rev 2209)
@@ -0,0 +1,71 @@
+%define __check_files %{nil}
+# Derived values
+%define module Net-Server
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-net-server
+Version: 0.86
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/B/BB/BBB/Net-Server-0.86.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/Net
+%dir %{siteperl}/Net/Server
+%dir %{siteperl}/Net/Server/Proto
+%{siteperl}/Net/*.pm
+%{siteperl}/Net/Server/*.pm
+%{siteperl}/Net/Server/Proto/*.pm
+%{_mandir}/man3/*
+%doc Changes MANIFEST.SKIP MANIFEST README examples
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 0.86-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 0.86-2gd
+- fixed permission on directory
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 14:21:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:21:46 +1000 (EST)
Subject: [tinysofa-svn] r2210 - contrib/perl-net-server
Message-ID: <20040627142146.095704E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:21:45 +1000 (Mon, 28 Jun 2004)
New Revision: 2210

Added:
   contrib/perl-net-server/pristine/
Log:
New in contrib


Copied: contrib/perl-net-server/pristine (from rev 2209, contrib/perl-net-server/current)


From svn at tinysofa.org  Sun Jun 27 14:22:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:22:28 +1000 (EST)
Subject: [tinysofa-svn] r2211 - contrib/perl-net-server
Message-ID: <20040627142228.628074E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:22:28 +1000 (Mon, 28 Jun 2004)
New Revision: 2211

Added:
   contrib/perl-net-server/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 14:22:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:22:39 +1000 (EST)
Subject: [tinysofa-svn] r2212 - contrib/perl-net-server/releases
Message-ID: <20040627142239.4E26A4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:22:39 +1000 (Mon, 28 Jun 2004)
New Revision: 2212

Added:
   contrib/perl-net-server/releases/0.86/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 14:23:30 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:23:30 +1000 (EST)
Subject: [tinysofa-svn] r2213 - contrib/perl-net-server/releases/0.86
Message-ID: <20040627142330.B129F4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:23:30 +1000 (Mon, 28 Jun 2004)
New Revision: 2213

Added:
   contrib/perl-net-server/releases/0.86/16gd/
Log:
New in contrib

Copied: contrib/perl-net-server/releases/0.86/16gd (from rev 2212, contrib/perl-net-server/current)


From svn at tinysofa.org  Sun Jun 27 14:25:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:25:57 +1000 (EST)
Subject: [tinysofa-svn] 
	r2214 - in contrib: . perl-unicode-map perl-unicode-map/current
	perl-unicode-map/current/sources perl-unicode-map/current/specs
Message-ID: <20040627142557.3C4C54E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:25:57 +1000 (Mon, 28 Jun 2004)
New Revision: 2214

Added:
   contrib/perl-unicode-map/
   contrib/perl-unicode-map/current/
   contrib/perl-unicode-map/current/sources/
   contrib/perl-unicode-map/current/sources/Unicode-Map-0.112.tar.gz
   contrib/perl-unicode-map/current/specs/
   contrib/perl-unicode-map/current/specs/perl-unicode-map.spec
Log:
New in contrib

Added: contrib/perl-unicode-map/current/sources/Unicode-Map-0.112.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-unicode-map/current/sources/Unicode-Map-0.112.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-unicode-map/current/specs/perl-unicode-map.spec
===================================================================
--- contrib/perl-unicode-map/current/specs/perl-unicode-map.spec	2004-06-27 14:23:30 UTC (rev 2213)
+++ contrib/perl-unicode-map/current/specs/perl-unicode-map.spec	2004-06-27 14:25:57 UTC (rev 2214)
@@ -0,0 +1,77 @@
+%define __check_files %{nil}
+# Derived values
+%define module Unicode-Map
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-unicode-map
+Version: 0.112
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	i586
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/i586-linux-thread-multi/auto
+%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode
+%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode/Map
+%{siteperl}/i586-linux-thread-multi/auto/Unicode/Map/Map.so
+%{siteperl}/i586-linux-thread-multi/auto/Unicode/Map/Map.bs
+%dir %{siteperl}/i586-linux-thread-multi/Unicode
+%{siteperl}/i586-linux-thread-multi/Unicode/Map.pm
+%dir %{siteperl}/i586-linux-thread-multi/Unicode/Map
+%{siteperl}/i586-linux-thread-multi/Unicode/Map/*
+%{_mandir}/man1/*
+%{_mandir}/man3/*
+/usr/bin/*
+%doc COPYING MANIFEST README Changes INSTALL
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 0.112-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Fri Feb 13 2004 Gerald Dachs <gda at trustix dot org> 0.112-2gd
+- fixed permission on directories
+- added %doc to %files section
+- changed buildarch to i586
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 14:26:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:26:40 +1000 (EST)
Subject: [tinysofa-svn] r2215 - contrib/perl-unicode-map
Message-ID: <20040627142640.781C94E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:26:40 +1000 (Mon, 28 Jun 2004)
New Revision: 2215

Added:
   contrib/perl-unicode-map/pristine/
Log:
New in contrib

Copied: contrib/perl-unicode-map/pristine (from rev 2214, contrib/perl-unicode-map/current)


From svn at tinysofa.org  Sun Jun 27 14:26:58 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:26:58 +1000 (EST)
Subject: [tinysofa-svn] r2216 - contrib/perl-unicode-map
Message-ID: <20040627142658.E61744E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:26:58 +1000 (Mon, 28 Jun 2004)
New Revision: 2216

Added:
   contrib/perl-unicode-map/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 14:27:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:27:08 +1000 (EST)
Subject: [tinysofa-svn] r2217 - contrib/perl-unicode-map/releases
Message-ID: <20040627142708.8524A4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:27:08 +1000 (Mon, 28 Jun 2004)
New Revision: 2217

Added:
   contrib/perl-unicode-map/releases/0.112/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 14:27:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:27:38 +1000 (EST)
Subject: [tinysofa-svn] r2218 - contrib/perl-unicode-map/releases/0.112
Message-ID: <20040627142738.B00EA4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:27:38 +1000 (Mon, 28 Jun 2004)
New Revision: 2218

Added:
   contrib/perl-unicode-map/releases/0.112/16gd/
Log:
New in contrib

Copied: contrib/perl-unicode-map/releases/0.112/16gd (from rev 2217, contrib/perl-unicode-map/current)


From svn at tinysofa.org  Sun Jun 27 14:36:30 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:36:30 +1000 (EST)
Subject: [tinysofa-svn] 
	r2219 - in contrib: . perl-html-tagset perl-html-tagset/current
	perl-html-tagset/current/sources perl-html-tagset/current/specs
Message-ID: <20040627143630.DC9884E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:36:30 +1000 (Mon, 28 Jun 2004)
New Revision: 2219

Added:
   contrib/perl-html-tagset/
   contrib/perl-html-tagset/current/
   contrib/perl-html-tagset/current/sources/
   contrib/perl-html-tagset/current/sources/HTML-Tagset-3.03.tar.gz
   contrib/perl-html-tagset/current/specs/
   contrib/perl-html-tagset/current/specs/perl-html-tagset.spec
Log:
New in contrib

Added: contrib/perl-html-tagset/current/sources/HTML-Tagset-3.03.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-html-tagset/current/sources/HTML-Tagset-3.03.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-html-tagset/current/specs/perl-html-tagset.spec
===================================================================
--- contrib/perl-html-tagset/current/specs/perl-html-tagset.spec	2004-06-27 14:27:38 UTC (rev 2218)
+++ contrib/perl-html-tagset/current/specs/perl-html-tagset.spec	2004-06-27 14:36:30 UTC (rev 2219)
@@ -0,0 +1,58 @@
+%define __check_files %{nil}
+%define real_name HTML-Tagset
+%define real_version 3.03
+%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary:	HTML Tagset for perl
+Name:		perl-html-tagset
+Version:	%{real_version}
+Release: 	16gd
+Source:		%{real_name}-%{real_version}.tar.gz
+License:	Perl
+Group: Trustix Contrib
+Requires:	perl >= %{perl_version}
+BuildArch:  noarch
+BuildRequires: perl-devel >= 5.8.0-12bg
+Buildroot:	%{_tmppath}/%{name}-root
+
+%define siteperl /usr/lib/perl5/site_perl/%{perl_version}
+
+%description
+This module contains data tables useful in dealing with HTML.
+
+%prep -q
+%setup -q -n %{real_name}-%{real_version}
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix}
+make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,0755)
+%doc ChangeLog README
+%dir %{siteperl}/HTML
+%{siteperl}/HTML/Tagset.pm
+%{_mandir}/man3/HTML::Tagset*
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 3.03-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 3.03-3gd
+- fixed permission on directory
+
+* Mon Oct 13 2003 Goetz Bock <bg at tawie dot org> 3.03-2bg
+- rebuild, small specfile cleanup
+
+* Tue Sep  2 2003 Goetz Bock <bock at trustix dot org> 3.03-1bg
+- build for Trustix 2.0 (aka Cloud) - Contrib


From svn at tinysofa.org  Sun Jun 27 14:37:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:37:00 +1000 (EST)
Subject: [tinysofa-svn] r2220 - contrib/perl-html-tagset
Message-ID: <20040627143700.EDD9B4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:37:00 +1000 (Mon, 28 Jun 2004)
New Revision: 2220

Added:
   contrib/perl-html-tagset/pristine/
Log:
New in contrib

Copied: contrib/perl-html-tagset/pristine (from rev 2219, contrib/perl-html-tagset/current)


From svn at tinysofa.org  Sun Jun 27 14:37:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:37:43 +1000 (EST)
Subject: [tinysofa-svn] r2221 - contrib/perl-html-tagset
Message-ID: <20040627143743.74F064E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:37:43 +1000 (Mon, 28 Jun 2004)
New Revision: 2221

Added:
   contrib/perl-html-tagset/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 14:37:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:37:49 +1000 (EST)
Subject: [tinysofa-svn] r2222 - contrib/perl-html-tagset/releases
Message-ID: <20040627143749.1881E4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:37:48 +1000 (Mon, 28 Jun 2004)
New Revision: 2222

Added:
   contrib/perl-html-tagset/releases/3.03/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 14:38:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:38:25 +1000 (EST)
Subject: [tinysofa-svn] r2223 - contrib/perl-html-tagset/releases/3.03
Message-ID: <20040627143825.E124B4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:38:25 +1000 (Mon, 28 Jun 2004)
New Revision: 2223

Added:
   contrib/perl-html-tagset/releases/3.03/16gd/
Log:
New in contrib

Copied: contrib/perl-html-tagset/releases/3.03/16gd (from rev 2222, contrib/perl-html-tagset/current)


From svn at tinysofa.org  Sun Jun 27 14:42:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:42:16 +1000 (EST)
Subject: [tinysofa-svn] 
	r2224 - in contrib: . perl-compress-zlib perl-compress-zlib/current
	perl-compress-zlib/current/sources perl-compress-zlib/current/specs
Message-ID: <20040627144216.38BC44E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:42:16 +1000 (Mon, 28 Jun 2004)
New Revision: 2224

Added:
   contrib/perl-compress-zlib/
   contrib/perl-compress-zlib/current/
   contrib/perl-compress-zlib/current/sources/
   contrib/perl-compress-zlib/current/sources/Compress-Zlib-1.33.tar.gz
   contrib/perl-compress-zlib/current/specs/
   contrib/perl-compress-zlib/current/specs/perl-compress-zlib.spec
Log:
New in contrib

Added: contrib/perl-compress-zlib/current/sources/Compress-Zlib-1.33.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-compress-zlib/current/sources/Compress-Zlib-1.33.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-compress-zlib/current/specs/perl-compress-zlib.spec
===================================================================
--- contrib/perl-compress-zlib/current/specs/perl-compress-zlib.spec	2004-06-27 14:38:25 UTC (rev 2223)
+++ contrib/perl-compress-zlib/current/specs/perl-compress-zlib.spec	2004-06-27 14:42:16 UTC (rev 2224)
@@ -0,0 +1,74 @@
+%define __check_files %{nil}
+# Derived values
+%define module Compress-Zlib
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-compress-zlib
+Version: 1.33
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.33.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	i586
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/i586-linux-thread-multi/auto
+%dir %{siteperl}/i586-linux-thread-multi/auto/Compress
+%dir %{siteperl}/i586-linux-thread-multi/auto/Compress/Zlib
+%dir %{siteperl}/i586-linux-thread-multi/Compress
+%{siteperl}/i586-linux-thread-multi/Compress/Zlib.pm
+%{siteperl}/i586-linux-thread-multi/auto/Compress/Zlib/Zlib.bs
+%{siteperl}/i586-linux-thread-multi/auto/Compress/Zlib/Zlib.so
+%{siteperl}/i586-linux-thread-multi/auto/Compress/Zlib/autosplit.ix
+%{_mandir}/man3/*
+%doc ANNOUNCE Changes MANIFEST README
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 1.33-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 1.33-2gd
+- fixed permission on directory
+- added %doc to %files section
+- changed arch to i586
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 14:42:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:42:37 +1000 (EST)
Subject: [tinysofa-svn] r2225 - contrib/perl-compress-zlib
Message-ID: <20040627144237.161004E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:42:36 +1000 (Mon, 28 Jun 2004)
New Revision: 2225

Added:
   contrib/perl-compress-zlib/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 14:42:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:42:53 +1000 (EST)
Subject: [tinysofa-svn] r2226 - contrib/perl-compress-zlib/releases
Message-ID: <20040627144253.DFC774E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:42:53 +1000 (Mon, 28 Jun 2004)
New Revision: 2226

Added:
   contrib/perl-compress-zlib/releases/1.33/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 14:43:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:43:22 +1000 (EST)
Subject: [tinysofa-svn] r2227 - contrib/perl-compress-zlib
Message-ID: <20040627144322.067B14E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:43:21 +1000 (Mon, 28 Jun 2004)
New Revision: 2227

Added:
   contrib/perl-compress-zlib/pristine/
Log:
New in contrib

Copied: contrib/perl-compress-zlib/pristine (from rev 2226, contrib/perl-compress-zlib/current)


From svn at tinysofa.org  Sun Jun 27 14:43:42 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:43:42 +1000 (EST)
Subject: [tinysofa-svn] r2228 - contrib/perl-compress-zlib/releases/1.33
Message-ID: <20040627144342.6F4DA4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:43:42 +1000 (Mon, 28 Jun 2004)
New Revision: 2228

Added:
   contrib/perl-compress-zlib/releases/1.33/16gd/
Log:
New in contrib

Copied: contrib/perl-compress-zlib/releases/1.33/16gd (from rev 2227, contrib/perl-compress-zlib/current)


From svn at tinysofa.org  Sun Jun 27 14:51:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:51:08 +1000 (EST)
Subject: [tinysofa-svn] 
	r2229 - in contrib: . perl-io-multiplex perl-io-multiplex/current
	perl-io-multiplex/current/sources perl-io-multiplex/current/specs
Message-ID: <20040627145108.6DEBA4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:51:08 +1000 (Mon, 28 Jun 2004)
New Revision: 2229

Added:
   contrib/perl-io-multiplex/
   contrib/perl-io-multiplex/current/
   contrib/perl-io-multiplex/current/sources/
   contrib/perl-io-multiplex/current/sources/IO-Multiplex-1.08.tar.gz
   contrib/perl-io-multiplex/current/specs/
   contrib/perl-io-multiplex/current/specs/perl-io-multiplex.spec
Log:
New in contrib

Added: contrib/perl-io-multiplex/current/sources/IO-Multiplex-1.08.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-io-multiplex/current/sources/IO-Multiplex-1.08.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-io-multiplex/current/specs/perl-io-multiplex.spec
===================================================================
--- contrib/perl-io-multiplex/current/specs/perl-io-multiplex.spec	2004-06-27 14:43:42 UTC (rev 2228)
+++ contrib/perl-io-multiplex/current/specs/perl-io-multiplex.spec	2004-06-27 14:51:08 UTC (rev 2229)
@@ -0,0 +1,67 @@
+%define __check_files %{nil}
+# Derived values
+%define module IO-Multiplex
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-io-multiplex
+Version: 1.08
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/B/BB/BBB/IO-Multiplex-1.08.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/IO
+%{siteperl}/IO/Multiplex.pm
+%{_mandir}/man3/IO::Multiplex.3.gz
+%doc Changes MANIFEST README TODO
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 1.08-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 1.08-2gd
+- fixed permission on directory
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 14:51:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:51:29 +1000 (EST)
Subject: [tinysofa-svn] r2230 - contrib/perl-io-multiplex
Message-ID: <20040627145129.E563E4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:51:29 +1000 (Mon, 28 Jun 2004)
New Revision: 2230

Added:
   contrib/perl-io-multiplex/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 14:51:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:51:39 +1000 (EST)
Subject: [tinysofa-svn] r2231 - contrib/perl-io-multiplex/releases
Message-ID: <20040627145139.EB77C4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:51:39 +1000 (Mon, 28 Jun 2004)
New Revision: 2231

Added:
   contrib/perl-io-multiplex/releases/1.08/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 14:52:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:52:37 +1000 (EST)
Subject: [tinysofa-svn] r2232 - contrib/perl-io-multiplex/releases/1.08
Message-ID: <20040627145237.7E2264E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:52:37 +1000 (Mon, 28 Jun 2004)
New Revision: 2232

Added:
   contrib/perl-io-multiplex/releases/1.08/16gd/
Log:
New in contrib

Copied: contrib/perl-io-multiplex/releases/1.08/16gd (from rev 2231, contrib/perl-io-multiplex/current)


From svn at tinysofa.org  Sun Jun 27 14:52:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 00:52:56 +1000 (EST)
Subject: [tinysofa-svn] r2233 - contrib/perl-io-multiplex
Message-ID: <20040627145256.746E44E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 00:52:56 +1000 (Mon, 28 Jun 2004)
New Revision: 2233

Added:
   contrib/perl-io-multiplex/pristine/
Log:
New in contrib

Copied: contrib/perl-io-multiplex/pristine (from rev 2232, contrib/perl-io-multiplex/current)


From svn at tinysofa.org  Sun Jun 27 15:22:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:22:35 +1000 (EST)
Subject: [tinysofa-svn] 
	r2234 - in contrib: . perl-unix-syslog perl-unix-syslog/current
	perl-unix-syslog/current/sources perl-unix-syslog/current/specs
Message-ID: <20040627152235.0295E4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:22:35 +1000 (Mon, 28 Jun 2004)
New Revision: 2234

Added:
   contrib/perl-unix-syslog/
   contrib/perl-unix-syslog/current/
   contrib/perl-unix-syslog/current/sources/
   contrib/perl-unix-syslog/current/sources/Unix-Syslog-0.100.tar.gz
   contrib/perl-unix-syslog/current/specs/
   contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec
Log:
New in contrib

Added: contrib/perl-unix-syslog/current/sources/Unix-Syslog-0.100.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-unix-syslog/current/sources/Unix-Syslog-0.100.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec
===================================================================
--- contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec	2004-06-27 14:52:56 UTC (rev 2233)
+++ contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec	2004-06-27 15:22:35 UTC (rev 2234)
@@ -0,0 +1,72 @@
+%define __check_files %{nil}
+# Derived values
+%define module Unix-Syslog
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-unix-syslog
+Version: 0.100
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/M/MH/MHARNISCH/Unix-Syslog-0.100.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	i586
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/i586-linux-thread-multi/auto
+%dir %{siteperl}/i586-linux-thread-multi/auto/Unix
+%dir %{siteperl}/i586-linux-thread-multi/auto/Unix/Syslog
+%{siteperl}/i586-linux-thread-multi/auto/Unix/Syslog/*
+%dir %{siteperl}/i586-linux-thread-multi/Unix
+%{siteperl}/i586-linux-thread-multi/Unix/Syslog.pm
+%{_mandir}/man3/*
+%doc Artistic Changes MANIFEST README
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 0.100-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Fri Feb 13 2004 Gerald Dachs <gda at trustix dot org> 0.100-2gd
+- fixed permission on directories
+- changed buildarch to i586
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 15:22:53 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:22:53 +1000 (EST)
Subject: [tinysofa-svn] r2235 - contrib/perl-unix-syslog
Message-ID: <20040627152253.01D684E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:22:53 +1000 (Mon, 28 Jun 2004)
New Revision: 2235

Added:
   contrib/perl-unix-syslog/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 15:23:11 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:23:11 +1000 (EST)
Subject: [tinysofa-svn] r2236 - contrib/perl-unix-syslog/releases
Message-ID: <20040627152311.8D3214E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:23:11 +1000 (Mon, 28 Jun 2004)
New Revision: 2236

Added:
   contrib/perl-unix-syslog/releases/0.100/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 15:23:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:23:43 +1000 (EST)
Subject: [tinysofa-svn] r2237 - contrib/perl-unix-syslog/releases/0.100
Message-ID: <20040627152343.86A3B4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:23:43 +1000 (Mon, 28 Jun 2004)
New Revision: 2237

Added:
   contrib/perl-unix-syslog/releases/0.100/16gd/
Log:
New in contrib

Copied: contrib/perl-unix-syslog/releases/0.100/16gd (from rev 2236, contrib/perl-unix-syslog/current)


From svn at tinysofa.org  Sun Jun 27 15:23:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:23:55 +1000 (EST)
Subject: [tinysofa-svn] r2238 - contrib/perl-unix-syslog
Message-ID: <20040627152355.8C29F4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:23:55 +1000 (Mon, 28 Jun 2004)
New Revision: 2238

Added:
   contrib/perl-unix-syslog/pristine/
Log:
New in contrib

Copied: contrib/perl-unix-syslog/pristine (from rev 2237, contrib/perl-unix-syslog/current)


From svn at tinysofa.org  Sun Jun 27 15:35:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:35:56 +1000 (EST)
Subject: [tinysofa-svn] 
	r2239 - in contrib: . perl-mailtools perl-mailtools/current
	perl-mailtools/current/sources perl-mailtools/current/specs
Message-ID: <20040627153556.0DFB44E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:35:55 +1000 (Mon, 28 Jun 2004)
New Revision: 2239

Added:
   contrib/perl-mailtools/
   contrib/perl-mailtools/current/
   contrib/perl-mailtools/current/sources/
   contrib/perl-mailtools/current/sources/MailTools-1.60.tar.gz
   contrib/perl-mailtools/current/specs/
   contrib/perl-mailtools/current/specs/perl-mailtools.spec
Log:
New in contrib

Added: contrib/perl-mailtools/current/sources/MailTools-1.60.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-mailtools/current/sources/MailTools-1.60.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-mailtools/current/specs/perl-mailtools.spec
===================================================================
--- contrib/perl-mailtools/current/specs/perl-mailtools.spec	2004-06-27 15:23:55 UTC (rev 2238)
+++ contrib/perl-mailtools/current/specs/perl-mailtools.spec	2004-06-27 15:35:55 UTC (rev 2239)
@@ -0,0 +1,77 @@
+%define __check_files %{nil}
+# Derived values
+%define module  MailTools
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-mailtools
+Version: 1.60
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MailTools-1.60.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/Mail
+%{siteperl}/Mail/*.pm
+%dir %{siteperl}/Mail/Field
+%{siteperl}/Mail/Field/*
+%dir %{siteperl}/Mail/Mailer
+%{siteperl}/Mail/Mailer/*
+%dir %{siteperl}/auto
+%dir %{siteperl}/auto/Mail
+%dir %{siteperl}/auto/Mail/Util
+%{siteperl}/auto/Mail/Util/*
+%dir %{siteperl}/auto/Mail/Internet
+%{siteperl}/auto/Mail/Internet/*
+%{_mandir}/man3/*
+%doc ChangeLog README MANIFEST README.demos  examples
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 1.60-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 1.60-2gd
+- fixed permission on directory
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 15:36:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:36:16 +1000 (EST)
Subject: [tinysofa-svn] r2240 - contrib/perl-mailtools
Message-ID: <20040627153616.D9F474E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:36:16 +1000 (Mon, 28 Jun 2004)
New Revision: 2240

Added:
   contrib/perl-mailtools/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 15:36:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:36:25 +1000 (EST)
Subject: [tinysofa-svn] r2241 - contrib/perl-mailtools/releases
Message-ID: <20040627153625.DA42B4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:36:25 +1000 (Mon, 28 Jun 2004)
New Revision: 2241

Added:
   contrib/perl-mailtools/releases/1.69/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 15:36:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:36:47 +1000 (EST)
Subject: [tinysofa-svn] r2242 - contrib/perl-mailtools/releases
Message-ID: <20040627153647.CE37F4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:36:47 +1000 (Mon, 28 Jun 2004)
New Revision: 2242

Removed:
   contrib/perl-mailtools/releases/1.69/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 15:36:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:36:59 +1000 (EST)
Subject: [tinysofa-svn] r2243 - contrib/perl-mailtools/releases
Message-ID: <20040627153659.74C7E4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:36:59 +1000 (Mon, 28 Jun 2004)
New Revision: 2243

Added:
   contrib/perl-mailtools/releases/1.60/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 15:37:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:37:29 +1000 (EST)
Subject: [tinysofa-svn] r2244 - contrib/perl-mailtools
Message-ID: <20040627153729.1B8694E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:37:28 +1000 (Mon, 28 Jun 2004)
New Revision: 2244

Added:
   contrib/perl-mailtools/pristine/
Log:
New in contrib

Copied: contrib/perl-mailtools/pristine (from rev 2243, contrib/perl-mailtools/current)


From svn at tinysofa.org  Sun Jun 27 15:37:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:37:49 +1000 (EST)
Subject: [tinysofa-svn] r2245 - contrib/perl-mailtools/releases/1.60
Message-ID: <20040627153749.CE9FA4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:37:49 +1000 (Mon, 28 Jun 2004)
New Revision: 2245

Added:
   contrib/perl-mailtools/releases/1.60/16gd/
Log:
New in contrib

Copied: contrib/perl-mailtools/releases/1.60/16gd (from rev 2244, contrib/perl-mailtools/current)


From svn at tinysofa.org  Sun Jun 27 15:41:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:41:06 +1000 (EST)
Subject: [tinysofa-svn] 
	r2246 - in contrib: . perl-html-parser perl-html-parser/current
	perl-html-parser/current/sources perl-html-parser/current/specs
Message-ID: <20040627154106.A58514E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:41:06 +1000 (Mon, 28 Jun 2004)
New Revision: 2246

Added:
   contrib/perl-html-parser/
   contrib/perl-html-parser/current/
   contrib/perl-html-parser/current/sources/
   contrib/perl-html-parser/current/sources/HTML-Parser-3.31-force-unicode.patch
   contrib/perl-html-parser/current/sources/HTML-Parser-3.35.tar.gz
   contrib/perl-html-parser/current/specs/
   contrib/perl-html-parser/current/specs/perl-html-parser.spec
Log:
New in contrib

Added: contrib/perl-html-parser/current/sources/HTML-Parser-3.31-force-unicode.patch
===================================================================
--- contrib/perl-html-parser/current/sources/HTML-Parser-3.31-force-unicode.patch	2004-06-27 15:37:49 UTC (rev 2245)
+++ contrib/perl-html-parser/current/sources/HTML-Parser-3.31-force-unicode.patch	2004-06-27 15:41:06 UTC (rev 2246)
@@ -0,0 +1,26 @@
+diff -ur HTML-Parser-3.31/Makefile.PL HTML-Parser-3.31.bg/Makefile.PL
+--- HTML-Parser-3.31/Makefile.PL	2003-08-15 17:32:56.000000000 +0200
++++ HTML-Parser-3.31.bg/Makefile.PL	2003-09-02 02:46:21.000000000 +0200
+@@ -9,21 +9,7 @@
+     push(@define, "-DMARKED_SECTION");
+ }
+ 
+-if ($] >= 5.008) {
+-    print <<"EOT";
+-
+-Perl-5.8 provide core support for Unicode strings.  You can compile
+-HTML::Entities so that Unicode entities like &euro; and &#x20AC; are
+-decoded into a string containing "\\x{20AC}".  If you select no to
+-the question below such entities will be left alone and only entities
+-in the Latin-1 range is decoded.
+-
+-EOT
+-    my $ans = prompt("Do you want decoding on unicode entities?", "no");
+-    if ($ans =~ /^y(es)?$/i) {
+-	push(@define, "-DUNICODE_ENTITIES");
+-    }
+-}
++push(@define, "-DUNICODE_ENTITIES") if ($] >= 5.008);
+ push(@extra, "DEFINE" => "@define") if @define;
+ 
+ 

Added: contrib/perl-html-parser/current/sources/HTML-Parser-3.35.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-html-parser/current/sources/HTML-Parser-3.35.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-html-parser/current/specs/perl-html-parser.spec
===================================================================
--- contrib/perl-html-parser/current/specs/perl-html-parser.spec	2004-06-27 15:37:49 UTC (rev 2245)
+++ contrib/perl-html-parser/current/specs/perl-html-parser.spec	2004-06-27 15:41:06 UTC (rev 2246)
@@ -0,0 +1,70 @@
+%define __check_files %{nil}
+%define real_name HTML-Parser
+%define real_version 3.35
+%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary:  HTML Parser for perl
+Name:     perl-html-parser
+Version:  %{real_version}
+Release:  16gd
+Source:   %{real_name}-%{real_version}.tar.gz
+Patch:    %{real_name}-3.31-force-unicode.patch
+License:  Perl
+Group: Trustix Contrib
+Requires: perl >= %{perl_version}, perl-html-tagset
+BuildRequires: perl-html-tagset
+BuildRequires: perl-devel >= 5.8.0-12bg
+Buildroot: %{_tmppath}/%{name}-root
+
+%define siteperl /usr/lib/perl5/site_perl/%{perl_version}
+
+%description
+This is a collection of modules that parse and extract information
+from HTML documents.  Bug reports and issues for discussion about
+these modules can be sent to the <libwww at perl.org> mailing list.
+Remember to also look at the HTML-Tree package that build on
+HTML::Parser to create and extract information from HTML syntax trees.
+
+%prep -q
+%setup -q -n %{real_name}-%{real_version}
+%patch -p1
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix} -DUNICODE_ENTITIES
+make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,0755)
+%doc Changes README
+%dir %{siteperl}/i586-linux-thread-multi/HTML
+%dir %{siteperl}/i586-linux-thread-multi/auto
+%dir %{siteperl}/i586-linux-thread-multi/auto/HTML
+%dir %{siteperl}/i586-linux-thread-multi/auto/HTML/Parser
+%{siteperl}/i586-linux-thread-multi/HTML/*
+%{siteperl}/i586-linux-thread-multi/auto/HTML/Parser/Parser.bs
+%{siteperl}/i586-linux-thread-multi/auto/HTML/Parser/Parser.so
+%{_mandir}/man3/*
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 3.35-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trsutix dot org> 3.35-1gd
+- new upstream
+- fixed permission on directories
+
+* Mon Oct 13 2003 Goetz Bock <bg at tawie dot org> 3.31-2bg
+- rebuild, small specfile cleanup
+
+* Tue Sep  2 2003 Goetz Bock <bock at trustix dot org> 3.31-1bg
+- build for Trustix 2.0 (aka Cloud) - Contrib


From svn at tinysofa.org  Sun Jun 27 15:45:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:45:45 +1000 (EST)
Subject: [tinysofa-svn] r2247 - contrib/perl-html-parser
Message-ID: <20040627154545.DB52C4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:45:45 +1000 (Mon, 28 Jun 2004)
New Revision: 2247

Added:
   contrib/perl-html-parser/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 15:46:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:46:00 +1000 (EST)
Subject: [tinysofa-svn] r2248 - contrib/perl-html-parser/releases
Message-ID: <20040627154600.965484E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:46:00 +1000 (Mon, 28 Jun 2004)
New Revision: 2248

Added:
   contrib/perl-html-parser/releases/3.35/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 15:46:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:46:37 +1000 (EST)
Subject: [tinysofa-svn] r2249 - contrib/perl-html-parser/releases/3.35
Message-ID: <20040627154637.480A84E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:46:37 +1000 (Mon, 28 Jun 2004)
New Revision: 2249

Added:
   contrib/perl-html-parser/releases/3.35/16gd/
Log:
New in contrib

Copied: contrib/perl-html-parser/releases/3.35/16gd (from rev 2248, contrib/perl-html-parser/current)


From svn at tinysofa.org  Sun Jun 27 15:46:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:46:59 +1000 (EST)
Subject: [tinysofa-svn] r2250 - contrib/perl-html-parser
Message-ID: <20040627154659.2A83D4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:46:58 +1000 (Mon, 28 Jun 2004)
New Revision: 2250

Added:
   contrib/perl-html-parser/pristine/
Log:
New in contrib

Copied: contrib/perl-html-parser/pristine (from rev 2249, contrib/perl-html-parser/current)


From svn at tinysofa.org  Sun Jun 27 15:48:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:48:54 +1000 (EST)
Subject: [tinysofa-svn] 
	r2251 - in contrib: . perl-convert-tnef perl-convert-tnef/current
	perl-convert-tnef/current/sources perl-convert-tnef/current/specs
Message-ID: <20040627154854.8F8994E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:48:54 +1000 (Mon, 28 Jun 2004)
New Revision: 2251

Added:
   contrib/perl-convert-tnef/
   contrib/perl-convert-tnef/current/
   contrib/perl-convert-tnef/current/sources/
   contrib/perl-convert-tnef/current/sources/Convert-TNEF-0.17.tar.gz
   contrib/perl-convert-tnef/current/specs/
   contrib/perl-convert-tnef/current/specs/perl-convert-tnef.spec
Log:
New in contrib

Added: contrib/perl-convert-tnef/current/sources/Convert-TNEF-0.17.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-convert-tnef/current/sources/Convert-TNEF-0.17.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-convert-tnef/current/specs/perl-convert-tnef.spec
===================================================================
--- contrib/perl-convert-tnef/current/specs/perl-convert-tnef.spec	2004-06-27 15:46:58 UTC (rev 2250)
+++ contrib/perl-convert-tnef/current/specs/perl-convert-tnef.spec	2004-06-27 15:48:54 UTC (rev 2251)
@@ -0,0 +1,68 @@
+%define __check_files %{nil}
+# Derived values
+%define module Convert-TNEF
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-convert-tnef
+Version: 0.17
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOUGW/Convert-TNEF-0.17.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl perl-mime-tools
+Requires:       perl = %{perlver}
+Requires:	perl-mime-tools
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/Convert
+%{siteperl}/Convert/TNEF.pm
+%{_mandir}/man3/Convert::TNEF.3.gz
+%doc Changes MANIFEST README
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 0.17-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 0.17-2gd
+- fixed permission on directory
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 15:49:14 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:49:14 +1000 (EST)
Subject: [tinysofa-svn] r2252 - contrib/perl-convert-tnef
Message-ID: <20040627154914.38B8D4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:49:14 +1000 (Mon, 28 Jun 2004)
New Revision: 2252

Added:
   contrib/perl-convert-tnef/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 15:49:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:49:24 +1000 (EST)
Subject: [tinysofa-svn] r2253 - contrib/perl-convert-tnef/releases
Message-ID: <20040627154924.2D9FA4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:49:23 +1000 (Mon, 28 Jun 2004)
New Revision: 2253

Added:
   contrib/perl-convert-tnef/releases/0.17/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 15:49:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:49:51 +1000 (EST)
Subject: [tinysofa-svn] r2254 - contrib/perl-convert-tnef
Message-ID: <20040627154951.4155D4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:49:51 +1000 (Mon, 28 Jun 2004)
New Revision: 2254

Added:
   contrib/perl-convert-tnef/pristine/
Log:
New in contrib

Copied: contrib/perl-convert-tnef/pristine (from rev 2253, contrib/perl-convert-tnef/current)


From svn at tinysofa.org  Sun Jun 27 15:50:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:50:17 +1000 (EST)
Subject: [tinysofa-svn] r2255 - contrib/perl-convert-tnef/releases/0.17
Message-ID: <20040627155017.64CEC4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:50:17 +1000 (Mon, 28 Jun 2004)
New Revision: 2255

Added:
   contrib/perl-convert-tnef/releases/0.17/16gd/
Log:
New in contrib

Copied: contrib/perl-convert-tnef/releases/0.17/16gd (from rev 2254, contrib/perl-convert-tnef/current)


From svn at tinysofa.org  Sun Jun 27 15:52:04 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 01:52:04 +1000 (EST)
Subject: [tinysofa-svn] 
	r2256 - in contrib: . perl-io-socket-ssl perl-io-socket-ssl/current
	perl-io-socket-ssl/current/sources perl-io-socket-ssl/current/specs
Message-ID: <20040627155204.29B3B4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 01:52:03 +1000 (Mon, 28 Jun 2004)
New Revision: 2256

Added:
   contrib/perl-io-socket-ssl/
   contrib/perl-io-socket-ssl/current/
   contrib/perl-io-socket-ssl/current/sources/
   contrib/perl-io-socket-ssl/current/sources/IO-Socket-SSL-0.95.tar.gz
   contrib/perl-io-socket-ssl/current/specs/
   contrib/perl-io-socket-ssl/current/specs/perl-io-socket-ssl.spec
Log:
New in contrib

Added: contrib/perl-io-socket-ssl/current/sources/IO-Socket-SSL-0.95.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-io-socket-ssl/current/sources/IO-Socket-SSL-0.95.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-io-socket-ssl/current/specs/perl-io-socket-ssl.spec
===================================================================
--- contrib/perl-io-socket-ssl/current/specs/perl-io-socket-ssl.spec	2004-06-27 15:50:17 UTC (rev 2255)
+++ contrib/perl-io-socket-ssl/current/specs/perl-io-socket-ssl.spec	2004-06-27 15:52:03 UTC (rev 2256)
@@ -0,0 +1,68 @@
+%define __check_files %{nil}
+# Derived values
+%define module IO-Socket-SSL
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-io-socket-ssl
+Version: 0.95
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-0.95.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/IO
+%dir %{siteperl}/IO/Socket
+%{siteperl}/IO/Socket/SSL.pm
+%{_mandir}/man3/IO::Socket::SSL.3.gz
+%doc BUGS MANIFEST README docs Changes certs  example
+ 
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 0.95-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 0.95-2gd
+- fixed permission on directory
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 16:20:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:20:34 +1000 (EST)
Subject: [tinysofa-svn] r2257 - contrib/perl-io-socket-ssl
Message-ID: <20040627162034.B3D724E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:20:34 +1000 (Mon, 28 Jun 2004)
New Revision: 2257

Added:
   contrib/perl-io-socket-ssl/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:20:48 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:20:48 +1000 (EST)
Subject: [tinysofa-svn] r2258 - contrib/perl-io-socket-ssl/releases
Message-ID: <20040627162048.01A244E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:20:48 +1000 (Mon, 28 Jun 2004)
New Revision: 2258

Added:
   contrib/perl-io-socket-ssl/releases/0.95/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:21:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:21:33 +1000 (EST)
Subject: [tinysofa-svn] r2259 - contrib/perl-io-socket-ssl
Message-ID: <20040627162133.75E574E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:21:33 +1000 (Mon, 28 Jun 2004)
New Revision: 2259

Added:
   contrib/perl-io-socket-ssl/pristine/
Log:
New in contrib

Copied: contrib/perl-io-socket-ssl/pristine (from rev 2258, contrib/perl-io-socket-ssl/current)


From svn at tinysofa.org  Sun Jun 27 16:22:01 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:22:01 +1000 (EST)
Subject: [tinysofa-svn] r2260 - contrib/perl-io-socket-ssl/releases/0.95
Message-ID: <20040627162201.CAAA64E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:22:01 +1000 (Mon, 28 Jun 2004)
New Revision: 2260

Added:
   contrib/perl-io-socket-ssl/releases/0.95/16gd/
Log:
New in contrib

Copied: contrib/perl-io-socket-ssl/releases/0.95/16gd (from rev 2259, contrib/perl-io-socket-ssl/current)


From svn at tinysofa.org  Sun Jun 27 16:24:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:24:16 +1000 (EST)
Subject: [tinysofa-svn] 
	r2261 - in contrib: . perl-io-zlib perl-io-zlib/current
	perl-io-zlib/current/sources perl-io-zlib/current/specs
Message-ID: <20040627162416.55E6A4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:24:16 +1000 (Mon, 28 Jun 2004)
New Revision: 2261

Added:
   contrib/perl-io-zlib/
   contrib/perl-io-zlib/current/
   contrib/perl-io-zlib/current/sources/
   contrib/perl-io-zlib/current/sources/IO-Zlib-1.01.tar.gz
   contrib/perl-io-zlib/current/specs/
   contrib/perl-io-zlib/current/specs/perl-io-zlib.spec
Log:
New in contrib

Added: contrib/perl-io-zlib/current/sources/IO-Zlib-1.01.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-io-zlib/current/sources/IO-Zlib-1.01.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-io-zlib/current/specs/perl-io-zlib.spec
===================================================================
--- contrib/perl-io-zlib/current/specs/perl-io-zlib.spec	2004-06-27 16:22:01 UTC (rev 2260)
+++ contrib/perl-io-zlib/current/specs/perl-io-zlib.spec	2004-06-27 16:24:16 UTC (rev 2261)
@@ -0,0 +1,67 @@
+%define __check_files %{nil}
+# Derived values
+%define module IO-Zlib
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-io-zlib
+Version: 1.01
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/T/TO/TOMHUGHES/IO-Zlib-1.01.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/IO
+%{siteperl}/IO/*
+%{_mandir}/man3/*
+%doc ChangeLog MANIFEST README
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 1.01-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 1.01-2gd
+- fixed permission on directory
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 16:25:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:25:36 +1000 (EST)
Subject: [tinysofa-svn] r2262 - contrib/perl-io-zlib
Message-ID: <20040627162536.844CF4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:25:36 +1000 (Mon, 28 Jun 2004)
New Revision: 2262

Added:
   contrib/perl-io-zlib/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:25:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:25:47 +1000 (EST)
Subject: [tinysofa-svn] r2263 - contrib/perl-io-zlib/releases
Message-ID: <20040627162547.9B0524E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:25:47 +1000 (Mon, 28 Jun 2004)
New Revision: 2263

Added:
   contrib/perl-io-zlib/releases/1.01/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:26:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:26:29 +1000 (EST)
Subject: [tinysofa-svn] r2264 - contrib/perl-io-zlib
Message-ID: <20040627162629.3C6B14E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:26:29 +1000 (Mon, 28 Jun 2004)
New Revision: 2264

Added:
   contrib/perl-io-zlib/pristine/
Log:
New in contrib

Copied: contrib/perl-io-zlib/pristine (from rev 2263, contrib/perl-io-zlib/current)


From svn at tinysofa.org  Sun Jun 27 16:27:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:27:20 +1000 (EST)
Subject: [tinysofa-svn] r2265 - contrib/perl-io-zlib/releases/1.01
Message-ID: <20040627162720.62BBF4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:27:20 +1000 (Mon, 28 Jun 2004)
New Revision: 2265

Added:
   contrib/perl-io-zlib/releases/1.01/16gd/
Log:
New in contrib

Copied: contrib/perl-io-zlib/releases/1.01/16gd (from rev 2264, contrib/perl-io-zlib/current)


From svn at tinysofa.org  Sun Jun 27 16:30:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:30:08 +1000 (EST)
Subject: [tinysofa-svn] 
	r2266 - in contrib: . perl-io-stringy perl-io-stringy/current
	perl-io-stringy/current/sources perl-io-stringy/current/specs
Message-ID: <20040627163008.8EA904E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:30:08 +1000 (Mon, 28 Jun 2004)
New Revision: 2266

Added:
   contrib/perl-io-stringy/
   contrib/perl-io-stringy/current/
   contrib/perl-io-stringy/current/sources/
   contrib/perl-io-stringy/current/sources/IO-stringy-2.109.tar.gz
   contrib/perl-io-stringy/current/specs/
   contrib/perl-io-stringy/current/specs/perl-io-stringy.spec
Log:
New in contrib

Added: contrib/perl-io-stringy/current/sources/IO-stringy-2.109.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-io-stringy/current/sources/IO-stringy-2.109.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-io-stringy/current/specs/perl-io-stringy.spec
===================================================================
--- contrib/perl-io-stringy/current/specs/perl-io-stringy.spec	2004-06-27 16:27:20 UTC (rev 2265)
+++ contrib/perl-io-stringy/current/specs/perl-io-stringy.spec	2004-06-27 16:30:08 UTC (rev 2266)
@@ -0,0 +1,69 @@
+%define __check_files %{nil}
+%define class IO
+%define subclass stringy
+# Derived values
+%define module  %{class}-%{subclass}
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-io-stringy
+Version: 2.109
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/E/ER/ERYQ/IO-stringy-2.109.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/IO
+%{siteperl}/IO/*
+%{_mandir}/man3/*
+%doc COPYING Makefile README docs MANIFEST  README.system  examples
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 2.109-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 2.109-2gd
+- fixed permission on directory
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 16:30:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:30:32 +1000 (EST)
Subject: [tinysofa-svn] r2267 - contrib/perl-io-stringy
Message-ID: <20040627163032.5AC734E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:30:32 +1000 (Mon, 28 Jun 2004)
New Revision: 2267

Added:
   contrib/perl-io-stringy/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:30:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:30:39 +1000 (EST)
Subject: [tinysofa-svn] r2268 - contrib/perl-io-stringy/releases
Message-ID: <20040627163039.EFCC44E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:30:39 +1000 (Mon, 28 Jun 2004)
New Revision: 2268

Added:
   contrib/perl-io-stringy/releases/2.109/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:31:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:31:15 +1000 (EST)
Subject: [tinysofa-svn] r2269 - contrib/perl-io-stringy/releases/2.109
Message-ID: <20040627163115.BBC2F4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:31:15 +1000 (Mon, 28 Jun 2004)
New Revision: 2269

Added:
   contrib/perl-io-stringy/releases/2.109/16gd/
Log:
New in contrib

Copied: contrib/perl-io-stringy/releases/2.109/16gd (from rev 2268, contrib/perl-io-stringy/current)


From svn at tinysofa.org  Sun Jun 27 16:31:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:31:29 +1000 (EST)
Subject: [tinysofa-svn] r2270 - contrib/perl-io-stringy
Message-ID: <20040627163129.B5C6A4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:31:29 +1000 (Mon, 28 Jun 2004)
New Revision: 2270

Added:
   contrib/perl-io-stringy/pristine/
Log:
New in contrib

Copied: contrib/perl-io-stringy/pristine (from rev 2269, contrib/perl-io-stringy/current)


From svn at tinysofa.org  Sun Jun 27 16:33:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:33:21 +1000 (EST)
Subject: [tinysofa-svn] 
	r2271 - in contrib: . perl-archive-tar perl-archive-tar/current
	perl-archive-tar/current/sources perl-archive-tar/current/specs
Message-ID: <20040627163321.0770B4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:33:20 +1000 (Mon, 28 Jun 2004)
New Revision: 2271

Added:
   contrib/perl-archive-tar/
   contrib/perl-archive-tar/current/
   contrib/perl-archive-tar/current/sources/
   contrib/perl-archive-tar/current/sources/Archive-Tar-1.08.tar.gz
   contrib/perl-archive-tar/current/specs/
   contrib/perl-archive-tar/current/specs/perl-archive-tar.spec
Log:
New in contrib

Added: contrib/perl-archive-tar/current/sources/Archive-Tar-1.08.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-archive-tar/current/sources/Archive-Tar-1.08.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-archive-tar/current/specs/perl-archive-tar.spec
===================================================================
--- contrib/perl-archive-tar/current/specs/perl-archive-tar.spec	2004-06-27 16:31:29 UTC (rev 2270)
+++ contrib/perl-archive-tar/current/specs/perl-archive-tar.spec	2004-06-27 16:33:20 UTC (rev 2271)
@@ -0,0 +1,68 @@
+%define __check_files %{nil}
+# Derived values
+%define module Archive-Tar
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-archive-tar
+Version: 1.08
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Archive-Tar-1.08.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	noarch
+BuildRequires:  perl perl-io-zlib
+Requires:	perl-io-zlib
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/Archive
+%{siteperl}/Archive/*
+%{_mandir}/man3/*
+%doc MANIFEST README
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 1.08-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 1.08-2gd
+- fixed permission on directory
+- added %doc to %files section
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 16:33:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:33:47 +1000 (EST)
Subject: [tinysofa-svn] r2272 - contrib/perl-archive-tar
Message-ID: <20040627163347.D56424E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:33:47 +1000 (Mon, 28 Jun 2004)
New Revision: 2272

Added:
   contrib/perl-archive-tar/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:34:07 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:34:07 +1000 (EST)
Subject: [tinysofa-svn] r2273 - contrib/perl-archive-tar/releases
Message-ID: <20040627163407.2ED3E4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:34:07 +1000 (Mon, 28 Jun 2004)
New Revision: 2273

Added:
   contrib/perl-archive-tar/releases/1.08/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:34:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:34:31 +1000 (EST)
Subject: [tinysofa-svn] r2274 - contrib/perl-archive-tar
Message-ID: <20040627163431.7E9C54E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:34:31 +1000 (Mon, 28 Jun 2004)
New Revision: 2274

Added:
   contrib/perl-archive-tar/pristine/
Log:
New in contrib

Copied: contrib/perl-archive-tar/pristine (from rev 2273, contrib/perl-archive-tar/current)


From svn at tinysofa.org  Sun Jun 27 16:34:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:34:57 +1000 (EST)
Subject: [tinysofa-svn] r2275 - contrib/perl-archive-tar/releases/1.08
Message-ID: <20040627163457.998D44E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:34:57 +1000 (Mon, 28 Jun 2004)
New Revision: 2275

Added:
   contrib/perl-archive-tar/releases/1.08/16gd/
Log:
New in contrib

Copied: contrib/perl-archive-tar/releases/1.08/16gd (from rev 2274, contrib/perl-archive-tar/current)


From svn at tinysofa.org  Sun Jun 27 16:40:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:40:13 +1000 (EST)
Subject: [tinysofa-svn] 
	r2276 - in contrib: . perl-convert-uulib perl-convert-uulib/current
	perl-convert-uulib/current/sources perl-convert-uulib/current/specs
Message-ID: <20040627164013.B40C44E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:40:13 +1000 (Mon, 28 Jun 2004)
New Revision: 2276

Added:
   contrib/perl-convert-uulib/
   contrib/perl-convert-uulib/current/
   contrib/perl-convert-uulib/current/sources/
   contrib/perl-convert-uulib/current/sources/Convert-TNEF-0.17.tar.gz
   contrib/perl-convert-uulib/current/specs/
   contrib/perl-convert-uulib/current/specs/perl-convert-uulib.spec
Log:
New in contrib

Added: contrib/perl-convert-uulib/current/sources/Convert-TNEF-0.17.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-convert-uulib/current/sources/Convert-TNEF-0.17.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-convert-uulib/current/specs/perl-convert-uulib.spec
===================================================================
--- contrib/perl-convert-uulib/current/specs/perl-convert-uulib.spec	2004-06-27 16:34:57 UTC (rev 2275)
+++ contrib/perl-convert-uulib/current/specs/perl-convert-uulib.spec	2004-06-27 16:40:13 UTC (rev 2276)
@@ -0,0 +1,72 @@
+%define __check_files %{nil}
+# Derived values
+%define module  Convert-UUlib
+%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl module %{module}
+Name: perl-convert-uulib
+Version: 1.0
+Release: 16gd
+License: distributable
+Group: Trustix Contrib
+Source0: http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Convert-UUlib-1.0.tar.gz
+Url: http://www.cpan.org
+BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
+BuildArch:	i586
+Requires:       perl = %{perlver}
+Provides:       %{module} = %{version}
+
+%define siteperl /usr/lib/perl5/site_perl/%{perlver}
+
+%description
+%{module} module from CPAN for perl
+
+# Provide perl-specific find-{provides,requires}.
+%define __find_provides /usr/lib/rpm/find-provides.perl
+%define __find_requires /usr/lib/rpm/find-requires.perl
+
+%prep
+%setup -q -n %{module}-%{version} 
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make
+
+%clean 
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+eval `perl '-V:installarchlib'`
+mkdir -p $RPM_BUILD_ROOT/$installarchlib
+%{makeinstall}
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+%files
+%defattr(-,root,root,0755)
+%dir %{siteperl}/i586-linux-thread-multi/auto
+%dir %{siteperl}/i586-linux-thread-multi/Convert
+%dir %{siteperl}/i586-linux-thread-multi/auto/Convert
+%{siteperl}/i586-linux-thread-multi/auto/Convert/UUlib/UUlib.so
+%{siteperl}/i586-linux-thread-multi/auto/Convert/UUlib/UUlib.bs
+%{siteperl}/i586-linux-thread-multi/Convert/UUlib.pm
+%{_mandir}/man3/Convert::UUlib.3.gz
+%doc COPYING COPYING.Artistic COPYING.GNU Changes MANIFEST README
+%doc example-decoder doc
+
+%changelog
+* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 1.0-16gd
+- Rebuilt for tinysofa
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 1.0-2gd
+- fixed permission on directory
+- added %doc to %files section
+- changed arch to i586
+
+* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
+- Initial release for Trustix based off a few others.
+


From svn at tinysofa.org  Sun Jun 27 16:40:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:40:36 +1000 (EST)
Subject: [tinysofa-svn] r2277 - contrib/perl-convert-uulib
Message-ID: <20040627164036.F061A4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:40:36 +1000 (Mon, 28 Jun 2004)
New Revision: 2277

Added:
   contrib/perl-convert-uulib/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:42:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:42:37 +1000 (EST)
Subject: [tinysofa-svn] r2278 - contrib/perl-convert-uulib/current/sources
Message-ID: <20040627164237.2C29A4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:42:36 +1000 (Mon, 28 Jun 2004)
New Revision: 2278

Added:
   contrib/perl-convert-uulib/current/sources/Convert-UUlib-1.0.tar.gz
Removed:
   contrib/perl-convert-uulib/current/sources/Convert-TNEF-0.17.tar.gz
Log:
New in contrib

Deleted: contrib/perl-convert-uulib/current/sources/Convert-TNEF-0.17.tar.gz
===================================================================
(Binary files differ)

Added: contrib/perl-convert-uulib/current/sources/Convert-UUlib-1.0.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-convert-uulib/current/sources/Convert-UUlib-1.0.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


From svn at tinysofa.org  Sun Jun 27 16:43:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:43:00 +1000 (EST)
Subject: [tinysofa-svn] r2279 - contrib/perl-convert-uulib/releases
Message-ID: <20040627164300.9CFE14E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:43:00 +1000 (Mon, 28 Jun 2004)
New Revision: 2279

Added:
   contrib/perl-convert-uulib/releases/1.0/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:43:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:43:28 +1000 (EST)
Subject: [tinysofa-svn] r2280 - contrib/perl-convert-uulib
Message-ID: <20040627164328.D0A1A4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:43:28 +1000 (Mon, 28 Jun 2004)
New Revision: 2280

Added:
   contrib/perl-convert-uulib/pristine/
Log:
New in contrib

Copied: contrib/perl-convert-uulib/pristine (from rev 2279, contrib/perl-convert-uulib/current)


From svn at tinysofa.org  Sun Jun 27 16:43:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:43:52 +1000 (EST)
Subject: [tinysofa-svn] r2281 - contrib/perl-convert-uulib/releases/1.0
Message-ID: <20040627164352.C0AB64E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:43:52 +1000 (Mon, 28 Jun 2004)
New Revision: 2281

Added:
   contrib/perl-convert-uulib/releases/1.0/16gd/
Log:
New in contrib

Copied: contrib/perl-convert-uulib/releases/1.0/16gd (from rev 2280, contrib/perl-convert-uulib/current)


From svn at tinysofa.org  Sun Jun 27 16:48:04 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:48:04 +1000 (EST)
Subject: [tinysofa-svn] 
	r2282 - in contrib: . perl-berkeleydb perl-berkeleydb/current
	perl-berkeleydb/current/sources perl-berkeleydb/current/specs
Message-ID: <20040627164804.74EAE4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:48:04 +1000 (Mon, 28 Jun 2004)
New Revision: 2282

Added:
   contrib/perl-berkeleydb/
   contrib/perl-berkeleydb/current/
   contrib/perl-berkeleydb/current/sources/
   contrib/perl-berkeleydb/current/sources/BerkeleyDB-0.25.tar.gz
   contrib/perl-berkeleydb/current/specs/
   contrib/perl-berkeleydb/current/specs/perl-berkeleydb.spec
Log:
New in contrib

Added: contrib/perl-berkeleydb/current/sources/BerkeleyDB-0.25.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-berkeleydb/current/sources/BerkeleyDB-0.25.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-berkeleydb/current/specs/perl-berkeleydb.spec
===================================================================
--- contrib/perl-berkeleydb/current/specs/perl-berkeleydb.spec	2004-06-27 16:43:52 UTC (rev 2281)
+++ contrib/perl-berkeleydb/current/specs/perl-berkeleydb.spec	2004-06-27 16:48:04 UTC (rev 2282)
@@ -0,0 +1,44 @@
+%define __check_files %{nil}
+%define real_name BerkeleyDB
+%define real_version 0.25
+%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl extension for Berkeley DB version 2, 3 or 4 
+Name:     perl-berkeleydb
+Version:  %{real_version}
+Release:  1gd
+Source:   %{real_name}-%{real_version}.tar.gz
+License:  Perl
+Group: tinysofa contrib
+Requires: perl >= %{perl_version} db4
+BuildRequires: perl-devel >= %{perl_version} db4-devel
+Buildroot: %{_tmppath}/%{name}-root
+
+%define siteperl /usr/lib/perl5/site_perl/%{perl_version}
+
+%description
+Perl extension for Berkeley DB version 2, 3 or 4 
+
+%prep -q
+%setup -q -n %{real_name}-%{real_version}
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix}
+make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,0755)
+%doc Changes README
+%{siteperl}/i586-linux-thread-multi/*
+%{_mandir}/man3/*
+
+%changelog
+* Wed Jun 23 2004 Gerald Dachs <gda at tinysofa dot org> 0.25-1gd
+- packaged for tinysofa


From svn at tinysofa.org  Sun Jun 27 16:48:46 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:48:46 +1000 (EST)
Subject: [tinysofa-svn] r2283 - contrib/perl-berkeleydb
Message-ID: <20040627164846.BFD754E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:48:46 +1000 (Mon, 28 Jun 2004)
New Revision: 2283

Added:
   contrib/perl-berkeleydb/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:48:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:48:57 +1000 (EST)
Subject: [tinysofa-svn] r2284 - contrib/perl-berkeleydb/releases
Message-ID: <20040627164857.E5E9F4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:48:57 +1000 (Mon, 28 Jun 2004)
New Revision: 2284

Added:
   contrib/perl-berkeleydb/releases/0.25/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:49:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:49:21 +1000 (EST)
Subject: [tinysofa-svn] r2285 - contrib/perl-berkeleydb
Message-ID: <20040627164921.C76F34E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:49:21 +1000 (Mon, 28 Jun 2004)
New Revision: 2285

Added:
   contrib/perl-berkeleydb/pristine/
Log:
New in contrib

Copied: contrib/perl-berkeleydb/pristine (from rev 2284, contrib/perl-berkeleydb/current)


From svn at tinysofa.org  Sun Jun 27 16:49:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:49:52 +1000 (EST)
Subject: [tinysofa-svn] r2286 - contrib/perl-berkeleydb/releases/0.25
Message-ID: <20040627164952.73F5F4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:49:52 +1000 (Mon, 28 Jun 2004)
New Revision: 2286

Added:
   contrib/perl-berkeleydb/releases/0.25/1gd/
Log:
New in contrib

Copied: contrib/perl-berkeleydb/releases/0.25/1gd (from rev 2285, contrib/perl-berkeleydb/current)


From svn at tinysofa.org  Sun Jun 27 16:52:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:52:40 +1000 (EST)
Subject: [tinysofa-svn] 
	r2287 - in contrib: . perl-inline perl-inline/current
	perl-inline/current/sources perl-inline/current/specs
Message-ID: <20040627165240.9F5974E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:52:40 +1000 (Mon, 28 Jun 2004)
New Revision: 2287

Added:
   contrib/perl-inline/
   contrib/perl-inline/current/
   contrib/perl-inline/current/sources/
   contrib/perl-inline/current/sources/Inline-0.44.tar.gz
   contrib/perl-inline/current/specs/
   contrib/perl-inline/current/specs/perl-inline.spec
Log:
New in contrib

Added: contrib/perl-inline/current/sources/Inline-0.44.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-inline/current/sources/Inline-0.44.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-inline/current/specs/perl-inline.spec
===================================================================
--- contrib/perl-inline/current/specs/perl-inline.spec	2004-06-27 16:49:52 UTC (rev 2286)
+++ contrib/perl-inline/current/specs/perl-inline.spec	2004-06-27 16:52:40 UTC (rev 2287)
@@ -0,0 +1,49 @@
+#%define __check_files %{nil}
+%define real_name Inline
+%define real_version 0.44
+%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary:  Write Perl subroutines in other programming languages. 
+Name:     perl-inline
+Version:  %{real_version}
+Release:  1gd
+Source:   %{real_name}-%{real_version}.tar.gz
+License:  Perl
+Group: tinysofa contrib
+Requires: perl >= %{perl_version}
+Requires: perl-parse-recdescent
+BuildRequires: perl-parse-recdescent
+BuildRequires: perl-devel >= %{perl_version}
+Buildroot: %{_tmppath}/%{name}-root
+
+%define siteperl /usr/lib/perl5/site_perl/%{perl_version}
+
+%description
+Write Perl subroutines in other programming languages.
+
+%prep -q
+%setup -q -n %{real_name}-%{real_version}
+
+%build
+echo y | %{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix}
+make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,0755)
+%doc Changes README
+%{siteperl}/i586-linux-thread-multi/auto/Inline
+%{siteperl}/Inline.pm
+%{siteperl}/auto/Inline
+%{siteperl}/Inline
+%{_mandir}/man3/*
+
+%changelog
+* Wed Jun 23 2004 Gerald Dachs <gda at tinysofa dot org> 0.44-1gd
+- packaged for tinysofa


From svn at tinysofa.org  Sun Jun 27 16:53:01 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:53:01 +1000 (EST)
Subject: [tinysofa-svn] r2288 - contrib/perl-inline
Message-ID: <20040627165301.771454E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:53:01 +1000 (Mon, 28 Jun 2004)
New Revision: 2288

Added:
   contrib/perl-inline/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:53:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:53:21 +1000 (EST)
Subject: [tinysofa-svn] r2289 - contrib/perl-inline/releases
Message-ID: <20040627165321.384BC4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:53:21 +1000 (Mon, 28 Jun 2004)
New Revision: 2289

Added:
   contrib/perl-inline/releases/0.44/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:53:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:53:51 +1000 (EST)
Subject: [tinysofa-svn] r2290 - contrib/perl-inline
Message-ID: <20040627165351.3F8FB4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:53:51 +1000 (Mon, 28 Jun 2004)
New Revision: 2290

Added:
   contrib/perl-inline/pristine/
Log:
New in contrib

Copied: contrib/perl-inline/pristine (from rev 2289, contrib/perl-inline/current)


From svn at tinysofa.org  Sun Jun 27 16:54:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:54:17 +1000 (EST)
Subject: [tinysofa-svn] r2291 - contrib/perl-inline/releases/0.44
Message-ID: <20040627165417.6F9FD4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:54:17 +1000 (Mon, 28 Jun 2004)
New Revision: 2291

Added:
   contrib/perl-inline/releases/0.44/1gd/
Log:
New in contrib

Copied: contrib/perl-inline/releases/0.44/1gd (from rev 2290, contrib/perl-inline/current)


From svn at tinysofa.org  Sun Jun 27 16:56:05 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:56:05 +1000 (EST)
Subject: [tinysofa-svn] 
	r2292 - in contrib: . perl-mail-clamav perl-mail-clamav/current
	perl-mail-clamav/current/sources perl-mail-clamav/current/specs
Message-ID: <20040627165605.895C14E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:56:05 +1000 (Mon, 28 Jun 2004)
New Revision: 2292

Added:
   contrib/perl-mail-clamav/
   contrib/perl-mail-clamav/current/
   contrib/perl-mail-clamav/current/sources/
   contrib/perl-mail-clamav/current/sources/Mail-ClamAV-0.10.tar.gz
   contrib/perl-mail-clamav/current/specs/
   contrib/perl-mail-clamav/current/specs/perl-mail-clamav.spec
Log:
New in contrib

Added: contrib/perl-mail-clamav/current/sources/Mail-ClamAV-0.10.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-mail-clamav/current/sources/Mail-ClamAV-0.10.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-mail-clamav/current/specs/perl-mail-clamav.spec
===================================================================
--- contrib/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2004-06-27 16:54:17 UTC (rev 2291)
+++ contrib/perl-mail-clamav/current/specs/perl-mail-clamav.spec	2004-06-27 16:56:05 UTC (rev 2292)
@@ -0,0 +1,49 @@
+%define __check_files %{nil}
+%define real_name Mail-ClamAV
+%define real_version 0.10
+%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: Perl extension for the clamav virus scanner 
+Name:     perl-mail-clamav
+Version:  %{real_version}
+Release:  1gd
+Source:   %{real_name}-%{real_version}.tar.gz
+License:  Perl
+Group: tinysofa contrib
+Requires: perl >= %{perl_version} perl-inline clamav
+BuildRequires: perl-devel >= %{perl_version} perl-inline clamav-devel
+Buildroot: %{_tmppath}/%{name}-root
+
+%define siteperl /usr/lib/perl5/site_perl/%{perl_version}
+
+%description
+Perl extension for the clamav virus scanner
+
+%prep -q
+%setup -q -n %{real_name}-%{real_version}
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix}
+make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,0755)
+%doc Changes README
+%dir %{siteperl}/i586-linux-thread-multi/auto/Mail
+%dir %{siteperl}/i586-linux-thread-multi/auto/Mail/ClamAV
+%{siteperl}/i586-linux-thread-multi/auto/Mail/ClamAV/ClamAV.so
+%{siteperl}/i586-linux-thread-multi/auto/Mail/ClamAV/ClamAV.bs
+%dir %{siteperl}/i586-linux-thread-multi/Mail
+%{siteperl}/i586-linux-thread-multi/Mail/ClamAV.pm
+%{_mandir}/man3/*
+
+%changelog
+* Wed Jun 23 2004 Gerald Dachs <gda at tinysofa dot org> 1.94-1gd
+- packaged for tinysofa


From svn at tinysofa.org  Sun Jun 27 16:56:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:56:31 +1000 (EST)
Subject: [tinysofa-svn] r2293 - contrib/perl-mail-clamav
Message-ID: <20040627165631.6C1BD4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:56:31 +1000 (Mon, 28 Jun 2004)
New Revision: 2293

Added:
   contrib/perl-mail-clamav/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:56:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:56:41 +1000 (EST)
Subject: [tinysofa-svn] r2294 - contrib/perl-mail-clamav/releases
Message-ID: <20040627165641.3C03F4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:56:41 +1000 (Mon, 28 Jun 2004)
New Revision: 2294

Added:
   contrib/perl-mail-clamav/releases/0.10/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 16:57:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:57:36 +1000 (EST)
Subject: [tinysofa-svn] r2295 - contrib/perl-mail-clamav
Message-ID: <20040627165736.703864E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:57:36 +1000 (Mon, 28 Jun 2004)
New Revision: 2295

Added:
   contrib/perl-mail-clamav/pristine/
Log:
New in contrib

Copied: contrib/perl-mail-clamav/pristine (from rev 2294, contrib/perl-mail-clamav/current)


From svn at tinysofa.org  Sun Jun 27 16:58:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:58:02 +1000 (EST)
Subject: [tinysofa-svn] r2296 - contrib/perl-mail-clamav/releases/0.10
Message-ID: <20040627165802.70EC04E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:58:02 +1000 (Mon, 28 Jun 2004)
New Revision: 2296

Added:
   contrib/perl-mail-clamav/releases/0.10/1gd/
Log:
New in contrib

Copied: contrib/perl-mail-clamav/releases/0.10/1gd (from rev 2295, contrib/perl-mail-clamav/current)


From svn at tinysofa.org  Sun Jun 27 16:59:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 02:59:50 +1000 (EST)
Subject: [tinysofa-svn] r2297 - in contrib: . perl-parse-recdescent
	perl-parse-recdescent/current perl-parse-recdescent/current/sources
	perl-parse-recdescent/current/specs
Message-ID: <20040627165950.8FA2E4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 02:59:50 +1000 (Mon, 28 Jun 2004)
New Revision: 2297

Added:
   contrib/perl-parse-recdescent/
   contrib/perl-parse-recdescent/current/
   contrib/perl-parse-recdescent/current/sources/
   contrib/perl-parse-recdescent/current/sources/Parse-RecDescent-1.94.tar.gz
   contrib/perl-parse-recdescent/current/specs/
   contrib/perl-parse-recdescent/current/specs/perl-parse-recdescent.spec
Log:
New in contrib

Added: contrib/perl-parse-recdescent/current/sources/Parse-RecDescent-1.94.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-parse-recdescent/current/sources/Parse-RecDescent-1.94.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-parse-recdescent/current/specs/perl-parse-recdescent.spec
===================================================================
--- contrib/perl-parse-recdescent/current/specs/perl-parse-recdescent.spec	2004-06-27 16:58:02 UTC (rev 2296)
+++ contrib/perl-parse-recdescent/current/specs/perl-parse-recdescent.spec	2004-06-27 16:59:50 UTC (rev 2297)
@@ -0,0 +1,48 @@
+%define __check_files %{nil}
+%define real_name Parse-RecDescent
+%define real_version 1.94
+%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary:  Generate Recursive-Descent Parsers 
+Name:     perl-parse-recdescent
+Version:  %{real_version}
+Release:  1gd
+Source:   %{real_name}-%{real_version}.tar.gz
+License:  Perl
+Group: tinysofa contrib
+Requires: perl >= %{perl_version}
+BuildRequires: perl-devel >= %{perl_version}
+Buildroot: %{_tmppath}/%{name}-root
+
+%define siteperl /usr/lib/perl5/site_perl/%{perl_version}
+
+%description
+Generate Recursive-Descent Parsers 
+
+%prep -q
+%setup -q -n %{real_name}-%{real_version}
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix}
+make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,0755)
+%doc Changes README
+%dir %{siteperl}/i586-linux-thread-multi/auto/Parse
+%{siteperl}/i586-linux-thread-multi/auto/Parse/RecDescent
+%dir %{siteperl}/Parse
+%{siteperl}/Parse/RecDescent.pm
+%{siteperl}/Parse/RecDescent.pod
+%{_mandir}/man3/Parse::RecDescent.3.gz
+
+%changelog
+* Wed Jun 23 2004 Gerald Dachs <gda at tinysofa dot org> 1.94-1gd
+- packaged for tinysofa


From svn at tinysofa.org  Sun Jun 27 17:00:26 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:00:26 +1000 (EST)
Subject: [tinysofa-svn] r2298 - contrib/perl-parse-recdescent
Message-ID: <20040627170026.73EF04E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:00:26 +1000 (Mon, 28 Jun 2004)
New Revision: 2298

Added:
   contrib/perl-parse-recdescent/pristine/
Log:
New in contrib

Copied: contrib/perl-parse-recdescent/pristine (from rev 2297, contrib/perl-parse-recdescent/current)


From svn at tinysofa.org  Sun Jun 27 17:00:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:00:43 +1000 (EST)
Subject: [tinysofa-svn] r2299 - contrib/perl-parse-recdescent
Message-ID: <20040627170043.D640E4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:00:43 +1000 (Mon, 28 Jun 2004)
New Revision: 2299

Added:
   contrib/perl-parse-recdescent/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 17:00:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:00:56 +1000 (EST)
Subject: [tinysofa-svn] r2300 - contrib/perl-parse-recdescent/releases
Message-ID: <20040627170056.464954E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:00:56 +1000 (Mon, 28 Jun 2004)
New Revision: 2300

Added:
   contrib/perl-parse-recdescent/releases/1.94/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 17:01:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:01:29 +1000 (EST)
Subject: [tinysofa-svn] r2301 - contrib/perl-parse-recdescent/releases/1.94
Message-ID: <20040627170129.E33894E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:01:29 +1000 (Mon, 28 Jun 2004)
New Revision: 2301

Added:
   contrib/perl-parse-recdescent/releases/1.94/1gd/
Log:
New in contrib

Copied: contrib/perl-parse-recdescent/releases/1.94/1gd (from rev 2300, contrib/perl-parse-recdescent/current)


From svn at tinysofa.org  Sun Jun 27 17:03:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:03:27 +1000 (EST)
Subject: [tinysofa-svn] r2302 - in contrib: . perl-uri perl-uri/current
	perl-uri/current/sources perl-uri/current/specs
Message-ID: <20040627170327.A49154E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:03:27 +1000 (Mon, 28 Jun 2004)
New Revision: 2302

Added:
   contrib/perl-uri/
   contrib/perl-uri/current/
   contrib/perl-uri/current/sources/
   contrib/perl-uri/current/sources/URI-1.31.tar.gz
   contrib/perl-uri/current/specs/
   contrib/perl-uri/current/specs/perl-uri.spec
Log:
New in contrib

Added: contrib/perl-uri/current/sources/URI-1.31.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/perl-uri/current/sources/URI-1.31.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/perl-uri/current/specs/perl-uri.spec
===================================================================
--- contrib/perl-uri/current/specs/perl-uri.spec	2004-06-27 17:01:29 UTC (rev 2301)
+++ contrib/perl-uri/current/specs/perl-uri.spec	2004-06-27 17:03:27 UTC (rev 2302)
@@ -0,0 +1,44 @@
+%define __check_files %{nil}
+%define real_name URI
+%define real_version 1.31
+%define perl_version %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
+
+Summary: URI - Uniform Resource Identifiers (absolute and relative)
+Name:     perl-uri
+Version:  %{real_version}
+Release:  1gd
+Source:   %{real_name}-%{real_version}.tar.gz
+License:  Perl
+Group: tinysofa contrib
+Requires: perl >= %{perl_version}
+BuildRequires: perl-devel >= %{perl_version}
+Buildroot: %{_tmppath}/%{name}-root
+
+%define siteperl /usr/lib/perl5/site_perl/%{perl_version}
+
+%description
+URI - Uniform Resource Identifiers (absolute and relative)
+
+%prep -q
+%setup -q -n %{real_name}-%{real_version}
+
+%build
+%{__perl} Makefile.PL INSTALLDIRS=site PREFIX=%{_prefix}
+make OPTIMIZE="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,0755)
+%doc Changes README
+%{siteperl}/*
+%{_mandir}/man3/*
+
+%changelog
+* Wed Jun 23 2004 Gerald Dachs <gda at tinysofa dot org> 1.31-1gd
+- packaged for tinysofa


From svn at tinysofa.org  Sun Jun 27 17:03:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:03:47 +1000 (EST)
Subject: [tinysofa-svn] r2303 - contrib/perl-uri
Message-ID: <20040627170347.C3DA44E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:03:47 +1000 (Mon, 28 Jun 2004)
New Revision: 2303

Added:
   contrib/perl-uri/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 17:03:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:03:54 +1000 (EST)
Subject: [tinysofa-svn] r2304 - contrib/perl-uri/releases
Message-ID: <20040627170354.56B034E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:03:54 +1000 (Mon, 28 Jun 2004)
New Revision: 2304

Added:
   contrib/perl-uri/releases/1.31/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 17:04:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:04:36 +1000 (EST)
Subject: [tinysofa-svn] r2305 - contrib/perl-uri
Message-ID: <20040627170436.52FBB4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:04:36 +1000 (Mon, 28 Jun 2004)
New Revision: 2305

Added:
   contrib/perl-uri/pristine/
Log:
New in contrib

Copied: contrib/perl-uri/pristine (from rev 2304, contrib/perl-uri/current)


From svn at tinysofa.org  Sun Jun 27 17:05:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:05:02 +1000 (EST)
Subject: [tinysofa-svn] r2306 - contrib/perl-uri/releases/1.31
Message-ID: <20040627170502.6BE1E4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:05:02 +1000 (Mon, 28 Jun 2004)
New Revision: 2306

Added:
   contrib/perl-uri/releases/1.31/1gd/
Log:
New in contrib

Copied: contrib/perl-uri/releases/1.31/1gd (from rev 2305, contrib/perl-uri/current)


From svn at tinysofa.org  Sun Jun 27 17:09:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:09:35 +1000 (EST)
Subject: [tinysofa-svn] 
	r2307 - in contrib: . spamassassin spamassassin/current
	spamassassin/current/source spamassassin/current/specs
Message-ID: <20040627170935.13BFD4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:09:34 +1000 (Mon, 28 Jun 2004)
New Revision: 2307

Added:
   contrib/spamassassin/
   contrib/spamassassin/current/
   contrib/spamassassin/current/source/
   contrib/spamassassin/current/source/Mail-SpamAssassin-2.63.tar.gz
   contrib/spamassassin/current/source/spamassassin-2.63-archiveiterator.patch
   contrib/spamassassin/current/source/spamassassin-confdir.patch
   contrib/spamassassin/current/source/spamassassin.initd
   contrib/spamassassin/current/source/spamassassin.sysconfig
   contrib/spamassassin/current/specs/
   contrib/spamassassin/current/specs/spamassassin.spec
Log:
New in contrib

Added: contrib/spamassassin/current/source/Mail-SpamAssassin-2.63.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/spamassassin/current/source/Mail-SpamAssassin-2.63.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: contrib/spamassassin/current/source/spamassassin-2.63-archiveiterator.patch
===================================================================
--- contrib/spamassassin/current/source/spamassassin-2.63-archiveiterator.patch	2004-06-27 17:05:02 UTC (rev 2306)
+++ contrib/spamassassin/current/source/spamassassin-2.63-archiveiterator.patch	2004-06-27 17:09:34 UTC (rev 2307)
@@ -0,0 +1,20 @@
+--- Mail-SpamAssassin-2.63/lib/Mail/SpamAssassin/ArchiveIterator.pm.orig	2004-01-18 00:56:08.000000000 +0100
++++ Mail-SpamAssassin-2.63/lib/Mail/SpamAssassin/ArchiveIterator.pm	2004-02-08 22:07:45.000000000 +0100
+@@ -433,7 +433,16 @@
+   my @files;
+ 
+   opendir(DIR, $folder) || die "Can't open '$folder' dir: $!";
+-  if (-f "$folder/cyrus.header") {
++  if (-d "$folder/new" && -d "$folder/cur" && -d "$folder/tmp") { 
++    # Maildir format
++    for my $sub ("new", "cur") { 
++      closedir(DIR);
++      opendir (DIR, "$folder/$sub") || die "Can't open '$folder/$sub' dir: $!";
++      # Don't learn from messages marked as deleted
++      # Or files starting with a leading dot
++      push @files, map {$_ = "$sub/$_";} grep { !/^\.|:2,.*T/ } readdir(DIR);
++    } 
++  } elsif (-f "$folder/cyrus.header") {
+     # cyrus metadata: http://unix.lsa.umich.edu/docs/imap/imap-lsa-srv_3.html
+     @files = grep { /^\S+$/ && !/^cyrus\.(?:index|header|cache|seen)/ }
+ 			readdir(DIR);

Added: contrib/spamassassin/current/source/spamassassin-confdir.patch
===================================================================
--- contrib/spamassassin/current/source/spamassassin-confdir.patch	2004-06-27 17:05:02 UTC (rev 2306)
+++ contrib/spamassassin/current/source/spamassassin-confdir.patch	2004-06-27 17:09:34 UTC (rev 2307)
@@ -0,0 +1,302 @@
+diff -urN Mail-SpamAssassin-2.60/Makefile.PL Mail-SpamAssassin-2.60.tsl/Makefile.PL
+--- Mail-SpamAssassin-2.60/Makefile.PL	2003-09-16 03:05:24.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/Makefile.PL	2003-10-29 15:17:42.000000000 +0100
+@@ -633,7 +633,7 @@
+ #   CONFDIR
+ #   LOCALRULESDIR
+ # If none of those is specified, it will chose an FHS-compliant dir,
+-# namely *SYSCONFDIR/mail/spamassassin.
++# namely *SYSCONFDIR/spamassassin.
+ sub _set_macro_CONFDIR {
+   my($repository) = (@_);
+ 
+@@ -653,7 +653,7 @@
+ 
+   # Set the default value based on the corresponding SYSCONFDIR
+   set_macro($macro,
+-    macro_ref("${repository}SYSCONFDIR") . '/mail/spamassassin'
++    macro_ref("${repository}SYSCONFDIR") . '/spamassassin'
+   );
+ }
+ 
+diff -urN Mail-SpamAssassin-2.60/PACKAGING Mail-SpamAssassin-2.60.tsl/PACKAGING
+--- Mail-SpamAssassin-2.60/PACKAGING	2003-09-14 03:05:24.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/PACKAGING	2003-10-29 14:52:46.000000000 +0100
+@@ -88,7 +88,7 @@
+   Samples:
+     This will install the spamassassin apps in /foo/bin, the libs in
+     /foo/lib/perl5, the shared stuff in /foo/share/spamassassin and make
+-    SpamAssassin look for config files in /foo/etc/mail/spamassassin:
++    SpamAssassin look for config files in /foo/etc/spamassassin:
+     	perl Makefile.PL PREFIX=/foo
+ 
+ LIB:
+@@ -147,7 +147,7 @@
+     	perl Makefile.PL PREFIX=/usr/local SYSCONFDIR=/usr/local/etc
+ 
+ CONFDIR (LOCALRULESDIR):
+-  SpamAssassin looks for its config files in SYSCONFDIR/mail/spamassassin.
++  SpamAssassin looks for its config files in SYSCONFDIR/spamassassin.
+   (There is also a sample local.cf created if such a file doesn't exist yet.)
+   Some people didn't like this path for various reasons so the full path to
+   the config files can be changed here (this more or less makes SYSCONFDIR
+diff -urN Mail-SpamAssassin-2.60/README Mail-SpamAssassin-2.60.tsl/README
+--- Mail-SpamAssassin-2.60/README	2003-09-13 03:05:21.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/README	2003-10-29 14:52:31.000000000 +0100
+@@ -110,7 +110,7 @@
+ 	Distributed configuration files, with all defaults.  Do not modify
+ 	these, as they are overwritten when you upgrade.
+ 
+-  - /etc/mail/spamassassin/*.cf:
++  - /etc/spamassassin/*.cf:
+ 
+   	Site config files, for system admins to create, modify, and
+ 	add local rules and scores to.  Modifications here will be
+@@ -121,14 +121,14 @@
+ 	Distributed default user preferences. Do not modify this, as it is
+ 	overwritten when you upgrade.
+ 
+-  - /etc/mail/spamassassin/user_prefs.template:
++  - /etc/spamassassin/user_prefs.template:
+ 
+ 	Default user preferences, for system admins to create, modify, and
+ 	set defaults for users' preferences files.  Takes precedence over
+ 	the above prefs file, if it exists.
+ 
+ 	Do not put system-wide settings in here; put them in the
+-	/etc/mail/spamassassin directory.  This file is just a template,
++	/etc/spamassassin directory.  This file is just a template,
+ 	which will be copied to a user's home directory for them to
+ 	change.
+ 
+@@ -176,20 +176,18 @@
+ 
+   - Site Configuration Files
+         '__local_rules_dir__'
+-        '__prefix__/etc/mail/spamassassin'
+         '__prefix__/etc/spamassassin'
+         '/usr/local/etc/spamassassin'
+         '/usr/pkg/etc/spamassassin'
+         '/usr/etc/spamassassin'
+-        '/etc/mail/spamassassin'
+         '/etc/spamassassin'
+ 
+   - Default User Preferences File
+         '__local_rules_dir__/user_prefs.template'
+-        '__prefix__/etc/mail/spamassassin/user_prefs.template'
++        '__prefix__/etc/spamassassin/user_prefs.template'
+         '__prefix__/share/spamassassin/user_prefs.template'
+         '/etc/spamassassin/user_prefs.template'
+-        '/etc/mail/spamassassin/user_prefs.template'
++        '/etc/spamassassin/user_prefs.template'
+         '/usr/local/share/spamassassin/user_prefs.template'
+         '/usr/share/spamassassin/user_prefs.template'
+ 
+diff -urN Mail-SpamAssassin-2.60/USAGE Mail-SpamAssassin-2.60.tsl/USAGE
+--- Mail-SpamAssassin-2.60/USAGE	2003-06-13 22:17:31.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/USAGE	2003-10-29 14:53:00.000000000 +0100
+@@ -141,14 +141,14 @@
+ 
+ 
+   - You can create your own system-wide rules files in
+-    /etc/mail/spamassassin; their filenames should end in ".cf".  Multiple
++    /etc/spamassassin; their filenames should end in ".cf".  Multiple
+     files will be read, and SpamAssassin will not overwrite these files
+     when installing a new version.
+ 
+ 
+   - You should not modify the files in /usr/share/spamassassin; these
+     will be overwritten when you upgrade.  Any changes you make in
+-    files in the /etc/mail/spamassassin directory,  however, will
++    files in the /etc/spamassassin directory,  however, will
+     override these files.
+ 
+ 
+diff -urN Mail-SpamAssassin-2.60/lib/Mail/SpamAssassin/Conf.pm Mail-SpamAssassin-2.60.tsl/lib/Mail/SpamAssassin/Conf.pm
+--- Mail-SpamAssassin-2.60/lib/Mail/SpamAssassin/Conf.pm	2003-09-22 03:05:50.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/lib/Mail/SpamAssassin/Conf.pm	2003-10-29 14:53:17.000000000 +0100
+@@ -21,7 +21,7 @@
+ =head1 DESCRIPTION
+ 
+ SpamAssassin is configured using some traditional UNIX-style configuration
+-files, loaded from the /usr/share/spamassassin and /etc/mail/spamassassin
++files, loaded from the /usr/share/spamassassin and /etc/spamassassin
+ directories.
+ 
+ The C<#> character starts a comment, which continues until end of line.
+@@ -1850,7 +1850,7 @@
+ 
+ These settings differ from the ones above, in that they are considered
+ 'privileged'.  Only users running C<spamassassin> from their procmailrc's or
+-forward files, or sysadmins editing a file in C</etc/mail/spamassassin>, can
++forward files, or sysadmins editing a file in C</etc/spamassassin>, can
+ use them.   C<spamd> users cannot use them in their C<user_prefs> files, for
+ security and efficiency reasons, unless allow_user_rules is enabled (and
+ then, they may only add rules from below).
+diff -urN Mail-SpamAssassin-2.60/lib/Mail/SpamAssassin.pm Mail-SpamAssassin-2.60.tsl/lib/Mail/SpamAssassin.pm
+--- Mail-SpamAssassin-2.60/lib/Mail/SpamAssassin.pm	2003-09-23 03:05:26.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/lib/Mail/SpamAssassin.pm	2003-10-29 14:54:20.000000000 +0100
+@@ -118,24 +118,21 @@
+   	'/usr/share/spamassassin',
+ );
+ 
+-# first 3 are BSDish, latter 2 Linuxish
++# first 2 are BSDish, lattest Linuxish
+ @site_rules_path = (
+         '__local_rules_dir__',
+-        '__prefix__/etc/mail/spamassassin',
+         '__prefix__/etc/spamassassin',
+         '/usr/local/etc/spamassassin',
+ 	'/usr/pkg/etc/spamassassin',
+         '/usr/etc/spamassassin',
+-  	'/etc/mail/spamassassin',
+   	'/etc/spamassassin',
+ );
+ 
+ @default_prefs_path = (
+         '__local_rules_dir__/user_prefs.template',
+-        '__prefix__/etc/mail/spamassassin/user_prefs.template',
++        '__prefix__/etc/spamassassin/user_prefs.template',
+         '__prefix__/share/spamassassin/user_prefs.template',
+-	'/etc/spamassassin/user_prefs.template',
+-        '/etc/mail/spamassassin/user_prefs.template',
++        '/etc/spamassassin/user_prefs.template',
+         '/usr/local/share/spamassassin/user_prefs.template',
+         '/usr/share/spamassassin/user_prefs.template',
+ );
+diff -urN Mail-SpamAssassin-2.60/rules/user_prefs.template Mail-SpamAssassin-2.60.tsl/rules/user_prefs.template
+--- Mail-SpamAssassin-2.60/rules/user_prefs.template	2003-06-13 22:17:32.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/rules/user_prefs.template	2003-10-29 14:54:31.000000000 +0100
+@@ -5,7 +5,7 @@
+ #* directory. At runtime, if a user has no preferences in their home directory
+ #* already, it will be copied for them, allowing them to perform personalised
+ #* customisation.  If you want to make changes to the site-wide defaults,
+-#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead.
++#* create a file in /etc/spamassassin or /etc/spamassassin instead.
+ ###########################################################################
+ 
+ # How many hits before a mail is considered spam.
+diff -urN Mail-SpamAssassin-2.60/sa-learn.raw Mail-SpamAssassin-2.60.tsl/sa-learn.raw
+--- Mail-SpamAssassin-2.60/sa-learn.raw	2003-09-16 03:05:24.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/sa-learn.raw	2003-10-29 14:54:52.000000000 +0100
+@@ -78,7 +78,7 @@
+  --import                          Upgrade data from an earlier database version
+  -C path, --configpath=path, --config-file=path   Path to standard configuration dir
+  -p prefs, --prefspath=file, --prefs-file=file    Set user preferences file
+- --siteconfigpath=path             Path for site configs (def: /etc/mail/spamassassin)
++ --siteconfigpath=path             Path for site configs (def: /etc/spamassassin)
+  -D, --debug-level                 Print debugging messages
+  -V, --version                     Print version
+  -h, --help                        Print usage message
+@@ -360,7 +360,7 @@
+ =item B<--siteconfigpath>=I<path>
+ 
+ Use the specified path for locating site-specific configuration files.  Ignore
+-the default directories (usually C</etc/mail/spamassassin> or similar).
++the default directories (usually C</etc/spamassassin> or similar).
+ 
+ =item B<-p> I<prefs>, B<--prefspath>=I<prefs>, B<--prefs-file>=I<prefs>
+ 
+diff -urN Mail-SpamAssassin-2.60/spamassassin.raw Mail-SpamAssassin-2.60.tsl/spamassassin.raw
+--- Mail-SpamAssassin-2.60/spamassassin.raw	2003-09-17 03:05:22.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/spamassassin.raw	2003-10-29 14:56:21.000000000 +0100
+@@ -324,7 +324,7 @@
+  -d, --remove-markup               Remove spam reports from a message
+  -C path, --configpath=path, --config-file=path	  Path to standard configuration dir
+  -p prefs, --prefspath=file, --prefs-file=file    Set user preferences file
+- --siteconfigpath=path             Path for site configs (def: /etc/mail/spamassassin)
++ --siteconfigpath=path             Path for site configs (def: /etc/spamassassin)
+  -x, --nocreate-prefs              Don't create user preferences file
+  -e, --exit-code                   Exit with a non-zero exit code if the
+                                    tested message was spam
+@@ -508,7 +508,7 @@
+ =item B<--siteconfigpath>=I<path>
+ 
+ Use the specified path for locating site-specific configuration files.  Ignore
+-the default directories (usually C</etc/mail/spamassassin> or similar).
++the default directories (usually C</etc/spamassassin> or similar).
+ 
+ =item B<-p> I<prefs>, B<--prefspath>=I<prefs>, B<--prefs-file>=I<prefs>
+ 
+@@ -564,12 +564,10 @@
+ Site-specific configuration data is used to override any values which had
+ already been set.  This is loaded from the first existing directory in:
+ F<@@LOCAL_RULES_DIR@@>;
+-F<@@PREFIX@@/etc/mail/spamassassin>;
+ F<@@PREFIX@@/etc/spamassassin>;
+ F</usr/local/etc/spamassassin>;
+ F</usr/pkg/etc/spamassassin>;
+ F</usr/etc/spamassassin>;
+-F</etc/mail/spamassassin>;
+ F</etc/spamassassin> .
+ 
+ Spamassassin will read *.cf in these directories, in alphanumeric order within
+@@ -583,10 +581,9 @@
+ create this file if it does not exist, using F<user_prefs.template> as a
+ template.  This file will be looked for in: 
+ F<@@LOCAL_RULES_DIR@@>;
+-F<@@PREFIX@@/etc/mail/spamassassin>;
++F<@@PREFIX@@/etc/spamassassin>;
+ F<@@PREFIX@@/share/spamassassin>;
+ F</etc/spamassassin>;
+-F</etc/mail/spamassassin>;
+ F</usr/local/share/spamassassin>;
+ F</usr/share/spamassassin>.
+ 
+diff -urN Mail-SpamAssassin-2.60/spamd/README.spamd Mail-SpamAssassin-2.60.tsl/spamd/README.spamd
+--- Mail-SpamAssassin-2.60/spamd/README.spamd	2003-08-21 02:52:01.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/spamd/README.spamd	2003-10-29 14:57:11.000000000 +0100
+@@ -91,7 +91,7 @@
+ If you plan to use Bayesian classification (the BAYES rules) with spamd,
+ you will need to either
+ 
+-  1. modify /etc/mail/spamassassin/local.cf to use a shared database of
++  1. modify /etc/spamassassin/local.cf to use a shared database of
+   tokens, by setting the 'bayes_path' setting to a path all users can read
+   and write to.  You will also need to set the 'bayes_file_mode' setting
+   to 0666 so that created files are shared, too.
+diff -urN Mail-SpamAssassin-2.60/spamd/README.spamd-vpopmail Mail-SpamAssassin-2.60.tsl/spamd/README.spamd-vpopmail
+--- Mail-SpamAssassin-2.60/spamd/README.spamd-vpopmail	2002-04-06 21:28:31.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/spamd/README.spamd-vpopmail	2003-10-29 14:57:27.000000000 +0100
+@@ -43,7 +43,7 @@
+ 	/home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs
+ 
+ 5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work. 
+-This is specified in your /etc/mail/spamassassin/local.cf file. Then add the 
++This is specified in your /etc/spamassassin/local.cf file. Then add the 
+ "-a" switch to spamd. Perhaps a future enhancement would be to add the 
+ capability to have personal AWL db. 
+ 
+diff -urN Mail-SpamAssassin-2.60/spamd/spamd.raw Mail-SpamAssassin-2.60.tsl/spamd/spamd.raw
+--- Mail-SpamAssassin-2.60/spamd/spamd.raw	2003-09-11 03:05:22.000000000 +0200
++++ Mail-SpamAssassin-2.60.tsl/spamd/spamd.raw	2003-10-29 14:56:54.000000000 +0100
+@@ -1341,7 +1341,7 @@
+  -a, --auto-whitelist, --whitelist  Use auto-whitelists
+  -c, --create-prefs                 Create user preferences files
+  -C path, --configpath=path         Path for default config files
+- --siteconfigpath=path              Path for site configs (def: /etc/mail/spamassassin)
++ --siteconfigpath=path              Path for site configs (def: /etc/spamassassin)
+  -d, --daemonize                    Daemonize
+  -h, --help                         Print usage message.
+  -i ipaddr, --listen-ip=ipaddr,...  Listen on the IP ipaddr (default: 127.0.0.1)
+@@ -1421,7 +1421,7 @@
+ =item B<--siteconfigpath>=I<path>
+ 
+ Use the specified path for locating site-specific configuration files.  Ignore
+-the default directories (usually C</etc/mail/spamassassin> or similar).
++the default directories (usually C</etc/spamassassin> or similar).
+ 
+ =item B<-d>, B<--daemonize>
+ 
+diff -urN Mail-SpamAssassin-2.60/sql/README Mail-SpamAssassin-2.60.tsl/sql/README
+--- Mail-SpamAssassin-2.60/sql/README	2003-02-20 13:23:24.000000000 +0100
++++ Mail-SpamAssassin-2.60.tsl/sql/README	2003-10-29 14:57:40.000000000 +0100
+@@ -13,7 +13,7 @@
+ RDBMS system.
+ 
+ SpamAssassin will check the global configuration file (ie. any file matching
+-/etc/mail/spamassassin/*.cf) for the following settings:
++/etc/spamassassin/*.cf) for the following settings:
+ 
+ user_scores_dsn			DBI:driver:database:hostname[:port]
+ user_scores_sql_username	dbusername

Added: contrib/spamassassin/current/source/spamassassin.initd
===================================================================
--- contrib/spamassassin/current/source/spamassassin.initd	2004-06-27 17:05:02 UTC (rev 2306)
+++ contrib/spamassassin/current/source/spamassassin.initd	2004-06-27 17:09:34 UTC (rev 2307)
@@ -0,0 +1,184 @@
+#!/bin/sh
+#
+# spamassassin     This script starts and stops the spamd daemon
+#
+# chkconfig:   - 80 30
+# description: spamd is a daemon process which uses SpamAssassin to check
+#              email messages for SPAM.  It is normally called by spamc
+#              from a MDA.
+#
+### BEGIN INIT INFO
+# Required-Start:    
+# Default-Start:     
+# Default-Stop:      
+# Short-Description: 
+### END INIT INFO
+
+# the name of the service
+NAME="spamassassin"
+
+# source function script
+if   [ -r /etc/init.d/functions ] ; then
+    . /etc/init.d/functions
+elif [ -r /etc/rc.d/function    ] ; then
+    . /etc/rc.d/functions
+elif [ -r /etc/rc.d/init.d/functions ] ; then 
+    . /etc/rc.d/init.d/funtcions
+else
+    echo $"$NAME: unable to find the functions library." >&2
+    exit 1 # generic or unspecified error
+fi
+
+# the binary too look for
+MYBIN="/usr/bin/spamd"
+
+
+# check for binary
+if [ ! -x $MYBIN ] ; then
+    STRING=$"$NAME: unable to find/execute binary."
+    echo -n "$STRING"
+    failure "$STRING"
+    echo
+    exit 5 # program is not installed
+fi
+
+# check if networking is enabled
+[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network
+if [ "${NETWORKING}" = "no" ] ; then
+    STRING=$"$NAME: networking disabled."
+    echo -n "$STRING"
+    failure "$STRING"
+    echo
+    exit 6 # program is not configured
+fi
+
+# maybe we should be root
+if [ ! `id -u` -eq 0 ] ; then
+    STRING=$"You must be root to manipulate $NAME."
+    echo -n "$STRING"
+    failure "$STRING"
+    echo
+    exit 4 # user had insufficient privilege
+fi
+
+# Source spamd configuration file.
+[ -r /etc/sysconfig/spamassassin ] && . /etc/sysconfig/spamassassin
+SPAMDOPTIONS="${SPAMDOPTIONS:- -d -c -a -m5 -H}"
+
+
+# no error yet
+rc=0
+
+
+# start the service
+start ()
+{
+    STRING=$"starting $NAME"
+    echo -n "$STRING"
+
+    # start the service
+    daemon $MYBIN $SPAMDOPTIONS
+    rc=$?
+
+    if [ $rc -eq 0 ] ; then
+        success "$STRING"
+        # create lock file
+        touch ${INITLOCK:-/var/lock/subsys}/$NAME
+    else
+        failure "$STRING"
+        rc=7 # not running
+    fi
+    echo
+
+    return $rc
+}
+
+# stop the service
+stop ()
+{
+    STRING="stopping $NAME"
+    echo -n "$STRING"
+
+    # stop service
+    killproc `basename $MYBIN`
+    rc=$?
+
+    if [ $rc -eq 0 ] ; then
+        success "$STRING"
+        # remove lockfile
+        rm -f ${INITLOCK:-/var/lock/subsys}/$NAME
+    else
+        failure "$STRING"
+        rc=7 # not running
+    fi
+    echo
+
+    return $rc
+}
+
+# restart the service
+restart ()
+{
+    stop
+    start
+}
+
+# restart, but only if already running
+condrestart ()
+{
+    if [ -e ${INITLOCK:-/var/lock/subsys}/$NAME ] ; then
+        restart
+        rc=$?
+    else
+        rc=7
+    fi
+
+    return $rc
+}
+
+# reload config
+reload ()
+{
+    return 3 # unimplemented feature
+}
+
+
+# check how we are called
+case "$1" in
+    start)
+        start
+        rc=$?
+    ;;
+    stop)
+        stop
+        rc=$?
+    ;;
+    restart)
+        restart
+        rc=$?
+    ;;
+    reload)
+        reload
+        rc=$?
+    ;;
+    condrestart)
+        condrestart
+        rc=$?
+    ;;
+    status)
+        status `basename $MYBIN`
+        rc=$?
+    ;;
+    *)
+        echo $"Usage: $0 {start|stop|restart|status}"
+        rc=3 # unimplemented feature
+    ;;
+esac
+
+exit $rc
+
+# Modeline {{{
+# vim:syntax=sh:
+# vim600:fdm=marker fdl=0 fdc=3 vb t_vb=:
+# }}}
+

Added: contrib/spamassassin/current/source/spamassassin.sysconfig
===================================================================
--- contrib/spamassassin/current/source/spamassassin.sysconfig	2004-06-27 17:05:02 UTC (rev 2306)
+++ contrib/spamassassin/current/source/spamassassin.sysconfig	2004-06-27 17:09:34 UTC (rev 2307)
@@ -0,0 +1,3 @@
+# spamd options.
+SPAMDOPTIONS="-d -c -a -m5 -H"
+

Added: contrib/spamassassin/current/specs/spamassassin.spec
===================================================================
--- contrib/spamassassin/current/specs/spamassassin.spec	2004-06-27 17:05:02 UTC (rev 2306)
+++ contrib/spamassassin/current/specs/spamassassin.spec	2004-06-27 17:09:34 UTC (rev 2307)
@@ -0,0 +1,180 @@
+%define __check_files %{nil}
+#%include        /usr/lib/rpm/macros.perl
+%define real_name Mail-SpamAssassin
+%define real_version 2.63
+
+Summary:   a spam filter for email which can be invoked from mail delivery agents
+Name:      spamassassin
+Group: Trustix Contrib
+Version:   %{real_version}
+Release:   16gd
+License:   Artistic
+Source:    http:/spamassassin.org/released/%{real_name}-%{real_version}.tar.gz
+Source1:   spamassassin.initd
+Source2:   spamassassin.sysconfig
+Patch:     spamassassin-confdir.patch
+Patch1:    spamassassin-2.63-archiveiterator.patch
+URL:       http:/spamassassin.org
+Prefix:    %{_prefix}
+Prereq:    /sbin/chkconfig
+Requires:  perl-mail-spamassassin = %{version}-%{release}
+Buildroot: %{_tmppath}/%{name}-root
+
+%define perl_sitelib %(eval "`%{__perl} -V:installsitelib`"; echo "$installsitelib")
+
+%description
+SpamAssassin provides you with a way to reduce, if not completely
+eliminate, Unsolicited Bulk Email (or "spam") from your incoming email.
+It can be invoked by a MDA such as sendmail or postfix, or can be called
+from a procmail script, .forward file, etc.  It uses a
+genetic-algorithm-evolved scoring system to identify messages which look
+spammy, then adds headers to the message so they can be filtered by the
+user's mail reading software.  This distribution includes the
+spamd/spamc components which considerably speeds processing of mail.
+
+
+%package tools
+Summary:   Miscellaneous tools and documentation for SpamAssassin
+Group: Trustix Contrib
+Requires:  perl-mail-spamassassin = %{version}-%{release}
+
+%description tools
+Miscellaneous tools and documentation from various authors, distributed
+with SpamAssassin.  See /usr/share/doc/SpamAssassin-tools-*/.
+
+
+%package -n perl-mail-spamassassin
+Summary:   SpamAssassin e-mail filter Perl modules
+Requires:  perl >= 5.004 perl-html-parser
+Group: Trustix Contrib
+
+%description -n perl-mail-spamassassin
+Mail::SpamAssassin is a module to identify spam using text analysis and
+several internet-based realtime blacklists. Using its rule base, it uses
+a wide range of heuristic tests on mail headers and body text to
+identify ``spam'', also known as unsolicited commercial email. Once
+identified, the mail can then be optionally tagged as spam for later
+filtering using the user's own mail user-agent application.
+
+
+%prep
+%setup -q -n %{real_name}-%{real_version}
+%patch -p1
+%patch1 -p1
+
+
+%build
+%{__perl} Makefile.PL PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} DESTDIR=$RPM_BUILD_ROOT < /dev/null
+%{__make}
+%{__make} spamd/libspamc.so
+
+
+%install
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/%{_initdir}
+install -d $RPM_BUILD_ROOT/%{_includedir}
+install -d $RPM_BUILD_ROOT/etc/spamassassin
+install -d $RPM_BUILD_ROOT/etc/sysconfig
+install -d -m 0755 $RPM_BUILD_ROOT/var/lib/spamassassin/shared
+# Specify the man dir locations since Perl sometimes gets it wrong... :(
+%makeinstall \
+    INSTALLMAN1DIR=%{_mandir}/man1 \
+    INSTALLMAN3DIR=%{_mandir}/man3 \
+    INSTALLSITEMAN1DIR=%{_mandir}/man1 \
+    INSTALLSITEMAN3DIR=%{_mandir}/man3 \
+    INSTALLVENDORMAN1DIR=%{_mandir}/man1 \
+    INSTALLVENDORMAN3DIR=%{_mandir}/man3
+
+install -m 0755 %{SOURCE1}        $RPM_BUILD_ROOT/%{_initdir}/spamassassin
+install -m 0644 spamd/libspamc.so $RPM_BUILD_ROOT/%{_libdir}
+install -m 0644 spamd/libspamc.h  $RPM_BUILD_ROOT/%{_includedir}/libspamc.h
+install -m 0644 rules/local.cf    $RPM_BUILD_ROOT/etc/spamassassin/
+install -m 0644 %{SOURCE2}        $RPM_BUILD_ROOT/etc/sysconfig/spamassassin
+
+
+[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+
+%post
+/sbin/chkconfig --add spamassassin
+/sbin/restart_maybe spamassassin
+
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/service spamassassin stop >/dev/null 2>&1
+    /sbin/chkconfig --del spamassassin
+fi
+
+
+%files
+%defattr(-,root,root)
+%doc README Changes sample-nonspam.txt sample-spam.txt spamd/README.spamd INSTALL
+%attr(0755,root,root) %{_bindir}/*
+%attr(0644,root,root) %{_includedir}/*
+%attr(0644,root,root) %{_libdir}/*.so
+%attr(0755,root,root) %{_initdir}/spamassassin
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin
+# Shared directory.  Not writeable by rpm default.
+%attr(755,root,root) /var/lib/spamassassin/shared
+%{_mandir}/man1/*
+
+
+%files tools
+%defattr(-,root,root)
+%doc sql tools masses contrib
+
+
+%files -n perl-mail-spamassassin
+%defattr(0644,root,root,0755)
+%dir %{perl_sitelib}/Mail/
+%{perl_sitelib}/Mail/SpamAssassin.pm
+%dir %{perl_sitelib}/Mail/SpamAssassin/
+%{perl_sitelib}/Mail/SpamAssassin/*
+%dir %{_sysconfdir}/spamassassin
+%config(noreplace) %{_sysconfdir}/spamassassin/*
+%{_datadir}/spamassassin
+%{_mandir}/man3/*
+
+
+%changelog
+* Tue Apr 14 2004 Gerald Dachs <gda at tinysofe dot org> 2.63-16gd
+- removed definitions for _find_requires and _find_provides as
+  tinysofa don't support perl dependencies
+- fixed requirements
+
+* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
+- Rebuilt for TSL 2.1
+
+* Sun Feb 15 2004 Erlend Midttun <erlendbm at trustix dot org> 2.63-6em
+- Now incluse /etc/sysconfig/spamassassin in file list too.
+
+* Thu Feb 12 2004 Gerald Dachs <gda at trustix dot org> 2.63-5gd
+- fixed permission on directory
+
+* Mon Feb  9 2004 Gerald Dachs <gda at trustix dot org> 2.63-4gd
+- removed %postun script
+
+* Sun Feb  8 2004 Gerald Dachs <gda at trustix dot org> 2.63-3gd
+- Added Nicos ArchiveIterator patch for Maildir support
+
+* Wed Jan 20 2004 Erlend Midttun <erlendbm at trustix dot org> 2.63-2em
+- New path to config files.
+
+* Wed Jan 20 2004 Erlend Midttun <erlendbm at trustix dot org> 2.63-1em
+- New upstream.
+
+* Wed Oct 29 2003 Goetz Bock <bg at tawie dot org> 2.60-2bg
+- specfile claenups
+- wrote startup file
+- added patch to move config file to /etc/spamassassin
+- build for TSL 2.0 (aka Cloud) Contrib
+
+* Sat Sep 27 2003 Gerald Dachs <gda at badgerix dot de> 2.60-1bx
+- adopted to badgerix
+- presumably from an rpm by PLD
+


From svn at tinysofa.org  Sun Jun 27 17:11:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:11:52 +1000 (EST)
Subject: [tinysofa-svn] r2308 - contrib/spamassassin
Message-ID: <20040627171152.8ED204E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:11:52 +1000 (Mon, 28 Jun 2004)
New Revision: 2308

Added:
   contrib/spamassassin/releases/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 17:12:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:12:03 +1000 (EST)
Subject: [tinysofa-svn] r2309 - contrib/spamassassin/releases
Message-ID: <20040627171203.238D34E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:12:02 +1000 (Mon, 28 Jun 2004)
New Revision: 2309

Added:
   contrib/spamassassin/releases/2.63/
Log:
New in contrib


From svn at tinysofa.org  Sun Jun 27 17:12:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:12:59 +1000 (EST)
Subject: [tinysofa-svn] r2310 - contrib/spamassassin
Message-ID: <20040627171259.B4EAA4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:12:59 +1000 (Mon, 28 Jun 2004)
New Revision: 2310

Added:
   contrib/spamassassin/pristine/
Log:
New in contrib

Copied: contrib/spamassassin/pristine (from rev 2309, contrib/spamassassin/current)


From svn at tinysofa.org  Sun Jun 27 17:13:19 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:13:19 +1000 (EST)
Subject: [tinysofa-svn] r2311 - contrib/spamassassin/releases/2.63
Message-ID: <20040627171319.68DE04E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:13:19 +1000 (Mon, 28 Jun 2004)
New Revision: 2311

Added:
   contrib/spamassassin/releases/2.63/16gd/
Log:
New in contrib

Copied: contrib/spamassassin/releases/2.63/16gd (from rev 2310, contrib/spamassassin/current)


From svn at tinysofa.org  Sun Jun 27 17:37:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:37:34 +1000 (EST)
Subject: [tinysofa-svn] r2312 - contrib/dnsmasq/current/specs
Message-ID: <20040627173734.C9A374E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:37:34 +1000 (Mon, 28 Jun 2004)
New Revision: 2312

Modified:
   contrib/dnsmasq/current/specs/dnsmasq.spec
Log:
New upstream

Modified: contrib/dnsmasq/current/specs/dnsmasq.spec
===================================================================
--- contrib/dnsmasq/current/specs/dnsmasq.spec	2004-06-27 17:13:19 UTC (rev 2311)
+++ contrib/dnsmasq/current/specs/dnsmasq.spec	2004-06-27 17:37:34 UTC (rev 2312)
@@ -1,6 +1,6 @@
 Summary:  A lightweight caching nameserver
 Name:     dnsmasq
-Version:  2.8
+Version:  2.9
 Release:  1gd
 Group:    Network/Services
 Source:   http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}.tar.gz
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Jun 24 2004 Gerald Dachs <gda at tinysofa dot org> 2.9-1gd
+- new upstream version
+
 * Tue May 25 2004 Gerald Dachs <gda at tinysofa dot org> 2.8-1gd
 - new upstream version
 


From svn at tinysofa.org  Sun Jun 27 17:38:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:38:24 +1000 (EST)
Subject: [tinysofa-svn] r2313 - contrib/dnsmasq/current/sources
Message-ID: <20040627173824.389284E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:38:24 +1000 (Mon, 28 Jun 2004)
New Revision: 2313

Added:
   contrib/dnsmasq/current/sources/dnsmasq-2.9.tar.gz
Removed:
   contrib/dnsmasq/current/sources/dnsmasq-2.8.tar.gz
Log:
New upstream

Deleted: contrib/dnsmasq/current/sources/dnsmasq-2.8.tar.gz
===================================================================
(Binary files differ)

Added: contrib/dnsmasq/current/sources/dnsmasq-2.9.tar.gz
===================================================================
(Binary files differ)


Property changes on: contrib/dnsmasq/current/sources/dnsmasq-2.9.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


From svn at tinysofa.org  Sun Jun 27 17:43:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:43:54 +1000 (EST)
Subject: [tinysofa-svn] r2314 - contrib/dnsmasq
Message-ID: <20040627174354.BEBC84E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:43:54 +1000 (Mon, 28 Jun 2004)
New Revision: 2314

Added:
   contrib/dnsmasq/releases/
Removed:
   contrib/dnsmasq/release/
Log:
Wrong name


Copied: contrib/dnsmasq/releases (from rev 2313, contrib/dnsmasq/release)


From svn at tinysofa.org  Sun Jun 27 17:44:45 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:44:45 +1000 (EST)
Subject: [tinysofa-svn] r2315 - contrib/dnsmasq/releases
Message-ID: <20040627174445.C209C4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:44:45 +1000 (Mon, 28 Jun 2004)
New Revision: 2315

Added:
   contrib/dnsmasq/releases/2.9/
Log:
New upstream


From svn at tinysofa.org  Sun Jun 27 17:45:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:45:25 +1000 (EST)
Subject: [tinysofa-svn] r2316 - contrib/dnsmasq/pristine
Message-ID: <20040627174525.E0CDD4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:45:25 +1000 (Mon, 28 Jun 2004)
New Revision: 2316

Added:
   contrib/dnsmasq/pristine/current/
Log:
New upstream

Copied: contrib/dnsmasq/pristine/current (from rev 2315, contrib/dnsmasq/current)


From svn at tinysofa.org  Sun Jun 27 17:46:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:46:06 +1000 (EST)
Subject: [tinysofa-svn] r2317 - contrib/dnsmasq/releases/2.9
Message-ID: <20040627174606.76F0B4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:46:06 +1000 (Mon, 28 Jun 2004)
New Revision: 2317

Added:
   contrib/dnsmasq/releases/2.9/1gd/
Log:
New upstream

Copied: contrib/dnsmasq/releases/2.9/1gd (from rev 2316, contrib/dnsmasq/current)


From svn at tinysofa.org  Sun Jun 27 17:47:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:47:25 +1000 (EST)
Subject: [tinysofa-svn] r2318 - contrib/dnsmasq
Message-ID: <20040627174725.B6E7C4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:47:25 +1000 (Mon, 28 Jun 2004)
New Revision: 2318

Removed:
   contrib/dnsmasq/pristine/
Log:
New upstream


From svn at tinysofa.org  Sun Jun 27 17:47:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 03:47:56 +1000 (EST)
Subject: [tinysofa-svn] r2319 - contrib/dnsmasq
Message-ID: <20040627174756.76EDD4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 03:47:56 +1000 (Mon, 28 Jun 2004)
New Revision: 2319

Added:
   contrib/dnsmasq/pristine/
Log:
New upstream

Copied: contrib/dnsmasq/pristine (from rev 2318, contrib/dnsmasq/current)


From svn at tinysofa.org  Sun Jun 27 18:39:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 04:39:25 +1000 (EST)
Subject: [tinysofa-svn] r2320 - tinysofa/snapshot/rp-pppoe/current/specs
Message-ID: <20040627183925.D57344E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-28 04:39:25 +1000 (Mon, 28 Jun 2004)
New Revision: 2320

Modified:
   tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec
Log:
- merge gd and jh changes


Modified: tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec
===================================================================
--- tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec	2004-06-27 17:47:56 UTC (rev 2319)
+++ tinysofa/snapshot/rp-pppoe/current/specs/rp-pppoe.spec	2004-06-27 18:39:25 UTC (rev 2320)
@@ -1,16 +1,17 @@
 Summary: PPP Over Ethernet (xDSL support)
 Name: rp-pppoe
 Version: 3.5
-Release: 14gd
+Release: 15gd
 License: GPL
-Group: tinysofa official
+Group: tinysofa/extra
 Source: http://www.roaringpenguin.com/pppoe/%{name}-%{version}.tar.gz
 Url: http://www.roaringpenguin.com/pppoe/
 Patch1: %{name}-3.5-makefile.patch
-BuildRoot: %{_tmppath}/%{name}-root
+Patch2: rp-pppoe-try-restart.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: perl ppp >= 2.3.7
 Requires: ppp >= 2.3.7
-PreReq: chkconfig /sbin/restart_maybe
+%service_requires
 
 %description
 PPPoE (Point-to-Point Protocol over Ethernet) is a protocol used by
@@ -21,10 +22,13 @@
 modifications. It is fully compliant with RFC 2516, the official PPPoE
 specification.
 
+
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
+
 %build
 perl -pi -e "s/^# chkconfig:.*$/# chkconfig: - 11 89/" scripts/adsl-init.in
 perl -pi -e "s/rc\.d\/init\.d/init.d/g" scripts/adsl-init.in
@@ -32,45 +36,43 @@
 perl -pi -e "s/^DNSTYPE=SERVER/DNSTYPE=NOCHANGE/" configs/pppoe.conf
 cd src
 %configure
-make
+%make
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 cd src
 %makeinstall docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %post
-# Create new system startup links
-chkconfig --add adsl
-/sbin/restart_maybe adsl
+%service_post adsl
 
 %preun
-if [ $1 = 0 ]; then
-  /etc/init.d/adsl stop >&2
-  chkconfig --del adsl
-fi
+%service_preun adsl
 
+%postun
+%service_postun adsl
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README
-%config(noreplace) /etc/ppp/pppoe.conf
-%config(noreplace) /etc/ppp/pppoe-server-options
-%config(noreplace) /etc/ppp/firewall-masq
-%config(noreplace) /etc/ppp/firewall-standalone
-/etc/ppp/plugins/*
-/usr/sbin/pppoe
-/usr/sbin/pppoe-server
-/usr/sbin/pppoe-sniff
-/usr/sbin/pppoe-relay
-/usr/sbin/adsl-connect
-/usr/sbin/adsl-start
-/usr/sbin/adsl-stop
-/usr/sbin/adsl-setup
-/usr/sbin/adsl-status
+%config(noreplace) %{_sysconfdir}/ppp/pppoe.conf
+%config(noreplace) %{_sysconfdir}/ppp/pppoe-server-options
+%config(noreplace) %{_sysconfdir}/ppp/firewall-masq
+%config(noreplace) %{_sysconfdir}/ppp/firewall-standalone
+%{_sysconfdir}/ppp/plugins/*
+%{_sbindir}/pppoe
+%{_sbindir}/pppoe-server
+%{_sbindir}/pppoe-sniff
+%{_sbindir}/pppoe-relay
+%{_sbindir}/adsl-connect
+%{_sbindir}/adsl-start
+%{_sbindir}/adsl-stop
+%{_sbindir}/adsl-setup
+%{_sbindir}/adsl-status
 %{_mandir}/man5/pppoe.conf.5*
 %{_mandir}/man8/pppoe.8*
 %{_mandir}/man8/pppoe-server.8*
@@ -81,13 +83,17 @@
 %{_mandir}/man8/adsl-stop.8*
 %{_mandir}/man8/adsl-status.8*
 %{_mandir}/man8/adsl-setup.8*
-/etc/init.d/adsl
+%{_initrddir}/adsl
 
 %changelog
-* Sat Jun 26 2004 Gerald Dachs <gda at tinysofa dot org> 3.5-14gd
+* Sat Jun 26 2004 Gerald Dachs <gda at tinysofa dot org> 3.5-15gd
 - if ppp is not installed during build time, then the adsl scripts
   gets broken. Fixed build requirements accordingly.
 
+* Wed Jun 23 2004 Jaakko Heinonen <jh at tinysofa dot org> 3.5-14jh
+- use macros
+- add try-restart target to init script
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 3.5-13ts
 - current (3.5-12ts) integrated as 3.5-13ts for release 1.0-U1
 


From svn at tinysofa.org  Sun Jun 27 20:31:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:31:20 +1000 (EST)
Subject: [tinysofa-svn] r2321 - contrib/spamassassin/current/specs
Message-ID: <20040627203120.69B1C4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:31:20 +1000 (Mon, 28 Jun 2004)
New Revision: 2321

Modified:
   contrib/spamassassin/current/specs/spamassassin.spec
Log:
changed group


Modified: contrib/spamassassin/current/specs/spamassassin.spec
===================================================================
--- contrib/spamassassin/current/specs/spamassassin.spec	2004-06-27 18:39:25 UTC (rev 2320)
+++ contrib/spamassassin/current/specs/spamassassin.spec	2004-06-27 20:31:20 UTC (rev 2321)
@@ -5,9 +5,9 @@
 
 Summary:   a spam filter for email which can be invoked from mail delivery agents
 Name:      spamassassin
-Group: Trustix Contrib
+Group: tinysofa contrib
 Version:   %{real_version}
-Release:   16gd
+Release:   17gd
 License:   Artistic
 Source:    http:/spamassassin.org/released/%{real_name}-%{real_version}.tar.gz
 Source1:   spamassassin.initd
@@ -35,7 +35,7 @@
 
 %package tools
 Summary:   Miscellaneous tools and documentation for SpamAssassin
-Group: Trustix Contrib
+Group: tinysofa contrib
 Requires:  perl-mail-spamassassin = %{version}-%{release}
 
 %description tools
@@ -46,7 +46,7 @@
 %package -n perl-mail-spamassassin
 Summary:   SpamAssassin e-mail filter Perl modules
 Requires:  perl >= 5.004 perl-html-parser
-Group: Trustix Contrib
+Group: tinysofa contrib
 
 %description -n perl-mail-spamassassin
 Mail::SpamAssassin is a module to identify spam using text analysis and
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Sun Jun 27 2004 Gerald Dachs <gda at tinysofe dot org> 2.63-17gd
+- changed group
+
 * Tue Apr 14 2004 Gerald Dachs <gda at tinysofe dot org> 2.63-16gd
 - removed definitions for _find_requires and _find_provides as
   tinysofa don't support perl dependencies


From svn at tinysofa.org  Sun Jun 27 20:32:18 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:32:18 +1000 (EST)
Subject: [tinysofa-svn] r2322 - contrib/spamassassin/pristine
Message-ID: <20040627203218.240354E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:32:17 +1000 (Mon, 28 Jun 2004)
New Revision: 2322

Added:
   contrib/spamassassin/pristine/current/
Log:
New upstream

Copied: contrib/spamassassin/pristine/current (from rev 2321, contrib/spamassassin/current)


From svn at tinysofa.org  Sun Jun 27 20:32:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:32:38 +1000 (EST)
Subject: [tinysofa-svn] r2323 - contrib/spamassassin/releases/2.63
Message-ID: <20040627203238.269194E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:32:37 +1000 (Mon, 28 Jun 2004)
New Revision: 2323

Added:
   contrib/spamassassin/releases/2.63/17gd/
Log:
New upstream

Copied: contrib/spamassassin/releases/2.63/17gd (from rev 2322, contrib/spamassassin/current)


From svn at tinysofa.org  Sun Jun 27 20:46:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:46:02 +1000 (EST)
Subject: [tinysofa-svn] r2324 - contrib/perl-unix-syslog/current/specs
Message-ID: <20040627204602.E40344E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:46:02 +1000 (Mon, 28 Jun 2004)
New Revision: 2324

Modified:
   contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec
Log:
changed group


Modified: contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec
===================================================================
--- contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec	2004-06-27 20:32:37 UTC (rev 2323)
+++ contrib/perl-unix-syslog/current/specs/perl-unix-syslog.spec	2004-06-27 20:46:02 UTC (rev 2324)
@@ -6,9 +6,9 @@
 Summary: Perl module %{module}
 Name: perl-unix-syslog
 Version: 0.100
-Release: 16gd
+Release: 17gd
 License: distributable
-Group: Trustix Contrib
+Group: tinysofa contrib
 Source0: http://search.cpan.org/CPAN/authors/id/M/MH/MHARNISCH/Unix-Syslog-0.100.tar.gz
 Url: http://www.cpan.org
 BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
@@ -56,6 +56,9 @@
 %doc Artistic Changes MANIFEST README
 
 %changelog
+* Sun Jun 27 2004 Gerald Dachs <gda at tinysofa dot org> 0.100-17gd
+- changed group
+
 * Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 0.100-16gd
 - Rebuilt for tinysofa
 


From svn at tinysofa.org  Sun Jun 27 20:46:54 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:46:54 +1000 (EST)
Subject: [tinysofa-svn] r2325 - contrib/perl-unix-syslog/releases/0.100
Message-ID: <20040627204654.51CE34E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:46:54 +1000 (Mon, 28 Jun 2004)
New Revision: 2325

Added:
   contrib/perl-unix-syslog/releases/0.100/17gd/
Log:
New upstream

Copied: contrib/perl-unix-syslog/releases/0.100/17gd (from rev 2324, contrib/perl-unix-syslog/current)


From svn at tinysofa.org  Sun Jun 27 20:48:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:48:21 +1000 (EST)
Subject: [tinysofa-svn] r2326 - contrib/spamassassin
Message-ID: <20040627204821.7D3D74E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:48:21 +1000 (Mon, 28 Jun 2004)
New Revision: 2326

Removed:
   contrib/spamassassin/pristine/
Log:
wrong copy



From svn at tinysofa.org  Sun Jun 27 20:48:35 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:48:35 +1000 (EST)
Subject: [tinysofa-svn] r2327 - contrib/spamassassin
Message-ID: <20040627204835.05F044E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:48:34 +1000 (Mon, 28 Jun 2004)
New Revision: 2327

Added:
   contrib/spamassassin/pristine/
Log:
New upstream

Copied: contrib/spamassassin/pristine (from rev 2326, contrib/spamassassin/current)


From svn at tinysofa.org  Sun Jun 27 20:49:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:49:02 +1000 (EST)
Subject: [tinysofa-svn] r2328 - contrib/perl-unix-syslog
Message-ID: <20040627204902.A6E664E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:49:02 +1000 (Mon, 28 Jun 2004)
New Revision: 2328

Removed:
   contrib/perl-unix-syslog/pristine/
Log:
wrong copy



From svn at tinysofa.org  Sun Jun 27 20:49:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:49:22 +1000 (EST)
Subject: [tinysofa-svn] r2329 - contrib/perl-unix-syslog
Message-ID: <20040627204922.051BC4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:49:21 +1000 (Mon, 28 Jun 2004)
New Revision: 2329

Added:
   contrib/perl-unix-syslog/pristine/
Log:
New upstream

Copied: contrib/perl-unix-syslog/pristine (from rev 2328, contrib/perl-unix-syslog/current)


From svn at tinysofa.org  Sun Jun 27 20:52:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:52:17 +1000 (EST)
Subject: [tinysofa-svn] r2330 - contrib/perl-unicode-string/current/specs
Message-ID: <20040627205217.695414E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:52:17 +1000 (Mon, 28 Jun 2004)
New Revision: 2330

Modified:
   contrib/perl-unicode-string/current/specs/perl-unicode-string.spec
Log:
changed group

Modified: contrib/perl-unicode-string/current/specs/perl-unicode-string.spec
===================================================================
--- contrib/perl-unicode-string/current/specs/perl-unicode-string.spec	2004-06-27 20:49:21 UTC (rev 2329)
+++ contrib/perl-unicode-string/current/specs/perl-unicode-string.spec	2004-06-27 20:52:17 UTC (rev 2330)
@@ -6,9 +6,9 @@
 Summary: Perl module %{module}
 Name: perl-unicode-string
 Version: 2.07
-Release: 16gd
+Release: 17gd
 License: distributable
-Group: Trustix Contrib
+Group: tinysofa contrib
 Source0: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Unicode-String-2.07.tar.gz
 Url: http://www.cpan.org
 BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
@@ -57,6 +57,9 @@
 %doc Changes MANIFEST README  
 
 %changelog
+* Sun Jun 27 2004 Gerald Dachs <gda at tinysofa dot org> 2.07-17gd
+- changed group
+
 * Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 2.07-16gd
 - Rebuilt for tinysofa
 


From svn at tinysofa.org  Sun Jun 27 20:54:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:54:16 +1000 (EST)
Subject: [tinysofa-svn] r2331 - contrib/perl-unicode-string/pristine/specs
Message-ID: <20040627205416.54AF24E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:54:16 +1000 (Mon, 28 Jun 2004)
New Revision: 2331

Removed:
   contrib/perl-unicode-string/pristine/specs/perl-unicode-string.spec
Log:
changed group

Deleted: contrib/perl-unicode-string/pristine/specs/perl-unicode-string.spec
===================================================================
--- contrib/perl-unicode-string/pristine/specs/perl-unicode-string.spec	2004-06-27 20:52:17 UTC (rev 2330)
+++ contrib/perl-unicode-string/pristine/specs/perl-unicode-string.spec	2004-06-27 20:54:16 UTC (rev 2331)
@@ -1,73 +0,0 @@
-%define __check_files %{nil}
-# Derived values
-%define module Unicode-String
-%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
-
-Summary: Perl module %{module}
-Name: perl-unicode-string
-Version: 2.07
-Release: 16gd
-License: distributable
-Group: Trustix Contrib
-Source0: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Unicode-String-2.07.tar.gz
-Url: http://www.cpan.org
-BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
-BuildArch:	i586
-BuildRequires:  perl
-Requires:       perl = %{perlver}
-Provides:       %{module} = %{version}
-
-%define siteperl /usr/lib/perl5/site_perl/%{perlver}
-
-%description
-%{module} module from CPAN for perl
-
-# Provide perl-specific find-{provides,requires}.
-%define __find_provides /usr/lib/rpm/find-provides.perl
-%define __find_requires /usr/lib/rpm/find-requires.perl
-
-%prep
-%setup -q -n %{module}-%{version} 
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
-make
-
-%clean 
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-
-%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-eval `perl '-V:installarchlib'`
-mkdir -p $RPM_BUILD_ROOT/$installarchlib
-%{makeinstall}
-
-[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
-
-%files
-%defattr(-,root,root,0755)
-%dir %{siteperl}/i586-linux-thread-multi/auto
-%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode
-%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode/String
-%{siteperl}/i586-linux-thread-multi/auto/Unicode/String/String.so
-%{siteperl}/i586-linux-thread-multi/auto/Unicode/String/String.bs
-%dir %{siteperl}/i586-linux-thread-multi/Unicode
-%{siteperl}/i586-linux-thread-multi/Unicode/*.pm
-%{_mandir}/man3/*
-%doc Changes MANIFEST README  
-
-%changelog
-* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 2.07-16gd
-- Rebuilt for tinysofa
-
-* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
-- Rebuilt for TSL 2.1
-
-* Fri Feb 13 2004 Gerald Dachs <gda at trustix dot org> 2.07-2gd
-- fixed permission on directories
-- added %doc to %files section
-- changed buildarch to i586
-
-* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
-- Initial release for Trustix based off a few others.
-


From svn at tinysofa.org  Sun Jun 27 20:54:26 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:54:26 +1000 (EST)
Subject: [tinysofa-svn] r2332 - contrib/perl-unicode-string/pristine/specs
Message-ID: <20040627205426.C9C164E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:54:26 +1000 (Mon, 28 Jun 2004)
New Revision: 2332

Added:
   contrib/perl-unicode-string/pristine/specs/perl-unicode-string.spec
Log:
changed group

Copied: contrib/perl-unicode-string/pristine/specs/perl-unicode-string.spec (from rev 2331, contrib/perl-unicode-string/current/specs/perl-unicode-string.spec)


From svn at tinysofa.org  Sun Jun 27 20:55:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 06:55:25 +1000 (EST)
Subject: [tinysofa-svn] r2333 - contrib/perl-unicode-string/releases
Message-ID: <20040627205525.B4B934E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 06:55:25 +1000 (Mon, 28 Jun 2004)
New Revision: 2333

Added:
   contrib/perl-unicode-string/releases/2.07-17gd/
Log:
New upstream

Copied: contrib/perl-unicode-string/releases/2.07-17gd (from rev 2332, contrib/perl-unicode-string/current)


From svn at tinysofa.org  Sun Jun 27 21:21:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 07:21:16 +1000 (EST)
Subject: [tinysofa-svn] r2334 - contrib/perl-unicode-map/current/specs
Message-ID: <20040627212116.7D8E14E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 07:21:16 +1000 (Mon, 28 Jun 2004)
New Revision: 2334

Modified:
   contrib/perl-unicode-map/current/specs/perl-unicode-map.spec
Log:
changed group

Modified: contrib/perl-unicode-map/current/specs/perl-unicode-map.spec
===================================================================
--- contrib/perl-unicode-map/current/specs/perl-unicode-map.spec	2004-06-27 20:55:25 UTC (rev 2333)
+++ contrib/perl-unicode-map/current/specs/perl-unicode-map.spec	2004-06-27 21:21:16 UTC (rev 2334)
@@ -6,9 +6,9 @@
 Summary: Perl module %{module}
 Name: perl-unicode-map
 Version: 0.112
-Release: 16gd
+Release: 17gd
 License: distributable
-Group: Trustix Contrib
+Group: tinysofa contrib
 Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
 Url: http://www.cpan.org
 BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
@@ -61,6 +61,9 @@
 %doc COPYING MANIFEST README Changes INSTALL
 
 %changelog
+* Sun Jun 27 2004 Gerald Dachs <gda at tinysofa dot org> 0.112-17gd
+- changed group
+
 * Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 0.112-16gd
 - Rebuilt for tinysofa
 


From svn at tinysofa.org  Sun Jun 27 21:21:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 07:21:47 +1000 (EST)
Subject: [tinysofa-svn] r2335 - contrib/perl-unicode-map/pristine/specs
Message-ID: <20040627212147.A3D9A4E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 07:21:47 +1000 (Mon, 28 Jun 2004)
New Revision: 2335

Removed:
   contrib/perl-unicode-map/pristine/specs/perl-unicode-map.spec
Log:
changed group

Deleted: contrib/perl-unicode-map/pristine/specs/perl-unicode-map.spec
===================================================================
--- contrib/perl-unicode-map/pristine/specs/perl-unicode-map.spec	2004-06-27 21:21:16 UTC (rev 2334)
+++ contrib/perl-unicode-map/pristine/specs/perl-unicode-map.spec	2004-06-27 21:21:47 UTC (rev 2335)
@@ -1,77 +0,0 @@
-%define __check_files %{nil}
-# Derived values
-%define module Unicode-Map
-%define perlver %(rpm -q perl --queryformat '%%{version}' 2>/dev/null)
-
-Summary: Perl module %{module}
-Name: perl-unicode-map
-Version: 0.112
-Release: 16gd
-License: distributable
-Group: Trustix Contrib
-Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWARTZ/Unicode-Map-0.112.tar.gz
-Url: http://www.cpan.org
-BuildRoot: /var/tmp/%{name}-buildroot-%(id -nu)/
-BuildArch:	i586
-BuildRequires:  perl
-Requires:       perl = %{perlver}
-Provides:       %{module} = %{version}
-
-%define siteperl /usr/lib/perl5/site_perl/%{perlver}
-
-%description
-%{module} module from CPAN for perl
-
-# Provide perl-specific find-{provides,requires}.
-%define __find_provides /usr/lib/rpm/find-provides.perl
-%define __find_requires /usr/lib/rpm/find-requires.perl
-
-%prep
-%setup -q -n %{module}-%{version} 
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix}
-make
-
-%clean 
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-
-%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-eval `perl '-V:installarchlib'`
-mkdir -p $RPM_BUILD_ROOT/$installarchlib
-%{makeinstall}
-
-[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
-
-%files
-%defattr(-,root,root,0755)
-%dir %{siteperl}/i586-linux-thread-multi/auto
-%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode
-%dir %{siteperl}/i586-linux-thread-multi/auto/Unicode/Map
-%{siteperl}/i586-linux-thread-multi/auto/Unicode/Map/Map.so
-%{siteperl}/i586-linux-thread-multi/auto/Unicode/Map/Map.bs
-%dir %{siteperl}/i586-linux-thread-multi/Unicode
-%{siteperl}/i586-linux-thread-multi/Unicode/Map.pm
-%dir %{siteperl}/i586-linux-thread-multi/Unicode/Map
-%{siteperl}/i586-linux-thread-multi/Unicode/Map/*
-%{_mandir}/man1/*
-%{_mandir}/man3/*
-/usr/bin/*
-%doc COPYING MANIFEST README Changes INSTALL
-
-%changelog
-* Sun Apr 18 2004 Gerald Dachs <gda at tinysofa dot org> 0.112-16gd
-- Rebuilt for tinysofa
-
-* Mon Mar  8 2004 Chr. Toldnes <christht at trustix dot org>
-- Rebuilt for TSL 2.1
-
-* Fri Feb 13 2004 Gerald Dachs <gda at trustix dot org> 0.112-2gd
-- fixed permission on directories
-- added %doc to %files section
-- changed buildarch to i586
-
-* Fri Jan 30 2004 Erlend Midttun <erlendbm at trustix dot org>
-- Initial release for Trustix based off a few others.
-


From svn at tinysofa.org  Sun Jun 27 21:22:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 07:22:22 +1000 (EST)
Subject: [tinysofa-svn] r2336 - contrib/perl-unicode-map/pristine/specs
Message-ID: <20040627212222.CE3314E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 07:22:22 +1000 (Mon, 28 Jun 2004)
New Revision: 2336

Added:
   contrib/perl-unicode-map/pristine/specs/perl-unicode-map.spec
Log:
changed group

Copied: contrib/perl-unicode-map/pristine/specs/perl-unicode-map.spec (from rev 2335, contrib/perl-unicode-map/current/specs/perl-unicode-map.spec)


From svn at tinysofa.org  Sun Jun 27 21:23:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 07:23:32 +1000 (EST)
Subject: [tinysofa-svn] r2337 - contrib/perl-unicode-map/releases/0.112
Message-ID: <20040627212332.1A6C24E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 07:23:31 +1000 (Mon, 28 Jun 2004)
New Revision: 2337

Added:
   contrib/perl-unicode-map/releases/0.112/17gd/
Log:
New upstream

Copied: contrib/perl-unicode-map/releases/0.112/17gd (from rev 2336, contrib/perl-unicode-map/current)


From svn at tinysofa.org  Sun Jun 27 21:23:48 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 07:23:48 +1000 (EST)
Subject: [tinysofa-svn] r2338 - contrib/perl-unicode-string/releases/2.07
Message-ID: <20040627212348.570F64E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 07:23:48 +1000 (Mon, 28 Jun 2004)
New Revision: 2338

Added:
   contrib/perl-unicode-string/releases/2.07/17gd/
Log:
New upstream

Copied: contrib/perl-unicode-string/releases/2.07/17gd (from rev 2337, contrib/perl-unicode-string/current)


From svn at tinysofa.org  Sun Jun 27 21:24:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 07:24:20 +1000 (EST)
Subject: [tinysofa-svn] r2339 - contrib/perl-unicode-string/releases
Message-ID: <20040627212420.BA0444E8033@minbar.tinysofa.org>

Author: gda
Date: 2004-06-28 07:24:20 +1000 (Mon, 28 Jun 2004)
New Revision: 2339

Removed:
   contrib/perl-unicode-string/releases/2.07-17gd/
Log:
wrong copy


From svn at tinysofa.org  Mon Jun 28 08:11:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 18:11:02 +1000 (EST)
Subject: [tinysofa-svn] r2340 - tinysofa/releases/1.0/rp-pppoe/current/specs
Message-ID: <20040628081102.854564E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-28 18:11:01 +1000 (Mon, 28 Jun 2004)
New Revision: 2340

Modified:
   tinysofa/releases/1.0/rp-pppoe/current/specs/rp-pppoe.spec
Log:
- add BuildRequires: ppp


Modified: tinysofa/releases/1.0/rp-pppoe/current/specs/rp-pppoe.spec
===================================================================
--- tinysofa/releases/1.0/rp-pppoe/current/specs/rp-pppoe.spec	2004-06-27 21:24:20 UTC (rev 2339)
+++ tinysofa/releases/1.0/rp-pppoe/current/specs/rp-pppoe.spec	2004-06-28 08:11:01 UTC (rev 2340)
@@ -1,14 +1,14 @@
 Summary: PPP Over Ethernet (xDSL support)
 Name: rp-pppoe
 Version: 3.5
-Release: 13ts
+Release: 14gd
 License: GPL
 Group: tinysofa official
 Source: http://www.roaringpenguin.com/pppoe/%{name}-%{version}.tar.gz
 Url: http://www.roaringpenguin.com/pppoe/
 Patch1: %{name}-3.5-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: perl
+BuildRequires: perl ppp >= 2.3.7
 Requires: ppp >= 2.3.7
 PreReq: chkconfig /sbin/restart_maybe
 
@@ -84,6 +84,10 @@
 /etc/init.d/adsl
 
 %changelog
+* Sat Jun 26 2004 Gerald Dachs <gda at tinysofa dot org> 3.5-14gd
+- if ppp is not installed during build time, then the adsl scripts
+  gets broken. Fixed build requirements accordingly.
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 3.5-13ts
 - current (3.5-12ts) integrated as 3.5-13ts for release 1.0-U1
 


From svn at tinysofa.org  Mon Jun 28 11:45:50 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 21:45:50 +1000 (EST)
Subject: [tinysofa-svn] 
	r2341 - in tinysofa/snapshot/arpwatch/current: sources specs
Message-ID: <20040628114550.1F9804E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-28 21:45:49 +1000 (Mon, 28 Jun 2004)
New Revision: 2341

Modified:
   tinysofa/snapshot/arpwatch/current/sources/arpwatch.init
   tinysofa/snapshot/arpwatch/current/specs/arpwatch.spec
Log:
- use service macros
- add try-restart support


Modified: tinysofa/snapshot/arpwatch/current/sources/arpwatch.init
===================================================================
--- tinysofa/snapshot/arpwatch/current/sources/arpwatch.init	2004-06-28 08:11:01 UTC (rev 2340)
+++ tinysofa/snapshot/arpwatch/current/sources/arpwatch.init	2004-06-28 11:45:49 UTC (rev 2341)
@@ -6,7 +6,14 @@
 # processname: arpwatch
 
 # Source function library.
-. /etc/init.d/functions
+if [ -f /etc/init.d/functions ]; then
+  . /etc/init.d/functions
+elif [ -f /etc/rc.d/init.d/functions ]; then
+  . /etc/rc.d/init.d/functions
+else
+  echo "Could not find a functions file. The system seems broken."
+  exit 1
+fi
 
 # Get config.
 . /etc/sysconfig/network
@@ -45,8 +52,14 @@
 	$0 start
 	RETVAL=$?
 	;;
+  condrestart|try-restart)
+	if [ -f ${INITLOCK:-/mnt/lockdev}/arpwatch ]; then
+		$0 stop
+		$0 start
+	fi
+	;;
   *)
-	echo "Usage: arpwatch {start|stop|status|restart|reload}"
+	echo "Usage: arpwatch {start|stop|status|restart|reload|try-restart}"
 	exit 1
 esac
 

Modified: tinysofa/snapshot/arpwatch/current/specs/arpwatch.spec
===================================================================
--- tinysofa/snapshot/arpwatch/current/specs/arpwatch.spec	2004-06-28 08:11:01 UTC (rev 2340)
+++ tinysofa/snapshot/arpwatch/current/specs/arpwatch.spec	2004-06-28 11:45:49 UTC (rev 2341)
@@ -1,14 +1,14 @@
 Summary: Network monitoring tools for tracking IP addresses on a network.
 Name: arpwatch
 Version: 2.1a13
-Release: 1ts
+Release: 2jh
 License: BSD
-Group: tinysofa official
+Group: tinysofa/extra
 Source0: ftp://ftp.ee.lbl.gov/arpwatch-%{version}.tar.gz
 Source1: arpwatch.init
 Patch0: arpwatch-Makefile-fixes.patch
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: chkconfig, tinysofa-utils
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+%service_requires
 BuildRequires: libpcap
 
 %description
@@ -21,10 +21,12 @@
 which will automatically keep track of the IP addresses on your
 network.
 
+
 %prep
 %setup -q
 %patch -p1
 
+
 %build
 %configure
 CFLAGS="$RPM_OPT_FLAGS -I/usr/include/pcap" ./configure \
@@ -46,24 +48,24 @@
         install -m644 $n $RPM_BUILD_ROOT/var/spool/arpwatch
 done
 
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-install -c -m755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/arpwatch
+mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
+install -c -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/arpwatch
 
-strip $RPM_BUILD_ROOT%{_prefix}/sbin/*
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post
-# Restart service after upgrade.
-/sbin/chkconfig --add arpwatch
-/sbin/restart_maybe arpwatch
+%service_post arpwatch
 
 %preun
-if [ $1 = 0 ]; then
-/sbin/chkconfig --del arpwatch
-fi
+%service_preun arpwatch
 
+%postun
+%service_postun arpwatch
+
+
 %files
 %defattr(-,root,root)
 %doc CHANGES README
@@ -71,7 +73,7 @@
 %{_prefix}/sbin/arpsnmp
 %{_prefix}/share/man/man8/arpwatch.8*
 %{_prefix}/share/man/man8/arpsnmp.8*
-/etc/init.d/arpwatch
+%{_initrddir}/arpwatch
 %dir    /var/spool/arpwatch
 %config /var/spool/arpwatch/arp.dat
 %config /var/spool/arpwatch/ethercodes.dat
@@ -116,4 +118,4 @@
 - New upstream version: 2.1a11
 
 * Thu Mar  8 2001 Alexander Reelsen <ar at trustix dot com>
-- Splitted arpwatch from tcpdump package
\ No newline at end of file
+- Splitted arpwatch from tcpdump package


From svn at tinysofa.org  Mon Jun 28 11:50:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 21:50:20 +1000 (EST)
Subject: [tinysofa-svn] r2342 - tinysofa/snapshot/arpwatch/current/sources
Message-ID: <20040628115020.924514E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-28 21:50:20 +1000 (Mon, 28 Jun 2004)
New Revision: 2342

Modified:
   tinysofa/snapshot/arpwatch/current/sources/arpwatch.init
Log:
- fix try-restart RETVAL


Modified: tinysofa/snapshot/arpwatch/current/sources/arpwatch.init
===================================================================
--- tinysofa/snapshot/arpwatch/current/sources/arpwatch.init	2004-06-28 11:45:49 UTC (rev 2341)
+++ tinysofa/snapshot/arpwatch/current/sources/arpwatch.init	2004-06-28 11:50:20 UTC (rev 2342)
@@ -56,6 +56,7 @@
 	if [ -f ${INITLOCK:-/mnt/lockdev}/arpwatch ]; then
 		$0 stop
 		$0 start
+		RETVAL=$?
 	fi
 	;;
   *)


From svn at tinysofa.org  Mon Jun 28 12:19:49 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Mon, 28 Jun 2004 22:19:49 +1000 (EST)
Subject: [tinysofa-svn] r2343 - tinysofa/releases
Message-ID: <20040628121949.001B34E8033@minbar.tinysofa.org>

Author: omar
Date: 2004-06-28 22:19:49 +1000 (Mon, 28 Jun 2004)
New Revision: 2343

Added:
   tinysofa/releases/1.1/
Log:
- Branch 1.1.


Copied: tinysofa/releases/1.1 (from rev 2342, tinysofa/releases/1.0)


From svn at tinysofa.org  Mon Jun 28 14:05:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:05:28 +1000 (EST)
Subject: [tinysofa-svn] r2344 - tinysofa/releases/1.1
Message-ID: <20040628140528.410224E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:05:27 +1000 (Tue, 29 Jun 2004)
New Revision: 2344

Removed:
   tinysofa/releases/1.1/arpwatch/
Log:
remove arpwatch


From svn at tinysofa.org  Mon Jun 28 14:05:36 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:05:36 +1000 (EST)
Subject: [tinysofa-svn] r2345 - tinysofa/releases/1.1
Message-ID: <20040628140536.D61554E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:05:36 +1000 (Tue, 29 Jun 2004)
New Revision: 2345

Added:
   tinysofa/releases/1.1/arpwatch/
Log:
copy arpwatch from snapshot

Copied: tinysofa/releases/1.1/arpwatch (from rev 2344, tinysofa/snapshot/arpwatch)


From svn at tinysofa.org  Mon Jun 28 14:05:42 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:05:42 +1000 (EST)
Subject: [tinysofa-svn] r2346 - tinysofa/releases/1.1
Message-ID: <20040628140542.979034E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:05:42 +1000 (Tue, 29 Jun 2004)
New Revision: 2346

Removed:
   tinysofa/releases/1.1/authconfig/
Log:
remove authconfig


From svn at tinysofa.org  Mon Jun 28 14:05:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:05:51 +1000 (EST)
Subject: [tinysofa-svn] r2347 - tinysofa/releases/1.1
Message-ID: <20040628140551.30EB34E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:05:51 +1000 (Tue, 29 Jun 2004)
New Revision: 2347

Added:
   tinysofa/releases/1.1/authconfig/
Log:
copy authconfig from snapshot

Copied: tinysofa/releases/1.1/authconfig (from rev 2346, tinysofa/snapshot/authconfig)


From svn at tinysofa.org  Mon Jun 28 14:06:04 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:06:04 +1000 (EST)
Subject: [tinysofa-svn] r2349 - tinysofa/releases/1.1
Message-ID: <20040628140604.43F2F4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:06:04 +1000 (Tue, 29 Jun 2004)
New Revision: 2349

Added:
   tinysofa/releases/1.1/bind/
Log:
copy bind from snapshot

Copied: tinysofa/releases/1.1/bind (from rev 2348, tinysofa/snapshot/bind)


From svn at tinysofa.org  Mon Jun 28 14:06:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:06:08 +1000 (EST)
Subject: [tinysofa-svn] r2350 - tinysofa/releases/1.1
Message-ID: <20040628140608.D65B74E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:06:08 +1000 (Tue, 29 Jun 2004)
New Revision: 2350

Removed:
   tinysofa/releases/1.1/cdrtools/
Log:
remove cdrtools


From svn at tinysofa.org  Mon Jun 28 14:05:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:05:55 +1000 (EST)
Subject: [tinysofa-svn] r2348 - tinysofa/releases/1.1
Message-ID: <20040628140555.C54604E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:05:55 +1000 (Tue, 29 Jun 2004)
New Revision: 2348

Removed:
   tinysofa/releases/1.1/bind/
Log:
remove bind


From svn at tinysofa.org  Mon Jun 28 14:06:17 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:06:17 +1000 (EST)
Subject: [tinysofa-svn] r2351 - tinysofa/releases/1.1
Message-ID: <20040628140617.680904E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:06:17 +1000 (Tue, 29 Jun 2004)
New Revision: 2351

Added:
   tinysofa/releases/1.1/cdrtools/
Log:
copy cdrtools from snapshot

Copied: tinysofa/releases/1.1/cdrtools (from rev 2350, tinysofa/snapshot/cdrtools)


From svn at tinysofa.org  Mon Jun 28 14:06:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:06:21 +1000 (EST)
Subject: [tinysofa-svn] r2352 - tinysofa/releases/1.1
Message-ID: <20040628140621.EF5004E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:06:21 +1000 (Tue, 29 Jun 2004)
New Revision: 2352

Removed:
   tinysofa/releases/1.1/bc/
Log:
remove bc


From svn at tinysofa.org  Mon Jun 28 14:06:30 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:06:30 +1000 (EST)
Subject: [tinysofa-svn] r2353 - tinysofa/releases/1.1
Message-ID: <20040628140630.725594E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:06:30 +1000 (Tue, 29 Jun 2004)
New Revision: 2353

Added:
   tinysofa/releases/1.1/bc/
Log:
copy bc from snapshot

Copied: tinysofa/releases/1.1/bc (from rev 2352, tinysofa/snapshot/bc)


From svn at tinysofa.org  Mon Jun 28 14:06:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:06:34 +1000 (EST)
Subject: [tinysofa-svn] r2354 - tinysofa/releases/1.1
Message-ID: <20040628140634.DDE844E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:06:34 +1000 (Tue, 29 Jun 2004)
New Revision: 2354

Removed:
   tinysofa/releases/1.1/dev/
Log:
remove dev


From svn at tinysofa.org  Mon Jun 28 14:06:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:06:43 +1000 (EST)
Subject: [tinysofa-svn] r2355 - tinysofa/releases/1.1
Message-ID: <20040628140643.6597E4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:06:43 +1000 (Tue, 29 Jun 2004)
New Revision: 2355

Added:
   tinysofa/releases/1.1/dev/
Log:
copy dev from snapshot

Copied: tinysofa/releases/1.1/dev (from rev 2354, tinysofa/snapshot/dev)


From svn at tinysofa.org  Mon Jun 28 14:06:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:06:47 +1000 (EST)
Subject: [tinysofa-svn] r2356 - tinysofa/releases/1.1
Message-ID: <20040628140647.0029B4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:06:47 +1000 (Tue, 29 Jun 2004)
New Revision: 2356

Removed:
   tinysofa/releases/1.1/dhcp/
Log:
remove dhcp


From svn at tinysofa.org  Mon Jun 28 14:06:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:06:57 +1000 (EST)
Subject: [tinysofa-svn] r2357 - tinysofa/releases/1.1
Message-ID: <20040628140657.4323C4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:06:57 +1000 (Tue, 29 Jun 2004)
New Revision: 2357

Added:
   tinysofa/releases/1.1/dhcp/
Log:
copy dhcp from snapshot

Copied: tinysofa/releases/1.1/dhcp (from rev 2356, tinysofa/snapshot/dhcp)


From svn at tinysofa.org  Mon Jun 28 14:07:01 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:07:01 +1000 (EST)
Subject: [tinysofa-svn] r2358 - tinysofa/releases/1.1
Message-ID: <20040628140701.B9E2E4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:07:01 +1000 (Tue, 29 Jun 2004)
New Revision: 2358

Removed:
   tinysofa/releases/1.1/ed/
Log:
remove ed


From svn at tinysofa.org  Mon Jun 28 14:07:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:07:10 +1000 (EST)
Subject: [tinysofa-svn] r2359 - tinysofa/releases/1.1
Message-ID: <20040628140710.40F574E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:07:10 +1000 (Tue, 29 Jun 2004)
New Revision: 2359

Added:
   tinysofa/releases/1.1/ed/
Log:
copy ed from snapshot

Copied: tinysofa/releases/1.1/ed (from rev 2358, tinysofa/snapshot/ed)


From svn at tinysofa.org  Mon Jun 28 14:07:14 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:07:14 +1000 (EST)
Subject: [tinysofa-svn] r2360 - tinysofa/releases/1.1
Message-ID: <20040628140714.DAE514E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:07:14 +1000 (Tue, 29 Jun 2004)
New Revision: 2360

Removed:
   tinysofa/releases/1.1/fcron/
Log:
remove fcron


From svn at tinysofa.org  Mon Jun 28 14:07:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:07:37 +1000 (EST)
Subject: [tinysofa-svn] r2363 - tinysofa/releases/1.1
Message-ID: <20040628140737.F1BB94E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:07:37 +1000 (Tue, 29 Jun 2004)
New Revision: 2363

Added:
   tinysofa/releases/1.1/file/
Log:
copy file from snapshot

Copied: tinysofa/releases/1.1/file (from rev 2362, tinysofa/snapshot/file)


From svn at tinysofa.org  Mon Jun 28 14:07:42 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:07:42 +1000 (EST)
Subject: [tinysofa-svn] r2364 - tinysofa/releases/1.1
Message-ID: <20040628140742.83EA44E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:07:42 +1000 (Tue, 29 Jun 2004)
New Revision: 2364

Removed:
   tinysofa/releases/1.1/findutils/
Log:
remove findutils


From svn at tinysofa.org  Mon Jun 28 14:08:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:08:47 +1000 (EST)
Subject: [tinysofa-svn] r2374 - tinysofa/releases/1.1
Message-ID: <20040628140847.0A4244E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:08:46 +1000 (Tue, 29 Jun 2004)
New Revision: 2374

Removed:
   tinysofa/releases/1.1/lilo/
Log:
remove lilo


From svn at tinysofa.org  Mon Jun 28 14:08:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:08:55 +1000 (EST)
Subject: [tinysofa-svn] r2375 - tinysofa/releases/1.1
Message-ID: <20040628140855.3C3904E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:08:55 +1000 (Tue, 29 Jun 2004)
New Revision: 2375

Added:
   tinysofa/releases/1.1/lilo/
Log:
copy lilo from snapshot

Copied: tinysofa/releases/1.1/lilo (from rev 2374, tinysofa/snapshot/lilo)


From svn at tinysofa.org  Mon Jun 28 14:08:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:08:59 +1000 (EST)
Subject: [tinysofa-svn] r2376 - tinysofa/releases/1.1
Message-ID: <20040628140859.AB99B4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:08:59 +1000 (Tue, 29 Jun 2004)
New Revision: 2376

Removed:
   tinysofa/releases/1.1/iputils/
Log:
remove iputils


From svn at tinysofa.org  Mon Jun 28 14:09:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:09:08 +1000 (EST)
Subject: [tinysofa-svn] r2377 - tinysofa/releases/1.1
Message-ID: <20040628140908.38D3C4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:09:08 +1000 (Tue, 29 Jun 2004)
New Revision: 2377

Added:
   tinysofa/releases/1.1/iputils/
Log:
copy iputils from snapshot

Copied: tinysofa/releases/1.1/iputils (from rev 2376, tinysofa/snapshot/iputils)


From svn at tinysofa.org  Mon Jun 28 14:09:12 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:09:12 +1000 (EST)
Subject: [tinysofa-svn] r2378 - tinysofa/releases/1.1
Message-ID: <20040628140912.A30164E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:09:12 +1000 (Tue, 29 Jun 2004)
New Revision: 2378

Removed:
   tinysofa/releases/1.1/lftp/
Log:
remove lftp


From svn at tinysofa.org  Mon Jun 28 14:09:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:09:21 +1000 (EST)
Subject: [tinysofa-svn] r2379 - tinysofa/releases/1.1
Message-ID: <20040628140921.05EF14E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:09:20 +1000 (Tue, 29 Jun 2004)
New Revision: 2379

Added:
   tinysofa/releases/1.1/lftp/
Log:
copy lftp from snapshot

Copied: tinysofa/releases/1.1/lftp (from rev 2378, tinysofa/snapshot/lftp)


From svn at tinysofa.org  Mon Jun 28 14:07:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:07:24 +1000 (EST)
Subject: [tinysofa-svn] r2361 - tinysofa/releases/1.1
Message-ID: <20040628140724.0653A4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:07:23 +1000 (Tue, 29 Jun 2004)
New Revision: 2361

Added:
   tinysofa/releases/1.1/fcron/
Log:
copy fcron from snapshot

Copied: tinysofa/releases/1.1/fcron (from rev 2360, tinysofa/snapshot/fcron)


From svn at tinysofa.org  Mon Jun 28 14:07:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:07:28 +1000 (EST)
Subject: [tinysofa-svn] r2362 - tinysofa/releases/1.1
Message-ID: <20040628140728.9E3874E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:07:28 +1000 (Tue, 29 Jun 2004)
New Revision: 2362

Removed:
   tinysofa/releases/1.1/file/
Log:
remove file


From svn at tinysofa.org  Mon Jun 28 14:07:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:07:51 +1000 (EST)
Subject: [tinysofa-svn] r2365 - tinysofa/releases/1.1
Message-ID: <20040628140751.166EE4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:07:50 +1000 (Tue, 29 Jun 2004)
New Revision: 2365

Added:
   tinysofa/releases/1.1/findutils/
Log:
copy findutils from snapshot

Copied: tinysofa/releases/1.1/findutils (from rev 2364, tinysofa/snapshot/findutils)


From svn at tinysofa.org  Mon Jun 28 14:07:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:07:55 +1000 (EST)
Subject: [tinysofa-svn] r2366 - tinysofa/releases/1.1
Message-ID: <20040628140755.833B14E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:07:55 +1000 (Tue, 29 Jun 2004)
New Revision: 2366

Removed:
   tinysofa/releases/1.1/finger/
Log:
remove finger


From svn at tinysofa.org  Mon Jun 28 14:08:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:08:03 +1000 (EST)
Subject: [tinysofa-svn] r2367 - tinysofa/releases/1.1
Message-ID: <20040628140803.C47084E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:08:03 +1000 (Tue, 29 Jun 2004)
New Revision: 2367

Added:
   tinysofa/releases/1.1/finger/
Log:
copy finger from snapshot

Copied: tinysofa/releases/1.1/finger (from rev 2366, tinysofa/snapshot/finger)


From svn at tinysofa.org  Mon Jun 28 14:09:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:09:25 +1000 (EST)
Subject: [tinysofa-svn] r2380 - tinysofa/releases/1.1
Message-ID: <20040628140925.819A04E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:09:25 +1000 (Tue, 29 Jun 2004)
New Revision: 2380

Removed:
   tinysofa/releases/1.1/man/
Log:
remove man


From svn at tinysofa.org  Mon Jun 28 14:09:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:09:34 +1000 (EST)
Subject: [tinysofa-svn] r2381 - tinysofa/releases/1.1
Message-ID: <20040628140934.223A14E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:09:33 +1000 (Tue, 29 Jun 2004)
New Revision: 2381

Added:
   tinysofa/releases/1.1/man/
Log:
copy man from snapshot

Copied: tinysofa/releases/1.1/man (from rev 2380, tinysofa/snapshot/man)


From svn at tinysofa.org  Mon Jun 28 14:09:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:09:38 +1000 (EST)
Subject: [tinysofa-svn] r2382 - tinysofa/releases/1.1
Message-ID: <20040628140938.DCB154E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:09:38 +1000 (Tue, 29 Jun 2004)
New Revision: 2382

Removed:
   tinysofa/releases/1.1/mdadm/
Log:
remove mdadm


From svn at tinysofa.org  Mon Jun 28 14:09:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:09:47 +1000 (EST)
Subject: [tinysofa-svn] r2383 - tinysofa/releases/1.1
Message-ID: <20040628140947.5A8804E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:09:47 +1000 (Tue, 29 Jun 2004)
New Revision: 2383

Added:
   tinysofa/releases/1.1/mdadm/
Log:
copy mdadm from snapshot

Copied: tinysofa/releases/1.1/mdadm (from rev 2382, tinysofa/snapshot/mdadm)


From svn at tinysofa.org  Mon Jun 28 14:09:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:09:51 +1000 (EST)
Subject: [tinysofa-svn] r2384 - tinysofa/releases/1.1
Message-ID: <20040628140951.EAF534E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:09:51 +1000 (Tue, 29 Jun 2004)
New Revision: 2384

Removed:
   tinysofa/releases/1.1/ntp/
Log:
remove ntp


From svn at tinysofa.org  Mon Jun 28 14:10:00 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:10:00 +1000 (EST)
Subject: [tinysofa-svn] r2385 - tinysofa/releases/1.1
Message-ID: <20040628141000.43B1A4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:10:00 +1000 (Tue, 29 Jun 2004)
New Revision: 2385

Added:
   tinysofa/releases/1.1/ntp/
Log:
copy ntp from snapshot

Copied: tinysofa/releases/1.1/ntp (from rev 2384, tinysofa/snapshot/ntp)


From svn at tinysofa.org  Mon Jun 28 14:10:04 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:10:04 +1000 (EST)
Subject: [tinysofa-svn] r2386 - tinysofa/releases/1.1
Message-ID: <20040628141004.DBCB04E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:10:04 +1000 (Tue, 29 Jun 2004)
New Revision: 2386

Removed:
   tinysofa/releases/1.1/python/
Log:
remove python


From svn at tinysofa.org  Mon Jun 28 14:10:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:10:13 +1000 (EST)
Subject: [tinysofa-svn] r2387 - tinysofa/releases/1.1
Message-ID: <20040628141013.87F734E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:10:13 +1000 (Tue, 29 Jun 2004)
New Revision: 2387

Added:
   tinysofa/releases/1.1/python/
Log:
copy python from snapshot

Copied: tinysofa/releases/1.1/python (from rev 2386, tinysofa/snapshot/python)


From svn at tinysofa.org  Mon Jun 28 14:10:18 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:10:18 +1000 (EST)
Subject: [tinysofa-svn] r2388 - tinysofa/releases/1.1
Message-ID: <20040628141018.1E7FE4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:10:17 +1000 (Tue, 29 Jun 2004)
New Revision: 2388

Removed:
   tinysofa/releases/1.1/reiserfsprogs/
Log:
remove reiserfsprogs


From svn at tinysofa.org  Mon Jun 28 14:10:26 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:10:26 +1000 (EST)
Subject: [tinysofa-svn] r2389 - tinysofa/releases/1.1
Message-ID: <20040628141026.ACF334E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:10:26 +1000 (Tue, 29 Jun 2004)
New Revision: 2389

Added:
   tinysofa/releases/1.1/reiserfsprogs/
Log:
copy reiserfsprogs from snapshot

Copied: tinysofa/releases/1.1/reiserfsprogs (from rev 2388, tinysofa/snapshot/reiserfsprogs)


From svn at tinysofa.org  Mon Jun 28 14:10:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:10:31 +1000 (EST)
Subject: [tinysofa-svn] r2390 - tinysofa/releases/1.1
Message-ID: <20040628141031.22DA24E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:10:30 +1000 (Tue, 29 Jun 2004)
New Revision: 2390

Removed:
   tinysofa/releases/1.1/rp-pppoe/
Log:
remove rp-pppoe


From svn at tinysofa.org  Mon Jun 28 14:10:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:10:39 +1000 (EST)
Subject: [tinysofa-svn] r2391 - tinysofa/releases/1.1
Message-ID: <20040628141039.610984E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:10:39 +1000 (Tue, 29 Jun 2004)
New Revision: 2391

Added:
   tinysofa/releases/1.1/rp-pppoe/
Log:
copy rp-pppoe from snapshot

Copied: tinysofa/releases/1.1/rp-pppoe (from rev 2390, tinysofa/snapshot/rp-pppoe)


From svn at tinysofa.org  Mon Jun 28 14:10:43 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:10:43 +1000 (EST)
Subject: [tinysofa-svn] r2392 - tinysofa/releases/1.1
Message-ID: <20040628141043.BE4614E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:10:43 +1000 (Tue, 29 Jun 2004)
New Revision: 2392

Removed:
   tinysofa/releases/1.1/slocate/
Log:
remove slocate


From svn at tinysofa.org  Mon Jun 28 14:10:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:10:52 +1000 (EST)
Subject: [tinysofa-svn] r2393 - tinysofa/releases/1.1
Message-ID: <20040628141052.417EA4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:10:52 +1000 (Tue, 29 Jun 2004)
New Revision: 2393

Added:
   tinysofa/releases/1.1/slocate/
Log:
copy slocate from snapshot

Copied: tinysofa/releases/1.1/slocate (from rev 2392, tinysofa/snapshot/slocate)


From svn at tinysofa.org  Mon Jun 28 14:08:08 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:08:08 +1000 (EST)
Subject: [tinysofa-svn] r2368 - tinysofa/releases/1.1
Message-ID: <20040628140808.7C7EF4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:08:08 +1000 (Tue, 29 Jun 2004)
New Revision: 2368

Removed:
   tinysofa/releases/1.1/ftp/
Log:
remove ftp


From svn at tinysofa.org  Mon Jun 28 14:08:21 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:08:21 +1000 (EST)
Subject: [tinysofa-svn] r2370 - tinysofa/releases/1.1
Message-ID: <20040628140821.265334E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:08:20 +1000 (Tue, 29 Jun 2004)
New Revision: 2370

Removed:
   tinysofa/releases/1.1/bind/
Log:
remove bind


From svn at tinysofa.org  Mon Jun 28 14:08:16 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:08:16 +1000 (EST)
Subject: [tinysofa-svn] r2369 - tinysofa/releases/1.1
Message-ID: <20040628140816.AED394E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:08:16 +1000 (Tue, 29 Jun 2004)
New Revision: 2369

Added:
   tinysofa/releases/1.1/ftp/
Log:
copy ftp from snapshot

Copied: tinysofa/releases/1.1/ftp (from rev 2368, tinysofa/snapshot/ftp)


From svn at tinysofa.org  Mon Jun 28 14:08:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:08:29 +1000 (EST)
Subject: [tinysofa-svn] r2371 - tinysofa/releases/1.1
Message-ID: <20040628140829.71E3A4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:08:29 +1000 (Tue, 29 Jun 2004)
New Revision: 2371

Added:
   tinysofa/releases/1.1/bind/
Log:
copy bind from snapshot

Copied: tinysofa/releases/1.1/bind (from rev 2370, tinysofa/snapshot/bind)


From svn at tinysofa.org  Mon Jun 28 14:08:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:08:33 +1000 (EST)
Subject: [tinysofa-svn] r2372 - tinysofa/releases/1.1
Message-ID: <20040628140833.E128F4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:08:33 +1000 (Tue, 29 Jun 2004)
New Revision: 2372

Removed:
   tinysofa/releases/1.1/cdrtools/
Log:
remove cdrtools


From svn at tinysofa.org  Mon Jun 28 14:08:42 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:08:42 +1000 (EST)
Subject: [tinysofa-svn] r2373 - tinysofa/releases/1.1
Message-ID: <20040628140842.727D64E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:08:42 +1000 (Tue, 29 Jun 2004)
New Revision: 2373

Added:
   tinysofa/releases/1.1/cdrtools/
Log:
copy cdrtools from snapshot

Copied: tinysofa/releases/1.1/cdrtools (from rev 2372, tinysofa/snapshot/cdrtools)


From svn at tinysofa.org  Mon Jun 28 14:11:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:11:02 +1000 (EST)
Subject: [tinysofa-svn] r2394 - tinysofa/releases/1.1
Message-ID: <20040628141102.540334E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:11:02 +1000 (Tue, 29 Jun 2004)
New Revision: 2394

Added:
   tinysofa/releases/1.1/tftp/
Log:
copy tftp from snapshot

Copied: tinysofa/releases/1.1/tftp (from rev 2393, tinysofa/snapshot/tftp)


From svn at tinysofa.org  Mon Jun 28 14:11:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:11:06 +1000 (EST)
Subject: [tinysofa-svn] r2395 - tinysofa/releases/1.1
Message-ID: <20040628141106.D02EC4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:11:06 +1000 (Tue, 29 Jun 2004)
New Revision: 2395

Removed:
   tinysofa/releases/1.1/groff/
Log:
remove groff


From svn at tinysofa.org  Mon Jun 28 14:11:15 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:11:15 +1000 (EST)
Subject: [tinysofa-svn] r2396 - tinysofa/releases/1.1
Message-ID: <20040628141115.6B57F4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:11:15 +1000 (Tue, 29 Jun 2004)
New Revision: 2396

Added:
   tinysofa/releases/1.1/groff/
Log:
copy groff from snapshot

Copied: tinysofa/releases/1.1/groff (from rev 2395, tinysofa/snapshot/groff)


From svn at tinysofa.org  Mon Jun 28 14:11:20 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:11:20 +1000 (EST)
Subject: [tinysofa-svn] r2397 - tinysofa/releases/1.1
Message-ID: <20040628141120.080624E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:11:19 +1000 (Tue, 29 Jun 2004)
New Revision: 2397

Removed:
   tinysofa/releases/1.1/libcap/
Log:
remove libcap


From svn at tinysofa.org  Mon Jun 28 14:11:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:11:28 +1000 (EST)
Subject: [tinysofa-svn] r2398 - tinysofa/releases/1.1
Message-ID: <20040628141128.629AA4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:11:28 +1000 (Tue, 29 Jun 2004)
New Revision: 2398

Added:
   tinysofa/releases/1.1/libcap/
Log:
copy libcap from snapshot

Copied: tinysofa/releases/1.1/libcap (from rev 2397, tinysofa/snapshot/libcap)


From svn at tinysofa.org  Mon Jun 28 14:11:33 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:11:33 +1000 (EST)
Subject: [tinysofa-svn] r2399 - tinysofa/releases/1.1
Message-ID: <20040628141133.D86964E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:11:33 +1000 (Tue, 29 Jun 2004)
New Revision: 2399

Removed:
   tinysofa/releases/1.1/logrotate/
Log:
remove logrotate


From svn at tinysofa.org  Mon Jun 28 14:11:42 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:11:42 +1000 (EST)
Subject: [tinysofa-svn] r2400 - tinysofa/releases/1.1
Message-ID: <20040628141142.83DBD4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:11:42 +1000 (Tue, 29 Jun 2004)
New Revision: 2400

Added:
   tinysofa/releases/1.1/logrotate/
Log:
copy logrotate from snapshot

Copied: tinysofa/releases/1.1/logrotate (from rev 2399, tinysofa/snapshot/logrotate)


From svn at tinysofa.org  Mon Jun 28 14:11:47 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:11:47 +1000 (EST)
Subject: [tinysofa-svn] r2401 - tinysofa/releases/1.1
Message-ID: <20040628141147.1529F4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:11:46 +1000 (Tue, 29 Jun 2004)
New Revision: 2401

Removed:
   tinysofa/releases/1.1/rsync/
Log:
remove rsync


From svn at tinysofa.org  Mon Jun 28 14:11:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:11:55 +1000 (EST)
Subject: [tinysofa-svn] r2402 - tinysofa/releases/1.1
Message-ID: <20040628141155.B91C34E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:11:55 +1000 (Tue, 29 Jun 2004)
New Revision: 2402

Added:
   tinysofa/releases/1.1/rsync/
Log:
copy rsync from snapshot

Copied: tinysofa/releases/1.1/rsync (from rev 2401, tinysofa/snapshot/rsync)


From svn at tinysofa.org  Mon Jun 28 14:12:01 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:12:01 +1000 (EST)
Subject: [tinysofa-svn] r2403 - tinysofa/releases/1.1
Message-ID: <20040628141201.240014E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:12:00 +1000 (Tue, 29 Jun 2004)
New Revision: 2403

Removed:
   tinysofa/releases/1.1/samba/
Log:
remove samba


From svn at tinysofa.org  Mon Jun 28 14:12:09 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:12:09 +1000 (EST)
Subject: [tinysofa-svn] r2404 - tinysofa/releases/1.1
Message-ID: <20040628141209.67FA64E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:12:09 +1000 (Tue, 29 Jun 2004)
New Revision: 2404

Added:
   tinysofa/releases/1.1/samba/
Log:
copy samba from snapshot

Copied: tinysofa/releases/1.1/samba (from rev 2403, tinysofa/snapshot/samba)


From svn at tinysofa.org  Mon Jun 28 14:12:13 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:12:13 +1000 (EST)
Subject: [tinysofa-svn] r2405 - tinysofa/releases/1.1
Message-ID: <20040628141213.BFB924E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:12:13 +1000 (Tue, 29 Jun 2004)
New Revision: 2405

Removed:
   tinysofa/releases/1.1/sysklogd/
Log:
remove sysklogd


From svn at tinysofa.org  Mon Jun 28 14:12:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:12:22 +1000 (EST)
Subject: [tinysofa-svn] r2406 - tinysofa/releases/1.1
Message-ID: <20040628141222.0E5E54E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:12:21 +1000 (Tue, 29 Jun 2004)
New Revision: 2406

Added:
   tinysofa/releases/1.1/sysklogd/
Log:
copy sysklogd from snapshot

Copied: tinysofa/releases/1.1/sysklogd (from rev 2405, tinysofa/snapshot/sysklogd)


From svn at tinysofa.org  Mon Jun 28 14:12:26 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:12:26 +1000 (EST)
Subject: [tinysofa-svn] r2407 - tinysofa/releases/1.1
Message-ID: <20040628141226.798924E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:12:26 +1000 (Tue, 29 Jun 2004)
New Revision: 2407

Removed:
   tinysofa/releases/1.1/vim/
Log:
remove vim


From svn at tinysofa.org  Mon Jun 28 14:12:34 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:12:34 +1000 (EST)
Subject: [tinysofa-svn] r2408 - tinysofa/releases/1.1
Message-ID: <20040628141234.D0AC14E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:12:34 +1000 (Tue, 29 Jun 2004)
New Revision: 2408

Added:
   tinysofa/releases/1.1/vim/
Log:
copy vim from snapshot

Copied: tinysofa/releases/1.1/vim (from rev 2407, tinysofa/snapshot/vim)


From svn at tinysofa.org  Mon Jun 28 14:12:39 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:12:39 +1000 (EST)
Subject: [tinysofa-svn] r2409 - tinysofa/releases/1.1
Message-ID: <20040628141239.599964E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:12:39 +1000 (Tue, 29 Jun 2004)
New Revision: 2409

Removed:
   tinysofa/releases/1.1/vsftpd/
Log:
remove vsftpd


From svn at tinysofa.org  Mon Jun 28 14:12:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:12:51 +1000 (EST)
Subject: [tinysofa-svn] r2410 - tinysofa/releases/1.1
Message-ID: <20040628141251.395AB4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:12:51 +1000 (Tue, 29 Jun 2004)
New Revision: 2410

Added:
   tinysofa/releases/1.1/vsftpd/
Log:
copy vsftpd from snapshot

Copied: tinysofa/releases/1.1/vsftpd (from rev 2409, tinysofa/snapshot/vsftpd)


From svn at tinysofa.org  Mon Jun 28 14:12:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:12:57 +1000 (EST)
Subject: [tinysofa-svn] r2411 - tinysofa/releases/1.1
Message-ID: <20040628141257.DE6924E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:12:57 +1000 (Tue, 29 Jun 2004)
New Revision: 2411

Removed:
   tinysofa/releases/1.1/wget/
Log:
remove wget


From svn at tinysofa.org  Mon Jun 28 14:13:06 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:13:06 +1000 (EST)
Subject: [tinysofa-svn] r2412 - tinysofa/releases/1.1
Message-ID: <20040628141306.3F7214E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:13:06 +1000 (Tue, 29 Jun 2004)
New Revision: 2412

Added:
   tinysofa/releases/1.1/wget/
Log:
copy wget from snapshot

Copied: tinysofa/releases/1.1/wget (from rev 2411, tinysofa/snapshot/wget)


From svn at tinysofa.org  Mon Jun 28 14:13:10 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:13:10 +1000 (EST)
Subject: [tinysofa-svn] r2413 - tinysofa/releases/1.1
Message-ID: <20040628141310.C179F4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:13:10 +1000 (Tue, 29 Jun 2004)
New Revision: 2413

Removed:
   tinysofa/releases/1.1/which/
Log:
remove which


From svn at tinysofa.org  Mon Jun 28 14:13:19 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:13:19 +1000 (EST)
Subject: [tinysofa-svn] r2414 - tinysofa/releases/1.1
Message-ID: <20040628141319.7C7524E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:13:19 +1000 (Tue, 29 Jun 2004)
New Revision: 2414

Added:
   tinysofa/releases/1.1/which/
Log:
copy which from snapshot

Copied: tinysofa/releases/1.1/which (from rev 2413, tinysofa/snapshot/which)


From svn at tinysofa.org  Mon Jun 28 14:23:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:23:57 +1000 (EST)
Subject: [tinysofa-svn] r2415 - tinysofa/releases/1.1
Message-ID: <20040628142357.070F24E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:23:56 +1000 (Tue, 29 Jun 2004)
New Revision: 2415

Removed:
   tinysofa/releases/1.1/uw-imap/
Log:
- remove uw-imap



From svn at tinysofa.org  Mon Jun 28 14:27:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:27:57 +1000 (EST)
Subject: [tinysofa-svn] r2416 - contrib tinysofa/releases/1.1
Message-ID: <20040628142757.C7C104E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:27:57 +1000 (Tue, 29 Jun 2004)
New Revision: 2416

Added:
   tinysofa/releases/1.1/dovecot/
Removed:
   contrib/dovecot/
Log:
- move dovecot from contrib to releases/1.1


Copied: tinysofa/releases/1.1/dovecot (from rev 2415, contrib/dovecot)


From svn at tinysofa.org  Mon Jun 28 14:27:57 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 00:27:57 +1000 (EST)
Subject: [tinysofa-svn] r2416 - contrib tinysofa/releases/1.1
Message-ID: <20040628142757.D2A914E8310@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 00:27:57 +1000 (Tue, 29 Jun 2004)
New Revision: 2416

Added:
   tinysofa/releases/1.1/dovecot/
Removed:
   contrib/dovecot/
Log:
- move dovecot from contrib to releases/1.1


Copied: tinysofa/releases/1.1/dovecot (from rev 2415, contrib/dovecot)


From svn at tinysofa.org  Mon Jun 28 15:16:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 01:16:27 +1000 (EST)
Subject: [tinysofa-svn] r2417 - tinysofa/releases/1.1
Message-ID: <20040628151627.2ADDD4E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 01:16:26 +1000 (Tue, 29 Jun 2004)
New Revision: 2417

Removed:
   tinysofa/releases/1.1/squid/
Log:
remove squid


From svn at tinysofa.org  Mon Jun 28 15:17:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 01:17:52 +1000 (EST)
Subject: [tinysofa-svn] r2418 - tinysofa/releases/1.1
Message-ID: <20040628151752.33EA64E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 01:17:52 +1000 (Tue, 29 Jun 2004)
New Revision: 2418

Added:
   tinysofa/releases/1.1/squid/
Log:
copy squid from snapshot

Copied: tinysofa/releases/1.1/squid (from rev 2417, tinysofa/snapshot/squid)


From svn at tinysofa.org  Mon Jun 28 17:36:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 03:36:51 +1000 (EST)
Subject: [tinysofa-svn] 
	r2419 - in tinysofa/releases/1.1/netatalk/current: sources specs
Message-ID: <20040628173651.7B4254E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 03:36:51 +1000 (Tue, 29 Jun 2004)
New Revision: 2419

Added:
   tinysofa/releases/1.1/netatalk/current/sources/ICDumpSuffixMap
   tinysofa/releases/1.1/netatalk/current/sources/atalk.init
   tinysofa/releases/1.1/netatalk/current/sources/netatalk-1.6.3-norc.patch
Removed:
   tinysofa/releases/1.1/netatalk/current/sources/netatalk.init
Modified:
   tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec
Log:
- new netatalk package from Fedora
- use tinysofa macros
- port init script to tinysofa


Added: tinysofa/releases/1.1/netatalk/current/sources/ICDumpSuffixMap
===================================================================
--- tinysofa/releases/1.1/netatalk/current/sources/ICDumpSuffixMap	2004-06-28 15:17:52 UTC (rev 2418)
+++ tinysofa/releases/1.1/netatalk/current/sources/ICDumpSuffixMap	2004-06-28 17:36:51 UTC (rev 2419)
@@ -0,0 +1 @@
+#!perl
#
# ICDumpMap
#     ---  Dump suffix mappings from your Internet Config extension.
#
# iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
#

use Mac::InternetConfig;

open MAP, ">AppleVolumes";
printf MAP "%-9s \"%4s\"  \"%4s\"      %-30s %-25s %-15s\n\n",
".", "TEXT", "ttxt", "ASCII Text", "SimpleText", "text/plain";
print MAP "\# The following lines are extracted from Internet Config Preference.\n\n";
for my $entry (keys %InternetConfigMap) {
   next unless $entry->extension =~ /^\./;
   $_ = sprintf "%-9s \"%4s\"  \"%4s\"      %-30s %-25s %-15s",
      $entry->extension, $entry->file_type, $entry->file_creator,
      $entry->entry_name, $entry->creator_app_name,
      $entry->MIME_type;
   s/\s*$/\n/;
   print MAP;
}
close MAP;
\ No newline at end of file

Added: tinysofa/releases/1.1/netatalk/current/sources/atalk.init
===================================================================
--- tinysofa/releases/1.1/netatalk/current/sources/atalk.init	2004-06-28 15:17:52 UTC (rev 2418)
+++ tinysofa/releases/1.1/netatalk/current/sources/atalk.init	2004-06-28 17:36:51 UTC (rev 2419)
@@ -0,0 +1,102 @@
+#!/bin/sh
+# chkconfig: - 91 35
+# description: This package enables Linux to talk to Macintosh computers via the \
+#              AppleTalk networking protocol. It includes a daemon to allow Linux \
+#              to act as a file server over EtherTalk or IP for Mac's.
+# processname: atalkd
+# pidfile: /var/run/atalkd.pid
+# config: /etc/atalk/*
+
+# Source function library.
+if [ -f /etc/init.d/functions ]; then
+  . /etc/init.d/functions
+elif [ -f /etc/rc.d/init.d/functions ]; then
+  . /etc/rc.d/init.d/functions
+else
+  echo "Could not find a functions file. The system seems broken."
+  exit 1
+fi
+
+# Source networking configuration.
+. /etc/sysconfig/network
+
+# Source Appletalk configuration
+. /etc/atalk/netatalk.conf
+
+# Check that networking is up.
+[ ${NETWORKING} = "no" ] && exit 0
+
+start() {
+	echo -n $"Starting AppleTalk services: "
+	if [ ${ATALK_BGROUND} = yes ] ; then
+	    echo -n "(backgrounded)"
+	    {
+		daemon atalkd -f /etc/atalk/atalkd.conf
+		nbprgstr -p 4 "${ATALK_NAME}:Workstation"
+		nbprgstr -p 4 "${ATALK_NAME}:netatalk"
+		if [ ${PAPD_RUN} = yes ] ; then
+		    daemon papd -f /etc/atalk/papd.conf
+		fi
+		if [ ${AFPD_RUN} = yes ] ; then
+		    daemon afpd -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}\" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system
+		fi
+	    } >/dev/null &
+	else
+	    daemon atalkd -f /etc/atalk/atalkd.conf
+	    nbprgstr -p 4 "${ATALK_NAME}:Workstation"
+	    nbprgstr -p 4 "${ATALK_NAME}:netatalk"
+	    if [ ${PAPD_RUN} = yes ] ; then
+		daemon papd -f /etc/atalk/papd.conf
+	    fi
+	    if [ ${AFPD_RUN} = yes ] ; then
+		daemon afpd -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}\" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system
+	    fi
+	fi
+	echo
+	touch ${INITLOCK:-/mnt/lockdev}/atalk
+}
+  
+stop() {
+	echo -n $"Shutting down AppleTalk services: "
+	killproc afpd
+	killproc papd
+	nbpunrgstr "${ATALK_NAME}:Workstation@*"
+	nbpunrgstr "${ATALK_NAME}:netatalk@*"
+	killproc atalkd
+	# Attempt to zap the module, so that we can restart the
+	# Appletalk daemons cleanly
+	if [ -e /proc/modules ] && [ -x /sbin/modprobe ] ; then
+	    modprobe -r appletalk
+	fi
+	rm -f ${INITLOCK:-/mnt/lockdev}/atalk
+	echo ""
+}
+
+
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+    start)
+	start	
+	;;
+    stop)
+	stop
+	;;
+    restart|reload)
+	restart
+	;;
+    condrestart|try-restart)
+    [ -f ${INITLOCK:-/mnt/lockdev}/atalk ] && restart || : 
+     ;;
+    status)
+	status atalkd
+	;;
+    *)
+	echo $"Usage: $0 {start|stop|restart|status|try-restart}"
+	exit 1
+esac
+
+exit 0

Added: tinysofa/releases/1.1/netatalk/current/sources/netatalk-1.6.3-norc.patch
===================================================================
--- tinysofa/releases/1.1/netatalk/current/sources/netatalk-1.6.3-norc.patch	2004-06-28 15:17:52 UTC (rev 2418)
+++ tinysofa/releases/1.1/netatalk/current/sources/netatalk-1.6.3-norc.patch	2004-06-28 17:36:51 UTC (rev 2419)
@@ -0,0 +1,20 @@
+--- netatalk-1.6.3/bin/afile/Makefile.in.norc	2003-06-12 19:07:40.000000000 -0400
++++ netatalk-1.6.3/bin/afile/Makefile.in	2003-07-08 14:22:28.000000000 -0400
+@@ -184,7 +184,6 @@
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+ 
+ bin_PROGRAMS = afile achfile
+-bin_SCRIPTS = acleandir.rc
+ 
+ afile_SOURCES = afile.c common.c common.h
+ achfile_SOURCES = achfile.c common.c common.h
+--- netatalk-1.6.3/man/man1/Makefile.in.norc	2003-06-09 11:59:12.000000000 -0400
++++ netatalk-1.6.3/man/man1/Makefile.in	2003-07-08 14:22:28.000000000 -0400
+@@ -188,7 +188,6 @@
+ GENERATED_MANS = apple_cp.1 apple_mv.1 apple_rm.1
+ TEMPLATE_FILES = $(foreach f,$(GENERATED_MANS),$(f).tmpl)
+ NONGENERATED_MANS = achfile.1  \
+-				acleandir.1 \
+ 				aecho.1 \
+ 				afile.1 \
+ 				afppasswd.1 \

Deleted: tinysofa/releases/1.1/netatalk/current/sources/netatalk.init
===================================================================
--- tinysofa/releases/1.1/netatalk/current/sources/netatalk.init	2004-06-28 15:17:52 UTC (rev 2418)
+++ tinysofa/releases/1.1/netatalk/current/sources/netatalk.init	2004-06-28 17:36:51 UTC (rev 2419)
@@ -1,150 +0,0 @@
-#! /bin/sh
-# chkconfig: - 91 35
-# description: This package enables Linux to talk to Macintosh
-#              computers via the AppleTalk networking protocol and 
-#              provides printer, file sharing, and AppleTalk routing 
-#              services.   
-#
-# AppleTalk daemons. Make sure not to start atalkd in the background:
-# its data structures must have time to stablize before running the
-# other processes.
-
-# Source function library.
-. /etc/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-if [ ! -x /usr/sbin/atalkd ]; then
-  echo "$0: Could not find the atalk executable"
-  failure "Could not find the atalk executable"
-  echo
-  exit 1
-fi
-
-if [ ! -f /etc/atalk/netatalk/netatalk.conf ]; then
-  echo "$0: Could not find the atalk config file"
-  failure "Could not find the atalk config file"
-  echo
-  exit 1
-fi
-
-
-# read in netatalk configuration
-. /etc/atalk/netatalk/netatalk.conf
-
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
-
-# initialize return values
-RETVAL=1
-RETVAL_ATALKD=0
-RETVAL_PAPD=0
-RETVAL_AFPD=0
-
-# startup code for everything
-atalk_startup() {
-    if [ x"${ATALKD_RUN}" != x"no" ]; then 
-	daemon /usr/sbin/atalkd
-	RETVAL_ATALKD=$?
-
-	if [ -x /usr/bin/nbprgstr ]; then	
-	    /usr/bin/nbprgstr -p 4 "${ATALK_NAME}:Workstation${ATALK_ZONE}"
-	    /usr/bin/nbprgstr -p 4 "${ATALK_NAME}:netatalk${ATALK_ZONE}"
-	fi	
-
-	if [ x"${PAPD_RUN}" = x"yes"  -a -x /usr/sbin/papd ]; then
-	    daemon /usr/sbin/papd
-	    RETVAL_PAPD=$?
-	fi
-
-	# check for timelord in bin directory
-	if [ -x /usr/bin/timelord ]; then
-	    daemon /usr/bin/timelord
-	fi
-
-	# check for timelord in sbin directory
-	if [ -x /usr/sbin/timelord ]; then
-	    daemon /usr/sbin/timelord
-	fi
-
-    fi
-
-    if [ x"${AFPD_RUN}" = x"yes" -a -x /usr/sbin/afpd ] ; then
-	    daemon /usr/sbin/afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} \
-		-c ${AFPD_MAX_CLIENTS} -n "${ATALK_NAME}${ATALK_ZONE}"
-	    RETVAL_AFPD=$?
-    fi
-
-    if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_AFPD -eq 0 ]; then
-        RETVAL=0
-	touch ${INITLOCK:-/mnt/lockdev}/atalk || RETVAL=1
-    fi
-}
-
-case "$1" in
-'start')
-	echo -n 'Starting AppleTalk services: '
-	if [ x"${ATALK_BGROUND}" = x"yes" ]; then 
-	    echo -n "(backgrounded)"
-	    atalk_startup >& /dev/null &
-	else
-	    atalk_startup
-	fi
-	echo 
-	;;
-'stop')
-	echo -n 'Shutting down AppleTalk services: '
-	if [ x"${ATALKD_RUN}" != x"no" ]; then
-	    if [ x"${PAPD_RUN}" = x"yes" -a -x /usr/sbin/papd ]; then
-		killproc papd
-		RETVAL_PAPD=$?
-	    fi
-
-            # checking for timelord in bin directory
-	    if [ -x /usr/bin/timelord ]; then
-		killproc timelord
-	    fi
-
-            # checking for timelord in sbin directory
-	    if [ -x /usr/sbin/timelord ]; then
-		killproc timelord
-	    fi
-
-	    /usr/bin/nbpunrgstr "${ATALK_NAME}:Workstation${ATALK_ZONE}"
-	    /usr/bin/nbpunrgstr "${ATALK_NAME}:netatalk${ATALK_ZONE}"
-
-	    # kill atalkd last, since without it the plumbing goes away.
-	    if [ -x /usr/sbin/atalkd ]; then
-		killproc atalkd
-		RETVAL_ATALKD=$?
-	    fi
-	fi
-
-	# kill this separately as we also do AFP/tcp
-	if [ x"${AFPD_RUN}" = x"yes" -a -x /usr/sbin/afpd ]; then
-	    killproc afpd
-	    RETVAL_AFPD=$?
-	fi
-
-	if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_AFPD -eq 0 ] ; then
-	    RETVAL=0
-	    rm -f ${INITLOCK:-/mnt/lockdev}/atalk || RETVAL=1
-	fi
-	echo ""
-	;;
-  'restart'|'reload')
-	$0 stop
-	$0 start
-	RETVAL=$?
-	;;
-  'status')
-	status atalkd
-	RETVAL=$?
-	;;
-  *)
-	echo "Usage: atalk {start|stop|restart|status}"
-	exit 1
-esac
-
-exit $RETVAL

Modified: tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec
===================================================================
--- tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec	2004-06-28 15:17:52 UTC (rev 2418)
+++ tinysofa/releases/1.1/netatalk/current/specs/netatalk.spec	2004-06-28 17:36:51 UTC (rev 2419)
@@ -1,211 +1,374 @@
-Summary: Appletalk and Appleshare/IP services for Linux
+Summary: AppleTalk networking programs
 Name: netatalk
 Version: 1.6.4
-Release: 5ts
-License: BSD
-Group: tinysofa official
-Source0: http://prdownloads.sourceforge.net/netatalk/%{name}-%{version}.tar.bz2
-Source1: netatalk.init
+Release: 6jh
+License: GPL
+Group: tinysofa/extra
+Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
+Source1: atalk.init
+#Source2: netatalk.config
+#Source3: AppleVolumes.system
+Source4: ICDumpSuffixMap
+Patch0: netatalk-1.6.3-norc.patch
+#Patch1: netatalk-1.5.5-openssl097.patch
+#Patch2: netatalk-1.5.5-pathcat.patch
 URL: http://netatalk.sourceforge.net/
-Requires: cracklib, openssl, tcp_wrappers, pam, tinysofa-utils
-BuildRequires: openssl-devel 
+%service_requires
+Requires: pam >= 0.56, /etc/pam.d/system-auth, tcp_wrappers, openssl, cracklib
+BuildRequires: cracklib openssl-devel pam quota libtool automake autoconf
 BuildRequires: gcc-c++-devel db4-devel kerberos5-devel libcom_err-devel
-BuildRequires: pam-devel
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: perl
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
-netatalk is an implementation of the AppleTalk Protocol Suite for Unix/Linux
-systems. The current release contains support for Ethertalk Phase I and II,
-DDP, RTMP, NBP, ZIP, AEP, ATP, PAP, ASP, and AFP. It provides Appletalk file
-printing and routing services on Solaris 2.5, Linux, FreeBSD, SunOS 4.1 and
-Ultrix 4. It also supports AFP 2.1 and 2.2 (Appleshare IP).
+This package enables Linux to talk to Macintosh computers via the
+AppleTalk networking protocol. It includes a daemon to allow Linux
+to act as a file server over EtherTalk or IP for Mac's.
 
 %package devel
-Group: tinysofa official
-Summary: Appletalk and Appleshare/IP services for Linux development files
-Requires: glibc-devel
+Summary: Headers and static libraries for Appletalk development
+Group: Development/Libraries
 
 %description devel
-netatalk is an implementation of the AppleTalk Protocol Suite for Unix/Linux
-systems. The current release contains support for Ethertalk Phase I and II,
-DDP, RTMP, NBP, ZIP, AEP, ATP, PAP, ASP, and AFP. It provides Appletalk file
-printing and routing services on Solaris 2.5, Linux, FreeBSD, SunOS 4.1 and
-Ultrix 4. It also supports AFP 2.1 and 2.2 (Appleshare IP).
+This package contains the header files, and static libraries for building
+Appletalk networking programs.
 
-This package is required for developing appletalk-based applications.
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p 1 -b .norc
+#%patch1 -p 1 -b .openssl097
+#%patch2 -p1 -b .pathcat
 
+
 %build
-#./autogen.sh
-CFLAGS="$(echo $RPM_OPT_FLAGS | sed "s|-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1||") -fomit-frame-pointer -fsigned-char" ./configure \
-	--prefix=%{prefix} \
-	--with-cracklib \
-	--with-pam \
-	--sysconfdir=/etc/atalk \
-	--with-tcp-wrappers \
-	--mandir=%{_mandir} \
-	--with-uams-path=/etc/atalk/uams \
-	--with-nls-path=/etc/atalk/nls \
-	--with-ssl
-make CONFIG_DIR=/etc/atalk
+touch AUTHORS
+libtoolize --force
+aclocal -I macros
+automake --add-missing
+autoconf
+autoheader
+export CFLAGS="$(echo $RPM_OPT_FLAGS | sed "s|-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -D_LARGEFILE64_SOURCE=1||")"
+%configure \
+	--with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \
+	--with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \
+	--with-uams-path=%{_libdir}
 
+# Grrrr. Fix broken libtool/autoFOO Makefiles.
+if [ "%{_lib}" != lib ]; then
+	find . -name Makefile | xargs perl -pi \
+	-e 's,-L/usr/lib,-L%{_libdir},g'
+	find . -name Makefile | xargs perl -pi \
+	-e 's,-L/lib,-L/%{_lib},g'
+fi
+
+%make
+
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-### INSTALL (USING "make install") ###
-mkdir -p $RPM_BUILD_ROOT/{usr,etc/atalk/uams}
-make DESTDIR=$RPM_BUILD_ROOT CONFIG_DIR=/etc/atalk install
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/atalk/{uams,nls}
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+mkdir -p $RPM_BUILD_ROOT/usr/include/{netatalk,atalk}
 
-# install /etc/init.d/atalk
-mkdir -p $RPM_BUILD_ROOT%{_initdir}
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/atalk
+make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 
-# make NLS
-( \
-  mkdir -p $RPM_BUILD_ROOT/etc/atalk/nls/; \
-  cd $RPM_BUILD_ROOT/etc/atalk/nls;        \
-  $RPM_BUILD_ROOT/usr/bin/makecode \
-)
+install -m644 config/AppleVolumes.default $RPM_BUILD_ROOT/%{_sysconfdir}/atalk/AppleVolumes.default
+install -m644 config/afpd.conf $RPM_BUILD_ROOT/%{_sysconfdir}/atalk/afpd.conf
+install -m644 config/atalkd.conf $RPM_BUILD_ROOT/%{_sysconfdir}/atalk/atalkd.conf
+install -m644 config/papd.conf $RPM_BUILD_ROOT/%{_sysconfdir}/atalk/papd.conf
+install -m644 config/netatalk.pamd $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/netatalk
+install -m644 %{SOURCE4} .
+#install -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/atalk/AppleVolumes.system
+#install -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/atalk/netatalk.conf
+install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/atalk
+cp include/atalk/*.h $RPM_BUILD_ROOT/usr/include/atalk/
+cp sys/netatalk/*.h $RPM_BUILD_ROOT/usr/include/netatalk/
 
-# install pam file
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d/
-install -m 644 config/netatalk.pamd \
-  $RPM_BUILD_ROOT/etc/pam.d/netatalk
+rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h || :
 
-# We don't have /usr/bin/rc
-rm $RPM_BUILD_ROOT/usr/bin/acleandir.rc
+cd $RPM_BUILD_ROOT/%{_sysconfdir}/atalk/nls
+$RPM_BUILD_ROOT/usr/bin/makecode || true
 
-%pre
-service atalk stop 2> /dev/null > /dev/null || :
+# Remove .la files in buildroot
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_bindir}/acleandir.rc \
+	$RPM_BUILD_ROOT%{_mandir}/man1/acleandir.1*
 
+
+%clean
+%clean_buildroot
+
+
 %post
-/sbin/chkconfig --add atalk
-/sbin/ldconfig
-/sbin/restart_maybe atalk
+%service_post atalk
 
 %preun
-if [ $1 = 0 ]; then
-	service atalk stop 2> /dev/null > /dev/null || :
-	/sbin/chkconfig --del atalk
-fi
+%service_preun atalk
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%postun
+%service_postun atalk
 
+
 %files
 %defattr(-,root,root)
-%doc CONTRIBUTORS doc/DEVELOPER doc/README.hidden-items COPYING
-%doc NEWS doc/FAQ doc/README.platforms COPYRIGHT README	doc/INSTALL
-%doc doc/README.veto ChangeLog TODO VERSION doc/CONFIGURE
-%dir /etc/atalk
-%dir /etc/atalk/netatalk
-%dir /etc/atalk/nls
-%dir /etc/atalk/uams
-%config /etc/atalk/netatalk/Apple*
-%config /etc/atalk/netatalk/*.conf
-%config /etc/pam.d/netatalk
-/etc/atalk/netatalk/nls/*
-/etc/atalk/nls/*
-/etc/atalk/uams/*.so
-%{_initdir}/atalk
-%{prefix}/bin/*
-%{prefix}/sbin/*
+%doc COPYRIGHT ChangeLog README* TODO VERSION NEWS
+%doc ICDumpSuffixMap doc
+%dir %{_sysconfdir}/atalk
+%dir %{_sysconfdir}/atalk/nls
+%config %{_sysconfdir}/atalk/nls/*
+%{_libdir}/*.so
+%config(noreplace) %{_sysconfdir}/atalk/AppleVolumes.default
+%config(noreplace) %{_sysconfdir}/atalk/AppleVolumes.system
+%config(noreplace) %{_sysconfdir}/atalk/netatalk.conf
+%config(noreplace) %{_sysconfdir}/atalk/afpd.conf
+%config(noreplace) %{_sysconfdir}/atalk/atalkd.conf
+%config(noreplace) %{_sysconfdir}/atalk/papd.conf
+%attr(755,root,root) %{_initrddir}/atalk
+%config(noreplace) %{_sysconfdir}/pam.d/netatalk
+%{_sbindir}/*
+%{_bindir}/*
 %{_mandir}/man*/*
+%{_datadir}/netatalk
 
-%exclude /usr/share/netatalk/pagecount.ps
 
 %files devel
 %defattr(-,root,root)
-%{prefix}/lib/*
-%dir %{prefix}/include/atalk
-%{prefix}/include/atalk/*.h
-%{prefix}/include/netatalk/aarp.h
-%{prefix}/include/netatalk/at_var.h
-%{prefix}/include/netatalk/ddp*.h
-%{prefix}/include/netatalk/endian.h
-%{prefix}/include/netatalk/phase2.h
-%{prefix}/share/aclocal/netatalk.m4
+%dir %{_includedir}/atalk
+%{_libdir}/*.a
+%attr(0644,root,root) %{_includedir}/atalk/*
+%attr(0644,root,root) %{_includedir}/netatalk/*
+%{_datadir}/aclocal/netatalk.m4
 
-%exclude /etc/atalk/uams/*.a
-%exclude /etc/atalk/uams/*.la
-%exclude %{_includedir}/netatalk/*.c
 
-# glibc wins!
-%exclude %{prefix}/include/netatalk/at.h
-
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.6.4-5ts
-- current (1.6.4-4ts) integrated as 1.6.4-5ts for release 1.0-U1
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Sat May 15 2004 Jaakko Heinonen <jh at tinysofa dot org>
-- fix non-root build
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed May 12 2004 Omar Kilani <omar at tinysofa dot org>
-- Add BuildRequires: gcc-c++-devel db4-devel kerberos5-devel libcom_err-devel
-- Add BuildRequires: pam-devel
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Jan 14 2004 Chr. Toldnes <christht at trustix dot org> 1.6.4-1tr
-- New upstream.
-- Built with no LFS.
+* Wed Jan 07 2004 Florian La Roche <Florian.LaRoche at redhat.de>
+- 1.6.4
 
-* Wed Dec  3 2003 Erlend Midttun <erlendbm at trustix dot org> 1.6.3-1tr
-- New upstream.
+* Fri Aug 1 2003 Charlie Bennett <ccb at redhat.com>
+- Update with 1.6.3 upstream sources
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 1.6.1-3tr
-- Big rebuild
+* Tue Jul 29 2003 Elliot Lee <sopwith at redhat.com>
+- Rebuild
+- Fix perl multilib path editing
+- Add pathcat patch
 
-* Tue May 27 2003 Erlend Midttun <erlendbm at trustix dot com> 1.6.0-5em
-- PreReq in devel -> Requires
+* Thu May  1 2003 Elliot Lee <sopwith at redhat.com> 1.5.5-7
+- Make multilib generic
+- Add builddep on quota (for rpcsvc/rquota.h)
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 1.6.0-4em
-- Rebuilt against glibc 2.3.2.
+* Wed Feb 18 2003 Bill Nottingham <notting at redhat.com> 1.5.5-5
+- fix initscript error (#82118)
 
-* Tue Feb 25 2003 Erlend Midttun <erlendbm at trustix dot com> 1.6.0-3em
-- Fix init script.
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
 
-* Mon Jan 27 2003 Erlend Midttun <erlendbm at trustix dot com> 1.6.0-2em
-- Fix file conflict with glibc-devel.
+* Tue Jan  7 2003 Nalin Dahyabhai <nalin at redhat.com> 1.5.5-3
+- patch for compile errors with new ssl libs
+- rebuild
 
-* Thu Jan 23 2003 Erlend Midttun <erlendbm at trustix dot com> 1.6.0-1em
-- New version.
-- Cleanup.
+* Mon Dec 02 2002 Florian La Roche <Florian.LaRoche at redhat.de>
+- postun should never fail
 
-* Thu Nov 21 2002 Christian H. Toldnes <christht at trustix dot com> 1.5.3.1-3ct
-- Initscript now uses $INITLOCK
+* Thu Nov 28 2002 Phil Knirsch <pknirsch at redhat.com> 1.5.5-1
+- Updated to 1.5.5
 
-* Fri Oct  4 2002 Gerald Dachs <gda at trustix dot org> 1.5.3.1-2gd
-- removed /usr/bin/acleandir.rc, because we have no rc
+* Tue Jun 25 2002 Phil Knirsch <pknirsch at redhat.com> 1.5.3.1-4
+- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc] (#67243)
+- Fixed missing /usr/share/netatalk dir (#67222)
 
-* Mon Aug 26 2002 Gerald Dachs <gda at trustix dot org> 1.5.3.1-1gd
-- New upstream version: 1.5.3.1
-- fixed start script location
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 1.5.3.1-2
+- automated rebuild
 
-* Wed Sep 26 2001 Erlend Midttun <erlendbm at trustix dot com>
-- Moving the shared object files.
+* Tue Jun 18 2002 Phil Knirsch <pknirsch at redhat.com> 1.5.3.1-1
+- Updated to latest version 1.5.3.1.
+- Fixed bug for nls file lookup (#66300).
 
-* Thu Aug 23 2001 Erlend Midttun <erlendbm at trustix dot com>
-- New upstream version
+* Mon May 27 2002 Phil Knirsch <pknirsch at redhat.com> 1.5.2-4
+- Fixed initscript bug where you can't use blanks inside of names (#64926).
 
-* Wed Jun 13 2001 Oystein Viggen <oysteivi at trustix dot com>
-- Fix build problems with newer strip
+* Wed Apr 10 2002 Phil Knirsch <pknirsch at redhat.com> 1.5.2-3
+- Fixed initscript to use correct config files from /etc/atalk (#62803)
+- Changed initscript to use $0 instead of direct string (#61734)
+- Change Copyright to Licencse and switch from BSD to GPL (#61746)
 
-* Tue Mar 13 2001 Alexander Reelsen <ar at trustix dot com>
-- Picked up 1.5pre5
+* Thu Mar 14 2002 Bill Nottingham <notting at redhat.com>
+- don't run by default
 
-* Thu Jan 09 2001 Olaf Trygve Berglihn <olafb at trustix dot com>
-- Removed dependency on pam-devel and cracklib-devel, as these are
-  included in the main packages in TSL.
-- Fixed initscript to comply with TSL standards.
-- Removed additions to /etc/services as the TSL /etc/services already
-  has the necessary entries.
-- Added conditional restart with /sbin/restart_maybe.
+* Wed Mar 13 2002 Bill Nottingham <notting at redhat.com>
+- it's back 
 
-* Wed Nov 08 2000 rufus t firefly <rufus.t.firefly at linux-mandrake.com>
-  - v1.4.99-0.20001108mdk
-  - pre-release for sourceforge
+* Fri Mar  2 2001 Tim Powers <timp at redhat.com>
+- rebuilt against openssl-0.9.6-1
 
-* Wed Sep 27 2000 rufus t firefly <rufus.t.firefly at linux-mandrake.com>
-  - v1.4.99-0.20000927mdk
-  - pre-release for sourceforge
\ No newline at end of file
+* Sun Feb 25 2001 Tim Powers <timp at redhat.com>
+- fixed bug 29370. This package is trying to include a file glibc already includes
+
+* Tue Jan 23 2001 Tim Powers <timp at redhat.com>
+- updated initscript
+
+* Thu Jan 04 2001 Than Ngo <than at redhat.com>
+- fixed uams-path
+- added noreplace to %config
+
+* Mon Nov 20 2000 Tim Powers <timp at redhat.com>
+- rebuilt to fix bad dir perms
+
+* Fri Nov 10 2000 Than Ngo <than at redhat.com>
+- update to 1.5pre2 (bug #19737, #20397)
+- update Url and ftp site
+- clean up specfile
+- netatalk-1.4b2+asun obsolete
+
+* Mon Aug 07 2000 Than Ngo <than at redhat.de>
+- fix dependency with glibc-devel (Bug #15589)
+- fix typo in description (Bug #15479)
+
+* Wed Aug 2 2000 Tim Powers <timp at redhat.com>
+- fix symlinks not being relative.
+
+* Fri Jul 28 2000 Than Ngo <than at redhat.de>
+- add missing restart function in startup script
+
+* Fri Jul 28 2000 Tim Powers <timp at redhat.com>
+- fixed initscripts so that condrestart doesn't return 1 when the test fails
+
+* Mon Jul 24 2000 Prospector <prospector at redhat.com>
+- rebuilt
+
+* Sun Jul 23 2000 Tim Powers <timp at redhat.com>
+- rebuilt 
+
+* Mon Jul 17 2000 Tim Powers <timp at redhat.com>
+- inits back to rc.d/init.d, using service to start inits
+
+* Wed Jul 12 2000 Than Ngo <than at redhat.de>
+- rebuilt
+
+* Thu Jul 06 2000 Tim Powers <timp at redhat.com>
+- fixed broken PreReq, now PreReq's /etc/init.d
+
+* Tue Jun 27 2000 Than Ngo <than at redhat.de>
+- remove prereq initscripts, add requires initscripts
+- clean up specfile
+
+* Mon Jun 26 2000 Than Ngo <than at redhat.de>
+- /etc/rc.d/init.d -> /etc/init.d
+- add condrestart directive
+- fix post/preun/postun scripts
+- prereq initscripts >= 5.20
+
+* Tue Jun 20 2000 Tim Powers <timp at redhat.com>
+- fixed bug 11420 concerning the building with -O2.
+
+* Thu Jun 8 2000 Tim Powers <timp at redhat.com>
+- fix bug #11978 
+- fix man page locations to be FHS compliant
+
+* Thu Jun  1 2000 Nalin Dahyabhai <nalin at redhat.com>
+- modify PAM setup to use system-auth
+
+* Thu Dec 16 1999 Tim Powers <timp at redhat.com>
+- renewed source so it is pristine, delete the problematic files in spec file
+	instead
+- general spec file cleanups, create buildroot and dirs in the %%install
+	section
+- strip binaries
+- gzip man pages
+- fixed netatalk-asun.librpcsvc.patch, -lnss_nis too
+- changed group
+- added %defattr to %files section
+
+* Tue Aug 3 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+- rpm-3.0 needs to remove vogus files from source.
+  Removed files: etc/papd/.#magics.c, etc/.#diff
+* Fri Jul 30 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+- Change Copyright tag to BSD.
+  Add /usr/bin/adv1tov2.
+* Thu Apr 22 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+- Correct librpcsvc.patch.  Move %changelog section last.
+  Uncomment again -DNEED_QUOTA_WRAPPER in sys/linux/Makefile since
+  LinuxPPC may need.
+* Wed Mar 31 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+- Comment out -DNEED_QUOTA_WRAPPER in sys/linux/Makefile.
+* Sat Mar 20 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+- Correct symbolic links to psf.
+  Remove asciize function from nbplkup so as to display Japanese hostname.
+* Thu Mar 11 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+- Included MacPerl 5 script ICDumpSuffixMap which dumps suffix mapping
+  containd in Internet Config Preference.
+* Tue Mar 2 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+- [asun2.1.3]
+* Mon Feb 15 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+- [pre-asun2.1.2-8]
+* Sun Feb 7 1999 iNOUE Koich! <inoue at ma.ns.musashi-tech.ac.jp>
+- [pre-asun2.1.2-6]
+* Mon Jan 25 1999 iNOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- [pre-asun2.1.2-3]
+* Thu Dec 17 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- [pre-asun2.1.2]
+  Remove crlf patch. It is now a server's option.
+* Thu Dec 3 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use stable version source netatalk-1.4b2+asun2.1.1.tar.gz
+  Add uams directory
+* Sat Nov 28 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use pre-asun2.1.1-3 source.
+* Mon Nov 23 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use pre-asun2.1.1-2 source.
+* Mon Nov 16 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Fix rcX.d's symbolic links.
+* Wed Oct 28 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use pre-asun2.1.0a-2 source. Remove '%exclusiveos linux' line.
+* Sat Oct 24 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use stable version source netatalk-1.4b2+asun2.1.0.tar.gz.
+* Mon Oct 5 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use pre-asun2.1.0-10a source.
+* Thu Sep 19 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use pre-asun2.1.0-8 source. Add chkconfig support.
+* Sat Sep 12 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Comment out -DCRLF. Use RPM_OPT_FLAGS.
+* Mon Sep 8 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use pre-asun2.1.0-7 source. Rename atalk.init to atalk.
+* Mon Aug 22 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use pre-asun2.1.0-6 source.
+* Mon Jul 27 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use pre-asun2.1.0-5 source.
+* Tue Jul 21 1998 INOUE Koichi <inoue at ma.ns.musashi-techa.c.jp>
+- Use pre-asun2.1.0-3 source.
+* Tue Jul 7 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Add afpovertcp entries to /etc/services
+- Remove BuildRoot in man8 pages
+* Mon Jun 29 1998 INOUE Koichi <inoue at ma.ns.musashi-tech.ac.jp>
+- Use modified sources 1.4b2+asun2.1.0 produced by Adrian Sun
+  <asun at saul9.u.washington.edu> to provide an AppleShareIP file server
+- Included AppleVolumes.system file maintained by Johnson
+  <johnson at stpt.usf.edu>
+* Mon Aug 25 1997 David Gibson <D.Gibson at student.anu.edu.au>
+- Used a buildroot
+- Use RPM_OPT_FLAGS
+- Moved configuration parameters/files from atalk.init to /etc/atalk
+- Separated devel package
+- Built with shared libraries
+* Sun Jul 13 1997 Paul H. Hargrove <hargrove at sccm.Stanford.EDU>
+- Updated sources from 1.3.3 to 1.4b2
+- Included endian patch for Linux/SPARC
+- Use all the configuration files supplied in the source.  This has the
+  following advantages over the ones in the previous rpm release:
+	+ The printer 'lp' isn't automatically placed in papd.conf
+	+ The default file conversion is binary rather than text.
+- Automatically add and remove DDP services from /etc/services
+- Placed the recommended /etc/services in the documentation
+- Changed atalk.init to give daemons a soft kill
+- Changed atalk.init to make configuration easier
+
+* Wed May 28 1997 Mark Cornick <mcornick at zorak.gsfc.nasa.gov>
+Updated for /etc/pam.d


From svn at tinysofa.org  Mon Jun 28 17:55:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 03:55:51 +1000 (EST)
Subject: [tinysofa-svn] 
	r2420 - in tinysofa/releases/1.1/expat/current: sources specs
Message-ID: <20040628175551.ABDE14E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 03:55:51 +1000 (Tue, 29 Jun 2004)
New Revision: 2420

Added:
   tinysofa/releases/1.1/expat/current/sources/expat-malloc-failure.diff
Modified:
   tinysofa/releases/1.1/expat/current/specs/expat.spec
Log:
- use macros for directories
- run ldconfig
- add malloc patch from Fedora


Added: tinysofa/releases/1.1/expat/current/sources/expat-malloc-failure.diff
===================================================================
--- tinysofa/releases/1.1/expat/current/sources/expat-malloc-failure.diff	2004-06-28 17:36:51 UTC (rev 2419)
+++ tinysofa/releases/1.1/expat/current/sources/expat-malloc-failure.diff	2004-06-28 17:55:51 UTC (rev 2420)
@@ -0,0 +1,19 @@
+Index: lib/xmlparse.c
+===================================================================
+RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
+retrieving revision 1.134
+diff -p -u -r1.134 xmlparse.c
+--- lib/xmlparse.c	18 May 2004 13:50:13 -0000	1.134
++++ lib/xmlparse.c	27 May 2004 15:53:18 -0000
+@@ -5758,8 +5758,10 @@ lookup(HASH_TABLE *table, KEY name, size
+     table->size = (size_t)1 << INIT_POWER;
+     tsize = table->size * sizeof(NAMED *);
+     table->v = (NAMED **)table->mem->malloc_fcn(tsize);
+-    if (!table->v)
++    if (!table->v) {
++      table->size = 0;
+       return NULL;
++    }
+     memset(table->v, 0, tsize);
+     i = hash(name) & ((unsigned long)table->size - 1);
+   }

Modified: tinysofa/releases/1.1/expat/current/specs/expat.spec
===================================================================
--- tinysofa/releases/1.1/expat/current/specs/expat.spec	2004-06-28 17:36:51 UTC (rev 2419)
+++ tinysofa/releases/1.1/expat/current/specs/expat.spec	2004-06-28 17:55:51 UTC (rev 2420)
@@ -1,71 +1,89 @@
 Summary: Expat is an XML 1.0 parser written in C.
 Name: expat
 Version: 1.95.7
-Release: 13ts
-License: MIT
-Group: tinysofa official
+Release: 14jh
+License: BSD
+Group: tinysofa/main
 Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
 Patch: expat-1.95.7-xmlcall.patch
+Patch1: http://ridley.csbnet.se/patches/expat-malloc-failure.diff
 
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: %{name}-libs
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
-Expat is an XML 1.0 parser written in C by James Clark.  It aims to be
-fully conforming. It is not a validating XML parser.
+This is expat, the C library for parsing XML, written by James Clark. Expat
+is a stream oriented XML parser. This means that you register handlers with
+the parser prior to starting the parse. These handlers are called when the
+parser discovers the associated structures in the document being parsed. A
+start tag is an example of the kind of structures for which you may
+register handlers.
 
 %package libs
 Summary: XML runtime libraries
 Group: tinysofa official
 Provides: libexpat.so.1
-
+                                                                                
 %description libs
 The runtime XML libraries for expat
-
+                                                                                
 %package devel
 Summary: XML development libraries
 Group: tinysofa official
-
+Requires: expat-libs = %{version}-%{release}
+                                                                                
 %description devel
 The development XML libraries for expat
+
+
 %prep
-
 %setup -q
-%patch -p1
+%patch0 -p1 -b .xmlcall
+%patch1 -p0 -b .malloc
 
+
 %build
+export CFLAGS="%{optflags} -fPIC"
 %configure
-make
+%make
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-%makeinstall mandir=$RPM_BUILD_ROOT/%{_mandir}/man1
+%makeinstall mandir=%{buildroot}%{_mandir}/man1
 
-pushd $RPM_BUILD_ROOT/usr/lib
-	ln -s libexpat.so.0.5.0 libexpat.so.1
-popd
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %doc COPYING Changes MANIFEST README doc/reference.html doc/style.css doc/valid-xhtml10.png
-/usr/bin/xmlwf
-/usr/share/man/man1/xmlwf.1*
+%{_bindir}/xmlwf
+%{_mandir}/man1/xmlwf.1*
 
 %files libs
 %defattr(0755,root,root)
-/usr/lib/*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root)
-/usr/lib/*.so
-/usr/lib/*.la
-/usr/lib/*.a
-/usr/include/expat.h
+%{_libdir}/*.so
+%{_libdir}/*.la
+%{_libdir}/*.a
+%{_includedir}/expat.h
 
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+
 %changelog
+* Mon Jun 28 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.95.7-14jh
+- use macros for directories
+- run ldconfig
+- add malloc patch from Fedora
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.95.7-13ts
 - current (1.95.7-12ts) integrated as 1.95.7-13ts for release 1.0-U1
 
@@ -93,4 +111,4 @@
 
 * Thu Nov 27 2003 Chr. Toldnes <christht at trustix dot org> 1.95.7-1ct
 - Initial release for TSL
-- Based upon work by Fred L. Drake and Sean Reifschneider
\ No newline at end of file
+- Based upon work by Fred L. Drake and Sean Reifschneider


From svn at tinysofa.org  Mon Jun 28 17:58:42 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 03:58:42 +1000 (EST)
Subject: [tinysofa-svn] r2421 - tinysofa/releases/1.1/dev86/current/specs
Message-ID: <20040628175842.F41254E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 03:58:42 +1000 (Tue, 29 Jun 2004)
New Revision: 2421

Modified:
   tinysofa/releases/1.1/dev86/current/specs/dev86.spec
Log:
- use 1.1 macros and groups


Modified: tinysofa/releases/1.1/dev86/current/specs/dev86.spec
===================================================================
--- tinysofa/releases/1.1/dev86/current/specs/dev86.spec	2004-06-28 17:55:51 UTC (rev 2420)
+++ tinysofa/releases/1.1/dev86/current/specs/dev86.spec	2004-06-28 17:58:42 UTC (rev 2421)
@@ -3,9 +3,9 @@
 Version: 0.16.15
 Release: 1ts
 License: GPL
-Group: tinysofa official
+Group: tinysofa/development
 Source: http://www.cix.co.uk/~mayday/Dev86src-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: bin86
 ExclusiveArch: i386 i586
 
@@ -20,20 +20,21 @@
 You should install dev86 if you intend to build programs that run in real
 mode from their source code.
 
+
 %prep
 %setup -q
 
+
 %build
 make config CFLAGS="$RPM_OPT_FLAGS" << __EOF__
 5
 quit
 __EOF__
 
-make GCCFLAG="$RPM_OPT_FLAGS"
+%make GCCFLAG="$RPM_OPT_FLAGS"
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
-
 make DIST=${RPM_BUILD_ROOT} MANDIR=%{_mandir} install install-man
 
 # preserve READMEs
@@ -48,9 +49,11 @@
 ln -s objdump86 nm86
 ln -s objdump86 size86
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root,-)
 %doc README MAGIC Contributors README.bootblocks README.copt README.dis88


From svn at tinysofa.org  Mon Jun 28 17:59:51 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 03:59:51 +1000 (EST)
Subject: [tinysofa-svn] r2422 - tinysofa/releases/1.1/expat/current/specs
Message-ID: <20040628175951.563E94E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-29 03:59:51 +1000 (Tue, 29 Jun 2004)
New Revision: 2422

Modified:
   tinysofa/releases/1.1/expat/current/specs/expat.spec
Log:
- fix subpackage groups


Modified: tinysofa/releases/1.1/expat/current/specs/expat.spec
===================================================================
--- tinysofa/releases/1.1/expat/current/specs/expat.spec	2004-06-28 17:58:42 UTC (rev 2421)
+++ tinysofa/releases/1.1/expat/current/specs/expat.spec	2004-06-28 17:59:51 UTC (rev 2422)
@@ -21,7 +21,7 @@
 
 %package libs
 Summary: XML runtime libraries
-Group: tinysofa official
+Group: tinysofa/main
 Provides: libexpat.so.1
                                                                                 
 %description libs
@@ -29,7 +29,7 @@
                                                                                 
 %package devel
 Summary: XML development libraries
-Group: tinysofa official
+Group: tinysofa/development
 Requires: expat-libs = %{version}-%{release}
                                                                                 
 %description devel


From svn at tinysofa.org  Tue Jun 29 13:41:26 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 23:41:26 +1000 (EST)
Subject: [tinysofa-svn] 
	r2424 - in tinysofa/releases/1.0/apache/current: sources specs
Message-ID: <20040629134126.D714A4E8033@minbar.tinysofa.org>

Author: omar
Date: 2004-06-29 23:41:25 +1000 (Tue, 29 Jun 2004)
New Revision: 2424

Added:
   tinysofa/releases/1.0/apache/current/sources/apache-2.0.49-CAN-2004-0493.patch
Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
Log:
- Fix CAN #2004-0493.


Added: tinysofa/releases/1.0/apache/current/sources/apache-2.0.49-CAN-2004-0493.patch
===================================================================
--- tinysofa/releases/1.0/apache/current/sources/apache-2.0.49-CAN-2004-0493.patch	2004-06-28 21:03:55 UTC (rev 2423)
+++ tinysofa/releases/1.0/apache/current/sources/apache-2.0.49-CAN-2004-0493.patch	2004-06-29 13:41:25 UTC (rev 2424)
@@ -0,0 +1,32 @@
+Index: server/protocol.c
+===================================================================
+RCS file: /home/cvspublic/httpd-2.0/server/protocol.c,v
+retrieving revision 1.148
+diff -u -r1.148 protocol.c
+--- server/protocol.c	22 Apr 2004 22:38:03 -0000	1.148
++++ server/protocol.c	13 Jun 2004 19:47:36 -0000
+@@ -716,6 +716,23 @@
+                  * continuations that span many many lines.
+                  */
+                 apr_size_t fold_len = last_len + len + 1; /* trailing null */
++
++                if ((fold_len - 1) > r->server->limit_req_fieldsize) {
++                    r->status = HTTP_BAD_REQUEST;
++                    /* report what we have accumulated so far before the
++                     * overflow (last_field) as the field with the problem
++                     */
++                    apr_table_setn(r->notes, "error-notes",
++                                   apr_pstrcat(r->pool,
++                                               "Size of a request header field " 
++                                               "after folding "
++                                               "exceeds server limit.<br />\n"
++                                               "<pre>\n",
++                                               ap_escape_html(r->pool, last_field),
++                                               "</pre>\n", NULL));
++                    return;
++                }
++
+                 if (fold_len > alloc_len) {
+                     char *fold_buf;
+                     alloc_len += alloc_len;
+

Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-28 21:03:55 UTC (rev 2423)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-29 13:41:25 UTC (rev 2424)
@@ -11,6 +11,7 @@
 Patch0: apache_2.0.45-tinysofa.patch
 Patch1: httpd-2.0.49-CAN-2004-0488.patch
 Patch2: apache-2.0.49-active_directory.patch
+Patch3: apache-2.0.49-CAN-2004-0493.patch
 Source3: httpd.init
 Source4: httpd.log
 Source5: gendummycerts
@@ -131,6 +132,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
 
 %build
 CFLAGS=${RPM_OPT_FLAGS} ./configure \
@@ -402,6 +404,9 @@
 
 
 %changelog
+* Tue Jun 29 2004 Omar Kilani <omar at tinysofa dot org>
+- Add apache-2.0.49-CAN-2004-0493.patch to fix vuln CAN #2004-0493.
+
 * Thu Jun 24 2004 tsintegrate <release at tinysofa dot org> 2.0.49-13ts
 - current (2.0.49-12ts) integrated as 2.0.49-13ts for release 1.0-U2
 


From svn at tinysofa.org  Tue Jun 29 13:41:55 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 23:41:55 +1000 (EST)
Subject: [tinysofa-svn] 
	r2425 - in tinysofa/releases/1.0/apache: current/specs
	releases/2.0.49/13ts releases/2.0.49/13ts/current/specs
Message-ID: <20040629134155.DA8274E8033@minbar.tinysofa.org>

Author: omar
Date: 2004-06-29 23:41:55 +1000 (Tue, 29 Jun 2004)
New Revision: 2425

Added:
   tinysofa/releases/1.0/apache/releases/2.0.49/13ts/current/
Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
   tinysofa/releases/1.0/apache/releases/2.0.49/13ts/current/specs/apache.spec
Log:
apache:
  * integrate current (2.0.49-13ts) as releases/2.0.49/13ts

Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-29 13:41:25 UTC (rev 2424)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-29 13:41:55 UTC (rev 2425)
@@ -404,6 +404,9 @@
 
 
 %changelog
+* Tue Jun 29 2004 tsintegrate <release at tinysofa dot org> 2.0.49-13ts
+- current (2.0.49-13ts) integrated as 2.0.49-13ts for release 1.0-U2
+
 * Tue Jun 29 2004 Omar Kilani <omar at tinysofa dot org>
 - Add apache-2.0.49-CAN-2004-0493.patch to fix vuln CAN #2004-0493.
 

Copied: tinysofa/releases/1.0/apache/releases/2.0.49/13ts/current (from rev 2424, tinysofa/releases/1.0/apache/current)

Modified: tinysofa/releases/1.0/apache/releases/2.0.49/13ts/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-29 13:41:25 UTC (rev 2424)
+++ tinysofa/releases/1.0/apache/releases/2.0.49/13ts/current/specs/apache.spec	2004-06-29 13:41:55 UTC (rev 2425)
@@ -404,6 +404,9 @@
 
 
 %changelog
+* Tue Jun 29 2004 tsintegrate <release at tinysofa dot org> 2.0.49-13ts
+- current (2.0.49-13ts) integrated as 2.0.49-13ts for release 1.0-U2
+
 * Tue Jun 29 2004 Omar Kilani <omar at tinysofa dot org>
 - Add apache-2.0.49-CAN-2004-0493.patch to fix vuln CAN #2004-0493.
 


From svn at tinysofa.org  Tue Jun 29 13:43:25 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 23:43:25 +1000 (EST)
Subject: [tinysofa-svn] r2426 - tinysofa/releases/1.0/apache/current/specs
Message-ID: <20040629134325.F374F4E8033@minbar.tinysofa.org>

Author: omar
Date: 2004-06-29 23:43:25 +1000 (Tue, 29 Jun 2004)
New Revision: 2426

Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
Log:
apache:
  * integrate current (2.0.49-13ts) as releases/2.0.49/13ts

Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-29 13:41:55 UTC (rev 2425)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-29 13:43:25 UTC (rev 2426)
@@ -407,6 +407,9 @@
 * Tue Jun 29 2004 tsintegrate <release at tinysofa dot org> 2.0.49-13ts
 - current (2.0.49-13ts) integrated as 2.0.49-13ts for release 1.0-U2
 
+* Tue Jun 29 2004 tsintegrate <release at tinysofa dot org> 2.0.49-13ts
+- current (2.0.49-13ts) integrated as 2.0.49-13ts for release 1.0-U2
+
 * Tue Jun 29 2004 Omar Kilani <omar at tinysofa dot org>
 - Add apache-2.0.49-CAN-2004-0493.patch to fix vuln CAN #2004-0493.
 


From svn at tinysofa.org  Tue Jun 29 13:44:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 23:44:31 +1000 (EST)
Subject: [tinysofa-svn] r2427 - tinysofa/releases/1.0/apache/pristine
Message-ID: <20040629134431.E086B4E8033@minbar.tinysofa.org>

Author: omar
Date: 2004-06-29 23:44:31 +1000 (Tue, 29 Jun 2004)
New Revision: 2427

Removed:
   tinysofa/releases/1.0/apache/pristine/12ts/
   tinysofa/releases/1.0/apache/pristine/13ts/
Log:
- Clean up.



From svn at tinysofa.org  Tue Jun 29 13:44:59 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 23:44:59 +1000 (EST)
Subject: [tinysofa-svn] 
	r2428 - tinysofa/releases/1.0/apache/releases/2.0.49/13ts
Message-ID: <20040629134459.81F704E8033@minbar.tinysofa.org>

Author: omar
Date: 2004-06-29 23:44:59 +1000 (Tue, 29 Jun 2004)
New Revision: 2428

Removed:
   tinysofa/releases/1.0/apache/releases/2.0.49/13ts/current/
Log:
- Clean up.



From svn at tinysofa.org  Tue Jun 29 13:45:32 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 23:45:32 +1000 (EST)
Subject: [tinysofa-svn] r2429 - tinysofa/releases/1.0/apache/pristine/specs
Message-ID: <20040629134532.CFDD14E8033@minbar.tinysofa.org>

Author: omar
Date: 2004-06-29 23:45:32 +1000 (Tue, 29 Jun 2004)
New Revision: 2429

Modified:
   tinysofa/releases/1.0/apache/pristine/specs/apache.spec
Log:
- Clean up.


Modified: tinysofa/releases/1.0/apache/pristine/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/pristine/specs/apache.spec	2004-06-29 13:44:59 UTC (rev 2428)
+++ tinysofa/releases/1.0/apache/pristine/specs/apache.spec	2004-06-29 13:45:32 UTC (rev 2429)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 12ts
+Release: 13ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch


From svn at tinysofa.org  Tue Jun 29 13:46:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 23:46:37 +1000 (EST)
Subject: [tinysofa-svn] 
	r2430 - in tinysofa/releases/1.0/apache: current/specs
	releases/2.0.49 releases/2.0.49/14ts/specs
Message-ID: <20040629134637.AE49E4E8033@minbar.tinysofa.org>

Author: omar
Date: 2004-06-29 23:46:37 +1000 (Tue, 29 Jun 2004)
New Revision: 2430

Added:
   tinysofa/releases/1.0/apache/releases/2.0.49/14ts/
Modified:
   tinysofa/releases/1.0/apache/current/specs/apache.spec
   tinysofa/releases/1.0/apache/releases/2.0.49/14ts/specs/apache.spec
Log:
apache:
  * integrate current (2.0.49-13ts) as releases/2.0.49/14ts

Modified: tinysofa/releases/1.0/apache/current/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-29 13:45:32 UTC (rev 2429)
+++ tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-29 13:46:37 UTC (rev 2430)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 13ts
+Release: 14ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
@@ -404,6 +404,9 @@
 
 
 %changelog
+* Tue Jun 29 2004 tsintegrate <release at tinysofa dot org> 2.0.49-14ts
+- current (2.0.49-13ts) integrated as 2.0.49-14ts for release 1.0-U2
+
 * Tue Jun 29 2004 tsintegrate <release at tinysofa dot org> 2.0.49-13ts
 - current (2.0.49-13ts) integrated as 2.0.49-13ts for release 1.0-U2
 

Copied: tinysofa/releases/1.0/apache/releases/2.0.49/14ts (from rev 2429, tinysofa/releases/1.0/apache/current)

Modified: tinysofa/releases/1.0/apache/releases/2.0.49/14ts/specs/apache.spec
===================================================================
--- tinysofa/releases/1.0/apache/current/specs/apache.spec	2004-06-29 13:45:32 UTC (rev 2429)
+++ tinysofa/releases/1.0/apache/releases/2.0.49/14ts/specs/apache.spec	2004-06-29 13:46:37 UTC (rev 2430)
@@ -5,7 +5,7 @@
 %define version 2.0.49
 Version: %{version}
 %{expand: %%define apache_version %{version}}
-Release: 13ts
+Release: 14ts
 Group: tinysofa official
 Source0: http://httpd.apache.org/dist/httpd/httpd-%{apache_version}.tar.gz
 Patch0: apache_2.0.45-tinysofa.patch
@@ -404,6 +404,9 @@
 
 
 %changelog
+* Tue Jun 29 2004 tsintegrate <release at tinysofa dot org> 2.0.49-14ts
+- current (2.0.49-13ts) integrated as 2.0.49-14ts for release 1.0-U2
+
 * Tue Jun 29 2004 tsintegrate <release at tinysofa dot org> 2.0.49-13ts
 - current (2.0.49-13ts) integrated as 2.0.49-13ts for release 1.0-U2
 


From svn at tinysofa.org  Tue Jun 29 13:46:38 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 23:46:38 +1000 (EST)
Subject: [tinysofa-svn] r2431 - tinysofa/releases/1.0/apache
Message-ID: <20040629134638.BA3CA4E8033@minbar.tinysofa.org>

Author: omar
Date: 2004-06-29 23:46:38 +1000 (Tue, 29 Jun 2004)
New Revision: 2431

Removed:
   tinysofa/releases/1.0/apache/pristine/
Log:
apache:
  * removing pristine (2.0.49-13ts)


From svn at tinysofa.org  Tue Jun 29 13:46:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Tue, 29 Jun 2004 23:46:41 +1000 (EST)
Subject: [tinysofa-svn] r2432 - tinysofa/releases/1.0/apache
Message-ID: <20040629134641.B302A4E8033@minbar.tinysofa.org>

Author: omar
Date: 2004-06-29 23:46:41 +1000 (Tue, 29 Jun 2004)
New Revision: 2432

Added:
   tinysofa/releases/1.0/apache/pristine/
Log:
apache:
  * retarget pristine (2.0.49-13ts) to releases/2.0.49/14ts

Copied: tinysofa/releases/1.0/apache/pristine (from rev 2430, tinysofa/releases/1.0/apache/releases/2.0.49/14ts)


From svn at tinysofa.org  Tue Jun 29 14:07:52 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 00:07:52 +1000 (EST)
Subject: [tinysofa-svn] 
	r2433 - in tinysofa/releases/1.1/bind/current: sources specs
Message-ID: <20040629140752.864054E8033@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 00:07:51 +1000 (Wed, 30 Jun 2004)
New Revision: 2433

Removed:
   tinysofa/releases/1.1/bind/current/sources/libtool.bz2
   tinysofa/releases/1.1/bind/current/sources/libtool.m4.bz2
Modified:
   tinysofa/releases/1.1/bind/current/specs/bind.spec
Log:
- cleanups


Deleted: tinysofa/releases/1.1/bind/current/sources/libtool.bz2
===================================================================
(Binary files differ)

Deleted: tinysofa/releases/1.1/bind/current/sources/libtool.m4.bz2
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.1/bind/current/specs/bind.spec
===================================================================
--- tinysofa/releases/1.1/bind/current/specs/bind.spec	2004-06-29 13:46:41 UTC (rev 2432)
+++ tinysofa/releases/1.1/bind/current/specs/bind.spec	2004-06-29 14:07:51 UTC (rev 2433)
@@ -21,8 +21,6 @@
 #Source8: named.sysconfig
 Source9: named.ca
 Source10: named.local
-Source11: libtool.bz2
-Source12: libtool.m4.bz2
 Source18: named.init
 Patch: %{name}-9.1.1-key.patch
 Patch1: %{name}-9.2.0.varrun.patch
@@ -44,13 +42,9 @@
 Prereq: bind-libs = %{epoch}:%{version}
 %accountman_requires
 %service_requires
-BuildRequires: /usr/bin/perl
-BuildRequires: binutils
-BuildRequires: gcc
-BuildRequires: glibc-devel
+BuildRequires: /usr/bin/perl binutils gcc glibc-devel automake gcc-c++-runtime
+BuildRequires: openssl-devel >= 0.9.7 make libtool autoconf
 #BuildRequires: glibc-iconv
-BuildRequires: make
-BuildRequires: openssl-devel >= 0.9.7
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: bind-chroot
 
@@ -188,21 +182,9 @@
 %patch2 -p1 -b .SO_BSDCOMPAT
 
 %build
-[ -n "$CDPATH" ] && unset CDPATH
-# I give up. I spent two or three days trying to fix the "relink at install
-# time". bind was relinking libissc, libdns and libisccfg with the installed
-# ones (older ones), which means the build was broken if bind < 9.2.3 was
-# installed during build time. libdns.so.11.0.2 (the new one from 9.2.3),
-# for example, was being linked with libisc.so.4 (the installed one from 9.2.2)
-# and libisc.so.7 (the correct one, from bind-9.2.3). This happened during
-# make install.
-# These two libtool files come directly from libtool-1.5.2 which I downloaded
-# and built locally and now inserted in this bind package. I suppose we won't
-# need this hack anymore when we upgrade our system libtool.
-bzcat %{_sourcedir}/libtool.bz2 > libtool
-bzcat %{_sourcedir}/libtool.m4.bz2 > libtool.m4
-cp -f libtool lib/bind/
-cp -f libtool.m4 lib/bind/
+libtoolize --copy --force
+aclocal
+autoconf
 
 %configure \
 	--with-openssl=/usr \
@@ -210,12 +192,6 @@
 	--enable-ipv6 \
 	--enable-threads
 
-# configure destroys it
-bzcat %{_sourcedir}/libtool.bz2 > libtool
-bzcat %{_sourcedir}/libtool.m4.bz2 > libtool.m4
-cp -f libtool lib/bind/
-cp -f libtool.m4 lib/bind/
-
 %make
 
 
@@ -309,10 +285,6 @@
 		touch %{jail}%{_sysconfdir}/named.conf
 		cat %{_sysconfdir}/named.boot | %{_sbindir}/named-bootconf \
 			> %{_sysconfdir}/named.conf
-# We don't need to change this here, since we will move this file
-# right down there, can you see?
-#		chmod 640 %{_sysconfdir}/named.conf
-#		chown root.named %{_sysconfdir}/named.conf
 	fi
 fi
 if [ -f %{_sysconfdir}/named.conf -a ! -f %{jail}%{_sysconfdir}/named.conf ]; then


From svn at tinysofa.org  Tue Jun 29 15:19:09 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 01:19:09 +1000 (EST)
Subject: [tinysofa-svn] 
	r2434 - in tinysofa/releases/1.1/pump/current: sources specs
Message-ID: <20040629151909.EC6BB4E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 01:19:09 +1000 (Wed, 30 Jun 2004)
New Revision: 2434

Removed:
   tinysofa/releases/1.1/pump/current/sources/pump-0.8.19-slang.patch
Modified:
   tinysofa/releases/1.1/pump/current/specs/pump.spec
Log:
- new Fedora based pump package


Deleted: tinysofa/releases/1.1/pump/current/sources/pump-0.8.19-slang.patch
===================================================================
--- tinysofa/releases/1.1/pump/current/sources/pump-0.8.19-slang.patch	2004-06-29 14:07:51 UTC (rev 2433)
+++ tinysofa/releases/1.1/pump/current/sources/pump-0.8.19-slang.patch	2004-06-29 15:19:09 UTC (rev 2434)
@@ -1,11 +0,0 @@
-diff -urN pump-0.8.19/Makefile pump-0.8.19.slang/Makefile
---- pump-0.8.19/Makefile	2003-08-15 03:54:02.000000000 +0000
-+++ pump-0.8.19.slang/Makefile	2004-05-12 01:58:39.000000000 +0000
-@@ -21,7 +21,7 @@
- pump:	pump.o config.o libpump.a(dhcp.o)
- 
- netconfig:	net.o libpump.a(dhcp.o) po
--	$(CC) -o netconfig net.o libpump.a $(LOADLIBES) -lnewt
-+	$(CC) -o netconfig net.o libpump.a $(LOADLIBES) -lnewt -lslang
- 
- pump.o: pump.c pump.h

Modified: tinysofa/releases/1.1/pump/current/specs/pump.spec
===================================================================
--- tinysofa/releases/1.1/pump/current/specs/pump.spec	2004-06-29 14:07:51 UTC (rev 2433)
+++ tinysofa/releases/1.1/pump/current/specs/pump.spec	2004-06-29 15:19:09 UTC (rev 2434)
@@ -1,99 +1,186 @@
 Summary: A Bootp and DHCP client for automatic IP configuration.
 Name: pump
 Version: 0.8.20
-Release: 1ts
-Group: tinysofa official
+Release: 2jh
+Group: tinysofa/main
 License: MIT
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: pump-%{version}.tar.gz
-Patch: pump-0.8.19-slang.patch
-Obsoletes: bootpc netconfig
+Obsoletes: bootpc
+BuildRequires: newt-devel slang-devel
 Requires: initscripts >= 3.92
 
-BuildRequires: newt-devel slang-devel gettext
-
 %description
 DHCP (Dynamic Host Configuration Protocol) and BOOTP (Boot Protocol)
 are protocols which allow individual devices on an IP network to get
 their own network configuration information (IP address, subnetmask,
-broadcast address, etc.) from network servers.  The overall purpose of
+broadcast address, etc.) from network servers. The overall purpose of
 DHCP and BOOTP is to make it easier to administer a large network.
 
 Pump is a combined BOOTP and DHCP client daemon, which allows your
-machine to retrieve configuration information from a server.  You
+machine to retrieve configuration information from a server. You
 should install this package if you are on a network which uses BOOTP
 or DHCP.
 
 %package devel
-Summary: Development tools for sending dhcp requests
-Group: tinysofa official
+Summary: Development tools for sending DHCP and BOOTP requests.
+Group: tinysofa/development
 
 %description devel
 The pump-devel package provides system developers the ability to send
-bootp and dhcp requests from their programs.
+BOOTP and DHCP requests from their programs. BOOTP and DHCP are
+protocols used to provide network configuration information to
+networked machines.
 
+%package -n netconfig
+Group: tinysofa/main
+Summary: A text-based tool for simple configuration of ethernet devices.
+Conflicts: pump < 0.8.20-2
+
+%description -n netconfig
+A text-based tool for simple configuration of ethernet devices.
+
+
 %prep
 %setup -q
-%patch -p1
 
+
 %build
-export RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//' |\
-			sed -e 's/-D_LARGE_FILES=1//' |\
-			sed -e 's/-D_LARGEFILE64_SOURCE=1//'` %{?no_stack_protector}"
-LDFLAGS="-lslang" make
+%make
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-export RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//' |\
-			sed -e 's/-D_LARGE_FILES=1//' |\
-			sed -e 's/-D_LARGEFILE64_SOURCE=1//'` %{?no_stack_protector}"
-
 %makeinstall RPM_BUILD_ROOT=$RPM_BUILD_ROOT
 
 %find_lang %{name}
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
-%files -f %{name}.lang
+
+%files
 %defattr(-,root,root)
-%{_sbindir}/*
 /sbin/pump
-%{_mandir}/*/*
+%{_mandir}/man8/pump.8*
 
 %files devel
 %defattr(-,root,root)
-%attr(644,root,root) %{_libdir}/libpump.a
+%{_libdir}/libpump.a
 %{_includedir}/pump.h
 
+%files -n netconfig -f %{name}.lang
+%defattr(-,root,root)
+%{_sbindir}/netconfig
+
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 0.8.20-1ts
-- current (0.8.20-1ok) integrated as 0.8.20-1ts for release 1.0-U1
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed May 12 2004 Omar Kilani <omar at tinysofa dot org> 0.8.19-4ts
-- Add BuildRequres newt-devel gettext.
-- Add Patch to link slang.
-- Fix perms on libpump.a
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Tue Feb 17 2004 Chr. Toldnes <christht at trustix dot org> 0.8.19-3tr
-- build without stack protector
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Dec 17 2003 Erlend Midttun <erlendbm at trustix dot org> 0.8.19-2tr
-- New optflags.
+* Tue Jan  6 2004 Jeremy Katz <katzj at redhat.com> 0.8.20-1
+- rebuild with vendor class id patch (#78843)
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 0.8.11-3tr
-- Big rebuild
+* Thu Aug 14 2003 Bill Nottingham <notting at redhat.com> 0.8.19-1
+- translations
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 0.8.11-2em
-- Rebuilt against glibc 2.3.2.
+* Wed Aug 13 2003 Bill Nottingham <notting at redhat.com> 0.8.18-1
+- add --hwaddr and --desc options to netconfig
 
-* Tue Jun  5 2001 Oystein Viggen <oysteivi at trustix dot com>
-- New upstream version: 0.8.11
-- Fix Group for -devel package
+* Fri Aug 01 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- set hopcount (ip_ttl) from 0 to 16
 
-* Mon Feb 26 2001 Oystein Viggen <oysteivi at trustix dot com>
-- Add to TSL
+* Tue Mar 11 2003 Jeremy Katz <katzj at redhat.com> 0.8.15-2
+- rebuild
 
+* Tue Mar 11 2003 Jeremy Katz <katzj at redhat.com> 0.8.15-1
+- add mtu and ptpaddr fields for s390 
+
+* Tue Feb 11 2003 Bill Nottingham <notting at redhat.com> 0.8.14-2
+- rebuild
+
+* Wed Dec 11 2002 Elliot Lee <sopwith at redhat.com> 0.8.14-1
+- Remove unpackaged files
+
+* Fri Oct  4 2002 Jeremy Katz <katzj at redhat.com>
+- build with -fPIC
+
+* Fri Oct  4 2002 Jeremy Katz <katzj at redhat.com>
+- link against libpopt.a in %%{_libdir}
+
+* Thu Aug 15 2002 Bill Nottingham <notting at redhat.com>
+- rebuild against new newt
+
+* Thu Jun 27 2002 Bill Nottingham <notting at redhat.com>
+- don't ship main package
+
+* Tue Jun 18 2002 Bill Nottingham <notting at redhat.com>
+- sync patches and CVS
+- rebuild against new slang
+- don't strip binaries
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Sun Aug 26 2001 Elliot Lee <sopwith at redhat.com>
+- Fix one half #17724
+
+* Wed Jul 25 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+- Don't obsolete netconfig, it's now separate again
+
+* Tue Jul 24 2001 Elliot Lee <sopwith at redhat.com>
+- Fix installer segfaults with nobootp patch.
+
+* Mon Jul 23 2001 Trond Eivind Glomsr?d <teg at redhat.com>
+- split out netconfig to a package of its own
+
+* Thu Jul 19 2001 Elliot Lee <sopwith at redhat.com>
+- Patch from bugs #19501, #19502, #21088, etc.
+
+* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
+- Bump release + rebuild.
+
+* Thu Mar  1 2001 Bill Nottingham <notting at redhat.com>
+- make netconfig much more sane (#30008, in essence)
+
+* Tue Feb 27 2001 Erik Troan <ewt at redhat.com>
+- applied patch to use SO_BINDTODEVICE properly (weejock at ferret.lmh.ox.ac.uk)
+
+* Mon Feb 12 2001 Bill Nottingham <notting at redhat.com>
+- run ifup-post on lease renewal
+
+* Thu Feb 01 2001 Erik Troan <ewt at redhat.com>
+- update secs field properly
+- don't reset interface flags we don't understand
+- added --win-client-id flag
+- cleaned up packet creation a bit
+- added --no-gateway
+
+* Tue Jan  9 2001 Matt Wilson <msw at redhat.com>
+- always set the src address of the broadcast to 0.0.0.0
+
+* Mon Nov 20 2000 Erik Troan <ewt at redhat.com>
+- lo device needs to have it's network route added 
+
+* Fri Nov 10 2000 Bill Nottingham <notting at redhat.com>
+- don't pass a random length to accept()
+
+* Mon Oct 23 2000 Erik Troan <ewt at redhat.com>
+- up scripts called for first interface information, and called even if pump
+  failed
+
+* Wed Aug 30 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix up the "search" entry scan so it works in Europe...
+
 * Wed Aug 16 2000 Matt Wilson <msw at redhat.com>
 - added a strerror(errno) to the "unable to set default route" syslog
 
@@ -131,6 +218,7 @@
 
 * Wed Feb 23 2000 Erik Troan <ewt at redhat.com>
 - fixed # parsing (aaron at schrab.com)
+
 * Tue Feb 15 2000 Erik Troan <ewt at redhat.com>
 - added script argument (Guy Delamarter <delamart at pas.rochester.edu>)
 - fixed bug in hostname passing (H.J. Lu)
@@ -210,4 +298,4 @@
 - it was always requesting a 20 second lease
 
 * Mon Mar 22 1999 Michael K. Johnson <johnsonm at redhat.com>
-- added minimal man page /usr/man/man8/pump.8
\ No newline at end of file
+- added minimal man page /usr/man/man8/pump.8


From svn at tinysofa.org  Tue Jun 29 15:53:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 01:53:28 +1000 (EST)
Subject: [tinysofa-svn] r2436 - tinysofa/releases/1.1/pump/current/specs
Message-ID: <20040629155328.762064E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 01:53:28 +1000 (Wed, 30 Jun 2004)
New Revision: 2436

Modified:
   tinysofa/releases/1.1/pump/current/specs/pump.spec
Log:
- add BuildRequires: gettext


Modified: tinysofa/releases/1.1/pump/current/specs/pump.spec
===================================================================
--- tinysofa/releases/1.1/pump/current/specs/pump.spec	2004-06-29 15:21:36 UTC (rev 2435)
+++ tinysofa/releases/1.1/pump/current/specs/pump.spec	2004-06-29 15:53:28 UTC (rev 2436)
@@ -7,7 +7,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: pump-%{version}.tar.gz
 Obsoletes: bootpc
-BuildRequires: newt-devel slang-devel
+BuildRequires: newt-devel slang-devel gettext
 Requires: initscripts >= 3.92
 
 %description


From svn at tinysofa.org  Tue Jun 29 16:30:41 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 02:30:41 +1000 (EST)
Subject: [tinysofa-svn] 
	r2437 - in tinysofa/snapshot/freeswan/current: sources specs
Message-ID: <20040629163041.102074E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 02:30:40 +1000 (Wed, 30 Jun 2004)
New Revision: 2437

Added:
   tinysofa/snapshot/freeswan/current/sources/x509-1.6.1-freeswan-2.05.tar.gz
Removed:
   tinysofa/snapshot/freeswan/current/sources/x509-1.5.4-freeswan-2.05.tar.gz
Modified:
   tinysofa/snapshot/freeswan/current/specs/freeswan.spec
Log:
- update x509 patch to fix security problems (CAN-2004-0590)


Deleted: tinysofa/snapshot/freeswan/current/sources/x509-1.5.4-freeswan-2.05.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/snapshot/freeswan/current/sources/x509-1.6.1-freeswan-2.05.tar.gz
===================================================================
(Binary files differ)


Property changes on: tinysofa/snapshot/freeswan/current/sources/x509-1.6.1-freeswan-2.05.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/snapshot/freeswan/current/specs/freeswan.spec
===================================================================
--- tinysofa/snapshot/freeswan/current/specs/freeswan.spec	2004-06-29 15:53:28 UTC (rev 2436)
+++ tinysofa/snapshot/freeswan/current/specs/freeswan.spec	2004-06-29 16:30:40 UTC (rev 2437)
@@ -1,12 +1,12 @@
 Summary: A free ipsec VPN solution for Linux
 Name: freeswan
 Version: 2.05
-Release: 3ts
+Release: 4jh
 License: GPL
 Group: tinysofa official
 URL: http://www.freeswan.org
 # The version of the X509 patch
-%define x509version 1.5.4
+%define x509version 1.6.1
 Source0: ftp://ftp.xs4all.nl/pub/crypto/freeswan/freeswan-%{version}.tar.gz
 Source1: freeswan-1.9.secrets.proto
 Source3: http://www.strongsec.com/freeswan/x509-%{x509version}-freeswan-%{version}.tar.gz
@@ -121,6 +121,9 @@
 /etc/ipsec.d
 
 %changelog
+* Tue Jun 29 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.05-4jh
+- update x509 patch to fix security problems (CAN-2004-0590)
+
 * Mon May 24 2004 tsintegrate <release at tinysofa dot org> 2.05-3ts
 - current (2.05-3jh) integrated as 2.05-3ts for release 1.0-U1
 


From svn at tinysofa.org  Tue Jun 29 16:55:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 02:55:37 +1000 (EST)
Subject: [tinysofa-svn] r2438 - tinysofa/releases/1.0/freeswan
Message-ID: <20040629165537.C1AAC4E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 02:55:37 +1000 (Wed, 30 Jun 2004)
New Revision: 2438

Removed:
   tinysofa/releases/1.0/freeswan/current/
Log:
remove freeswan current


From svn at tinysofa.org  Tue Jun 29 16:56:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 02:56:31 +1000 (EST)
Subject: [tinysofa-svn] r2439 - tinysofa/releases/1.0/freeswan
Message-ID: <20040629165631.F389C4E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 02:56:31 +1000 (Wed, 30 Jun 2004)
New Revision: 2439

Added:
   tinysofa/releases/1.0/freeswan/current/
Log:
copy freeswan current from snapshot

Copied: tinysofa/releases/1.0/freeswan/current (from rev 2438, tinysofa/snapshot/freeswan/current)


From svn at tinysofa.org  Tue Jun 29 17:55:24 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 03:55:24 +1000 (EST)
Subject: [tinysofa-svn] 
	r2440 - in tinysofa/releases/1.1/ncurses/current: sources specs
Message-ID: <20040629175524.A8FC44E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 03:55:24 +1000 (Wed, 30 Jun 2004)
New Revision: 2440

Added:
   tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.2-nocbt.patch
   tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.2-rxvt.patch
   tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.4.tar.bz2
   tinysofa/releases/1.1/ncurses/current/sources/ncurses-linux
   tinysofa/releases/1.1/ncurses/current/sources/ncurses-linux-m
Removed:
   tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.4.tar.gz
Modified:
   tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.4-color_xterm.patch
   tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec
Log:
- new Fedora based wide character capable ncurses package


Added: tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.2-nocbt.patch
===================================================================
--- tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.2-nocbt.patch	2004-06-29 16:56:31 UTC (rev 2439)
+++ tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.2-nocbt.patch	2004-06-29 17:55:24 UTC (rev 2440)
@@ -0,0 +1,10 @@
+--- ncurses-5.2/misc/terminfo.src.cbt	Mon Apr  8 16:02:17 2002
++++ ncurses-5.2/misc/terminfo.src	Mon Apr  8 16:03:09 2002
+@@ -2669,7 +2669,6 @@
+ 	bel=^G,
+ 	blink=\E[5m,
+ 	bold=\E[1m,
+-	cbt=\E[Z,
+ 	civis=\E[?25l,
+ 	clear=\E[H\E[2J,
+ 	cnorm=\E[?25h,

Added: tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.2-rxvt.patch
===================================================================
--- tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.2-rxvt.patch	2004-06-29 16:56:31 UTC (rev 2439)
+++ tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.2-rxvt.patch	2004-06-29 17:55:24 UTC (rev 2440)
@@ -0,0 +1,11 @@
+--- ncurses-5.2/misc/terminfo.src.rxvt	Thu Feb 22 12:14:11 2001
++++ ncurses-5.2/misc/terminfo.src	Thu Feb 22 12:14:20 2001
+@@ -3248,7 +3248,7 @@
+ 	il=\E[%p1%dL, il1=\E[L, ind=^J, is1=\E[?47l\E=\E[?1l, 
+ 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, 
+ 	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kLFT=\E[d, kNXT=\E[6$, 
+-	kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy, kb2=\EOu, kbs=^H, 
++	kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy, kb2=\EOu, kbs=^?, 
+ 	kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, 
+ 	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^, 
+ 	kend=\E[8~, kent=\EOM, kf1=\E[11~, kf10=\E[21~, 

Modified: tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.4-color_xterm.patch
===================================================================
--- tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.4-color_xterm.patch	2004-06-29 16:56:31 UTC (rev 2439)
+++ tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.4-color_xterm.patch	2004-06-29 17:55:24 UTC (rev 2440)
@@ -1,12 +1,17 @@
---- ncurses-5.4/misc/terminfo.src.color_xterm	2004-01-17 20:37:18.000000000 -0500
-+++ ncurses-5.4/misc/terminfo.src	2004-02-26 14:44:33.000000000 -0500
-@@ -3023,8 +3023,7 @@
+--- ncurses-5.4/misc/terminfo.src.rh-xterm	2004-01-18 02:37:18.000000000 +0100
++++ ncurses-5.4/misc/terminfo.src	2004-05-26 21:34:43.447721168 +0200
+@@ -3021,10 +3021,12 @@
+ xterm-24|vs100|xterms|xterm terminal emulator (X Window System), 
+ 	lines#24, use=xterm-r6, 
  
++xterm-redhat|RedHat xterm,
++	kbs=\177, khome=\E[1~, kend=\E[4~, use=xterm-xfree86,
++
  # This is xterm for ncurses.
  xterm|xterm terminal emulator (X Window System), 
 -	use=xterm-r6, 
 -#	use=xterm-xfree86, 
-+	bce, msgr, use=gnome-rh80, 
++	use=xterm-redhat, 
  
  # These entries allow access to the X titlebar and icon name as a status line. 
  # Note that twm (and possibly window managers descended from it such as tvtwm, 

Added: tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.4.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.4.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.1/ncurses/current/sources/ncurses-5.4.tar.gz
===================================================================
(Binary files differ)

Added: tinysofa/releases/1.1/ncurses/current/sources/ncurses-linux
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/ncurses/current/sources/ncurses-linux
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tinysofa/releases/1.1/ncurses/current/sources/ncurses-linux-m
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/ncurses/current/sources/ncurses-linux-m
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec
===================================================================
--- tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec	2004-06-29 16:56:31 UTC (rev 2439)
+++ tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec	2004-06-29 17:55:24 UTC (rev 2440)
@@ -1,25 +1,32 @@
 Summary: A CRT screen handling and optimization package.
 Name: ncurses
 Version: 5.4
-Release: 3ts
+%define includedirw %{_includedir}/ncursesw
+Release: 7ts
 License: distributable
-Group: tinysofa official
-Source0: ftp://ftp.gnu.org/gnu/ncurses/ncurses-%{version}.tar.gz
-Source1: ncurses-resetall.sh
-Patch1: ncurses-5.4-color_xterm.patch
+Group: tinysofa/main
+URL: http://dickey.his.com/ncurses/ncurses.html
+Source0: ftp://dickey.his.com/ncurses/ncurses-%{version}.tar.bz2
+Source2: ncurses-linux
+Source3: ncurses-linux-m
+Source4: ncurses-resetall.sh
+Patch10: ncurses-5.4-color_xterm.patch
+Patch11: ncurses-5.2-rxvt.patch
+Patch12: ncurses-5.2-nocbt.patch
+BuildRequires: sharutils
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-BuildRoot: %{_tmppath}/%{name}-root
-
 %description
 The curses library routines are a terminal-independent method of
 updating character screens with reasonable optimization.  The ncurses
 (new curses) library is a freely distributable replacement for the
-discontinued 4.4BSD classic curses library.
+discontinued 4.4 BSD classic curses library.
 
 %package devel
-Summary: The development files for applications which use ncurses.
-Group: tinysofa official
+Summary: The development files for applications that use ncurses.
+Group: Development/Libraries
 Requires: ncurses = %{PACKAGE_VERSION}
+Obsoletes: ncurses-c++-devel
 
 %description devel
 The header files and libraries for developing applications that use
@@ -28,138 +35,378 @@
 Install the ncurses-devel package if you want to develop applications
 which will use ncurses.
 
+Use the following compiler flags to build against the ncurses library:
+
+-lncurses
+(compile and link against the regular ncurses library)
+
+-I %{includedirw} -lncursesw
+(compile and link against the wide-character, UTF-8, library)
+
+
 %prep
 %setup -q
-%patch1 -p1 -b .color_xterm
-find . -name "*.orig" -exec rm -f {} \;
+%patch10 -p1 -b .color_xterm
 
+
 %build
-CFLAGS="$RPM_OPT_FLAGS -DPURE_TERMINFO -DSVR4_CURSES" ./configure \
-	--with-install-prefix=$RPM_BUILD_ROOT \
-	--libdir=/lib \
-	--with-normal \
+CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES"
+%define optflags $CFLAGS
+
+#WITH_GPM="--with-gpm"
+
+mkdir narrowc widec
+cd narrowc
+ln -s ../configure .
+%configure \
 	--with-shared \
-	--without-debug \
-	--without-profile \
-	--without-cxx \
+	--with-cxx \
 	--without-ada \
+	--with-ospeed=unsigned \
+	$WITH_GPM \
 	--enable-sigwinch \
 	--enable-hard-tabs \
+	--enable-xmc-glitch \
 	--enable-colorfgbg \
-	--mandir=%{_mandir}
-make
+	--with-install-prefix=${RPM_BUILD_ROOT} \
+	--libdir=/%{_lib}
 
+%make
+
+cd ../widec
+ln -s ../configure .
+%configure \
+	--with-shared \
+	--with-cxx \
+	--without-ada \
+	--with-ospeed=unsigned \
+	$WITH_GPM \
+	--enable-sigwinch \
+	--enable-hard-tabs \
+	--enable-xmc-glitch \
+	--enable-colorfgbg \
+	--enable-widec \
+	--with-install-prefix=${RPM_BUILD_ROOT} \
+	--libdir=/%{_lib}
+
+%make
+cd ..
+
 %install
-rm -rf $RPM_BUILD_ROOT
-make install includedir=/usr/include/ncurses
-ln -s ../l/linux $RPM_BUILD_ROOT/usr/share/terminfo/c/console
-ln -s ncurses/curses.h $RPM_BUILD_ROOT/usr/include/ncurses.h
-for I in curses unctrl eti form menu panel term; do
-	ln -sf ncurses/$I.h $RPM_BUILD_ROOT/usr/include/$I.h
+%{__mkdir_p} \
+	${RPM_BUILD_ROOT}%{_libdir} \
+	${RPM_BUILD_ROOT}%{_datadir} \
+	${RPM_BUILD_ROOT}%{_includedir}
+
+cd widec
+make install includedir=%{_includedir}/ncurses
+mkdir -p ${RPM_BUILD_ROOT}%{includedirw}
+mv ${RPM_BUILD_ROOT}%{_includedir}/ncurses/* ${RPM_BUILD_ROOT}%{includedirw}
+cd ../narrowc
+make install includedir=%{_includedir}/ncurses
+cd ..
+
+ln -s %{_datadir}/terminfo/l/linux ${RPM_BUILD_ROOT}%{_datadir}/terminfo/c/console
+ln -s %{_includedir}/ncurses/curses.h ${RPM_BUILD_ROOT}%{_includedir}/ncurses.h
+
+for header in curses.h unctrl.h eti.h form.h menu.h panel.h term.h
+   do ln -sf ncurses/${header} ${RPM_BUILD_ROOT}%{_includedir}/${header}
 done
 
+ln -sf libncurses.a ${RPM_BUILD_ROOT}%{_libdir}/libcurses.a
+ln -sf libncursesw.a ${RPM_BUILD_ROOT}%{_libdir}/libcursesw.a
+
 # We want to link stuff in /bin against ncurses, but we do not need to compile
 # things without /usr mounted.
-[ -d $RPM_BUILD_ROOT/usr/lib/ ] || mkdir $RPM_BUILD_ROOT/usr/lib/
-ln -sf /lib/libform.so.5 $RPM_BUILD_ROOT/usr/lib/libform.so
-ln -sf /lib/libmenu.so.5 $RPM_BUILD_ROOT/usr/lib/libmenu.so
-ln -sf /lib/libncurses.so.5 $RPM_BUILD_ROOT/usr/lib/libncurses.so
-ln -sf /lib/libpanel.so.5 $RPM_BUILD_ROOT/usr/lib/libpanel.so
-ln -sf /lib/libncurses.so.5 $RPM_BUILD_ROOT/usr/lib/libcurses.so
+%{__mkdir_p} %{buildroot}%{_libdir}
+for n in form menu ncurses panel; do
+	ln -sf /%{_lib}/lib${n}.so.? %{buildroot}%{_libdir}/lib${n}.so
+done
+mv %{buildroot}/%{_lib}/*.a %{buildroot}%{_libdir}
 
-mv $RPM_BUILD_ROOT/lib/*.a $RPM_BUILD_ROOT/usr/lib/
+%ifarch sparc
+install -c -m644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux
+install -c -m644 %SOURCE3 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux-m
+%endif
 
-strip $RPM_BUILD_ROOT/usr/bin/* || :
-make clean -C test
+install -c -m 755 %SOURCE4 ${RPM_BUILD_ROOT}%{_bindir}/resetall
 
-# the resetall script
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/bin/resetall
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/key_defined.3x.20030517*
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/panel.3x.20030517*
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README ANNOUNCE
-%attr(755,root,root) /lib/lib*.so.*
-/usr/share/terminfo
-/usr/share/tabset
-/usr/bin/*
-/usr/share/man/man1/*
-/usr/share/man/man5/*
-/usr/share/man/man7/*
+%doc README ANNOUNCE doc/html/announce.html
+%attr(755,root,root) /%{_lib}/lib*.so.*
+%{_datadir}/terminfo
+%{_datadir}/tabset
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man7/*
 
 %files devel
 %defattr(-,root,root)
-%doc c++ test
+%doc test
 %doc doc/html/hackguide.html
 %doc doc/html/ncurses-intro.html
-/usr/lib/lib*.so
-/usr/lib/lib*.a
-%dir /usr/include/ncurses/
-/usr/include/ncurses/*.h
-/usr/include/*.h
-/usr/share/man/man3/*
+%doc c++/README*
+%{_libdir}/lib*.so
+%{_libdir}/lib*.a
+%dir %{_includedir}/ncurses
+%dir %{_includedir}/ncursesw
+%{_includedir}/ncurses/*.h
+%{_includedir}/ncursesw/*.h
+%{_includedir}/curses.h
+%{_includedir}/ncurses.h
+%{_includedir}/eti.h
+%{_includedir}/form.h
+%{_includedir}/menu.h
+%{_includedir}/panel.h
+%{_includedir}/term.h
+%{_includedir}/unctrl.h
+%{_mandir}/man3/*
 
+
+%clean
+%clean_buildroot
+
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 5.4-3ts
-- current (5.4-2ts) integrated as 5.4-3ts for release 1.0-U1
+* Sun May 30 2004 Florian La Roche <Florian.LaRoche at redhat.de>
+- remove ncurses-c++-devel rpm, all files are also part of ncurses-devel
 
-* Thu Mar 25 2004 Omar Kilani <omar at tinysofa dot org> 5.4-2ts
-- Retag.
-- Add color_xterm patch. This fixes all issues with tr..tix/tinysofa
-- terminal emulation. Del works as it should, Home/End work. Colour
-- works. A proper terminfo for tinysofa. Finally.
+* Sat May 29 2004 Joe Orton <jorton at redhat.com> 5.4-6
+- fix xterm terminfo entry (Hans de Geode, #122815)
 
-* Wed Feb 18 2004 Omar Kilani <ok at trustix dot org> 5.4-1ok
-- New upstream.
-- Get rid of all the patches.
+* Thu May 06 2004 Adrian Havill <havill at redhat.com> 5.4-5
+- remove --with-gpm from configure, as it adds a pkg
+  dependency (#122336) and causes too many problems vs its benefits
 
-* Wed Dec  6 2003 Erlend Midttun <erlendbm at trustix dot org> 5.3-7tr
-- Big rebuild
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Tue Sep 16 2003 Chr. H. Toldnes <christht at trustix dot com> 5.3-6tr
-- Rebuilt and retagged for release.
+* Thu Feb 26 2004 Adrian Havill <havill at redhat.com> 5.4-3
+- xterm-color is wrong for rh; inverted bs/del (#115499)
 
-* Wed Sep  3 2003 Goetz Bock <bock at trustix dot org> 5.3-5bg
-- own /usr/include/ncurses, to get permissions right
-  (reported by Malpa)
+* Wed Feb 25 2004 Adrian Havill <havill at redhat.com> 5.4-3
+- link "xterm" to "xterm-color" as temp fix for escape problem (#115448)
+- remove old zcat for PATCH1
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 5.3-4tr
-- Big rebuild
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 5.3-3em
-- Rebuilt against glibc 2.3.2.
+* Tue Feb 10 2004 Adrian Havill <havill at redhat.com> 5.4-1
+- version update to 5.4
 
-* Tue Dec 19 2002 Goetz Bock <bock at trustix dot org> 5.3-2bg
-- the ncurses devel was broken, I've integrated a lot of patches from dickey
-- hopefully it works now
+* Thu Jan 29 2004 Adrian Havill <havill at redhat.com> 5.3-10
+- add /usr/include/ncursesw (#112979)
+- allow for non-gzipped man pages during the build process
 
-* Tue Dec 10 2002 Goetz Bock <bock at trustix dot org> 5.3-1bg
-- new upstream 5.3
-- removed all patches
-- removed sparc specific sections/files
+* Sun Sep 21 2003 Matt Wilson <msw at redhat.com> 5.3-9.3
+- remove the elf32/elf64 provides/obsoletes
 
-* Thu Aug 15 2002 Christian H. Toldnes <christht at trustix dot com> 5.2.6ct
-- Minor .spec cleanup
+* Wed Sep 17 2003 Matt Wilson <msw at redhat.com> 5.3-9.2
+- rebuild to fix gzipped file md5sums (#91211)
 
-* Wed Jul 24 2002 Daniel Meyer <eagle at trustix dot org> 5.2-5dm
-- rebuild for Trustix Secure Linux 2.0
+* Thu Sep 11 2003 Adrian Havill <havill at redhat.com> 5.3-9.1
+- RHEL bump
 
-* Fri Jan 25 2002 Christian H. Toldnes <christht at trustix dot com>
-- Updated the curses compability symlinks.
+* Thu Sep 11 2003 Adrian Havill <havill at redhat.com> 5.3-9
+- remove not-so safe-sprintf configure option because the code does
+  not appear to be stable enough for some apps. (#103790)
 
-* Sun Nov 26 2000 Oystein Viggen <oysteivi at trustix dot com
-- v5.2
-- Move runtime libs to /lib, because we want to link stuff in /bin to ncurses
+* Wed Aug 20 2003 Adrian Havill <havill at redhat.com> 5.3-8.1
+- RHEL bump
 
-* Tue Feb 15 2000 Erlend Midttun <erlendbm at trustix dot com>
-- Made Ncurses 5 actually install as Ncurses 5
+* Wed Aug 20 2003 Adrian Havill <havill at redhat.com> 5.3-8
+- multilib patch (#91211)
 
+* Mon Aug 11 2003 Adrian Havill <havill at redhat.com> 5.3-7
+- fixed the safe sprintf code that was enabled in the previous release
+  by the configure parameter. (#101486)
+
+* Mon Jun 16 2003 Elliot Lee <sopwith at redhat.com> 5.3-6.1
+- Fix ac25 patch, make it easy to turn off GPM support
+
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
+* Thu May 22 2003 Adrian Havill <havill at redhat.com> 5.3-5
+- added latest rollup patch with widec/UTF8 centric weekly (20030517)
+- added --enable-widec to configure (#86311)
+  original work done by Mr. Sam <sam at email-scan.com>
+- require sharutils (#86605)
+- add gpm, xmc support
+- add debug syms back into package
+- updated autoconf/configure patch
+
+* Thu Feb  6 2003 Bill Nottingham <notting at redhat.com> 5.3-4
+- fix debuginfo package
+
+* Fri Jan 31 2003 Adrian Havill <havill at redhat.com> 5.3-3
+- remunged xterm changes from 5.2 patch for 5.3
+- updated screen entry (#82951)
+- fixed ka3, kb2 and kf0 entries (#77506)
+
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
+
+* Wed Jan 22 2003 Adrian Havill <havill at redhat.com> 5.3-1
+- upgrade to 5.3 for sake of utf-8, wide chars (#77585 ...)
+- spec file summary/desc grammar (#73583)
+- add Requires: for c++ devel subpkg (#74002)
+- terminfo.src patches no longer needed
+- adjust autoconf patch
+
+* Thu Dec 05 2002 Elliot Lee <sopwith at redhat.com> 5.2-29
+- Merge in multilib fixes
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon Apr  8 2002 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-26
+- Remove duplicated files (#62752)
+- Don't strip libraries (#60398)
+- Remove cbt capability from xterm description (#61077)
+
+* Mon Feb 25 2002 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-25
+- Remove bogus man pages
+- Remove bool hack, it breaks make menuconfig
+
+* Fri Feb 22 2002 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-24
+- Rebuild for glibc 2.3/gcc 3.1
+
+* Fri Feb 22 2002 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-23
+- Put the bool type back in for !c++, but leave TRUE/FALSE out
+
+* Thu Feb 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-21
+- Don't define TRUE/FALSE etc., we don't care about SVR4 compliance and
+  it breaks building gdb
+
+* Thu Feb 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-20
+- Rebuild for glibc 2.3/gcc 3.1
+
+* Thu Feb 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-19
+- Patchlevel 20020218
+- Re-add %{_includedir}/ncurses.h (#60169)
+
+* Tue Feb 12 2002 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-18
+- Add C++ bindings (#59751)
+
+* Tue Feb 12 2002 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-17
+- Patchlevel 20020209
+- Fix zero-substitution of cf_cv_type_of_bool (#59450)
+- Fix rebuilding of configure script with autoconf 2.5x
+
+* Thu Jan 31 2002 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-16
+- Patchlevel 20020127
+
+* Tue Nov 27 2001 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-14
+- Patchlevel 20011124
+
+* Thu Sep 13 2001 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-13
+- Sync with patchlevel 20010908
+
+* Fri Jul 20 2001 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-12
+- Sync terminfo with termcap 11.0.1-10
+
+* Sun Jun 24 2001 Bernhard Rosenkraenzer <bero at redhat.com> 5.2-11
+- Update to patchlevel 20010623, fixes some lynx issues
+
+* Mon Jun 18 2001 Helge Deller <hdeller at redhat.de>
+- fixed tput -S segfaulting bug (#44669)
+- use _tmppath for BuildRoot:
+- Copyright -> License
+
+* Sun Apr 15 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update to patchlevel 20010407
+
+* Tue Mar  6 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix up some terminfo entries containing includes to
+  "/var/tmp/ncurses-root/something" (#30771)
+
+* Wed Feb 22 2001 Harald Hoyer <harald at redhat.de>
+- fixed rxvt backspace setting
+
+* Fri Feb  9 2001 Yukihiro Nakai <ynakai at redhat.com>
+- Update Japanese kterm patch
+
+* Mon Jan 15 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Add japanese patch from termcap
+- Fix ospeed handling
+
+* Mon Jan  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Add libcurses.a -> libncurses.a symlink (RFE #23023)
+
+* Tue Dec 12 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Use --with-ospeed='unsigned int'
+
+* Fri Nov 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix alpha and ia64
+- Rebuild with gcc 2.96-64
+
+* Thu Nov  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 5.2
+- Fix typo in man page (Bug #20205)
+- update the "screen" terminfo entries to the version supplied with
+  screen 3.9.8
+
+* Mon Oct  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update (fixes the "make menuconfig" bug introduced by the security fix)
+
+* Tue Oct  3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix security problem (possible buffer overrun)
+
+* Fri Aug  4 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Add the bugfix patches from the ncurses maintainer
+
+* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 5.1
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Mon Jun  5 2000 Matt Wilson <msw at redhat.com>
+- *don't ship symlinks from lib*.so.5 to lib*.so.4!
+- use FHS macros
+
+* Fri Jun  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- rebuild for 7.0
+- /usr/share/man
+- update URL for patches
+- misc. fixes to spec file
+
+* Mon Mar 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- use the real library version number
+- update to 20000319
+
+* Tue Mar  7 2000 Jeff Johnson <jbj at redhat.com>
+- rebuild for sparc baud rates > 38400.
+
+* Fri Feb 18 2000 Preston Brown <pbrown at redhat.com>
+- xterm terminfo entries from XFree86 3.3.6
+- final round of xterm fixes, follow debian policy.
+
+* Sat Feb  5 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- strip libraries
+
+* Thu Feb  3 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- More xterm fixes (Bug #9087)
+
+* Thu Jan 27 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- More xterm fixes from Hans de Goede (Bug #8633)
+
 * Sat Jan 15 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
 - remove some broken symlinks (leftovers from libncurses.so.5)
 - Use %configure (Bug #8484)
@@ -270,3 +517,4 @@
 
 * Tue Jul 08 1997 Erik Troan <ewt at redhat.com>
 - built against glibc, linked shared libs against -lc
+


From svn at tinysofa.org  Tue Jun 29 18:06:28 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 04:06:28 +1000 (EST)
Subject: [tinysofa-svn] 
	r2441 - in tinysofa/releases/1.0/freeswan: current/specs
	releases/2.05 releases/2.05/4ts/specs
Message-ID: <20040629180628.13A574E8032@minbar.tinysofa.org>

Author: omar
Date: 2004-06-30 04:06:27 +1000 (Wed, 30 Jun 2004)
New Revision: 2441

Added:
   tinysofa/releases/1.0/freeswan/releases/2.05/4ts/
Modified:
   tinysofa/releases/1.0/freeswan/current/specs/freeswan.spec
   tinysofa/releases/1.0/freeswan/releases/2.05/4ts/specs/freeswan.spec
Log:
freeswan:
  * integrate current (2.05-4jh) as releases/2.05/4ts

Modified: tinysofa/releases/1.0/freeswan/current/specs/freeswan.spec
===================================================================
--- tinysofa/releases/1.0/freeswan/current/specs/freeswan.spec	2004-06-29 17:55:24 UTC (rev 2440)
+++ tinysofa/releases/1.0/freeswan/current/specs/freeswan.spec	2004-06-29 18:06:27 UTC (rev 2441)
@@ -1,7 +1,7 @@
 Summary: A free ipsec VPN solution for Linux
 Name: freeswan
 Version: 2.05
-Release: 4jh
+Release: 4ts
 License: GPL
 Group: tinysofa official
 URL: http://www.freeswan.org
@@ -121,6 +121,9 @@
 /etc/ipsec.d
 
 %changelog
+* Wed Jun 30 2004 tsintegrate <release at tinysofa dot org> 2.05-4ts
+- current (2.05-4jh) integrated as 2.05-4ts for release 1.0-U2
+
 * Tue Jun 29 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.05-4jh
 - update x509 patch to fix security problems (CAN-2004-0590)
 

Copied: tinysofa/releases/1.0/freeswan/releases/2.05/4ts (from rev 2440, tinysofa/releases/1.0/freeswan/current)

Modified: tinysofa/releases/1.0/freeswan/releases/2.05/4ts/specs/freeswan.spec
===================================================================
--- tinysofa/releases/1.0/freeswan/current/specs/freeswan.spec	2004-06-29 17:55:24 UTC (rev 2440)
+++ tinysofa/releases/1.0/freeswan/releases/2.05/4ts/specs/freeswan.spec	2004-06-29 18:06:27 UTC (rev 2441)
@@ -1,7 +1,7 @@
 Summary: A free ipsec VPN solution for Linux
 Name: freeswan
 Version: 2.05
-Release: 4jh
+Release: 4ts
 License: GPL
 Group: tinysofa official
 URL: http://www.freeswan.org
@@ -121,6 +121,9 @@
 /etc/ipsec.d
 
 %changelog
+* Wed Jun 30 2004 tsintegrate <release at tinysofa dot org> 2.05-4ts
+- current (2.05-4jh) integrated as 2.05-4ts for release 1.0-U2
+
 * Tue Jun 29 2004 Jaakko Heinonen <jh at tinysofa dot org> 2.05-4jh
 - update x509 patch to fix security problems (CAN-2004-0590)
 


From svn at tinysofa.org  Tue Jun 29 18:06:29 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 04:06:29 +1000 (EST)
Subject: [tinysofa-svn] r2442 - tinysofa/releases/1.0/freeswan
Message-ID: <20040629180629.847484E8032@minbar.tinysofa.org>

Author: omar
Date: 2004-06-30 04:06:29 +1000 (Wed, 30 Jun 2004)
New Revision: 2442

Removed:
   tinysofa/releases/1.0/freeswan/pristine/
Log:
freeswan:
  * removing pristine (2.05-3ts)


From svn at tinysofa.org  Tue Jun 29 18:06:31 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 04:06:31 +1000 (EST)
Subject: [tinysofa-svn] r2443 - tinysofa/releases/1.0/freeswan
Message-ID: <20040629180631.DF5E44E8032@minbar.tinysofa.org>

Author: omar
Date: 2004-06-30 04:06:31 +1000 (Wed, 30 Jun 2004)
New Revision: 2443

Added:
   tinysofa/releases/1.0/freeswan/pristine/
Log:
freeswan:
  * retarget pristine (2.05-3ts) to releases/2.05/4ts

Copied: tinysofa/releases/1.0/freeswan/pristine (from rev 2441, tinysofa/releases/1.0/freeswan/releases/2.05/4ts)


From svn at tinysofa.org  Tue Jun 29 18:18:22 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 04:18:22 +1000 (EST)
Subject: [tinysofa-svn] 
	r2444 - in tinysofa/releases/1.1/readline/current: sources specs
Message-ID: <20040629181822.913924E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 04:18:22 +1000 (Wed, 30 Jun 2004)
New Revision: 2444

Added:
   tinysofa/releases/1.1/readline/current/sources/readline-4.3-no_rpath.patch
   tinysofa/releases/1.1/readline/current/sources/readline-4.3.tar.bz2
Removed:
   tinysofa/releases/1.1/readline/current/sources/readline-4.3.tar.gz
Modified:
   tinysofa/releases/1.1/readline/current/specs/readline.spec
Log:
- update spec file from Fedora


Added: tinysofa/releases/1.1/readline/current/sources/readline-4.3-no_rpath.patch
===================================================================
--- tinysofa/releases/1.1/readline/current/sources/readline-4.3-no_rpath.patch	2004-06-29 18:06:31 UTC (rev 2443)
+++ tinysofa/releases/1.1/readline/current/sources/readline-4.3-no_rpath.patch	2004-06-29 18:18:22 UTC (rev 2444)
@@ -0,0 +1,11 @@
+--- readline-4.3/support/shobj-conf.no_rpath	2002-04-17 19:27:46.000000000 +0200
++++ readline-4.3/support/shobj-conf	2003-11-28 14:48:22.000000000 +0100
+@@ -102,7 +102,7 @@
+ 	SHOBJ_LD='${CC}'
+ 	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+ 
+-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
++	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ 	;;
+ 

Added: tinysofa/releases/1.1/readline/current/sources/readline-4.3.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/readline/current/sources/readline-4.3.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.1/readline/current/sources/readline-4.3.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.1/readline/current/specs/readline.spec
===================================================================
--- tinysofa/releases/1.1/readline/current/specs/readline.spec	2004-06-29 18:06:31 UTC (rev 2443)
+++ tinysofa/releases/1.1/readline/current/specs/readline.spec	2004-06-29 18:18:22 UTC (rev 2444)
@@ -1,41 +1,42 @@
-Summary: A library for reading and returning lines from a terminal.
+Summary: A library for editing typed command lines.
 Name: readline
 Version: 4.3
-Release: 7ts
+Release: 8jh
 License: GPL
-Group: tinysofa official
-Source: ftp://ftp.gnu.org/pub/gnu/readline/readline-%{version}.tar.gz
+Group: tinysofa/main
+Source: ftp://ftp.gnu.org/gnu/readline-%{version}.tar.bz2
 Patch0: readline-4.1-outdated.patch
 Patch1: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-001
 Patch2: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-002
 Patch3: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-003
 Patch4: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-004
 Patch5: ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-005
-Prereq: /sbin/ldconfig htmlinfo
-BuildRoot: %{_tmppath}/%{name}-root
+Patch6: readline-4.3-no_rpath.patch
+Prereq: /sbin/ldconfig
+%info_requires
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: sed autoconf libtool
 
 %description
-The readline library reads a line from the terminal and returns it,
-allowing the user to edit the line with standard emacs editing keys.
-The readline library allows programmers to provide an easy to use and
-more intuitive interface for users.
+The Readline library provides a set of functions that allow users to
+edit command lines. Both Emacs and vi editing modes are available. The
+Readline library includes additional functions for maintaining a list
+of previously-entered command lines for recalling or editing those
+lines, and for performing csh-like history expansion on previous
+commands.
 
-If you want to develop programs that will use the readline library,
-you'll also need to install the readline-devel package.
-
 %package devel
-Summary: Development files for programs which will use the readline library.
-Group: tinysofa official
-Requires: readline = %{version}
+Summary: Files needed to develop programs which use the readline library.
+Group: tinysofa/development
+Requires: readline = %{version}-%{release}
+Requires: libtermcap-devel
 
 %description devel
-The readline library will read a line from the terminal and return it.
-Use of the readline library allows programmers to provide an easy
-to use and more intuitive interface for users.
+The Readline library provides a set of functions that allow users to
+edit typed command lines. If you want to develop programs that will
+use the readline library, you need to have the readline-devel package
+installed. You also need to have the readline package installed.
 
-If you want to develop programs which will use the readline library,
-you'll need to have the readline-devel package installed.  You'll also
-need to have the readline package installed.
 
 %prep
 %setup -q
@@ -45,104 +46,168 @@
 %patch3 -p0 -b .readline43-003
 %patch4 -p0 -b .readline43-004
 %patch5 -p0 -b .readline43-005
+%patch6 -p1 -b .no_rpath
 
+libtoolize --copy --force
+autoconf || autoconf-2.53
+
+
 %build
-%configure --prefix=/usr
-make static shared
+%configure
+%make all shared
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p $RPM_BUILD_ROOT/usr/share/html/{readline,history,rluserman}
-make install install-shared \
-	prefix=$RPM_BUILD_ROOT/%{_prefix} \
-	libdir=$RPM_BUILD_ROOT/%{_prefix}/lib \
-	includedir=$RPM_BUILD_ROOT/%{_prefix}/include \
-	mandir=$RPM_BUILD_ROOT/%{_mandir} \
-	infodir=$RPM_BUILD_ROOT/%{_infodir}
+mkdir -p \
+	${buildroot}%{_libdir} \
+	%{buildroot}%{_htmldir}/{readline,history,rluserman}
 
-install -m 644 doc/readline.html $RPM_BUILD_ROOT/usr/share/html/readline/
-install -m 644 doc/history.html $RPM_BUILD_ROOT/usr/share/html/history/
-install -m 644 doc/rluserman.html $RPM_BUILD_ROOT/usr/share/html/rluserman/
-( cd $RPM_BUILD_ROOT
-  ln -sf libreadline.so.%{version} ./%{_prefix}/lib/libreadline.so
-  ln -sf libhistory.so.%{version} ./%{_prefix}/lib/libhistory.so
-  ln -sf libreadline.so.%{version} ./%{_prefix}/lib/libreadline.so.4
-  ln -sf libhistory.so.%{version} ./%{_prefix}/lib/libhistory.so.4
-)
+%makeinstall
+
+chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/*.so*
+
+install -m 644 doc/readline.html %{buildroot}%{_htmldir}/readline/
+install -m 644 doc/history.html %{buildroot}%{_htmldir}/history/
+install -m 644 doc/rluserman.html %{buildroot}%{_htmldir}/rluserman/
+%nuke_info
+
  
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post
 /sbin/ldconfig
-/usr/sbin/htmlinfo_update.sh
+%info_post
 
-%postun -p /sbin/ldconfig
-/usr/sbin/htmlinfo_update.sh
+%postun
+/sbin/ldconfig
+%info_postun
 
 
 %files
 %defattr(-,root,root)
-%{_mandir}/*/*
-%dir %{_prefix}/share/html/readline
-%dir %{_prefix}/share/html/history
-%dir %{_prefix}/share/html/rluserman
-%{_prefix}/share/html/readline/*
-%{_prefix}/share/html/history/*
-%{_prefix}/share/html/rluserman/*
-%attr(755,root,root) %{_prefix}/lib/lib*.so.*
-%exclude %{_infodir}
+%{_mandir}/man*/*
+%attr(755,root,root) %{_libdir}/lib*.so.*
+%{_htmldir}/*
 
 %files devel
-%defattr(-,root,root)
-%{_prefix}/include/readline
-%attr(644,root,root) %{_prefix}/lib/lib*.a
-%attr(755,root,root) %{_prefix}/lib/lib*.so
+%defattr(644,root,root,755)
+%{_includedir}/readline
+%attr(644,root,root) %{_libdir}/lib*.a
+%attr(755,root,root) %{_libdir}/lib*.so
 
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 4.3-7ts
-- current (4.3-7jh) integrated as 4.3-7ts for release 1.0-U1
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon May 17 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.3-7jh
-- fix non-root build
-- include patches from Fedora
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Sun May  9 2004 Omar Kilani <omar at tinysofa dot org> 4.3-6ts
-- Rebuild.
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Fri May  7 2004 Jaakko Heinonen <jh at tinysofa dot org> 4.3-5jh
-- fixed permissions for so files
-- removed obsolete file removal
+* Fri Nov 28 2003 Thomas Woerner <twoerner at redhat.com> 4.3-9
+- removed rpath
 
-* Mon Dec  8 2003 Erlend Midttun <erlendbm at trustix dot org> 4.3-1tr
-- New upstream.
+* Thu Nov  6 2003 Tim Waugh <twaugh at redhat.com> 4.3-8
+- Apply upstream patches (bug #109240 among others).
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 4.2-5tr
-- Big rebuild
+* Wed Jun 25 2003 Tim Waugh <twaugh at redhat.com>
+- devel package requires libtermcap-devel (bug #98015).
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix.com> 4.2-4em
-- Rebuilt against glibc 2.3.2.
+* Wed Jun 25 2003 Tim Waugh <twaugh at redhat.com> 4.3-7
+- Fixed recursion loop (bug #92372).
 
-* Fri Oct 25 2002 Christian H. Toldnes <christht at trustix.com> 4.2-3ct
-- Replaced info stuff with htmlinfo
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Jul 24 2002 Daniel Meyer <eagle at trustix.org> 4.2-2dm
-- rebuild for Trustix Secure Linux 2.0
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
 
-* Mon Jun 11 2001 Erlend Midttun <erlendbm at trustix.com>
-- New upstream version.
+* Wed Nov 20 2002 Tim Powers <timp at redhat.com>
+- rebuild in current collinst
+- BuildRequires autoconf only
 
-* Wed Sep 13 2000 Per Ivar Paulsen <perp at trustix.com>
-- Picked up 4.1
+* Wed Aug 07 2002 Phil Knirsch <pknirsch at redhat.com> 4.3-3
+- Fixed Esc-O-M stack overflow bug.
 
-* Sun Feb 27 2000 Lars Gaarden <larsg at trustix.com>
-- missed libhistory.so.4 and libreadline.so.4
-- dangling symlinks to *.so.3.0
+* Mon Jul 22 2002 Phil Knirsch <pknirsch at redhat.com> 4.3-1
+- Updated to latest readline release 4.3
 
-* Tue Jan 25 2000 Tore Olsen <toreo at trustix.com>
-- upgraded to 4.0
-- moved /usr/{man,info} to /usr/share/{man,info} for FHS compliance
+* Thu Jul 11 2002 Phil Knirsch <pknirsch at redhat.com> 4.2a-7
+- Fixed problem with alpha build.
 
+* Wed Jul 10 2002 Phil Knirsch <pknirsch at redhat.com>
+- Fixed utf8 problem (originally observed in bash).
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 4.2a-6
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com> 4.2a-5
+- automated rebuild
+
+* Wed Mar 20 2002 Trond Eivind Glomsr?d <teg at redhat.com> 4.2a-4
+- Use autoconf 2.53, not 2.52
+
+* Mon Mar  4 2002 Bernhard Rosenkraenzer <bero at redhat.com> 4.2a-3
+- Rebuild
+
+* Mon Nov 26 2001 Matt Wilson <msw at redhat.com> 4.2a-2
+- removed the manual symlinking of .so, readline handles this by itself
+- call only %%makeinstall, not %%makeinstall install install-shared as
+  this makes bogus .old files in the buildroot
+
+* Tue Nov 20 2001 Bernhard Rosenkraenzer <bero at redhat.com> 4.2a-1
+- 4.2a
+
+* Tue Oct  2 2001 Bernhard Rosenkraenzer <bero at redhat.com> 4.2-4
+- Work around autoconf bug
+
+* Mon Oct  1 2001 Bernhard Rosenkraenzer <bero at redhat.com> 4.2-3
+- Don't use readline's internal re-implementation of strpbrk on systems
+  that have strpbrk - the system implementation is faster and better maintained.
+
+* Tue Aug  7 2001 Bernhard Rosenkraenzer <bero at redhat.com> 4.2-2
+- Make sure headers can be included from C++ applications (#51131)
+  (Patch based on Debian's with the bugs removed ;) )
+
+* Wed May 09 2001 Florian La Roche <Florian.LaRoche at redhat.de>
+- update to 4.2 and adapt patches
+
+* Fri Apr  6 2001 Nalin Dahyabhai <nalin at redhat.com>
+- change the paths listed for the header files in the man page to reflect
+  the location changes from previous versions (#35073)
+- note that "on" is acceptable instead of "On" in the man page (#21327)
+
+* Thu Mar  8 2001 Preston Brown <pbrown at redhat.com>
+- fix reading of end key termcap value (@7 is correct, was kH) (#30884)
+
+* Tue Jan 30 2001 Nalin Dahyabhai <nalin at redhat.com>
+- mark the man page as currently out-of-date (#25294)
+
+* Thu Sep  7 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging (64bit systems need to use libdir).
+
+* Thu Aug 17 2000 Jeff Johnson <jbj at redhat.com>
+- summaries from specspo.
+
+* Wed Aug  2 2000 Florian La Roche <Florian.LaRoche at redhat.com>
+- use "rm -f" in specfile
+
+* Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Mon Jun  5 2000 Jeff Johnson <jbj at redhat.com>
+- FHS packaging.
+
+* Tue Mar 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 4.1
+
+* Thu Feb 03 2000 Nalin Dahyabhai <nalin at redhat.com>
+- update to 4.0
+
 * Fri Apr 09 1999 Michael K. Johnson <johnsonm at redhat.com>
 - added guard patch from Taneli Huuskonen <huuskone at cc.helsinki.fi>
 
@@ -174,4 +239,4 @@
 - updated to readline 2.1
 
 * Tue Jun 03 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
\ No newline at end of file
+- built against glibc


From svn at tinysofa.org  Tue Jun 29 18:21:27 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 04:21:27 +1000 (EST)
Subject: [tinysofa-svn] r2445 - tinysofa/releases/1.1/ncurses/current/specs
Message-ID: <20040629182127.A85894E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 04:21:27 +1000 (Wed, 30 Jun 2004)
New Revision: 2445

Modified:
   tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec
Log:
- fix release


Modified: tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec
===================================================================
--- tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec	2004-06-29 18:18:22 UTC (rev 2444)
+++ tinysofa/releases/1.1/ncurses/current/specs/ncurses.spec	2004-06-29 18:21:27 UTC (rev 2445)
@@ -2,7 +2,7 @@
 Name: ncurses
 Version: 5.4
 %define includedirw %{_includedir}/ncursesw
-Release: 7ts
+Release: 4jh
 License: distributable
 Group: tinysofa/main
 URL: http://dickey.his.com/ncurses/ncurses.html


From svn at tinysofa.org  Wed Jun 30 10:06:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 20:06:56 +1000 (EST)
Subject: [tinysofa-svn] r2446 - tinysofa/releases/1.1/setup/current/specs
Message-ID: <20040630100656.1682B4E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 20:06:55 +1000 (Wed, 30 Jun 2004)
New Revision: 2446

Modified:
   tinysofa/releases/1.1/setup/current/specs/setup.spec
Log:
- prepare for 1.1


Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec
===================================================================
--- tinysofa/releases/1.1/setup/current/specs/setup.spec	2004-06-29 18:21:27 UTC (rev 2445)
+++ tinysofa/releases/1.1/setup/current/specs/setup.spec	2004-06-30 10:06:55 UTC (rev 2446)
@@ -1,35 +1,37 @@
 Summary: A set of system configuration and setup files.
 Name: setup
 Version: 2.2.5
-Release: 6ts
+Release: 7jh
 License: public domain
-Group: tinysofa official
+Group: tinysofa/main
 Source: setup-%{version}.tar.gz
 Patch: setup-2.2.5-sieve.patch
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
 Conflicts: initscripts < 4.26
 BuildRequires: coreutils, awk
-Prereq: bash-static
 
 %description
 The setup package contains a set of important system configuration and
 setup files, such as passwd, group, and profile.
 
+
 %prep
 %setup -q
 %patch -p1
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d
 cp -ar * $RPM_BUILD_ROOT/etc
 mkdir -p $RPM_BUILD_ROOT/var/log
 cp /dev/null $RPM_BUILD_ROOT/var/log/lastlog
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
 %attr(644,root,root) %verify(not md5 size mtime) %config(noreplace) /etc/passwd
@@ -57,6 +59,7 @@
 %exclude /etc/shells
 %exclude /etc/setup.spec
 
+
 %changelog
 * Fri Jun 18 2004 tsintegrate <release at tinysofa dot org> 2.2.5-6ts
 - current (2.2.5-5ts) integrated as 2.2.5-6ts for release 1.0-U2


From svn at tinysofa.org  Wed Jun 30 12:36:37 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Wed, 30 Jun 2004 22:36:37 +1000 (EST)
Subject: [tinysofa-svn] r2449 - tinysofa/releases/1.1/etcskel/current/specs
Message-ID: <20040630123637.2E27B4E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-06-30 22:36:36 +1000 (Wed, 30 Jun 2004)
New Revision: 2449

Modified:
   tinysofa/releases/1.1/etcskel/current/specs/etcskel.spec
Log:
- .bash_logout, .bash_profile and .bashrc are now owned by bash


Modified: tinysofa/releases/1.1/etcskel/current/specs/etcskel.spec
===================================================================
--- tinysofa/releases/1.1/etcskel/current/specs/etcskel.spec	2004-06-30 12:29:35 UTC (rev 2448)
+++ tinysofa/releases/1.1/etcskel/current/specs/etcskel.spec	2004-06-30 12:36:36 UTC (rev 2449)
@@ -1,37 +1,44 @@
 Summary: tinysofa default files for new users' home directories.
 Name: etcskel
 Version: 1.0
-Release: 2ts
+Release: 3jh
 License: public domain
-Group: tinysofa official
+Group: tinysofa/main
 Source: etcskel.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
-Requires: bash
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArchitectures: noarch
 Epoch: 2
 
 %description
-The etcskel package is part of the basic tinysofa system.  Etcskel
-provides the /etc/skel directory's files.  These files (.bash_logout, 
-.bash_profile, .bashrc) are then placed in every new user's home 
-directory when new accounts are created.
+The etcskel package is part of the basic tinysofa system.  Etcskel provides
+the /etc/skel directory's files.  These files are then placed in every new
+user's home directory when new accounts are created.
 
+
 %prep
 
+
 %install
 rm -rf $RPM_BUILD_ROOT/etc/skel
 mkdir -p $RPM_BUILD_ROOT/etc/skel
 
 zcat $RPM_SOURCE_DIR/etcskel.tar.gz | (cd $RPM_BUILD_ROOT ; tar -xvSpf-)
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %files
 %defattr(-,root,root)
-%config /etc/skel
+%config %{_sysconfdir}/skel
+%exclude %{_sysconfdir}/skel/.bash*
 
+
 %changelog
+* Wed Jun 30 2004 Jaakko Heinonen <jh at tinysofa dot org> 1.0-3jh
+- .bash_logout, .bash_profile and .bashrc are now owned by bash
+
 * Wed May 19 2004 tsintegrate <release at tinysofa.org> 1.0-2ts
 - current (1.0-1ts) integrated as 1.0-2ts for release 1.0-U1
 
@@ -97,4 +104,4 @@
 - added bash dependencie 
 
 * Thu Mar 20 1997 Erik Troan <ewt at redhat.com>
-- Moved .Xclients and .xsession to xinitrc package
\ No newline at end of file
+- Moved .Xclients and .xsession to xinitrc package


From svn at tinysofa.org  Wed Jun 30 14:45:56 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  1 Jul 2004 00:45:56 +1000 (EST)
Subject: [tinysofa-svn] 
	r2450 - in tinysofa/releases/1.1/setup/current: sources specs
Message-ID: <20040630144556.E35BA4E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-07-01 00:45:56 +1000 (Thu, 01 Jul 2004)
New Revision: 2450

Added:
   tinysofa/releases/1.1/setup/current/sources/setup-profile.patch
Modified:
   tinysofa/releases/1.1/setup/current/specs/setup.spec
Log:
- make /etc/profile to play nice with new bash package


Added: tinysofa/releases/1.1/setup/current/sources/setup-profile.patch
===================================================================
--- tinysofa/releases/1.1/setup/current/sources/setup-profile.patch	2004-06-30 12:36:36 UTC (rev 2449)
+++ tinysofa/releases/1.1/setup/current/sources/setup-profile.patch	2004-06-30 14:45:56 UTC (rev 2450)
@@ -0,0 +1,19 @@
+--- setup-2.2.5/profile	2003-12-11 14:24:16.000000000 +0200
++++ setup-2.2.5/profile.new	2004-06-30 17:32:12.000000000 +0300
+@@ -4,7 +4,6 @@
+ # Functions and aliases go in /etc/bashrc
+ 
+ PATH="/sbin:/usr/sbin:$PATH:/usr/local/bin"
+-PS1="\u@\h \w\\$ "
+ 
+ ulimit -S -c 0
+ umask 077
+@@ -20,7 +19,7 @@
+ 	INPUTRC=/etc/inputrc
+ fi
+ 
+-export PATH PS1 USER LOGNAME MAIL HOSTNAME HISTSIZE INPUTRC
++export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE INPUTRC
+ 
+ #Setting system defaults:
+ unset LANG

Modified: tinysofa/releases/1.1/setup/current/specs/setup.spec
===================================================================
--- tinysofa/releases/1.1/setup/current/specs/setup.spec	2004-06-30 12:36:36 UTC (rev 2449)
+++ tinysofa/releases/1.1/setup/current/specs/setup.spec	2004-06-30 14:45:56 UTC (rev 2450)
@@ -6,6 +6,7 @@
 Group: tinysofa/main
 Source: setup-%{version}.tar.gz
 Patch: setup-2.2.5-sieve.patch
+Patch1: setup-profile.patch
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
 Conflicts: initscripts < 4.26
@@ -19,6 +20,7 @@
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1
 
 
 %install


From svn at tinysofa.org  Wed Jun 30 14:56:40 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  1 Jul 2004 00:56:40 +1000 (EST)
Subject: [tinysofa-svn] 
	r2451 - in tinysofa/releases/1.1/less/current: sources specs
Message-ID: <20040630145640.E30624E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-07-01 00:56:40 +1000 (Thu, 01 Jul 2004)
New Revision: 2451

Added:
   tinysofa/releases/1.1/less/current/sources/less-382-ncursesw.patch
Modified:
   tinysofa/releases/1.1/less/current/sources/less.csh
   tinysofa/releases/1.1/less/current/sources/less.sh
   tinysofa/releases/1.1/less/current/sources/lesspipe.sh
   tinysofa/releases/1.1/less/current/specs/less.spec
Log:
- add support for non-latin1 charsets
- update from Fedora


Added: tinysofa/releases/1.1/less/current/sources/less-382-ncursesw.patch
===================================================================
--- tinysofa/releases/1.1/less/current/sources/less-382-ncursesw.patch	2004-06-30 14:45:56 UTC (rev 2450)
+++ tinysofa/releases/1.1/less/current/sources/less-382-ncursesw.patch	2004-06-30 14:56:40 UTC (rev 2451)
@@ -0,0 +1,30 @@
+--- less-382/configure.ac.ncursesw	2004-03-02 11:54:04.497369060 +0100
++++ less-382/configure.ac	2004-03-02 11:56:08.311247569 +0100
+@@ -24,6 +24,7 @@
+ 
+ # Checks for general libraries.
+ AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no])
++AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no])
+ AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
+ AC_CHECK_LIB(curses, initscr, [have_curses=yes], [have_curses=no])
+ AC_CHECK_LIB(termcap, tgetent, [have_termcap=yes], [have_termcap=no])
+@@ -63,6 +64,19 @@
+   fi
+ fi
+ 
++dnl -- Try ncursesw.
++if test "x$TERMLIBS" = x; then
++  if test $have_ncursesw = yes; then
++    TERMLIBS="-lncursesw"
++    SAVE_LIBS=$LIBS
++    LIBS="$LIBS $TERMLIBS"
++    AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
++      [termok=yes], [termok=no])
++    LIBS=$SAVE_LIBS
++    if test $termok = no; then TERMLIBS=""; fi
++  fi
++fi
++
+ # -- Try ncurses.
+ if test "x$TERMLIBS" = x; then
+   if test $have_ncurses = yes; then

Modified: tinysofa/releases/1.1/less/current/sources/less.csh
===================================================================
--- tinysofa/releases/1.1/less/current/sources/less.csh	2004-06-30 14:45:56 UTC (rev 2450)
+++ tinysofa/releases/1.1/less/current/sources/less.csh	2004-06-30 14:56:40 UTC (rev 2451)
@@ -1,3 +1,4 @@
 # less initialization script (csh)
-setenv LESSCHARSET iso8859
-test -x /usr/bin/lesspipe.sh && setenv LESSOPEN "|/usr/bin/lesspipe.sh %s"
+if ( -x /usr/bin/lesspipe.sh ) then
+  setenv LESSOPEN "|/usr/bin/lesspipe.sh %s"
+endif

Modified: tinysofa/releases/1.1/less/current/sources/less.sh
===================================================================
--- tinysofa/releases/1.1/less/current/sources/less.sh	2004-06-30 14:45:56 UTC (rev 2450)
+++ tinysofa/releases/1.1/less/current/sources/less.sh	2004-06-30 14:56:40 UTC (rev 2451)
@@ -1,6 +1,2 @@
 # less initialization script (sh)
-LESSCHARSET="iso8859"
-export LESSCHARSET
-if [ -x /usr/bin/lesspipe.sh ] ; then
-  export LESSOPEN="|/usr/bin/lesspipe.sh %s"
-fi
+[ -x /usr/bin/lesspipe.sh ] && export LESSOPEN="|/usr/bin/lesspipe.sh %s"

Modified: tinysofa/releases/1.1/less/current/sources/lesspipe.sh
===================================================================
--- tinysofa/releases/1.1/less/current/sources/lesspipe.sh	2004-06-30 14:45:56 UTC (rev 2450)
+++ tinysofa/releases/1.1/less/current/sources/lesspipe.sh	2004-06-30 14:56:40 UTC (rev 2451)
@@ -1,29 +1,51 @@
-#!/bin/sh
+#!/bin/sh -
 #
 # To use this filter with less, define LESSOPEN:
-# export LESSOPEN="|/usr/local/bin/lesspipe.sh %s"
+# export LESSOPEN="|/usr/bin/lesspipe.sh %s"
 
 lesspipe() {
   case "$1" in
-  *.tar) tar tvvf $1 2>/dev/null ;; # View contents of .tar and .tgz files
-  *.tgz) tar tzvvf $1 2>/dev/null ;;
-  *.tar.gz) tar tzvvf $1 2>/dev/null ;;
-  *.tar.bz2) bzip2 -dc $1 | tar tvvf - 2>/dev/null ;;
-  *.tar.Z) tar tzvvf $1 2>/dev/null ;;
-  *.tar.z) tar tzvvf $1 2>/dev/null ;;
-  *.Z) gzip -dc $1  2>/dev/null ;; # View compressed files correctly
-  *.z) gzip -dc $1  2>/dev/null ;;
-  *.gz) gzip -dc $1  2>/dev/null ;;
-  *.bz2) bzip2 -dc $1  2>/dev/null ;;
-  *.zip) unzip -l $1 2>/dev/null ;;
-  *.rpm) rpm -qpivl $1 2>/dev/null ;; # view contents of .rpm files
-  *.1|*.2|*.3|*.4|*.5|*.6|*.7|*.8|*.9|*.n|*.man) FILE=`file -L $1` ; # groff src
-    FILE=`echo $FILE | cut -d ' ' -f 2`
-    if [ "$FILE" = "troff" ]; then
-      groff -s -p -t -e -Tascii -mandoc $1
-    fi ;;
+  *.[1-9n]|*.man|*.[1-9n].bz2|*.man.bz2|*.[1-9].gz|*.[1-9]x.gz|*.[1-9].man.gz)
+	case "$1" in
+		*.gz)	DECOMPRESSOR="gunzip -c" ;;
+		*.bz2)	DECOMPRESSOR="bunzip2 -c" ;;
+		*)	DECOMPRESSOR="cat" ;;
+	esac
+	if $DECOMPRESSOR -- "$1" | file - | grep -q troff; then
+		if echo "$1" | grep -q ^/; then	#absolute path
+			man -- "$1" | cat -s
+		else
+			man -- "./$1" | cat -s
+		fi
+	else
+		$DECOMPRESSOR -- "$1"
+	fi ;;
+  *.tar) tar tvvf "$1" ;;
+  *.tgz|*.tar.gz|*.tar.[zZ]) tar tzvvf "$1" ;;
+  *.tar.bz2|*.tbz2) bzip2 -dc "$1" | tar tvvf - ;;
+  *.[zZ]|*.gz) gzip -dc -- "$1" ;;
+  *.bz2) bzip2 -dc -- "$1" ;;
+  *.zip) zipinfo -- "$1" ;;
+  *.rpm) rpm -qpivl --changelog -- "$1" ;;
+  *.cpi|*.cpio) cpio -itv < "$1" ;;
+  *.gif|*.jpeg|*.jpg|*.pcd|*.png|*.tga|*.tiff|*.tif)
+   if [ -x "`which identify`" ]; then
+     identify "$1"
+   else
+     echo "No identify available"
+     echo "Install ImageMagick to browse images"
+   fi ;;
+  *)
+	case "$1" in
+		*.gz)	DECOMPRESSOR="gunzip -c" ;;
+		*.bz2)	DECOMPRESSOR="bunzip2 -c" ;;
+	esac
+	$DECOMPRESSOR -- "$1" ;;
   esac
 }
 
-lesspipe $1
-
+if [ -d "$1" ] ; then
+	/bin/ls -alF -- "$1"
+else
+	lesspipe "$1" 2> /dev/null
+fi

Modified: tinysofa/releases/1.1/less/current/specs/less.spec
===================================================================
--- tinysofa/releases/1.1/less/current/specs/less.spec	2004-06-30 14:45:56 UTC (rev 2450)
+++ tinysofa/releases/1.1/less/current/specs/less.spec	2004-06-30 14:56:40 UTC (rev 2451)
@@ -1,17 +1,18 @@
 Summary: A text file browser similar to more, but better.
 Name: less
 Version: 382
-Release: 5ts
+Release: 6jh
 License: GPL
-Group: tinysofa official
-Source: http://www.greenwoodsoftware.com/less/less-%{version}.tar.gz
+Group: Applications/Text
+Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
 Source1: lesspipe.sh
 Source2: less.sh
 Source3: less.csh
-BuildRoot: %{_tmppath}/%{name}-root
+Patch0:	less-382-ncursesw.patch
+URL: http://www.greenwoodsoftware.com/less/
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: ncurses-devel
 
-BuildRequires: libtermcap-devel, ncurses-devel
-
 %description
 The less utility is a text file browser that resembles more, but has
 more capabilities.  Less allows you to move backwards in the file as
@@ -22,81 +23,182 @@
 You should install less because it is a basic utility for viewing text
 files, and you'll use it frequently.
 
+
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
+%patch0 -p1 -b .ncursesw
 
+
 %build
 %configure
-make CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
+make CC="gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" datadir=%{_docdir}
 
+
 %install
-mkdir -p $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT/usr \
-	bindir=$RPM_BUILD_ROOT/usr/bin \
-	mandir=$RPM_BUILD_ROOT/%{_mandir} install
+%makeinstall
+strip -R .comment %{buildroot}%{_bindir}/less
 
-strip -R .comments $RPM_BUILD_ROOT/usr/bin/less
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-mkdir -p $RPM_BUILD_ROOT/usr/share
-install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/bin/
-install -c -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d
-install -c -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 
+install -c -m 755 %{SOURCE1} %{buildroot}%{_bindir}
+install -c -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
+install -c -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d
+
+
 %files
 %defattr(-,root,root)
-/etc/profile.d/*
-/usr/bin/*
-/usr/share/man/man1/*
+%{_sysconfdir}/profile.d/*
+%{_bindir}/*
+%{_mandir}/man1/*
 
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 382-5ts
-- current (382-4ts) integrated as 382-5ts for release 1.0-U1
+* Mon Mar 29 2004 Karsten Hopp <karsten at redhat.de> 382-3
+- remove old stuff from /etc/profile.d/less.*, fixes #109011
 
-* Mon May 10 2004 Omar Kilani <omar at tinysofa dot org>
-- Add BuildRequires libtermcap-devel, ncurses-devel
+* Tue Mar 02 2004 Karsten Hopp <karsten at redhat.de> 382-1.1 
+- build for FC1
 
-* Wed Feb 18 2004 Omar Kilani <ok at trustix dot org> 382-1ok
-- New upstream.
+* Sat Feb 14 2004 Karsten Hopp <karsten at redhat.de> 382-1
+- new upstream version
 
-* Fri Dec  5 2003 Erlend Midttun <erlendbm at trustix dot org> 381-1tr
-- New upstream.
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Oct 20 2003 Michael Scheffler <duke at tawie dot org> 376-6ms
-- Added $RPM_OPT_FLAGS
-- Added 64bit file support
+* Thu Jan 15 2004 Karsten Hopp <karsten at redhat.de> 381-2 
+- drop iso247 patch, doesn't work
 
-* Mon Jun 23 2003 Erlend Midttun <erlendbm at trustix dot com> 376-5tr
-- Added %defattr.
+* Wed Jun 11 2003 Karsten Hopp <karsten at redhat.de> 381-1
+- new version with rewritten iso247 patch
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 376-4tr
-- Big rebuild
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Thu May 15 2003 Erlend Midttun <erlendbm at trustix dot com> 376-3em
-- Added LESSCHARSET -> iso8859
+* Wed May 28 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- fix korean #79977
+- add new less.sh from #89780, s/ko/korean/ and write .csh script
+- add patch from #91661: /japanses/japanese-euc/
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 376-2em
-- Rebuilt against glibc 2.3.2.
+* Tue Feb  4 2003 Tim Waugh <twaugh at redhat.com> 378-7
+- Part of multibyte patch was missing; fixed.
 
-* Wed Jul 24 2002 Christian H. Toldnes <christht at trustix dot com> 376-1ct
-- New upstream version: 376
-- Changed back to original version numbers, as this is what the author wants.
+* Mon Feb  3 2003 Tim Waugh <twaugh at redhat.com> 378-6
+- Fix underlining multibyte characters (bug #83377).
 
-* Wed Jul  3 2002 Christian H. Toldnes <christht at trustix dot com> 0.0.374-1ct
-- Update to 374, called it 0.0.374 since this is for TSL 2.0
-- spec file cleanup
+* Thu Jan 30 2003 Karsten Hopp <karsten at redhat.de> 378-5
+- removed older, unused patches
+- add patch from Yukihiro Nakai to fix display of japanese text
+  (#79977)
 
-* Wed Sep 13 2000 Erlend Midttun <erlendbm at trustix dot com>
-- version 358
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
 
-* Thu May 11 2000 Oystein Viggen <oysteivi at trustix dot com>
-- version 354
+* Wed Dec 18 2002 Karsten Hopp <karsten at redhat.de>?
+- removed default 'cat' from lesspipe.sh as it breaks 'v' and 'F' keys 
+  (#79921)
 
-* Wed Mar 29 2000 Lars Gaarden <larsg at trustix dot com>
-- Moved man pages to /usr/share, FHS.
+* Fri Dec  6 2002 Nalin Dahyabhai <nalin at redhat.com> 378-2
+- add a default case to lesspipe so that it shows other kinds of files
 
+* Mon Nov 04 2002 Karsten Hopp <karsten at redhat.de>
+- less-378
+- added some debian patches
+- show image info instead of binary garbage when viewing images
+
+* Fri Oct 05 2001 Karsten Hopp <karsten at redhat.de>
+- fix line numbering (less -N filename), caused by
+  a broken i18n patch
+
+* Tue Sep 04 2001 Karsten Hopp <karsten at redhat.de>
+- recompile with large file support (#52945)
+
+* Tue Jul 24 2001 Karsten Hopp <karsten at redhat.de>
+- fix #49506 (BuildRequires)
+
+* Mon Jun 25 2001 Nalin Dahyabhai <nalin at redhat.com>
+- fixup eline patch to initialize result correctly
+
+* Mon Jun 25 2001 Karsten Hopp <karsten at redhat.de>
+- update URLs
+- Copyright -> License
+- fix #43348 (crashes when searching for /<)
+- fix #39849 (
+  _ ignores LESSCHARDEF in displaying characters,
+  _ prefaces sequences of one or "high" characters with a capital "A")
+
+* Mon Feb  5 2001 Yukihiro Nakai <ynakai at redhat.com>
+- Update less.sh, less.csh to set JLESSCHARSET=japanese
+  when LANG=ja??
+
+* Mon Feb  5 2001 Matt Wilson <msw at redhat.com>
+- changed the less-358+iso247-20001210.diff patch to use strcasecmp when
+  comparing locale names
+
+* Thu Feb 01 2001 Karsten Hopp <karsten at redhat.de>
+- fixed character translations (bugzilla #24463)
+
+* Wed Jan 31 2001 Karsten Hopp <karsten at redhat.de>
+- fixed lesspipe (bugzilla #17456 #25324)
+
+* Tue Dec 12 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- rebuild with new ncurses
+
+* Mon Dec 11 2000 Yukihiro Nakai <ynakai at redhat.com>
+- Add Japanese patch with ia64 support.
+
+* Mon Nov 27 2000 Karsten Hopp <karsten at redhat.de>
+- rebuild with new ncurses
+- fix Bug #21288
+
+* Mon Nov 13 2000 Karsten Hopp <karsten at redhat.de>
+- fixed handling of manpages of type *.1x.gz
+- added support for cpio packages
+
+* Thu Sep 14 2000 Than Ngo <than at redhat.com>
+- added new lesspipe.sh (Bug #17456)
+
+* Wed Aug 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- support files with spaces in their names (Bug #16777)
+
+* Tue Aug  8 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Support gzipped man pages in lesspipe.sh (Bug #15610)
+
+* Thu Aug  3 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Tweak init script (Bug #14622)
+
+* Thu Jul 27 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Oops, actually apply the patch for 9443. ;)
+
+* Wed Jul 26 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix up messed output if a user outputs anything in ~/.bashrc or the
+  likes (Bug #9443)
+- handle RPM_OPT_FLAGS
+
+* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 358
+
+* Mon Jun 26 2000 Matt Wilson <msw at redhat.com>
+- defattr root
+
+* Mon Jun 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- FHSify
+
+* Fri Apr 14 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- 354
+
+* Mon Mar 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update to v352
+
+* Tue Mar  7 2000 Jeff Johnson <jbj at redhat.com>
+- rebuild for sparc baud rates > 38400.
+
 * Tue Jan 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
 - Update to v346
 - Update download URL
@@ -133,4 +235,4 @@
 - added buildroot
 
 * Mon Jun 02 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
\ No newline at end of file
+- built against glibc


From svn at tinysofa.org  Wed Jun 30 14:57:03 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  1 Jul 2004 00:57:03 +1000 (EST)
Subject: [tinysofa-svn] r2452 - tinysofa/releases/1.1/less/current/specs
Message-ID: <20040630145703.D918B4E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-07-01 00:57:03 +1000 (Thu, 01 Jul 2004)
New Revision: 2452

Modified:
   tinysofa/releases/1.1/less/current/specs/less.spec
Log:
- fix group


Modified: tinysofa/releases/1.1/less/current/specs/less.spec
===================================================================
--- tinysofa/releases/1.1/less/current/specs/less.spec	2004-06-30 14:56:40 UTC (rev 2451)
+++ tinysofa/releases/1.1/less/current/specs/less.spec	2004-06-30 14:57:03 UTC (rev 2452)
@@ -3,7 +3,7 @@
 Version: 382
 Release: 6jh
 License: GPL
-Group: Applications/Text
+Group: tinysofa/main
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
 Source1: lesspipe.sh
 Source2: less.sh


From svn at tinysofa.org  Wed Jun 30 14:59:23 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  1 Jul 2004 00:59:23 +1000 (EST)
Subject: [tinysofa-svn] r2453 - tinysofa/releases/1.1/less/current/specs
Message-ID: <20040630145923.B8E294E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-07-01 00:59:23 +1000 (Thu, 01 Jul 2004)
New Revision: 2453

Modified:
   tinysofa/releases/1.1/less/current/specs/less.spec
Log:
- build fixes


Modified: tinysofa/releases/1.1/less/current/specs/less.spec
===================================================================
--- tinysofa/releases/1.1/less/current/specs/less.spec	2004-06-30 14:57:03 UTC (rev 2452)
+++ tinysofa/releases/1.1/less/current/specs/less.spec	2004-06-30 14:59:23 UTC (rev 2453)
@@ -11,7 +11,7 @@
 Patch0:	less-382-ncursesw.patch
 URL: http://www.greenwoodsoftware.com/less/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: ncurses-devel
+BuildRequires: ncurses-devel autoconf autoheader
 
 %description
 The less utility is a text file browser that resembles more, but has
@@ -27,6 +27,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .ncursesw
+chmod -R u+w *
 
 
 %build


From svn at tinysofa.org  Wed Jun 30 15:25:02 2004
From: svn at tinysofa.org (svn at tinysofa.org)
Date: Thu,  1 Jul 2004 01:25:02 +1000 (EST)
Subject: [tinysofa-svn] 
	r2454 - in tinysofa/releases/1.1/libtermcap/current: sources specs
Message-ID: <20040630152502.85BB44E8032@minbar.tinysofa.org>

Author: jh
Date: 2004-07-01 01:25:02 +1000 (Thu, 01 Jul 2004)
New Revision: 2454

Added:
   tinysofa/releases/1.1/libtermcap/current/sources/libtermcap-2.0.8-ia64.patch
   tinysofa/releases/1.1/libtermcap/current/sources/termcap-116934.patch
   tinysofa/releases/1.1/libtermcap/current/sources/termcap-2.0.8.tar.bz2
Removed:
   tinysofa/releases/1.1/libtermcap/current/sources/termcap-2.0.8.tar.gz
Modified:
   tinysofa/releases/1.1/libtermcap/current/specs/libtermcap.spec
Log:
- update spec file from ts2


Added: tinysofa/releases/1.1/libtermcap/current/sources/libtermcap-2.0.8-ia64.patch
===================================================================
--- tinysofa/releases/1.1/libtermcap/current/sources/libtermcap-2.0.8-ia64.patch	2004-06-30 14:59:23 UTC (rev 2453)
+++ tinysofa/releases/1.1/libtermcap/current/sources/libtermcap-2.0.8-ia64.patch	2004-06-30 15:25:02 UTC (rev 2454)
@@ -0,0 +1,13 @@
+--- termcap-2.0.8/termcap.c.ia64sux	Mon Jan 14 17:59:19 2002
++++ termcap-2.0.8/termcap.c	Mon Jan 14 18:00:01 2002
+@@ -694,6 +694,10 @@
+ 	(*outfun) (PC);
+ }
+ 
++static long foo(long x, long y)
++{
++	return x / y;
++}
+ 
+ #ifdef TEST
+ /*ARGSUSED*/

Added: tinysofa/releases/1.1/libtermcap/current/sources/termcap-116934.patch
===================================================================
--- tinysofa/releases/1.1/libtermcap/current/sources/termcap-116934.patch	2004-06-30 14:59:23 UTC (rev 2453)
+++ tinysofa/releases/1.1/libtermcap/current/sources/termcap-116934.patch	2004-06-30 15:25:02 UTC (rev 2454)
@@ -0,0 +1,12 @@
+--- termcap-2.0.8/termcap.c.116934	2004-04-21 14:02:57.000000000 +0100
++++ termcap-2.0.8/termcap.c	2004-04-21 14:03:57.000000000 +0100
+@@ -457,6 +457,9 @@
+        put data in the termcap buffer themselves as a fallback.  */
+     if (buffer)
+     {
++      /* Free old buffer if possible. */
++      if (is_malloced && term_entry) free(term_entry);
++      is_malloced = 0;
+       term_entry = buffer;
+     }
+     return(0);

Added: tinysofa/releases/1.1/libtermcap/current/sources/termcap-2.0.8.tar.bz2
===================================================================
(Binary files differ)


Property changes on: tinysofa/releases/1.1/libtermcap/current/sources/termcap-2.0.8.tar.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: tinysofa/releases/1.1/libtermcap/current/sources/termcap-2.0.8.tar.gz
===================================================================
(Binary files differ)

Modified: tinysofa/releases/1.1/libtermcap/current/specs/libtermcap.spec
===================================================================
--- tinysofa/releases/1.1/libtermcap/current/specs/libtermcap.spec	2004-06-30 14:59:23 UTC (rev 2453)
+++ tinysofa/releases/1.1/libtermcap/current/specs/libtermcap.spec	2004-06-30 15:25:02 UTC (rev 2454)
@@ -1,11 +1,11 @@
 Summary: A basic system library for accessing the termcap database.
 Name: libtermcap
 Version: 2.0.8
-Release: 29ts
+Release: 30jh
+Source: ftp://metalab.unc.edu/pub/Linux/GCC/termcap-2.0.8.tar.bz2
+Url: ftp://metalab.unc.edu/pub/Linux/GCC/
 License: LGPL
-Group: tinysofa official
-Source: ftp://sunsite.unc.edu/pub/Linux/GCC/termcap-2.0.8.tar.gz
-Url: ftp://sunsite.unc.edu/pub/Linux/GCC/
+Group: tinysofa/main
 Patch0: termcap-2.0.8-shared.patch
 Patch1: termcap-2.0.8-setuid.patch
 Patch2: termcap-2.0.8-instnoroot.patch
@@ -18,12 +18,12 @@
 Patch8: termcap-2.0.8-bufsize.patch
 Patch9: termcap-2.0.8-colon.patch
 Patch10: libtermcap-aaargh.patch
-Patch11: termcap-2.0.8-infopath.patch
-Patch12: termcap-2.0.8-glibc22.patch
-Patch13: termcap-2.0.8-noinfo.patch
-BuildRequires: termcap
-Requires: termcap
-BuildRoot: %{_tmppath}/%{name}-root
+Patch11: termcap-2.0.8-glibc22.patch
+Patch12: libtermcap-2.0.8-ia64.patch
+Patch13: termcap-116934.patch
+Patch14: termcap-2.0.8-noinfo.patch
+Requires: /etc/termcap
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 The libtermcap package contains a basic system library needed to
@@ -33,8 +33,8 @@
 
 %package devel
 Summary: Development tools for programs which will access the termcap database.
-Group: tinysofa official
-Requires: libtermcap
+Group: Development/Libraries
+Requires: libtermcap = %{version}
 
 %description devel
 This package includes the libraries and header files necessary for
@@ -44,6 +44,7 @@
 you'll need to install this package.  You'll also need to install the
 libtermcap package.
 
+
 %prep
 %setup -q -n termcap-2.0.8
 %patch0 -p1
@@ -57,73 +58,137 @@
 %patch8 -p1 -b .bufsize
 %patch9 -p1 -b .colon
 %patch10 -p1 -b .aaargh
-#%patch11 -p1
-%patch12 -p1
-%patch13 -p1 -b .noinfo
+%patch11 -p1 -b .glibc22
+%ifarch ia64
+%patch12 -p1 -b .ia64
+%endif
+%patch13 -p1 -b .116934
+%patch14 -p1 -b .noinfo
 
+
 %build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+%make AR=%{__ar} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -I."
 
+
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p $RPM_BUILD_ROOT/{usr/lib,usr/include,etc,lib}
+mkdir -p $RPM_BUILD_ROOT/{usr/lib,%{_infodir},usr/include,etc,lib}
 
 export PATH=/sbin:$PATH
 make prefix=$RPM_BUILD_ROOT/usr install
 
-install -m644 termcap.src $RPM_BUILD_ROOT/etc/termcap
+install -c -m644 termcap.src $RPM_BUILD_ROOT/etc/termcap
+cp termcap.info* $RPM_BUILD_ROOT/%{_infodir}
 
-( cd $RPM_BUILD_ROOT
-  rm -f ./etc/termcap
-  mv ./usr/lib/libtermcap.so* ./lib
-  ln -sf libtermcap.so.2.0.8 ./lib/libtermcap.so
-  ln -sf ../../lib/libtermcap.so.2.0.8 ./usr/lib/libtermcap.so
-)
+rm -f $RPM_BUILD_ROOT/etc/termcap
+mkdir -p $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT/%{_libdir}
+mv $RPM_BUILD_ROOT/usr/lib/libtermcap.so* $RPM_BUILD_ROOT/%{_lib}/
+ln -sf libtermcap.so.2.0.8 $RPM_BUILD_ROOT/%{_lib}/libtermcap.so.2
+ln -sf ../../%{_lib}/libtermcap.so.2.0.8 $RPM_BUILD_ROOT/%{_libdir}/libtermcap.so
+if [ %{_libdir} != /usr/lib ] ; then
+ mv $RPM_BUILD_ROOT/usr/lib/libtermcap.a $RPM_BUILD_ROOT/%{_libdir}/libtermcap.a
+fi
 
+%nuke_info
+
+
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%clean_buildroot
 
+
 %post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-/lib/libtermcap.so.2.0.8
+/%{_lib}/libtermcap.so.2*
 
 %files devel
 %defattr(-,root,root)
-/usr/lib/libtermcap.a
-/usr/include/termcap.h
-/usr/lib/libtermcap.so
+%{_libdir}/libtermcap.a
+%{_libdir}/libtermcap.so
+%{_includedir}/termcap.h
 
+
 %changelog
-* Wed May 19 2004 tsintegrate <release at tinysofa.org> 2.0.8-29ts
-- current (2.0.8-28ts) integrated as 2.0.8-29ts for release 1.0-U1
+* Fri May  7 2004 Tim Waugh <twaugh at redhat.com> 2.0.8-38
+- Fix tgetent() (bug #116934).
 
-* Thu Dec 11 2003 Erlend Midttun <erlendbm at trustix dot com> 2.0.8-25tr
-- Big rebuild
+* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Wed Jun 18 2003 Erlend Midttun <erlendbm at trustix dot com> 2.0.8-24tr
-- Big rebuild
+* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Mon Mar 24 2003 Erlend Midttun <erlendbm at trustix dot com> 2.0.8-23em
-- Rebuilt against glibc 2.3.2.
+* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
+- rebuilt
 
-* Thu Aug 29 2002 Christian H. Toldnes <christht at trustix dot com> 2.0.8-22ct
-- Patched away info generation.
+* Tue Feb 04 2003 Florian La Roche <Florian.LaRoche at redhat.de>
+- add symlink to shared lib
 
-* Tue Aug  6 2002 Christian H. Toldnes <christht at trustix dot com> 2.0.8-21ct
-- Patched to build against new glibc (Patch 12)
-- Removed info stuff.
+* Mon Jan 27 2003 Nalin Dahyabhai <nalin at redhat.com> 2.0.8-34
+- don't strip libraries directly, that's the job of the buildroot policy
+- rework part of %%install to handle cases where %%{_libdir} = /usr/lib
 
-* Tue Jul 17 2001 Erlend Midttun <erlendbm at trustix dot com>
-- Inc serial number before release.
+* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
+- rebuilt
 
-* Mon Jan 24 2000 Tore Olsen <toreo at trustix dot com>
-- moved /usr/info to /usr/share/info for FHS compliance
+* Thu Nov 21 2002 Elliot Lee <sopwith at redhat.com> 2.0.8-33
+- Cross-compile changes
 
+* Thu Nov 21 2002 Elliot Lee <sopwith at redhat.com>
+- Pull in hammer changes, rebuild
+
+* Tue Sep 24 2002 Jeremy Katz <katzj at redhat.com>
+- libdir fun
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Mon Jan 14 2002 Bernhard Rosenkraenzer <bero at redhat.com> 2.0.8-29
+- Add workaround for libgcc/glibc breakage on ia64
+- s/Copyright/License/ in spec file
+- bzip2 source to save space
+
+* Mon Jul  9 2001 Tim Powers <timp at redhat.com>
+- make libtermcap-devel require the same version as the main package
+
+* Thu Jun 21 2001 Than Ngo <than at redhat.com>
+- add missing libtermcap symlink
+
+* Sat Oct  7 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Uninstall info pages in %%postun devel rather than %%postun
+  (Bug #18545)
+
+* Wed Aug 16 2000 Nalin Dahyabhai <nalin at redhat.com>
+- fix broken symlink (#16285)
+
+* Mon Aug 14 2000 Preston Brown <pbrown at redhat.com>
+- absolute --> relative symlink (#16131)
+
+* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
+- automatic rebuild
+
+* Tue Jul  4 2000 Matt Wilson <msw at redhat.com>
+- move the trigger to the devel package, that's where the info pages
+  live now
+
+* Sun Jun 18 2000 Matt Wilson <msw at redhat.com>
+- rebuild for next release
+- move info pages to the development package
+- use %%{_infodir}
+- patched to build against new glibc (patch11)
+
+* Sun Feb  6 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- BuildPrereq: texinfo (#8927)
+
+* Sat Feb  5 2000 Bernhard Rosenkr?nzer <bero at redhat.com>
+- strip library
+- fix up handling of RPM_OPT_FLAGS
+
 * Tue Aug 30 1999 Bill Nottingham <notting at redhat.com>
 - ignore the first argument to tgetent, so the last change doesn't
   keep blowing up programs.
@@ -173,4 +238,4 @@
 - spec file cleanups
 
 * Tue Jun 03 1997 Erik Troan <ewt at redhat.com>
-- built against glibc
\ No newline at end of file
+- built against glibc