From svn at tinysofa.org Tue Mar 1 13:36:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 1 Mar 2005 08:36:45 -0500 (EST) Subject: [tinysofa-svn] r6105 - in tinysofa/releases/1.2/httpd/current: sources specs Message-ID: <20050301133645.40F60344479@minbar.tinysofa.org> Author: jh Date: 2005-03-01 08:33:57 -0500 (Tue, 01 Mar 2005) New Revision: 6105 Added: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.53.tar.gz Removed: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.52-CAN-2004-0885.patch tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.52-CAN-2004-0942.patch tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.52.tar.gz Modified: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.40-apctl.patch tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.40-xfsz.patch tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.45-export.patch tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.46-dumpcerts.patch tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.47-pie.patch tinysofa/releases/1.2/httpd/current/specs/httpd.spec Log: - 2.0.53 Modified: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.40-apctl.patch =================================================================== --- tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.40-apctl.patch 2005-02-26 23:47:20 UTC (rev 6104) +++ tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.40-apctl.patch 2005-03-01 13:33:57 UTC (rev 6105) @@ -2,13 +2,15 @@ - fail gracefully if a 1.3 config file is found - use links not lynx, and fail gracefully when neither is found - source sysconfig/httpd for custom env. vars etc. +- make httpd -t work even in SELinux +- refuse to restart into a bad config (done better on HEAD) Upstream-HEAD: vendor Upstream-2.0: vendor Upstream-Status: Vendor-specific changes for better initscript integration ---- httpd-2.0.49/support/apachectl.in.apctl -+++ httpd-2.0.49/support/apachectl.in +--- httpd-2.0.52/support/apachectl.in.apctl ++++ httpd-2.0.52/support/apachectl.in @@ -41,32 +41,27 @@ # # the path to your httpd binary, including options if necessary @@ -55,7 +57,7 @@ fi ERROR=0 -@@ -74,12 +69,33 @@ +@@ -74,23 +69,65 @@ ARGV="-h" fi @@ -78,8 +80,29 @@ +fi +} + ++function testconfig() { ++# httpd is denied terminal access in SELinux, so run in the ++# current context to get stdout from $HTTPD -t. ++if test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled; then ++ runcon -- `id -Z` $HTTPD -t ++else ++ $HTTPD -t ++fi ++ERROR=$? ++} ++ case $ARGV in - start|stop|restart|graceful) +-start|stop|restart|graceful) ++restart|graceful) ++ if $HTTPD -t >&/dev/null; then ++ $HTTPD -k $ARGV ++ ERROR=$? ++ else ++ echo "apachectl: Configuration syntax error, will not run \"$ARGV\":" ++ testconfig ++ fi ++ ;; ++start|stop) + check13 $HTTPD -k $ARGV ERROR=$? @@ -89,8 +112,10 @@ $HTTPD -k start -DSSL ERROR=$? ;; -@@ -88,9 +104,11 @@ - ERROR=$? + configtest) +- $HTTPD -t +- ERROR=$? ++ testconfig ;; status) + checklynx Modified: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.40-xfsz.patch =================================================================== --- tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.40-xfsz.patch 2005-02-26 23:47:20 UTC (rev 6104) +++ tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.40-xfsz.patch 2005-03-01 13:33:57 UTC (rev 6105) @@ -2,9 +2,9 @@ Set SIGXFSZ to be ignored, so a write() beyond 2gb will fail with E2BIG rather than killing the process -Upstream-HEAD: omit +Upstream-HEAD: needed Upstream-2.0: omit -Upstream-Status: Obsoleted by proper LFS support in APR +Upstream-Status: Obsoleted by proper LFS support in APR, do it anyway Upstream-PR: 13511 --- ./server/mpm/prefork/prefork.c.xfsz Wed Jul 17 22:39:55 2002 Modified: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.45-export.patch =================================================================== --- tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.45-export.patch 2005-02-26 23:47:20 UTC (rev 6104) +++ tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.45-export.patch 2005-03-01 13:33:57 UTC (rev 6105) @@ -6,9 +6,9 @@ Upstream-2.0: omit Upstream-Status: EXPORT_DIRS change is conditional on using shared apr ---- httpd-2.0.48/server/main.c.export -+++ httpd-2.0.48/server/main.c -@@ -669,28 +669,6 @@ +--- httpd-2.0.53/server/main.c.export ++++ httpd-2.0.53/server/main.c +@@ -627,28 +627,6 @@ return 0; /* Termination 'ok' */ } @@ -37,14 +37,16 @@ #ifdef AP_USING_AUTOCONF /* This ugly little hack pulls any function referenced in exports.c into * the web server. exports.c is generated during the build, and it ---- httpd-2.0.48/server/Makefile.in.export -+++ httpd-2.0.48/server/Makefile.in -@@ -30,7 +30,7 @@ +--- httpd-2.0.53/server/Makefile.in.export ++++ httpd-2.0.53/server/Makefile.in +@@ -59,10 +59,6 @@ + for dir in $(EXPORT_DIRS); do \ + ls $$dir/*.h >> $$tmp; \ + done; \ +- for dir in $(EXPORT_DIRS_APR); do \ +- ls $$dir/ap[ru].h >> $$tmp; \ +- ls $$dir/ap[ru]_*.h >> $$tmp; \ +- done; \ + sort -u $$tmp > $@; \ + rm -f $$tmp - util.lo: test_char.h - --EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) $(top_srcdir)/modules/http -+EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) $(top_srcdir)/modules/http - - # If export_files is a dependency here, but we remove it during this stage, - # when exports.c is generated, make will not detect that export_files is no Modified: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.46-dumpcerts.patch =================================================================== --- tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.46-dumpcerts.patch 2005-02-26 23:47:20 UTC (rev 6104) +++ tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.46-dumpcerts.patch 2005-03-01 13:33:57 UTC (rev 6105) @@ -6,9 +6,9 @@ dumps the list of configured certificate files to stdout. -Upstream-HEAD: needed +Upstream-HEAD: committed Upstream-2.0: omit -Upstream-Status: Depends on the test_config hook in HEAD +Upstream-Status: 2.0 backport would depend on the test_config hook backport --- httpd-2.0.46/modules/ssl/mod_ssl.c.dumpcerts +++ httpd-2.0.46/modules/ssl/mod_ssl.c Modified: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.47-pie.patch =================================================================== --- tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.47-pie.patch 2005-02-26 23:47:20 UTC (rev 6104) +++ tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.47-pie.patch 2005-03-01 13:33:57 UTC (rev 6105) @@ -7,8 +7,8 @@ - define AP_FNAME for the debuglog patch *note the -debuglog patch depends on this patch* -Upstream-HEAD: needed -Upstream-Status: Should go upstream as an --enable-pie flag or similar +Upstream-HEAD: committed +Upstream-Status: committed for 2.1.3 --- httpd-2.0.47/build/rules.mk.in.pie +++ httpd-2.0.47/build/rules.mk.in Deleted: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.52-CAN-2004-0885.patch =================================================================== --- tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.52-CAN-2004-0885.patch 2005-02-26 23:47:20 UTC (rev 6104) +++ tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.52-CAN-2004-0885.patch 2005-03-01 13:33:57 UTC (rev 6105) @@ -1,48 +0,0 @@ - -Add fix for CAN-2004-0885, SSLCipherSuite bypass. - -Upstream-2.0: pending -Upstream-HEAD: committed -Upstream-Status: mod_ssl fix for CAN-2004-0885 - ---- httpd-2.0.52/modules/ssl/ssl_engine_kernel.c.can0885 -+++ httpd-2.0.52/modules/ssl/ssl_engine_kernel.c -@@ -719,6 +719,21 @@ - X509_free(peercert); - } - } -+ -+ /* -+ * Also check that SSLCipherSuite has been enforced as expected. -+ */ -+ if (cipher_list) { -+ cipher = SSL_get_current_cipher(ssl); -+ if (sk_SSL_CIPHER_find(cipher_list, cipher) < 0) { -+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, -+ "SSL cipher suite not renegotiated: " -+ "access to %s denied using cipher %s", -+ r->filename, -+ SSL_CIPHER_get_name(cipher)); -+ return HTTP_FORBIDDEN; -+ } -+ } - } - - /* ---- httpd-2.0.52/modules/ssl/ssl_engine_init.c.can0885 -+++ httpd-2.0.52/modules/ssl/ssl_engine_init.c -@@ -439,6 +439,14 @@ - * Configure additional context ingredients - */ - SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE); -+ -+#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION -+ /* -+ * Disallow a session from being resumed during a renegotiation, -+ * so that an acceptable cipher suite can be negotiated. -+ */ -+ SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION); -+#endif - } - - static void ssl_init_ctx_session_cache(server_rec *s, Deleted: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.52-CAN-2004-0942.patch =================================================================== --- tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.52-CAN-2004-0942.patch 2005-02-26 23:47:20 UTC (rev 6104) +++ tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.52-CAN-2004-0942.patch 2005-03-01 13:33:57 UTC (rev 6105) @@ -1,110 +0,0 @@ - -Fix for memory consumption DoS, CVE CAN-2004-0942: - - * server/protocol.c (ap_rgetline_core): Don't trim trailing whitespace - from the buffer here. - (ap_get_mime_headers_core): Trim trailing whitespace here, after - reading a complete field including continuation lines. Also simplify - code to remove whitespace between field-name and colon. - -Upstream-HEAD: committed -Upstream-2.0: committed - ---- httpd-2.0.52/server/protocol.c.can0942 -+++ httpd-2.0.52/server/protocol.c -@@ -305,35 +305,13 @@ - } - } - -- /* We now go backwards over any CR (if present) or white spaces. -- * -- * Trim any extra trailing spaces or tabs except for the first -- * space or tab at the beginning of a blank string. This makes -- * it much easier to check field values for exact matches, and -- * saves memory as well. Terminate string at end of line. -- */ -- pos = last_char; -- if (pos > *s && *(pos - 1) == APR_ASCII_CR) { -- --pos; -+ /* Now NUL-terminate the string at the end of the line; -+ * if the last-but-one character is a CR, terminate there */ -+ if (last_char > *s && last_char[-1] == APR_ASCII_CR) { -+ last_char--; - } -- -- /* Trim any extra trailing spaces or tabs except for the first -- * space or tab at the beginning of a blank string. This makes -- * it much easier to check field values for exact matches, and -- * saves memory as well. -- */ -- while (pos > ((*s) + 1) -- && (*(pos - 1) == APR_ASCII_BLANK || *(pos - 1) == APR_ASCII_TAB)) { -- --pos; -- } -- -- /* Since we want to remove the LF from the line, we'll go ahead -- * and set this last character to be the term NULL and reset -- * bytes_handled accordingly. -- */ -- *pos = '\0'; -- last_char = pos; -- bytes_handled = pos - *s; -+ *last_char = '\0'; -+ bytes_handled = last_char - *s; - - /* If we're folding, we have more work to do. - * -@@ -751,7 +729,7 @@ - last_len += len; - folded = 1; - } -- else { -+ else /* not a continuation line */ { - - if (r->server->limit_req_fields - && (++fields_read > r->server->limit_req_fields)) { -@@ -774,29 +752,26 @@ - "\n", NULL)); - return; - } -+ -+ tmp_field = value - 1; /* last character of field-name */ -+ -+ *value++ = '\0'; /* NUL-terminate at colon */ - -- *value = '\0'; -- tmp_field = value; /* used to trim the whitespace between key -- * token and separator -- */ -- ++value; - while (*value == ' ' || *value == '\t') { - ++value; /* Skip to start of value */ - } - -- /* This check is to avoid any invalid memory reference while -- * traversing backwards in the key. To avoid a case where -- * the header starts with ':' (or with just some white -- * space and the ':') followed by the value -- */ -- if (tmp_field > last_field) { -- --tmp_field; -- while ((tmp_field > last_field) && -- (*tmp_field == ' ' || *tmp_field == '\t')) { -- --tmp_field; /* Removing LWS between key and ':' */ -- } -- ++tmp_field; -- *tmp_field = '\0'; -+ /* Strip LWS after field-name: */ -+ while (tmp_field > last_field -+ && (*tmp_field == ' ' || *tmp_field == '\t')) { -+ *tmp_field-- = '\0'; -+ } -+ -+ /* Strip LWS after field-value: */ -+ tmp_field = last_field + last_len - 1; -+ while (tmp_field > value -+ && (*tmp_field == ' ' || *tmp_field == '\t')) { -+ *tmp_field-- = '\0'; - } - - apr_table_addn(r->headers_in, last_field, value); Deleted: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.52.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.53.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/httpd/current/sources/httpd-2.0.53.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/httpd/current/specs/httpd.spec =================================================================== --- tinysofa/releases/1.2/httpd/current/specs/httpd.spec 2005-02-26 23:47:20 UTC (rev 6104) +++ tinysofa/releases/1.2/httpd/current/specs/httpd.spec 2005-03-01 13:33:57 UTC (rev 6105) @@ -6,8 +6,8 @@ Summary: Apache HTTP Server Name: httpd -Version: 2.0.52 -Release: 2jh +Version: 2.0.53 +Release: 1jh URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html.tinysofa @@ -63,9 +63,6 @@ Patch90: httpd-2.0.49-workerstack.patch Patch91: httpd-2.0.46-testhook.patch Patch92: httpd-2.0.46-dumpcerts.patch -# Security fixes -Patch120: httpd-2.0.52-CAN-2004-0885.patch -Patch121: httpd-2.0.52-CAN-2004-0942.patch License: Apache Software License Group: main BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -83,9 +80,9 @@ Conflicts: pcre < 4.0 %description -Apache is a powerful, full-featured, efficient, and freely-available -Web server. Apache is also the most popular Web server on the -Internet. +The Apache HTTP Server is a powerful, full-featured, efficient, and +freely-available Web server. The Apache HTTP Server is also the +most popular Web server on the Internet. %package devel Group: development @@ -95,7 +92,8 @@ %description devel The httpd-devel package contains the APXS binary and other files -that you need to build Dynamic Shared Objects (DSOs) for Apache. +that you need to build Dynamic Shared Objects (DSOs) for the +Apache HTTP Server. If you are installing the Apache HTTP server and you want to be able to compile or develop additional modules for Apache, you need @@ -115,7 +113,7 @@ %package -n mod_ssl Group: main Summary: SSL/TLS module for the Apache HTTP server -Serial: 1 +Epoch: 1 BuildRequires: openssl-devel, distcache-devel Prereq: openssl, dev, /bin/cat Requires: httpd = %{version}-%{release}, make, httpd-mmn = %{mmn} @@ -177,9 +175,6 @@ %patch91 -p1 -b .testhook %patch92 -p1 -b .dumpcerts -%patch120 -p1 -b .can0885 -%patch121 -p1 -b .can0942 - # Patch in vendor/release string sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1 @@ -273,14 +268,6 @@ # easiest way seems to be enable them shared. mpmbuild worker --enable-mods-shared=all -# Verify that the same modules were built into the two httpd binaries -./prefork/httpd -l | grep -v prefork > prefork.mods -./worker/httpd -l | grep -v worker > worker.mods -if ! diff -u prefork.mods worker.mods; then - : Different modules built into httpd binaries, will not proceed - exit 1 -fi - %install rm -rf $RPM_BUILD_ROOT @@ -295,8 +282,12 @@ install -m 755 worker/httpd $RPM_BUILD_ROOT%{_sbindir}/httpd.worker # link to system pcreposix.h -ln -s ../pcre/pcreposix.h $RPM_BUILD_ROOT%{_includedir}/httpd/pcreposix.h +ln -s ../pcreposix.h $RPM_BUILD_ROOT%{_includedir}/httpd/pcreposix.h +# install htsslpass(1) and man page +install -m 755 htsslpass $RPM_BUILD_ROOT%{_bindir}/htsslpass +install -m 644 htsslpass.1 $RPM_BUILD_ROOT%{_mandir}/man1/htsslpass.1 + # install conf file/directory mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d install -m 644 $RPM_SOURCE_DIR/README.confd \ @@ -477,6 +468,14 @@ exit 1 fi +# Verify that the same modules were built into the two httpd binaries +./prefork/httpd -l | grep -v prefork > prefork.mods +./worker/httpd -l | grep -v worker > worker.mods +if ! diff -u prefork.mods worker.mods; then + : Different modules built into httpd binaries, will not proceed + exit 1 +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -509,6 +508,7 @@ %{_sbindir}/httpd.worker %{_sbindir}/apachectl %{_sbindir}/rotatelogs +%exclude %{_bindir}/htsslpass %dir %{_libdir}/httpd %dir %{_libdir}/httpd/modules @@ -534,6 +534,7 @@ %{_mandir}/man?/* %exclude %{_mandir}/man8/apxs.8* %exclude %{_mandir}/man8/suexec.8* +%exclude %{_mandir}/man1/htsslpass.1* %files manual %defattr(-,root,root) @@ -541,6 +542,8 @@ %files -n mod_ssl %defattr(-,root,root) +%{_bindir}/htsslpass +%{_mandir}/man1/htsslpass.1* %{_libdir}/httpd/modules/mod_ssl.so %config(noreplace) %{_sysconfdir}/httpd/conf.d/ssl.conf %attr(0700,root,root) %dir %{_sysconfdir}/httpd/conf/ssl.* @@ -568,6 +571,9 @@ %{_mandir}/man8/suexec.8* %changelog +* Tue Mar 1 2005 Jaakko Heinonen 2.0.53-1jh +- 2.0.53 + * Tue Jan 04 2005 tsintegrate 2.0.52-1ts - current (2.0.52-1jh) integrated as 2.0.52-1ts for release 1.1-U3 From svn at tinysofa.org Tue Mar 1 13:47:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 1 Mar 2005 08:47:39 -0500 (EST) Subject: [tinysofa-svn] r6106 - in tinysofa/releases/1.2/httpd/current: sources specs Message-ID: <20050301134739.05B6E344587@minbar.tinysofa.org> Author: jh Date: 2005-03-01 08:47:29 -0500 (Tue, 01 Mar 2005) New Revision: 6106 Added: tinysofa/releases/1.2/httpd/current/sources/htsslpass.c Modified: tinysofa/releases/1.2/httpd/current/specs/httpd.spec Log: - build htsslpass Added: tinysofa/releases/1.2/httpd/current/sources/htsslpass.c =================================================================== --- tinysofa/releases/1.2/httpd/current/sources/htsslpass.c 2005-03-01 13:33:57 UTC (rev 6105) +++ tinysofa/releases/1.2/httpd/current/sources/htsslpass.c 2005-03-01 13:47:29 UTC (rev 6106) @@ -0,0 +1,148 @@ +/* Copyright 2004 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* SSLPassPhraseDialog tool: sent prompt text on stdin, sends back + * passwords on stdout; forwards both to/from /dev/tty. Written as a + * standalone executable to: (a) allow running within a separate + * SELinux security context; (b) enforce a 5 minute timeout to prevent + * httpd from hanging indefinitely if configured to start at boot. */ + +/* $Id: htsslpass.c,v 1.1 2004/11/18 11:59:52 jorton Exp $ */ + +/* Written by Joe Orton; file bugs against the httpd component in + * https://bugzilla.redhat.com/bugzilla/ */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int tty; +static struct termios torig; + +#define TIMEOUT_MSG "...timing out after 5 minutes.\n" +#define TIMEOUT (5 * 60) + +/* interrupt signal handler */ +static void interrupt(int signum) +{ + tcsetattr(tty, TCSANOW, &torig); + _exit(6); +} + +static int full_write(int fd, char *buffer, size_t len) +{ + ssize_t nb; + + do { + nb = write(fd, buffer, len); + if (nb == -1 && errno == EINTR) continue; + + buffer += nb; + len -= nb; + } while (nb > 0 && len); + + return len ? -1 : 0; +} + +/* Await input from the tty (passwords to send to mod_ssl), or stdin + * (output to send to the tty. */ +static int pollit(void) +{ + struct pollfd fds[2]; + int rv; + + fds[0].fd = tty; + fds[1].fd = STDIN_FILENO; + + fds[0].events = fds[1].events = POLLIN | POLLHUP; + + do { + fds[0].revents = fds[1].revents = 0; + + rv = poll(fds, 2, TIMEOUT * 1000); + + if (rv == -1 && errno == EINTR) + continue; + + if (rv > 0) { + int from, to; + ssize_t len; + char buffer[BUFSIZ]; + + if (fds[1].revents & (POLLIN|POLLHUP)) { + from = STDIN_FILENO; + to = tty; + } else { + from = tty; + to = STDOUT_FILENO; + } + + len = read(from, buffer, sizeof buffer); + if (len < 1) + return 0; + + if (full_write(to, buffer, len)) + return 1; + } + + } while (rv > 0); + + if (rv == 0) { + /* timeout */ + full_write(tty, TIMEOUT_MSG, strlen(TIMEOUT_MSG)); + tcdrain(tty); + rv = 1; + } + + return rv; +} + +int main(int argc, char **argv) +{ + struct termios tio; + int rv; + + /* open the tty */ + tty = open("/dev/tty", O_RDWR); + if (tty < 0) + exit(2); + + if (tcgetattr(tty, &torig) < 0) + exit(3); + + tio = torig; + tio.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL); + tio.c_lflag |= ICANON; + + signal(SIGTERM, interrupt); + signal(SIGINT, interrupt); + signal(SIGHUP, interrupt); + signal(SIGPIPE, interrupt); + + if (tcsetattr(tty, TCSAFLUSH, &tio) < 0) + exit(3); + + rv = pollit() ? 4 : 0; + + tcsetattr(tty, TCSAFLUSH, &torig); + exit(rv); +} Property changes on: tinysofa/releases/1.2/httpd/current/sources/htsslpass.c ___________________________________________________________________ Name: svn:executable + * Modified: tinysofa/releases/1.2/httpd/current/specs/httpd.spec =================================================================== --- tinysofa/releases/1.2/httpd/current/specs/httpd.spec 2005-03-01 13:33:57 UTC (rev 6105) +++ tinysofa/releases/1.2/httpd/current/specs/httpd.spec 2005-03-01 13:47:29 UTC (rev 6106) @@ -21,6 +21,7 @@ Source12: welcome.conf Source14: mod_ssl-Makefile.crt Source15: mod_ssl-Makefile.crl +Source16: htsslpass.c # Documentation Source33: README.confd # build/scripts patches @@ -219,6 +220,10 @@ %{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \ support/apachectl.in +# Build htsslpass +cp $RPM_SOURCE_DIR/htsslpass.c . || exit 1 +gcc $RPM_OPT_FLAGS -Wall -Werror htsslpass.c -o htsslpass + CFLAGS=$RPM_OPT_FLAGS CPPFLAGS="-DSSL_EXPERIMENTAL_ENGINE -I/usr/include/pcre" export CFLAGS CPPFLAGS @@ -284,9 +289,8 @@ # link to system pcreposix.h ln -s ../pcreposix.h $RPM_BUILD_ROOT%{_includedir}/httpd/pcreposix.h -# install htsslpass(1) and man page +# install htsslpass(1) install -m 755 htsslpass $RPM_BUILD_ROOT%{_bindir}/htsslpass -install -m 644 htsslpass.1 $RPM_BUILD_ROOT%{_mandir}/man1/htsslpass.1 # install conf file/directory mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d @@ -534,7 +538,7 @@ %{_mandir}/man?/* %exclude %{_mandir}/man8/apxs.8* %exclude %{_mandir}/man8/suexec.8* -%exclude %{_mandir}/man1/htsslpass.1* +#%exclude %{_mandir}/man1/htsslpass.1* %files manual %defattr(-,root,root) @@ -543,7 +547,7 @@ %files -n mod_ssl %defattr(-,root,root) %{_bindir}/htsslpass -%{_mandir}/man1/htsslpass.1* +#%{_mandir}/man1/htsslpass.1* %{_libdir}/httpd/modules/mod_ssl.so %config(noreplace) %{_sysconfdir}/httpd/conf.d/ssl.conf %attr(0700,root,root) %dir %{_sysconfdir}/httpd/conf/ssl.* From svn at tinysofa.org Wed Mar 2 15:36:35 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 2 Mar 2005 10:36:35 -0500 (EST) Subject: [tinysofa-svn] r6107 - in tinysofa/releases/1.2/anaconda/current: sources specs Message-ID: <20050302153635.3F53D345A59@minbar.tinysofa.org> Author: omar Date: 2005-03-02 10:36:33 -0500 (Wed, 02 Mar 2005) New Revision: 6107 Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-rpm-platform.patch Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec Log: - Fix /etc/rpm/platform issue with anaconda. Added: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-rpm-platform.patch =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-rpm-platform.patch 2005-03-01 13:47:29 UTC (rev 6106) +++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-rpm-platform.patch 2005-03-02 15:36:33 UTC (rev 6107) @@ -0,0 +1,37 @@ +diff -urN anaconda-9.1/anaconda anaconda-9.1.rpm-platform/anaconda +--- anaconda-9.1/anaconda 2005-03-02 10:31:34.586812117 -0500 ++++ anaconda-9.1.rpm-platform/anaconda 2005-03-02 10:30:55.058181255 -0500 +@@ -341,6 +341,10 @@ + + import signal, traceback, string, isys, iutil, time + ++# we need to do this really early so we make sure its done before rpm ++# is imported ++iutil.writeRpmPlatform() ++ + from exception import handleException + import dispatch + from flags import flags +@@ -376,10 +380,6 @@ + if os.environ.has_key("LD_PRELOAD"): + del os.environ["LD_PRELOAD"] + +-# we need to do this really early so we make sure its done before rpm +-# is imported +-iutil.writeRpmPlatform() +- + try: + (args, extra) = isys.getopt(theargs, 'CGTRxtdr:fm:', + [ 'text', 'test', 'debug', 'nofallback', +diff -urN anaconda-9.1/iutil.py anaconda-9.1.rpm-platform/iutil.py +--- anaconda-9.1/iutil.py 2005-03-02 10:31:41.783291084 -0500 ++++ anaconda-9.1.rpm-platform/iutil.py 2005-03-02 10:30:55.323198893 -0500 +@@ -590,7 +590,7 @@ + if not os.access("%s/etc/rpm" %(root,), os.X_OK): + os.mkdir("%s/etc/rpm" %(root,)) + f = open("%s/etc/rpm/platform" %(root,), 'w+') +- f.write("%s-redhat-linux\n" %(rhpl.arch.canonArch,)) ++ f.write("%s-tinysofa-linux\n" %(rhpl.arch.canonArch,)) + f.close() + + # FIXME: writing /etc/rpm/macros feels wrong somehow Modified: tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec 2005-03-01 13:47:29 UTC (rev 6106) +++ tinysofa/releases/1.2/anaconda/current/specs/anaconda.spec 2005-03-02 15:36:33 UTC (rev 6107) @@ -1,7 +1,7 @@ ExcludeArch: ppc64 Name: anaconda Version: 9.1 -Release: 0.17jh +Release: 0.18jh License: GPL Summary: installation program Group: development @@ -35,6 +35,7 @@ Patch18: anaconda-9.1-grsecurity.patch Patch19: anaconda-9.1-en-only.patch Patch20: anaconda-9.1-wcstubs.patch +Patch21: anaconda-9.1-rpm-platform.patch # booty patches Patch100: booty-0.38-tinysofa.patch Patch101: booty-0.38-tinysofa-splash.patch @@ -99,6 +100,7 @@ %patch18 -p1 %patch19 -p1 -b .en-only~ %patch20 -p1 -b .wcstubs~ +%patch21 -p1 -b .rpm-platform~ # rhpl and booty use originally python 2.3 # anaconda uses orginally python 2.2 From svn at tinysofa.org Wed Mar 2 15:52:31 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 2 Mar 2005 10:52:31 -0500 (EST) Subject: [tinysofa-svn] r6108 - in tinysofa/releases/1.2/rpm/current: sources specs Message-ID: <20050302155231.8D0013458A2@minbar.tinysofa.org> Author: jh Date: 2005-03-02 10:52:22 -0500 (Wed, 02 Mar 2005) New Revision: 6108 Added: tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-lkey.patch Modified: tinysofa/releases/1.2/rpm/current/specs/rpm.spec Log: - build with -O2 to not break it Added: tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-lkey.patch =================================================================== --- tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-lkey.patch 2005-03-02 15:36:33 UTC (rev 6107) +++ tinysofa/releases/1.2/rpm/current/sources/rpm-4.3.3-lkey.patch 2005-03-02 15:52:22 UTC (rev 6108) @@ -0,0 +1,13 @@ +diff -urN python/rpmts-py.c /tmp/rpm/rpm/python/rpmts-py.c +--- python/rpmts-py.c 2004-11-02 12:02:48.000000000 +0200 ++++ rpm/python/rpmts-py.c 2005-03-02 15:21:25.978919572 +0200 +@@ -1274,7 +1274,8 @@ + PyObject *TagN = NULL; + PyObject *Key = NULL; + char *key = NULL; +- long lkey = 0; ++/* XXX lkey *must* be a 32 bit integer, int "works" on all known platforms. */ ++ int lkey = 0; + int len = 0; + int tag = RPMDBI_PACKAGES; + Modified: tinysofa/releases/1.2/rpm/current/specs/rpm.spec =================================================================== --- tinysofa/releases/1.2/rpm/current/specs/rpm.spec 2005-03-02 15:36:33 UTC (rev 6107) +++ tinysofa/releases/1.2/rpm/current/specs/rpm.spec 2005-03-02 15:52:22 UTC (rev 6108) @@ -29,7 +29,8 @@ Patch1: rpm-4.3.2-noselinux.patch Patch2: rpm-4.3.2-canonarch.patch Patch3: rpm-4.3.2-aptctrlc.patch -Patch4: rpm-4.3.3-msglvl.patch +Patch4: rpm-4.3.3-lkey.patch +Patch5: rpm-4.3.3-msglvl.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -137,7 +138,8 @@ %endif %patch2 -p1 %patch3 -p1 -b .aptctrlc~ -#%patch4 -p1 -b .msglvl~ +%patch4 -p1 -b .lkey~ +#%patch5 -p1 -b .msglvl~ cp -f %{SOURCE1} . @@ -162,7 +164,12 @@ WITH_SELINUX="--without-selinux" %endif +%ifarch i586 +# XXX optimization breaks it +CFLAGS="-O2 -g -march=i586 -pipe %{?no_stack_protector}"; export CFLAGS +%else CFLAGS="$RPM_OPT_FLAGS %{?no_stack_protector}"; export CFLAGS +%endif ./configure \ $WITH_PYTHON \ --prefix=%{_prefix} \ From svn at tinysofa.org Wed Mar 2 18:02:14 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 2 Mar 2005 13:02:14 -0500 (EST) Subject: [tinysofa-svn] r6109 - tinysofa/releases/1.2/anaconda/current/sources Message-ID: <20050302180214.1D43B34458E@minbar.tinysofa.org> Author: jh Date: 2005-03-02 13:02:05 -0500 (Wed, 02 Mar 2005) New Revision: 6109 Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-scripts-kernel26.patch Log: - update pkgorder - add more timezones Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch 2005-03-02 15:52:22 UTC (rev 6108) +++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch 2005-03-02 18:02:05 UTC (rev 6109) @@ -1,5 +1,5 @@ --- anaconda-9.1/Makefile.nox~ 2003-07-07 23:53:24.000000000 +0300 -+++ anaconda-9.1/Makefile 2005-01-26 20:29:08.000000000 +0200 ++++ anaconda-9.1/Makefile 2005-03-02 19:47:35.871508425 +0200 @@ -18,13 +18,13 @@ PYFILES = $(wildcard *.py) @@ -38,7 +38,7 @@ CVSTAG=anaconda-$(subst .,_,$(VERSION)-$(RELEASE)) --- anaconda-9.1/instdata.py.nox~ 2003-08-21 19:33:35.000000000 +0300 -+++ anaconda-9.1/instdata.py 2005-01-26 20:29:08.000000000 +0200 ++++ anaconda-9.1/instdata.py 2005-03-02 19:47:35.872507160 +0200 @@ -110,12 +110,12 @@ self.langSupport.write (instPath) @@ -66,7 +66,7 @@ self.rootPassword.writeKS(f, self.auth) self.firewall.writeKS(f) --- anaconda-9.1/scripts/mk-images.x86_64.nox~ 2003-07-10 21:23:17.000000000 +0300 -+++ anaconda-9.1/scripts/mk-images.x86_64 2005-01-26 20:29:08.000000000 +0200 ++++ anaconda-9.1/scripts/mk-images.x86_64 2005-03-02 19:47:35.873505896 +0200 @@ -12,8 +12,8 @@ cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img @@ -79,7 +79,7 @@ for file in $BOOTDISKDIR/*.msg; do filename=`basename $file` --- anaconda-9.1/scripts/upd-instroot.nox~ 2003-09-18 01:17:58.000000000 +0300 -+++ anaconda-9.1/scripts/upd-instroot 2005-01-26 20:35:22.000000000 +0200 ++++ anaconda-9.1/scripts/upd-instroot 2005-03-02 19:52:30.168836341 +0200 @@ -103,16 +103,17 @@ mkdir -p $DEST mkdir -p $DESTGR @@ -357,7 +357,7 @@ usr/$LIBDIR/rpm/rpmpopt usr/lib/syslinux/* usr/lib/yaboot/* -@@ -593,43 +495,11 @@ +@@ -593,54 +495,30 @@ usr/sbin/fbset usr/sbin/smartctl usr/share/anaconda/* @@ -401,8 +401,30 @@ usr/share/vte/termcap/xterm usr/share/zoneinfo/zone.tab EOF -@@ -750,7 +620,7 @@ + TIMEZONES=" +-usr/share/zoneinfo/US +-usr/share/zoneinfo/Europe +-usr/share/zoneinfo/Japan ++usr/share/zoneinfo/Africa + usr/share/zoneinfo/America ++usr/share/zoneinfo/Antarctica ++usr/share/zoneinfo/Arctic + usr/share/zoneinfo/Asia + usr/share/zoneinfo/Atlantic ++usr/share/zoneinfo/Australia ++usr/share/zoneinfo/Canada ++usr/share/zoneinfo/Europe ++usr/share/zoneinfo/Indian ++usr/share/zoneinfo/Japan ++usr/share/zoneinfo/Mideast ++usr/share/zoneinfo/Pacific ++usr/share/zoneinfo/US + " + + # sparc needs 100dpi fonts as well, otherwise +@@ -750,7 +628,7 @@ + rm -rf $DEST; mkdir -p $DEST/usr/sbin rm -rf $DESTGR; mkdir -p $DESTGR/usr/sbin $DESTGR/var/lib -ln -s /tmp $DESTGR/var/lib/xkb @@ -410,7 +432,7 @@ # # concat KEEPFILEGR and KEEPFILERESCUE lists -@@ -828,10 +698,10 @@ +@@ -828,10 +706,10 @@ rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/extensions/lib{GLcore,glx,pex5}* # fixup joe links @@ -425,7 +447,7 @@ echo "Creating nsswitch.conf" cat > $DEST/etc/nsswitch.conf < Author: jh Date: 2005-03-02 13:09:50 -0500 (Wed, 02 Mar 2005) New Revision: 6110 Removed: tinysofa/releases/1.2/elinks/ Log: - remove elinks From svn at tinysofa.org Wed Mar 2 18:10:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 2 Mar 2005 13:10:50 -0500 (EST) Subject: [tinysofa-svn] r6111 - tinysofa/releases/1.2 Message-ID: <20050302181050.596563441F0@minbar.tinysofa.org> Author: jh Date: 2005-03-02 13:10:42 -0500 (Wed, 02 Mar 2005) New Revision: 6111 Added: tinysofa/releases/1.2/elinks/ Log: - revert to elinks 0.9.3 Copied: tinysofa/releases/1.2/elinks (from rev 5612, tinysofa/releases/1.2/elinks) From svn at tinysofa.org Wed Mar 2 18:13:06 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 2 Mar 2005 13:13:06 -0500 (EST) Subject: [tinysofa-svn] r6112 - tinysofa/releases/1.2/elinks/current/specs Message-ID: <20050302181306.51E96344B46@minbar.tinysofa.org> Author: jh Date: 2005-03-02 13:13:00 -0500 (Wed, 02 Mar 2005) New Revision: 6112 Modified: tinysofa/releases/1.2/elinks/current/specs/elinks.spec Log: - bump up release Modified: tinysofa/releases/1.2/elinks/current/specs/elinks.spec =================================================================== --- tinysofa/releases/1.2/elinks/current/specs/elinks.spec 2005-03-02 18:10:42 UTC (rev 6111) +++ tinysofa/releases/1.2/elinks/current/specs/elinks.spec 2005-03-02 18:13:00 UTC (rev 6112) @@ -1,7 +1,7 @@ Name: elinks Summary: A text-mode Web browser. Version: 0.9.3 -Release: 2ts +Release: 3jh Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2 Source1: http://links.sourceforge.net/download/docs/manual-0.82-en.tar.bz2 Patch0: elinks-noegd.patch From svn at tinysofa.org Wed Mar 2 19:35:04 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 2 Mar 2005 14:35:04 -0500 (EST) Subject: [tinysofa-svn] r6113 - tinysofa/releases/1.2/anaconda/current/sources Message-ID: <20050302193504.92DCB345564@minbar.tinysofa.org> Author: jh Date: 2005-03-02 14:34:58 -0500 (Wed, 02 Mar 2005) New Revision: 6113 Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch Log: - add "add users" dialog Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch 2005-03-02 18:13:00 UTC (rev 6112) +++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch 2005-03-02 19:34:58 UTC (rev 6113) @@ -1,5 +1,5 @@ --- anaconda-9.1/Makefile.nox~ 2003-07-07 23:53:24.000000000 +0300 -+++ anaconda-9.1/Makefile 2005-03-02 19:47:35.871508425 +0200 ++++ anaconda-9.1/Makefile 2005-03-02 20:59:57.647360278 +0200 @@ -18,13 +18,13 @@ PYFILES = $(wildcard *.py) @@ -38,7 +38,7 @@ CVSTAG=anaconda-$(subst .,_,$(VERSION)-$(RELEASE)) --- anaconda-9.1/instdata.py.nox~ 2003-08-21 19:33:35.000000000 +0300 -+++ anaconda-9.1/instdata.py 2005-03-02 19:47:35.872507160 +0200 ++++ anaconda-9.1/instdata.py 2005-03-02 20:59:57.648360010 +0200 @@ -110,12 +110,12 @@ self.langSupport.write (instPath) @@ -66,7 +66,7 @@ self.rootPassword.writeKS(f, self.auth) self.firewall.writeKS(f) --- anaconda-9.1/scripts/mk-images.x86_64.nox~ 2003-07-10 21:23:17.000000000 +0300 -+++ anaconda-9.1/scripts/mk-images.x86_64 2005-03-02 19:47:35.873505896 +0200 ++++ anaconda-9.1/scripts/mk-images.x86_64 2005-03-02 20:59:57.649359741 +0200 @@ -12,8 +12,8 @@ cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img @@ -79,7 +79,7 @@ for file in $BOOTDISKDIR/*.msg; do filename=`basename $file` --- anaconda-9.1/scripts/upd-instroot.nox~ 2003-09-18 01:17:58.000000000 +0300 -+++ anaconda-9.1/scripts/upd-instroot 2005-03-02 19:52:30.168836341 +0200 ++++ anaconda-9.1/scripts/upd-instroot 2005-03-02 20:59:57.651359205 +0200 @@ -103,16 +103,17 @@ mkdir -p $DEST mkdir -p $DESTGR @@ -557,7 +557,7 @@ fi fi --- anaconda-9.1/scripts/mk-images.i386.nox~ 2003-08-26 18:48:47.000000000 +0300 -+++ anaconda-9.1/scripts/mk-images.i386 2005-03-02 19:47:35.876502102 +0200 ++++ anaconda-9.1/scripts/mk-images.i386 2005-03-02 20:59:57.652358936 +0200 @@ -22,8 +22,8 @@ cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz @@ -570,7 +570,7 @@ if [ -d $BOOTDISKDIR/$BOOTLANG ]; then for file in $BOOTDISKDIR/$BOOTLANG/*.msg; do --- anaconda-9.1/scripts/mk-images.nox~ 2003-09-11 21:46:09.000000000 +0300 -+++ anaconda-9.1/scripts/mk-images 2005-03-02 19:47:35.878499572 +0200 ++++ anaconda-9.1/scripts/mk-images 2005-03-02 20:59:57.653358668 +0200 @@ -54,7 +54,7 @@ if [ "$BUILDARCH" = "sparc64" ]; then BASEARCH=sparc @@ -631,7 +631,7 @@ fi --- anaconda-9.1/installclass.py.nox~ 2003-09-12 00:02:21.000000000 +0300 -+++ anaconda-9.1/installclass.py 2005-03-02 19:47:35.879498307 +0200 ++++ anaconda-9.1/installclass.py 2005-03-02 20:59:57.654358399 +0200 @@ -111,11 +111,11 @@ dispatch.setStepList( "language", @@ -684,8 +684,8 @@ "writeksconfig", "methodcomplete", "complete" ---- anaconda-9.1/anaconda.nox~ 2005-03-02 19:47:35.847538778 +0200 -+++ anaconda-9.1/anaconda 2005-03-02 19:47:35.880497043 +0200 +--- anaconda-9.1/anaconda.nox~ 2005-03-02 20:59:57.576379336 +0200 ++++ anaconda-9.1/anaconda 2005-03-02 20:59:57.656357862 +0200 @@ -409,7 +409,7 @@ # rootPath = '/mnt/sysimage' # where to instal packages @@ -784,8 +784,19 @@ # # XXX - hack - here we want to enforce frame buffer requirement on ppc # pick 640x480x8bpp cause that is what frame buffer inits to +--- anaconda-9.1/text.py.nox~ 2005-03-02 21:27:29.281274041 +0200 ++++ anaconda-9.1/text.py 2005-03-02 21:17:18.238690472 +0200 +@@ -59,7 +59,7 @@ + "languagesupport" : ("language_text", ("LanguageSupportWindow", + "LanguageDefaultWindow")), + "timezone" : ("timezone_text", "TimezoneWindow"), +- "accounts" : ("userauth_text", "RootPasswordWindow"), ++ "accounts" : ("userauth_text", ("RootPasswordWindow", "UsersWindow")), + "authentication" : ("userauth_text", ("AuthConfigWindow")), + "desktopchoice": ("desktop_choice_text", "DesktopChoiceWindow"), + "package-selection" : ("packages_text", "PackageGroupWindow"), --- anaconda-9.1/dispatch.py.nox~ 2003-09-12 00:02:31.000000000 +0300 -+++ anaconda-9.1/dispatch.py 2005-03-02 19:47:35.882494513 +0200 ++++ anaconda-9.1/dispatch.py 2005-03-02 21:24:46.116168914 +0200 @@ -57,10 +57,10 @@ ("betanag", betaNagScreen, ("intf", "dir")), ("language", ("intf", "id.instLanguage")), @@ -808,7 +819,8 @@ +# ("firewall", ("intf", "id.network", "id.firewall")), +# ("languagesupport", ("id.langSupport",)), ("timezone", ("id.instLanguage", "id.timezone")), - ("accounts", ("intf", "id.rootPassword")), +- ("accounts", ("intf", "id.rootPassword")), ++ ("accounts", ("id.rootPassword", "id.accounts")), ("authentication", ("id.auth",)), ("readcomps", readPackages, ("intf", "method", "id")), - ("desktopchoice", ("intf", "id.instClass", "dispatch")), From svn at tinysofa.org Wed Mar 2 20:20:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 2 Mar 2005 15:20:21 -0500 (EST) Subject: [tinysofa-svn] r6114 - tinysofa/releases/1.2/words/current/specs Message-ID: <20050302202021.017AF3454E1@minbar.tinysofa.org> Author: jh Date: 2005-03-02 15:20:16 -0500 (Wed, 02 Mar 2005) New Revision: 6114 Modified: tinysofa/releases/1.2/words/current/specs/words.spec Log: - install under /usr/share Modified: tinysofa/releases/1.2/words/current/specs/words.spec =================================================================== --- tinysofa/releases/1.2/words/current/specs/words.spec 2005-03-02 19:34:58 UTC (rev 6113) +++ tinysofa/releases/1.2/words/current/specs/words.spec 2005-03-02 20:20:16 UTC (rev 6114) @@ -1,7 +1,7 @@ Summary: A dictionary of English words for the /usr/dict directory. Name: words Version: 2 -Release: 24jh +Release: 25jh License: Free/freeware Group: extra Source: ftp://sunsite.unc.edu/pub/Linux/libs/linux.words.2.tar.gz @@ -14,31 +14,37 @@ directory. Programs like ispell use this database of words to check spelling. + %prep %setup -q -c %patch0 -p1 + %build + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/dict +mkdir -p %{buildroot}%{_datadir}/dict -cp usr/dict/linux.words $RPM_BUILD_ROOT/usr/dict -ln -sf linux.words $RPM_BUILD_ROOT/usr/dict/words +cp usr/dict/linux.words %{buildroot}%{_datadir}/dict +ln -sf linux.words %{buildroot}%{_datadir}/dict + %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot + %files %defattr(-,root,root) %doc usr/dict/README.linux.words %doc usr/dict/README2.linux.words -%dir /usr/dict -/usr/dict/linux.words -/usr/dict/words +%{_datadir}/dict + %changelog +* Wed Mar 2 2005 Jaakko Heinonen 2-25jh +- install under /usr/share + * Thu Aug 05 2004 tsintegrate 2-23ts - current (2-23jh) integrated as 2-23ts for release 1.1 From svn at tinysofa.org Wed Mar 2 20:25:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 2 Mar 2005 15:25:03 -0500 (EST) Subject: [tinysofa-svn] r6115 - tinysofa/releases/1.2/cracklib/current/specs Message-ID: <20050302202503.4B623345536@minbar.tinysofa.org> Author: jh Date: 2005-03-02 15:24:57 -0500 (Wed, 02 Mar 2005) New Revision: 6115 Modified: tinysofa/releases/1.2/cracklib/current/specs/cracklib.spec Log: - fix reference to /usr/dict Modified: tinysofa/releases/1.2/cracklib/current/specs/cracklib.spec =================================================================== --- tinysofa/releases/1.2/cracklib/current/specs/cracklib.spec 2005-03-02 20:20:16 UTC (rev 6114) +++ tinysofa/releases/1.2/cracklib/current/specs/cracklib.spec 2005-03-02 20:24:57 UTC (rev 6115) @@ -1,7 +1,7 @@ Summary: A password-checking library. Name: cracklib Version: 2.7 -Release: 21jh +Release: 22jh Group: main Source: http://www.users.dircon.co.uk/~crypto/download/cracklib,2.7.tgz Source1: crack.h @@ -40,8 +40,8 @@ %description dicts The cracklib-dicts package includes the CrackLib dictionaries. CrackLib will need to use the dictionary appropriate to your system, -which is normally put in /usr/dict/words. Cracklib-dicts also contains -the utilities necessary for the creation of new dictionaries. +which is normally put in /usr/share/dict/words. Cracklib-dicts also +contains the utilities necessary for the creation of new dictionaries. If you are installing CrackLib, you should also install cracklib-dicts. From svn at tinysofa.org Thu Mar 3 06:42:40 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 3 Mar 2005 01:42:40 -0500 (EST) Subject: [tinysofa-svn] r6116 - in tinysofa/releases/1.2/cyrus-imapd/current: sources specs Message-ID: <20050303064240.BFEE93454B8@minbar.tinysofa.org> Author: jh Date: 2005-03-03 01:42:30 -0500 (Thu, 03 Mar 2005) New Revision: 6116 Added: tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-2.2.4-OE-seenstate.patch Modified: tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec Log: - add cyrus-imapd-2.2.4-OE-seenstate.patch Added: tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-2.2.4-OE-seenstate.patch =================================================================== --- tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-2.2.4-OE-seenstate.patch 2005-03-02 20:24:57 UTC (rev 6115) +++ tinysofa/releases/1.2/cyrus-imapd/current/sources/cyrus-imapd-2.2.4-OE-seenstate.patch 2005-03-03 06:42:30 UTC (rev 6116) @@ -0,0 +1,104 @@ +# Small patch to Cyrus IMAP 2.2.4 which modifies \Seen state handling to +# make it compatible with Outlook Express. OE makes two connections to a +# given mailfolder: one generates indexes while the other fetches messages. +# Unfortunately it gets confused if \Seen updates caused by the message +# stream aren't immediately flushed and picked up by the index stream. +# +# This patch is a 2.2.4 port from the patch found here: +# http://www-uxsup.csx.cam.ac.uk/~dpc22/cyrus/patches/2.1.16/OutLookExpress-seenstate.patch +# +diff -Naur cyrus-imapd-2.2.4.orig/imap/imapd.c cyrus-imapd-2.2.4/imap/imapd.c +--- cyrus-imapd-2.2.4.orig/imap/imapd.c Thu May 6 20:46:21 2004 ++++ cyrus-imapd-2.2.4/imap/imapd.c Fri May 21 02:10:25 2004 +@@ -3063,6 +3063,10 @@ + snprintf(mytime, sizeof(mytime), "%2.3f", + (clock() - start) / (double) CLOCKS_PER_SEC); + ++ /* Checkpoint \Seen immediately after each FETCH completes. Checks for ++ * changes from other processes at the same time */ ++ index_check_existing(imapd_mailbox, usinguid, 1); ++ + if (r) { + prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag, + error_message(r), mytime); +@@ -3184,7 +3188,7 @@ + + index_fetch(imapd_mailbox, msgno, 0, &fetchargs, &fetchedsomething); + +- index_check(imapd_mailbox, 0, 0); ++ index_check_existing(imapd_mailbox, 0, 1); + + if (fetchedsomething) { + prot_printf(imapd_out, "%s OK %s\r\n", tag, +@@ -3321,7 +3325,9 @@ + flag, nflags); + + if (usinguid) { +- index_check(imapd_mailbox, 1, 0); ++ index_check(imapd_mailbox, 1, 1); /* Check \Seen too */ ++ } else { ++ index_check_existing(imapd_mailbox, 0, 1); + } + + if (r) { +diff -Naur cyrus-imapd-2.2.4.orig/imap/imapd.h cyrus-imapd-2.2.4/imap/imapd.h +--- cyrus-imapd-2.2.4.orig/imap/imapd.h Wed Oct 22 20:50:07 2003 ++++ cyrus-imapd-2.2.4/imap/imapd.h Fri May 21 02:06:02 2004 +@@ -233,6 +233,8 @@ + extern void index_operatemailbox(struct mailbox *mailbox); + extern void index_check(struct mailbox *mailbox, int usinguid, + int checkseen); ++extern void ++index_check_existing(struct mailbox *mailbox, int usinguid, int checkseen); + extern void index_checkseen(struct mailbox *mailbox, int quiet, + int usinguid, int oldexists); + +diff -Naur cyrus-imapd-2.2.4.orig/imap/index.c cyrus-imapd-2.2.4/imap/index.c +--- cyrus-imapd-2.2.4.orig/imap/index.c Wed Apr 21 19:40:48 2004 ++++ cyrus-imapd-2.2.4/imap/index.c Fri May 21 02:06:02 2004 +@@ -425,6 +425,45 @@ + } + } + ++/* Nasty hack to report system + user flags updates without checking for ++ * new mail or expunge (relies on index atomic rewrite+rename for expunge). ++ * ++ * Needed to keep Outlook Express happy without breaking IMAP concurrent ++ * access regime which (quite correctly) prohibits unsolicited EXPUNGE and ++ * EXIST responses for non-UID versions of FETCH and STORE. Otherwise you ++ * can end up with hilarous situations such as: ++ * ++ * . FETCH 2 fast ++ * * EXPUNGE 1 <-- from concurrent session. ++ * . FETCH (data relating to previous message _3_, if it exists) ++ * ++ */ ++ ++void ++index_check_existing(struct mailbox *mailbox, int usinguid, int checkseen) ++{ ++ int msgno, i; ++ bit32 user_flags[MAX_USER_FLAGS/32]; ++ ++ if (imapd_exists == -1) ++ return; ++ ++ if (checkseen) ++ index_checkseen(mailbox, 0, usinguid, imapd_exists); ++ ++ for (msgno = 1; msgno <= imapd_exists; msgno++) { ++ if (flagreport[msgno] < LAST_UPDATED(msgno)) { ++ for (i = 0; i < VECTOR_SIZE(user_flags); i++) { ++ user_flags[i] = USER_FLAGS(msgno, i); ++ } ++ index_fetchflags(mailbox, msgno, SYSTEM_FLAGS(msgno), user_flags, ++ LAST_UPDATED(msgno)); ++ if (usinguid) prot_printf(imapd_out, " UID %u", UID(msgno)); ++ prot_printf(imapd_out, ")\r\n"); ++ } ++ } ++} ++ + /* + * Checkpoint the user's \Seen state + * Modified: tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-03-02 20:24:57 UTC (rev 6115) +++ tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-03-03 06:42:30 UTC (rev 6116) @@ -1,7 +1,7 @@ Summary: A high-performance mail store with IMAP and POP3 support. Name: cyrus-imapd Version: 2.2.12 -Release: 2jh +Release: 3jh License: BSD Group: main URL: http://asg.web.cmu.edu/cyrus/imapd/ @@ -21,6 +21,7 @@ Patch1: cyrus-imapd-2.0.5-pollute.patch Patch2: cyrus-imapd-2.2.9-imap_err.patch Patch3: cyrus-imapd-perl-path2.patch +Patch4: cyrus-imapd-2.2.4-OE-seenstate.patch # University of Athens patches Patch10: cyrus-imapd-2.2.10-autosievefolder-0.5.diff Patch11: cyrus-imapd-2.2.10-autocreate-0.9.1.diff @@ -70,6 +71,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch10 -p1 -b .autosieve~ %patch11 -p1 -b .autocreate~ @@ -293,6 +295,9 @@ %changelog +* Thu Mar 3 2005 Jaakko Heinonen 2.2.12-3jh +- add cyrus-imapd-2.2.4-OE-seenstate.patch + * Thu Feb 24 2005 Jaakko Heinonen 2.2.12-1jh - 2.1.12, which fixes vulnerabilities - enable idled From svn at tinysofa.org Thu Mar 3 07:30:23 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 3 Mar 2005 02:30:23 -0500 (EST) Subject: [tinysofa-svn] r6117 - in tinysofa/releases/1.2/tar/current: sources specs Message-ID: <20050303073023.0087E345A0B@minbar.tinysofa.org> Author: jh Date: 2005-03-03 02:30:14 -0500 (Thu, 03 Mar 2005) New Revision: 6117 Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010-gzip.patch Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec Log: - correctly skip gzip "Extra Data" field (libarchive-1.02.010-gzip.patch) Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010-gzip.patch =================================================================== --- tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010-gzip.patch 2005-03-03 06:42:30 UTC (rev 6116) +++ tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010-gzip.patch 2005-03-03 07:30:14 UTC (rev 6117) @@ -0,0 +1,16 @@ +=================================================================== +RCS file: /usr/local/www/cvsroot/FreeBSD/src/lib/libarchive/archive_read_support_compression_gzip.c,v +retrieving revision 1.7 +retrieving revision 1.8 +diff -u -p -r1.7 -r1.8 +--- libarchive/archive_read_support_compression_gzip.c 2004/08/14 03:45:45 1.7 ++++ libarchive/archive_read_support_compression_gzip.c 2005/03/02 05:34:05 1.8 +@@ -426,7 +426,7 @@ drive_decompressor(struct archive *a, st + */ + case 11: /* Optional Extra: Second byte of Length. */ + if ((flags & 4)) { +- count = (count << 8) | (255 & (int)b); ++ count = (0xff00 & ((int)b << 8)) | count; + header_state = 12; + break; + } Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec =================================================================== --- tinysofa/releases/1.2/tar/current/specs/tar.spec 2005-03-03 06:42:30 UTC (rev 6116) +++ tinysofa/releases/1.2/tar/current/specs/tar.spec 2005-03-03 07:30:14 UTC (rev 6117) @@ -3,7 +3,7 @@ Name: tar Epoch: 1 Version: 1.02.010 -Release: 1jh +Release: 2jh License: BSD Group: main Source0: http://people.freebsd.org/~kientzle/libarchive/src/bsdtar-%{version}.tar.gz @@ -11,6 +11,7 @@ Patch0: bsdtar-1.01.022-setlocale.patch Patch1: bsdtar-1.02.006-malloc.patch Patch2: libarchive-1.02.009-eilseq.patch +Patch3: libarchive-1.02.010-gzip.patch BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel Provides: bsdtar = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -32,6 +33,7 @@ pushd libarchive-%{libarchive_version} %patch2 -p1 -b .eilseq~ +%patch3 -p1 -b .gzip~ popd @@ -68,6 +70,9 @@ %changelog +* Thu Mar 3 2005 Jaakko Heinonen 1.02.010-2jh +- correctly skip gzip "Extra Data" field (libarchive-1.02.010-gzip.patch) + * Fri Feb 25 2005 Jaakko Heinonen 1.02.010-1jh - 1.02.010 From svn at tinysofa.org Thu Mar 3 07:59:01 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 3 Mar 2005 02:59:01 -0500 (EST) Subject: [tinysofa-svn] r6118 - tinysofa/releases/1.2/dhcp/current/specs Message-ID: <20050303075901.AC76234456A@minbar.tinysofa.org> Author: jh Date: 2005-03-03 02:58:55 -0500 (Thu, 03 Mar 2005) New Revision: 6118 Modified: tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec Log: - provide dhclient Modified: tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec =================================================================== --- tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec 2005-03-03 07:30:14 UTC (rev 6117) +++ tinysofa/releases/1.2/dhcp/current/specs/dhcp.spec 2005-03-03 07:58:55 UTC (rev 6118) @@ -59,6 +59,7 @@ Group: main Requires: dhcp-common = %{epoch}:%{version} Obsoletes: pump +Provides: dhclient = %{version} %description client DHCP client is the Internet Software Consortium (ISC) DHCP client for various From svn at tinysofa.org Thu Mar 3 08:27:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 3 Mar 2005 03:27:28 -0500 (EST) Subject: [tinysofa-svn] r6119 - contrib/1.1/clamav/current/specs Message-ID: <20050303082728.E55A53444F9@minbar.tinysofa.org> Author: jh Date: 2005-03-03 03:27:23 -0500 (Thu, 03 Mar 2005) New Revision: 6119 Modified: contrib/1.1/clamav/current/specs/clamav.spec Log: - don't overwrite configuration files Modified: contrib/1.1/clamav/current/specs/clamav.spec =================================================================== --- contrib/1.1/clamav/current/specs/clamav.spec 2005-03-03 07:58:55 UTC (rev 6118) +++ contrib/1.1/clamav/current/specs/clamav.spec 2005-03-03 08:27:23 UTC (rev 6119) @@ -140,9 +140,9 @@ %files %defattr(-,root,root) -%attr(0640,root,%{group_name}) %config %{_sysconfdir}/clamd.conf -%attr(0640,root,%{group_name}) %config %{_sysconfdir}/freshclam.conf -%attr(0640,root,%{group_name}) %config %{_sysconfdir}/sysconfig/freshclam +%attr(0640,root,%{group_name}) %config(noreplace) %{_sysconfdir}/clamd.conf +%attr(0640,root,%{group_name}) %config(noreplace) %{_sysconfdir}/freshclam.conf +%attr(0640,root,%{group_name}) %config(noreplace) %{_sysconfdir}/sysconfig/freshclam %{_initrddir}/clamd %{_initrddir}/freshclam %{_sysconfdir}/logrotate.d/clamd From svn at tinysofa.org Thu Mar 3 08:30:29 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 3 Mar 2005 03:30:29 -0500 (EST) Subject: [tinysofa-svn] r6120 - contrib/1.2/clamav/current/specs Message-ID: <20050303083029.B659F3444F9@minbar.tinysofa.org> Author: jh Date: 2005-03-03 03:30:24 -0500 (Thu, 03 Mar 2005) New Revision: 6120 Modified: contrib/1.2/clamav/current/specs/clamav.spec Log: - merge from 1.1 Modified: contrib/1.2/clamav/current/specs/clamav.spec =================================================================== --- contrib/1.2/clamav/current/specs/clamav.spec 2005-03-03 08:27:23 UTC (rev 6119) +++ contrib/1.2/clamav/current/specs/clamav.spec 2005-03-03 08:30:24 UTC (rev 6120) @@ -140,9 +140,9 @@ %files %defattr(-,root,root) -%attr(0640,root,%{group_name}) %config %{_sysconfdir}/clamd.conf -%attr(0640,root,%{group_name}) %config %{_sysconfdir}/freshclam.conf -%attr(0640,root,%{group_name}) %config %{_sysconfdir}/sysconfig/freshclam +%attr(0640,root,%{group_name}) %config(noreplace) %{_sysconfdir}/clamd.conf +%attr(0640,root,%{group_name}) %config(noreplace) %{_sysconfdir}/freshclam.conf +%attr(0640,root,%{group_name}) %config(noreplace) %{_sysconfdir}/sysconfig/freshclam %{_initrddir}/clamd %{_initrddir}/freshclam %{_sysconfdir}/logrotate.d/clamd From svn at tinysofa.org Fri Mar 4 10:12:41 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 4 Mar 2005 05:12:41 -0500 (EST) Subject: [tinysofa-svn] r6123 - in tinysofa/releases/1.2/tzdata/current: sources specs Message-ID: <20050304101241.BB463345488@minbar.tinysofa.org> Author: jh Date: 2005-03-04 05:12:26 -0500 (Fri, 04 Mar 2005) New Revision: 6123 Added: tinysofa/releases/1.2/tzdata/current/sources/tzdata2005f.tar.gz Removed: tinysofa/releases/1.2/tzdata/current/sources/tzdata2005a.tar.gz Modified: tinysofa/releases/1.2/tzdata/current/specs/tzdata.spec Log: - 2005f Deleted: tinysofa/releases/1.2/tzdata/current/sources/tzdata2005a.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/tzdata/current/sources/tzdata2005f.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/tzdata/current/sources/tzdata2005f.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/tzdata/current/specs/tzdata.spec =================================================================== --- tinysofa/releases/1.2/tzdata/current/specs/tzdata.spec 2005-03-04 10:04:18 UTC (rev 6122) +++ tinysofa/releases/1.2/tzdata/current/specs/tzdata.spec 2005-03-04 10:12:26 UTC (rev 6123) @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2005a +Version: 2005f Release: 1jh License: GPL Group: main @@ -47,6 +47,9 @@ %changelog +* Fri Mar 4 2005 Jaakko Heinonen 2005f-1jh +- 2005f + * Mon Jan 10 2005 Jaakko Heinonen 2005a-1jh - 2005a From svn at tinysofa.org Fri Mar 4 18:13:27 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 4 Mar 2005 13:13:27 -0500 (EST) Subject: [tinysofa-svn] r6124 - in contrib/1.2/sylpheed/current: sources specs Message-ID: <20050304181327.9F24234418D@minbar.tinysofa.org> Author: gda Date: 2005-03-04 13:12:24 -0500 (Fri, 04 Mar 2005) New Revision: 6124 Added: contrib/1.2/sylpheed/current/sources/sylpheed-1.0.3.tar.bz2 Removed: contrib/1.2/sylpheed/current/sources/sylpheed-1.0.0.tar.bz2 Modified: contrib/1.2/sylpheed/current/specs/sylpheed.spec Log: 1.0.3 Deleted: contrib/1.2/sylpheed/current/sources/sylpheed-1.0.0.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.2/sylpheed/current/sources/sylpheed-1.0.3.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.2/sylpheed/current/sources/sylpheed-1.0.3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.2/sylpheed/current/specs/sylpheed.spec =================================================================== --- contrib/1.2/sylpheed/current/specs/sylpheed.spec 2005-03-04 10:12:26 UTC (rev 6123) +++ contrib/1.2/sylpheed/current/specs/sylpheed.spec 2005-03-04 18:12:24 UTC (rev 6124) @@ -1,8 +1,8 @@ Summary: a GTK+ based, lightweight, and fast e-mail client Name: sylpheed Epoch: 1 -Version: 1.0.0 -Release: 2gd +Version: 1.0.3 +Release: 1gd Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2 Copyright: GPL URL: http://sylpheed.good-day.net/ @@ -57,6 +57,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Fri Mar 4 2005 Gerald Dachs 1.0.3-1gd +- 1.0.3 + * Sun Feb 13 2005 Gerald Dachs 1.0.0-2gd - added Epoch From svn at tinysofa.org Fri Mar 4 18:19:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 4 Mar 2005 13:19:11 -0500 (EST) Subject: [tinysofa-svn] r6125 - in contrib/1.1/sylpheed/current: sources specs Message-ID: <20050304181911.CC028344479@minbar.tinysofa.org> Author: gda Date: 2005-03-04 13:18:13 -0500 (Fri, 04 Mar 2005) New Revision: 6125 Added: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.3.tar.bz2 Removed: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0.tar.bz2 Modified: contrib/1.1/sylpheed/current/specs/sylpheed.spec Log: 1.0.3 Deleted: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.0.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.3.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.1/sylpheed/current/sources/sylpheed-1.0.3.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.1/sylpheed/current/specs/sylpheed.spec =================================================================== --- contrib/1.1/sylpheed/current/specs/sylpheed.spec 2005-03-04 18:12:24 UTC (rev 6124) +++ contrib/1.1/sylpheed/current/specs/sylpheed.spec 2005-03-04 18:18:13 UTC (rev 6125) @@ -1,8 +1,8 @@ Summary: a GTK+ based, lightweight, and fast e-mail client Name: sylpheed Epoch: 1 -Version: 1.0.0 -Release: 2gd +Version: 1.0.3 +Release: 1gd Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2 Copyright: GPL URL: http://sylpheed.good-day.net/ @@ -57,6 +57,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Fri Mar 4 2005 Gerald Dachs 1.0.3-1gd +- 1.0.3 + * Sun Feb 13 2005 Gerald Dachs 1.0.0-2gd - added Epoch From svn at tinysofa.org Fri Mar 4 19:09:15 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 4 Mar 2005 14:09:15 -0500 (EST) Subject: [tinysofa-svn] r6126 - tinysofa/releases/1.2/release/current/specs Message-ID: <20050304190915.C6F8B34464F@minbar.tinysofa.org> Author: jh Date: 2005-03-04 14:09:10 -0500 (Fri, 04 Mar 2005) New Revision: 6126 Modified: tinysofa/releases/1.2/release/current/specs/release.spec Log: - update release name Modified: tinysofa/releases/1.2/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.2/release/current/specs/release.spec 2005-03-04 18:18:13 UTC (rev 6125) +++ tinysofa/releases/1.2/release/current/specs/release.spec 2005-03-04 19:09:10 UTC (rev 6126) @@ -1,11 +1,11 @@ -%define release_name 1.2-test1 +%define release_name Ceara %define vendor tinysofa %define product classic server Summary: tinysofa release file Name: release -Version: 1.1.99 -Release: 1jh +Version: 1.2 +Release: 0jh Epoch: 2 License: GPL Group: main From svn at tinysofa.org Sun Mar 6 17:02:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 6 Mar 2005 12:02:21 -0500 (EST) Subject: [tinysofa-svn] r6127 - in tinysofa/releases/1.2/initscripts/current: sources specs Message-ID: <20050306170221.417B2344532@minbar.tinysofa.org> Author: gda Date: 2005-03-06 12:02:14 -0500 (Sun, 06 Mar 2005) New Revision: 6127 Added: tinysofa/releases/1.2/initscripts/current/sources/initscripts-7.31.9-udev-support.patch Modified: tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec Log: udev support Added: tinysofa/releases/1.2/initscripts/current/sources/initscripts-7.31.9-udev-support.patch =================================================================== --- tinysofa/releases/1.2/initscripts/current/sources/initscripts-7.31.9-udev-support.patch 2005-03-04 19:09:10 UTC (rev 6126) +++ tinysofa/releases/1.2/initscripts/current/sources/initscripts-7.31.9-udev-support.patch 2005-03-06 17:02:14 UTC (rev 6127) @@ -0,0 +1,12 @@ +--- initscripts-7.31.9/rc.d/rc.sysinit.orig 2005-03-06 18:56:09.251668984 +0100 ++++ initscripts-7.31.9/rc.d/rc.sysinit 2005-03-06 18:57:06.198011824 +0100 +@@ -75,6 +75,9 @@ + action "Mounting sysfs on /sys" mount -t sysfs none /sys + fi + ++# start udev if it is available ++[ -x /sbin/start_udev ] && /sbin/start_udev ++ + # Fix console loglevel + if [ -n "$LOGLEVEL" ]; then + /bin/dmesg -n $LOGLEVEL Modified: tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec =================================================================== --- tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec 2005-03-04 19:09:10 UTC (rev 6126) +++ tinysofa/releases/1.2/initscripts/current/specs/initscripts.spec 2005-03-06 17:02:14 UTC (rev 6127) @@ -3,7 +3,7 @@ Version: 7.31.9 License: GPL Group: main -Release: 12jh +Release: 13gd Source: initscripts-%{version}.tar.bz2 Source1: sysctl.grsec URL: http://rhlinux.redhat.com/initscripts/ @@ -15,6 +15,7 @@ Patch5: initscripts-7.31.9-alsa.patch Patch6: initscripts-7.31.9-dovecot.patch Patch7: initscripts-7.31.9-usbfs.patch +Patch8: initscripts-7.31.9-udev-support.patch BuildRoot: %{_tmppath}/%{name}-root Requires: agetty, gawk, sed, mktemp, e2fsprogs >= 1.15 Requires: procps, sysklogd >= 1.3.31 @@ -49,6 +50,7 @@ %patch5 -p1 -b .alsa~ %patch6 -p1 -b .dovecot~ %patch7 -p1 -b .usbfs~ +%patch8 -p1 -b .udev~ find . -name '*~'|xargs rm -f @@ -215,6 +217,9 @@ %changelog +* Sun Mar 6 2005 Gerald Dachs 7.31.9-13gd +- udev support + * Sun Jan 23 2005 Jaakko Heinonen 7.31.9-11jh - add grsecurity options to sysctl.conf From svn at tinysofa.org Sun Mar 6 17:51:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 6 Mar 2005 12:51:02 -0500 (EST) Subject: [tinysofa-svn] r6128 - in tinysofa/releases/1.2: . udev udev/current udev/current/sources udev/current/specs Message-ID: <20050306175102.4628034556D@minbar.tinysofa.org> Author: gda Date: 2005-03-06 12:50:44 -0500 (Sun, 06 Mar 2005) New Revision: 6128 Added: tinysofa/releases/1.2/udev/ tinysofa/releases/1.2/udev/current/ tinysofa/releases/1.2/udev/current/sources/ tinysofa/releases/1.2/udev/current/sources/udev-054.tar.bz2 tinysofa/releases/1.2/udev/current/sources/udev.conf tinysofa/releases/1.2/udev/current/specs/ tinysofa/releases/1.2/udev/current/specs/udev.spec tinysofa/releases/1.2/udev/pristine/ tinysofa/releases/1.2/udev/releases/ Log: nice to have Added: tinysofa/releases/1.2/udev/current/sources/udev-054.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/udev/current/sources/udev-054.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.2/udev/current/sources/udev.conf =================================================================== --- tinysofa/releases/1.2/udev/current/sources/udev.conf 2005-03-06 17:02:14 UTC (rev 6127) +++ tinysofa/releases/1.2/udev/current/sources/udev.conf 2005-03-06 17:50:44 UTC (rev 6128) @@ -0,0 +1,19 @@ +# udev.conf +# The main config file for udev +# +# This file can be used to override some of udev's default values +# for where it looks for files, and where it places device nodes. + + +# udev_root - where in the filesystem to place the device nodes +udev_root="/dev" + +# udev_db - The name and location of the udev database. +udev_db="/dev/.udevdb" + +# udev_rules - The name and location of the udev rules file +udev_rules="/etc/udev/rules.d" + +# udev_log - set to "yes" if you want logging, else "no" +udev_log="yes" + Added: tinysofa/releases/1.2/udev/current/specs/udev.spec =================================================================== --- tinysofa/releases/1.2/udev/current/specs/udev.spec 2005-03-06 17:02:14 UTC (rev 6127) +++ tinysofa/releases/1.2/udev/current/specs/udev.spec 2005-03-06 17:50:44 UTC (rev 6128) @@ -0,0 +1,48 @@ +Summary: A userspace implementation of devf +Name: udev +Version: 054 +Release: 1gd +Source: http://www.us.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 +Source1: udev.conf +License: GPL +Group: contrib +Requires: hotplug kernel >= 2.6 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +udev allows Linux users to have a dynamic /dev directory and it provides the ability to have persistent device names. It uses sysfs and /sbin/hotplug and runs entirely in userspace. + +%prep +%setup -q + +%build +%make USE_LOG=false DEBUG=false EXTRAS="extras/scsi_id extras/volume_id" + + +%install +make install DESTDIR=$RPM_BUILD_ROOT EXTRAS="extras/scsi_id extras/volume_id" +install -m 755 extras/start_udev $RPM_BUILD_ROOT/sbin +install -m 644 %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/udev/ + +%clean +%clean_buildroot + +%files +%defattr(-,root,root) +/sbin/* +%{_bindir}/* +%dir %{_sysconfdir}/dev.d +%dir %{_sysconfdir}/dev.d/net +%{_sysconfdir}/dev.d/net/hotplug.dev +%{_sysconfdir}/dev.d/default +%dir %{_sysconfdir}/udev +%dir %{_sysconfdir}/udev/rules.d +%config(noreplace) %{_sysconfdir}/udev/rules.d/50-udev.rules +%config(noreplace) %{_sysconfdir}/udev/udev.conf +%config(noreplace) %{_sysconfdir}/scsi_id.config +/etc/hotplug.d/default/10-udev.hotplug +%{_mandir}/man8/* + +%changelog +* Sun Mar 6 2005 Gerald Dachs 054-1gd +- new in tinysofa contrib From svn at tinysofa.org Mon Mar 7 12:34:25 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 7 Mar 2005 07:34:25 -0500 (EST) Subject: [tinysofa-svn] r6129 - contrib/1.2 tinysofa/releases/1.2 Message-ID: <20050307123425.88ABA3443D4@minbar.tinysofa.org> Author: jh Date: 2005-03-07 07:34:06 -0500 (Mon, 07 Mar 2005) New Revision: 6129 Added: contrib/1.2/udev/ Removed: tinysofa/releases/1.2/udev/ Log: - move to contrib Copied: contrib/1.2/udev (from rev 6128, tinysofa/releases/1.2/udev) From svn at tinysofa.org Mon Mar 7 12:34:25 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 7 Mar 2005 07:34:25 -0500 (EST) Subject: [tinysofa-svn] r6129 - contrib/1.2 tinysofa/releases/1.2 Message-ID: <20050307123425.8B9403443AC@minbar.tinysofa.org> Author: jh Date: 2005-03-07 07:34:06 -0500 (Mon, 07 Mar 2005) New Revision: 6129 Added: contrib/1.2/udev/ Removed: tinysofa/releases/1.2/udev/ Log: - move to contrib Copied: contrib/1.2/udev (from rev 6128, tinysofa/releases/1.2/udev) From svn at tinysofa.org Mon Mar 7 15:10:47 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 7 Mar 2005 10:10:47 -0500 (EST) Subject: [tinysofa-svn] r6130 - tinysofa/releases/1.2/anaconda/current/sources Message-ID: <20050307151047.E0D82345770@minbar.tinysofa.org> Author: jh Date: 2005-03-07 10:10:42 -0500 (Mon, 07 Mar 2005) New Revision: 6130 Modified: tinysofa/releases/1.2/anaconda/current/sources/booty-0.40-bootloader.patch Log: - add missing comment character Modified: tinysofa/releases/1.2/anaconda/current/sources/booty-0.40-bootloader.patch =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/booty-0.40-bootloader.patch 2005-03-07 12:34:06 UTC (rev 6129) +++ tinysofa/releases/1.2/anaconda/current/sources/booty-0.40-bootloader.patch 2005-03-07 15:10:42 UTC (rev 6130) @@ -26,7 +26,7 @@ + "REBOOTAT=+60\n" + "# Who do we mail when we have upgraded the kernel? " + "Empty means do not mail.\n" -+ "You need to have mailx installed to use this option.\n" ++ "# You need to have mailx installed to use this option.\n" + "MAILTO=\n") + From svn at tinysofa.org Mon Mar 7 22:08:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 7 Mar 2005 17:08:39 -0500 (EST) Subject: [tinysofa-svn] r6131 - in contrib/1.2/sqlite3/current: sources specs Message-ID: <20050307220839.7704C3456CF@minbar.tinysofa.org> Author: gda Date: 2005-03-07 17:08:00 -0500 (Mon, 07 Mar 2005) New Revision: 6131 Added: contrib/1.2/sqlite3/current/sources/sqlite-3.1.3-makefile.in.patch contrib/1.2/sqlite3/current/sources/sqlite-3.1.3.tar.gz Removed: contrib/1.2/sqlite3/current/sources/sqlite-3.0.8.tar.gz Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec Log: 3.1.3 Deleted: contrib/1.2/sqlite3/current/sources/sqlite-3.0.8.tar.gz =================================================================== (Binary files differ) Added: contrib/1.2/sqlite3/current/sources/sqlite-3.1.3-makefile.in.patch =================================================================== --- contrib/1.2/sqlite3/current/sources/sqlite-3.1.3-makefile.in.patch 2005-03-07 15:10:42 UTC (rev 6130) +++ contrib/1.2/sqlite3/current/sources/sqlite-3.1.3-makefile.in.patch 2005-03-07 22:08:00 UTC (rev 6131) @@ -0,0 +1,12 @@ +--- sqlite-3.1.3/Makefile.in.orig 2005-03-07 22:56:04.833954328 +0100 ++++ sqlite-3.1.3/Makefile.in 2005-03-07 22:56:41.189427456 +0100 +@@ -451,6 +451,9 @@ + arch.html: $(TOP)/www/arch.tcl + tclsh $(TOP)/www/arch.tcl >arch.html + ++arch.png: $(TOP)/www/arch.png ++ cp $(TOP)/www/arch.png . ++ + arch2.gif: $(TOP)/www/arch2.gif + cp $(TOP)/www/arch2.gif . + Added: contrib/1.2/sqlite3/current/sources/sqlite-3.1.3.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.2/sqlite3/current/sources/sqlite-3.1.3.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec =================================================================== --- contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-07 15:10:42 UTC (rev 6130) +++ contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-07 22:08:00 UTC (rev 6131) @@ -1,10 +1,11 @@ Summary: SQLite is a C library that implements an embeddable SQL database engine Name: sqlite3 -Version: 3.0.8 +Version: 3.1.3 Release: 1gd License: GPL Group: contrib Source: http://www.sqlite.org/sqlite-%{version}.tar.gz +Patch: sqlite-3.1.3-makefile.in.patch URL: http://www.sqlite.org/ BuildRoot: %{_tmppath}/%{name}-root BuildRequires: tcl, tcl-devel, gcc-c++ @@ -27,10 +28,11 @@ to develop programs that use the sqlite database library. %prep -%setup -q -n sqlite +%setup -q -n sqlite-%{version} +%patch -p1 %build -CFLAGS="%optflags -DNDEBUG=1" CXXFLAGS="%optflags -DNDEBUG=1" %configure --enable-utf8 --enable-incore-db +CFLAGS="%optflags -DNDEBUG=1" CXXFLAGS="%optflags -DNDEBUG=1" %configure --enable-utf8 --enable-incore-db --disable-tcl make make doc @@ -58,6 +60,9 @@ %doc README doc/* %changelog +* Mon Mar 7 2005 Gerald Dachs 3.1.3-1gd +- 3.1.3 + * Sun Nov 28 2004 Gerald Dachs 3.0.8-1gd - new upstream version From svn at tinysofa.org Tue Mar 8 08:19:58 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 8 Mar 2005 03:19:58 -0500 (EST) Subject: [tinysofa-svn] r6132 - in tinysofa/releases/1.2/grsecurity/current: sources specs Message-ID: <20050308081958.D3267345A2C@minbar.tinysofa.org> Author: jh Date: 2005-03-08 03:19:46 -0500 (Tue, 08 Mar 2005) New Revision: 6132 Added: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.1.3-200503070918.tar.gz Removed: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.1.1-200501222316.tar.gz Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - 2.1.3 Deleted: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.1.1-200501222316.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.1.3-200503070918.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/grsecurity/current/sources/gradm-2.1.3-200503070918.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-03-07 22:08:00 UTC (rev 6131) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-03-08 08:19:46 UTC (rev 6132) @@ -1,9 +1,9 @@ %define policies_date 20050223 Summary: grsecurity user space utilities and policies Name: grsecurity -Version: 2.1.1 -Release: 2jh -Source0: gradm-2.1.1-200501222316.tar.gz +Version: 2.1.3 +Release: 1jh +Source0: gradm-%{version}-200503070918.tar.gz Source1: grsec.init Source2: policies-%{policies_date}.tar Source3: rbac.txt @@ -110,6 +110,9 @@ %changelog +* Tue Mar 8 2005 Jaakko Heinonen 2.1.3-1jh +- 2.1.3 + * Fri Feb 4 2005 Jaakko Heinonen 2.1.1-2jh - change dummypw patch to use /dev/urandom if /dev/random doesn't have enough entropy From svn at tinysofa.org Wed Mar 9 06:13:42 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 9 Mar 2005 01:13:42 -0500 (EST) Subject: [tinysofa-svn] r6133 - in tinysofa/releases/1.2/ipsec-tools/current: sources specs Message-ID: <20050309061342.B47F9345729@minbar.tinysofa.org> Author: jh Date: 2005-03-09 01:13:08 -0500 (Wed, 09 Mar 2005) New Revision: 6133 Added: tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.3.3-stdin.patch tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.5-libs.patch tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.5.tar.bz2 Removed: tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.3.3.tar.gz Modified: tinysofa/releases/1.2/ipsec-tools/current/sources/pfkeyv2.h tinysofa/releases/1.2/ipsec-tools/current/sources/udp.h tinysofa/releases/1.2/ipsec-tools/current/sources/xfrm.h tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec Log: - 0.5 Added: tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.3.3-stdin.patch =================================================================== --- tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.3.3-stdin.patch 2005-03-08 08:19:46 UTC (rev 6132) +++ tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.3.3-stdin.patch 2005-03-09 06:13:08 UTC (rev 6133) @@ -0,0 +1,12 @@ +--- ipsec-tools-0.3.3/src/setkey/setkey.c.foo 2004-11-04 15:24:55.130336209 -0500 ++++ ipsec-tools-0.3.3/src/setkey/setkey.c 2004-11-04 15:25:08.118673928 -0500 +@@ -141,7 +141,8 @@ + while ((c = getopt(argc, argv, "acdf:HlvxDFPhV")) != -1) { + switch (c) { + case 'c': +- f_mode = MODE_STDIN; ++ f_mode = MODE_SCRIPT; ++ fp = stdin; + break; + case 'f': + f_mode = MODE_SCRIPT; Deleted: tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.3.3.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.5-libs.patch =================================================================== --- tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.5-libs.patch 2005-03-08 08:19:46 UTC (rev 6132) +++ tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.5-libs.patch 2005-03-09 06:13:08 UTC (rev 6133) @@ -0,0 +1,13 @@ +--- ipsec-tools-0.5/configure.moo 2005-02-25 17:07:06.000000000 -0500 ++++ ipsec-tools-0.5/configure 2005-02-25 17:08:15.000000000 -0500 +@@ -24557,7 +24557,9 @@ + ;; + esac + +- ac_config_files="$ac_config_files Makefile package_version.h src/Makefile src/include-glibc/Makefile src/libipsec/Makefile src/setkey/Makefile src/racoon/Makefile src/racoon/samples/psk.txt src/racoon/samples/racoon.conf rpm/Makefile rpm/suse/Makefile rpm/suse/ipsec-tools.spec" ++LIBS="-Wl,--as-needed $LIBS" ++ ++ac_config_files="$ac_config_files Makefile package_version.h src/Makefile src/include-glibc/Makefile src/libipsec/Makefile src/setkey/Makefile src/racoon/Makefile src/racoon/samples/psk.txt src/racoon/samples/racoon.conf rpm/Makefile rpm/suse/Makefile rpm/suse/ipsec-tools.spec" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure Added: tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.5.tar.bz2 =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-0.5.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/ipsec-tools/current/sources/pfkeyv2.h =================================================================== --- tinysofa/releases/1.2/ipsec-tools/current/sources/pfkeyv2.h 2005-03-08 08:19:46 UTC (rev 6132) +++ tinysofa/releases/1.2/ipsec-tools/current/sources/pfkeyv2.h 2005-03-09 06:13:08 UTC (rev 6133) @@ -245,6 +245,7 @@ /* Security Association flags */ #define SADB_SAFLAGS_PFS 1 +#define SADB_SAFLAGS_DECAP_DSCP 0x40000000 #define SADB_SAFLAGS_NOECN 0x80000000 /* Security Association states */ Modified: tinysofa/releases/1.2/ipsec-tools/current/sources/udp.h =================================================================== --- tinysofa/releases/1.2/ipsec-tools/current/sources/udp.h 2005-03-08 08:19:46 UTC (rev 6132) +++ tinysofa/releases/1.2/ipsec-tools/current/sources/udp.h 2005-03-09 06:13:08 UTC (rev 6133) @@ -34,38 +34,4 @@ #define UDP_ENCAP_ESPINUDP_NON_IKE 1 /* draft-ietf-ipsec-nat-t-ike-00/01 */ #define UDP_ENCAP_ESPINUDP 2 /* draft-ietf-ipsec-udp-encaps-06 */ -#ifdef __KERNEL__ - -#include -#include -#include - -struct udp_opt { - int pending; /* Any pending frames ? */ - unsigned int corkflag; /* Cork is required */ - __u16 encap_type; /* Is this an Encapsulation socket? */ - /* - * Following member retains the infomation to create a UDP header - * when the socket is uncorked. - */ - __u16 len; /* total length of pending frames */ -}; - -/* WARNING: don't change the layout of the members in udp_sock! */ -struct udp_sock { - struct sock sk; -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) - struct ipv6_pinfo *pinet6; -#endif - struct inet_opt inet; - struct udp_opt udp; -}; - -static inline struct udp_opt * udp_sk(const struct sock *__sk) -{ - return &((struct udp_sock *)__sk)->udp; -} - -#endif - #endif /* _LINUX_UDP_H */ Modified: tinysofa/releases/1.2/ipsec-tools/current/sources/xfrm.h =================================================================== --- tinysofa/releases/1.2/ipsec-tools/current/sources/xfrm.h 2005-03-08 08:19:46 UTC (rev 6132) +++ tinysofa/releases/1.2/ipsec-tools/current/sources/xfrm.h 2005-03-09 06:13:08 UTC (rev 6133) @@ -103,27 +103,46 @@ }; /* Netlink configuration messages. */ -#define XFRM_MSG_BASE 0x10 +enum { + XFRM_MSG_BASE = 0x10, -#define XFRM_MSG_NEWSA (XFRM_MSG_BASE + 0) -#define XFRM_MSG_DELSA (XFRM_MSG_BASE + 1) -#define XFRM_MSG_GETSA (XFRM_MSG_BASE + 2) + XFRM_MSG_NEWSA = 0x10, +#define XFRM_MSG_NEWSA XFRM_MSG_NEWSA + XFRM_MSG_DELSA, +#define XFRM_MSG_DELSA XFRM_MSG_DELSA + XFRM_MSG_GETSA, +#define XFRM_MSG_GETSA XFRM_MSG_GETSA -#define XFRM_MSG_NEWPOLICY (XFRM_MSG_BASE + 3) -#define XFRM_MSG_DELPOLICY (XFRM_MSG_BASE + 4) -#define XFRM_MSG_GETPOLICY (XFRM_MSG_BASE + 5) + XFRM_MSG_NEWPOLICY, +#define XFRM_MSG_NEWPOLICY XFRM_MSG_NEWPOLICY + XFRM_MSG_DELPOLICY, +#define XFRM_MSG_DELPOLICY XFRM_MSG_DELPOLICY + XFRM_MSG_GETPOLICY, +#define XFRM_MSG_GETPOLICY XFRM_MSG_GETPOLICY -#define XFRM_MSG_ALLOCSPI (XFRM_MSG_BASE + 6) -#define XFRM_MSG_ACQUIRE (XFRM_MSG_BASE + 7) -#define XFRM_MSG_EXPIRE (XFRM_MSG_BASE + 8) + XFRM_MSG_ALLOCSPI, +#define XFRM_MSG_ALLOCSPI XFRM_MSG_ALLOCSPI + XFRM_MSG_ACQUIRE, +#define XFRM_MSG_ACQUIRE XFRM_MSG_ACQUIRE + XFRM_MSG_EXPIRE, +#define XFRM_MSG_EXPIRE XFRM_MSG_EXPIRE -#define XFRM_MSG_UPDPOLICY (XFRM_MSG_BASE + 9) -#define XFRM_MSG_UPDSA (XFRM_MSG_BASE + 10) + XFRM_MSG_UPDPOLICY, +#define XFRM_MSG_UPDPOLICY XFRM_MSG_UPDPOLICY + XFRM_MSG_UPDSA, +#define XFRM_MSG_UPDSA XFRM_MSG_UPDSA -#define XFRM_MSG_POLEXPIRE (XFRM_MSG_BASE + 11) + XFRM_MSG_POLEXPIRE, +#define XFRM_MSG_POLEXPIRE XFRM_MSG_POLEXPIRE -#define XFRM_MSG_MAX (XFRM_MSG_POLEXPIRE+1) + XFRM_MSG_FLUSHSA, +#define XFRM_MSG_FLUSHSA XFRM_MSG_FLUSHSA + XFRM_MSG_FLUSHPOLICY, +#define XFRM_MSG_FLUSHPOLICY XFRM_MSG_FLUSHPOLICY + XFRM_MSG_MAX +}; + struct xfrm_user_tmpl { struct xfrm_id id; __u16 family; @@ -171,6 +190,7 @@ __u8 replay_window; __u8 flags; #define XFRM_STATE_NOECN 1 +#define XFRM_STATE_DECAP_DSCP 2 }; struct xfrm_usersa_id { @@ -228,6 +248,10 @@ __u8 hard; }; +struct xfrm_usersa_flush { + __u8 proto; +}; + #define XFRMGRP_ACQUIRE 1 #define XFRMGRP_EXPIRE 2 Modified: tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec =================================================================== --- tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec 2005-03-08 08:19:46 UTC (rev 6132) +++ tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec 2005-03-09 06:13:08 UTC (rev 6133) @@ -1,19 +1,20 @@ Name: ipsec-tools -Version: 0.3.3 -Release: 2jh +Version: 0.5 +Release: 1jh Summary: Tools for configuring and using IPSEC License: BSD Group: main URL: http://ipsec-tools.sourceforge.net/ -Source: http://prdownload.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.gz +Source: http://prdownload.sourceforge.net/ipsec-tools/ipsec-tools-%{version}.tar.bz2 Source1: ipsec.h Source2: pfkeyv2.h Source3: racoon.conf Source4: psk.txt Source5: xfrm.h Source6: udp.h -Patch: ipsec-tools-0.2.4-racoon-dest.patch +Patch: ipsec-tools-0.5-libs.patch Patch2: isakmp.c.diff +Patch3: ipsec-tools-0.3.3-stdin.patch BuildPrereq: openssl-devel, krb5-devel, flex, bison, gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: initscripts >= 7.31 @@ -23,67 +24,76 @@ really use the IPsec functionality in the linux-2.5+ kernels. This package builds: - - libipsec, a PFKeyV2 library - setkey, a program to directly manipulate policies and SAs - racoon, an IKEv1 keying daemon + %prep %setup -q %patch -p1 %patch2 -p1 +%patch3 -p1 mkdir -p kernel-headers/linux cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux + %build -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --exec-prefix=/ \ - --libdir=/%{_lib} \ - --sysconfdir=/etc \ - --mandir=%{_mandir} \ +sed -i 's|-Werror||g' configure +CFLAGS="$RPM_OPT_FLAGS" %configure \ --with-kernel-headers=`pwd`/kernel-headers \ - --enable-shared=yes + --sysconfdir=/etc/racoon \ + --enable-adminport \ + --enable-hybrid \ + --enable-frag \ + --enable-dpd \ + --enable-gssapi \ + --enable-natt %make + %install -mkdir -p $RPM_BUILD_ROOT/usr/sbin -%makeinstall_std +mkdir -p $RPM_BUILD_ROOT/sbin +mkdir -p $RPM_BUILD_ROOT/etc/racoon +make install DESTDIR=$RPM_BUILD_ROOT # no devel stuff for now -rm -rf $RPM_BUILD_ROOT/%{_lib}/libipsec.{a,la} \ +rm -rf $RPM_BUILD_ROOT/%{_libdir}/libipsec.{a,la} \ $RPM_BUILD_ROOT/%{_includedir} \ $RPM_BUILD_ROOT/%{_mandir}/man3 -rm -f $RPM_BUILD_ROOT/etc/racoon/{psk.txt,psk.txt.dist,racoon.conf,racoon.conf.dist} install -m 600 %{SOURCE3} \ $RPM_BUILD_ROOT/etc/racoon/racoon.conf install -m 600 %{SOURCE4} \ $RPM_BUILD_ROOT/etc/racoon/psk.txt - - - + +mv $RPM_BUILD_ROOT%{_sbindir}/setkey $RPM_BUILD_ROOT/sbin + mkdir -m 0700 -p $RPM_BUILD_ROOT/etc/racoon/certs + %clean %clean_buildroot -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - %files %defattr(-,root,root) %doc src/racoon/samples/racoon.conf src/racoon/samples/psk.txt %doc src/racoon/doc/FAQ %doc ChangeLog NEWS README -/%{_lib}/* /sbin/* %{_sbindir}/* %{_mandir}/man*/* %dir /etc/racoon %dir /etc/racoon/certs +%dir /var/racoon %config(noreplace) /etc/racoon/psk.txt %config(noreplace) /etc/racoon/racoon.conf + %changelog +* Tue Mar 8 2005 Jaakko Heinonen 0.5-1jh +- 0.5 + * Sat Sep 04 2004 tsintegrate 0.3.3-1ts - current (0.3.3-1jh) integrated as 0.3.3-1ts for release 1.1-U1 From svn at tinysofa.org Wed Mar 9 19:55:07 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 9 Mar 2005 14:55:07 -0500 (EST) Subject: [tinysofa-svn] r6135 - in tinysofa/releases/1.2/grsecurity/current: sources specs Message-ID: <20050309195507.DAA9234553D@minbar.tinysofa.org> Author: jh Date: 2005-03-09 14:54:57 -0500 (Wed, 09 Mar 2005) New Revision: 6135 Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050309.tar Removed: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050223.tar Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - update policies Deleted: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050223.tar =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050309.tar =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050309.tar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-03-09 17:29:16 UTC (rev 6134) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-03-09 19:54:57 UTC (rev 6135) @@ -1,4 +1,4 @@ -%define policies_date 20050223 +%define policies_date 20050309 Summary: grsecurity user space utilities and policies Name: grsecurity Version: 2.1.3 From svn at tinysofa.org Thu Mar 10 05:20:52 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 10 Mar 2005 00:20:52 -0500 (EST) Subject: [tinysofa-svn] r6136 - tinysofa/releases/1.2/squid/current/specs Message-ID: <20050310052052.A1422345A57@minbar.tinysofa.org> Author: jh Date: 2005-03-10 00:20:46 -0500 (Thu, 10 Mar 2005) New Revision: 6136 Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec Log: - BuildRequires: cyrus-sasl-devel Modified: tinysofa/releases/1.2/squid/current/specs/squid.spec =================================================================== --- tinysofa/releases/1.2/squid/current/specs/squid.spec 2005-03-09 19:54:57 UTC (rev 6135) +++ tinysofa/releases/1.2/squid/current/specs/squid.spec 2005-03-10 05:20:46 UTC (rev 6136) @@ -34,7 +34,7 @@ %accountman_requires %service_requires BuildRequires: openldap-devel pam-devel openssl-devel -BuildRequires: krb5-devel libcom_err-devel +BuildRequires: krb5-devel libcom_err-devel cyrus-sasl-devel %description Squid is a high-performance proxy caching server for Web clients, From svn at tinysofa.org Thu Mar 10 14:33:28 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 10 Mar 2005 09:33:28 -0500 (EST) Subject: [tinysofa-svn] r6138 - in tinysofa/releases/1.2/grsecurity/current: sources specs Message-ID: <20050310143328.1BBE7345732@minbar.tinysofa.org> Author: jh Date: 2005-03-10 09:33:17 -0500 (Thu, 10 Mar 2005) New Revision: 6138 Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050310.tar Removed: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050309.tar Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - update policies Deleted: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050309.tar =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050310.tar =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/grsecurity/current/sources/policies-20050310.tar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-03-10 13:11:11 UTC (rev 6137) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-03-10 14:33:17 UTC (rev 6138) @@ -1,4 +1,4 @@ -%define policies_date 20050309 +%define policies_date 20050310 Summary: grsecurity user space utilities and policies Name: grsecurity Version: 2.1.3 From svn at tinysofa.org Thu Mar 10 14:51:27 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 10 Mar 2005 09:51:27 -0500 (EST) Subject: [tinysofa-svn] r6139 - tinysofa/releases/1.2/anaconda/current/sources Message-ID: <20050310145127.65CE234557F@minbar.tinysofa.org> Author: jh Date: 2005-03-10 09:51:21 -0500 (Thu, 10 Mar 2005) New Revision: 6139 Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch Log: - hopefully fix account dialog Modified: tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch =================================================================== --- tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch 2005-03-10 14:33:17 UTC (rev 6138) +++ tinysofa/releases/1.2/anaconda/current/sources/anaconda-9.1-nox.patch 2005-03-10 14:51:21 UTC (rev 6139) @@ -855,3 +855,14 @@ ("writeksconfig", writeKSConfiguration, ("id", "instPath")), ("dopostaction", doPostAction, ("id", "instPath")), ("methodcomplete", doMethodComplete, ("method",)), +--- anaconda-9.1/textw/userauth_text.py.nox~ 2005-03-02 21:29:05.000000000 +0200 ++++ anaconda-9.1/textw/userauth_text.py 2005-03-10 16:49:07.638170464 +0200 +@@ -25,7 +25,7 @@ + return 0 + + class RootPasswordWindow: +- def __call__ (self, screen, intf, rootPw): ++ def __call__ (self, screen, rootPw, accounts): + toplevel = GridFormHelp (screen, _("Root Password"), "rootpw", 1, 3) + + toplevel.add (TextboxReflowed(37, _("Pick a root password. You must " From svn at tinysofa.org Fri Mar 11 20:25:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 11 Mar 2005 15:25:43 -0500 (EST) Subject: [tinysofa-svn] r6140 - in contrib/1.2/sqlite3/current: sources specs Message-ID: <20050311202543.70AB3345716@minbar.tinysofa.org> Author: gda Date: 2005-03-11 15:25:04 -0500 (Fri, 11 Mar 2005) New Revision: 6140 Added: contrib/1.2/sqlite3/current/sources/sqlite-3.1.5.tar.gz Removed: contrib/1.2/sqlite3/current/sources/sqlite-3.1.3.tar.gz Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec Log: 3.1.5 Deleted: contrib/1.2/sqlite3/current/sources/sqlite-3.1.3.tar.gz =================================================================== (Binary files differ) Added: contrib/1.2/sqlite3/current/sources/sqlite-3.1.5.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.2/sqlite3/current/sources/sqlite-3.1.5.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec =================================================================== --- contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-10 14:51:21 UTC (rev 6139) +++ contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-11 20:25:04 UTC (rev 6140) @@ -1,6 +1,6 @@ Summary: SQLite is a C library that implements an embeddable SQL database engine Name: sqlite3 -Version: 3.1.3 +Version: 3.1.5 Release: 1gd License: GPL Group: contrib @@ -60,6 +60,12 @@ %doc README doc/* %changelog +* Fri Mar 11 2005 Gerald Dachs 3.1.5-1gd +- 3.1.5 + +* Fri Mar 11 2005 Gerald Dachs 3.1.4-1gd +- 3.1.4 + * Mon Mar 7 2005 Gerald Dachs 3.1.3-1gd - 3.1.3 From svn at tinysofa.org Sat Mar 12 08:41:29 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 12 Mar 2005 03:41:29 -0500 (EST) Subject: [tinysofa-svn] r6141 - in tinysofa/releases/1.2/mysql/current: sources specs Message-ID: <20050312084129.BF20F34592E@minbar.tinysofa.org> Author: jh Date: 2005-03-12 03:33:15 -0500 (Sat, 12 Mar 2005) New Revision: 6141 Added: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10a.tar.gz Removed: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10.tar.gz Modified: tinysofa/releases/1.2/mysql/current/specs/mysql.spec Log: - 4.1.10a Deleted: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10a.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/mysql/current/sources/mysql-4.1.10a.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.2/mysql/current/specs/mysql.spec 2005-03-11 20:25:04 UTC (rev 6140) +++ tinysofa/releases/1.2/mysql/current/specs/mysql.spec 2005-03-12 08:33:15 UTC (rev 6141) @@ -5,7 +5,7 @@ Summary: A SQL database engine Name: mysql Group: main -Version: 4.1.10 +Version: 4.1.10a Release: 1jh License: GPL / LGPL Source: http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/mysql-%{version}.tar.gz @@ -307,6 +307,9 @@ %changelog +* Sat Mar 12 2005 Jaakko Heinonen 4.1.10a-1jh +- 4.1.10a (security fixes) + * Fri Feb 25 2005 Jaakko Heinonen 4.1.10-1jh - 4.1.10 - make it build with new gcc From svn at tinysofa.org Sat Mar 12 22:34:07 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 12 Mar 2005 17:34:07 -0500 (EST) Subject: [tinysofa-svn] r6142 - in tinysofa/releases/1.2/kernel/current: sources specs Message-ID: <20050312223407.23FC9345695@minbar.tinysofa.org> Author: jh Date: 2005-03-12 17:33:59 -0500 (Sat, 12 Mar 2005) New Revision: 6142 Added: tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-achi.patch Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec Log: - add linux-2.6.11-achi.patch - correct groups Added: tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-achi.patch =================================================================== --- tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-achi.patch 2005-03-12 08:33:15 UTC (rev 6141) +++ tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-achi.patch 2005-03-12 22:33:59 UTC (rev 6142) @@ -0,0 +1,33 @@ +From: Brett Russ +Subject: [PATCH libata-2.6] AHCI: fix fatal error int handling +Date: Wed, 9 Mar 2005 21:04:34 GMT + +I noticed that the AHCI CI (cmd issue) reg wasn't getting cleared +after error ints resulting in no further commands being successfully +issued to the port. This patch fixes. All that's really needed is +the 1's complement but I also removed the disabling/enabling of the +FIS_RX b/c this isn't spec'd as necessary when handling error ints. + +Signed-off-by: Brett Russ + +===== drivers/scsi/ahci.c 1.17 vs edited ===== +--- 1.17/drivers/scsi/ahci.c 2005-02-24 14:52:41 -05:00 ++++ edited/drivers/scsi/ahci.c 2005-03-09 15:30:06 -05:00 +@@ -538,7 +538,7 @@ + + /* stop DMA */ + tmp = readl(port_mmio + PORT_CMD); +- tmp &= PORT_CMD_START | PORT_CMD_FIS_RX; ++ tmp &= ~PORT_CMD_START; + writel(tmp, port_mmio + PORT_CMD); + + /* wait for engine to stop. TODO: this could be +@@ -570,7 +570,7 @@ + + /* re-start DMA */ + tmp = readl(port_mmio + PORT_CMD); +- tmp |= PORT_CMD_START | PORT_CMD_FIS_RX; ++ tmp |= PORT_CMD_START; + writel(tmp, port_mmio + PORT_CMD); + readl(port_mmio + PORT_CMD); /* flush */ + Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-03-12 08:33:15 UTC (rev 6141) +++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-03-12 22:33:59 UTC (rev 6142) @@ -45,7 +45,7 @@ Group: main License: GPLv2 Version: %{rpmversion} -Release: 1jh +Release: 2jh ExclusiveArch: noarch %{all_x86} x86_64 ExclusiveOS: Linux Provides: kernel = %{version} @@ -82,6 +82,7 @@ Patch3: patch-2.6.11-ac1 Patch100: linux-2.6.11-route-crash.patch +Patch101: linux-2.6.11-achi.patch Patch20020: linux-2.6.8-tinysofa-syslog.patch @@ -99,7 +100,7 @@ %package devel Summary: Development package for building kernel modules to match the kernel. -Group: System Environment/Kernel +Group: development AutoReqProv: no Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release} @@ -110,7 +111,7 @@ %package doc Summary: Various documentation bits found in the kernel source. -Group: Documentation +Group: documentation %description doc This package contains documentation files from the kernel @@ -143,7 +144,7 @@ %package smp-devel Summary: Development package for building kernel modules to match the SMP kernel. -Group: System Environment/Kernel +Group: development Provides: kernel-smp-devel-%{_target_cpu} = %{rpmversion}-%{release} AutoReqProv: no @@ -173,7 +174,7 @@ %package xen0-devel Summary: Development package for building kernel modules to match the kernel. -Group: System Environment/Kernel +Group: development AutoReqProv: no Provides: kernel-xen0-devel-%{_target_cpu} = %{rpmversion}-%{release} @@ -200,7 +201,7 @@ %package xenU-devel Summary: Development package for building kernel modules to match the kernel. -Group: System Environment/Kernel +Group: development AutoReqProv: no Provides: kernel-XenU-devel-%{_target_cpu} = %{rpmversion}-%{release} @@ -221,6 +222,7 @@ %patch3 -p1 -b .ac1~ %patch100 -p1 -b .route-crash~ +%patch101 -p1 -b .achi~ %patch20020 -p1 -b .tinysofa-syslog~ @@ -574,6 +576,10 @@ %changelog +* Sun Mar 13 2005 Jaakko Heinonen 2.6.11-2jh +- add linux-2.6.11-achi.patch +- correct groups + * Fri Feb 18 2005 Jaakko Heinonen 2.6.10-6jh - 2.6.11-rc4 - add a x86_64 patch From svn at tinysofa.org Sat Mar 12 23:17:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 12 Mar 2005 18:17:50 -0500 (EST) Subject: [tinysofa-svn] r6143 - contrib/1.2/amavisd-new/current/specs Message-ID: <20050312231750.D410A3458A1@minbar.tinysofa.org> Author: gda Date: 2005-03-12 18:17:45 -0500 (Sat, 12 Mar 2005) New Revision: 6143 Modified: contrib/1.2/amavisd-new/current/specs/amavisd-new.spec Log: added JpegTester.pm to installed files Modified: contrib/1.2/amavisd-new/current/specs/amavisd-new.spec =================================================================== --- contrib/1.2/amavisd-new/current/specs/amavisd-new.spec 2005-03-12 22:33:59 UTC (rev 6142) +++ contrib/1.2/amavisd-new/current/specs/amavisd-new.spec 2005-03-12 23:17:45 UTC (rev 6143) @@ -1,6 +1,6 @@ Name: amavisd-new Version: 2.2.1 -Release: 2gd +Release: 3gd Summary: AMaViSd-new - A Mail Virus Scanner URL: http://www.ijs.si/software/amavisd/ License: GPL @@ -69,6 +69,9 @@ install -m 0640 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/amavisd.conf install -m 0755 amavisd $RPM_BUILD_ROOT/%{_sbindir}/amavisd +install -d -m 0755 $RPM_BUILD_ROOT%perl_vendorlib +install -m 755 JpegTester.pm $RPM_BUILD_ROOT%perl_vendorlib + %clean %clean_buildroot @@ -117,9 +120,12 @@ %dir /var/spool/amavis %dir /var/spool/amavis/db %dir /var/spool/amavis/virusmails +%perl_vendorlib/JpegTester.pm +%changelog +* Sun Mar 13 2005 Gerald Dachs 2.2.1-3gd +- added JpegTester.pm to installed files -%changelog * Wed Feb 15 2005 Gerald Dachs 2.2.1-2gd - removed version check from perl-mime-tools From svn at tinysofa.org Sun Mar 13 11:32:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 13 Mar 2005 06:32:55 -0500 (EST) Subject: [tinysofa-svn] r6144 - tinysofa/releases/1.2/cyrus-imapd/current/specs Message-ID: <20050313113255.324B634563A@minbar.tinysofa.org> Author: gda Date: 2005-03-13 06:32:49 -0500 (Sun, 13 Mar 2005) New Revision: 6144 Modified: tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec Log: some fixes for sieve Modified: tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec =================================================================== --- tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-03-12 23:17:45 UTC (rev 6143) +++ tinysofa/releases/1.2/cyrus-imapd/current/specs/cyrus-imapd.spec 2005-03-13 11:32:49 UTC (rev 6144) @@ -1,7 +1,7 @@ Summary: A high-performance mail store with IMAP and POP3 support. Name: cyrus-imapd Version: 2.2.12 -Release: 3jh +Release: 4gd License: BSD Group: main URL: http://asg.web.cmu.edu/cyrus/imapd/ @@ -156,6 +156,8 @@ install -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pam.d/imap install -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pam.d/pop install -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pam.d/pop3 +install -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pam.d/sieve + # fix libdir perl -pi -e 's|/usr/lib|%{_libdir}|g' \ %{buildroot}%{_initrddir}/cyrus \ @@ -164,7 +166,7 @@ # Build and populate /var/spool %{__mkdir_p} -m 0755 \ %{buildroot}/var/spool/cyrus-imap/{stage,user,quota,proc,log,msg,socket,db} \ - %{buildroot}/var/spool/cyrus-imap/spool + %{buildroot}/var/spool/cyrus-imap/{spool,sieve} touch %{buildroot}/var/spool/cyrus-imap/mailboxes export IMAP_DIR="%{buildroot}/var/spool/cyrus-imap/" @@ -270,6 +272,7 @@ %config(noreplace) %{_sysconfdir}/pam.d/imap %config(noreplace) %{_sysconfdir}/pam.d/pop %config(noreplace) %{_sysconfdir}/pam.d/pop3 +%config(noreplace) %{_sysconfdir}/pam.d/sieve %attr(0755,root,root) %{_initrddir}/cyrus %attr(0750,cyrus,mail) %dir /var/spool/cyrus-imap %attr(0640,cyrus,cyrus) /var/spool/cyrus-imap/mailboxes @@ -279,6 +282,7 @@ %attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/proc %attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/quota %attr(0750,cyrus,mail) /var/spool/cyrus-imap/socket +%attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/sieve %attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/spool %attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/stage %attr(0750,cyrus,cyrus) /var/spool/cyrus-imap/user @@ -295,6 +299,9 @@ %changelog +* Sun Mar 13 2005 Gerald Dachs 2.2.12-4gd +- added /var/spool/cyrus-imap/sieve and /etc/pam.d/sieve + * Thu Mar 3 2005 Jaakko Heinonen 2.2.12-3jh - add cyrus-imapd-2.2.4-OE-seenstate.patch From svn at tinysofa.org Sun Mar 13 11:44:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 13 Mar 2005 06:44:24 -0500 (EST) Subject: [tinysofa-svn] r6145 - in tinysofa/releases/1.2/apt/current: sources specs Message-ID: <20050313114424.E1DFD3456C0@minbar.tinysofa.org> Author: jh Date: 2005-03-13 06:44:06 -0500 (Sun, 13 Mar 2005) New Revision: 6145 Modified: tinysofa/releases/1.2/apt/current/sources/mirror-select.lua tinysofa/releases/1.2/apt/current/specs/apt.spec Log: - disable mirror selector if it fails to fetch the list Modified: tinysofa/releases/1.2/apt/current/sources/mirror-select.lua =================================================================== --- tinysofa/releases/1.2/apt/current/sources/mirror-select.lua 2005-03-13 11:32:49 UTC (rev 6144) +++ tinysofa/releases/1.2/apt/current/sources/mirror-select.lua 2005-03-13 11:44:06 UTC (rev 6145) @@ -209,7 +209,9 @@ sourcelist = confget("Dir::Etc::sourceparts::mirrorsource/f"); if fetch_mirrors() == false then + disable_druid() apterror(_("Failed to fetch mirror list file:\n"..confget("Apt::State::mirrors-URL"))) + print(_('To re-run the mirror selector run "apt-get mirror-select"')) return end Modified: tinysofa/releases/1.2/apt/current/specs/apt.spec =================================================================== --- tinysofa/releases/1.2/apt/current/specs/apt.spec 2005-03-13 11:32:49 UTC (rev 6144) +++ tinysofa/releases/1.2/apt/current/specs/apt.spec 2005-03-13 11:44:06 UTC (rev 6145) @@ -4,7 +4,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support. Name: apt Version: 0.5.15cnc6 -Release: 8jh +Release: 9jh Epoch: 0 Group: main URL: https://moin.conectiva.com.br/AptRpm @@ -364,6 +364,9 @@ exit 0 %changelog +* Sun Mar 13 2005 Jaakko Heinonen 0.5.15cnc6-9jh +- disable mirror selector if it fails to fetch the list + * Fri Feb 25 2005 Jaakko Heinonen 0.5.15cnc6-8jh - fix libdir for apt scripts From svn at tinysofa.org Sun Mar 13 17:49:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 13 Mar 2005 12:49:11 -0500 (EST) Subject: [tinysofa-svn] r6146 - in tinysofa/releases/1.1/mysql/current: sources specs Message-ID: <20050313174911.257D434558B@minbar.tinysofa.org> Author: jh Date: 2005-03-13 12:34:06 -0500 (Sun, 13 Mar 2005) New Revision: 6146 Added: tinysofa/releases/1.1/mysql/current/sources/mysql-4.0.24.tar.gz Removed: tinysofa/releases/1.1/mysql/current/sources/mysql-4.0.21.tar.gz Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec Log: - 4.0.24 (security fixes) Deleted: tinysofa/releases/1.1/mysql/current/sources/mysql-4.0.21.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.1/mysql/current/sources/mysql-4.0.24.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.1/mysql/current/sources/mysql-4.0.24.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.1/mysql/current/specs/mysql.spec =================================================================== --- tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2005-03-13 11:44:06 UTC (rev 6145) +++ tinysofa/releases/1.1/mysql/current/specs/mysql.spec 2005-03-13 17:34:06 UTC (rev 6146) @@ -1,8 +1,8 @@ Summary: A SQL database engine Name: mysql Group: main -Version: 4.0.21 -Release: 3ts +Version: 4.0.24 +Release: 1jh License: GPL / LGPL %define shared_libversion 12:0:0 %define mysqld_user mysql @@ -162,11 +162,11 @@ ## Install debugging symbols [bg] #install -m644 sql/mysqld.sym $RBR%{_libdir}/mysql/mysqld.sym -pushd Docs - makeinfo --html --no-split manual.texi - install -d -m 755 $RBR%{_htmldir}/%{name} - install -m644 mysql.html $RBR%{_htmldir}/%{name}/ -popd +#pushd Docs +# makeinfo --html --no-split manual.texi +# install -d -m 755 $RBR%{_htmldir}/%{name} +# install -m644 mysql.html $RBR%{_htmldir}/%{name}/ +#popd %nuke_info @@ -274,7 +274,7 @@ %exclude %{_bindir}/make_win_src_distribution %exclude %{_bindir}/make_win_binary_distribution -%{_htmldir}/%{name} +#%{_htmldir}/%{name} %{_sbindir}/mysqld @@ -344,6 +344,9 @@ %{_bindir}/mysqlmanagerc %changelog +* Sun Mar 13 2005 Jaakko Heinonen 4.0.24-1jh +- 4.0.24 (security fixes) + * Tue Jan 04 2005 tsintegrate 4.0.21-3ts - current (4.0.21-3jh) integrated as 4.0.21-3ts for release 1.1-U3 From svn at tinysofa.org Sun Mar 13 18:00:01 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 13 Mar 2005 13:00:01 -0500 (EST) Subject: [tinysofa-svn] r6147 - in tinysofa/releases/1.2/perl/current: sources specs Message-ID: <20050313180001.1B4F83456C3@minbar.tinysofa.org> Author: jh Date: 2005-03-13 12:59:29 -0500 (Sun, 13 Mar 2005) New Revision: 6147 Added: tinysofa/releases/1.2/perl/current/sources/perl-5.8.4-CAN-2005-0448.patch Modified: tinysofa/releases/1.2/perl/current/specs/perl.spec Log: - fix CAN-2005-0448 (#9) Added: tinysofa/releases/1.2/perl/current/sources/perl-5.8.4-CAN-2005-0448.patch =================================================================== --- tinysofa/releases/1.2/perl/current/sources/perl-5.8.4-CAN-2005-0448.patch 2005-03-13 17:34:06 UTC (rev 6146) +++ tinysofa/releases/1.2/perl/current/sources/perl-5.8.4-CAN-2005-0448.patch 2005-03-13 17:59:29 UTC (rev 6147) @@ -0,0 +1,275 @@ +--- perl-5.8.4.orig/lib/File/Path.pm ++++ perl-5.8.4/lib/File/Path.pm +@@ -72,27 +72,17 @@ + + =item * + +-a boolean value, which if TRUE will cause C to +-skip any files to which you do not have delete access +-(if running under VMS) or write access (if running +-under another OS). This will change in the future when +-a criterion for 'delete permission' under OSs other +-than VMS is settled. (defaults to FALSE) ++a boolean value, which if FALSE (the default for non-root users) will ++cause C to adjust the mode of directories (if required) prior ++to attempting to remove the contents. Note that on interruption or ++failure of C, directories may be left with more permissive ++modes for the owner. + + =back + + It returns the number of files successfully deleted. Symlinks are + simply deleted and not followed. + +-B If the third parameter is not TRUE, C is B +-in the face of failure or interruption. Files and directories which +-were not deleted may be left with permissions reset to allow world +-read and write access. Note also that the occurrence of errors in +-rmtree can be determined I by trapping diagnostic messages +-using C<$SIG{__WARN__}>; it is not apparent from the return value. +-Therefore, you must be extremely careful about using C +-in situations where security is an issue. +- + =head1 DIAGNOSTICS + + =over 4 +@@ -118,6 +108,7 @@ + use Exporter (); + use strict; + use warnings; ++use Cwd 'getcwd'; + + our $VERSION = "1.06"; + our @ISA = qw( Exporter ); +@@ -166,111 +157,129 @@ + @created; + } + +-sub rmtree { +- my($roots, $verbose, $safe) = @_; +- my(@files); +- my($count) = 0; +- $verbose ||= 0; +- $safe ||= 0; +- +- if ( defined($roots) && length($roots) ) { +- $roots = [$roots] unless ref $roots; +- } +- else { +- carp "No root path(s) specified\n"; +- return 0; +- } +- +- my($root); +- foreach $root (@{$roots}) { +- if ($Is_MacOS) { +- $root = ":$root" if $root !~ /:/; +- $root =~ s#([^:])\z#$1:#; +- } else { +- $root =~ s#/\z##; ++sub _rmtree; ++sub _rmtree ++{ ++ my ($path, $prefix, $up, $up_dev, $up_ino, $verbose, $safe) = @_; ++ ++ my ($dev, $ino) = lstat $path or return 0; ++ unless (-d _) ++ { ++ print "unlink $prefix$path\n" if $verbose; ++ unless (unlink $path) ++ { ++ carp "Can't remove file $prefix$path ($!)"; ++ return 0; + } +- (undef, undef, my $rp) = lstat $root or next; +- $rp &= 07777; # don't forget setuid, setgid, sticky bits +- if ( -d _ ) { +- # notabene: 0700 is for making readable in the first place, +- # it's also intended to change it to writable in case we have +- # to recurse in which case we are better than rm -rf for +- # subtrees with strange permissions +- chmod(0700, ($Is_VMS ? VMS::Filespec::fileify($root) : $root)) +- or carp "Can't make directory $root read+writeable: $!" +- unless $safe; +- +- if (opendir my $d, $root) { +- no strict 'refs'; +- if (!defined ${"\cTAINT"} or ${"\cTAINT"}) { +- # Blindly untaint dir names +- @files = map { /^(.*)$/s ; $1 } readdir $d; +- } else { +- @files = readdir $d; +- } +- closedir $d; +- } +- else { +- carp "Can't read $root: $!"; +- @files = (); +- } + +- # Deleting large numbers of files from VMS Files-11 filesystems +- # is faster if done in reverse ASCIIbetical order +- @files = reverse @files if $Is_VMS; +- ($root = VMS::Filespec::unixify($root)) =~ s#\.dir\z## if $Is_VMS; +- if ($Is_MacOS) { +- @files = map("$root$_", @files); +- } else { +- @files = map("$root/$_", grep $_!~/^\.{1,2}\z/s, at files); +- } +- $count += rmtree(\@files,$verbose,$safe); +- if ($safe && +- ($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) { +- print "skipped $root\n" if $verbose; +- next; +- } +- chmod 0700, $root +- or carp "Can't make directory $root writeable: $!" +- if $force_writeable; +- print "rmdir $root\n" if $verbose; +- if (rmdir $root) { +- ++$count; +- } +- else { +- carp "Can't remove directory $root: $!"; +- chmod($rp, ($Is_VMS ? VMS::Filespec::fileify($root) : $root)) +- or carp("and can't restore permissions to " +- . sprintf("0%o",$rp) . "\n"); +- } +- } +- else { +- if ($safe && +- ($Is_VMS ? !&VMS::Filespec::candelete($root) +- : !(-l $root || -w $root))) +- { +- print "skipped $root\n" if $verbose; +- next; +- } +- chmod 0600, $root +- or carp "Can't make file $root writeable: $!" +- if $force_writeable; +- print "unlink $root\n" if $verbose; +- # delete all versions under VMS +- for (;;) { +- unless (unlink $root) { +- carp "Can't unlink file $root: $!"; +- if ($force_writeable) { +- chmod $rp, $root +- or carp("and can't restore permissions to " +- . sprintf("0%o",$rp) . "\n"); +- } +- last; +- } +- ++$count; +- last unless $Is_VMS && lstat $root; +- } ++ return 1; ++ } ++ ++ unless (chdir $path) ++ { ++ carp "Can't chdir to $prefix$path ($!)"; ++ return 0; ++ } ++ ++ # avoid a race condition where a directory may be replaced by a ++ # symlink between the lstat and the chdir ++ my ($new_dev, $new_ino, $perm) = stat '.'; ++ unless ("$new_dev:$new_ino" eq "$dev:$ino") ++ { ++ croak "Directory $prefix$path changed before chdir, aborting"; ++ } ++ ++ $perm &= 07777; ++ my $nperm = $perm | 0700; ++ unless ($safe or $nperm == $perm or chmod $nperm, '.') ++ { ++ carp "Can't make directory $prefix$path read+writeable ($!)"; ++ $nperm = $perm; ++ } ++ ++ my $count = 0; ++ if (opendir my $dir, '.') ++ { ++ my $entry; ++ while (defined ($entry = readdir $dir)) ++ { ++ next if $entry =~ /^\.\.?$/; ++ $entry =~ /^(.*)$/s; $entry = $1; # untaint ++ $count += _rmtree $entry, "$prefix$path/", '..', $dev, $ino, ++ $verbose, $safe; + } ++ ++ closedir $dir; ++ } ++ ++ # restore directory permissions if required (in case the rmdir ++ # below fails) now, while we're still in the directory and may do ++ # so without a race via '.' ++ unless ($nperm == $perm or chmod $perm, '.') ++ { ++ carp "Can't restore permissions on directory $prefix$path ($!)"; ++ } ++ ++ # don't leave the caller in an unexpected directory ++ unless (chdir $up) ++ { ++ croak "Can't return to $up from $prefix$path ($!)"; ++ } ++ ++ # ensure that a chdir .. didn't take us somewhere other than ++ # where we expected (see CVE-2002-0435) ++ unless (($new_dev, $new_ino) = stat '.' ++ and "$new_dev:$new_ino" eq "$up_dev:$up_ino") ++ { ++ croak "Previous directory $up changed since entering $prefix$path"; ++ } ++ ++ print "rmdir $prefix$path\n" if $verbose; ++ if (rmdir $path) ++ { ++ $count++; ++ } ++ else ++ { ++ carp "Can't remove directory $prefix$path ($!)"; ++ } ++ ++ return $count; ++} ++ ++sub rmtree ++{ ++ my ($p, $verbose, $safe) = @_; ++ $p = [] unless defined $p and length $p; ++ $p = [ $p ] unless ref $p; ++ my @paths = grep defined && length, @$p; ++ ++ # default to "unsafe" for non-root (will chmod dirs) ++ $safe = $> ? 0 : 1 unless defined $safe; ++ ++ unless (@paths) ++ { ++ carp "No root path(s) specified"; ++ return; ++ } ++ ++ my $oldpwd = getcwd or do { ++ carp "Can't fetch initial working directory"; ++ return; ++ }; ++ ++ my ($dev, $ino) = stat '.' or do { ++ carp "Can't stat initial working directory"; ++ return; ++ }; ++ ++ # untaint ++ for ($oldpwd) { /^(.*)$/s; $_ = $1 } ++ ++ my $count = 0; ++ for my $path (@paths) ++ { ++ $count += _rmtree $path, '', $oldpwd, $dev, $ino, $verbose, $safe; + } + + $count; Modified: tinysofa/releases/1.2/perl/current/specs/perl.spec =================================================================== --- tinysofa/releases/1.2/perl/current/specs/perl.spec 2005-03-13 17:34:06 UTC (rev 6146) +++ tinysofa/releases/1.2/perl/current/specs/perl.spec 2005-03-13 17:59:29 UTC (rev 6147) @@ -4,7 +4,7 @@ Name: perl Version: 5.8.6 Epoch: 1 -Release: 4jh +Release: 5jh License: GPL Group: main Url: http://www.perl.com @@ -23,6 +23,7 @@ Patch6: perl-5.8.6-CAN-2004-0452.patch Patch7: perl-5.8.5-CAN-2004-0976.patch Patch8: perl-5.8.5-CAN-2005-0155.patch +Patch9: perl-5.8.4-CAN-2005-0448.patch # arch-specific patches Patch100: perl-5.8.1-fpic.patch @@ -101,6 +102,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %patch100 -p1 @@ -446,6 +448,9 @@ %changelog +* Sun Mar 13 2005 Jaakko Heinonen 5.8.6-5jh +- fix CAN-2005-0448 (#9) + * Fri Feb 18 2005 Jaakko Heinonen - own /usr/lib/perl5, /usr/lib/perl5/%%{version} correctly on multilib arches From svn at tinysofa.org Sun Mar 13 18:07:19 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 13 Mar 2005 13:07:19 -0500 (EST) Subject: [tinysofa-svn] r6148 - in tinysofa/releases/1.1/perl/current: sources specs Message-ID: <20050313180719.409A33456C5@minbar.tinysofa.org> Author: jh Date: 2005-03-13 13:06:36 -0500 (Sun, 13 Mar 2005) New Revision: 6148 Added: tinysofa/releases/1.1/perl/current/sources/perl-5.8.4-CAN-2005-0448.patch Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec Log: - fix CAN-2005-0448 (#9) Copied: tinysofa/releases/1.1/perl/current/sources/perl-5.8.4-CAN-2005-0448.patch (from rev 6147, tinysofa/releases/1.2/perl/current/sources/perl-5.8.4-CAN-2005-0448.patch) Modified: tinysofa/releases/1.1/perl/current/specs/perl.spec =================================================================== --- tinysofa/releases/1.1/perl/current/specs/perl.spec 2005-03-13 17:59:29 UTC (rev 6147) +++ tinysofa/releases/1.1/perl/current/specs/perl.spec 2005-03-13 18:06:36 UTC (rev 6148) @@ -4,7 +4,7 @@ Name: perl Version: 5.8.5 Epoch: 1 -Release: 5jh +Release: 6jh License: GPL Group: main Url: http://www.perl.com @@ -23,6 +23,7 @@ Patch6: perl-5.8.5-CAN-2004-0452.patch Patch7: perl-5.8.5-CAN-2004-0976.patch Patch8: perl-5.8.5-CAN-2005-0155.patch +Patch9: perl-5.8.4-CAN-2005-0448.patch # arch-specific patches Patch100: perl-5.8.1-fpic.patch @@ -101,6 +102,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %patch100 -p1 @@ -444,6 +446,9 @@ %changelog +* Sun Mar 13 2005 Jaakko Heinonen 5.8.5-6jh +- fix CAN-2005-0448 (#9) + * Sun Feb 6 2005 Jaakko Heinonen 5.8.5-5jh - fix CAN-2005-0155 and CAN-2005-0156 (#5) From svn at tinysofa.org Mon Mar 14 14:17:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 14 Mar 2005 09:17:24 -0500 (EST) Subject: [tinysofa-svn] r6149 - in tinysofa/releases/1.2/bind/current: sources specs Message-ID: <20050314141724.85CEE345564@minbar.tinysofa.org> Author: jh Date: 2005-03-14 09:15:20 -0500 (Mon, 14 Mar 2005) New Revision: 6149 Added: tinysofa/releases/1.2/bind/current/sources/bind-9.3.1.tar.gz Removed: tinysofa/releases/1.2/bind/current/sources/bind-9.3.1rc1.tar.gz Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec Log: - 9.3.1 final Added: tinysofa/releases/1.2/bind/current/sources/bind-9.3.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/bind/current/sources/bind-9.3.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.2/bind/current/sources/bind-9.3.1rc1.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/1.2/bind/current/specs/bind.spec =================================================================== --- tinysofa/releases/1.2/bind/current/specs/bind.spec 2005-03-13 18:06:36 UTC (rev 6148) +++ tinysofa/releases/1.2/bind/current/specs/bind.spec 2005-03-14 14:15:20 UTC (rev 6149) @@ -2,7 +2,7 @@ Name: bind Version: 9.3.1 -Release: 0.rc1.1jh +Release: 1jh Epoch: 0 Summary: A chrooted DNS (Domain Name System) server Summary(pt_BR): BIND - Servidor de nomes DNS chrooted @@ -10,7 +10,7 @@ Group: main License: BSD Like URL: http://www.isc.org/bind.html -Source0: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}rc1.tar.gz +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 @@ -168,7 +168,7 @@ %prep -%setup -q -n %{name}-9.3.1rc1 +%setup -q %patch -p1 -b .key %patch1 -p1 -b .varrun %patch2 -p1 -b .SO_BSDCOMPAT @@ -487,6 +487,9 @@ %changelog +* Mon Mar 14 2005 Jaakko Heinonen 9.3.1-1jh +- 9.3.1 final + * Mon Feb 21 2005 Jaakko Heinonen 9.3.1-0.rc1.1jh - 9.3.1rc1 From svn at tinysofa.org Mon Mar 14 20:27:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 14 Mar 2005 15:27:54 -0500 (EST) Subject: [tinysofa-svn] r6150 - in tinysofa/releases/1.2/ipsec-tools/current: sources specs Message-ID: <20050314202754.3FC89345583@minbar.tinysofa.org> Author: jh Date: 2005-03-14 15:27:44 -0500 (Mon, 14 Mar 2005) New Revision: 6150 Added: tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-fix.diff Modified: tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec Log: - fix CAN-2005-0398 (ipsec-tools-fix.diff) Added: tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-fix.diff =================================================================== --- tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-fix.diff 2005-03-14 14:15:20 UTC (rev 6149) +++ tinysofa/releases/1.2/ipsec-tools/current/sources/ipsec-tools-fix.diff 2005-03-14 20:27:44 UTC (rev 6150) @@ -0,0 +1,16 @@ +Index: src/racoon/isakmp.c +=================================================================== +RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp.c,v +retrieving revision 1.35 +diff -u -r1.35 isakmp.c +--- src/racoon/isakmp.c 23 Feb 2005 13:31:45 -0000 1.35 ++++ src/racoon/isakmp.c 24 Feb 2005 09:09:26 -0000 +@@ -1346,7 +1346,7 @@ + + p->type = np; + p->len = ntohs(gen->len); +- if (p->len == 0 || p->len > tlen) { ++ if (p->len < sizeof(struct isakmp_gen) || p->len > tlen) { + plog(LLV_DEBUG, LOCATION, NULL, + "invalid length of payload\n"); + vfree(result); Modified: tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec =================================================================== --- tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec 2005-03-14 14:15:20 UTC (rev 6149) +++ tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec 2005-03-14 20:27:44 UTC (rev 6150) @@ -1,6 +1,6 @@ Name: ipsec-tools Version: 0.5 -Release: 1jh +Release: 2jh Summary: Tools for configuring and using IPSEC License: BSD Group: main @@ -15,6 +15,7 @@ Patch: ipsec-tools-0.5-libs.patch Patch2: isakmp.c.diff Patch3: ipsec-tools-0.3.3-stdin.patch +Patch4: ipsec-tools-fix.diff BuildPrereq: openssl-devel, krb5-devel, flex, bison, gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: initscripts >= 7.31 @@ -33,6 +34,7 @@ %patch -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p0 mkdir -p kernel-headers/linux cp %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE6} kernel-headers/linux @@ -91,6 +93,9 @@ %changelog +* Mon Mar 14 2005 Jaakko Heinonen 0.5-2jh +- fix CAN-2005-0398 (ipsec-tools-fix.diff) + * Tue Mar 8 2005 Jaakko Heinonen 0.5-1jh - 0.5 From svn at tinysofa.org Mon Mar 14 21:27:05 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 14 Mar 2005 16:27:05 -0500 (EST) Subject: [tinysofa-svn] r6152 - in contrib/1.2: . afio afio/current afio/current/sources afio/current/specs Message-ID: <20050314212705.917AB3458A7@minbar.tinysofa.org> Author: gda Date: 2005-03-14 16:26:51 -0500 (Mon, 14 Mar 2005) New Revision: 6152 Added: contrib/1.2/afio/ contrib/1.2/afio/current/ contrib/1.2/afio/current/sources/ contrib/1.2/afio/current/sources/afio-2.5.tgz contrib/1.2/afio/current/specs/ contrib/1.2/afio/current/specs/afio.spec contrib/1.2/afio/pristine/ contrib/1.2/afio/releases/ Log: New in contrib Added: contrib/1.2/afio/current/sources/afio-2.5.tgz =================================================================== (Binary files differ) Property changes on: contrib/1.2/afio/current/sources/afio-2.5.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/1.2/afio/current/specs/afio.spec =================================================================== --- contrib/1.2/afio/current/specs/afio.spec 2005-03-14 21:20:13 UTC (rev 6151) +++ contrib/1.2/afio/current/specs/afio.spec 2005-03-14 21:26:51 UTC (rev 6152) @@ -0,0 +1,44 @@ +Summary: Archiver program which writes cpio-format archives +Name: afio +Version: 2.5 +Release: 1gd +Copyright: LGPL +Group: contrib +URL: http://www.linux.org/apps/AppId_266.html +Source: http://metalab.unc.edu/pub/linux/system/backup/afio-2.5.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Afio makes cpio-format archives. It deals somewhat gracefully with +input data corruption, supports multi-volume archives during +interactive operation, and can make compressed archives that are +much safer than compressed tar or cpio archives. Afio is best used +as an `archive engine' in a backup script. + +%prep + +%setup -q + +%build +# make CFLAGS1="$RPM_OPT_FLAGS" +%make + +%install +mkdir -p $RPM_BUILD_ROOT%{_bindir} \ + $RPM_BUILD_ROOT%{_mandir}/man1 + +install -c -s afio $RPM_BUILD_ROOT%{_bindir} +install -m 0444 afio.1 $RPM_BUILD_ROOT%{_mandir}/man1 + +%clean +%clean_buildroot + +%files +%defattr(-,root,root) +%{_bindir}/* +%{_mandir}/*/* +%doc HISTORY PORTING README SCRIPTS afio.lsm script1 script2 script3 script4 + +%changelog +* Mon Mar 14 2005 Gerald Dachs 2.5-1gd +- new in tinysofa contrib Property changes on: contrib/1.2/afio/current/specs/afio.spec ___________________________________________________________________ Name: svn:executable + * From svn at tinysofa.org Mon Mar 14 21:27:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 14 Mar 2005 16:27:24 -0500 (EST) Subject: [tinysofa-svn] r6153 - in contrib/1.2: . flexbackup flexbackup/current flexbackup/current/sources flexbackup/current/specs Message-ID: <20050314212724.31B533458A7@minbar.tinysofa.org> Author: gda Date: 2005-03-14 16:27:13 -0500 (Mon, 14 Mar 2005) New Revision: 6153 Added: contrib/1.2/flexbackup/ contrib/1.2/flexbackup/current/ contrib/1.2/flexbackup/current/sources/ contrib/1.2/flexbackup/current/sources/flexbackup-1.2.1.tar.gz contrib/1.2/flexbackup/current/specs/ contrib/1.2/flexbackup/current/specs/flexbackup.spec contrib/1.2/flexbackup/pristine/ contrib/1.2/flexbackup/releases/ Log: New in contrib Added: contrib/1.2/flexbackup/current/sources/flexbackup-1.2.1.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.2/flexbackup/current/sources/flexbackup-1.2.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/1.2/flexbackup/current/specs/flexbackup.spec =================================================================== --- contrib/1.2/flexbackup/current/specs/flexbackup.spec 2005-03-14 21:26:51 UTC (rev 6152) +++ contrib/1.2/flexbackup/current/specs/flexbackup.spec 2005-03-14 21:27:13 UTC (rev 6153) @@ -0,0 +1,59 @@ +Summary: Flexible backup script +Name: flexbackup +Version: 1.2.1 +Release: 1gd +License: GPL +Group: contrib +URL: http://www.flexbackup.org +Source0: %{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildArch: noarch +Requires: gzip +Requires: fileutils +Requires: findutils + +%description +A flexible backup tool + +Features: + o Easy to configure + o Uses dump, afio, GNU tar, cpio, star, pax, or zip archivers + o Full and numbered levels of incremental backup (acts like "dump") + o Compression and buffering options for all backup types + o Does remote filesystems (over rsh/ssh; no special service) + o Can backup only files not owned by rpm, or changed from rpm version + o Writes to tapes, on-disk archive files, or on-disk directory trees + o Keeps a table of contents so you know archives are on each tape + o Nice log files + + +%prep +%setup -q + +%build +%make all CONFFILE=/etc/flexbackup.conf + +%install +mkdir -p $RPM_BUILD_ROOT/etc +mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 +mkdir -p $RPM_BUILD_ROOT/var/lib/flexbackup +mkdir -p $RPM_BUILD_ROOT/var/log/flexbackup +make install PREFIX=$RPM_BUILD_ROOT/usr CONFFILE=$RPM_BUILD_ROOT/etc/flexbackup.conf + +%clean +%clean_buildroot + +%files +%defattr(-,root,root,-) +%config(noreplace) /etc/flexbackup.conf +%{_bindir}/* +%{_mandir}/*/* +%dir /var/lib/flexbackup +%dir /var/log/flexbackup +%doc CHANGES COPYING TODO README CREDITS INSTALL faq.html + +%changelog +* Mon Mar 14 2005 Gerald Dachs 1.2.1-1gd +- new in tinysofa contrib From svn at tinysofa.org Mon Mar 14 21:36:26 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 14 Mar 2005 16:36:26 -0500 (EST) Subject: [tinysofa-svn] r6154 - in tinysofa/releases/1.2/kernel/current: sources specs Message-ID: <20050314213626.953063456C5@minbar.tinysofa.org> Author: jh Date: 2005-03-14 16:36:17 -0500 (Mon, 14 Mar 2005) New Revision: 6154 Added: tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-epoll.patch Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec Log: - re-add the epoll patch Added: tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-epoll.patch =================================================================== --- tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-epoll.patch 2005-03-14 21:27:13 UTC (rev 6153) +++ tinysofa/releases/1.2/kernel/current/sources/linux-2.6.11-epoll.patch 2005-03-14 21:36:17 UTC (rev 6154) @@ -0,0 +1,20 @@ +diff -Nru a/fs/eventpoll.c b/fs/eventpoll.c +--- a/fs/eventpoll.c 2005-03-09 00:13:29 -08:00 ++++ b/fs/eventpoll.c 2005-03-09 00:13:29 -08:00 +@@ -619,6 +619,7 @@ + return error; + } + ++#define MAX_EVENTS (INT_MAX / sizeof(struct epoll_event)) + + /* + * Implement the event wait interface for the eventpoll file. It is the kernel +@@ -635,7 +636,7 @@ + current, epfd, events, maxevents, timeout)); + + /* The maximum number of event must be greater than zero */ +- if (maxevents <= 0) ++ if (maxevents <= 0 || maxevents > MAX_EVENTS) + return -EINVAL; + + /* Verify that the area passed by the user is writeable */ Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-03-14 21:27:13 UTC (rev 6153) +++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-03-14 21:36:17 UTC (rev 6154) @@ -81,6 +81,7 @@ Patch2: patch-2.6.11-ac3 Patch100: linux-2.6.11-route-crash.patch +Patch101: linux-2.6.11-epoll.patch Patch20020: linux-2.6.8-tinysofa-syslog.patch @@ -219,6 +220,7 @@ %patch2 -p1 -b .ac~ %patch100 -p1 -b .route-crash~ +%patch101 -p1 -b .epoll~ %patch20020 -p1 -b .tinysofa-syslog~ From svn at tinysofa.org Mon Mar 14 21:53:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 14 Mar 2005 16:53:46 -0500 (EST) Subject: [tinysofa-svn] r6155 - in contrib/1.2: . mbuffer mbuffer/current mbuffer/current/sources mbuffer/current/specs Message-ID: <20050314215346.98618345790@minbar.tinysofa.org> Author: gda Date: 2005-03-14 16:53:35 -0500 (Mon, 14 Mar 2005) New Revision: 6155 Added: contrib/1.2/mbuffer/ contrib/1.2/mbuffer/current/ contrib/1.2/mbuffer/current/sources/ contrib/1.2/mbuffer/current/sources/mbuffer-20050125.tgz contrib/1.2/mbuffer/current/specs/ contrib/1.2/mbuffer/current/specs/mbuffer.spec contrib/1.2/mbuffer/pristine/ contrib/1.2/mbuffer/releases/ Log: new in contrib Added: contrib/1.2/mbuffer/current/sources/mbuffer-20050125.tgz =================================================================== (Binary files differ) Property changes on: contrib/1.2/mbuffer/current/sources/mbuffer-20050125.tgz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/1.2/mbuffer/current/specs/mbuffer.spec =================================================================== --- contrib/1.2/mbuffer/current/specs/mbuffer.spec 2005-03-14 21:36:17 UTC (rev 6154) +++ contrib/1.2/mbuffer/current/specs/mbuffer.spec 2005-03-14 21:53:35 UTC (rev 6155) @@ -0,0 +1,49 @@ +Summary: mbuffer is a raplacement for buffer with additional functionality +Name: mbuffer +Version: 20050125 +Release: 1gd +License: GPL +Group: contrib +URL: http://www.rcs.ei.tum.de/~maierkom/privat/software/mbuffer/ +Source0: %{name}-%{version}.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + +%description +mbuffer is a raplacement for buffer with additional functionality: + + * display of I/O speed + * optional use of memory mapped I/O for huge buffers + * multithreaded instead of sharedmemory ipc + * multi volume support + * autoloader support + * networking support + * compatible command-line options + +%prep +%setup -q + +%build +%configure +%make + +%install +mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 + +%makeinstall + +install -m 755 mbuffer.1 $RPM_BUILD_ROOT%{_mandir}/man1 + +%clean +%clean_buildroot + +%files +%defattr(-,root,root,-) +%{_bindir}/mbuffer +%{_mandir}/man1/mbuffer.1* +%doc AUTHORS NEWS ChangeLog README COPYING INSTALL + + +%changelog +* Mon Mar 14 2005 Gerald Dachs 20050125-1gd +- new in tinysofa contrib From svn at tinysofa.org Mon Mar 14 22:21:32 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 14 Mar 2005 17:21:32 -0500 (EST) Subject: [tinysofa-svn] r6156 - contrib/1.2/flexbackup/current/specs Message-ID: <20050314222132.C7CD73456C3@minbar.tinysofa.org> Author: gda Date: 2005-03-14 17:21:27 -0500 (Mon, 14 Mar 2005) New Revision: 6156 Modified: contrib/1.2/flexbackup/current/specs/flexbackup.spec Log: some changes Modified: contrib/1.2/flexbackup/current/specs/flexbackup.spec =================================================================== --- contrib/1.2/flexbackup/current/specs/flexbackup.spec 2005-03-14 21:53:35 UTC (rev 6155) +++ contrib/1.2/flexbackup/current/specs/flexbackup.spec 2005-03-14 22:21:27 UTC (rev 6156) @@ -1,16 +1,18 @@ Summary: Flexible backup script Name: flexbackup Version: 1.2.1 -Release: 1gd +Release: 2gd License: GPL Group: contrib URL: http://www.flexbackup.org Source0: %{name}-%{version}.tar.gz +Source1: flexbackup.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: gzip Requires: fileutils Requires: findutils +Requires: mbuffer %description A flexible backup tool @@ -40,14 +42,16 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 mkdir -p $RPM_BUILD_ROOT/var/lib/flexbackup mkdir -p $RPM_BUILD_ROOT/var/log/flexbackup -make install PREFIX=$RPM_BUILD_ROOT/usr CONFFILE=$RPM_BUILD_ROOT/etc/flexbackup.conf +make install PREFIX=$RPM_BUILD_ROOT/usr CONFFILE=$RPM_BUILD_ROOT%{_sysconfdir}/flexbackup.conf +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} + %clean %clean_buildroot %files %defattr(-,root,root,-) -%config(noreplace) /etc/flexbackup.conf +%config(noreplace) %{_sysconfdir}/flexbackup.conf %{_bindir}/* %{_mandir}/*/* %dir /var/lib/flexbackup @@ -55,5 +59,8 @@ %doc CHANGES COPYING TODO README CREDITS INSTALL faq.html %changelog +* Mon Mar 14 2005 Gerald Dachs 1.2.1-2gd +- changed conf file for mbuffer, requires now mbuffer + * Mon Mar 14 2005 Gerald Dachs 1.2.1-1gd - new in tinysofa contrib From svn at tinysofa.org Mon Mar 14 22:22:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 14 Mar 2005 17:22:02 -0500 (EST) Subject: [tinysofa-svn] r6157 - contrib/1.2/flexbackup/current/sources Message-ID: <20050314222202.B723A3456C3@minbar.tinysofa.org> Author: gda Date: 2005-03-14 17:21:56 -0500 (Mon, 14 Mar 2005) New Revision: 6157 Added: contrib/1.2/flexbackup/current/sources/flexbackup.conf Log: some changes Added: contrib/1.2/flexbackup/current/sources/flexbackup.conf =================================================================== --- contrib/1.2/flexbackup/current/sources/flexbackup.conf 2005-03-14 22:21:27 UTC (rev 6156) +++ contrib/1.2/flexbackup/current/sources/flexbackup.conf 2005-03-14 22:21:56 UTC (rev 6157) @@ -0,0 +1,236 @@ +# -*-Mode: perl-*- +# ---------------------------------------------------------------------- +# Flexbackup configuration file +# check "flexbackup -help" for usage information +# ---------------------------------------------------------------------- +# General configuration section + +# Archive type? afio, dump, tar, cpio, star, pax, zip, lha, ar, shar +# 'copy' or 'rsync' are extra options if running in archive-to-disk mode. +# 'filelist' dumps a list of files in your cwd - for debugging setup/exclusion +$type = 'afio'; + +# Configure backup "sets". +# Not needed if you use "-dir " to backup one tree at a time. +# Each set is a simple space-separated list of filesystems +# Remote filesystems should denoted as 'host:dir' +# You can use anything (other than 'all') as set names +# +# Example: +# $set{'set1'} = "/home /usr"; +# $set{'set2'} = "/dir3 machine2:/dir4 machine3:/dir5"; +# +# "-set all" will back up all defined sets. If you are doing a full backup +# using tapes, each "set" will go onto a different tape and you will be +# prompted for tape change in between. +# +$set{'backup'} = "/home"; + +# Subtree pruning +# A space-separated list of directories to prune from each backup. +# Key is a filesystem or host:dir spec as outlined above +# regular expressions allowed (not shell-type wildcards!) +$prune{'/'} = "tmp proc"; + +# Compression +$compress = 'gzip'; # one of false/gzip/bzip2/lzop/zip/compress/hardware +$compr_level = '4'; # compression level (1-9) (for gzip/bzip2/lzop/zip) + +# Buffering program - to help streaming +$buffer = 'mbuffer'; # one of false/buffer/mbuffer +$buffer_megs = '10'; # buffer memory size (in megabytes) +$buffer_fill_pct = '75'; # start writing when buffer this percent full +$buffer_pause_usec = '100'; # pause after write (tape devices only) + +# Device to backup to. -->> non-rewinding version, please! <<-- +# +# Examples: +# Linux SCSI: /dev/nst0 Linux IDE: /dev/nht0 +# Linux ftape: /dev/nqft0 FreeBSD SCSI: /dev/nrsa0 (4.x compat device node) +# FreeBSD SCSI: /dev/nsa0 (5.x) +# +# If a directory, will archive to files in that directory rather than a device +# If "host:/dev/tapedevice", will use remote tape drive via rsh/ssh +# +$device = '/dev/tape'; + +# Block size (in kilobytes!) to use for archive programs and dd. Default is +# 10 for most things. Some tape drives need 32 or 64. Set to '0' to +# disable all blocking +$blksize = '10'; + +# Block size (in bytes!) to use for the tape device, with "mt setblk" or +# equivalent. If set to 0, will use "variable" block size for the tape +# device (which is recommended). Comment out or set to "$blksize * 1024" to +# have it be the same as the archiver block size above. +$mt_blksize = "0"; + +# Padding. True to pad blocks to blocksize +# (devices only, not used when archiving to files) +$pad_blocks = 'true'; + +# Other global flags +$remoteshell = 'ssh'; # command for remote shell (rsh/ssh/ssh2) +$remoteuser = ''; # if non-null, secondary username for remote shells +$label = 'true'; # somehow store identifying label in archive? +$verbose = 'true'; # echo each file? +$sparse = 'true'; # handle sparse files? +$indexes = 'true'; # false to turn off all table-of-contents support + +# If backing up to files, use static filenames - no date stamp +# (same level backup of same directory will overwrite old backups) +$staticfiles = 'false'; + +# True to try and preserve file access times during backup, if the selected +# archive program can do so. Note that if this is true, -cnewer checks (file +# permission/status changes only, not content) are turned off when deciding +# which files to archive on the local system. +$atime_preserve = 'false'; + +# Span across filesytems? ("dump" will ignore this option) +# Set to "false" (don't) , "local" (all but nfs/smbfs), or "all" (everything) +$traverse_fs = 'false'; + +# Exclude files that match these *regular expressions* (not shell wildcards) +# from the backups (no affect on 'dump' archives). You can list more than one, +# just keep incrementing the index in the brackets for each. Also, strip off +# leading directories (the filesystem specs above or the "-dir" flag). +# Matches paths, not filenames, so put .* on the front/back as needed. +# Comment these out to exclude nothing. +$exclude_expr[0] = '.*/[Cc]ache/.*'; +$exclude_expr[1] = '.*~$'; + +# If true (default), and using a tape device, level zero "set" backups +# assume you want to erase and use a new tape for each set. If false, level +# zero "set" backups append to tapes. To force an erase for any backup, +# use "-erase" on the commandline. +$erase_tape_set_level_zero = 'true'; + +# Set this to "true" to make erase operations just call "mt rewind" - not +# "mt rewind' followed by "mt erase". (For some tape drives, erase takes +# hours rather than seconds or is otherwise undesirable) +$erase_rewind_only = 'false'; + +# ---------------------------------------------------------------------- +# Log/stamp files, path for temporary files + +$logdir = '/var/log/flexbackup'; # directory for log files +$comp_log = 'gzip'; # compress log? false/gzip/bzip2/lzop/compress/zip +$staticlogs = 'false'; # static log filenames w/ no date stamp +$prefix = ''; # log files will start with this prefix +$tmpdir = '/tmp'; # used for temporary refdate files, etc +$stampdir = '/var/lib/flexbackup'; # directory for backup timestamps +$index = '/var/lib/flexbackup/index'; # DB filename for tape indexes +$keyfile = '00-index-key'; # filename for keyfile if archiving to dir +$sprefix = ''; # stamp files will start with this prefix + +# ---------------------------------------------------------------------- +# Parameters for 'afio' only + +# File extensions that should not be compressed (seperate with spaces) +$afio_nocompress_types = 'mp3 MP3 Z z gz gif zip ZIP lha jpeg jpg JPG taz tgz deb rpm bz2 lzo'; + +# True to show block numbers +$afio_echo_block = 'false'; + +# Files less than this size (kilobytes) won't be compressed +$afio_compress_threshold = '3'; + +# Maximum amount of memory (megabytes) to use for temporary storage of +# compression results. If a compressed file is bigger than this, compression +# will have to run twice on the file (see manpage). +$afio_compress_cache_size = '2'; + +# ---------------------------------------------------------------------- +# Parameters for 'tar' only + +# True to show record numbers +$tar_echo_record_num = 'false'; + +# ---------------------------------------------------------------------- +# Parameters for 'cpio' only + +# Format of cpio archive +$cpio_format = 'newc'; + +# ---------------------------------------------------------------------- +# Parameters for 'dump' only + +# Estimated tape size (in kilobytes). This number doesn't really do much +# but help 'dump' get size estimates if set to zero uses 'dump -a' +$dump_length = '0'; + +# True to use /etc/dumpdates (could mess things up if you dump subdirectories +# of mount points). False to use flexbackup's timestamps. +$dump_use_dumpdates = 'false'; + +# ---------------------------------------------------------------------- +# Parameters for 'star' only + +# Use fifo (buffering)? (you probably want to set $buffer=false above if so) +$star_fifo = 'true'; + +# Handle ACLs? +$star_acl = 'true'; + +# Format of star archive +$star_format = 'exustar'; + +# True to show block numbers +$star_echo_block_num = 'false'; + +# ---------------------------------------------------------------------- +# Parameters for 'pax' only + +# Format of pax archive +$pax_format = 'ustar'; + +# ---------------------------------------------------------------------- +# Parameters for 'zip' only + +# File extensions that should not be compressed (seperate with spaces) +$zip_nocompress_types = 'mp3 MP3 Z z gz gif zip ZIP lha jpeg jpg JPG taz tgz deb rpm bz2 lzo'; + +# ---------------------------------------------------------------------- +# Parameters for 'package delta' backups + +# Archive a list of all installed packages in the top level of each backup? +# Can be 'false', 'true' (save it for any backup), or +# 'rootonly' (saves list only if the filesystem is '/') +$pkgdelta_archive_list = 'rootonly'; + +# Archive files not "owned" by packages? +$pkgdelta_archive_unowned = 'true'; + +# Archive any package-owned files which have been modified? +$pkgdelta_archive_changed = 'true'; + +# ---------------------------------------------------------------------- +# Paths to commands. Default will look for them in $PATH. Use this if +# you want to set commands explicitly. You can use full paths or just +# change command names. +# +# Example: If GNU tar is called "gtar" on your system: +# $path{'tar'} = 'gtar'; +# +# Or can be used to "sudo" certain commands. Examples: +# $path{'find'} = 'sudo find'; +# $path{'dump'} = 'sudo dump'; +# $path{'afio'} = 'sudo -u nonrootuser afio'; +# + +# ---------------------------------------------------------------------- +# mt operation overrides. Set if flexbackup doesn't know the right mt +# command(s) for your OS/device, or you want to override things. +# +# Example: use "mt status" instead of "mt tell" +# $mt{'tell'} = 'status'; + + +###################################################################### +# +# $Id: flexbackup.conf,v 1.74 2003/09/21 22:59:58 edwinh Exp $ +# $Name: v1_2_1 $ +# +# Leave '1;' on the the next line - for perl 'require' +1; From svn at tinysofa.org Mon Mar 14 22:55:05 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 14 Mar 2005 17:55:05 -0500 (EST) Subject: [tinysofa-svn] r6158 - contrib/1.2/flexbackup/current/sources Message-ID: <20050314225505.C52333458AD@minbar.tinysofa.org> Author: gda Date: 2005-03-14 17:55:00 -0500 (Mon, 14 Mar 2005) New Revision: 6158 Modified: contrib/1.2/flexbackup/current/sources/flexbackup.conf Log: changed the config for my tape :) Modified: contrib/1.2/flexbackup/current/sources/flexbackup.conf =================================================================== --- contrib/1.2/flexbackup/current/sources/flexbackup.conf 2005-03-14 22:21:56 UTC (rev 6157) +++ contrib/1.2/flexbackup/current/sources/flexbackup.conf 2005-03-14 22:55:00 UTC (rev 6158) @@ -52,12 +52,13 @@ # If a directory, will archive to files in that directory rather than a device # If "host:/dev/tapedevice", will use remote tape drive via rsh/ssh # -$device = '/dev/tape'; +#$device = '/dev/tape'; +$device = '/dev/nst0'; # Block size (in kilobytes!) to use for archive programs and dd. Default is # 10 for most things. Some tape drives need 32 or 64. Set to '0' to # disable all blocking -$blksize = '10'; +$blksize = '4'; # Block size (in bytes!) to use for the tape device, with "mt setblk" or # equivalent. If set to 0, will use "variable" block size for the tape @@ -109,7 +110,7 @@ # Set this to "true" to make erase operations just call "mt rewind" - not # "mt rewind' followed by "mt erase". (For some tape drives, erase takes # hours rather than seconds or is otherwise undesirable) -$erase_rewind_only = 'false'; +$erase_rewind_only = 'true'; # ---------------------------------------------------------------------- # Log/stamp files, path for temporary files From svn at tinysofa.org Mon Mar 14 22:56:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 14 Mar 2005 17:56:39 -0500 (EST) Subject: [tinysofa-svn] r6159 - contrib/1.2/flexbackup/current/specs Message-ID: <20050314225639.E1CCE3458AD@minbar.tinysofa.org> Author: gda Date: 2005-03-14 17:56:34 -0500 (Mon, 14 Mar 2005) New Revision: 6159 Modified: contrib/1.2/flexbackup/current/specs/flexbackup.spec Log: new requirements Modified: contrib/1.2/flexbackup/current/specs/flexbackup.spec =================================================================== --- contrib/1.2/flexbackup/current/specs/flexbackup.spec 2005-03-14 22:55:00 UTC (rev 6158) +++ contrib/1.2/flexbackup/current/specs/flexbackup.spec 2005-03-14 22:56:34 UTC (rev 6159) @@ -13,6 +13,7 @@ Requires: fileutils Requires: findutils Requires: mbuffer +Requires: afio %description A flexible backup tool @@ -60,7 +61,7 @@ %changelog * Mon Mar 14 2005 Gerald Dachs 1.2.1-2gd -- changed conf file for mbuffer, requires now mbuffer +- changed conf file for mbuffer, requires now mbuffer, afio * Mon Mar 14 2005 Gerald Dachs 1.2.1-1gd - new in tinysofa contrib From svn at tinysofa.org Tue Mar 15 06:26:17 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 15 Mar 2005 01:26:17 -0500 (EST) Subject: [tinysofa-svn] r6160 - tinysofa/releases/1.2/kernel/current/specs Message-ID: <20050315062617.8B8AF345A28@minbar.tinysofa.org> Author: jh Date: 2005-03-15 01:26:11 -0500 (Tue, 15 Mar 2005) New Revision: 6160 Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec Log: - provide kernel-grsecurity Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-03-14 22:56:34 UTC (rev 6159) +++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-03-15 06:26:11 UTC (rev 6160) @@ -24,6 +24,7 @@ %define make_target bzImage %define drbd_version 0.7.10 +%define grsec_version 2.1.3 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} @@ -52,6 +53,7 @@ Provides: kernel-drm = 4.3.0 Prereq: %{kernel_prereq} Provides: kernel-drbd = %{drbd_version} +Provides: kernel-grsecurity = %{grsec_version} # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency from the module headers which # isn't required for the kernel proper to function @@ -75,7 +77,7 @@ Source25: kernel-%{kversion}-x86_64.config Source26: kernel-%{kversion}-x86_64-smp.config -Patch0: grsecurity-2.1.3-2.6.11-200503070900.patch +Patch0: grsecurity-%{grsec_version}-2.6.11-200503070900.patch Patch1: linux-2.6.11-exec-shield-on-grsec.patch Patch2: patch-2.6.11-ac3 @@ -126,6 +128,8 @@ Group: main Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 +Provides: kernel-drbd = %{drbd_version} +Provides: kernel-grsecurity = %{grsec_version} Prereq: %{kernel_prereq} # upto and including kernel 2.4.9 rpms, the 4Gb+ kernel was called kernel-enterprise # now that the smp kernel offers this capability, obsolete the old kernel From svn at tinysofa.org Tue Mar 15 06:27:58 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 15 Mar 2005 01:27:58 -0500 (EST) Subject: [tinysofa-svn] r6161 - tinysofa/releases/1.2/grsecurity/current/specs Message-ID: <20050315062758.3FEB5345A33@minbar.tinysofa.org> Author: jh Date: 2005-03-15 01:27:52 -0500 (Tue, 15 Mar 2005) New Revision: 6161 Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec Log: - require kernel-grsecurity Modified: tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-03-15 06:26:11 UTC (rev 6160) +++ tinysofa/releases/1.2/grsecurity/current/specs/grsecurity.spec 2005-03-15 06:27:52 UTC (rev 6161) @@ -14,6 +14,7 @@ Group: main PreReq: /dev %{__cp} %{__rm} %{__mkdir} findutils %service_requires +Requires: kernel-%{name} = %{version} BuildRequires: byacc flex bison findutils BuildRoot: %{_tmppath}/%{name}-%{version}-root From svn at tinysofa.org Tue Mar 15 07:33:32 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 15 Mar 2005 02:33:32 -0500 (EST) Subject: [tinysofa-svn] r6162 - tinysofa/releases/1.2/kernel/current/sources Message-ID: <20050315073332.0AC5C3456E2@minbar.tinysofa.org> Author: jh Date: 2005-03-15 02:33:24 -0500 (Tue, 15 Mar 2005) New Revision: 6162 Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.11-x86_64-smp.config tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.11-x86_64.config Log: - update x86_64 configs Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.11-x86_64-smp.config =================================================================== --- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.11-x86_64-smp.config 2005-03-15 06:27:52 UTC (rev 6161) +++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.11-x86_64-smp.config 2005-03-15 07:33:24 UTC (rev 6162) @@ -1,8 +1,8 @@ # x86_64 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc4 -# Fri Feb 18 22:32:39 2005 +# Linux kernel version: 2.6.11-grsec +# Tue Mar 15 11:34:58 2005 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -395,6 +395,7 @@ CONFIG_BLK_DEV_IDEDISK=y CONFIG_IDEDISK_MULTI_MODE=y CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_DELKIN=m CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set CONFIG_BLK_DEV_IDEFLOPPY=y @@ -432,6 +433,7 @@ CONFIG_BLK_DEV_HPT366=y # CONFIG_BLK_DEV_SC1200 is not set CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_IT821X=m # CONFIG_BLK_DEV_NS87415 is not set CONFIG_BLK_DEV_PDC202XX_OLD=y # CONFIG_PDC202XX_BURST is not set @@ -509,6 +511,7 @@ CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_SATA_NV=m CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_QSTOR=m CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m @@ -1402,6 +1405,8 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_ROCKETPORT=m # CONFIG_CYCLADES is not set +CONFIG_DIGIEPCA=m +CONFIG_ESPSERIAL=m # CONFIG_MOXA_SMARTIO is not set # CONFIG_ISI is not set # CONFIG_SYNCLINK is not set @@ -2010,6 +2015,7 @@ CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m CONFIG_USB_W9968CF=m +# CONFIG_USB_PWC is not set # # USB Network Adapters @@ -2391,7 +2397,6 @@ # # CONFIG_GRKERNSEC_KMEM is not set # CONFIG_GRKERNSEC_IO is not set -# CONFIG_GRKERNSEC_PROC_MEMMAP is not set CONFIG_GRKERNSEC_BRUTE=y # CONFIG_GRKERNSEC_HIDESYM is not set @@ -2453,10 +2458,7 @@ # Network Protections # # CONFIG_GRKERNSEC_RANDNET is not set -# CONFIG_GRKERNSEC_RANDISN is not set -# CONFIG_GRKERNSEC_RANDID is not set # CONFIG_GRKERNSEC_RANDSRC is not set -# CONFIG_GRKERNSEC_RANDRPC is not set # CONFIG_GRKERNSEC_SOCKET is not set # Modified: tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.11-x86_64.config =================================================================== --- tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.11-x86_64.config 2005-03-15 06:27:52 UTC (rev 6161) +++ tinysofa/releases/1.2/kernel/current/sources/kernel-2.6.11-x86_64.config 2005-03-15 07:33:24 UTC (rev 6162) @@ -1,8 +1,8 @@ # x86_64 # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc4 -# Fri Feb 18 22:32:43 2005 +# Linux kernel version: 2.6.11-grsec +# Tue Mar 15 11:35:07 2005 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -387,6 +387,7 @@ CONFIG_BLK_DEV_IDEDISK=y CONFIG_IDEDISK_MULTI_MODE=y CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_DELKIN=m CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set CONFIG_BLK_DEV_IDEFLOPPY=y @@ -424,6 +425,7 @@ CONFIG_BLK_DEV_HPT366=y # CONFIG_BLK_DEV_SC1200 is not set CONFIG_BLK_DEV_PIIX=y +CONFIG_BLK_DEV_IT821X=m # CONFIG_BLK_DEV_NS87415 is not set CONFIG_BLK_DEV_PDC202XX_OLD=y # CONFIG_PDC202XX_BURST is not set @@ -501,6 +503,7 @@ CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_SATA_NV=m CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_QSTOR=m CONFIG_SCSI_SATA_SX4=m CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIS=m @@ -1403,6 +1406,7 @@ # CONFIG_CYCLADES is not set # CONFIG_DIGIEPCA is not set # CONFIG_DIGI is not set +CONFIG_ESPSERIAL=m # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set # CONFIG_ISI is not set @@ -2019,6 +2023,7 @@ CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m CONFIG_USB_W9968CF=m +# CONFIG_USB_PWC is not set # # USB Network Adapters @@ -2402,7 +2407,6 @@ # # CONFIG_GRKERNSEC_KMEM is not set # CONFIG_GRKERNSEC_IO is not set -# CONFIG_GRKERNSEC_PROC_MEMMAP is not set CONFIG_GRKERNSEC_BRUTE=y # CONFIG_GRKERNSEC_HIDESYM is not set @@ -2464,10 +2468,7 @@ # Network Protections # # CONFIG_GRKERNSEC_RANDNET is not set -# CONFIG_GRKERNSEC_RANDISN is not set -# CONFIG_GRKERNSEC_RANDID is not set # CONFIG_GRKERNSEC_RANDSRC is not set -# CONFIG_GRKERNSEC_RANDRPC is not set # CONFIG_GRKERNSEC_SOCKET is not set # From svn at tinysofa.org Tue Mar 15 09:42:33 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 15 Mar 2005 04:42:33 -0500 (EST) Subject: [tinysofa-svn] r6163 - tinysofa/releases/1.2/ipsec-tools/current/specs Message-ID: <20050315094233.17037345A05@minbar.tinysofa.org> Author: jh Date: 2005-03-15 04:42:26 -0500 (Tue, 15 Mar 2005) New Revision: 6163 Modified: tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec Log: - x86_64 compile fix Modified: tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec =================================================================== --- tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec 2005-03-15 07:33:24 UTC (rev 6162) +++ tinysofa/releases/1.2/ipsec-tools/current/specs/ipsec-tools.spec 2005-03-15 09:42:26 UTC (rev 6163) @@ -42,7 +42,9 @@ %build sed -i 's|-Werror||g' configure -CFLAGS="$RPM_OPT_FLAGS" %configure \ +export CFLAGS="$RPM_OPT_FLAGS -fPIE" +export LDFLAGS="$RPM_OPT_FLAGS -pie" +%configure \ --with-kernel-headers=`pwd`/kernel-headers \ --sysconfdir=/etc/racoon \ --enable-adminport \ From svn at tinysofa.org Tue Mar 15 20:35:19 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 15 Mar 2005 15:35:19 -0500 (EST) Subject: [tinysofa-svn] r6164 - in tinysofa/releases/1.2: . gtar gtar/current gtar/current/sources gtar/current/specs Message-ID: <20050315203519.979D13458A0@minbar.tinysofa.org> Author: jh Date: 2005-03-15 15:34:13 -0500 (Tue, 15 Mar 2005) New Revision: 6164 Added: tinysofa/releases/1.2/gtar/ tinysofa/releases/1.2/gtar/current/ tinysofa/releases/1.2/gtar/current/sources/ tinysofa/releases/1.2/gtar/current/sources/tar-1.13.18-manpage.patch tinysofa/releases/1.2/gtar/current/sources/tar-1.14-err.patch tinysofa/releases/1.2/gtar/current/sources/tar-1.14-loneZeroWarning.patch tinysofa/releases/1.2/gtar/current/sources/tar-1.14-nolibrt.patch tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1-gcc4.patch tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1-makeCheck.patch tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1.tar.gz tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1.tar.gz.sig tinysofa/releases/1.2/gtar/current/specs/ tinysofa/releases/1.2/gtar/current/specs/gtar.spec tinysofa/releases/1.2/gtar/pristine/ tinysofa/releases/1.2/gtar/releases/ Log: - add gtar Added: tinysofa/releases/1.2/gtar/current/sources/tar-1.13.18-manpage.patch =================================================================== --- tinysofa/releases/1.2/gtar/current/sources/tar-1.13.18-manpage.patch 2005-03-15 09:42:26 UTC (rev 6163) +++ tinysofa/releases/1.2/gtar/current/sources/tar-1.13.18-manpage.patch 2005-03-15 20:34:13 UTC (rev 6164) @@ -0,0 +1,339 @@ +--- tar-1.13.18/tar.1.manpage Mon Oct 30 12:52:03 2000 ++++ tar-1.13.18/tar.1 Mon Oct 30 12:56:15 2000 +@@ -0,0 +1,336 @@ ++.\" @(#)tar.1 1.13.14 2000/10/30 Bero; ++.TH TAR 1 "30 October 2000" ++.SH NAME ++tar \- The GNU version of the tar archiving utility ++.SH SYNOPSIS ++.B tar ++[ ++.B \- ++] ++.B A --catenate --concatenate \||\| c --create \||\| d --diff --compare \||\| r --append \||\| t --list \||\| u --update \||\| x -extract --get ++[ ++.B --atime-preserve ++] ++[ ++.B -b, --block-size N ++] ++[ ++.B -B, --read-full-blocks ++] ++[ ++.B -C, --directory DIR ++] ++[ ++.B --checkpoint ++] ++[ ++.B -f, --file [HOSTNAME:]F ++] ++[ ++.B --force-local ++] ++[ ++.B -F, --info-script F --new-volume-script F ++] ++[ ++.B -G, --incremental ++] ++[ ++.B -g, --listed-incremental F ++] ++[ ++.B -h, --dereference ++] ++[ ++.B -i, --ignore-zeros ++] ++[ ++.B -j, -I, --bzip ++] ++[ ++.B --ignore-failed-read ++] ++[ ++.B -k, --keep-old-files ++] ++[ ++.B -K, --starting-file F ++] ++[ ++.B -l, --one-file-system ++] ++[ ++.B -L, --tape-length N ++] ++[ ++.B -m, --modification-time ++] ++[ ++.B -M, --multi-volume ++] ++[ ++.B -N, --after-date DATE, --newer DATE ++] ++[ ++.B -o, --old-archive, --portability ++] ++[ ++.B -O, --to-stdout ++] ++[ ++.B -p, --same-permissions, --preserve-permissions ++] ++[ ++.B -P, --absolute-paths ++] ++[ ++.B --preserve ++] ++[ ++.B -R, --record-number ++] ++[ ++.B --remove-files ++] ++[ ++.B -s, --same-order, --preserve-order ++] ++[ ++.B --same-owner ++] ++[ ++.B -S, --sparse ++] ++[ ++.B -T, --files-from=F ++] ++[ ++.B --null ++] ++[ ++.B --totals ++] ++[ ++.B -v, --verbose ++] ++[ ++.B -V, --label NAME ++] ++[ ++.B --version ++] ++[ ++.B -w, --interactive, --confirmation ++] ++[ ++.B -W, --verify ++] ++[ ++.B --exclude FILE ++] ++[ ++.B -X, --exclude-from FILE ++] ++[ ++.B -Z, --compress, --uncompress ++] ++[ ++.B -z, --gzip, --ungzip ++] ++[ ++.B --use-compress-program PROG ++] ++[ ++.B --block-compress ++] ++[ ++.B -[0-7][lmh] ++] ++.TP ++.I filename1 [ filename2, ... filenameN ] ++.TP ++.I directory1 [ directory2, ...directoryN ] ++.SH DESCRIPTION ++.LP ++This manual page documents the GNU version of ++.B tar ++, an archiving program designed to store and extract files from ++an archive file known as a ++.IR tarfile. ++A ++.IR tarfile ++may be made on a tape drive, however, it is also common ++to write a ++.IR tarfile ++to a normal file. ++The first argument to ++.B tar ++must be one of the options: ++.BR Acdrtux , ++followed by any optional functions. ++The final arguments to ++.B tar ++are the names of the files or directories which should be archived. The use ++of a directory name always implies that the subdirectories below should be ++included in the archive. ++.SH "FUNCTION LETTERS" ++.TP ++.B One of the following options must be used: ++.TP ++.B -A, --catenate, --concatenate ++append tar files to an archive ++.TP ++.B -c, --create ++create a new archive ++.TP ++.B -d, --diff, --compare ++find differences between archive and file system ++.TP ++.B --delete ++delete from the archive (not for use on mag tapes!) ++.TP ++.B -r, --append ++append files to the end of an archive ++.TP ++.B -t, --list ++list the contents of an archive ++.TP ++.B -u, --update ++only append files that are newer than copy in archive ++.TP ++.B -x, --extract, --get ++extract files from an archive ++.SH "OTHER OPTIONS" ++.TP ++.B --atime-preserve ++don't change access times on dumped files ++.TP ++.B -b, --block-size N ++block size of Nx512 bytes (default N=20) ++.TP ++.B -B, --read-full-blocks ++reblock as we read (for reading 4.2BSD pipes) ++.TP ++.B -C, --directory DIR ++change to directory DIR ++.TP ++.B --checkpoint ++print directory names while reading the archive ++.TP ++.B -f, --file [HOSTNAME:]F ++use archive file or device F (default /dev/rmt0) ++.TP ++.B --force-local ++archive file is local even if has a colon ++.TP ++.B -F, --info-script F --new-volume-script F ++run script at end of each tape (implies -M) ++.TP ++.B -G, --incremental ++create/list/extract old GNU-format incremental backup ++.TP ++.B -g, --listed-incremental F ++create/list/extract new GNU-format incremental backup ++.TP ++.B -h, --dereference ++don't dump symlinks; dump the files they point to ++.TP ++.B -i, --ignore-zeros ++ignore blocks of zeros in archive (normally mean EOF) ++.TP ++.B -j, -I, --bzip ++filter the archive through bzip2. Note: -I is deprecated and may get a ++different meaning in the near future. ++.TP ++.B --ignore-failed-read ++don't exit with non-zero status on unreadable files ++.TP ++.B -k, --keep-old-files ++keep existing files; don't overwrite them from archive ++.TP ++.B -K, --starting-file F ++begin at file F in the archive ++.TP ++.B -l, --one-file-system ++stay in local file system when creating an archive ++.TP ++.B -L, --tape-length N ++change tapes after writing N*1024 bytes ++.TP ++.B -m, --modification-time ++don't extract file modified time ++.TP ++.B -M, --multi-volume ++create/list/extract multi-volume archive ++.TP ++.B -N, --after-date DATE, --newer DATE ++only store files newer than DATE ++.TP ++.B -o, --old-archive, --portability ++write a V7 format archive, rather than ANSI format ++.TP ++.B -O, --to-stdout ++extract files to standard output ++.TP ++.B -p, --same-permissions, --preserve-permissions ++extract all protection information ++.TP ++.B -P, --absolute-paths ++don't strip leading `/'s from file names ++.TP ++.B --preserve ++like -p -s ++.TP ++.B -R, --record-number ++show record number within archive with each message ++.TP ++.B --remove-files ++remove files after adding them to the archive ++.TP ++.B -s, --same-order, --preserve-order ++list of names to extract is sorted to match archive ++.TP ++.B --same-owner ++create extracted files with the same ownership ++.TP ++.B -S, --sparse ++handle sparse files efficiently ++.TP ++.B -T, --files-from=F ++get names to extract or create from file F ++.TP ++.B --null ++-T reads null-terminated names, disable -C ++.TP ++.B --totals ++print total bytes written with --create ++.TP ++.B -v, --verbose ++verbosely list files processed ++.TP ++.B -V, --label NAME ++create archive with volume name NAME ++.TP ++.B --version ++print tar program version number ++.TP ++.B -w, --interactive, --confirmation ++ask for confirmation for every action ++.TP ++.B -W, --verify ++attempt to verify the archive after writing it ++.TP ++.B --exclude FILE ++exclude file FILE ++.TP ++.B -X, --exclude-from FILE ++exclude files listed in FILE ++.TP ++.B -Z, --compress, --uncompress ++filter the archive through compress ++.TP ++.B -z, --gzip, --ungzip ++filter the archive through gzip ++.TP ++.B --use-compress-program PROG ++filter the archive through PROG (which must accept -d) Added: tinysofa/releases/1.2/gtar/current/sources/tar-1.14-err.patch =================================================================== --- tinysofa/releases/1.2/gtar/current/sources/tar-1.14-err.patch 2005-03-15 09:42:26 UTC (rev 6163) +++ tinysofa/releases/1.2/gtar/current/sources/tar-1.14-err.patch 2005-03-15 20:34:13 UTC (rev 6164) @@ -0,0 +1,11 @@ +--- tar-1.15.1/src/incremen.c.err 2005-01-07 11:24:08.000000000 +0000 ++++ tar-1.15.1/src/incremen.c 2005-01-07 11:25:52.429775748 +0000 +@@ -133,6 +133,8 @@ + if (! dirp) + { + savedir_error (dir_name); ++ errno = 1; ++ return NULL; + } + errno = 0; + Added: tinysofa/releases/1.2/gtar/current/sources/tar-1.14-loneZeroWarning.patch =================================================================== --- tinysofa/releases/1.2/gtar/current/sources/tar-1.14-loneZeroWarning.patch 2005-03-15 09:42:26 UTC (rev 6163) +++ tinysofa/releases/1.2/gtar/current/sources/tar-1.14-loneZeroWarning.patch 2005-03-15 20:34:13 UTC (rev 6164) @@ -0,0 +1,25 @@ +--- tar-1.15.1/src/list.c.loneZeroWarning 2004-12-21 14:34:05.000000000 +0000 ++++ tar-1.15.1/src/list.c 2005-01-07 11:32:39.348691306 +0000 +@@ -140,6 +140,14 @@ + + if (!ignore_zeros_option) + { ++ /* ++ * According to POSIX tar specs, this is wrong, but on the web ++ * there are some tar specs that can trigger this, and some tar ++ * implementations create tars according to that spec. For now, ++ * let's not be pedantic about issuing the warning. ++ */ ++#if 0 ++ + char buf[UINTMAX_STRSIZE_BOUND]; + + status = read_header (false); +@@ -147,6 +155,7 @@ + break; + WARN ((0, 0, _("A lone zero block at %s"), + STRINGIFY_BIGINT (current_block_ordinal (), buf))); ++#endif + break; + } + status = prev_status; Added: tinysofa/releases/1.2/gtar/current/sources/tar-1.14-nolibrt.patch =================================================================== --- tinysofa/releases/1.2/gtar/current/sources/tar-1.14-nolibrt.patch 2005-03-15 09:42:26 UTC (rev 6163) +++ tinysofa/releases/1.2/gtar/current/sources/tar-1.14-nolibrt.patch 2005-03-15 20:34:13 UTC (rev 6164) @@ -0,0 +1,214 @@ +--- tar-1.15.1/configure.nolibrt 2004-12-21 13:30:30.000000000 +0000 ++++ tar-1.15.1/configure 2005-01-07 11:18:51.878839553 +0000 +@@ -11470,20 +11470,20 @@ + # dnl Persuade glibc to declare these functions. + + +- # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. ++ # Solaris 2.5.1 needs -lposix4 to get the clock_gettyme function. + # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. + + # Save and restore LIBS so e.g., -lrt, isn't added to it. Otherwise, *all* + # programs in the package would end up linked with that potentially-shared + # library, inducing unnecessary run-time overhead. + fetish_saved_libs=$LIBS +- echo "$as_me:$LINENO: checking for library containing clock_gettime" >&5 +-echo $ECHO_N "checking for library containing clock_gettime... $ECHO_C" >&6 +-if test "${ac_cv_search_clock_gettime+set}" = set; then ++ echo "$as_me:$LINENO: checking for library containing clock_gettyme" >&5 ++echo $ECHO_N "checking for library containing clock_gettyme... $ECHO_C" >&6 ++if test "${ac_cv_search_clock_gettyme+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS +-ac_cv_search_clock_gettime=no ++ac_cv_search_clock_gettyme=no + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -11497,11 +11497,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char clock_gettime (); ++char clock_gettyme (); + int + main () + { +-clock_gettime (); ++clock_gettyme (); + ; + return 0; + } +@@ -11528,7 +11528,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_search_clock_gettime="none required" ++ ac_cv_search_clock_gettyme="none required" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -11536,7 +11536,7 @@ + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +-if test "$ac_cv_search_clock_gettime" = no; then ++if test "$ac_cv_search_clock_gettyme" = no; then + for ac_lib in rt posix4; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +@@ -11552,11 +11552,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char clock_gettime (); ++char clock_gettyme (); + int + main () + { +-clock_gettime (); ++clock_gettyme (); + ; + return 0; + } +@@ -11583,7 +11583,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_search_clock_gettime="-l$ac_lib" ++ ac_cv_search_clock_gettyme="-l$ac_lib" + break + else + echo "$as_me: failed program was:" >&5 +@@ -11596,18 +11596,18 @@ + fi + LIBS=$ac_func_search_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettime" >&5 +-echo "${ECHO_T}$ac_cv_search_clock_gettime" >&6 +-if test "$ac_cv_search_clock_gettime" != no; then +- test "$ac_cv_search_clock_gettime" = "none required" || LIBS="$ac_cv_search_clock_gettime $LIBS" +- test "$ac_cv_search_clock_gettime" = "none required" || +- LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime ++echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettyme" >&5 ++echo "${ECHO_T}$ac_cv_search_clock_gettyme" >&6 ++if test "$ac_cv_search_clock_gettyme" != no; then ++ test "$ac_cv_search_clock_gettyme" = "none required" || LIBS="$ac_cv_search_clock_gettyme $LIBS" ++ test "$ac_cv_search_clock_gettyme" = "none required" || ++ LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettyme + fi + + + + +-for ac_func in clock_gettime clock_settime ++for ac_func in clock_gettyme clock_settime + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -20541,17 +20541,17 @@ + # programs in the package would end up linked with that potentially-shared + # library, inducing unnecessary run-time overhead. + +-# Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. ++# Solaris 2.5.1 needs -lposix4 to get the clock_gettyme function. + # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. + tar_save_LIBS=$LIBS + LIB_CLOCK_GETTIME= +- echo "$as_me:$LINENO: checking for library containing clock_gettime" >&5 +-echo $ECHO_N "checking for library containing clock_gettime... $ECHO_C" >&6 +-if test "${ac_cv_search_clock_gettime+set}" = set; then ++ echo "$as_me:$LINENO: checking for library containing clock_gettyme" >&5 ++echo $ECHO_N "checking for library containing clock_gettyme... $ECHO_C" >&6 ++if test "${ac_cv_search_clock_gettyme+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS +-ac_cv_search_clock_gettime=no ++ac_cv_search_clock_gettyme=no + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -20565,11 +20565,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char clock_gettime (); ++char clock_gettyme (); + int + main () + { +-clock_gettime (); ++clock_gettyme (); + ; + return 0; + } +@@ -20596,7 +20596,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_search_clock_gettime="none required" ++ ac_cv_search_clock_gettyme="none required" + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -20604,7 +20604,7 @@ + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +-if test "$ac_cv_search_clock_gettime" = no; then ++if test "$ac_cv_search_clock_gettyme" = no; then + for ac_lib in rt posix4; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +@@ -20620,11 +20620,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char clock_gettime (); ++char clock_gettyme (); + int + main () + { +-clock_gettime (); ++clock_gettyme (); + ; + return 0; + } +@@ -20651,7 +20651,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_search_clock_gettime="-l$ac_lib" ++ ac_cv_search_clock_gettyme="-l$ac_lib" + break + else + echo "$as_me: failed program was:" >&5 +@@ -20664,19 +20664,19 @@ + fi + LIBS=$ac_func_search_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettime" >&5 +-echo "${ECHO_T}$ac_cv_search_clock_gettime" >&6 +-if test "$ac_cv_search_clock_gettime" != no; then +- test "$ac_cv_search_clock_gettime" = "none required" || LIBS="$ac_cv_search_clock_gettime $LIBS" ++echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettyme" >&5 ++echo "${ECHO_T}$ac_cv_search_clock_gettyme" >&6 ++if test "$ac_cv_search_clock_gettyme" != no; then ++ test "$ac_cv_search_clock_gettyme" = "none required" || LIBS="$ac_cv_search_clock_gettyme $LIBS" + + fi + +- case "$ac_cv_search_clock_gettime" in +- -l*) LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime;; ++ case "$ac_cv_search_clock_gettyme" in ++ -l*) LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettyme;; + esac + + +-for ac_func in clock_gettime ++for ac_func in clock_gettyme + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 Added: tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1-gcc4.patch =================================================================== --- tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1-gcc4.patch 2005-03-15 09:42:26 UTC (rev 6163) +++ tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1-gcc4.patch 2005-03-15 20:34:13 UTC (rev 6164) @@ -0,0 +1,16 @@ +Patch by Robert Scheck for tar >= 1.15.1, which makes tar +rebuildable using gcc 4. + +--- tar-1.15.1/tests/genfile.c 2004-09-08 13:50:20.000000000 +0200 ++++ tar-1.15.1/tests/genfile.c.gcc4 2005-03-13 16:25:15.000000000 +0100 +@@ -60,8 +60,8 @@ + /* Block buffer for sparse file */ + char *buffer; + +-static const char *argp_program_version = "genfile (" PACKAGE ") " VERSION; +-static const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">"; ++const char *argp_program_version = "genfile (" PACKAGE ") " VERSION; ++const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">"; + static char doc[] = N_("genfile generates data files for GNU paxutils test suite"); + + static struct argp_option options[] = { Added: tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1-makeCheck.patch =================================================================== --- tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1-makeCheck.patch 2005-03-15 09:42:26 UTC (rev 6163) +++ tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1-makeCheck.patch 2005-03-15 20:34:13 UTC (rev 6164) @@ -0,0 +1,37 @@ +--- tar-1.15.1/tests/testsuite.at.makeCheck 2004-12-21 12:41:40.000000000 +0000 ++++ tar-1.15.1/tests/testsuite.at 2005-01-17 16:03:58.879187416 +0000 +@@ -64,7 +64,7 @@ + + m4_include([options.at]) + +-m4_include([append.at]) ++#m4_include([append.at]) + + m4_include([delete01.at]) + m4_include([delete02.at]) +--- tar-1.15.1/tests/pipe.at.makeCheck 2004-12-21 12:51:40.000000000 +0000 ++++ tar-1.15.1/tests/pipe.at 2005-01-17 16:04:30.468604188 +0000 +@@ -34,7 +34,7 @@ + mkdir directory + genfile --length 10240 --pattern zeros > directory/file1 + genfile --length 13 > directory/file2 +-tar cf archive directory ++tar cf archive directory/file1 directory/file2 + mv directory orig + cat archive | tar xfv - + echo "separator" +@@ -42,11 +42,10 @@ + echo "separator" + cmp orig/file2 directory/file2], + [0], +-[directory/ +-directory/file1 ++[directory/file1 + directory/file2 + separator + separator + ]) + +-AT_CLEANUP +\ No newline at end of file ++AT_CLEANUP Added: tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1.tar.gz.sig =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/gtar/current/sources/tar-1.15.1.tar.gz.sig ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: tinysofa/releases/1.2/gtar/current/specs/gtar.spec =================================================================== --- tinysofa/releases/1.2/gtar/current/specs/gtar.spec 2005-03-15 09:42:26 UTC (rev 6163) +++ tinysofa/releases/1.2/gtar/current/specs/gtar.spec 2005-03-15 20:34:13 UTC (rev 6164) @@ -0,0 +1,295 @@ +Summary: A GNU file archiving program. +Name: gtar +Version: 1.15.1 +Release: 1jh +License: GPL +Group: extra +URL: http://www.gnu.org/software/tar/ +Source0: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.gz +Source1: ftp://ftp.gnu.org/pub/gnu/tar/tar-%{version}.tar.gz.sig +Patch0: tar-1.13.18-manpage.patch +Patch6: tar-1.14-nolibrt.patch +Patch7: tar-1.14-err.patch +Patch8: tar-1.14-loneZeroWarning.patch +Patch9: tar-1.15.1-makeCheck.patch +Patch10: tar-1.15.1-gcc4.patch +%info_requires +BuildRequires: autoconf automake gzip gettext +Buildroot: %{_tmppath}/%{name}-%{version}-root + +%description +The GNU tar program saves many files together in one archive and can +restore individual files (or all of the files) from that archive. Tar +can also be used to add supplemental files to an archive and to update +or list files in the archive. Tar includes multivolume support, +automatic archive compression/decompression, the ability to perform +remote archives, and the ability to perform incremental and full +backups. + +If you want to use tar for remote backups, you also need to install +the rmt package. + + +%prep +%setup -q -n tar-%{version} +%patch0 -p1 +%patch6 -p1 -b .nolibrt +%patch7 -p1 -b .err +%patch8 -p1 -b .loneZeroWarning +%patch9 -p1 -b .makeCheck +%patch10 -p1 -b .gcc4 + + +%build +%configure +%make LIBS=-lbsd + + +%install +%makeinstall + +mv %{buildroot}%{_bindir}/tar %{buildroot}%{_bindir}/gtar + +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 +install -c -m644 tar.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/gtar.1 + +%install_info doc/tar.texi +%nuke_info + +%find_lang tar + + +%clean +%clean_buildroot + + +%post +%info_post + +%postun +%info_postun + + +%files -f tar.lang +%defattr(-,root,root) +%doc AUTHORS ChangeLog ChangeLog.1 NEWS README THANKS TODO +%{_bindir}/gtar +%exclude %{_libexecdir}/* +%{_mandir}/man1/gtar.1* +%{_htmldir}/%{name} + + +%changelog +* Tue Mar 15 2005 Jaakko Heinonen +- tinysofa + +* Mon Mar 14 2005 Peter Vrabec +- gcc4 fix (#150993) 1.15.1-4 + +* Mon Jan 31 2005 Peter Vrabec +- rebuild 1.15.1-3 + +* Mon Jan 17 2005 Peter Vrabec +- fix tests/testsuite + +* Fri Jan 07 2005 Peter Vrabec +- upgrade to 1.15.1 + +* Mon Oct 11 2004 Peter Vrabec +- patch to stop issuing lone zero block warnings +- rebuilt + +* Mon Oct 11 2004 Peter Vrabec +- URL added to spec file +- spec file clean up + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon Jun 7 2004 Jeff Johnson 1.14-1 +- upgrade to 1.14. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jun 17 2003 Jeff Johnson 1.13.25-13 +- rebuilt because of crt breakage on ppc64. +- dump automake15 requirement. + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Nov 29 2002 Tim Powers 1.13.25-10 +- fix broken buildrquires on autoconf253 + +* Thu Nov 7 2002 Jeff Johnson 1.13.25-9 +- rebuild from CVS. + +* Fri Aug 23 2002 Phil Knirsch 1.13.25-8 +- Included security patch from errata release. + +* Mon Jul 1 2002 Bernhard Rosenkraenzer 1.13.25-7 +- Fix argv NULL termination (#64869) + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 9 2002 Bernhard Rosenkraenzer 1.13.25-4 +- Fix build with autoconf253 (LIBOBJ change; autoconf252 worked) + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Oct 23 2001 Bernhard Rosenkraenzer 1.13.25-2 +- Don't include hardlinks to sockets in a tar file (#54827) + +* Thu Sep 27 2001 Bernhard Rosenkraenzer 1.13.25-1 +- 1.13.25 + +* Tue Sep 18 2001 Bernhard Rosenkraenzer 1.13.22-1 +- Update to 1.13.22, adapt patches + +* Mon Aug 27 2001 Bernhard Rosenkraenzer 1.13.19-6 +- Fix #52084 + +* Thu May 17 2001 Bernhard Rosenkraenzer 1.13.19-5 +- Fix build with current autoconf (stricter checking on AC_DEFINE) +- Fix segfault when tarring directories without having read permissions + (#40802) + +* Tue Mar 6 2001 Bernhard Rosenkraenzer +- Don't depend on librt. + +* Fri Feb 23 2001 Trond Eivind Glomsr?d +- langify + +* Thu Feb 22 2001 Bernhard Rosenkraenzer +- Fix up the man page (#28915) + +* Wed Feb 21 2001 Bernhard Rosenkraenzer +- 1.3.19, nukes -I and fixes up -N +- Add -I back in as an alias to -j with a nice loud warning + +* Mon Oct 30 2000 Bernhard Rosenkraenzer +- 1.3.18 +- Update man page to reflect changes + +* Thu Oct 5 2000 Bernhard Rosenkraenzer +- Fix the "ignore failed read" option (Bug #8330) + +* Mon Sep 25 2000 Bernhard Rosenkraenzer +- fix hang on tar tvzf - + +* Fri Aug 18 2000 Bernhard Rosenkraenzer +- really fix exit code (Bug #15448) + +* Mon Aug 7 2000 Bernhard Rosenkraenzer +- fix exit code (Bug #15448), patch from Tim Waugh + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 19 2000 Bernhard Rosenkraenzer +- FHSify + +* Fri Apr 28 2000 Bill Nottingham +- fix for ia64 + +* Wed Feb 9 2000 Bernhard Rosenkr?nzer +- Fix the exclude bug (#9201) + +* Wed Feb 02 2000 Cristian Gafton +- man pages are compressed +- fix description +- fix fnmatch build problems + +* Sun Jan 9 2000 Bernhard Rosenkr?nzer +- 1.13.17 +- remove dotbug patch (fixed in base) +- update download URL + +* Fri Jan 7 2000 Bernhard Rosenkr?nzer +- Fix a severe bug (tar xf any_package_containing_. would delete the + current directory) + +* Wed Jan 5 2000 Bernhard Rosenkr?nzer +- 1.3.16 +- unset LINGUAS before running configure + +* Tue Nov 9 1999 Bernhard Rosenkr?nzer +- 1.13.14 +- Update man page to know about -I / --bzip +- Remove dependancy on rmt - tar can be used for anything local + without it. + +* Fri Aug 27 1999 Preston Brown +- upgrade to 1.13.11. + +* Wed Aug 18 1999 Jeff Johnson +- update to 1.13.9. + +* Thu Aug 12 1999 Jeff Johnson +- update to 1.13.6. +- support -y --bzip2 options for bzip2 compression (#2415). + +* Fri Jul 23 1999 Jeff Johnson +- update to 1.13.5. + +* Tue Jul 13 1999 Bill Nottingham +- update to 1.13 + +* Sat Jun 26 1999 Jeff Johnson +- update to 1.12.64014. +- pipe patch corrected for remote tars now merged in. + +* Sun Jun 20 1999 Jeff Johnson +- update to tar-1.12.64013. +- subtract (and reopen #2415) bzip2 support using -y. +- move gtar to /bin. + +* Tue Jun 15 1999 Jeff Johnson +- upgrade to tar-1.12.64011 to +- add bzip2 support (#2415) +- fix filename bug (#3479) + +* Mon Mar 29 1999 Jeff Johnson +- fix suspended tar with compression over pipe produces error (#390). + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 8) + +* Mon Mar 08 1999 Michael Maher +- added patch for bad name cache. +- FIXES BUG 320 + +* Wed Feb 24 1999 Preston Brown +- Injected new description and group. + +* Fri Dec 18 1998 Preston Brown +- bumped spec number for initial rh 6.0 build + +* Tue Aug 4 1998 Jeff Johnson +- add /usr/bin/gtar symlink (change #421) + +* Tue Jul 14 1998 Jeff Johnson +- Fiddle bindir/libexecdir to get RH install correct. +- Don't include /sbin/rmt -- use the rmt from dump. +- Turn on nls. + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Oct 16 1997 Donnie Barnes +- updated from 1.11.8 to 1.12 +- various spec file cleanups +- /sbin/install-info support + +* Thu Jun 19 1997 Erik Troan +- built against glibc + +* Thu May 29 1997 Michael Fulbright +- Fixed to include rmt From svn at tinysofa.org Tue Mar 15 20:52:53 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 15 Mar 2005 15:52:53 -0500 (EST) Subject: [tinysofa-svn] r6165 - tinysofa/releases/1.2/gtar/current/specs Message-ID: <20050315205253.6A542345894@minbar.tinysofa.org> Author: jh Date: 2005-03-15 15:52:47 -0500 (Tue, 15 Mar 2005) New Revision: 6165 Modified: tinysofa/releases/1.2/gtar/current/specs/gtar.spec Log: - minor cleanup Modified: tinysofa/releases/1.2/gtar/current/specs/gtar.spec =================================================================== --- tinysofa/releases/1.2/gtar/current/specs/gtar.spec 2005-03-15 20:34:13 UTC (rev 6164) +++ tinysofa/releases/1.2/gtar/current/specs/gtar.spec 2005-03-15 20:52:47 UTC (rev 6165) @@ -41,15 +41,14 @@ %build -%configure +%configure \ + --program-prefix=g %make LIBS=-lbsd %install %makeinstall -mv %{buildroot}%{_bindir}/tar %{buildroot}%{_bindir}/gtar - mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 install -c -m644 tar.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/gtar.1 From svn at tinysofa.org Wed Mar 16 05:28:39 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 00:28:39 -0500 (EST) Subject: [tinysofa-svn] r6166 - in tinysofa/releases/1.2/kernel/current: sources specs Message-ID: <20050316052839.8256D34551D@minbar.tinysofa.org> Author: jh Date: 2005-03-16 00:28:29 -0500 (Wed, 16 Mar 2005) New Revision: 6166 Added: tinysofa/releases/1.2/kernel/current/sources/patch-2.6.11.4-security.patch Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec Log: - add security fixes from 2.6.11.4 Added: tinysofa/releases/1.2/kernel/current/sources/patch-2.6.11.4-security.patch =================================================================== --- tinysofa/releases/1.2/kernel/current/sources/patch-2.6.11.4-security.patch 2005-03-15 20:52:47 UTC (rev 6165) +++ tinysofa/releases/1.2/kernel/current/sources/patch-2.6.11.4-security.patch 2005-03-16 05:28:29 UTC (rev 6166) @@ -0,0 +1,24 @@ +diff -Nru a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c +--- a/drivers/net/ppp_async.c 2005-03-15 16:09:56 -08:00 ++++ b/drivers/net/ppp_async.c 2005-03-15 16:09:56 -08:00 +@@ -1000,7 +1000,7 @@ + data += 4; + dlen -= 4; + /* data[0] is code, data[1] is length */ +- while (dlen >= 2 && dlen >= data[1]) { ++ while (dlen >= 2 && dlen >= data[1] && data[1] >= 2) { + switch (data[0]) { + case LCP_MRU: + val = (data[2] << 8) + data[3]; +diff -Nru a/fs/exec.c b/fs/exec.c +--- a/fs/exec.c 2005-03-15 16:09:56 -08:00 ++++ b/fs/exec.c 2005-03-15 16:09:56 -08:00 +@@ -814,7 +814,7 @@ + { + /* buf must be at least sizeof(tsk->comm) in size */ + task_lock(tsk); +- memcpy(buf, tsk->comm, sizeof(tsk->comm)); ++ strncpy(buf, tsk->comm, sizeof(tsk->comm)); + task_unlock(tsk); + } + Modified: tinysofa/releases/1.2/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-03-15 20:52:47 UTC (rev 6165) +++ tinysofa/releases/1.2/kernel/current/specs/kernel.spec 2005-03-16 05:28:29 UTC (rev 6166) @@ -46,7 +46,7 @@ Group: main License: GPLv2 Version: %{rpmversion} -Release: 3jh +Release: 4jh ExclusiveArch: noarch %{all_x86} x86_64 ExclusiveOS: Linux Provides: kernel = %{version} @@ -81,6 +81,7 @@ Patch1: linux-2.6.11-exec-shield-on-grsec.patch Patch2: patch-2.6.11-ac3 +Patch3: patch-2.6.11.4-security.patch Patch100: linux-2.6.11-route-crash.patch Patch101: linux-2.6.11-epoll.patch @@ -222,6 +223,7 @@ %patch0 -p1 %patch1 -p1 -b .exec-shield~ %patch2 -p1 -b .ac~ +%patch3 -p1 %patch100 -p1 -b .route-crash~ %patch101 -p1 -b .epoll~ @@ -578,6 +580,9 @@ %changelog +* Wed Mar 16 2005 Jaakko Heinonen 2.6.11-4jh +- add security fixes from 2.6.11.4 + * Mon Mar 14 2005 Jaakko Heinonen 2.6.11-3jh - update to -ac3 level From svn at tinysofa.org Wed Mar 16 06:50:51 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 01:50:51 -0500 (EST) Subject: [tinysofa-svn] r6167 - in tinysofa/releases/1.2/tar/current: sources specs Message-ID: <20050316065051.B54AE34556F@minbar.tinysofa.org> Author: jh Date: 2005-03-16 01:50:30 -0500 (Wed, 16 Mar 2005) New Revision: 6167 Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.016.tar.gz tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.016.tar.gz Removed: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.010.tar.gz tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010-gzip.patch tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010.tar.gz Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec Log: - 1.02.016 Deleted: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.01.022.tar.gz =================================================================== (Binary files differ) Deleted: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.010.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.016.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/tar/current/sources/bsdtar-1.02.016.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010-gzip.patch =================================================================== --- tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010-gzip.patch 2005-03-16 05:28:29 UTC (rev 6166) +++ tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010-gzip.patch 2005-03-16 06:50:30 UTC (rev 6167) @@ -1,16 +0,0 @@ -=================================================================== -RCS file: /usr/local/www/cvsroot/FreeBSD/src/lib/libarchive/archive_read_support_compression_gzip.c,v -retrieving revision 1.7 -retrieving revision 1.8 -diff -u -p -r1.7 -r1.8 ---- libarchive/archive_read_support_compression_gzip.c 2004/08/14 03:45:45 1.7 -+++ libarchive/archive_read_support_compression_gzip.c 2005/03/02 05:34:05 1.8 -@@ -426,7 +426,7 @@ drive_decompressor(struct archive *a, st - */ - case 11: /* Optional Extra: Second byte of Length. */ - if ((flags & 4)) { -- count = (count << 8) | (255 & (int)b); -+ count = (0xff00 & ((int)b << 8)) | count; - header_state = 12; - break; - } Deleted: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.010.tar.gz =================================================================== (Binary files differ) Added: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.016.tar.gz =================================================================== (Binary files differ) Property changes on: tinysofa/releases/1.2/tar/current/sources/libarchive-1.02.016.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/1.2/tar/current/specs/tar.spec =================================================================== --- tinysofa/releases/1.2/tar/current/specs/tar.spec 2005-03-16 05:28:29 UTC (rev 6166) +++ tinysofa/releases/1.2/tar/current/specs/tar.spec 2005-03-16 06:50:30 UTC (rev 6167) @@ -1,8 +1,8 @@ -%define libarchive_version 1.02.010 +%define libarchive_version 1.02.016 Summary: A BSD file archiving program Name: tar Epoch: 1 -Version: 1.02.010 +Version: 1.02.016 Release: 2jh License: BSD Group: main @@ -11,7 +11,6 @@ Patch0: bsdtar-1.01.022-setlocale.patch Patch1: bsdtar-1.02.006-malloc.patch Patch2: libarchive-1.02.009-eilseq.patch -Patch3: libarchive-1.02.010-gzip.patch BuildRequires: e2fsprogs-devel zlib-devel bzip2-devel libattr-devel libacl-devel Provides: bsdtar = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -33,7 +32,6 @@ pushd libarchive-%{libarchive_version} %patch2 -p1 -b .eilseq~ -%patch3 -p1 -b .gzip~ popd @@ -70,6 +68,9 @@ %changelog +* Wed Mar 16 2005 Jaakko Heinonen 1.02.016-1jh +- 1.02.016 + * Thu Mar 3 2005 Jaakko Heinonen 1.02.010-2jh - correctly skip gzip "Extra Data" field (libarchive-1.02.010-gzip.patch) From svn at tinysofa.org Wed Mar 16 06:57:54 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 01:57:54 -0500 (EST) Subject: [tinysofa-svn] r6168 - tinysofa/releases/1.2/release/current/specs Message-ID: <20050316065754.DEC043456C3@minbar.tinysofa.org> Author: jh Date: 2005-03-16 01:57:49 -0500 (Wed, 16 Mar 2005) New Revision: 6168 Modified: tinysofa/releases/1.2/release/current/specs/release.spec Log: - call it 2.0 Modified: tinysofa/releases/1.2/release/current/specs/release.spec =================================================================== --- tinysofa/releases/1.2/release/current/specs/release.spec 2005-03-16 06:50:30 UTC (rev 6167) +++ tinysofa/releases/1.2/release/current/specs/release.spec 2005-03-16 06:57:49 UTC (rev 6168) @@ -4,7 +4,7 @@ Summary: tinysofa release file Name: release -Version: 1.2 +Version: 2.0 Release: 0jh Epoch: 2 License: GPL @@ -51,6 +51,9 @@ %changelog +* Wed Mar 16 2005 Jaakko Heinonen +- 2.0 + * Sun Jan 9 2005 Jaakko Heinonen - prepare for 1.2 From svn at tinysofa.org Wed Mar 16 11:41:20 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 06:41:20 -0500 (EST) Subject: [tinysofa-svn] r6169 - tinysofa/releases Message-ID: <20050316114120.42279345A0B@minbar.tinysofa.org> Author: jh Date: 2005-03-16 06:41:14 -0500 (Wed, 16 Mar 2005) New Revision: 6169 Added: tinysofa/releases/classic/ Log: - create directory for classic From svn at tinysofa.org Wed Mar 16 11:41:43 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 06:41:43 -0500 (EST) Subject: [tinysofa-svn] r6170 - tinysofa/releases Message-ID: <20050316114143.D77C5345A0B@minbar.tinysofa.org> Author: jh Date: 2005-03-16 06:41:38 -0500 (Wed, 16 Mar 2005) New Revision: 6170 Added: tinysofa/releases/enterprise/ Log: - create directory for enterprise From svn at tinysofa.org Wed Mar 16 11:42:48 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 06:42:48 -0500 (EST) Subject: [tinysofa-svn] r6171 - in tinysofa/releases: . classic Message-ID: <20050316114248.91CA2345A10@minbar.tinysofa.org> Author: jh Date: 2005-03-16 06:42:38 -0500 (Wed, 16 Mar 2005) New Revision: 6171 Added: tinysofa/releases/classic/1.0/ Removed: tinysofa/releases/1.0/ Log: - move to classic Copied: tinysofa/releases/classic/1.0 (from rev 6170, tinysofa/releases/1.0) From svn at tinysofa.org Wed Mar 16 11:43:22 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 06:43:22 -0500 (EST) Subject: [tinysofa-svn] r6172 - in tinysofa/releases: . classic Message-ID: <20050316114322.E12CE345A10@minbar.tinysofa.org> Author: jh Date: 2005-03-16 06:43:12 -0500 (Wed, 16 Mar 2005) New Revision: 6172 Added: tinysofa/releases/classic/1.1/ Removed: tinysofa/releases/1.1/ Log: - move to classic Copied: tinysofa/releases/classic/1.1 (from rev 6171, tinysofa/releases/1.1) From svn at tinysofa.org Wed Mar 16 11:44:01 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 06:44:01 -0500 (EST) Subject: [tinysofa-svn] r6173 - in tinysofa/releases: . classic Message-ID: <20050316114401.C85D0345A32@minbar.tinysofa.org> Author: jh Date: 2005-03-16 06:43:51 -0500 (Wed, 16 Mar 2005) New Revision: 6173 Added: tinysofa/releases/classic/2.0/ Removed: tinysofa/releases/1.2/ Log: - move to classic as 2.0 Copied: tinysofa/releases/classic/2.0 (from rev 6172, tinysofa/releases/1.2) From svn at tinysofa.org Wed Mar 16 11:44:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 06:44:59 -0500 (EST) Subject: [tinysofa-svn] r6174 - in tinysofa/releases: . enterprise Message-ID: <20050316114459.C3628345A16@minbar.tinysofa.org> Author: jh Date: 2005-03-16 06:44:49 -0500 (Wed, 16 Mar 2005) New Revision: 6174 Added: tinysofa/releases/enterprise/2.0/ Removed: tinysofa/releases/2.0/ Log: - move to enterprise Copied: tinysofa/releases/enterprise/2.0 (from rev 6173, tinysofa/releases/2.0) From svn at tinysofa.org Wed Mar 16 16:27:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 11:27:45 -0500 (EST) Subject: [tinysofa-svn] r6175 - in contrib/1.2: . grun grun/current grun/current/sources grun/current/specs Message-ID: <20050316162745.C63C7345791@minbar.tinysofa.org> Author: jh Date: 2005-03-16 11:27:32 -0500 (Wed, 16 Mar 2005) New Revision: 6175 Added: contrib/1.2/grun/ contrib/1.2/grun/current/ contrib/1.2/grun/current/sources/ contrib/1.2/grun/current/sources/grun_0.9.2.orig.tar.gz contrib/1.2/grun/current/specs/ contrib/1.2/grun/current/specs/grun.spec contrib/1.2/grun/pristine/ contrib/1.2/grun/releases/ Log: - add grun Added: contrib/1.2/grun/current/sources/grun_0.9.2.orig.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.2/grun/current/sources/grun_0.9.2.orig.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/1.2/grun/current/specs/grun.spec =================================================================== --- contrib/1.2/grun/current/specs/grun.spec 2005-03-16 11:44:49 UTC (rev 6174) +++ contrib/1.2/grun/current/specs/grun.spec 2005-03-16 16:27:32 UTC (rev 6175) @@ -0,0 +1,43 @@ +Name: grun +Summary: GTK based Run dialog +License: GPL +Version: 0.9.2 +Release: 1jh +Group: contrib +Source: grun_%{version}.orig.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: gtk12+-devel glib12-devel + +%description +gRun is a GTK based Run dialog that resembles the Windows Run dialog +It has a intelligent history mechanism and a dual level fork() mechanism +for launching the application in its own process. gRun also has support +for launching console mode application in an XTerm as well as associations +for file types. + + +%prep +%setup -q + + +%build +%configure +%make + + +%install +%{__mkdir_p} \ + %{buildroot}%{_bindir} + +%{__install} -m 755 grun %{buildroot}%{_bindir}/grun + + +%files +%defattr(-,root,root) +%doc NEWS README BUGS +%{_bindir}/grun + + +%changelog +* Wed Mar 16 2005 Jaakko Heinonen 0.9.2-1jh +- initial spec From svn at tinysofa.org Wed Mar 16 18:33:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 13:33:11 -0500 (EST) Subject: [tinysofa-svn] r6176 - in tinysofa/releases/classic/2.0/anaconda/current: sources specs Message-ID: <20050316183311.CA2AA345AB8@minbar.tinysofa.org> Author: jh Date: 2005-03-16 13:32:55 -0500 (Wed, 16 Mar 2005) New Revision: 6176 Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-grsecurity.patch tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec Log: - correct a typo - bump up release to 1jh Modified: tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-grsecurity.patch =================================================================== --- tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-grsecurity.patch 2005-03-16 16:27:32 UTC (rev 6175) +++ tinysofa/releases/classic/2.0/anaconda/current/sources/anaconda-9.1-grsecurity.patch 2005-03-16 18:32:55 UTC (rev 6176) @@ -149,7 +149,7 @@ + return INSTALL_OK + + buttons = [ _("Yes"), _("No") ] -+ text = _("Grsecurity role based access control provides finer-grained" ++ text = _("Grsecurity role based access control provides finer-grained " + "security controls.\n\n" + "Would you like to enable the Grsecurity RBAC?") + Modified: tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec 2005-03-16 16:27:32 UTC (rev 6175) +++ tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec 2005-03-16 18:32:55 UTC (rev 6176) @@ -1,7 +1,7 @@ ExcludeArch: ppc64 Name: anaconda Version: 9.1 -Release: 0.18jh +Release: 1jh License: GPL Summary: installation program Group: development From svn at tinysofa.org Wed Mar 16 18:40:13 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 13:40:13 -0500 (EST) Subject: [tinysofa-svn] r6177 - tinysofa/releases/classic/2.0/kernel/current/sources Message-ID: <20050316184013.2331234557F@minbar.tinysofa.org> Author: jh Date: 2005-03-16 13:40:03 -0500 (Wed, 16 Mar 2005) New Revision: 6177 Modified: tinysofa/releases/classic/2.0/kernel/current/sources/kernel-2.6.11-x86_64-smp.config tinysofa/releases/classic/2.0/kernel/current/sources/kernel-2.6.11-x86_64.config Log: - compile usb hid as module (x86_64) Modified: tinysofa/releases/classic/2.0/kernel/current/sources/kernel-2.6.11-x86_64-smp.config =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/sources/kernel-2.6.11-x86_64-smp.config 2005-03-16 18:32:55 UTC (rev 6176) +++ tinysofa/releases/classic/2.0/kernel/current/sources/kernel-2.6.11-x86_64-smp.config 2005-03-16 18:40:03 UTC (rev 6177) @@ -1980,7 +1980,7 @@ # # USB Input Devices # -CONFIG_USB_HID=y +CONFIG_USB_HID=m CONFIG_USB_HIDINPUT=y CONFIG_HID_FF=y CONFIG_HID_PID=y Modified: tinysofa/releases/classic/2.0/kernel/current/sources/kernel-2.6.11-x86_64.config =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/sources/kernel-2.6.11-x86_64.config 2005-03-16 18:32:55 UTC (rev 6176) +++ tinysofa/releases/classic/2.0/kernel/current/sources/kernel-2.6.11-x86_64.config 2005-03-16 18:40:03 UTC (rev 6177) @@ -1988,7 +1988,7 @@ # # USB Input Devices # -CONFIG_USB_HID=y +CONFIG_USB_HID=m CONFIG_USB_HIDINPUT=y CONFIG_HID_FF=y CONFIG_HID_PID=y From svn at tinysofa.org Wed Mar 16 18:46:17 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 13:46:17 -0500 (EST) Subject: [tinysofa-svn] r6178 - in tinysofa/releases/classic/2.0/grsecurity/current: sources specs Message-ID: <20050316184617.1207A34556F@minbar.tinysofa.org> Author: jh Date: 2005-03-16 13:45:57 -0500 (Wed, 16 Mar 2005) New Revision: 6178 Added: tinysofa/releases/classic/2.0/grsecurity/current/sources/policies-20050316.tar Removed: tinysofa/releases/classic/2.0/grsecurity/current/sources/policies-20050310.tar Modified: tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec Log: - update policies Deleted: tinysofa/releases/classic/2.0/grsecurity/current/sources/policies-20050310.tar =================================================================== (Binary files differ) Added: tinysofa/releases/classic/2.0/grsecurity/current/sources/policies-20050316.tar =================================================================== (Binary files differ) Property changes on: tinysofa/releases/classic/2.0/grsecurity/current/sources/policies-20050316.tar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec 2005-03-16 18:40:03 UTC (rev 6177) +++ tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec 2005-03-16 18:45:57 UTC (rev 6178) @@ -1,8 +1,8 @@ -%define policies_date 20050310 +%define policies_date 20050316 Summary: grsecurity user space utilities and policies Name: grsecurity Version: 2.1.3 -Release: 1jh +Release: 2jh Source0: gradm-%{version}-200503070918.tar.gz Source1: grsec.init Source2: policies-%{policies_date}.tar From svn at tinysofa.org Wed Mar 16 20:21:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 15:21:46 -0500 (EST) Subject: [tinysofa-svn] r6180 - in contrib/1.1/mach/current: sources specs Message-ID: <20050316202146.D95F734563B@minbar.tinysofa.org> Author: jh Date: 2005-03-16 15:21:24 -0500 (Wed, 16 Mar 2005) New Revision: 6180 Added: contrib/1.1/mach/current/sources/ts-classic-2.0 Removed: contrib/1.1/mach/current/sources/tinysofa-1.2 Modified: contrib/1.1/mach/current/specs/mach.spec Log: - update for classic 2.0 Deleted: contrib/1.1/mach/current/sources/tinysofa-1.2 =================================================================== --- contrib/1.1/mach/current/sources/tinysofa-1.2 2005-03-16 20:09:31 UTC (rev 6179) +++ contrib/1.1/mach/current/sources/tinysofa-1.2 2005-03-16 20:21:24 UTC (rev 6180) @@ -1,30 +0,0 @@ -# mach dist configuration -*- python -*- - -# tinysofa-1.2: configuration for tinysofa - -# each distro flavour has an aptsources line describing where to get each -# kind of package from -# each actual dist has a packages dict for bootstrap packages and -# a sourceslist dict referencing aptsources lines to use - -### -aptsources['tinysofa-1.2'] = { - 'os': 'rpm file:///mnt/cdrom tinysofa all', -} - -# -packages['tinysofa-1.2'] = { - 'dir': 'tinysofa-1.2', - 'minimal': 'bash glibc', - 'base': 'coreutils findutils openssh-server openssh initscripts pam ' + - 'fcron openssl zlib dev glibc-locales glibc-i18n-en_US ' + - 'tcp_wrappers', - 'build': 'dev rpm-devel rpm-build make gcc tar gzip patch ' + - 'unzip bzip2 diffutils cpio elfutils', -} -sourceslist['tinysofa-1.2'] = { - 'tinysofa-1.2': ('os', ) -} -config['tinysofa-1.2'] = {} -aliases['tinysofa-1.2'] = ('ts12', 'ts-1.2', ) - Copied: contrib/1.1/mach/current/sources/ts-classic-2.0 (from rev 6086, contrib/1.1/mach/current/sources/tinysofa-1.2) =================================================================== --- contrib/1.1/mach/current/sources/tinysofa-1.2 2005-02-24 13:51:48 UTC (rev 6086) +++ contrib/1.1/mach/current/sources/ts-classic-2.0 2005-03-16 20:21:24 UTC (rev 6180) @@ -0,0 +1,30 @@ +# mach dist configuration -*- python -*- + +# ts-classic-2.0: configuration for tinysofa classic server 2.0 + +# each distro flavour has an aptsources line describing where to get each +# kind of package from +# each actual dist has a packages dict for bootstrap packages and +# a sourceslist dict referencing aptsources lines to use + +### +aptsources['ts-classic-2.0'] = { + 'os': 'rpm file:///mnt/cdrom tinysofa all', +} + +# +packages['ts-classic-2.0'] = { + 'dir': 'ts-classic-2.0', + 'minimal': 'bash glibc', + 'base': 'coreutils findutils openssh-server openssh initscripts pam ' + + 'fcron openssl zlib dev glibc-locales glibc-i18n-en_US ' + + 'tcp_wrappers', + 'build': 'dev rpm-devel rpm-build make gcc tar gzip patch ' + + 'unzip bzip2 diffutils cpio elfutils', +} +sourceslist['ts-classic-2.0'] = { + 'ts-classic-2.0': ('os', ) +} +config['ts-classic-2.0'] = {} +aliases['ts-classic-2.0'] = ('tsc20', 'tsc-2.0', ) + Modified: contrib/1.1/mach/current/specs/mach.spec =================================================================== --- contrib/1.1/mach/current/specs/mach.spec 2005-03-16 20:09:31 UTC (rev 6179) +++ contrib/1.1/mach/current/specs/mach.spec 2005-03-16 20:21:24 UTC (rev 6180) @@ -2,7 +2,7 @@ Name: mach Version: 0.4.6 -Release: 12jh +Release: 13jh Summary: make a chroot buildsystem Group: contrib License: GPL @@ -10,7 +10,7 @@ Source: http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.gz Source1: tinysofa-1.1 Source2: tinysofa-2.0 -Source3: tinysofa-1.2 +Source3: ts-classic-2.0 Patch0: mach-0.4.6-tinysofa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root From svn at tinysofa.org Wed Mar 16 20:44:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 16 Mar 2005 15:44:50 -0500 (EST) Subject: [tinysofa-svn] r6181 - in tinysofa/releases/classic/2.0/htmlinfo/current: sources specs Message-ID: <20050316204450.930E2345A26@minbar.tinysofa.org> Author: jh Date: 2005-03-16 15:44:34 -0500 (Wed, 16 Mar 2005) New Revision: 6181 Modified: tinysofa/releases/classic/2.0/htmlinfo/current/sources/htmlinfo-dottop.html tinysofa/releases/classic/2.0/htmlinfo/current/specs/htmlinfo.spec Log: - enterprise -> classic Modified: tinysofa/releases/classic/2.0/htmlinfo/current/sources/htmlinfo-dottop.html =================================================================== --- tinysofa/releases/classic/2.0/htmlinfo/current/sources/htmlinfo-dottop.html 2005-03-16 20:21:24 UTC (rev 6180) +++ tinysofa/releases/classic/2.0/htmlinfo/current/sources/htmlinfo-dottop.html 2005-03-16 20:44:34 UTC (rev 6181) @@ -9,7 +9,7 @@ -tinysofa enterprise server htmlinfo documentation area +tinysofa classic server htmlinfo documentation area @@ -18,7 +18,7 @@
-

tinysofa enterprise server htmlinfo documentation area

+

tinysofa classic server htmlinfo documentation area

This is the area containing the info type documentation resources for the installed software. The documentation is formatted as html pages. Modified: tinysofa/releases/classic/2.0/htmlinfo/current/specs/htmlinfo.spec =================================================================== --- tinysofa/releases/classic/2.0/htmlinfo/current/specs/htmlinfo.spec 2005-03-16 20:21:24 UTC (rev 6180) +++ tinysofa/releases/classic/2.0/htmlinfo/current/specs/htmlinfo.spec 2005-03-16 20:44:34 UTC (rev 6181) @@ -1,7 +1,7 @@ Summary: Info documentation html indexer Name: htmlinfo Version: 0.1.5 -Release: 17jh +Release: 18jh License: GPL Group: main Source1: htmlinfo_update.sh-%{version} @@ -31,7 +31,7 @@ chmod 644 $RPM_BUILD_ROOT/usr/share/html/index.html %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%clean_buildroot %files %defattr(-,root,root) From svn at tinysofa.org Thu Mar 17 11:02:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 17 Mar 2005 06:02:55 -0500 (EST) Subject: [tinysofa-svn] r6182 - tinysofa/releases/classic/2.0/apt/current/sources Message-ID: <20050317110255.E6DFD3454E0@minbar.tinysofa.org> Author: jh Date: 2005-03-17 06:02:50 -0500 (Thu, 17 Mar 2005) New Revision: 6182 Modified: tinysofa/releases/classic/2.0/apt/current/sources/default.conf Log: - allow duplicate kernel-devel packages as default Modified: tinysofa/releases/classic/2.0/apt/current/sources/default.conf =================================================================== --- tinysofa/releases/classic/2.0/apt/current/sources/default.conf 2005-03-16 20:44:34 UTC (rev 6181) +++ tinysofa/releases/classic/2.0/apt/current/sources/default.conf 2005-03-17 11:02:50 UTC (rev 6182) @@ -22,9 +22,8 @@ Ignore { "gpg-pubkey"; }; // Allow multiple kernel and kernel-related packages to be installed - // XXX: not used currently - Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; - Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; }; + Allow-Duplicated { "^kernel(-(BOOT|devel|smp-devel|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; }; + Allow-Duplicated-Upgrade { "^kernel(-(BOOT|devel|smp-devel|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; }; // "Upgrade" allow-duplicated packages as well Upgrade-Virtual "true"; From svn at tinysofa.org Thu Mar 17 12:42:51 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 17 Mar 2005 07:42:51 -0500 (EST) Subject: [tinysofa-svn] r6183 - tinysofa/releases/classic/2.0/kernel/current/sources Message-ID: <20050317124251.7A42B345A2E@minbar.tinysofa.org> Author: jh Date: 2005-03-17 07:42:45 -0500 (Thu, 17 Mar 2005) New Revision: 6183 Modified: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch Log: - minor patch update Modified: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch 2005-03-17 11:02:50 UTC (rev 6182) +++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch 2005-03-17 12:42:45 UTC (rev 6183) @@ -1,22 +1,5 @@ ---- linux-2.6.11/fs/proc/array.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/fs/proc/array.c 2005-03-08 10:57:03.000000000 +0200 -@@ -403,8 +403,12 @@ - ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0; - read_unlock(&tasklist_lock); - -- if (!whole || num_threads<2) -- wchan = get_wchan(task); -+ if (!whole || num_threads<2) { -+ wchan = 0; -+ if (current->uid == task->uid || current->euid == task->uid || -+ capable(CAP_SYS_NICE)) -+ wchan = get_wchan(task); -+ } - if (!whole) { - min_flt = task->min_flt; - maj_flt = task->maj_flt; ---- linux-2.6.11/fs/proc/base.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/fs/proc/base.c 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/fs/proc/base.c.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/fs/proc/base.c 2005-03-17 13:52:48.000000000 +0200 @@ -132,7 +132,7 @@ E(PROC_TGID_CMDLINE, "cmdline", S_IFREG|S_IRUGO), E(PROC_TGID_STAT, "stat", S_IFREG|S_IRUGO), @@ -35,8 +18,25 @@ E(PROC_TID_MEM, "mem", S_IFREG|S_IRUSR|S_IWUSR), E(PROC_TID_CWD, "cwd", S_IFLNK|S_IRWXUGO), E(PROC_TID_ROOT, "root", S_IFLNK|S_IRWXUGO), ---- linux-2.6.11/fs/proc/task_mmu.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/fs/proc/task_mmu.c 2005-03-08 20:34:22.860796209 +0200 +--- linux-2.6.11/fs/proc/array.c.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/fs/proc/array.c 2005-03-17 13:52:48.000000000 +0200 +@@ -403,8 +403,12 @@ + ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0; + read_unlock(&tasklist_lock); + +- if (!whole || num_threads<2) +- wchan = get_wchan(task); ++ if (!whole || num_threads<2) { ++ wchan = 0; ++ if (current->uid == task->uid || current->euid == task->uid || ++ capable(CAP_SYS_NICE)) ++ wchan = get_wchan(task); ++ } + if (!whole) { + min_flt = task->min_flt; + maj_flt = task->maj_flt; +--- linux-2.6.11/fs/proc/task_mmu.c.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/fs/proc/task_mmu.c 2005-03-17 13:52:48.000000000 +0200 @@ -22,24 +22,25 @@ "VmExe:\t%8lu kB\n" "VmLib:\t%8lu kB\n" @@ -96,8 +96,8 @@ flags & VM_MAYSHARE ? 's' : 'p', #ifdef CONFIG_GRKERNSEC_PROC_MEMMAP PAX_RAND_FLAGS ? 0UL : map->vm_pgoff << PAGE_SHIFT, ---- linux-2.6.11/fs/binfmt_elf.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/fs/binfmt_elf.c 2005-03-08 19:48:52.000000000 +0200 +--- linux-2.6.11/fs/binfmt_elf.c.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/fs/binfmt_elf.c 2005-03-17 13:52:48.000000000 +0200 @@ -52,7 +52,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs); @@ -404,8 +404,8 @@ goto out; } ---- linux-2.6.11/fs/exec.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/fs/exec.c 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/fs/exec.c.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/fs/exec.c 2005-03-17 13:52:48.000000000 +0200 @@ -428,7 +428,12 @@ while (i < MAX_ARG_PAGES) bprm->page[i++] = NULL; @@ -427,8 +427,8 @@ flush_thread(); if (bprm->e_uid != current->euid || bprm->e_gid != current->egid || ---- linux-2.6.11/mm/mprotect.c.shield~ 2005-03-08 10:56:44.000000000 +0200 -+++ linux-2.6.11/mm/mprotect.c 2005-03-08 11:00:04.000000000 +0200 +--- linux-2.6.11/mm/mprotect.c.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/mm/mprotect.c 2005-03-17 14:39:55.000000000 +0200 @@ -28,6 +28,7 @@ #include @@ -455,11 +455,8 @@ pgprot_t newprot; pgoff_t pgoff; int error; -@@ -312,8 +313,11 @@ - * vm_flags and vm_page_prot are protected by the mmap_sem - * held in write mode. +@@ -314,6 +315,8 @@ */ -+ oldflags = vma->vm_flags; vma->vm_flags = newflags; vma->vm_page_prot = newprot; + if (oldflags & VM_EXEC) @@ -467,8 +464,8 @@ change_protection(vma, start, end, newprot); __vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); __vm_stat_account(mm, newflags, vma->vm_file, nrpages); ---- linux-2.6.11/mm/mmap.c.shield~ 2005-03-08 10:56:44.000000000 +0200 -+++ linux-2.6.11/mm/mmap.c 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/mm/mmap.c.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/mm/mmap.c 2005-03-17 13:52:48.000000000 +0200 @@ -25,6 +25,7 @@ #include #include @@ -552,8 +549,8 @@ spin_unlock(&mm->page_table_lock); ---- linux-2.6.11/arch/i386/mm/mmap.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/arch/i386/mm/mmap.c 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/arch/i386/mm/mmap.c.exec-shield~ 2005-03-17 13:52:42.000000000 +0200 ++++ linux-2.6.11/arch/i386/mm/mmap.c 2005-03-17 13:54:35.000000000 +0200 @@ -26,6 +26,7 @@ #include @@ -597,8 +594,17 @@ mm->mmap_base = TASK_UNMAPPED_BASE; #ifdef CONFIG_PAX_RANDMMAP ---- linux-2.6.11/arch/i386/mm/init.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/arch/i386/mm/init.c 2005-03-08 10:57:03.000000000 +0200 +@@ -84,6 +91,8 @@ + #endif + + mm->get_unmapped_area = arch_get_unmapped_area_topdown; ++ if (current->flags & PF_RELOCEXEC) ++ mm->get_unmapped_exec_area = arch_get_unmapped_exec_area; + mm->unmap_area = arch_unmap_area_topdown; + } + } +--- linux-2.6.11/arch/i386/mm/init.c.exec-shield~ 2005-03-17 13:52:42.000000000 +0200 ++++ linux-2.6.11/arch/i386/mm/init.c 2005-03-17 13:52:48.000000000 +0200 @@ -383,7 +383,7 @@ * Control non executable mappings. * @@ -627,8 +633,8 @@ pagetable_init(); ---- linux-2.6.11/arch/i386/kernel/cpu/common.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/arch/i386/kernel/cpu/common.c 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/arch/i386/kernel/cpu/common.c.exec-shield~ 2005-03-17 13:52:42.000000000 +0200 ++++ linux-2.6.11/arch/i386/kernel/cpu/common.c 2005-03-17 13:52:48.000000000 +0200 @@ -392,6 +392,12 @@ if (disable_pse) clear_bit(X86_FEATURE_PSE, c->x86_capability); @@ -642,25 +648,202 @@ /* If the model name is still unset, do table lookup. */ if ( !c->x86_model_id[0] ) { char *p; ---- linux-2.6.11/arch/i386/kernel/vsyscall-sysenter.S.shield~ 2005-03-02 09:38:07.000000000 +0200 -+++ linux-2.6.11/arch/i386/kernel/vsyscall-sysenter.S 2005-03-08 10:57:03.000000000 +0200 -@@ -24,11 +24,11 @@ - /* 7: align return point with nop's to make disassembly easier */ - .space 7,0x90 +--- linux-2.6.11/arch/i386/kernel/asm-offsets.c.exec-shield~ 2005-03-02 09:38:00.000000000 +0200 ++++ linux-2.6.11/arch/i386/kernel/asm-offsets.c 2005-03-17 13:52:48.000000000 +0200 +@@ -52,6 +52,7 @@ + OFFSET(TI_preempt_count, thread_info, preempt_count); + OFFSET(TI_addr_limit, thread_info, addr_limit); + OFFSET(TI_restart_block, thread_info, restart_block); ++ OFFSET(TI_sysenter_return, thread_info, sysenter_return); + BLANK(); -- /* 14: System call restart point is here! (SYSENTER_RETURN - 2) */ -+ /* 14: System call restart point is here! (SYSENTER_RETURN_OFFSET-2) */ - jmp .Lenter_kernel - /* 16: System call normal return point is here! */ -- .globl SYSENTER_RETURN /* Symbol used by entry.S. */ --SYSENTER_RETURN: -+ .globl SYSENTER_RETURN_OFFSET /* Symbol used by sysenter.c */ -+SYSENTER_RETURN_OFFSET: - pop %ebp - .Lpop_ebp: - pop %edx ---- linux-2.6.11/arch/i386/kernel/process.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/arch/i386/kernel/process.c 2005-03-08 10:57:03.000000000 +0200 + OFFSET(EXEC_DOMAIN_handler, exec_domain, handler); +--- linux-2.6.11/arch/i386/kernel/sysenter.c.exec-shield~ 2005-03-17 13:52:42.000000000 +0200 ++++ linux-2.6.11/arch/i386/kernel/sysenter.c 2005-03-17 13:52:48.000000000 +0200 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -42,11 +43,15 @@ + extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; + + #ifndef CONFIG_PAX_NOVSYSCALL ++ ++struct page *sysenter_page; ++ + static int __init sysenter_setup(void) + { + void *page = (void *)get_zeroed_page(GFP_ATOMIC); + +- __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC); ++ __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_KERNEL_RO); ++ sysenter_page = virt_to_page(page); + + if (!boot_cpu_has(X86_FEATURE_SEP)) { + memcpy(page, +@@ -65,3 +70,45 @@ + + __initcall(sysenter_setup); + #endif ++ ++extern void SYSENTER_RETURN_OFFSET; ++ ++unsigned int vdso_enabled = 0; ++ ++void map_vsyscall(void) ++{ ++ struct thread_info *ti = current_thread_info(); ++ struct vm_area_struct *vma; ++ unsigned long addr; ++ ++ if (unlikely(!vdso_enabled)) { ++ current->mm->context.vdso = NULL; ++ return; ++ } ++ ++ /* ++ * Map the vDSO (it will be randomized): ++ */ ++ down_write(¤t->mm->mmap_sem); ++ addr = do_mmap(NULL, 0, 4096, PROT_READ | PROT_EXEC, MAP_PRIVATE, 0); ++ current->mm->context.vdso = (void *)addr; ++ ti->sysenter_return = (void *)addr + (long)&SYSENTER_RETURN_OFFSET; ++ if (addr != -1) { ++ vma = find_vma(current->mm, addr); ++ if (vma) { ++ pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; ++ get_page(sysenter_page); ++ install_page(current->mm, vma, addr, ++ sysenter_page, vma->vm_page_prot); ++ } ++ } ++ up_write(¤t->mm->mmap_sem); ++} ++ ++static int __init vdso_setup(char *str) ++{ ++ vdso_enabled = simple_strtoul(str, NULL, 0); ++ return 1; ++} ++__setup("vdso=", vdso_setup); ++ +--- linux-2.6.11/arch/i386/kernel/vsyscall.lds.S.exec-shield~ 2005-03-02 09:38:07.000000000 +0200 ++++ linux-2.6.11/arch/i386/kernel/vsyscall.lds.S 2005-03-17 13:52:48.000000000 +0200 +@@ -7,7 +7,7 @@ + + SECTIONS + { +- . = VSYSCALL_BASE + SIZEOF_HEADERS; ++ . = SIZEOF_HEADERS; + + .hash : { *(.hash) } :text + .dynsym : { *(.dynsym) } +@@ -20,7 +20,7 @@ + For the layouts to match, we need to skip more than enough + space for the dynamic symbol table et al. If this amount + is insufficient, ld -shared will barf. Just increase it here. */ +- . = VSYSCALL_BASE + 0x400; ++ . = 0x400; + + .text : { *(.text) } :text =0x90909090 + +--- linux-2.6.11/arch/i386/kernel/traps.c.exec-shield~ 2005-03-17 13:52:42.000000000 +0200 ++++ linux-2.6.11/arch/i386/kernel/traps.c 2005-03-17 13:52:48.000000000 +0200 +@@ -452,6 +452,10 @@ + DO_ERROR(12, SIGBUS, "stack segment", stack_segment) + DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) + ++/* ++ * the original non-exec stack patch was written by ++ * Solar Designer . Thanks! ++ */ + fastcall void do_general_protection(struct pt_regs * regs, long error_code) + { + int cpu = get_cpu(); +@@ -508,6 +512,38 @@ + } + #endif + ++ /* ++ * lazy-check for CS validity on exec-shield binaries: ++ */ ++ if (current->mm) { ++ int cpu = smp_processor_id(); ++ struct desc_struct *desc1, *desc2; ++ struct vm_area_struct *vma; ++ unsigned long limit = PAGE_SIZE; ++ ++ spin_lock(¤t->mm->page_table_lock); ++ for (vma = current->mm->mmap; vma; vma = vma->vm_next) ++ if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) ++ limit = vma->vm_end; ++ spin_unlock(¤t->mm->page_table_lock); ++ ++ current->mm->context.exec_limit = limit; ++ set_user_cs(¤t->mm->context.user_cs, limit); ++ ++ desc1 = ¤t->mm->context.user_cs; ++ desc2 = cpu_gdt_table[cpu] + GDT_ENTRY_DEFAULT_USER_CS; ++ ++ /* ++ * The CS was not in sync - reload it and retry the ++ * instruction. If the instruction still faults then ++ * we wont hit this branch next time around. ++ */ ++ if (desc1->a != desc2->a || desc1->b != desc2->b) { ++ load_user_cs_desc(cpu, current->mm); ++ return; ++ } ++ } ++ + current->thread.error_code = error_code; + current->thread.trap_no = 13; + force_sig(SIGSEGV, current); +--- linux-2.6.11/arch/i386/kernel/signal.c.exec-shield~ 2005-03-17 13:52:42.000000000 +0200 ++++ linux-2.6.11/arch/i386/kernel/signal.c 2005-03-17 13:52:48.000000000 +0200 +@@ -383,7 +383,7 @@ + #ifdef CONFIG_PAX_NOVSYSCALL + restorer = frame->retcode; + #else +- restorer = &__kernel_sigreturn; ++ restorer = current->mm->context.vdso + (long)&__kernel_sigreturn; + + #ifdef CONFIG_PAX_SEGMEXEC + if (current->mm->flags & MF_PAX_SEGMEXEC) +@@ -489,7 +489,7 @@ + #ifdef CONFIG_PAX_NOVSYSCALL + restorer = frame->retcode; + #else +- restorer = &__kernel_rt_sigreturn; ++ restorer = current->mm->context.vdso + (long)&__kernel_rt_sigreturn; + + #ifdef CONFIG_PAX_SEGMEXEC + if (current->mm->flags & MF_PAX_SEGMEXEC) +--- linux-2.6.11/arch/i386/kernel/smp.c.exec-shield~ 2005-03-02 09:37:48.000000000 +0200 ++++ linux-2.6.11/arch/i386/kernel/smp.c 2005-03-17 13:52:48.000000000 +0200 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include + + /* +@@ -313,6 +314,8 @@ + unsigned long cpu; + + cpu = get_cpu(); ++ if (current->active_mm) ++ load_user_cs_desc(cpu, current->active_mm); + + if (!cpu_isset(cpu, flush_cpumask)) + goto out; +--- linux-2.6.11/arch/i386/kernel/process.c.exec-shield~ 2005-03-17 13:52:42.000000000 +0200 ++++ linux-2.6.11/arch/i386/kernel/process.c 2005-03-17 13:52:48.000000000 +0200 @@ -36,6 +36,8 @@ #include #include @@ -703,7 +886,7 @@ +void arch_remove_exec_range(struct mm_struct *mm, unsigned long old_end) +{ + struct vm_area_struct *vma; -+ unsigned long limit = 0; ++ unsigned long limit = PAGE_SIZE; + + if (old_end == mm->context.exec_limit) { + for (vma = mm->mmap; vma; vma = vma->vm_next) @@ -743,90 +926,25 @@ #ifdef CONFIG_PAX_RANDKSTACK asmlinkage void pax_randomize_kstack(void) { ---- linux-2.6.11/arch/i386/kernel/signal.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/arch/i386/kernel/signal.c 2005-03-08 10:57:03.000000000 +0200 -@@ -383,7 +383,7 @@ - #ifdef CONFIG_PAX_NOVSYSCALL - restorer = frame->retcode; - #else -- restorer = &__kernel_sigreturn; -+ restorer = current->mm->context.vdso + (long)&__kernel_sigreturn; +--- linux-2.6.11/arch/i386/kernel/vsyscall-sysenter.S.exec-shield~ 2005-03-02 09:38:07.000000000 +0200 ++++ linux-2.6.11/arch/i386/kernel/vsyscall-sysenter.S 2005-03-17 13:52:48.000000000 +0200 +@@ -24,11 +24,11 @@ + /* 7: align return point with nop's to make disassembly easier */ + .space 7,0x90 - #ifdef CONFIG_PAX_SEGMEXEC - if (current->mm->flags & MF_PAX_SEGMEXEC) -@@ -489,7 +489,7 @@ - #ifdef CONFIG_PAX_NOVSYSCALL - restorer = frame->retcode; - #else -- restorer = &__kernel_rt_sigreturn; -+ restorer = current->mm->context.vdso + (long)&__kernel_rt_sigreturn; - - #ifdef CONFIG_PAX_SEGMEXEC - if (current->mm->flags & MF_PAX_SEGMEXEC) ---- linux-2.6.11/arch/i386/kernel/traps.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/arch/i386/kernel/traps.c 2005-03-08 10:57:03.000000000 +0200 -@@ -452,6 +452,10 @@ - DO_ERROR(12, SIGBUS, "stack segment", stack_segment) - DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) - -+/* -+ * the original non-exec stack patch was written by -+ * Solar Designer . Thanks! -+ */ - fastcall void do_general_protection(struct pt_regs * regs, long error_code) - { - int cpu = get_cpu(); -@@ -508,6 +512,38 @@ - } - #endif - -+ /* -+ * lazy-check for CS validity on exec-shield binaries: -+ */ -+ if (current->mm) { -+ int cpu = smp_processor_id(); -+ struct desc_struct *desc1, *desc2; -+ struct vm_area_struct *vma; -+ unsigned long limit = 0; -+ -+ spin_lock(¤t->mm->page_table_lock); -+ for (vma = current->mm->mmap; vma; vma = vma->vm_next) -+ if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) -+ limit = vma->vm_end; -+ spin_unlock(¤t->mm->page_table_lock); -+ -+ current->mm->context.exec_limit = limit; -+ set_user_cs(¤t->mm->context.user_cs, limit); -+ -+ desc1 = ¤t->mm->context.user_cs; -+ desc2 = cpu_gdt_table[cpu] + GDT_ENTRY_DEFAULT_USER_CS; -+ -+ /* -+ * The CS was not in sync - reload it and retry the -+ * instruction. If the instruction still faults then -+ * we wont hit this branch next time around. -+ */ -+ if (desc1->a != desc2->a || desc1->b != desc2->b) { -+ load_user_cs_desc(cpu, current->mm); -+ return; -+ } -+ } -+ - current->thread.error_code = error_code; - current->thread.trap_no = 13; - force_sig(SIGSEGV, current); ---- linux-2.6.11/arch/i386/kernel/asm-offsets.c.shield~ 2005-03-02 09:38:00.000000000 +0200 -+++ linux-2.6.11/arch/i386/kernel/asm-offsets.c 2005-03-08 10:57:03.000000000 +0200 -@@ -52,6 +52,7 @@ - OFFSET(TI_preempt_count, thread_info, preempt_count); - OFFSET(TI_addr_limit, thread_info, addr_limit); - OFFSET(TI_restart_block, thread_info, restart_block); -+ OFFSET(TI_sysenter_return, thread_info, sysenter_return); - BLANK(); - - OFFSET(EXEC_DOMAIN_handler, exec_domain, handler); ---- linux-2.6.11/arch/i386/kernel/entry.S.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/arch/i386/kernel/entry.S 2005-03-08 10:57:03.000000000 +0200 +- /* 14: System call restart point is here! (SYSENTER_RETURN - 2) */ ++ /* 14: System call restart point is here! (SYSENTER_RETURN_OFFSET-2) */ + jmp .Lenter_kernel + /* 16: System call normal return point is here! */ +- .globl SYSENTER_RETURN /* Symbol used by entry.S. */ +-SYSENTER_RETURN: ++ .globl SYSENTER_RETURN_OFFSET /* Symbol used by sysenter.c */ ++SYSENTER_RETURN_OFFSET: + pop %ebp + .Lpop_ebp: + pop %edx +--- linux-2.6.11/arch/i386/kernel/entry.S.exec-shield~ 2005-03-17 13:52:42.000000000 +0200 ++++ linux-2.6.11/arch/i386/kernel/entry.S 2005-03-17 13:52:48.000000000 +0200 @@ -201,8 +201,12 @@ pushl %ebp pushfl @@ -842,120 +960,8 @@ /* * Load the potential sixth argument from user stack. * Careful about security. ---- linux-2.6.11/arch/i386/kernel/vsyscall.lds.S.shield~ 2005-03-02 09:38:07.000000000 +0200 -+++ linux-2.6.11/arch/i386/kernel/vsyscall.lds.S 2005-03-08 10:57:03.000000000 +0200 -@@ -7,7 +7,7 @@ - - SECTIONS - { -- . = VSYSCALL_BASE + SIZEOF_HEADERS; -+ . = SIZEOF_HEADERS; - - .hash : { *(.hash) } :text - .dynsym : { *(.dynsym) } -@@ -20,7 +20,7 @@ - For the layouts to match, we need to skip more than enough - space for the dynamic symbol table et al. If this amount - is insufficient, ld -shared will barf. Just increase it here. */ -- . = VSYSCALL_BASE + 0x400; -+ . = 0x400; - - .text : { *(.text) } :text =0x90909090 - ---- linux-2.6.11/arch/i386/kernel/sysenter.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/arch/i386/kernel/sysenter.c 2005-03-08 10:57:03.000000000 +0200 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -42,11 +43,15 @@ - extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; - - #ifndef CONFIG_PAX_NOVSYSCALL -+ -+struct page *sysenter_page; -+ - static int __init sysenter_setup(void) - { - void *page = (void *)get_zeroed_page(GFP_ATOMIC); - -- __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC); -+ __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_KERNEL_RO); -+ sysenter_page = virt_to_page(page); - - if (!boot_cpu_has(X86_FEATURE_SEP)) { - memcpy(page, -@@ -65,3 +70,45 @@ - - __initcall(sysenter_setup); - #endif -+ -+extern void SYSENTER_RETURN_OFFSET; -+ -+unsigned int vdso_enabled = 0; -+ -+void map_vsyscall(void) -+{ -+ struct thread_info *ti = current_thread_info(); -+ struct vm_area_struct *vma; -+ unsigned long addr; -+ -+ if (unlikely(!vdso_enabled)) { -+ current->mm->context.vdso = NULL; -+ return; -+ } -+ -+ /* -+ * Map the vDSO (it will be randomized): -+ */ -+ down_write(¤t->mm->mmap_sem); -+ addr = do_mmap(NULL, 0, 4096, PROT_READ | PROT_EXEC, MAP_PRIVATE, 0); -+ current->mm->context.vdso = (void *)addr; -+ ti->sysenter_return = (void *)addr + (long)&SYSENTER_RETURN_OFFSET; -+ if (addr != -1) { -+ vma = find_vma(current->mm, addr); -+ if (vma) { -+ pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; -+ get_page(sysenter_page); -+ install_page(current->mm, vma, addr, -+ sysenter_page, vma->vm_page_prot); -+ } -+ } -+ up_write(¤t->mm->mmap_sem); -+} -+ -+static int __init vdso_setup(char *str) -+{ -+ vdso_enabled = simple_strtoul(str, NULL, 0); -+ return 1; -+} -+__setup("vdso=", vdso_setup); -+ ---- linux-2.6.11/arch/i386/kernel/smp.c.shield~ 2005-03-02 09:37:48.000000000 +0200 -+++ linux-2.6.11/arch/i386/kernel/smp.c 2005-03-08 10:57:03.000000000 +0200 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include - - /* -@@ -313,6 +314,8 @@ - unsigned long cpu; - - cpu = get_cpu(); -+ if (current->active_mm) -+ load_user_cs_desc(cpu, current->active_mm); - - if (!cpu_isset(cpu, flush_cpumask)) - goto out; ---- linux-2.6.11/arch/ia64/ia32/binfmt_elf32.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/arch/ia64/ia32/binfmt_elf32.c 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/arch/ia64/ia32/binfmt_elf32.c.exec-shield~ 2005-03-17 13:52:42.000000000 +0200 ++++ linux-2.6.11/arch/ia64/ia32/binfmt_elf32.c 2005-03-17 13:52:48.000000000 +0200 @@ -283,7 +283,7 @@ } @@ -965,8 +971,8 @@ { unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; ---- linux-2.6.11/arch/x86_64/ia32/ia32_binfmt.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/arch/x86_64/ia32/ia32_binfmt.c 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/arch/x86_64/ia32/ia32_binfmt.c.exec-shield~ 2005-03-17 13:52:47.000000000 +0200 ++++ linux-2.6.11/arch/x86_64/ia32/ia32_binfmt.c 2005-03-17 13:52:48.000000000 +0200 @@ -406,7 +406,7 @@ } @@ -976,8 +982,8 @@ { unsigned long map_addr; struct task_struct *me = current; ---- linux-2.6.11/drivers/char/random.c.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/drivers/char/random.c 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/drivers/char/random.c.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/drivers/char/random.c 2005-03-17 13:52:48.000000000 +0200 @@ -2390,6 +2390,39 @@ #endif #endif /* CONFIG_INET */ @@ -1018,8 +1024,8 @@ #if defined(CONFIG_PAX_ASLR) || defined(CONFIG_GRKERNSEC) unsigned long pax_get_random_long(void) { ---- linux-2.6.11/kernel/sysctl.c.shield~ 2005-03-08 10:56:44.000000000 +0200 -+++ linux-2.6.11/kernel/sysctl.c 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/kernel/sysctl.c.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/kernel/sysctl.c 2005-03-17 13:52:48.000000000 +0200 @@ -80,6 +80,29 @@ void __user *, size_t *, loff_t *); #endif @@ -1083,20 +1089,8 @@ .ctl_name = KERN_CORE_USES_PID, .procname = "core_uses_pid", .data = &core_uses_pid, ---- linux-2.6.11/include/linux/random.h.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/include/linux/random.h 2005-03-08 10:57:03.000000000 +0200 -@@ -72,6 +72,9 @@ - extern struct file_operations random_fops, urandom_fops; - #endif - -+unsigned int get_random_int(void); -+unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len); -+ - #endif /* __KERNEL___ */ - - #endif /* _LINUX_RANDOM_H */ ---- linux-2.6.11/include/linux/sched.h.shield~ 2005-03-08 10:56:44.000000000 +0200 -+++ linux-2.6.11/include/linux/sched.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/linux/sched.h.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/include/linux/sched.h 2005-03-17 13:52:48.000000000 +0200 @@ -34,6 +34,8 @@ #include @@ -1114,8 +1108,20 @@ /* * Only the _current_ task can read/write to tsk->flags, but other ---- linux-2.6.11/include/linux/resource.h.shield~ 2005-03-02 09:37:48.000000000 +0200 -+++ linux-2.6.11/include/linux/resource.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/linux/random.h.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/include/linux/random.h 2005-03-17 13:52:48.000000000 +0200 +@@ -72,6 +72,9 @@ + extern struct file_operations random_fops, urandom_fops; + #endif + ++unsigned int get_random_int(void); ++unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len); ++ + #endif /* __KERNEL___ */ + + #endif /* _LINUX_RANDOM_H */ +--- linux-2.6.11/include/linux/resource.h.exec-shield~ 2005-03-02 09:37:48.000000000 +0200 ++++ linux-2.6.11/include/linux/resource.h 2005-03-17 13:52:48.000000000 +0200 @@ -52,8 +52,11 @@ /* * Limit the stack by to some sane default: root can always @@ -1129,8 +1135,8 @@ /* * GPG wants 32kB of mlocked memory, to make sure pass phrases ---- linux-2.6.11/include/asm-x86_64/pgalloc.h.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/include/asm-x86_64/pgalloc.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-x86_64/pgalloc.h.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/include/asm-x86_64/pgalloc.h 2005-03-17 13:52:48.000000000 +0200 @@ -7,6 +7,11 @@ #include #include @@ -1143,8 +1149,8 @@ #define pmd_populate_kernel(mm, pmd, pte) \ set_pmd(pmd, __pmd(_KERNPG_TABLE | __pa(pte))) #define pud_populate(mm, pud, pmd) \ ---- linux-2.6.11/include/asm-ppc64/pgalloc.h.shield~ 2005-03-02 09:37:47.000000000 +0200 -+++ linux-2.6.11/include/asm-ppc64/pgalloc.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-ppc64/pgalloc.h.exec-shield~ 2005-03-02 09:37:47.000000000 +0200 ++++ linux-2.6.11/include/asm-ppc64/pgalloc.h 2005-03-17 13:52:48.000000000 +0200 @@ -11,6 +11,11 @@ extern kmem_cache_t *zero_cache; @@ -1157,8 +1163,8 @@ /* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License ---- linux-2.6.11/include/asm-sparc/pgalloc.h.shield~ 2005-03-02 09:37:48.000000000 +0200 -+++ linux-2.6.11/include/asm-sparc/pgalloc.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-sparc/pgalloc.h.exec-shield~ 2005-03-02 09:37:48.000000000 +0200 ++++ linux-2.6.11/include/asm-sparc/pgalloc.h 2005-03-17 13:52:48.000000000 +0200 @@ -66,4 +66,8 @@ #define pte_free(pte) BTFIXUP_CALL(pte_free)(pte) #define __pte_free_tlb(tlb, pte) pte_free(pte) @@ -1168,52 +1174,8 @@ +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC_PGALLOC_H */ ---- linux-2.6.11/include/asm-i386/desc.h.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/include/asm-i386/desc.h 2005-03-08 10:57:03.000000000 +0200 -@@ -46,9 +46,9 @@ - asm("movl %0,%%cr3": :"r" (cr3)); \ - } while(0) - -+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) - static inline void set_user_cs(struct mm_struct *mm, int cpu) - { --#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) - unsigned long base = mm->context.user_cs_base; - unsigned long limit = mm->context.user_cs_limit; - -@@ -70,8 +70,8 @@ - pax_close_kernel(flags, cr3); - #endif - --#endif - } -+#endif - - struct Xgt_desc_struct { - unsigned short size; -@@ -226,6 +226,20 @@ - put_cpu(); - } - -+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) -+{ -+ limit = (limit - 1) / PAGE_SIZE; -+ desc->a = limit & 0xffff; -+ desc->b = (limit & 0xf0000) | 0x00c0fb00; -+} -+ -+#define load_user_cs_desc(cpu, mm) \ -+ cpu_gdt_table[cpu][GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs -+ -+extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); -+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); -+extern void arch_flush_exec_range(struct mm_struct *mm); -+ - #endif /* !__ASSEMBLY__ */ - - #endif ---- linux-2.6.11/include/asm-i386/elf.h.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/include/asm-i386/elf.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-i386/elf.h.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/include/asm-i386/elf.h 2005-03-17 13:52:48.000000000 +0200 @@ -9,6 +9,7 @@ #include #include @@ -1305,8 +1267,52 @@ +extern void map_vsyscall(void); + #endif ---- linux-2.6.11/include/asm-i386/mmu.h.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/include/asm-i386/mmu.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-i386/desc.h.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/include/asm-i386/desc.h 2005-03-17 13:52:48.000000000 +0200 +@@ -46,9 +46,9 @@ + asm("movl %0,%%cr3": :"r" (cr3)); \ + } while(0) + ++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) + static inline void set_user_cs(struct mm_struct *mm, int cpu) + { +-#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) + unsigned long base = mm->context.user_cs_base; + unsigned long limit = mm->context.user_cs_limit; + +@@ -70,8 +70,8 @@ + pax_close_kernel(flags, cr3); + #endif + +-#endif + } ++#endif + + struct Xgt_desc_struct { + unsigned short size; +@@ -226,6 +226,20 @@ + put_cpu(); + } + ++static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) ++{ ++ limit = (limit - 1) / PAGE_SIZE; ++ desc->a = limit & 0xffff; ++ desc->b = (limit & 0xf0000) | 0x00c0fb00; ++} ++ ++#define load_user_cs_desc(cpu, mm) \ ++ cpu_gdt_table[cpu][GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs ++ ++extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); ++extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); ++extern void arch_flush_exec_range(struct mm_struct *mm); ++ + #endif /* !__ASSEMBLY__ */ + + #endif +--- linux-2.6.11/include/asm-i386/mmu.h.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/include/asm-i386/mmu.h 2005-03-17 13:52:48.000000000 +0200 @@ -7,12 +7,19 @@ * we put the segment information here. * @@ -1327,8 +1333,8 @@ #if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) unsigned long user_cs_base; unsigned long user_cs_limit; ---- linux-2.6.11/include/asm-i386/pgalloc.h.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/include/asm-i386/pgalloc.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-i386/pgalloc.h.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/include/asm-i386/pgalloc.h 2005-03-17 13:52:48.000000000 +0200 @@ -4,6 +4,7 @@ #include #include @@ -1337,18 +1343,8 @@ #include #include /* for struct page */ ---- linux-2.6.11/include/asm-i386/thread_info.h.shield~ 2005-03-02 09:37:48.000000000 +0200 -+++ linux-2.6.11/include/asm-i386/thread_info.h 2005-03-08 10:57:03.000000000 +0200 -@@ -38,6 +38,7 @@ - 0-0xBFFFFFFF for user-thead - 0-0xFFFFFFFF for kernel-thread - */ -+ void *sysenter_return; - struct restart_block restart_block; - - unsigned long previous_esp; /* ESP of the previous stack in case ---- linux-2.6.11/include/asm-i386/mmu_context.h.shield~ 2005-03-08 11:08:05.000000000 +0200 -+++ linux-2.6.11/include/asm-i386/mmu_context.h 2005-03-08 11:04:56.000000000 +0200 +--- linux-2.6.11/include/asm-i386/mmu_context.h.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/include/asm-i386/mmu_context.h 2005-03-17 13:52:48.000000000 +0200 @@ -52,7 +52,9 @@ cpu_set(cpu, next->context.cpu_user_cs_mask); #endif @@ -1359,8 +1355,8 @@ } #ifdef CONFIG_SMP else { ---- linux-2.6.11/include/asm-i386/processor.h.shield~ 2005-03-08 10:56:43.000000000 +0200 -+++ linux-2.6.11/include/asm-i386/processor.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-i386/processor.h.exec-shield~ 2005-03-17 13:52:48.000000000 +0200 ++++ linux-2.6.11/include/asm-i386/processor.h 2005-03-17 13:52:48.000000000 +0200 @@ -318,7 +318,9 @@ #elif defined(CONFIG_PAX_SEGMEXEC) #define TASK_UNMAPPED_BASE (PAGE_ALIGN((current->mm->flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3 : TASK_SIZE/3)) @@ -1380,8 +1376,18 @@ } while (0) /* Forward declaration, a strange C thing */ ---- linux-2.6.11/include/asm-ia64/pgalloc.h.shield~ 2005-03-02 09:37:31.000000000 +0200 -+++ linux-2.6.11/include/asm-ia64/pgalloc.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-i386/thread_info.h.exec-shield~ 2005-03-02 09:37:48.000000000 +0200 ++++ linux-2.6.11/include/asm-i386/thread_info.h 2005-03-17 13:52:48.000000000 +0200 +@@ -38,6 +38,7 @@ + 0-0xBFFFFFFF for user-thead + 0-0xFFFFFFFF for kernel-thread + */ ++ void *sysenter_return; + struct restart_block restart_block; + + unsigned long previous_esp; /* ESP of the previous stack in case +--- linux-2.6.11/include/asm-ia64/pgalloc.h.exec-shield~ 2005-03-02 09:37:31.000000000 +0200 ++++ linux-2.6.11/include/asm-ia64/pgalloc.h 2005-03-17 13:52:48.000000000 +0200 @@ -23,6 +23,10 @@ #include #include @@ -1393,8 +1399,8 @@ /* * Very stupidly, we used to get new pgd's and pmd's, init their contents * to point to the NULL versions of the next level page table, later on ---- linux-2.6.11/include/asm-s390/pgalloc.h.shield~ 2005-03-02 09:38:12.000000000 +0200 -+++ linux-2.6.11/include/asm-s390/pgalloc.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-s390/pgalloc.h.exec-shield~ 2005-03-02 09:38:12.000000000 +0200 ++++ linux-2.6.11/include/asm-s390/pgalloc.h 2005-03-17 13:52:48.000000000 +0200 @@ -19,6 +19,10 @@ #include #include @@ -1406,8 +1412,8 @@ #define check_pgt_cache() do {} while (0) extern void diag10(unsigned long addr); ---- linux-2.6.11/include/asm-ppc/pgalloc.h.shield~ 2005-03-02 09:38:34.000000000 +0200 -+++ linux-2.6.11/include/asm-ppc/pgalloc.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-ppc/pgalloc.h.exec-shield~ 2005-03-02 09:38:34.000000000 +0200 ++++ linux-2.6.11/include/asm-ppc/pgalloc.h 2005-03-17 13:52:48.000000000 +0200 @@ -40,5 +40,10 @@ #define check_pgt_cache() do { } while (0) @@ -1419,8 +1425,8 @@ + #endif /* _PPC_PGALLOC_H */ #endif /* __KERNEL__ */ ---- linux-2.6.11/include/asm-sparc64/pgalloc.h.shield~ 2005-03-02 09:38:26.000000000 +0200 -+++ linux-2.6.11/include/asm-sparc64/pgalloc.h 2005-03-08 10:57:03.000000000 +0200 +--- linux-2.6.11/include/asm-sparc64/pgalloc.h.exec-shield~ 2005-03-02 09:38:26.000000000 +0200 ++++ linux-2.6.11/include/asm-sparc64/pgalloc.h 2005-03-17 13:52:48.000000000 +0200 @@ -260,4 +260,8 @@ #define pgd_free(pgd) free_pgd_fast(pgd) #define pgd_alloc(mm) get_pgd_fast() From svn at tinysofa.org Thu Mar 17 13:19:24 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 17 Mar 2005 08:19:24 -0500 (EST) Subject: [tinysofa-svn] r6184 - tinysofa/releases/classic/2.0/kernel/current/sources Message-ID: <20050317131924.7B1A2344303@minbar.tinysofa.org> Author: jh Date: 2005-03-17 08:19:18 -0500 (Thu, 17 Mar 2005) New Revision: 6184 Modified: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch Log: - remove inccorrect hunk Modified: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch 2005-03-17 12:42:45 UTC (rev 6183) +++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-exec-shield-on-grsec.patch 2005-03-17 13:19:18 UTC (rev 6184) @@ -594,15 +594,6 @@ mm->mmap_base = TASK_UNMAPPED_BASE; #ifdef CONFIG_PAX_RANDMMAP -@@ -84,6 +91,8 @@ - #endif - - mm->get_unmapped_area = arch_get_unmapped_area_topdown; -+ if (current->flags & PF_RELOCEXEC) -+ mm->get_unmapped_exec_area = arch_get_unmapped_exec_area; - mm->unmap_area = arch_unmap_area_topdown; - } - } --- linux-2.6.11/arch/i386/mm/init.c.exec-shield~ 2005-03-17 13:52:42.000000000 +0200 +++ linux-2.6.11/arch/i386/mm/init.c 2005-03-17 13:52:48.000000000 +0200 @@ -383,7 +383,7 @@ From svn at tinysofa.org Thu Mar 17 19:20:05 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 17 Mar 2005 14:20:05 -0500 (EST) Subject: [tinysofa-svn] r6185 - in contrib/1.2/sqlite3/current: sources specs Message-ID: <20050317192005.A22773458A2@minbar.tinysofa.org> Author: gda Date: 2005-03-17 14:19:25 -0500 (Thu, 17 Mar 2005) New Revision: 6185 Added: contrib/1.2/sqlite3/current/sources/sqlite-3.1.6.tar.gz Removed: contrib/1.2/sqlite3/current/sources/sqlite-3.1.3-makefile.in.patch contrib/1.2/sqlite3/current/sources/sqlite-3.1.5.tar.gz Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec Log: 3.1.6 Deleted: contrib/1.2/sqlite3/current/sources/sqlite-3.1.3-makefile.in.patch =================================================================== --- contrib/1.2/sqlite3/current/sources/sqlite-3.1.3-makefile.in.patch 2005-03-17 13:19:18 UTC (rev 6184) +++ contrib/1.2/sqlite3/current/sources/sqlite-3.1.3-makefile.in.patch 2005-03-17 19:19:25 UTC (rev 6185) @@ -1,12 +0,0 @@ ---- sqlite-3.1.3/Makefile.in.orig 2005-03-07 22:56:04.833954328 +0100 -+++ sqlite-3.1.3/Makefile.in 2005-03-07 22:56:41.189427456 +0100 -@@ -451,6 +451,9 @@ - arch.html: $(TOP)/www/arch.tcl - tclsh $(TOP)/www/arch.tcl >arch.html - -+arch.png: $(TOP)/www/arch.png -+ cp $(TOP)/www/arch.png . -+ - arch2.gif: $(TOP)/www/arch2.gif - cp $(TOP)/www/arch2.gif . - Deleted: contrib/1.2/sqlite3/current/sources/sqlite-3.1.5.tar.gz =================================================================== (Binary files differ) Added: contrib/1.2/sqlite3/current/sources/sqlite-3.1.6.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.2/sqlite3/current/sources/sqlite-3.1.6.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec =================================================================== --- contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-17 13:19:18 UTC (rev 6184) +++ contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-17 19:19:25 UTC (rev 6185) @@ -1,11 +1,10 @@ Summary: SQLite is a C library that implements an embeddable SQL database engine Name: sqlite3 -Version: 3.1.5 +Version: 3.1.6 Release: 1gd License: GPL Group: contrib Source: http://www.sqlite.org/sqlite-%{version}.tar.gz -Patch: sqlite-3.1.3-makefile.in.patch URL: http://www.sqlite.org/ BuildRoot: %{_tmppath}/%{name}-root BuildRequires: tcl, tcl-devel, gcc-c++ @@ -29,7 +28,6 @@ %prep %setup -q -n sqlite-%{version} -%patch -p1 %build CFLAGS="%optflags -DNDEBUG=1" CXXFLAGS="%optflags -DNDEBUG=1" %configure --enable-utf8 --enable-incore-db --disable-tcl @@ -60,6 +58,9 @@ %doc README doc/* %changelog +* Thu Mar 17 2005 Gerald Dachs 3.1.6-1gd +- 3.1.6 + * Fri Mar 11 2005 Gerald Dachs 3.1.5-1gd - 3.1.5 From svn at tinysofa.org Fri Mar 18 14:48:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 18 Mar 2005 09:48:18 -0500 (EST) Subject: [tinysofa-svn] r6186 - contrib/1.2/subversion/current/specs Message-ID: <20050318144818.3FD9F34557E@minbar.tinysofa.org> Author: gda Date: 2005-03-18 09:48:12 -0500 (Fri, 18 Mar 2005) New Revision: 6186 Modified: contrib/1.2/subversion/current/specs/subversion.spec Log: helped subversion to find the pcre headers Modified: contrib/1.2/subversion/current/specs/subversion.spec =================================================================== --- contrib/1.2/subversion/current/specs/subversion.spec 2005-03-17 19:19:25 UTC (rev 6185) +++ contrib/1.2/subversion/current/specs/subversion.spec 2005-03-18 14:48:12 UTC (rev 6186) @@ -4,7 +4,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.1.1 -Release: 1jh +Release: 2gd License: BSD Group: contrib URL: http://subversion.tigris.org/ @@ -86,7 +86,7 @@ # fix shebang lines, #111498 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in -export CC=gcc CXX=g++ +export CC=gcc CXX=g++ CFLAGS=-I/usr/include/pcre %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --with-swig --with-neon=%{_prefix} \ --with-apxs=%{_sbindir}/apxs --disable-mod-activation @@ -189,6 +189,9 @@ %{_mandir}/man*/*::* %changelog +* Fri Mar 18 2005 Gerald Dachs 1.1.1-2gd +- let subversion find the pcre headers + * Mon Oct 25 2004 Joe Orton 1.1.1-2 - update to 1.1.1 - update -pie patch to address #134786 From svn at tinysofa.org Sat Mar 19 18:31:23 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 19 Mar 2005 13:31:23 -0500 (EST) Subject: [tinysofa-svn] r6188 - in tinysofa/releases/classic/2.0/kernel/current: sources specs Message-ID: <20050319183123.9F0E6344384@minbar.tinysofa.org> Author: jh Date: 2005-03-19 13:30:28 -0500 (Sat, 19 Mar 2005) New Revision: 6188 Added: tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.5.patch tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-compile.patch Removed: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-route-crash.patch Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec Log: - add security fixes from 2.6.11.5 - add linux-2.6.11-compile.patch from Fedora Added: tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.5.patch =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.5.patch 2005-03-18 16:06:05 UTC (rev 6187) +++ tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.5.patch 2005-03-19 18:30:28 UTC (rev 6188) @@ -0,0 +1,160 @@ +diff -Nru a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c +--- a/drivers/net/amd8111e.c 2005-03-18 22:35:14 -08:00 ++++ b/drivers/net/amd8111e.c 2005-03-18 22:35:14 -08:00 +@@ -1381,6 +1381,8 @@ + + if(amd8111e_restart(dev)){ + spin_unlock_irq(&lp->lock); ++ if (dev->irq) ++ free_irq(dev->irq, dev); + return -ENOMEM; + } + /* Start ipg timer */ +diff -Nru a/drivers/net/tun.c b/drivers/net/tun.c +--- a/drivers/net/tun.c 2005-03-18 22:35:14 -08:00 ++++ b/drivers/net/tun.c 2005-03-18 22:35:14 -08:00 +@@ -229,7 +229,7 @@ + size_t len = count; + + if (!(tun->flags & TUN_NO_PI)) { +- if ((len -= sizeof(pi)) > len) ++ if ((len -= sizeof(pi)) > count) + return -EINVAL; + + if(memcpy_fromiovec((void *)&pi, iv, sizeof(pi))) +diff -Nru a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c +--- a/drivers/net/via-rhine.c 2005-03-18 22:35:14 -08:00 ++++ b/drivers/net/via-rhine.c 2005-03-18 22:35:14 -08:00 +@@ -1197,8 +1197,10 @@ + dev->name, rp->pdev->irq); + + rc = alloc_ring(dev); +- if (rc) ++ if (rc) { ++ free_irq(rp->pdev->irq, dev); + return rc; ++ } + alloc_rbufs(dev); + alloc_tbufs(dev); + rhine_chip_reset(dev); +diff -Nru a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c +--- a/drivers/net/wan/hd6457x.c 2005-03-18 22:35:14 -08:00 ++++ b/drivers/net/wan/hd6457x.c 2005-03-18 22:35:14 -08:00 +@@ -315,7 +315,7 @@ + #endif + stats->rx_packets++; + stats->rx_bytes += skb->len; +- skb->dev->last_rx = jiffies; ++ dev->last_rx = jiffies; + skb->protocol = hdlc_type_trans(skb, dev); + netif_rx(skb); + } +diff -Nru a/kernel/signal.c b/kernel/signal.c +--- a/kernel/signal.c 2005-03-18 22:35:14 -08:00 ++++ b/kernel/signal.c 2005-03-18 22:35:14 -08:00 +@@ -1728,6 +1728,7 @@ + * with another processor delivering a stop signal, + * then the SIGCONT that wakes us up should clear it. + */ ++ read_unlock(&tasklist_lock); + return 0; + } + +diff -Nru a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c +--- a/net/ipv4/fib_hash.c 2005-03-18 22:35:14 -08:00 ++++ b/net/ipv4/fib_hash.c 2005-03-18 22:35:14 -08:00 +@@ -919,13 +919,23 @@ + return fa; + } + ++static struct fib_alias *fib_get_idx(struct seq_file *seq, loff_t pos) ++{ ++ struct fib_alias *fa = fib_get_first(seq); ++ ++ if (fa) ++ while (pos && (fa = fib_get_next(seq))) ++ --pos; ++ return pos ? NULL : fa; ++} ++ + static void *fib_seq_start(struct seq_file *seq, loff_t *pos) + { + void *v = NULL; + + read_lock(&fib_hash_lock); + if (ip_fib_main_table) +- v = *pos ? fib_get_next(seq) : SEQ_START_TOKEN; ++ v = *pos ? fib_get_idx(seq, *pos - 1) : SEQ_START_TOKEN; + return v; + } + +diff -Nru a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c +--- a/net/xfrm/xfrm_state.c 2005-03-18 22:35:14 -08:00 ++++ b/net/xfrm/xfrm_state.c 2005-03-18 22:35:14 -08:00 +@@ -609,7 +609,7 @@ + + for (i = 0; i < XFRM_DST_HSIZE; i++) { + list_for_each_entry(x, xfrm_state_bydst+i, bydst) { +- if (x->km.seq == seq) { ++ if (x->km.seq == seq && x->km.state == XFRM_STATE_ACQ) { + xfrm_state_hold(x); + return x; + } +diff -Nru a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c +--- a/sound/pci/ac97/ac97_codec.c 2005-03-18 22:35:14 -08:00 ++++ b/sound/pci/ac97/ac97_codec.c 2005-03-18 22:35:14 -08:00 +@@ -1185,7 +1185,7 @@ + /* + * create mute switch(es) for normal stereo controls + */ +-static int snd_ac97_cmute_new(snd_card_t *card, char *name, int reg, ac97_t *ac97) ++static int snd_ac97_cmute_new_stereo(snd_card_t *card, char *name, int reg, int check_stereo, ac97_t *ac97) + { + snd_kcontrol_t *kctl; + int err; +@@ -1196,7 +1196,7 @@ + + mute_mask = 0x8000; + val = snd_ac97_read(ac97, reg); +- if (ac97->flags & AC97_STEREO_MUTES) { ++ if (check_stereo || (ac97->flags & AC97_STEREO_MUTES)) { + /* check whether both mute bits work */ + val1 = val | 0x8080; + snd_ac97_write(ac97, reg, val1); +@@ -1254,7 +1254,7 @@ + /* + * create a mute-switch and a volume for normal stereo/mono controls + */ +-static int snd_ac97_cmix_new(snd_card_t *card, const char *pfx, int reg, ac97_t *ac97) ++static int snd_ac97_cmix_new_stereo(snd_card_t *card, const char *pfx, int reg, int check_stereo, ac97_t *ac97) + { + int err; + char name[44]; +@@ -1265,7 +1265,7 @@ + + if (snd_ac97_try_bit(ac97, reg, 15)) { + sprintf(name, "%s Switch", pfx); +- if ((err = snd_ac97_cmute_new(card, name, reg, ac97)) < 0) ++ if ((err = snd_ac97_cmute_new_stereo(card, name, reg, check_stereo, ac97)) < 0) + return err; + } + check_volume_resolution(ac97, reg, &lo_max, &hi_max); +@@ -1277,6 +1277,8 @@ + return 0; + } + ++#define snd_ac97_cmix_new(card, pfx, reg, ac97) snd_ac97_cmix_new_stereo(card, pfx, reg, 0, ac97) ++#define snd_ac97_cmute_new(card, name, reg, ac97) snd_ac97_cmute_new_stereo(card, name, reg, 0, ac97) + + static unsigned int snd_ac97_determine_spdif_rates(ac97_t *ac97); + +@@ -1327,7 +1329,8 @@ + + /* build surround controls */ + if (snd_ac97_try_volume_mix(ac97, AC97_SURROUND_MASTER)) { +- if ((err = snd_ac97_cmix_new(card, "Surround Playback", AC97_SURROUND_MASTER, ac97)) < 0) ++ /* Surround Master (0x38) is with stereo mutes */ ++ if ((err = snd_ac97_cmix_new_stereo(card, "Surround Playback", AC97_SURROUND_MASTER, 1, ac97)) < 0) + return err; + } + Added: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-compile.patch =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-compile.patch 2005-03-18 16:06:05 UTC (rev 6187) +++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-compile.patch 2005-03-19 18:30:28 UTC (rev 6188) @@ -0,0 +1,371 @@ +diff -urNp linux-1130/arch/x86_64/ia32/sys_ia32.c linux-10000/arch/x86_64/ia32/sys_ia32.c +--- linux-1130/arch/x86_64/ia32/sys_ia32.c ++++ linux-10000/arch/x86_64/ia32/sys_ia32.c +@@ -1355,4 +1355,3 @@ static int __init ia32_init (void) + __initcall(ia32_init); + + extern unsigned long ia32_sys_call_table[]; +-EXPORT_SYMBOL(ia32_sys_call_table); + if (ei->type == E820_RAM) { +diff -urNp linux-1130/drivers/acpi/ec.c linux-10000/drivers/acpi/ec.c +--- linux-1130/drivers/acpi/ec.c ++++ linux-10000/drivers/acpi/ec.c +@@ -600,7 +600,7 @@ acpi_ec_add ( + + acpi_remove_gpe_handler(NULL, ec_ecdt->gpe_bit, &acpi_ec_gpe_handler); + +- kfree(ec_ecdt); ++// kfree(ec_ecdt); + } + + /* Get GPE bit assignment (EC events). */ +--- linux-2.6.9/drivers/net/acenic.c~ 2004-12-24 01:59:02.420451656 -0500 ++++ linux-2.6.9/drivers/net/acenic.c 2004-12-24 01:59:20.755664280 -0500 +@@ -443,7 +443,7 @@ MODULE_PARM_DESC(max_rx_desc, "AceNIC/3C + MODULE_PARM_DESC(tx_ratio, "AceNIC/3C985/GA620 ratio of NIC memory used for TX/RX descriptors (range 0-63)"); + + +-static char version[] __devinitdata = ++static char version[] = + "acenic.c: v0.92 08/05/2002 Jes Sorensen, linux-acenic at SunSITE.dk\n" + " http://home.cern.ch/~jes/gige/acenic.html\n"; + +diff -urNp linux-1130/drivers/pci/search.c linux-10000/drivers/pci/search.c +--- linux-1130/drivers/pci/search.c ++++ linux-10000/drivers/pci/search.c +@@ -164,7 +164,7 @@ pci_find_subsys(unsigned int vendor, uns + struct list_head *n; + struct pci_dev *dev; + +- WARN_ON(in_interrupt()); ++ BUG_ON(in_interrupt()); + spin_lock(&pci_bus_lock); + n = from ? from->global_list.next : pci_devices.next; + +diff -urNp linux-1130/drivers/usb/storage/scsiglue.c linux-10000/drivers/usb/storage/scsiglue.c +--- linux-1130/drivers/usb/storage/scsiglue.c ++++ linux-10000/drivers/usb/storage/scsiglue.c +@@ -398,7 +398,7 @@ struct scsi_host_template usb_stor_host_ + .sg_tablesize = SG_ALL, + + /* limit the total size of a transfer to 120 KB */ +- .max_sectors = 240, ++ .max_sectors = 256, + + /* merge commands... this seems to help performance, but + * periodically someone should test to see which setting is more +diff -urNp linux-1130/fs/open.c linux-10000/fs/open.c +--- linux-1130/fs/open.c ++++ linux-10000/fs/open.c +@@ -967,7 +967,6 @@ out_error: + fd = error; + goto out; + } +-EXPORT_SYMBOL_GPL(sys_open); + + #ifndef __alpha__ + +diff -urNp linux-1130/fs/proc/generic.c linux-10000/fs/proc/generic.c +--- linux-1130/fs/proc/generic.c ++++ linux-10000/fs/proc/generic.c +@@ -675,7 +675,7 @@ void remove_proc_entry(const char *name, + parent->nlink--; + proc_kill_inodes(de); + de->nlink = 0; +- WARN_ON(de->subdir); ++ BUG_ON(de->subdir); + if (!atomic_read(&de->count)) + free_proc_entry(de); + else { +diff -urNp linux-1130/include/linux/config.h linux-10000/include/linux/config.h +--- linux-1130/include/linux/config.h ++++ linux-10000/include/linux/config.h +@@ -2,5 +2,7 @@ + #define _LINUX_CONFIG_H + + #include +- ++#ifndef __KERNEL__ ++#error including kernel header in userspace; use the glibc headers instead! ++#endif + #endif +diff -urNp linux-1130/include/linux/delay.h linux-10000/include/linux/delay.h +--- linux-1130/include/linux/delay.h ++++ linux-10000/include/linux/delay.h +@@ -10,7 +10,7 @@ + extern unsigned long loops_per_jiffy; + + #include +- ++#include + /* + * Using udelay() for intervals greater than a few milliseconds can + * risk overflow for high loops_per_jiffy (high bogomips) machines. The +@@ -25,14 +25,13 @@ extern unsigned long loops_per_jiffy; + #define MAX_UDELAY_MS 5 + #endif + +-#ifdef notdef +-#define mdelay(n) (\ +- {unsigned long __ms=(n); while (__ms--) udelay(1000);}) +-#else +-#define mdelay(n) (\ +- (__builtin_constant_p(n) && (n)<=MAX_UDELAY_MS) ? udelay((n)*1000) : \ +- ({unsigned long __ms=(n); while (__ms--) udelay(1000);})) +-#endif ++#define mdelay(n) ( \ ++ { \ ++ static int warned=0; \ ++ unsigned long __ms=(n); \ ++ WARN_ON(in_irq() && !(warned++)); \ ++ while (__ms--) udelay(1000); \ ++ }) + + #ifndef ndelay + #define ndelay(x) udelay(((x)+999)/1000) +diff -urNp linux-1130/include/linux/gfp.h linux-10000/include/linux/gfp.h +--- linux-1130/include/linux/gfp.h ++++ linux-10000/include/linux/gfp.h +@@ -46,7 +46,7 @@ struct vm_area_struct; + __GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \ + __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP) + +-#define GFP_ATOMIC (__GFP_HIGH) ++#define GFP_ATOMIC (__GFP_HIGH | __GFP_NOWARN) + #define GFP_NOIO (__GFP_WAIT) + #define GFP_NOFS (__GFP_WAIT | __GFP_IO) + #define GFP_KERNEL (__GFP_WAIT | __GFP_IO | __GFP_FS) +diff -urNp linux-1130/init/Kconfig linux-10000/init/Kconfig +--- linux-1130/init/Kconfig ++++ linux-10000/init/Kconfig +@@ -264,7 +264,7 @@ config EPOLL + source "drivers/block/Kconfig.iosched" + + config CC_OPTIMIZE_FOR_SIZE +- bool "Optimize for size" if EMBEDDED ++ bool "Optimize for size" + default y if ARM || H8300 + default n + help +--- linux-2.6.6/drivers/net/3c59x.c~ 2004-06-11 17:44:15.678397999 +0200 ++++ linux-2.6.6/drivers/net/3c59x.c 2004-06-11 17:44:15.679397880 +0200 +@@ -1789,7 +1789,7 @@ + struct net_device *dev = (struct net_device *)data; + struct vortex_private *vp = netdev_priv(dev); + long ioaddr = dev->base_addr; +- int next_tick = 60*HZ; ++ int next_tick = 10*HZ; + int ok = 0; + int media_status, mii_status, old_window; + +diff -purN linux-2.6.7/scripts/reference_discarded.pl linux/scripts/reference_discarded.pl +--- linux-2.6.7/scripts/reference_discarded.pl 2004-06-16 07:19:22.000000000 +0200 ++++ linux/scripts/reference_discarded.pl 2004-06-17 15:06:31.554823071 +0200 +@@ -106,4 +106,4 @@ foreach $object (keys(%object)) { + } + # printf("Done\n"); + +-exit(0); ++exit($errorcount); +diff -purN linux-2.6.7/scripts/reference_init.pl linux/scripts/reference_init.pl +--- linux-2.6.7/scripts/reference_init.pl 2004-06-16 07:19:43.000000000 +0200 ++++ linux/scripts/reference_init.pl 2004-06-17 15:06:10.230376584 +0200 +@@ -90,6 +90,7 @@ foreach $object (sort(keys(%object))) { + if (($line =~ /\.init$/ || $line =~ /\.init\./) && + ($from !~ /\.init$/ && + $from !~ /\.init\./ && ++ $from !~ /\.eh_frame$/ && + $from !~ /\.stab$/ && + $from !~ /\.rodata$/ && + $from !~ /\.text\.lock$/ && +--- linux-2.6.7/drivers/usb/host/ehci-hcd.c~ 2004-06-20 12:05:24.653760319 +0200 ++++ linux-2.6.7/drivers/usb/host/ehci-hcd.c 2004-06-20 12:05:24.653760319 +0200 +@@ -344,6 +344,7 @@ + dbg_hcc_params (ehci, "reset"); + + #ifdef CONFIG_PCI ++ writel(0, &ehci->regs->intr_enable); + /* EHCI 0.96 and later may have "extended capabilities" */ + if (hcd->self.controller->bus == &pci_bus_type) + temp = HCC_EXT_CAPS (readl (&ehci->caps->hcc_params)); +--- linux-2.6.7/init/main.c.acpi 2004-06-28 11:31:10.000000000 -0700 ++++ linux-2.6.7/init/main.c 2004-07-01 13:18:09.556088191 -0700 +@@ -665,7 +665,6 @@ static int init(void * unused) + + fixup_cpu_present_map(); + smp_init(); +- sched_init_smp(); + + /* + * Do this before initcalls, because some drivers want to access +@@ -675,6 +674,8 @@ static int init(void * unused) + + do_basic_setup(); + ++ sched_init_smp(); ++ + /* + * check if there is an early userspace init. If yes, let it do all + * the work +--- linux-2.6.7/kernel/pid.c~ 2004-07-13 10:09:45.303329314 +0200 ++++ linux-2.6.7/kernel/pid.c 2004-07-13 10:09:45.303329314 +0200 +@@ -273,7 +273,7 @@ + int i, j, pidhash_size; + unsigned long megabytes = max_pfn >> (20 - PAGE_SHIFT); + +- pidhash_shift = max(4, fls(megabytes * 4)); ++ pidhash_shift = max(10, fls(megabytes * 4)); + pidhash_shift = min(12, pidhash_shift); + pidhash_size = 1 << pidhash_shift; + +--- linux-2.6.7/include/linux/namei.h~ 2004-07-29 13:24:31.255858922 +0200 ++++ linux-2.6.7/include/linux/namei.h 2004-07-29 13:24:31.256858801 +0200 +@@ -10,7 +10,7 @@ + int create_mode; + }; + +-enum { MAX_NESTED_LINKS = 5 }; ++enum { MAX_NESTED_LINKS = 8 }; + + struct nameidata { + struct dentry *dentry; +--- linux-2.6.7/sound/core/oss/pcm_oss.c.orig 2004-08-04 11:21:32.364458304 -0400 ++++ linux-2.6.7/sound/core/oss/pcm_oss.c 2004-08-04 13:09:08.118034584 -0400 +@@ -1807,6 +1807,13 @@ static int snd_pcm_oss_open(struct inode + snd_pcm_oss_setup_t *psetup = NULL, *csetup = NULL; + int nonblock; + wait_queue_t wait; ++ static char printed_comm[16]; ++ ++ if (strncmp(printed_comm, current->comm, 16)) { ++ printk(KERN_DEBUG "application %s uses obsolete OSS audio interface\n", ++ current->comm); ++ memcpy(printed_comm, current->comm, 16); ++ } + + snd_assert(cardnum >= 0 && cardnum < SNDRV_CARDS, return -ENXIO); + device = SNDRV_MINOR_OSS_DEVICE(minor) == SNDRV_MINOR_OSS_PCM1 ? +--- linux-2.6.7/drivers/scsi/ide-scsi.c~ 2004-08-09 21:30:24.480420957 +0200 ++++ linux-2.6.7/drivers/scsi/ide-scsi.c 2004-08-09 21:30:24.480420957 +0200 +@@ -717,10 +717,16 @@ + .drives = LIST_HEAD_INIT(idescsi_driver.drives), + }; + ++static int ide_scsi_warned; ++ + static int idescsi_ide_open(struct inode *inode, struct file *filp) + { + ide_drive_t *drive = inode->i_bdev->bd_disk->private_data; + drive->usage++; ++ if (!ide_scsi_warned++) { ++ printk(KERN_WARNING "ide-scsi: Warning this device driver is only intended for specialist devices.\n"); ++ printk(KERN_WARNING "ide-scsi: Do not use for cd burning, use /dev/hdX directly instead.\n"); ++ } + return 0; + } + +diff -urNp linux-2.6.8.orig/sound/pci/intel8x0.c linux-2.6.8/sound/pci/intel8x0.c +--- linux-2.6.8.orig/sound/pci/intel8x0.c 2004-08-14 01:37:15.000000000 -0400 ++++ linux-2.6.8/sound/pci/intel8x0.c 2004-08-16 10:45:22.018793582 -0400 +@@ -1823,6 +1823,24 @@ static struct ac97_quirk ac97_quirks[] _ + .type = AC97_TUNE_HP_ONLY + }, + #endif ++ { ++ .vendor = 0x1028, ++ .device = 0x012d, ++ .name = "Dell Precision 450", /* AD1981B*/ ++ .type = AC97_TUNE_HP_ONLY ++ }, ++ { ++ .vendor = 0x103c, ++ .device = 0x3008, ++ .name = "HP xw4200", /* AD1981B*/ ++ .type = AC97_TUNE_HP_ONLY ++ }, ++ { ++ .vendor = 0x103c, ++ .device = 0x12f1, ++ .name = "HP xw8200", /* AD1981B*/ ++ .type = AC97_TUNE_HP_ONLY ++ }, + { } /* terminator */ + }; + +--- linux-2.6.8/scripts/reference_discarded.pl~ 2004-08-18 17:37:24.469640739 +0200 ++++ linux-2.6.8/scripts/reference_discarded.pl 2004-08-18 17:37:24.469640739 +0200 +@@ -88,6 +88,7 @@ + ($from !~ /\.text\.exit$/ && + $from !~ /\.exit\.text$/ && + $from !~ /\.data\.exit$/ && ++ $from !~ /\.opd$/ && + $from !~ /\.exit\.data$/ && + $from !~ /\.altinstructions$/ && + $from !~ /\.debug_info$/ && +--- linux-2.6.8-rc4-mm1/drivers/usb/storage/usb.c 2004-08-16 12:13:06.000000000 -0700 ++++ linux-2.6.8-rc4-mm1-ub/drivers/usb/storage/usb.c 2004-08-18 23:48:09.335107648 -0700 +@@ -285,7 +285,7 @@ static int usb_stor_control_thread(void + */ + daemonize("usb-storage"); + +- current->flags |= PF_NOFREEZE; ++ current->flags |= PF_NOFREEZE|PF_MEMALLOC; + + unlock_kernel(); + +--- linux-2.6.8/arch/i386/kernel/nmi.c~ 2004-08-27 12:43:10.995416336 +0200 ++++ linux-2.6.8/arch/i386/kernel/nmi.c 2004-08-27 12:43:10.995416336 +0200 +@@ -481,7 +481,7 @@ + * wait a few IRQs (5 seconds) before doing the oops ... + */ + alert_counter[cpu]++; +- if (alert_counter[cpu] == 5*nmi_hz) ++ if (alert_counter[cpu] == 30*nmi_hz) + die_nmi(regs, "NMI Watchdog detected LOCKUP"); + } else { + last_irq_sums[cpu] = sum; +--- linux-2.6.8/arch/x86_64/mm/init.c~ 2004-08-27 13:34:47.565301620 +0200 ++++ linux-2.6.8/arch/x86_64/mm/init.c 2004-08-27 13:34:47.565301620 +0200 +@@ -434,8 +434,6 @@ + int tmp; + + #ifdef CONFIG_SWIOTLB +- if (swiotlb_force) +- swiotlb = 1; + if (!iommu_aperture && + (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu)) + swiotlb = 1; +--- linux-2.6.9/arch/ppc64/Makefile~ 2004-12-24 02:09:42.912082128 -0500 ++++ linux-2.6.9/arch/ppc64/Makefile 2004-12-24 02:10:02.289136368 -0500 +@@ -57,7 +57,7 @@ boot := arch/ppc64/boot + bzImage: vmlinux + cp vmlinux arch/ppc64/boot/bzImage + +-boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd ++boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd zImage.stub + boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd + boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm + $(boottarget-y): vmlinux +--- linux-2.6.8/arch/ppc64/boot/Makefile~ 2004-10-12 14:57:52.746516104 -0400 ++++ linux-2.6.8/arch/ppc64/boot/Makefile 2004-10-12 14:59:06.726269472 -0400 +@@ -113,6 +113,9 @@ $(obj)/zImage: obj-boot += $(call obj-se + $(obj)/zImage: $(call obj-sec, $(required)) $(obj-boot) $(obj)/addnote FORCE + $(call if_changed,addnote) + ++$(obj)/zImage.stub: $(obj-boot) FORCE ++ $(BOOTLD) -r $(BOOTLFLAGS) -o $@ $(obj-boot) ++ + $(obj)/zImage.initrd: obj-boot += $(call obj-sec, $(required) $(initrd)) + $(obj)/zImage.initrd: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(obj)/addnote FORCE + $(call if_changed,addnote) +--- linux-2.6.9/drivers/md/raid5.c~ 2004-10-29 00:16:42.000000000 -0400 ++++ linux-2.6.9/drivers/md/raid5.c 2004-10-29 00:17:11.000000000 -0400 +@@ -1329,6 +1329,8 @@ static void raid5_unplug_device(request_ + raid5_conf_t *conf = mddev_to_conf(mddev); + unsigned long flags; + ++ if (!conf) return; ++ + spin_lock_irqsave(&conf->device_lock, flags); + + if (blk_remove_plug(q)) Deleted: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-route-crash.patch =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-route-crash.patch 2005-03-18 16:06:05 UTC (rev 6187) +++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-route-crash.patch 2005-03-19 18:30:28 UTC (rev 6188) @@ -1,42 +0,0 @@ -# This is a BitKeeper generated diff -Nru style patch. -# -# ChangeSet -# 2005/03/09 20:41:46+01:00 kaber at coreworks.de -# [IPV4]: Fix crash while reading /proc/net/route caused by stale pointers -# -# Signed-off-by: Patrick McHardy -# -# net/ipv4/fib_hash.c -# 2005/03/09 20:41:37+01:00 kaber at coreworks.de +11 -1 -# [IPV4]: Fix crash while reading /proc/net/route caused by stale pointers -# -# Signed-off-by: Patrick McHardy -# -diff -Nru a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c ---- a/net/ipv4/fib_hash.c 2005-03-09 20:43:55 +01:00 -+++ b/net/ipv4/fib_hash.c 2005-03-09 20:43:55 +01:00 -@@ -919,13 +919,23 @@ - return fa; - } - -+static struct fib_alias *fib_get_idx(struct seq_file *seq, loff_t pos) -+{ -+ struct fib_alias *fa = fib_get_first(seq); -+ -+ if (fa) -+ while (pos && (fa = fib_get_next(seq))) -+ --pos; -+ return pos ? NULL : fa; -+} -+ - static void *fib_seq_start(struct seq_file *seq, loff_t *pos) - { - void *v = NULL; - - read_lock(&fib_hash_lock); - if (ip_fib_main_table) -- v = *pos ? fib_get_next(seq) : SEQ_START_TOKEN; -+ v = *pos ? fib_get_idx(seq, *pos - 1) : SEQ_START_TOKEN; - return v; - } - Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec 2005-03-18 16:06:05 UTC (rev 6187) +++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec 2005-03-19 18:30:28 UTC (rev 6188) @@ -46,7 +46,7 @@ Group: main License: GPLv2 Version: %{rpmversion} -Release: 6jh +Release: 7jh ExclusiveArch: noarch %{all_x86} x86_64 ExclusiveOS: Linux Provides: kernel = %{version} @@ -82,10 +82,11 @@ Patch2: patch-2.6.11-ac3 Patch3: patch-2.6.11.4-security.patch +Patch4: 2.6.11.5.patch -Patch100: linux-2.6.11-route-crash.patch Patch101: linux-2.6.11-epoll.patch Patch102: linux-2.6.11-load_elf_binary-kfree-fix.patch +Patch103: linux-2.6.11-compile.patch Patch20020: linux-2.6.8-tinysofa-syslog.patch @@ -225,10 +226,11 @@ %patch1 -p1 -b .exec-shield~ %patch2 -p1 -b .ac~ %patch3 -p1 +%patch4 -p1 -%patch100 -p1 -b .route-crash~ %patch101 -p1 -b .epoll~ %patch102 -p1 -b .load_elf_binary-kfree-fix~ +%patch103 -p1 -b .compile~ %patch20020 -p1 -b .tinysofa-syslog~ From svn at tinysofa.org Sun Mar 20 17:50:48 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 20 Mar 2005 12:50:48 -0500 (EST) Subject: [tinysofa-svn] r6189 - contrib/1.2/firefox/current/specs Message-ID: <20050320175048.6C30F345566@minbar.tinysofa.org> Author: jh Date: 2005-03-20 12:50:42 -0500 (Sun, 20 Mar 2005) New Revision: 6189 Modified: contrib/1.2/firefox/current/specs/firefox.spec Log: - kerberos5 -> krb5 Modified: contrib/1.2/firefox/current/specs/firefox.spec =================================================================== --- contrib/1.2/firefox/current/specs/firefox.spec 2005-03-19 18:30:28 UTC (rev 6188) +++ contrib/1.2/firefox/current/specs/firefox.spec 2005-03-20 17:50:42 UTC (rev 6189) @@ -30,7 +30,7 @@ BuildRequires: xorg-x11-devel, zlib-devel, zip, unzip BuildRequires: libpng-devel, libjpeg-devel -BuildRequires: gcc-c++, kerberos5-devel +BuildRequires: gcc-c++, krb5-devel BuildRequires: libidl-devel BuildRequires: openssl-devel Requires: xorg-x11-libs, openssl, freetype From svn at tinysofa.org Sun Mar 20 18:13:55 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 20 Mar 2005 13:13:55 -0500 (EST) Subject: [tinysofa-svn] r6190 - contrib/1.2/subversion/current/specs Message-ID: <20050320181355.F313A344C50@minbar.tinysofa.org> Author: jh Date: 2005-03-20 13:13:50 -0500 (Sun, 20 Mar 2005) New Revision: 6190 Modified: contrib/1.2/subversion/current/specs/subversion.spec Log: - fix cflags Modified: contrib/1.2/subversion/current/specs/subversion.spec =================================================================== --- contrib/1.2/subversion/current/specs/subversion.spec 2005-03-20 17:50:42 UTC (rev 6189) +++ contrib/1.2/subversion/current/specs/subversion.spec 2005-03-20 18:13:50 UTC (rev 6190) @@ -86,7 +86,7 @@ # fix shebang lines, #111498 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in -export CC=gcc CXX=g++ CFLAGS=-I/usr/include/pcre +export CC=gcc CXX=g++ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/pcre" %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --with-swig --with-neon=%{_prefix} \ --with-apxs=%{_sbindir}/apxs --disable-mod-activation From svn at tinysofa.org Sun Mar 20 19:34:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 20 Mar 2005 14:34:38 -0500 (EST) Subject: [tinysofa-svn] r6191 - contrib/1.2/firefox/current/specs Message-ID: <20050320193438.9312B3451CF@minbar.tinysofa.org> Author: jh Date: 2005-03-20 14:34:32 -0500 (Sun, 20 Mar 2005) New Revision: 6191 Modified: contrib/1.2/firefox/current/specs/firefox.spec Log: - fix bookmarks installation Modified: contrib/1.2/firefox/current/specs/firefox.spec =================================================================== --- contrib/1.2/firefox/current/specs/firefox.spec 2005-03-20 18:13:50 UTC (rev 6190) +++ contrib/1.2/firefox/current/specs/firefox.spec 2005-03-20 19:34:32 UTC (rev 6191) @@ -183,6 +183,9 @@ %{__install} -d -m0755 %{buildroot}%{_libdir} %{__tar} -xvz -C %{buildroot}%{_libdir} -f dist/firefox-*-linux-gnu.tar.gz +%{__rm} -f \ + %{buildroot}%{_libdir}/firefox/defaults/profile/bookmarks.html \ + %{buildroot}%{_libdir}/firefox/defaults/profile/US/bookmarks.html %{__install} -D -m0644 %{SOURCE3} %{buildroot}%{_libdir}/firefox/defaults/profile/bookmarks.html %{__install} -D -m0644 %{SOURCE3} %{buildroot}%{_libdir}/firefox/defaults/profile/US/bookmarks.html %{__install} -D -m0644 %{SOURCE4} %{buildroot}%{_libdir}/firefox/chrome/icons/default/default.xpm From svn at tinysofa.org Mon Mar 21 20:06:53 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 21 Mar 2005 15:06:53 -0500 (EST) Subject: [tinysofa-svn] r6193 - in contrib/1.2/firefox/current: sources specs Message-ID: <20050321200653.86AB0344429@minbar.tinysofa.org> Author: gda Date: 2005-03-21 14:54:59 -0500 (Mon, 21 Mar 2005) New Revision: 6193 Added: contrib/1.2/firefox/current/sources/firefox-1.0.1-source.tar.bz2 Removed: contrib/1.2/firefox/current/sources/firefox-1.0-source.tar.bz2 Modified: contrib/1.2/firefox/current/specs/firefox.spec Log: 1.0.1 Deleted: contrib/1.2/firefox/current/sources/firefox-1.0-source.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.2/firefox/current/sources/firefox-1.0.1-source.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.2/firefox/current/sources/firefox-1.0.1-source.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.2/firefox/current/specs/firefox.spec =================================================================== --- contrib/1.2/firefox/current/specs/firefox.spec 2005-03-21 18:41:45 UTC (rev 6192) +++ contrib/1.2/firefox/current/specs/firefox.spec 2005-03-21 19:54:59 UTC (rev 6193) @@ -9,8 +9,8 @@ Summary: Mozilla Firefox web browser Name: firefox -Version: 1.0 -Release: 2gd +Version: 1.0.1 +Release: 1gd License: MPL/LGPL Group: contrib URL: http://www.mozilla.org/projects/firefox/ @@ -248,6 +248,9 @@ %endif %changelog +* Mon Mar 21 2005 Gerald Dachs 1.0.1-1gd +- 1.0.1 + * Mon Feb 14 2005 Gerald Dachs 1.0-2gd - patches for bsd tar From svn at tinysofa.org Tue Mar 22 05:52:47 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 22 Mar 2005 00:52:47 -0500 (EST) Subject: [tinysofa-svn] r6194 - contrib/1.2 Message-ID: <20050322055247.31F1C344410@minbar.tinysofa.org> Author: jh Date: 2005-03-22 00:52:37 -0500 (Tue, 22 Mar 2005) New Revision: 6194 Added: contrib/1.2/mach/ Log: - copy mach from 1.1 Copied: contrib/1.2/mach (from rev 6193, contrib/1.1/mach) From svn at tinysofa.org Tue Mar 22 06:00:37 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 22 Mar 2005 01:00:37 -0500 (EST) Subject: [tinysofa-svn] r6195 - in contrib/1.2/mach/current: sources specs Message-ID: <20050322060037.DF3653443D7@minbar.tinysofa.org> Author: jh Date: 2005-03-22 01:00:29 -0500 (Tue, 22 Mar 2005) New Revision: 6195 Modified: contrib/1.2/mach/current/sources/ts-classic-2.0 contrib/1.2/mach/current/specs/mach.spec Log: - add configuration for tcs 2.0 contrib Modified: contrib/1.2/mach/current/sources/ts-classic-2.0 =================================================================== --- contrib/1.2/mach/current/sources/ts-classic-2.0 2005-03-22 05:52:37 UTC (rev 6194) +++ contrib/1.2/mach/current/sources/ts-classic-2.0 2005-03-22 06:00:29 UTC (rev 6195) @@ -10,6 +10,7 @@ ### aptsources['ts-classic-2.0'] = { 'os': 'rpm file:///mnt/cdrom tinysofa all', + 'contrib': 'rpm file:///mnt/cdrom tinysofa contrib', } # @@ -28,3 +29,9 @@ config['ts-classic-2.0'] = {} aliases['ts-classic-2.0'] = ('tsc20', 'tsc-2.0', ) +packages['ts-classic-2.0-contrib'] = packages['ts-classic-2.0'] +sourceslist['ts-classic-2.0-contrib'] = { + 'ts-classic-2.0': ('os', 'contrib', ) +} +aliases['ts-classic-2.0-contrib'] = ('tsc20-contrib', 'tsc-2.0-contrib', ) + Modified: contrib/1.2/mach/current/specs/mach.spec =================================================================== --- contrib/1.2/mach/current/specs/mach.spec 2005-03-22 05:52:37 UTC (rev 6194) +++ contrib/1.2/mach/current/specs/mach.spec 2005-03-22 06:00:29 UTC (rev 6195) @@ -1,8 +1,8 @@ -%define default_flavor tinysofa-1.1 +%define default_flavor ts-classic-2.0 Name: mach Version: 0.4.6 -Release: 13jh +Release: 14jh Summary: make a chroot buildsystem Group: contrib License: GPL From svn at tinysofa.org Wed Mar 23 21:21:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 23 Mar 2005 16:21:11 -0500 (EST) Subject: [tinysofa-svn] r6196 - in contrib/1.2/sqlite3/current: sources specs Message-ID: <20050323212111.EC9413443A6@minbar.tinysofa.org> Author: gda Date: 2005-03-23 16:20:31 -0500 (Wed, 23 Mar 2005) New Revision: 6196 Added: contrib/1.2/sqlite3/current/sources/sqlite-3.2.0.tar.gz Removed: contrib/1.2/sqlite3/current/sources/sqlite-3.1.6.tar.gz Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec Log: 3.2.0 Deleted: contrib/1.2/sqlite3/current/sources/sqlite-3.1.6.tar.gz =================================================================== (Binary files differ) Added: contrib/1.2/sqlite3/current/sources/sqlite-3.2.0.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.2/sqlite3/current/sources/sqlite-3.2.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec =================================================================== --- contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-22 06:00:29 UTC (rev 6195) +++ contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-23 21:20:31 UTC (rev 6196) @@ -1,6 +1,6 @@ Summary: SQLite is a C library that implements an embeddable SQL database engine Name: sqlite3 -Version: 3.1.6 +Version: 3.2.0 Release: 1gd License: GPL Group: contrib @@ -58,6 +58,9 @@ %doc README doc/* %changelog +* Wed Mar 23 2005 Gerald Dachs 3.2.0-1gd +- 3.2.0 + * Thu Mar 17 2005 Gerald Dachs 3.1.6-1gd - 3.1.6 From svn at tinysofa.org Thu Mar 24 20:22:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 24 Mar 2005 15:22:44 -0500 (EST) Subject: [tinysofa-svn] r6198 - contrib/1.2/sqlite3/current/specs Message-ID: <20050324202244.4106234443A@minbar.tinysofa.org> Author: gda Date: 2005-03-24 15:22:38 -0500 (Thu, 24 Mar 2005) New Revision: 6198 Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec Log: requires readline Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec =================================================================== --- contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-24 19:02:22 UTC (rev 6197) +++ contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-24 20:22:38 UTC (rev 6198) @@ -1,13 +1,14 @@ Summary: SQLite is a C library that implements an embeddable SQL database engine Name: sqlite3 Version: 3.2.0 -Release: 1gd +Release: 2gd License: GPL Group: contrib Source: http://www.sqlite.org/sqlite-%{version}.tar.gz URL: http://www.sqlite.org/ +Requires: readline BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: tcl, tcl-devel, gcc-c++ +BuildRequires: tcl, tcl-devel, gcc-c++, readline-devel %description SQLITE is a C library that implements an embeddable SQL database engine. @@ -58,6 +59,9 @@ %doc README doc/* %changelog +* Thu Mar 24 2005 Gerald Dachs 3.2.0-2gd +- requires readline + * Wed Mar 23 2005 Gerald Dachs 3.2.0-1gd - 3.2.0 From svn at tinysofa.org Thu Mar 24 22:02:51 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 24 Mar 2005 17:02:51 -0500 (EST) Subject: [tinysofa-svn] r6199 - tinysofa/releases/classic/2.0/grsecurity/current/specs Message-ID: <20050324220251.EF2F034457A@minbar.tinysofa.org> Author: jh Date: 2005-03-24 17:02:45 -0500 (Thu, 24 Mar 2005) New Revision: 6199 Modified: tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec Log: - fix %post script Modified: tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec 2005-03-24 20:22:38 UTC (rev 6198) +++ tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec 2005-03-24 22:02:45 UTC (rev 6199) @@ -80,12 +80,12 @@ %{__mkdir} -m 700 rpmsave fi if [ -d rpmnew ]; then - /usr/bin/find policies roles -type f \( + /usr/bin/find policies roles -type f \( \ -name '*.rpmnew' -o -name '*.rpmsave' \) \ -exec %{__cp} -pf --parents '{}' rpmsave/ \; \ -exec %{__rm} -f '{}' \; else - /usr/bin/find policies roles -type f \( + /usr/bin/find policies roles -type f \( \ -name '*.rpmnew' -o -name '*.rpmsave' \) \ -exec %{__rm} -f '{}' \; fi From svn at tinysofa.org Thu Mar 24 22:05:48 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 24 Mar 2005 17:05:48 -0500 (EST) Subject: [tinysofa-svn] r6200 - tinysofa/releases/classic/2.0/grsecurity/current/specs Message-ID: <20050324220548.CB54534457A@minbar.tinysofa.org> Author: jh Date: 2005-03-24 17:05:42 -0500 (Thu, 24 Mar 2005) New Revision: 6200 Modified: tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec Log: - more %post fixes Modified: tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec =================================================================== --- tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec 2005-03-24 22:02:45 UTC (rev 6199) +++ tinysofa/releases/classic/2.0/grsecurity/current/specs/grsecurity.spec 2005-03-24 22:05:42 UTC (rev 6200) @@ -76,10 +76,10 @@ # handle .rpmsave and .rpmnew files if [ $1 -gt 1 ]; then cd %{_sysconfdir}/grsec || exit 0 - if [ ! -e rpmnew ]; then + if [ ! -e rpmsave ]; then %{__mkdir} -m 700 rpmsave fi - if [ -d rpmnew ]; then + if [ -d rpmsave ]; then /usr/bin/find policies roles -type f \( \ -name '*.rpmnew' -o -name '*.rpmsave' \) \ -exec %{__cp} -pf --parents '{}' rpmsave/ \; \ From svn at tinysofa.org Thu Mar 24 22:10:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 24 Mar 2005 17:10:45 -0500 (EST) Subject: [tinysofa-svn] r6201 - in contrib/1.2/firefox/current: sources specs Message-ID: <20050324221045.CA57C344677@minbar.tinysofa.org> Author: gda Date: 2005-03-24 16:58:43 -0500 (Thu, 24 Mar 2005) New Revision: 6201 Added: contrib/1.2/firefox/current/sources/firefox-1.0.2-source.tar.bz2 Removed: contrib/1.2/firefox/current/sources/firefox-1.0.1-source.tar.bz2 Modified: contrib/1.2/firefox/current/specs/firefox.spec Log: 1.0.2 Deleted: contrib/1.2/firefox/current/sources/firefox-1.0.1-source.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.2/firefox/current/sources/firefox-1.0.2-source.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.2/firefox/current/sources/firefox-1.0.2-source.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.2/firefox/current/specs/firefox.spec =================================================================== --- contrib/1.2/firefox/current/specs/firefox.spec 2005-03-24 22:05:42 UTC (rev 6200) +++ contrib/1.2/firefox/current/specs/firefox.spec 2005-03-24 21:58:43 UTC (rev 6201) @@ -9,7 +9,7 @@ Summary: Mozilla Firefox web browser Name: firefox -Version: 1.0.1 +Version: 1.0.2 Release: 1gd License: MPL/LGPL Group: contrib @@ -248,6 +248,9 @@ %endif %changelog +* Thu Mar 24 2005 Gerald Dachs 1.0.2-1gd +- 1.0.2 + * Mon Mar 21 2005 Gerald Dachs 1.0.1-1gd - 1.0.1 From svn at tinysofa.org Thu Mar 24 22:12:11 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 24 Mar 2005 17:12:11 -0500 (EST) Subject: [tinysofa-svn] r6202 - in contrib/1.2/sylpheed/current: sources specs Message-ID: <20050324221211.46F6B344684@minbar.tinysofa.org> Author: gda Date: 2005-03-24 17:11:08 -0500 (Thu, 24 Mar 2005) New Revision: 6202 Added: contrib/1.2/sylpheed/current/sources/sylpheed-1.0.4.tar.bz2 Removed: contrib/1.2/sylpheed/current/sources/sylpheed-1.0.3.tar.bz2 Modified: contrib/1.2/sylpheed/current/specs/sylpheed.spec Log: 1.0.4 Deleted: contrib/1.2/sylpheed/current/sources/sylpheed-1.0.3.tar.bz2 =================================================================== (Binary files differ) Added: contrib/1.2/sylpheed/current/sources/sylpheed-1.0.4.tar.bz2 =================================================================== (Binary files differ) Property changes on: contrib/1.2/sylpheed/current/sources/sylpheed-1.0.4.tar.bz2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/1.2/sylpheed/current/specs/sylpheed.spec =================================================================== --- contrib/1.2/sylpheed/current/specs/sylpheed.spec 2005-03-24 21:58:43 UTC (rev 6201) +++ contrib/1.2/sylpheed/current/specs/sylpheed.spec 2005-03-24 22:11:08 UTC (rev 6202) @@ -1,7 +1,7 @@ Summary: a GTK+ based, lightweight, and fast e-mail client Name: sylpheed Epoch: 1 -Version: 1.0.3 +Version: 1.0.4 Release: 1gd Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2 Copyright: GPL @@ -57,6 +57,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Thu Mar 24 2005 Gerald Dachs 1.0.4-1gd +- 1.0.4 + * Fri Mar 4 2005 Gerald Dachs 1.0.3-1gd - 1.0.3 From svn at tinysofa.org Fri Mar 25 21:42:20 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 25 Mar 2005 16:42:20 -0500 (EST) Subject: [tinysofa-svn] r6203 - tinysofa/releases/classic/2.0/fcron/current/sources Message-ID: <20050325214220.CC5F03446F7@minbar.tinysofa.org> Author: jh Date: 2005-03-25 16:42:14 -0500 (Fri, 25 Mar 2005) New Revision: 6203 Modified: tinysofa/releases/classic/2.0/fcron/current/sources/fcrontab-default Log: - remove reference to enterprise Modified: tinysofa/releases/classic/2.0/fcron/current/sources/fcrontab-default =================================================================== --- tinysofa/releases/classic/2.0/fcron/current/sources/fcrontab-default 2005-03-24 22:11:08 UTC (rev 6202) +++ tinysofa/releases/classic/2.0/fcron/current/sources/fcrontab-default 2005-03-25 21:42:14 UTC (rev 6203) @@ -1,4 +1,4 @@ -# This is the default system fcrontab file for tinysofa enterprise server 1.0 +# This is the default system fcrontab file SHELL=/bin/bash PATH=/sbin:/bin:/usr/bin:/usr/sbin From svn at tinysofa.org Sat Mar 26 08:35:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 26 Mar 2005 03:35:45 -0500 (EST) Subject: [tinysofa-svn] r6204 - in tinysofa/releases/classic/2.0/kernel/current: sources specs Message-ID: <20050326083545.DA4393443BE@minbar.tinysofa.org> Author: jh Date: 2005-03-26 03:35:35 -0500 (Sat, 26 Mar 2005) New Revision: 6204 Added: tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.6.patch Removed: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-load_elf_binary-kfree-fix.patch Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec Log: - add 2.6.11.6.patch Added: tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.6.patch =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.6.patch 2005-03-25 21:42:14 UTC (rev 6203) +++ tinysofa/releases/classic/2.0/kernel/current/sources/2.6.11.6.patch 2005-03-26 08:35:35 UTC (rev 6204) @@ -0,0 +1,232 @@ +diff -Nru a/fs/binfmt_elf.c b/fs/binfmt_elf.c +--- a/fs/binfmt_elf.c 2005-03-25 18:26:00 -08:00 ++++ b/fs/binfmt_elf.c 2005-03-25 18:26:00 -08:00 +@@ -1008,6 +1008,7 @@ + static int load_elf_library(struct file *file) + { + struct elf_phdr *elf_phdata; ++ struct elf_phdr *eppnt; + unsigned long elf_bss, bss, len; + int retval, error, i, j; + struct elfhdr elf_ex; +@@ -1031,44 +1032,47 @@ + /* j < ELF_MIN_ALIGN because elf_ex.e_phnum <= 2 */ + + error = -ENOMEM; +- elf_phdata = (struct elf_phdr *) kmalloc(j, GFP_KERNEL); ++ elf_phdata = kmalloc(j, GFP_KERNEL); + if (!elf_phdata) + goto out; + ++ eppnt = elf_phdata; + error = -ENOEXEC; +- retval = kernel_read(file, elf_ex.e_phoff, (char *) elf_phdata, j); ++ retval = kernel_read(file, elf_ex.e_phoff, (char *)eppnt, j); + if (retval != j) + goto out_free_ph; + + for (j = 0, i = 0; ip_type == PT_LOAD) j++; ++ if ((eppnt + i)->p_type == PT_LOAD) ++ j++; + if (j != 1) + goto out_free_ph; + +- while (elf_phdata->p_type != PT_LOAD) elf_phdata++; ++ while (eppnt->p_type != PT_LOAD) ++ eppnt++; + + /* Now use mmap to map the library into memory. */ + down_write(¤t->mm->mmap_sem); + error = do_mmap(file, +- ELF_PAGESTART(elf_phdata->p_vaddr), +- (elf_phdata->p_filesz + +- ELF_PAGEOFFSET(elf_phdata->p_vaddr)), ++ ELF_PAGESTART(eppnt->p_vaddr), ++ (eppnt->p_filesz + ++ ELF_PAGEOFFSET(eppnt->p_vaddr)), + PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE, +- (elf_phdata->p_offset - +- ELF_PAGEOFFSET(elf_phdata->p_vaddr))); ++ (eppnt->p_offset - ++ ELF_PAGEOFFSET(eppnt->p_vaddr))); + up_write(¤t->mm->mmap_sem); +- if (error != ELF_PAGESTART(elf_phdata->p_vaddr)) ++ if (error != ELF_PAGESTART(eppnt->p_vaddr)) + goto out_free_ph; + +- elf_bss = elf_phdata->p_vaddr + elf_phdata->p_filesz; ++ elf_bss = eppnt->p_vaddr + eppnt->p_filesz; + if (padzero(elf_bss)) { + error = -EFAULT; + goto out_free_ph; + } + +- len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1); +- bss = elf_phdata->p_memsz + elf_phdata->p_vaddr; ++ len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr + ELF_MIN_ALIGN - 1); ++ bss = eppnt->p_memsz + eppnt->p_vaddr; + if (bss > len) { + down_write(¤t->mm->mmap_sem); + do_brk(len, bss - len); +diff -Nru a/fs/ext2/dir.c b/fs/ext2/dir.c +--- a/fs/ext2/dir.c 2005-03-25 18:26:00 -08:00 ++++ b/fs/ext2/dir.c 2005-03-25 18:26:00 -08:00 +@@ -592,6 +592,7 @@ + goto fail; + } + kaddr = kmap_atomic(page, KM_USER0); ++ memset(kaddr, 0, chunk_size); + de = (struct ext2_dir_entry_2 *)kaddr; + de->name_len = 1; + de->rec_len = cpu_to_le16(EXT2_DIR_REC_LEN(1)); +diff -Nru a/fs/isofs/inode.c b/fs/isofs/inode.c +--- a/fs/isofs/inode.c 2005-03-25 18:26:00 -08:00 ++++ b/fs/isofs/inode.c 2005-03-25 18:26:00 -08:00 +@@ -685,6 +685,8 @@ + sbi->s_log_zone_size = isonum_723 (h_pri->logical_block_size); + sbi->s_max_size = isonum_733(h_pri->volume_space_size); + } else { ++ if (!pri) ++ goto out_freebh; + rootp = (struct iso_directory_record *) pri->root_directory_record; + sbi->s_nzones = isonum_733 (pri->volume_space_size); + sbi->s_log_zone_size = isonum_723 (pri->logical_block_size); +@@ -1394,6 +1396,9 @@ + unsigned long hashval; + struct inode *inode; + struct isofs_iget5_callback_data data; ++ ++ if (offset >= 1ul << sb->s_blocksize_bits) ++ return NULL; + + data.block = block; + data.offset = offset; +diff -Nru a/fs/isofs/rock.c b/fs/isofs/rock.c +--- a/fs/isofs/rock.c 2005-03-25 18:26:00 -08:00 ++++ b/fs/isofs/rock.c 2005-03-25 18:26:00 -08:00 +@@ -53,6 +53,7 @@ + if(LEN & 1) LEN++; \ + CHR = ((unsigned char *) DE) + LEN; \ + LEN = *((unsigned char *) DE) - LEN; \ ++ if (LEN<0) LEN=0; \ + if (ISOFS_SB(inode->i_sb)->s_rock_offset!=-1) \ + { \ + LEN-=ISOFS_SB(inode->i_sb)->s_rock_offset; \ +@@ -73,6 +74,10 @@ + offset1 = 0; \ + pbh = sb_bread(DEV->i_sb, block); \ + if(pbh){ \ ++ if (offset > pbh->b_size || offset + cont_size > pbh->b_size){ \ ++ brelse(pbh); \ ++ goto out; \ ++ } \ + memcpy(buffer + offset1, pbh->b_data + offset, cont_size - offset1); \ + brelse(pbh); \ + chr = (unsigned char *) buffer; \ +@@ -103,12 +108,13 @@ + struct rock_ridge * rr; + int sig; + +- while (len > 1){ /* There may be one byte for padding somewhere */ ++ while (len > 2){ /* There may be one byte for padding somewhere */ + rr = (struct rock_ridge *) chr; +- if (rr->len == 0) goto out; /* Something got screwed up here */ ++ if (rr->len < 3) goto out; /* Something got screwed up here */ + sig = isonum_721(chr); + chr += rr->len; + len -= rr->len; ++ if (len < 0) goto out; /* corrupted isofs */ + + switch(sig){ + case SIG('R','R'): +@@ -122,6 +128,7 @@ + break; + case SIG('N','M'): + if (truncate) break; ++ if (rr->len < 5) break; + /* + * If the flags are 2 or 4, this indicates '.' or '..'. + * We don't want to do anything with this, because it +@@ -186,12 +193,13 @@ + struct rock_ridge * rr; + int rootflag; + +- while (len > 1){ /* There may be one byte for padding somewhere */ ++ while (len > 2){ /* There may be one byte for padding somewhere */ + rr = (struct rock_ridge *) chr; +- if (rr->len == 0) goto out; /* Something got screwed up here */ ++ if (rr->len < 3) goto out; /* Something got screwed up here */ + sig = isonum_721(chr); + chr += rr->len; + len -= rr->len; ++ if (len < 0) goto out; /* corrupted isofs */ + + switch(sig){ + #ifndef CONFIG_ZISOFS /* No flag for SF or ZF */ +@@ -462,7 +470,7 @@ + struct rock_ridge *rr; + + if (!ISOFS_SB(inode->i_sb)->s_rock) +- panic ("Cannot have symlink with high sierra variant of iso filesystem\n"); ++ goto error; + + block = ei->i_iget5_block; + lock_kernel(); +@@ -487,13 +495,15 @@ + SETUP_ROCK_RIDGE(raw_inode, chr, len); + + repeat: +- while (len > 1) { /* There may be one byte for padding somewhere */ ++ while (len > 2) { /* There may be one byte for padding somewhere */ + rr = (struct rock_ridge *) chr; +- if (rr->len == 0) ++ if (rr->len < 3) + goto out; /* Something got screwed up here */ + sig = isonum_721(chr); + chr += rr->len; + len -= rr->len; ++ if (len < 0) ++ goto out; /* corrupted isofs */ + + switch (sig) { + case SIG('R', 'R'): +@@ -543,6 +553,7 @@ + fail: + brelse(bh); + unlock_kernel(); ++ error: + SetPageError(page); + kunmap(page); + unlock_page(page); +diff -Nru a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c +--- a/net/bluetooth/af_bluetooth.c 2005-03-25 18:26:00 -08:00 ++++ b/net/bluetooth/af_bluetooth.c 2005-03-25 18:26:00 -08:00 +@@ -64,7 +64,7 @@ + + int bt_sock_register(int proto, struct net_proto_family *ops) + { +- if (proto >= BT_MAX_PROTO) ++ if (proto < 0 || proto >= BT_MAX_PROTO) + return -EINVAL; + + if (bt_proto[proto]) +@@ -77,7 +77,7 @@ + + int bt_sock_unregister(int proto) + { +- if (proto >= BT_MAX_PROTO) ++ if (proto < 0 || proto >= BT_MAX_PROTO) + return -EINVAL; + + if (!bt_proto[proto]) +@@ -92,7 +92,7 @@ + { + int err = 0; + +- if (proto >= BT_MAX_PROTO) ++ if (proto < 0 || proto >= BT_MAX_PROTO) + return -EINVAL; + + #if defined(CONFIG_KMOD) Deleted: tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-load_elf_binary-kfree-fix.patch =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-load_elf_binary-kfree-fix.patch 2005-03-25 21:42:14 UTC (rev 6203) +++ tinysofa/releases/classic/2.0/kernel/current/sources/linux-2.6.11-load_elf_binary-kfree-fix.patch 2005-03-26 08:35:35 UTC (rev 6204) @@ -1,71 +0,0 @@ ---- 25/fs/binfmt_elf.c~load_elf_binary-kfree-fix 2005-03-18 01:00:49.000000000 -0800 -+++ 25-akpm/fs/binfmt_elf.c 2005-03-18 01:03:14.000000000 -0800 -@@ -1028,6 +1028,7 @@ out_free_ph: - static int load_elf_library(struct file *file) - { - struct elf_phdr *elf_phdata; -+ struct elf_phdr *eppnt; - unsigned long elf_bss, bss, len; - int retval, error, i, j; - struct elfhdr elf_ex; -@@ -1051,44 +1052,47 @@ static int load_elf_library(struct file - /* j < ELF_MIN_ALIGN because elf_ex.e_phnum <= 2 */ - - error = -ENOMEM; -- elf_phdata = (struct elf_phdr *) kmalloc(j, GFP_KERNEL); -+ elf_phdata = kmalloc(j, GFP_KERNEL); - if (!elf_phdata) - goto out; - -+ eppnt = elf_phdata; - error = -ENOEXEC; -- retval = kernel_read(file, elf_ex.e_phoff, (char *) elf_phdata, j); -+ retval = kernel_read(file, elf_ex.e_phoff, (char *)eppnt, j); - if (retval != j) - goto out_free_ph; - - for (j = 0, i = 0; ip_type == PT_LOAD) j++; -+ if ((eppnt + i)->p_type == PT_LOAD) -+ j++; - if (j != 1) - goto out_free_ph; - -- while (elf_phdata->p_type != PT_LOAD) elf_phdata++; -+ while (eppnt->p_type != PT_LOAD) -+ eppnt++; - - /* Now use mmap to map the library into memory. */ - down_write(¤t->mm->mmap_sem); - error = do_mmap(file, -- ELF_PAGESTART(elf_phdata->p_vaddr), -- (elf_phdata->p_filesz + -- ELF_PAGEOFFSET(elf_phdata->p_vaddr)), -+ ELF_PAGESTART(eppnt->p_vaddr), -+ (eppnt->p_filesz + -+ ELF_PAGEOFFSET(eppnt->p_vaddr)), - PROT_READ | PROT_WRITE | PROT_EXEC, - MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE, -- (elf_phdata->p_offset - -- ELF_PAGEOFFSET(elf_phdata->p_vaddr))); -+ (eppnt->p_offset - -+ ELF_PAGEOFFSET(eppnt->p_vaddr))); - up_write(¤t->mm->mmap_sem); -- if (error != ELF_PAGESTART(elf_phdata->p_vaddr)) -+ if (error != ELF_PAGESTART(eppnt->p_vaddr)) - goto out_free_ph; - -- elf_bss = elf_phdata->p_vaddr + elf_phdata->p_filesz; -+ elf_bss = eppnt->p_vaddr + eppnt->p_filesz; - if (padzero(elf_bss)) { - error = -EFAULT; - goto out_free_ph; - } - -- len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1); -- bss = elf_phdata->p_memsz + elf_phdata->p_vaddr; -+ len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr + ELF_MIN_ALIGN - 1); -+ bss = eppnt->p_memsz + eppnt->p_vaddr; - if (bss > len) { - down_write(¤t->mm->mmap_sem); - do_brk(len, bss - len); Modified: tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec =================================================================== --- tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec 2005-03-25 21:42:14 UTC (rev 6203) +++ tinysofa/releases/classic/2.0/kernel/current/specs/kernel.spec 2005-03-26 08:35:35 UTC (rev 6204) @@ -83,12 +83,12 @@ Patch2: patch-2.6.11-ac3 Patch3: patch-2.6.11.4-security.patch Patch4: 2.6.11.5.patch -Patch5: acpi-20050309-2.6.11.diff +Patch5: 2.6.11.6.patch +Patch6: acpi-20050309-2.6.11.diff Patch101: linux-2.6.11-epoll.patch -Patch102: linux-2.6.11-load_elf_binary-kfree-fix.patch -Patch103: linux-2.6.11-compile.patch -Patch104: linux-2.6.11-grsec-gracl-fix.patch +Patch102: linux-2.6.11-compile.patch +Patch103: linux-2.6.11-grsec-gracl-fix.patch Patch20020: linux-2.6.8-tinysofa-syslog.patch @@ -230,11 +230,11 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch101 -p1 -b .epoll~ -%patch102 -p1 -b .load_elf_binary-kfree-fix~ -%patch103 -p1 -b .compile~ -%patch104 -p1 -b .gracl~ +%patch102 -p1 -b .compile~ +%patch103 -p1 -b .gracl~ %patch20020 -p1 -b .tinysofa-syslog~ From svn at tinysofa.org Sat Mar 26 13:20:50 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sat, 26 Mar 2005 08:20:50 -0500 (EST) Subject: [tinysofa-svn] r6205 - in tinysofa/releases/classic/2.0/anaconda/current: sources specs Message-ID: <20050326132050.A4684344395@minbar.tinysofa.org> Author: jh Date: 2005-03-26 08:20:40 -0500 (Sat, 26 Mar 2005) New Revision: 6205 Added: tinysofa/releases/classic/2.0/anaconda/current/sources/booty-0.40-lilo-timeout.patch Modified: tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec Log: - unify lilo timeout with grub Added: tinysofa/releases/classic/2.0/anaconda/current/sources/booty-0.40-lilo-timeout.patch =================================================================== --- tinysofa/releases/classic/2.0/anaconda/current/sources/booty-0.40-lilo-timeout.patch 2005-03-26 08:35:35 UTC (rev 6204) +++ tinysofa/releases/classic/2.0/anaconda/current/sources/booty-0.40-lilo-timeout.patch 2005-03-26 13:20:40 UTC (rev 6205) @@ -0,0 +1,11 @@ +--- ./bootloaderInfo.py.x 2005-03-26 15:17:05.000000000 +0200 ++++ ./bootloaderInfo.py 2005-03-26 15:17:32.000000000 +0200 +@@ -311,7 +311,7 @@ + lilo.delImage(label) + + lilo.addEntry("prompt", replace = 0) +- lilo.addEntry("timeout", "20", replace = 0) ++ lilo.addEntry("timeout", "50", replace = 0) + + rootDev = fsset.getEntryByMountPoint("/").device.getDevice() + if not rootDev: Modified: tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec =================================================================== --- tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec 2005-03-26 08:35:35 UTC (rev 6204) +++ tinysofa/releases/classic/2.0/anaconda/current/specs/anaconda.spec 2005-03-26 13:20:40 UTC (rev 6205) @@ -1,7 +1,7 @@ ExcludeArch: ppc64 Name: anaconda Version: 9.1 -Release: 1jh +Release: 2jh License: GPL Summary: installation program Group: development @@ -43,6 +43,7 @@ Patch103: booty-0.40-tinysofa-xfs-fix.patch Patch104: booty-0.40-bootloader.patch Patch105: booty-0.40-ide-scsi.patch +Patch106: booty-0.40-lilo-timeout.patch # rhpl patches Patch200: rhpl-0.145-tinysofa-keytables.patch # common patches @@ -118,6 +119,7 @@ %patch103 -p1 %patch104 -p1 %patch105 -p1 +%patch106 -p1 popd pushd rhpl-%{rhpl_version} From svn at tinysofa.org Wed Mar 30 13:25:53 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 30 Mar 2005 08:25:53 -0500 (EST) Subject: [tinysofa-svn] r6206 - in tinysofa/releases/classic/2.0/telnet/current: sources specs Message-ID: <20050330132553.40BFD3443B4@minbar.tinysofa.org> Author: jh Date: 2005-03-30 08:25:43 -0500 (Wed, 30 Mar 2005) New Revision: 6206 Added: tinysofa/releases/classic/2.0/telnet/current/sources/telnet-bsd-1.1-SLC+ENV-fix.diff Modified: tinysofa/releases/classic/2.0/telnet/current/specs/telnet.spec Log: - fixes for CAN-2005-0468 and CAN-2005-0469 (telnet-bsd-1.1-SLC+ENV-fix.diff) Added: tinysofa/releases/classic/2.0/telnet/current/sources/telnet-bsd-1.1-SLC+ENV-fix.diff =================================================================== --- tinysofa/releases/classic/2.0/telnet/current/sources/telnet-bsd-1.1-SLC+ENV-fix.diff 2005-03-26 13:20:40 UTC (rev 6205) +++ tinysofa/releases/classic/2.0/telnet/current/sources/telnet-bsd-1.1-SLC+ENV-fix.diff 2005-03-30 13:25:43 UTC (rev 6206) @@ -0,0 +1,37 @@ +diff -ruN telnet-bsd-1.1/telnet/telnet.c telnet-bsd-1.1.fixed/telnet/telnet.c +--- telnet-bsd-1.1/telnet/telnet.c 2004-02-14 05:11:27.000000000 -0800 ++++ telnet-bsd-1.1.fixed/telnet/telnet.c 2005-02-23 07:21:09.898412008 -0800 +@@ -1245,6 +1245,10 @@ + void + slc_add_reply (unsigned char func, unsigned char flags, cc_t value) + { ++ if (slc_replyp + 6 >= slc_reply + sizeof(slc_reply)) { ++ printf("slc_add_reply: not enough room\n"); ++ return; ++ } + if ((*slc_replyp++ = func) == IAC) + *slc_replyp++ = IAC; + if ((*slc_replyp++ = flags) == IAC) +@@ -1258,6 +1262,10 @@ + { + int len; + ++ if (slc_replyp + 2 >= slc_reply + sizeof(slc_reply)) { ++ printf("slc_end_reply: not enough room\n"); ++ return; ++ } + *slc_replyp++ = IAC; + *slc_replyp++ = SE; + len = slc_replyp - slc_reply; +@@ -1416,7 +1424,11 @@ + { + int len; + unsigned char *p; ++ /* Pointer wrap should be no issue here */ + opt_replyend += OPT_REPLY_SIZE; ++ opt_replyend += 2*strlen(ep); ++ if (vp) ++ opt_replyend += 2*strlen(vp); + len = opt_replyend - opt_reply; + p = (unsigned char *) realloc (opt_reply, len); + if (p == NULL) Modified: tinysofa/releases/classic/2.0/telnet/current/specs/telnet.spec =================================================================== --- tinysofa/releases/classic/2.0/telnet/current/specs/telnet.spec 2005-03-26 13:20:40 UTC (rev 6205) +++ tinysofa/releases/classic/2.0/telnet/current/specs/telnet.spec 2005-03-30 13:25:43 UTC (rev 6206) @@ -6,6 +6,7 @@ Group: main Source: telnet-bsd-%{version}.tar.bz2 Patch0: telnet-bsd-1.1.diff +Patch1: telnet-bsd-1.1-SLC+ENV-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: ncurses-devel @@ -20,7 +21,8 @@ %prep %setup -q -n telnet-bsd-%{version} -%patch -p0 +%patch0 -p0 +%patch1 -p1 -b .security~ %build @@ -51,6 +53,9 @@ %changelog +* Wed Mar 30 2005 Jaakko Heinonen 1.1-2jh +- fixes for CAN-2005-0468 and CAN-2005-0469 (telnet-bsd-1.1-SLC+ENV-fix.diff) + * Tue Jan 04 2005 tsintegrate 1.1-1ts - current (1.1-1jh) integrated as 1.1-1ts for release 1.1-U3 From svn at tinysofa.org Wed Mar 30 13:33:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 30 Mar 2005 08:33:59 -0500 (EST) Subject: [tinysofa-svn] r6207 - in tinysofa/releases/classic/2.0/krb5/current: sources specs Message-ID: <20050330133359.7ABD63443C2@minbar.tinysofa.org> Author: jh Date: 2005-03-30 08:33:48 -0500 (Wed, 30 Mar 2005) New Revision: 6207 Added: tinysofa/releases/classic/2.0/krb5/current/sources/2005-001-patch_1.4.txt Removed: tinysofa/releases/classic/2.0/krb5/current/sources/2004-002-dblfree_patch.txt tinysofa/releases/classic/2.0/krb5/current/sources/2004-003-patch_1.3.4.txt tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.3.4.tar.gz Modified: tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec Log: - fix CAN-2005-0468 and CAN-2005-0469 (2005-001-patch_1.4.txt) Deleted: tinysofa/releases/classic/2.0/krb5/current/sources/2004-002-dblfree_patch.txt =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/sources/2004-002-dblfree_patch.txt 2005-03-30 13:25:43 UTC (rev 6206) +++ tinysofa/releases/classic/2.0/krb5/current/sources/2004-002-dblfree_patch.txt 2005-03-30 13:33:48 UTC (rev 6207) @@ -1,268 +0,0 @@ -Index: src/clients/klist/klist.c -=================================================================== -RCS file: /cvs/krbdev/krb5/src/clients/klist/klist.c,v -retrieving revision 5.63 -diff -c -r5.63 klist.c -*** src/clients/klist/klist.c 11 Apr 2002 03:21:46 -0000 5.63 ---- src/clients/klist/klist.c 23 Aug 2004 03:37:26 -0000 -*************** -*** 614,619 **** ---- 614,622 ---- - - if (show_etype) { - retval = krb5_decode_ticket(&cred->ticket, &tkt); -+ if (retval) -+ goto err_tkt; -+ - if (!extra_field) - fputs("\t",stdout); - else -*************** -*** 622,629 **** - etype_string(cred->keyblock.enctype)); - printf("%s ", - etype_string(tkt->enc_part.enctype)); -- krb5_free_ticket(kcontext, tkt); - extra_field++; - } - - /* if any additional info was printed, extra_field is non-zero */ ---- 625,635 ---- - etype_string(cred->keyblock.enctype)); - printf("%s ", - etype_string(tkt->enc_part.enctype)); - extra_field++; -+ -+ err_tkt: -+ if (tkt != NULL) -+ krb5_free_ticket(kcontext, tkt); - } - - /* if any additional info was printed, extra_field is non-zero */ -Index: src/krb524/krb524d.c -=================================================================== -RCS file: /cvs/krbdev/krb5/src/krb524/krb524d.c,v -retrieving revision 1.55.2.3 -diff -c -r1.55.2.3 krb524d.c -*** src/krb524/krb524d.c 28 May 2003 04:06:31 -0000 1.55.2.3 ---- src/krb524/krb524d.c 23 Aug 2004 03:37:26 -0000 -*************** -*** 582,589 **** - printf("v4 credentials encoded\n"); - - error: -! if (v5tkt->enc_part2) - krb5_free_enc_tkt_part(context, v5tkt->enc_part2); - - if(v5_service_key.contents) - krb5_free_keyblock_contents(context, &v5_service_key); ---- 582,591 ---- - printf("v4 credentials encoded\n"); - - error: -! if (v5tkt->enc_part2) { - krb5_free_enc_tkt_part(context, v5tkt->enc_part2); -+ v5tkt->enc_part2 = NULL; -+ } - - if(v5_service_key.contents) - krb5_free_keyblock_contents(context, &v5_service_key); -Index: src/lib/krb5/asn.1/asn1buf.c -=================================================================== -RCS file: /cvs/krbdev/krb5/src/lib/krb5/asn.1/asn1buf.c,v -retrieving revision 5.24 -diff -c -r5.24 asn1buf.c -*** src/lib/krb5/asn.1/asn1buf.c 12 Mar 2003 04:33:30 -0000 5.24 ---- src/lib/krb5/asn.1/asn1buf.c 23 Aug 2004 03:37:27 -0000 -*************** -*** 255,260 **** ---- 255,261 ---- - (*code)->data = (char*)malloc((((*code)->length)+1)*sizeof(char)); - if ((*code)->data == NULL) { - free(*code); -+ *code = NULL; - return ENOMEM; - } - for(i=0; i < (*code)->length; i++) -Index: src/lib/krb5/asn.1/krb5_decode.c -=================================================================== -RCS file: /cvs/krbdev/krb5/src/lib/krb5/asn.1/krb5_decode.c,v -retrieving revision 5.40.2.5 -diff -c -r5.40.2.5 krb5_decode.c -*** src/lib/krb5/asn.1/krb5_decode.c 10 Oct 2003 23:57:38 -0000 5.40.2.5 ---- src/lib/krb5/asn.1/krb5_decode.c 23 Aug 2004 03:37:27 -0000 -*************** -*** 183,190 **** - #define cleanup(cleanup_routine)\ - return 0; \ - error_out: \ -! if (rep && *rep) \ - cleanup_routine(*rep); \ - return retval; - - #define cleanup_none()\ ---- 183,192 ---- - #define cleanup(cleanup_routine)\ - return 0; \ - error_out: \ -! if (rep && *rep) { \ - cleanup_routine(*rep); \ -+ *rep = NULL; \ -+ } \ - return retval; - - #define cleanup_none()\ -*************** -*** 233,238 **** ---- 235,241 ---- - free_field(*rep,checksum); - free_field(*rep,client); - free(*rep); -+ *rep = NULL; - } - return retval; - } -*************** -*** 254,260 **** - { begin_structure(); - { krb5_kvno kvno; - get_field(kvno,0,asn1_decode_kvno); -! if(kvno != KVNO) return KRB5KDC_ERR_BAD_PVNO; - } - alloc_field((*rep)->server,krb5_principal_data); - get_field((*rep)->server,1,asn1_decode_realm); ---- 257,263 ---- - { begin_structure(); - { krb5_kvno kvno; - get_field(kvno,0,asn1_decode_kvno); -! if(kvno != KVNO) clean_return(KRB5KDC_ERR_BAD_PVNO); - } - alloc_field((*rep)->server,krb5_principal_data); - get_field((*rep)->server,1,asn1_decode_realm); -*************** -*** 268,273 **** ---- 271,277 ---- - if (rep && *rep) { - free_field(*rep,server); - free(*rep); -+ *rep = NULL; - } - return retval; - } -*************** -*** 320,325 **** ---- 324,330 ---- - free_field(*rep,session); - free_field(*rep,client); - free(*rep); -+ *rep = NULL; - } - return retval; - } -*************** -*** 403,408 **** ---- 408,414 ---- - if (rep && *rep) { - free_field(*rep,ticket); - free(*rep); -+ *rep = NULL; - } - return retval; - } -*************** -*** 451,456 **** ---- 457,463 ---- - if (rep && *rep) { - free_field(*rep,subkey); - free(*rep); -+ *rep = NULL; - } - return retval; - } -*************** -*** 556,561 **** ---- 563,569 ---- - if (rep && *rep) { - free_field(*rep,checksum); - free(*rep); -+ *rep = NULL; - } - return retval; - } -*************** -*** 614,619 **** ---- 622,628 ---- - free_field(*rep,r_address); - free_field(*rep,s_address); - free(*rep); -+ *rep = NULL; - } - return retval; - } -*************** -*** 668,673 **** ---- 677,683 ---- - free_field(*rep,r_address); - free_field(*rep,s_address); - free(*rep); -+ *rep = NULL; - } - return retval; - } -*************** -*** 713,718 **** ---- 723,729 ---- - free_field(*rep,server); - free_field(*rep,client); - free(*rep); -+ *rep = NULL; - } - return retval; - } -Index: src/lib/krb5/krb/rd_rep.c -=================================================================== -RCS file: /cvs/krbdev/krb5/src/lib/krb5/krb/rd_rep.c,v -retrieving revision 5.33.2.2 -diff -c -r5.33.2.2 rd_rep.c -*** src/lib/krb5/krb/rd_rep.c 14 Jun 2003 00:09:47 -0000 5.33.2.2 ---- src/lib/krb5/krb/rd_rep.c 23 Aug 2004 03:37:27 -0000 -*************** -*** 71,76 **** ---- 71,78 ---- - - /* now decode the decrypted stuff */ - retval = decode_krb5_ap_rep_enc_part(&scratch, repl); -+ if (retval) -+ goto clean_scratch; - - /* Check reply fields */ - if (((*repl)->ctime != auth_context->authentp->ctime) || -Index: src/lib/krb5/krb/send_tgs.c -=================================================================== -RCS file: /cvs/krbdev/krb5/src/lib/krb5/krb/send_tgs.c,v -retrieving revision 5.55.2.1 -diff -c -r5.55.2.1 send_tgs.c -*** src/lib/krb5/krb/send_tgs.c 13 May 2004 19:27:59 -0000 5.55.2.1 ---- src/lib/krb5/krb/send_tgs.c 23 Aug 2004 03:37:27 -0000 -*************** -*** 269,274 **** ---- 269,276 ---- - if (!tcp_only) { - krb5_error *err_reply; - retval = decode_krb5_error(&rep->response, &err_reply); -+ if (retval) -+ goto send_tgs_error_3; - if (err_reply->error == KRB_ERR_RESPONSE_TOO_BIG) { - tcp_only = 1; - krb5_free_error(context, err_reply); -*************** -*** 277,282 **** ---- 279,286 ---- - goto send_again; - } - krb5_free_error(context, err_reply); -+ send_tgs_error_3: -+ ; - } - rep->message_type = KRB5_ERROR; - } else if (krb5_is_tgs_rep(&rep->response)) Deleted: tinysofa/releases/classic/2.0/krb5/current/sources/2004-003-patch_1.3.4.txt =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/sources/2004-003-patch_1.3.4.txt 2005-03-30 13:25:43 UTC (rev 6206) +++ tinysofa/releases/classic/2.0/krb5/current/sources/2004-003-patch_1.3.4.txt 2005-03-30 13:33:48 UTC (rev 6207) @@ -1,17 +0,0 @@ -Index: src/lib/krb5/asn.1/asn1buf.c -=================================================================== -RCS file: /cvs/krbdev/krb5/src/lib/krb5/asn.1/asn1buf.c,v -retrieving revision 5.24 -*** src/lib/krb5/asn.1/asn1buf.c 12 Mar 2003 04:33:30 -0000 5.24 ---- src/lib/krb5/asn.1/asn1buf.c 23 Aug 2004 03:43:47 -0000 -*************** -*** 122,127 **** ---- 122,129 ---- - return ASN1_OVERRUN; - } - while (nestlevel > 0) { -+ if (buf->bound - buf->next + 1 <= 0) -+ return ASN1_OVERRUN; - retval = asn1_get_tag_2(buf, &t); - if (retval) return retval; - if (!t.indef) { Added: tinysofa/releases/classic/2.0/krb5/current/sources/2005-001-patch_1.4.txt =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/sources/2005-001-patch_1.4.txt 2005-03-30 13:25:43 UTC (rev 6206) +++ tinysofa/releases/classic/2.0/krb5/current/sources/2005-001-patch_1.4.txt 2005-03-30 13:33:48 UTC (rev 6207) @@ -0,0 +1,95 @@ +Index: telnet.c +=================================================================== +RCS file: /cvs/krbdev/krb5/src/appl/telnet/telnet/telnet.c,v +retrieving revision 5.18 +diff -c -r5.18 telnet.c +*** telnet.c 15 Nov 2002 20:21:35 -0000 5.18 +--- telnet.c 15 Mar 2005 18:59:32 -0000 +*************** +*** 1475,1480 **** +--- 1475,1482 ---- + unsigned char flags; + cc_t value; + { ++ if ((slc_replyp - slc_reply) + 6 > sizeof(slc_reply)) ++ return; + if ((*slc_replyp++ = func) == IAC) + *slc_replyp++ = IAC; + if ((*slc_replyp++ = flags) == IAC) +*************** +*** 1488,1498 **** + { + register int len; + +- *slc_replyp++ = IAC; +- *slc_replyp++ = SE; + len = slc_replyp - slc_reply; +! if (len <= 6) + return; + if (NETROOM() > len) { + ring_supply_data(&netoring, slc_reply, slc_replyp - slc_reply); + printsub('>', &slc_reply[2], slc_replyp - slc_reply - 2); +--- 1490,1501 ---- + { + register int len; + + len = slc_replyp - slc_reply; +! if (len <= 4 || (len + 2 > sizeof(slc_reply))) + return; ++ *slc_replyp++ = IAC; ++ *slc_replyp++ = SE; ++ len += 2; + if (NETROOM() > len) { + ring_supply_data(&netoring, slc_reply, slc_replyp - slc_reply); + printsub('>', &slc_reply[2], slc_replyp - slc_reply - 2); +*************** +*** 1645,1650 **** +--- 1648,1654 ---- + register unsigned char *ep; + { + register unsigned char *vp, c; ++ unsigned int len, olen, elen; + + if (opt_reply == NULL) /*XXX*/ + return; /*XXX*/ +*************** +*** 1662,1680 **** + return; + } + vp = env_getvalue(ep); +! if (opt_replyp + (vp ? strlen((char *)vp) : 0) + +! strlen((char *)ep) + 6 > opt_replyend) + { +! register unsigned int len; +! opt_replyend += OPT_REPLY_SIZE; +! len = opt_replyend - opt_reply; + opt_reply = (unsigned char *)realloc(opt_reply, len); + if (opt_reply == NULL) { + /*@*/ printf("env_opt_add: realloc() failed!!!\n"); + opt_reply = opt_replyp = opt_replyend = NULL; + return; + } +! opt_replyp = opt_reply + len - (opt_replyend - opt_replyp); + opt_replyend = opt_reply + len; + } + if (opt_welldefined((char *) ep)) +--- 1666,1684 ---- + return; + } + vp = env_getvalue(ep); +! elen = 2 * (vp ? strlen((char *)vp) : 0) + +! 2 * strlen((char *)ep) + 6; +! if ((opt_replyend - opt_replyp) < elen) + { +! len = opt_replyend - opt_reply + elen; +! olen = opt_replyp - opt_reply; + opt_reply = (unsigned char *)realloc(opt_reply, len); + if (opt_reply == NULL) { + /*@*/ printf("env_opt_add: realloc() failed!!!\n"); + opt_reply = opt_replyp = opt_replyend = NULL; + return; + } +! opt_replyp = opt_reply + olen; + opt_replyend = opt_reply + len; + } + if (opt_welldefined((char *) ep)) Deleted: tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.3.4.tar.gz =================================================================== (Binary files differ) Modified: tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec 2005-03-30 13:25:43 UTC (rev 6206) +++ tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec 2005-03-30 13:33:48 UTC (rev 6207) @@ -1,10 +1,11 @@ Summary: Kerberos is a network authentication protocol. Name: krb5 Version: 1.3.6 -Release: 4jh +Release: 5jh Group: main Source0: krb5-%{version}.tar.gz Patch0: krb5-1.3.6-prof_err.patch +Patch1: 2005-001-patch_1.4.txt URL: http://web.mit.edu/kerberos License: Distributable Requires: libcom_err libtermcap ncurses @@ -43,6 +44,9 @@ %prep %setup -q -n krb5-%{version} %patch0 -p1 -b .prof_err~ +cd src/appl/telnet/telnet +%patch1 -p0 +cd - %build @@ -98,6 +102,9 @@ %changelog +* Wed Mar 30 2005 Jaakko Heinonen 1.3.6-5jh +- fix CAN-2005-0468 and CAN-2005-0469 (2005-001-patch_1.4.txt) + * Tue Jan 25 2005 Jaakko Heinonen 1.3.6-3jh - make devel to require the base package From svn at tinysofa.org Thu Mar 31 18:18:18 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 31 Mar 2005 13:18:18 -0500 (EST) Subject: [tinysofa-svn] r6208 - in contrib/1.2/sqlite3/current: sources specs Message-ID: <20050331181818.F0CE234481B@minbar.tinysofa.org> Author: gda Date: 2005-03-31 13:17:38 -0500 (Thu, 31 Mar 2005) New Revision: 6208 Added: contrib/1.2/sqlite3/current/sources/sqlite-3.2.1.tar.gz Removed: contrib/1.2/sqlite3/current/sources/sqlite-3.2.0.tar.gz Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec Log: 3.2.1 Deleted: contrib/1.2/sqlite3/current/sources/sqlite-3.2.0.tar.gz =================================================================== (Binary files differ) Added: contrib/1.2/sqlite3/current/sources/sqlite-3.2.1.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.2/sqlite3/current/sources/sqlite-3.2.1.tar.gz ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: contrib/1.2/sqlite3/current/specs/sqlite3.spec =================================================================== --- contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-30 13:33:48 UTC (rev 6207) +++ contrib/1.2/sqlite3/current/specs/sqlite3.spec 2005-03-31 18:17:38 UTC (rev 6208) @@ -1,7 +1,7 @@ Summary: SQLite is a C library that implements an embeddable SQL database engine Name: sqlite3 -Version: 3.2.0 -Release: 2gd +Version: 3.2.1 +Release: 1gd License: GPL Group: contrib Source: http://www.sqlite.org/sqlite-%{version}.tar.gz @@ -59,6 +59,9 @@ %doc README doc/* %changelog +* Thu Mar 31 2005 Gerald Dachs 3.2.1-1gd +- 3.2.1 + * Thu Mar 24 2005 Gerald Dachs 3.2.0-2gd - requires readline From svn at tinysofa.org Thu Mar 31 19:58:45 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 31 Mar 2005 14:58:45 -0500 (EST) Subject: [tinysofa-svn] r6209 - in contrib/1.2: . perl-net-dns perl-net-dns/current perl-net-dns/current/sources perl-net-dns/current/specs Message-ID: <20050331195845.A800B3447D9@minbar.tinysofa.org> Author: gda Date: 2005-03-31 14:58:34 -0500 (Thu, 31 Mar 2005) New Revision: 6209 Added: contrib/1.2/perl-net-dns/ contrib/1.2/perl-net-dns/current/ contrib/1.2/perl-net-dns/current/sources/ contrib/1.2/perl-net-dns/current/sources/Net-DNS-0.49.tar.gz contrib/1.2/perl-net-dns/current/specs/ contrib/1.2/perl-net-dns/current/specs/perl-net-dns.spec contrib/1.2/perl-net-dns/pristine/ contrib/1.2/perl-net-dns/releases/ Log: new in contrib Added: contrib/1.2/perl-net-dns/current/sources/Net-DNS-0.49.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.2/perl-net-dns/current/sources/Net-DNS-0.49.tar.gz ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: contrib/1.2/perl-net-dns/current/specs/perl-net-dns.spec =================================================================== --- contrib/1.2/perl-net-dns/current/specs/perl-net-dns.spec 2005-03-31 18:17:38 UTC (rev 6208) +++ contrib/1.2/perl-net-dns/current/specs/perl-net-dns.spec 2005-03-31 19:58:34 UTC (rev 6209) @@ -0,0 +1,55 @@ +%define perlname Net-DNS + +Summary:The Perl module Net-Server. +Name: perl-net-dns +Version: 0.49 +Release: 1gd +License: Artistic, GPL +Group: contrib +Source: %{perlname}-%{version}.tar.gz +URL: http://www.cpan.org/ +Requires: perl = %{perl_version} perl-digest-hmac +BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version} +BuildRequires: perl-digest-hmac +BuildRoot: %{_tmppath}/%{name}-%{version} + + +%description +The Perl module Net-DNS. + +%prep +%setup -q -n %{perlname}-%{version} + + +%build +%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor %{name}-%{version}-filelist +find %{buildroot} -type f -print |\ +%{__sed} "s|%{buildroot}||g" |\ +%{__sed} "/Win32/d" >>%{name}-%{version}-filelist + +%{__rm} %{buildroot}%{_mandir}/man3/Net::DNS::Resolver::Win32.3.gz +%{__rm} %{buildroot}%{perl_vendorarch}/Net/DNS/Resolver/Win32.pm + +%clean +#%clean_buildroot + +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) +%doc Changes MANIFEST README + +%changelog +* Thu Mar 31 2005 Gerald Dachs 0.49-1gd +- initial build From svn at tinysofa.org Thu Mar 31 19:59:09 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 31 Mar 2005 14:59:09 -0500 (EST) Subject: [tinysofa-svn] r6210 - in contrib/1.2: . perl-digest-hmac perl-digest-hmac/current perl-digest-hmac/current/sources perl-digest-hmac/current/specs Message-ID: <20050331195909.2BC5F3447D9@minbar.tinysofa.org> Author: gda Date: 2005-03-31 14:58:59 -0500 (Thu, 31 Mar 2005) New Revision: 6210 Added: contrib/1.2/perl-digest-hmac/ contrib/1.2/perl-digest-hmac/current/ contrib/1.2/perl-digest-hmac/current/sources/ contrib/1.2/perl-digest-hmac/current/sources/Digest-HMAC-1.01.tar.gz contrib/1.2/perl-digest-hmac/current/specs/ contrib/1.2/perl-digest-hmac/current/specs/perl-digest-hmac.spec contrib/1.2/perl-digest-hmac/pristine/ contrib/1.2/perl-digest-hmac/releases/ Log: new in contrib Added: contrib/1.2/perl-digest-hmac/current/sources/Digest-HMAC-1.01.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/1.2/perl-digest-hmac/current/sources/Digest-HMAC-1.01.tar.gz ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: contrib/1.2/perl-digest-hmac/current/specs/perl-digest-hmac.spec =================================================================== --- contrib/1.2/perl-digest-hmac/current/specs/perl-digest-hmac.spec 2005-03-31 19:58:34 UTC (rev 6209) +++ contrib/1.2/perl-digest-hmac/current/specs/perl-digest-hmac.spec 2005-03-31 19:58:59 UTC (rev 6210) @@ -0,0 +1,50 @@ +%define perlname Digest-HMAC + +Summary:The Perl module Digest-HMAC. +Name: perl-digest-hmac +Version: 1.01 +Release: 1gd +License: Artistic, GPL +Group: contrib +Source: %{perlname}-%{version}.tar.gz +URL: http://www.cpan.org/ +Requires: perl = %{perl_version} +BuildRequires: perl-devel >= %{perl_version} perl = %{perl_version} +BuildRoot: %{_tmppath}/%{name}-%{version} + + +%description +The Perl module Digest-HMAC. + +%prep +%setup -q -n %{perlname}-%{version} + + +%build +%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor %{name}-%{version}-filelist +find %{buildroot} -type f -print |\ +%{__sed} "s|%{buildroot}||g" >>%{name}-%{version}-filelist + +%clean +%clean_buildroot + +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) +%doc Changes MANIFEST README + +%changelog +* Thu Mar 31 2005 Gerald Dachs 1.01-1gd +- initial build