From svn at tinysofa.org Fri Jul 1 06:36:59 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 1 Jul 2005 02:36:59 -0400 (EDT) Subject: [tinysofa-svn] r6475 - in tinysofa/releases/classic/2.0/initscripts/current: sources specs Message-ID: <20050701063659.1F0F1345342@minbar.tinysofa.org> Author: jh Date: 2005-07-01 02:36:46 -0400 (Fri, 01 Jul 2005) New Revision: 6475 Added: tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-usb.patch Removed: tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-usbfs.patch Modified: tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec Log: - usb fixes for 2.6 kernel Copied: tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-usb.patch (from rev 6311, tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-usbfs.patch) =================================================================== --- tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-usbfs.patch 2005-05-09 18:54:10 UTC (rev 6311) +++ tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-usb.patch 2005-07-01 06:36:46 UTC (rev 6475) @@ -0,0 +1,44 @@ +--- ./rc.d/rc.sysinit.usb~ 2005-07-01 09:29:27.000000000 +0300 ++++ ./rc.d/rc.sysinit 2005-07-01 09:32:59.000000000 +0300 +@@ -169,16 +169,14 @@ + update_boot_stage RCusb + usb=0 + if ! strstr "$cmdline" nousb ; then +- if ! LC_ALL=C grep -q "usb" /proc/devices 2>/dev/null ; then +- aliases=`/sbin/modprobe -c | awk '/^alias usb-controller/ { print $3 }'` +- if [ -n "$aliases" -a "$aliases" != "off" ]; then +- modprobe usbcore +- for alias in $aliases ; do +- [ "$alias" = "off" ] && continue ++ aliases=`/sbin/modprobe -c | awk '/^alias[[:space:]]+usb-controller/ { print $3 }'` ++ if [ -n "$aliases" -a "$aliases" != "off" ]; then ++ modprobe usbcore ++ for alias in $aliases ; do ++ [ "$alias" = "off" ] && continue + action $"Initializing USB controller ($alias): " modprobe $alias +- done +- [ $? -eq 0 -a -n "$aliases" ] && usb=1 +- fi ++ done ++ [ $? -eq 0 -a -n "$aliases" ] && usb=1 + fi + if LC_ALL=C grep -q "usb" /proc/devices 2>/dev/null ; then + usb=1 +@@ -186,7 +184,7 @@ + fi + + if [ $usb = 1 -a ! -f /proc/bus/usb/devices ]; then +- action $"Mounting USB filesystem: " mount -t usbdevfs usbdevfs /proc/bus/usb ++ action $"Mounting USB filesystem: " mount -t usbfs usbfs /proc/bus/usb + fi + + needusbstorage= +@@ -360,7 +358,7 @@ + # Enter root, /proc and (potentially) /proc/bus/usb and devfs into mtab. + mount -f / + mount -f /proc +-[ -f /proc/bus/usb/devices ] && mount -f -t usbdevfs usbdevfs /proc/bus/usb ++[ -f /proc/bus/usb/devices ] && mount -f -t usbfs usbfs /proc/bus/usb + [ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev + + Deleted: tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-usbfs.patch =================================================================== --- tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-usbfs.patch 2005-06-30 22:07:13 UTC (rev 6474) +++ tinysofa/releases/classic/2.0/initscripts/current/sources/initscripts-7.31.9-usbfs.patch 2005-07-01 06:36:46 UTC (rev 6475) @@ -1,20 +0,0 @@ ---- initscripts-7.31.9/rc.d/rc.sysinit.orig 2005-01-10 09:48:36.320251448 +0100 -+++ initscripts-7.31.9/rc.d/rc.sysinit 2005-01-10 09:48:59.111786608 +0100 -@@ -186,7 +186,7 @@ - fi - - if [ $usb = 1 -a ! -f /proc/bus/usb/devices ]; then -- action $"Mounting USB filesystem: " mount -t usbdevfs usbdevfs /proc/bus/usb -+ action $"Mounting USB filesystem: " mount -t usbfs usbfs /proc/bus/usb - fi - - needusbstorage= -@@ -360,7 +360,7 @@ - # Enter root, /proc and (potentially) /proc/bus/usb and devfs into mtab. - mount -f / - mount -f /proc --[ -f /proc/bus/usb/devices ] && mount -f -t usbdevfs usbdevfs /proc/bus/usb -+[ -f /proc/bus/usb/devices ] && mount -f -t usbfs usbfs /proc/bus/usb - [ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev - - Modified: tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec =================================================================== --- tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec 2005-06-30 22:07:13 UTC (rev 6474) +++ tinysofa/releases/classic/2.0/initscripts/current/specs/initscripts.spec 2005-07-01 06:36:46 UTC (rev 6475) @@ -3,7 +3,7 @@ Version: 7.31.9 License: GPL Group: main -Release: 16jh +Release: 18jh Source: initscripts-%{version}.tar.bz2 Source1: sysctl.grsec Source2: sysctl.raid @@ -15,7 +15,7 @@ Patch4: initscripts-7.31.9-tinysofa-kernel-2.6.patch Patch5: initscripts-7.31.9-alsa.patch Patch6: initscripts-7.31.9-dovecot.patch -Patch7: initscripts-7.31.9-usbfs.patch +Patch7: initscripts-7.31.9-usb.patch Patch8: initscripts-7.31.9-udev-support.patch Patch9: initscripts-7.31.9-legacy-ups.patch Patch10: initscripts-7.31.9-lvm2.patch @@ -53,7 +53,7 @@ %patch4 -p1 -b .kernel-2.6~ %patch5 -p1 -b .alsa~ %patch6 -p1 -b .dovecot~ -%patch7 -p1 -b .usbfs~ +%patch7 -p1 -b .usb~ %patch8 -p1 -b .udev~ %patch9 -p1 -b .legacy-ups~ %patch10 -p1 -b .lvm2~ @@ -228,6 +228,9 @@ %changelog +* Fri Jul 1 2005 Jaakko Heinonen 7.31.9-18jh +- usb fixes for 2.6 kernel + * Fri Jun 3 2005 Jaakko Heinonen 7.31.9-17jh - handle more network file systems From svn at tinysofa.org Fri Jul 1 08:24:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 1 Jul 2005 04:24:44 -0400 (EDT) Subject: [tinysofa-svn] r6476 - in tinysofa/releases/classic/2.0/kudzu/current: sources specs Message-ID: <20050701082444.A447E3452DC@minbar.tinysofa.org> Author: jh Date: 2005-07-01 04:24:35 -0400 (Fri, 01 Jul 2005) New Revision: 6476 Modified: tinysofa/releases/classic/2.0/kudzu/current/sources/kudzu-1.1.22-kernel26.patch tinysofa/releases/classic/2.0/kudzu/current/specs/kudzu.spec Log: - improve usb controller detection with 2.6 kernel Modified: tinysofa/releases/classic/2.0/kudzu/current/sources/kudzu-1.1.22-kernel26.patch =================================================================== --- tinysofa/releases/classic/2.0/kudzu/current/sources/kudzu-1.1.22-kernel26.patch 2005-07-01 06:36:46 UTC (rev 6475) +++ tinysofa/releases/classic/2.0/kudzu/current/sources/kudzu-1.1.22-kernel26.patch 2005-07-01 08:24:35 UTC (rev 6476) @@ -1,5 +1,5 @@ --- ./usb.c.kernel26~ 2004-04-01 08:03:01.000000000 +0300 -+++ ./usb.c 2005-02-15 20:55:56.000000000 +0200 ++++ ./usb.c 2005-07-01 10:00:49.000000000 +0300 @@ -139,9 +139,9 @@ { int fd; @@ -141,17 +141,15 @@ struct device *usbProbe(enum deviceClass probeClass, int probeFlags, struct device *devlist) -@@ -526,8 +568,8 @@ +@@ -526,7 +568,7 @@ } probeMods = malloc(2 * sizeof(struct module)); probeMods[0].name = NULL; - cf = readConfModules("/etc/modules.conf"); -- if (cf && (alias = getAlias(cf, "usb-controller")) + cf = readConfModules("/etc/modprobe.conf"); -+ if (cf && (alias = getAlias(cf, "usb-controller")) + if (cf && (alias = getAlias(cf, "usb-controller")) && !loadModule(alias)) { probeMods[0].name = strdup(alias); - probeMods[0].loaded = 1; @@ -570,6 +612,10 @@ parseTopologyLine(line, usbdev); break; @@ -164,7 +162,7 @@ if (usbdev != NULL) { tmpdev = usbNewDevice(usbdev); --- ./modules.c.kernel26~ 2002-11-13 22:12:06.000000000 +0200 -+++ ./modules.c 2005-02-15 20:55:56.000000000 +0200 ++++ ./modules.c 2005-07-01 10:00:49.000000000 +0300 @@ -9,7 +9,7 @@ * */ @@ -237,8 +235,22 @@ return runModuleCommand(args); } else { return -1; +--- ./pci.c.kernel26~ 2005-07-01 10:02:18.000000000 +0300 ++++ ./pci.c 2005-07-01 10:04:00.000000000 +0300 +@@ -760,9 +760,9 @@ + /* Test to see if it's UHCI or OHCI */ + free (dev->driver); + if (config[PCI_CLASS_PROG] == 0) { +- dev->driver = strdup("usb-uhci"); ++ dev->driver = strdup("uhci-hcd"); + } else if (config[PCI_CLASS_PROG] == 0x10) { +- dev->driver = strdup("usb-ohci"); ++ dev->driver = strdup("ohci-hcd"); + } else if (config[PCI_CLASS_PROG] == 0x20) { + dev->driver = strdup("ehci-hcd"); + } --- ./module_upgrade.c.kernel26~ 2003-04-16 22:49:17.000000000 +0300 -+++ ./module_upgrade.c 2005-02-15 20:55:56.000000000 +0200 ++++ ./module_upgrade.c 2005-07-01 10:00:49.000000000 +0300 @@ -123,13 +123,37 @@ readModlist(); @@ -322,7 +334,7 @@ return 0; } --- ./scsi.c.kernel26~ 2003-10-17 23:30:38.000000000 +0300 -+++ ./scsi.c 2005-02-15 20:58:23.000000000 +0200 ++++ ./scsi.c 2005-07-01 10:00:49.000000000 +0300 @@ -185,10 +185,10 @@ static void scsiFindDeviceNames(struct scsiDevice * devlist, int forceSeq) { struct scsiDevice * dev; @@ -357,7 +369,7 @@ } state = SCSISCSI_HOST; --- ./usb.h.kernel26~ 2003-07-03 07:29:27.000000000 +0300 -+++ ./usb.h 2005-02-15 20:55:56.000000000 +0200 ++++ ./usb.h 2005-07-01 10:00:49.000000000 +0300 @@ -13,6 +13,7 @@ #define _KUDZU_USB_H @@ -367,7 +379,7 @@ struct usbDevice { /* common fields */ --- ./kudzu.8.kernel26~ 2003-02-13 22:43:25.000000000 +0200 -+++ ./kudzu.8 2005-02-15 20:55:56.000000000 +0200 ++++ ./kudzu.8 2005-07-01 10:00:49.000000000 +0300 @@ -21,9 +21,9 @@ .B kudzu attempts to determine what devices have already been configured, @@ -390,7 +402,7 @@ .TP .I /etc/sysconfig/network-scripts/ifcfg-* --- ./modules.h.kernel26~ 2002-11-13 22:12:06.000000000 +0200 -+++ ./modules.h 2005-02-15 20:55:56.000000000 +0200 ++++ ./modules.h 2005-07-01 10:00:49.000000000 +0300 @@ -58,6 +58,7 @@ * alias eth2 tulip */ Modified: tinysofa/releases/classic/2.0/kudzu/current/specs/kudzu.spec =================================================================== --- tinysofa/releases/classic/2.0/kudzu/current/specs/kudzu.spec 2005-07-01 06:36:46 UTC (rev 6475) +++ tinysofa/releases/classic/2.0/kudzu/current/specs/kudzu.spec 2005-07-01 08:24:35 UTC (rev 6476) @@ -1,6 +1,6 @@ Name: kudzu Version: 1.1.22.9 -Release: 2jh +Release: 3jh License: GPL Summary: The Red Hat Linux hardware probing tool. Group: main @@ -91,6 +91,9 @@ %changelog +* Fri Jul 1 2005 Jaakko Heinonen 1.1.22.9-3jh +- improve usb controller detection with 2.6 kernel + * Tue Feb 15 2005 Jaakko Heinonen 1.1.22.9-2jh - add a patch for 2.6 kernel From svn at tinysofa.org Fri Jul 1 16:45:57 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Fri, 1 Jul 2005 12:45:57 -0400 (EDT) Subject: [tinysofa-svn] r6477 - in contrib/classic/2.0: . perl-dbd-sqlite perl-dbd-sqlite/current perl-dbd-sqlite/current/sources perl-dbd-sqlite/current/specs Message-ID: <20050701164557.597EE34509F@minbar.tinysofa.org> Author: gda Date: 2005-07-01 12:45:35 -0400 (Fri, 01 Jul 2005) New Revision: 6477 Added: contrib/classic/2.0/perl-dbd-sqlite/ contrib/classic/2.0/perl-dbd-sqlite/current/ contrib/classic/2.0/perl-dbd-sqlite/current/sources/ contrib/classic/2.0/perl-dbd-sqlite/current/sources/DBD-SQLite-1.09.tar.gz contrib/classic/2.0/perl-dbd-sqlite/current/specs/ contrib/classic/2.0/perl-dbd-sqlite/current/specs/perl-dbd-sqlite.spec contrib/classic/2.0/perl-dbd-sqlite/pristine/ contrib/classic/2.0/perl-dbd-sqlite/releases/ Log: new in contrib Added: contrib/classic/2.0/perl-dbd-sqlite/current/sources/DBD-SQLite-1.09.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/classic/2.0/perl-dbd-sqlite/current/sources/DBD-SQLite-1.09.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/classic/2.0/perl-dbd-sqlite/current/specs/perl-dbd-sqlite.spec =================================================================== --- contrib/classic/2.0/perl-dbd-sqlite/current/specs/perl-dbd-sqlite.spec 2005-07-01 08:24:35 UTC (rev 6476) +++ contrib/classic/2.0/perl-dbd-sqlite/current/specs/perl-dbd-sqlite.spec 2005-07-01 16:45:35 UTC (rev 6477) @@ -0,0 +1,60 @@ +%define perlname DBD-SQLite + +Summary: DBD::SQLite - Self Contained RDBMS in a DBI Driver +Name: perl-dbd-sqlite +Version: 1.09 +Release: 1gd +License: GPL +Group: contrib +Requires: perl sqlite3 +BuildRequires: perl-devel perl-dbi >= 1.03 sqlite3-devel +Buildroot: %{_tmppath}/%{name}-root +URL: http://search.cpan.org/dist/%{perlname}/ +Source: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/%{perlname}-%{version}.tar.gz + +%description +SQLite is a public domain RDBMS database engine that you can find +at http://www.hwaci.com/sw/sqlite/. + +Rather than asking you to install SQLite first, because SQLite is public +domain, DBD::SQLite includes the entire thing in the distribution. So in +order to get a fast transaction capable RDBMS working for your perl project +you simply have to install this module, and nothing else. + +SQLite supports the following features: + - Implements a large subset of SQL92 + - A complete DB in a single disk file + - Atomic commit and rollback + - Extensible (User-defined aggregate or regular functions can be + registered with the SQL parser) + +%prep +%setup -q -n %{perlname}-%{version} + +%build +%{__perl} Makefile.PL DESTDIR=%{buildroot} INSTALLDIRS=vendor USE_LOCAL_SQLITE=0 %{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 README + +%changelog +* Fri Jul 1 2005 Gerald Dachs 1.09-1gd +- new in tinysofa contrib From svn at tinysofa.org Sun Jul 3 17:31:52 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 3 Jul 2005 13:31:52 -0400 (EDT) Subject: [tinysofa-svn] r6478 - in tinysofa/releases/classic/2.0/krb5/current: sources specs Message-ID: <20050703173152.4A685345098@minbar.tinysofa.org> Author: jh Date: 2005-07-03 13:31:42 -0400 (Sun, 03 Jul 2005) New Revision: 6478 Added: tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.3.6-CAN-2004-0175.patch Modified: tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec Log: - CAN-2004-0175 Added: tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.3.6-CAN-2004-0175.patch =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.3.6-CAN-2004-0175.patch 2005-07-01 16:45:35 UTC (rev 6477) +++ tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.3.6-CAN-2004-0175.patch 2005-07-03 17:31:42 UTC (rev 6478) @@ -0,0 +1,44 @@ +--- krb5-1.3.3/src/appl/bsd/krcp.c 2003-05-12 18:20:15.000000000 -0400 ++++ krb5-1.3.3/src/appl/bsd/krcp.c 2004-04-13 12:01:31.000000000 -0400 +@@ -1088,6 +1088,10 @@ + size = size * 10 + (*cp++ - '0'); + if (*cp++ != ' ') + SCREWUP("size not delimited"); ++ if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { ++ error("error: unexpected filename: %s", cp); ++ exit(1); ++ } + if (targisdir) { + if(strlen(targ) + strlen(cp) + 2 >= sizeof(nambuf)) + SCREWUP("target name too long"); +@@ -1101,6 +1105,8 @@ + nambuf[sizeof(nambuf) - 1] = '\0'; + exists = stat(nambuf, &stb) == 0; + if (cmdbuf[0] == 'D') { ++ if (!iamrecursive) ++ SCREWUP("received directory without -r"); + if (exists) { + if ((stb.st_mode&S_IFMT) != S_IFDIR) { + errno = ENOTDIR; +--- krb5-1.3.3/src/appl/bsd/v4rcp.c 2002-07-12 16:21:31.000000000 -0400 ++++ krb5-1.3.3/src/appl/bsd/v4rcp.c 2004-04-13 12:01:53.000000000 -0400 +@@ -801,6 +801,10 @@ + size = size * 10 + (*cp++ - '0'); + if (*cp++ != ' ') + SCREWUP("size not delimited"); ++ if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { ++ error("error: unexpected filename: %s", cp); ++ exit(1); ++ } + if (targisdir) { + if (strlen(targ) + strlen(cp) + 1 < sizeof(nambuf)) { + (void) sprintf(nambuf, "%s%s%s", targ, +@@ -817,6 +821,8 @@ + nambuf[sizeof(nambuf)-1] = '\0'; + exists = stat(nambuf, &stb) == 0; + if (cmdbuf[0] == 'D') { ++ if (!iamrecursive) ++ SCREWUP("received directory without -r"); + if (exists) { + if ((stb.st_mode&S_IFMT) != S_IFDIR) { + errno = ENOTDIR; Modified: tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec 2005-07-01 16:45:35 UTC (rev 6477) +++ tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec 2005-07-03 17:31:42 UTC (rev 6478) @@ -1,11 +1,12 @@ Summary: Kerberos is a network authentication protocol. Name: krb5 Version: 1.3.6 -Release: 6jh +Release: 7jh Group: main Source0: krb5-%{version}.tar.gz Patch0: krb5-1.3.6-prof_err.patch Patch1: 2005-001-patch_1.4.txt +Patch2: krb5-1.3.6-CAN-2004-0175.patch URL: http://web.mit.edu/kerberos License: Distributable Requires: libcom_err libtermcap ncurses @@ -47,6 +48,7 @@ cd src/appl/telnet/telnet %patch1 -p0 cd - +%patch2 -p1 -b .CAN-2004-0175~ %build @@ -101,6 +103,9 @@ %changelog +* Sun Jul 3 2005 Jaakko Heinonen 1.3.6-7jh +- CAN-2004-0175 + * Wed Mar 30 2005 Jaakko Heinonen 1.3.6-5jh - fix CAN-2005-0468 and CAN-2005-0469 (2005-001-patch_1.4.txt) From svn at tinysofa.org Sun Jul 3 17:35:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 3 Jul 2005 13:35:03 -0400 (EDT) Subject: [tinysofa-svn] r6479 - in tinysofa/releases/classic/2.0/openldap/current: sources specs Message-ID: <20050703173503.6138D345099@minbar.tinysofa.org> Author: jh Date: 2005-07-03 13:34:53 -0400 (Sun, 03 Jul 2005) New Revision: 6479 Added: tinysofa/releases/classic/2.0/openldap/current/sources/openldap-2.1.30-tls_fix_connection.patch Modified: tinysofa/releases/classic/2.0/openldap/current/specs/openldap.spec Log: - CAN-2005-2069 Added: tinysofa/releases/classic/2.0/openldap/current/sources/openldap-2.1.30-tls_fix_connection.patch =================================================================== --- tinysofa/releases/classic/2.0/openldap/current/sources/openldap-2.1.30-tls_fix_connection.patch 2005-07-03 17:31:42 UTC (rev 6478) +++ tinysofa/releases/classic/2.0/openldap/current/sources/openldap-2.1.30-tls_fix_connection.patch 2005-07-03 17:34:53 UTC (rev 6479) @@ -0,0 +1,13 @@ +diff -urN openldap-2.2.26.orig/libraries/libldap/tls.c openldap-2.2.26/libraries/libldap/tls.c +--- openldap-2.2.26.orig/libraries/libldap/tls.c 2005-01-20 17:01:02.000000000 +0000 ++++ openldap-2.2.26/libraries/libldap/tls.c 2005-06-22 01:34:22.000000000 +0100 +@@ -1738,7 +1738,8 @@ + + /* XXYYZ: this initiates operation only on default connection! */ + +- if ( ld->ld_sb != NULL && ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) { ++ if ( ( ld->ld_defconn != NULL ) ? ( ld->ld_defconn->lconn_sb != NULL && ldap_pvt_tls_inplace( ld->ld_defconn->lconn_sb ) != 0 ) ++ : ( ld->ld_sb != NULL && ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) ) { + return LDAP_LOCAL_ERROR; + } + Modified: tinysofa/releases/classic/2.0/openldap/current/specs/openldap.spec =================================================================== --- tinysofa/releases/classic/2.0/openldap/current/specs/openldap.spec 2005-07-03 17:31:42 UTC (rev 6478) +++ tinysofa/releases/classic/2.0/openldap/current/specs/openldap.spec 2005-07-03 17:34:53 UTC (rev 6479) @@ -6,7 +6,7 @@ Summary: Lightweight Directory Access Protocol clients/servers Name: openldap Version: 2.1.30 -Release: 6jh +Release: 7jh Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz Source1: openldap.init Source2: openldap-slapd.conf @@ -28,6 +28,7 @@ Patch23: MigrationTools-27-simple.patch Patch24: MigrationTools-26-suffix.patch Patch25: MigrationTools-44-schema.patch +Patch26: openldap-2.1.30-tls_fix_connection.patch URL: http://www.openldap.org/ License: Freely distributable Group: extra @@ -110,6 +111,7 @@ %patch24 -p1 %patch25 -p1 popd +%patch26 -p1 %build @@ -280,6 +282,9 @@ %changelog +* Sun Jul 3 2005 Jaakko Heinonen 2.1.30-7jh +- CAN-2005-2069 + * Tue Jan 04 2005 tsintegrate 2.1.30-5ts - current (2.1.30-5jh) integrated as 2.1.30-5ts for release 1.1-U3 From svn at tinysofa.org Sun Jul 3 17:38:22 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 3 Jul 2005 13:38:22 -0400 (EDT) Subject: [tinysofa-svn] r6480 - tinysofa/releases/classic/2.0/nss_ldap/current/specs Message-ID: <20050703173822.CD594344F4A@minbar.tinysofa.org> Author: jh Date: 2005-07-03 13:38:16 -0400 (Sun, 03 Jul 2005) New Revision: 6480 Modified: tinysofa/releases/classic/2.0/nss_ldap/current/specs/nss_ldap.spec Log: - CAN-2005-2069 Modified: tinysofa/releases/classic/2.0/nss_ldap/current/specs/nss_ldap.spec =================================================================== --- tinysofa/releases/classic/2.0/nss_ldap/current/specs/nss_ldap.spec 2005-07-03 17:34:53 UTC (rev 6479) +++ tinysofa/releases/classic/2.0/nss_ldap/current/specs/nss_ldap.spec 2005-07-03 17:38:16 UTC (rev 6480) @@ -3,7 +3,7 @@ Summary: NSS library and PAM module for LDAP. Name: nss_ldap Version: %{nss_ldap_version} -Release: 3jh +Release: 4jh Source0: ftp://ftp.padl.com/pub/nss_ldap-%{nss_ldap_version}.tar.gz Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz Source3: nss_ldap.versions @@ -12,6 +12,7 @@ Source6: version.c Source7: dlopen.sh Patch0: pam_ldap-176-dnsconfig.patch +Patch1: pam_ldap-fix_referral_tls.patch URL: http://www.padl.com/ License: LGPL Group: main @@ -62,7 +63,8 @@ cp nss_ldap-%{nss_ldap_version}/snprintf.h pam_ldap-%{pam_ldap_version}/ pushd pam_ldap-%{pam_ldap_version} -%patch0 -p1 -b .dnsconfig +%patch0 -p1 -b .dnsconfig~ +%patch1 -p1 -b .tls~ autoreconf popd @@ -213,6 +215,9 @@ %changelog +* Sun Jul 3 2005 Jaakko Heinonen 226-4jh +- CAN-2005-2069 + * Tue Jan 04 2005 tsintegrate 226-2ts - current (226-2jh) integrated as 226-2ts for release 1.1-U3 From svn at tinysofa.org Sun Jul 3 18:19:02 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 3 Jul 2005 14:19:02 -0400 (EDT) Subject: [tinysofa-svn] r6481 - in tinysofa/releases/classic/2.0/php/current: sources specs Message-ID: <20050703181902.D56293451B9@minbar.tinysofa.org> Author: jh Date: 2005-07-03 14:18:55 -0400 (Sun, 03 Jul 2005) New Revision: 6481 Added: tinysofa/releases/classic/2.0/php/current/sources/php-5.0.4-XML_RPC.patch Modified: tinysofa/releases/classic/2.0/php/current/specs/php.spec Log: - CAN-2005-1921 Added: tinysofa/releases/classic/2.0/php/current/sources/php-5.0.4-XML_RPC.patch =================================================================== --- tinysofa/releases/classic/2.0/php/current/sources/php-5.0.4-XML_RPC.patch 2005-07-03 17:38:16 UTC (rev 6480) +++ tinysofa/releases/classic/2.0/php/current/sources/php-5.0.4-XML_RPC.patch 2005-07-03 18:18:55 UTC (rev 6481) @@ -0,0 +1,31 @@ +--- XML_RPC-1.2.2/RPC.php.orig 2005-06-30 10:30:59.171982257 +0000 ++++ XML_RPC-1.2.2/RPC.php 2005-06-30 10:39:45.409680644 +0000 +@@ -219,7 +219,7 @@ + break; + + case 'NAME': +- $XML_RPC_xh[$parser]['st'] .= "'"; ++ $XML_RPC_xh[$parser]['st'] .= '"'; + $XML_RPC_xh[$parser]['ac'] = ''; + break; + +@@ -301,7 +301,7 @@ + break; + + case 'NAME': +- $XML_RPC_xh[$parser]['st'] .= $XML_RPC_xh[$parser]['ac'] . "' => "; ++ $XML_RPC_xh[$parser]['st'] .= $XML_RPC_xh[$parser]['ac'] . '" => '; + break; + + case 'BOOLEAN': +@@ -326,8 +326,8 @@ + // we use double quotes rather than single so backslashification works OK + $XML_RPC_xh[$parser]['st'] .= '"' . $XML_RPC_xh[$parser]['ac'] . '"'; + } elseif ($XML_RPC_xh[$parser]['qt'] == 2) { +- $XML_RPC_xh[$parser]['st'] .= "base64_decode('" +- . $XML_RPC_xh[$parser]['ac'] . "')"; ++ $XML_RPC_xh[$parser]['st'] .= "base64_decode("' ++ . $XML_RPC_xh[$parser]['ac'] . '")'; + } elseif ($name == 'BOOLEAN') { + $XML_RPC_xh[$parser]['st'] .= $XML_RPC_xh[$parser]['ac']; + } else { Modified: tinysofa/releases/classic/2.0/php/current/specs/php.spec =================================================================== --- tinysofa/releases/classic/2.0/php/current/specs/php.spec 2005-07-03 17:38:16 UTC (rev 6480) +++ tinysofa/releases/classic/2.0/php/current/specs/php.spec 2005-07-03 18:18:55 UTC (rev 6481) @@ -8,7 +8,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php Version: 5.0.4 -Release: 1jh +Release: 2jh License: The PHP License Group: main URL: http://www.php.net/ @@ -30,6 +30,7 @@ Patch10: php-5.0.2-gdnspace.patch Patch11: php-4.3.8-round.patch Patch13: php-5.0.2-phpize64.patch +Patch14: php-5.0.4-XML_RPC.patch # Fixes for extension modules Patch21: php-4.3.1-odbc.patch @@ -330,6 +331,12 @@ %patch11 -p1 -b .round %patch13 -p1 -b .phpize64 +pushd pear/packages +tar xpvf XML_RPC-1.2.2.tar +%patch14 -p0 +tar cpvf XML_RPC-1.2.2.tar package.xml package2.xml XML_RPC-1.2.2 +popd + %patch21 -p1 -b .odbc %patch30 -p1 -b .dlopen @@ -633,6 +640,9 @@ %endif %changelog +* Sun Jul 3 2005 Jaakko Heinonen 5.0.4-2jh +- CAN-2005-1921 + * Fri Apr 1 2005 Jaakko Heinonen 5.0.4-1jh - 5.0.4, fixes CAN-2005-0524 and CAN-2005-0525 From svn at tinysofa.org Sun Jul 3 18:22:34 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Sun, 3 Jul 2005 14:22:34 -0400 (EDT) Subject: [tinysofa-svn] r6482 - in tinysofa/releases/classic/1.1/php4/current: sources specs Message-ID: <20050703182234.8AF2A344F45@minbar.tinysofa.org> Author: jh Date: 2005-07-03 14:22:27 -0400 (Sun, 03 Jul 2005) New Revision: 6482 Added: tinysofa/releases/classic/1.1/php4/current/sources/php4-4.3.11-XML_RPC.patch Modified: tinysofa/releases/classic/1.1/php4/current/specs/php4.spec Log: - CAN-2005-1921 Added: tinysofa/releases/classic/1.1/php4/current/sources/php4-4.3.11-XML_RPC.patch =================================================================== --- tinysofa/releases/classic/1.1/php4/current/sources/php4-4.3.11-XML_RPC.patch 2005-07-03 18:18:55 UTC (rev 6481) +++ tinysofa/releases/classic/1.1/php4/current/sources/php4-4.3.11-XML_RPC.patch 2005-07-03 18:22:27 UTC (rev 6482) @@ -0,0 +1,31 @@ +--- XML_RPC-1.2.2/RPC.php.orig 2005-06-30 10:30:59.171982257 +0000 ++++ XML_RPC-1.2.2/RPC.php 2005-06-30 10:39:45.409680644 +0000 +@@ -219,7 +219,7 @@ + break; + + case 'NAME': +- $XML_RPC_xh[$parser]['st'] .= "'"; ++ $XML_RPC_xh[$parser]['st'] .= '"'; + $XML_RPC_xh[$parser]['ac'] = ''; + break; + +@@ -301,7 +301,7 @@ + break; + + case 'NAME': +- $XML_RPC_xh[$parser]['st'] .= $XML_RPC_xh[$parser]['ac'] . "' => "; ++ $XML_RPC_xh[$parser]['st'] .= $XML_RPC_xh[$parser]['ac'] . '" => '; + break; + + case 'BOOLEAN': +@@ -326,8 +326,8 @@ + // we use double quotes rather than single so backslashification works OK + $XML_RPC_xh[$parser]['st'] .= '"' . $XML_RPC_xh[$parser]['ac'] . '"'; + } elseif ($XML_RPC_xh[$parser]['qt'] == 2) { +- $XML_RPC_xh[$parser]['st'] .= "base64_decode('" +- . $XML_RPC_xh[$parser]['ac'] . "')"; ++ $XML_RPC_xh[$parser]['st'] .= "base64_decode("' ++ . $XML_RPC_xh[$parser]['ac'] . '")'; + } elseif ($name == 'BOOLEAN') { + $XML_RPC_xh[$parser]['st'] .= $XML_RPC_xh[$parser]['ac']; + } else { Modified: tinysofa/releases/classic/1.1/php4/current/specs/php4.spec =================================================================== --- tinysofa/releases/classic/1.1/php4/current/specs/php4.spec 2005-07-03 18:18:55 UTC (rev 6481) +++ tinysofa/releases/classic/1.1/php4/current/specs/php4.spec 2005-07-03 18:22:27 UTC (rev 6482) @@ -7,7 +7,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php4 Version: 4.3.11 -Release: 1jh +Release: 2jh License: The PHP License Group: main URL: http://www.php.net/ @@ -25,6 +25,7 @@ Patch7: php-4.3.2-libtool15.patch Patch8: php-4.3.3-miscfix.patch Patch9: php-4.3.7-handler.patch +Patch10: php4-4.3.11-XML_RPC.patch # Fixes for extension modules Patch21: php-4.3.1-odbc.patch @@ -335,6 +336,12 @@ %patch8 -p1 -b .miscfix #%patch9 -p1 -b .handler +pushd pear/packages +tar xpvf XML_RPC-1.2.2.tar +%patch10 -p0 +tar cpvf XML_RPC-1.2.2.tar package.xml package2.xml XML_RPC-1.2.2 +popd + %if 0 %patch21 -p1 -b .odbc %endif @@ -613,6 +620,9 @@ %endif %changelog +* Sun Jul 3 2005 Jaakko Heinonen 4.3.11-2jh +- CAN-2005-1921 + * Fri Apr 1 2005 Jaakko Heinonen 4.3.11-1jh - 4.3.11, fixes CAN-2005-0524 and CAN-2005-0525 From svn at tinysofa.org Mon Jul 4 18:29:32 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 4 Jul 2005 14:29:32 -0400 (EDT) Subject: [tinysofa-svn] r6483 - tinysofa/releases/classic/2.0/xinetd/current/specs Message-ID: <20050704182932.2F97A345090@minbar.tinysofa.org> Author: jh Date: 2005-07-04 14:29:26 -0400 (Mon, 04 Jul 2005) New Revision: 6483 Modified: tinysofa/releases/classic/2.0/xinetd/current/specs/xinetd.spec Log: - major spec cleanup Modified: tinysofa/releases/classic/2.0/xinetd/current/specs/xinetd.spec =================================================================== --- tinysofa/releases/classic/2.0/xinetd/current/specs/xinetd.spec 2005-07-03 18:22:27 UTC (rev 6482) +++ tinysofa/releases/classic/2.0/xinetd/current/specs/xinetd.spec 2005-07-04 18:29:26 UTC (rev 6483) @@ -1,7 +1,7 @@ Summary: A secure replacement for inetd. Name: xinetd Version: 2.3.13 -Release: 9jh +Release: 10jh License: Distributable Group: main Source: http://www.xinetd.org/%{name}-%{version}.tar.gz @@ -20,12 +20,12 @@ Source13: xinetd-servers Source14: xinetd-services Provides: inetd -Prereq: /etc/init.d +Prereq: %{_initrddir} %service_requires BuildRequires: tcp_wrappers-devel glibc-devel libtool Requires: filesystem, initscripts, setup, coreutils URL: http://www.xinetd.org -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Xinetd is a secure replacement for inetd, the Internet services @@ -35,59 +35,67 @@ limit on the number of server arguments, and lets you bind specific services to specific IP addresses on your host machine. Each service has its own specific configuration file for Xinetd; the files are -located in the /etc/xinetd.d directory. +located in the %{_sysconfdir}/xinetd.d directory. + %prep %setup -q + %build libtoolize --copy --force export CFLAGS="$RPM_OPT_FLAGS -fPIE" export LDFLAGS="$LDFLAGS -pie" -./configure --with-libwrap --with-inet6 -make +%configure --with-libwrap --with-inet6 +%make cp xinetd/xinetd xinetd-ipv6 make clean rm -f config.cache -./configure --with-libwrap -make +%configure --with-libwrap +%make + %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%{__mkdir_p} \ + %{buildroot}%{_initrddir} \ + %{buildroot}%{_sysconfdir}/init.d \ + %{buildroot}%{_sysconfdir}/xinetd.d -mkdir -p $RPM_BUILD_ROOT/etc/init.d -make DESTDIR="$RPM_BUILD_ROOT" DAEMONDIR=$RPM_BUILD_ROOT/usr/sbin MANDIR=$RPM_BUILD_ROOT/%{_mandir} install +make install \ + DESTDIR="%{buildroot}" \ + DAEMONDIR=%{buildroot}%{_sbindir} \ + MANDIR=%{buildroot}%{_mandir} -mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d/ -install -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/xinetd -install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/xinetd.conf -install -m 644 %SOURCE3 $RPM_BUILD_ROOT/usr/sbin/inetdconvert -install -m 644 %SOURCE4 $RPM_BUILD_ROOT/etc/xinetd.d/time -install -m 644 %SOURCE5 $RPM_BUILD_ROOT/etc/xinetd.d/time-udp -install -m 644 %SOURCE6 $RPM_BUILD_ROOT/etc/xinetd.d/daytime -install -m 644 %SOURCE7 $RPM_BUILD_ROOT/etc/xinetd.d/daytime-udp -install -m 644 %SOURCE8 $RPM_BUILD_ROOT/etc/xinetd.d/echo -install -m 644 %SOURCE9 $RPM_BUILD_ROOT/etc/xinetd.d/echo-udp -install -m 644 %SOURCE10 $RPM_BUILD_ROOT/etc/xinetd.d/chargen -install -m 644 %SOURCE11 $RPM_BUILD_ROOT/etc/xinetd.d/chargen-udp -install -m 644 %SOURCE13 $RPM_BUILD_ROOT/etc/xinetd.d/servers -install -m 644 %SOURCE14 $RPM_BUILD_ROOT/etc/xinetd.d/services +install -m 755 %SOURCE1 %{buildroot}%{_initrddir}/xinetd +install -m 644 %SOURCE2 %{buildroot}%{_sysconfdir}/xinetd.conf +install -m 755 %SOURCE3 %{buildroot}%{_sbindir}/inetdconvert +install -m 644 %SOURCE4 %{buildroot}%{_sysconfdir}/xinetd.d/time +install -m 644 %SOURCE5 %{buildroot}%{_sysconfdir}/xinetd.d/time-udp +install -m 644 %SOURCE6 %{buildroot}%{_sysconfdir}/xinetd.d/daytime +install -m 644 %SOURCE7 %{buildroot}%{_sysconfdir}/xinetd.d/daytime-udp +install -m 644 %SOURCE8 %{buildroot}%{_sysconfdir}/xinetd.d/echo +install -m 644 %SOURCE9 %{buildroot}%{_sysconfdir}/xinetd.d/echo-udp +install -m 644 %SOURCE10 %{buildroot}%{_sysconfdir}/xinetd.d/chargen +install -m 644 %SOURCE11 %{buildroot}%{_sysconfdir}/xinetd.d/chargen-udp +install -m 644 %SOURCE13 %{buildroot}%{_sysconfdir}/xinetd.d/servers +install -m 644 %SOURCE14 %{buildroot}%{_sysconfdir}/xinetd.d/services -install -m 755 xinetd-ipv6 $RPM_BUILD_ROOT/usr/sbin/xinetd-ipv6 +install -m 755 xinetd-ipv6 %{buildroot}%{_sbindir}/xinetd-ipv6 -rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/itox* -rm -f $RPM_BUILD_ROOT/usr/sbin/itox -rm -f $RPM_BUILD_ROOT/usr/sbin/xconv.pl +rm -f %{buildroot}%{_mandir}/man8/itox* +rm -f %{buildroot}%{_sbindir}/itox +rm -f %{buildroot}%{_sbindir}/xconv.pl -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -install -m 644 %SOURCE12 $RPM_BUILD_ROOT/etc/sysconfig/xinetd +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +install -m 644 %SOURCE12 %{buildroot}%{_sysconfdir}/sysconfig/xinetd + %clean %clean_buildroot + %post -chmod +x /usr/sbin/inetdconvert %service_post xinetd %preun @@ -96,21 +104,25 @@ %postun %service_postun xinetd + %files %defattr(-,root,root) %doc INSTALL README xinetd/sample.conf +%{_sbindir}/xinetd +%{_sbindir}/xinetd-ipv6 +%{_sbindir}/inetdconvert +%{_mandir}/man?/* +%config %{_initrddir}/xinetd +%dir %{_sysconfdir}/xinetd.d +%config(noreplace) %{_sysconfdir}/xinetd.conf +%config(noreplace) %{_sysconfdir}/xinetd.d/* +%config(noreplace) %{_sysconfdir}/sysconfig/xinetd -%config(noreplace) /etc/xinetd.conf -/usr/sbin/xinetd -/usr/sbin/xinetd-ipv6 -/usr/sbin/inetdconvert -%{_mandir}/*/* -%config /etc/init.d/xinetd -%dir /etc/xinetd.d -%config(noreplace) /etc/xinetd.d/* -%config(noreplace) /etc/sysconfig/xinetd %changelog +* Mon Jul 4 2005 Jaakko Heinonen 2.3.13-10jh +- major spec cleanup + * Thu Aug 05 2004 tsintegrate 2.3.13-8ts - current (2.3.13-8jh) integrated as 2.3.13-8ts for release 1.1 @@ -124,7 +136,7 @@ - Add BuildRequires libtool. * Wed Mar 31 2004 Omar Kilani 2.3.13-5ts -- Own /etc/xinetd.d +- Own %%{_sysconfdir}/xinetd.d * Fri Feb 06 2004 Omar Kilani 2.3.13-1ok - New upstream. @@ -145,7 +157,7 @@ - Rebuilt against glibc 2.3.2. * Thu Feb 27 2003 Christian H. Toldnes 2.3.5-8ct -- Added better removel of $RPM_BUILD_ROOT +- Added better removel of %%{buildroot} - Fixed bug in %filelilst - More correct license From svn at tinysofa.org Mon Jul 4 20:32:08 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 4 Jul 2005 16:32:08 -0400 (EDT) Subject: [tinysofa-svn] r6484 - in contrib/classic/2.0: . qemu qemu/current qemu/current/sources qemu/current/specs Message-ID: <20050704203208.358C2345071@minbar.tinysofa.org> Author: gda Date: 2005-07-04 16:31:31 -0400 (Mon, 04 Jul 2005) New Revision: 6484 Added: contrib/classic/2.0/qemu/ contrib/classic/2.0/qemu/current/ contrib/classic/2.0/qemu/current/sources/ contrib/classic/2.0/qemu/current/sources/qemu-0.7.0.tar.gz contrib/classic/2.0/qemu/current/specs/ contrib/classic/2.0/qemu/current/specs/qemu.spec contrib/classic/2.0/qemu/pristine/ contrib/classic/2.0/qemu/releases/ Log: new in contrib Added: contrib/classic/2.0/qemu/current/sources/qemu-0.7.0.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/classic/2.0/qemu/current/sources/qemu-0.7.0.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/classic/2.0/qemu/current/specs/qemu.spec =================================================================== --- contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-04 18:29:26 UTC (rev 6483) +++ contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-04 20:31:31 UTC (rev 6484) @@ -0,0 +1,42 @@ +Name: qemu +Version: 0.7.0 +Release: 1gd +Group: contrib +Summary: A processor emulator +Source0: %{name}-%{version}.tar.gz +License: GPL +URL: http://fabrice.bellard.free.fr/qemu/ +Requires: libsdl zlib +BuildRequires: libsdl-devel zlib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +A processor emulator that is used to run an x86 Linux Kernel on x86 Linux. + +%prep +%setup -q + + +%build +%configure --datadir=%{_datadir}/%{name} +%make + +%install +%makeinstall docdir=$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version} \ + datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} + +%clean +%clean_buildroot + + +%files +%defattr(-,root,root,0755) +%{_bindir}/* +%{_datadir}/qemu +%{_mandir}/man1/* +%{_defaultdocdir}/%{name}-%{version} + +%changelog +* Mon Jul 4 2005 Gerald Dachs 0.7.0-1gd +- tinysofa contrib + From svn at tinysofa.org Mon Jul 4 21:19:03 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 4 Jul 2005 17:19:03 -0400 (EDT) Subject: [tinysofa-svn] r6485 - contrib/classic/2.0/qemu/current/specs Message-ID: <20050704211903.03A543451CE@minbar.tinysofa.org> Author: jh Date: 2005-07-04 17:18:58 -0400 (Mon, 04 Jul 2005) New Revision: 6485 Modified: contrib/classic/2.0/qemu/current/specs/qemu.spec Log: - use RPM_OPT_FLAGS - add support for accelerator module - improve description Modified: contrib/classic/2.0/qemu/current/specs/qemu.spec =================================================================== --- contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-04 20:31:31 UTC (rev 6484) +++ contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-04 21:18:58 UTC (rev 6485) @@ -1,6 +1,6 @@ Name: qemu Version: 0.7.0 -Release: 1gd +Release: 2jh Group: contrib Summary: A processor emulator Source0: %{name}-%{version}.tar.gz @@ -11,7 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description -A processor emulator that is used to run an x86 Linux Kernel on x86 Linux. +Qemu is a generic and open source processor emulator which achieves a good +emulation speed by using dynamic translation. %prep %setup -q @@ -19,7 +20,7 @@ %build %configure --datadir=%{_datadir}/%{name} -%make +%make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install %makeinstall docdir=$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version} \ @@ -37,6 +38,11 @@ %{_defaultdocdir}/%{name}-%{version} %changelog +* Tue Jul 5 2005 Jaakko Heinonen 0.7.0-2jh +- use RPM_OPT_FLAGS +- add support for accelerator module +- improve description + * Mon Jul 4 2005 Gerald Dachs 0.7.0-1gd - tinysofa contrib From svn at tinysofa.org Mon Jul 4 21:22:30 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 4 Jul 2005 17:22:30 -0400 (EDT) Subject: [tinysofa-svn] r6486 - contrib/classic/2.0/qemu/current/specs Message-ID: <20050704212230.8DE58345246@minbar.tinysofa.org> Author: jh Date: 2005-07-04 17:22:24 -0400 (Mon, 04 Jul 2005) New Revision: 6486 Modified: contrib/classic/2.0/qemu/current/specs/qemu.spec Log: - actually add the accelerator support Modified: contrib/classic/2.0/qemu/current/specs/qemu.spec =================================================================== --- contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-04 21:18:58 UTC (rev 6485) +++ contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-04 21:22:24 UTC (rev 6486) @@ -20,6 +20,11 @@ %build %configure --datadir=%{_datadir}/%{name} +# include support for propiertary accelator module +%ifarch %{ix86} x86_64 +echo "CONFIG_KQEMU=yes" >> config-host.mak +echo "#define USE_KQEMU 1" >> config-host.h +%endif %make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install From svn at tinysofa.org Mon Jul 4 22:12:46 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 4 Jul 2005 18:12:46 -0400 (EDT) Subject: [tinysofa-svn] r6487 - contrib/classic/2.0/qemu/current/specs Message-ID: <20050704221246.C735B345274@minbar.tinysofa.org> Author: gda Date: 2005-07-04 18:12:41 -0400 (Mon, 04 Jul 2005) New Revision: 6487 Modified: contrib/classic/2.0/qemu/current/specs/qemu.spec Log: small fixes Modified: contrib/classic/2.0/qemu/current/specs/qemu.spec =================================================================== --- contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-04 21:22:24 UTC (rev 6486) +++ contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-04 22:12:41 UTC (rev 6487) @@ -1,9 +1,10 @@ Name: qemu Version: 0.7.0 -Release: 2jh +Release: 3gd Group: contrib Summary: A processor emulator Source0: %{name}-%{version}.tar.gz +Patch0: %{name}-0.7.0-install-nodocs.patch License: GPL URL: http://fabrice.bellard.free.fr/qemu/ Requires: libsdl zlib @@ -16,20 +17,15 @@ %prep %setup -q +%patch -p1 -b .ndi~ %build %configure --datadir=%{_datadir}/%{name} -# include support for propiertary accelator module -%ifarch %{ix86} x86_64 -echo "CONFIG_KQEMU=yes" >> config-host.mak -echo "#define USE_KQEMU 1" >> config-host.h -%endif %make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install -%makeinstall docdir=$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version} \ - datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} +%makeinstall datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} %clean %clean_buildroot @@ -37,12 +33,17 @@ %files %defattr(-,root,root,0755) +%doc qemu-doc.html qemu-tech.html Changelog COPYING COPYING.LIB LICENSE README +%doc README.distrib TODO %{_bindir}/* %{_datadir}/qemu %{_mandir}/man1/* -%{_defaultdocdir}/%{name}-%{version} %changelog +* Mon Jul 5 2005 Gerald Dachs 0.7.0-1gd +- clean up docs install +- removed support for accelerator module + * Tue Jul 5 2005 Jaakko Heinonen 0.7.0-2jh - use RPM_OPT_FLAGS - add support for accelerator module From svn at tinysofa.org Mon Jul 4 22:13:17 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 4 Jul 2005 18:13:17 -0400 (EDT) Subject: [tinysofa-svn] r6488 - contrib/classic/2.0/qemu/current/sources Message-ID: <20050704221317.B2C2D345274@minbar.tinysofa.org> Author: gda Date: 2005-07-04 18:13:12 -0400 (Mon, 04 Jul 2005) New Revision: 6488 Added: contrib/classic/2.0/qemu/current/sources/qemu-0.7.0-install-nodocs.patch Log: small fixes Added: contrib/classic/2.0/qemu/current/sources/qemu-0.7.0-install-nodocs.patch =================================================================== --- contrib/classic/2.0/qemu/current/sources/qemu-0.7.0-install-nodocs.patch 2005-07-04 22:12:41 UTC (rev 6487) +++ contrib/classic/2.0/qemu/current/sources/qemu-0.7.0-install-nodocs.patch 2005-07-04 22:13:12 UTC (rev 6488) @@ -0,0 +1,11 @@ +--- qemu-0.7.0/Makefile.orig 2005-07-04 23:56:42.000000000 +0200 ++++ qemu-0.7.0/Makefile 2005-07-04 23:56:56.000000000 +0200 +@@ -62,8 +62,6 @@ + pc-bios/ppc_rom.bin \ + pc-bios/proll.elf \ + pc-bios/linux_boot.bin "$(datadir)" +- mkdir -p "$(docdir)" +- install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" + ifndef CONFIG_WIN32 + mkdir -p "$(mandir)/man1" + install qemu.1 qemu-img.1 "$(mandir)/man1" From svn at tinysofa.org Tue Jul 5 13:05:44 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 5 Jul 2005 09:05:44 -0400 (EDT) Subject: [tinysofa-svn] r6489 - in contrib/classic/2.0/nut/current: sources specs Message-ID: <20050705130544.006E7344FF7@minbar.tinysofa.org> Author: jh Date: 2005-07-05 09:05:36 -0400 (Tue, 05 Jul 2005) New Revision: 6489 Modified: contrib/classic/2.0/nut/current/sources/nut-initscripts.patch contrib/classic/2.0/nut/current/specs/nut.spec Log: - rationalize service handling Modified: contrib/classic/2.0/nut/current/sources/nut-initscripts.patch =================================================================== --- contrib/classic/2.0/nut/current/sources/nut-initscripts.patch 2005-07-04 22:13:12 UTC (rev 6488) +++ contrib/classic/2.0/nut/current/sources/nut-initscripts.patch 2005-07-05 13:05:36 UTC (rev 6489) @@ -1,12 +1,15 @@ ---- ./scripts/RedHat/upsmon.orig 2005-05-23 13:54:08.000000000 +0300 -+++ ./scripts/RedHat/upsmon 2005-05-23 13:54:36.000000000 +0300 -@@ -16,10 +16,10 @@ +--- ./scripts/RedHat/upsd.initscripts~ 2005-01-27 16:33:19.000000000 +0200 ++++ ./scripts/RedHat/upsd 2005-07-05 15:56:03.000000000 +0300 +@@ -25,13 +25,13 @@ export PATH # Source function library. -. /etc/rc.d/init.d/functions +. /etc/init.d/functions + # POWERDOWNFLAG *must* match that in upsmon.conf + # Loading POWERDOWNFLAG from /etc/sysconfig/ups + DRIVERPATH=/sbin -if [ -f /etc/sysconfig/ups ]; then - . /etc/sysconfig/ups +if [ -f /etc/sysconfig/nut ]; then @@ -14,18 +17,36 @@ else POWERDOWNFLAG=/etc/killpower NUTUSER=nutmon ---- ./scripts/RedHat/upsd.orig 2005-05-23 13:52:58.000000000 +0300 -+++ ./scripts/RedHat/upsd 2005-05-23 13:54:02.000000000 +0300 -@@ -25,13 +25,13 @@ +@@ -98,13 +98,16 @@ + ;; + + status) +- # new style drivers +- action "NUT: checking UPS model drivers" upsdrvctl status +- + status upsd + ;; ++ condrestart|try-restart) ++ if [ -e /var/lock/subsys/upsd ]; then ++ $0 stop ++ $0 start ++ fi ++ ;; + *) +- echo "Usage: upsd {start|stop|powerdown|restart|reload|status}" ++ echo "Usage: upsd {start|stop|powerdown|restart|reload|status|try-restart}" + exit 1 + esac + +--- ./scripts/RedHat/upsmon.initscripts~ 2005-01-27 16:33:19.000000000 +0200 ++++ ./scripts/RedHat/upsmon 2005-07-05 15:52:49.000000000 +0300 +@@ -16,10 +16,10 @@ export PATH # Source function library. -. /etc/rc.d/init.d/functions +. /etc/init.d/functions - # POWERDOWNFLAG *must* match that in upsmon.conf - # Loading POWERDOWNFLAG from /etc/sysconfig/ups - DRIVERPATH=/sbin -if [ -f /etc/sysconfig/ups ]; then - . /etc/sysconfig/ups +if [ -f /etc/sysconfig/nut ]; then @@ -33,13 +54,19 @@ else POWERDOWNFLAG=/etc/killpower NUTUSER=nutmon -@@ -98,9 +98,6 @@ - ;; - +@@ -49,8 +49,14 @@ status) -- # new style drivers -- action "NUT: checking UPS model drivers" upsdrvctl status -- - status upsd + status upsmon ;; ++ condrestart|try-restart) ++ if [ -e /var/lock/subsys/upsmon ]; then ++ $0 stop ++ $0 start ++ fi ++ ;; *) +- echo "Usage: upsmon {start|stop|restart|reload|status}" ++ echo "Usage: upsmon {start|stop|restart|reload|status|try-restart}" + exit 1 + esac + Modified: contrib/classic/2.0/nut/current/specs/nut.spec =================================================================== --- contrib/classic/2.0/nut/current/specs/nut.spec 2005-07-04 22:13:12 UTC (rev 6488) +++ contrib/classic/2.0/nut/current/specs/nut.spec 2005-07-05 13:05:36 UTC (rev 6489) @@ -11,7 +11,7 @@ Name: nut Summary: Multi-vendor UPS Monitoring Project Client Utilities Version: 0.cvs20050518 -Release: 3jh +Release: 4jh Group: contrib Source: nut-cvs20050518.tar.bz2 Source1: halt.local @@ -20,7 +20,8 @@ Patch0: nut-initscripts.patch License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root -Prereq: chkconfig coreutils +%service_requires +Prereq: coreutils BuildRequires: autoconf %description @@ -40,6 +41,7 @@ %package server Summary: Multi-vendor UPS Monitoring Project server Group: contrib +%service_requires PreReq: nut = %{version}-%{release} %description server @@ -148,44 +150,25 @@ fi %endif -%preun -# only do this if it is not an upgrade -if [ $1 -eq 0 ] -then - /sbin/chkconfig --del upsmon - [ -f %{_initrddir}/upsmon ] && \ - %{_initrddir}/upsmon stop -fi - %post -/sbin/chkconfig --add upsmon -# restart server if this is an upgrade -if [ $1 -gt 1 ] -then - [ -f %{_initrddir}/upsmon ] && \ - %{_initrddir}/upsmon restart -fi +%service_post upsmon +%post server +%service_post upsd +%preun +%service_preun upsmon + %preun server -# only do this if it is not an upgrade -if [ $1 -eq 0 ] -then - /sbin/chkconfig --del upsd - [ -f %{_initrddir}/upsd ] && \ - %{_initrddir}/upsd stop -fi +%service_preun upsd -%post server -/sbin/chkconfig --add upsd -# restart server if this is an upgrade -if [ $1 -gt 1 ] -then - [ -f %{_initrddir}/upsd ] && \ - %{_initrddir}/upsd restart -fi +%postun +%service_postun upsmon +%postun server +%service_postun upsd + %clean %clean_buildroot @@ -283,6 +266,9 @@ %changelog +* Tue Jul 5 2005 Jaakko Heinonen +- rationalize service handling + * Mon May 30 2005 Jaakko Heinonen - fix halt.local - provide more useful default configuration files From svn at tinysofa.org Tue Jul 5 15:43:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 5 Jul 2005 11:43:21 -0400 (EDT) Subject: [tinysofa-svn] r6490 - in contrib/classic/2.0: . pylibacl pylibacl/current pylibacl/current/sources pylibacl/current/specs pyxattr pyxattr/current pyxattr/current/sources pyxattr/current/specs rdiff-backup/current/specs Message-ID: <20050705154321.D79EE3452AF@minbar.tinysofa.org> Author: jh Date: 2005-07-05 11:43:02 -0400 (Tue, 05 Jul 2005) New Revision: 6490 Added: contrib/classic/2.0/pylibacl/ contrib/classic/2.0/pylibacl/current/ contrib/classic/2.0/pylibacl/current/sources/ contrib/classic/2.0/pylibacl/current/sources/pylibacl-0.2.1.tar.gz contrib/classic/2.0/pylibacl/current/specs/ contrib/classic/2.0/pylibacl/current/specs/pylibacl.spec contrib/classic/2.0/pylibacl/pristine/ contrib/classic/2.0/pylibacl/releases/ contrib/classic/2.0/pyxattr/ contrib/classic/2.0/pyxattr/current/ contrib/classic/2.0/pyxattr/current/sources/ contrib/classic/2.0/pyxattr/current/sources/pyxattr-0.2.tar.gz contrib/classic/2.0/pyxattr/current/specs/ contrib/classic/2.0/pyxattr/current/specs/pyxattr.spec contrib/classic/2.0/pyxattr/pristine/ contrib/classic/2.0/pyxattr/releases/ Modified: contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec Log: - add pyxattr - add pylibacl - attempt to add acl and xattr support for rdiff-backup Added: contrib/classic/2.0/pylibacl/current/sources/pylibacl-0.2.1.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/classic/2.0/pylibacl/current/sources/pylibacl-0.2.1.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/classic/2.0/pylibacl/current/specs/pylibacl.spec =================================================================== --- contrib/classic/2.0/pylibacl/current/specs/pylibacl.spec 2005-07-05 13:05:36 UTC (rev 6489) +++ contrib/classic/2.0/pylibacl/current/specs/pylibacl.spec 2005-07-05 15:43:02 UTC (rev 6490) @@ -0,0 +1,43 @@ +Summary: POSIX.1e ACLs for python +Name: pylibacl +Version: 0.2.1 +Release: 1jh +Source0: %{name}-%{version}.tar.gz +License: GPL +Group: contrib +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: libacl +BuildRequires: libacl-devel +%py_requires -d +URL: http://pylibacl.sourceforge.net + +%description +This is a C extension module for Python which +implements POSIX ACLs manipulation. It is a wrapper on top +of the systems's acl C library - see acl(5). + + +%prep +%setup -q + + +%build +env CFLAGS="$RPM_OPT_FLAGS" python setup.py build + + +%install +python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES + + +%clean +%clean_buildroot + + +%files -f INSTALLED_FILES +%defattr(-,root,root) + + +%changelog +* Tue Jul 5 2005 Jaakko Heinonen 0.2-1jh +- tinysofa contrib + Added: contrib/classic/2.0/pyxattr/current/sources/pyxattr-0.2.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/classic/2.0/pyxattr/current/sources/pyxattr-0.2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: contrib/classic/2.0/pyxattr/current/specs/pyxattr.spec =================================================================== --- contrib/classic/2.0/pyxattr/current/specs/pyxattr.spec 2005-07-05 13:05:36 UTC (rev 6489) +++ contrib/classic/2.0/pyxattr/current/specs/pyxattr.spec 2005-07-05 15:43:02 UTC (rev 6490) @@ -0,0 +1,42 @@ +Summary: Extended attributes for python +Name: pyxattr +Version: 0.2 +Release: 1jh +Source0: %{name}-%{version}.tar.gz +License: GPL +Group: contrib +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: libattr +BuildRequires: libattr-devel +%py_requires -d +URL: http://pyxattr.sourceforge.net/ + +%description +This is a C extension module for Python which +implements extended attributes manipulation. It is a wrapper on top +of the attr C library - see attr(5). + + +%prep +%setup -q + + +%build +env CFLAGS="$RPM_OPT_FLAGS" python setup.py build + +%install +python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES + + +%clean +%clean_buildroot + + +%files -f INSTALLED_FILES +%defattr(-,root,root) + + +%changelog +* Tue Jul 5 2005 Jaakko Heinonen 0.2-1jh +- tinysofa contrib + Modified: contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec =================================================================== --- contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec 2005-07-05 13:05:36 UTC (rev 6489) +++ contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec 2005-07-05 15:43:02 UTC (rev 6490) @@ -1,14 +1,16 @@ Version: 0.12.8 Summary: Convenient and transparent local/remote incremental mirror/backup Name: rdiff-backup -Release: 1jh +Release: 2jh URL: http://rdiff-backup.stanford.edu/ Source: http://rdiff-backup.stanford.edu/OLD/%{version}/%{name}-%{version}.tar.gz License: GPL Group: contrib BuildRoot: %{_tmppath}/%{name}-%{version}-root %py_requires -d +Requires: pylibacl pyxattr BuildRequires: librsync-devel >= 0.9.6 +BuildRequires: pylibacl pyxattr %description rdiff-backup is a script, written in Python, that backs up one @@ -48,6 +50,9 @@ %changelog +* Tue Jul 5 2005 Jaakko Heinonen 0.12.8-2jh +- attempt to add acl and xattr support + * Wed May 18 2005 Jaakko Heinonen 0.12.8-1jh - 0.12.8 From svn at tinysofa.org Tue Jul 5 15:49:27 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 5 Jul 2005 11:49:27 -0400 (EDT) Subject: [tinysofa-svn] r6491 - contrib/classic/2.0/rdiff-backup/current/specs Message-ID: <20050705154927.C1A3034508E@minbar.tinysofa.org> Author: jh Date: 2005-07-05 11:49:22 -0400 (Tue, 05 Jul 2005) New Revision: 6491 Modified: contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec Log: - remove acl/xattr support for now Modified: contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec =================================================================== --- contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec 2005-07-05 15:43:02 UTC (rev 6490) +++ contrib/classic/2.0/rdiff-backup/current/specs/rdiff-backup.spec 2005-07-05 15:49:22 UTC (rev 6491) @@ -1,16 +1,17 @@ Version: 0.12.8 Summary: Convenient and transparent local/remote incremental mirror/backup Name: rdiff-backup -Release: 2jh +Release: 1jh URL: http://rdiff-backup.stanford.edu/ Source: http://rdiff-backup.stanford.edu/OLD/%{version}/%{name}-%{version}.tar.gz License: GPL Group: contrib BuildRoot: %{_tmppath}/%{name}-%{version}-root %py_requires -d -Requires: pylibacl pyxattr BuildRequires: librsync-devel >= 0.9.6 -BuildRequires: pylibacl pyxattr +# ACLs and extended attributes are not supported in stable 0.12 series +#Requires: pylibacl pyxattr +#BuildRequires: pylibacl pyxattr %description rdiff-backup is a script, written in Python, that backs up one @@ -50,8 +51,8 @@ %changelog -* Tue Jul 5 2005 Jaakko Heinonen 0.12.8-2jh -- attempt to add acl and xattr support +* Tue Jul 5 2005 Jaakko Heinonen +- add acl and xattr support framework * Wed May 18 2005 Jaakko Heinonen 0.12.8-1jh - 0.12.8 From svn at tinysofa.org Tue Jul 5 21:38:20 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Tue, 5 Jul 2005 17:38:20 -0400 (EDT) Subject: [tinysofa-svn] r6492 - in contrib/classic/2.0/qemu/current: sources specs Message-ID: <20050705213820.BAD5E3451CF@minbar.tinysofa.org> Author: gda Date: 2005-07-05 17:38:12 -0400 (Tue, 05 Jul 2005) New Revision: 6492 Added: contrib/classic/2.0/qemu/current/sources/kqemu.h Modified: contrib/classic/2.0/qemu/current/specs/qemu.spec Log: now with kqemu support Added: contrib/classic/2.0/qemu/current/sources/kqemu.h =================================================================== --- contrib/classic/2.0/qemu/current/sources/kqemu.h 2005-07-05 15:49:22 UTC (rev 6491) +++ contrib/classic/2.0/qemu/current/sources/kqemu.h 2005-07-05 21:38:12 UTC (rev 6492) @@ -0,0 +1,99 @@ +#ifndef KQEMU_H +#define KQEMU_H + +#define KQEMU_MAJOR 250 + +#define KQEMU_VERSION 0x010000 + +struct kqemu_segment_cache { + uint32_t selector; + uint32_t base; + uint32_t limit; + uint32_t flags; +}; + +struct kqemu_cpu_state { + uint32_t regs[8]; + uint32_t eip; + uint32_t eflags; + + uint32_t dummy0, dummy1, dumm2, dummy3, dummy4; + + struct kqemu_segment_cache segs[6]; /* selector values */ + struct kqemu_segment_cache ldt; + struct kqemu_segment_cache tr; + struct kqemu_segment_cache gdt; /* only base and limit are used */ + struct kqemu_segment_cache idt; /* only base and limit are used */ + + uint32_t cr0; + uint32_t dumm5; + uint32_t cr2; + uint32_t cr3; + uint32_t cr4; + uint32_t a20_mask; + + uint32_t dr0; + uint32_t dr1; + uint32_t dr2; + uint32_t dr3; + uint32_t dr6; + uint32_t dr7; + + int cpl; /* currently only 3 */ + + uint32_t error_code; /* error_code when exiting with an exception */ + uint32_t next_eip; /* next eip value when exiting with an interrupt */ + unsigned int nb_pages_to_flush; /* number of pages to flush, + KQEMU_FLUSH_ALL means full flush */ +#define KQEMU_MAX_PAGES_TO_FLUSH 512 +#define KQEMU_FLUSH_ALL (KQEMU_MAX_PAGES_TO_FLUSH + 1) +}; + +struct kqemu_init { + uint8_t *ram_base; /* must be page aligned */ + unsigned long ram_size; /* must be multiple of 4 KB */ + uint8_t *ram_dirty; /* must be page aligned */ + uint32_t **phys_to_ram_map; /* must be page aligned */ + unsigned long *pages_to_flush; /* must be page aligned */ +}; + +#define KQEMU_RET_ABORT (-1) +#define KQEMU_RET_EXCEPTION 0x0000 /* 8 low order bit are the exception */ +#define KQEMU_RET_INT 0x0100 /* 8 low order bit are the interrupt */ +#define KQEMU_RET_SOFTMMU 0x0200 /* emulation needed (I/O or + unsupported INSN) */ +#define KQEMU_RET_INTR 0x0201 /* interrupted by a signal */ + +#define KQEMU_EXEC _IOWR('q', 1, struct kqemu_cpu_state) +#define KQEMU_INIT _IOW('q', 2, struct kqemu_init) +#define KQEMU_GET_VERSION _IOR('q', 3, int) + +#ifdef __KERNEL__ +struct kqemu_state; + +#define CDECL __attribute__((regparm(0))) + +struct kqemu_state * CDECL kqemu_init(struct kqemu_init *d, int max_locked_pages); +struct kqemu_cpu_state * CDECL kqemu_get_cpu_state(struct kqemu_state *s); +long CDECL kqemu_exec(struct kqemu_state *s); +void CDECL kqemu_delete(struct kqemu_state *s); + +/* callbacks */ +unsigned long CDECL kqemu_lock_user_page(unsigned long user_addr); +void CDECL kqemu_unlock_user_page(unsigned long page_index); + +unsigned long CDECL kqemu_alloc_zeroed_page(void); +void CDECL kqemu_free_page(unsigned long page_index); +void * CDECL kqemu_page_kaddr(unsigned long page_index); + +void * CDECL kqemu_vmalloc(unsigned int size); +void CDECL kqemu_vfree(void *ptr); +unsigned long CDECL kqemu_vmalloc_to_phys(const void *vaddr); + +int CDECL kqemu_schedule(void); + +void CDECL kqemu_log(const char *fmt, ...); + +#endif + +#endif /* KQEMU_H */ Modified: contrib/classic/2.0/qemu/current/specs/qemu.spec =================================================================== --- contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-05 15:49:22 UTC (rev 6491) +++ contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-05 21:38:12 UTC (rev 6492) @@ -1,9 +1,10 @@ Name: qemu Version: 0.7.0 -Release: 3gd +Release: 4gd Group: contrib Summary: A processor emulator Source0: %{name}-%{version}.tar.gz +Source1: kqemu.h Patch0: %{name}-0.7.0-install-nodocs.patch License: GPL URL: http://fabrice.bellard.free.fr/qemu/ @@ -19,7 +20,15 @@ %setup -q %patch -p1 -b .ndi~ +#this activates kqemu support +mkdir kqemu +cp %{SOURCE1} kqemu +cat <kqemu/Makefile +all: + @true +EOF + %build %configure --datadir=%{_datadir}/%{name} %make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -40,7 +49,11 @@ %{_mandir}/man1/* %changelog -* Mon Jul 5 2005 Gerald Dachs 0.7.0-1gd +* Mon Jul 5 2005 Gerald Dachs 0.7.0-4gd +- add support for accelerator module; use of kqemu.h with explicit + allowance from Fabrice Bellard + +* Mon Jul 5 2005 Gerald Dachs 0.7.0-3gd - clean up docs install - removed support for accelerator module From svn at tinysofa.org Wed Jul 6 22:11:38 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 6 Jul 2005 18:11:38 -0400 (EDT) Subject: [tinysofa-svn] r6493 - contrib/classic/2.0/qemu/current/specs Message-ID: <20050706221138.8EFF9345277@minbar.tinysofa.org> Author: gda Date: 2005-07-06 18:11:33 -0400 (Wed, 06 Jul 2005) New Revision: 6493 Modified: contrib/classic/2.0/qemu/current/specs/qemu.spec Log: kqemu support, this time really Modified: contrib/classic/2.0/qemu/current/specs/qemu.spec =================================================================== --- contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-05 21:38:12 UTC (rev 6492) +++ contrib/classic/2.0/qemu/current/specs/qemu.spec 2005-07-06 22:11:33 UTC (rev 6493) @@ -1,6 +1,6 @@ Name: qemu Version: 0.7.0 -Release: 4gd +Release: 5gd Group: contrib Summary: A processor emulator Source0: %{name}-%{version}.tar.gz @@ -27,10 +27,11 @@ all: @true EOF +ln -s /bin/true kqemu/install.sh %build -%configure --datadir=%{_datadir}/%{name} +%configure --datadir=%{_datadir}/%{name} --kernel-path=. %make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install @@ -49,11 +50,14 @@ %{_mandir}/man1/* %changelog -* Mon Jul 5 2005 Gerald Dachs 0.7.0-4gd +* Wed Jul 6 2005 Gerald Dachs 0.7.0-5gd +- small hack to let kqemu support work in mach too + +* Tue Jul 5 2005 Gerald Dachs 0.7.0-4gd - add support for accelerator module; use of kqemu.h with explicit allowance from Fabrice Bellard -* Mon Jul 5 2005 Gerald Dachs 0.7.0-3gd +* Tue Jul 5 2005 Gerald Dachs 0.7.0-3gd - clean up docs install - removed support for accelerator module From svn at tinysofa.org Thu Jul 7 15:45:17 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Thu, 7 Jul 2005 11:45:17 -0400 (EDT) Subject: [tinysofa-svn] r6494 - in tinysofa/releases/classic/2.0/zlib/current: sources specs Message-ID: <20050707154517.938E134509B@minbar.tinysofa.org> Author: jh Date: 2005-07-07 11:45:07 -0400 (Thu, 07 Jul 2005) New Revision: 6494 Added: tinysofa/releases/classic/2.0/zlib/current/sources/zlib-1.2.1.2-can-2005-2096.patch Modified: tinysofa/releases/classic/2.0/zlib/current/specs/zlib.spec Log: - CAN-2005-2096 Added: tinysofa/releases/classic/2.0/zlib/current/sources/zlib-1.2.1.2-can-2005-2096.patch =================================================================== --- tinysofa/releases/classic/2.0/zlib/current/sources/zlib-1.2.1.2-can-2005-2096.patch 2005-07-06 22:11:33 UTC (rev 6493) +++ tinysofa/releases/classic/2.0/zlib/current/sources/zlib-1.2.1.2-can-2005-2096.patch 2005-07-07 15:45:07 UTC (rev 6494) @@ -0,0 +1,12 @@ +Permit incomplete codes only if they consist of a single code of length 1. +--- zlib-1.2.1.2/inftrees.c.incomplete-set 2004-09-07 07:29:19.000000000 +0200 ++++ zlib-1.2.1.2/inftrees.c 2005-07-04 11:59:07.000000000 +0200 +@@ -134,7 +134,7 @@ + left -= count[len]; + if (left < 0) return -1; /* over-subscribed */ + } +- if (left > 0 && (type == CODES || (codes - count[0] != 1))) ++ if (left > 0 && (type == CODES || max != 1)) + return -1; /* incomplete set */ + + /* generate offsets into symbol table for each length for sorting */ Modified: tinysofa/releases/classic/2.0/zlib/current/specs/zlib.spec =================================================================== --- tinysofa/releases/classic/2.0/zlib/current/specs/zlib.spec 2005-07-06 22:11:33 UTC (rev 6493) +++ tinysofa/releases/classic/2.0/zlib/current/specs/zlib.spec 2005-07-07 15:45:07 UTC (rev 6494) @@ -1,10 +1,11 @@ Summary: The zlib compression and decompression library. Name: zlib Version: 1.2.1.2 -Release: 2jh +Release: 3jh Group: main Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz Patch0: zlib-1.1.4-make-test.patch +Patch1: zlib-1.2.1.2-can-2005-2096.patch URL: http://www.gzip.org/zlib/ License: BSD Prefix: %{_prefix} @@ -28,7 +29,9 @@ %prep %setup -q %patch0 -p1 -b .make-test +%patch1 -p1 -b .incomplete-set + %build CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix} @@ -82,6 +85,9 @@ %changelog +* Thu Jul 7 2005 Jaakko Heinonen 1.2.1.2-3jh +- CAN-2005-2096 + * Tue Jan 04 2005 tsintegrate 1.2.1.2-1ts - current (1.2.1.2-1jh) integrated as 1.2.1.2-1ts for release 1.1-U3 From svn at tinysofa.org Mon Jul 11 21:21:15 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Mon, 11 Jul 2005 17:21:15 -0400 (EDT) Subject: [tinysofa-svn] r6495 - in contrib/classic/2.0/sqlite3/current: sources specs Message-ID: <20050711212115.F07C6345084@minbar.tinysofa.org> Author: gda Date: 2005-07-11 17:20:34 -0400 (Mon, 11 Jul 2005) New Revision: 6495 Added: contrib/classic/2.0/sqlite3/current/sources/sqlite-3.2.2.tar.gz Removed: contrib/classic/2.0/sqlite3/current/sources/sqlite-3.2.1.tar.gz Modified: contrib/classic/2.0/sqlite3/current/specs/sqlite3.spec Log: 3.2.2 Deleted: contrib/classic/2.0/sqlite3/current/sources/sqlite-3.2.1.tar.gz =================================================================== (Binary files differ) Added: contrib/classic/2.0/sqlite3/current/sources/sqlite-3.2.2.tar.gz =================================================================== (Binary files differ) Property changes on: contrib/classic/2.0/sqlite3/current/sources/sqlite-3.2.2.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: contrib/classic/2.0/sqlite3/current/specs/sqlite3.spec =================================================================== --- contrib/classic/2.0/sqlite3/current/specs/sqlite3.spec 2005-07-07 15:45:07 UTC (rev 6494) +++ contrib/classic/2.0/sqlite3/current/specs/sqlite3.spec 2005-07-11 21:20:34 UTC (rev 6495) @@ -1,6 +1,6 @@ Summary: SQLite is a C library that implements an embeddable SQL database engine Name: sqlite3 -Version: 3.2.1 +Version: 3.2.2 Release: 1gd License: GPL Group: contrib @@ -59,6 +59,9 @@ %doc README doc/* %changelog +* Mon Jul 11 2005 Gerald Dachs 3.2.2-1gd +- 3.2.2 + * Thu Mar 31 2005 Gerald Dachs 3.2.1-1gd - 3.2.1 From svn at tinysofa.org Wed Jul 13 17:50:21 2005 From: svn at tinysofa.org (svn at tinysofa.org) Date: Wed, 13 Jul 2005 13:50:21 -0400 (EDT) Subject: [tinysofa-svn] r6496 - in tinysofa/releases/classic/2.0/krb5/current: sources specs Message-ID: <20050713175021.DD56F345088@minbar.tinysofa.org> Author: jh Date: 2005-07-13 13:50:08 -0400 (Wed, 13 Jul 2005) New Revision: 6496 Added: tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.3.3-no-rpath.patch tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4-MITKRB5-SA-2005-002.patch tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4-MITKRB5-SA-2005-003.patch tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4.1-telnet-environ.patch Modified: tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec Log: - CAN-2005-1174,CAN-2005-1175 (MIT-KRB5-SA-2005-002) - CAN-2005-1689 (MIT-KRB5-SA-2005-003) - fix telnet client environment variable disclosure (CAN-2005-0488) - add no-rpath patch from Fedora Added: tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.3.3-no-rpath.patch =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.3.3-no-rpath.patch 2005-07-11 21:20:34 UTC (rev 6495) +++ tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.3.3-no-rpath.patch 2005-07-13 17:50:08 UTC (rev 6496) @@ -0,0 +1,49 @@ +--- krb5-1.3.3/src/config/shlib.conf.no-rpath 2004-05-12 13:42:48.967902053 +0200 ++++ krb5-1.3.3/src/config/shlib.conf 2004-05-12 13:42:50.671669954 +0200 +@@ -286,9 +286,9 @@ + LDCOMBINE_TAIL='' + # For cases where we do have dependencies on other libraries + # built in this tree... +- SHLIB_EXPFLAGS='-Wl,-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' ++ SHLIB_EXPFLAGS='$(SHLIB_DIRS) $(SHLIB_EXPLIBS)' + PROFFLAGS=-pg +- RPATH_FLAG='-Wl,-rpath -Wl,' ++ RPATH_FLAG='-L' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' + RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' +--- krb5-1.3.3/src/aclocal.m4.no-rpath 2004-02-13 23:32:04.000000000 +0100 ++++ krb5-1.3.3/src/aclocal.m4 2004-05-12 13:16:42.188968852 +0200 +@@ -1040,6 +1041,7 @@ + [AC_REQUIRE([KRB5_LIB_AUX])dnl + AC_REQUIRE([KRB5_AC_NEED_LIBGEN])dnl + AC_SUBST(CC_LINK) ++RPATH_FLAG= + AC_SUBST(RPATH_FLAG) + AC_SUBST(DEPLIBEXT)]) + +--- krb5-1.3.3/src/krb5-config.in.no-rpath 2003-04-03 21:29:09.000000000 +0200 ++++ krb5-1.3.3/src/krb5-config.in 2004-05-12 13:16:42.177970369 +0200 +@@ -165,7 +166,9 @@ + fi + + if test -n "$do_cflags"; then +- echo "-I${includedir}" ++ if test "${includedir}" != /usr/include ; then ++ echo "-I${includedir}" ++ fi + fi + + +@@ -179,6 +182,11 @@ + -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ + -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` + ++ if test $libdir = /usr/`basename $libdir` ; then ++ lib_flags=`echo $lib_flags | sed -e "s#-L$libdir##"` ++ fi ++# lib_flags=`echo $lib_flags | sed -e "s#$RPATH_FLAG$libdir##" ` ++ + if test $library = 'kdb'; then + lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB" + library=krb5 Added: tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4-MITKRB5-SA-2005-002.patch =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4-MITKRB5-SA-2005-002.patch 2005-07-11 21:20:34 UTC (rev 6495) +++ tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4-MITKRB5-SA-2005-002.patch 2005-07-13 17:50:08 UTC (rev 6496) @@ -0,0 +1,95 @@ +Patch from draft for MIT-KRB5-SA-2005-002: CAN-2005-1174 (1.3 and later), +CAN-2005-1175 (all releases). + +Thanks to Daniel Wachdorf for reporting these vulnerabilities to the upstream +maintainers. + +Index: kdc/do_as_req.c +=================================================================== +RCS file: /cvs/krbdev/krb5/src/kdc/do_as_req.c,v +retrieving revision 5.90 +diff -c -r5.90 do_as_req.c +*** kdc/do_as_req.c 4 Nov 2002 02:20:51 -0000 5.90 +--- kdc/do_as_req.c 25 Apr 2005 22:02:56 -0000 +*************** +*** 524,529 **** + + retval = krb5_mk_error(kdc_context, &errpkt, scratch); + free(errpkt.text.data); +! *response = scratch; + return retval; + } +--- 524,533 ---- + + retval = krb5_mk_error(kdc_context, &errpkt, scratch); + free(errpkt.text.data); +! if (retval) +! free(scratch); +! else +! *response = scratch; +! + return retval; + } +Index: kdc/do_tgs_req.c +=================================================================== +RCS file: /cvs/krbdev/krb5/src/kdc/do_tgs_req.c,v +retrieving revision 5.89 +diff -c -r5.89 do_tgs_req.c +*** kdc/do_tgs_req.c 22 May 2003 20:28:21 -0000 5.89 +--- kdc/do_tgs_req.c 25 Apr 2005 22:02:56 -0000 +*************** +*** 722,728 **** + + retval = krb5_mk_error(kdc_context, &errpkt, scratch); + free(errpkt.text.data); +! *response = scratch; + return retval; + } + +--- 722,732 ---- + + retval = krb5_mk_error(kdc_context, &errpkt, scratch); + free(errpkt.text.data); +! if (retval) +! free(scratch); +! else +! *response = scratch; +! + return retval; + } + +Index: kdc/network.c +=================================================================== +RCS file: /cvs/krbdev/krb5/src/kdc/network.c,v +retrieving revision 5.62 +diff -c -r5.62 network.c +*** kdc/network.c 24 Sep 2004 02:21:47 -0000 5.62 +--- kdc/network.c 25 Apr 2005 22:02:56 -0000 +*************** +*** 722,727 **** +--- 722,728 ---- + char pktbuf[MAX_DGRAM_SIZE]; + int port_fd = conn->fd; + ++ response = NULL; + saddr_len = sizeof(saddr); + cc = recvfrom(port_fd, pktbuf, sizeof(pktbuf), 0, + (struct sockaddr *)&saddr, &saddr_len); +Index: lib/krb5/krb/unparse.c +=================================================================== +RCS file: /cvs/krbdev/krb5/src/lib/krb5/krb/unparse.c,v +retrieving revision 5.33.8.1 +diff -c -r5.33.8.1 unparse.c +*** lib/krb5/krb/unparse.c 18 Jan 2005 17:57:32 -0000 5.33.8.1 +--- lib/krb5/krb/unparse.c 25 Apr 2005 22:02:56 -0000 +*************** +*** 91,96 **** +--- 91,98 ---- + totalsize++; + totalsize++; /* This is for the separator */ + } ++ if (nelem == 0) ++ totalsize++; + + /* + * Allocate space for the ascii string; if space has been Added: tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4-MITKRB5-SA-2005-003.patch =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4-MITKRB5-SA-2005-003.patch 2005-07-11 21:20:34 UTC (rev 6495) +++ tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4-MITKRB5-SA-2005-003.patch 2005-07-13 17:50:08 UTC (rev 6496) @@ -0,0 +1,32 @@ +Patch from draft for MIT-KRB5-SA-2005-003: CAN-2005-1689. + +Thanks to Magnus Hagander for reporting this vulnerability to the upstream +maintainers. + +Index: lib/krb5/krb/recvauth.c +=================================================================== +RCS file: /cvs/krbdev/krb5/src/lib/krb5/krb/recvauth.c,v +retrieving revision 5.38 +diff -c -r5.38 recvauth.c +*** lib/krb5/krb/recvauth.c 3 Sep 2002 01:13:47 -0000 5.38 +--- lib/krb5/krb/recvauth.c 23 May 2005 23:19:15 -0000 +*************** +*** 76,82 **** + if ((retval = krb5_read_message(context, fd, &inbuf))) + return(retval); + if (strcmp(inbuf.data, sendauth_version)) { +- krb5_xfree(inbuf.data); + problem = KRB5_SENDAUTH_BADAUTHVERS; + } + krb5_xfree(inbuf.data); +--- 76,81 ---- +*************** +*** 90,96 **** + if ((retval = krb5_read_message(context, fd, &inbuf))) + return(retval); + if (appl_version && strcmp(inbuf.data, appl_version)) { +- krb5_xfree(inbuf.data); + if (!problem) + problem = KRB5_SENDAUTH_BADAPPLVERS; + } +--- 89,94 ---- Added: tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4.1-telnet-environ.patch =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4.1-telnet-environ.patch 2005-07-11 21:20:34 UTC (rev 6495) +++ tinysofa/releases/classic/2.0/krb5/current/sources/krb5-1.4.1-telnet-environ.patch 2005-07-13 17:50:08 UTC (rev 6496) @@ -0,0 +1,164 @@ +Port of fixes originally made to the NetKit telnet client. + +Previous behavior: + Well-defined or exported variables are sent to the server on initial connect. + The "environ list" command prints "*" before these variable names. + Other variables are sent to the server if it requests them. + The "environ list" command prints " " before these variable names. +New behavior: + Well-defined variables are sent to the server on initial connect. + The "environ list" command prints "*" before these variable names. + Exported variables are sent to the server on initial connect. + The "environ list" command prints "+" before these variable names. + Other variables are NOT sent to the server. + The "environ list" command prints " " before these variable names. + +diff -uNr krb5-1.4.1/src/appl/telnet/telnet/authenc.c krb5-1.4.1/src/appl/telnet/telnet/authenc.c +--- krb5-1.4.1/src/appl/telnet/telnet/authenc.c 2002-11-15 15:21:34.000000000 -0500 ++++ krb5-1.4.1/src/appl/telnet/telnet/authenc.c 2005-06-29 21:06:39.000000000 -0400 +@@ -83,13 +83,6 @@ + } + + char * +-telnet_getenv(val) +- char *val; +-{ +- return((char *)env_getvalue((unsigned char *)val)); +-} +- +- char * + telnet_gets(tprompt, result, length, echo) + char *tprompt; + char *result; +diff -uNr krb5-1.4.1/src/appl/telnet/telnet/commands.c krb5-1.4.1/src/appl/telnet/telnet/commands.c +--- krb5-1.4.1/src/appl/telnet/telnet/commands.c 2005-04-07 17:17:26.000000000 -0400 ++++ krb5-1.4.1/src/appl/telnet/telnet/commands.c 2005-06-29 21:11:34.000000000 -0400 +@@ -1889,8 +1889,9 @@ + register struct env_lst *ep; + + for (ep = envlisthead.next; ep; ep = ep->next) { +- printf("%c %-20s %s\r\n", ep->export ? '*' : ' ', +- ep->var, ep->value); ++ printf("%c %-20s %s\r\n", ++ " +*"[(ep->welldefined ? 2 : (ep->export > 0))], ++ ep->var, ep->value); + } + } + +@@ -1914,13 +1915,15 @@ + } + + unsigned char * +-env_getvalue(var) ++env_getvalue(var, export_only) + unsigned char *var; ++ int export_only; + { + register struct env_lst *ep; + + if ((ep = env_find(var))) +- return(ep->value); ++ if (ep->export || !export_only) ++ return(ep->value); + return(NULL); + } + +diff -uNr krb5-1.4.1/src/appl/telnet/telnet/externs.h krb5-1.4.1/src/appl/telnet/telnet/externs.h +--- krb5-1.4.1/src/appl/telnet/telnet/externs.h 2003-04-23 23:27:56.000000000 -0400 ++++ krb5-1.4.1/src/appl/telnet/telnet/externs.h 2005-06-29 21:05:16.000000000 -0400 +@@ -347,7 +347,7 @@ + + extern unsigned char + *env_default (int, int), +- *env_getvalue (unsigned char *); ++ *env_getvalue (unsigned char *, int); + + extern int + env_is_exported (unsigned char *); +diff -uNr krb5-1.4.1/src/appl/telnet/telnet/telnet.c krb5-1.4.1/src/appl/telnet/telnet/telnet.c +--- krb5-1.4.1/src/appl/telnet/telnet/telnet.c 2005-06-29 21:13:29.000000000 -0400 ++++ krb5-1.4.1/src/appl/telnet/telnet/telnet.c 2005-06-29 21:09:13.000000000 -0400 +@@ -552,7 +552,7 @@ + #endif + + case TELOPT_XDISPLOC: /* X Display location */ +- if (env_getvalue((unsigned char *)"DISPLAY") && ++ if (env_getvalue((unsigned char *)"DISPLAY", 0) && + env_is_exported((unsigned char *)"DISPLAY")) + new_state_ok = 1; + break; +@@ -813,7 +813,7 @@ + resettermname = 0; + if (tnamep && tnamep != unknown) + free(tnamep); +- if ((tname = (char *)env_getvalue((unsigned char *)"TERM")) && ++ if ((tname = (char *)env_getvalue((unsigned char *)"TERM", 0)) && + (setupterm(tname, 1, &err) == 0)) { + tnamep = mklist(termbuf, tname); + } else { +@@ -988,7 +988,7 @@ + unsigned char temp[50], *dp; + int len; + +- if (((dp = env_getvalue((unsigned char *)"DISPLAY")) == NULL) || ++ if (((dp = env_getvalue((unsigned char *)"DISPLAY", 0)) == NULL) || + (! env_is_exported((unsigned char *)"DISPLAY"))) { + /* + * Something happened, we no longer have a DISPLAY +@@ -1669,7 +1669,7 @@ + env_opt_add(ep); + return; + } +- vp = env_getvalue(ep); ++ vp = env_getvalue(ep, 1); + elen = 2 * (vp ? strlen((char *)vp) : 0) + + 2 * strlen((char *)ep) + 6; + if ((opt_replyend - opt_replyp) < elen) +@@ -2327,7 +2327,7 @@ + send_will(TELOPT_LINEMODE, 1); + send_will(TELOPT_NEW_ENVIRON, 1); + send_do(TELOPT_STATUS, 1); +- if (env_getvalue((unsigned char *)"DISPLAY") && ++ if (env_getvalue((unsigned char *)"DISPLAY", 0) && + env_is_exported((unsigned char *)"DISPLAY")) + send_will(TELOPT_XDISPLOC, 1); + if (eight) +--- krb5-1.4.1/src/appl/telnet/telnetd/authenc.c 2005-06-29 21:25:09.000000000 -0400 ++++ krb5-1.4.1/src/appl/telnet/telnetd/authenc.c 2005-06-29 21:25:13.000000000 -0400 +@@ -67,14 +67,6 @@ + } + + char * +-telnet_getenv(val) +- char *val; +-{ +- extern char *getenv(); +- return(getenv(val)); +-} +- +- char * + telnet_gets(prompt, result, length, echo) + char *prompt; + char *result; +--- krb5-1.4.1/src/appl/telnet/telnet/telnet.1 2005-06-29 21:26:55.000000000 -0400 ++++ krb5-1.4.1/src/appl/telnet/telnet/telnet.1 2005-06-29 21:29:05.000000000 -0400 +@@ -401,7 +401,7 @@ + .I variable + to have a value of + .IR value . +-Any variables defined by this command are automatically exported. The ++Variables defined by this command are not automatically exported. The + .I value + may be enclosed in single or double quotes so that tabs and spaces may + be included. +@@ -423,8 +423,8 @@ + .TP + .B list + List the current set of environment variables. Those marked with a \&* +-will be sent automatically; other variables will only be sent if +-explicitly requested. ++will be sent automatically; those marked with a \&+ will be sent if the ++other end requests their values, and other variables will not be sent. + .TP + .B \&? + Prints out help information for the Modified: tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec =================================================================== --- tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec 2005-07-11 21:20:34 UTC (rev 6495) +++ tinysofa/releases/classic/2.0/krb5/current/specs/krb5.spec 2005-07-13 17:50:08 UTC (rev 6496) @@ -1,16 +1,20 @@ Summary: Kerberos is a network authentication protocol. Name: krb5 Version: 1.3.6 -Release: 7jh +Release: 8jh Group: main Source0: krb5-%{version}.tar.gz Patch0: krb5-1.3.6-prof_err.patch Patch1: 2005-001-patch_1.4.txt Patch2: krb5-1.3.6-CAN-2004-0175.patch +Patch3: krb5-1.4-MITKRB5-SA-2005-002.patch +Patch4: krb5-1.4-MITKRB5-SA-2005-003.patch +Patch5: krb5-1.4.1-telnet-environ.patch +Patch6: krb5-1.3.3-no-rpath.patch URL: http://web.mit.edu/kerberos License: Distributable Requires: libcom_err libtermcap ncurses -BuildRequires: libcom_err-devel byacc libtermcap-devel ncurses-devel +BuildRequires: libcom_err-devel byacc libtermcap-devel ncurses-devel autoconf %rename kerberos5 BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -49,8 +53,22 @@ %patch1 -p0 cd - %patch2 -p1 -b .CAN-2004-0175~ +cd src +%patch3 -p0 -b .MIT-KRB5-SA-2005-002~ +%patch4 -p0 -b .MIT-KRB5-SA-2005-003~ +cd - +%patch5 -p1 -b .telnet-environ~ +%patch6 -p1 -b .no-rpath~ +cd src +top=`pwd` +for configurein in `find -name configure.in -type f` ; do + pushd `dirname $configurein` + autoconf -I "$top" + popd +done + %build pushd src export CFLAGS="${RPM_OPT_FLAGS} %{?no_stack_protector} -I/usr/include/et -fPIC" @@ -62,9 +80,16 @@ --enable-shared \ --program-prefix=krb5 \ --with-system-et \ + --with-system-ss \ --enable-dns \ - --with-netlib=-lresolv -%make -j1 + --with-netlib=-lresolv \ + --without-tcl +# Override the RPATH_FLAG and PROG_LIBPATH to drop the rpath, and +# override LDCOMBINE to use gcc instead of ld to build shared libraries. +%make -j1 \ + RPATH_FLAG= \ + PROG_RPATH= \ + LDCOMBINE='%{__cc} -shared -Wl,-soname=lib$(LIB)$(SHLIBSEXT) $(CFLAGS)' popd @@ -103,6 +128,12 @@ %changelog +* Tue Jul 12 2005 Jaakko Heinonen 1.3.6-8jh +- CAN-2005-1174,CAN-2005-1175 (MIT-KRB5-SA-2005-002) +- CAN-2005-1689 (MIT-KRB5-SA-2005-003) +- fix telnet client environment variable disclosure (CAN-2005-0488) +- add no-rpath patch from Fedora + * Sun Jul 3 2005 Jaakko Heinonen 1.3.6-7jh - CAN-2004-0175