From fedora-cvs-commits at redhat.com Sun May 1 03:53:45 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 30 Apr 2005 23:53:45 -0400 Subject: rpms/perl-Frontier-RPC/devel perl-Frontier-RPC.spec,1.5,1.6 Message-ID: <200505010353.j413rjGh017860@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/perl-Frontier-RPC/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17848 Modified Files: perl-Frontier-RPC.spec Log Message: - Source URL: using the Comprehensive Perl Arcana Society Tapestry address (Frontier::RPC version 0.06 no longer available in CPAN mirrors). - spec cleanup (#156480) (and remove Changelog because we don't care about changes made in 1999) Index: perl-Frontier-RPC.spec =================================================================== RCS file: /cvs/dist/rpms/perl-Frontier-RPC/devel/perl-Frontier-RPC.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-Frontier-RPC.spec 31 Mar 2005 09:28:05 -0000 1.5 +++ perl-Frontier-RPC.spec 1 May 2005 03:53:43 -0000 1.6 @@ -1,22 +1,20 @@ -%define _use_internal_dependency_generator 0 - -Summary: A Perl interface for making and serving XML-RPC calls. -Name: perl-Frontier-RPC -Version: 0.06 -Release: 39 -License: distributable -Group: Applications/CPAN -Source0: Frontier-RPC-%{version}.tar.gz -Patch0: perl-frontier-raw-call.patch -Patch1: perl-frontier-raw-serve.patch -Url: http://www.cpan.org -BuildRoot: /var/tmp/perl-Frontier-RPC-buildroot/ -BuildRequires: perl >= 0:5.00503 -Requires: perl >= 0:5.00503 -BuildArch: noarch - -BuildRequires: perl-XML-Parser -BuildRequires: perl-libwww-perl +Summary: A Perl interface for making and serving XML-RPC calls +Name: perl-Frontier-RPC +Version: 0.06 +Release: 39 + +Group: Development/Libraries +License: GPL or Artistic +Url: http://search.cpan.org/dist/Frontier-RPC/ +Source0: http://history.perl.org/backpan/authors/id/K/KM/KMACLEOD/Frontier-RPC-0.06.tar.gz +Patch0: perl-frontier-raw-call.patch +Patch1: perl-frontier-raw-serve.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl-libwww-perl, perl-XML-Parser +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Frontier::RPC implements UserLand Software's XML RPC (Remote Procedure @@ -25,44 +23,41 @@ for implementing servers. Frontier::RPC uses RPC2 format messages. -# Provide perl-specific find-{provides,requires}. -%define __find_provides /usr/lib/rpm/find-provides.perl -%define __find_requires /usr/lib/rpm/find-requires.perl - %prep %setup -q -n Frontier-RPC-%{version} -%patch0 -p1 -b .rawcall -%patch1 -p1 -b .rawserve +%patch0 -p1 +%patch1 -p1 %build -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor -make -#make test +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} -%clean +%install rm -rf $RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w $RPM_BUILD_ROOT/* -%install +%check || : +make test + +%clean rm -rf $RPM_BUILD_ROOT -make install -find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; -find $RPM_BUILD_ROOT/usr -type f -print | - sed "s@^$RPM_BUILD_ROOT@@g" | - grep -v perllocal.pod | - grep -v "\.packlist" > Frontier-RPC-%{version}-filelist -if [ "$(cat Frontier-RPC-%{version}-filelist)X" = "X" ] ; then - echo "ERROR: EMPTY FILE LIST" - exit -1 -fi +%files +%defattr(-,root,root,-) +%doc COPYING README examples/ +%{perl_vendorlib}/Frontier/ +%{_mandir}/man3/*.3* -%files -f Frontier-RPC-%{version}-filelist -%defattr(-,root,root) %changelog -* Wed Mar 30 2005 Warren Togami -- remove brp-compress +* Sat Apr 30 2005 Jose Pedro Oliveira - 0.06-39 +- Source URL: using the Comprehensive Perl Arcana Society Tapestry address + (Frontier::RPC version 0.06 no longer available in CPAN mirrors). +- spec cleanup (#156480) * Wed Sep 22 2004 Chip Turner 0.06-38 - rebuild From fedora-cvs-commits at redhat.com Sun May 1 04:05:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 May 2005 00:05:59 -0400 Subject: rpms/perl-SGMLSpm/devel perl-SGMLSpm.spec,1.6,1.7 Message-ID: <200505010405.j4145xJQ011759@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/perl-SGMLSpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11735 Modified Files: perl-SGMLSpm.spec Log Message: Specfile cleanup. (#156483) Index: perl-SGMLSpm.spec =================================================================== RCS file: /cvs/dist/rpms/perl-SGMLSpm/devel/perl-SGMLSpm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-SGMLSpm.spec 22 Sep 2004 12:10:28 -0000 1.6 +++ perl-SGMLSpm.spec 1 May 2005 04:05:53 -0000 1.7 @@ -1,61 +1,53 @@ -%define _use_internal_dependency_generator 0 +Name: perl-SGMLpm +Version: 1.03ii +Release: 15 +Summary: Perl library for parsing the output of nsgmls + +Group: Development/Libraries +License: GPL +URL: http://search.cpan.org/dist/SGMLSpm/ +Source0: http://www.cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: perl >= 1:5.6.1 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: openjade -%define Name perl-SGMLSpm -%define Version 1.03ii -%define perldir %(perl -V:installvendorlib | sed 's/^installvendorlib=.\\(.*\\).;$/\\1/') - -Name : %{Name} -Version : %{Version} -Release : 14 -Group : Applications/Text - -Summary : Perl library for parsing the output of nsgmls. - -License : GPL -URL : http://www.megginson.com/Software/ - -Requires : openjade -Requires : perl >= 5 - -BuildRoot : %{_tmppath}/%{Name}-%{Version} - -BuildArch : noarch -Source0 : ftp://cpan.perl.org/pub/perl/CPAN/modules/by-module/SGMLS/SGMLSpm-%{Version}.tar.gz - - -%Description +%description Perl programs can use the SGMLSpm module to help convert SGML, HTML or XML documents into new formats. -%Prep -%setup -n SGMLSpm - +%prep +%setup -q -n SGMLSpm -%Build +%build +%install +rm -rf $RPM_BUILD_ROOT +install -d -m 755 $RPM_BUILD_ROOT{%{_bindir},%{perl_vendorlib}} +make install_system \ + BINDIR=$RPM_BUILD_ROOT%{_bindir} \ + PERL5DIR=$RPM_BUILD_ROOT%{perl_vendorlib} -%Install -DESTDIR=$RPM_BUILD_ROOT -rm -rf $DESTDIR -mkdir -p $DESTDIR/usr/bin -mkdir -p $DESTDIR/%{perldir} -make install_system BINDIR=${DESTDIR}/usr/bin PERL5DIR=${DESTDIR}/%{perldir} +%check || : +%clean +rm -rf $RPM_BUILD_ROOT -%Clean -DESTDIR=$RPM_BUILD_ROOT -rm -rf $DESTDIR - -%Files -%defattr (-,root,root) -%doc BUGS COPYING ChangeLog DOC/ README TODO elisp -/usr/bin/sgmlspl -%{perldir} +%files +%defattr(-,root,root,-) +%{_bindir}/sgmlspl +%{perl_vendorlib}/SGMLS* +%{perl_vendorlib}/skel.pl %changelog +* Sat Apr 30 2005 Jose Pedro Oliveira - 1.03ii-15 +- Specfile cleanup. (#156483) + * Wed Sep 22 2004 Than Ngo - rebuilt From fedora-cvs-commits at redhat.com Sun May 1 07:18:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 May 2005 03:18:56 -0400 Subject: rpms/kernel/devel kernel-2.6.spec,1.1278,1.1279 Message-ID: <200505010718.j417Iutn001244@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1227 Modified Files: kernel-2.6.spec Log Message: - Enable usbmon & debugfs. (#156489) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1278 retrieving revision 1.1279 diff -u -r1.1278 -r1.1279 --- kernel-2.6.spec 30 Apr 2005 19:42:10 -0000 1.1278 +++ kernel-2.6.spec 1 May 2005 07:18:54 -0000 1.1279 @@ -1192,6 +1192,9 @@ %endif %changelog +* Sun May 1 2005 Dave Jones +- Enable usbmon & debugfs. (#156489) + * Sat Apr 30 2005 Dave Jones - Numerous IDE layer fixes from Alan Cox. - Kill off some stupid messages from the input layer. From fedora-cvs-commits at redhat.com Sun May 1 07:18:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 May 2005 03:18:56 -0400 Subject: rpms/kernel/devel/configs config-generic,1.17,1.18 Message-ID: <200505010718.j417Iuem001252@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv1227/configs Modified Files: config-generic Log Message: - Enable usbmon & debugfs. (#156489) Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- config-generic 30 Apr 2005 19:32:24 -0000 1.17 +++ config-generic 1 May 2005 07:18:54 -0000 1.18 @@ -2154,7 +2154,7 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_IPW=m CONFIG_USB_PHIDGETKIT=m -# CONFIG_USB_MON is not set +CONFIG_USB_MON=m CONFIG_USB_SISUSBVGA=m @@ -2452,7 +2452,7 @@ CONFIG_SENSORS_SMSC47B397=m CONFIG_USB_SERIAL_GARMIN=m CONFIG_USB_SERIAL_TI=m -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m From fedora-cvs-commits at redhat.com Sun May 1 08:22:32 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 May 2005 04:22:32 -0400 Subject: rpms/kernel/FC-3 linux-2.6.10-ac11-firewire-fixes.patch, NONE, 1.1 kernel-2.6.spec, 1.820, 1.821 Message-ID: <200505010822.j418MWHe029976@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv29962 Modified Files: kernel-2.6.spec Added Files: linux-2.6.10-ac11-firewire-fixes.patch Log Message: Various firewire fixes backported from -mm. (#133798) linux-2.6.10-ac11-firewire-fixes.patch: drivers/ieee1394/raw1394.c | 3090 ++++++++++----------- linux-2.6.10-ac11/drivers/ieee1394/dv1394.c | 5 linux-2.6.10-ac11/drivers/ieee1394/ieee1394_core.c | 16 linux-2.6.10-ac11/drivers/ieee1394/ieee1394_core.h | 1 linux-2.6.10-ac11/drivers/ieee1394/raw1394.c | 862 +++-- linux-2.6.10-ac11/drivers/ieee1394/video1394.c | 10 6 files changed, 2091 insertions(+), 1893 deletions(-) --- NEW FILE linux-2.6.10-ac11-firewire-fixes.patch --- # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/01/31 00:49:36-05:00 scjody at modernduck.com # Some Lindent cleanup (most removed to its own patch by scjody) # Adds basic sysfs support for udev etc. # # Signed-off-by: Daniel Drake # Signed-off-by: Jody McIntyre # # drivers/ieee1394/raw1394.c # 2005/01/31 00:47:36-05:00 scjody at modernduck.com +531 -335 # Index: linux-2.6.10-ac11/drivers/ieee1394/raw1394.c =================================================================== --- linux-2.6.10-ac11.orig/drivers/ieee1394/raw1394.c 2005-02-04 11:54:54.000000000 -0500 +++ linux-2.6.10-ac11/drivers/ieee1394/raw1394.c 2005-02-04 12:22:21.000000000 -0500 @@ -78,15 +78,18 @@ static atomic_t iso_buffer_size; static const int iso_buffer_max = 4 * 1024 * 1024; /* 4 MB */ static struct hpsb_highlevel raw1394_highlevel; +static struct class_simple *raw1394_class; -static int arm_read (struct hpsb_host *host, int nodeid, quadlet_t *buffer, +static int arm_read(struct hpsb_host *host, int nodeid, quadlet_t * buffer, u64 addr, size_t length, u16 flags); -static int arm_write (struct hpsb_host *host, int nodeid, int destid, - quadlet_t *data, u64 addr, size_t length, u16 flags); -static int arm_lock (struct hpsb_host *host, int nodeid, quadlet_t *store, - u64 addr, quadlet_t data, quadlet_t arg, int ext_tcode, u16 flags); -static int arm_lock64 (struct hpsb_host *host, int nodeid, octlet_t *store, - u64 addr, octlet_t data, octlet_t arg, int ext_tcode, u16 flags); +static int arm_write(struct hpsb_host *host, int nodeid, int destid, + quadlet_t * data, u64 addr, size_t length, u16 flags); +static int arm_lock(struct hpsb_host *host, int nodeid, quadlet_t * store, + u64 addr, quadlet_t data, quadlet_t arg, int ext_tcode, + u16 flags); +static int arm_lock64(struct hpsb_host *host, int nodeid, octlet_t * store, + u64 addr, octlet_t data, octlet_t arg, int ext_tcode, + u16 flags); static struct hpsb_address_ops arm_ops = { .read = arm_read, .write = arm_write, @@ -268,11 +271,14 @@ static void host_reset(struct hpsb_host if (req != NULL) { req->file_info = fi; req->req.type = RAW1394_REQ_BUS_RESET; - req->req.generation = get_hpsb_generation(host); + req->req.generation = + get_hpsb_generation(host); req->req.misc = (host->node_id << 16) | host->node_count; if (fi->protocol_version > 3) { - req->req.misc |= (NODEID_TO_NODE(host->irm_id) + req->req.misc |= + (NODEID_TO_NODE + (host->irm_id) << 8); } @@ -284,7 +290,7 @@ static void host_reset(struct hpsb_host spin_unlock_irqrestore(&host_info_lock, flags); } -static void iso_receive(struct hpsb_host *host, int channel, quadlet_t *data, +static void iso_receive(struct hpsb_host *host, int channel, quadlet_t * data, size_t length) { unsigned long flags; @@ -308,7 +314,8 @@ static void iso_receive(struct hpsb_host continue; req = __alloc_pending_request(SLAB_ATOMIC); - if (!req) break; + if (!req) + break; if (!ibs) { ibs = kmalloc(sizeof(struct iso_block_store) @@ -345,7 +352,7 @@ static void iso_receive(struct hpsb_host } static void fcp_request(struct hpsb_host *host, int nodeid, int direction, - int cts, u8 *data, size_t length) + int cts, u8 * data, size_t length) { unsigned long flags; struct host_info *hi; @@ -368,7 +375,8 @@ static void fcp_request(struct hpsb_host continue; req = __alloc_pending_request(SLAB_ATOMIC); - if (!req) break; + if (!req) + break; if (!ibs) { ibs = kmalloc(sizeof(struct iso_block_store) @@ -404,9 +412,8 @@ static void fcp_request(struct hpsb_host queue_complete_req(req); } - -static ssize_t raw1394_read(struct file *file, char __user *buffer, size_t count, - loff_t *offset_is_ignored) +static ssize_t raw1394_read(struct file *file, char __user * buffer, + size_t count, loff_t * offset_is_ignored) { struct file_info *fi = (struct file_info *)file->private_data; struct list_head *lh; @@ -496,7 +503,7 @@ static int state_initialized(struct file if (khl != NULL) { req->req.misc = host_count; - req->data = (quadlet_t *)khl; + req->data = (quadlet_t *) khl; list_for_each_entry(hi, &host_info_list, list) { khl->nodes = hi->host->node_count; @@ -509,7 +516,8 @@ static int state_initialized(struct file if (khl != NULL) { req->req.error = RAW1394_ERROR_NONE; req->req.length = min(req->req.length, - (u32)(sizeof(struct raw1394_khost_list) + (u32) (sizeof + (struct raw1394_khost_list) * req->req.misc)); req->free_data = 1; } else { @@ -534,7 +542,8 @@ static int state_initialized(struct file req->req.misc = (fi->host->node_id << 16) | fi->host->node_count; if (fi->protocol_version > 3) { - req->req.misc |= NODEID_TO_NODE(fi->host->irm_id) << 8; + req->req.misc |= + NODEID_TO_NODE(fi->host->irm_id) << 8; } } else { req->req.error = RAW1394_ERROR_INVALID_ARG; @@ -566,7 +575,8 @@ static void handle_iso_listen(struct fil if (fi->listen_channels & (1ULL << channel)) { req->req.error = RAW1394_ERROR_ALREADY; } else { - if (hpsb_listen_channel(&raw1394_highlevel, fi->host, channel)) { + if (hpsb_listen_channel + (&raw1394_highlevel, fi->host, channel)) { req->req.error = RAW1394_ERROR_ALREADY; } else { fi->listen_channels |= 1ULL << channel; @@ -579,7 +589,8 @@ static void handle_iso_listen(struct fil channel = ~channel; if (fi->listen_channels & (1ULL << channel)) { - hpsb_unlisten_channel(&raw1394_highlevel, fi->host, channel); + hpsb_unlisten_channel(&raw1394_highlevel, fi->host, + channel); fi->listen_channels &= ~(1ULL << channel); } else { req->req.error = RAW1394_ERROR_INVALID_ARG; @@ -621,7 +632,8 @@ static int handle_async_request(struct f switch (req->req.type) { case RAW1394_REQ_ASYNC_READ: DBGMSG("read_request called"); - packet = hpsb_make_readpacket(fi->host, node, addr, req->req.length); + packet = + hpsb_make_readpacket(fi->host, node, addr, req->req.length); if (!packet) return -ENOMEM; @@ -642,11 +654,13 @@ static int handle_async_request(struct f return -ENOMEM; if (req->req.length == 4) { - if (copy_from_user(&packet->header[3], int2ptr(req->req.sendb), + if (copy_from_user + (&packet->header[3], int2ptr(req->req.sendb), req->req.length)) req->req.error = RAW1394_ERROR_MEMFAULT; } else { - if (copy_from_user(packet->data, int2ptr(req->req.sendb), + if (copy_from_user + (packet->data, int2ptr(req->req.sendb), req->req.length)) req->req.error = RAW1394_ERROR_MEMFAULT; } @@ -657,8 +671,11 @@ static int handle_async_request(struct f case RAW1394_REQ_ASYNC_STREAM: DBGMSG("stream_request called"); - packet = hpsb_make_streampacket(fi->host, NULL, req->req.length, node & 0x3f/*channel*/, - (req->req.misc >> 16) & 0x3, req->req.misc & 0xf); + packet = + hpsb_make_streampacket(fi->host, NULL, req->req.length, + node & 0x3f /*channel */ , + (req->req.misc >> 16) & 0x3, + req->req.misc & 0xf); if (!packet) return -ENOMEM; [...5590 lines suppressed...] @@ -2333,6 +2333,8 @@ static void dv1394_remove_host (struct h dv1394_un_init(video); } while (video != NULL); + class_simple_device_remove(MKDEV( + IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2))); devfs_remove("ieee1394/dv/host%d/NTSC", id); devfs_remove("ieee1394/dv/host%d/PAL", id); devfs_remove("ieee1394/dv/host%d", id); @@ -2349,6 +2351,9 @@ static void dv1394_add_host (struct hpsb ohci = (struct ti_ohci *)host->hostdata; + class_simple_device_add(hpsb_protocol_class, MKDEV( + IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), + NULL, "dv1394-%d", id); devfs_mk_dir("ieee1394/dv/host%d", id); devfs_mk_dir("ieee1394/dv/host%d/NTSC", id); devfs_mk_dir("ieee1394/dv/host%d/PAL", id); Index: linux-2.6.10-ac11/drivers/ieee1394/ieee1394_core.c =================================================================== --- linux-2.6.10-ac11.orig/drivers/ieee1394/ieee1394_core.c 2005-01-11 13:32:37.000000000 -0500 +++ linux-2.6.10-ac11/drivers/ieee1394/ieee1394_core.c 2005-02-04 12:32:00.000000000 -0500 @@ -61,6 +61,7 @@ MODULE_LICENSE("GPL"); /* Some globals used */ const char *hpsb_speedto_str[] = { "S100", "S200", "S400", "S800", "S1600", "S3200" }; +struct class_simple *hpsb_protocol_class; #ifdef CONFIG_IEEE1394_VERBOSEDEBUG static void dump_packet(const char *text, quadlet_t *data, int size) @@ -1054,7 +1055,6 @@ static int hpsbpkt_thread(void *__hi) complete_and_exit(&khpsbpkt_complete, 0); } - static int __init ieee1394_init(void) { int i, ret; @@ -1109,11 +1109,17 @@ static int __init ieee1394_init(void) if (ret < 0) goto release_all_bus; + hpsb_protocol_class = class_simple_create(THIS_MODULE, "ieee1394_protocol"); + if (IS_ERR(hpsb_protocol_class)) { + ret = PTR_ERR(hpsb_protocol_class); + goto release_class_host; + } + ret = init_csr(); if (ret) { HPSB_INFO("init csr failed"); ret = -ENOMEM; - goto release_class; + goto release_class_protocol; } if (disable_nodemgr) { @@ -1131,7 +1137,9 @@ static int __init ieee1394_init(void) cleanup_csr: cleanup_csr(); -release_class: +release_class_protocol: + class_simple_destroy(hpsb_protocol_class); +release_class_host: class_unregister(&hpsb_host_class); release_all_bus: for (i = 0; fw_bus_attrs[i]; i++) @@ -1160,6 +1168,7 @@ static void __exit ieee1394_cleanup(void cleanup_csr(); + class_simple_destroy(hpsb_protocol_class); class_unregister(&hpsb_host_class); for (i = 0; fw_bus_attrs[i]; i++) bus_remove_file(&ieee1394_bus_type, fw_bus_attrs[i]); @@ -1191,6 +1200,7 @@ EXPORT_SYMBOL(hpsb_update_config_rom_ima /** ieee1394_core.c **/ EXPORT_SYMBOL(hpsb_speedto_str); +EXPORT_SYMBOL(hpsb_protocol_class); EXPORT_SYMBOL(hpsb_set_packet_complete_task); EXPORT_SYMBOL(hpsb_alloc_packet); EXPORT_SYMBOL(hpsb_free_packet); Index: linux-2.6.10-ac11/drivers/ieee1394/ieee1394_core.h =================================================================== --- linux-2.6.10-ac11.orig/drivers/ieee1394/ieee1394_core.h 2005-01-11 13:32:37.000000000 -0500 +++ linux-2.6.10-ac11/drivers/ieee1394/ieee1394_core.h 2005-02-04 12:32:00.000000000 -0500 @@ -223,5 +223,6 @@ static inline unsigned char ieee1394_fil /* Our sysfs bus entry */ extern struct bus_type ieee1394_bus_type; extern struct class hpsb_host_class; +extern struct class_simple *hpsb_protocol_class; #endif /* _IEEE1394_CORE_H */ Index: linux-2.6.10-ac11/drivers/ieee1394/raw1394.c =================================================================== --- linux-2.6.10-ac11.orig/drivers/ieee1394/raw1394.c 2005-02-04 12:31:22.000000000 -0500 +++ linux-2.6.10-ac11/drivers/ieee1394/raw1394.c 2005-02-04 12:32:00.000000000 -0500 @@ -78,7 +78,6 @@ static atomic_t iso_buffer_size; static const int iso_buffer_max = 4 * 1024 * 1024; /* 4 MB */ static struct hpsb_highlevel raw1394_highlevel; -static struct class_simple *raw1394_class; static int arm_read(struct hpsb_host *host, int nodeid, quadlet_t * buffer, u64 addr, size_t length, u16 flags); @@ -2887,20 +2886,16 @@ static int __init init_raw1394(void) hpsb_register_highlevel(&raw1394_highlevel); - raw1394_class = class_simple_create(THIS_MODULE, "raw1394"); - if (IS_ERR(raw1394_class)) { - ret = PTR_ERR(raw1394_class); + if (IS_ERR(class_simple_device_add(hpsb_protocol_class, MKDEV( + IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16), + NULL, RAW1394_DEVICE_NAME))) { + ret = -EFAULT; goto out_unreg; } - - class_simple_device_add(raw1394_class, - MKDEV(IEEE1394_MAJOR, - IEEE1394_MINOR_BLOCK_RAW1394 * 16), NULL, - RAW1394_DEVICE_NAME); - ret = - devfs_mk_cdev(MKDEV - (IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16), - S_IFCHR | S_IRUSR | S_IWUSR, RAW1394_DEVICE_NAME); + + ret = devfs_mk_cdev(MKDEV( + IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16), + S_IFCHR | S_IRUSR | S_IWUSR, RAW1394_DEVICE_NAME); if (ret) goto out_class; @@ -2924,25 +2919,21 @@ static int __init init_raw1394(void) goto out; - out_dev: +out_dev: devfs_remove(RAW1394_DEVICE_NAME); - out_class: - class_simple_device_remove(MKDEV - (IEEE1394_MAJOR, - IEEE1394_MINOR_BLOCK_RAW1394 * 16)); - class_simple_destroy(raw1394_class); - out_unreg: +out_class: + class_simple_device_remove(MKDEV( + IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)); +out_unreg: hpsb_unregister_highlevel(&raw1394_highlevel); - out: +out: return ret; } static void __exit cleanup_raw1394(void) { - class_simple_device_remove(MKDEV - (IEEE1394_MAJOR, - IEEE1394_MINOR_BLOCK_RAW1394 * 16)); - class_simple_destroy(raw1394_class); + class_simple_device_remove(MKDEV( + IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16)); hpsb_unregister_protocol(&raw1394_driver); cdev_del(&raw1394_cdev); devfs_remove(RAW1394_DEVICE_NAME); Index: linux-2.6.10-ac11/drivers/ieee1394/video1394.c =================================================================== --- linux-2.6.10-ac11.orig/drivers/ieee1394/video1394.c 2005-01-11 11:12:42.000000000 -0500 +++ linux-2.6.10-ac11/drivers/ieee1394/video1394.c 2005-02-04 12:32:00.000000000 -0500 @@ -1288,6 +1288,9 @@ static void video1394_add_host (struct h hpsb_set_hostinfo_key(&video1394_highlevel, host, ohci->host->id); minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id; + class_simple_device_add(hpsb_protocol_class, MKDEV( + IEEE1394_MAJOR, minor), + NULL, "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id); devfs_mk_cdev(MKDEV(IEEE1394_MAJOR, minor), S_IFCHR | S_IRUSR | S_IWUSR, "%s/%d", VIDEO1394_DRIVER_NAME, ohci->host->id); @@ -1298,9 +1301,12 @@ static void video1394_remove_host (struc { struct ti_ohci *ohci = hpsb_get_hostinfo(&video1394_highlevel, host); - if (ohci) + if (ohci) { + class_simple_device_remove(MKDEV(IEEE1394_MAJOR, + IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id)); devfs_remove("%s/%d", VIDEO1394_DRIVER_NAME, ohci->host->id); - + } + return; } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v retrieving revision 1.820 retrieving revision 1.821 diff -u -r1.820 -r1.821 --- kernel-2.6.spec 30 Apr 2005 22:18:43 -0000 1.820 +++ kernel-2.6.spec 1 May 2005 08:22:30 -0000 1.821 @@ -298,6 +298,7 @@ # Misc bits. Patch1700: linux-2.6.10-revert-module-invalidparam.patch Patch1710: linux-2.6.11-panic-stackdump.patch +Patch1720: linux-2.6.10-ac11-firewire-fixes.patch Patch1740: linux-2.6.11-default-elevator.patch Patch1760: linux-2.6.9-module_version.patch Patch1910: linux-2.6.9-spinlock-debug-panic.patch @@ -589,6 +590,8 @@ %patch1700 -p1 # Print stack trace when we panic. %patch1710 -p1 +# Various fixes for firewire from -mm +%patch1720 -p1 # Set CFQ as default elevator %patch1740 -p1 # Add missing MODULE_VERSION tags to some modules. @@ -909,6 +912,10 @@ %endif %changelog +* Sun May 1 2005 Dave Jones +- Various firewire fixes backported from -mm. (#133798) + (Thanks to Jody McIntyre for doing this) + * Fri Apr 29 2005 Dave Jones - fix oops in aacraid open when using adaptec tools. (#148761) - Blacklist another brainless SCSI scanner. (#155457) From fedora-cvs-commits at redhat.com Sun May 1 09:30:31 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 May 2005 05:30:31 -0400 Subject: rpms/kernel/devel linux-2.6.11-random-ehci-patch.patch, NONE, 1.1 linux-2.6.12-rc3-ehci-misc-updates.patch, NONE, 1.1 kernel-2.6.spec, 1.1279, 1.1280 linux-2.6.0-compile.patch, 1.151, 1.152 Message-ID: <200505010930.j419UV7B017880@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17857 Modified Files: kernel-2.6.spec linux-2.6.0-compile.patch Added Files: linux-2.6.11-random-ehci-patch.patch linux-2.6.12-rc3-ehci-misc-updates.patch Log Message: EHCI port power fix, split some other random unexplained patch out of linux-2.6.0-compile.patch linux-2.6.11-random-ehci-patch.patch: ehci-hcd.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6.11-random-ehci-patch.patch --- --- linux-2.6.11/drivers/usb/host/ehci-hcd.c.orig 2005-05-01 10:01:22.152008984 +0100 +++ linux-2.6.11/drivers/usb/host/ehci-hcd.c 2005-05-01 10:25:00.418949184 +0100 @@ -382,6 +382,7 @@ static int ehci_hc_reset (struct usb_hcd ehci->hcs_params = readl (&ehci->caps->hcs_params); #ifdef CONFIG_PCI + writel(0, &ehci->regs->intr_enable); if (hcd->self.controller->bus == &pci_bus_type) { struct pci_dev *pdev = to_pci_dev(hcd->self.controller); linux-2.6.12-rc3-ehci-misc-updates.patch: ehci-hcd.c | 65 +++++++++++++++++++++++++++++++++++++++++-------------------- ehci-hub.c | 2 + ehci.h | 19 +++++++++-------- 3 files changed, 56 insertions(+), 30 deletions(-) --- NEW FILE linux-2.6.12-rc3-ehci-misc-updates.patch --- Miscellaneous updates for EHCI. - Mostly updates the power switching on EHCI controllers. One routine centralizes the "power on/off all ports" logic, and the capability to do that is reported more correctly. - Courtesy Colin Leroy, a patch to always power up ports after resumes which didn't keep a USB device suspended. The reset-everything logic powers down those ports (on some hardware) so something needs to turn them back on. - Minor tweaks/bugfixes for the debug port support. Signed-off-by: David Brownell --- a/drivers/usb/host/ehci-hcd.c 2005-04-05 15:04:13 -07:00 +++ b/drivers/usb/host/ehci-hcd.c 2005-04-05 15:04:13 -07:00 @@ -346,6 +347,22 @@ return 0; } +static void ehci_port_power (struct ehci_hcd *ehci, int is_on) +{ + unsigned port; + + if (!HCS_PPC (ehci->hcs_params)) + return; + + ehci_dbg (ehci, "...power%s ports...\n", is_on ? "up" : "down"); + for (port = HCS_N_PORTS (ehci->hcs_params); port > 0; ) + (void) ehci_hub_control(ehci_to_hcd(ehci), + is_on ? SetPortFeature : ClearPortFeature, + USB_PORT_FEAT_POWER, + port--, NULL, 0); + msleep(20); +} + /* called by khubd or root hub init threads */ @@ -362,8 +379,10 @@ dbg_hcs_params (ehci, "reset"); dbg_hcc_params (ehci, "reset"); + /* cache this readonly data; minimize chip reads */ + ehci->hcs_params = readl (&ehci->caps->hcs_params); + #ifdef CONFIG_PCI - /* EHCI 0.96 and later may have "extended capabilities" */ if (hcd->self.controller->bus == &pci_bus_type) { struct pci_dev *pdev = to_pci_dev(hcd->self.controller); @@ -383,9 +402,30 @@ break; } + /* optional debug port, normally in the first BAR */ + temp = pci_find_capability (pdev, 0x0a); + if (temp) { + pci_read_config_dword(pdev, temp, &temp); + temp >>= 16; + if ((temp & (3 << 13)) == (1 << 13)) { + temp &= 0x1fff; + ehci->debug = hcd->regs + temp; + temp = readl (&ehci->debug->control); + ehci_info (ehci, "debug port %d%s\n", + HCS_DEBUG_PORT(ehci->hcs_params), + (temp & DBGP_ENABLED) + ? " IN USE" + : ""); + if (!(temp & DBGP_ENABLED)) + ehci->debug = NULL; + } + } + temp = HCC_EXT_CAPS (readl (&ehci->caps->hcc_params)); } else temp = 0; + + /* EHCI 0.96 and later may have "extended capabilities" */ while (temp && count--) { u32 cap; @@ -414,8 +454,7 @@ ehci_reset (ehci); #endif - /* cache this readonly data; minimize PCI reads */ - ehci->hcs_params = readl (&ehci->caps->hcs_params); + ehci_port_power (ehci, 0); /* at least the Genesys GL880S needs fixup here */ temp = HCS_N_CC(ehci->hcs_params) * HCS_N_PCC(ehci->hcs_params); @@ -657,16 +696,11 @@ static void ehci_stop (struct usb_hcd *hcd) { struct ehci_hcd *ehci = hcd_to_ehci (hcd); - u8 rh_ports, port; ehci_dbg (ehci, "stop\n"); /* Turn off port power on all root hub ports. */ - rh_ports = HCS_N_PORTS (ehci->hcs_params); - for (port = 1; port <= rh_ports; port++) - (void) ehci_hub_control(hcd, - ClearPortFeature, USB_PORT_FEAT_POWER, - port, NULL, 0); + ehci_port_power (ehci, 0); /* no more interrupts ... */ del_timer_sync (&ehci->watchdog); @@ -748,7 +782,6 @@ unsigned port; struct usb_device *root = hcd->self.root_hub; int retval = -EINVAL; - int powerup = 0; // maybe restore (PCI) FLADJ @@ -766,8 +799,6 @@ up (&hcd->self.root_hub->serialize); break; } - if ((status & PORT_POWER) == 0) - powerup = 1; if (!root->children [port]) continue; dbg_port (ehci, __FUNCTION__, port + 1, status); @@ -794,16 +825,9 @@ retval = ehci_start (hcd); /* here we "know" root ports should always stay powered; - * but some controllers may lost all power. + * but some controllers may lose all power. */ - if (powerup) { - ehci_dbg (ehci, "...powerup ports...\n"); - for (port = HCS_N_PORTS (ehci->hcs_params); port > 0; ) - (void) ehci_hub_control(hcd, - SetPortFeature, USB_PORT_FEAT_POWER, - port--, NULL, 0); - msleep(20); - } + ehci_port_power (ehci, 1); } return retval; --- a/drivers/usb/host/ehci-hub.c 2005-04-05 15:04:13 -07:00 +++ b/drivers/usb/host/ehci-hub.c 2005-04-05 15:04:13 -07:00 @@ -281,6 +281,8 @@ temp = 0x0008; /* per-port overcurrent reporting */ if (HCS_PPC (ehci->hcs_params)) temp |= 0x0001; /* per-port power control */ + else + temp |= 0x0002; /* no power switching */ #if 0 // re-enable when we support USB_PORT_FEAT_INDICATOR below. if (HCS_INDICATOR (ehci->hcs_params)) --- a/drivers/usb/host/ehci.h 2005-04-05 15:04:13 -07:00 +++ b/drivers/usb/host/ehci.h 2005-04-05 15:04:13 -07:00 @@ -47,6 +47,12 @@ #define EHCI_MAX_ROOT_PORTS 15 /* see HCS_N_PORTS */ struct ehci_hcd { /* one per controller */ + /* glue to PCI and HCD framework */ + struct ehci_caps __iomem *caps; + struct ehci_regs __iomem *regs; + struct ehci_dbg_port __iomem *debug; + + __u32 hcs_params; /* cached register copy */ spinlock_t lock; /* async schedule support */ @@ -84,11 +90,6 @@ unsigned is_tdi_rh_tt:1; /* TDI roothub with TT */ - /* glue to PCI and HCD framework */ - struct ehci_caps __iomem *caps; - struct ehci_regs __iomem *regs; - __u32 hcs_params; /* cached register copy */ - /* irq statistics */ #ifdef EHCI_STATS struct ehci_stats stats; @@ -165,7 +166,7 @@ /* these fields are specified as 8 and 16 bit registers, * but some hosts can't perform 8 or 16 bit PCI accesses. */ - u32 hc_capbase; + u32 hc_capbase; #define HC_LENGTH(p) (((p)>>00)&0x00ff) /* bits 7:0 */ #define HC_VERSION(p) (((p)>>16)&0xffff) /* bits 31:16 */ u32 hcs_params; /* HCSPARAMS - offset 0x4 */ @@ -273,7 +274,7 @@ #define DBGP_ENABLED (1<<28) #define DBGP_DONE (1<<16) #define DBGP_INUSE (1<<10) -#define DBGP_ERRCODE(x) (((x)>>7)&0x0f) +#define DBGP_ERRCODE(x) (((x)>>7)&0x07) # define DBGP_ERR_BAD 1 # define DBGP_ERR_SIGNAL 2 #define DBGP_ERROR (1<<6) @@ -282,11 +283,11 @@ #define DBGP_LEN(x) (((x)>>0)&0x0f) u32 pids; #define DBGP_PID_GET(x) (((x)>>16)&0xff) -#define DBGP_PID_SET(data,tok) (((data)<<8)|(tok)); +#define DBGP_PID_SET(data,tok) (((data)<<8)|(tok)) u32 data03; u32 data47; u32 address; -#define DBGP_EPADDR(dev,ep) (((dev)<<8)|(ep)); +#define DBGP_EPADDR(dev,ep) (((dev)<<8)|(ep)) } __attribute__ ((packed)); /*-------------------------------------------------------------------------*/ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1279 retrieving revision 1.1280 diff -u -r1.1279 -r1.1280 --- kernel-2.6.spec 1 May 2005 07:18:54 -0000 1.1279 +++ kernel-2.6.spec 1 May 2005 09:30:29 -0000 1.1280 @@ -307,6 +307,8 @@ # USB bits Patch1400: linux-2.6.10-usb-use_both_schemes.patch +Patch1401: linux-2.6.12-rc3-ehci-misc-updates.patch +Patch1402: linux-2.6.11-random-ehci-patch.patch # Netdump and Diskdump bits. Patch1500: linux-2.6.10-crashdump-common.patch @@ -701,6 +703,10 @@ # USB Bits. # Enable both old and new style USB initialisation. %patch1400 -p1 +# Fix port power switching for EHCI +%patch1401 -p1 +# Do something else originally described as "Alan's hint for ehci" +%patch1402 -p1 # netdump bits %patch1500 -p1 @@ -1192,6 +1198,9 @@ %endif %changelog +* Sun May 1 2005 David Woodhouse +- Fix EHCI port power switching + * Sun May 1 2005 Dave Jones - Enable usbmon & debugfs. (#156489) linux-2.6.0-compile.patch: linux-10000/arch/i386/Makefile | 4 ++-- linux-10000/arch/i386/kernel/Makefile | 6 +++--- linux-10000/arch/i386/kernel/nmi.c | 2 +- linux-10000/arch/ppc64/Makefile | 2 +- linux-10000/arch/ppc64/boot/Makefile | 3 +++ linux-10000/arch/x86_64/ia32/sys_ia32.c | 1 - linux-10000/arch/x86_64/mm/init.c | 2 -- linux-10000/drivers/acpi/ec.c | 2 +- linux-10000/drivers/md/raid5.c | 2 ++ linux-10000/drivers/net/3c59x.c | 2 +- linux-10000/drivers/net/acenic.c | 2 +- linux-10000/drivers/pci/search.c | 2 +- linux-10000/drivers/usb/storage/scsiglue.c | 2 +- linux-10000/fs/open.c | 1 - linux-10000/fs/proc/generic.c | 2 +- linux-10000/include/linux/config.h | 4 +++- linux-10000/include/linux/delay.h | 17 ++++++++--------- linux-10000/include/linux/gfp.h | 2 +- linux-10000/include/linux/namei.h | 2 +- linux-10000/init/Kconfig | 2 +- linux-10000/init/main.c | 3 ++- linux-10000/kernel/pid.c | 2 +- linux-10000/scripts/reference_discarded.pl | 3 ++- linux-10000/scripts/reference_init.pl | 1 + linux-10000/sound/core/oss/pcm_oss.c | 7 +++++++ linux-10000/sound/pci/intel8x0.c | 18 ++++++++++++++++++ linux-2.6.11/drivers/scsi/ide-scsi.c | 7 ++++++- linux-2.6.11/drivers/usb/storage/usb.c | 2 +- 28 files changed, 70 insertions(+), 35 deletions(-) Index: linux-2.6.0-compile.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.0-compile.patch,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- linux-2.6.0-compile.patch 13 Apr 2005 02:43:48 -0000 1.151 +++ linux-2.6.0-compile.patch 1 May 2005 09:30:29 -0000 1.152 @@ -189,17 +189,6 @@ return 0; } -diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/usb/host/ehci-hcd.c linux-10000/drivers/usb/host/ehci-hcd.c ---- linux-3022/drivers/usb/host/ehci-hcd.c -+++ linux-10000/drivers/usb/host/ehci-hcd.c -@@ -363,6 +363,7 @@ static int ehci_hc_reset (struct usb_hcd - 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) { - struct pci_dev *pdev = to_pci_dev(hcd->self.controller); diff -urNp --exclude-from=/home/davej/.exclude linux-3022/drivers/usb/storage/scsiglue.c linux-10000/drivers/usb/storage/scsiglue.c --- linux-3022/drivers/usb/storage/scsiglue.c +++ linux-10000/drivers/usb/storage/scsiglue.c From fedora-cvs-commits at redhat.com Sun May 1 19:45:29 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 May 2005 15:45:29 -0400 Subject: rpms/dbus/devel dbus-0.33-types.patch,NONE,1.1 dbus.spec,1.45,1.46 Message-ID: <200505011945.j41JjT6C025074@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/dbus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23831 Modified Files: dbus.spec Added Files: dbus-0.33-types.patch Log Message: - Backport patch from CVS that fixes int32's being marshaled as uint16's in the python bindings dbus-0.33-types.patch: dbus_bindings.pyx.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE dbus-0.33-types.patch --- --- dbus-0.33/python/dbus_bindings.pyx.in.types 2005-05-01 15:38:53.000000000 -0400 +++ dbus-0.33/python/dbus_bindings.pyx.in 2005-05-01 15:39:56.000000000 -0400 @@ -952,7 +952,7 @@ (MESSAGE_TYPE_INVALID, MESSAGE_TYPE_METHOD_CALL, MESSAGE_TYPE_METHOD_RETURN, MESSAGE_TYPE_ERROR, MESSAGE_TYPE_SIGNAL) = range(5) -(TYPE_INVALID, TYPE_BYTE, TYPE_BOOLEAN, TYPE_INT16, TYPE_UINT16, TYPE_INT32, TYPE_UINT32, TYPE_INT64, TYPE_UINT64, TYPE_DOUBLE, TYPE_STRING, TYPE_OBJECT_PATH, TYPE_SIGNATURE, TYPE_ARRAY, TYPE_STRUCT, STRUCT_BEGIN, STRUCT_END, TYPE_VARIANT, TYPE_DICT_ENTRY, DICT_ENTRY_BEGIN, DICT_ENTRY_END) = (0, ord('y'), ord('b'), ord('n'), ord('i'), ord('u'), ord('q'), ord('x'), ord('t'), ord('d'), ord('s'), ord('o'), ord('g'), ord('a'), ord('r'), ord('('), ord(')'), ord('v'), ord('e'), ord('{'), ord('}')) +(TYPE_INVALID, TYPE_BYTE, TYPE_BOOLEAN, TYPE_INT16, TYPE_UINT16, TYPE_INT32, TYPE_UINT32, TYPE_INT64, TYPE_UINT64, TYPE_DOUBLE, TYPE_STRING, TYPE_OBJECT_PATH, TYPE_SIGNATURE, TYPE_ARRAY, TYPE_STRUCT, STRUCT_BEGIN, STRUCT_END, TYPE_VARIANT, TYPE_DICT_ENTRY, DICT_ENTRY_BEGIN, DICT_ENTRY_END) = (0, ord('y'), ord('b'), ord('n'), ord('q'), ord('i'), ord('u'), ord('x'), ord('t'), ord('d'), ord('s'), ord('o'), ord('g'), ord('a'), ord('r'), ord('('), ord(')'), ord('v'), ord('e'), ord('{'), ord('}')) (HANDLER_RESULT_HANDLED, HANDLER_RESULT_NOT_YET_HANDLED, HANDLER_RESULT_NEED_MEMORY) = range(3) cdef class Message: Index: dbus.spec =================================================================== RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- dbus.spec 26 Apr 2005 01:26:19 -0000 1.45 +++ dbus.spec 1 May 2005 19:45:27 -0000 1.46 @@ -12,7 +12,7 @@ Summary: D-BUS message bus Name: dbus Version: 0.33 -Release: 1 +Release: 2 URL: http://www.freedesktop.org/software/dbus/ Source0: %{name}-%{version}.tar.gz License: AFL/GPL @@ -38,6 +38,7 @@ Patch2: dbus-0.23-selinux-avc-audit.patch Patch4: dbus-0.32-print_child_pid.patch Patch5: dbus-0.32-deadlock-fix.patch +Patch6: dbus-0.33-types.patch %description @@ -117,6 +118,7 @@ %patch2 -p1 -b .selinux-avc-audit %patch4 -p1 -b .print_child_pid %patch5 -p0 -b .deadlock-fix +%patch6 -p1 -b .types %build @@ -268,6 +270,10 @@ %{_libdir}/python*/site-packages/dbus_bindings.so %changelog +* Sun May 01 2005 John (J5) Palmieri - 0.33-2 +- Backport patch from CVS that fixes int32's being marshaled as +uint16's in the python bindings + * Mon Apr 25 2005 John (J5) Palmieri - 0.33-1 - update to upstream 0.33 - renable selinux audit patch From fedora-cvs-commits at redhat.com Sun May 1 21:29:14 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 May 2005 17:29:14 -0400 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1280, 1.1281 linux-2.6.12rc-ac-ide-fixes.patch, 1.2, 1.3 Message-ID: <200505012129.j41LTELe010429@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10414 Modified Files: kernel-2.6.spec linux-2.6.12rc-ac-ide-fixes.patch Log Message: Fix the IDE fixes. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1280 retrieving revision 1.1281 diff -u -r1.1280 -r1.1281 --- kernel-2.6.spec 1 May 2005 09:30:29 -0000 1.1280 +++ kernel-2.6.spec 1 May 2005 21:29:11 -0000 1.1281 @@ -1198,6 +1198,9 @@ %endif %changelog +* Sun May 1 2005 Dave Jones +- Fix yesterdays IDE fixes. + * Sun May 1 2005 David Woodhouse - Fix EHCI port power switching linux-2.6.12rc-ac-ide-fixes.patch: drivers/cdrom/cdrom.c | 3 drivers/ide/Kconfig | 13 drivers/ide/Makefile | 2 drivers/ide/arm/icside.c | 6 drivers/ide/cris/ide-v10.c | 6 drivers/ide/ide-cd.c | 135 +++++- drivers/ide/ide-default.c | 108 +++++ drivers/ide/ide-disk.c | 58 ++ drivers/ide/ide-dma.c | 13 drivers/ide/ide-floppy.c | 16 drivers/ide/ide-io.c | 65 +++ drivers/ide/ide-iops.c | 165 +++++--- drivers/ide/ide-pnp.c | 7 drivers/ide/ide-probe.c | 9 drivers/ide/ide-proc.c | 176 +++++--- drivers/ide/ide-tape.c | 16 drivers/ide/ide-taskfile.c | 12 drivers/ide/ide.c | 489 +++++++++++++++++++----- drivers/ide/legacy/ide-cs.c | 28 - drivers/ide/pci/Makefile | 2 drivers/ide/pci/alim15x3.c | 2 drivers/ide/pci/cs5520.c | 11 drivers/ide/pci/delkin_cb.c | 140 +++++++ drivers/ide/pci/generic.c | 86 +++- drivers/ide/pci/hpt366.c | 474 +++++++++++------------ drivers/ide/pci/it821x.c | 812 +++++++++++++++++++++++++++++++++++++++++ drivers/ide/pci/ns87415.c | 2 drivers/ide/pci/pdc202xx_old.c | 2 drivers/ide/pci/sgiioc4.c | 4 drivers/ide/pci/siimage.c | 8 drivers/ide/pci/sl82c105.c | 2 drivers/ide/pci/trm290.c | 7 drivers/ide/ppc/pmac.c | 6 drivers/ide/setup-pci.c | 83 ++++ drivers/macintosh/mediabay.c | 5 drivers/scsi/ide-scsi.c | 4 drivers/scsi/nsp32.h | 1 include/asm-i386/ide.h | 14 include/linux/ide.h | 47 +- include/linux/pci_ids.h | 5 40 files changed, 2416 insertions(+), 628 deletions(-) Index: linux-2.6.12rc-ac-ide-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.12rc-ac-ide-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.12rc-ac-ide-fixes.patch 30 Apr 2005 19:35:34 -0000 1.2 +++ linux-2.6.12rc-ac-ide-fixes.patch 1 May 2005 21:29:11 -0000 1.3 @@ -1,6 +1,6 @@ -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/cdrom/cdrom.c linux-2.6.12rc3/drivers/cdrom/cdrom.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/cdrom/cdrom.c linux-2.6.12rc3-minoride/drivers/cdrom/cdrom.c --- linux.vanilla-2.6.12rc3/drivers/cdrom/cdrom.c 2005-04-27 15:59:27.000000000 +0100 -+++ linux-2.6.12rc3/drivers/cdrom/cdrom.c 2005-04-28 23:48:18.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/cdrom/cdrom.c 2005-04-29 14:51:39.000000000 +0100 @@ -1131,7 +1131,8 @@ This ensures that the drive gets unlocked after a mount fails. This is a goto to avoid bloating the driver with redundant code. */ @@ -11,9 +11,9 @@ if (CDROM_CAN(CDC_LOCK) && cdi->options & CDO_LOCK) { cdo->lock_door(cdi, 0); cdinfo(CD_OPEN, "door unlocked.\n"); -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/arm/icside.c linux-2.6.12rc3/drivers/ide/arm/icside.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/arm/icside.c linux-2.6.12rc3-minoride/drivers/ide/arm/icside.c --- linux.vanilla-2.6.12rc3/drivers/ide/arm/icside.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/arm/icside.c 2005-04-27 16:16:07.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/arm/icside.c 2005-04-29 01:21:18.000000000 +0100 @@ -502,9 +502,9 @@ hwif->ide_dma_off_quietly = icside_dma_off_quietly; hwif->ide_dma_host_on = icside_dma_host_on; @@ -27,9 +27,9 @@ hwif->ide_dma_end = icside_dma_end; hwif->ide_dma_test_irq = icside_dma_test_irq; hwif->ide_dma_timeout = icside_dma_timeout; -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/cris/ide-v10.c linux-2.6.12rc3/drivers/ide/cris/ide-v10.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/cris/ide-v10.c linux-2.6.12rc3-minoride/drivers/ide/cris/ide-v10.c --- linux.vanilla-2.6.12rc3/drivers/ide/cris/ide-v10.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/cris/ide-v10.c 2005-04-27 16:16:07.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/cris/ide-v10.c 2005-04-29 01:21:18.000000000 +0100 @@ -332,9 +332,9 @@ hwif->atapi_output_bytes = &e100_atapi_output_bytes; hwif->ide_dma_check = &e100_dma_check; @@ -43,9 +43,9 @@ hwif->OUTB = &etrax100_ide_outb; hwif->OUTW = &etrax100_ide_outw; hwif->OUTBSYNC = &etrax100_ide_outbsync; -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide.c linux-2.6.12rc3/drivers/ide/ide.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide.c linux-2.6.12rc3-minoride/drivers/ide/ide.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide.c 2005-04-29 00:00:38.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide.c 2005-04-29 01:21:18.000000000 +0100 @@ -175,6 +175,7 @@ static int initializing; /* set while initializing built-in drivers */ @@ -982,9 +982,9 @@ #ifdef CONFIG_PROC_FS proc_ide_destroy(); -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-cd.c linux-2.6.12rc3/drivers/ide/ide-cd.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-cd.c linux-2.6.12rc3-minoride/drivers/ide/ide-cd.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-cd.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-cd.c 2005-04-28 16:22:43.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-cd.c 2005-05-01 14:09:35.135702688 +0100 @@ -394,7 +394,8 @@ * we cannot reliably check if drive can auto-close */ @@ -1182,7 +1182,7 @@ toc->capacity = 0x1fffff; set_capacity(info->disk, toc->capacity * sectors_per_frame); -+ /* Save a private copy of the TOC capacity for error handling */ ++ /* Save a private copy of te TOC capacity for error handling */ + drive->probed_capacity = toc->capacity * sectors_per_frame; + blk_queue_hardsect_size(drive->queue, @@ -1215,7 +1215,17 @@ return CDS_DRIVE_NOT_READY; } -@@ -3303,10 +3365,18 @@ +@@ -2860,6 +2922,9 @@ + devinfo->mask |= CDC_CLOSE_TRAY; + if (!CDROM_CONFIG_FLAGS(drive)->mo_drive) + devinfo->mask |= CDC_MO_DRIVE; ++ ++ /* We must have this masked unless a drive definitely handles it */ ++ devinfo->mask |= CDC_MRW_W; + + devinfo->disk = info->disk; + return register_cdrom(devinfo); +@@ -3303,10 +3368,18 @@ static int proc_idecd_read_capacity (char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -1236,10 +1246,10 @@ PROC_IDE_READ_RETURN(page,start,off,count,eof,len); } -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-default.c linux-2.6.12rc3/drivers/ide/ide-default.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-default.c linux-2.6.12rc3-minoride/drivers/ide/ide-default.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-default.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-default.c 2005-04-28 23:58:37.000000000 +0100 -@@ -0,0 +1,256 @@ ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-default.c 2005-04-29 14:16:16.000000000 +0100 +@@ -0,0 +1,108 @@ +/* + * ide-default - Driver for unbound ide devices + * @@ -1276,45 +1286,6 @@ +#define IDEDEFAULT_VERSION "0.9.newide" + +/* -+ * Refcounting methods -+ */ -+ -+struct ide_default_obj { -+ ide_drive_t *drive; -+ ide_driver_t *driver; -+ struct gendisk *disk; -+ struct kref kref; -+}; -+ -+static DECLARE_MUTEX(idedefault_ref_sem); -+ -+#define to_ide_default(obj) container_of(obj, struct ide_default_obj, kref) -+ -+#define ide_default_g(disk) \ -+ container_of((disk)->private_data, struct ide_default_obj, driver) -+ -+static struct ide_default_obj *ide_default_get(struct gendisk *disk) -+{ -+ struct ide_default_obj *idp = NULL; -+ -+ down(&idedefault_ref_sem); -+ idp = ide_default_g(disk); -+ if (idp) -+ kref_get(&idp->kref); -+ up(&idedefault_ref_sem); -+ return idp; -+} -+ -+static void ide_default_release(struct kref *); -+ -+static void ide_default_put(struct ide_default_obj *idp) -+{ -+ down(&idedefault_ref_sem); -+ kref_put(&idp->kref, ide_default_release); -+ up(&idedefault_ref_sem); -+} -+ -+/* + * Driver private methods + */ + @@ -1340,28 +1311,8 @@ + return __ide_abort(drive, rq); +} + -+static void ide_default_release(struct kref *kref) -+{ -+ struct ide_default_obj *idp = to_ide_default(kref); -+ ide_drive_t *drive = idp->drive; -+ struct gendisk *g = idp->disk; -+ -+ drive->driver_data = NULL; -+ drive->devfs_name[0] = '\0'; -+ g->private_data = NULL; -+ put_disk(g); -+ kfree(idp); -+} -+ +static int idedefault_cleanup (ide_drive_t *drive) +{ -+ struct ide_default_obj *idp = drive->driver_data; -+ struct gendisk *g = idp->disk; -+ -+ if (ide_unregister_subdriver(drive)) -+ return 1; -+ del_gendisk(g); -+ ide_default_put(idp); + return 0; +} +/* @@ -1387,80 +1338,12 @@ + .abort = default_abort, +}; + -+ -+static int idedefault_open(struct inode *inode, struct file *filp) -+{ -+ struct gendisk *disk = inode->i_bdev->bd_disk; -+ struct ide_default_obj *idp; -+ ide_drive_t *drive; -+ -+ if (!(idp = ide_default_get(disk))) -+ return -ENXIO; -+ drive = idp->drive; -+ drive->usage++; -+ return 0; -+} -+ -+static int idedefault_release(struct inode *inode, struct file *filp) -+{ -+ struct gendisk *disk = inode->i_bdev->bd_disk; -+ struct ide_default_obj *idp = ide_default_g(disk); -+ ide_drive_t *drive = idp->drive; -+ drive->usage--; -+ ide_default_put(idp); -+ return 0; -+} -+ -+static int idedefault_ioctl(struct inode *inode, struct file *file, -+ unsigned int cmd, unsigned long arg) -+{ -+ struct block_device *bdev = inode->i_bdev; -+ struct ide_default_obj *idp = ide_default_g(bdev->bd_disk); -+ return generic_ide_ioctl(idp->drive, file, bdev, cmd, arg); -+} -+ -+static int idedefault_remove(struct device * dev) -+{ -+ ide_drive_t * drive = container_of(dev,ide_drive_t,gendev); -+ idedefault_cleanup(drive); -+ return 0; -+} -+ -+static struct block_device_operations idedefault_ops = { -+ .owner = THIS_MODULE, -+ .open = idedefault_open, -+ .release = idedefault_release, -+ .ioctl = idedefault_ioctl, -+}; -+ +static int idedefault_attach (ide_drive_t *drive) +{ -+ struct ide_default_obj *idp; -+ struct gendisk *g; -+ static int first_time = 1; -+ -+ if(first_time) { -+ first_time = 0; -+ idedefault_driver.gen_driver.name = (char *) idedefault_driver.name; -+ idedefault_driver.gen_driver.bus = &ide_bus_type; -+ idedefault_driver.gen_driver.remove = idedefault_remove; -+ driver_register(&idedefault_driver.gen_driver); -+ } -+ -+ idp = kmalloc(sizeof(*idp), GFP_KERNEL); -+ if (!idp) -+ goto failed; -+ -+ g = alloc_disk(1 << PARTN_BITS); -+ if (!g) -+ goto failed; -+ -+ ide_init_disk(g, drive); + if (ide_register_subdriver(drive, &idedefault_driver)) { + printk(KERN_ERR "ide-default: %s: Failed to register the " + "driver with ide.c\n", drive->name); -+ put_disk(g); -+ goto failed; ++ return 1; + } + + /* For the sake of the request layer, we must make sure we have a @@ -1469,36 +1352,15 @@ + */ + if (drive->media != ide_disk) + drive->ready_stat = 0; -+ -+ memset(idp, 0, sizeof(*idp)); -+ -+ kref_init(&idp->kref); -+ -+ idp->drive = drive; -+ idp->driver = &idedefault_driver; -+ idp->disk = g; -+ g->private_data = &idp->driver; -+ drive->driver_data = idp; -+ -+ g->minors = 1; -+ strcpy(g->devfs_name, drive->devfs_name); -+ g->driverfs_dev = &drive->gendev; -+ g->flags = 0; -+ set_capacity(g, 0); -+ g->fops = &idedefault_ops; -+ add_disk(g); + return 0; -+failed: -+ kfree(idp); -+ return 1; +} + +MODULE_DESCRIPTION("IDE Default Driver"); + +MODULE_LICENSE("GPL"); -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-disk.c linux-2.6.12rc3/drivers/ide/ide-disk.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-disk.c linux-2.6.12rc3-minoride/drivers/ide/ide-disk.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-disk.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-disk.c 2005-04-29 14:12:29.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-disk.c 2005-04-29 01:21:18.000000000 +0100 @@ -119,6 +119,10 @@ { unsigned long lba_sects, chs_sects, head, tail; @@ -1553,7 +1415,7 @@ - if (lba48) + /* Some maxtor support LBA48 but do not accept LBA48 set max... */ -+ if (lba48 && set_max >= (1ULL << 28)) ++ if (lba48 || set_max < (1ULL << 28)) set_max = idedisk_set_max_address_ext(drive, set_max); else set_max = idedisk_set_max_address(drive, set_max); @@ -1655,9 +1517,9 @@ if (drive->using_dma) ide_dma_verbose(drive); printk("\n"); -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-dma.c linux-2.6.12rc3/drivers/ide/ide-dma.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-dma.c linux-2.6.12rc3-minoride/drivers/ide/ide-dma.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-dma.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-dma.c 2005-04-27 17:20:34.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-dma.c 2005-04-29 01:21:18.000000000 +0100 @@ -132,7 +132,6 @@ { "SAMSUNG CD-ROM SC-148C", "ALL" }, { "SAMSUNG CD-ROM SC", "ALL" }, @@ -1685,9 +1547,9 @@ if (!hwif->ide_dma_end) hwif->ide_dma_end = &__ide_dma_end; if (!hwif->ide_dma_test_irq) -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-floppy.c linux-2.6.12rc3/drivers/ide/ide-floppy.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-floppy.c linux-2.6.12rc3-minoride/drivers/ide/ide-floppy.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-floppy.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-floppy.c 2005-04-28 16:23:25.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-floppy.c 2005-04-29 01:21:18.000000000 +0100 @@ -1100,7 +1100,7 @@ feature.all = 0; @@ -1726,9 +1588,9 @@ PROC_IDE_READ_RETURN(page,start,off,count,eof,len); } -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-io.c linux-2.6.12rc3/drivers/ide/ide-io.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-io.c linux-2.6.12rc3-minoride/drivers/ide/ide-io.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-io.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-io.c 2005-04-27 17:23:32.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-io.c 2005-04-29 01:21:18.000000000 +0100 @@ -129,6 +129,63 @@ } EXPORT_SYMBOL(ide_end_request); @@ -1808,9 +1670,9 @@ if ((handler = hwgroup->handler) == NULL || hwgroup->polling) { /* * Not expecting an interrupt from this drive. -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-iops.c linux-2.6.12rc3/drivers/ide/ide-iops.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-iops.c linux-2.6.12rc3-minoride/drivers/ide/ide-iops.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-iops.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-iops.c 2005-04-27 17:24:33.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-iops.c 2005-04-29 01:21:18.000000000 +0100 @@ -107,6 +107,74 @@ EXPORT_SYMBOL(default_hwif_iops); @@ -2038,9 +1900,9 @@ hwgroup->poll_timeout = jiffies + WAIT_WORSTCASE; hwgroup->polling = 1; __ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL); -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-pnp.c linux-2.6.12rc3/drivers/ide/ide-pnp.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-pnp.c linux-2.6.12rc3-minoride/drivers/ide/ide-pnp.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-pnp.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-pnp.c 2005-04-27 17:24:46.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-pnp.c 2005-04-29 01:21:18.000000000 +0100 @@ -19,6 +19,7 @@ #include #include @@ -2062,9 +1924,9 @@ } else printk(KERN_ERR "idepnp: Unable to remove device, please report.\n"); } -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-probe.c linux-2.6.12rc3/drivers/ide/ide-probe.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-probe.c linux-2.6.12rc3-minoride/drivers/ide/ide-probe.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-probe.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-probe.c 2005-04-28 16:55:29.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-probe.c 2005-05-01 14:08:32.128281272 +0100 @@ -672,6 +672,7 @@ } hwif->gendev.release = hwif_release_dev; @@ -2073,6 +1935,22 @@ } static int wait_hwif_ready(ide_hwif_t *hwif) +@@ -696,13 +697,13 @@ + SELECT_DRIVE(&hwif->drives[0]); + hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]); + mdelay(2); +- rc = ide_wait_not_busy(hwif, 10000); ++ rc = ide_wait_not_busy(hwif, 35000); + if (rc) + return rc; + SELECT_DRIVE(&hwif->drives[1]); + hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]); + mdelay(2); +- rc = ide_wait_not_busy(hwif, 10000); ++ rc = ide_wait_not_busy(hwif, 35000); + + /* Exit function with master reselected (let's be sane) */ + SELECT_DRIVE(&hwif->drives[0]); @@ -1212,6 +1213,8 @@ return 0; } @@ -2091,9 +1969,9 @@ if (drive->media == ide_disk) request_module("ide-disk"); -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-proc.c linux-2.6.12rc3/drivers/ide/ide-proc.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-proc.c linux-2.6.12rc3-minoride/drivers/ide/ide-proc.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-proc.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-proc.c 2005-04-28 15:17:23.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-proc.c 2005-04-29 01:21:18.000000000 +0100 @@ -42,68 +42,86 @@ static int proc_ide_read_imodel (char *page, char **start, off_t off, int count, int *eof, void *data) @@ -2432,9 +2310,9 @@ extern struct seq_operations ide_drivers_op; static int ide_drivers_open(struct inode *inode, struct file *file) -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-tape.c linux-2.6.12rc3/drivers/ide/ide-tape.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-tape.c linux-2.6.12rc3-minoride/drivers/ide/ide-tape.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-tape.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-tape.c 2005-04-28 16:23:06.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-tape.c 2005-04-29 01:21:18.000000000 +0100 @@ -2108,7 +2108,7 @@ #ifdef CONFIG_BLK_DEV_IDEDMA /* Begin DMA, if necessary */ @@ -2474,9 +2352,9 @@ PROC_IDE_READ_RETURN(page, start, off, count, eof, len); } -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-taskfile.c linux-2.6.12rc3/drivers/ide/ide-taskfile.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ide-taskfile.c linux-2.6.12rc3-minoride/drivers/ide/ide-taskfile.c --- linux.vanilla-2.6.12rc3/drivers/ide/ide-taskfile.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ide-taskfile.c 2005-04-27 17:25:09.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ide-taskfile.c 2005-04-29 01:21:18.000000000 +0100 @@ -147,9 +147,9 @@ case WIN_READDMA: case WIN_READDMA_EXT: @@ -2503,9 +2381,9 @@ break; default: -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/Kconfig linux-2.6.12rc3/drivers/ide/Kconfig +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/Kconfig linux-2.6.12rc3-minoride/drivers/ide/Kconfig --- linux.vanilla-2.6.12rc3/drivers/ide/Kconfig 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/Kconfig 2005-04-27 17:13:52.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/Kconfig 2005-04-29 01:21:18.000000000 +0100 @@ -165,6 +165,13 @@ Support for outboard IDE disks, tape drives, and CD-ROM drives connected through a PCMCIA card. @@ -2533,9 +2411,9 @@ config BLK_DEV_NS87415 tristate "NS87415 chipset support" help -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/legacy/ide-cs.c linux-2.6.12rc3/drivers/ide/legacy/ide-cs.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/legacy/ide-cs.c linux-2.6.12rc3-minoride/drivers/ide/legacy/ide-cs.c --- linux.vanilla-2.6.12rc3/drivers/ide/legacy/ide-cs.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/legacy/ide-cs.c 2005-04-27 17:25:14.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/legacy/ide-cs.c 2005-04-29 01:21:18.000000000 +0100 @@ -43,6 +43,7 @@ #include #include @@ -2630,9 +2508,9 @@ } info->ndev = 0; link->dev = NULL; -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/Makefile linux-2.6.12rc3/drivers/ide/Makefile +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/Makefile linux-2.6.12rc3-minoride/drivers/ide/Makefile --- linux.vanilla-2.6.12rc3/drivers/ide/Makefile 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/Makefile 2005-04-28 17:01:38.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/Makefile 2005-04-29 01:21:18.000000000 +0100 @@ -13,7 +13,7 @@ obj-$(CONFIG_BLK_DEV_IDE) += pci/ @@ -2642,9 +2520,9 @@ ide-core-$(CONFIG_BLK_DEV_CMD640) += pci/cmd640.o -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/alim15x3.c linux-2.6.12rc3/drivers/ide/pci/alim15x3.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/alim15x3.c linux-2.6.12rc3-minoride/drivers/ide/pci/alim15x3.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/alim15x3.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/alim15x3.c 2005-04-27 17:25:23.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/alim15x3.c 2005-04-29 01:21:18.000000000 +0100 @@ -775,7 +775,7 @@ * M1543C or newer for DMAing */ @@ -2654,9 +2532,9 @@ if (!noautodma) hwif->autodma = 1; if (!(hwif->udma_four)) -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/cs5520.c linux-2.6.12rc3/drivers/ide/pci/cs5520.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/cs5520.c linux-2.6.12rc3-minoride/drivers/ide/pci/cs5520.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/cs5520.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/cs5520.c 2005-04-27 17:25:23.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/cs5520.c 2005-04-29 01:21:18.000000000 +0100 @@ -159,10 +159,11 @@ * DMA channel */ @@ -2690,9 +2568,9 @@ } pci_set_master(dev); if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) { -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/delkin_cb.c linux-2.6.12rc3/drivers/ide/pci/delkin_cb.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/delkin_cb.c linux-2.6.12rc3-minoride/drivers/ide/pci/delkin_cb.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/delkin_cb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/delkin_cb.c 2005-04-27 17:14:05.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/delkin_cb.c 2005-04-29 01:21:18.000000000 +0100 @@ -0,0 +1,140 @@ +/* + * linux/drivers/ide/pci/delkin_cb.c @@ -2834,9 +2712,9 @@ +MODULE_DESCRIPTION("Basic support for Delkin/ASKA/Workbit Cardbus IDE"); +MODULE_LICENSE("GPL"); + -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/generic.c linux-2.6.12rc3/drivers/ide/pci/generic.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/generic.c linux-2.6.12rc3-minoride/drivers/ide/pci/generic.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/generic.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/generic.c 2005-04-27 17:14:15.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/generic.c 2005-04-29 01:21:18.000000000 +0100 @@ -39,6 +39,17 @@ #include @@ -3029,9 +2907,9 @@ MODULE_AUTHOR("Andre Hedrick"); MODULE_DESCRIPTION("PCI driver module for generic PCI IDE"); MODULE_LICENSE("GPL"); -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/hpt366.c linux-2.6.12rc3/drivers/ide/pci/hpt366.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/hpt366.c linux-2.6.12rc3-minoride/drivers/ide/pci/hpt366.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/hpt366.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/hpt366.c 2005-04-27 17:25:31.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/hpt366.c 2005-04-29 01:21:18.000000000 +0100 @@ -10,6 +10,11 @@ * donation of an ABit BP6 mainboard, processor, and memory acellerated * development and support. @@ -3923,9 +3801,9 @@ .init_hwif = init_hwif_hpt366, .init_dma = init_dma_hpt366, .channels = 2, /* 4 */ -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/it821x.c linux-2.6.12rc3/drivers/ide/pci/it821x.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/it821x.c linux-2.6.12rc3-minoride/drivers/ide/pci/it821x.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/it821x.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/it821x.c 2005-04-27 17:14:29.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/it821x.c 2005-04-29 01:21:18.000000000 +0100 @@ -0,0 +1,812 @@ + +/* @@ -4739,9 +4617,9 @@ +MODULE_AUTHOR("Alan Cox"); +MODULE_DESCRIPTION("PCI driver module for the ITE 821x"); +MODULE_LICENSE("GPL"); -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/Makefile linux-2.6.12rc3/drivers/ide/pci/Makefile +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/Makefile linux-2.6.12rc3-minoride/drivers/ide/pci/Makefile --- linux.vanilla-2.6.12rc3/drivers/ide/pci/Makefile 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/Makefile 2005-04-27 17:25:39.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/Makefile 2005-04-29 01:21:18.000000000 +0100 @@ -8,10 +8,12 @@ obj-$(CONFIG_BLK_DEV_CS5530) += cs5530.o obj-$(CONFIG_BLK_DEV_SC1200) += sc1200.o @@ -4755,9 +4633,9 @@ obj-$(CONFIG_BLK_DEV_NS87415) += ns87415.o obj-$(CONFIG_BLK_DEV_OPTI621) += opti621.o obj-$(CONFIG_BLK_DEV_PDC202XX_OLD) += pdc202xx_old.o -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/ns87415.c linux-2.6.12rc3/drivers/ide/pci/ns87415.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/ns87415.c linux-2.6.12rc3-minoride/drivers/ide/pci/ns87415.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/ns87415.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/ns87415.c 2005-04-27 17:14:41.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/ns87415.c 2005-04-29 01:21:18.000000000 +0100 @@ -265,7 +265,7 @@ return; @@ -4767,9 +4645,9 @@ hwif->ide_dma_check = &ns87415_ide_dma_check; hwif->ide_dma_end = &ns87415_ide_dma_end; -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/pdc202xx_old.c linux-2.6.12rc3/drivers/ide/pci/pdc202xx_old.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/pdc202xx_old.c linux-2.6.12rc3-minoride/drivers/ide/pci/pdc202xx_old.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/pdc202xx_old.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/pdc202xx_old.c 2005-04-27 17:14:41.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/pdc202xx_old.c 2005-04-29 01:21:18.000000000 +0100 @@ -644,7 +644,7 @@ if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) { if (!(hwif->udma_four)) @@ -4779,9 +4657,9 @@ hwif->ide_dma_end = &pdc202xx_old_ide_dma_end; } hwif->ide_dma_test_irq = &pdc202xx_old_ide_dma_test_irq; -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/sgiioc4.c linux-2.6.12rc3/drivers/ide/pci/sgiioc4.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/sgiioc4.c linux-2.6.12rc3-minoride/drivers/ide/pci/sgiioc4.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/sgiioc4.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/sgiioc4.c 2005-04-27 17:14:41.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/sgiioc4.c 2005-04-29 01:21:18.000000000 +0100 @@ -601,8 +601,8 @@ hwif->quirkproc = NULL; hwif->busproc = NULL; @@ -4793,9 +4671,9 @@ hwif->ide_dma_end = &sgiioc4_ide_dma_end; hwif->ide_dma_check = &sgiioc4_ide_dma_check; hwif->ide_dma_on = &sgiioc4_ide_dma_on; -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/siimage.c linux-2.6.12rc3/drivers/ide/pci/siimage.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/siimage.c linux-2.6.12rc3-minoride/drivers/ide/pci/siimage.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/siimage.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/siimage.c 2005-04-27 17:25:50.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/siimage.c 2005-04-29 01:21:18.000000000 +0100 @@ -48,6 +48,8 @@ { case PCI_DEVICE_ID_SII_3112: @@ -4825,9 +4703,9 @@ #endif { 0, }, }; -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/sl82c105.c linux-2.6.12rc3/drivers/ide/pci/sl82c105.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/sl82c105.c linux-2.6.12rc3-minoride/drivers/ide/pci/sl82c105.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/sl82c105.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/sl82c105.c 2005-04-27 17:14:54.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/sl82c105.c 2005-04-29 01:21:18.000000000 +0100 @@ -467,7 +467,7 @@ hwif->ide_dma_on = &sl82c105_ide_dma_on; hwif->ide_dma_off_quietly = &sl82c105_ide_dma_off_quietly; @@ -4837,9 +4715,9 @@ hwif->ide_dma_timeout = &sl82c105_ide_dma_timeout; if (!noautodma) -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/trm290.c linux-2.6.12rc3/drivers/ide/pci/trm290.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/pci/trm290.c linux-2.6.12rc3-minoride/drivers/ide/pci/trm290.c --- linux.vanilla-2.6.12rc3/drivers/ide/pci/trm290.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/pci/trm290.c 2005-04-27 17:14:54.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/pci/trm290.c 2005-04-29 01:21:18.000000000 +0100 @@ -256,6 +256,7 @@ u8 reg = 0; struct pci_dev *dev = hwif->pci_dev; @@ -4861,9 +4739,9 @@ hwif->ide_dma_end = &trm290_ide_dma_end; hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq; #endif /* CONFIG_BLK_DEV_IDEDMA */ -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ppc/pmac.c linux-2.6.12rc3/drivers/ide/ppc/pmac.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/ppc/pmac.c linux-2.6.12rc3-minoride/drivers/ide/ppc/pmac.c --- linux.vanilla-2.6.12rc3/drivers/ide/ppc/pmac.c 2005-04-27 16:01:29.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/ppc/pmac.c 2005-04-27 17:14:54.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/ppc/pmac.c 2005-04-29 01:21:18.000000000 +0100 @@ -2169,9 +2169,9 @@ hwif->ide_dma_off_quietly = &__ide_dma_off_quietly; hwif->ide_dma_on = &__ide_dma_on; @@ -4877,9 +4755,9 @@ hwif->ide_dma_end = &pmac_ide_dma_end; hwif->ide_dma_test_irq = &pmac_ide_dma_test_irq; hwif->ide_dma_host_off = &pmac_ide_dma_host_off; -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/setup-pci.c linux-2.6.12rc3/drivers/ide/setup-pci.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/ide/setup-pci.c linux-2.6.12rc3-minoride/drivers/ide/setup-pci.c --- linux.vanilla-2.6.12rc3/drivers/ide/setup-pci.c 2005-04-27 15:59:28.000000000 +0100 -+++ linux-2.6.12rc3/drivers/ide/setup-pci.c 2005-04-28 15:19:56.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/ide/setup-pci.c 2005-04-29 01:21:18.000000000 +0100 @@ -1,7 +1,8 @@ /* - * linux/drivers/ide/setup-pci.c Version 1.10 2002/08/19 @@ -5028,9 +4906,9 @@ /* * Module interfaces */ -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/macintosh/mediabay.c linux-2.6.12rc3/drivers/macintosh/mediabay.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/macintosh/mediabay.c linux-2.6.12rc3-minoride/drivers/macintosh/mediabay.c --- linux.vanilla-2.6.12rc3/drivers/macintosh/mediabay.c 2005-04-27 16:01:35.000000000 +0100 -+++ linux-2.6.12rc3/drivers/macintosh/mediabay.c 2005-04-27 17:15:20.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/macintosh/mediabay.c 2005-04-29 01:21:35.000000000 +0100 @@ -82,6 +82,7 @@ #ifdef CONFIG_BLK_DEV_IDE void __iomem *cd_base; @@ -5057,9 +4935,9 @@ bay->cd_index = -1; } if (bay->cd_retry) { -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/scsi/ide-scsi.c linux-2.6.12rc3/drivers/scsi/ide-scsi.c +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/scsi/ide-scsi.c linux-2.6.12rc3-minoride/drivers/scsi/ide-scsi.c --- linux.vanilla-2.6.12rc3/drivers/scsi/ide-scsi.c 2005-04-27 16:01:36.000000000 +0100 -+++ linux-2.6.12rc3/drivers/scsi/ide-scsi.c 2005-04-27 17:26:25.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/scsi/ide-scsi.c 2005-04-29 01:22:08.000000000 +0100 @@ -579,7 +579,7 @@ drive->hwif->atapi_output_bytes(drive, scsi->pc->c, 12); if (test_bit (PC_DMA_OK, &pc->flags)) { @@ -5078,9 +4956,20 @@ hwif->sg_mapped = 0; } -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/include/asm-i386/ide.h linux-2.6.12rc3/include/asm-i386/ide.h +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/scsi/nsp32.h linux-2.6.12rc3-minoride/drivers/scsi/nsp32.h +--- linux.vanilla-2.6.12rc3/drivers/scsi/nsp32.h 2005-04-27 15:59:38.000000000 +0100 ++++ linux-2.6.12rc3-minoride/drivers/scsi/nsp32.h 2005-04-29 01:22:09.000000000 +0100 +@@ -22,7 +22,6 @@ + * VENDOR/DEVICE ID + */ + #define PCI_VENDOR_ID_IODATA 0x10fc +-#define PCI_VENDOR_ID_WORKBIT 0x1145 + + #define PCI_DEVICE_ID_NINJASCSI_32BI_CBSC_II 0x0005 + #define PCI_DEVICE_ID_NINJASCSI_32BI_KME 0xf007 +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/include/asm-i386/ide.h linux-2.6.12rc3-minoride/include/asm-i386/ide.h --- linux.vanilla-2.6.12rc3/include/asm-i386/ide.h 2005-04-27 15:59:46.000000000 +0100 -+++ linux-2.6.12rc3/include/asm-i386/ide.h 2005-04-27 16:21:37.000000000 +0100 ++++ linux-2.6.12rc3-minoride/include/asm-i386/ide.h 2005-04-29 01:23:10.000000000 +0100 @@ -41,16 +41,20 @@ static __inline__ unsigned long ide_default_io_base(int index) @@ -5107,9 +4996,9 @@ } #define IDE_ARCH_OBSOLETE_INIT -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/include/linux/ide.h linux-2.6.12rc3/include/linux/ide.h +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/include/linux/ide.h linux-2.6.12rc3-minoride/include/linux/ide.h --- linux.vanilla-2.6.12rc3/include/linux/ide.h 2005-04-27 16:01:41.000000000 +0100 -+++ linux-2.6.12rc3/include/linux/ide.h 2005-04-28 15:26:02.000000000 +0100 ++++ linux-2.6.12rc3-minoride/include/linux/ide.h 2005-04-29 01:23:14.000000000 +0100 @@ -190,7 +190,7 @@ #define WAIT_READY (5*HZ) /* 5sec - some laptops are very slow */ #define WAIT_PIDENTIFY (10*HZ) /* 10sec - should be less than 3ms (?), if all ATAPI CD is closed at boot */ @@ -5262,21 +5151,9 @@ extern int probe_hwif_init(ide_hwif_t *); static inline void *ide_get_hwifdata (ide_hwif_t * hwif) -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/drivers/scsi/nsp32.h linux-2.6.12rc3/drivers/scsi/nsp32.h ---- linux.vanilla-2.6.12rc3/drivers/scsi/nsp32.h 2005-04-27 15:59:38.000000000 +0100 -+++ linux-2.6.12rc3/drivers/scsi/nsp32.h 2005-04-27 16:19:52.000000000 +0100 -@@ -22,7 +22,6 @@ - * VENDOR/DEVICE ID - */ - #define PCI_VENDOR_ID_IODATA 0x10fc --#define PCI_VENDOR_ID_WORKBIT 0x1145 - - #define PCI_DEVICE_ID_NINJASCSI_32BI_CBSC_II 0x0005 - #define PCI_DEVICE_ID_NINJASCSI_32BI_KME 0xf007 - -diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/include/linux/pci_ids.h linux-2.6.12rc3/include/linux/pci_ids.h +diff -u --new-file --exclude-from /usr/src/exclude --recursive linux.vanilla-2.6.12rc3/include/linux/pci_ids.h linux-2.6.12rc3-minoride/include/linux/pci_ids.h --- linux.vanilla-2.6.12rc3/include/linux/pci_ids.h 2005-04-27 16:01:41.000000000 +0100 -+++ linux-2.6.12rc3/include/linux/pci_ids.h 2005-04-27 17:31:29.000000000 +0100 ++++ linux-2.6.12rc3-minoride/include/linux/pci_ids.h 2005-04-29 01:23:14.000000000 +0100 @@ -1502,6 +1502,9 @@ #define PCI_DEVICE_ID_ALLIANCE_AT24 0x6424 #define PCI_DEVICE_ID_ALLIANCE_AT3D 0x643d @@ -5296,8 +5173,3 @@ #define PCI_DEVICE_ID_ITE_8872 0x8872 #define PCI_DEVICE_ID_ITE_IT8330G_0 0xe886 -@@ -2591,3 +2596,4 @@ - #define PCI_DEVICE_ID_ARK_STING 0xa091 - #define PCI_DEVICE_ID_ARK_STINGARK 0xa099 - #define PCI_DEVICE_ID_ARK_2000MT 0xa0a1 -+ From fedora-cvs-commits at redhat.com Sun May 1 21:31:06 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 May 2005 17:31:06 -0400 Subject: rpms/kernel/devel linux-2.6.12-scsi-blacklist.patch, NONE, 1.1 kernel-2.6.spec, 1.1281, 1.1282 Message-ID: <200505012131.j41LV6OZ010494@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10457 Modified Files: kernel-2.6.spec Added Files: linux-2.6.12-scsi-blacklist.patch Log Message: blacklist another stoopid scanner linux-2.6.12-scsi-blacklist.patch: scsi_devinfo.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6.12-scsi-blacklist.patch --- --- linux-2.6.11/drivers/scsi/scsi_devinfo.c~ 2005-04-29 18:16:15.000000000 -0400 +++ linux-2.6.11/drivers/scsi/scsi_devinfo.c 2005-04-29 18:18:27.000000000 -0400 @@ -114,6 +114,7 @@ static struct { {"YAMAHA", "CDR102", "1.00", BLIST_NOLUN}, /* locks up */ {"YAMAHA", "CRW8424S", "1.0", BLIST_NOLUN}, /* locks up */ {"YAMAHA", "CRW6416S", "1.0c", BLIST_NOLUN}, /* locks up */ + {"", "Scanner", "1.80", BLIST_NOLUN}, /* responds to all lun */ /* * Other types of devices that have special flags. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1281 retrieving revision 1.1282 diff -u -r1.1281 -r1.1282 --- kernel-2.6.spec 1 May 2005 21:29:11 -0000 1.1281 +++ kernel-2.6.spec 1 May 2005 21:31:04 -0000 1.1282 @@ -295,6 +295,7 @@ # SCSI bits. Patch1101: linux-2.6.9-scsi-advansys-enabler.patch Patch1102: linux-2.6.9-scsi-megaraid-legacy.patch +Patch1103: linux-2.6.12-scsi-blacklist.patch # NFS bits. Patch1200: linux-2.6.9-NFSD-non-null-getxattr.patch @@ -687,6 +688,8 @@ %patch1101 -p1 # Enable both new and old megaraid drivers. %patch1102 -p1 +# Blacklist some SCSI devices that don't like having LUNs probed. +%patch1103 -p1 # # Various upstream NFS/NFSD fixes. @@ -1200,6 +1203,7 @@ %changelog * Sun May 1 2005 Dave Jones - Fix yesterdays IDE fixes. +- Blacklist another brainless SCSI scanner. (#155457) * Sun May 1 2005 David Woodhouse - Fix EHCI port power switching From fedora-cvs-commits at redhat.com Mon May 2 06:53:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 02:53:38 -0400 Subject: rpms/gzip/devel gzip.spec,1.20,1.21 Message-ID: <200505020653.j426rcGN027946@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gzip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27934 Modified Files: gzip.spec Log Message: rebuilt Index: gzip.spec =================================================================== RCS file: /cvs/dist/rpms/gzip/devel/gzip.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gzip.spec 29 Apr 2005 13:15:42 -0000 1.20 +++ gzip.spec 2 May 2005 06:53:36 -0000 1.21 @@ -1,7 +1,7 @@ Summary: The GNU data compression program. Name: gzip Version: 1.3.5 -Release: 5 +Release: 6 License: GPL Group: Applications/File Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz @@ -84,6 +84,9 @@ %{_infodir}/gzip.info* %changelog +* Mon May 02 2005 Ivana Varekova 1.3.5-6 +- rebuilt + * Fri Apr 29 2005 Ivana Varekova 1.3.5-5 - fix bug 156269 - CAN-2005-1228 directory traversal bug (using the patch from Ulf Harnhammar) From fedora-cvs-commits at redhat.com Mon May 2 08:24:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 04:24:38 -0400 Subject: rpms/kernel/devel linux-2.6.11-kallsyms-extra-text.patch, NONE, 1.1 linux-2.6.12rc-ppc32-clockspreading-fix.patch, NONE, 1.1 kernel-2.6.spec, 1.1282, 1.1283 linux-2.6.11-ppc32-pmac-sleep-fix.patch, 1.2, 1.3 Message-ID: <200505020824.j428Ocg1001719@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20249 Modified Files: kernel-2.6.spec linux-2.6.11-ppc32-pmac-sleep-fix.patch Added Files: linux-2.6.11-kallsyms-extra-text.patch linux-2.6.12rc-ppc32-clockspreading-fix.patch Log Message: * Mon May 2 2005 David Woodhouse - Make kallsyms include platform-specific symbols - Fix might_sleep warning in pbook clock-spreading fix linux-2.6.11-kallsyms-extra-text.patch: arch/ppc/kernel/vmlinux.lds.S | 2 ++ include/asm-generic/sections.h | 2 ++ kernel/kallsyms.c | 10 +++++++++- scripts/kallsyms.c | 20 +++++++++++++------- 4 files changed, 26 insertions(+), 8 deletions(-) --- NEW FILE linux-2.6.11-kallsyms-extra-text.patch --- The PPC32 kernel puts platform-specific functions into separate sections so that unneeded parts of it can be freed when we've booted and actually worked out what we're running on today. This makes kallsyms ignore those functions, because they're not between _[se]text or _[se]inittext. Rather than teaching kallsyms about the various pmac/chrp/etc sections, this patch adds '_[se]extratext' markers for kallsyms. Signed-off-by: David Woodhouse --- linux-2.6.11/arch/ppc/kernel/vmlinux.lds.S~ 2005-05-01 10:43:10.000000000 +0100 +++ linux-2.6.11/arch/ppc/kernel/vmlinux.lds.S 2005-05-02 08:06:52.000000000 +0100 @@ -147,6 +147,7 @@ SECTIONS __init_end = .; . = ALIGN(4096); + _sextratext = .; __pmac_begin = .; .pmac.text : { *(.pmac.text) } .pmac.data : { *(.pmac.data) } @@ -173,6 +174,7 @@ SECTIONS .openfirmware.data : { *(.openfirmware.data) } . = ALIGN(4096); __openfirmware_end = .; + _eextratext = .; __bss_start = .; .bss : --- linux-2.6.11/include/asm-generic/sections.h~ 2005-03-02 07:37:31.000000000 +0000 +++ linux-2.6.11/include/asm-generic/sections.h 2005-05-02 08:43:04.000000000 +0100 @@ -8,6 +8,8 @@ extern char _data[], _sdata[], _edata[]; extern char __bss_start[], __bss_stop[]; extern char __init_begin[], __init_end[]; extern char _sinittext[], _einittext[]; +extern char _sextratext[] __attribute__((weak)); +extern char _eextratext[] __attribute__((weak)); extern char _end[]; #endif /* _ASM_GENERIC_SECTIONS_H_ */ --- linux-2.6.11/scripts/kallsyms.c~ 2005-03-02 07:38:33.000000000 +0000 +++ linux-2.6.11/scripts/kallsyms.c 2005-05-02 08:09:11.000000000 +0100 @@ -67,7 +67,7 @@ struct sym_entry { static struct sym_entry *table; static int size, cnt; -static unsigned long long _stext, _etext, _sinittext, _einittext; +static unsigned long long _stext, _etext, _sinittext, _einittext, _sextratext, _eextratext; static int all_symbols = 0; struct token { @@ -132,6 +132,10 @@ read_symbol(FILE *in, struct sym_entry * _sinittext = s->addr; else if (strcmp(str, "_einittext") == 0) _einittext = s->addr; + else if (strcmp(str, "_sextratext") == 0) + _sextratext = s->addr; + else if (strcmp(str, "_eextratext") == 0) + _eextratext = s->addr; else if (toupper(s->type) == 'A') { /* Keep these useful absolute symbols */ @@ -182,16 +186,18 @@ symbol_valid(struct sym_entry *s) * and inittext sections are discarded */ if (!all_symbols) { if ((s->addr < _stext || s->addr > _etext) - && (s->addr < _sinittext || s->addr > _einittext)) + && (s->addr < _sinittext || s->addr > _einittext) + && (s->addr < _sextratext || s->addr > _eextratext)) return 0; /* Corner case. Discard any symbols with the same value as - * _etext or _einittext, they can move between pass 1 and 2 - * when the kallsyms data is added. If these symbols move then - * they may get dropped in pass 2, which breaks the kallsyms - * rules. + * _etext _einittext or _eextratext; they can move between pass + * 1 and 2 when the kallsyms data is added. If these symbols + * move then they may get dropped in pass 2, which breaks the + * kallsyms rules. */ if ((s->addr == _etext && strcmp(s->sym + 1, "_etext")) || - (s->addr == _einittext && strcmp(s->sym + 1, "_einittext"))) + (s->addr == _einittext && strcmp(s->sym + 1, "_einittext")) || + (s->addr == _eextratext && strcmp(s->sym + 1, "_eextratext"))) return 0; } --- linux-2.6.11/kernel/kallsyms.c~ 2005-05-01 10:37:45.000000000 +0100 +++ linux-2.6.11/kernel/kallsyms.c 2005-05-02 08:42:59.000000000 +0100 @@ -46,6 +46,14 @@ static inline int is_kernel_inittext(uns return 0; } +static inline int is_kernel_extratext(unsigned long addr) +{ + if (addr >= (unsigned long)_sextratext + && addr <= (unsigned long)_eextratext) + return 1; + return 0; +} + static inline int is_kernel_text(unsigned long addr) { if (addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) @@ -169,7 +177,7 @@ const char *kallsyms_lookup(unsigned lon namebuf[0] = 0; if ((all_var && is_kernel(addr)) || - (!all_var && (is_kernel_text(addr) || is_kernel_inittext(addr)))) { + (!all_var && (is_kernel_text(addr) || is_kernel_inittext(addr) || is_kernel_extratext(addr)))) { unsigned long symbol_end=0; /* do a binary search on the sorted kallsyms_addresses array */ -- dwmw2 _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev at ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev linux-2.6.12rc-ppc32-clockspreading-fix.patch: arch/ppc/platforms/pmac_feature.c | 12 ++++-------- drivers/macintosh/via-pmu.c | 9 +++++++-- include/asm-ppc/pmac_feature.h | 3 +++ 3 files changed, 14 insertions(+), 10 deletions(-) --- NEW FILE linux-2.6.12rc-ppc32-clockspreading-fix.patch --- >From benh at kernel.crashing.org Mon May 2 06:49:45 2005 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Mon, 02 May 2005 06:49:45 +0100 Received: from phoenix.infradead.org ([2001:8b0:10b:1:2c0:f0ff:fe31:e18]) by baythorne.infradead.org with esmtps (Exim 4.43 #1 (Red Hat Linux)) id 1DSToP-0004ZQ-0C for dwmw2 at baythorne.infradead.org; Mon, 02 May 2005 06:49:45 +0100 Received: from djurbala-pt.tunnel.tserv2.fmt.ipv6.he.net ([2001:470:1f01:ffff::eb] helo=gate.crashing.org) by phoenix.infradead.org with esmtps (Exim 4.43 #1 (Red Hat Linux)) id 1DSTo5-0006nT-9H for dwmw2 at infradead.org; Mon, 02 May 2005 06:49:42 +0100 Received: from gaston (localhost [127.0.0.1]) by gate.crashing.org (8.12.8/8.12.8) with ESMTP id j425gNgJ017759 for ; Mon, 2 May 2005 00:42:24 -0500 Subject: clock spreading fix From: Benjamin Herrenschmidt To: David Woodhouse Content-Type: text/plain Date: Mon, 02 May 2005 15:46:09 +1000 Message-Id: <1115012769.6155.6.camel at gaston> Mime-Version: 1.0 X-Mailer: Evolution 2.2.2 X-Spam-Score: 0.0 (/) X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit Index: linux-work/include/asm-ppc/pmac_feature.h =================================================================== --- linux-work.orig/include/asm-ppc/pmac_feature.h 2005-05-02 10:49:57.000000000 +1000 +++ linux-work/include/asm-ppc/pmac_feature.h 2005-05-02 15:43:08.000000000 +1000 @@ -316,6 +316,9 @@ extern void pmac_suspend_agp_for_card(struct pci_dev *dev); extern void pmac_resume_agp_for_card(struct pci_dev *dev); +/* Used by the via-pmu driver for suspend/resume + */ +extern void pmac_tweak_clock_spreading(int enable); /* * The part below is for use by macio_asic.c only, do not rely Index: linux-work/arch/ppc/platforms/pmac_feature.c =================================================================== --- linux-work.orig/arch/ppc/platforms/pmac_feature.c 2005-05-02 13:16:22.000000000 +1000 +++ linux-work/arch/ppc/platforms/pmac_feature.c 2005-05-02 15:43:55.000000000 +1000 @@ -1591,8 +1591,10 @@ } -static void __pmac pmac_tweak_clock_spreading(struct macio_chip* macio, int enable) +void __pmac pmac_tweak_clock_spreading(int enable) { + struct macio_chip* macio = &macio_chips[0]; + /* Hack for doing clock spreading on some machines PowerBooks and * iBooks. This implements the "platform-do-clockspreading" OF * property as decoded manually on various models. For safety, we also @@ -1707,9 +1709,6 @@ macio->type != macio_intrepid) return -ENODEV; - /* Disable clock spreading */ - pmac_tweak_clock_spreading(macio, 0); - /* We power off the wireless slot in case it was not done * by the driver. We don't power it on automatically however */ @@ -1852,9 +1851,6 @@ UN_OUT(UNI_N_CLOCK_CNTL, save_unin_clock_ctl); udelay(100); - /* Enable clock spreading */ - pmac_tweak_clock_spreading(macio, 1); - return 0; } @@ -2822,7 +2818,7 @@ * clock spreading now. This should be a platform function but we * don't do these at the moment */ - pmac_tweak_clock_spreading(&macio_chips[0], 1); + pmac_tweak_clock_spreading(1); #endif /* CONFIG_POWER4 */ Index: linux-work/drivers/macintosh/via-pmu.c =================================================================== --- linux-work.orig/drivers/macintosh/via-pmu.c 2005-05-02 10:48:11.000000000 +1000 +++ linux-work/drivers/macintosh/via-pmu.c 2005-05-02 15:45:49.000000000 +1000 @@ -2351,6 +2351,10 @@ return -EBUSY; } + /* Disable clock spreading on some machines */ + pmac_tweak_clock_spreading(0); + + /* Stop preemption */ preempt_disable(); /* Make sure the decrementer won't interrupt us */ @@ -2417,11 +2421,12 @@ /* Re-enable local CPU interrupts */ local_irq_enable(); - mdelay(100); - preempt_enable(); + /* Re-enable clock spreading on some machines */ + pmac_tweak_clock_spreading(1); + /* Resume devices */ device_resume(); -- Benjamin Herrenschmidt Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1282 retrieving revision 1.1283 diff -u -r1.1282 -r1.1283 --- kernel-2.6.spec 1 May 2005 21:31:04 -0000 1.1282 +++ kernel-2.6.spec 2 May 2005 08:24:36 -0000 1.1283 @@ -236,6 +236,8 @@ Patch307: linux-2.6.11-mac-mini-sound.patch Patch308: linux-2.6.11-pmac-volume-save.patch Patch309: linux-2.6.11-pmac-ide-sleep.patch +Patch310: linux-2.6.11-kallsyms-extra-text.patch +Patch311: linux-2.6.12rc-ppc32-clockspreading-fix.patch # 400 - 499 ia64 Patch400: linux-2.6.3-ia64-build.patch @@ -554,6 +556,8 @@ %patch307 -p1 %patch308 -p1 %patch309 -p1 +%patch310 -p1 +%patch311 -p1 # # ia64 @@ -1201,6 +1205,10 @@ %endif %changelog +* Mon May 2 2005 David Woodhouse +- Make kallsyms include platform-specific symbols +- Fix might_sleep warning in pbook clock-spreading fix + * Sun May 1 2005 Dave Jones - Fix yesterdays IDE fixes. - Blacklist another brainless SCSI scanner. (#155457) linux-2.6.11-ppc32-pmac-sleep-fix.patch: pmac_cache.S | 56 +++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 43 insertions(+), 13 deletions(-) Index: linux-2.6.11-ppc32-pmac-sleep-fix.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-ppc32-pmac-sleep-fix.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.11-ppc32-pmac-sleep-fix.patch 8 Apr 2005 12:48:03 -0000 1.2 +++ linux-2.6.11-ppc32-pmac-sleep-fix.patch 2 May 2005 08:24:36 -0000 1.3 @@ -1,19 +1,49 @@ +We are experiencing a problem when flushing the CPU caches before sleep +on some laptop models using the 750FX CPU rev 1.X. While I haven't been +able to figure out a proper explanation for what's going on, I do have a +workaround that seem to work reliably and allows those machine to sleep +and wakeup properly again. This should be applied for 2.6.12. I'll +re-update that code if/when I ever find exactly what is happening with +those CPU revisions. + +Signed-off-by: Benjamin Herrenschmidt + Index: linux-work/arch/ppc/platforms/pmac_cache.S =================================================================== ---- linux-work.orig/arch/ppc/platforms/pmac_cache.S 2005-03-15 11:56:42.000000000 +1100 -+++ linux-work/arch/ppc/platforms/pmac_cache.S 2005-04-05 10:40:26.000000000 +1000 -@@ -65,7 +65,7 @@ - li r4,0x4000 - mtctr r4 +--- linux-work.orig/arch/ppc/platforms/pmac_cache.S 2005-04-24 11:37:38.000000000 +1000 ++++ linux-work/arch/ppc/platforms/pmac_cache.S 2005-04-24 12:00:46.000000000 +1000 +@@ -64,27 +64,39 @@ + mtspr SPRN_HID0,r4 /* Disable DPM */ + sync + +- /* disp-flush L1 */ +- li r4,0x4000 +- mtctr r4 ++ /* Disp-flush L1. We have a weird problem here that I never ++ * totally figured out. On 750FX, using the ROM for the flush ++ * results in a non-working flush. We use that workaround for ++ * now until I finally understand what's going on. --BenH ++ */ ++ ++ /* ROM base by default */ lis r4,0xfff0 -1: lwzx r0,r0,r4 ++ mfpvr r3 ++ srwi r3,r3,16 ++ cmplwi cr0,r3,0x7000 ++ bne+ 1f ++ /* RAM base on 750FX */ ++ li r4,0 ++1: li r4,0x4000 ++ mtctr r4 +1: lwz r0,0(r4) addi r4,r4,32 bdnz 1b sync -@@ -73,15 +73,15 @@ + isync - /* disable / invalidate / enable L1 data */ +- /* disable / invalidate / enable L1 data */ ++ /* Disable / invalidate / enable L1 data */ mfspr r3,SPRN_HID0 - rlwinm r0,r0,0,~HID0_DCE + rlwinm r3,r3,0,~(HID0_DCE | HID0_ICE) @@ -30,7 +60,7 @@ mtspr SPRN_HID0,r3 sync -@@ -107,11 +107,20 @@ +@@ -110,11 +122,20 @@ lis r4,2 mtctr r4 lis r4,0xfff0 @@ -52,11 +82,11 @@ /* now disable L2 */ rlwinm r5,r5,0,~L2CR_L2E b 2f -@@ -132,6 +141,13 @@ +@@ -135,6 +156,13 @@ mtspr SPRN_L2CR,r4 sync isync -+ ++ + /* Wait for the invalidation to complete */ +1: mfspr r3,SPRN_L2CR + rlwinm. r0,r3,0,31,31 @@ -66,7 +96,7 @@ xoris r4,r4,L2CR_L2I at h sync mtspr SPRN_L2CR,r4 -@@ -139,16 +155,18 @@ +@@ -142,16 +170,18 @@ /* now disable the L1 data cache */ mfspr r0,SPRN_HID0 @@ -84,11 +114,11 @@ + mtspr SPRN_HID0,r0 sync - -+ ++ /* restore DR and EE */ sync mtmsr r11 -@@ -198,7 +216,7 @@ +@@ -201,7 +231,7 @@ mtctr r4 li r4,0 1: @@ -97,3 +127,9 @@ addi r4,r4,32 /* Go to start of next cache line */ bdnz 1b isync + + +_______________________________________________ +Linuxppc-dev mailing list +Linuxppc-dev at ozlabs.org +https://ozlabs.org/mailman/listinfo/linuxppc-dev From fedora-cvs-commits at redhat.com Mon May 2 09:53:48 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 05:53:48 -0400 Subject: rpms/pam/devel pam-0.79-console-perms-d.patch, NONE, 1.1 pam.spec, 1.71, 1.72 pam-0.79-console-fix-perms.patch, 1.1, NONE Message-ID: <200505020953.j429rmAd011331@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11317 Modified Files: pam.spec Added Files: pam-0.79-console-perms-d.patch Removed Files: pam-0.79-console-fix-perms.patch Log Message: * Mon May 2 2005 Tomas Mraz 0.79-8 - pam_console: support loading .perms files in the console.perms.d (#156069) pam-0.79-console-perms-d.patch: 50-default.perms | 59 +++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 6 ++++ README | 3 +- config.h | 2 - config.l | 4 +-- config.y | 27 ++++++++++++--------- console.perms | 64 ++++------------------------------------------------ console.perms.5 | 11 ++++---- pam_console.8 | 9 ++++--- pam_console.c | 12 ++++++--- pam_console.h | 2 - pam_console_apply.8 | 24 ++++++++++++++----- pam_console_apply.c | 60 ++++++++++++++++++++++++++++++++++++++++++++---- 13 files changed, 182 insertions(+), 101 deletions(-) --- NEW FILE pam-0.79-console-perms-d.patch --- --- Linux-PAM-0.79/modules/pam_console/pam_console_apply.c.perms-d 2005-03-18 18:42:20.000000000 +0100 +++ Linux-PAM-0.79/modules/pam_console/pam_console_apply.c 2005-05-01 23:55:33.381257819 +0200 @@ -16,6 +16,8 @@ #include #include #include +#include +#include #define STATIC static #include "chmod.h" #include "pam_console.h" @@ -24,9 +26,11 @@ #include #define CAST_ME_HARDER (const void**) +#define DEFAULT_PERMSFILE "/etc/security/console.perms" +#define PERMS_GLOB "/etc/security/console.perms.d/*.perms" -static char consolelock[PATH_MAX] = LOCKDIR "/console.lock"; -static char consoleperms[PATH_MAX] = "/etc/security/console.perms"; +static const char consolelock[] = LOCKDIR "/" LOCKFILE; +static char consoleperms[PATH_MAX]; static char tty[PATH_MAX] = "tty0"; static int debug = 0; static int syslogging = 0; @@ -53,10 +57,44 @@ } else { vfprintf(stderr, format, args); + fprintf(stderr, "\n"); } va_end(args); } +static int +pf_glob_errorfn(const char *epath, int eerrno) +{ + return 0; +} + +static void +parse_files(void) +{ + int rc; + glob_t globbuf; + int i; + const char *oldlocale; + + /* first we parse the console.perms file */ + parse_file(DEFAULT_PERMSFILE); + + /* set the LC_COLLATE so the sorting order doesn't depend + on system locale */ + oldlocale = setlocale(LC_COLLATE, "C"); + + rc = glob(PERMS_GLOB, GLOB_NOCHECK, pf_glob_errorfn, &globbuf); + setlocale(LC_COLLATE, oldlocale); + if (rc == GLOB_NOSPACE) { + return; + } + + for (i = 0; globbuf.gl_pathv[i] != NULL; i++) { + parse_file(globbuf.gl_pathv[i]); + } + globfree(&globbuf); +} + int main(int argc, char **argv) { @@ -69,12 +107,20 @@ while((c = getopt(argc, argv, "c:f:t:rsd")) != -1) { switch(c) { - case 'c': strncpy(consoleperms, optarg, sizeof(consoleperms) - 1); + case 'c': if (strlen(optarg) >= sizeof(consoleperms)) { + fprintf(stderr, "Console.perms filename too long\n"); + exit(1); + } + strncpy(consoleperms, optarg, sizeof(consoleperms) - 1); consoleperms[sizeof(consoleperms) - 1] = '\0'; break; case 'f': chmod_set_fstab(optarg); break; - case 't': strncpy(tty, optarg, sizeof(tty) - 1); + case 't': if (strlen(optarg) >= sizeof(tty)) { + fprintf(stderr, "TTY name too long\n"); + exit(1); + } + strncpy(tty, optarg, sizeof(tty) - 1); tty[sizeof(tty) - 1] = '\0'; break; case 'r': @@ -98,7 +144,11 @@ files = g_slist_prepend(files, argv[i]); } - parse_file(consoleperms); + if (*consoleperms == '\0') + parse_files(); + else + parse_file(consoleperms); + fd = open(consolelock, O_RDONLY); if (fd != -1) { if (fstat (fd, &st)) { --- Linux-PAM-0.79/modules/pam_console/config.l.perms-d 2005-03-09 09:59:47.000000000 +0100 +++ Linux-PAM-0.79/modules/pam_console/config.l 2005-05-01 23:12:59.761469240 +0200 @@ -12,7 +12,7 @@ #include static int lineno; -static char *filename; +static const char *filename; STATIC char * strip_slash(const char *); @@ -37,7 +37,7 @@ } static void -lex_set_filename(char *name) { +lex_set_filename(const char *name) { filename = name; } --- Linux-PAM-0.79/modules/pam_console/pam_console.8.perms-d 2005-03-18 18:42:20.000000000 +0100 +++ Linux-PAM-0.79/modules/pam_console/pam_console.8 2005-05-02 00:43:05.580433618 +0200 @@ -1,6 +1,6 @@ .\" Copyright 1999 Red Hat Software, Inc. .\" Written by Michael K. Johnson -.TH pam_console 8 2005/3/18 "Red Hat" "System Administrator's Manual" +.TH pam_console 8 2005/5/2 "Red Hat" "System Administrator's Manual" .SH NAME pam_console \- determine user owning the system console .SH SYNOPSIS @@ -79,8 +79,6 @@ .br \fI/etc/security/console.apps\fP .br -\fI/etc/security/console.perms\fP -.br \fI/etc/security/console.handlers\fP .SH SECURITY NOTES When pam_console "auth" is used for login services which provide @@ -100,5 +98,8 @@ .SH BUGS Let's hope not, but if you find any, please report them via the "Bug Track" link at http://bugzilla.redhat.com/bugzilla/ -.SH AUTHOR +.SH AUTHORS Michael K. Johnson +.br +Support of console.handlers and other improvements by +Tomas Mraz --- Linux-PAM-0.79/modules/pam_console/pam_console_apply.8.perms-d 2005-03-18 18:42:20.000000000 +0100 +++ Linux-PAM-0.79/modules/pam_console/pam_console_apply.8 2005-05-02 00:31:33.662769846 +0200 @@ -1,19 +1,26 @@ .\" Copyright 2001 Red Hat, Inc. -.TH pam_console_apply 8 2005/3/18 "Red Hat" "System Administrator's Manual" +.TH pam_console_apply 8 2005/5/2 "Red Hat" "System Administrator's Manual" .SH NAME pam_console_apply \- set or revoke permissions for users at the system console .SH SYNOPSIS .B pam_console_apply [-f ] [-c ] [-r] [-t ] [-s] [-d] [ ...] .SH DESCRIPTION -\fBpam_console_apply\fP sets or resets permissions on devices in the same -manner as pam_console. +\fBpam_console_apply\fP is a helper executable which sets or resets permissions +on device nodes. .br If \fI/var/run/console.lock\fP exists, \fBpam_console_apply\fP will grant permissions to the user listed therein. If the lock file does not exist, -permissions are reset to those listed in \fI/etc/security/console.perms\fP, -which should be configured to set permissions on devices so that \fBroot\fP +permissions are reset according to defaults set in \fIconsole.perms\fP files, +normally configured to set permissions on devices so that \fBroot\fP owns them. + +When initializing its configuration it first parses +the \fI/etc/security/console.perms\fP file and then it searches for files +ending with the \fI.perms\fP suffix in the \fI/etc/security/console.perms.d\fP +directory. These files are parsed in the lexical order in "C" locale. +Permission rules are appended to a global list, console and device class +definitions override previous definitions of the same class. .SH ARGUMENTS .IP -c Load other console.perms file than the default one. @@ -37,6 +44,8 @@ \fI/var/run/console.lock\fP .br \fI/etc/security/console.perms\fP +.br +\fI/etc/security/console.perms.d/50-default.perms\fP .SH "SEE ALSO" .BR pam_console(8) .br @@ -45,6 +54,9 @@ .SH BUGS Let's hope not, but if you find any, please report them via the "Bug Track" link at http://bugzilla.redhat.com/bugzilla/ -.SH AUTHOR +.SH AUTHORS Nalin Dahyabhai , using code shamelessly stolen from parts of pam_console. +.br +Support of console.perms.d and other improvements by +Tomas Mraz . --- Linux-PAM-0.79/modules/pam_console/console.perms.5.perms-d 2005-01-10 17:11:40.000000000 +0100 +++ Linux-PAM-0.79/modules/pam_console/console.perms.5 2005-05-02 00:34:06.545390513 +0200 @@ -1,13 +1,14 @@ -.\" Copyright 1999 Red Hat Software, Inc. +.\" Copyright 1999,2005 Red Hat Software, Inc. .\" Written by Michael K. Johnson -.TH console.perms 5 1999/2/3 "Red Hat Software" "System Administrator's Manual" +.TH console.perms 5 2005/5/2 "Red Hat Software" "System Administrator's Manual" .SH NAME console.perms \- permissions control file for users at the system console .SH DESCRIPTION -/etc/security/console.perms determines the permissions that will be +/etc/security/console.perms and .perms files in the +/etc/security/console.perms.d directory determine the permissions that will be given to priviledged users of the console at login time, and the -permissions to which to revert when the users log out. It is -read by the pam_console module. +permissions to which to revert when the users log out. They are +read by the pam_console_apply helper executable. The format is: --- Linux-PAM-0.79/modules/pam_console/config.y.perms-d 2005-03-18 18:42:20.000000000 +0100 +++ Linux-PAM-0.79/modules/pam_console/config.y 2005-05-02 00:22:54.260595997 +0200 @@ -28,7 +28,7 @@ do_yyerror(const char *format, ...); static void -free_class(class *c); +empty_class(class *c); %} @@ -51,16 +51,17 @@ classdef: OBRACKET string CBEQUALS stringlist EOL { - void *old; class *c; - old = g_hash_table_lookup(namespace, $2); - if (old) free_class(old); - - c = g_malloc(sizeof(class)); + c = g_hash_table_lookup(namespace, $2); + if (c) { + empty_class(c); + } else { + c = g_malloc(sizeof(class)); + g_hash_table_insert(namespace, g_strdup($2), c); + } c->name = $2; c->list = $4; - g_hash_table_insert(namespace, $2, c); } ; @@ -98,7 +99,7 @@ classlist: OBRACKET string CBRACKET { class *c = g_hash_table_lookup(namespace, $2); if(!c) { - g_log(G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, + _pam_log(LOG_ERR, FALSE, "unknown class \"%s\" at line %d in %s\n", (const char *)$2, lineno, filename); _exit(1); @@ -130,7 +131,7 @@ /* parse a file given by a name */ STATIC void -parse_file(char *name) { +parse_file(const char *name) { FILE *infile; _pam_log(LOG_DEBUG, TRUE, "parsing config file %s", name); @@ -289,7 +290,9 @@ } static void -free_class(class *c) { - if (c->name) free (c->name); - if (c) free (c); +empty_class(class *c) { + g_free(c->name); + c->name = NULL; + g_slist_free(c->list); + c->list = NULL; } --- Linux-PAM-0.79/modules/pam_console/console.perms.perms-d 2005-03-31 18:39:58.000000000 +0200 +++ Linux-PAM-0.79/modules/pam_console/console.perms 2005-05-01 23:12:59.762469081 +0200 @@ -13,67 +13,13 @@ # # For more information: # man 5 console.perms +# +# This file should not be modified. +# Rather a new file in the console.perms.d directory should be created. # file classes -- these are regular expressions =tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]\.[0-9] :[0-9] =:[0-9]\.[0-9] :[0-9] -# device classes -- these are shell-style globs -=/dev/fd[0-1]* \ - /dev/floppy/* /mnt/floppy* -=/dev/dsp* /dev/audio* /dev/midi* \ - /dev/mixer* /dev/sequencer \ - /dev/sound/* /dev/beep \ - /dev/snd/* -=/dev/cdrom* /dev/cdroms/* /dev/cdwriter* /mnt/cdrom* -=/dev/pilot -=/mnt/jaz* -=/mnt/pocketzip* /mnt/zip* /dev/zip* -=/dev/ls120 /mnt/ls120* -=/dev/scanner* /dev/usb/scanner* -=/dev/usb/rio500 -=/mnt/camera* /dev/usb/dc2xx* /dev/usb/mdc800* -=/mnt/memstick* -=/mnt/flash* /dev/flash* -=/mnt/diskonkey* -=/mnt/microdrive* -=/dev/fb /dev/fb[0-9]* \ - /dev/fb/* -=/dev/kbd -=/dev/js[0-9]* -=/dev/video* /dev/radio* /dev/winradio* /dev/vtx* /dev/vbi* \ - /dev/video/* -=/dev/gpmctl -=/dev/nvidia* /dev/3dfx* /dev/dri/card* -=/dev/apm_bios -=/dev/pmu -=/dev/rfcomm* -=/dev/raw1394 - -# permission definitions - 0660 0660 root.floppy - 0600 0600 root - 0600 0660 root.disk - 0600 0660 root.uucp - 0600 0660 root.disk - 0600 0660 root.disk - 0600 0660 root.disk - 0600 0600 root - 0600 0600 root.disk - 0600 0600 root.disk - 0600 0600 root.disk - 0600 0660 root.disk - 0600 0660 root.disk - 0600 0600 root - 0600 0600 root - 0600 0600 root - 0600 0600 root - 0700 0700 root - 0600 0600 root - 0600 0600 root - 0600 0600 root - 0600 0600 root - 0600 0600 root - - 0600 /dev/console 0600 root.root - 0600 0600 root +# device classes -- see console.perms.d/50-default.perms +# permission definitions -- see console.perms.d/50-default.perms --- Linux-PAM-0.79/modules/pam_console/pam_console.h.perms-d 2005-03-18 18:42:20.000000000 +0100 +++ Linux-PAM-0.79/modules/pam_console/pam_console.h 2005-05-01 23:12:59.762469081 +0200 @@ -6,7 +6,7 @@ #define _PAM_CONSOLE_H #include -/* pam_console.c */ +#define LOCKFILE "console.lock" static void _pam_log(int err, int debug_p, const char *format, ...); --- /dev/null 2005-05-01 20:01:13.492601904 +0200 +++ Linux-PAM-0.79/modules/pam_console/50-default.perms 2005-05-01 23:12:59.763468921 +0200 @@ -0,0 +1,59 @@ +# device classes -- these are shell-style globs +=/dev/fd[0-1]* \ + /dev/floppy* /mnt/floppy* +=/dev/dsp* /dev/audio* /dev/midi* \ + /dev/mixer* /dev/sequencer \ + /dev/sound/* /dev/beep \ + /dev/snd/* +=/dev/cdrom* /dev/cdroms/* /dev/cdwriter* /mnt/cdrom* +=/dev/pilot +=/mnt/jaz* +=/mnt/pocketzip* /mnt/zip* /dev/zip* +=/dev/ls120 /mnt/ls120* +=/dev/scanner* /dev/usb/scanner* +=/dev/usb/rio500 +=/mnt/camera* /dev/usb/dc2xx* /dev/usb/mdc800* +=/mnt/memstick* +=/mnt/flash* /dev/flash* +=/mnt/diskonkey* +=/mnt/microdrive* +=/dev/fb /dev/fb[0-9]* \ + /dev/fb/* +=/dev/kbd +=/dev/js[0-9]* +=/dev/video* /dev/radio* /dev/winradio* /dev/vtx* /dev/vbi* \ + /dev/video/* +=/dev/gpmctl +=/dev/nvidia* /dev/3dfx* /dev/dri/card* +=/dev/apm_bios +=/dev/pmu +=/dev/rfcomm* +=/dev/raw1394 + +# permission definitions + 0660 0660 root.floppy + 0600 0600 root + 0600 0660 root.disk + 0600 0660 root.uucp + 0600 0660 root.disk + 0600 0660 root.disk + 0600 0660 root.disk + 0600 0600 root + 0600 0600 root.disk + 0600 0600 root.disk + 0600 0600 root.disk + 0600 0660 root.disk + 0600 0660 root.disk + 0600 0600 root + 0600 0600 root + 0600 0600 root + 0600 0600 root + 0700 0700 root + 0600 0600 root + 0600 0600 root + 0600 0600 root + 0600 0600 root + 0600 0600 root + + 0600 /dev/console 0600 root.root + 0600 0600 root --- Linux-PAM-0.79/modules/pam_console/config.h.perms-d 2005-03-18 18:42:20.000000000 +0100 +++ Linux-PAM-0.79/modules/pam_console/config.h 2005-05-01 23:12:59.763468921 +0200 @@ -23,7 +23,7 @@ }; STATIC void -parse_file(char *name); +parse_file(const char *name); STATIC int check_console_name (const char *consolename); --- Linux-PAM-0.79/modules/pam_console/README.perms-d 2005-03-18 18:42:20.000000000 +0100 +++ Linux-PAM-0.79/modules/pam_console/README 2005-05-02 00:35:58.968463036 +0200 @@ -21,7 +21,8 @@ make it possible to allow users who are at the console to run various programs that would otherwise be restricted to root only. -The pam_console.8 man page explains this software in more detail. +The pam_console.8 and pam_console_apply.8 man pages explain this +software in more detail. Please note: the current version depends on too many external tools and libraries, making it big and hard to evaluate for security. --- Linux-PAM-0.79/modules/pam_console/pam_console.c.perms-d 2005-05-01 23:12:59.755470197 +0200 +++ Linux-PAM-0.79/modules/pam_console/pam_console.c 2005-05-01 23:12:59.782465892 +0200 @@ -53,9 +53,9 @@ */ #define CAST_ME_HARDER (const void**) -static char consolelock[PATH_MAX] = LOCKDIR "/console.lock"; -static char consolerefs[PATH_MAX] = LOCKDIR "/"; -static char consoleapps[PATH_MAX] = "/etc/security/console.apps/"; +static char consolelock[] = LOCKDIR "/" LOCKFILE; +static char consolerefs[] = LOCKDIR "/"; +static char consoleapps[] = "/etc/security/console.apps/"; static char consolehandlers[PATH_MAX] = "/etc/security/console.handlers"; static int configfileparsed = 0; static int debug = 0; @@ -98,7 +98,11 @@ else if (!strcmp(*argv,"allow_nonroot_tty")) allow_nonroot_tty = 1; else if (!strncmp(*argv,"handlersfile=",13)) - strcpy(consolehandlers,*argv+13); + if (strlen(*argv+13) < PATH_MAX) + strcpy(consolehandlers,*argv+13); + else + _pam_log(LOG_ERR, FALSE, + "_args_parse: handlersfile filename too long"); else { _pam_log(LOG_ERR, FALSE, "_args_parse: unknown option; %s",*argv); --- Linux-PAM-0.79/modules/pam_console/Makefile.perms-d 2005-03-18 18:42:20.000000000 +0100 +++ Linux-PAM-0.79/modules/pam_console/Makefile 2005-05-01 23:12:59.782465892 +0200 @@ -25,6 +25,8 @@ INSTALLED_CONF1 = $(SCONFIGD)/console.perms LOCAL_CONF2 = console.handlers INSTALLED_CONF2 = $(SCONFIGD)/console.handlers +LOCAL_CONF3 = 50-default.perms +INSTALLED_CONF3 = $(SCONFIGD)/console.perms.d/50-default.perms MAN5 = console.apps.5 console.perms.5 console.handlers.5 MAN8 = pam_console.8 pam_console_apply.8 @@ -114,9 +116,11 @@ test -d $(FAKEROOT)$(MANDIR)/man8 || $(MKDIR) $(FAKEROOT)$(MANDIR)/man8 $(INSTALL) -m $(MANMODE) $(MAN8) $(FAKEROOT)$(MANDIR)/man8/ endif - if $(MKDIR) -m $(LOCKMODE) $(FAKEROOT)$(LOCKDIR) $(FAKEROOT)/$(SCONFIGD)/console.apps ; then \ + if $(MKDIR) -m $(LOCKMODE) $(FAKEROOT)$(LOCKDIR) \ + $(FAKEROOT)/$(SCONFIGD)/console.apps $(FAKEROOT)/$(SCONFIGD)/console.perms.d; then \ bash -f ../install_conf "$(FAKEROOT)" "$(SCONFIGD)" "$(INSTALLED_CONF1)" "$(TITLE)" "$(LOCAL_CONF1)" ;\ bash -f ../install_conf "$(FAKEROOT)" "$(SCONFIGD)" "$(INSTALLED_CONF2)" "$(TITLE)" "$(LOCAL_CONF2)" ;\ + bash -f ../install_conf "$(FAKEROOT)" "$(SCONFIGD)/console.perms.d" "$(INSTALLED_CONF3)" "$(TITLE)" "$(LOCAL_CONF3)" ;\ fi test -d $(FAKEROOT)$(SUPLEMENTED) || install -m 755 -d $(FAKEROOT)$(SUPLEMENTED) install -m 555 $(BINARY) $(FAKEROOT)$(SUPLEMENTED) Index: pam.spec =================================================================== RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- pam.spec 26 Apr 2005 12:00:40 -0000 1.71 +++ pam.spec 2 May 2005 09:53:46 -0000 1.72 @@ -12,7 +12,7 @@ Summary: A security tool which provides authentication for applications. Name: pam Version: 0.79 -Release: 7 +Release: 8 License: GPL or BSD Group: System Environment/Base Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 @@ -38,7 +38,7 @@ Patch74: pam-0.79-cleanup.patch Patch75: pam-0.79-cleanup-redhat.patch Patch76: pam-0.79-xauth-unsetenv.patch -Patch77: pam-0.79-console-fix-perms.patch +Patch77: pam-0.79-console-perms-d.patch BuildRoot: %{_tmppath}/%{name}-root Requires: cracklib, cracklib-dicts >= 2.8, glib2, initscripts >= 3.94 @@ -102,7 +102,7 @@ %patch74 -p1 -b .cleanup %patch75 -p1 -b .rhcleanup %patch76 -p1 -b .xauth-unset -%patch77 -p1 -b .fix-perms +%patch77 -p1 -b .perms-d for readme in modules/pam_*/README ; do cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'` @@ -346,7 +346,7 @@ %dir %{_sysconfdir}/security %config(noreplace) %{_sysconfdir}/security/access.conf %config(noreplace) %{_sysconfdir}/security/chroot.conf -%config(noreplace) %{_sysconfdir}/security/console.perms +%config %{_sysconfdir}/security/console.perms %config(noreplace) %{_sysconfdir}/security/console.handlers %config(noreplace) %{_sysconfdir}/security/group.conf %config(noreplace) %{_sysconfdir}/security/limits.conf @@ -354,6 +354,8 @@ %config(noreplace) %{_sysconfdir}/security/time.conf %config(noreplace) %{_sysconfdir}/security/opasswd %dir %{_sysconfdir}/security/console.apps +%dir %{_sysconfdir}/security/console.perms.d +%config %{_sysconfdir}/security/console.perms.d/50-default.perms %dir /var/run/console %{_mandir}/man5/* %{_mandir}/man8/* @@ -370,6 +372,9 @@ %{_libdir}/libpam_misc.so %changelog +* Mon May 2 2005 Tomas Mraz 0.79-8 +- pam_console: support loading .perms files in the console.perms.d (#156069) + * Tue Apr 26 2005 Tomas Mraz 0.79-7 - pam_xauth: unset the XAUTHORITY variable on error, fix potential memory leaks --- pam-0.79-console-fix-perms.patch DELETED --- From fedora-cvs-commits at redhat.com Mon May 2 10:36:07 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 06:36:07 -0400 Subject: rpms/words/FC-3 words-2.spec,1.14,1.15 Message-ID: <200505021036.j42Aa7KY002228@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/words/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv2213 Modified Files: words-2.spec Log Message: - sort with --dictionary-order - remove words with possessives ('s) Index: words-2.spec =================================================================== RCS file: /cvs/dist/rpms/words/FC-3/words-2.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- words-2.spec 4 Apr 2005 11:48:27 -0000 1.14 +++ words-2.spec 2 May 2005 10:36:05 -0000 1.15 @@ -1,7 +1,7 @@ Summary: A dictionary of English words for the /usr/share/dict directory. Name: words Version: 3.0 -Release: 2.2 +Release: 2.3 License: public domain Group: System Environment/Libraries Source: http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z @@ -22,7 +22,7 @@ %build cd mwords dos2unix -o *; chmod a+r * -sort --ignore-case [1-9]*.??? | uniq | grep -E "^[[:alnum:]'&!,./-]+$" > moby +cat [1-9]*.??? | fgrep -v \'s | egrep "^[[:alnum:]'&!,./-]+$" | sort --ignore-case --dictionary-order | uniq > moby cat <license.txt On June 1, 1996 Grady Ward announced that the fruits of @@ -60,6 +60,10 @@ /usr/share/dict/words %changelog +* Mon May 2 2005 Karel Zak 3-2.3 +- sort with --dictionary-order +- remove words with possessives ('s) + * Mon Apr 4 2005 Karel Zak 3-2.2 - sort with --ignore-case (#147949) From fedora-cvs-commits at redhat.com Mon May 2 10:36:45 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 06:36:45 -0400 Subject: rpms/words/devel words.spec,1.4,1.5 Message-ID: <200505021036.j42AajjW002291@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/words/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2279 Modified Files: words.spec Log Message: - sort with --dictionary-order - remove words with possessives ('s) Index: words.spec =================================================================== RCS file: /cvs/dist/rpms/words/devel/words.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- words.spec 4 Apr 2005 12:10:33 -0000 1.4 +++ words.spec 2 May 2005 10:36:43 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A dictionary of English words for the /usr/share/dict directory. Name: words Version: 3.0 -Release: 6 +Release: 4 License: public domain Group: System Environment/Libraries Source: http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z @@ -22,7 +22,7 @@ %build cd mwords dos2unix -o *; chmod a+r * -sort --ignore-case [1-9]*.??? | uniq | grep -E "^[[:alnum:]'&!,./-]+$" > moby +cat [1-9]*.??? | fgrep -v \'s | egrep "^[[:alnum:]'&!,./-]+$" | sort --ignore-case --dictionary-order | uniq > moby cat <license.txt On June 1, 1996 Grady Ward announced that the fruits of @@ -60,6 +60,10 @@ /usr/share/dict/words %changelog +* Mon May 2 2005 Karel Zak 3-7 +- sort with --dictionary-order +- remove words with possessives ('s) + * Mon Apr 4 2005 Karel Zak 3-6 - fix uniq command usage From fedora-cvs-commits at redhat.com Mon May 2 10:38:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 06:38:25 -0400 Subject: rpms/words/devel words.spec,1.5,1.6 Message-ID: <200505021038.j42AcPXp002364@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/words/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2351 Modified Files: words.spec Log Message: - fix release number Index: words.spec =================================================================== RCS file: /cvs/dist/rpms/words/devel/words.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- words.spec 2 May 2005 10:36:43 -0000 1.5 +++ words.spec 2 May 2005 10:38:23 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A dictionary of English words for the /usr/share/dict directory. Name: words Version: 3.0 -Release: 4 +Release: 7 License: public domain Group: System Environment/Libraries Source: http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z From fedora-cvs-commits at redhat.com Mon May 2 11:17:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 07:17:56 -0400 Subject: rpms/util-linux/devel util-linux.spec,1.69,1.70 Message-ID: <200505021117.j42BHuxI002576@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2564 Modified Files: util-linux.spec Log Message: - fix #156597 - look - doesn't work with separators Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- util-linux.spec 25 Apr 2005 10:23:12 -0000 1.69 +++ util-linux.spec 2 May 2005 11:17:54 -0000 1.70 @@ -27,7 +27,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.12p -Release: 8 +Release: 9 License: distributable Group: System Environment/Base @@ -126,6 +126,8 @@ Patch186: util-linux-2.12p-fdformat-ide.patch # 145355 - Man pages for fstab and fstab-sync in conflict. Patch187: util-linux-2.12p-fstab-man.patch +# 156597 - look - doesn't work with separators +Patch188: util-linux-2.12p-look-separator.patch # When adding patches, please make sure that it is easy to find out what bug # the # patch fixes. @@ -251,6 +253,7 @@ %patch185 -p1 %patch186 -p1 %patch187 -p1 +%patch188 -p1 %build unset LINGUAS || : @@ -641,6 +644,9 @@ /sbin/losetup %changelog +* Mon May 2 2005 Karel Zak 2.12p-9 +- fix #156597 - look - doesn't work with separators + * Mon Apr 25 2005 Karel Zak 2.12p-8 - fix #154498 - util-linux login & pam session - fix #155293 - man 5 nfs should include vers as a mount option From fedora-cvs-commits at redhat.com Mon May 2 11:19:28 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 07:19:28 -0400 Subject: rpms/util-linux/devel util-linux-2.12p-look-separator.patch, NONE, 1.1 Message-ID: <200505021119.j42BJSfn002611@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2598 Added Files: util-linux-2.12p-look-separator.patch Log Message: - add patch... util-linux-2.12p-look-separator.patch: look.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE util-linux-2.12p-look-separator.patch --- --- util-linux-2.12p/misc-utils/look.c.sep 2005-05-02 12:51:17.808227240 +0200 +++ util-linux-2.12p/misc-utils/look.c 2005-05-02 12:53:18.078943312 +0200 @@ -327,9 +327,12 @@ /* copy, ignoring things that should be ignored */ p = comparbuf; i = stringlen; - while(s2 < s2end && *s2 != '\n' && i--) { + while(s2 < s2end && *s2 != '\n' && i) { if (!dflag || isalnum(*s2)) + { *p++ = *s2; + i--; + } s2++; } *p = 0; From fedora-cvs-commits at redhat.com Mon May 2 12:14:55 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 08:14:55 -0400 Subject: rpms/util-linux/devel util-linux.spec,1.70,1.71 Message-ID: <200505021214.j42CEt5K026081@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26069 Modified Files: util-linux.spec Log Message: Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- util-linux.spec 2 May 2005 11:17:54 -0000 1.70 +++ util-linux.spec 2 May 2005 12:14:53 -0000 1.71 @@ -27,7 +27,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.12p -Release: 9 +Release: 9.1 License: distributable Group: System Environment/Base @@ -644,6 +644,9 @@ /sbin/losetup %changelog +* Mon May 2 2005 Karel Zak 2.12p-9.1 +- rebuild + * Mon May 2 2005 Karel Zak 2.12p-9 - fix #156597 - look - doesn't work with separators From fedora-cvs-commits at redhat.com Mon May 2 12:16:36 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 08:16:36 -0400 Subject: rpms/util-linux/devel util-linux.spec,1.71,1.72 Message-ID: <200505021216.j42CGaC3029288@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29253 Modified Files: util-linux.spec Log Message: Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- util-linux.spec 2 May 2005 12:14:53 -0000 1.71 +++ util-linux.spec 2 May 2005 12:16:34 -0000 1.72 @@ -27,7 +27,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.12p -Release: 9.1 +Release: 9.2 License: distributable Group: System Environment/Base @@ -644,7 +644,7 @@ /sbin/losetup %changelog -* Mon May 2 2005 Karel Zak 2.12p-9.1 +* Mon May 2 2005 Karel Zak 2.12p-9.2 - rebuild * Mon May 2 2005 Karel Zak 2.12p-9 From fedora-cvs-commits at redhat.com Mon May 2 12:38:26 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 08:38:26 -0400 Subject: rpms/kdewebdev/FC-3 fix-kdewebdev-kommander.diff, NONE, 1.1 kdewebdev.spec, 1.3, 1.4 Message-ID: <200505021238.j42CcQXi023350@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdewebdev/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv23336 Modified Files: kdewebdev.spec Added Files: fix-kdewebdev-kommander.diff Log Message: fix post-3.3.2-kdewebdev-kommander.diff - By default KURL::directory() strips the trailing slash and so, /tmp does not starts with /tmp fix-kdewebdev-kommander.diff: instance.cpp | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE fix-kdewebdev-kommander.diff --- Index: kommander/executor/instance.cpp =================================================================== RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -u -3 -d -p -b -r1.53 -r1.54 --- kommander/executor/instance.cpp 18 Mar 2005 12:57:57 -0000 1.53 +++ kommander/executor/instance.cpp 2 May 2005 09:58:17 -0000 1.54 @@ -147,7 +147,7 @@ bool Instance::run(QFile *a_file) bool inTemp = false; for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I) - if (m_uiFileName.directory().startsWith(*I)) + if (m_uiFileName.directory(false).startsWith(*I)) inTemp = true; if (inTemp) Index: kdewebdev.spec =================================================================== RCS file: /cvs/dist/rpms/kdewebdev/FC-3/kdewebdev.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kdewebdev.spec 27 Apr 2005 17:58:57 -0000 1.3 +++ kdewebdev.spec 2 May 2005 12:38:24 -0000 1.4 @@ -7,7 +7,7 @@ %define kde_version 3.3.1 Version: 3.3.1 -Release: 2.1 +Release: 2.2 Summary: WEB Development package for the K Desktop Environment. Name: kdewebdev Url: http://quanta.sourceforge.net/ @@ -25,7 +25,8 @@ Patch0: javascript.patch # KDE Security Advisory: Kommander untrusted code execution CAN-2005-0754 -Patch1: post-3.3.2-kdewebdev-kommander.diff +Patch100: post-3.3.2-kdewebdev-kommander.diff +Patch101: fix-kdewebdev-kommander.diff Prereq: /sbin/ldconfig Requires: kdelibs >= %{kde_version} @@ -56,7 +57,8 @@ %prep %setup -q -a 1 -a 2 -a 3 -a 4 %patch0 -p0 -b .javascript -%patch1 -p0 -b .CAN-2005-0754 +%patch100 -p0 -b .CAN-2005-0754 +%patch101 -p0 -b .CAN-2005-0754 %build QTDIR="" && . /etc/profile.d/qt.sh @@ -136,6 +138,9 @@ %{_includedir}/* %changelog +* Mon May 02 2005 Than Ngo 6:3.3.1-2.2 +- fix post-3.3.2-kdewebdev-kommander.diff + * Wed Apr 27 2005 Than Ngo 6:3.3.1-2.1 - apply patch to fix CAN-2005-0754, Kommander untrusted code execution, thanks to KDE security team From fedora-cvs-commits at redhat.com Mon May 2 12:39:23 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 08:39:23 -0400 Subject: rpms/util-linux/FC-3 util-linux.spec,1.51,1.52 Message-ID: <200505021239.j42CdNjs023431@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv23409 Modified Files: util-linux.spec Log Message: - fix #156597 - look - doesn't work with separators Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-3/util-linux.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- util-linux.spec 4 Apr 2005 09:32:54 -0000 1.51 +++ util-linux.spec 2 May 2005 12:39:21 -0000 1.52 @@ -621,6 +621,9 @@ /sbin/losetup %changelog +* Mon May 2 2005 Karel Zak 2.12a-24 +- fix #156597 - look - doesn't work with separators + * Mon Apr 4 2005 Karel Zak 2.12a-23 - Fixed dmesg doesn't understand kernel log buffer size (#138772) - Fixed ipcs -t output incorrectly labels semaphore section as "shared memory" (#151156) From fedora-cvs-commits at redhat.com Mon May 2 12:44:09 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 08:44:09 -0400 Subject: rpms/util-linux/FC-3 util-linux.spec,1.52,1.53 Message-ID: <200505021244.j42Ci91i023557@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv23545 Modified Files: util-linux.spec Log Message: Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-3/util-linux.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- util-linux.spec 2 May 2005 12:39:21 -0000 1.52 +++ util-linux.spec 2 May 2005 12:44:07 -0000 1.53 @@ -21,7 +21,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.12a -Release: 23 +Release: 24 License: distributable Group: System Environment/Base From fedora-cvs-commits at redhat.com Mon May 2 12:46:13 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 08:46:13 -0400 Subject: rpms/util-linux/FC-3 util-linux.spec,1.53,1.54 Message-ID: <200505021246.j42CkD1L026754@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv26742 Modified Files: util-linux.spec Log Message: Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-3/util-linux.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- util-linux.spec 2 May 2005 12:44:07 -0000 1.53 +++ util-linux.spec 2 May 2005 12:46:11 -0000 1.54 @@ -21,7 +21,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.12a -Release: 24 +Release: 24.1 License: distributable Group: System Environment/Base @@ -621,7 +621,7 @@ /sbin/losetup %changelog -* Mon May 2 2005 Karel Zak 2.12a-24 +* Mon May 2 2005 Karel Zak 2.12a-24.1 - fix #156597 - look - doesn't work with separators * Mon Apr 4 2005 Karel Zak 2.12a-23 From fedora-cvs-commits at redhat.com Mon May 2 13:18:28 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 09:18:28 -0400 Subject: rpms/gnome-panel/devel gnome-panel.spec, 1.65, 1.66 redhat-panel-default-setup.entries, 1.9, 1.10 Message-ID: <200505021318.j42DISYf023987@cvs.devel.redhat.com> Author: markmc Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23974 Modified Files: gnome-panel.spec redhat-panel-default-setup.entries Log Message: * Mon May 2 2005 Mark McLoughlin 2.10.1-8 - Update to new OpenOffice.org .desktop file locations in openoffice.org-1.9.97-3 (bug #156064) Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- gnome-panel.spec 27 Apr 2005 10:58:26 -0000 1.65 +++ gnome-panel.spec 2 May 2005 13:18:24 -0000 1.66 @@ -23,7 +23,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.10.1 -Release: 7 +Release: 8 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2 Source1: redhat-panel-default-setup.entries @@ -237,7 +237,11 @@ %{_datadir}/gtk-doc %changelog -* Wed Apr 27 2005 Mark McLoughlin - 2.10.1-6 +* Mon May 2 2005 Mark McLoughlin 2.10.1-8 +- Update to new OpenOffice.org .desktop file locations in + openoffice.org-1.9.97-3 (bug #156064) + +* Wed Apr 27 2005 Mark McLoughlin - 2.10.1-7 - Add patch to clamp the size of the icons on the panel at 48x48. Fixes "moved the panel to the side, can't move it back" issue (rh #141743) Index: redhat-panel-default-setup.entries =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/redhat-panel-default-setup.entries,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- redhat-panel-default-setup.entries 27 Apr 2005 09:44:43 -0000 1.9 +++ redhat-panel-default-setup.entries 2 May 2005 13:18:24 -0000 1.10 @@ -361,7 +361,7 @@ objects/wordprocessor_launcher/launcher_location /schemas/apps/panel/objects/launcher_location - /usr/share/applications/writer.desktop + /usr/share/applications/openoffice.org-1.9-writer.desktop @@ -415,7 +415,7 @@ objects/presentation_launcher/launcher_location /schemas/apps/panel/objects/launcher_location - /usr/share/applications/impress.desktop + /usr/share/applications/openoffice.org-1.9-impress.desktop @@ -469,7 +469,7 @@ objects/spreadsheet_launcher/launcher_location /schemas/apps/panel/objects/launcher_location - /usr/share/applications/calc.desktop + /usr/share/applications/openoffice.org-1.9-calc.desktop From fedora-cvs-commits at redhat.com Mon May 2 13:44:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 09:44:00 -0400 Subject: rpms/dictd/devel dictd.spec,1.12,1.13 Message-ID: <200505021344.j42Di075018023@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/dictd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18010 Modified Files: dictd.spec Log Message: - use _bindir / _sysconfdir macros Index: dictd.spec =================================================================== RCS file: /cvs/dist/rpms/dictd/devel/dictd.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dictd.spec 2 Apr 2005 11:17:33 -0000 1.12 +++ dictd.spec 2 May 2005 13:43:58 -0000 1.13 @@ -1,7 +1,7 @@ Summary: DICT protocol (RFC 2229) command-line client Name: dictd Version: 1.9.7 -Release: 8 +Release: 9 License: GPL Group: Applications/Internet Source0: ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz @@ -29,12 +29,11 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT{/usr/bin,/etc/rc.d/init.d,/etc/sysconfig} +mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/rc.d/init.d,%{_sysconfdir}/sysconfig} mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 make install DESTDIR=$RPM_BUILD_ROOT -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dictd -#install -m 644 dictd.conf $RPM_BUILD_ROOT/etc/dictd.conf -echo "DICTD_FLAGS=" > $RPM_BUILD_ROOT/etc/sysconfig/dictd +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/dictd +echo "DICTD_FLAGS=" > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/dictd %clean rm -rf $RPM_BUILD_ROOT @@ -57,13 +56,17 @@ %{_libdir}/libdictdplugin.a %{_includedir}/* %{_mandir}/man?/* -/etc/rc.d/init.d/* -%config(noreplace) /etc/sysconfig/dictd +%{_sysconfdir}/rc.d/init.d/* +%config(noreplace) %{_sysconfdir}/sysconfig/dictd %changelog +* Mon May 02 2005 Karsten Hopp 1.9.7-9 +- use _bindir / _sysconfdir macros + * Sat Apr 02 2005 Florian La Roche - /etc/init.d -> /etc/rc.d/init.d + * Thu Mar 10 2005 Bill Nottingham 1.9.7-7 - prereq chkconfig From fedora-cvs-commits at redhat.com Mon May 2 15:52:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 11:52:38 -0400 Subject: rpms/openobex/devel openobex-1.0.1-export.patch, NONE, 1.1 openobex.spec, 1.8, 1.9 Message-ID: <200505021552.j42Fqcci009898@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/openobex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9884 Modified Files: openobex.spec Added Files: openobex-1.0.1-export.patch Log Message: - added `OBEX_ServerAccept' to the exported symbols (bug rh#146353) openobex-1.0.1-export.patch: obex.sym | 1 + 1 files changed, 1 insertion(+) --- NEW FILE openobex-1.0.1-export.patch --- diff -ur openobex-1.0.1/src/obex.sym openobex-1.0.1.new/src/obex.sym --- openobex-1.0.1/src/obex.sym 2003-10-01 13:17:13.000000000 +0200 +++ openobex-1.0.1.new/src/obex.sym 2005-05-02 17:43:30.000000000 +0200 @@ -26,6 +26,7 @@ OBEX_CharToUnicode OBEX_ResponseToString OBEX_GetResponseMessage +OBEX_ServerAccept InOBEX_ServerRegister InOBEX_TransportConnect IrOBEX_ServerRegister Index: openobex.spec =================================================================== RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- openobex.spec 2 Mar 2005 14:20:14 -0000 1.8 +++ openobex.spec 2 May 2005 15:52:36 -0000 1.9 @@ -1,12 +1,13 @@ Summary: Library for using OBEX Name: openobex Version: 1.0.1 -Release: 3 +Release: 4 License: LGPL Group: System Environment/Libraries URL: http://openobex.sourceforge.net Source: ftp://download.sourceforge.net/pub/sourceforge/openobex/openobex-%{version}.tar.gz Patch: openobex-1.0.0-include.patch +Patch2: openobex-1.0.1-export.patch #Patch1: openobex-1.0.0-bigendian.patch BuildRoot: %{_tmppath}/%{name}-root BuildRequires: autoconf >= 0:2.57, docbook-utils >= 0:0.6.13, bluez-libs-devel @@ -28,7 +29,7 @@ %setup -q %patch -p1 -#%patch1 -p0 +%patch2 -p1 %build autoreconf --install --force @@ -64,6 +65,9 @@ %{_includedir}/openobex/ %changelog +* Mon May 02 2005 Harald Hoyer 1.0.1-4 +- added `OBEX_ServerAccept' to the exported symbols (bug rh#146353) + * Wed Mar 02 2005 Harald Hoyer - rebuilt From fedora-cvs-commits at redhat.com Mon May 2 16:07:18 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 12:07:18 -0400 Subject: rpms/bluez-utils/devel bluetooth.init, 1.2, 1.3 bluez-utils.spec, 1.19, 1.20 dund.init, 1.1, 1.2 hidd.init, 1.1, 1.2 pand.init, 1.1, 1.2 Message-ID: <200505021607.j42G7IRN003961@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3948 Modified Files: bluetooth.init bluez-utils.spec dund.init hidd.init pand.init Log Message: * Mon May 2 2005 Miloslav Trmac - 2.15-6 - Add missing backslashes to init script descriptions (#154494, patch by Ville Skytt??) Index: bluetooth.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluetooth.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bluetooth.init 2 Mar 2005 12:07:21 -0000 1.2 +++ bluetooth.init 2 May 2005 16:07:15 -0000 1.3 @@ -3,7 +3,7 @@ # bluetooth: Start/stop bluetooth services # # chkconfig: - 25 90 -# description: Bluetooth services for service discovery, authentication, +# description: Bluetooth services for service discovery, authentication, \ # Human Interface Devices, etc. # Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bluez-utils.spec 24 Mar 2005 23:35:23 -0000 1.19 +++ bluez-utils.spec 2 May 2005 16:07:15 -0000 1.20 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 2.15 -Release: 5 +Release: 6 License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -108,6 +108,10 @@ %{_libdir}/cups/backend/bluetooth %changelog +* Mon May 2 2005 Miloslav Trmac - 2.15-6 +- Add missing backslashes to init script descriptions (#154494, patch by Ville + Skytt??) + * Fri Mar 25 2005 Florian La Roche - make sure post/postun end with a "exit 0" Index: dund.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/dund.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dund.init 9 Sep 2004 03:35:18 -0000 1.1 +++ dund.init 2 May 2005 16:07:15 -0000 1.2 @@ -3,7 +3,7 @@ # dund: Bluetooth Dial-Up-Networking Daemon. # # chkconfig: - 26 89 -# description: Bluetooth Dial-Up-Networking Daemon. Provides PPP over RFCOMM +# description: Bluetooth Dial-Up-Networking Daemon. Provides PPP over RFCOMM \ # services. # Index: hidd.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/hidd.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hidd.init 9 Sep 2004 03:35:18 -0000 1.1 +++ hidd.init 2 May 2005 16:07:15 -0000 1.2 @@ -3,7 +3,7 @@ # dund: Bluetooth Human Interface Device Daemon. # # chkconfig: - 26 89 -# description: Bluetooth Human Interface Device Daemon. Provides keyboard, +# description: Bluetooth Human Interface Device Daemon. Provides keyboard, \ # mouse etc. functionality over Bluetooth. # Index: pand.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/pand.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pand.init 9 Sep 2004 03:35:18 -0000 1.1 +++ pand.init 2 May 2005 16:07:15 -0000 1.2 @@ -3,7 +3,7 @@ # pand: Bluetooth Personal Area Networking Daemon. # # chkconfig: - 26 89 -# description: Bluetooth Personal Area Networking Daemon. Provides network +# description: Bluetooth Personal Area Networking Daemon. Provides network \ # services over Bluetooth. # From fedora-cvs-commits at redhat.com Mon May 2 16:55:40 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 12:55:40 -0400 Subject: rpms/util-linux/FC-3 util-linux-2.12a-lastlabel.patch, NONE, 1.1 util-linux-2.12p-look-separator.patch, NONE, 1.1 util-linux-2.12p-nfsman.patch, NONE, 1.1 util-linux.spec, 1.54, 1.55 Message-ID: <200505021655.j42GtehV031058@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv31039 Modified Files: util-linux.spec Added Files: util-linux-2.12a-lastlabel.patch util-linux-2.12p-look-separator.patch util-linux-2.12p-nfsman.patch Log Message: - fix #156597 - look - doesn't work with separators - fix #154202 - wrong duplicate labels detection - fix #155293 - man 5 nfs should include vers as a mount option util-linux-2.12a-lastlabel.patch: mount_by_label.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE util-linux-2.12a-lastlabel.patch --- --- util-linux-2.12a/mount/mount_by_label.c.lastlabel 2005-04-08 14:00:03.525410992 +0200 +++ util-linux-2.12a/mount/mount_by_label.c 2005-04-08 14:00:16.871382096 +0200 @@ -385,7 +385,7 @@ uuidcache_init(); if(!uuidCache) return NULL; - for (last = uuidCache; last->next; last = last->next) { + for (last = uuidCache; last; last = last->next) { if (last->label && !strcmp(last->label, label)) { occurrences++; if (occurrences == 2) util-linux-2.12p-look-separator.patch: look.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE util-linux-2.12p-look-separator.patch --- --- util-linux-2.12p/misc-utils/look.c.sep 2005-05-02 12:51:17.808227240 +0200 +++ util-linux-2.12p/misc-utils/look.c 2005-05-02 12:53:18.078943312 +0200 @@ -327,9 +327,12 @@ /* copy, ignoring things that should be ignored */ p = comparbuf; i = stringlen; - while(s2 < s2end && *s2 != '\n' && i--) { + while(s2 < s2end && *s2 != '\n' && i) { if (!dflag || isalnum(*s2)) + { *p++ = *s2; + i--; + } s2++; } *p = 0; util-linux-2.12p-nfsman.patch: nfs.5 | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE util-linux-2.12p-nfsman.patch --- --- util-linux-2.12p/mount/nfs.5.nfsver 2005-04-20 12:29:01.597052880 +0200 +++ util-linux-2.12p/mount/nfs.5 2005-04-20 12:30:02.181842592 +0200 @@ -180,6 +180,10 @@ for hosts that can run multiple NFS servers. The default value depends on which kernel you are using. .TP 1.5i +.I vers=n +vers is an alternative to nfsvers and is compatible with +many other operating systems. +.TP 1.5i .I nolock Disable NFS locking. Do not start lockd. This has to be used with some old NFS servers Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-3/util-linux.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- util-linux.spec 2 May 2005 12:46:11 -0000 1.54 +++ util-linux.spec 2 May 2005 16:55:37 -0000 1.55 @@ -111,6 +111,13 @@ Patch163: util-linux-2.12a-swap-label.patch # 145355 - Man pages for fstab and fstab-sync in conflict Patch164: util-linux-2.12a-fstab-man.patch +# 154202 - wrong duplicate labels detection +Patch165: util-linux-2.12a-lastlabel.patch +# 155293 - man 5 nfs should include vers as a mount option +Patch166: util-linux-2.12p-nfsman.patch +# 156597 - look - doesn't work with separators +Patch167: util-linux-2.12p-look-separator.patch + # patches required for NFSv4 support Patch1000: util-linux-2.12-nfsv4.patch @@ -240,6 +247,9 @@ %patch162 -p1 -b .typo %patch163 -p1 -b .swaplabel %patch164 -p1 -b .sync +%patch165 -p1 +%patch166 -p1 +%patch167 -p1 %patch1000 -p1 -b .nfsv4 %patch1001 -p1 @@ -623,6 +633,8 @@ %changelog * Mon May 2 2005 Karel Zak 2.12a-24.1 - fix #156597 - look - doesn't work with separators +- fix #154202 - wrong duplicate labels detection +- fix #155293 - man 5 nfs should include vers as a mount option * Mon Apr 4 2005 Karel Zak 2.12a-23 - Fixed dmesg doesn't understand kernel log buffer size (#138772) From fedora-cvs-commits at redhat.com Mon May 2 16:57:03 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 12:57:03 -0400 Subject: rpms/bluez-utils/devel bluetooth.init, 1.3, 1.4 bluez-utils.spec, 1.20, 1.21 hidd.init, 1.2, 1.3 Message-ID: <200505021657.j42Gv3jw031141@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31127 Modified Files: bluetooth.init bluez-utils.spec hidd.init Log Message: start hidd by default Index: bluetooth.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluetooth.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bluetooth.init 2 May 2005 16:07:15 -0000 1.3 +++ bluetooth.init 2 May 2005 16:57:01 -0000 1.4 @@ -2,7 +2,7 @@ # # bluetooth: Start/stop bluetooth services # -# chkconfig: - 25 90 +# chkconfig: 2345 25 90 # description: Bluetooth services for service discovery, authentication, \ # Human Interface Devices, etc. # Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bluez-utils.spec 2 May 2005 16:07:15 -0000 1.20 +++ bluez-utils.spec 2 May 2005 16:57:01 -0000 1.21 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 2.15 -Release: 6 +Release: 7 License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -108,6 +108,9 @@ %{_libdir}/cups/backend/bluetooth %changelog +* Mon May 2 2005 David Woodhouse 2.15-7 +- Run hidd by default (#155831) + * Mon May 2 2005 Miloslav Trmac - 2.15-6 - Add missing backslashes to init script descriptions (#154494, patch by Ville Skytt??) Index: hidd.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/hidd.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hidd.init 2 May 2005 16:07:15 -0000 1.2 +++ hidd.init 2 May 2005 16:57:01 -0000 1.3 @@ -1,8 +1,8 @@ #!/bin/sh # -# dund: Bluetooth Human Interface Device Daemon. +# hidd: Bluetooth Human Interface Device Daemon. # -# chkconfig: - 26 89 +# chkconfig: 2345 26 89 # description: Bluetooth Human Interface Device Daemon. Provides keyboard, \ # mouse etc. functionality over Bluetooth. # From fedora-cvs-commits at redhat.com Mon May 2 17:25:37 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 13:25:37 -0400 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.62,1.63 Message-ID: <200505021725.j42HPbLX028676@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28664 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- cman-kernel.spec 29 Apr 2005 15:58:29 -0000 1.62 +++ cman-kernel.spec 2 May 2005 17:25:34 -0000 1.63 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1276_FC4 +%define kernel_version 2.6.11-1.1282_FC4 %define subversion 20050425.154843.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.11.3 -Release: 20050425.154843.FC4.4 +Release: 20050425.154843.FC4.5 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Mon May 2 17:26:19 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 13:26:19 -0400 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.45,1.46 Message-ID: <200505021726.j42HQJiP028736@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28723 Modified Files: GFS-kernel.spec Log Message: Updated Kernel Version Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- GFS-kernel.spec 29 Apr 2005 16:20:04 -0000 1.45 +++ GFS-kernel.spec 2 May 2005 17:26:17 -0000 1.46 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1276_FC4 +%define kernel_version 2.6.11-1.1282_FC4 %define subversion 20050426.134031.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.11.3 -Release: %{subversion}.8 +Release: %{subversion}.9 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Mon May 2 17:26:27 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 13:26:27 -0400 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.39,1.40 Message-ID: <200505021726.j42HQRrx028789@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28777 Modified Files: dlm-kernel.spec Log Message: Updated Kernel Version Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- dlm-kernel.spec 29 Apr 2005 15:59:20 -0000 1.39 +++ dlm-kernel.spec 2 May 2005 17:26:24 -0000 1.40 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1276_FC4 +%define kernel_version 2.6.11-1.1282_FC4 %define subversion 20050425.154843.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.11.3 -Release: 20050425.154843.FC4.5 +Release: 20050425.154843.FC4.6 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Mon May 2 17:26:33 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 13:26:33 -0400 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.45,1.46 Message-ID: <200505021726.j42HQXg1028844@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28831 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gnbd-kernel.spec 29 Apr 2005 15:44:46 -0000 1.45 +++ gnbd-kernel.spec 2 May 2005 17:26:30 -0000 1.46 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1276_FC4 +%define kernel_version 2.6.11-1.1282_FC4 %define subversion 20050420.133124.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.11.2 -Release: 20050420.133124.FC4.9 +Release: 20050420.133124.FC4.10 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Mon May 2 18:18:42 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 14:18:42 -0400 Subject: rpms/gnome-media/devel .cvsignore, 1.17, 1.18 gnome-media.spec, 1.37, 1.38 sources, 1.17, 1.18 Message-ID: <200505021818.j42IIgYI030027@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30013 Modified Files: .cvsignore gnome-media.spec sources Log Message: - Update to 2.10.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 16 Mar 2005 17:13:15 -0000 1.17 +++ .cvsignore 2 May 2005 18:18:40 -0000 1.18 @@ -2,3 +2,4 @@ gnome-media-2.8.0.tar.bz2 gnome-media-2.9.90.tar.bz2 gnome-media-2.10.0.tar.bz2 +gnome-media-2.10.2.tar.bz2 Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gnome-media.spec 29 Mar 2005 22:14:54 -0000 1.37 +++ gnome-media.spec 2 May 2005 18:18:40 -0000 1.38 @@ -10,8 +10,8 @@ Summary: GNOME media programs. Name: gnome-media -Version: 2.10.0 -Release: 2 +Version: 2.10.2 +Release: 1 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.6/gnome-media-%{version}.tar.bz2 @@ -146,6 +146,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon May 02 2005 John (J5) Palmieri 2.10.2-1 +- Update to 2.10.2 + * Tue Mar 29 2005 John (J5) Palmieri 2.10.0-2 - Added a devel package Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 16 Mar 2005 17:13:15 -0000 1.17 +++ sources 2 May 2005 18:18:40 -0000 1.18 @@ -1 +1 @@ -e3b5a422881bfcb7f4082818075e8c88 gnome-media-2.10.0.tar.bz2 +3d73cd40cfa52c5eef882302f92c60d6 gnome-media-2.10.2.tar.bz2 From fedora-cvs-commits at redhat.com Mon May 2 19:02:05 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 15:02:05 -0400 Subject: rpms/selinux-policy-targeted/devel policy-20050502.patch, NONE, 1.1 .cvsignore, 1.106, 1.107 policy-20050425.patch, 1.7, 1.8 selinux-policy-targeted.spec, 1.291, 1.292 sources, 1.112, 1.113 Message-ID: <200505021902.j42J252k021451@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-targeted/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21424 Modified Files: .cvsignore policy-20050425.patch selinux-policy-targeted.spec sources Added Files: policy-20050502.patch Log Message: * Mon May 2 2005 Dan Walsh 1.23.14-1 - Update to latest from NSA * Added afs policy from Andrew Reisse. * Merged patch from Lorenzo Hern??ndez Garc??a-Hierro which defines execstack and execheap permissions. The patch excludes these permissions from general_domain_access and updates the macros for X, legacy binaries, users, and unconfined domains. * Added nlmsg_relay permisison where netlink_audit_socket class is used. Added nlmsg_readpriv permission to auditd_t and auditctl_t. * Merged some minor cleanups from Russell Coker and David Hampton. * Merged patch from Dan Walsh. Many changes made to allow targeted policy to run closer to strict and now almost all of non-userspace is protected via SELinux. Kernel is now in unconfined_domain for targeted and runs as root:system_r:kernel_t. Added transitionbool to daemon_sub_domain, mainly to turn off httpd_suexec transitioning. Implemented web_client_domain name_connect rules. Added yp support for cups. Now the real hotplug, udev, initial_sid_contexts are used for the targeted policy. Other minor cleanups and fixes. Auditd fixes by Paul Moore. policy-20050502.patch: domains/misc/kernel.te | 2 ++ domains/program/ifconfig.te | 2 ++ domains/program/modutil.te | 2 +- domains/program/unused/apmd.te | 2 +- domains/program/unused/auditd.te | 1 + domains/program/unused/automount.te | 9 +++++++-- domains/program/unused/consoletype.te | 1 + domains/program/unused/cups.te | 4 +++- domains/program/unused/hald.te | 7 ++++--- domains/program/unused/hotplug.te | 2 +- domains/program/unused/i18n_input.te | 2 ++ domains/program/unused/kudzu.te | 1 + domains/program/unused/lvm.te | 2 +- domains/program/unused/pamconsole.te | 2 +- domains/program/unused/udev.te | 4 ++-- domains/program/unused/updfstab.te | 6 ++++++ domains/program/unused/xdm.te | 1 + domains/program/unused/xserver.te | 1 + file_contexts/distros.fc | 3 ++- file_contexts/program/cups.fc | 1 + file_contexts/program/i18n_input.fc | 1 + file_contexts/program/rhgb.fc | 1 - file_contexts/types.fc | 1 + macros/core_macros.te | 1 - macros/program/su_macros.te | 5 +++-- net_contexts | 2 ++ tunables/distro.tun | 2 +- tunables/tunable.tun | 6 +++--- 28 files changed, 52 insertions(+), 22 deletions(-) --- NEW FILE policy-20050502.patch --- diff --exclude-from=exclude -N -u -r nsapolicy/domains/misc/kernel.te policy-1.23.14/domains/misc/kernel.te --- nsapolicy/domains/misc/kernel.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/misc/kernel.te 2005-05-02 14:51:59.000000000 -0400 @@ -36,6 +36,7 @@ # Send signal to any process. allow kernel_t domain:process signal; +allow kernel_t domain:dir search; # Access the console. allow kernel_t device_t:dir search; @@ -50,6 +51,7 @@ allow kernel_t self:capability sys_chroot; allow kernel_t { unlabeled_t root_t file_t }:dir mounton; +allow kernel_t unlabeled_t:fifo_file rw_file_perms; allow kernel_t file_t:dir rw_dir_perms; allow kernel_t file_t:blk_file create_file_perms; allow kernel_t { sysctl_t sysctl_kernel_t }:file { setattr rw_file_perms }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/ifconfig.te policy-1.23.14/domains/program/ifconfig.te --- nsapolicy/domains/program/ifconfig.te 2005-04-27 10:28:49.000000000 -0400 +++ policy-1.23.14/domains/program/ifconfig.te 2005-05-02 14:51:59.000000000 -0400 @@ -21,7 +21,9 @@ general_domain_access(ifconfig_t) domain_auto_trans(initrc_t, ifconfig_exec_t, ifconfig_t) +ifdef(`targeted_policy', `', ` domain_auto_trans(sysadm_t, ifconfig_exec_t, ifconfig_t) +') # for /sbin/ip allow ifconfig_t self:netlink_route_socket rw_netlink_socket_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/modutil.te policy-1.23.14/domains/program/modutil.te --- nsapolicy/domains/program/modutil.te 2005-04-27 10:28:49.000000000 -0400 +++ policy-1.23.14/domains/program/modutil.te 2005-05-02 14:51:59.000000000 -0400 @@ -143,7 +143,7 @@ allow insmod_t proc_t:dir search; allow insmod_t sysctl_kernel_t:file { setattr rw_file_perms }; -allow insmod_t proc_t:file { getattr read }; +allow insmod_t proc_t:file rw_file_perms; allow insmod_t proc_t:lnk_file read; # Write to /proc/mtrr. diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apmd.te policy-1.23.14/domains/program/unused/apmd.te --- nsapolicy/domains/program/unused/apmd.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/apmd.te 2005-05-02 14:51:59.000000000 -0400 @@ -31,7 +31,7 @@ allow apmd_t device_t:lnk_file read; allow apmd_t proc_t:file { getattr read }; -read_sysctl(apmd_t) +can_sysctl(apmd_t) allow apmd_t self:unix_dgram_socket create_socket_perms; allow apmd_t self:unix_stream_socket create_stream_socket_perms; allow apmd_t self:fifo_file rw_file_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/auditd.te policy-1.23.14/domains/program/unused/auditd.te --- nsapolicy/domains/program/unused/auditd.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/auditd.te 2005-05-02 14:51:59.000000000 -0400 @@ -56,3 +56,4 @@ allow auditctl_t sysctl_kernel_t:file read; allow auditd_t self:process setsched; dontaudit auditctl_t init_t:fd use; +allow auditctl_t initrc_devpts_t:chr_file { read write }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/automount.te policy-1.23.14/domains/program/unused/automount.te --- nsapolicy/domains/program/unused/automount.te 2005-04-27 10:28:49.000000000 -0400 +++ policy-1.23.14/domains/program/unused/automount.te 2005-05-02 14:53:00.000000000 -0400 @@ -26,7 +26,7 @@ allow automount_t { etc_t etc_runtime_t }:file { getattr read }; allow automount_t proc_t:file { getattr read }; allow automount_t self:process { setpgid setsched }; -allow automount_t self:capability sys_nice; +allow automount_t self:capability { sys_nice dac_override }; allow automount_t self:unix_stream_socket create_socket_perms; allow automount_t self:unix_dgram_socket create_socket_perms; @@ -66,4 +66,9 @@ allow automount_t home_root_t:dir getattr; allow automount_t mnt_t:dir { getattr search }; -allow initrc_t automount_etc_t:file { getattr read }; +can_exec(initrc_t, automount_etc_t) + +# Need something like the following +# file_type_auto_trans(automount_t, file_type, automount_tmp_t, dir) + + diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/consoletype.te policy-1.23.14/domains/program/unused/consoletype.te --- nsapolicy/domains/program/unused/consoletype.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/consoletype.te 2005-05-02 14:51:59.000000000 -0400 @@ -57,6 +57,7 @@ ifdef(`firstboot.te', ` allow consoletype_t firstboot_t:fifo_file write; ') +dontaudit consoletype_t proc_t:dir search; dontaudit consoletype_t proc_t:file read; dontaudit consoletype_t root_t:file read; allow consoletype_t crond_t:fifo_file { read getattr ioctl }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/cups.te policy-1.23.14/domains/program/unused/cups.te --- nsapolicy/domains/program/unused/cups.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/cups.te 2005-05-02 14:51:59.000000000 -0400 @@ -22,6 +22,7 @@ logdir_domain(cupsd) tmp_domain(cupsd) +file_type_auto_trans(cupsd_t, tmp_t, cupsd_tmp_t, fifo_file) allow cupsd_t devpts_t:dir search; @@ -246,8 +247,9 @@ allow cupsd_config_t logrotate_t:fd use; ')dnl end if logrotate.te allow cupsd_config_t system_crond_t:fd use; -allow cupsd_config_t crond_t:fifo_file read; +allow cupsd_config_t crond_t:fifo_file r_file_perms; allow cupsd_t crond_t:fifo_file read; +allow cupsd_t crond_t:fd use; # Alternatives asks for this allow cupsd_config_t initrc_exec_t:file getattr; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hald.te policy-1.23.14/domains/program/unused/hald.te --- nsapolicy/domains/program/unused/hald.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/hald.te 2005-05-02 14:51:59.000000000 -0400 @@ -10,12 +10,12 @@ # # hald_exec_t is the type of the hald executable. # -daemon_domain(hald, `, fs_domain, nscd_client_domain') +daemon_domain(hald, `, fs_domain, nscd_client_domain, privmem') can_exec_any(hald_t) allow hald_t { etc_t etc_runtime_t }:file { getattr read }; -allow hald_t self:unix_stream_socket create_stream_socket_perms; +allow hald_t self:unix_stream_socket { connectto create_stream_socket_perms }; allow hald_t self:unix_dgram_socket create_socket_perms; ifdef(`dbusd.te', ` @@ -36,7 +36,7 @@ allow hald_t self:netlink_kobject_uevent_socket create_socket_perms; allow hald_t self:netlink_route_socket r_netlink_socket_perms; -allow hald_t self:capability { net_admin sys_admin dac_override dac_read_search mknod }; +allow hald_t self:capability { net_admin sys_admin dac_override dac_read_search mknod sys_rawio }; can_network_server(hald_t) can_ypbind(hald_t) @@ -47,6 +47,7 @@ allow hald_t printer_device_t:chr_file rw_file_perms; allow hald_t urandom_device_t:chr_file read; allow hald_t mouse_device_t:chr_file r_file_perms; +allow hald_t memory_device_t:chr_file r_file_perms; can_getsecurity(hald_t) diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hotplug.te policy-1.23.14/domains/program/unused/hotplug.te --- nsapolicy/domains/program/unused/hotplug.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/hotplug.te 2005-05-02 14:51:59.000000000 -0400 @@ -156,4 +156,4 @@ domain_auto_trans(hotplug_t, sendmail_exec_t, system_mail_t) ') -allow kernel_t hotplug_etc_t:dir search; +allow { insmod_t kernel_t } hotplug_etc_t:dir { search getattr }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/i18n_input.te policy-1.23.14/domains/program/unused/i18n_input.te --- nsapolicy/domains/program/unused/i18n_input.te 2005-04-27 10:28:51.000000000 -0400 +++ policy-1.23.14/domains/program/unused/i18n_input.te 2005-05-02 14:51:59.000000000 -0400 @@ -14,6 +14,7 @@ can_ypbind(i18n_input_t) can_tcp_connect(userdomain, i18n_input_t) +can_unix_connect(i18n_input_t, initrc_t) allow i18n_input_t self:fifo_file rw_file_perms; allow i18n_input_t i18n_input_port_t:tcp_socket name_bind; @@ -28,3 +29,4 @@ allow i18n_input_t self:unix_stream_socket create_stream_socket_perms; allow i18n_input_t i18n_input_var_run_t:dir create_dir_perms; allow i18n_input_t i18n_input_var_run_t:sock_file create_file_perms; +allow i18n_input_t usr_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/kudzu.te policy-1.23.14/domains/program/unused/kudzu.te --- nsapolicy/domains/program/unused/kudzu.te 2005-04-27 10:28:51.000000000 -0400 +++ policy-1.23.14/domains/program/unused/kudzu.te 2005-05-02 14:51:59.000000000 -0400 @@ -26,6 +26,7 @@ allow kudzu_t mouse_device_t:chr_file { read write }; allow kudzu_t proc_net_t:dir r_dir_perms; allow kudzu_t { proc_net_t proc_t }:file { getattr read }; +allow kudzu_t proc_t:lnk_file getattr; allow kudzu_t { fixed_disk_device_t removable_device_t }:blk_file rw_file_perms; allow kudzu_t scsi_generic_device_t:chr_file r_file_perms; allow kudzu_t { bin_t sbin_t }:dir { getattr search }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/lvm.te policy-1.23.14/domains/program/unused/lvm.te --- nsapolicy/domains/program/unused/lvm.te 2005-04-27 10:28:51.000000000 -0400 +++ policy-1.23.14/domains/program/unused/lvm.te 2005-05-02 14:51:59.000000000 -0400 @@ -112,7 +112,7 @@ allow lvm_t lvm_control_t:chr_file rw_file_perms; allow initrc_t lvm_control_t:chr_file { getattr read unlink }; allow initrc_t device_t:chr_file create; -dontaudit lvm_t var_run_t:dir getattr; +var_run_domain(lvm) # for when /usr is not mounted dontaudit lvm_t file_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/pamconsole.te policy-1.23.14/domains/program/unused/pamconsole.te --- nsapolicy/domains/program/unused/pamconsole.te 2005-04-27 10:28:52.000000000 -0400 +++ policy-1.23.14/domains/program/unused/pamconsole.te 2005-05-02 14:51:59.000000000 -0400 @@ -45,5 +45,5 @@ ifdef(`xdm.te', ` allow pam_console_t xdm_var_run_t:file { getattr read }; ') -allow initrc_t pam_var_console_t:dir r_dir_perms; +allow initrc_t pam_var_console_t:dir rw_dir_perms; allow pam_console_t file_context_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/udev.te policy-1.23.14/domains/program/unused/udev.te --- nsapolicy/domains/program/unused/udev.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/udev.te 2005-05-02 14:51:59.000000000 -0400 @@ -38,8 +38,8 @@ allow udev_t device_t:lnk_file create_lnk_perms; allow udev_t { device_t device_type }:{ chr_file blk_file } { relabelfrom relabelto create_file_perms }; ifdef(`distro_redhat', ` -allow udev_t tmpfs_t:dir rw_dir_perms; -allow udev_t tmpfs_t:sock_file create_file_perms; +allow udev_t tmpfs_t:dir create_dir_perms; +allow udev_t tmpfs_t:{ sock_file file } create_file_perms; allow udev_t tmpfs_t:lnk_file create_lnk_perms; allow udev_t tmpfs_t:{ chr_file blk_file } { relabelfrom relabelto create_file_perms }; allow udev_t tmpfs_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/updfstab.te policy-1.23.14/domains/program/unused/updfstab.te --- nsapolicy/domains/program/unused/updfstab.te 2005-04-27 10:28:53.000000000 -0400 +++ policy-1.23.14/domains/program/unused/updfstab.te 2005-05-02 14:51:59.000000000 -0400 @@ -31,6 +31,8 @@ ifdef(`dbusd.te', ` dbusd_client(system, updfstab) allow updfstab_t system_dbusd_t:dbus { send_msg }; +allow initrc_t updfstab_t:dbus send_msg; +allow updfstab_t initrc_t:dbus send_msg; ') # not sure what the sysctl_kernel_t file is, or why it wants to write it, so @@ -73,3 +75,7 @@ dontaudit updfstab_t { home_dir_type home_type }:dir search; allow updfstab_t fs_t:filesystem { getattr }; allow updfstab_t tmpfs_t:dir getattr; +ifdef(`hald.te', ` +can_unix_connect(updfstab_t, hald_t) +') + diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xdm.te policy-1.23.14/domains/program/unused/xdm.te --- nsapolicy/domains/program/unused/xdm.te 2005-04-27 10:28:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/xdm.te 2005-05-02 14:51:59.000000000 -0400 @@ -344,3 +344,4 @@ # Run telinit->init to shutdown. can_exec(xdm_t, init_exec_t) +allow xdm_t self:sem create_sem_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xserver.te policy-1.23.14/domains/program/unused/xserver.te --- nsapolicy/domains/program/unused/xserver.te 2005-04-27 10:28:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/xserver.te 2005-05-02 14:51:59.000000000 -0400 @@ -20,3 +20,4 @@ # Everything else is in the xserver_domain macro in # macros/program/xserver_macros.te. +allow initrc_t xserver_log_t:fifo_file { read write }; diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/distros.fc policy-1.23.14/file_contexts/distros.fc --- nsapolicy/file_contexts/distros.fc 2005-05-02 14:06:56.000000000 -0400 +++ policy-1.23.14/file_contexts/distros.fc 2005-05-02 14:51:59.000000000 -0400 @@ -37,7 +37,8 @@ /usr/share/texmf/web2c/mktexupd -- system_u:object_r:bin_t /usr/share/ssl/certs(/.*)? system_u:object_r:cert_t /usr/share/ssl/private(/.*)? system_u:object_r:cert_t -/etc/pki(/.*)? system_u:object_r:cert_t +/etc/pki(/.*)? system_u:object_r:cert_t +/etc/rhgb(/.*)? -d system_u:object_r:mnt_t /usr/share/ssl/misc(/.*)? system_u:object_r:bin_t # # /emul/ia32-linux/usr diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/cups.fc policy-1.23.14/file_contexts/program/cups.fc --- nsapolicy/file_contexts/program/cups.fc 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.14/file_contexts/program/cups.fc 2005-05-02 14:51:59.000000000 -0400 @@ -25,6 +25,7 @@ /usr/sbin/printconf-backend -- system_u:object_r:cupsd_config_exec_t ') /var/log/cups(/.*)? system_u:object_r:cupsd_log_t +/var/log/turboprint_cups\.log.* -- system_u:object_r:cupsd_log_t /var/spool/cups(/.*)? system_u:object_r:print_spool_t /var/run/cups/printcap -- system_u:object_r:cupsd_var_run_t /usr/lib(64)?/cups/filter/.* -- system_u:object_r:bin_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/i18n_input.fc policy-1.23.14/file_contexts/program/i18n_input.fc --- nsapolicy/file_contexts/program/i18n_input.fc 2005-05-02 14:06:56.000000000 -0400 +++ policy-1.23.14/file_contexts/program/i18n_input.fc 2005-05-02 14:51:59.000000000 -0400 @@ -9,3 +9,4 @@ /usr/lib(64)?/im/.*\.so.* -- system_u:object_r:shlib_t /usr/lib(64)?/iiim/.*\.so.* -- system_u:object_r:shlib_t /var/run/iiim(/.*)? system_u:object_r:i18n_input_var_run_t +/var/run/\.iroha_unix(/.*)? system_u:object_r:i18n_input_var_run_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/rhgb.fc policy-1.23.14/file_contexts/program/rhgb.fc --- nsapolicy/file_contexts/program/rhgb.fc 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.14/file_contexts/program/rhgb.fc 2005-05-02 14:51:59.000000000 -0400 @@ -1,2 +1 @@ /usr/bin/rhgb -- system_u:object_r:rhgb_exec_t -/etc/rhgb(/.*)? -d system_u:object_r:mnt_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/types.fc policy-1.23.14/file_contexts/types.fc --- nsapolicy/file_contexts/types.fc 2005-05-02 14:06:56.000000000 -0400 +++ policy-1.23.14/file_contexts/types.fc 2005-05-02 14:51:59.000000000 -0400 @@ -129,6 +129,7 @@ /dev/nvram -c system_u:object_r:memory_device_t /dev/random -c system_u:object_r:random_device_t /dev/urandom -c system_u:object_r:urandom_device_t +/dev/adb.* -c system_u:object_r:tty_device_t /dev/capi.* -c system_u:object_r:tty_device_t /dev/dcbri[0-9]+ -c system_u:object_r:tty_device_t /dev/irlpt[0-9]+ -c system_u:object_r:printer_device_t diff --exclude-from=exclude -N -u -r nsapolicy/macros/core_macros.te policy-1.23.14/macros/core_macros.te --- nsapolicy/macros/core_macros.te 2005-05-02 14:06:57.000000000 -0400 +++ policy-1.23.14/macros/core_macros.te 2005-05-02 14:51:59.000000000 -0400 @@ -341,7 +341,6 @@ # Get the selinuxfs mount point via /proc/self/mounts. allow $1 proc_t:dir search; allow $1 proc_t:lnk_file read; -allow $1 proc_t:file { getattr read }; allow $1 self:dir search; allow $1 self:file { getattr read }; # Access selinuxfs. diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/su_macros.te policy-1.23.14/macros/program/su_macros.te --- nsapolicy/macros/program/su_macros.te 2005-05-02 14:06:57.000000000 -0400 +++ policy-1.23.14/macros/program/su_macros.te 2005-05-02 14:51:59.000000000 -0400 @@ -61,7 +61,7 @@ ') # Use capabilities. -allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; +allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource audit_control }; dontaudit $1_su_t self:capability sys_tty_config; # # Caused by su - init scripts @@ -90,9 +90,10 @@ ifdef(`chkpwd.te', ` domain_auto_trans($1_su_t, chkpwd_exec_t, $2_chkpwd_t) -allow $1_su_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; ') +allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; + ') dnl end su_restricted_domain define(`su_mini_domain', ` diff --exclude-from=exclude -N -u -r nsapolicy/net_contexts policy-1.23.14/net_contexts --- nsapolicy/net_contexts 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/net_contexts 2005-05-02 14:51:59.000000000 -0400 @@ -227,6 +227,8 @@ portcon tcp 3128 system_u:object_r:http_cache_port_t portcon tcp 8080 system_u:object_r:http_cache_port_t portcon udp 3130 system_u:object_r:http_cache_port_t +# 8118 is for privoxy +portcon tcp 8118 system_u:object_r:http_cache_port_t ifdef(`clockspeed.te', `portcon udp 4041 system_u:object_r:clockspeed_port_t') ifdef(`transproxy.te', `portcon tcp 8081 system_u:object_r:transproxy_port_t') diff --exclude-from=exclude -N -u -r nsapolicy/tunables/distro.tun policy-1.23.14/tunables/distro.tun --- nsapolicy/tunables/distro.tun 2005-02-24 14:51:09.000000000 -0500 +++ policy-1.23.14/tunables/distro.tun 2005-05-02 14:51:59.000000000 -0400 @@ -5,7 +5,7 @@ # appropriate ifdefs. -dnl define(`distro_redhat') +define(`distro_redhat') dnl define(`distro_suse') diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.tun policy-1.23.14/tunables/tunable.tun --- nsapolicy/tunables/tunable.tun 2005-04-14 15:01:54.000000000 -0400 +++ policy-1.23.14/tunables/tunable.tun 2005-05-02 14:51:59.000000000 -0400 @@ -2,7 +2,7 @@ dnl define(`user_can_mount') # Allow rpm to run unconfined. -dnl define(`unlimitedRPM') +define(`unlimitedRPM') # Allow privileged utilities like hotplug and insmod to run unconfined. dnl define(`unlimitedUtils') @@ -20,11 +20,11 @@ # Do not audit things that we know to be broken but which # are not security risks -dnl define(`hide_broken_symptoms') +define(`hide_broken_symptoms') # Allow user_r to reach sysadm_r via su, sudo, or userhelper. # Otherwise, only staff_r can do so. -dnl define(`user_canbe_sysadm') +define(`user_canbe_sysadm') # Allow xinetd to run unconfined, including any services it starts # that do not have a domain transition explicitly defined. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/.cvsignore,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- .cvsignore 25 Apr 2005 19:13:38 -0000 1.106 +++ .cvsignore 2 May 2005 19:01:55 -0000 1.107 @@ -71,3 +71,4 @@ policy-1.23.11.tgz policy-1.23.12.tgz policy-1.23.13.tgz +policy-1.23.14.tgz policy-20050425.patch: domains/misc/kernel.te | 4 +- domains/program/fsadm.te | 2 - domains/program/getty.te | 14 ++------- domains/program/hostname.te | 1 domains/program/ifconfig.te | 2 + domains/program/init.te | 4 +- domains/program/initrc.te | 1 domains/program/klogd.te | 3 + domains/program/load_policy.te | 3 - domains/program/modutil.te | 2 - domains/program/mount.te | 1 domains/program/unused/NetworkManager.te | 4 ++ domains/program/unused/amanda.te | 2 + domains/program/unused/amavis.te | 7 ---- domains/program/unused/apache.te | 16 +++------- domains/program/unused/apmd.te | 3 + domains/program/unused/auditd.te | 20 +++++++++---- domains/program/unused/cardmgr.te | 4 +- domains/program/unused/clamav.te | 2 - domains/program/unused/consoletype.te | 14 ++++----- domains/program/unused/cups.te | 3 + domains/program/unused/cyrus.te | 4 -- domains/program/unused/hald.te | 11 +++++-- domains/program/unused/hotplug.te | 10 +----- domains/program/unused/i18n_input.te | 2 + domains/program/unused/kudzu.te | 1 domains/program/unused/lvm.te | 2 - domains/program/unused/ntpd.te | 7 ++-- domains/program/unused/pamconsole.te | 2 - domains/program/unused/portmap.te | 5 +-- domains/program/unused/samba.te | 1 domains/program/unused/snmpd.te | 2 - domains/program/unused/squid.te | 4 -- domains/program/unused/tinydns.te | 2 - domains/program/unused/udev.te | 8 +++-- domains/program/unused/updfstab.te | 6 +++ domains/program/unused/webalizer.te | 2 - domains/program/unused/xserver.te | 1 domains/user.te | 16 +++++++++- file_contexts/distros.fc | 2 + file_contexts/program/apache.fc | 3 + file_contexts/program/compat.fc | 17 +++++++---- file_contexts/program/crack.fc | 1 file_contexts/program/cups.fc | 1 file_contexts/program/getty.fc | 2 + file_contexts/program/i18n_input.fc | 4 ++ file_contexts/program/lvm.fc | 1 file_contexts/program/portmap.fc | 1 file_contexts/program/rhgb.fc | 1 file_contexts/program/traceroute.fc | 1 file_contexts/program/webalizer.fc | 2 + file_contexts/types.fc | 9 +++++ flask/access_vectors | 2 + macros/base_user_macros.te | 10 +++++- macros/core_macros.te | 5 +-- macros/global_macros.te | 22 +++++++++++++- macros/program/cdrecord_macros.te | 2 - macros/program/chkpwd_macros.te | 4 +- macros/program/mozilla_macros.te | 2 - macros/program/su_macros.te | 5 +-- macros/program/xserver_macros.te | 2 + man/man8/httpd_selinux.8 | 6 +++ targeted/appconfig/default_contexts | 1 targeted/domains/program/compat.te | 7 ---- targeted/domains/program/crond.te | 2 - targeted/domains/program/hotplug.te | 17 ----------- targeted/domains/program/sendmail.te | 3 + targeted/domains/program/udev.te | 17 ----------- targeted/domains/program/xdm.te | 1 targeted/domains/unconfined.te | 12 +++++-- targeted/initial_sid_contexts | 47 ------------------------------- tunables/distro.tun | 2 - tunables/tunable.tun | 6 +-- types/network.te | 1 74 files changed, 221 insertions(+), 198 deletions(-) Index: policy-20050425.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/policy-20050425.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- policy-20050425.patch 29 Apr 2005 20:36:59 -0000 1.7 +++ policy-20050425.patch 2 May 2005 19:02:02 -0000 1.8 @@ -461,8 +461,14 @@ allow cyrus_t mail_port_t:tcp_socket name_bind; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hald.te policy-1.23.13/domains/program/unused/hald.te --- nsapolicy/domains/program/unused/hald.te 2005-04-27 10:28:51.000000000 -0400 -+++ policy-1.23.13/domains/program/unused/hald.te 2005-04-29 15:34:38.000000000 -0400 -@@ -15,7 +15,7 @@ ++++ policy-1.23.13/domains/program/unused/hald.te 2005-04-29 16:52:51.000000000 -0400 +@@ -10,12 +10,12 @@ + # + # hald_exec_t is the type of the hald executable. + # +-daemon_domain(hald, `, fs_domain, nscd_client_domain') ++daemon_domain(hald, `, fs_domain, nscd_client_domain, privmem') + can_exec_any(hald_t) allow hald_t { etc_t etc_runtime_t }:file { getattr read }; @@ -618,6 +624,16 @@ -allow sysadm_t ntp_port_t:udp_socket name_bind; +# For clock devices like wwvb1 +allow ntpd_t device_t:lnk_file read; +diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/pamconsole.te policy-1.23.13/domains/program/unused/pamconsole.te +--- nsapolicy/domains/program/unused/pamconsole.te 2005-04-27 10:28:52.000000000 -0400 ++++ policy-1.23.13/domains/program/unused/pamconsole.te 2005-05-02 07:31:17.000000000 -0400 +@@ -45,5 +45,5 @@ + ifdef(`xdm.te', ` + allow pam_console_t xdm_var_run_t:file { getattr read }; + ') +-allow initrc_t pam_var_console_t:dir r_dir_perms; ++allow initrc_t pam_var_console_t:dir rw_dir_perms; + allow pam_console_t file_context_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/portmap.te policy-1.23.13/domains/program/unused/portmap.te --- nsapolicy/domains/program/unused/portmap.te 2005-04-27 10:28:52.000000000 -0400 +++ policy-1.23.13/domains/program/unused/portmap.te 2005-04-25 15:18:00.000000000 -0400 @@ -689,7 +705,7 @@ r_dir_file(tinydns_t, tinydns_conf_t) diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/udev.te policy-1.23.13/domains/program/unused/udev.te --- nsapolicy/domains/program/unused/udev.te 2005-04-27 10:28:53.000000000 -0400 -+++ policy-1.23.13/domains/program/unused/udev.te 2005-04-25 21:41:17.000000000 -0400 ++++ policy-1.23.13/domains/program/unused/udev.te 2005-04-29 16:52:40.000000000 -0400 @@ -33,7 +33,7 @@ allow udev_t self:unix_stream_socket {connectto create_stream_socket_perms}; allow udev_t self:unix_dgram_socket create_socket_perms; @@ -755,6 +771,14 @@ # to use from cron system_crond_entry(webalizer_exec_t,webalizer_t) role system_r types webalizer_t; +diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xserver.te policy-1.23.13/domains/program/unused/xserver.te +--- nsapolicy/domains/program/unused/xserver.te 2005-04-27 10:28:54.000000000 -0400 ++++ policy-1.23.13/domains/program/unused/xserver.te 2005-05-02 07:30:32.000000000 -0400 +@@ -20,3 +20,4 @@ + # Everything else is in the xserver_domain macro in + # macros/program/xserver_macros.te. + ++allow initrc_t xserver_log_t:fifo_file { read write }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/user.te policy-1.23.13/domains/user.te --- nsapolicy/domains/user.te 2005-04-27 10:28:48.000000000 -0400 +++ policy-1.23.13/domains/user.te 2005-04-28 10:47:53.000000000 -0400 @@ -1140,16 +1164,28 @@ uses_shlib($1_mozilla_t) diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/su_macros.te policy-1.23.13/macros/program/su_macros.te --- nsapolicy/macros/program/su_macros.te 2005-04-27 10:28:55.000000000 -0400 -+++ policy-1.23.13/macros/program/su_macros.te 2005-04-29 14:34:15.000000000 -0400 -@@ -90,7 +90,7 @@ ++++ policy-1.23.13/macros/program/su_macros.te 2005-05-02 07:21:27.000000000 -0400 +@@ -61,7 +61,7 @@ + ') + + # Use capabilities. +-allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; ++allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource audit_control }; + dontaudit $1_su_t self:capability sys_tty_config; + # + # Caused by su - init scripts +@@ -90,9 +90,10 @@ ifdef(`chkpwd.te', ` domain_auto_trans($1_su_t, chkpwd_exec_t, $2_chkpwd_t) -allow $1_su_t self:netlink_audit_socket create_netlink_socket_perms; -+allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; ') ++allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; ++ ') dnl end su_restricted_domain + + define(`su_mini_domain', ` diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/xserver_macros.te policy-1.23.13/macros/program/xserver_macros.te --- nsapolicy/macros/program/xserver_macros.te 2005-04-27 10:28:55.000000000 -0400 +++ policy-1.23.13/macros/program/xserver_macros.te 2005-04-28 10:47:53.000000000 -0400 Index: selinux-policy-targeted.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/selinux-policy-targeted.spec,v retrieving revision 1.291 retrieving revision 1.292 diff -u -r1.291 -r1.292 --- selinux-policy-targeted.spec 29 Apr 2005 20:36:59 -0000 1.291 +++ selinux-policy-targeted.spec 2 May 2005 19:02:02 -0000 1.292 @@ -10,15 +10,15 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} -Version: 1.23.13 -Release: 8 +Version: 1.23.14 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz Source1: booleans Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-buildroot -Patch: policy-20050425.patch +Patch: policy-20050502.patch Patch1: policy-%{type}.patch BuildArch: noarch @@ -234,6 +234,27 @@ exit 0 %changelog +* Mon May 2 2005 Dan Walsh 1.23.14-1 +- Update to latest from NSA + * Added afs policy from Andrew Reisse. + * Merged patch from Lorenzo Hern??ndez Garc??a-Hierro which defines + execstack and execheap permissions. The patch excludes these + permissions from general_domain_access and updates the macros for + X, legacy binaries, users, and unconfined domains. + * Added nlmsg_relay permisison where netlink_audit_socket class is + used. Added nlmsg_readpriv permission to auditd_t and auditctl_t. + * Merged some minor cleanups from Russell Coker and David Hampton. + * Merged patch from Dan Walsh. Many changes made to allow + targeted policy to run closer to strict and now almost all of + non-userspace is protected via SELinux. Kernel is now in + unconfined_domain for targeted and runs as root:system_r:kernel_t. + Added transitionbool to daemon_sub_domain, mainly to turn off + httpd_suexec transitioning. Implemented web_client_domain + name_connect rules. Added yp support for cups. Now the real + hotplug, udev, initial_sid_contexts are used for the targeted + policy. Other minor cleanups and fixes. Auditd fixes by Paul + Moore. + * Fri Apr 29 2005 Dan Walsh 1.23.13-8 - Fixes for consoletype, kudzu reading proc_t - Add label /dev/adb Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/sources,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- sources 25 Apr 2005 19:13:38 -0000 1.112 +++ sources 2 May 2005 19:02:02 -0000 1.113 @@ -1 +1,2 @@ fa4f9d32909773c63c05099a59e1b4a9 policy-1.23.13.tgz +8099052796e16fb5a9a3fdafe3debefd policy-1.23.14.tgz From fedora-cvs-commits at redhat.com Mon May 2 19:02:34 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 15:02:34 -0400 Subject: rpms/selinux-policy-strict/devel policy-20050502.patch, NONE, 1.1 .cvsignore, 1.110, 1.111 policy-20050425.patch, 1.8, 1.9 selinux-policy-strict.spec, 1.296, 1.297 sources, 1.116, 1.117 Message-ID: <200505021902.j42J2YQ5021567@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-strict/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21552 Modified Files: .cvsignore policy-20050425.patch selinux-policy-strict.spec sources Added Files: policy-20050502.patch Log Message: * Mon May 2 2005 Dan Walsh 1.23.14-1 - Update to latest from NSA * Added afs policy from Andrew Reisse. * Merged patch from Lorenzo Hern??ndez Garc??a-Hierro which defines execstack and execheap permissions. The patch excludes these permissions from general_domain_access and updates the macros for X, legacy binaries, users, and unconfined domains. * Added nlmsg_relay permisison where netlink_audit_socket class is used. Added nlmsg_readpriv permission to auditd_t and auditctl_t. * Merged some minor cleanups from Russell Coker and David Hampton. * Merged patch from Dan Walsh. Many changes made to allow targeted policy to run closer to strict and now almost all of non-userspace is protected via SELinux. Kernel is now in unconfined_domain for targeted and runs as root:system_r:kernel_t. Added transitionbool to daemon_sub_domain, mainly to turn off httpd_suexec transitioning. Implemented web_client_domain name_connect rules. Added yp support for cups. Now the real hotplug, udev, initial_sid_contexts are used for the targeted policy. Other minor cleanups and fixes. Auditd fixes by Paul Moore. policy-20050502.patch: domains/misc/kernel.te | 2 ++ domains/program/ifconfig.te | 2 ++ domains/program/modutil.te | 2 +- domains/program/unused/apmd.te | 2 +- domains/program/unused/auditd.te | 1 + domains/program/unused/automount.te | 9 +++++++-- domains/program/unused/consoletype.te | 1 + domains/program/unused/cups.te | 4 +++- domains/program/unused/hald.te | 7 ++++--- domains/program/unused/hotplug.te | 2 +- domains/program/unused/i18n_input.te | 2 ++ domains/program/unused/kudzu.te | 1 + domains/program/unused/lvm.te | 2 +- domains/program/unused/pamconsole.te | 2 +- domains/program/unused/udev.te | 4 ++-- domains/program/unused/updfstab.te | 6 ++++++ domains/program/unused/xdm.te | 1 + domains/program/unused/xserver.te | 1 + file_contexts/distros.fc | 3 ++- file_contexts/program/cups.fc | 1 + file_contexts/program/i18n_input.fc | 1 + file_contexts/program/rhgb.fc | 1 - file_contexts/types.fc | 1 + macros/core_macros.te | 1 - macros/program/su_macros.te | 5 +++-- net_contexts | 2 ++ tunables/distro.tun | 2 +- tunables/tunable.tun | 6 +++--- 28 files changed, 52 insertions(+), 22 deletions(-) --- NEW FILE policy-20050502.patch --- diff --exclude-from=exclude -N -u -r nsapolicy/domains/misc/kernel.te policy-1.23.14/domains/misc/kernel.te --- nsapolicy/domains/misc/kernel.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/misc/kernel.te 2005-05-02 14:51:59.000000000 -0400 @@ -36,6 +36,7 @@ # Send signal to any process. allow kernel_t domain:process signal; +allow kernel_t domain:dir search; # Access the console. allow kernel_t device_t:dir search; @@ -50,6 +51,7 @@ allow kernel_t self:capability sys_chroot; allow kernel_t { unlabeled_t root_t file_t }:dir mounton; +allow kernel_t unlabeled_t:fifo_file rw_file_perms; allow kernel_t file_t:dir rw_dir_perms; allow kernel_t file_t:blk_file create_file_perms; allow kernel_t { sysctl_t sysctl_kernel_t }:file { setattr rw_file_perms }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/ifconfig.te policy-1.23.14/domains/program/ifconfig.te --- nsapolicy/domains/program/ifconfig.te 2005-04-27 10:28:49.000000000 -0400 +++ policy-1.23.14/domains/program/ifconfig.te 2005-05-02 14:51:59.000000000 -0400 @@ -21,7 +21,9 @@ general_domain_access(ifconfig_t) domain_auto_trans(initrc_t, ifconfig_exec_t, ifconfig_t) +ifdef(`targeted_policy', `', ` domain_auto_trans(sysadm_t, ifconfig_exec_t, ifconfig_t) +') # for /sbin/ip allow ifconfig_t self:netlink_route_socket rw_netlink_socket_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/modutil.te policy-1.23.14/domains/program/modutil.te --- nsapolicy/domains/program/modutil.te 2005-04-27 10:28:49.000000000 -0400 +++ policy-1.23.14/domains/program/modutil.te 2005-05-02 14:51:59.000000000 -0400 @@ -143,7 +143,7 @@ allow insmod_t proc_t:dir search; allow insmod_t sysctl_kernel_t:file { setattr rw_file_perms }; -allow insmod_t proc_t:file { getattr read }; +allow insmod_t proc_t:file rw_file_perms; allow insmod_t proc_t:lnk_file read; # Write to /proc/mtrr. diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apmd.te policy-1.23.14/domains/program/unused/apmd.te --- nsapolicy/domains/program/unused/apmd.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/apmd.te 2005-05-02 14:51:59.000000000 -0400 @@ -31,7 +31,7 @@ allow apmd_t device_t:lnk_file read; allow apmd_t proc_t:file { getattr read }; -read_sysctl(apmd_t) +can_sysctl(apmd_t) allow apmd_t self:unix_dgram_socket create_socket_perms; allow apmd_t self:unix_stream_socket create_stream_socket_perms; allow apmd_t self:fifo_file rw_file_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/auditd.te policy-1.23.14/domains/program/unused/auditd.te --- nsapolicy/domains/program/unused/auditd.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/auditd.te 2005-05-02 14:51:59.000000000 -0400 @@ -56,3 +56,4 @@ allow auditctl_t sysctl_kernel_t:file read; allow auditd_t self:process setsched; dontaudit auditctl_t init_t:fd use; +allow auditctl_t initrc_devpts_t:chr_file { read write }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/automount.te policy-1.23.14/domains/program/unused/automount.te --- nsapolicy/domains/program/unused/automount.te 2005-04-27 10:28:49.000000000 -0400 +++ policy-1.23.14/domains/program/unused/automount.te 2005-05-02 14:53:00.000000000 -0400 @@ -26,7 +26,7 @@ allow automount_t { etc_t etc_runtime_t }:file { getattr read }; allow automount_t proc_t:file { getattr read }; allow automount_t self:process { setpgid setsched }; -allow automount_t self:capability sys_nice; +allow automount_t self:capability { sys_nice dac_override }; allow automount_t self:unix_stream_socket create_socket_perms; allow automount_t self:unix_dgram_socket create_socket_perms; @@ -66,4 +66,9 @@ allow automount_t home_root_t:dir getattr; allow automount_t mnt_t:dir { getattr search }; -allow initrc_t automount_etc_t:file { getattr read }; +can_exec(initrc_t, automount_etc_t) + +# Need something like the following +# file_type_auto_trans(automount_t, file_type, automount_tmp_t, dir) + + diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/consoletype.te policy-1.23.14/domains/program/unused/consoletype.te --- nsapolicy/domains/program/unused/consoletype.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/consoletype.te 2005-05-02 14:51:59.000000000 -0400 @@ -57,6 +57,7 @@ ifdef(`firstboot.te', ` allow consoletype_t firstboot_t:fifo_file write; ') +dontaudit consoletype_t proc_t:dir search; dontaudit consoletype_t proc_t:file read; dontaudit consoletype_t root_t:file read; allow consoletype_t crond_t:fifo_file { read getattr ioctl }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/cups.te policy-1.23.14/domains/program/unused/cups.te --- nsapolicy/domains/program/unused/cups.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/cups.te 2005-05-02 14:51:59.000000000 -0400 @@ -22,6 +22,7 @@ logdir_domain(cupsd) tmp_domain(cupsd) +file_type_auto_trans(cupsd_t, tmp_t, cupsd_tmp_t, fifo_file) allow cupsd_t devpts_t:dir search; @@ -246,8 +247,9 @@ allow cupsd_config_t logrotate_t:fd use; ')dnl end if logrotate.te allow cupsd_config_t system_crond_t:fd use; -allow cupsd_config_t crond_t:fifo_file read; +allow cupsd_config_t crond_t:fifo_file r_file_perms; allow cupsd_t crond_t:fifo_file read; +allow cupsd_t crond_t:fd use; # Alternatives asks for this allow cupsd_config_t initrc_exec_t:file getattr; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hald.te policy-1.23.14/domains/program/unused/hald.te --- nsapolicy/domains/program/unused/hald.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/hald.te 2005-05-02 14:51:59.000000000 -0400 @@ -10,12 +10,12 @@ # # hald_exec_t is the type of the hald executable. # -daemon_domain(hald, `, fs_domain, nscd_client_domain') +daemon_domain(hald, `, fs_domain, nscd_client_domain, privmem') can_exec_any(hald_t) allow hald_t { etc_t etc_runtime_t }:file { getattr read }; -allow hald_t self:unix_stream_socket create_stream_socket_perms; +allow hald_t self:unix_stream_socket { connectto create_stream_socket_perms }; allow hald_t self:unix_dgram_socket create_socket_perms; ifdef(`dbusd.te', ` @@ -36,7 +36,7 @@ allow hald_t self:netlink_kobject_uevent_socket create_socket_perms; allow hald_t self:netlink_route_socket r_netlink_socket_perms; -allow hald_t self:capability { net_admin sys_admin dac_override dac_read_search mknod }; +allow hald_t self:capability { net_admin sys_admin dac_override dac_read_search mknod sys_rawio }; can_network_server(hald_t) can_ypbind(hald_t) @@ -47,6 +47,7 @@ allow hald_t printer_device_t:chr_file rw_file_perms; allow hald_t urandom_device_t:chr_file read; allow hald_t mouse_device_t:chr_file r_file_perms; +allow hald_t memory_device_t:chr_file r_file_perms; can_getsecurity(hald_t) diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hotplug.te policy-1.23.14/domains/program/unused/hotplug.te --- nsapolicy/domains/program/unused/hotplug.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/hotplug.te 2005-05-02 14:51:59.000000000 -0400 @@ -156,4 +156,4 @@ domain_auto_trans(hotplug_t, sendmail_exec_t, system_mail_t) ') -allow kernel_t hotplug_etc_t:dir search; +allow { insmod_t kernel_t } hotplug_etc_t:dir { search getattr }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/i18n_input.te policy-1.23.14/domains/program/unused/i18n_input.te --- nsapolicy/domains/program/unused/i18n_input.te 2005-04-27 10:28:51.000000000 -0400 +++ policy-1.23.14/domains/program/unused/i18n_input.te 2005-05-02 14:51:59.000000000 -0400 @@ -14,6 +14,7 @@ can_ypbind(i18n_input_t) can_tcp_connect(userdomain, i18n_input_t) +can_unix_connect(i18n_input_t, initrc_t) allow i18n_input_t self:fifo_file rw_file_perms; allow i18n_input_t i18n_input_port_t:tcp_socket name_bind; @@ -28,3 +29,4 @@ allow i18n_input_t self:unix_stream_socket create_stream_socket_perms; allow i18n_input_t i18n_input_var_run_t:dir create_dir_perms; allow i18n_input_t i18n_input_var_run_t:sock_file create_file_perms; +allow i18n_input_t usr_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/kudzu.te policy-1.23.14/domains/program/unused/kudzu.te --- nsapolicy/domains/program/unused/kudzu.te 2005-04-27 10:28:51.000000000 -0400 +++ policy-1.23.14/domains/program/unused/kudzu.te 2005-05-02 14:51:59.000000000 -0400 @@ -26,6 +26,7 @@ allow kudzu_t mouse_device_t:chr_file { read write }; allow kudzu_t proc_net_t:dir r_dir_perms; allow kudzu_t { proc_net_t proc_t }:file { getattr read }; +allow kudzu_t proc_t:lnk_file getattr; allow kudzu_t { fixed_disk_device_t removable_device_t }:blk_file rw_file_perms; allow kudzu_t scsi_generic_device_t:chr_file r_file_perms; allow kudzu_t { bin_t sbin_t }:dir { getattr search }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/lvm.te policy-1.23.14/domains/program/unused/lvm.te --- nsapolicy/domains/program/unused/lvm.te 2005-04-27 10:28:51.000000000 -0400 +++ policy-1.23.14/domains/program/unused/lvm.te 2005-05-02 14:51:59.000000000 -0400 @@ -112,7 +112,7 @@ allow lvm_t lvm_control_t:chr_file rw_file_perms; allow initrc_t lvm_control_t:chr_file { getattr read unlink }; allow initrc_t device_t:chr_file create; -dontaudit lvm_t var_run_t:dir getattr; +var_run_domain(lvm) # for when /usr is not mounted dontaudit lvm_t file_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/pamconsole.te policy-1.23.14/domains/program/unused/pamconsole.te --- nsapolicy/domains/program/unused/pamconsole.te 2005-04-27 10:28:52.000000000 -0400 +++ policy-1.23.14/domains/program/unused/pamconsole.te 2005-05-02 14:51:59.000000000 -0400 @@ -45,5 +45,5 @@ ifdef(`xdm.te', ` allow pam_console_t xdm_var_run_t:file { getattr read }; ') -allow initrc_t pam_var_console_t:dir r_dir_perms; +allow initrc_t pam_var_console_t:dir rw_dir_perms; allow pam_console_t file_context_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/udev.te policy-1.23.14/domains/program/unused/udev.te --- nsapolicy/domains/program/unused/udev.te 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/udev.te 2005-05-02 14:51:59.000000000 -0400 @@ -38,8 +38,8 @@ allow udev_t device_t:lnk_file create_lnk_perms; allow udev_t { device_t device_type }:{ chr_file blk_file } { relabelfrom relabelto create_file_perms }; ifdef(`distro_redhat', ` -allow udev_t tmpfs_t:dir rw_dir_perms; -allow udev_t tmpfs_t:sock_file create_file_perms; +allow udev_t tmpfs_t:dir create_dir_perms; +allow udev_t tmpfs_t:{ sock_file file } create_file_perms; allow udev_t tmpfs_t:lnk_file create_lnk_perms; allow udev_t tmpfs_t:{ chr_file blk_file } { relabelfrom relabelto create_file_perms }; allow udev_t tmpfs_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/updfstab.te policy-1.23.14/domains/program/unused/updfstab.te --- nsapolicy/domains/program/unused/updfstab.te 2005-04-27 10:28:53.000000000 -0400 +++ policy-1.23.14/domains/program/unused/updfstab.te 2005-05-02 14:51:59.000000000 -0400 @@ -31,6 +31,8 @@ ifdef(`dbusd.te', ` dbusd_client(system, updfstab) allow updfstab_t system_dbusd_t:dbus { send_msg }; +allow initrc_t updfstab_t:dbus send_msg; +allow updfstab_t initrc_t:dbus send_msg; ') # not sure what the sysctl_kernel_t file is, or why it wants to write it, so @@ -73,3 +75,7 @@ dontaudit updfstab_t { home_dir_type home_type }:dir search; allow updfstab_t fs_t:filesystem { getattr }; allow updfstab_t tmpfs_t:dir getattr; +ifdef(`hald.te', ` +can_unix_connect(updfstab_t, hald_t) +') + diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xdm.te policy-1.23.14/domains/program/unused/xdm.te --- nsapolicy/domains/program/unused/xdm.te 2005-04-27 10:28:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/xdm.te 2005-05-02 14:51:59.000000000 -0400 @@ -344,3 +344,4 @@ # Run telinit->init to shutdown. can_exec(xdm_t, init_exec_t) +allow xdm_t self:sem create_sem_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xserver.te policy-1.23.14/domains/program/unused/xserver.te --- nsapolicy/domains/program/unused/xserver.te 2005-04-27 10:28:54.000000000 -0400 +++ policy-1.23.14/domains/program/unused/xserver.te 2005-05-02 14:51:59.000000000 -0400 @@ -20,3 +20,4 @@ # Everything else is in the xserver_domain macro in # macros/program/xserver_macros.te. +allow initrc_t xserver_log_t:fifo_file { read write }; diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/distros.fc policy-1.23.14/file_contexts/distros.fc --- nsapolicy/file_contexts/distros.fc 2005-05-02 14:06:56.000000000 -0400 +++ policy-1.23.14/file_contexts/distros.fc 2005-05-02 14:51:59.000000000 -0400 @@ -37,7 +37,8 @@ /usr/share/texmf/web2c/mktexupd -- system_u:object_r:bin_t /usr/share/ssl/certs(/.*)? system_u:object_r:cert_t /usr/share/ssl/private(/.*)? system_u:object_r:cert_t -/etc/pki(/.*)? system_u:object_r:cert_t +/etc/pki(/.*)? system_u:object_r:cert_t +/etc/rhgb(/.*)? -d system_u:object_r:mnt_t /usr/share/ssl/misc(/.*)? system_u:object_r:bin_t # # /emul/ia32-linux/usr diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/cups.fc policy-1.23.14/file_contexts/program/cups.fc --- nsapolicy/file_contexts/program/cups.fc 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.14/file_contexts/program/cups.fc 2005-05-02 14:51:59.000000000 -0400 @@ -25,6 +25,7 @@ /usr/sbin/printconf-backend -- system_u:object_r:cupsd_config_exec_t ') /var/log/cups(/.*)? system_u:object_r:cupsd_log_t +/var/log/turboprint_cups\.log.* -- system_u:object_r:cupsd_log_t /var/spool/cups(/.*)? system_u:object_r:print_spool_t /var/run/cups/printcap -- system_u:object_r:cupsd_var_run_t /usr/lib(64)?/cups/filter/.* -- system_u:object_r:bin_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/i18n_input.fc policy-1.23.14/file_contexts/program/i18n_input.fc --- nsapolicy/file_contexts/program/i18n_input.fc 2005-05-02 14:06:56.000000000 -0400 +++ policy-1.23.14/file_contexts/program/i18n_input.fc 2005-05-02 14:51:59.000000000 -0400 @@ -9,3 +9,4 @@ /usr/lib(64)?/im/.*\.so.* -- system_u:object_r:shlib_t /usr/lib(64)?/iiim/.*\.so.* -- system_u:object_r:shlib_t /var/run/iiim(/.*)? system_u:object_r:i18n_input_var_run_t +/var/run/\.iroha_unix(/.*)? system_u:object_r:i18n_input_var_run_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/rhgb.fc policy-1.23.14/file_contexts/program/rhgb.fc --- nsapolicy/file_contexts/program/rhgb.fc 2005-02-24 14:51:08.000000000 -0500 +++ policy-1.23.14/file_contexts/program/rhgb.fc 2005-05-02 14:51:59.000000000 -0400 @@ -1,2 +1 @@ /usr/bin/rhgb -- system_u:object_r:rhgb_exec_t -/etc/rhgb(/.*)? -d system_u:object_r:mnt_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/types.fc policy-1.23.14/file_contexts/types.fc --- nsapolicy/file_contexts/types.fc 2005-05-02 14:06:56.000000000 -0400 +++ policy-1.23.14/file_contexts/types.fc 2005-05-02 14:51:59.000000000 -0400 @@ -129,6 +129,7 @@ /dev/nvram -c system_u:object_r:memory_device_t /dev/random -c system_u:object_r:random_device_t /dev/urandom -c system_u:object_r:urandom_device_t +/dev/adb.* -c system_u:object_r:tty_device_t /dev/capi.* -c system_u:object_r:tty_device_t /dev/dcbri[0-9]+ -c system_u:object_r:tty_device_t /dev/irlpt[0-9]+ -c system_u:object_r:printer_device_t diff --exclude-from=exclude -N -u -r nsapolicy/macros/core_macros.te policy-1.23.14/macros/core_macros.te --- nsapolicy/macros/core_macros.te 2005-05-02 14:06:57.000000000 -0400 +++ policy-1.23.14/macros/core_macros.te 2005-05-02 14:51:59.000000000 -0400 @@ -341,7 +341,6 @@ # Get the selinuxfs mount point via /proc/self/mounts. allow $1 proc_t:dir search; allow $1 proc_t:lnk_file read; -allow $1 proc_t:file { getattr read }; allow $1 self:dir search; allow $1 self:file { getattr read }; # Access selinuxfs. diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/su_macros.te policy-1.23.14/macros/program/su_macros.te --- nsapolicy/macros/program/su_macros.te 2005-05-02 14:06:57.000000000 -0400 +++ policy-1.23.14/macros/program/su_macros.te 2005-05-02 14:51:59.000000000 -0400 @@ -61,7 +61,7 @@ ') # Use capabilities. -allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; +allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource audit_control }; dontaudit $1_su_t self:capability sys_tty_config; # # Caused by su - init scripts @@ -90,9 +90,10 @@ ifdef(`chkpwd.te', ` domain_auto_trans($1_su_t, chkpwd_exec_t, $2_chkpwd_t) -allow $1_su_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; ') +allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; + ') dnl end su_restricted_domain define(`su_mini_domain', ` diff --exclude-from=exclude -N -u -r nsapolicy/net_contexts policy-1.23.14/net_contexts --- nsapolicy/net_contexts 2005-05-02 14:06:54.000000000 -0400 +++ policy-1.23.14/net_contexts 2005-05-02 14:51:59.000000000 -0400 @@ -227,6 +227,8 @@ portcon tcp 3128 system_u:object_r:http_cache_port_t portcon tcp 8080 system_u:object_r:http_cache_port_t portcon udp 3130 system_u:object_r:http_cache_port_t +# 8118 is for privoxy +portcon tcp 8118 system_u:object_r:http_cache_port_t ifdef(`clockspeed.te', `portcon udp 4041 system_u:object_r:clockspeed_port_t') ifdef(`transproxy.te', `portcon tcp 8081 system_u:object_r:transproxy_port_t') diff --exclude-from=exclude -N -u -r nsapolicy/tunables/distro.tun policy-1.23.14/tunables/distro.tun --- nsapolicy/tunables/distro.tun 2005-02-24 14:51:09.000000000 -0500 +++ policy-1.23.14/tunables/distro.tun 2005-05-02 14:51:59.000000000 -0400 @@ -5,7 +5,7 @@ # appropriate ifdefs. -dnl define(`distro_redhat') +define(`distro_redhat') dnl define(`distro_suse') diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.tun policy-1.23.14/tunables/tunable.tun --- nsapolicy/tunables/tunable.tun 2005-04-14 15:01:54.000000000 -0400 +++ policy-1.23.14/tunables/tunable.tun 2005-05-02 14:51:59.000000000 -0400 @@ -2,7 +2,7 @@ dnl define(`user_can_mount') # Allow rpm to run unconfined. -dnl define(`unlimitedRPM') +define(`unlimitedRPM') # Allow privileged utilities like hotplug and insmod to run unconfined. dnl define(`unlimitedUtils') @@ -20,11 +20,11 @@ # Do not audit things that we know to be broken but which # are not security risks -dnl define(`hide_broken_symptoms') +define(`hide_broken_symptoms') # Allow user_r to reach sysadm_r via su, sudo, or userhelper. # Otherwise, only staff_r can do so. -dnl define(`user_canbe_sysadm') +define(`user_canbe_sysadm') # Allow xinetd to run unconfined, including any services it starts # that do not have a domain transition explicitly defined. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/.cvsignore,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- .cvsignore 25 Apr 2005 19:12:42 -0000 1.110 +++ .cvsignore 2 May 2005 19:02:31 -0000 1.111 @@ -76,3 +76,4 @@ policy-1.23.11.tgz policy-1.23.12.tgz policy-1.23.13.tgz +policy-1.23.14.tgz policy-20050425.patch: domains/misc/kernel.te | 4 +- domains/program/fsadm.te | 2 - domains/program/getty.te | 14 ++------- domains/program/hostname.te | 1 domains/program/ifconfig.te | 2 + domains/program/init.te | 4 +- domains/program/initrc.te | 1 domains/program/klogd.te | 3 + domains/program/load_policy.te | 3 - domains/program/modutil.te | 2 - domains/program/mount.te | 1 domains/program/unused/NetworkManager.te | 4 ++ domains/program/unused/amanda.te | 2 + domains/program/unused/amavis.te | 7 ---- domains/program/unused/apache.te | 16 +++------- domains/program/unused/apmd.te | 3 + domains/program/unused/auditd.te | 20 +++++++++---- domains/program/unused/cardmgr.te | 4 +- domains/program/unused/clamav.te | 2 - domains/program/unused/consoletype.te | 14 ++++----- domains/program/unused/cups.te | 3 + domains/program/unused/cyrus.te | 4 -- domains/program/unused/hald.te | 11 +++++-- domains/program/unused/hotplug.te | 10 +----- domains/program/unused/i18n_input.te | 2 + domains/program/unused/kudzu.te | 1 domains/program/unused/lvm.te | 2 - domains/program/unused/ntpd.te | 7 ++-- domains/program/unused/pamconsole.te | 2 - domains/program/unused/portmap.te | 5 +-- domains/program/unused/samba.te | 1 domains/program/unused/snmpd.te | 2 - domains/program/unused/squid.te | 4 -- domains/program/unused/tinydns.te | 2 - domains/program/unused/udev.te | 8 +++-- domains/program/unused/updfstab.te | 6 +++ domains/program/unused/webalizer.te | 2 - domains/program/unused/xserver.te | 1 domains/user.te | 16 +++++++++- file_contexts/distros.fc | 2 + file_contexts/program/apache.fc | 3 + file_contexts/program/compat.fc | 17 +++++++---- file_contexts/program/crack.fc | 1 file_contexts/program/cups.fc | 1 file_contexts/program/getty.fc | 2 + file_contexts/program/i18n_input.fc | 4 ++ file_contexts/program/lvm.fc | 1 file_contexts/program/portmap.fc | 1 file_contexts/program/rhgb.fc | 1 file_contexts/program/traceroute.fc | 1 file_contexts/program/webalizer.fc | 2 + file_contexts/types.fc | 9 +++++ flask/access_vectors | 2 + macros/base_user_macros.te | 10 +++++- macros/core_macros.te | 5 +-- macros/global_macros.te | 22 +++++++++++++- macros/program/cdrecord_macros.te | 2 - macros/program/chkpwd_macros.te | 4 +- macros/program/mozilla_macros.te | 2 - macros/program/su_macros.te | 5 +-- macros/program/xserver_macros.te | 2 + man/man8/httpd_selinux.8 | 6 +++ targeted/appconfig/default_contexts | 1 targeted/domains/program/compat.te | 7 ---- targeted/domains/program/crond.te | 2 - targeted/domains/program/hotplug.te | 17 ----------- targeted/domains/program/sendmail.te | 3 + targeted/domains/program/udev.te | 17 ----------- targeted/domains/program/xdm.te | 1 targeted/domains/unconfined.te | 12 +++++-- targeted/initial_sid_contexts | 47 ------------------------------- tunables/distro.tun | 2 - tunables/tunable.tun | 6 +-- types/network.te | 1 74 files changed, 221 insertions(+), 198 deletions(-) Index: policy-20050425.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/policy-20050425.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- policy-20050425.patch 29 Apr 2005 20:36:52 -0000 1.8 +++ policy-20050425.patch 2 May 2005 19:02:31 -0000 1.9 @@ -461,8 +461,14 @@ allow cyrus_t mail_port_t:tcp_socket name_bind; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hald.te policy-1.23.13/domains/program/unused/hald.te --- nsapolicy/domains/program/unused/hald.te 2005-04-27 10:28:51.000000000 -0400 -+++ policy-1.23.13/domains/program/unused/hald.te 2005-04-29 15:34:38.000000000 -0400 -@@ -15,7 +15,7 @@ ++++ policy-1.23.13/domains/program/unused/hald.te 2005-04-29 16:52:51.000000000 -0400 +@@ -10,12 +10,12 @@ + # + # hald_exec_t is the type of the hald executable. + # +-daemon_domain(hald, `, fs_domain, nscd_client_domain') ++daemon_domain(hald, `, fs_domain, nscd_client_domain, privmem') + can_exec_any(hald_t) allow hald_t { etc_t etc_runtime_t }:file { getattr read }; @@ -618,6 +624,16 @@ -allow sysadm_t ntp_port_t:udp_socket name_bind; +# For clock devices like wwvb1 +allow ntpd_t device_t:lnk_file read; +diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/pamconsole.te policy-1.23.13/domains/program/unused/pamconsole.te +--- nsapolicy/domains/program/unused/pamconsole.te 2005-04-27 10:28:52.000000000 -0400 ++++ policy-1.23.13/domains/program/unused/pamconsole.te 2005-05-02 07:31:17.000000000 -0400 +@@ -45,5 +45,5 @@ + ifdef(`xdm.te', ` + allow pam_console_t xdm_var_run_t:file { getattr read }; + ') +-allow initrc_t pam_var_console_t:dir r_dir_perms; ++allow initrc_t pam_var_console_t:dir rw_dir_perms; + allow pam_console_t file_context_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/portmap.te policy-1.23.13/domains/program/unused/portmap.te --- nsapolicy/domains/program/unused/portmap.te 2005-04-27 10:28:52.000000000 -0400 +++ policy-1.23.13/domains/program/unused/portmap.te 2005-04-25 15:18:00.000000000 -0400 @@ -689,7 +705,7 @@ r_dir_file(tinydns_t, tinydns_conf_t) diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/udev.te policy-1.23.13/domains/program/unused/udev.te --- nsapolicy/domains/program/unused/udev.te 2005-04-27 10:28:53.000000000 -0400 -+++ policy-1.23.13/domains/program/unused/udev.te 2005-04-25 21:41:17.000000000 -0400 ++++ policy-1.23.13/domains/program/unused/udev.te 2005-04-29 16:52:40.000000000 -0400 @@ -33,7 +33,7 @@ allow udev_t self:unix_stream_socket {connectto create_stream_socket_perms}; allow udev_t self:unix_dgram_socket create_socket_perms; @@ -755,6 +771,14 @@ # to use from cron system_crond_entry(webalizer_exec_t,webalizer_t) role system_r types webalizer_t; +diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xserver.te policy-1.23.13/domains/program/unused/xserver.te +--- nsapolicy/domains/program/unused/xserver.te 2005-04-27 10:28:54.000000000 -0400 ++++ policy-1.23.13/domains/program/unused/xserver.te 2005-05-02 07:30:32.000000000 -0400 +@@ -20,3 +20,4 @@ + # Everything else is in the xserver_domain macro in + # macros/program/xserver_macros.te. + ++allow initrc_t xserver_log_t:fifo_file { read write }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/user.te policy-1.23.13/domains/user.te --- nsapolicy/domains/user.te 2005-04-27 10:28:48.000000000 -0400 +++ policy-1.23.13/domains/user.te 2005-04-28 10:47:53.000000000 -0400 @@ -1140,16 +1164,28 @@ uses_shlib($1_mozilla_t) diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/su_macros.te policy-1.23.13/macros/program/su_macros.te --- nsapolicy/macros/program/su_macros.te 2005-04-27 10:28:55.000000000 -0400 -+++ policy-1.23.13/macros/program/su_macros.te 2005-04-29 14:34:15.000000000 -0400 -@@ -90,7 +90,7 @@ ++++ policy-1.23.13/macros/program/su_macros.te 2005-05-02 07:21:27.000000000 -0400 +@@ -61,7 +61,7 @@ + ') + + # Use capabilities. +-allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource }; ++allow $1_su_t self:capability { setuid setgid net_bind_service chown dac_override fowner sys_nice sys_resource audit_control }; + dontaudit $1_su_t self:capability sys_tty_config; + # + # Caused by su - init scripts +@@ -90,9 +90,10 @@ ifdef(`chkpwd.te', ` domain_auto_trans($1_su_t, chkpwd_exec_t, $2_chkpwd_t) -allow $1_su_t self:netlink_audit_socket create_netlink_socket_perms; -+allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; ') ++allow $1_su_t self:netlink_audit_socket { nlmsg_relay create_netlink_socket_perms }; ++ ') dnl end su_restricted_domain + + define(`su_mini_domain', ` diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/xserver_macros.te policy-1.23.13/macros/program/xserver_macros.te --- nsapolicy/macros/program/xserver_macros.te 2005-04-27 10:28:55.000000000 -0400 +++ policy-1.23.13/macros/program/xserver_macros.te 2005-04-28 10:47:53.000000000 -0400 Index: selinux-policy-strict.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/selinux-policy-strict.spec,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- selinux-policy-strict.spec 29 Apr 2005 20:36:52 -0000 1.296 +++ selinux-policy-strict.spec 2 May 2005 19:02:31 -0000 1.297 @@ -10,15 +10,15 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} -Version: 1.23.13 -Release: 8 +Version: 1.23.14 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz Source1: booleans Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-buildroot -patch: policy-20050425.patch +Patch: policy-20050502.patch BuildArch: noarch BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER} @@ -48,7 +48,7 @@ %build mv domains/misc/unused/* domains/misc mv domains/program/unused/* domains/program/ -(cd domains/program/; mv -f amavis.te asterisk.te audio-entropyd.te authbind.te backup.te calamaris.te ciped.te clamav.te clockspeed.te courier.te daemontools.te distcc.te djbdns.te dante.te dcc.te ddclient.te devfsd.te dnsmasq.te dpk* gatekeeper* gift.te imazesrv.te ircd.te jabberd.te lcd.te lrrd.te monopd.te nagios.te nessusd.te nrpe.te nsd.te nx_server.te oav-update.te openca-ca.te openvpn.te perdition.te portslave.te postgrey.te publicfile.te pyzor.te pxe.te qmail* razor.te resmgrd.te rssh.te scannerdaemon.te seuser* sound-server.te speedmgmt.te snort.te sxid.te tiny* transproxy.te ucspi-tcp.te uml_net* uptimed.te uwimapd.te watchdog.te xprint* unused/) +(cd domains/program/; mv -f afs.te amavis.te asterisk.te audio-entropyd.te authbind.te backup.te calamaris.te ciped.te clamav.te clockspeed.te courier.te daemontools.te distcc.te djbdns.te dante.te dcc.te ddclient.te devfsd.te dnsmasq.te dpk* gatekeeper* gift.te imazesrv.te ircd.te jabberd.te lcd.te lrrd.te monopd.te nagios.te nessusd.te nrpe.te nsd.te nx_server.te oav-update.te openca-ca.te openvpn.te perdition.te portslave.te postgrey.te publicfile.te pyzor.te pxe.te qmail* razor.te resmgrd.te rssh.te scannerdaemon.te seuser* sound-server.te speedmgmt.te snort.te sxid.te tiny* transproxy.te ucspi-tcp.te uml_net* uptimed.te uwimapd.te watchdog.te xprint* unused/) make policy rm -rf tmp @@ -220,6 +220,27 @@ exit 0 %changelog +* Mon May 2 2005 Dan Walsh 1.23.14-1 +- Update to latest from NSA + * Added afs policy from Andrew Reisse. + * Merged patch from Lorenzo Hern??ndez Garc??a-Hierro which defines + execstack and execheap permissions. The patch excludes these + permissions from general_domain_access and updates the macros for + X, legacy binaries, users, and unconfined domains. + * Added nlmsg_relay permisison where netlink_audit_socket class is + used. Added nlmsg_readpriv permission to auditd_t and auditctl_t. + * Merged some minor cleanups from Russell Coker and David Hampton. + * Merged patch from Dan Walsh. Many changes made to allow + targeted policy to run closer to strict and now almost all of + non-userspace is protected via SELinux. Kernel is now in + unconfined_domain for targeted and runs as root:system_r:kernel_t. + Added transitionbool to daemon_sub_domain, mainly to turn off + httpd_suexec transitioning. Implemented web_client_domain + name_connect rules. Added yp support for cups. Now the real + hotplug, udev, initial_sid_contexts are used for the targeted + policy. Other minor cleanups and fixes. Auditd fixes by Paul + Moore. + * Fri Apr 29 2005 Dan Walsh 1.23.13-8 - Fixes for consoletype, kudzu reading proc_t - Add label /dev/adb Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/sources,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- sources 25 Apr 2005 19:12:42 -0000 1.116 +++ sources 2 May 2005 19:02:31 -0000 1.117 @@ -1 +1 @@ -fa4f9d32909773c63c05099a59e1b4a9 policy-1.23.13.tgz +8099052796e16fb5a9a3fdafe3debefd policy-1.23.14.tgz From fedora-cvs-commits at redhat.com Mon May 2 19:17:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 15:17:59 -0400 Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200505021917.j42JHxXH025022@cvs.devel.redhat.com> Author: jpound Update of /cvs/dist/rpms/eclipse-bugzilla/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25009 Modified Files: eclipse-bugzilla.spec sources Log Message: Fix default bugzilla.redhat.com url. Index: eclipse-bugzilla.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- eclipse-bugzilla.spec 26 Apr 2005 22:57:58 -0000 1.14 +++ eclipse-bugzilla.spec 2 May 2005 19:17:57 -0000 1.15 @@ -22,7 +22,7 @@ Summary: %{pkg_summary} Name: %{eclipse_name}-bugzilla Version: %{version_majmin}.%{version_micro}_fc -Release: 13 +Release: 14 License: Common Public License v1.0 Group: Text Editors/Integrated Development Environments (IDE) #URL: @@ -178,6 +178,9 @@ %endif %changelog +* Mon May 02 2005 Jeff Pound 0.1.0_fc-14 +- Fix default bugzilla.redhat.com url. + * Tue Apr 26 2005 Andrew Overholt 0.1.0_fc-13 - Re-organize and make use of scripts. Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 26 Apr 2005 21:31:25 -0000 1.7 +++ sources 2 May 2005 19:17:57 -0000 1.8 @@ -1 +1 @@ -21ac3a8bb940ce2389d49e454f5419c5 eclipse-bugzilla.tar.gz +32bd647d447adef5eb8e992efd0f439f eclipse-bugzilla.tar.gz From fedora-cvs-commits at redhat.com Mon May 2 19:36:03 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 15:36:03 -0400 Subject: rpms/samba/devel samba-3.0.12pre1-logfiles.patch, NONE, 1.1 samba-3.0.12pre1-quoting.patch, NONE, 1.1 samba-3.0.12rc1-gcc4.patch, NONE, 1.1 samba-3.0.13-man.patch, NONE, 1.1 samba-3.0.13-smbclient.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 samba.spec, 1.50, 1.51 sources, 1.25, 1.26 Message-ID: <200505021936.j42Ja3xj018998@cvs.devel.redhat.com> Author: fenlason Update of /cvs/dist/rpms/samba/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18981 Modified Files: .cvsignore samba.spec sources Added Files: samba-3.0.12pre1-logfiles.patch samba-3.0.12pre1-quoting.patch samba-3.0.12rc1-gcc4.patch samba-3.0.13-man.patch samba-3.0.13-smbclient.patch Log Message: Upgrade to 3.0.14a samba-3.0.12pre1-logfiles.patch: samba-3.0.0beta3/source/lib/popt_common.c | 4 ++-- samba-3.0.11/packaging/RedHat/samba.log | 2 +- samba-3.0.11/packaging/RedHat/smb.conf | 4 ++-- samba-3.0.8pre1/source/nmbd/nmbd.c | 2 +- samba-3.0.8pre1/source/nsswitch/winbindd.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) --- NEW FILE samba-3.0.12pre1-logfiles.patch --- diff -u -r samba-3.0.0beta3.orig/source/lib/popt_common.c samba-3.0.0beta3/source/lib/popt_common.c --- samba-3.0.0beta3.orig/source/lib/popt_common.c 2003-07-28 17:27:07.000000000 -0400 +++ samba-3.0.0beta3/source/lib/popt_common.c 2003-07-28 17:56:28.000000000 -0400 @@ -55,7 +55,7 @@ pname++; if (reason == POPT_CALLBACK_REASON_PRE) { - pstr_sprintf(logfile, "%s/log.%s", dyn_LOGFILEBASE, pname); + pstr_sprintf(logfile, "%s/%s.log", dyn_LOGFILEBASE, pname); lp_set_logfile(logfile); return; } @@ -93,7 +93,7 @@ case 'l': if (arg) { - pstr_sprintf(logfile, "%s/log.%s", arg, pname); + pstr_sprintf(logfile, "%s/%s.log", arg, pname); lp_set_logfile(logfile); } break; --- samba-3.0.8pre1/source/nmbd/nmbd.c.logfiles 2004-09-22 08:42:14.000000000 -0400 +++ samba-3.0.8pre1/source/nmbd/nmbd.c 2004-09-27 14:16:59.000000000 -0400 @@ -626,7 +626,7 @@ sys_srandom(time(NULL) ^ sys_getpid()); if (!override_logfile) { - slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE); + slprintf(logfile, sizeof(logfile)-1, "%s/nmbd.log", dyn_LOGFILEBASE); lp_set_logfile(logfile); } --- samba-3.0.8pre1/source/nsswitch/winbindd.c.logfiles 2004-09-22 08:42:13.000000000 -0400 +++ samba-3.0.8pre1/source/nsswitch/winbindd.c 2004-09-27 14:17:35.000000000 -0400 @@ -856,7 +856,7 @@ } if (!override_logfile) { - pstr_sprintf(logfile, "%s/log.winbindd", dyn_LOGFILEBASE); + pstr_sprintf(logfile, "%s/winbindd.log", dyn_LOGFILEBASE); lp_set_logfile(logfile); } setup_logging("winbindd", log_stdout); --- samba-3.0.11/packaging/RedHat/samba.log.logfiles 2005-02-03 22:07:48.000000000 -0500 +++ samba-3.0.11/packaging/RedHat/samba.log 2005-02-04 16:17:00.000000000 -0500 @@ -1,4 +1,4 @@ -/var/log/samba/*.log /var/log/samba/log.smbd /var/log/samba/log.nmbd { +/var/log/samba/*.log { notifempty missingok sharedscripts --- samba-3.0.11/packaging/RedHat/smb.conf.logfiles 2005-02-03 22:07:48.000000000 -0500 +++ samba-3.0.11/packaging/RedHat/smb.conf 2005-02-04 16:17:48.000000000 -0500 @@ -43,9 +43,9 @@ # this tells Samba to use a separate log file for each machine # that connects - # log file = /var/log/samba/%m.log + log file = /var/log/samba/%m.log # all log information in one file - log file = /var/log/samba/log.smbd +# log file = /var/log/samba/log.smbd # Put a capping on the size of the log files (in Kb). max log size = 50 samba-3.0.12pre1-quoting.patch: swat.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 79 insertions(+), 29 deletions(-) --- NEW FILE samba-3.0.12pre1-quoting.patch --- --- samba-3.0.12pre1/source/web/swat.c.quoting 2005-02-25 12:59:36.000000000 -0500 +++ samba-3.0.12pre1/source/web/swat.c 2005-03-08 17:01:48.000000000 -0500 @@ -63,18 +63,49 @@ return(i); } -static char *fix_backslash(const char *str) +static void emit_as_html(const char *str, int double_slashes ) { - static char newstring[1024]; - char *p = newstring; + const char *p; + const char *todo; + p = str; + todo = NULL; while (*str) { - if (*str == '\\') {*p++ = '\\';*p++ = '\\';} - else *p++ = *str; + switch ( *str ) { + case '\\': + if ( double_slashes ) + todo = "\\\\"; + break; + case '<': + todo = "<"; + break; + + case '>': + todo = ">"; + break; + + case '\"': + todo = """; + break; + + case '&': + todo = "&"; + break; + + default: + break; + } + if ( todo ) { + if ( p != str ) + fwrite ( p, 1, str - p, stdout ); + fputs ( todo, stdout ); + todo = NULL; + p = str + 1; + } ++str; } - *p = '\0'; - return newstring; + if ( p != str ) + fwrite ( p, 1, str - p, stdout ); } static char *stripspaceupper(const char *str) @@ -195,6 +226,7 @@ int i; void *ptr = parm->ptr; char *utf8_s1, *utf8_s2; + char tmp[2]; if (parm->class == P_LOCAL && snum >= 0) { ptr = lp_local_ptr(snum, ptr); @@ -203,10 +235,18 @@ printf("%s", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label)); switch (parm->type) { case P_CHAR: - printf("", - make_parm_name(parm->label), *(char *)ptr); - printf("", - _("Set Default"), make_parm_name(parm->label),(char)(parm->def.cvalue)); + printf("label) ); + tmp[0] = *(char *)ptr; + tmp[1] = '\0'; + emit_as_html ( tmp, 0 ); + printf ( "\">" ); + + printf("label) ); + tmp[0] = (char)(parm->def.cvalue); + tmp[1] = '\0'; + emit_as_html ( tmp, 1 ); + printf ( "\'\">" ); break; case P_LIST: @@ -215,15 +255,16 @@ if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) { char **list = *(char ***)ptr; for (;*list;list++) { + push_utf8_allocate(&utf8_s1, *list); + push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":"")); /* enclose in quotes if the string contains a space */ if ( strchr_m(*list, ' ') ) { - push_utf8_allocate(&utf8_s1, *list); - push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":"")); - printf("\'%s\'%s", utf8_s1, utf8_s2); + printf(""" ); + emit_as_html ( utf8_s1, 0 ); + printf ( ""%s", utf8_s2); } else { - push_utf8_allocate(&utf8_s1, *list); - push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":"")); - printf("%s%s", utf8_s1, utf8_s2); + emit_as_html ( utf8_s1, 0 ); + printf("%s", utf8_s2); } SAFE_FREE(utf8_s1); SAFE_FREE(utf8_s2); @@ -236,10 +277,14 @@ char **list = (char **)(parm->def.lvalue); for (; *list; list++) { /* enclose in quotes if the string contains a space */ - if ( strchr_m(*list, ' ') ) - printf("\'%s\'%s", *list, ((*(list+1))?", ":"")); - else - printf("%s%s", *list, ((*(list+1))?", ":"")); + if ( strchr_m(*list, ' ') ) { + printf("""); + emit_as_html( *list, 1 ); + printf ( ""%s", ((*(list+1))?", ":"")); + } else { + emit_as_html ( *list, 1 ); + printf("%s", ((*(list+1))?", ":"")); + } } } printf("\'\">"); @@ -248,21 +293,26 @@ case P_STRING: case P_USTRING: push_utf8_allocate(&utf8_s1, *(char **)ptr); - printf("", - make_parm_name(parm->label), utf8_s1); + printf("label) ); + emit_as_html ( utf8_s1, 0 ); + printf ( "\">" ); SAFE_FREE(utf8_s1); - printf("", - _("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue))); + printf("label) ); + emit_as_html ( (char *)(parm->def.svalue), 1 ); + printf ( "\'\">" ); break; case P_GSTRING: case P_UGSTRING: push_utf8_allocate(&utf8_s1, (char *)ptr); - printf("", - make_parm_name(parm->label), utf8_s1); + printf("label) ); + emit_as_html ( utf8_s1, 0 ); + printf ( "\">" ); SAFE_FREE(utf8_s1); - printf("", - _("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue))); + printf("label) ); + emit_as_html ( (char *)(parm->def.svalue), 1 ); + printf ( "\'\">" ); break; case P_BOOL: samba-3.0.12rc1-gcc4.patch: popt_common.h | 1 samba-3.0.12rc1.pre-warnings/source/client/clitar.c | 1 samba-3.0.12rc1.pre-warnings/source/lib/gencache.c | 22 ++++++++-- samba-3.0.12rc1.pre-warnings/source/lib/privileges.c | 1 samba-3.0.12rc1.pre-warnings/source/libsmb/samlogon_cache.c | 6 +- samba-3.0.12rc1.pre-warnings/source/nsswitch/winbindd_cm.c | 2 samba-3.0.12rc1.pre-warnings/source/pam_smbpass/pam_smb_auth.c | 15 +++--- samba-3.0.12rc1.pre-warnings/source/rpc_client/cli_netlogon.c | 3 - samba-3.0.12rc1/source/include/vfs_macros.h | 18 ++++---- samba-3.0.12rc1/source/libsmb/libsmb_compat.c | 2 samba-3.0.12rc1/source/libsmb/libsmbclient.c | 2 11 files changed, 47 insertions(+), 26 deletions(-) --- NEW FILE samba-3.0.12rc1-gcc4.patch --- --- samba-3.0.12rc1/source/include/#vfs_macros.h~ 2005-03-15 10:59:02.000000000 -0500 +++ samba-3.0.12rc1/source/include/vfs_macros.h 2005-03-15 11:03:56.000000000 -0500 @@ -48,8 +48,8 @@ /* File operations */ #define SMB_VFS_OPEN(conn, fname, flags, mode) ((conn)->vfs.ops.open((conn)->vfs.handles.open, (conn), (fname), (flags), (mode))) #define SMB_VFS_CLOSE(fsp, fd) ((fsp)->conn->vfs.ops.close((fsp)->conn->vfs.handles.close, (fsp), (fd))) -#define SMB_VFS_READ(fsp, fd, data, n) ((fsp)->conn->vfs.ops.read((fsp)->conn->vfs.handles.read, (fsp), (fd), (data), (n))) -#define SMB_VFS_PREAD(fsp, fd, data, n, off) ((fsp)->conn->vfs.ops.pread((fsp)->conn->vfs.handles.pread, (fsp), (fd), (data), (n), (off))) +#define SMB_VFS_READ(fsp, fd, data, n) (((fsp)->conn->vfs.ops.read)((fsp)->conn->vfs.handles.read, (fsp), (fd), (data), (n))) +#define SMB_VFS_PREAD(fsp, fd, data, n, off) (((fsp)->conn->vfs.ops.pread)((fsp)->conn->vfs.handles.pread, (fsp), (fd), (data), (n), (off))) #define SMB_VFS_WRITE(fsp, fd, data, n) ((fsp)->conn->vfs.ops.write((fsp)->conn->vfs.handles.write, (fsp), (fd), (data), (n))) #define SMB_VFS_PWRITE(fsp, fd, data, n, off) ((fsp)->conn->vfs.ops.pwrite((fsp)->conn->vfs.handles.pwrite, (fsp), (fd), (data), (n), (off))) #define SMB_VFS_LSEEK(fsp, fd, offset, whence) ((fsp)->conn->vfs.ops.lseek((fsp)->conn->vfs.handles.lseek, (fsp), (fd), (offset), (whence))) @@ -70,7 +70,7 @@ #define SMB_VFS_FTRUNCATE(fsp, fd, offset) ((fsp)->conn->vfs.ops.ftruncate((fsp)->conn->vfs.handles.ftruncate, (fsp), (fd), (offset))) #define SMB_VFS_LOCK(fsp, fd, op, offset, count, type) ((fsp)->conn->vfs.ops.lock((fsp)->conn->vfs.handles.lock, (fsp), (fd) ,(op), (offset), (count), (type))) #define SMB_VFS_SYMLINK(conn, oldpath, newpath) ((conn)->vfs.ops.symlink((conn)->vfs.handles.symlink, (conn), (oldpath), (newpath))) -#define SMB_VFS_READLINK(conn, path, buf, bufsiz) ((conn)->vfs.ops.readlink((conn)->vfs.handles.readlink, (conn), (path), (buf), (bufsiz))) +#define SMB_VFS_READLINK(conn, path, buf, bufsiz) (((conn)->vfs.ops.readlink)((conn)->vfs.handles.readlink, (conn), (path), (buf), (bufsiz))) #define SMB_VFS_LINK(conn, oldpath, newpath) ((conn)->vfs.ops.link((conn)->vfs.handles.link, (conn), (oldpath), (newpath))) #define SMB_VFS_MKNOD(conn, path, mode, dev) ((conn)->vfs.ops.mknod((conn)->vfs.handles.mknod, (conn), (path), (mode), (dev))) #define SMB_VFS_REALPATH(conn, path, resolved_path) ((conn)->vfs.ops.realpath((conn)->vfs.handles.realpath, (conn), (path), (resolved_path))) @@ -149,8 +149,8 @@ /* File operations */ #define SMB_VFS_OPAQUE_OPEN(conn, fname, flags, mode) ((conn)->vfs_opaque.ops.open((conn)->vfs_opaque.handles.open, (conn), (fname), (flags), (mode))) #define SMB_VFS_OPAQUE_CLOSE(fsp, fd) ((fsp)->conn->vfs_opaque.ops.close((fsp)->conn->vfs_opaque.handles.close, (fsp), (fd))) -#define SMB_VFS_OPAQUE_READ(fsp, fd, data, n) ((fsp)->conn->vfs_opaque.ops.read((fsp)->conn->vfs_opaque.handles.read, (fsp), (fd), (data), (n))) -#define SMB_VFS_OPAQUE_PREAD(fsp, fd, data, n, off) ((fsp)->conn->vfs_opaque.ops.pread((fsp)->conn->vfs_opaque.handles.pread, (fsp), (fd), (data), (n), (off))) +#define SMB_VFS_OPAQUE_READ(fsp, fd, data, n) (((fsp)->conn->vfs_opaque.ops.read)((fsp)->conn->vfs_opaque.handles.read, (fsp), (fd), (data), (n))) +#define SMB_VFS_OPAQUE_PREAD(fsp, fd, data, n, off) (((fsp)->conn->vfs_opaque.ops.pread)((fsp)->conn->vfs_opaque.handles.pread, (fsp), (fd), (data), (n), (off))) #define SMB_VFS_OPAQUE_WRITE(fsp, fd, data, n) ((fsp)->conn->vfs_opaque.ops.write((fsp)->conn->vfs_opaque.handles.write, (fsp), (fd), (data), (n))) #define SMB_VFS_OPAQUE_PWRITE(fsp, fd, data, n, off) ((fsp)->conn->vfs_opaque.ops.pwrite((fsp)->conn->vfs_opaque.handles.pwrite, (fsp), (fd), (data), (n), (off))) #define SMB_VFS_OPAQUE_LSEEK(fsp, fd, offset, whence) ((fsp)->conn->vfs_opaque.ops.lseek((fsp)->conn->vfs_opaque.handles.lseek, (fsp), (fd), (offset), (whence))) @@ -171,7 +171,7 @@ #define SMB_VFS_OPAQUE_FTRUNCATE(fsp, fd, offset) ((fsp)->conn->vfs_opaque.ops.ftruncate((fsp)->conn->vfs_opaque.handles.ftruncate, (fsp), (fd), (offset))) #define SMB_VFS_OPAQUE_LOCK(fsp, fd, op, offset, count, type) ((fsp)->conn->vfs_opaque.ops.lock((fsp)->conn->vfs_opaque.handles.lock, (fsp), (fd) ,(op), (offset), (count), (type))) #define SMB_VFS_OPAQUE_SYMLINK(conn, oldpath, newpath) ((conn)->vfs_opaque.ops.symlink((conn)->vfs_opaque.handles.symlink, (conn), (oldpath), (newpath))) -#define SMB_VFS_OPAQUE_READLINK(conn, path, buf, bufsiz) ((conn)->vfs_opaque.ops.readlink((conn)->vfs_opaque.handles.readlink, (conn), (path), (buf), (bufsiz))) +#define SMB_VFS_OPAQUE_READLINK(conn, path, buf, bufsiz) (((conn)->vfs_opaque.ops.readlink)((conn)->vfs_opaque.handles.readlink, (conn), (path), (buf), (bufsiz))) #define SMB_VFS_OPAQUE_LINK(conn, oldpath, newpath) ((conn)->vfs_opaque.ops.link((conn)->vfs_opaque.handles.link, (conn), (oldpath), (newpath))) #define SMB_VFS_OPAQUE_MKNOD(conn, path, mode, dev) ((conn)->vfs_opaque.ops.mknod((conn)->vfs_opaque.handles.mknod, (conn), (path), (mode), (dev))) #define SMB_VFS_OPAQUE_REALPATH(conn, path, resolved_path) ((conn)->vfs_opaque.ops.realpath((conn)->vfs_opaque.handles.realpath, (conn), (path), (resolved_path))) @@ -251,8 +251,8 @@ /* File operations */ #define SMB_VFS_NEXT_OPEN(handle, conn, fname, flags, mode) ((handle)->vfs_next.ops.open((handle)->vfs_next.handles.open, (conn), (fname), (flags), (mode))) #define SMB_VFS_NEXT_CLOSE(handle, fsp, fd) ((handle)->vfs_next.ops.close((handle)->vfs_next.handles.close, (fsp), (fd))) -#define SMB_VFS_NEXT_READ(handle, fsp, fd, data, n) ((handle)->vfs_next.ops.read((handle)->vfs_next.handles.read, (fsp), (fd), (data), (n))) -#define SMB_VFS_NEXT_PREAD(handle, fsp, fd, data, n, off) ((handle)->vfs_next.ops.pread((handle)->vfs_next.handles.pread, (fsp), (fd), (data), (n), (off))) +#define SMB_VFS_NEXT_READ(handle, fsp, fd, data, n) (((handle)->vfs_next.ops.read)((handle)->vfs_next.handles.read, (fsp), (fd), (data), (n))) +#define SMB_VFS_NEXT_PREAD(handle, fsp, fd, data, n, off) (((handle)->vfs_next.ops.pread)((handle)->vfs_next.handles.pread, (fsp), (fd), (data), (n), (off))) #define SMB_VFS_NEXT_WRITE(handle, fsp, fd, data, n) ((handle)->vfs_next.ops.write((handle)->vfs_next.handles.write, (fsp), (fd), (data), (n))) #define SMB_VFS_NEXT_PWRITE(handle, fsp, fd, data, n, off) ((handle)->vfs_next.ops.pwrite((handle)->vfs_next.handles.pwrite, (fsp), (fd), (data), (n), (off))) #define SMB_VFS_NEXT_LSEEK(handle, fsp, fd, offset, whence) ((handle)->vfs_next.ops.lseek((handle)->vfs_next.handles.lseek, (fsp), (fd), (offset), (whence))) @@ -273,7 +273,7 @@ #define SMB_VFS_NEXT_FTRUNCATE(handle, fsp, fd, offset) ((handle)->vfs_next.ops.ftruncate((handle)->vfs_next.handles.ftruncate, (fsp), (fd), (offset))) #define SMB_VFS_NEXT_LOCK(handle, fsp, fd, op, offset, count, type) ((handle)->vfs_next.ops.lock((handle)->vfs_next.handles.lock, (fsp), (fd) ,(op), (offset), (count), (type))) #define SMB_VFS_NEXT_SYMLINK(handle, conn, oldpath, newpath) ((handle)->vfs_next.ops.symlink((handle)->vfs_next.handles.symlink, (conn), (oldpath), (newpath))) -#define SMB_VFS_NEXT_READLINK(handle, conn, path, buf, bufsiz) ((handle)->vfs_next.ops.readlink((handle)->vfs_next.handles.readlink, (conn), (path), (buf), (bufsiz))) +#define SMB_VFS_NEXT_READLINK(handle, conn, path, buf, bufsiz) (((handle)->vfs_next.ops.readlink)((handle)->vfs_next.handles.readlink, (conn), (path), (buf), (bufsiz))) #define SMB_VFS_NEXT_LINK(handle, conn, oldpath, newpath) ((handle)->vfs_next.ops.link((handle)->vfs_next.handles.link, (conn), (oldpath), (newpath))) #define SMB_VFS_NEXT_MKNOD(handle, conn, path, mode, dev) ((handle)->vfs_next.ops.mknod((handle)->vfs_next.handles.mknod, (conn), (path), (mode), (dev))) #define SMB_VFS_NEXT_REALPATH(handle, conn, path, resolved_path) ((handle)->vfs_next.ops.realpath((handle)->vfs_next.handles.realpath, (conn), (path), (resolved_path))) --- samba-3.0.12rc1/source/libsmb/#libsmbclient.c~ 2005-03-15 11:32:37.000000000 -0500 +++ samba-3.0.12rc1/source/libsmb/libsmbclient.c 2005-03-15 11:32:37.000000000 -0500 @@ -4626,7 +4626,7 @@ } - while ((bytes = c_file->read(c_file, fid1, buf, sizeof(buf))) > 0) { + while ((bytes = (*c_file->read)(c_file, fid1, buf, sizeof(buf))) > 0) { tot_bytes += bytes; --- samba-3.0.12rc1/source/libsmb/#libsmb_compat.c~ 2005-03-15 11:25:13.000000000 -0500 +++ samba-3.0.12rc1/source/libsmb/libsmb_compat.c 2005-03-15 11:25:13.000000000 -0500 @@ -190,7 +190,7 @@ ssize_t smbc_read(int fd, void *buf, size_t bufsize) { SMBCFILE * file = find_fd(fd); - return statcont->read(statcont, file, buf, bufsize); + return (statcont->read)(statcont, file, buf, bufsize); } ssize_t smbc_write(int fd, void *buf, size_t bufsize) --- samba-3.0.11/source/include/popt_common.h 2004-10-25 17:05:06.000000000 -0400 +++ popt_common.h 2005-02-18 23:24:21.000000000 -0500 @@ -21,6 +21,7 @@ #ifndef _POPT_COMMON_H #define _POPT_COMMON_H +#include "popt/popt.h" /* Common popt structures */ extern struct poptOption popt_common_samba[]; extern struct poptOption popt_common_connection[]; diff -r -u samba-3.0.12rc1/source/client/clitar.c samba-3.0.12rc1.pre-warnings/source/client/clitar.c --- samba-3.0.12rc1/source/client/clitar.c 2005-03-11 08:47:05.000000000 -0500 +++ samba-3.0.12rc1.pre-warnings/source/client/clitar.c 2005-03-17 12:37:46.000000000 -0500 @@ -1111,6 +1111,7 @@ DEBUG(5, ("Reading the next header ...\n")); + memset ( &finfo, 0, sizeof(finfo) ); switch (readtarheader((union hblock *) buffer_p, &finfo, cur_dir)) { case -2: /* Hmm, not good, but not fatal */ DEBUG(0, ("Skipping %s...\n", finfo.name)); diff -r -u samba-3.0.12rc1/source/lib/gencache.c samba-3.0.12rc1.pre-warnings/source/lib/gencache.c --- samba-3.0.12rc1/source/lib/gencache.c 2005-02-25 12:59:31.000000000 -0500 +++ samba-3.0.12rc1.pre-warnings/source/lib/gencache.c 2005-03-17 12:54:58.000000000 -0500 @@ -251,11 +251,19 @@ char* entry_buf = SMB_STRNDUP(databuf.dptr, databuf.dsize); char *v; time_t t; + unsigned int u; + int status; v = SMB_MALLOC(databuf.dsize - TIMEOUT_LEN); - + SAFE_FREE(databuf.dptr); - sscanf(entry_buf, CACHE_DATA_FMT, (int*)&t, v); + status = sscanf(entry_buf, CACHE_DATA_FMT, &u, v); + if ( status != 2 ) { + DEBUG(0, ("getcache_get: only scanned %d elements in \"%s\"\n", status, entry_buf )); + u = 0; + v[0] = '\0'; + } + t = (time_t)u; SAFE_FREE(entry_buf); DEBUG(10, ("Returning %s cache entry: key = %s, value = %s, " @@ -307,6 +315,8 @@ TDB_DATA databuf; char *keystr = NULL, *valstr = NULL, *entry = NULL; time_t timeout = 0; + unsigned int u; + int status; /* fail completely if get null pointers passed */ SMB_ASSERT(fn && keystr_pattern); @@ -335,7 +345,13 @@ entry = SMB_STRNDUP(databuf.dptr, databuf.dsize); SAFE_FREE(databuf.dptr); valstr = SMB_MALLOC(databuf.dsize - TIMEOUT_LEN); - sscanf(entry, CACHE_DATA_FMT, (int*)(&timeout), valstr); + status = sscanf(entry, CACHE_DATA_FMT, &u, valstr); + if ( status != 2 ) { + DEBUG(0, ("getcache_iterate: only scanned %d elements in \"%s\"\n", status, entry )); + u = 0; + valstr[0] = '\0'; + } + timeout = (time_t)u; DEBUG(10, ("Calling function with arguments (key = %s, value = %s, timeout = %s)\n", keystr, valstr, ctime(&timeout))); diff -r -u samba-3.0.12rc1/source/lib/privileges.c samba-3.0.12rc1.pre-warnings/source/lib/privileges.c --- samba-3.0.12rc1/source/lib/privileges.c 2005-03-11 08:47:03.000000000 -0500 +++ samba-3.0.12rc1.pre-warnings/source/lib/privileges.c 2005-03-17 11:28:46.000000000 -0500 @@ -388,6 +388,7 @@ int i; priv_luid.attr = 0; + priv_luid.luid.low = 0; priv_luid.luid.high = 0; for ( i=0; !se_priv_equal(&privs[i].se_priv, &se_priv_end); i++ ) { diff -r -u samba-3.0.12rc1/source/libsmb/samlogon_cache.c samba-3.0.12rc1.pre-warnings/source/libsmb/samlogon_cache.c --- samba-3.0.12rc1/source/libsmb/samlogon_cache.c 2005-02-25 12:59:32.000000000 -0500 +++ samba-3.0.12rc1.pre-warnings/source/libsmb/samlogon_cache.c 2005-03-17 11:32:53.000000000 -0500 @@ -117,6 +117,7 @@ BOOL result = False; DOM_SID user_sid; time_t t = time(NULL); + uint32 u; if (!netsamlogon_cache_init()) { @@ -143,8 +144,9 @@ /* Prepare data */ prs_init( &ps,MAX_PDU_FRAG_LEN , mem_ctx, MARSHALL); - - if ( !prs_uint32( "timestamp", &ps, 0, (uint32*)&t ) ) + + u = (uint32)t; + if ( !prs_uint32( "timestamp", &ps, 0, &u ) ) return False; if ( net_io_user_info3("", user, &ps, 0, 3) ) diff -r -u samba-3.0.12rc1/source/nsswitch/winbindd_cm.c samba-3.0.12rc1.pre-warnings/source/nsswitch/winbindd_cm.c --- samba-3.0.12rc1/source/nsswitch/winbindd_cm.c 2005-02-25 12:59:29.000000000 -0500 +++ samba-3.0.12rc1.pre-warnings/source/nsswitch/winbindd_cm.c 2005-03-17 11:50:41.000000000 -0500 @@ -634,7 +634,7 @@ for (retries = 0; retries < 3; retries++) { int fd = -1; - BOOL retry; + BOOL retry = False; result = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND; diff -r -u samba-3.0.12rc1/source/pam_smbpass/pam_smb_auth.c samba-3.0.12rc1.pre-warnings/source/pam_smbpass/pam_smb_auth.c --- samba-3.0.12rc1/source/pam_smbpass/pam_smb_auth.c 2005-02-25 12:59:30.000000000 -0500 +++ samba-3.0.12rc1.pre-warnings/source/pam_smbpass/pam_smb_auth.c 2005-03-17 12:45:01.000000000 -0500 @@ -84,6 +84,10 @@ pam_sm_setcred(). */ ret_data = malloc(sizeof(int)); + /* Getting into places that might use LDAP -- protect the app + from a SIGPIPE it's not expecting */ + oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN); + /* get the username */ retval = pam_get_user( pamh, &name, "Username: " ); if ( retval != PAM_SUCCESS ) { @@ -96,10 +100,6 @@ _log_err( LOG_DEBUG, "username [%s] obtained", name ); } - /* Getting into places that might use LDAP -- protect the app - from a SIGPIPE it's not expecting */ - oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN); - if (!initialize_password_db(True)) { _log_err( LOG_ALERT, "Cannot access samba password database" ); retval = PAM_AUTHINFO_UNAVAIL; @@ -158,13 +158,14 @@ int pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv) { - int retval, *pretval = NULL; + int retval; + const void *pretval = NULL; retval = PAM_SUCCESS; - pam_get_data(pamh, "smb_setcred_return", (const void **) &pretval); + pam_get_data(pamh, "smb_setcred_return", &pretval); if(pretval) { - retval = *pretval; + retval = *(int *)pretval; SAFE_FREE(pretval); } pam_set_data(pamh, "smb_setcred_return", NULL, NULL); diff -r -u samba-3.0.12rc1/source/rpc_client/cli_netlogon.c samba-3.0.12rc1.pre-warnings/source/rpc_client/cli_netlogon.c --- samba-3.0.12rc1/source/rpc_client/cli_netlogon.c 2005-02-25 12:59:24.000000000 -0500 +++ samba-3.0.12rc1.pre-warnings/source/rpc_client/cli_netlogon.c 2005-03-17 11:34:41.000000000 -0500 @@ -754,6 +754,7 @@ uint16 sec_chan_type = 2; NTSTATUS nt_status; + nt_status = NT_STATUS_UNSUCCESSFUL; gen_next_creds( cli, &new_clnt_cred); prs_init(&qbuf , 1024, mem_ctx, MARSHALL); @@ -771,7 +772,6 @@ /* turn parameters into data stream */ if(!net_io_q_srv_pwset("", &q_s, &qbuf, 0)) { DEBUG(0,("cli_net_srv_pwset: Error : failed to marshall NET_Q_SRV_PWSET struct.\n")); - nt_status = NT_STATUS_UNSUCCESSFUL; goto done; } @@ -781,7 +781,6 @@ NET_R_SRV_PWSET r_s; if (!net_io_r_srv_pwset("", &r_s, &rbuf, 0)) { - nt_status = NT_STATUS_UNSUCCESSFUL; goto done; } samba-3.0.13-man.patch: samba-3.0.12/docs/manpages/ntlm_auth.1 | 26 +++++++++++++------------- samba-3.0.13/docs/manpages/smb.conf.5 | 8 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) --- NEW FILE samba-3.0.13-man.patch --- --- samba-3.0.12/docs/manpages/ntlm_auth.1.man 2005-03-17 16:12:35.000000000 -0500 +++ samba-3.0.12/docs/manpages/ntlm_auth.1 2005-03-18 13:30:56.000000000 -0500 @@ -96,63 +96,63 @@ Username The username, expected to be in Samba's unix charset\&. -Example?1.?Username: bob +Example 1. Username: bob -Example?2.?Username:: Ym9i +Example 2. Username:: Ym9i .TP Username The user's domain, expected to be in Samba's unix charset\&. -Example?3.?Domain: WORKGROUP +Example 3. Domain: WORKGROUP -Example?4.?Domain:: V09SS0dST1VQ +Example 4. Domain:: V09SS0dST1VQ .TP Full\-Username The fully qualified username, expected to be in Samba's and qualified with the winbind separator\&. -Example?5.?Full\-Username: WORKGROUP\\bob +Example 5. Full\-Username: WORKGROUP\\bob -Example?6.?Full\-Username:: V09SS0dST1VQYm9i +Example 6. Full\-Username:: V09SS0dST1VQYm9i .TP LANMAN\-Challenge The 8 byte \fBLANMAN Challenge\fR value, generated randomly by the server, or (in cases such as MSCHAPv2) generated in some way by both the server and the client\&. -Example?7.?LANMAN\-Challege: 0102030405060708 +Example 7. LANMAN\-Challege: 0102030405060708 .TP LANMAN\-Response The 24 byte \fBLANMAN Response\fR value, calculated from the user's password and the supplied \fBLANMAN Challenge\fR\&. Typically, this is provided over the network by a client wishing to authenticate\&. -Example?8.?LANMAN\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718 +Example 8. LANMAN\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718 .TP NT\-Response The >= 24 byte \fBNT Response\fR calculated from the user's password and the supplied \fBLANMAN Challenge\fR\&. Typically, this is provided over the network by a client wishing to authenticate\&. -Example?9.?NT\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718 +Example 9. NT\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718 .TP Password The user's password\&. This would be provided by a network client, if the helper is being used in a legacy situation that exposes plaintext passwords in this way\&. -Example?10.?Password: samba2 +Example 10. Password: samba2 -Example?11.?Password:: c2FtYmEy +Example 11. Password:: c2FtYmEy .TP Request\-User\-Session\-Key Apon sucessful authenticaiton, return the user session key associated with the login\&. -Example?12.?Request\-User\-Session\-Key: Yes +Example 12. Request\-User\-Session\-Key: Yes .TP Request\-LanMan\-Session\-Key Apon sucessful authenticaiton, return the LANMAN session key associated with the login\&. -Example?13.?Request\-LanMan\-Session\-Key: Yes +Example 13. Request\-LanMan\-Session\-Key: Yes .RS .Sh "Warning" Implementors should take care to base64 encode any data (such as usernames/passwords) that may contain malicous user data, such as a newline\&. They may also need to decode strings from the helper, which likewise may have been base64 encoded\&. .RE .RE --- samba-3.0.13/docs/manpages/smb.conf.5.man 2005-03-23 11:14:31.000000000 -0500 +++ samba-3.0.13/docs/manpages/smb.conf.5 2005-04-07 10:03:25.000000000 -0400 @@ -76,14 +76,14 @@ .PP The following sample section defines a file space share\&. The user has write access to the path \fI/home/bar\fR\&. The share is accessed via the share name ``\fBfoo\fR'': -Example?1.? \fI[foo]\fR\fI +Example 1. \fI[foo]\fR\fI path = /home/bar\fR\fI read only = read only = no\fR .PP The following sample section defines a printable share\&. The share is read\-only, but printable\&. That is, the only write access permitted is via calls to open, write to and close a spool file\&. The \fBguest ok\fR parameter means access will be permitted as the default guest user (specified elsewhere): -Example?2.? \fI[aprinter]\fR\fI +Example 2. \fI[aprinter]\fR\fI path = /usr/spool/public\fR\fI @@ -135,7 +135,7 @@ .PP The [homes] section can specify all the parameters a normal service section can specify, though some make more sense than others\&. The following is a typical and suitable [homes] section: -Example?3.? \fI[homes]\fR\fI +Example 3. \fI[homes]\fR\fI read only = no\fR .PP @@ -174,7 +174,7 @@ .PP Typically the path specified is that of a world\-writeable spool directory with the sticky bit set on it\&. A typical [printers] entry looks like this: -Example?4.? \fI[printers]\fR\fI +Example 4. \fI[printers]\fR\fI path = /usr/spool/public\fR\fI samba-3.0.13-smbclient.patch: client.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE samba-3.0.13-smbclient.patch --- --- samba-3.0.13/source/client/client.c.smbclient 2005-04-05 13:51:47.000000000 -0400 +++ samba-3.0.13/source/client/client.c 2005-04-05 13:52:46.000000000 -0400 @@ -3177,6 +3177,7 @@ else but port 139... */ cli_cm_shutdown(); + port = 139; cli_cm_set_port( 139 ); cli = cli_cm_open(query_host, "IPC$", True); } @@ -3339,8 +3340,9 @@ name_type = 0x03; cli_cm_set_dest_name_type( name_type ); pstrcpy(desthost,poptGetOptArg(pc)); - if( !port ) - cli_cm_set_port( 139 ); + if ( port != 139 ) + port = 139; + cli_cm_set_port ( 138); message = True; break; case 'I': Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 22 Feb 2005 18:25:48 -0000 1.23 +++ .cvsignore 2 May 2005 19:36:01 -0000 1.24 @@ -1 +1 @@ -samba-3.0.11.tar.gz +samba-3.0.14a.tar.gz Index: samba.spec =================================================================== RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- samba.spec 24 Mar 2005 16:07:20 -0000 1.50 +++ samba.spec 2 May 2005 19:36:01 -0000 1.51 @@ -2,15 +2,15 @@ Summary: The Samba SMB server. Name: samba -Version: 3.0.11 -Release: 6 +Version: 3.0.14a +Release: 2 Epoch: 0 License: GNU GPL Version 2 Group: System Environment/Daemons URL: http://www.samba.org/ #TAG: change for non-pre -#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc1.tar.gz +#Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}pre2.tar.gz Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz # Red Hat specific replacement-files @@ -29,23 +29,20 @@ # generic patches Patch1: samba-2.2.0-smbw.patch Patch2: samba-3.0.0beta1-pipedir.patch -Patch3: samba-3.0.11-logfiles.patch +Patch3: samba-3.0.12pre1-logfiles.patch Patch4: samba-3.0.11rc1-pie.patch Patch5: samba-3.0.0rc3-nmbd-netbiosname.patch Patch6: samba-3.0.4-smb.conf.patch -Patch7: samba-3.0.10-man.patch +Patch7: samba-3.0.13-man.patch Patch8: samba-3.0.4-warning.patch Patch9: samba-3.0.5rc1-passwd.patch -Patch10: samba-3.0.5rc1-64bit-timestamps.patch #Patch11: samba-3.0.8-non-ascii-domain.patch Patch12: samba-3.0.4-install.mount.smbfs.patch Patch13: samba-3.0.10-delim.patch Patch14: samba-3.0.9-smbspool.patch -Patch15: samba-3.0.11-gcc4.patch -Patch16: samba-3.0.11-clitar.patch -Patch17: samba-3.0.11-establish_trust.patch -Patch18: samba-3.0.11-user_rights_v1.patch -Patch19: samba-3.0.11-winbind_find_dc_v2.patch +Patch15: samba-3.0.12rc1-gcc4.patch +Patch16: samba-3.0.12pre1-quoting.patch +Patch17: samba-3.0.13-smbclient.patch Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version} Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 @@ -101,7 +98,7 @@ %prep # TAG: change for non-pre -#% setup -q -n samba-3.0.11rc1 +#% setup -q -n samba-3.0.15pre2 %setup -q # copy Red Hat specific scripts @@ -119,16 +116,13 @@ %patch7 -p1 -b .man %patch8 -p1 -b .warning %patch9 -p1 -b .passwd -%patch10 -p1 -b .64bit-timestamps #%patch11 -p1 -b .non-ascii-domain %patch12 -p1 -b .install.mount.smbfs %patch13 -p1 -b .delim %patch14 -p1 -b .smbspool %patch15 -p1 -b .gcc4 -%patch16 -p0 -b .clitar -%patch17 -p0 -b .establish_trust -%patch18 -p0 -b .user_rights_v1 -%patch19 -p1 -b .winbind_find_dc_v2 +%patch16 -p1 -b .quoting +%patch17 -p1 -b .smbclient # crap rm -f examples/VFS/.cvsignore @@ -460,6 +454,20 @@ #%lang(ja) %{_mandir}/ja/man8/smbpasswd.8* %changelog +* Mon May 2 2005 Jay Fenlason 3.0.14a-2 +- New upstream release. +- the -64bit-timestamps, -clitar, -establish_trust, user_rights_v1, + winbind_find_dc_v2 patches are now obsolete. + +* Thu Apr 7 2005 Jay Fenlason 3.0.13-2 +- New upstream release +- add my -quoting patch, to fix swat with strings that contain + html meta-characters, and to use correct quote characters in + lists, closing bz#134310 +- include the upstream winbindd_2k3sp1 patch +- include the -smbclient patch. +- include the -hang patch from upstream. + * Thu Mar 24 2005 Florian La Roche - add a "exit 0" to the postun of the main samba package Index: sources =================================================================== RCS file: /cvs/dist/rpms/samba/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 22 Feb 2005 18:25:48 -0000 1.25 +++ sources 2 May 2005 19:36:01 -0000 1.26 @@ -1 +1 @@ -217e489646a474b4fb69d5802c14bc6e samba-3.0.11.tar.gz +ebee37e66a8b5f6fd328967dc09088e8 samba-3.0.14a.tar.gz From fedora-cvs-commits at redhat.com Mon May 2 20:16:09 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 16:16:09 -0400 Subject: rpms/selinux-policy-strict/devel policy-20050502.patch, 1.1, 1.2 selinux-policy-strict.spec, 1.297, 1.298 Message-ID: <200505022016.j42KG90m019691@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-strict/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19677 Modified Files: policy-20050502.patch selinux-policy-strict.spec Log Message: * Mon May 2 2005 Dan Walsh 1.23.14-2 - Allow all domains on ppc execmem priv, otherwise it crashes policy-20050502.patch: domains/misc/kernel.te | 2 ++ domains/program/ifconfig.te | 2 ++ domains/program/modutil.te | 2 +- domains/program/unused/apmd.te | 2 +- domains/program/unused/auditd.te | 1 + domains/program/unused/automount.te | 9 +++++++-- domains/program/unused/consoletype.te | 1 + domains/program/unused/cups.te | 4 +++- domains/program/unused/hald.te | 7 ++++--- domains/program/unused/hotplug.te | 2 +- domains/program/unused/i18n_input.te | 2 ++ domains/program/unused/kudzu.te | 1 + domains/program/unused/lvm.te | 2 +- domains/program/unused/pamconsole.te | 2 +- domains/program/unused/udev.te | 4 ++-- domains/program/unused/updfstab.te | 6 ++++++ domains/program/unused/xdm.te | 1 + domains/program/unused/xserver.te | 1 + file_contexts/distros.fc | 3 ++- file_contexts/program/cups.fc | 1 + file_contexts/program/rhgb.fc | 1 - file_contexts/types.fc | 1 + macros/core_macros.te | 1 - macros/program/su_macros.te | 5 +++-- net_contexts | 2 ++ targeted/domains/unconfined.te | 5 +++++ tunables/distro.tun | 2 +- tunables/tunable.tun | 6 +++--- 28 files changed, 56 insertions(+), 22 deletions(-) Index: policy-20050502.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/policy-20050502.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- policy-20050502.patch 2 May 2005 19:02:31 -0000 1.1 +++ policy-20050502.patch 2 May 2005 20:16:06 -0000 1.2 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicy/domains/misc/kernel.te policy-1.23.14/domains/misc/kernel.te --- nsapolicy/domains/misc/kernel.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/misc/kernel.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/misc/kernel.te 2005-05-02 14:57:26.000000000 -0400 @@ -36,6 +36,7 @@ # Send signal to any process. @@ -19,7 +19,7 @@ allow kernel_t { sysctl_t sysctl_kernel_t }:file { setattr rw_file_perms }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/ifconfig.te policy-1.23.14/domains/program/ifconfig.te --- nsapolicy/domains/program/ifconfig.te 2005-04-27 10:28:49.000000000 -0400 -+++ policy-1.23.14/domains/program/ifconfig.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/ifconfig.te 2005-05-02 14:57:26.000000000 -0400 @@ -21,7 +21,9 @@ general_domain_access(ifconfig_t) @@ -32,7 +32,7 @@ allow ifconfig_t self:netlink_route_socket rw_netlink_socket_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/modutil.te policy-1.23.14/domains/program/modutil.te --- nsapolicy/domains/program/modutil.te 2005-04-27 10:28:49.000000000 -0400 -+++ policy-1.23.14/domains/program/modutil.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/modutil.te 2005-05-02 14:57:26.000000000 -0400 @@ -143,7 +143,7 @@ allow insmod_t proc_t:dir search; allow insmod_t sysctl_kernel_t:file { setattr rw_file_perms }; @@ -44,7 +44,7 @@ # Write to /proc/mtrr. diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apmd.te policy-1.23.14/domains/program/unused/apmd.te --- nsapolicy/domains/program/unused/apmd.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/apmd.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/apmd.te 2005-05-02 14:57:26.000000000 -0400 @@ -31,7 +31,7 @@ allow apmd_t device_t:lnk_file read; @@ -56,7 +56,7 @@ allow apmd_t self:fifo_file rw_file_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/auditd.te policy-1.23.14/domains/program/unused/auditd.te --- nsapolicy/domains/program/unused/auditd.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/auditd.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/auditd.te 2005-05-02 14:57:26.000000000 -0400 @@ -56,3 +56,4 @@ allow auditctl_t sysctl_kernel_t:file read; allow auditd_t self:process setsched; @@ -64,7 +64,7 @@ +allow auditctl_t initrc_devpts_t:chr_file { read write }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/automount.te policy-1.23.14/domains/program/unused/automount.te --- nsapolicy/domains/program/unused/automount.te 2005-04-27 10:28:49.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/automount.te 2005-05-02 14:53:00.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/automount.te 2005-05-02 14:57:26.000000000 -0400 @@ -26,7 +26,7 @@ allow automount_t { etc_t etc_runtime_t }:file { getattr read }; allow automount_t proc_t:file { getattr read }; @@ -87,7 +87,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/consoletype.te policy-1.23.14/domains/program/unused/consoletype.te --- nsapolicy/domains/program/unused/consoletype.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/consoletype.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/consoletype.te 2005-05-02 14:57:26.000000000 -0400 @@ -57,6 +57,7 @@ ifdef(`firstboot.te', ` allow consoletype_t firstboot_t:fifo_file write; @@ -98,7 +98,7 @@ allow consoletype_t crond_t:fifo_file { read getattr ioctl }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/cups.te policy-1.23.14/domains/program/unused/cups.te --- nsapolicy/domains/program/unused/cups.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/cups.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/cups.te 2005-05-02 14:57:26.000000000 -0400 @@ -22,6 +22,7 @@ logdir_domain(cupsd) @@ -120,7 +120,7 @@ allow cupsd_config_t initrc_exec_t:file getattr; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hald.te policy-1.23.14/domains/program/unused/hald.te --- nsapolicy/domains/program/unused/hald.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/hald.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/hald.te 2005-05-02 14:57:26.000000000 -0400 @@ -10,12 +10,12 @@ # # hald_exec_t is the type of the hald executable. @@ -155,7 +155,7 @@ diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hotplug.te policy-1.23.14/domains/program/unused/hotplug.te --- nsapolicy/domains/program/unused/hotplug.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/hotplug.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/hotplug.te 2005-05-02 14:57:26.000000000 -0400 @@ -156,4 +156,4 @@ domain_auto_trans(hotplug_t, sendmail_exec_t, system_mail_t) ') @@ -164,7 +164,7 @@ +allow { insmod_t kernel_t } hotplug_etc_t:dir { search getattr }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/i18n_input.te policy-1.23.14/domains/program/unused/i18n_input.te --- nsapolicy/domains/program/unused/i18n_input.te 2005-04-27 10:28:51.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/i18n_input.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/i18n_input.te 2005-05-02 14:57:26.000000000 -0400 @@ -14,6 +14,7 @@ can_ypbind(i18n_input_t) @@ -180,7 +180,7 @@ +allow i18n_input_t usr_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/kudzu.te policy-1.23.14/domains/program/unused/kudzu.te --- nsapolicy/domains/program/unused/kudzu.te 2005-04-27 10:28:51.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/kudzu.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/kudzu.te 2005-05-02 14:57:26.000000000 -0400 @@ -26,6 +26,7 @@ allow kudzu_t mouse_device_t:chr_file { read write }; allow kudzu_t proc_net_t:dir r_dir_perms; @@ -191,7 +191,7 @@ allow kudzu_t { bin_t sbin_t }:dir { getattr search }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/lvm.te policy-1.23.14/domains/program/unused/lvm.te --- nsapolicy/domains/program/unused/lvm.te 2005-04-27 10:28:51.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/lvm.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/lvm.te 2005-05-02 14:57:26.000000000 -0400 @@ -112,7 +112,7 @@ allow lvm_t lvm_control_t:chr_file rw_file_perms; allow initrc_t lvm_control_t:chr_file { getattr read unlink }; @@ -203,7 +203,7 @@ dontaudit lvm_t file_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/pamconsole.te policy-1.23.14/domains/program/unused/pamconsole.te --- nsapolicy/domains/program/unused/pamconsole.te 2005-04-27 10:28:52.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/pamconsole.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/pamconsole.te 2005-05-02 14:57:26.000000000 -0400 @@ -45,5 +45,5 @@ ifdef(`xdm.te', ` allow pam_console_t xdm_var_run_t:file { getattr read }; @@ -213,7 +213,7 @@ allow pam_console_t file_context_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/udev.te policy-1.23.14/domains/program/unused/udev.te --- nsapolicy/domains/program/unused/udev.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/udev.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/udev.te 2005-05-02 14:57:26.000000000 -0400 @@ -38,8 +38,8 @@ allow udev_t device_t:lnk_file create_lnk_perms; allow udev_t { device_t device_type }:{ chr_file blk_file } { relabelfrom relabelto create_file_perms }; @@ -227,7 +227,7 @@ allow udev_t tmpfs_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/updfstab.te policy-1.23.14/domains/program/unused/updfstab.te --- nsapolicy/domains/program/unused/updfstab.te 2005-04-27 10:28:53.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/updfstab.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/updfstab.te 2005-05-02 14:57:26.000000000 -0400 @@ -31,6 +31,8 @@ ifdef(`dbusd.te', ` dbusd_client(system, updfstab) @@ -247,7 +247,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xdm.te policy-1.23.14/domains/program/unused/xdm.te --- nsapolicy/domains/program/unused/xdm.te 2005-04-27 10:28:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/xdm.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/xdm.te 2005-05-02 14:57:26.000000000 -0400 @@ -344,3 +344,4 @@ # Run telinit->init to shutdown. @@ -255,7 +255,7 @@ +allow xdm_t self:sem create_sem_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xserver.te policy-1.23.14/domains/program/unused/xserver.te --- nsapolicy/domains/program/unused/xserver.te 2005-04-27 10:28:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/xserver.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/xserver.te 2005-05-02 14:57:26.000000000 -0400 @@ -20,3 +20,4 @@ # Everything else is in the xserver_domain macro in # macros/program/xserver_macros.te. @@ -263,7 +263,7 @@ +allow initrc_t xserver_log_t:fifo_file { read write }; diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/distros.fc policy-1.23.14/file_contexts/distros.fc --- nsapolicy/file_contexts/distros.fc 2005-05-02 14:06:56.000000000 -0400 -+++ policy-1.23.14/file_contexts/distros.fc 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/file_contexts/distros.fc 2005-05-02 14:57:26.000000000 -0400 @@ -37,7 +37,8 @@ /usr/share/texmf/web2c/mktexupd -- system_u:object_r:bin_t /usr/share/ssl/certs(/.*)? system_u:object_r:cert_t @@ -276,7 +276,7 @@ # /emul/ia32-linux/usr diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/cups.fc policy-1.23.14/file_contexts/program/cups.fc --- nsapolicy/file_contexts/program/cups.fc 2005-02-24 14:51:08.000000000 -0500 -+++ policy-1.23.14/file_contexts/program/cups.fc 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/file_contexts/program/cups.fc 2005-05-02 14:57:26.000000000 -0400 @@ -25,6 +25,7 @@ /usr/sbin/printconf-backend -- system_u:object_r:cupsd_config_exec_t ') @@ -285,23 +285,15 @@ /var/spool/cups(/.*)? system_u:object_r:print_spool_t /var/run/cups/printcap -- system_u:object_r:cupsd_var_run_t /usr/lib(64)?/cups/filter/.* -- system_u:object_r:bin_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/i18n_input.fc policy-1.23.14/file_contexts/program/i18n_input.fc ---- nsapolicy/file_contexts/program/i18n_input.fc 2005-05-02 14:06:56.000000000 -0400 -+++ policy-1.23.14/file_contexts/program/i18n_input.fc 2005-05-02 14:51:59.000000000 -0400 -@@ -9,3 +9,4 @@ - /usr/lib(64)?/im/.*\.so.* -- system_u:object_r:shlib_t - /usr/lib(64)?/iiim/.*\.so.* -- system_u:object_r:shlib_t - /var/run/iiim(/.*)? system_u:object_r:i18n_input_var_run_t -+/var/run/\.iroha_unix(/.*)? system_u:object_r:i18n_input_var_run_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/rhgb.fc policy-1.23.14/file_contexts/program/rhgb.fc --- nsapolicy/file_contexts/program/rhgb.fc 2005-02-24 14:51:08.000000000 -0500 -+++ policy-1.23.14/file_contexts/program/rhgb.fc 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/file_contexts/program/rhgb.fc 2005-05-02 14:57:26.000000000 -0400 @@ -1,2 +1 @@ /usr/bin/rhgb -- system_u:object_r:rhgb_exec_t -/etc/rhgb(/.*)? -d system_u:object_r:mnt_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/types.fc policy-1.23.14/file_contexts/types.fc --- nsapolicy/file_contexts/types.fc 2005-05-02 14:06:56.000000000 -0400 -+++ policy-1.23.14/file_contexts/types.fc 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/file_contexts/types.fc 2005-05-02 14:57:26.000000000 -0400 @@ -129,6 +129,7 @@ /dev/nvram -c system_u:object_r:memory_device_t /dev/random -c system_u:object_r:random_device_t @@ -312,7 +304,7 @@ /dev/irlpt[0-9]+ -c system_u:object_r:printer_device_t diff --exclude-from=exclude -N -u -r nsapolicy/macros/core_macros.te policy-1.23.14/macros/core_macros.te --- nsapolicy/macros/core_macros.te 2005-05-02 14:06:57.000000000 -0400 -+++ policy-1.23.14/macros/core_macros.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/macros/core_macros.te 2005-05-02 14:57:26.000000000 -0400 @@ -341,7 +341,6 @@ # Get the selinuxfs mount point via /proc/self/mounts. allow $1 proc_t:dir search; @@ -323,7 +315,7 @@ # Access selinuxfs. diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/su_macros.te policy-1.23.14/macros/program/su_macros.te --- nsapolicy/macros/program/su_macros.te 2005-05-02 14:06:57.000000000 -0400 -+++ policy-1.23.14/macros/program/su_macros.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/macros/program/su_macros.te 2005-05-02 14:57:26.000000000 -0400 @@ -61,7 +61,7 @@ ') @@ -347,7 +339,7 @@ define(`su_mini_domain', ` diff --exclude-from=exclude -N -u -r nsapolicy/net_contexts policy-1.23.14/net_contexts --- nsapolicy/net_contexts 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/net_contexts 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/net_contexts 2005-05-02 14:57:26.000000000 -0400 @@ -227,6 +227,8 @@ portcon tcp 3128 system_u:object_r:http_cache_port_t portcon tcp 8080 system_u:object_r:http_cache_port_t @@ -357,9 +349,21 @@ ifdef(`clockspeed.te', `portcon udp 4041 system_u:object_r:clockspeed_port_t') ifdef(`transproxy.te', `portcon tcp 8081 system_u:object_r:transproxy_port_t') +diff --exclude-from=exclude -N -u -r nsapolicy/targeted/domains/unconfined.te policy-1.23.14/targeted/domains/unconfined.te +--- nsapolicy/targeted/domains/unconfined.te 2005-05-02 14:06:57.000000000 -0400 ++++ policy-1.23.14/targeted/domains/unconfined.te 2005-05-02 16:12:08.000000000 -0400 +@@ -77,3 +77,8 @@ + + # allow reading of default file context + bool read_default_t true; ++ ++if (allow_execmem) { ++allow domain self:process execmem; ++} ++ diff --exclude-from=exclude -N -u -r nsapolicy/tunables/distro.tun policy-1.23.14/tunables/distro.tun --- nsapolicy/tunables/distro.tun 2005-02-24 14:51:09.000000000 -0500 -+++ policy-1.23.14/tunables/distro.tun 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/tunables/distro.tun 2005-05-02 14:57:26.000000000 -0400 @@ -5,7 +5,7 @@ # appropriate ifdefs. @@ -371,7 +375,7 @@ diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.tun policy-1.23.14/tunables/tunable.tun --- nsapolicy/tunables/tunable.tun 2005-04-14 15:01:54.000000000 -0400 -+++ policy-1.23.14/tunables/tunable.tun 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/tunables/tunable.tun 2005-05-02 14:57:26.000000000 -0400 @@ -2,7 +2,7 @@ dnl define(`user_can_mount') Index: selinux-policy-strict.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/selinux-policy-strict.spec,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- selinux-policy-strict.spec 2 May 2005 19:02:31 -0000 1.297 +++ selinux-policy-strict.spec 2 May 2005 20:16:06 -0000 1.298 @@ -220,6 +220,9 @@ exit 0 %changelog +* Mon May 2 2005 Dan Walsh 1.23.14-2 +- Allow all domains on ppc execmem priv, otherwise it crashes + * Mon May 2 2005 Dan Walsh 1.23.14-1 - Update to latest from NSA * Added afs policy from Andrew Reisse. From fedora-cvs-commits at redhat.com Mon May 2 20:16:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 16:16:38 -0400 Subject: rpms/selinux-policy-strict/devel selinux-policy-strict.spec, 1.298, 1.299 Message-ID: <200505022016.j42KGcdp019751@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-strict/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19738 Modified Files: selinux-policy-strict.spec Log Message: * Mon May 2 2005 Dan Walsh 1.23.14-2 - Allow all domains on ppc execmem priv, otherwise it crashes Index: selinux-policy-strict.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/devel/selinux-policy-strict.spec,v retrieving revision 1.298 retrieving revision 1.299 diff -u -r1.298 -r1.299 --- selinux-policy-strict.spec 2 May 2005 20:16:06 -0000 1.298 +++ selinux-policy-strict.spec 2 May 2005 20:16:36 -0000 1.299 @@ -11,7 +11,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.23.14 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz From fedora-cvs-commits at redhat.com Mon May 2 20:16:49 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 16:16:49 -0400 Subject: rpms/selinux-policy-targeted/devel policy-20050502.patch, 1.1, 1.2 selinux-policy-targeted.spec, 1.292, 1.293 Message-ID: <200505022016.j42KGnkq019804@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-targeted/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19790 Modified Files: policy-20050502.patch selinux-policy-targeted.spec Log Message: * Mon May 2 2005 Dan Walsh 1.23.14-2 - Allow all domains on ppc execmem priv, otherwise it crashes policy-20050502.patch: domains/misc/kernel.te | 2 ++ domains/program/ifconfig.te | 2 ++ domains/program/modutil.te | 2 +- domains/program/unused/apmd.te | 2 +- domains/program/unused/auditd.te | 1 + domains/program/unused/automount.te | 9 +++++++-- domains/program/unused/consoletype.te | 1 + domains/program/unused/cups.te | 4 +++- domains/program/unused/hald.te | 7 ++++--- domains/program/unused/hotplug.te | 2 +- domains/program/unused/i18n_input.te | 2 ++ domains/program/unused/kudzu.te | 1 + domains/program/unused/lvm.te | 2 +- domains/program/unused/pamconsole.te | 2 +- domains/program/unused/udev.te | 4 ++-- domains/program/unused/updfstab.te | 6 ++++++ domains/program/unused/xdm.te | 1 + domains/program/unused/xserver.te | 1 + file_contexts/distros.fc | 3 ++- file_contexts/program/cups.fc | 1 + file_contexts/program/rhgb.fc | 1 - file_contexts/types.fc | 1 + macros/core_macros.te | 1 - macros/program/su_macros.te | 5 +++-- net_contexts | 2 ++ targeted/domains/unconfined.te | 5 +++++ tunables/distro.tun | 2 +- tunables/tunable.tun | 6 +++--- 28 files changed, 56 insertions(+), 22 deletions(-) Index: policy-20050502.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/policy-20050502.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- policy-20050502.patch 2 May 2005 19:02:02 -0000 1.1 +++ policy-20050502.patch 2 May 2005 20:16:46 -0000 1.2 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicy/domains/misc/kernel.te policy-1.23.14/domains/misc/kernel.te --- nsapolicy/domains/misc/kernel.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/misc/kernel.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/misc/kernel.te 2005-05-02 14:57:26.000000000 -0400 @@ -36,6 +36,7 @@ # Send signal to any process. @@ -19,7 +19,7 @@ allow kernel_t { sysctl_t sysctl_kernel_t }:file { setattr rw_file_perms }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/ifconfig.te policy-1.23.14/domains/program/ifconfig.te --- nsapolicy/domains/program/ifconfig.te 2005-04-27 10:28:49.000000000 -0400 -+++ policy-1.23.14/domains/program/ifconfig.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/ifconfig.te 2005-05-02 14:57:26.000000000 -0400 @@ -21,7 +21,9 @@ general_domain_access(ifconfig_t) @@ -32,7 +32,7 @@ allow ifconfig_t self:netlink_route_socket rw_netlink_socket_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/modutil.te policy-1.23.14/domains/program/modutil.te --- nsapolicy/domains/program/modutil.te 2005-04-27 10:28:49.000000000 -0400 -+++ policy-1.23.14/domains/program/modutil.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/modutil.te 2005-05-02 14:57:26.000000000 -0400 @@ -143,7 +143,7 @@ allow insmod_t proc_t:dir search; allow insmod_t sysctl_kernel_t:file { setattr rw_file_perms }; @@ -44,7 +44,7 @@ # Write to /proc/mtrr. diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apmd.te policy-1.23.14/domains/program/unused/apmd.te --- nsapolicy/domains/program/unused/apmd.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/apmd.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/apmd.te 2005-05-02 14:57:26.000000000 -0400 @@ -31,7 +31,7 @@ allow apmd_t device_t:lnk_file read; @@ -56,7 +56,7 @@ allow apmd_t self:fifo_file rw_file_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/auditd.te policy-1.23.14/domains/program/unused/auditd.te --- nsapolicy/domains/program/unused/auditd.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/auditd.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/auditd.te 2005-05-02 14:57:26.000000000 -0400 @@ -56,3 +56,4 @@ allow auditctl_t sysctl_kernel_t:file read; allow auditd_t self:process setsched; @@ -64,7 +64,7 @@ +allow auditctl_t initrc_devpts_t:chr_file { read write }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/automount.te policy-1.23.14/domains/program/unused/automount.te --- nsapolicy/domains/program/unused/automount.te 2005-04-27 10:28:49.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/automount.te 2005-05-02 14:53:00.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/automount.te 2005-05-02 14:57:26.000000000 -0400 @@ -26,7 +26,7 @@ allow automount_t { etc_t etc_runtime_t }:file { getattr read }; allow automount_t proc_t:file { getattr read }; @@ -87,7 +87,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/consoletype.te policy-1.23.14/domains/program/unused/consoletype.te --- nsapolicy/domains/program/unused/consoletype.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/consoletype.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/consoletype.te 2005-05-02 14:57:26.000000000 -0400 @@ -57,6 +57,7 @@ ifdef(`firstboot.te', ` allow consoletype_t firstboot_t:fifo_file write; @@ -98,7 +98,7 @@ allow consoletype_t crond_t:fifo_file { read getattr ioctl }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/cups.te policy-1.23.14/domains/program/unused/cups.te --- nsapolicy/domains/program/unused/cups.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/cups.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/cups.te 2005-05-02 14:57:26.000000000 -0400 @@ -22,6 +22,7 @@ logdir_domain(cupsd) @@ -120,7 +120,7 @@ allow cupsd_config_t initrc_exec_t:file getattr; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hald.te policy-1.23.14/domains/program/unused/hald.te --- nsapolicy/domains/program/unused/hald.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/hald.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/hald.te 2005-05-02 14:57:26.000000000 -0400 @@ -10,12 +10,12 @@ # # hald_exec_t is the type of the hald executable. @@ -155,7 +155,7 @@ diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hotplug.te policy-1.23.14/domains/program/unused/hotplug.te --- nsapolicy/domains/program/unused/hotplug.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/hotplug.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/hotplug.te 2005-05-02 14:57:26.000000000 -0400 @@ -156,4 +156,4 @@ domain_auto_trans(hotplug_t, sendmail_exec_t, system_mail_t) ') @@ -164,7 +164,7 @@ +allow { insmod_t kernel_t } hotplug_etc_t:dir { search getattr }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/i18n_input.te policy-1.23.14/domains/program/unused/i18n_input.te --- nsapolicy/domains/program/unused/i18n_input.te 2005-04-27 10:28:51.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/i18n_input.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/i18n_input.te 2005-05-02 14:57:26.000000000 -0400 @@ -14,6 +14,7 @@ can_ypbind(i18n_input_t) @@ -180,7 +180,7 @@ +allow i18n_input_t usr_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/kudzu.te policy-1.23.14/domains/program/unused/kudzu.te --- nsapolicy/domains/program/unused/kudzu.te 2005-04-27 10:28:51.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/kudzu.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/kudzu.te 2005-05-02 14:57:26.000000000 -0400 @@ -26,6 +26,7 @@ allow kudzu_t mouse_device_t:chr_file { read write }; allow kudzu_t proc_net_t:dir r_dir_perms; @@ -191,7 +191,7 @@ allow kudzu_t { bin_t sbin_t }:dir { getattr search }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/lvm.te policy-1.23.14/domains/program/unused/lvm.te --- nsapolicy/domains/program/unused/lvm.te 2005-04-27 10:28:51.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/lvm.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/lvm.te 2005-05-02 14:57:26.000000000 -0400 @@ -112,7 +112,7 @@ allow lvm_t lvm_control_t:chr_file rw_file_perms; allow initrc_t lvm_control_t:chr_file { getattr read unlink }; @@ -203,7 +203,7 @@ dontaudit lvm_t file_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/pamconsole.te policy-1.23.14/domains/program/unused/pamconsole.te --- nsapolicy/domains/program/unused/pamconsole.te 2005-04-27 10:28:52.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/pamconsole.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/pamconsole.te 2005-05-02 14:57:26.000000000 -0400 @@ -45,5 +45,5 @@ ifdef(`xdm.te', ` allow pam_console_t xdm_var_run_t:file { getattr read }; @@ -213,7 +213,7 @@ allow pam_console_t file_context_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/udev.te policy-1.23.14/domains/program/unused/udev.te --- nsapolicy/domains/program/unused/udev.te 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/udev.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/udev.te 2005-05-02 14:57:26.000000000 -0400 @@ -38,8 +38,8 @@ allow udev_t device_t:lnk_file create_lnk_perms; allow udev_t { device_t device_type }:{ chr_file blk_file } { relabelfrom relabelto create_file_perms }; @@ -227,7 +227,7 @@ allow udev_t tmpfs_t:dir search; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/updfstab.te policy-1.23.14/domains/program/unused/updfstab.te --- nsapolicy/domains/program/unused/updfstab.te 2005-04-27 10:28:53.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/updfstab.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/updfstab.te 2005-05-02 14:57:26.000000000 -0400 @@ -31,6 +31,8 @@ ifdef(`dbusd.te', ` dbusd_client(system, updfstab) @@ -247,7 +247,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xdm.te policy-1.23.14/domains/program/unused/xdm.te --- nsapolicy/domains/program/unused/xdm.te 2005-04-27 10:28:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/xdm.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/xdm.te 2005-05-02 14:57:26.000000000 -0400 @@ -344,3 +344,4 @@ # Run telinit->init to shutdown. @@ -255,7 +255,7 @@ +allow xdm_t self:sem create_sem_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xserver.te policy-1.23.14/domains/program/unused/xserver.te --- nsapolicy/domains/program/unused/xserver.te 2005-04-27 10:28:54.000000000 -0400 -+++ policy-1.23.14/domains/program/unused/xserver.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/domains/program/unused/xserver.te 2005-05-02 14:57:26.000000000 -0400 @@ -20,3 +20,4 @@ # Everything else is in the xserver_domain macro in # macros/program/xserver_macros.te. @@ -263,7 +263,7 @@ +allow initrc_t xserver_log_t:fifo_file { read write }; diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/distros.fc policy-1.23.14/file_contexts/distros.fc --- nsapolicy/file_contexts/distros.fc 2005-05-02 14:06:56.000000000 -0400 -+++ policy-1.23.14/file_contexts/distros.fc 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/file_contexts/distros.fc 2005-05-02 14:57:26.000000000 -0400 @@ -37,7 +37,8 @@ /usr/share/texmf/web2c/mktexupd -- system_u:object_r:bin_t /usr/share/ssl/certs(/.*)? system_u:object_r:cert_t @@ -276,7 +276,7 @@ # /emul/ia32-linux/usr diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/cups.fc policy-1.23.14/file_contexts/program/cups.fc --- nsapolicy/file_contexts/program/cups.fc 2005-02-24 14:51:08.000000000 -0500 -+++ policy-1.23.14/file_contexts/program/cups.fc 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/file_contexts/program/cups.fc 2005-05-02 14:57:26.000000000 -0400 @@ -25,6 +25,7 @@ /usr/sbin/printconf-backend -- system_u:object_r:cupsd_config_exec_t ') @@ -285,23 +285,15 @@ /var/spool/cups(/.*)? system_u:object_r:print_spool_t /var/run/cups/printcap -- system_u:object_r:cupsd_var_run_t /usr/lib(64)?/cups/filter/.* -- system_u:object_r:bin_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/i18n_input.fc policy-1.23.14/file_contexts/program/i18n_input.fc ---- nsapolicy/file_contexts/program/i18n_input.fc 2005-05-02 14:06:56.000000000 -0400 -+++ policy-1.23.14/file_contexts/program/i18n_input.fc 2005-05-02 14:51:59.000000000 -0400 -@@ -9,3 +9,4 @@ - /usr/lib(64)?/im/.*\.so.* -- system_u:object_r:shlib_t - /usr/lib(64)?/iiim/.*\.so.* -- system_u:object_r:shlib_t - /var/run/iiim(/.*)? system_u:object_r:i18n_input_var_run_t -+/var/run/\.iroha_unix(/.*)? system_u:object_r:i18n_input_var_run_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/rhgb.fc policy-1.23.14/file_contexts/program/rhgb.fc --- nsapolicy/file_contexts/program/rhgb.fc 2005-02-24 14:51:08.000000000 -0500 -+++ policy-1.23.14/file_contexts/program/rhgb.fc 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/file_contexts/program/rhgb.fc 2005-05-02 14:57:26.000000000 -0400 @@ -1,2 +1 @@ /usr/bin/rhgb -- system_u:object_r:rhgb_exec_t -/etc/rhgb(/.*)? -d system_u:object_r:mnt_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/types.fc policy-1.23.14/file_contexts/types.fc --- nsapolicy/file_contexts/types.fc 2005-05-02 14:06:56.000000000 -0400 -+++ policy-1.23.14/file_contexts/types.fc 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/file_contexts/types.fc 2005-05-02 14:57:26.000000000 -0400 @@ -129,6 +129,7 @@ /dev/nvram -c system_u:object_r:memory_device_t /dev/random -c system_u:object_r:random_device_t @@ -312,7 +304,7 @@ /dev/irlpt[0-9]+ -c system_u:object_r:printer_device_t diff --exclude-from=exclude -N -u -r nsapolicy/macros/core_macros.te policy-1.23.14/macros/core_macros.te --- nsapolicy/macros/core_macros.te 2005-05-02 14:06:57.000000000 -0400 -+++ policy-1.23.14/macros/core_macros.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/macros/core_macros.te 2005-05-02 14:57:26.000000000 -0400 @@ -341,7 +341,6 @@ # Get the selinuxfs mount point via /proc/self/mounts. allow $1 proc_t:dir search; @@ -323,7 +315,7 @@ # Access selinuxfs. diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/su_macros.te policy-1.23.14/macros/program/su_macros.te --- nsapolicy/macros/program/su_macros.te 2005-05-02 14:06:57.000000000 -0400 -+++ policy-1.23.14/macros/program/su_macros.te 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/macros/program/su_macros.te 2005-05-02 14:57:26.000000000 -0400 @@ -61,7 +61,7 @@ ') @@ -347,7 +339,7 @@ define(`su_mini_domain', ` diff --exclude-from=exclude -N -u -r nsapolicy/net_contexts policy-1.23.14/net_contexts --- nsapolicy/net_contexts 2005-05-02 14:06:54.000000000 -0400 -+++ policy-1.23.14/net_contexts 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/net_contexts 2005-05-02 14:57:26.000000000 -0400 @@ -227,6 +227,8 @@ portcon tcp 3128 system_u:object_r:http_cache_port_t portcon tcp 8080 system_u:object_r:http_cache_port_t @@ -357,9 +349,21 @@ ifdef(`clockspeed.te', `portcon udp 4041 system_u:object_r:clockspeed_port_t') ifdef(`transproxy.te', `portcon tcp 8081 system_u:object_r:transproxy_port_t') +diff --exclude-from=exclude -N -u -r nsapolicy/targeted/domains/unconfined.te policy-1.23.14/targeted/domains/unconfined.te +--- nsapolicy/targeted/domains/unconfined.te 2005-05-02 14:06:57.000000000 -0400 ++++ policy-1.23.14/targeted/domains/unconfined.te 2005-05-02 16:12:08.000000000 -0400 +@@ -77,3 +77,8 @@ + + # allow reading of default file context + bool read_default_t true; ++ ++if (allow_execmem) { ++allow domain self:process execmem; ++} ++ diff --exclude-from=exclude -N -u -r nsapolicy/tunables/distro.tun policy-1.23.14/tunables/distro.tun --- nsapolicy/tunables/distro.tun 2005-02-24 14:51:09.000000000 -0500 -+++ policy-1.23.14/tunables/distro.tun 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/tunables/distro.tun 2005-05-02 14:57:26.000000000 -0400 @@ -5,7 +5,7 @@ # appropriate ifdefs. @@ -371,7 +375,7 @@ diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.tun policy-1.23.14/tunables/tunable.tun --- nsapolicy/tunables/tunable.tun 2005-04-14 15:01:54.000000000 -0400 -+++ policy-1.23.14/tunables/tunable.tun 2005-05-02 14:51:59.000000000 -0400 ++++ policy-1.23.14/tunables/tunable.tun 2005-05-02 14:57:26.000000000 -0400 @@ -2,7 +2,7 @@ dnl define(`user_can_mount') Index: selinux-policy-targeted.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/devel/selinux-policy-targeted.spec,v retrieving revision 1.292 retrieving revision 1.293 diff -u -r1.292 -r1.293 --- selinux-policy-targeted.spec 2 May 2005 19:02:02 -0000 1.292 +++ selinux-policy-targeted.spec 2 May 2005 20:16:46 -0000 1.293 @@ -11,7 +11,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.23.14 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz @@ -234,6 +234,9 @@ exit 0 %changelog +* Mon May 2 2005 Dan Walsh 1.23.14-2 +- Allow all domains on ppc execmem priv, otherwise it crashes + * Mon May 2 2005 Dan Walsh 1.23.14-1 - Update to latest from NSA * Added afs policy from Andrew Reisse. From fedora-cvs-commits at redhat.com Mon May 2 20:39:06 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 16:39:06 -0400 Subject: rpms/comps-extras/devel .cvsignore, 1.9, 1.10 comps-extras.spec, 1.13, 1.14 sources, 1.12, 1.13 Message-ID: <200505022039.j42Kd6u9013791@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/comps-extras/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13777 Modified Files: .cvsignore comps-extras.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 17 Oct 2004 06:20:39 -0000 1.9 +++ .cvsignore 2 May 2005 20:39:04 -0000 1.10 @@ -1 +1 @@ -comps-extras-10.1.tar.gz +comps-extras-10.2.tar.gz Index: comps-extras.spec =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/comps-extras.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- comps-extras.spec 17 Oct 2004 06:20:39 -0000 1.13 +++ comps-extras.spec 2 May 2005 20:39:04 -0000 1.14 @@ -1,6 +1,6 @@ Summary: Images for components and tools for working with the comps file Name: comps-extras -Version: 10.1 +Version: 10.2 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -33,6 +33,9 @@ %changelog +* Mon May 2 2005 Bill Nottingham - 10.2-1 +- add some icons + * Sun Oct 17 2004 Bill Nottingham - 10.1-1 - fix xfce images (#136046) Index: sources =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 17 Oct 2004 06:20:39 -0000 1.12 +++ sources 2 May 2005 20:39:04 -0000 1.13 @@ -1 +1 @@ -02e0cd706d23f902471dc614590bd14c comps-extras-10.1.tar.gz +cacd747a793887187d8498ef7a9574bc comps-extras-10.2.tar.gz From fedora-cvs-commits at redhat.com Mon May 2 20:58:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 16:58:00 -0400 Subject: rpms/comps-extras/devel sources,1.13,1.14 Message-ID: <200505022058.j42Kw0X4011218@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/comps-extras/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11203 Modified Files: sources Log Message: new spin Index: sources =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 2 May 2005 20:39:04 -0000 1.13 +++ sources 2 May 2005 20:57:58 -0000 1.14 @@ -1 +1 @@ -cacd747a793887187d8498ef7a9574bc comps-extras-10.2.tar.gz +35a047e22d9ab19ca774a361a33940e2 comps-extras-10.2.tar.gz From fedora-cvs-commits at redhat.com Mon May 2 21:22:31 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 17:22:31 -0400 Subject: rpms/eclipse/devel eclipse-combo-bug-backport.patch, NONE, 1.1 eclipse.spec, 1.120, 1.121 eclipse-NPE-debug.ui.patch, 1.1, NONE Message-ID: <200505022122.j42LMVDp014719@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14705 Modified Files: eclipse.spec Added Files: eclipse-combo-bug-backport.patch Removed Files: eclipse-NPE-debug.ui.patch Log Message: - Replace temporary patch to debug.ui with upstream patch to swt (rh#155853). eclipse-combo-bug-backport.patch: SWT/gtk/org/eclipse/swt/widgets/Combo.java | 0 gtk/org/eclipse/swt/widgets/Combo.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE eclipse-combo-bug-backport.patch --- Index: Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java =================================================================== RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java,v retrieving revision 1.127 diff -u -r1.127 Combo.java --- gtk/org/eclipse/swt/widgets/Combo.java 1 Mar 2005 13:01:37 -0000 1.127 +++ gtk/org/eclipse/swt/widgets/Combo.java 2 May 2005 16:58:12 -0000 @@ -1366,7 +1366,7 @@ this.items = new String [items.length]; System.arraycopy (items, 0, this.items, 0, i); lockText = ignoreSelect = false; - OS.gtk_entry_set_text (entryHandle, new byte[0]); + OS.gtk_entry_set_text (entryHandle, new byte[1]); } void setOrientation() { Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- eclipse.spec 30 Apr 2005 19:45:37 -0000 1.120 +++ eclipse.spec 2 May 2005 21:22:29 -0000 1.121 @@ -23,7 +23,7 @@ Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 0.M6.13 +Release: 0.M6.14 License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -88,7 +88,8 @@ #https://bugs.eclipse.org/bugs/show_bug.cgi?id=82988 Patch23: %{name}-importArchivedProj.patch #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155853 -Patch24: %{name}-NPE-debug.ui.patch +#FIXME: should be removed for 3.1M7 +Patch24: %{name}-combo-bug-backport.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ant @@ -282,7 +283,7 @@ pushd plugins/org.eclipse.ui.ide %patch23 -p0 popd -pushd plugins/org.eclipse.debug.ui +pushd plugins/org.eclipse.swt/Eclipse\ SWT %patch24 -p0 popd @@ -1038,6 +1039,9 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0 %changelog +* Mon May 2 2005 Ben Konrath 3.1.0_fc-0.M6.14 +- Replace temporary patch to debug.ui with upstream patch to swt (rh#155853). + * Sat Apr 30 2005 Ben Konrath 3.1.0_fc-0.M6.13 - Add patch to temporarily stop an NPE in debug.ui (rh#155853). --- eclipse-NPE-debug.ui.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 3 02:02:20 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 22:02:20 -0400 Subject: rpms/rhpl/devel .cvsignore, 1.34, 1.35 rhpl.spec, 1.37, 1.38 sources, 1.36, 1.37 Message-ID: <200505030202.j4322KZN015403@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/rhpl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15384/devel Modified Files: .cvsignore rhpl.spec sources Log Message: auto-import rhpl-0.161-1 on branch devel from rhpl-0.161-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 27 Apr 2005 21:14:25 -0000 1.34 +++ .cvsignore 3 May 2005 02:02:14 -0000 1.35 @@ -1 +1 @@ -rhpl-0.160.tar.gz +rhpl-0.161.tar.gz Index: rhpl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- rhpl.spec 27 Apr 2005 21:14:25 -0000 1.37 +++ rhpl.spec 3 May 2005 02:02:14 -0000 1.38 @@ -1,6 +1,6 @@ Summary: Library of python code used by programs in Red Hat Linux Name: rhpl -Version: 0.160 +Version: 0.161 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -38,6 +38,10 @@ %{_datadir}/rhpl %changelog +* Mon May 2 2005 Jeremy Katz - 0.161-1 +- Only default to fbdev X server on ppc64pseries, not all ppc (#149188) +- Set UseFBDev on ppc boxes using ati video cards (#149188) + * Wed Apr 27 2005 Jeremy Katz - 0.160-1 - don't build ethtool stuff on s390 Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 27 Apr 2005 21:14:25 -0000 1.36 +++ sources 3 May 2005 02:02:14 -0000 1.37 @@ -1 +1 @@ -c10cdc29f01c4ad9613f7d7c116069b4 rhpl-0.160.tar.gz +7c33c6361f73b5bfe4892ad6b7b71dd3 rhpl-0.161.tar.gz From fedora-cvs-commits at redhat.com Tue May 3 02:17:11 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 22:17:11 -0400 Subject: rpms/anaconda/devel .cvsignore, 1.106, 1.107 anaconda.spec, 1.221, 1.222 sources, 1.222, 1.223 Message-ID: <200505030217.j432HBRM018690@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18669/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.2.0.58-1 on branch devel from anaconda-10.2.0.58-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- .cvsignore 28 Apr 2005 20:34:29 -0000 1.106 +++ .cvsignore 3 May 2005 02:17:09 -0000 1.107 @@ -1 +1 @@ -anaconda-10.2.0.57.tar.bz2 +anaconda-10.2.0.58.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- anaconda.spec 28 Apr 2005 20:34:29 -0000 1.221 +++ anaconda.spec 3 May 2005 02:17:09 -0000 1.222 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.2.0.57 +Version: 10.2.0.58 Release: 1 License: GPL Summary: Graphical system installer @@ -69,6 +69,13 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon May 2 2005 Jeremy Katz - 10.2.0.58-1 +- Beep on CD insertion, not after +- Fix language support selection (clumens) +- Fix nfsiso (clumens) +- Misc X config fixes for ppc. Boot with "usefbx" to use fbdev + instead again (#149188) + * Thu Apr 28 2005 Jeremy Katz - 10.2.0.57-1 - Fix bind mounts (clumens, #151458) - Fix hard drive installs (clumens) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.222 retrieving revision 1.223 diff -u -r1.222 -r1.223 --- sources 28 Apr 2005 20:34:29 -0000 1.222 +++ sources 3 May 2005 02:17:09 -0000 1.223 @@ -1 +1 @@ -252a46c6e599165984598f29e690ce60 anaconda-10.2.0.57.tar.bz2 +9f0b830adf01da27b3b65beedd7cfdde anaconda-10.2.0.58.tar.bz2 From fedora-cvs-commits at redhat.com Tue May 3 03:03:16 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 23:03:16 -0400 Subject: rpms/evolution-connector/devel .cvsignore, 1.13, 1.14 evolution-connector.spec, 1.23, 1.24 regenerate-patch.sh, 1.3, 1.4 sources, 1.13, 1.14 ximian-connector-2.1.4-generated-autotool.patch, 1.2, 1.3 Message-ID: <200505030303.j4333Gw9009571@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-connector/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9554 Modified Files: .cvsignore evolution-connector.spec regenerate-patch.sh sources ximian-connector-2.1.4-generated-autotool.patch Log Message: * Mon Apr 11 2005 David Malcolm - 2.2.2-1 - 2.2.2 * Thu Mar 17 2005 David Malcolm - 2.2.1-1 - 2.2.1 - Regenerated autotool patch Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 9 Mar 2005 06:46:53 -0000 1.13 +++ .cvsignore 3 May 2005 03:03:12 -0000 1.14 @@ -1 +1 @@ -ximian-connector-2.2.0.tar.bz2 +ximian-connector-2.2.2.tar.bz2 Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- evolution-connector.spec 9 Mar 2005 06:46:53 -0000 1.23 +++ evolution-connector.spec 3 May 2005 03:03:12 -0000 1.24 @@ -9,7 +9,7 @@ %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null) Name: evolution-connector -Version: 2.2.0 +Version: 2.2.2 Release: 1 License: GPL Group: Applications/Productivity @@ -19,7 +19,7 @@ # Patches we apply to the autotool files: Patch0: ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch -#Patch1: ximian-connector-2.1.4-fix-convenience-libraries.patch +Patch1: ximian-connector-2.2.2-noinst-ltlibraries.patch # Patch generated against a pristine source tree after applying the # above patches and then rerunning the autotools. This patch will contain @@ -91,6 +91,13 @@ %{_datadir}/ximian-connector/%{evo_major}/ui/ximian-connector.xml %changelog +* Mon Apr 11 2005 David Malcolm - 2.2.2-1 +- 2.2.2 + +* Thu Mar 17 2005 David Malcolm - 2.2.1-1 +- 2.2.1 +- Regenerated autotool patch + * Wed Mar 9 2005 David Malcolm - 2.2.0-1 - 2.2.0 - Updated evolution dependency to 2.2.0 Index: regenerate-patch.sh =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/regenerate-patch.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- regenerate-patch.sh 2 Mar 2005 01:55:45 -0000 1.3 +++ regenerate-patch.sh 3 May 2005 03:03:12 -0000 1.4 @@ -1,5 +1,5 @@ #!/bin/sh -BASE_NAME=ximian-connector-2.1.6 +BASE_NAME=ximian-connector-2.2.2 TARBALL_NAME=$BASE_NAME.tar.bz2 INPUT_PATCHES="ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch" Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 9 Mar 2005 06:46:53 -0000 1.13 +++ sources 3 May 2005 03:03:12 -0000 1.14 @@ -1 +1 @@ -10ee14a8670c36c24f1d13021257c0ce ximian-connector-2.2.0.tar.bz2 +2cee47bdf6030d30a5ac82e5028b58ed ximian-connector-2.2.2.tar.bz2 ximian-connector-2.1.4-generated-autotool.patch: ximian-connector-2.2.2-patched/Makefile.in | 477 ximian-connector-2.2.2-patched/acinclude.m4 | 22 ximian-connector-2.2.2-patched/aclocal.m4 |14675 ++++------ ximian-connector-2.2.2-patched/addressbook/Makefile.in | 370 ximian-connector-2.2.2-patched/autom4te.cache |only ximian-connector-2.2.2-patched/calendar/Makefile.in | 374 ximian-connector-2.2.2-patched/camel/Makefile.in | 433 ximian-connector-2.2.2-patched/configure | 1160 ximian-connector-2.2.2-patched/docs/Makefile.in | 343 ximian-connector-2.2.2-patched/docs/ietf/Makefile.in | 239 ximian-connector-2.2.2-patched/docs/reference/Makefile.in | 274 ximian-connector-2.2.2-patched/lib/Makefile.in | 556 ximian-connector-2.2.2-patched/mail/Makefile.in | 366 ximian-connector-2.2.2-patched/shell/Makefile.in | 450 ximian-connector-2.2.2-patched/storage/Makefile.in | 593 ximian-connector-2.2.2-patched/xntlm/Makefile.in | 362 ximian-connector-2.2.2-pristine/Makefile |only ximian-connector-2.2.2-pristine/acinclude.m4.autotool-results |only ximian-connector-2.2.2-pristine/aclocal.m4.autotool-results |only ximian-connector-2.2.2-pristine/addressbook/.deps |only ximian-connector-2.2.2-pristine/addressbook/Makefile |only ximian-connector-2.2.2-pristine/addressbook/Makefile.in.autotool-results |only ximian-connector-2.2.2-pristine/calendar/.deps |only ximian-connector-2.2.2-pristine/calendar/Makefile |only ximian-connector-2.2.2-pristine/calendar/Makefile.in.autotool-results |only ximian-connector-2.2.2-pristine/camel/.deps |only ximian-connector-2.2.2-pristine/camel/Makefile |only ximian-connector-2.2.2-pristine/camel/Makefile.in.autotool-results |only ximian-connector-2.2.2-pristine/config.h |only ximian-connector-2.2.2-pristine/config.log |only ximian-connector-2.2.2-pristine/config.status |only ximian-connector-2.2.2-pristine/configure.autotool-results |only ximian-connector-2.2.2-pristine/docs/Makefile |only ximian-connector-2.2.2-pristine/docs/Makefile.in.autotool-results |only ximian-connector-2.2.2-pristine/docs/ietf/Makefile |only ximian-connector-2.2.2-pristine/docs/ietf/Makefile.in.autotool-results |only ximian-connector-2.2.2-pristine/docs/reference/Makefile |only ximian-connector-2.2.2-pristine/docs/reference/Makefile.in.autotool-results |only ximian-connector-2.2.2-pristine/intltool-extract |only ximian-connector-2.2.2-pristine/intltool-merge |only ximian-connector-2.2.2-pristine/intltool-update |only ximian-connector-2.2.2-pristine/lib/.deps |only ximian-connector-2.2.2-pristine/lib/.libs |only ximian-connector-2.2.2-pristine/lib/Makefile |only ximian-connector-2.2.2-pristine/lib/Makefile.am.autotool-results |only ximian-connector-2.2.2-pristine/lib/e2k-action.lo |only ximian-connector-2.2.2-pristine/lib/e2k-action.o |only ximian-connector-2.2.2-pristine/lib/e2k-autoconfig.lo |only ximian-connector-2.2.2-pristine/lib/e2k-autoconfig.o |only ximian-connector-2.2.2-pristine/lib/e2k-context.lo |only ximian-connector-2.2.2-pristine/lib/e2k-context.o |only ximian-connector-2.2.2-pristine/lib/e2k-encoding-utils.lo |only ximian-connector-2.2.2-pristine/lib/e2k-encoding-utils.o |only ximian-connector-2.2.2-pristine/lib/e2k-freebusy.lo |only ximian-connector-2.2.2-pristine/lib/e2k-freebusy.o |only ximian-connector-2.2.2-pristine/lib/e2k-global-catalog.lo |only ximian-connector-2.2.2-pristine/lib/e2k-global-catalog.o |only ximian-connector-2.2.2-pristine/lib/e2k-http-utils.lo |only ximian-connector-2.2.2-pristine/lib/e2k-http-utils.o |only ximian-connector-2.2.2-pristine/lib/e2k-kerberos.lo |only ximian-connector-2.2.2-pristine/lib/e2k-kerberos.o |only ximian-connector-2.2.2-pristine/lib/e2k-marshal.c |only ximian-connector-2.2.2-pristine/lib/e2k-marshal.h |only ximian-connector-2.2.2-pristine/lib/e2k-marshal.lo |only ximian-connector-2.2.2-pristine/lib/e2k-marshal.o |only ximian-connector-2.2.2-pristine/lib/e2k-operation.lo |only ximian-connector-2.2.2-pristine/lib/e2k-operation.o |only ximian-connector-2.2.2-pristine/lib/e2k-path.lo |only ximian-connector-2.2.2-pristine/lib/e2k-path.o |only ximian-connector-2.2.2-pristine/lib/e2k-properties.lo |only ximian-connector-2.2.2-pristine/lib/e2k-properties.o |only ximian-connector-2.2.2-pristine/lib/e2k-propnames.c |only ximian-connector-2.2.2-pristine/lib/e2k-propnames.h |only ximian-connector-2.2.2-pristine/lib/e2k-proptags.h |only ximian-connector-2.2.2-pristine/lib/e2k-restriction.lo |only ximian-connector-2.2.2-pristine/lib/e2k-restriction.o |only ximian-connector-2.2.2-pristine/lib/e2k-result.lo |only ximian-connector-2.2.2-pristine/lib/e2k-result.o |only ximian-connector-2.2.2-pristine/lib/e2k-rule-xml.lo |only ximian-connector-2.2.2-pristine/lib/e2k-rule-xml.o |only ximian-connector-2.2.2-pristine/lib/e2k-rule.lo |only ximian-connector-2.2.2-pristine/lib/e2k-rule.o |only ximian-connector-2.2.2-pristine/lib/e2k-security-descriptor.lo |only ximian-connector-2.2.2-pristine/lib/e2k-security-descriptor.o |only ximian-connector-2.2.2-pristine/lib/e2k-sid.lo |only ximian-connector-2.2.2-pristine/lib/e2k-sid.o |only ximian-connector-2.2.2-pristine/lib/e2k-uri.lo |only ximian-connector-2.2.2-pristine/lib/e2k-uri.o |only ximian-connector-2.2.2-pristine/lib/e2k-user-dialog.lo |only ximian-connector-2.2.2-pristine/lib/e2k-user-dialog.o |only ximian-connector-2.2.2-pristine/lib/e2k-utils.lo |only ximian-connector-2.2.2-pristine/lib/e2k-utils.o |only ximian-connector-2.2.2-pristine/lib/e2k-xml-utils.lo |only ximian-connector-2.2.2-pristine/lib/e2k-xml-utils.o |only ximian-connector-2.2.2-pristine/libtool |only ximian-connector-2.2.2-pristine/mail/.deps |only ximian-connector-2.2.2-pristine/mail/Makefile |only ximian-connector-2.2.2-pristine/po/Makefile |only ximian-connector-2.2.2-pristine/po/Makefile.in |only ximian-connector-2.2.2-pristine/po/POTFILES |only ximian-connector-2.2.2-pristine/shell/.deps |only ximian-connector-2.2.2-pristine/shell/Makefile |only ximian-connector-2.2.2-pristine/stamp-h1 |only ximian-connector-2.2.2-pristine/storage/.deps |only ximian-connector-2.2.2-pristine/storage/Makefile |only ximian-connector-2.2.2-pristine/xntlm/.deps |only ximian-connector-2.2.2-pristine/xntlm/.libs |only ximian-connector-2.2.2-pristine/xntlm/Makefile |only ximian-connector-2.2.2-pristine/xntlm/libxntlm.la |only ximian-connector-2.2.2-pristine/xntlm/xntlm-des.lo |only ximian-connector-2.2.2-pristine/xntlm/xntlm-des.o |only ximian-connector-2.2.2-pristine/xntlm/xntlm-md4.lo |only ximian-connector-2.2.2-pristine/xntlm/xntlm-md4.o |only ximian-connector-2.2.2-pristine/xntlm/xntlm.lo |only ximian-connector-2.2.2-pristine/xntlm/xntlm.o |only 115 files changed, 10997 insertions(+), 9697 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 ximian-connector-2.1.4-generated-autotool.patch Index: ximian-connector-2.1.4-generated-autotool.patch =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/ximian-connector-2.1.4-generated-autotool.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ximian-connector-2.1.4-generated-autotool.patch 2 Mar 2005 01:55:45 -0000 1.2 +++ ximian-connector-2.1.4-generated-autotool.patch 3 May 2005 03:03:12 -0000 1.3 @@ -1,6 +1,6 @@ -diff --recursive -up ximian-connector-2.1.6-pristine/acinclude.m4 ximian-connector-2.1.6-patched/acinclude.m4 ---- ximian-connector-2.1.6-pristine/acinclude.m4 2004-08-13 21:31:34.000000000 -0400 -+++ ximian-connector-2.1.6-patched/acinclude.m4 2005-03-01 20:52:34.252433453 -0500 +diff --recursive -up ximian-connector-2.2.2-pristine/acinclude.m4 ximian-connector-2.2.2-patched/acinclude.m4 +--- ximian-connector-2.2.2-pristine/acinclude.m4 2004-08-13 14:16:45.000000000 -0400 ++++ ximian-connector-2.2.2-patched/acinclude.m4 2005-05-02 22:20:38.000000000 -0400 @@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [ AC_ARG_WITH(openldap, [ --with-openldap=[no/yes/PREFIX] Enable LDAP support in evolution]) AC_ARG_WITH(static-ldap, [ --with-static-ldap=[no/yes] Link LDAP support statically into evolution ]) @@ -54,20 +54,22 @@ else LDAP_LIBS="-lldap $LDAP_LIBS" fi], -Only in ximian-connector-2.1.6-pristine: acinclude.m4.autotool-results -diff --recursive -up ximian-connector-2.1.6-pristine/aclocal.m4 ximian-connector-2.1.6-patched/aclocal.m4 ---- ximian-connector-2.1.6-pristine/aclocal.m4 2005-03-01 00:23:01.000000000 -0500 -+++ ximian-connector-2.1.6-patched/aclocal.m4 2005-03-01 20:52:43.700082078 -0500 -@@ -1,6 +1,6 @@ +Only in ximian-connector-2.2.2-pristine: acinclude.m4.autotool-results +diff --recursive -up ximian-connector-2.2.2-pristine/aclocal.m4 ximian-connector-2.2.2-patched/aclocal.m4 +--- ximian-connector-2.2.2-pristine/aclocal.m4 2005-04-06 09:16:16.000000000 -0400 ++++ ximian-connector-2.2.2-patched/aclocal.m4 2005-05-02 22:20:46.000000000 -0400 +@@ -1,7 +1,7 @@ -# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- -+# generated automatically by aclocal 1.9.2 -*- Autoconf -*- ++# generated automatically by aclocal 1.9.5 -*- Autoconf -*- -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 - # Free Software Foundation, Inc. +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, -@@ -11,3915 +11,3673 @@ + # with or without modifications, as long as this notice is preserved. +@@ -11,3703 +11,3704 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @@ -429,12 +431,8 @@ - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes -+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+ else -+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - +- fi +- - dnl do we want to do a version check? -ifelse([$1],[],, - [gtk_doc_min_version=$1 @@ -452,27 +450,45 @@ - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE + fi + +- AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) +- AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") +-]) + AC_ARG_WITH(gconf-source, + [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) -+ + +-# AM_CONDITIONAL -*- Autoconf -*- + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -+ + +-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi ++ fi -- AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) -- AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") --]) +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. + AC_ARG_WITH(gconf-schema-file-dir, + [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) --# AM_CONDITIONAL -*- Autoconf -*- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. + AC_SUBST(GCONF_SCHEMA_FILE_DIR) + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) --# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. + AC_ARG_ENABLE(schemas-install, + [ --disable-schemas-install Disable the schemas installation], + [case "${enableval}" in @@ -483,25 +499,10 @@ + AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test x$schemas_install = xtrue) +]) --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +-# serial 5 +# Configure paths for GLIB +# Owen Taylor 1997-2001 --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 5 -- -AC_PREREQ(2.52) - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) @@ -617,11 +618,11 @@ +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or +dnl gthread is specified in MODULES, pass to pkg-config - dnl ++dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config -+dnl + dnl +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) @@ -928,6 +929,12 @@ - openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" - ;; +- *) +- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros @@ -939,7 +946,8 @@ +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl -+ + +-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], @@ -953,7 +961,13 @@ + [Define if your file defines LC_MESSAGES.]) + fi + fi]) -+ + +-# Only perform the check for file, if the check method requires it +-case $deplibs_check_method in +-file_magic*) +- if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC +- fi +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, @@ -966,12 +980,9 @@ +[case "[$]$1" in [...19406 lines suppressed...] + $(KRB5_LIBS) - serverdir = $(libdir)/bonobo/servers @@ -24715,7 +24994,7 @@ imagesdir = $(CONNECTOR_DATADIR)/images images_DATA = \ connector.png \ -@@ -307,7 +430,6 @@ images_DATA = \ +@@ -309,7 +432,6 @@ images_DATA = \ exchange-delegates-48.png \ exchange-oof-48.png @@ -24723,7 +25002,7 @@ gladedir = $(CONNECTOR_DATADIR)/glade glade_DATA = \ exchange-autoconfig-wizard.glade \ -@@ -318,14 +440,11 @@ glade_DATA = \ +@@ -320,14 +442,11 @@ glade_DATA = \ exchange-folder-tree.glade \ exchange-passwd-expiry.glade @@ -24738,7 +25017,7 @@ EXTRA_DIST = \ $(server_in_files) \ $(server_DATA) \ -@@ -333,122 +452,50 @@ EXTRA_DIST = \ +@@ -335,122 +454,50 @@ EXTRA_DIST = \ $(glade_DATA) \ $(ui_DATA) @@ -24891,7 +25170,7 @@ else :; fi; \ done -@@ -456,8 +503,8 @@ uninstall-EVOLUTION_privlibexecPROGRAMS: +@@ -458,8 +505,8 @@ uninstall-EVOLUTION_privlibexecPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(EVOLUTION_privlibexec_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -24902,7 +25181,7 @@ done clean-EVOLUTION_privlibexecPROGRAMS: -@@ -484,7 +531,7 @@ ximian-connector-setup$(EXEEXT): $(ximia +@@ -486,7 +533,7 @@ ximian-connector-setup$(EXEEXT): $(ximia $(LINK) $(ximian_connector_setup_LDFLAGS) $(ximian_connector_setup_OBJECTS) $(ximian_connector_setup_LDADD) $(LIBS) mostlyclean-compile: @@ -24911,7 +25190,7 @@ distclean-compile: -rm -f *.tab.c -@@ -516,27 +563,26 @@ distclean-compile: +@@ -518,27 +565,26 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xc-commands.Po at am__quote@ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ximian-connector-setup.Po at am__quote@ @@ -24954,7 +25233,7 @@ mostlyclean-libtool: -rm -f *.lo -@@ -547,84 +593,75 @@ clean-libtool: +@@ -549,84 +595,75 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: @@ -25067,7 +25346,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ -@@ -633,6 +670,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS +@@ -635,6 +672,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique @@ -25075,7 +25354,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -644,8 +682,24 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -646,8 +684,24 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ @@ -25102,7 +25381,7 @@ $$tags $$unique GTAGS: -@@ -654,19 +708,21 @@ GTAGS: +@@ -656,19 +710,21 @@ GTAGS: && gtags -i $(GTAGS_ARGS) $$here distclean-tags: @@ -25131,7 +25410,7 @@ else \ dir=''; \ fi; \ -@@ -684,10 +740,10 @@ distdir: $(DISTFILES) +@@ -686,10 +742,10 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(DATA) @@ -25145,7 +25424,7 @@ install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -699,7 +755,7 @@ install-am: all-am +@@ -701,7 +757,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ @@ -25154,7 +25433,7 @@ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: -@@ -707,7 +763,7 @@ mostlyclean-generic: +@@ -709,7 +765,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -25163,7 +25442,7 @@ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -719,20 +775,23 @@ clean-am: clean-EVOLUTION_privlibexecPRO +@@ -721,20 +777,23 @@ clean-am: clean-EVOLUTION_privlibexecPRO clean-libtool clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am @@ -25192,7 +25471,7 @@ install-exec-am: install-EVOLUTION_privlibexecPROGRAMS \ install-exec-local -@@ -744,7 +803,8 @@ install-man: +@@ -746,7 +805,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am @@ -25202,7 +25481,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -@@ -752,25 +812,34 @@ mostlyclean: mostlyclean-am +@@ -754,25 +814,34 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool @@ -25252,18 +25531,22 @@ install-exec-local: ximian-connector-setup -diff --recursive -up ximian-connector-2.1.6-pristine/xntlm/Makefile.in ximian-connector-2.1.6-patched/xntlm/Makefile.in ---- ximian-connector-2.1.6-pristine/xntlm/Makefile.in 2005-03-01 00:23:15.000000000 -0500 -+++ ximian-connector-2.1.6-patched/xntlm/Makefile.in 2005-03-01 20:52:56.365270471 -0500 +Only in ximian-connector-2.2.2-pristine/xntlm: .deps +Only in ximian-connector-2.2.2-pristine/xntlm: .libs +Only in ximian-connector-2.2.2-pristine/xntlm: libxntlm.la +Only in ximian-connector-2.2.2-pristine/xntlm: Makefile +diff --recursive -up ximian-connector-2.2.2-pristine/xntlm/Makefile.in ximian-connector-2.2.2-patched/xntlm/Makefile.in +--- ximian-connector-2.2.2-pristine/xntlm/Makefile.in 2005-04-06 09:16:34.000000000 -0400 ++++ ximian-connector-2.2.2-patched/xntlm/Makefile.in 2005-05-02 22:20:57.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. -+# Makefile.in generated by automake 1.9.2 from Makefile.am. ++# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004 Free Software Foundation, Inc. ++# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -25346,11 +25629,11 @@ +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ ++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) -+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libxntlm_la_SOURCES) +DIST_SOURCES = $(libxntlm_la_SOURCES) @@ -25862,3 +26145,9 @@ uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. +Only in ximian-connector-2.2.2-pristine/xntlm: xntlm-des.lo +Only in ximian-connector-2.2.2-pristine/xntlm: xntlm-des.o +Only in ximian-connector-2.2.2-pristine/xntlm: xntlm.lo +Only in ximian-connector-2.2.2-pristine/xntlm: xntlm-md4.lo +Only in ximian-connector-2.2.2-pristine/xntlm: xntlm-md4.o +Only in ximian-connector-2.2.2-pristine/xntlm: xntlm.o From fedora-cvs-commits at redhat.com Tue May 3 03:08:21 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 May 2005 23:08:21 -0400 Subject: rpms/evolution-connector/devel evolution-connector.spec,1.24,1.25 Message-ID: <200505030308.j4338LUP009680@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-connector/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9667 Modified Files: evolution-connector.spec Log Message: * Mon May 2 2005 David Malcolm - 2.2.2-2 - disabling noinst patch as not yet applied Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- evolution-connector.spec 3 May 2005 03:03:12 -0000 1.24 +++ evolution-connector.spec 3 May 2005 03:08:19 -0000 1.25 @@ -10,7 +10,7 @@ Name: evolution-connector Version: 2.2.2 -Release: 1 +Release: 2 License: GPL Group: Applications/Productivity URL: http://ftp.gnome.org/pub/gnome/sources/ximian-connector/2.1/ @@ -19,7 +19,7 @@ # Patches we apply to the autotool files: Patch0: ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch -Patch1: ximian-connector-2.2.2-noinst-ltlibraries.patch +#Patch1: ximian-connector-2.2.2-noinst-ltlibraries.patch # Patch generated against a pristine source tree after applying the # above patches and then rerunning the autotools. This patch will contain @@ -91,6 +91,9 @@ %{_datadir}/ximian-connector/%{evo_major}/ui/ximian-connector.xml %changelog +* Mon May 2 2005 David Malcolm - 2.2.2-2 +- disabling noinst patch as not yet applied + * Mon Apr 11 2005 David Malcolm - 2.2.2-1 - 2.2.2 From fedora-cvs-commits at redhat.com Tue May 3 07:57:39 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 03:57:39 -0400 Subject: rpms/net-snmp/devel net-snmp.spec,1.39,1.40 Message-ID: <200505030757.j437vdti017262@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17250 Modified Files: net-snmp.spec Log Message: - libs dependecies Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- net-snmp.spec 19 Apr 2005 11:09:07 -0000 1.39 +++ net-snmp.spec 3 May 2005 07:57:37 -0000 1.40 @@ -113,6 +113,7 @@ %package libs Group: Development/Libraries +Requires: %{name} = %{version}-%{release} Summary: The NET-SNMP runtime libraries. %description libs From fedora-cvs-commits at redhat.com Tue May 3 09:51:55 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 05:51:55 -0400 Subject: rpms/xterm/devel xterm-resources-redhat.patch, 1.3, 1.4 xterm.spec, 1.11, 1.12 Message-ID: <200505030951.j439ptkt012203@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xterm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12189 Modified Files: xterm-resources-redhat.patch xterm.spec Log Message: - Updated xterm-resources-redhat.patch to enable xterm utf8 resource by default, as our default OS environment is UTF-8, for bug (#138681) xterm-resources-redhat.patch: XTerm-col.ad | 10 +++++----- XTerm.ad | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) Index: xterm-resources-redhat.patch =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/xterm-resources-redhat.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xterm-resources-redhat.patch 8 Mar 2005 22:14:29 -0000 1.3 +++ xterm-resources-redhat.patch 3 May 2005 09:51:52 -0000 1.4 @@ -1,3 +1,9 @@ +Fixes the following bugs, among others: + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=49315 + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=138681 + + + --- XTerm-col.ad.orig 2004-07-12 20:41:24.000000000 -0400 +++ XTerm-col.ad 2005-03-08 16:27:22.198725952 -0500 @@ -12,11 +12,11 @@ @@ -28,7 +34,7 @@ ! Disclaimer: there are no standard colors used in terminal emulation. --- XTerm.ad.orig 2005-03-08 16:32:20.628357752 -0500 +++ XTerm.ad 2005-03-08 16:31:08.602307376 -0500 -@@ -116,3 +116,44 @@ +@@ -116,3 +116,47 @@ *tek4014*font2: 8x13 *tek4014*font3: 6x13 *tek4014*fontSmall: 6x10 @@ -73,3 +79,6 @@ + +! Bug fix for bugzilla bug #49315 +*VT100*eightBitInput: false ++ ++! Red Hat bugzilla #138681 (failsafe xterm has non-utf locale while environment is set to utf) ++*VT100*utf8: true Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xterm.spec 16 Apr 2005 16:51:26 -0000 1.11 +++ xterm.spec 3 May 2005 09:51:52 -0000 1.12 @@ -4,7 +4,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm Version: 200 -Release: 6 +Release: 7 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -76,6 +76,10 @@ %{_x11bindir}/xterm %changelog +* Mon May 2 2005 Mike A. Harris 200-7 +- Updated xterm-resources-redhat.patch to enable xterm utf8 resource by + default, as our default OS environment is UTF-8, for bug (#138681) + * Sat Apr 16 2005 Mike A. Harris 200-6 - Added option to spec file to allow easy rebuilding with 256 color option for those who prefer this non-default behaviour (#103402) From fedora-cvs-commits at redhat.com Tue May 3 09:58:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 05:58:38 -0400 Subject: rpms/openoffice.org/devel openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch, NONE, 1.1 .cvsignore, 1.41, 1.42 openoffice.org.spec, 1.178, 1.179 sources, 1.60, 1.61 openoffice.org-1.9.95.gcc21233.noquotesonjavaver.patch, 1.1, NONE Message-ID: <200505030958.j439wc3X006068@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6052 Modified Files: .cvsignore openoffice.org.spec sources Added Files: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch Removed Files: openoffice.org-1.9.95.gcc21233.noquotesonjavaver.patch Log Message: bump to next version openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch: source/svrtf/rtfitem.cxx | 0 svx/source/svrtf/rtfitem.cxx | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch --- Index: source/svrtf/rtfitem.cxx =================================================================== RCS file: /cvs/graphics/svx/source/svrtf/rtfitem.cxx,v retrieving revision 1.24 diff -u -p -r1.24 rtfitem.cxx --- openoffice.org.orig/svx/source/svrtf/rtfitem.cxx 16 Feb 2005 17:56:39 -0000 1.24 +++ openoffice.org/svx/source/svrtf/rtfitem.cxx 3 May 2005 09:35:22 -0000 @@ -1342,6 +1342,7 @@ ATTR_SETEMPHASIS: void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet ) { + bool bMethodOwnsToken = false; // dann lese doch mal alle TabStops ein SvxTabStop aTabStop; SvxTabStopItem aAttr( 0, 0, SVX_TAB_ADJUST_DEFAULT, PARDID->nTabStop ); @@ -1392,7 +1393,8 @@ void SvxRTFParser::ReadTabAttr( int nTok aTabStop.GetDecimal() = BYTE(nTokenValue & 0xff); aTabStop.GetFill() = BYTE((nTokenValue >> 8) & 0xff); // ueberlese noch die schliessende Klammer - GetNextToken(); + if (bMethodOwnsToken) + GetNextToken(); } if( nSkip ) { @@ -1406,7 +1408,10 @@ void SvxRTFParser::ReadTabAttr( int nTok bWeiter = FALSE; } if( bWeiter ) + { nToken = GetNextToken(); + bMethodOwnsToken = true; + } } while( bWeiter ); // mit Defaults aufuellen fehlt noch !!! Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 29 Apr 2005 13:09:10 -0000 1.41 +++ .cvsignore 3 May 2005 09:58:35 -0000 1.42 @@ -98,3 +98,4 @@ openoffice.org-jakubicons.tar.gz SRC680_m97.tar.bz2 SRC680_m98.tar.bz2 +SRC680_m99.tar.bz2 Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- openoffice.org.spec 29 Apr 2005 17:50:53 -0000 1.178 +++ openoffice.org.spec 3 May 2005 09:58:35 -0000 1.179 @@ -1,4 +1,4 @@ -%define ooo2ver 98 +%define ooo2ver 99 #undef to get english only and no-langpacks for a quick smoketest build %define langpacks 1 %if %{langpacks} @@ -83,11 +83,11 @@ Patch28: openoffice.org-1.9.92.oooXXXXX.addindic.patch Patch29: workspace.db4-2.patch Patch30: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch -Patch31: openoffice.org-1.9.95.gcc21233.noquotesonjavaver.patch -Patch32: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch -Patch33: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch -Patch34: openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch -Patch35: openoffice.org-1.9.97.rh156067.noversionedicons.patch +Patch31: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch +Patch32: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch +Patch33: openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch +Patch34: openoffice.org-1.9.97.rh156067.noversionedicons.patch +Patch35: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch %define instdir %{_libdir}/openoffice.org%{version} @@ -667,11 +667,11 @@ %patch28 -p1 -b .oooXXXXX.addindic.patch %patch29 -p1 -b .workspace.db4-2.patch %patch30 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch -%patch31 -p1 -b .gcc21233.noquotesonjavaver.patch -%patch32 -p1 -b .ooo35641.noxfonts.vcl.patch -%patch33 -p1 -b .ooo48256.nolongname.sysui.patch -%patch34 -p1 -b .ooo48362.checkzipresult.sc.patch -%patch35 -p1 -b .rh156067.noversionedicons.patch +%patch31 -p1 -b .ooo35641.noxfonts.vcl.patch +%patch32 -p1 -b .ooo48256.nolongname.sysui.patch +%patch33 -p1 -b .ooo48362.checkzipresult.sc.patch +%patch34 -p1 -b .rh156067.noversionedicons.patch +%patch35 -p1 -b .ooo48600.rtfparseerror.svx.patch #start ludicrous workaround #while we include these libs we need this, if/when we move to system @@ -2430,7 +2430,12 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Fri Apr 29 2005 Caolan McNamara - 1:1.9.98-1-UNBUILT +* Tue May 03 2005 Caolan McNamara - 1:1.9.99-1 +- add openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch +- drop openoffice.org-1.9.95.gcc21233.noquotesonjavaver.patch as of + gcc 4.0.0-2 + +* Fri Apr 29 2005 Caolan McNamara - 1:1.9.98-1 - bump to next version - drop integrated workspace.mhu06.patch - a better idea for the rh#156039# provides problem along the valgrind.spec Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 29 Apr 2005 13:52:57 -0000 1.60 +++ sources 3 May 2005 09:58:35 -0000 1.61 @@ -5,5 +5,5 @@ a66c6ab52b2eb2deaa7ff85595276b15 GSI_ta-IN.sdf acf1fd0931af26b8bb68003a8e31d5c5 db-3.2.9.patch 4df5c7051b11411e0a970f6c91613942 db-3.2.9.tar.gz -1044dc5c91e4d57e495f4fbbef353717 SRC680_m98.tar.bz2 176aa81d51a6ed28c5e9a14696a8d208 openoffice.org-jakubicons.tar.gz +91788bf3c11fc1b568c949fbcb0df69f SRC680_m99.tar.bz2 --- openoffice.org-1.9.95.gcc21233.noquotesonjavaver.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 3 10:03:02 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 06:03:02 -0400 Subject: rpms/xterm/FC-3 xterm-resources-redhat.patch, 1.1, 1.2 xterm.spec, 1.4, 1.5 Message-ID: <200505031003.j43A32Ax006205@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xterm/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv6191 Modified Files: xterm-resources-redhat.patch xterm.spec Log Message: - Enabled xterm-resources-redhat.patch to fix various bugs caused due to it being inadvertently disabled for so long. - Updated xterm-resources-redhat.patch to enable xterm utf8 resource by default, as our default OS environment is UTF-8, for bug (#138681) xterm-resources-redhat.patch: XTerm-col.ad | 10 +++++----- XTerm.ad | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) Index: xterm-resources-redhat.patch =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-3/xterm-resources-redhat.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xterm-resources-redhat.patch 9 Sep 2004 15:04:59 -0000 1.1 +++ xterm-resources-redhat.patch 3 May 2005 10:03:00 -0000 1.2 @@ -1,7 +1,13 @@ ---- XTerm.ad.xtermresources Sat Jan 5 17:05:02 2002 -+++ XTerm.ad Wed Jan 23 14:51:59 2002 -@@ -112,11 +112,11 @@ - *VT100*dynamicColors: on +Fixes the following bugs, among others: + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=49315 + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=138681 + + + +--- XTerm-col.ad.orig 2004-07-12 20:41:24.000000000 -0400 ++++ XTerm-col.ad 2005-03-08 16:27:22.198725952 -0500 +@@ -12,11 +12,11 @@ + !*VT100*background: black ! Uncomment this to use color for underline attribute -!*VT100*colorULMode: on @@ -15,7 +21,7 @@ ! Uncomment this to use the bold/underline colors in preference to other colors !*VT100*colorAttrMode: on -@@ -137,5 +137,49 @@ +@@ -37,8 +37,8 @@ *VT100*color13: magenta *VT100*color14: cyan *VT100*color15: white @@ -23,6 +29,15 @@ -*VT100*colorBD: white +*VT100*colorUL: green4 +*VT100*colorBD: blue3 + + + ! Disclaimer: there are no standard colors used in terminal emulation. +--- XTerm.ad.orig 2005-03-08 16:32:20.628357752 -0500 ++++ XTerm.ad 2005-03-08 16:31:08.602307376 -0500 +@@ -116,3 +116,47 @@ + *tek4014*font2: 8x13 + *tek4014*font3: 6x13 + *tek4014*fontSmall: 6x10 + +! keyboard setup +*VT100*backarrowKey: false @@ -59,11 +74,11 @@ + : scroll-forw(5,line) + +! Provide plenty of scrollback -+*VT100*saveLines: 2500 ++! Upstream xterm now defaults to 1024 instead of 64 *VT100*saveLines: 2500 +*VT100*scrollBar: true + +! Bug fix for bugzilla bug #49315 +*VT100*eightBitInput: false + -+ -+ ++! Red Hat bugzilla #138681 (failsafe xterm has non-utf locale while environment is set to utf) ++*VT100*utf8: true Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-3/xterm.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xterm.spec 9 Sep 2004 15:06:34 -0000 1.4 +++ xterm.spec 3 May 2005 10:03:00 -0000 1.5 @@ -4,7 +4,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm Version: 192 -Release: 1 +Release: 1.FC3.0 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -27,7 +27,7 @@ # is totally retarded. chmod -R u+w . %patch0 -p0 -b .can-2003-0063 -#%patch1 -p0 -b .resources-redhat +%patch1 -p0 -b .resources-redhat %ifarch ppc ppc64 %patch2 -p0 -b .ppc-fix-bug-101472 %endif @@ -71,6 +71,12 @@ %{_x11bindir}/xterm %changelog +* Mon May 2 2005 Mike A. Harris 192-1.FC3.0 +- Enabled xterm-resources-redhat.patch to fix various bugs caused due to it + being inadvertently disabled for so long. +- Updated xterm-resources-redhat.patch to enable xterm utf8 resource by + default, as our default OS environment is UTF-8, for bug (#138681) + * Fri Jul 13 2004 Mike A. Harris 192-1 - Updated main tarball to xterm-192 for FC3 devel - Resolved bugs #126569,127132 From fedora-cvs-commits at redhat.com Tue May 3 10:14:30 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 06:14:30 -0400 Subject: rpms/glibc/devel .cvsignore, 1.98, 1.99 glibc-fedora.patch, 1.83, 1.84 glibc.spec, 1.149, 1.150 sources, 1.115, 1.116 Message-ID: <200505031014.j43AEUn1006560@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6533/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.3.5-5 on branch devel from glibc-2.3.5-5.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- .cvsignore 28 Apr 2005 09:50:59 -0000 1.98 +++ .cvsignore 3 May 2005 10:14:26 -0000 1.99 @@ -1,2 +1,2 @@ -glibc-20050428T0846.tar.bz2 -glibc-fedora-20050428T0846.tar.bz2 +glibc-20050503T0852.tar.bz2 +glibc-fedora-20050503T0852.tar.bz2 glibc-fedora.patch: ChangeLog | 40 + ChangeLog.11 | 21 ChangeLog.12 | 12 ChangeLog.15 | 45 ++ Versions.def | 2 csu/elf-init.c | 18 debug/Versions | 6 debug/fgets_chk.c | 2 debug/fgets_u_chk.c | 2 debug/getcwd_chk.c | 3 debug/getwd_chk.c | 3 debug/pread64_chk.c | 3 debug/pread_chk.c | 3 debug/read_chk.c | 3 debug/readlink_chk.c | 3 debug/recv_chk.c | 3 debug/recvfrom_chk.c | 3 debug/tst-chk1.c | 9 elf/dl-load.c | 30 + elf/dl-support.c | 5 elf/ldconfig.c | 25 - elf/rtld.c | 104 ++++ elf/tst-tls10.h | 4 iconv/iconvconfig.c | 55 +- include/features.h | 10 intl/locale.alias | 2 libio/bits/stdio2.h | 34 - libio/stdio.h | 2 linuxthreads/ChangeLog | 34 + linuxthreads/Makefile | 7 linuxthreads/cancel.c | 1 linuxthreads/lockfile.c | 6 linuxthreads/semaphore.h | 1 linuxthreads/sysdeps/alpha/tls.h | 46 +- linuxthreads/sysdeps/i386/tls.h | 9 linuxthreads/sysdeps/ia64/tls.h | 9 linuxthreads/sysdeps/powerpc/tls.h | 12 linuxthreads/sysdeps/pthread/Makefile | 12 linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym | 13 linuxthreads/sysdeps/s390/tls.h | 9 linuxthreads/sysdeps/sh/tls.h | 9 linuxthreads/sysdeps/sparc/tls.h | 9 linuxthreads/sysdeps/x86_64/tls.h | 9 linuxthreads/tst-tls1.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 + localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/en_US | 1 localedata/locales/no_NO | 69 +++ localedata/locales/zh_TW | 6 math/Versions | 9 nptl/ChangeLog | 10 nptl/Makefile | 8 nptl/descr.h | 4 nptl/pthread_cond_destroy.c | 30 + nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nscd/connections.c | 52 ++ nscd/nscd.c | 8 nscd/nscd.conf | 4 nscd/nscd_conf.c | 5 posix/Makefile | 19 posix/bits/unistd.h | 58 -- posix/getconf.speclist.h | 15 socket/bits/socket2.h | 18 sysdeps/generic/dl-cache.h | 8 sysdeps/generic/w_exp2.c | 4 sysdeps/i386/Versions | 7 sysdeps/i386/bits/atomic.h | 410 +++++++++++++++++++ sysdeps/ia64/Makefile | 4 sysdeps/ia64/Versions | 7 sysdeps/ia64/ia64libgcc.S | 350 ---------------- sysdeps/ia64/libgcc-compat.c | 84 +++ sysdeps/m68k/Versions | 7 sysdeps/mips/mips64/Versions | 7 sysdeps/posix/posix_fallocate.c | 43 + sysdeps/posix/posix_fallocate64.c | 43 + sysdeps/sparc/sparc64/Versions | 7 sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/readonly-area.c | 5 sysdeps/unix/sysv/linux/tcsetattr.c | 32 + sysdeps/x86_64/Versions | 7 version.h | 2 91 files changed, 1534 insertions(+), 629 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- glibc-fedora.patch 28 Apr 2005 09:50:59 -0000 1.83 +++ glibc-fedora.patch 3 May 2005 10:14:26 -0000 1.84 @@ -1,6 +1,19 @@ ---- glibc-20050428T0846/ChangeLog 28 Apr 2005 06:27:13 -0000 1.9339 -+++ glibc-20050428T0846-fedora/ChangeLog 28 Apr 2005 09:10:04 -0000 1.8782.2.96 -@@ -3,6 +3,14 @@ +--- glibc-20050503T0852/ChangeLog 2 May 2005 20:15:34 -0000 1.9349 ++++ glibc-20050503T0852-fedora/ChangeLog 3 May 2005 09:39:07 -0000 1.8782.2.98 +@@ -1,3 +1,12 @@ ++2005-04-29 Jakub Jelinek ++ ++ * sysdeps/posix/posix_fallocate.c (posix_fallocate): If len == 0, ++ call ftruncate if offset is bigger than current size. Make sure ++ the file is offset + len bytes long if that is more than current size. ++ Don't overwrite previous content of the file. ++ * sysdeps/posix/posix_fallocate64.c (__posix_fallocate64_l64): ++ Likewise. ++ + 2005-05-02 Roland McGrath + + [BZ #924] +@@ -98,6 +107,14 @@ * nscd/connections.c (nscd_run): Use time() value in prune_cache call, not timeout value, since the latter might be from another clock. @@ -15,7 +28,7 @@ 2005-04-27 Roland McGrath [BZ #877] -@@ -618,17 +626,6 @@ +@@ -713,17 +730,6 @@ 2005-03-28 Roland McGrath @@ -33,7 +46,7 @@ * locale/langinfo.h (_NL_LOCALE_NAME): New macro. [__USE_GNU] (NL_LOCALE_NAME): New macro. * locale/nl_langinfo.c: Grok special item value for _NL_LOCALE_NAME, -@@ -1697,6 +1694,18 @@ +@@ -1792,6 +1798,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -52,8 +65,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20050428T0846/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20050428T0846-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050503T0852/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20050503T0852-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -103,8 +116,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20050428T0846/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20050428T0846-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050503T0852/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20050503T0852-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -131,8 +144,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20050428T0846/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20050428T0846-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20050503T0852/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20050503T0852-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -213,8 +226,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20050428T0846/Versions.def 28 Mar 2005 20:42:44 -0000 1.61 -+++ glibc-20050428T0846-fedora/Versions.def 24 Mar 2005 08:18:51 -0000 1.58.2.3 +--- glibc-20050503T0852/Versions.def 28 Mar 2005 20:42:44 -0000 1.61 ++++ glibc-20050503T0852-fedora/Versions.def 24 Mar 2005 08:18:51 -0000 1.58.2.3 @@ -20,7 +20,6 @@ libc { GLIBC_2.3.2 GLIBC_2.3.3 @@ -231,16 +244,16 @@ } libnsl { GLIBC_2.0 ---- glibc-20050428T0846/version.h 20 Dec 2004 23:37:41 -0000 1.67 -+++ glibc-20050428T0846-fedora/version.h 15 Apr 2005 09:32:42 -0000 1.65.2.4 +--- glibc-20050503T0852/version.h 20 Dec 2004 23:37:41 -0000 1.67 ++++ glibc-20050503T0852-fedora/version.h 15 Apr 2005 09:32:42 -0000 1.65.2.4 @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ #define RELEASE "development" -#define VERSION "2.3.90" +#define VERSION "2.3.5" ---- glibc-20050428T0846/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 -+++ glibc-20050428T0846-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 +--- glibc-20050503T0852/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 ++++ glibc-20050503T0852-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 @@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo extern void (*__init_array_end []) (void) attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden; @@ -266,8 +279,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20050428T0846/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 -+++ glibc-20050428T0846-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 +--- glibc-20050503T0852/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 ++++ glibc-20050503T0852-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 @@ -18,10 +18,4 @@ libc { __printf_chk; __fprintf_chk; __vprintf_chk; __vfprintf_chk; __gets_chk; @@ -279,8 +292,8 @@ - __recv_chk; __recvfrom_chk; - } } ---- glibc-20050428T0846/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050428T0846-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050503T0852/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050503T0852-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -30,6 +30,7 @@ #include #include @@ -294,8 +307,8 @@ return result; } +#endif ---- glibc-20050428T0846/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050428T0846-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050503T0852/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050503T0852-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -30,6 +30,7 @@ #include #include @@ -309,8 +322,8 @@ return result; } +#endif ---- glibc-20050428T0846/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 -+++ glibc-20050428T0846-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 +--- glibc-20050503T0852/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 ++++ glibc-20050503T0852-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 @@ -20,7 +20,7 @@ #include #include @@ -325,8 +338,8 @@ return __getcwd (buf, size); } +#endif ---- glibc-20050428T0846/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050428T0846-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050503T0852/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050503T0852-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -20,7 +20,7 @@ #include #include @@ -341,8 +354,8 @@ link_warning (getwd, "the `getwd' function is dangerous and should not be used.") +#endif ---- glibc-20050428T0846/debug/pread64_chk.c 19 Mar 2005 00:08:11 -0000 1.4 -+++ glibc-20050428T0846-fedora/debug/pread64_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 +--- glibc-20050503T0852/debug/pread64_chk.c 19 Mar 2005 00:08:11 -0000 1.4 ++++ glibc-20050503T0852-fedora/debug/pread64_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 @@ -19,7 +19,7 @@ #include #include @@ -357,8 +370,8 @@ return __pread64 (fd, buf, nbytes, offset); } +#endif ---- glibc-20050428T0846/debug/pread_chk.c 19 Mar 2005 00:07:31 -0000 1.4 -+++ glibc-20050428T0846-fedora/debug/pread_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 +--- glibc-20050503T0852/debug/pread_chk.c 19 Mar 2005 00:07:31 -0000 1.4 ++++ glibc-20050503T0852-fedora/debug/pread_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 @@ -19,7 +19,7 @@ #include #include @@ -373,8 +386,8 @@ return __pread (fd, buf, nbytes, offset); } +#endif ---- glibc-20050428T0846/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 -+++ glibc-20050428T0846-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 +--- glibc-20050503T0852/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 ++++ glibc-20050503T0852-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 @@ -23,7 +23,7 @@ # include #endif @@ -389,8 +402,8 @@ #endif } +#endif ---- glibc-20050428T0846/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 -+++ glibc-20050428T0846-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 +--- glibc-20050503T0852/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 ++++ glibc-20050503T0852-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 @@ -23,7 +23,7 @@ # include #endif @@ -405,8 +418,8 @@ #endif } +#endif ---- glibc-20050428T0846/debug/recv_chk.c 6 Mar 2005 21:24:42 -0000 1.2 -+++ glibc-20050428T0846-fedora/debug/recv_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 +--- glibc-20050503T0852/debug/recv_chk.c 6 Mar 2005 21:24:42 -0000 1.2 ++++ glibc-20050503T0852-fedora/debug/recv_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 @@ -19,7 +19,7 @@ #include #include @@ -421,8 +434,8 @@ return __recv (fd, buf, n, flags); } +#endif ---- glibc-20050428T0846/debug/recvfrom_chk.c 6 Mar 2005 21:24:16 -0000 1.2 -+++ glibc-20050428T0846-fedora/debug/recvfrom_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 +--- glibc-20050503T0852/debug/recvfrom_chk.c 6 Mar 2005 21:24:16 -0000 1.2 ++++ glibc-20050503T0852-fedora/debug/recvfrom_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 @@ -19,7 +19,7 @@ #include #include @@ -437,8 +450,8 @@ return __recvfrom (fd, buf, n, flags, addr, addr_len); } +#endif ---- glibc-20050428T0846/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 -+++ glibc-20050428T0846-fedora/debug/tst-chk1.c 19 Mar 2005 21:04:10 -0000 1.1.2.10 +--- glibc-20050503T0852/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 ++++ glibc-20050503T0852-fedora/debug/tst-chk1.c 19 Mar 2005 21:04:10 -0000 1.1.2.10 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -476,8 +489,8 @@ CHK_FAIL_START if (getwd (getcwdbuf + 2) != getcwdbuf + 2) FAIL (); ---- glibc-20050428T0846/elf/dl-load.c 26 Apr 2005 04:25:58 -0000 1.268 -+++ glibc-20050428T0846-fedora/elf/dl-load.c 27 Apr 2005 11:40:21 -0000 1.249.2.12 +--- glibc-20050503T0852/elf/dl-load.c 26 Apr 2005 04:25:58 -0000 1.268 ++++ glibc-20050503T0852-fedora/elf/dl-load.c 27 Apr 2005 11:40:21 -0000 1.249.2.12 @@ -644,7 +644,7 @@ _dl_init_paths (const char *llp) /* First set up the rest of the default search directory entries. */ @@ -522,8 +535,8 @@ static void __attribute__ ((noreturn, noinline)) lose (int code, int fd, const char *name, char *realname, struct link_map *l, ---- glibc-20050428T0846/elf/dl-support.c 7 Apr 2005 20:57:04 -0000 1.88 -+++ glibc-20050428T0846-fedora/elf/dl-support.c 15 Apr 2005 09:32:44 -0000 1.84.2.5 +--- glibc-20050503T0852/elf/dl-support.c 7 Apr 2005 20:57:04 -0000 1.88 ++++ glibc-20050503T0852-fedora/elf/dl-support.c 15 Apr 2005 09:32:44 -0000 1.84.2.5 @@ -281,6 +281,11 @@ _dl_non_dynamic_init (void) if (_dl_platform != NULL) _dl_platformlen = strlen (_dl_platform); @@ -536,8 +549,8 @@ /* Scan for a program header telling us the stack is nonexecutable. */ if (_dl_phdr != NULL) for (uint_fast16_t i = 0; i < _dl_phnum; ++i) ---- glibc-20050428T0846/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 -+++ glibc-20050428T0846-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 +--- glibc-20050503T0852/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 ++++ glibc-20050503T0852-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 @@ -953,17 +953,19 @@ search_dirs (void) @@ -619,8 +632,8 @@ } search_dirs (); ---- glibc-20050428T0846/elf/rtld.c 7 Apr 2005 20:56:48 -0000 1.351 -+++ glibc-20050428T0846-fedora/elf/rtld.c 27 Apr 2005 11:40:21 -0000 1.330.2.18 +--- glibc-20050503T0852/elf/rtld.c 7 Apr 2005 20:56:48 -0000 1.351 ++++ glibc-20050503T0852-fedora/elf/rtld.c 27 Apr 2005 11:40:21 -0000 1.330.2.18 @@ -1335,6 +1335,59 @@ ld.so does not support TLS, but program ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded; ++GL(dl_load_adds); @@ -739,8 +752,8 @@ if (__builtin_expect (*first_preload != NULL, 0)) { /* Set up PRELOADS with a vector of the preloaded libraries. */ ---- glibc-20050428T0846/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 -+++ glibc-20050428T0846-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 +--- glibc-20050503T0852/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 ++++ glibc-20050503T0852-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 @@ -1,8 +1,8 @@ #include #include @@ -752,8 +765,8 @@ # define USE_TLS__THREAD struct A ---- glibc-20050428T0846/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 -+++ glibc-20050428T0846-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 +--- glibc-20050503T0852/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 ++++ glibc-20050503T0852-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -830,8 +843,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20050428T0846/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 -+++ glibc-20050428T0846-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 +--- glibc-20050503T0852/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 ++++ glibc-20050503T0852-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 @@ -262,7 +262,13 @@ # define __USE_REENTRANT 1 #endif @@ -856,8 +869,8 @@ #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) ---- glibc-20050428T0846/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20050428T0846-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20050503T0852/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20050503T0852-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -867,8 +880,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20050428T0846/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 -+++ glibc-20050428T0846-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 +--- glibc-20050503T0852/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 ++++ glibc-20050503T0852-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -882,8 +895,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20050428T0846/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20050428T0846-fedora/libio/bits/stdio2.h 19 Mar 2005 20:18:03 -0000 1.1.2.5 +--- glibc-20050503T0852/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20050503T0852-fedora/libio/bits/stdio2.h 19 Mar 2005 20:18:03 -0000 1.1.2.5 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -954,8 +967,8 @@ return __fgets_unlocked_alias (__s, __n, __stream); } #endif ---- glibc-20050428T0846/linuxthreads/ChangeLog 27 Apr 2005 16:56:50 -0000 1.846 -+++ glibc-20050428T0846-fedora/linuxthreads/ChangeLog 27 Apr 2005 19:25:34 -0000 1.817.2.23 +--- glibc-20050503T0852/linuxthreads/ChangeLog 27 Apr 2005 16:56:50 -0000 1.846 ++++ glibc-20050503T0852-fedora/linuxthreads/ChangeLog 27 Apr 2005 19:25:34 -0000 1.817.2.23 @@ -813,6 +813,12 @@ (pthread_barrierattr_setpshared): Return EINVAL if pshared is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. @@ -1004,8 +1017,8 @@ * descr.h (struct _pthread_descr_struct): Provide p_res member even if USE_TLS && HAVE___THREAD. * sysdeps/pthread/res-state.c (__res_state): Return __resp ---- glibc-20050428T0846/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 -+++ glibc-20050428T0846-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 +--- glibc-20050503T0852/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 ++++ glibc-20050503T0852-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 @@ -245,15 +245,18 @@ $(addprefix $(objpfx), \ $(filter-out $(tests-static) $(tests-reverse) unload, \ $(tests) $(test-srcs))): $(objpfx)libpthread.so \ @@ -1027,8 +1040,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a ---- glibc-20050428T0846/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 -+++ glibc-20050428T0846-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 +--- glibc-20050503T0852/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 ++++ glibc-20050503T0852-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 @@ -230,5 +230,6 @@ void __pthread_perform_cleanup(char *cur } @@ -1036,8 +1049,8 @@ + THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); __libc_thread_freeres (); } ---- glibc-20050428T0846/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 -+++ glibc-20050428T0846-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 +--- glibc-20050503T0852/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 ++++ glibc-20050503T0852-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 @@ -74,7 +74,11 @@ __fresetlockfiles (void) __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); @@ -1051,8 +1064,8 @@ __pthread_mutexattr_destroy (&attr); ---- glibc-20050428T0846/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 -+++ glibc-20050428T0846-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 +--- glibc-20050503T0852/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 ++++ glibc-20050503T0852-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 @@ -21,6 +21,7 @@ # define __need_timespec # include @@ -1061,8 +1074,8 @@ #ifndef _PTHREAD_DESCR_DEFINED /* Thread descriptors. Needed for `sem_t' definition. */ ---- glibc-20050428T0846/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 -+++ glibc-20050428T0846-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 +--- glibc-20050503T0852/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 ++++ glibc-20050503T0852-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 @@ -2,7 +2,7 @@ #include #include @@ -1072,8 +1085,8 @@ struct tls_obj { ---- glibc-20050428T0846/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 -+++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 +--- glibc-20050503T0852/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 ++++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 @@ -58,54 +58,76 @@ typedef struct # include @@ -1163,8 +1176,8 @@ /* Get the thread descriptor definition. */ # include ---- glibc-20050428T0846/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 -+++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 +--- glibc-20050503T0852/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 ++++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 @@ -86,7 +86,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1181,8 +1194,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050428T0846/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 -+++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 +--- glibc-20050503T0852/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 ++++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 @@ -65,7 +65,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1199,8 +1212,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050428T0846/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 -+++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 +--- glibc-20050503T0852/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 ++++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 @@ -69,11 +69,19 @@ typedef struct # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) @@ -1223,8 +1236,8 @@ TCB + 0x7000 (per the ABI). This implies that TCB address is TP - 0x7000. As we define TLS_DTV_AT_TP we can assume that the pthread_descr is allocated immediately ahead of the ---- glibc-20050428T0846/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 -+++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 +--- glibc-20050503T0852/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 ++++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 @@ -12,3 +12,15 @@ endif ifeq ($(subdir),posix) CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../linuxthreads/Banner)\"" @@ -1241,8 +1254,8 @@ + @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ +endif +endif ---- glibc-20050428T0846/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 +--- glibc-20050503T0852/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 @@ -0,0 +1,13 @@ +#ifdef HAVE_TLS_SUPPORT +# ifndef HAVE_FORCED_UNWIND @@ -1257,8 +1270,8 @@ +#ifdef HAVE_TLS_SUPPORT +NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) +#endif ---- glibc-20050428T0846/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 -+++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 +--- glibc-20050503T0852/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 ++++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 @@ -77,7 +77,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1275,8 +1288,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050428T0846/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 -+++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 +--- glibc-20050503T0852/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 ++++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1293,8 +1306,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050428T0846/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 -+++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 +--- glibc-20050503T0852/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 ++++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1311,8 +1324,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050428T0846/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 -+++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 +--- glibc-20050503T0852/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 ++++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 @@ -71,7 +71,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1329,8 +1342,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050428T0846/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 -+++ glibc-20050428T0846-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 +--- glibc-20050503T0852/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 ++++ glibc-20050503T0852-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1422,8 +1435,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20050428T0846/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20050428T0846-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20050503T0852/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20050503T0852-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 @@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -1467,8 +1480,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20050428T0846/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20050428T0846-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20050503T0852/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 ++++ glibc-20050503T0852-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1477,9 +1490,9 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20050428T0846/localedata/SUPPORTED 20 Mar 2005 04:16:36 -0000 1.74 -+++ glibc-20050428T0846-fedora/localedata/SUPPORTED 24 Mar 2005 08:19:04 -0000 1.71.2.4 -@@ -64,6 +64,7 @@ cy_GB.UTF-8/UTF-8 \ +--- glibc-20050503T0852/localedata/SUPPORTED 28 Apr 2005 14:21:30 -0000 1.75 ++++ glibc-20050503T0852-fedora/localedata/SUPPORTED 3 May 2005 09:28:25 -0000 1.71.2.5 +@@ -68,6 +68,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ da_DK/ISO-8859-1 \ @@ -1487,7 +1500,7 @@ de_AT.UTF-8/UTF-8 \ de_AT/ISO-8859-1 \ de_AT at euro/ISO-8859-15 \ -@@ -90,6 +91,7 @@ en_DK.UTF-8/UTF-8 \ +@@ -94,6 +95,7 @@ en_DK.UTF-8/UTF-8 \ en_DK/ISO-8859-1 \ en_GB.UTF-8/UTF-8 \ en_GB/ISO-8859-1 \ @@ -1495,7 +1508,7 @@ en_HK.UTF-8/UTF-8 \ en_HK/ISO-8859-1 \ en_IE.UTF-8/UTF-8 \ -@@ -104,6 +106,7 @@ en_SG.UTF-8/UTF-8 \ +@@ -108,6 +110,7 @@ en_SG.UTF-8/UTF-8 \ en_SG/ISO-8859-1 \ en_US.UTF-8/UTF-8 \ en_US/ISO-8859-1 \ @@ -1503,25 +1516,25 @@ en_ZA.UTF-8/UTF-8 \ en_ZA/ISO-8859-1 \ en_ZW.UTF-8/UTF-8 \ -@@ -244,6 +247,8 @@ nl_NL/ISO-8859-1 \ +@@ -253,6 +256,8 @@ nl_NL/ISO-8859-1 \ nl_NL at euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ +no_NO.UTF-8/UTF-8 \ +no_NO/ISO-8859-1 \ + oc_FR.UTF-8/UTF-8 \ oc_FR/ISO-8859-1 \ om_ET/UTF-8 \ - om_KE/ISO-8859-1 \ -@@ -283,6 +288,7 @@ sv_FI/ISO-8859-1 \ +@@ -297,6 +302,7 @@ sv_FI/ISO-8859-1 \ sv_FI at euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ +sv_SE.ISO-8859-15/ISO-8859-15 \ ta_IN/UTF-8 \ te_IN/UTF-8 \ - tg_TJ/KOI8-T \ ---- glibc-20050428T0846/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20050428T0846-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 + tg_TJ.UTF-8/UTF-8 \ +--- glibc-20050503T0852/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20050503T0852-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -1536,8 +1549,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20050428T0846/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20050428T0846-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20050503T0852/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20050503T0852-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -1549,8 +1562,8 @@ date_fmt "/ / " ---- glibc-20050428T0846/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 -+++ glibc-20050428T0846-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 +--- glibc-20050503T0852/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 ++++ glibc-20050503T0852-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 @@ -100,7 +100,6 @@ mon " "";/ "";/ @@ -1559,8 +1572,8 @@ % Appropriate date and time representation (%c) % "%a %d %b %Y %r %Z" d_t_fmt "" ---- glibc-20050428T0846/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050428T0846-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20050503T0852/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050503T0852-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1631,8 +1644,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20050428T0846/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20050428T0846-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20050503T0852/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20050503T0852-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1660,8 +1673,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20050428T0846/math/Versions 28 Mar 2005 20:42:43 -0000 1.9 -+++ glibc-20050428T0846-fedora/math/Versions 26 Feb 2000 01:04:00 -0000 1.8 +--- glibc-20050503T0852/math/Versions 28 Mar 2005 20:42:43 -0000 1.9 ++++ glibc-20050503T0852-fedora/math/Versions 26 Feb 2000 01:04:00 -0000 1.8 @@ -94,7 +94,7 @@ libm { } GLIBC_2.1 { @@ -1683,8 +1696,8 @@ - exp2l; - } } ---- glibc-20050428T0846/nptl/ChangeLog 27 Apr 2005 16:53:38 -0000 1.776 -+++ glibc-20050428T0846-fedora/nptl/ChangeLog 27 Apr 2005 19:25:34 -0000 1.706.2.43 +--- glibc-20050503T0852/nptl/ChangeLog 27 Apr 2005 16:53:38 -0000 1.776 ++++ glibc-20050503T0852-fedora/nptl/ChangeLog 27 Apr 2005 19:25:34 -0000 1.706.2.43 @@ -620,6 +620,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1709,8 +1722,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20050428T0846/nptl/Makefile 27 Apr 2005 09:55:18 -0000 1.167 -+++ glibc-20050428T0846-fedora/nptl/Makefile 27 Apr 2005 11:31:25 -0000 1.157.2.10 +--- glibc-20050503T0852/nptl/Makefile 27 Apr 2005 09:55:18 -0000 1.167 ++++ glibc-20050503T0852-fedora/nptl/Makefile 27 Apr 2005 11:31:25 -0000 1.157.2.10 @@ -499,15 +499,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1733,8 +1746,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20050428T0846/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 -+++ glibc-20050428T0846-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 +--- glibc-20050503T0852/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 ++++ glibc-20050503T0852-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 @@ -27,9 +27,13 @@ #include #include @@ -1749,8 +1762,8 @@ #include "../nptl_db/thread_db.h" #include #ifdef HAVE_FORCED_UNWIND ---- glibc-20050428T0846/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20050428T0846-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20050503T0852/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 ++++ glibc-20050503T0852-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 @@ -44,15 +44,35 @@ __pthread_cond_destroy (cond) broadcasted, but still are using the pthread_cond_t structure, pthread_cond_destroy needs to wait for them. */ @@ -1792,8 +1805,8 @@ } return 0; ---- glibc-20050428T0846/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050428T0846-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20050503T0852/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050503T0852-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1801,8 +1814,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20050428T0846/nscd/connections.c 28 Apr 2005 06:26:10 -0000 1.67 -+++ glibc-20050428T0846-fedora/nscd/connections.c 28 Apr 2005 09:10:12 -0000 1.55.2.8 +--- glibc-20050503T0852/nscd/connections.c 28 Apr 2005 06:26:10 -0000 1.67 ++++ glibc-20050503T0852-fedora/nscd/connections.c 28 Apr 2005 09:10:12 -0000 1.55.2.8 @@ -21,6 +21,7 @@ #include #include @@ -1893,8 +1906,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20050428T0846/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 -+++ glibc-20050428T0846-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 +--- glibc-20050503T0852/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 ++++ glibc-20050503T0852-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 @@ -122,9 +122,16 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1920,8 +1933,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20050428T0846/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 -+++ glibc-20050428T0846-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +--- glibc-20050503T0852/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 ++++ glibc-20050503T0852-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 @@ -31,8 +31,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1933,8 +1946,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20050428T0846/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 -+++ glibc-20050428T0846-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 +--- glibc-20050503T0852/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 ++++ glibc-20050503T0852-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 @@ -230,7 +230,10 @@ nscd_parse_file (const char *fname, stru if (strcmp (arg2, "no") == 0) dbs[cnt].shared = 0; @@ -1947,8 +1960,8 @@ break; } if (cnt == lastdb) ---- glibc-20050428T0846/posix/Makefile 14 Apr 2005 21:19:34 -0000 1.184 -+++ glibc-20050428T0846-fedora/posix/Makefile 15 Apr 2005 09:32:51 -0000 1.171.2.12 +--- glibc-20050503T0852/posix/Makefile 14 Apr 2005 21:19:34 -0000 1.184 ++++ glibc-20050503T0852-fedora/posix/Makefile 15 Apr 2005 09:32:51 -0000 1.171.2.12 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1982,8 +1995,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20050428T0846/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050428T0846-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20050503T0852/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050503T0852-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -2000,8 +2013,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20050428T0846/posix/bits/unistd.h 20 Mar 2005 16:48:41 -0000 1.8 -+++ glibc-20050428T0846-fedora/posix/bits/unistd.h 20 Mar 2005 18:12:27 -0000 1.3.2.4 +--- glibc-20050503T0852/posix/bits/unistd.h 20 Mar 2005 16:48:41 -0000 1.8 ++++ glibc-20050503T0852-fedora/posix/bits/unistd.h 20 Mar 2005 18:12:27 -0000 1.3.2.4 @@ -21,25 +21,19 @@ # error "Never include directly; use instead." #endif @@ -2119,8 +2132,8 @@ - return __getwd_alias (__buf); -} -#endif ---- glibc-20050428T0846/socket/bits/socket2.h 19 Mar 2005 00:13:57 -0000 1.5 -+++ glibc-20050428T0846-fedora/socket/bits/socket2.h 19 Mar 2005 20:18:08 -0000 1.2.2.5 +--- glibc-20050503T0852/socket/bits/socket2.h 19 Mar 2005 00:13:57 -0000 1.5 ++++ glibc-20050503T0852-fedora/socket/bits/socket2.h 19 Mar 2005 20:18:08 -0000 1.2.2.5 @@ -21,24 +21,18 @@ # error "Never include directly; use instead." #endif @@ -2161,8 +2174,8 @@ + __chk_fail (); return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len); } ---- glibc-20050428T0846/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20050428T0846-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20050503T0852/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20050503T0852-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -2178,8 +2191,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20050428T0846/sysdeps/generic/w_exp2.c 28 Mar 2005 20:42:42 -0000 1.3 -+++ glibc-20050428T0846-fedora/sysdeps/generic/w_exp2.c 6 Jun 2001 12:40:16 -0000 1.2 +--- glibc-20050503T0852/sysdeps/generic/w_exp2.c 28 Mar 2005 20:42:42 -0000 1.3 ++++ glibc-20050503T0852-fedora/sysdeps/generic/w_exp2.c 6 Jun 2001 12:40:16 -0000 1.2 @@ -31,6 +31,6 @@ __exp2 (double x) /* wrapper exp2 */ } weak_alias (__exp2, exp2) @@ -2189,8 +2202,8 @@ +strong_alias (__exp2, __expl2) +weak_alias (__exp2, expl2) #endif ---- glibc-20050428T0846/sysdeps/i386/Versions 28 Mar 2005 20:42:43 -0000 1.5 -+++ glibc-20050428T0846-fedora/sysdeps/i386/Versions 29 Apr 2003 22:47:20 -0000 1.4 +--- glibc-20050503T0852/sysdeps/i386/Versions 28 Mar 2005 20:42:43 -0000 1.5 ++++ glibc-20050503T0852-fedora/sysdeps/i386/Versions 29 Apr 2003 22:47:20 -0000 1.4 @@ -20,10 +20,3 @@ libc { __strspn_cg; __strspn_g; __strstr_cg; __strstr_g; } @@ -2202,8 +2215,8 @@ - exp2l; - } -} ---- glibc-20050428T0846/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050428T0846-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 +--- glibc-20050503T0852/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050503T0852-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 @@ -0,0 +1,410 @@ +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -2615,8 +2628,8 @@ + + +#define atomic_delay() asm ("rep; nop") ---- glibc-20050428T0846/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20050428T0846-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20050503T0852/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20050503T0852-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -2628,8 +2641,8 @@ endif endif ---- glibc-20050428T0846/sysdeps/ia64/Versions 28 Mar 2005 20:42:43 -0000 1.10 -+++ glibc-20050428T0846-fedora/sysdeps/ia64/Versions 3 May 2002 07:10:31 -0000 1.9 +--- glibc-20050503T0852/sysdeps/ia64/Versions 28 Mar 2005 20:42:43 -0000 1.10 ++++ glibc-20050503T0852-fedora/sysdeps/ia64/Versions 3 May 2002 07:10:31 -0000 1.9 @@ -12,10 +12,3 @@ libc { __multi3; } @@ -2641,8 +2654,8 @@ - exp2l; - } -} ---- glibc-20050428T0846/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20050428T0846-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20050503T0852/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20050503T0852-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -2994,8 +3007,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20050428T0846/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050428T0846-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050503T0852/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050503T0852-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3081,8 +3094,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20050428T0846/sysdeps/m68k/Versions 28 Mar 2005 20:42:42 -0000 1.2 -+++ glibc-20050428T0846-fedora/sysdeps/m68k/Versions 29 Jan 1999 09:06:03 -0000 1.1 +--- glibc-20050503T0852/sysdeps/m68k/Versions 28 Mar 2005 20:42:42 -0000 1.2 ++++ glibc-20050503T0852-fedora/sysdeps/m68k/Versions 29 Jan 1999 09:06:03 -0000 1.1 @@ -4,10 +4,3 @@ libc { __divdi3; __moddi3; __udivdi3; __umoddi3; } @@ -3094,8 +3107,8 @@ - exp2l; - } -} ---- glibc-20050428T0846/sysdeps/mips/mips64/Versions 28 Mar 2005 20:42:43 -0000 1.1 -+++ glibc-20050428T0846-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000 +--- glibc-20050503T0852/sysdeps/mips/mips64/Versions 28 Mar 2005 20:42:43 -0000 1.1 ++++ glibc-20050503T0852-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -libm { - GLIBC_2.1 { @@ -3104,8 +3117,158 @@ - exp2l; - } -} ---- glibc-20050428T0846/sysdeps/sparc/sparc64/Versions 28 Mar 2005 20:42:42 -0000 1.2 -+++ glibc-20050428T0846-fedora/sysdeps/sparc/sparc64/Versions 19 May 1999 14:21:36 -0000 1.1 +--- glibc-20050503T0852/sysdeps/posix/posix_fallocate.c 22 Aug 2003 18:08:29 -0000 1.5 ++++ glibc-20050503T0852-fedora/sysdeps/posix/posix_fallocate.c 3 May 2005 09:39:16 -0000 1.5.2.1 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2000, 2003 Free Software Foundation, Inc. ++/* Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -29,9 +29,8 @@ posix_fallocate (int fd, __off_t offset, + { + struct stat64 st; + struct statfs f; +- size_t step; + +- /* `off_t? is a signed type. Therefore we can determine whether ++ /* `off_t' is a signed type. Therefore we can determine whether + OFFSET + LEN is too large if it is a negative value. */ + if (offset < 0 || len < 0) + return EINVAL; +@@ -47,24 +46,48 @@ posix_fallocate (int fd, __off_t offset, + if (! S_ISREG (st.st_mode)) + return ENODEV; + ++ if (len == 0) ++ { ++ if (st.st_size < offset) ++ { ++ int ret = __ftruncate (fd, offset); ++ ++ if (ret != 0) ++ ret = errno; ++ return ret; ++ } ++ return 0; ++ } ++ + /* We have to know the block size of the filesystem to get at least some + sort of performance. */ + if (__fstatfs (fd, &f) != 0) + return errno; + +- /* Align OFFSET to block size and adjust LEN. */ +- step = (offset + f.f_bsize - 1) % ~f.f_bsize; +- offset += step; ++ /* Try to play safe. */ ++ if (f.f_bsize == 0) ++ f.f_bsize = 512; + + /* Write something to every block. */ +- while (len > step) ++ for (offset += (len - 1) % f.f_bsize; len > 0; offset += f.f_bsize) + { +- len -= step; ++ len -= f.f_bsize; ++ ++ if (offset < st.st_size) ++ { ++ unsigned char c; ++ ssize_t rsize = __pread (fd, &c, 1, offset); ++ ++ if (rsize < 0) ++ return errno; ++ /* If there is a non-zero byte, the block must have been ++ allocated already. */ ++ else if (rsize == 1 && c != 0) ++ continue; ++ } + + if (__pwrite (fd, "", 1, offset) != 1) + return errno; +- +- offset += step; + } + + return 0; +--- glibc-20050503T0852/sysdeps/posix/posix_fallocate64.c 10 Mar 2004 09:28:25 -0000 1.5 ++++ glibc-20050503T0852-fedora/sysdeps/posix/posix_fallocate64.c 3 May 2005 09:39:16 -0000 1.5.2.1 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc. ++/* Copyright (C) 2000, 2003, 2004, 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -29,9 +29,8 @@ __posix_fallocate64_l64 (int fd, __off64 + { + struct stat64 st; + struct statfs64 f; +- size_t step; + +- /* `off64_t? is a signed type. Therefore we can determine whether ++ /* `off64_t' is a signed type. Therefore we can determine whether + OFFSET + LEN is too large if it is a negative value. */ + if (offset < 0 || len < 0) + return EINVAL; +@@ -47,24 +46,48 @@ __posix_fallocate64_l64 (int fd, __off64 + if (! S_ISREG (st.st_mode)) + return ENODEV; + ++ if (len == 0) ++ { ++ if (st.st_size < offset) ++ { ++ int ret = __ftruncate64 (fd, offset); ++ ++ if (ret != 0) ++ ret = errno; ++ return ret; ++ } ++ return 0; ++ } ++ + /* We have to know the block size of the filesystem to get at least some + sort of performance. */ + if (__fstatfs64 (fd, &f) != 0) + return errno; + +- /* Align OFFSET to block size and adjust LEN. */ +- step = (offset + f.f_bsize - 1) % ~f.f_bsize; +- offset += step; ++ /* Try to play safe. */ ++ if (f.f_bsize == 0) ++ f.f_bsize = 512; + + /* Write something to every block. */ +- while (len > step) ++ for (offset += (len - 1) % f.f_bsize; len > 0; offset += f.f_bsize) + { +- len -= step; ++ len -= f.f_bsize; ++ ++ if (offset < st.st_size) ++ { ++ unsigned char c; ++ ssize_t rsize = __pread64 (fd, &c, 1, offset); ++ ++ if (rsize < 0) ++ return errno; ++ /* If there is a non-zero byte, the block must have been ++ allocated already. */ ++ else if (rsize == 1 && c != 0) ++ continue; ++ } + + if (__pwrite64 (fd, "", 1, offset) != 1) + return errno; +- +- offset += step; + } + + return 0; +--- glibc-20050503T0852/sysdeps/sparc/sparc64/Versions 28 Mar 2005 20:42:42 -0000 1.2 ++++ glibc-20050503T0852-fedora/sysdeps/sparc/sparc64/Versions 19 May 1999 14:21:36 -0000 1.1 @@ -5,10 +5,3 @@ libc { __align_cpy_8; __align_cpy_16; } @@ -3117,8 +3280,8 @@ - exp2l; - } -} ---- glibc-20050428T0846/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20050428T0846-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20050503T0852/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20050503T0852-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -3133,8 +3296,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20050428T0846/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20050428T0846-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20050503T0852/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -3144,8 +3307,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20050428T0846/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 -+++ glibc-20050428T0846-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 +--- glibc-20050503T0852/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 ++++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 @@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t FILE *fp = fopen ("/proc/self/maps", "rc"); @@ -3158,8 +3321,8 @@ /* We need no locking. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); ---- glibc-20050428T0846/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20050428T0846-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20050503T0852/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -3205,8 +3368,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20050428T0846/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050428T0846-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050503T0852/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -3267,8 +3430,8 @@ + } while (0) + +#include_next ---- glibc-20050428T0846/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20050428T0846-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20050503T0852/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -3301,29 +3464,29 @@ + } while (0) + #include_next ---- glibc-20050428T0846/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050428T0846-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050503T0852/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050428T0846/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050428T0846-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050503T0852/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050428T0846/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20050428T0846-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20050503T0852/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20050428T0846/sysdeps/x86_64/Versions 28 Mar 2005 20:42:42 -0000 1.3 -+++ glibc-20050428T0846-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000 +--- glibc-20050503T0852/sysdeps/x86_64/Versions 28 Mar 2005 20:42:42 -0000 1.3 ++++ glibc-20050503T0852-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -libm { - GLIBC_2.1 { Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- glibc.spec 28 Apr 2005 09:50:59 -0000 1.149 +++ glibc.spec 3 May 2005 10:14:26 -0000 1.150 @@ -1,9 +1,9 @@ -%define glibcdate 20050428T0846 +%define glibcdate 20050503T0852 %define glibcname glibc -%define glibcsrcdir glibc-20050428T0846 +%define glibcsrcdir glibc-20050503T0852 %define glibc_release_tarballs 0 %define glibcversion 2.3.5 -%define glibcrelease 4 +%define glibcrelease 5 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 sparc64 ppc ppc64 @@ -562,9 +562,7 @@ %ifarch i386 -DARCH_386 \ %endif -%ifarch %{nptlarches} '-DLIBTLS="/%{_lib}/tls/"' \ -%endif '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \ '-DLD_SO_CONF="/etc/ld.so.conf"' \ '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"' @@ -1346,6 +1344,13 @@ %endif %changelog +* Tue May 3 2005 Jakub Jelinek 2.3.5-5 +- update from CVS + - add some more UTF-8 locales (#156115) +- clean up /lib64/tls instead of /lib/tls on x86-64, s390x and + ppc64 in glibc_post_upgrade (#156656) +- fix posix_fallocate{,64} (#156289) + * Thu Apr 28 2005 Jakub Jelinek 2.3.5-4 - update from CVS - fix nscd cache pruning (#150748) Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- sources 28 Apr 2005 09:50:59 -0000 1.115 +++ sources 3 May 2005 10:14:26 -0000 1.116 @@ -1,2 +1,2 @@ -adc721d1d497a35e4a7370999cf3f8f3 glibc-20050428T0846.tar.bz2 -6cb81148d235c03ec384662fc5a9829d glibc-fedora-20050428T0846.tar.bz2 +1c17083d3eef7549ac0ea98ecb094c48 glibc-20050503T0852.tar.bz2 +2cf649e0b771b370c06620987b85334b glibc-fedora-20050503T0852.tar.bz2 From fedora-cvs-commits at redhat.com Tue May 3 10:57:07 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 06:57:07 -0400 Subject: rpms/curl/devel curl-7.13.1-auth.patch, NONE, 1.1 curl.spec, 1.23, 1.24 Message-ID: <200505031057.j43Av7cQ000592@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/curl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv578 Modified Files: curl.spec Added Files: curl-7.13.1-auth.patch Log Message: fix bug 150768 - curl-7.12.3-2 breaks basic authentication used Daniel Stenberg patch curl-7.13.1-auth.patch: http.c | 1 + url.c | 12 ++++++++++-- urldata.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) --- NEW FILE curl-7.13.1-auth.patch --- --- curl-7.13.1/lib/http.c.pom 2005-02-19 00:53:07.000000000 +0100 +++ curl-7.13.1/lib/http.c 2005-04-27 11:48:40.000000000 +0200 @@ -455,6 +455,7 @@ /* To prevent the user+password to get sent to other than the original host due to a location-follow, we do some weirdo checks here */ if(!data->state.this_is_a_follow || + conn->bits.netrc || !data->state.first_host || curl_strequal(data->state.first_host, conn->host.name) || data->set.http_disable_hostname_check_before_authentication) { --- curl-7.13.1/lib/url.c.pom 2005-02-09 23:47:57.000000000 +0100 +++ curl-7.13.1/lib/url.c 2005-04-27 11:45:59.000000000 +0200 @@ -3131,15 +3131,23 @@ user, passwd); } + conn->bits.netrc = FALSE; if (data->set.use_netrc != CURL_NETRC_IGNORED) { if(Curl_parsenetrc(conn->host.name, user, passwd, data->set.netrc_file)) { - infof(data, "Couldn't find host %s in the " DOT_CHAR "netrc file, using defaults\n", + infof(data, "Couldn't find host %s in the " DOT_CHAR + "netrc file, using defaults\n", conn->host.name); } - else + else { + /* set bits.netrc TRUE to remember that we got the name from a .netrc + file, so that it is safe to use even if we followed a Location: to a + different host or similar. */ + conn->bits.netrc = TRUE; + conn->bits.user_passwd = 1; /* enable user+password */ + } } /* If our protocol needs a password and we have none, use the defaults */ --- curl-7.13.1/lib/urldata.h.pom 2005-02-09 14:06:56.000000000 +0100 +++ curl-7.13.1/lib/urldata.h 2005-04-27 11:50:31.000000000 +0200 @@ -388,6 +388,7 @@ bool ftp_use_lprt; /* As set with CURLOPT_FTP_USE_EPRT, but if we find out LPRT doesn't work we disable it for the forthcoming requests */ + bool netrc; /* name+password provided by netrc */ }; struct hostname { Index: curl.spec =================================================================== RCS file: /cvs/dist/rpms/curl/devel/curl.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- curl.spec 25 Apr 2005 15:09:40 -0000 1.23 +++ curl.spec 3 May 2005 10:57:05 -0000 1.24 @@ -1,12 +1,13 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others). Name: curl Version: 7.13.1 -Release: 2 +Release: 3 License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Patch0: curl-7.12.0-nousr.patch Patch1: curl-7.10.4-path.patch +Patch2: curl-7.13.1-auth.patch URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel @@ -36,6 +37,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 -b .auth %build aclocal @@ -90,6 +92,10 @@ %{_mandir}/man3/* %changelog +* Tue May 03 2005 Ivana Varekova 7.13.1-3 +- fix bug 150768 - curl-7.12.3-2 breaks basic authentication + used Daniel Stenberg patch (patch2) + * Mon Apr 25 2005 Joe Orton 7.13.1-2 - update to use ca-bundle in /etc/pki - mark License as MIT not MPL From fedora-cvs-commits at redhat.com Tue May 3 11:48:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 07:48:00 -0400 Subject: rpms/alsa-lib/devel .cvsignore, 1.9, 1.10 alsa-lib.spec, 1.23, 1.24 sources, 1.10, 1.11 alsa-lib-getc-returns-int.patch, 1.1, NONE Message-ID: <200505031148.j43Bm0pm001005@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-lib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv987 Modified Files: .cvsignore alsa-lib.spec sources Removed Files: alsa-lib-getc-returns-int.patch Log Message: fixed ainit (#156278, #156505) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 27 Apr 2005 12:41:25 -0000 1.9 +++ .cvsignore 3 May 2005 11:47:58 -0000 1.10 @@ -2,3 +2,4 @@ alsa-lib-1.0.8.tar.bz2 alsa-lib-1.0.9rc2.tar.bz2 ainit-0.2.tar.gz +ainit-0.3.tar.gz Index: alsa-lib.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- alsa-lib.spec 28 Apr 2005 16:23:13 -0000 1.23 +++ alsa-lib.spec 3 May 2005 11:47:58 -0000 1.24 @@ -1,16 +1,15 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library. Name: alsa-lib Version: 1.0.9rc2 -Release: 2 +Release: 3 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}.tar.bz2 -Source1: ainit-0.2.tar.gz +Source1: ainit-0.3.tar.gz Patch0: alsa-lib-mixer.patch Patch1: alsa-lib-alpha.patch Patch2: alsa-lib-gcc4.patch Patch3: alsa-lib-ainit.patch -Patch4: alsa-lib-getc-returns-int.patch URL: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: doxygen @@ -42,7 +41,6 @@ %patch1 -p1 -b .alpha %patch2 -p1 -b .gcc4 %patch3 -p1 -b .ainit -%patch4 -p1 -b .getc %build %configure \ @@ -116,6 +114,9 @@ %{_datadir}/aclocal/alsa.m4 %changelog +* Tue May 3 2005 Martin Stransky 1.0.9rc2-3 +- fixed ainit (#156278, #156505) + * Thu Apr 28 2005 David Woodhouse 1.0.9rc2-2 - Fix bogus use of fgetc() in ainit. (#156278) Index: sources =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Apr 2005 12:41:25 -0000 1.10 +++ sources 3 May 2005 11:47:58 -0000 1.11 @@ -1,2 +1,2 @@ 0b606956d9c02e568be36a7f6ca15511 alsa-lib-1.0.9rc2.tar.bz2 -9bdd3c747ee2f95750661c07bc55d9a2 ainit-0.2.tar.gz +39f98d74d7cd65ae7695cc80e2e2b0e8 ainit-0.3.tar.gz --- alsa-lib-getc-returns-int.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 3 13:10:11 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 09:10:11 -0400 Subject: rpms/dump/devel dump.spec,1.25,1.26 Message-ID: <200505031310.j43DABcA021598@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/dump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21582 Modified Files: dump.spec Log Message: - update to dump 0.4b40 Index: dump.spec =================================================================== RCS file: /cvs/dist/rpms/dump/devel/dump.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- dump.spec 2 Mar 2005 07:40:33 -0000 1.25 +++ dump.spec 3 May 2005 13:10:09 -0000 1.26 @@ -4,8 +4,8 @@ Summary: Programs for backing up and restoring ext2/ext3 filesystems. Name: dump -Version: 0.4b39 -Release: 3 +Version: 0.4b40 +Release: 1 License: BSD Group: Applications/Archiving URL: http://dump.sourceforge.net @@ -20,9 +20,6 @@ Obsoletes: dump-static Provides: dump-static -Patch0: dump-%{version}-ea.patch.bz2 -Patch1: dump-%{version}-asize.patch - %description The dump package contains both dump and restore. Dump examines files in a filesystem, determines which ones need to be backed up, and @@ -46,8 +43,6 @@ %prep %setup -q -%patch0 -p1 -b .ea -%patch1 -p1 -b .asize %build %configure %{myoptions} --enable-static --enable-rmt --enable-qfa @@ -100,6 +95,10 @@ %{_mandir}/man8/rmt.* %changelog +* Tue May 3 2005 Jindrich Novy 0.4b40-1 +- Updated to dump 0.4b40 +- Dropped .ea and .asize patches (applied upstream) + * Wed Mar 2 2005 Jindrich Novy 0.4b39-3 - Added patch to fix negative size problem with -s/-d options (#147710) - from Stelian Pop From fedora-cvs-commits at redhat.com Tue May 3 13:18:09 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 09:18:09 -0400 Subject: rpms/dump/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 dump-0.4b39-asize.patch, 1.1, NONE dump-0.4b39-ea.patch.bz2, 1.2, NONE Message-ID: <200505031318.j43DI9HR024917@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/dump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24896 Modified Files: .cvsignore sources Removed Files: dump-0.4b39-asize.patch dump-0.4b39-ea.patch.bz2 Log Message: - remove unused patches and upload new source tarball Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dump/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 24 Jan 2005 09:06:15 -0000 1.13 +++ .cvsignore 3 May 2005 13:18:07 -0000 1.14 @@ -1,3 +1,4 @@ dump-0.4b37.tar.gz dump-0.4b38.tar.bz2 dump-0.4b39.tar.bz2 +dump-0.4b40.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/dump/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 24 Jan 2005 09:06:15 -0000 1.13 +++ sources 3 May 2005 13:18:07 -0000 1.14 @@ -1 +1 @@ -62d6054a2366392ce39b30d447e3191d dump-0.4b39.tar.bz2 +ea42e689489e08cfeab48c25b1dc5435 dump-0.4b40.tar.bz2 --- dump-0.4b39-asize.patch DELETED --- --- dump-0.4b39-ea.patch.bz2 DELETED --- From fedora-cvs-commits at redhat.com Tue May 3 13:43:16 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 09:43:16 -0400 Subject: rpms/latex2html/devel latex2html.spec,1.1,1.2 Message-ID: <200505031343.j43DhG1P019045@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/latex2html/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19032 Modified Files: latex2html.spec Log Message: - run texhash in %%post and %%postun phase (#156660) Index: latex2html.spec =================================================================== RCS file: /cvs/dist/rpms/latex2html/devel/latex2html.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- latex2html.spec 16 Mar 2005 11:38:16 -0000 1.1 +++ latex2html.spec 3 May 2005 13:43:14 -0000 1.2 @@ -4,7 +4,7 @@ Summary: Converts LaTeX documents to HTML Name: latex2html Version: 2002.2.1 -Release: 1 +Release: 2 License: Free To Use But Restricted (See LICENSE) Group: Applications/Publishing URL: http://www.latex2html.org/ @@ -172,6 +172,13 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +[ -x %{_bindir}/texhash ] && /usr/bin/env - %{_bindir}/texhash 2> /dev/null +exit 0 + +%postun +[ -x %{_bindir}/texhash ] && /usr/bin/env - %{_bindir}/texhash 2> /dev/null +exit 0 %files %defattr(-,root,root,-) @@ -193,6 +200,9 @@ %endif %changelog +* Tue May 3 2005 Jindrich Novy 2002.2.1-2 +- run texhash in the %%post and %%postun phase (#156660) + * Fri Mar 15 2005 Jindrich Novy 2002.2.1-1 - create backups for patches - update Source1 From fedora-cvs-commits at redhat.com Tue May 3 13:57:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 09:57:00 -0400 Subject: rpms/openoffice.org/devel openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch, NONE, 1.1 openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch, NONE, 1.1 openoffice.org.spec, 1.179, 1.180 Message-ID: <200505031357.j43Dv0Ww016145@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16129 Modified Files: openoffice.org.spec Added Files: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch Log Message: more help, gcj workarounds openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch: com/sun/star/wizards/common/FileAccess.java | 0 wizards/com/sun/star/wizards/common/FileAccess.java | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch --- Index: com/sun/star/wizards/common/FileAccess.java =================================================================== RCS file: /cvs/installation/wizards/com/sun/star/wizards/common/FileAccess.java,v retrieving revision 1.7 diff -u -p -r1.7 FileAccess.java --- openoffice.org.orig/wizards/com/sun/star/wizards/common/FileAccess.java 18 Mar 2005 16:13:40 -0000 1.7 +++ openoffice.org/wizards/com/sun/star/wizards/common/FileAccess.java 3 May 2005 11:36:45 -0000 @@ -174,7 +174,8 @@ public class FileAccess { iPos = CurPath.length() - EndLength; if ((CurPath.indexOf(sType) > 0) || (CurPath.indexOf(EndString) == iPos)) { ResultPath = deleteLastSlashfromUrl(CurPath); - break; + if (xSimpleFileAccess.exists(ResultPath)) + break; } } } else openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch: filter/source/xsltfilter/XSLTransformer.java | 2 +- source/xsltfilter/XSLTransformer.java | 0 2 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch --- Index: source/xsltfilter/XSLTransformer.java =================================================================== RCS file: /cvs/framework/filter/source/xsltfilter/XSLTransformer.java,v retrieving revision 1.10 diff -u -p -r1.10 XSLTransformer.java --- openoffice.org.orig/filter/source/xsltfilter/XSLTransformer.java 29 Mar 2005 14:53:43 -0000 1.10 +++ openoffice.org/filter/source/xsltfilter/XSLTransformer.java 3 May 2005 11:10:45 -0000 @@ -102,7 +102,7 @@ public class XSLTransformer private static final int STREAM_BUFFER_SIZE = 4000; private static final String STATSPROP = "XSLTransformer.statsfile"; - private static PrintStream statsp; + static PrintStream statsp; private String stylesheeturl; private String targeturl; Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- openoffice.org.spec 3 May 2005 09:58:35 -0000 1.179 +++ openoffice.org.spec 3 May 2005 13:56:58 -0000 1.180 @@ -88,6 +88,8 @@ Patch33: openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch Patch34: openoffice.org-1.9.97.rh156067.noversionedicons.patch Patch35: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch +Patch36: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch +Patch37: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch %define instdir %{_libdir}/openoffice.org%{version} @@ -672,6 +674,8 @@ %patch33 -p1 -b .ooo48362.checkzipresult.sc.patch %patch34 -p1 -b .rh156067.noversionedicons.patch %patch35 -p1 -b .ooo48600.rtfparseerror.svx.patch +%patch36 -p1 -b .gcc19870.gcjaccessproblem.filter.patch +%patch37 -p1 -b .ooo48610.searchalltemplates.wizards.patch #start ludicrous workaround #while we include these libs we need this, if/when we move to system @@ -933,6 +937,7 @@ %files langpack-cs_CZ %defattr(-,root,root) %dir %{instdir} +%{instdir}/help/cs %dir %{instdir}/share %{instdir}/program/resource/*680cs.res %dir %{instdir}/share/dict @@ -1033,6 +1038,7 @@ %files langpack-et_EE %defattr(-,root,root) %dir %{instdir} +%{instdir}/help/et %dir %{instdir}/share %{instdir}/program/resource/*680et.res %{instdir}/share/readme/LICENSE_et* @@ -1901,6 +1907,7 @@ %{instdir}/program/simplereg.uno.so %{instdir}/program/slideshow.uno.so %{instdir}/program/sbase +%{instdir}/program/setofficelang* %{instdir}/program/soffice %{instdir}/program/soffice.bin %{instdir}/program/sofficerc @@ -2430,6 +2437,11 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Tue May 03 2005 Caolan McNamara - 1:1.9.99-2 +- add openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch for gcj bug workaround +- add openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch +- help documentation for cs and et has landed + * Tue May 03 2005 Caolan McNamara - 1:1.9.99-1 - add openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch - drop openoffice.org-1.9.95.gcc21233.noquotesonjavaver.patch as of From fedora-cvs-commits at redhat.com Tue May 3 14:06:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 10:06:00 -0400 Subject: rpms/rpm/devel rpm.spec,1.156,1.157 Message-ID: <200505031406.j43E60AG016356@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16316 Modified Files: rpm.spec Log Message: Patch from mitr at redhat.com Remove $RPM_BUILD_ROOT and $RPM_BUILD_DIR from distribued .la files (#116891)+- Don't ship static version of _rpmdb.so BuildRequires: readline-devel Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- rpm.spec 27 Apr 2005 15:02:13 -0000 1.156 +++ rpm.spec 3 May 2005 14:05:57 -0000 1.157 @@ -20,7 +20,7 @@ %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 11 +Release: 12 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Patch0: rpm-4.4.1-posttrans.patch @@ -44,7 +44,7 @@ BuildRequires: elfutils-libelf BuildRequires: elfutils-devel -BuildRequires: zlib-devel +BuildRequires: sed readline-devel zlib-devel BuildRequires: beecrypt-devel >= 4.1.2 Requires: beecrypt >= 4.1.2 @@ -185,6 +185,15 @@ make DESTDIR="$RPM_BUILD_ROOT" install +# Working around breakage from the -L$(RPM_BUILD_ROOT)... -L$(DESTDIR)... +# workaround to #132435, +# and from linking to included zlib +for i in librpm.la librpmbuild.la librpmdb.la librpmio.la ; do + sed -i -e 's~-L'"$RPM_BUILD_ROOT"'[^ ]* ~~g' \ + -e 's~-L'"$RPM_BUILD_DIR"'[^ ]* ~~g' \ + "$RPM_BUILD_ROOT%{__libdir}/$i" +done + %ifos linux # Save list of packages through cron @@ -221,6 +230,7 @@ %if %{with_python_subpackage} rm -f .%{__libdir}/python%{with_python_version}/site-packages/*.{a,la} rm -f .%{__libdir}/python%{with_python_version}/site-packages/rpm/*.{a,la} + rm -f .%{__libdir}/python%{with_python_version}/site-packages/rpmdb/*.{a,la} %endif } @@ -519,6 +529,11 @@ %{__includedir}/popt.h %changelog +* Sat Apr 30 2005 Miloslav Trmac - 4.4.1-12 +- Remove $RPM_BUILD_ROOT and $RPM_BUILD_DIR from distribued .la files (#116891) +- Don't ship static version of _rpmdb.so +- BuildRequires: readline-devel + * Wed Apr 27 2005 Paul Nasrat - 4.4.1-11 - Fix for (pre,postun) (#155700) - Erase ordering From fedora-cvs-commits at redhat.com Tue May 3 14:07:07 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 10:07:07 -0400 Subject: rpms/rpm/devel rpm-4.4.1-matchpathcon.patch, NONE, 1.1 rpm.spec, 1.157, 1.158 Message-ID: <200505031407.j43E77Xm016416@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16402 Modified Files: rpm.spec Added Files: rpm-4.4.1-matchpathcon.patch Log Message: Use matchpathcon (#151870) rpm-4.4.1-matchpathcon.patch: build/Makefile.am | 1 + build/files.c | 20 +++++++++----------- lib/rpmfi.c | 13 ++++++------- lib/rpminstall.c | 14 ++++---------- lib/verify.c | 30 ++++++++++++------------------ python/rpmts-py.c | 13 ++++--------- 6 files changed, 36 insertions(+), 55 deletions(-) --- NEW FILE rpm-4.4.1-matchpathcon.patch --- --- rpm-4.4.1/lib/rpmfi.c.matchpathcon 2005-02-10 03:30:28.000000000 -0500 +++ rpm-4.4.1/lib/rpmfi.c 2005-05-02 13:39:34.545636000 -0400 @@ -16,7 +16,7 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" -#include "rpmsx.h" +#include #define _RPMTE_INTERNAL /* relocations */ #include "rpmte.h" @@ -1645,8 +1645,8 @@ { int scareMem = 0; rpmfi fi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, scareMem); - rpmsx sx = NULL; const char ** av = NULL; + const char * myfn = rpmGetPath("%{?__file_context_path}", NULL); int ac; size_t nb; char * t; @@ -1660,7 +1660,7 @@ } /* Read security context patterns. */ - sx = rpmsxNew(NULL); + matchpathcon_init(myfn); /* Compute size of argv array blob, concatenating file contexts. */ nb = ac * sizeof(*fcnb); @@ -1671,10 +1671,9 @@ while (rpmfiNext(fi) >= 0) { const char * fn = rpmfiFN(fi); mode_t fmode = rpmfiFMode(fi); - const char * scon; + security_context_t scon; - scon = rpmsxFContext(sx, fn, fmode); - if (scon != NULL) { + if (matchpathcon(fn, fmode, &scon) == 0) { fcnb[ac] = strlen(scon) + 1; /*@-branchstate@*/ if (fcnb[ac] > 0) { @@ -1682,6 +1681,7 @@ memcpy(fctxt+fctxtlen, scon, fcnb[ac]); fctxtlen += fcnb[ac]; } + freecon(scon); /*@=branchstate@*/ } ac++; @@ -1707,7 +1707,6 @@ exit: fi = rpmfiFree(fi); - sx = rpmsxFree(sx); /*@-branchstate@*/ if (fcontextp) *fcontextp = av; --- rpm-4.4.1/lib/verify.c.matchpathcon 2004-10-24 15:36:30.000000000 -0400 +++ rpm-4.4.1/lib/verify.c 2005-05-02 13:39:34.568609000 -0400 @@ -128,20 +128,19 @@ if (rc == -1) *res |= (RPMVERIFY_LGETFILECONFAIL|RPMVERIFY_CONTEXTS); else { - rpmsx sx = rpmtsREContext(ts); - const char * fcontext; - - if (sx != NULL) { - /* Get file security context from patterns. */ - fcontext = rpmsxFContext(sx, fn, fmode); - sx = rpmsxFree(sx); - } else { + security_context_t fcontext; + + /* Get file security context from patterns. */ + if (matchpathcon(fn,fmode,&fcontext) != 0) { /* Get file security context from package. */ fcontext = rpmfiFContext(fi); } + if (fcontext == NULL || strcmp(fcontext, con)) *res |= RPMVERIFY_CONTEXTS; freecon(con); + freecon(fcontext); + } } /*@=branchstate@*/ @@ -524,16 +523,11 @@ /* Initialize security context patterns (if not already done). */ if (qva->qva_flags & VERIFY_CONTEXTS) { - rpmsx sx = rpmtsREContext(ts); - if (sx == NULL) { - arg = rpmGetPath("%{?_verify_file_context_path}", NULL); - if (arg != NULL && *arg != '\0') { - sx = rpmsxNew(arg); - (void) rpmtsSetREContext(ts, sx); - } - arg = _free(arg); - } - sx = rpmsxFree(sx); + arg = rpmGetPath("%{?_verify_file_context_path}", NULL); + if (arg != NULL && *arg != '\0') { + matchpathcon_init(arg); + } + arg = _free(arg); } ovsflags = rpmtsSetVSFlags(ts, vsflags); --- rpm-4.4.1/lib/rpminstall.c.matchpathcon 2005-05-02 13:39:34.528651000 -0400 +++ rpm-4.4.1/lib/rpminstall.c 2005-05-02 13:39:34.579599000 -0400 @@ -310,16 +310,10 @@ /* Initialize security context patterns (if not already done). */ if (!(ia->transFlags & RPMTRANS_FLAG_NOCONTEXTS)) { - rpmsx sx = rpmtsREContext(ts); - if (sx == NULL) { - const char *fn = rpmGetPath("%{?_install_file_context_path}", NULL); - if (fn != NULL && *fn != '\0') { - sx = rpmsxNew(fn); - (void) rpmtsSetREContext(ts, sx); - } - fn = _free(fn); - } - sx = rpmsxFree(sx); + const char *fn = rpmGetPath("%{?_install_file_context_path}", NULL); + if (fn != NULL && *fn != '\0') { + matchpathcon_init(fn); + } } (void) rpmtsSetFlags(ts, ia->transFlags); --- rpm-4.4.1/build/Makefile.am.matchpathcon 2005-01-17 13:46:16.000000000 -0500 +++ rpm-4.4.1/build/Makefile.am 2005-05-02 13:39:34.585591000 -0400 @@ -35,6 +35,7 @@ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ + @WITH_SELINUX_LIB@ \ @WITH_LIBELF_LIB@ rpmfile.h: --- rpm-4.4.1/build/files.c.matchpathcon 2005-01-04 11:35:05.000000000 -0500 +++ rpm-4.4.1/build/files.c 2005-05-02 15:07:28.691340000 -0400 @@ -23,7 +23,7 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" -#include "rpmsx.h" +#include #define _RPMTE_INTERNAL #include "rpmte.h" @@ -1122,7 +1122,7 @@ int apathlen = 0; int dpathlen = 0; int skipLen = 0; - rpmsx sx = NULL; + security_context_t scon = NULL; const char * sxfn; size_t fnlen; FileListRec flp; @@ -1142,7 +1142,7 @@ sxfn = rpmGetPath("%{?_build_file_context_path}", NULL); if (sxfn != NULL && *sxfn != '\0') - sx = rpmsxNew(sxfn); + matchpathcon_init(sxfn); for (i = 0, flp = fl->fileList; i < fl->fileListRecsUsed; i++, flp++) { const char *s; @@ -1324,18 +1324,16 @@ &(flp->flags), 1); /* Add file security context to package. */ + mode_t fmode = (uint_16)flp->fl_mode; /*@-branchstate@*/ - if (sx != NULL) { - mode_t fmode = (uint_16)flp->fl_mode; - s = rpmsxFContext(sx, flp->fileURL, fmode); - if (s == NULL) s = ""; - (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, - &s, 1); - } + if (matchpathcon(flp->fileURL, fmode, &scon) != 0) + scon = ""; /*@=branchstate@*/ + (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, + scon, 1); + freecon(scon); } - sx = rpmsxFree(sx); sxfn = _free(sxfn); (void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE, --- rpm-4.4.1/python/rpmts-py.c.matchpathcon 2005-02-12 22:12:07.000000000 -0500 +++ rpm-4.4.1/python/rpmts-py.c 2005-05-02 13:39:34.606575000 -0400 @@ -1182,16 +1182,11 @@ /* Initialize security context patterns (if not already done). */ if (!(s->ts->transFlags & RPMTRANS_FLAG_NOCONTEXTS)) { - rpmsx sx = rpmtsREContext(s->ts); - if (sx == NULL) { - const char *fn = rpmGetPath("%{?_install_file_context_path}", NULL); - if (fn != NULL && *fn != '\0') { - sx = rpmsxNew(fn); - (void) rpmtsSetREContext(s->ts, sx); - } - fn = _free(fn); + const char *fn = rpmGetPath("%{?_install_file_context_path}", NULL); + if (fn != NULL && *fn != '\0') { + matchpatcon_init(fn); } - sx = rpmsxFree(sx); + fn = _free(fn); } if (_rpmts_debug) Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- rpm.spec 3 May 2005 14:05:57 -0000 1.157 +++ rpm.spec 3 May 2005 14:07:04 -0000 1.158 @@ -20,7 +20,7 @@ %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 12 +Release: 13 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Patch0: rpm-4.4.1-posttrans.patch @@ -32,6 +32,7 @@ Patch6: rpm-4.4.1-nonmerged.patch Patch7: rpm-4.4.1-prepostun.patch Patch8: rpm-4.4.1-ordererase.patch +Patch9: rpm-4.4.1-matchpathcon.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -149,6 +150,7 @@ %patch6 -p1 %patch7 -p1 -b .prepostun %patch8 -p1 -b .ordererase +%patch9 -p1 -b .matchpathcon %build @@ -529,6 +531,9 @@ %{__includedir}/popt.h %changelog +* Mon May 02 2005 Paul Nasrat - 4.4.1-13 +- Use matchpathcon (#151870) + * Sat Apr 30 2005 Miloslav Trmac - 4.4.1-12 - Remove $RPM_BUILD_ROOT and $RPM_BUILD_DIR from distribued .la files (#116891) - Don't ship static version of _rpmdb.so From fedora-cvs-commits at redhat.com Tue May 3 14:18:30 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 10:18:30 -0400 Subject: rpms/gdm/devel gdm-2.6.0.8-process-all-messages.patch, 1.1, 1.2 gdm.spec, 1.79, 1.80 Message-ID: <200505031418.j43EIUma019696@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19682 Modified Files: gdm-2.6.0.8-process-all-messages.patch gdm.spec Log Message: - Fix processing of non-ascii characters that got broken in 2.6.0.8-11, found by Miloslav Trmac , (bug 156590). gdm-2.6.0.8-process-all-messages.patch: greeter.c | 1042 +++++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 700 insertions(+), 342 deletions(-) Index: gdm-2.6.0.8-process-all-messages.patch =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.6.0.8-process-all-messages.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdm-2.6.0.8-process-all-messages.patch 28 Apr 2005 20:44:51 -0000 1.1 +++ gdm-2.6.0.8-process-all-messages.patch 3 May 2005 14:18:28 -0000 1.2 @@ -1,8 +1,5 @@ -Note this patch needs to be refactored. - -It contains too much repetitive code. ---- gdm-2.6.0.8/gui/greeter/greeter.c.process-all-messages 2005-04-28 15:42:20.000000000 -0400 -+++ gdm-2.6.0.8/gui/greeter/greeter.c 2005-04-28 15:42:31.000000000 -0400 +--- gdm-2.6.0.8/gui/greeter/greeter.c.process-all-messages 2005-05-03 09:58:37.000000000 -0400 ++++ gdm-2.6.0.8/gui/greeter/greeter.c 2005-05-03 10:13:03.000000000 -0400 @@ -226,362 +226,720 @@ greeter_parse_config (void) } } @@ -298,7 +295,7 @@ + case GDM_SETLOGIN: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -325,7 +322,7 @@ + case GDM_PROMPT: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -354,7 +351,7 @@ + case GDM_NOECHO: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -377,7 +374,7 @@ + case GDM_MSG: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -403,7 +400,7 @@ + case GDM_ERRBOX: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -429,7 +426,7 @@ + case GDM_ERRDLG: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -471,7 +468,7 @@ + case GDM_SESS: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -499,7 +496,7 @@ + case GDM_LANG: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -523,7 +520,7 @@ + case GDM_SSESS: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -549,7 +546,7 @@ + case GDM_SLANG: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -578,7 +575,7 @@ + case GDM_RESETOK: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -611,7 +608,7 @@ + case GDM_QUIT: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -664,7 +661,7 @@ + case GDM_STARTTIMER: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -688,7 +685,7 @@ + case GDM_STOPTIMER: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -712,7 +709,7 @@ + case GDM_STARTTHROBBER: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -736,7 +733,7 @@ + case GDM_STOPTHROBBER: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -760,7 +757,7 @@ + case GDM_DISABLE: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -797,7 +794,7 @@ + case GDM_ENABLE: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -830,7 +827,7 @@ + case GDM_READPIC: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -852,7 +849,7 @@ + case GDM_NOFOCUS: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -876,7 +873,7 @@ + case GDM_FOCUS: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -900,7 +897,7 @@ + case GDM_SAVEDIE: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; @@ -924,7 +921,7 @@ + case GDM_QUERY_CAPSLOCK: + p++; + q = p; -+ while (*q >= ' ') ++ while (((guchar) *q) >= ' ') + q++; + + length = q - p; Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- gdm.spec 28 Apr 2005 20:44:51 -0000 1.79 +++ gdm.spec 3 May 2005 14:18:28 -0000 1.80 @@ -288,6 +288,11 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Tue May 3 2005 Ray Strode 1:2.6.0.8-12 +- Fix processing of non-ascii characters that got broken + in 2.6.0.8-11, found by Miloslav Trmac , + (bug 156590). + * Thu Apr 28 2005 Ray Strode 1:2.6.0.8-11 - Fix halt command (bug 156299) - Process all messages sent to the greeter in a read, not just From fedora-cvs-commits at redhat.com Tue May 3 14:18:54 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 10:18:54 -0400 Subject: rpms/gdm/devel gdm.spec,1.80,1.81 Message-ID: <200505031418.j43EIsuY019775@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19762 Modified Files: gdm.spec Log Message: rev release Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- gdm.spec 3 May 2005 14:18:28 -0000 1.80 +++ gdm.spec 3 May 2005 14:18:52 -0000 1.81 @@ -16,7 +16,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.6.0.8 -Release: 11 +Release: 12 Epoch: 1 License: LGPL/GPL Group: User Interface/X From fedora-cvs-commits at redhat.com Tue May 3 14:29:57 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 10:29:57 -0400 Subject: rpms/foomatic/devel foomatic-ieee1284.patch, 1.29, 1.30 foomatic.spec, 1.88, 1.89 Message-ID: <200505031429.j43ETvSa013721@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13707 Modified Files: foomatic-ieee1284.patch foomatic.spec Log Message: * Tue May 3 2005 Tim Waugh - Add IEEE 1284 ID for Epson Stylus CX5400 (bug #156661). foomatic-ieee1284.patch: Epson-Stylus_CX5400.xml | 6 ++++++ HP-DeskJet_5150.xml | 2 ++ HP-LaserJet_2420.xml | 6 ++++++ 3 files changed, 14 insertions(+) Index: foomatic-ieee1284.patch =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic-ieee1284.patch,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- foomatic-ieee1284.patch 12 Apr 2005 14:28:31 -0000 1.29 +++ foomatic-ieee1284.patch 3 May 2005 14:29:54 -0000 1.30 @@ -24,3 +24,18 @@ MLC,PCL,PML,DW-PCL,DESKJET,DYN 5150 +--- foomatic-db-20050310/db/source/printer/Epson-Stylus_CX5400.xml 12 Jul 2004 17:35:16 -0000 1.5 ++++ foomatic-db-20050310/db/source/printer/Epson-Stylus_CX5400.xml 3 May 2005 13:46:44 -0000 +@@ -25,6 +25,12 @@ + + + ++ ++ EPSON ++ Stylus CX5400 ++ EPSON Stylus CX5400 ++ ESCPL2,BDC,D4 ++ + + B + gimp-print Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- foomatic.spec 12 Apr 2005 16:24:40 -0000 1.88 +++ foomatic.spec 3 May 2005 14:29:54 -0000 1.89 @@ -62,6 +62,7 @@ # Add IEEE 1284 ID for HP LaserJet 2420 (bug #114191). # Add IEEE 1284 ID for HP DeskJet 5150 (bug #154518). +# Add IEEE 1284 ID for Epson Stylus CX5400 (bug #156661). Patch16: foomatic-ieee1284.patch # Fix Postscript driver (bug #151645). @@ -285,6 +286,9 @@ %{_mandir}/*/* %changelog +* Tue May 3 2005 Tim Waugh +- Add IEEE 1284 ID for Epson Stylus CX5400 (bug #156661). + * Tue Apr 12 2005 Tim Waugh - Fix Postscript driver (bug #151645). - Add IEEE 1284 ID for HP DeskJet 5150 (bug #154518). From fedora-cvs-commits at redhat.com Tue May 3 14:30:35 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 10:30:35 -0400 Subject: rpms/foomatic/devel foomatic.spec,1.89,1.90 Message-ID: <200505031430.j43EUZj8013758@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13746 Modified Files: foomatic.spec Log Message: 3.0.2-19 Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- foomatic.spec 3 May 2005 14:29:54 -0000 1.89 +++ foomatic.spec 3 May 2005 14:30:31 -0000 1.90 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 18 +Release: 19 License: GPL Group: System Environment/Libraries @@ -286,7 +286,7 @@ %{_mandir}/*/* %changelog -* Tue May 3 2005 Tim Waugh +* Tue May 3 2005 Tim Waugh 3.0.2-19 - Add IEEE 1284 ID for Epson Stylus CX5400 (bug #156661). * Tue Apr 12 2005 Tim Waugh From fedora-cvs-commits at redhat.com Tue May 3 15:51:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 11:51:00 -0400 Subject: rpms/firefox/devel firefox-1.0-nss-system-nspr.patch, NONE, 1.1 firefox-1.0-pango-bidi-justify.patch, NONE, 1.1 firefox-1.0-uriloader.patch, NONE, 1.1 firefox.sh.in, 1.6, 1.7 firefox.spec, 1.64, 1.65 Message-ID: <200505031551.j43Fp0NL011887@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11869 Modified Files: firefox.sh.in firefox.spec Added Files: firefox-1.0-nss-system-nspr.patch firefox-1.0-pango-bidi-justify.patch firefox-1.0-uriloader.patch Log Message: * Fri Apr 15 2005 Christopher Aillon 0:1.0.3-2 - Add patch to properly link against libgfxshared_s.a * Fri Apr 15 2005 Christopher Aillon 0:1.0.3-1 - Update to security release 1.0.3 firefox-1.0-nss-system-nspr.patch: coreconf/location.mk | 2 ++ manager/Makefile.in | 17 ++++++++++++++--- nss/lib/ckfw/builtins/Makefile | 10 +++++----- nss/lib/fortcrypt/swfort/pkcs11/Makefile | 10 +++++----- 4 files changed, 26 insertions(+), 13 deletions(-) --- NEW FILE firefox-1.0-nss-system-nspr.patch --- Index: mozilla/security/coreconf/location.mk =================================================================== RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v retrieving revision 1.9 diff -u -r1.9 location.mk --- mozilla/security/coreconf/location.mk 25 Apr 2004 15:02:17 -0000 1.9 +++ mozilla/security/coreconf/location.mk 11 Apr 2005 20:21:57 -0000 @@ -61,6 +61,8 @@ DIST = $(SOURCE_PREFIX)/$(PLATFORM) +NSPR_LIBDIR = $(DIST)/lib + ifdef BUILD_DEBUG_GC DEFINES += -DDEBUG_GC endif Index: mozilla/security/manager/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v retrieving revision 1.56 diff -u -r1.56 Makefile.in --- mozilla/security/manager/Makefile.in 14 Mar 2005 10:00:58 -0000 1.56 +++ mozilla/security/manager/Makefile.in 11 Apr 2005 20:21:57 -0000 @@ -76,11 +76,22 @@ endif endif +ABS_DIST := $(shell cd $(DIST) && pwd) +ifeq ($(OS_ARCH),WINNT) +ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g') +endif +NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS))) +ifneq (,$(strip $(NSPR_LIBDIR))) +NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR))) +else +NSPR_LIBDIR = $(ABS_DIST)/lib +endif # NSS makefiles are not safe for parallel execution. DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 -DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm" -DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist -DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist +DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)" +DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) +DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) +DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR) DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) Index: mozilla/security/nss/lib/ckfw/builtins/Makefile =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- mozilla/security/nss/lib/ckfw/builtins/Makefile 20 Jan 2005 02:25:46 -0000 1.14 +++ mozilla/security/nss/lib/ckfw/builtins/Makefile 11 Apr 2005 20:21:57 -0000 @@ -53,23 +53,23 @@ # This is merely an expedient hack and not the right solution. ifdef NS_USE_GCC EXTRA_LIBS += \ - -L$(DIST)/lib \ + -L$(NSPR_LIBDIR) \ -lplc4 \ -lplds4 \ -lnspr4 \ $(NULL) else EXTRA_LIBS += \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \ + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \ $(NULL) endif else EXTRA_LIBS += \ - $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ + $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ + $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ $(NULL) endif Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 25 Apr 2004 15:03:08 -0000 1.18 +++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 11 Apr 2005 20:21:57 -0000 @@ -63,7 +63,7 @@ $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ $(CRYPTO_LIB) \ $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ - -L$(DIST)/lib \ + -L$(NSPR_LIBDIR) \ -lplc4 \ -lplds4 \ -lnspr4 \ @@ -76,8 +76,8 @@ $(DIST)/lib/softokn.lib \ $(CRYPTO_LIB) \ $(DIST)/lib/secutil.lib \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \ + $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \ wsock32.lib \ winmm.lib \ $(NULL) @@ -98,8 +98,8 @@ $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ $(CRYPTO_LIB) \ $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ + $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ + $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ $(NULL) endif firefox-1.0-pango-bidi-justify.patch: gfx/public/nsIRenderingContext.h | 8 +++ gfx/src/gtk/nsFontMetricsPango.cpp | 3 - layout/html/base/src/nsTextFrame.cpp | 86 ++++++++++++++++++++++++++--------- 3 files changed, 75 insertions(+), 22 deletions(-) --- NEW FILE firefox-1.0-pango-bidi-justify.patch --- Index: gfx/public/nsIRenderingContext.h =================================================================== RCS file: /cvsroot/mozilla/gfx/public/nsIRenderingContext.h,v retrieving revision 1.62 diff -u -r1.62 nsIRenderingContext.h --- gfx/public/nsIRenderingContext.h 27 Nov 2004 08:22:21 -0000 1.62 +++ gfx/public/nsIRenderingContext.h 14 Apr 2005 07:12:39 -0000 @@ -835,6 +835,14 @@ */ #define NS_RENDERING_HINT_FAST_MEASURE 0x10 +/** + * This bit, when set, indicates that gfx performs glyph reordering of complex + * text after applying character or word spacing, and so expects to be passed + * text in logical order. When this bit is not set, gfx must be passed text in + * visual order if characters and word spacing are to be applied. + */ +#define NS_RENDERING_HINT_REORDER_SPACED_TEXT 0x40 + //flags for copy CopyOffScreenBits //when performing the blit, use the region, if any, Index: gfx/src/gtk/nsFontMetricsPango.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp,v retrieving revision 1.13 diff -u -r1.13 nsFontMetricsPango.cpp --- gfx/src/gtk/nsFontMetricsPango.cpp 23 Jan 2005 23:58:30 -0000 1.13 +++ gfx/src/gtk/nsFontMetricsPango.cpp 14 Apr 2005 07:12:40 -0000 @@ -1138,7 +1138,8 @@ return (NS_RENDERING_HINT_BIDI_REORDERING | NS_RENDERING_HINT_ARABIC_SHAPING | NS_RENDERING_HINT_FAST_MEASURE | - NS_RENDERING_HINT_TEXT_CLUSTERS); + NS_RENDERING_HINT_TEXT_CLUSTERS | + NS_RENDERING_HINT_REORDER_SPACED_TEXT); } /* static */ Index: layout/html/base/src/nsTextFrame.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/html/base/src/Attic/nsTextFrame.cpp,v retrieving revision 1.455.6.2 diff -d -u -p -r1.455.6.2 nsTextFrame.cpp --- layout/html/base/src/nsTextFrame.cpp 24 Nov 2004 18:39:34 -0000 1.455.6.2 +++ layout/html/base/src/nsTextFrame.cpp 20 Apr 2005 19:21:11 -0000 @@ -2931,12 +2931,21 @@ nsTextFrame::PaintTextSlowly(nsIPresCont if (0 != textLength) { #ifdef IBMBIDI + PRBool isRightToLeftOnBidiPlatform = PR_FALSE; + PRBool isBidiSystem = PR_FALSE; + PRUint32 hints = 0; + aRenderingContext.GetHints(hints); + PRBool paintCharByChar = (0 == (hints & NS_RENDERING_HINT_REORDER_SPACED_TEXT)) && + ((0 != aTextStyle.mLetterSpacing) || + (0 != aTextStyle.mWordSpacing) || + aTextStyle.mJustifying); PRBool bidiEnabled; PRUint8 level = 0; nsCharType charType = eCharType_LeftToRight; aPresContext->GetBidiEnabled(&bidiEnabled); if (bidiEnabled) { + isBidiSystem = aPresContext->IsBidiSystem(); nsBidiPresUtils* bidiUtils; aPresContext->GetBidiUtils(&bidiUtils); @@ -2949,8 +2958,19 @@ nsTextFrame::PaintTextSlowly(nsIPresCont PRInt32 rememberTextLength = textLength; #endif // Since we paint char by char, handle the text like on non-bidi platform + isRightToLeftOnBidiPlatform = (!paintCharByChar && + isBidiSystem && + (eCharType_RightToLeft == charType || + eCharType_RightToLeftArabic == charType)); + if (isRightToLeftOnBidiPlatform) { + // indicate that the platform should use its native + // capabilities to reorder the text with right-to-left + // base direction + aRenderingContext.SetRightToLeftText(PR_TRUE); + } + // If we will be painting char by char, handle the text like on non-bidi platform bidiUtils->ReorderUnicodeText(text, textLength, charType, - level & 1, PR_FALSE); + isOddLevel, (paintCharByChar) ? PR_FALSE : isBidiSystem); NS_ASSERTION(rememberTextLength == textLength, "Bidi formatting changed text length"); } } @@ -2992,7 +3012,9 @@ nsTextFrame::PaintTextSlowly(nsIPresCont sdptr->mStart = ip[sdptr->mStart] - mContentOffset; sdptr->mEnd = ip[sdptr->mEnd] - mContentOffset; #ifdef IBMBIDI - AdjustSelectionPointsForBidi(sdptr, textLength, CHARTYPE_IS_RTL(charType), level & 1, PR_FALSE); + AdjustSelectionPointsForBidi(sdptr, textLength, + CHARTYPE_IS_RTL(charType), isOddLevel, + (paintCharByChar) ? PR_FALSE : isBidiSystem); #endif sdptr = sdptr->mNext; } @@ -3000,19 +3022,32 @@ nsTextFrame::PaintTextSlowly(nsIPresCont DrawSelectionIterator iter(content, details,text,(PRUint32)textLength,aTextStyle, selectionValue, aPresContext, mStyleContext); if (!iter.IsDone() && iter.First()) { - nscoord currentX = dx; - nsTextDimensions newDimensions;//temp - while (!iter.IsDone()) - { - PRUnichar *currenttext = iter.CurrentTextUnicharPtr(); - PRUint32 currentlength= iter.CurrentLength(); - //TextStyle ¤tStyle = iter.CurrentStyle(); - nscolor currentFGColor = iter.CurrentForeGroundColor(); - nscolor currentBKColor; - PRBool isCurrentBKColorTransparent; - GetTextDimensions(aRenderingContext,aTextStyle,currenttext, (PRInt32)currentlength,&newDimensions); - if (newDimensions.width) - { + nscoord currentX = dx; + nsTextDimensions newDimensions;//temp +#ifdef IBMBIDI // Simon - display substrings RTL in RTL frame + if (isRightToLeftOnBidiPlatform) + { + nsTextDimensions frameDimensions; + GetTextDimensions(aRenderingContext, aTextStyle, text, + (PRInt32)textLength, iter.IsLast(), &frameDimensions); + currentX = dx + frameDimensions.width; + } +#endif + while (!iter.IsDone()) + { + PRUnichar *currenttext = iter.CurrentTextUnicharPtr(); + PRUint32 currentlength= iter.CurrentLength(); + //TextStyle ¤tStyle = iter.CurrentStyle(); + nscolor currentFGColor = iter.CurrentForeGroundColor(); + nscolor currentBKColor; + PRBool isCurrentBKColorTransparent; + GetTextDimensions(aRenderingContext,aTextStyle,currenttext, (PRInt32)currentlength,&newDimensions); + if (newDimensions.width) + { +#ifdef IBMBIDI + if (isRightToLeftOnBidiPlatform) + currentX -= newDimensions.width; +#endif if (iter.CurrentBackGroundColor(currentBKColor, &isCurrentBKColorTransparent)) {//DRAW RECT HERE!!! if (!isCurrentBKColorTransparent) { @@ -3021,7 +3056,7 @@ nsTextFrame::PaintTextSlowly(nsIPresCont } currentFGColor = EnsureDifferentColors(currentFGColor, currentBKColor); } - } + } if (isPaginated && !iter.IsBeforeOrAfter()) { aRenderingContext.SetColor(nsCSSRendering::TransformColor(aTextStyle.mColor->mColor,canDarkenColor)); @@ -3035,11 +3070,13 @@ nsTextFrame::PaintTextSlowly(nsIPresCont dy, width, details); } +#ifdef IBMBIDI + if (!isRightToLeftOnBidiPlatform) +#endif //increment twips X start but remember to get ready for next draw by reducing current x by letter spacing amount - currentX+=newDimensions.width;// + aTextStyle.mLetterSpacing; - - iter.Next(); - } + currentX+=newDimensions.width;// + aTextStyle.mLetterSpacing; + iter.Next(); + } } else if (!isPaginated) { @@ -3057,8 +3094,15 @@ nsTextFrame::PaintTextSlowly(nsIPresCont delete details; } } +#ifdef IBMBIDI + if (isRightToLeftOnBidiPlatform) { + // indicate that future text should not be reordered with + // right-to-left base direction + aRenderingContext.SetRightToLeftText(PR_FALSE); + } +#endif // IBMBIDI } -} +} void nsTextFrame::PaintAsciiText(nsIPresContext* aPresContext, firefox-1.0-uriloader.patch: Makefile.in | 2 unix/nsGNOMERegistry.cpp | 28 ++++-- unix/nsGNOMERegistry.h | 11 +- unix/nsMIMEInfoUnix.cpp | 196 ++++++++++++++++++++++++++++++++++++++++++ unix/nsMIMEInfoUnix.h | 49 ++++++++++ unix/nsOSHelperAppService.cpp | 27 ++--- 6 files changed, 286 insertions(+), 27 deletions(-) --- NEW FILE firefox-1.0-uriloader.patch --- Index: uriloader/exthandler/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v retrieving revision 1.60 diff -d -u -p -r1.60 Makefile.in --- uriloader/exthandler/Makefile.in 2 May 2005 16:30:03 -0000 1.60 +++ uriloader/exthandler/Makefile.in 3 May 2005 15:40:08 -0000 @@ -102,7 +102,7 @@ endif LOCAL_INCLUDES = -I$(srcdir) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -OSHELPER += nsGNOMERegistry.cpp +OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp endif ifeq ($(MOZ_WIDGET_TOOLKIT),beos) Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v retrieving revision 1.10 diff -d -u -p -r1.10 nsGNOMERegistry.cpp --- uriloader/exthandler/unix/nsGNOMERegistry.cpp 16 Oct 2004 13:46:17 -0000 1.10 +++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 3 May 2005 15:40:08 -0000 @@ -42,7 +42,7 @@ #include "nsString.h" #include "nsIComponentManager.h" #include "nsILocalFile.h" -#include "nsMIMEInfoImpl.h" +#include "nsMIMEInfoUnix.h" #include "nsAutoPtr.h" #include @@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient; typedef struct _GnomeProgram GnomeProgram; typedef struct _GnomeModuleInfo GnomeModuleInfo; -typedef struct { +struct GnomeVFSMimeApplication { char *id; char *name; char *command; /* there is more here, but we don't need it */ -} GnomeVFSMimeApplication; +}; typedef GConfClient * (*_gconf_client_get_default_fn)(); typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *, @@ -264,7 +264,7 @@ nsGNOMERegistry::GetAppDescForScheme(con } -/* static */ already_AddRefed +/* static */ already_AddRefed nsGNOMERegistry::GetFromExtension(const char *aFileExt) { if (!gconfLib) @@ -286,7 +286,7 @@ nsGNOMERegistry::GetFromExtension(const return GetFromType(mimeType); } -/* static */ already_AddRefed +/* static */ already_AddRefed nsGNOMERegistry::GetFromType(const char *aMIMEType) { if (!gconfLib) @@ -296,9 +296,11 @@ nsGNOMERegistry::GetFromType(const char if (!handlerApp) return nsnull; - nsRefPtr mimeInfo = new nsMIMEInfoImpl(aMIMEType); + nsRefPtr mimeInfo = new nsMIMEInfoUnix(aMIMEType); NS_ENSURE_TRUE(mimeInfo, nsnull); + mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp); + // Get the list of extensions and append then to the mimeInfo. GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType); for (GList *extension = extensions; extension; extension = extension->next) @@ -320,11 +322,21 @@ nsGNOMERegistry::GetFromType(const char return nsnull; } - gchar *commandPath = g_find_program_in_path(nativeCommand); + gchar **argv; + gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL); + if (!res) { + NS_ERROR("Could not convert helper app command to filesystem encoding"); + _gnome_vfs_mime_application_free(handlerApp); + return nsnull; + } + + gchar *commandPath = g_find_program_in_path(argv[0]); g_free(nativeCommand); + g_strfreev(argv); if (!commandPath) { + NS_WARNING("could not find command in path"); _gnome_vfs_mime_application_free(handlerApp); return nsnull; } @@ -342,7 +354,7 @@ nsGNOMERegistry::GetFromType(const char _gnome_vfs_mime_application_free(handlerApp); - nsMIMEInfoBase* retval; + nsMIMEInfoUnix* retval; NS_ADDREF((retval = mimeInfo)); return retval; } Index: uriloader/exthandler/unix/nsGNOMERegistry.h =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v retrieving revision 1.3 diff -d -u -p -r1.3 nsGNOMERegistry.h --- uriloader/exthandler/unix/nsGNOMERegistry.h 16 Oct 2004 13:46:17 -0000 1.3 +++ uriloader/exthandler/unix/nsGNOMERegistry.h 3 May 2005 15:40:08 -0000 @@ -35,10 +35,13 @@ * * ***** END LICENSE BLOCK ***** */ +#ifndef nsGNOMERegistry_h__ +#define nsGNOMERegistry_h__ + #include "nsIURI.h" #include "nsCOMPtr.h" -class nsMIMEInfoBase; +class nsMIMEInfoUnix; class nsGNOMERegistry { @@ -52,7 +55,9 @@ class nsGNOMERegistry static void GetAppDescForScheme(const nsACString& aScheme, nsAString& aDesc); - static already_AddRefed GetFromExtension(const char *aFileExt); + static already_AddRefed GetFromExtension(const char *aFileExt); - static already_AddRefed GetFromType(const char *aMIMEType); + static already_AddRefed GetFromType(const char *aMIMEType); }; + +#endif // nsGNOMERegistry_h__ Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp =================================================================== RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 3 May 2005 15:40:08 -0000 @@ -0,0 +1,196 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org Code. + * + * The Initial Developer of the Original Code is + * Red Hat, Inc. + * Portions created by the Initial Developer are Copyright (C) 2005 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Christopher Aillon (Original author) + * + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsMIMEInfoUnix.h" +#include "prlink.h" +#include "prmem.h" +#include +#include + +static PRLibrary *gnomeLib; +static PRLibrary *vfsLib; + +typedef struct _GnomeProgram GnomeProgram; +typedef struct _GnomeModuleInfo GnomeModuleInfo; + +typedef enum { + GNOME_VFS_OK // there's more but we don't care about them. +} GnomeVFSResult; + +typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn) + (GnomeVFSMimeApplication *app, + GList *uris); +typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *); +typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *); +typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *, + const GnomeModuleInfo *, int, + char **, const char *, ...); +typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *); +typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)(); +typedef GnomeProgram * (*_gnome_program_get_fn)(); +typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *); + +#define DECL_FUNC_PTR(func) static _##func##_fn _##func + +DECL_FUNC_PTR(gnome_vfs_mime_application_launch); +DECL_FUNC_PTR(gnome_vfs_mime_application_free); +DECL_FUNC_PTR(gnome_vfs_mime_application_copy); +DECL_FUNC_PTR(gnome_vfs_mime_application_get_name); +DECL_FUNC_PTR(gnome_program_init); +DECL_FUNC_PTR(gnome_program_get); +DECL_FUNC_PTR(libgnome_module_info_get); +DECL_FUNC_PTR(gnome_vfs_make_uri_from_input); + +static PRLibrary * +LoadVersionedLibrary(const char* libName, const char* libVersion) +{ + char *platformLibName = PR_GetLibraryName(nsnull, libName); + nsCAutoString versionLibName(platformLibName); + versionLibName.Append(libVersion); + PR_Free(platformLibName); + return PR_LoadLibrary(versionLibName.get()); +} + +static void +Cleanup() +{ + // Unload all libraries + if (gnomeLib) + PR_UnloadLibrary(gnomeLib); + if (vfsLib) + PR_UnloadLibrary(vfsLib); + + gnomeLib = vfsLib = nsnull; +} + +static void +InitGnomeVFS() +{ + static PRBool initialized = PR_FALSE; + + if (initialized) + return; + + #define ENSURE_LIB(lib) \ + PR_BEGIN_MACRO \ + if (!lib) { \ + Cleanup(); \ + return; \ + } \ + PR_END_MACRO + + #define GET_LIB_FUNCTION(lib, func, failure) \ + PR_BEGIN_MACRO \ + _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \ + if (!_##func) { \ + failure; \ + } \ + PR_END_MACRO + + // Attempt to open libgnome + gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); + ENSURE_LIB(gnomeLib); + + GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup()); + GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup()); + GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup()); + + // Attempt to open libgnomevfs + vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); + ENSURE_LIB(vfsLib); + + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */); + GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup()); + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup()); + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup()); + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup()); + + // Initialize GNOME, if it's not already initialized. It's not + // necessary to tell GNOME about our actual command line arguments. + + if (!_gnome_program_get()) { + char *argv[1] = { "gecko" }; + _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(), + 1, argv, NULL); + } + + // Note: after GNOME has been initialized, do not ever unload these + // libraries. They register atexit handlers, so if they are unloaded, we'll + // crash on exit. +} + +void +nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app) +{ + if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) { + mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app); + + mPreferredAction = nsIMIMEInfo::useSystemDefault; + + const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication); + if (name) + mDefaultAppDescription = NS_ConvertUTF8toUCS2(name); + } +} + +nsMIMEInfoUnix::~nsMIMEInfoUnix() +{ + if (mDefaultVFSApplication) + _gnome_vfs_mime_application_free(mDefaultVFSApplication); +} + +nsresult +nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile) +{ + NS_ENSURE_ARG_POINTER(aFile); + + InitGnomeVFS(); + + if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) { + nsCAutoString nativePath; + aFile->GetNativePath(nativePath); + + gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get()); + + GList *uris = NULL; + uris = g_list_append(uris, uri); + + GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris); + + g_free(uri); + g_list_free(uris); + + if (result != GNOME_VFS_OK) + return NS_ERROR_FAILURE; + + return NS_OK; + } + + if (!mDefaultApplication) + return NS_ERROR_FILE_NOT_FOUND; + + return LaunchWithIProcess(mDefaultApplication, aFile); +} Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h =================================================================== RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ uriloader/exthandler/unix/nsMIMEInfoUnix.h 3 May 2005 15:40:08 -0000 @@ -0,0 +1,49 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org Code. + * + * The Initial Developer of the Original Code is + * Red Hat, Inc. + * Portions created by the Initial Developer are Copyright (C) 2005 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Christopher Aillon (Original author) + * + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef nsMimeInfoUnix_h__ +#define nsMimeInfoUnix_h__ + +#include "nsMIMEInfoImpl.h" + +struct GnomeVFSMimeApplication; + +class nsMIMEInfoUnix : public nsMIMEInfoImpl +{ +public: + nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {} + nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType), mDefaultVFSApplication(nsnull) {} + virtual ~nsMIMEInfoUnix(); + + void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); + +protected: + virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); + + GnomeVFSMimeApplication *mDefaultVFSApplication; +}; + +#endif // nsMimeInfoUnix_h__ Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v retrieving revision 1.58 diff -d -u -p -r1.58 nsOSHelperAppService.cpp --- uriloader/exthandler/unix/nsOSHelperAppService.cpp 25 Oct 2004 07:46:01 -0000 1.58 +++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 3 May 2005 15:40:08 -0000 @@ -44,6 +44,7 @@ #include "nsOSHelperAppService.h" #ifdef MOZ_WIDGET_GTK2 #include "nsGNOMERegistry.h" +#include "nsMIMEInfoUnix.h" #endif #include "nsISupports.h" #include "nsString.h" @@ -1486,6 +1487,17 @@ nsOSHelperAppService::GetFromType(const LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get())); +#ifdef MOZ_WIDGET_GTK2 + // Look in GNOME registry first since it is the preferred method in GNOME, + // should trump the mailcap entry + LOG(("Looking in GNOME registry\n")); + nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); + if (gnomeInfo) { + LOG(("Got MIMEInfo from GNOME registry\n")); + return gnomeInfo; + } +#endif + // extract the major and minor types NS_ConvertASCIItoUTF16 mimeType(aMIMEType); nsAString::const_iterator start_iter, end_iter, @@ -1522,21 +1534,6 @@ nsOSHelperAppService::GetFromType(const mozillaFlags, PR_TRUE); - - if (handler.IsEmpty() && extensions.IsEmpty() && - mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) { - // No useful data yet - -#ifdef MOZ_WIDGET_GTK2 - LOG(("Looking in GNOME registry\n")); - nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); - if (gnomeInfo) { - LOG(("Got MIMEInfo from GNOME registry\n")); - return gnomeInfo; - } -#endif - } - if (handler.IsEmpty() && mailcap_description.IsEmpty()) { DoLookUpHandlerAndDescription(majorType, minorType, Index: firefox.sh.in =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.sh.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- firefox.sh.in 28 Apr 2005 05:05:25 -0000 1.6 +++ firefox.sh.in 3 May 2005 15:50:58 -0000 1.7 @@ -36,7 +36,12 @@ ## ## Variables ## -MOZ_DIST_BIN="FFDIR" +MOZ_LIB_DIR="/usr/lib" +if [ -x "/usr/lib64/firefox-FIREFOX_VERSION/firefox-bin" ] +then + MOZ_LIB_DIR="/usr/lib64" +fi +MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" MOZ_PROGRAM="$MOZ_DIST_BIN/firefox" MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/mozilla-xremote-client" MOZ_CLIENT_PROGRAM_PARAM="-a firefox" @@ -65,9 +70,9 @@ ## if [ "$MOZ_PLUGIN_PATH" ] then - MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:LIBDIR/mozilla/plugins:$MOZ_DIST_BIN/plugins + MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$MOZ_LIB_DIR/mozilla/plugins:$MOZ_DIST_BIN/plugins else - MOZ_PLUGIN_PATH=LIBDIR/mozilla/plugins:$MOZ_DIST_BIN/plugins + MOZ_PLUGIN_PATH=$MOZ_LIB_DIR/mozilla/plugins:$MOZ_DIST_BIN/plugins fi export MOZ_PLUGIN_PATH Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- firefox.spec 28 Apr 2005 05:16:10 -0000 1.64 +++ firefox.spec 3 May 2005 15:50:58 -0000 1.65 @@ -10,7 +10,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.0.3 -Release: 2 +Release: 3 Epoch: 0 URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL @@ -36,8 +36,8 @@ Patch2: firefox-1.0-prdtoa.patch Patch3: firefox-1.0-gcc4-compile.patch Patch4: firefox-1.0-recv-fortify.patch -Patch5: firefox-1.0-nspr-config.patch -Patch6: firefox-1.0-gfxshared_s.patch +Patch5: firefox-1.0-gfxshared_s.patch +Patch6: firefox-1.0-nss-system-nspr.patch # customization patches Patch20: firefox-redhat-homepage.patch @@ -54,11 +54,13 @@ Patch32: firefox-1.0-pango-space-width.patch Patch33: firefox-1.0-pango-rounding.patch Patch34: firefox-1.0-pango-direction.patch +Patch35: firefox-1.0-pango-bidi-justify.patch # local bugfixes Patch40: firefox-PR1-gnome-vfs-default-app.patch Patch41: firefox-PR1-stack-direction.patch Patch42: firefox-1.0-download-to-desktop.patch +Patch43: firefox-1.0-uriloader.patch # backported patches Patch90: firefox-PR1-gtk-file-chooser-morefixes.patch @@ -117,7 +119,7 @@ %patch3 -p0 %patch4 -p0 %patch5 -p0 -%patch6 -p0 +%patch6 -p1 %patch20 -p0 %patch21 -p1 %patch22 -p1 @@ -132,9 +134,11 @@ %patch32 -p1 %patch33 -p1 %patch34 -p1 +%patch35 -p0 %patch40 -p1 %patch41 -p0 %patch42 -p0 +%patch43 -p0 %patch90 -p0 %patch101 -p0 %patch102 -p0 @@ -188,7 +192,7 @@ %{SOURCE20} # set up the firefox start script -%{__cat} %{SOURCE21} | %{__sed} -e 's,FFDIR,%{ffdir},g' -e 's,LIBDIR,%{_libdir},g' > \ +%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{version},g' > \ $RPM_BUILD_ROOT%{_bindir}/firefox %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox @@ -330,6 +334,11 @@ #--------------------------------------------------------------------- %changelog +* Tue May 3 2005 Christopher Aillon 0:1.0.3-3 +- Firefox script fixes to support multilib installs. +- Add upstream patch to fix bidi justification of pango +- Add patch to fix launching of helper applications + * Wed Apr 27 2005 Warren Togami - remove JVM version probing (#116445) - correct confusing PANGO vars in startup script From fedora-cvs-commits at redhat.com Tue May 3 16:01:19 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 12:01:19 -0400 Subject: rpms/rpm/devel rpm-4.4.1-matchpathcon.patch,1.1,1.2 Message-ID: <200505031601.j43G1JZ6005867@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5855 Modified Files: rpm-4.4.1-matchpathcon.patch Log Message: rediff - fix rpmbuild brain fart rpm-4.4.1-matchpathcon.patch: build/Makefile.am | 1 + build/files.c | 21 ++++++++------------- lib/rpmfi.c | 13 ++++++------- lib/rpminstall.c | 14 ++++---------- lib/verify.c | 30 ++++++++++++------------------ python/rpmts-py.c | 13 ++++--------- 6 files changed, 35 insertions(+), 57 deletions(-) Index: rpm-4.4.1-matchpathcon.patch =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.1-matchpathcon.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rpm-4.4.1-matchpathcon.patch 3 May 2005 14:07:04 -0000 1.1 +++ rpm-4.4.1-matchpathcon.patch 3 May 2005 16:01:02 -0000 1.2 @@ -1,5 +1,5 @@ --- rpm-4.4.1/lib/rpmfi.c.matchpathcon 2005-02-10 03:30:28.000000000 -0500 -+++ rpm-4.4.1/lib/rpmfi.c 2005-05-02 13:39:34.545636000 -0400 ++++ rpm-4.4.1/lib/rpmfi.c 2005-05-02 16:15:24.000000000 -0400 @@ -16,7 +16,7 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" @@ -58,7 +58,7 @@ if (fcontextp) *fcontextp = av; --- rpm-4.4.1/lib/verify.c.matchpathcon 2004-10-24 15:36:30.000000000 -0400 -+++ rpm-4.4.1/lib/verify.c 2005-05-02 13:39:34.568609000 -0400 ++++ rpm-4.4.1/lib/verify.c 2005-05-02 16:15:24.000000000 -0400 @@ -128,20 +128,19 @@ if (rc == -1) *res |= (RPMVERIFY_LGETFILECONFAIL|RPMVERIFY_CONTEXTS); @@ -109,8 +109,8 @@ } ovsflags = rpmtsSetVSFlags(ts, vsflags); ---- rpm-4.4.1/lib/rpminstall.c.matchpathcon 2005-05-02 13:39:34.528651000 -0400 -+++ rpm-4.4.1/lib/rpminstall.c 2005-05-02 13:39:34.579599000 -0400 +--- rpm-4.4.1/lib/rpminstall.c.matchpathcon 2005-05-02 16:15:24.000000000 -0400 ++++ rpm-4.4.1/lib/rpminstall.c 2005-05-02 16:15:24.000000000 -0400 @@ -310,16 +310,10 @@ /* Initialize security context patterns (if not already done). */ @@ -133,7 +133,7 @@ (void) rpmtsSetFlags(ts, ia->transFlags); --- rpm-4.4.1/build/Makefile.am.matchpathcon 2005-01-17 13:46:16.000000000 -0500 -+++ rpm-4.4.1/build/Makefile.am 2005-05-02 13:39:34.585591000 -0400 ++++ rpm-4.4.1/build/Makefile.am 2005-05-02 16:15:24.000000000 -0400 @@ -35,6 +35,7 @@ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ @@ -143,7 +143,7 @@ rpmfile.h: --- rpm-4.4.1/build/files.c.matchpathcon 2005-01-04 11:35:05.000000000 -0500 -+++ rpm-4.4.1/build/files.c 2005-05-02 15:07:28.691340000 -0400 ++++ rpm-4.4.1/build/files.c 2005-05-03 11:59:10.528669000 -0400 @@ -23,7 +23,7 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" @@ -171,12 +171,11 @@ for (i = 0, flp = fl->fileList; i < fl->fileListRecsUsed; i++, flp++) { const char *s; -@@ -1324,18 +1324,16 @@ +@@ -1324,18 +1324,13 @@ &(flp->flags), 1); /* Add file security context to package. */ -+ mode_t fmode = (uint_16)flp->fl_mode; - /*@-branchstate@*/ +-/*@-branchstate@*/ - if (sx != NULL) { - mode_t fmode = (uint_16)flp->fl_mode; - s = rpmsxFContext(sx, flp->fileURL, fmode); @@ -184,11 +183,11 @@ - (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, - &s, 1); - } -+ if (matchpathcon(flp->fileURL, fmode, &scon) != 0) -+ scon = ""; - /*@=branchstate@*/ -+ (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, -+ scon, 1); +-/*@=branchstate@*/ ++ mode_t fmode = (uint_16)flp->fl_mode; ++ matchpathcon(flp->fileURL, fmode, &scon); ++ if (scon == NULL) scon = ""; ++ (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, &scon, 1); + freecon(scon); } @@ -197,7 +196,7 @@ (void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE, --- rpm-4.4.1/python/rpmts-py.c.matchpathcon 2005-02-12 22:12:07.000000000 -0500 -+++ rpm-4.4.1/python/rpmts-py.c 2005-05-02 13:39:34.606575000 -0400 ++++ rpm-4.4.1/python/rpmts-py.c 2005-05-02 16:15:24.000000000 -0400 @@ -1182,16 +1182,11 @@ /* Initialize security context patterns (if not already done). */ From fedora-cvs-commits at redhat.com Tue May 3 16:04:23 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 12:04:23 -0400 Subject: rpms/rpm/devel rpm.spec,1.158,1.159 Message-ID: <200505031604.j43G4N0i005938@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5926 Modified Files: rpm.spec Log Message: Fixup Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- rpm.spec 3 May 2005 14:07:04 -0000 1.158 +++ rpm.spec 3 May 2005 16:04:21 -0000 1.159 @@ -20,7 +20,7 @@ %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 13 +Release: 14 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Patch0: rpm-4.4.1-posttrans.patch @@ -531,6 +531,9 @@ %{__includedir}/popt.h %changelog +* Mon May 02 2005 Paul Nasrat - 4.4.1-14 +- matchpathcon fixup + * Mon May 02 2005 Paul Nasrat - 4.4.1-13 - Use matchpathcon (#151870) From fedora-cvs-commits at redhat.com Tue May 3 16:06:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 12:06:25 -0400 Subject: rpms/gstreamer/devel .cvsignore, 1.13, 1.14 gstreamer.spec, 1.31, 1.32 sources, 1.13, 1.14 Message-ID: <200505031606.j43G6P83006064@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6049 Modified Files: .cvsignore gstreamer.spec sources Log Message: - update to upstream 0.8.10 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 9 Feb 2005 19:24:43 -0000 1.13 +++ .cvsignore 3 May 2005 16:06:23 -0000 1.14 @@ -3,3 +3,4 @@ gstreamer-0.8.7.tar.bz2 gstreamer-0.8.8.tar.bz2 gstreamer-0.8.9.tar.bz2 +gstreamer-0.8.10.tar.bz2 Index: gstreamer.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gstreamer.spec 17 Mar 2005 19:09:55 -0000 1.31 +++ gstreamer.spec 3 May 2005 16:06:23 -0000 1.32 @@ -2,12 +2,12 @@ %define _libxml2 2.4.9 Name: gstreamer -Version: 0.8.9 +Version: 0.8.10 # keep in sync with the VERSION. gstreamer can append a .0.1 to CVS snapshots. %define majmin 0.8 %define po_package %{name}-%{majmin} -Release: 4 +Release: 1 Summary: GStreamer streaming media framework runtime. Group: Applications/Multimedia License: LGPL @@ -165,6 +165,9 @@ %exclude %{_mandir}/man1/*-%{majmin}.1.gz %changelog +* Tue May 03 2005 John (J5) Palmieri 0.8.10-1 +- Update to upstream 0.8.10 + * Thu Mar 17 2005 Colin Walters 0.8.9-4 - Rebuild to make it through beehive Index: sources =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 9 Feb 2005 19:24:43 -0000 1.13 +++ sources 3 May 2005 16:06:23 -0000 1.14 @@ -1 +1,2 @@ 6769de224de8457ed0dc09016287883a gstreamer-0.8.9.tar.bz2 +3de474d993e23c901e9dfdd1fea486e0 gstreamer-0.8.10.tar.bz2 From fedora-cvs-commits at redhat.com Tue May 3 16:07:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 12:07:10 -0400 Subject: rpms/gstreamer/devel sources,1.14,1.15 Message-ID: <200505031607.j43G7AK5006096@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6083 Modified Files: sources Log Message: - removed old version of tarball from sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 3 May 2005 16:06:23 -0000 1.14 +++ sources 3 May 2005 16:07:08 -0000 1.15 @@ -1,2 +1 @@ -6769de224de8457ed0dc09016287883a gstreamer-0.8.9.tar.bz2 3de474d993e23c901e9dfdd1fea486e0 gstreamer-0.8.10.tar.bz2 From fedora-cvs-commits at redhat.com Tue May 3 16:19:45 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 12:19:45 -0400 Subject: rpms/xml-commons/devel xml-commons.spec, 1.12, 1.13 xml-commons.bz155693.patch, 1.3, NONE Message-ID: <200505031619.j43GJj8C009309@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/xml-commons/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9297 Modified Files: xml-commons.spec Removed Files: xml-commons.bz155693.patch Log Message: Merge in final #155693 fix and build Index: xml-commons.spec =================================================================== RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xml-commons.spec 25 Apr 2005 10:46:36 -0000 1.12 +++ xml-commons.spec 3 May 2005 16:19:43 -0000 1.13 @@ -3,7 +3,7 @@ Summary: Common code for XML projects Name: xml-commons Version: 1.0 -Release: 0.b2.6jpp_9fc +Release: 0.b2.6jpp_11fc Epoch: 0 License: Apache Software License URL: http://xml.apache.org/commons/ @@ -12,10 +12,11 @@ Patch0: xml-commons.build.patch Patch1: xml-commons.manifest.patch Patch2: xml-commons.bz130162.patch -Patch3: xml-commons.bz155693.patch Requires: jpackage-utils >= 0:1.5 BuildRequires: ant, jpackage-utils >= 0:1.5 BuildRequires: coreutils +BuildRequires: gcc-java >= 4.0.0-0.43 +ExclusiveArch: i386 x86_64 ppc Group: Text Processing/Markup/XML BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot #Vendor: JPackage Project @@ -82,7 +83,6 @@ if java -version 2>&1 | grep -q "gcj"; then %patch2 -p1 fi -%patch3 -p1 # ----------------------------------------------------------------------------- @@ -122,11 +122,6 @@ $RPM_BUILD_ROOT%{_javadir}/%{name}-apis-%{version}.jar \ %{_libdir}/lib%{name}-apis-%{version}.jar.so -# GCJ endorsed dirs support -install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed -ln -s %{_javadir}/%{name}-apis-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-apis-%{version}.jar - # Javadocs mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-apis-%{version} mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-which-%{version} @@ -156,7 +151,6 @@ %files apis %defattr(0644,root,root,0755) %{_javadir}/%{name}-apis* -%{_javadir}/gcj-endorsed/%{name}-apis-%{version}.jar %attr(0755,root,root) %{_libdir}/lib*.jar.so %{_libdir}/*/*/%{name}-%{version}.db @@ -206,9 +200,12 @@ # ----------------------------------------------------------------------------- %changelog -* Mon Apr 25 2005 Gary Benson +* Tue May 3 2005 Gary Benson - 0:1.0-0.b2.6jpp_11fc - BC-compile the API jar. +* Tue Apr 26 2005 Gary Benson - 0:1.0-0.b2.6jpp_10fc +- Remove gcj endorsed dir support (#155693). + * Mon Apr 25 2005 Gary Benson - 0:1.0-0.b2.6jpp_9fc - Provide a default transformer when running under libgcj. --- xml-commons.bz155693.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 3 16:24:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 12:24:25 -0400 Subject: rpms/xml-commons/devel xml-commons.spec,1.13,1.14 Message-ID: <200505031624.j43GOPAb021995@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/xml-commons/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20405 Modified Files: xml-commons.spec Log Message: They don't call me Mr Forgetful for nothing, but I can't remember why... Index: xml-commons.spec =================================================================== RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xml-commons.spec 3 May 2005 16:19:43 -0000 1.13 +++ xml-commons.spec 3 May 2005 16:24:23 -0000 1.14 @@ -89,7 +89,10 @@ %build ant jars -aot-compile java/external/build/xml-apis.jar lib%{name}-apis.jar.so +aot-compile \ + java/external/build/xml-apis.jar \ + lib%{name}-apis.jar.so \ + "$RPM_OPT_FLAGS -fPIC" # ----------------------------------------------------------------------------- From fedora-cvs-commits at redhat.com Tue May 3 16:35:24 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 12:35:24 -0400 Subject: rpms/kernel/devel kernel-2.6.spec,1.1283,1.1284 Message-ID: <200505031635.j43GZOhc003486@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3467 Modified Files: kernel-2.6.spec Log Message: selinux borked debugfs, which borked usb. bad. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1283 retrieving revision 1.1284 diff -u -r1.1283 -r1.1284 --- kernel-2.6.spec 2 May 2005 08:24:36 -0000 1.1283 +++ kernel-2.6.spec 3 May 2005 16:35:22 -0000 1.1284 @@ -1205,6 +1205,9 @@ %endif %changelog +* Tue May 3 2005 Dave Jones +- Disable usbmon/debugfs again for now until SELinux policy is fixed. + * Mon May 2 2005 David Woodhouse - Make kallsyms include platform-specific symbols - Fix might_sleep warning in pbook clock-spreading fix From fedora-cvs-commits at redhat.com Tue May 3 16:35:24 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 12:35:24 -0400 Subject: rpms/kernel/devel/configs config-generic,1.18,1.19 Message-ID: <200505031635.j43GZOUv003494@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv3467/configs Modified Files: config-generic Log Message: selinux borked debugfs, which borked usb. bad. Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- config-generic 1 May 2005 07:18:54 -0000 1.18 +++ config-generic 3 May 2005 16:35:22 -0000 1.19 @@ -2154,7 +2154,7 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_IPW=m CONFIG_USB_PHIDGETKIT=m -CONFIG_USB_MON=m +# CONFIG_USB_MON is not set CONFIG_USB_SISUSBVGA=m @@ -2452,7 +2452,7 @@ CONFIG_SENSORS_SMSC47B397=m CONFIG_USB_SERIAL_GARMIN=m CONFIG_USB_SERIAL_TI=m -CONFIG_DEBUG_FS=y +# CONFIG_DEBUG_FS is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m From fedora-cvs-commits at redhat.com Tue May 3 16:39:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 12:39:52 -0400 Subject: rpms/audit/devel .cvsignore, 1.17, 1.18 audit.spec, 1.29, 1.30 sources, 1.17, 1.18 Message-ID: <200505031639.j43Gdqal003622@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3608 Modified Files: .cvsignore audit.spec sources Log Message: - Add code to get watch list to auditctl - Get -f & -hn working in ausearch - Added search by terminal, exe, and syscall to ausearch program - Added -w parameter to match whole word in ausearch Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 29 Apr 2005 20:43:43 -0000 1.17 +++ .cvsignore 3 May 2005 16:39:50 -0000 1.18 @@ -14,3 +14,4 @@ audit-0.7.tar.gz audit-0.7.1.tar.gz audit-0.7.2.tar.gz +audit-0.7.3.tar.gz Index: audit.spec =================================================================== RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- audit.spec 29 Apr 2005 20:54:31 -0000 1.29 +++ audit.spec 3 May 2005 16:39:50 -0000 1.30 @@ -1,7 +1,7 @@ Summary: User space tools for 2.6 kernel auditing. Name: audit -Version: 0.7.2 -Release: 2 +Version: 0.7.3 +Release: 1 License: GPL Group: System Environment/Daemons URL: http://people.redhat.com/sgrubb/audit/ @@ -119,6 +119,12 @@ %changelog +* Tue May 03 2005 Steve Grubb 0.7.3-1 +- Add code to get watch list to auditctl +- Get -f & -hn working in ausearch +- Added search by terminal, exe, and syscall to ausearch program +- Added -w parameter to match whole word in ausearch + * Wed Apr 27 2005 Steve Grubb 0.7.2-1 - Allow ausearch uid & gid to be non-numeric (root, wheel, etc) - Fix problems with changing run level Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 29 Apr 2005 20:43:43 -0000 1.17 +++ sources 3 May 2005 16:39:50 -0000 1.18 @@ -12,3 +12,4 @@ 48a94a0d0bd890b451b84397133b5781 audit-0.7.tar.gz 03d26ae05ce5cf6ddba625b560a6f1b9 audit-0.7.1.tar.gz 56c82cfe0d5af98a3313a8a76a08ed43 audit-0.7.2.tar.gz +1fbed5d8a67b2ad7724e4d95174d451f audit-0.7.3.tar.gz From fedora-cvs-commits at redhat.com Tue May 3 16:54:15 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 12:54:15 -0400 Subject: rpms/audit/devel audit.spec,1.30,1.31 Message-ID: <200505031654.j43GsF79012707@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6990 Modified Files: audit.spec Log Message: Bump release since beehive terminated previous build Index: audit.spec =================================================================== RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- audit.spec 3 May 2005 16:39:50 -0000 1.30 +++ audit.spec 3 May 2005 16:54:12 -0000 1.31 @@ -1,7 +1,7 @@ Summary: User space tools for 2.6 kernel auditing. Name: audit Version: 0.7.3 -Release: 1 +Release: 2 License: GPL Group: System Environment/Daemons URL: http://people.redhat.com/sgrubb/audit/ From fedora-cvs-commits at redhat.com Tue May 3 17:49:06 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 13:49:06 -0400 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.180,1.181 Message-ID: <200505031749.j43Hn6IC001324@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1312 Modified Files: openoffice.org.spec Log Message: i'm a fool Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- openoffice.org.spec 3 May 2005 13:56:58 -0000 1.180 +++ openoffice.org.spec 3 May 2005 17:49:03 -0000 1.181 @@ -687,7 +687,7 @@ %define __find_requires %{_builddir}/SRC680_m%{ooo2ver}/find-requires find_requires=`rpm --eval %%{__find_requires}` -echo "$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_" | grep -v "(" > find-requires +echo '$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_ | grep -v "("'> find-requires chmod +x find-requires #end ludicrous workaround From fedora-cvs-commits at redhat.com Tue May 3 17:52:07 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 13:52:07 -0400 Subject: rpms/openoffice.org/devel openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch, NONE, 1.1 openoffice.org.spec, 1.181, 1.182 Message-ID: <200505031752.j43Hq7YK001404@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1391 Modified Files: openoffice.org.spec Added Files: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch Log Message: make wizards work openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch: com/sun/star/wizards/agenda/AgendaTemplate.java | 0 com/sun/star/wizards/agenda/AgendaWizardDialog.java | 0 com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java | 0 com/sun/star/wizards/agenda/CallWizard.java | 0 com/sun/star/wizards/agenda/TopicsControl.java | 0 com/sun/star/wizards/common/ConfigGroup.java | 0 com/sun/star/wizards/common/ConfigSet.java | 0 com/sun/star/wizards/common/FileAccess.java | 0 com/sun/star/wizards/common/Helper.java | 0 com/sun/star/wizards/common/NumberFormatter.java | 0 com/sun/star/wizards/common/SystemDialog.java | 0 com/sun/star/wizards/common/UCB.java | 0 com/sun/star/wizards/db/BlindtextCreator.java | 0 com/sun/star/wizards/db/ColumnPropertySet.java | 0 com/sun/star/wizards/db/CommandMetaData.java | 0 com/sun/star/wizards/db/CommandName.java | 0 com/sun/star/wizards/db/DBMetaData.java | 0 com/sun/star/wizards/db/FieldColumn.java | 0 com/sun/star/wizards/db/RecordParser.java | 0 com/sun/star/wizards/db/SQLQueryComposer.java | 0 com/sun/star/wizards/db/TableDescriptor.java | 0 com/sun/star/wizards/db/TypeInspector.java | 0 com/sun/star/wizards/document/Control.java | 0 com/sun/star/wizards/document/DatabaseControl.java | 0 com/sun/star/wizards/document/FormHandler.java | 0 com/sun/star/wizards/document/OfficeDocument.java | 0 com/sun/star/wizards/document/Shape.java | 0 com/sun/star/wizards/fax/CallWizard.java | 0 com/sun/star/wizards/fax/FaxWizardDialogImpl.java | 0 com/sun/star/wizards/fax/FaxWizardDialogResources.java | 0 com/sun/star/wizards/form/CallFormWizard.java | 0 com/sun/star/wizards/form/FormConfiguration.java | 0 com/sun/star/wizards/form/FormControlArranger.java | 0 com/sun/star/wizards/form/FormDocument.java | 0 com/sun/star/wizards/form/FormWizard.java | 0 com/sun/star/wizards/form/StyleApplier.java | 0 com/sun/star/wizards/form/UIControlArranger.java | 0 com/sun/star/wizards/letter/CallWizard.java | 0 com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 0 com/sun/star/wizards/letter/LetterWizardDialogResources.java | 0 com/sun/star/wizards/query/CallQueryWizard.java | 0 com/sun/star/wizards/query/Finalizer.java | 0 com/sun/star/wizards/query/QuerySummary.java | 0 com/sun/star/wizards/query/QueryWizard.java | 0 com/sun/star/wizards/report/CallReportWizard.java | 0 com/sun/star/wizards/report/DBColumn.java | 0 com/sun/star/wizards/report/Dataimport.java | 0 com/sun/star/wizards/report/Finalizer.java | 0 com/sun/star/wizards/report/RecordTable.java | 0 com/sun/star/wizards/report/ReportDocument.java | 0 com/sun/star/wizards/report/ReportLayouter.java | 0 com/sun/star/wizards/report/ReportWizard.java | 0 com/sun/star/wizards/table/CGCategory.java | 0 com/sun/star/wizards/table/CGTable.java | 0 com/sun/star/wizards/table/CallTableWizard.java | 0 com/sun/star/wizards/table/FieldDescription.java | 0 com/sun/star/wizards/table/FieldFormatter.java | 0 com/sun/star/wizards/table/PrimaryKeyHandler.java | 0 com/sun/star/wizards/table/ScenarioSelector.java | 0 com/sun/star/wizards/table/TableWizard.java | 0 com/sun/star/wizards/text/TextFieldHandler.java | 0 com/sun/star/wizards/text/TextSectionHandler.java | 0 com/sun/star/wizards/text/TextStyleHandler.java | 0 com/sun/star/wizards/text/TextTableHandler.java | 0 com/sun/star/wizards/text/ViewHandler.java | 0 com/sun/star/wizards/tutorial/creator/frame/CallTutorialCreatorFramework.java | 0 com/sun/star/wizards/tutorial/creator/frame/ConnectFrame.java | 0 com/sun/star/wizards/tutorial/creator/frame/Framework.java | 0 com/sun/star/wizards/tutorial/creator/frame/StepFrame.java | 0 com/sun/star/wizards/tutorial/creator/frame/StepModel.java | 0 com/sun/star/wizards/tutorial/creator/frame/TutorialCreator.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/AccessibleObjectFind.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/ActionFrame.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/ActionPanel.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/GraphicalDisplay.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/MenuFactory.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/MethodDialog.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/TableColumModel.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/TextualDisplay.java | 0 com/sun/star/wizards/tutorial/executer/CallTutorialFramework.java | 0 com/sun/star/wizards/tutorial/executer/ExecuteCache.java | 0 com/sun/star/wizards/tutorial/executer/ExecuteMethod.java | 0 com/sun/star/wizards/tutorial/executer/ExecutePropertiesMethod.java | 0 com/sun/star/wizards/tutorial/executer/LocalisationCache.java | 0 com/sun/star/wizards/tutorial/executer/TranslateMacro.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/Components.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/Desktop.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/DesktopDialog.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/DesktopMenu.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/Presentation_Drawing.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/Spreadsheet.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/TextDocument.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XCellTextCompact.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XItemSelection.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XMouse.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XMoveMouseCompact.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XTabList.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XTextCompact.java | 0 com/sun/star/wizards/tutorial/executer/util/AccessibilityTools.java | 0 com/sun/star/wizards/tutorial/executer/util/Child.java | 0 com/sun/star/wizards/tutorial/executer/util/Control.java | 0 com/sun/star/wizards/tutorial/executer/util/File.java | 0 com/sun/star/wizards/tutorial/executer/util/FindInterfaces.java | 0 com/sun/star/wizards/tutorial/executer/util/Helper.java | 0 com/sun/star/wizards/tutorial/executer/util/Localizer.java | 0 com/sun/star/wizards/tutorial/executer/util/NameProvider.java | 0 com/sun/star/wizards/tutorial/executer/util/PathProperties.java | 0 com/sun/star/wizards/tutorial/executer/util/PropertiesFileWriter.java | 0 com/sun/star/wizards/ui/AggregateComponent.java | 0 com/sun/star/wizards/ui/CommandFieldSelection.java | 0 com/sun/star/wizards/ui/ControlScroller.java | 0 com/sun/star/wizards/ui/DocumentPreview.java | 0 com/sun/star/wizards/ui/FieldSelection.java | 0 com/sun/star/wizards/ui/FilterComponent.java | 0 com/sun/star/wizards/ui/ImageList.java | 0 com/sun/star/wizards/ui/PathSelection.java | 0 com/sun/star/wizards/ui/SortingComponent.java | 0 com/sun/star/wizards/ui/TitlesComponent.java | 0 com/sun/star/wizards/ui/UnoDialog.java | 0 com/sun/star/wizards/ui/UnoDialog2.java | 0 com/sun/star/wizards/ui/WizardDialog.java | 0 com/sun/star/wizards/ui/event/AbstractListener.java | 0 com/sun/star/wizards/ui/event/DataAware.java | 0 com/sun/star/wizards/ui/event/DataAwareFields.java | 0 com/sun/star/wizards/ui/event/ListModelBinder.java | 0 com/sun/star/wizards/ui/event/Task.java | 0 com/sun/star/wizards/ui/event/TaskEvent.java | 0 com/sun/star/wizards/ui/event/UnoDataAware.java | 0 com/sun/star/wizards/web/AbstractErrorHandler.java | 0 com/sun/star/wizards/web/BackgroundsDialog.java | 0 com/sun/star/wizards/web/CallWizard.java | 0 com/sun/star/wizards/web/ExtensionVerifier.java | 0 com/sun/star/wizards/web/FTPDialog.java | 0 com/sun/star/wizards/web/IconsDialog.java | 0 com/sun/star/wizards/web/ImageListDialog.java | 0 com/sun/star/wizards/web/LogTaskListener.java | 0 com/sun/star/wizards/web/Process.java | 0 com/sun/star/wizards/web/ProcessErrorHandler.java | 0 com/sun/star/wizards/web/StatusDialog.java | 0 com/sun/star/wizards/web/StylePreview.java | 0 com/sun/star/wizards/web/TOCPreview.java | 0 com/sun/star/wizards/web/WWD_Events.java | 0 com/sun/star/wizards/web/WWD_General.java | 0 com/sun/star/wizards/web/WWD_Startup.java | 0 com/sun/star/wizards/web/WebWizardDialog.java | 0 com/sun/star/wizards/web/data/CGDesign.java | 0 com/sun/star/wizards/web/data/CGDocument.java | 0 com/sun/star/wizards/web/data/CGGeneralInfo.java | 0 com/sun/star/wizards/web/data/CGLayout.java | 0 com/sun/star/wizards/web/data/CGPublish.java | 0 com/sun/star/wizards/web/data/CGSession.java | 0 com/sun/star/wizards/web/data/CGSettings.java | 0 com/sun/star/wizards/web/export/AbstractExporter.java | 0 com/sun/star/wizards/web/export/ConfiguredExporter.java | 0 com/sun/star/wizards/web/export/ImpressHTMLExporter.java | 0 com/sun/star/wizards/web/status/ErrorLog.java | 0 com/sun/star/wizards/web/status/LogTaskListener.java | 0 com/sun/star/wizards/web/status/Task.java | 0 com/sun/star/wizards/web/status/TaskEvent.java | 0 wizards/com/sun/star/wizards/agenda/AgendaTemplate.java | 50 +-- wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java | 20 - wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java | 28 +- wizards/com/sun/star/wizards/agenda/CallWizard.java | 4 wizards/com/sun/star/wizards/agenda/TopicsControl.java | 71 ++--- wizards/com/sun/star/wizards/common/ConfigGroup.java | 4 wizards/com/sun/star/wizards/common/ConfigSet.java | 14 - wizards/com/sun/star/wizards/common/FileAccess.java | 2 wizards/com/sun/star/wizards/common/Helper.java | 12 wizards/com/sun/star/wizards/common/NumberFormatter.java | 4 wizards/com/sun/star/wizards/common/SystemDialog.java | 8 wizards/com/sun/star/wizards/common/UCB.java | 4 wizards/com/sun/star/wizards/db/BlindtextCreator.java | 2 wizards/com/sun/star/wizards/db/ColumnPropertySet.java | 10 wizards/com/sun/star/wizards/db/CommandMetaData.java | 6 wizards/com/sun/star/wizards/db/CommandName.java | 26 - wizards/com/sun/star/wizards/db/DBMetaData.java | 42 +-- wizards/com/sun/star/wizards/db/FieldColumn.java | 8 wizards/com/sun/star/wizards/db/RecordParser.java | 10 wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 12 wizards/com/sun/star/wizards/db/TableDescriptor.java | 34 +- wizards/com/sun/star/wizards/db/TypeInspector.java | 20 - wizards/com/sun/star/wizards/document/Control.java | 2 wizards/com/sun/star/wizards/document/DatabaseControl.java | 4 wizards/com/sun/star/wizards/document/FormHandler.java | 2 wizards/com/sun/star/wizards/document/OfficeDocument.java | 4 wizards/com/sun/star/wizards/document/Shape.java | 2 wizards/com/sun/star/wizards/fax/CallWizard.java | 4 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java | 18 - wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.java | 10 wizards/com/sun/star/wizards/form/CallFormWizard.java | 4 wizards/com/sun/star/wizards/form/FormConfiguration.java | 2 wizards/com/sun/star/wizards/form/FormControlArranger.java | 36 +- wizards/com/sun/star/wizards/form/FormDocument.java | 38 +- wizards/com/sun/star/wizards/form/FormWizard.java | 4 wizards/com/sun/star/wizards/form/StyleApplier.java | 10 wizards/com/sun/star/wizards/form/UIControlArranger.java | 6 wizards/com/sun/star/wizards/letter/CallWizard.java | 4 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 30 +- wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java | 10 wizards/com/sun/star/wizards/query/CallQueryWizard.java | 4 wizards/com/sun/star/wizards/query/Finalizer.java | 2 wizards/com/sun/star/wizards/query/QuerySummary.java | 14 - wizards/com/sun/star/wizards/query/QueryWizard.java | 4 wizards/com/sun/star/wizards/report/CallReportWizard.java | 4 wizards/com/sun/star/wizards/report/DBColumn.java | 18 - wizards/com/sun/star/wizards/report/Dataimport.java | 4 wizards/com/sun/star/wizards/report/Finalizer.java | 2 wizards/com/sun/star/wizards/report/RecordTable.java | 2 wizards/com/sun/star/wizards/report/ReportDocument.java | 24 - wizards/com/sun/star/wizards/report/ReportLayouter.java | 2 wizards/com/sun/star/wizards/report/ReportWizard.java | 6 wizards/com/sun/star/wizards/table/CGCategory.java | 4 wizards/com/sun/star/wizards/table/CGTable.java | 4 wizards/com/sun/star/wizards/table/CallTableWizard.java | 4 wizards/com/sun/star/wizards/table/FieldDescription.java | 22 - wizards/com/sun/star/wizards/table/FieldFormatter.java | 2 wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 10 wizards/com/sun/star/wizards/table/ScenarioSelector.java | 4 wizards/com/sun/star/wizards/table/TableWizard.java | 4 wizards/com/sun/star/wizards/text/TextFieldHandler.java | 4 wizards/com/sun/star/wizards/text/TextSectionHandler.java | 6 wizards/com/sun/star/wizards/text/TextStyleHandler.java | 4 wizards/com/sun/star/wizards/text/TextTableHandler.java | 6 wizards/com/sun/star/wizards/text/ViewHandler.java | 10 wizards/com/sun/star/wizards/tutorial/creator/frame/CallTutorialCreatorFramework.java | 4 wizards/com/sun/star/wizards/tutorial/creator/frame/ConnectFrame.java | 32 +- wizards/com/sun/star/wizards/tutorial/creator/frame/Framework.java | 6 wizards/com/sun/star/wizards/tutorial/creator/frame/StepFrame.java | 76 ++--- wizards/com/sun/star/wizards/tutorial/creator/frame/StepModel.java | 2 wizards/com/sun/star/wizards/tutorial/creator/frame/TutorialCreator.java | 32 +- wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/AccessibleObjectFind.java | 6 wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/ActionFrame.java | 26 - wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/ActionPanel.java | 12 wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/GraphicalDisplay.java | 10 wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/MenuFactory.java | 18 - wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/MethodDialog.java | 24 - wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/TableColumModel.java | 2 wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/TextualDisplay.java | 14 - wizards/com/sun/star/wizards/tutorial/executer/CallTutorialFramework.java | 12 wizards/com/sun/star/wizards/tutorial/executer/ExecuteCache.java | 18 - wizards/com/sun/star/wizards/tutorial/executer/ExecuteMethod.java | 16 - wizards/com/sun/star/wizards/tutorial/executer/ExecutePropertiesMethod.java | 10 wizards/com/sun/star/wizards/tutorial/executer/LocalisationCache.java | 2 wizards/com/sun/star/wizards/tutorial/executer/TranslateMacro.java | 16 - wizards/com/sun/star/wizards/tutorial/executer/officeHelper/Components.java | 26 - wizards/com/sun/star/wizards/tutorial/executer/officeHelper/Desktop.java | 12 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/DesktopDialog.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/DesktopMenu.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/Presentation_Drawing.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/Spreadsheet.java | 18 - wizards/com/sun/star/wizards/tutorial/executer/officeHelper/TextDocument.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XCellTextCompact.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XItemSelection.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XMouse.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XMoveMouseCompact.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XTabList.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XTextCompact.java | 4 wizards/com/sun/star/wizards/tutorial/executer/util/AccessibilityTools.java | 42 +-- wizards/com/sun/star/wizards/tutorial/executer/util/Child.java | 4 wizards/com/sun/star/wizards/tutorial/executer/util/Control.java | 36 +- wizards/com/sun/star/wizards/tutorial/executer/util/File.java | 2 wizards/com/sun/star/wizards/tutorial/executer/util/FindInterfaces.java | 8 wizards/com/sun/star/wizards/tutorial/executer/util/Helper.java | 8 wizards/com/sun/star/wizards/tutorial/executer/util/Localizer.java | 4 wizards/com/sun/star/wizards/tutorial/executer/util/NameProvider.java | 4 wizards/com/sun/star/wizards/tutorial/executer/util/PathProperties.java | 6 wizards/com/sun/star/wizards/tutorial/executer/util/PropertiesFileWriter.java | 2 wizards/com/sun/star/wizards/ui/AggregateComponent.java | 38 +- wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 10 wizards/com/sun/star/wizards/ui/ControlScroller.java | 116 ++++---- wizards/com/sun/star/wizards/ui/DocumentPreview.java | 16 - wizards/com/sun/star/wizards/ui/FieldSelection.java | 8 wizards/com/sun/star/wizards/ui/FilterComponent.java | 34 +- wizards/com/sun/star/wizards/ui/ImageList.java | 138 +++++----- wizards/com/sun/star/wizards/ui/PathSelection.java | 4 wizards/com/sun/star/wizards/ui/SortingComponent.java | 10 wizards/com/sun/star/wizards/ui/TitlesComponent.java | 20 - wizards/com/sun/star/wizards/ui/UnoDialog.java | 4 wizards/com/sun/star/wizards/ui/UnoDialog2.java | 4 wizards/com/sun/star/wizards/ui/WizardDialog.java | 34 +- wizards/com/sun/star/wizards/ui/event/AbstractListener.java | 2 wizards/com/sun/star/wizards/ui/event/DataAware.java | 4 wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 34 +- wizards/com/sun/star/wizards/ui/event/ListModelBinder.java | 8 wizards/com/sun/star/wizards/ui/event/Task.java | 12 wizards/com/sun/star/wizards/ui/event/TaskEvent.java | 2 wizards/com/sun/star/wizards/ui/event/UnoDataAware.java | 4 wizards/com/sun/star/wizards/web/AbstractErrorHandler.java | 6 wizards/com/sun/star/wizards/web/BackgroundsDialog.java | 22 - wizards/com/sun/star/wizards/web/CallWizard.java | 6 wizards/com/sun/star/wizards/web/ExtensionVerifier.java | 2 wizards/com/sun/star/wizards/web/FTPDialog.java | 96 +++--- wizards/com/sun/star/wizards/web/IconsDialog.java | 16 - wizards/com/sun/star/wizards/web/ImageListDialog.java | 46 +-- wizards/com/sun/star/wizards/web/LogTaskListener.java | 2 wizards/com/sun/star/wizards/web/Process.java | 60 ++-- wizards/com/sun/star/wizards/web/ProcessErrorHandler.java | 6 wizards/com/sun/star/wizards/web/StatusDialog.java | 30 +- wizards/com/sun/star/wizards/web/StylePreview.java | 12 wizards/com/sun/star/wizards/web/TOCPreview.java | 20 - wizards/com/sun/star/wizards/web/WWD_Events.java | 32 +- wizards/com/sun/star/wizards/web/WWD_General.java | 12 wizards/com/sun/star/wizards/web/WWD_Startup.java | 30 +- wizards/com/sun/star/wizards/web/WebWizardDialog.java | 24 - wizards/com/sun/star/wizards/web/data/CGDesign.java | 10 wizards/com/sun/star/wizards/web/data/CGDocument.java | 22 - wizards/com/sun/star/wizards/web/data/CGGeneralInfo.java | 2 wizards/com/sun/star/wizards/web/data/CGLayout.java | 4 wizards/com/sun/star/wizards/web/data/CGPublish.java | 2 wizards/com/sun/star/wizards/web/data/CGSession.java | 2 wizards/com/sun/star/wizards/web/data/CGSettings.java | 18 - wizards/com/sun/star/wizards/web/export/AbstractExporter.java | 2 wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java | 2 wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java | 12 wizards/com/sun/star/wizards/web/status/ErrorLog.java | 2 wizards/com/sun/star/wizards/web/status/LogTaskListener.java | 2 wizards/com/sun/star/wizards/web/status/Task.java | 12 wizards/com/sun/star/wizards/web/status/TaskEvent.java | 2 318 files changed, 1163 insertions(+), 1156 deletions(-) --- NEW FILE openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch --- Index: com/sun/star/wizards/agenda/AgendaTemplate.java =================================================================== RCS file: /cvs/installation/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java,v retrieving revision 1.4 diff -u -p -r1.4 AgendaTemplate.java --- openoffice.org.orig/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java 21 Feb 2005 13:50:05 -0000 1.4 +++ openoffice.org/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java 3 May 2005 14:11:53 -0000 @@ -231,7 +231,7 @@ public class AgendaTemplate extends Text /** * used to set the document title property (step 6). */ - private Object docInfo; + Object docInfo; /** * loads the given template, and analyze its structure. @@ -259,7 +259,7 @@ public class AgendaTemplate extends Text * @param url * @return the template name without the "aw-" at the beginning. */ - private String calcTemplateName(String url) { + String calcTemplateName(String url) { return FileAccess.connectURLs( FileAccess.getParentDir(url) ,FileAccess.getFilename(url).substring(3)); } @@ -271,7 +271,7 @@ public class AgendaTemplate extends Text * information (it is only actualized on save) the given list * supplies this information. */ - private void initializeData(List topicsData) { + void initializeData(List topicsData) { for (int i = 0; i < itemsTables.length; i++) { try { itemsTables[i].write(""); @@ -377,7 +377,7 @@ public class AgendaTemplate extends Text * A cache is used in order to reuse the objects, instead of recreate them. * This method fills the cache will all items objects (names and headings). */ - private void initItemsCache() { + void initItemsCache() { itemsCache = new Hashtable(11); XMultiServiceFactory xmsf = (XMultiServiceFactory)UnoRuntime.queryInterface(XMultiServiceFactory.class,document); @@ -443,7 +443,7 @@ public class AgendaTemplate extends Text * -locate the titles and actualize them * -analyze the topics table */ - private void initialize() + void initialize() { /* * Get the default locale of the document, and create the date and time formatters. @@ -498,7 +498,7 @@ public class AgendaTemplate extends Text * locates the titles (name, location, date, time) and saves a reference to thier Text ranges. * */ - private void initializeTitles() { + void initializeTitles() { XTextRange item = null; XMultiServiceFactory xmsf = (XMultiServiceFactory)UnoRuntime.queryInterface(XMultiServiceFactory.class,document); @@ -530,12 +530,12 @@ public class AgendaTemplate extends Text } } - private void initializeTopics() + void initializeTopics() { topics = new Topics(); } - private void initializeItems() + void initializeItems() { _allItems = searchFillInItems(); } @@ -544,7 +544,7 @@ public class AgendaTemplate extends Text * searches the document for items in the format ">*<" * @return a vector containing the XTextRanges of the found items */ - private List searchFillInItems() { + List searchFillInItems() { try { XSearchable xSearchable = (XSearchable)UnoRuntime.queryInterface(XSearchable.class,document); XSearchDescriptor sd = xSearchable.createSearchDescriptor(); @@ -574,7 +574,7 @@ public class AgendaTemplate extends Text * analyze the item sections in the template. delegates the analyze of each table to the * ItemsTable class. */ - private void initializeItemsSections() + void initializeItemsSections() { String[] sections = getSections(document, TemplateConsts.SECTION_ITEMS); @@ -593,7 +593,7 @@ public class AgendaTemplate extends Text } - private String[] getSections(Object document, String s) + String[] getSections(Object document, String s) { XTextSectionsSupplier xTextSectionsSupplier = (XTextSectionsSupplier) UnoRuntime.queryInterface(XTextSectionsSupplier.class, document); String[] allSections = xTextSectionsSupplier.getTextSections().getElementNames(); @@ -627,7 +627,7 @@ public class AgendaTemplate extends Text } - private synchronized void redrawTitle(String controlName) { + synchronized void redrawTitle(String controlName) { if (controlName.equals("txtTitle")) writeTitle(teTitle, trTitle, agenda.cp_Title); else if (controlName.equals("txtDate")) @@ -640,13 +640,13 @@ public class AgendaTemplate extends Text } - private void writeTitle( TextElement te, XTextRange tr, String text) { + void writeTitle( TextElement te, XTextRange tr, String text) { te.text = (text == null ? "" : text); te.write(tr); } - private static long DAY_IN_MILLIS = ( 24 * 60 * 60 * 1000 ); + static long DAY_IN_MILLIS = ( 24 * 60 * 60 * 1000 ); - private String getDateString(String d) { + String getDateString(String d) { if (d == null || d.equals("")) return ""; @@ -666,7 +666,7 @@ public class AgendaTemplate extends Text return dateFormatter.convertNumberToString(dateFormat, daysDiff); } - private String getTimeString(String s) { + String getTimeString(String s) { if (s == null || s.equals("")) return ""; int time = new Integer(s).intValue(); @@ -692,7 +692,7 @@ public class AgendaTemplate extends Text * user specified not to display any items which it contains. * When finishing the wizard removes this sections entireley from the document. */ - private void deleteHiddenSections() { + void deleteHiddenSections() { XTextSectionsSupplier xTextSectionsSupplier = (XTextSectionsSupplier) UnoRuntime.queryInterface(XTextSectionsSupplier.class, document); String[] allSections = xTextSectionsSupplier.getTextSections().getElementNames(); try { @@ -824,7 +824,7 @@ public class AgendaTemplate extends Text * @param text the text to fill to the text range object. * @param placeholder the placeholder text to use, if the text argument is empty (null or "") */ - private void fillMinutesItem(XTextRange range, Object text, String placeholder) { + void fillMinutesItem(XTextRange range, Object text, String placeholder) { String paraStyle = (String)Helper.getUnoPropertyValue(range,"ParaStyleName"); range.setString((String)text); Helper.setUnoPropertyValue(range,"ParaStyleName",paraStyle); @@ -1226,7 +1226,7 @@ public class AgendaTemplate extends Text * @return the number of rows that have been added * to the table. 0 or a negative number: no rows added. */ - private int write2(int topic, PropertyValue[] data) throws Exception { + int write2(int topic, PropertyValue[] data) throws Exception { while (topic >= writtenTopics.size()) writtenTopics.add(null); @@ -1270,7 +1270,7 @@ public class AgendaTemplate extends Text * (false would mean new rows must be added to the table in order to * be able to write this topic). */ - private boolean isWritten(int topic) { + boolean isWritten(int topic) { return (writtenTopics.size() > topic && writtenTopics.get(topic) != null ); } @@ -1406,7 +1406,7 @@ public class AgendaTemplate extends Text /** * reapply the format of the first (header) row. */ - private void formatFirstRow() { + void formatFirstRow() { XTextTableCursor cursor = table.createCursorByCellName("A1"); formatTable(cursor,firstRowFormat, false ); } @@ -1414,7 +1414,7 @@ public class AgendaTemplate extends Text /** * reaply the format of the last row. */ - private void formatLastRow() { + void formatLastRow() { XTextTableCursor cursor = table.createCursorByCellName("A1"); cursor.gotoEnd(false); formatTable(cursor,lastRowFormat, true); @@ -1428,7 +1428,7 @@ public class AgendaTemplate extends Text * @return a TextElement object which will write the given value * to the given cell. */ - private TextElement setItemText(int cell, Object value) { + TextElement setItemText(int cell, Object value) { if (cell >= 0) { [...7895 lines suppressed...] @@ -80,7 +80,7 @@ public class CGSettings extends Confi } - private static final CGExporter[] EMPTY_ARRAY_1 = new CGExporter[0]; + static final CGExporter[] EMPTY_ARRAY_1 = new CGExporter[0]; public CGExporter[] getExporters(String mime) { CGExporter[] exps = (CGExporter[])exportersMap.get(mime); @@ -89,7 +89,7 @@ public class CGSettings extends Confi return exps; } - private CGExporter[] createExporters(String mime) { + CGExporter[] createExporters(String mime) { Object[] exporters = cp_Exporters.items(); Vector v = new Vector(); for (int i = 0; iPreferences>Java>Code Generation>Code and Comments */ public class Task { - private int successfull = 0; - private int failed = 0; + int successfull = 0; + int failed = 0; - private int max = 0; - private String taskName; - private List listeners = new Vector(); - private String subtaskName; + int max = 0; + String taskName; + List listeners = new Vector(); + String subtaskName; public Task(String taskName_ , String subtaskName_, int max_) { Index: com/sun/star/wizards/web/status/TaskEvent.java =================================================================== RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/status/TaskEvent.java,v retrieving revision 1.2 diff -u -p -r1.2 TaskEvent.java --- openoffice.org.orig/wizards/com/sun/star/wizards/web/status/TaskEvent.java 19 May 2004 13:22:01 -0000 1.2 +++ openoffice.org/wizards/com/sun/star/wizards/web/status/TaskEvent.java 3 May 2005 14:12:28 -0000 @@ -21,7 +21,7 @@ public class TaskEvent extends EventObje public static final int TASK_STATUS_CHANGED = 3; public static final int SUBTASK_NAME_CHANGED = 4; - private int type; + int type; /** * general constructor- Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- openoffice.org.spec 3 May 2005 17:49:03 -0000 1.181 +++ openoffice.org.spec 3 May 2005 17:52:05 -0000 1.182 @@ -20,7 +20,7 @@ Summary: OpenOffice.org comprehensive office suite. Name: openoffice.org Version: 1.9.%{ooo2ver} -Release: 1 +Release: 2 Epoch: 1 License: LGPL/SISSL Group: Applications/Productivity @@ -90,6 +90,7 @@ Patch35: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch Patch36: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch Patch37: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch +Patch38: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch %define instdir %{_libdir}/openoffice.org%{version} @@ -676,6 +677,7 @@ %patch35 -p1 -b .ooo48600.rtfparseerror.svx.patch %patch36 -p1 -b .gcc19870.gcjaccessproblem.filter.patch %patch37 -p1 -b .ooo48610.searchalltemplates.wizards.patch +%patch38 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch #start ludicrous workaround #while we include these libs we need this, if/when we move to system @@ -2441,6 +2443,8 @@ - add openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch for gcj bug workaround - add openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch - help documentation for cs and et has landed +- add openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch + -> wizards work! * Tue May 03 2005 Caolan McNamara - 1:1.9.99-1 - add openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch From fedora-cvs-commits at redhat.com Tue May 3 18:05:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 14:05:56 -0400 Subject: rpms/xscreensaver/devel xscreensaver-4.21-make-hack-paths-absolute.patch, NONE, 1.1 xscreensaver.spec, 1.45, 1.46 Message-ID: <200505031805.j43I5up0027867@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xscreensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27853 Modified Files: xscreensaver.spec Added Files: xscreensaver-4.21-make-hack-paths-absolute.patch Log Message: - Use absolute filenames for screenhacks so we don't pull in screenhacks from PATH (bug 151677). xscreensaver-4.21-make-hack-paths-absolute.patch: XScreenSaver.ad.in | 428 ++++++++++++++++++++++++++++------------------------- 1 files changed, 233 insertions(+), 195 deletions(-) --- NEW FILE xscreensaver-4.21-make-hack-paths-absolute.patch --- --- xscreensaver-4.21/driver/XScreenSaver.ad.in.make-hack-paths-absolute 2005-05-03 13:28:38.000000000 -0400 +++ xscreensaver-4.21/driver/XScreenSaver.ad.in 2005-05-03 13:42:22.000000000 -0400 @@ -148,262 +148,262 @@ loadURL: htmlview '%s' ! screen savers interactively. ! *programs: \ - "Qix (solid)" qix -root -solid -segments 100 \n\ - "Qix (transparent)" qix -root -count 4 -solid -transparent \n\ - "Qix (linear)" qix -root -count 5 -solid -transparent \ + "Qix (solid)" @HACKDIR@/qix -root -solid -segments 100 \n\ + "Qix (transparent)" @HACKDIR@/qix -root -count 4 -solid -transparent \n\ + "Qix (linear)" @HACKDIR@/qix -root -count 5 -solid -transparent \ -linear -segments 250 -size 100 \n\ -- "Qix (xor)" qix -root -linear -count 5 -size 200 \ +- "Qix (xor)" @HACKDIR@/qix -root -linear -count 5 -size 200 \ -spread 30 -segments 75 -solid -xor \n\ \ - "Attraction (balls)" attraction -root -mode balls \n\ - "Attraction (lines)" attraction -root -mode lines -points 3 \ + "Attraction (balls)" @HACKDIR@/attraction -root -mode balls \n\ + "Attraction (lines)" @HACKDIR@/attraction -root -mode lines -points 3 \ -segments 200 \n\ -- "Attraction (poly)" attraction -root -mode polygons \n\ - "Attraction (splines)" attraction -root -mode splines -segments \ +- "Attraction (poly)" @HACKDIR@/attraction -root -mode polygons \n\ + "Attraction (splines)" @HACKDIR@/attraction -root -mode splines -segments \ 300 \n\ - "Attraction (orbital)" attraction -root -mode lines -radius 300 \ + "Attraction (orbital)" @HACKDIR@/attraction -root -mode lines -radius 300 \ -orbit -vmult 0.5 \n\ \ - pyro -root \n\ - rocks -root \n\ - helix -root \n\ - pedal -root \n\ - rorschach -root -offset 7 \n\ - hopalong -root \n\ - greynetic -root \n\ - imsmap -root \n\ - slidescreen -root \n\ - decayscreen -root \n\ - jigsaw -root \n\ - blitspin -root -grab \n\ - slip -root \n\ - distort -root \n\ - spotlight -root \n\ - "Ripples (oily)" ripples -root -oily -light 2 \n\ - "Ripples (stir)" ripples -root -oily -light 2 -stir \n\ - "Ripples (desktop)" ripples -root -water -light 6 \n\ - hypercube -root \n\ -- hyperball -root \n\ - halo -root \n\ - maze -root \n\ - noseguy -root \n\ - flame -root \n\ -- lmorph -root \n\ - deco -root \n\ - moire -root \n\ - moire2 -root \n\ - lightning -root \n\ - strange -root \n\ -- spiral -root \n\ - laser -root \n\ - grav -root \n\ - "Grav (trails)" grav -root -trail -decay \n\ - drift -root \n\ - ifs -root \n\ - julia -root \n\ - penrose -root \n\ -- sierpinski -root \n\ - braid -root \n\ - galaxy -root \n\ - bouboule -root \n\ - swirl -root \n\ - flag -root \n\ - sphere -root \n\ - forest -root \n\ -- lisa -root \n\ -- lissie -root \n\ - goop -root -max-velocity 0.5 -elasticity \ + @HACKDIR@/pyro -root \n\ + @HACKDIR@/rocks -root \n\ + @HACKDIR@/helix -root \n\ + @HACKDIR@/pedal -root \n\ + @HACKDIR@/rorschach -root -offset 7 \n\ + @HACKDIR@/hopalong -root \n\ + @HACKDIR@/greynetic -root \n\ + @HACKDIR@/imsmap -root \n\ + @HACKDIR@/slidescreen -root \n\ + @HACKDIR@/decayscreen -root \n\ + @HACKDIR@/jigsaw -root \n\ + @HACKDIR@/blitspin -root -grab \n\ + @HACKDIR@/slip -root \n\ + @HACKDIR@/distort -root \n\ + @HACKDIR@/spotlight -root \n\ + "Ripples (oily)" @HACKDIR@/ripples -root -oily -light 2 \n\ + "Ripples (stir)" @HACKDIR@/ripples -root -oily -light 2 -stir \n\ + "Ripples (desktop)" @HACKDIR@/ripples -root -water -light 6 \n\ + @HACKDIR@/hypercube -root \n\ +- @HACKDIR@/hyperball -root \n\ + @HACKDIR@/halo -root \n\ + @HACKDIR@/maze -root \n\ + @HACKDIR@/noseguy -root \n\ + @HACKDIR@/flame -root \n\ +- @HACKDIR@/lmorph -root \n\ + @HACKDIR@/deco -root \n\ + @HACKDIR@/moire -root \n\ + @HACKDIR@/moire2 -root \n\ + @HACKDIR@/lightning -root \n\ + @HACKDIR@/strange -root \n\ +- @HACKDIR@/spiral -root \n\ + @HACKDIR@/laser -root \n\ + @HACKDIR@/grav -root \n\ + "Grav (trails)" @HACKDIR@/grav -root -trail -decay \n\ + @HACKDIR@/drift -root \n\ + @HACKDIR@/ifs -root \n\ + @HACKDIR@/julia -root \n\ + @HACKDIR@/penrose -root \n\ +- @HACKDIR@/sierpinski -root \n\ + @HACKDIR@/braid -root \n\ + @HACKDIR@/galaxy -root \n\ + @HACKDIR@/bouboule -root \n\ + @HACKDIR@/swirl -root \n\ + @HACKDIR@/flag -root \n\ + @HACKDIR@/sphere -root \n\ + @HACKDIR@/forest -root \n\ +- @HACKDIR@/lisa -root \n\ +- @HACKDIR@/lissie -root \n\ + @HACKDIR@/goop -root -max-velocity 0.5 -elasticity \ 0.9 \n\ - starfish -root \n\ - "Starfish (blob)" starfish -root -blob \n\ - munch -root \n\ - mismunch -root \n\ - fadeplot -root \n\ - coral -root -delay 0 \n\ - mountain -root \n\ - triangle -root -delay 1 \n\ -- worm -root \n\ -- rotor -root \n\ -- ant -root \n\ -- demon -root \n\ -- loop -root \n\ -- vines -root \n\ - kaleidescope -root \n\ - xjack -root \n\ - xlyap -root -randomize \n\ - cynosure -root \n\ - flow -root \n\ - epicycle -root \n\ - interference -root \n\ - truchet -root -randomize \n\ - bsod -root \n\ - crystal -root \n\ - discrete -root \n\ - kumppa -root \n\ - rd-bomb -root \n\ - "RD-Bomb (mobile)" rd-bomb -root -speed 1 -size 0.1 \n\ - sonar -root \n\ - t3d -root \n\ - penetrate -root \n\ - deluxe -root \n\ - compass -root \n\ - squiral -root \n\ - xflame -root \n\ - wander -root \n\ - "Wander (spots)" wander -root -advance 0 -size 10 -circles \ + @HACKDIR@/starfish -root \n\ + "Starfish (blob)" @HACKDIR@/starfish -root -blob \n\ + @HACKDIR@/munch -root \n\ + @HACKDIR@/mismunch -root \n\ + @HACKDIR@/fadeplot -root \n\ + @HACKDIR@/coral -root -delay 0 \n\ + @HACKDIR@/mountain -root \n\ + @HACKDIR@/triangle -root -delay 1 \n\ +- @HACKDIR@/worm -root \n\ +- @HACKDIR@/rotor -root \n\ +- @HACKDIR@/ant -root \n\ +- @HACKDIR@/demon -root \n\ +- @HACKDIR@/loop -root \n\ +- @HACKDIR@/vines -root \n\ + @HACKDIR@/kaleidescope -root \n\ + @HACKDIR@/xjack -root \n\ + @HACKDIR@/xlyap -root -randomize \n\ + @HACKDIR@/cynosure -root \n\ + @HACKDIR@/flow -root \n\ + @HACKDIR@/epicycle -root \n\ + @HACKDIR@/interference -root \n\ + @HACKDIR@/truchet -root -randomize \n\ + @HACKDIR@/bsod -root \n\ + @HACKDIR@/crystal -root \n\ + @HACKDIR@/discrete -root \n\ + @HACKDIR@/kumppa -root \n\ + @HACKDIR@/rd-bomb -root \n\ + "RD-Bomb (mobile)" @HACKDIR@/rd-bomb -root -speed 1 -size 0.1 \n\ + @HACKDIR@/sonar -root \n\ + @HACKDIR@/t3d -root \n\ + @HACKDIR@/penetrate -root \n\ + @HACKDIR@/deluxe -root \n\ + @HACKDIR@/compass -root \n\ + @HACKDIR@/squiral -root \n\ + @HACKDIR@/xflame -root \n\ + @HACKDIR@/wander -root \n\ + "Wander (spots)" @HACKDIR@/wander -root -advance 0 -size 10 -circles \ -length 10000 -reset 100000 \n\ -- critical -root \n\ - phosphor -root \n\ - xmatrix -root \n\ - petri -root -size 2 -count 20 \n\ - "Petri 2" petri -root -minlifespeed 0.02 \ +- @HACKDIR@/critical -root \n\ + @HACKDIR@/phosphor -root \n\ + @HACKDIR@/xmatrix -root \n\ + @HACKDIR@/petri -root -size 2 -count 20 \n\ + "Petri 2" @HACKDIR@/petri -root -minlifespeed 0.02 \ -maxlifespeed 0.03 -minlifespan 1 \ -maxlifespan 1 -instantdeathchan 0 \ -minorchan 0 -anychan 0.3 \n\ - shadebobs -root \n\ - ccurve -root \n\ - blaster -root \n\ - bumps -root \n\ - xteevee -root \n\ - xanalogtv -root \n\ - xspirograph -root \n\ - nerverot -root \n\ -- "NerveRot (dense)" nerverot -root -count 1000 \n\ -- "NerveRot (thick)" nerverot -root -count 100 -line-width 4 \ + @HACKDIR@/shadebobs -root \n\ + @HACKDIR@/ccurve -root \n\ + @HACKDIR@/blaster -root \n\ + @HACKDIR@/bumps -root \n\ + @HACKDIR@/xteevee -root \n\ + @HACKDIR@/xanalogtv -root \n\ + @HACKDIR@/xspirograph -root \n\ + @HACKDIR@/nerverot -root \n\ +- "NerveRot (dense)" @HACKDIR@/nerverot -root -count 1000 \n\ +- "NerveRot (thick)" @HACKDIR@/nerverot -root -count 100 -line-width 4 \ -max-nerve-radius 0.8 -nervousness 0.5 -db \n\ - xrayswarm -root \n\ -- "Zoom (Fatbits)" zoom -root \n\ - "Zoom (Lenses)" zoom -root -lenses \n\ - rotzoomer -root \n\ -- "RotZoomer (mobile)" rotzoomer -root -move \n\ -- "RotZoomer (sweep)" rotzoomer -root -sweep \n\ - whirlwindwarp -root \n\ - "WhirlyGig" whirlygig -root \n\ - "SpeedMine" speedmine -root \n\ - "SpeedWorm" speedmine -root -worm \n\ - vermiculate -root \n\ - twang -root \n\ - apollonian -root \n\ - euler2d -root \n\ - "Euler2d (dense)" euler2d -root -count 4000 -eulertail 400 \ + @HACKDIR@/xrayswarm -root \n\ +- "Zoom (Fatbits)" @HACKDIR@/zoom -root \n\ + "Zoom (Lenses)" @HACKDIR@/zoom -root -lenses \n\ + @HACKDIR@/rotzoomer -root \n\ +- "RotZoomer (mobile)" @HACKDIR@/rotzoomer -root -move \n\ +- "RotZoomer (sweep)" @HACKDIR@/rotzoomer -root -sweep \n\ + @HACKDIR@/whirlwindwarp -root \n\ + "WhirlyGig" @HACKDIR@/whirlygig -root \n\ + "SpeedMine" @HACKDIR@/speedmine -root \n\ + "SpeedWorm" @HACKDIR@/speedmine -root -worm \n\ + @HACKDIR@/vermiculate -root \n\ + @HACKDIR@/twang -root \n\ + @HACKDIR@/apollonian -root \n\ + @HACKDIR@/euler2d -root \n\ + "Euler2d (dense)" @HACKDIR@/euler2d -root -count 4000 -eulertail 400 \ -ncolors 230 \n\ -- juggle -root \n\ - polyominoes -root \n\ -- thornbird -root \n\ - fluidballs -root \n\ - anemone -root \n\ - halftone -root \n\ - metaballs -root \n\ - eruption -root \n\ - popsquares -root \n\ - barcode -root \n\ - piecewise -root \n\ - cloudlife -root \n\ - "FontGlide" fontglide -root -page \n\ - "FontGlide (scroller)" fontglide -root -scroll \n\ - apple2 -root \n\ - bubbles -root \n\ - pong -root \n\ - wormhole -root \n\ - pacman -root \n\ - fuzzyflakes -root \n\ - anemotaxis -root \n\ - memscroller -root \n\ - substrate -root \n\ - "Substrate (circles)" substrate -root -circle-percent 33 \n\ - intermomentary -root \n\ - fireworkx -root \n\ - fiberlamp -root \n\ - boxfit -root \n\ -- default-n: webcollage -root \n\ +- @HACKDIR@/juggle -root \n\ + @HACKDIR@/polyominoes -root \n\ +- @HACKDIR@/thornbird -root \n\ + @HACKDIR@/fluidballs -root \n\ + @HACKDIR@/anemone -root \n\ + @HACKDIR@/halftone -root \n\ + @HACKDIR@/metaballs -root \n\ + @HACKDIR@/eruption -root \n\ + @HACKDIR@/popsquares -root \n\ + @HACKDIR@/barcode -root \n\ + @HACKDIR@/piecewise -root \n\ + @HACKDIR@/cloudlife -root \n\ + "FontGlide" @HACKDIR@/fontglide -root -page \n\ + "FontGlide (scroller)" @HACKDIR@/fontglide -root -scroll \n\ + @HACKDIR@/apple2 -root \n\ + @HACKDIR@/bubbles -root \n\ + @HACKDIR@/pong -root \n\ + @HACKDIR@/wormhole -root \n\ + @HACKDIR@/pacman -root \n\ + @HACKDIR@/fuzzyflakes -root \n\ + @HACKDIR@/anemotaxis -root \n\ + @HACKDIR@/memscroller -root \n\ + @HACKDIR@/substrate -root \n\ + "Substrate (circles)" @HACKDIR@/substrate -root -circle-percent 33 \n\ + @HACKDIR@/intermomentary -root \n\ + @HACKDIR@/fireworkx -root \n\ + @HACKDIR@/fiberlamp -root \n\ + @HACKDIR@/boxfit -root \n\ +- default-n: @HACKDIR@/webcollage -root \n\ - default-n: "WebCollage (whacked)" \ - webcollage -root -filter \ - 'vidwhacker -stdin -stdout' \n\ -- default-n: vidwhacker -root \n\ + @HACKDIR@/webcollage -root -filter \ + '@HACKDIR@/vidwhacker -stdin -stdout' \n\ +- default-n: @HACKDIR@/vidwhacker -root \n\ \ - at GL_KLUDGE@ GL: gears -root \n\ - at GL_KLUDGE@ GL: "Gears (planetary)" gears -root -planetary \n\ - at GL_KLUDGE@ GL: superquadrics -root \n\ - at GL_KLUDGE@ GL: morph3d -root \n\ - at GL_KLUDGE@ GL: cage -root \n\ - at GL_KLUDGE@ GL: moebius -root \n\ - at GL_KLUDGE@ GL: stairs -root \n\ - at GL_KLUDGE@ GL: pipes -root \n\ - at GL_KLUDGE@ GL: sproingies -root \n\ - at GL_KLUDGE@ GL: rubik -root \n\ - at GL_KLUDGE@ GL: atlantis -root -gradient \n\ - at GL_KLUDGE@ GL: lament -root \n\ - at GL_KLUDGE@ GL: bubble3d -root \n\ - at GL_KLUDGE@ GL: glplanet -root \n\ - at GL_KLUDGE@ GL: flurry -root -preset random \n\ - at GL_KLUDGE@ GL: pulsar -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/gears -root \n\ + at GL_KLUDGE@ GL: "Gears (planetary)" @HACKDIR@/gears -root -planetary \n\ + at GL_KLUDGE@ GL: @HACKDIR@/superquadrics -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/morph3d -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/cage -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/moebius -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/stairs -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/pipes -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/sproingies -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/rubik -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/atlantis -root -gradient \n\ + at GL_KLUDGE@ GL: @HACKDIR@/lament -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/bubble3d -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/glplanet -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/flurry -root -preset random \n\ + at GL_KLUDGE@ GL: @HACKDIR@/pulsar -root \n\ - GL: "Pulsar (textures)" \ - pulsar -root -texture -mipmap \ + @HACKDIR@/pulsar -root -texture -mipmap \ -texture_quality -light -fog \n\ - at GLE_KLUDGE@GL: extrusion -root \n\ - at GL_KLUDGE@ GL: sierpinski3d -root \n\ - at GL_KLUDGE@ GL: menger -root \n\ - at GL_KLUDGE@ GL: "GFlux" gflux -root \n\ - at GL_KLUDGE@ GL: "GFlux (grab)" gflux -root -mode grab \n\ - at GL_KLUDGE@ GL: stonerview -root \n\ - at GL_KLUDGE@ GL: starwars -root \n\ - at GL_KLUDGE@ GL: gltext -root \n\ - at GL_KLUDGE@ GL: "GLText (clock)" gltext -text "%A%n%d %b %Y%n%r" -root \n\ - at GL_KLUDGE@ GL: molecule -root -shells \n\ - at GL_KLUDGE@ GL: dangerball -root \n\ - at GL_KLUDGE@ GL: circuit -root \n\ - at GL_KLUDGE@ GL: engine -root \n\ - at GL_KLUDGE@ GL: flipscreen3d -root \n\ - at GL_KLUDGE@ GL: glsnake -root \n\ - at GL_KLUDGE@ GL: boxed -root \n\ -- GL: "GLForestFire" glforestfire -root \n\ -- GL: "GLForestFire (rain)" glforestfire -root -count 0 \n\ -- GL: sballs -root \n\ - at GL_KLUDGE@ GL: cubenetic -root \n\ - at GL_KLUDGE@ GL: spheremonics -root \n\ - at GL_KLUDGE@ GL: lavalite -root \n\ - at GL_KLUDGE@ GL: queens -root \n\ - at GL_KLUDGE@ GL: endgame -root \n\ -- GL: glblur -root \n\ - at GL_KLUDGE@ GL: atunnel -root \n\ - at GL_KLUDGE@ GL: flyingtoasters -root \n\ - at GL_KLUDGE@ GL: bouncingcow -root \n\ - at GL_KLUDGE@ GL: jigglypuff -root -random \n\ - at GL_KLUDGE@ GL: klein -root -random \n\ - at GL_KLUDGE@ GL: "HyperTorus (striped)" hypertorus -root \n\ - at GL_KLUDGE@ GL: "HyperTorus (solid)" hypertorus -root -solid -transparent \n\ - at GL_KLUDGE@ GL: glmatrix -root \n\ - at GL_KLUDGE@ GL: cubestorm -root \n\ - at GL_KLUDGE@ GL: glknots -root \n\ - at GL_KLUDGE@ GL: blocktube -root \n\ - at GL_KLUDGE@ GL: flipflop -root \n\ - at GL_KLUDGE@ GL: antspotlight -root \n\ -- GL: glslideshow -root \n\ - at GL_KLUDGE@ GL: polytopes -root \n\ - at GL_KLUDGE@ GL: gleidescope -root \n\ -- GL: mirrorblob -root \n\ + at GLE_KLUDGE@GL: @HACKDIR@/extrusion -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/sierpinski3d -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/menger -root \n\ + at GL_KLUDGE@ GL: "GFlux" @HACKDIR@/gflux -root \n\ + at GL_KLUDGE@ GL: "GFlux (grab)" @HACKDIR@/gflux -root -mode grab \n\ + at GL_KLUDGE@ GL: @HACKDIR@/stonerview -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/starwars -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/gltext -root \n\ + at GL_KLUDGE@ GL: "GLText (clock)" @HACKDIR@/gltext -text "%A%n%d %b %Y%n%r" -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/molecule -root -shells \n\ + at GL_KLUDGE@ GL: @HACKDIR@/dangerball -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/circuit -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/engine -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/flipscreen3d -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/glsnake -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/boxed -root \n\ +- GL: "GLForestFire" @HACKDIR@/glforestfire -root \n\ +- GL: "GLForestFire (rain)" @HACKDIR@/glforestfire -root -count 0 \n\ +- GL: @HACKDIR@/sballs -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/cubenetic -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/spheremonics -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/lavalite -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/queens -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/endgame -root \n\ +- GL: @HACKDIR@/glblur -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/atunnel -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/flyingtoasters -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/bouncingcow -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/jigglypuff -root -random \n\ + at GL_KLUDGE@ GL: @HACKDIR@/klein -root -random \n\ + at GL_KLUDGE@ GL: "HyperTorus (striped)" @HACKDIR@/hypertorus -root \n\ + at GL_KLUDGE@ GL: "HyperTorus (solid)" @HACKDIR@/hypertorus -root -solid -transparent \n\ + at GL_KLUDGE@ GL: @HACKDIR@/glmatrix -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/cubestorm -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/glknots -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/blocktube -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/flipflop -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/antspotlight -root \n\ +- GL: @HACKDIR@/glslideshow -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/polytopes -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/gleidescope -root \n\ +- GL: @HACKDIR@/mirrorblob -root \n\ @GL_KLUDGE@ GL: "MirrorBlob (color only)" \ - mirrorblob -root -colour -no-texture \n\ - at GL_KLUDGE@ GL: blinkbox -root \n\ - at GL_KLUDGE@ GL: noof -root \n\ - at GL_KLUDGE@ GL: polyhedra -root \n\ -- GL: antinspect -root \n\ - at GL_KLUDGE@ GL: providence -root \n\ - at GL_KLUDGE@ GL: "Pinion (large gears)" pinion -root \n\ - at GL_KLUDGE@ GL: "Pinion (small gears)" pinion -root -size 0.2 -scroll 0.3 \n\ - at GL_KLUDGE@ GL: boing -root -lighting -smooth \n\ -- GL: carousel -root \n\ - at GL_KLUDGE@ GL: fliptext -root \n\ + @HACKDIR@/mirrorblob -root -colour -no-texture \n\ + at GL_KLUDGE@ GL: @HACKDIR@/blinkbox -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/noof -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/polyhedra -root \n\ +- GL: @HACKDIR@/antinspect -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/providence -root \n\ + at GL_KLUDGE@ GL: "Pinion (large gears)" @HACKDIR@/pinion -root \n\ + at GL_KLUDGE@ GL: "Pinion (small gears)" @HACKDIR@/pinion -root -size 0.2 -scroll 0.3 \n\ + at GL_KLUDGE@ GL: @HACKDIR@/boing -root -lighting -smooth \n\ +- GL: @HACKDIR@/carousel -root \n\ + at GL_KLUDGE@ GL: @HACKDIR@/fliptext -root \n\ \ -- xdaliclock -root -builtin3 -cycle \n\ -- default-n: xearth -nofork -nostars -ncolors 50 \ +- @HACKDIR@/xdaliclock -root -builtin3 -cycle \n\ +- default-n: @HACKDIR@/xearth -nofork -nostars -ncolors 50 \ -night 3 -wait 0 -timewarp 400.0 -pos \ sunrel/38/-30 \n\ -- xplanet -vroot -wait 1 -timewarp 90000 \ +- @HACKDIR@/xplanet -vroot -wait 1 -timewarp 90000 \ -label -origin moon \n\ -- xmountains -b -M -Z 0 -r 1 \n\ -- "XMountains (top)" xmountains -b -M -Z 0 -r 1 -m \n\ -- xaos -root -autopilot -nogui -delay 10000 \ +- @HACKDIR@/xmountains -b -M -Z 0 -r 1 \n\ +- "XMountains (top)" @HACKDIR@/xmountains -b -M -Z 0 -r 1 -m \n\ +- @HACKDIR@/xaos -root -autopilot -nogui -delay 10000 \ -maxframerate 30 \ -incoloring -1 -outcoloring -1 \n\ - xfishtank -d -s \n\ Index: xscreensaver.spec =================================================================== RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- xscreensaver.spec 22 Mar 2005 15:49:14 -0000 1.45 +++ xscreensaver.spec 3 May 2005 18:05:53 -0000 1.46 @@ -4,7 +4,7 @@ Summary: X screen saver and locker Name: %{name} Version: %{version} -Release: 1 +Release: 2 Epoch: 1 License: BSD Group: Amusements/Graphics @@ -13,6 +13,8 @@ Source1: removed-display-modes Patch0: xscreensaver-4.21-change-defaults.patch Patch1: xscreensaver-4.16-sanitize-hacks.patch +Patch2: xscreensaver-4.21-dont-ping-if-not-root.patch +Patch3: xscreensaver-4.21-make-hack-paths-absolute.patch Buildroot: %{_tmppath}/%{name}-root # find_lang @@ -68,6 +70,8 @@ %setup -q %patch0 -p1 -b .change-defaults %patch1 -p1 -b .sanitize-hacks +%patch2 -p1 -b .dont-ping-if-not-root +%patch3 -p1 -b .make-hack-paths-absolute if [ -x %{_datadir}/libtool/config.guess ]; then # use system-wide copy @@ -196,6 +200,10 @@ %defattr(-,root,root) %changelog +* Tue May 03 2005 Ray Strode 1:4.21-2 +- Use absolute filenames for screenhacks so we don't pull + in screenhacks from PATH (bug 151677). + * Sun Mar 20 2005 Ray Strode 1:4.21-1 - Update to xscreensaver-4.21. - Update spec file to better match new upstream spec file. From fedora-cvs-commits at redhat.com Tue May 3 18:24:01 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 14:24:01 -0400 Subject: rpms/xscreensaver/devel xscreensaver-4.21-dont-ping-if-not-root.patch, NONE, 1.1 xscreensaver.spec, 1.46, 1.47 Message-ID: <200505031824.j43IO1RR031259@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xscreensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31234 Modified Files: xscreensaver.spec Added Files: xscreensaver-4.21-dont-ping-if-not-root.patch Log Message: - Use absolute filenames for screenhacks so we don't pull in screenhacks from PATH (bug 151677). - Don't try to ping in sonar screensaver (bug 139692). xscreensaver-4.21-dont-ping-if-not-root.patch: sonar.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletion(-) --- NEW FILE xscreensaver-4.21-dont-ping-if-not-root.patch --- --- xscreensaver-4.21/hacks/sonar.c.dont-ping-if-not-root 2005-04-21 11:57:49.000000000 -0400 +++ xscreensaver-4.21/hacks/sonar.c 2005-04-21 12:01:40.000000000 -0400 @@ -2148,7 +2148,14 @@ screenhack(Display *dpy, Window win) sensor = 0; # ifdef HAVE_PING - sensor_info = (void *) init_ping(); + if (geteuid () == 0) + { + sensor_info = (void *) init_ping(); + } + else + { + sensor_info = 0; + } # else /* !HAVE_PING */ sensor_info = 0; parse_mode (0); /* just to check argument syntax */ Index: xscreensaver.spec =================================================================== RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- xscreensaver.spec 3 May 2005 18:05:53 -0000 1.46 +++ xscreensaver.spec 3 May 2005 18:23:59 -0000 1.47 @@ -203,6 +203,7 @@ * Tue May 03 2005 Ray Strode 1:4.21-2 - Use absolute filenames for screenhacks so we don't pull in screenhacks from PATH (bug 151677). +- Don't try to ping in sonar screensaver (bug 139692). * Sun Mar 20 2005 Ray Strode 1:4.21-1 - Update to xscreensaver-4.21. From fedora-cvs-commits at redhat.com Tue May 3 18:44:53 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 14:44:53 -0400 Subject: rpms/mkinitrd/devel .cvsignore, 1.57, 1.58 mkinitrd.spec, 1.57, 1.58 sources, 1.59, 1.60 Message-ID: <200505031844.j43IirML025565@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25521 Modified Files: .cvsignore mkinitrd.spec sources Log Message: set umask ourselves Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 27 Apr 2005 04:59:27 -0000 1.57 +++ .cvsignore 3 May 2005 18:44:51 -0000 1.58 @@ -1 +1 @@ -mkinitrd-4.2.9.tar.bz2 +mkinitrd-4.2.10.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- mkinitrd.spec 27 Apr 2005 04:59:27 -0000 1.57 +++ mkinitrd.spec 3 May 2005 18:44:51 -0000 1.58 @@ -1,6 +1,6 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 4.2.9 +Version: 4.2.10 Release: 1 License: GPL Group: System Environment/Base @@ -57,6 +57,9 @@ %attr(644,root,root) %{_mandir}/man8/grubby.8* %changelog +* Tue May 3 2005 Peter Jones - 4.2.10-1 +- set umask explicitly + * Tue Apr 26 2005 Peter Jones - 4.2.9-1 - invoke bash with "--norc" (#155986) - use binary udevstart.static, not a symlink Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 27 Apr 2005 04:59:27 -0000 1.59 +++ sources 3 May 2005 18:44:51 -0000 1.60 @@ -1 +1 @@ -98ffe17bebb065fc45e2ede457879e88 mkinitrd-4.2.9.tar.bz2 +b8425f0a15f2c59312c38a4dcde16784 mkinitrd-4.2.10.tar.bz2 From fedora-cvs-commits at redhat.com Tue May 3 19:00:39 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:00:39 -0400 Subject: rpms/dhcp/devel dhcp-3.0.2-dhclient-script-dbus-fix-interface.patch, NONE, 1.1 dhcp.spec, 1.55, 1.56 Message-ID: <200505031900.j43J0dNN022823@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22810 Modified Files: dhcp.spec Added Files: dhcp-3.0.2-dhclient-script-dbus-fix-interface.patch Log Message: fix dhclient-script dhcdbd set for multiple interfaces; rebuild for new glibc dhcp-3.0.2-dhclient-script-dbus-fix-interface.patch: linux | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE dhcp-3.0.2-dhclient-script-dbus-fix-interface.patch --- --- dhcp-3.0.2/client/scripts/linux.dhclient-dbus-fix-interface 2005-04-27 18:40:17.000000000 -0400 +++ dhcp-3.0.2/client/scripts/linux 2005-05-03 14:54:02.638750000 -0400 @@ -24,7 +24,7 @@ --system \ --dest=com.redhat.dhcp \ --type=method_call \ - /com/redhat/dhcp/eth0 \ + /com/redhat/dhcp/$interface \ com.redhat.dhcp.set \ 'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"; if (( ( dhc_dbus & 31 ) == 31 )); then Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- dhcp.spec 27 Apr 2005 22:50:12 -0000 1.55 +++ dhcp.spec 3 May 2005 19:00:34 -0000 1.56 @@ -48,6 +48,8 @@ Patch142: dhcp-3.0.2-dhclient-script-restorecon.patch Patch143: dhcp-3.0.2-dhclient-script-dhcdbd.patch Patch144: dhcp-3.0.2-dhclient-script-fix-init-state-1.patch +Patch145: dhcp-3.0.2-dhclient-script-dbus-fix-interface.patch + URL: http://isc.org/products/DHCP/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig @@ -139,6 +141,8 @@ %patch142 -p1 -b .restore_restorecon %patch143 -p1 -b .dhclient-script-dhcdbd %patch144 -p1 -b .dhclient-script-fix-init-state-1 +%patch145 -p1 -b .dhclient-script-dbus-fix-interface + cp %SOURCE1 . cat <site.conf VARDB=%{_localstatedir}/lib/dhcp @@ -266,6 +270,10 @@ %{_mandir}/man3/* %changelog +* Tue May 03 2005 Jason Vas Dias 10:3.0.2-12 +- Rebuild for new glibc +- Fix dhcdbd set for multiple interfaces + * Wed Apr 27 2005 Jason Vas Dias 10:3.0.2-11 - as pointed out by Peter Jones, dhclient-script spews - 'chkconfig: Usage' if run in init state 1 (runlevel returns "unknown".) From fedora-cvs-commits at redhat.com Tue May 3 19:01:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:01:44 -0400 Subject: rpms/dhcp/devel dhcp.spec,1.56,1.57 Message-ID: <200505031901.j43J1i7O022908@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22888 Modified Files: dhcp.spec Log Message: fix dhclient-script dhcdbd set for multiple interfaces; rebuild for new glibc Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- dhcp.spec 3 May 2005 19:00:34 -0000 1.56 +++ dhcp.spec 3 May 2005 19:01:28 -0000 1.57 @@ -2,7 +2,7 @@ Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.2 -Release: 11 +Release: 12 Epoch: 10 License: distributable Group: System Environment/Daemons From fedora-cvs-commits at redhat.com Tue May 3 19:12:22 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:12:22 -0400 Subject: rpms/firefox/devel firefox-1.0-uriloader.patch, 1.1, 1.2 firefox.spec, 1.65, 1.66 Message-ID: <200505031912.j43JCMKK023059@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23045 Modified Files: firefox-1.0-uriloader.patch firefox.spec Log Message: * Tue May 3 2005 Christopher Aillon 0:1.0.3-3 - Firefox script fixes to support multilib installs. - Add upstream patch to fix bidi justification of pango - Add patch to fix launching of helper applications firefox-1.0-uriloader.patch: nsGNOMERegistry.cpp | 27 ++++-- nsGNOMERegistry.h | 11 +- nsMIMEInfoUnix.cpp | 196 +++++++++++++++++++++++++++++++++++++++++++++++ nsMIMEInfoUnix.h | 48 +++++++++++ nsOSHelperAppService.cpp | 27 ++---- 5 files changed, 283 insertions(+), 26 deletions(-) Index: firefox-1.0-uriloader.patch =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.0-uriloader.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- firefox-1.0-uriloader.patch 3 May 2005 15:50:58 -0000 1.1 +++ firefox-1.0-uriloader.patch 3 May 2005 19:12:19 -0000 1.2 @@ -1,26 +1,10 @@ -Index: uriloader/exthandler/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v -retrieving revision 1.60 -diff -d -u -p -r1.60 Makefile.in ---- uriloader/exthandler/Makefile.in 2 May 2005 16:30:03 -0000 1.60 -+++ uriloader/exthandler/Makefile.in 3 May 2005 15:40:08 -0000 -@@ -102,7 +102,7 @@ endif - LOCAL_INCLUDES = -I$(srcdir) - - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) --OSHELPER += nsGNOMERegistry.cpp -+OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp - endif - - ifeq ($(MOZ_WIDGET_TOOLKIT),beos) Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v -retrieving revision 1.10 -diff -d -u -p -r1.10 nsGNOMERegistry.cpp ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp 16 Oct 2004 13:46:17 -0000 1.10 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 3 May 2005 15:40:08 -0000 +retrieving revision 1.8 +diff -d -u -p -r1.8 nsGNOMERegistry.cpp +--- uriloader/exthandler/unix/nsGNOMERegistry.cpp 6 Mar 2004 14:41:00 -0000 1.8 ++++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 3 May 2005 19:09:20 -0000 @@ -42,7 +42,7 @@ #include "nsString.h" #include "nsIComponentManager.h" @@ -45,16 +29,16 @@ typedef GConfClient * (*_gconf_client_get_default_fn)(); typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *, -@@ -264,7 +264,7 @@ nsGNOMERegistry::GetAppDescForScheme(con +@@ -231,7 +231,7 @@ nsGNOMERegistry::LoadURL(nsIURI *aURL) + return NS_ERROR_FAILURE; } - -/* static */ already_AddRefed +/* static */ already_AddRefed nsGNOMERegistry::GetFromExtension(const char *aFileExt) { if (!gconfLib) -@@ -286,7 +286,7 @@ nsGNOMERegistry::GetFromExtension(const +@@ -253,7 +253,7 @@ nsGNOMERegistry::GetFromExtension(const return GetFromType(mimeType); } @@ -63,20 +47,20 @@ nsGNOMERegistry::GetFromType(const char *aMIMEType) { if (!gconfLib) -@@ -296,9 +296,11 @@ nsGNOMERegistry::GetFromType(const char +@@ -263,10 +263,11 @@ nsGNOMERegistry::GetFromType(const char if (!handlerApp) return nsnull; -- nsRefPtr mimeInfo = new nsMIMEInfoImpl(aMIMEType); -+ nsRefPtr mimeInfo = new nsMIMEInfoUnix(aMIMEType); +- nsRefPtr mimeInfo = new nsMIMEInfoImpl(); ++ nsRefPtr mimeInfo = new nsMIMEInfoUnix(); NS_ENSURE_TRUE(mimeInfo, nsnull); + mimeInfo->SetMIMEType(aMIMEType); + mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp); -+ + // Get the list of extensions and append then to the mimeInfo. GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType); - for (GList *extension = extensions; extension; extension = extension->next) -@@ -320,11 +322,21 @@ nsGNOMERegistry::GetFromType(const char +@@ -289,11 +290,21 @@ nsGNOMERegistry::GetFromType(const char return nsnull; } @@ -99,7 +83,7 @@ _gnome_vfs_mime_application_free(handlerApp); return nsnull; } -@@ -342,7 +354,7 @@ nsGNOMERegistry::GetFromType(const char +@@ -311,7 +322,7 @@ nsGNOMERegistry::GetFromType(const char _gnome_vfs_mime_application_free(handlerApp); @@ -111,10 +95,10 @@ Index: uriloader/exthandler/unix/nsGNOMERegistry.h =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v -retrieving revision 1.3 -diff -d -u -p -r1.3 nsGNOMERegistry.h ---- uriloader/exthandler/unix/nsGNOMERegistry.h 16 Oct 2004 13:46:17 -0000 1.3 -+++ uriloader/exthandler/unix/nsGNOMERegistry.h 3 May 2005 15:40:08 -0000 +retrieving revision 1.2 +diff -d -u -p -r1.2 nsGNOMERegistry.h +--- uriloader/exthandler/unix/nsGNOMERegistry.h 23 Feb 2004 22:49:27 -0000 1.2 ++++ uriloader/exthandler/unix/nsGNOMERegistry.h 3 May 2005 18:21:35 -0000 @@ -35,10 +35,13 @@ * * ***** END LICENSE BLOCK ***** */ @@ -130,9 +114,9 @@ class nsGNOMERegistry { -@@ -52,7 +55,9 @@ class nsGNOMERegistry - static void GetAppDescForScheme(const nsACString& aScheme, - nsAString& aDesc); +@@ -49,7 +52,9 @@ class nsGNOMERegistry + + static nsresult LoadURL(nsIURI *aURL); - static already_AddRefed GetFromExtension(const char *aFileExt); + static already_AddRefed GetFromExtension(const char *aFileExt); @@ -147,7 +131,7 @@ RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 3 May 2005 15:40:08 -0000 ++++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 3 May 2005 18:21:35 -0000 @@ -0,0 +1,196 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 @@ -350,8 +334,8 @@ RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ uriloader/exthandler/unix/nsMIMEInfoUnix.h 3 May 2005 15:40:08 -0000 -@@ -0,0 +1,49 @@ ++++ uriloader/exthandler/unix/nsMIMEInfoUnix.h 3 May 2005 18:21:35 -0000 +@@ -0,0 +1,48 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * @@ -389,7 +373,6 @@ +{ +public: + nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {} -+ nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType), mDefaultVFSApplication(nsnull) {} + virtual ~nsMIMEInfoUnix(); + + void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); @@ -404,11 +387,11 @@ Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v -retrieving revision 1.58 -diff -d -u -p -r1.58 nsOSHelperAppService.cpp ---- uriloader/exthandler/unix/nsOSHelperAppService.cpp 25 Oct 2004 07:46:01 -0000 1.58 -+++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 3 May 2005 15:40:08 -0000 -@@ -44,6 +44,7 @@ +retrieving revision 1.50.6.2 +diff -d -u -p -r1.50.6.2 nsOSHelperAppService.cpp +--- uriloader/exthandler/unix/nsOSHelperAppService.cpp 20 Oct 2004 13:32:38 -0000 1.50.6.2 ++++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 3 May 2005 18:21:35 -0000 +@@ -27,6 +27,7 @@ #include "nsOSHelperAppService.h" #ifdef MOZ_WIDGET_GTK2 #include "nsGNOMERegistry.h" @@ -416,15 +399,15 @@ #endif #include "nsISupports.h" #include "nsString.h" -@@ -1486,6 +1487,17 @@ nsOSHelperAppService::GetFromType(const +@@ -1453,6 +1454,17 @@ nsOSHelperAppService::GetFromType(const - LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get())); + LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType)); +#ifdef MOZ_WIDGET_GTK2 + // Look in GNOME registry first since it is the preferred method in GNOME, + // should trump the mailcap entry + LOG(("Looking in GNOME registry\n")); -+ nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); ++ nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get(); + if (gnomeInfo) { + LOG(("Got MIMEInfo from GNOME registry\n")); + return gnomeInfo; @@ -434,7 +417,7 @@ // extract the major and minor types NS_ConvertASCIItoUTF16 mimeType(aMIMEType); nsAString::const_iterator start_iter, end_iter, -@@ -1522,21 +1534,6 @@ nsOSHelperAppService::GetFromType(const +@@ -1489,21 +1501,6 @@ nsOSHelperAppService::GetFromType(const mozillaFlags, PR_TRUE); @@ -445,7 +428,7 @@ - -#ifdef MOZ_WIDGET_GTK2 - LOG(("Looking in GNOME registry\n")); -- nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); +- nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get(); - if (gnomeInfo) { - LOG(("Got MIMEInfo from GNOME registry\n")); - return gnomeInfo; Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- firefox.spec 3 May 2005 15:50:58 -0000 1.65 +++ firefox.spec 3 May 2005 19:12:19 -0000 1.66 @@ -57,7 +57,6 @@ Patch35: firefox-1.0-pango-bidi-justify.patch # local bugfixes -Patch40: firefox-PR1-gnome-vfs-default-app.patch Patch41: firefox-PR1-stack-direction.patch Patch42: firefox-1.0-download-to-desktop.patch Patch43: firefox-1.0-uriloader.patch @@ -135,7 +134,6 @@ %patch33 -p1 %patch34 -p1 %patch35 -p0 -%patch40 -p1 %patch41 -p0 %patch42 -p0 %patch43 -p0 From fedora-cvs-commits at redhat.com Tue May 3 19:16:27 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:16:27 -0400 Subject: rpms/rpm/devel rpm-4.4.1-matchpathcon.patch, 1.2, 1.3 rpm.spec, 1.159, 1.160 Message-ID: <200505031916.j43JGRwZ026324@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26310 Modified Files: rpm-4.4.1-matchpathcon.patch rpm.spec Log Message: fixes rpm-4.4.1-matchpathcon.patch: build/Makefile.am | 1 + build/files.c | 27 ++++++++++++++------------- lib/rpmfi.c | 13 ++++++------- lib/rpminstall.c | 14 ++++---------- lib/verify.c | 30 ++++++++++++------------------ python/rpmts-py.c | 13 ++++--------- 6 files changed, 41 insertions(+), 57 deletions(-) Index: rpm-4.4.1-matchpathcon.patch =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.1-matchpathcon.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rpm-4.4.1-matchpathcon.patch 3 May 2005 16:01:02 -0000 1.2 +++ rpm-4.4.1-matchpathcon.patch 3 May 2005 19:16:24 -0000 1.3 @@ -1,5 +1,5 @@ --- rpm-4.4.1/lib/rpmfi.c.matchpathcon 2005-02-10 03:30:28.000000000 -0500 -+++ rpm-4.4.1/lib/rpmfi.c 2005-05-02 16:15:24.000000000 -0400 ++++ rpm-4.4.1/lib/rpmfi.c 2005-05-03 12:03:07.674849000 -0400 @@ -16,7 +16,7 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" @@ -58,7 +58,7 @@ if (fcontextp) *fcontextp = av; --- rpm-4.4.1/lib/verify.c.matchpathcon 2004-10-24 15:36:30.000000000 -0400 -+++ rpm-4.4.1/lib/verify.c 2005-05-02 16:15:24.000000000 -0400 ++++ rpm-4.4.1/lib/verify.c 2005-05-03 12:03:07.692829000 -0400 @@ -128,20 +128,19 @@ if (rc == -1) *res |= (RPMVERIFY_LGETFILECONFAIL|RPMVERIFY_CONTEXTS); @@ -109,8 +109,8 @@ } ovsflags = rpmtsSetVSFlags(ts, vsflags); ---- rpm-4.4.1/lib/rpminstall.c.matchpathcon 2005-05-02 16:15:24.000000000 -0400 -+++ rpm-4.4.1/lib/rpminstall.c 2005-05-02 16:15:24.000000000 -0400 +--- rpm-4.4.1/lib/rpminstall.c.matchpathcon 2005-05-03 12:03:07.661860000 -0400 ++++ rpm-4.4.1/lib/rpminstall.c 2005-05-03 12:03:07.701823000 -0400 @@ -310,16 +310,10 @@ /* Initialize security context patterns (if not already done). */ @@ -133,7 +133,7 @@ (void) rpmtsSetFlags(ts, ia->transFlags); --- rpm-4.4.1/build/Makefile.am.matchpathcon 2005-01-17 13:46:16.000000000 -0500 -+++ rpm-4.4.1/build/Makefile.am 2005-05-02 16:15:24.000000000 -0400 ++++ rpm-4.4.1/build/Makefile.am 2005-05-03 12:03:07.707813000 -0400 @@ -35,6 +35,7 @@ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ @@ -143,7 +143,7 @@ rpmfile.h: --- rpm-4.4.1/build/files.c.matchpathcon 2005-01-04 11:35:05.000000000 -0500 -+++ rpm-4.4.1/build/files.c 2005-05-03 11:59:10.528669000 -0400 ++++ rpm-4.4.1/build/files.c 2005-05-03 14:22:39.841438000 -0400 @@ -23,7 +23,7 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" @@ -171,7 +171,7 @@ for (i = 0, flp = fl->fileList; i < fl->fileListRecsUsed; i++, flp++) { const char *s; -@@ -1324,18 +1324,13 @@ +@@ -1324,18 +1324,19 @@ &(flp->flags), 1); /* Add file security context to package. */ @@ -185,10 +185,16 @@ - } -/*@=branchstate@*/ + mode_t fmode = (uint_16)flp->fl_mode; -+ matchpathcon(flp->fileURL, fmode, &scon); -+ if (scon == NULL) scon = ""; -+ (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, &scon, 1); -+ freecon(scon); ++ int rc = matchpathcon(flp->fileURL, fmode, &scon); ++ if ( rc == 0 && scon != NULL) { ++ (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, &scon, 1); ++ freecon(scon); ++ } ++ else { ++ const char *nocon = ""; ++ (void) headerAddOrAppendEntry(h, RPMTAG_FILECONTEXTS, RPM_STRING_ARRAY_TYPE, &nocon, 1); ++ } ++ } - sx = rpmsxFree(sx); @@ -196,7 +202,7 @@ (void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE, --- rpm-4.4.1/python/rpmts-py.c.matchpathcon 2005-02-12 22:12:07.000000000 -0500 -+++ rpm-4.4.1/python/rpmts-py.c 2005-05-02 16:15:24.000000000 -0400 ++++ rpm-4.4.1/python/rpmts-py.c 2005-05-03 12:03:07.727793000 -0400 @@ -1182,16 +1182,11 @@ /* Initialize security context patterns (if not already done). */ Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- rpm.spec 3 May 2005 16:04:21 -0000 1.159 +++ rpm.spec 3 May 2005 19:16:24 -0000 1.160 @@ -20,7 +20,7 @@ %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 14 +Release: 15 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Patch0: rpm-4.4.1-posttrans.patch @@ -531,6 +531,9 @@ %{__includedir}/popt.h %changelog +* Tue May 03 2005 Paul Nasrat - 4.4.1-15 +- Some more matchpathcon work + * Mon May 02 2005 Paul Nasrat - 4.4.1-14 - matchpathcon fixup From fedora-cvs-commits at redhat.com Tue May 3 19:26:48 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:26:48 -0400 Subject: rpms/openoffice.org/devel openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch, 1.1, 1.2 Message-ID: <200505031926.j43JQmCm020420@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20406 Modified Files: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch Log Message: tweak wizards patch openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch: com/sun/star/wizards/agenda/AgendaTemplate.java | 0 com/sun/star/wizards/agenda/AgendaWizardDialog.java | 0 com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java | 0 com/sun/star/wizards/agenda/CallWizard.java | 0 com/sun/star/wizards/agenda/TopicsControl.java | 0 com/sun/star/wizards/common/ConfigGroup.java | 0 com/sun/star/wizards/common/ConfigSet.java | 0 com/sun/star/wizards/common/FileAccess.java | 0 com/sun/star/wizards/common/Helper.java | 0 com/sun/star/wizards/common/NumberFormatter.java | 0 com/sun/star/wizards/common/SystemDialog.java | 0 com/sun/star/wizards/common/UCB.java | 0 com/sun/star/wizards/db/BlindtextCreator.java | 0 com/sun/star/wizards/db/ColumnPropertySet.java | 0 com/sun/star/wizards/db/CommandMetaData.java | 0 com/sun/star/wizards/db/CommandName.java | 0 com/sun/star/wizards/db/DBMetaData.java | 0 com/sun/star/wizards/db/FieldColumn.java | 0 com/sun/star/wizards/db/RecordParser.java | 0 com/sun/star/wizards/db/SQLQueryComposer.java | 0 com/sun/star/wizards/db/TableDescriptor.java | 0 com/sun/star/wizards/db/TypeInspector.java | 0 com/sun/star/wizards/document/Control.java | 0 com/sun/star/wizards/document/DatabaseControl.java | 0 com/sun/star/wizards/document/FormHandler.java | 0 com/sun/star/wizards/document/OfficeDocument.java | 0 com/sun/star/wizards/document/Shape.java | 0 com/sun/star/wizards/fax/CallWizard.java | 0 com/sun/star/wizards/fax/FaxWizardDialogImpl.java | 0 com/sun/star/wizards/fax/FaxWizardDialogResources.java | 0 com/sun/star/wizards/form/CallFormWizard.java | 0 com/sun/star/wizards/form/FieldLinker.java | 0 com/sun/star/wizards/form/FormConfiguration.java | 0 com/sun/star/wizards/form/FormControlArranger.java | 0 com/sun/star/wizards/form/FormDocument.java | 0 com/sun/star/wizards/form/FormWizard.java | 0 com/sun/star/wizards/form/StyleApplier.java | 0 com/sun/star/wizards/form/UIControlArranger.java | 0 com/sun/star/wizards/letter/CallWizard.java | 0 com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 0 com/sun/star/wizards/letter/LetterWizardDialogResources.java | 0 com/sun/star/wizards/query/CallQueryWizard.java | 0 com/sun/star/wizards/query/Finalizer.java | 0 com/sun/star/wizards/query/QuerySummary.java | 0 com/sun/star/wizards/query/QueryWizard.java | 0 com/sun/star/wizards/report/CallReportWizard.java | 0 com/sun/star/wizards/report/DBColumn.java | 0 com/sun/star/wizards/report/Dataimport.java | 0 com/sun/star/wizards/report/Finalizer.java | 0 com/sun/star/wizards/report/GroupFieldHandler.java | 0 com/sun/star/wizards/report/RecordTable.java | 0 com/sun/star/wizards/report/ReportDocument.java | 0 com/sun/star/wizards/report/ReportLayouter.java | 0 com/sun/star/wizards/report/ReportWizard.java | 0 com/sun/star/wizards/table/CGCategory.java | 0 com/sun/star/wizards/table/CGTable.java | 0 com/sun/star/wizards/table/CallTableWizard.java | 0 com/sun/star/wizards/table/FieldDescription.java | 0 com/sun/star/wizards/table/FieldFormatter.java | 0 com/sun/star/wizards/table/PrimaryKeyHandler.java | 0 com/sun/star/wizards/table/ScenarioSelector.java | 0 com/sun/star/wizards/table/TableWizard.java | 0 com/sun/star/wizards/text/TextFieldHandler.java | 0 com/sun/star/wizards/text/TextSectionHandler.java | 0 com/sun/star/wizards/text/TextStyleHandler.java | 0 com/sun/star/wizards/text/TextTableHandler.java | 0 com/sun/star/wizards/text/ViewHandler.java | 0 com/sun/star/wizards/tutorial/creator/frame/CallTutorialCreatorFramework.java | 0 com/sun/star/wizards/tutorial/creator/frame/ConnectFrame.java | 0 com/sun/star/wizards/tutorial/creator/frame/Framework.java | 0 com/sun/star/wizards/tutorial/creator/frame/StepFrame.java | 0 com/sun/star/wizards/tutorial/creator/frame/StepModel.java | 0 com/sun/star/wizards/tutorial/creator/frame/TutorialCreator.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/AccessibleObjectFind.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/ActionFrame.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/ActionPanel.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/GraphicalDisplay.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/MenuFactory.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/MethodDialog.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/TableColumModel.java | 0 com/sun/star/wizards/tutorial/creator/frame/objectFinder/TextualDisplay.java | 0 com/sun/star/wizards/tutorial/executer/CallTutorialFramework.java | 0 com/sun/star/wizards/tutorial/executer/ExecuteCache.java | 0 com/sun/star/wizards/tutorial/executer/ExecuteMethod.java | 0 com/sun/star/wizards/tutorial/executer/ExecutePropertiesMethod.java | 0 com/sun/star/wizards/tutorial/executer/LocalisationCache.java | 0 com/sun/star/wizards/tutorial/executer/TranslateMacro.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/Components.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/Desktop.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/DesktopDialog.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/DesktopMenu.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/Presentation_Drawing.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/Spreadsheet.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/TextDocument.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XCellTextCompact.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XItemSelection.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XMouse.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XMoveMouseCompact.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XTabList.java | 0 com/sun/star/wizards/tutorial/executer/officeHelper/XTextCompact.java | 0 com/sun/star/wizards/tutorial/executer/util/AccessibilityTools.java | 0 com/sun/star/wizards/tutorial/executer/util/Child.java | 0 com/sun/star/wizards/tutorial/executer/util/Control.java | 0 com/sun/star/wizards/tutorial/executer/util/File.java | 0 com/sun/star/wizards/tutorial/executer/util/FindInterfaces.java | 0 com/sun/star/wizards/tutorial/executer/util/Helper.java | 0 com/sun/star/wizards/tutorial/executer/util/Localizer.java | 0 com/sun/star/wizards/tutorial/executer/util/NameProvider.java | 0 com/sun/star/wizards/tutorial/executer/util/PathProperties.java | 0 com/sun/star/wizards/tutorial/executer/util/PropertiesFileWriter.java | 0 com/sun/star/wizards/ui/AggregateComponent.java | 0 com/sun/star/wizards/ui/CommandFieldSelection.java | 0 com/sun/star/wizards/ui/ControlScroller.java | 0 com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 0 com/sun/star/wizards/ui/DocumentPreview.java | 0 com/sun/star/wizards/ui/FieldSelection.java | 0 com/sun/star/wizards/ui/FilterComponent.java | 0 com/sun/star/wizards/ui/ImageList.java | 0 com/sun/star/wizards/ui/PathSelection.java | 0 com/sun/star/wizards/ui/SortingComponent.java | 0 com/sun/star/wizards/ui/TitlesComponent.java | 0 com/sun/star/wizards/ui/UnoDialog.java | 0 com/sun/star/wizards/ui/UnoDialog2.java | 0 com/sun/star/wizards/ui/WizardDialog.java | 0 com/sun/star/wizards/ui/event/AbstractListener.java | 0 com/sun/star/wizards/ui/event/DataAware.java | 0 com/sun/star/wizards/ui/event/DataAwareFields.java | 0 com/sun/star/wizards/ui/event/ListModelBinder.java | 0 com/sun/star/wizards/ui/event/RadioDataAware.java | 0 com/sun/star/wizards/ui/event/SimpleDataAware.java | 0 com/sun/star/wizards/ui/event/Task.java | 0 com/sun/star/wizards/ui/event/TaskEvent.java | 0 com/sun/star/wizards/ui/event/UnoDataAware.java | 0 com/sun/star/wizards/web/AbstractErrorHandler.java | 0 com/sun/star/wizards/web/BackgroundsDialog.java | 0 com/sun/star/wizards/web/CallWizard.java | 0 com/sun/star/wizards/web/ExtensionVerifier.java | 0 com/sun/star/wizards/web/FTPDialog.java | 0 com/sun/star/wizards/web/IconsDialog.java | 0 com/sun/star/wizards/web/ImageListDialog.java | 0 com/sun/star/wizards/web/LogTaskListener.java | 0 com/sun/star/wizards/web/Process.java | 0 com/sun/star/wizards/web/ProcessErrorHandler.java | 0 com/sun/star/wizards/web/StatusDialog.java | 0 com/sun/star/wizards/web/StylePreview.java | 0 com/sun/star/wizards/web/TOCPreview.java | 0 com/sun/star/wizards/web/WWD_Events.java | 0 com/sun/star/wizards/web/WWD_General.java | 0 com/sun/star/wizards/web/WWD_Startup.java | 0 com/sun/star/wizards/web/WebWizardDialog.java | 0 com/sun/star/wizards/web/data/CGContent.java | 0 com/sun/star/wizards/web/data/CGDesign.java | 0 com/sun/star/wizards/web/data/CGDocument.java | 0 com/sun/star/wizards/web/data/CGGeneralInfo.java | 0 com/sun/star/wizards/web/data/CGLayout.java | 0 com/sun/star/wizards/web/data/CGPublish.java | 0 com/sun/star/wizards/web/data/CGSession.java | 0 com/sun/star/wizards/web/data/CGSettings.java | 0 com/sun/star/wizards/web/export/AbstractExporter.java | 0 com/sun/star/wizards/web/export/ConfiguredExporter.java | 0 com/sun/star/wizards/web/export/FilterExporter.java | 0 com/sun/star/wizards/web/export/ImpressHTMLExporter.java | 0 com/sun/star/wizards/web/status/ErrorLog.java | 0 com/sun/star/wizards/web/status/LogTaskListener.java | 0 com/sun/star/wizards/web/status/Task.java | 0 com/sun/star/wizards/web/status/TaskEvent.java | 0 wizards/com/sun/star/wizards/agenda/AgendaTemplate.java | 50 +-- wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java | 20 - wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java | 26 - wizards/com/sun/star/wizards/agenda/CallWizard.java | 4 wizards/com/sun/star/wizards/agenda/TopicsControl.java | 76 ++--- wizards/com/sun/star/wizards/common/ConfigGroup.java | 4 wizards/com/sun/star/wizards/common/ConfigSet.java | 18 - wizards/com/sun/star/wizards/common/FileAccess.java | 2 wizards/com/sun/star/wizards/common/Helper.java | 12 wizards/com/sun/star/wizards/common/NumberFormatter.java | 4 wizards/com/sun/star/wizards/common/SystemDialog.java | 8 wizards/com/sun/star/wizards/common/UCB.java | 4 wizards/com/sun/star/wizards/db/BlindtextCreator.java | 2 wizards/com/sun/star/wizards/db/ColumnPropertySet.java | 10 wizards/com/sun/star/wizards/db/CommandMetaData.java | 6 wizards/com/sun/star/wizards/db/CommandName.java | 26 - wizards/com/sun/star/wizards/db/DBMetaData.java | 42 +-- wizards/com/sun/star/wizards/db/FieldColumn.java | 20 - wizards/com/sun/star/wizards/db/RecordParser.java | 10 wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 12 wizards/com/sun/star/wizards/db/TableDescriptor.java | 34 +- wizards/com/sun/star/wizards/db/TypeInspector.java | 20 - wizards/com/sun/star/wizards/document/Control.java | 4 wizards/com/sun/star/wizards/document/DatabaseControl.java | 4 wizards/com/sun/star/wizards/document/FormHandler.java | 2 wizards/com/sun/star/wizards/document/OfficeDocument.java | 4 wizards/com/sun/star/wizards/document/Shape.java | 10 wizards/com/sun/star/wizards/fax/CallWizard.java | 4 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java | 18 - wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.java | 18 - wizards/com/sun/star/wizards/form/CallFormWizard.java | 4 wizards/com/sun/star/wizards/form/FieldLinker.java | 10 wizards/com/sun/star/wizards/form/FormConfiguration.java | 2 wizards/com/sun/star/wizards/form/FormControlArranger.java | 36 +- wizards/com/sun/star/wizards/form/FormDocument.java | 38 +- wizards/com/sun/star/wizards/form/FormWizard.java | 10 wizards/com/sun/star/wizards/form/StyleApplier.java | 10 wizards/com/sun/star/wizards/form/UIControlArranger.java | 6 wizards/com/sun/star/wizards/letter/CallWizard.java | 4 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 30 +- wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java | 18 - wizards/com/sun/star/wizards/query/CallQueryWizard.java | 4 wizards/com/sun/star/wizards/query/Finalizer.java | 4 wizards/com/sun/star/wizards/query/QuerySummary.java | 20 - wizards/com/sun/star/wizards/query/QueryWizard.java | 10 wizards/com/sun/star/wizards/report/CallReportWizard.java | 4 wizards/com/sun/star/wizards/report/DBColumn.java | 18 - wizards/com/sun/star/wizards/report/Dataimport.java | 4 wizards/com/sun/star/wizards/report/Finalizer.java | 2 wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 2 wizards/com/sun/star/wizards/report/RecordTable.java | 2 wizards/com/sun/star/wizards/report/ReportDocument.java | 24 - wizards/com/sun/star/wizards/report/ReportLayouter.java | 2 wizards/com/sun/star/wizards/report/ReportWizard.java | 12 wizards/com/sun/star/wizards/table/CGCategory.java | 4 wizards/com/sun/star/wizards/table/CGTable.java | 4 wizards/com/sun/star/wizards/table/CallTableWizard.java | 4 wizards/com/sun/star/wizards/table/FieldDescription.java | 22 - wizards/com/sun/star/wizards/table/FieldFormatter.java | 2 wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 10 wizards/com/sun/star/wizards/table/ScenarioSelector.java | 6 wizards/com/sun/star/wizards/table/TableWizard.java | 8 wizards/com/sun/star/wizards/text/TextFieldHandler.java | 4 wizards/com/sun/star/wizards/text/TextSectionHandler.java | 6 wizards/com/sun/star/wizards/text/TextStyleHandler.java | 4 wizards/com/sun/star/wizards/text/TextTableHandler.java | 6 wizards/com/sun/star/wizards/text/ViewHandler.java | 10 wizards/com/sun/star/wizards/tutorial/creator/frame/CallTutorialCreatorFramework.java | 4 wizards/com/sun/star/wizards/tutorial/creator/frame/ConnectFrame.java | 34 +- wizards/com/sun/star/wizards/tutorial/creator/frame/Framework.java | 6 wizards/com/sun/star/wizards/tutorial/creator/frame/StepFrame.java | 78 ++--- wizards/com/sun/star/wizards/tutorial/creator/frame/StepModel.java | 2 wizards/com/sun/star/wizards/tutorial/creator/frame/TutorialCreator.java | 34 +- wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/AccessibleObjectFind.java | 6 wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/ActionFrame.java | 28 +- wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/ActionPanel.java | 14 - wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/GraphicalDisplay.java | 10 wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/MenuFactory.java | 18 - wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/MethodDialog.java | 26 - wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/TableColumModel.java | 2 wizards/com/sun/star/wizards/tutorial/creator/frame/objectFinder/TextualDisplay.java | 14 - wizards/com/sun/star/wizards/tutorial/executer/CallTutorialFramework.java | 12 wizards/com/sun/star/wizards/tutorial/executer/ExecuteCache.java | 18 - wizards/com/sun/star/wizards/tutorial/executer/ExecuteMethod.java | 16 - wizards/com/sun/star/wizards/tutorial/executer/ExecutePropertiesMethod.java | 10 wizards/com/sun/star/wizards/tutorial/executer/LocalisationCache.java | 2 wizards/com/sun/star/wizards/tutorial/executer/TranslateMacro.java | 16 - wizards/com/sun/star/wizards/tutorial/executer/officeHelper/Components.java | 26 - wizards/com/sun/star/wizards/tutorial/executer/officeHelper/Desktop.java | 22 - wizards/com/sun/star/wizards/tutorial/executer/officeHelper/DesktopDialog.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/DesktopMenu.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/Presentation_Drawing.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/Spreadsheet.java | 18 - wizards/com/sun/star/wizards/tutorial/executer/officeHelper/TextDocument.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XCellTextCompact.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XItemSelection.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XMouse.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XMoveMouseCompact.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XTabList.java | 4 wizards/com/sun/star/wizards/tutorial/executer/officeHelper/XTextCompact.java | 4 wizards/com/sun/star/wizards/tutorial/executer/util/AccessibilityTools.java | 42 +-- wizards/com/sun/star/wizards/tutorial/executer/util/Child.java | 4 wizards/com/sun/star/wizards/tutorial/executer/util/Control.java | 36 +- wizards/com/sun/star/wizards/tutorial/executer/util/File.java | 2 wizards/com/sun/star/wizards/tutorial/executer/util/FindInterfaces.java | 8 wizards/com/sun/star/wizards/tutorial/executer/util/Helper.java | 8 wizards/com/sun/star/wizards/tutorial/executer/util/Localizer.java | 4 wizards/com/sun/star/wizards/tutorial/executer/util/NameProvider.java | 4 wizards/com/sun/star/wizards/tutorial/executer/util/PathProperties.java | 6 wizards/com/sun/star/wizards/tutorial/executer/util/PropertiesFileWriter.java | 2 wizards/com/sun/star/wizards/ui/AggregateComponent.java | 50 +-- wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 10 wizards/com/sun/star/wizards/ui/ControlScroller.java | 110 +++---- wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 46 +-- wizards/com/sun/star/wizards/ui/DocumentPreview.java | 20 - wizards/com/sun/star/wizards/ui/FieldSelection.java | 14 - wizards/com/sun/star/wizards/ui/FilterComponent.java | 56 ++-- wizards/com/sun/star/wizards/ui/ImageList.java | 138 +++++----- wizards/com/sun/star/wizards/ui/PathSelection.java | 4 wizards/com/sun/star/wizards/ui/SortingComponent.java | 10 wizards/com/sun/star/wizards/ui/TitlesComponent.java | 18 - wizards/com/sun/star/wizards/ui/UnoDialog.java | 8 wizards/com/sun/star/wizards/ui/UnoDialog2.java | 6 wizards/com/sun/star/wizards/ui/WizardDialog.java | 50 +-- wizards/com/sun/star/wizards/ui/event/AbstractListener.java | 2 wizards/com/sun/star/wizards/ui/event/DataAware.java | 32 +- wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 34 +- wizards/com/sun/star/wizards/ui/event/ListModelBinder.java | 22 - wizards/com/sun/star/wizards/ui/event/RadioDataAware.java | 6 wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java | 14 - wizards/com/sun/star/wizards/ui/event/Task.java | 22 - wizards/com/sun/star/wizards/ui/event/TaskEvent.java | 2 wizards/com/sun/star/wizards/ui/event/UnoDataAware.java | 24 - wizards/com/sun/star/wizards/web/AbstractErrorHandler.java | 12 wizards/com/sun/star/wizards/web/BackgroundsDialog.java | 22 - wizards/com/sun/star/wizards/web/CallWizard.java | 6 wizards/com/sun/star/wizards/web/ExtensionVerifier.java | 2 wizards/com/sun/star/wizards/web/FTPDialog.java | 96 +++--- wizards/com/sun/star/wizards/web/IconsDialog.java | 16 - wizards/com/sun/star/wizards/web/ImageListDialog.java | 56 ++-- wizards/com/sun/star/wizards/web/LogTaskListener.java | 2 wizards/com/sun/star/wizards/web/Process.java | 60 ++-- wizards/com/sun/star/wizards/web/ProcessErrorHandler.java | 8 wizards/com/sun/star/wizards/web/StatusDialog.java | 30 +- wizards/com/sun/star/wizards/web/StylePreview.java | 12 wizards/com/sun/star/wizards/web/TOCPreview.java | 20 - wizards/com/sun/star/wizards/web/WWD_Events.java | 38 +- wizards/com/sun/star/wizards/web/WWD_General.java | 50 +-- wizards/com/sun/star/wizards/web/WWD_Startup.java | 70 ++--- wizards/com/sun/star/wizards/web/WebWizardDialog.java | 24 - wizards/com/sun/star/wizards/web/data/CGContent.java | 2 wizards/com/sun/star/wizards/web/data/CGDesign.java | 10 wizards/com/sun/star/wizards/web/data/CGDocument.java | 22 - wizards/com/sun/star/wizards/web/data/CGGeneralInfo.java | 2 wizards/com/sun/star/wizards/web/data/CGLayout.java | 4 wizards/com/sun/star/wizards/web/data/CGPublish.java | 2 wizards/com/sun/star/wizards/web/data/CGSession.java | 2 wizards/com/sun/star/wizards/web/data/CGSettings.java | 18 - wizards/com/sun/star/wizards/web/export/AbstractExporter.java | 22 - wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java | 2 wizards/com/sun/star/wizards/web/export/FilterExporter.java | 4 wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java | 12 wizards/com/sun/star/wizards/web/status/ErrorLog.java | 2 wizards/com/sun/star/wizards/web/status/LogTaskListener.java | 2 wizards/com/sun/star/wizards/web/status/Task.java | 20 - wizards/com/sun/star/wizards/web/status/TaskEvent.java | 2 332 files changed, 1381 insertions(+), 1381 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch Index: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch 3 May 2005 17:52:05 -0000 1.1 +++ openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch 3 May 2005 19:26:45 -0000 1.2 @@ -1,16 +1,18 @@ +? com/sun/star/wizards/test.sh +? prj/build.lst.skipuselessmodules.patch Index: com/sun/star/wizards/agenda/AgendaTemplate.java =================================================================== RCS file: /cvs/installation/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java,v retrieving revision 1.4 diff -u -p -r1.4 AgendaTemplate.java --- openoffice.org.orig/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java 21 Feb 2005 13:50:05 -0000 1.4 -+++ openoffice.org/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java 3 May 2005 14:11:53 -0000 ++++ openoffice.org/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java 3 May 2005 19:33:32 -0000 @@ -231,7 +231,7 @@ public class AgendaTemplate extends Text /** * used to set the document title property (step 6). */ - private Object docInfo; -+ Object docInfo; ++ public Object docInfo; /** * loads the given template, and analyze its structure. @@ -19,7 +21,7 @@ * @return the template name without the "aw-" at the beginning. */ - private String calcTemplateName(String url) { -+ String calcTemplateName(String url) { ++ public String calcTemplateName(String url) { return FileAccess.connectURLs( FileAccess.getParentDir(url) ,FileAccess.getFilename(url).substring(3)); } @@ -28,7 +30,7 @@ * supplies this information. */ - private void initializeData(List topicsData) { -+ void initializeData(List topicsData) { ++ public void initializeData(List topicsData) { for (int i = 0; i < itemsTables.length; i++) { try { itemsTables[i].write(""); @@ -37,7 +39,7 @@ * This method fills the cache will all items objects (names and headings). */ - private void initItemsCache() { -+ void initItemsCache() { ++ public void initItemsCache() { itemsCache = new Hashtable(11); XMultiServiceFactory xmsf = (XMultiServiceFactory)UnoRuntime.queryInterface(XMultiServiceFactory.class,document); @@ -46,7 +48,7 @@ * -analyze the topics table */ - private void initialize() -+ void initialize() ++ public void initialize() { /* * Get the default locale of the document, and create the date and time formatters. @@ -55,7 +57,7 @@ * */ - private void initializeTitles() { -+ void initializeTitles() { ++ public void initializeTitles() { XTextRange item = null; XMultiServiceFactory xmsf = (XMultiServiceFactory)UnoRuntime.queryInterface(XMultiServiceFactory.class,document); @@ -64,13 +66,13 @@ } - private void initializeTopics() -+ void initializeTopics() ++ public void initializeTopics() { topics = new Topics(); } - private void initializeItems() -+ void initializeItems() ++ public void initializeItems() { _allItems = searchFillInItems(); } @@ -79,7 +81,7 @@ * @return a vector containing the XTextRanges of the found items */ - private List searchFillInItems() { -+ List searchFillInItems() { ++ public List searchFillInItems() { try { XSearchable xSearchable = (XSearchable)UnoRuntime.queryInterface(XSearchable.class,document); XSearchDescriptor sd = xSearchable.createSearchDescriptor(); @@ -88,7 +90,7 @@ * ItemsTable class. */ - private void initializeItemsSections() -+ void initializeItemsSections() ++ public void initializeItemsSections() { String[] sections = getSections(document, TemplateConsts.SECTION_ITEMS); @@ -97,7 +99,7 @@ } - private String[] getSections(Object document, String s) -+ String[] getSections(Object document, String s) ++ public String[] getSections(Object document, String s) { XTextSectionsSupplier xTextSectionsSupplier = (XTextSectionsSupplier) UnoRuntime.queryInterface(XTextSectionsSupplier.class, document); String[] allSections = xTextSectionsSupplier.getTextSections().getElementNames(); @@ -106,7 +108,7 @@ } - private synchronized void redrawTitle(String controlName) { -+ synchronized void redrawTitle(String controlName) { ++ public synchronized void redrawTitle(String controlName) { if (controlName.equals("txtTitle")) writeTitle(teTitle, trTitle, agenda.cp_Title); else if (controlName.equals("txtDate")) @@ -115,15 +117,15 @@ - private void writeTitle( TextElement te, XTextRange tr, String text) { -+ void writeTitle( TextElement te, XTextRange tr, String text) { ++ public void writeTitle( TextElement te, XTextRange tr, String text) { te.text = (text == null ? "" : text); te.write(tr); } - private static long DAY_IN_MILLIS = ( 24 * 60 * 60 * 1000 ); -+ static long DAY_IN_MILLIS = ( 24 * 60 * 60 * 1000 ); ++ public static long DAY_IN_MILLIS = ( 24 * 60 * 60 * 1000 ); - private String getDateString(String d) { -+ String getDateString(String d) { ++ public String getDateString(String d) { if (d == null || d.equals("")) return ""; @@ -132,7 +134,7 @@ } - private String getTimeString(String s) { -+ String getTimeString(String s) { ++ public String getTimeString(String s) { if (s == null || s.equals("")) return ""; int time = new Integer(s).intValue(); @@ -141,7 +143,7 @@ * When finishing the wizard removes this sections entireley from the document. */ - private void deleteHiddenSections() { -+ void deleteHiddenSections() { ++ public void deleteHiddenSections() { XTextSectionsSupplier xTextSectionsSupplier = (XTextSectionsSupplier) UnoRuntime.queryInterface(XTextSectionsSupplier.class, document); String[] allSections = xTextSectionsSupplier.getTextSections().getElementNames(); try { @@ -150,7 +152,7 @@ * @param placeholder the placeholder text to use, if the text argument is empty (null or "") */ - private void fillMinutesItem(XTextRange range, Object text, String placeholder) { -+ void fillMinutesItem(XTextRange range, Object text, String placeholder) { ++ public void fillMinutesItem(XTextRange range, Object text, String placeholder) { String paraStyle = (String)Helper.getUnoPropertyValue(range,"ParaStyleName"); range.setString((String)text); Helper.setUnoPropertyValue(range,"ParaStyleName",paraStyle); @@ -159,7 +161,7 @@ * to the table. 0 or a negative number: no rows added. */ - private int write2(int topic, PropertyValue[] data) throws Exception { -+ int write2(int topic, PropertyValue[] data) throws Exception { ++ public int write2(int topic, PropertyValue[] data) throws Exception { while (topic >= writtenTopics.size()) writtenTopics.add(null); @@ -168,7 +170,7 @@ * be able to write this topic). */ - private boolean isWritten(int topic) { -+ boolean isWritten(int topic) { ++ public boolean isWritten(int topic) { return (writtenTopics.size() > topic && writtenTopics.get(topic) != null ); } @@ -177,7 +179,7 @@ * reapply the format of the first (header) row. */ - private void formatFirstRow() { -+ void formatFirstRow() { ++ public void formatFirstRow() { XTextTableCursor cursor = table.createCursorByCellName("A1"); formatTable(cursor,firstRowFormat, false ); } @@ -186,7 +188,7 @@ [...9751 lines suppressed...] Index: com/sun/star/wizards/web/export/ConfiguredExporter.java =================================================================== RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java,v retrieving revision 1.2 diff -u -p -r1.2 ConfiguredExporter.java --- openoffice.org.orig/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java 19 May 2004 13:19:54 -0000 1.2 -+++ openoffice.org/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java 3 May 2005 14:12:28 -0000 ++++ openoffice.org/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java 3 May 2005 19:34:07 -0000 @@ -33,7 +33,7 @@ public class ConfiguredExporter extends } } - private Object cast(String s) { -+ Object cast(String s) { ++ public Object cast(String s) { String s1 = s.substring(1); char c = s.charAt(0); switch (c) { +Index: com/sun/star/wizards/web/export/FilterExporter.java +=================================================================== +RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/export/FilterExporter.java,v +retrieving revision 1.2 +diff -u -p -r1.2 FilterExporter.java +--- openoffice.org.orig/wizards/com/sun/star/wizards/web/export/FilterExporter.java 19 May 2004 13:20:32 -0000 1.2 ++++ openoffice.org/wizards/com/sun/star/wizards/web/export/FilterExporter.java 3 May 2005 19:34:07 -0000 +@@ -21,8 +21,8 @@ import com.sun.star.wizards.web.data.CGE + */ + public class FilterExporter extends AbstractExporter { + +- protected String filterName; +- protected Properties props = new Properties(); ++ public String filterName; ++ public Properties props = new Properties(); + + /* (non-Javadoc) + * @see com.sun.star.wizards.web.export.Exporter#export(java.lang.Object, java.io.File, com.sun.star.wizards.web.data.CGSettings, com.sun.star.lang.XMultiServiceFactory) Index: com/sun/star/wizards/web/export/ImpressHTMLExporter.java =================================================================== RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java,v retrieving revision 1.2 diff -u -p -r1.2 ImpressHTMLExporter.java --- openoffice.org.orig/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java 19 May 2004 13:20:45 -0000 1.2 -+++ openoffice.org/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java 3 May 2005 14:12:28 -0000 ++++ openoffice.org/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java 3 May 2005 19:34:07 -0000 @@ -73,9 +73,9 @@ import com.sun.star.wizards.web.data.CGS */ public class ImpressHTMLExporter extends ConfiguredExporter { @@ -8187,9 +9683,9 @@ - private static final Integer SMALL_IMAGE = new Integer(512); - private static final Integer MEDIUM_IMAGE = new Integer(640); - private static final Integer LARGE_IMAGE = new Integer(800); -+ static final Integer SMALL_IMAGE = new Integer(512); -+ static final Integer MEDIUM_IMAGE = new Integer(640); -+ static final Integer LARGE_IMAGE = new Integer(800); ++ public static final Integer SMALL_IMAGE = new Integer(512); ++ public static final Integer MEDIUM_IMAGE = new Integer(640); ++ public static final Integer LARGE_IMAGE = new Integer(800); public boolean export(CGDocument source, String targetDirectory ,XMultiServiceFactory xmsf, Task task) { @@ -8198,13 +9694,13 @@ } - private String getHomepageURL(CGSession session) { -+ String getHomepageURL(CGSession session) { ++ public String getHomepageURL(CGSession session) { return "../" + ( exporter.cp_OwnDirectory ? "../index.html" : "index.html" ) ; } - private Integer getImageWidth(CGSession session) { -+ Integer getImageWidth(CGSession session) { ++ public Integer getImageWidth(CGSession session) { switch (session.cp_Design.cp_OptimizeDisplaySize) { case 0 : return SMALL_IMAGE; case 1 : return MEDIUM_IMAGE; @@ -8213,7 +9709,7 @@ } - private CGSession getSession(CGDocument doc) { -+ CGSession getSession(CGDocument doc) { ++ public CGSession getSession(CGDocument doc) { return doc.getSettings().cp_DefaultSession; } @@ -8223,13 +9719,13 @@ retrieving revision 1.2 diff -u -p -r1.2 ErrorLog.java --- openoffice.org.orig/wizards/com/sun/star/wizards/web/status/ErrorLog.java 19 May 2004 13:21:10 -0000 1.2 -+++ openoffice.org/wizards/com/sun/star/wizards/web/status/ErrorLog.java 3 May 2005 14:12:28 -0000 ++++ openoffice.org/wizards/com/sun/star/wizards/web/status/ErrorLog.java 3 May 2005 19:34:07 -0000 @@ -17,7 +17,7 @@ import java.util.Vector; */ public class ErrorLog implements ErrorReporter { - private List errors = new Vector(); -+ List errors = new Vector(); ++ public List errors = new Vector(); public void error(Exception ex, Object obj, String s) { errors.add(new Err(ex,obj,s)); @@ -8239,13 +9735,13 @@ retrieving revision 1.2 diff -u -p -r1.2 LogTaskListener.java --- openoffice.org.orig/wizards/com/sun/star/wizards/web/status/LogTaskListener.java 19 May 2004 13:21:34 -0000 1.2 -+++ openoffice.org/wizards/com/sun/star/wizards/web/status/LogTaskListener.java 3 May 2005 14:12:28 -0000 ++++ openoffice.org/wizards/com/sun/star/wizards/web/status/LogTaskListener.java 3 May 2005 19:34:07 -0000 @@ -16,7 +16,7 @@ import java.io.PrintStream; */ public class LogTaskListener implements TaskListener { - private PrintStream out; -+ PrintStream out; ++ public PrintStream out; public LogTaskListener(PrintStream os) { out = os; @@ -8255,40 +9751,73 @@ retrieving revision 1.2 diff -u -p -r1.2 Task.java --- openoffice.org.orig/wizards/com/sun/star/wizards/web/status/Task.java 19 May 2004 13:21:48 -0000 1.2 -+++ openoffice.org/wizards/com/sun/star/wizards/web/status/Task.java 3 May 2005 14:12:28 -0000 ++++ openoffice.org/wizards/com/sun/star/wizards/web/status/Task.java 3 May 2005 19:34:07 -0000 @@ -16,13 +16,13 @@ import java.util.Vector; * Window>Preferences>Java>Code Generation>Code and Comments */ public class Task { - private int successfull = 0; - private int failed = 0; -+ int successfull = 0; -+ int failed = 0; ++ public int successfull = 0; ++ public int failed = 0; - private int max = 0; - private String taskName; - private List listeners = new Vector(); - private String subtaskName; -+ int max = 0; -+ String taskName; -+ List listeners = new Vector(); -+ String subtaskName; ++ public int max = 0; ++ public String taskName; ++ public List listeners = new Vector(); ++ public String subtaskName; public Task(String taskName_ , String subtaskName_, int max_) { +@@ -71,28 +71,28 @@ public class Task { + listeners.remove(tl); + } + +- protected void fireTaskStatusChanged() { ++ public void fireTaskStatusChanged() { + TaskEvent te = new TaskEvent(this, TaskEvent.TASK_STATUS_CHANGED); + + for (int i = 0; i Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20698 Modified Files: rpm-4.4.1-matchpathcon.patch rpm.spec Log Message: matchpathcon fixes rpm-4.4.1-matchpathcon.patch: build/Makefile.am | 1 + build/files.c | 27 ++++++++++++++------------- lib/rpmfi.c | 13 ++++++------- lib/rpminstall.c | 14 ++++---------- lib/verify.c | 30 ++++++++++++------------------ python/Makefile.am | 1 + python/rpmts-py.c | 13 ++++--------- 7 files changed, 42 insertions(+), 57 deletions(-) Index: rpm-4.4.1-matchpathcon.patch =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.1-matchpathcon.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rpm-4.4.1-matchpathcon.patch 3 May 2005 19:16:24 -0000 1.3 +++ rpm-4.4.1-matchpathcon.patch 3 May 2005 19:42:01 -0000 1.4 @@ -224,3 +224,13 @@ } if (_rpmts_debug) +--- rpm-4.4.1/python/Makefile.am.matchpathcon 2005-05-03 15:39:52.814388000 -0400 ++++ rpm-4.4.1/python/Makefile.am 2005-05-03 15:40:15.835346000 -0400 +@@ -34,6 +34,7 @@ + $(top_builddir)/rpmio/librpmio.la \ + $(top_builddir)/popt/libpopt.la \ + $(top_builddir)/build/librpmbuild.la \ ++ @WITH_SELINUX_LIB@ \ + @WITH_LIBELF_LIB@ + + LDADD = Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- rpm.spec 3 May 2005 19:16:24 -0000 1.160 +++ rpm.spec 3 May 2005 19:42:01 -0000 1.161 @@ -20,7 +20,7 @@ %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 15 +Release: 16 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Patch0: rpm-4.4.1-posttrans.patch @@ -531,6 +531,9 @@ %{__includedir}/popt.h %changelog +* Tue May 03 2005 Paul Nasrat - 4.4.1-16 +- Yet more matchpathcon + * Tue May 03 2005 Paul Nasrat - 4.4.1-15 - Some more matchpathcon work From fedora-cvs-commits at redhat.com Tue May 3 19:43:37 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:43:37 -0400 Subject: rpms/GFS-kernel/devel .cvsignore, 1.12, 1.13 GFS-kernel.spec, 1.46, 1.47 sources, 1.13, 1.14 Message-ID: <200505031943.j43JhbMr020868@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20854 Modified Files: .cvsignore GFS-kernel.spec sources Log Message: Updated Sources (automated). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Apr 2005 18:40:52 -0000 1.12 +++ .cvsignore 3 May 2005 19:43:35 -0000 1.13 @@ -8,3 +8,4 @@ gfs-kernel-2.6.11.1-20050419.170309.FC4.tar.gz gfs-kernel-2.6.11.2-20050425.154843.FC4.tar.gz gfs-kernel-2.6.11.3-20050426.134031.FC4.tar.gz +gfs-kernel-2.6.11.4-20050503.144108.FC4.tar.gz Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- GFS-kernel.spec 2 May 2005 17:26:17 -0000 1.46 +++ GFS-kernel.spec 3 May 2005 19:43:35 -0000 1.47 @@ -13,7 +13,7 @@ %define buildsmp 1 %define buildxen 1 %define kernel_version 2.6.11-1.1282_FC4 -%define subversion 20050426.134031.FC4 +%define subversion 20050503.144108.FC4 %ifnarch i686 x86_64 %define buildsmp 0 @@ -24,8 +24,8 @@ %endif Name: GFS-kernel -Version: 2.6.11.3 -Release: %{subversion}.9 +Version: 2.6.11.4 +Release: 20050503.144108.FC4.0 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules Index: sources =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 26 Apr 2005 18:40:52 -0000 1.13 +++ sources 3 May 2005 19:43:35 -0000 1.14 @@ -1 +1 @@ -1e836fe061f0444ad718a9e3b751a9d6 gfs-kernel-2.6.11.3-20050426.134031.FC4.tar.gz +aa93b2305d14facee0aceea3b6ac790e gfs-kernel-2.6.11.4-20050503.144108.FC4.tar.gz From fedora-cvs-commits at redhat.com Tue May 3 19:43:42 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:43:42 -0400 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.182,1.183 Message-ID: <200505031943.j43JhgfG020922@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20910 Modified Files: openoffice.org.spec Log Message: X Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- openoffice.org.spec 3 May 2005 17:52:05 -0000 1.182 +++ openoffice.org.spec 3 May 2005 19:43:40 -0000 1.183 @@ -689,7 +689,7 @@ %define __find_requires %{_builddir}/SRC680_m%{ooo2ver}/find-requires find_requires=`rpm --eval %%{__find_requires}` -echo '$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_ | grep -v "("'> find-requires +echo "$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_ | grep -v \(" > find-requires chmod +x find-requires #end ludicrous workaround From fedora-cvs-commits at redhat.com Tue May 3 19:50:30 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:50:30 -0400 Subject: rpms/autofs/devel autofs-4.1.4-non-replicated-ping.patch, 1.2, 1.3 autofs.spec, 1.62, 1.63 Message-ID: <200505031950.j43JoUAt024253@cvs.devel.redhat.com> Author: jmoyer Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24228 Modified Files: autofs-4.1.4-non-replicated-ping.patch autofs.spec Log Message: - I reversed the checking for multimount entries, breaking those configs! This update puts the code back the way it was before I broke it. autofs-4.1.4-non-replicated-ping.patch: mount_nfs.c | 120 +++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 90 insertions(+), 30 deletions(-) Index: autofs-4.1.4-non-replicated-ping.patch =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs-4.1.4-non-replicated-ping.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- autofs-4.1.4-non-replicated-ping.patch 14 Apr 2005 02:30:56 -0000 1.2 +++ autofs-4.1.4-non-replicated-ping.patch 3 May 2005 19:50:27 -0000 1.3 @@ -1,5 +1,5 @@ ---- autofs-4.1.4/modules/mount_nfs.c.orig 2005-04-13 20:31:24.639009544 -0400 -+++ autofs-4.1.4/modules/mount_nfs.c 2005-04-13 20:31:40.727563712 -0400 +--- autofs-4.1.4/modules/mount_nfs.c.orig 2005-05-03 15:41:17.000000000 -0400 ++++ autofs-4.1.4/modules/mount_nfs.c 2005-05-03 15:47:18.000000000 -0400 @@ -31,6 +31,7 @@ #include #include @@ -8,21 +8,12 @@ #define MODULE_MOUNT #include "automount.h" -@@ -105,28 +106,116 @@ int is_local_addr(const char *host, cons +@@ -105,28 +106,107 @@ int is_local_addr(const char *host, cons return 1; } + +/* -+ * If the map doesn't contain a ',' and doesn't contain more than -+ * one ':' then @what is not a multimount entry. -+ */ -+static int is_multimount_entry(char *what) -+{ -+ return !strchr(what, ',') && (strchr(what, ':') == strrchr(what, ':')); -+} -+ -+/* + * Check to see if the 'host:path' or 'host' is on the local machine + * Returns < 0 if there is a host lookup problem, otherwise returns 0 + * if it's not a local mount, and returns > 0 if it is a local mount. @@ -104,7 +95,7 @@ + * If only one mountpoint has been passed in, we don't need to + * do anything except strip whitespace from the end of the string. + */ -+ if (!is_multimount_entry(p)) { ++ if (!strchr(p, ',') && (strchr(p,':') == strrchr(p,':'))) { + for (pstrip = p+strlen(p) - 1; pstrip >= p; pstrip--) + if (isspace(*pstrip)) + *pstrip = '\0'; @@ -128,7 +119,7 @@ while (p && *p) { char *next; unsigned int ping_stat = 0; -@@ -171,37 +260,17 @@ int get_best_mount(char *what, const cha +@@ -171,37 +251,17 @@ int get_best_mount(char *what, const cha /* p points to a server, "next is our next parse point */ if (!skiplocal) { /* Check if it's localhost */ @@ -170,7 +161,7 @@ } /* ping each (or the) entry to see if it's alive. */ -@@ -256,7 +325,7 @@ int get_best_mount(char *what, const cha +@@ -256,7 +316,7 @@ int get_best_mount(char *what, const cha */ if (!local && winner_weight == INT_MAX) { /* We had more than one contender and none responded in time */ @@ -179,7 +170,7 @@ /* We've already tried a longer timeout */ if (!longtimeout) { /* Reset string and try again */ -@@ -267,7 +336,7 @@ int get_best_mount(char *what, const cha +@@ -267,7 +327,7 @@ int get_best_mount(char *what, const cha "retrying with longer timeout", original); @@ -188,7 +179,7 @@ } } } -@@ -395,7 +464,7 @@ int mount_mount(const char *root, const +@@ -395,7 +455,7 @@ int mount_mount(const char *root, const /* No colon, take this as a bind (local) entry */ local = 1; } else if (!nosymlink) { Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- autofs.spec 27 Apr 2005 00:58:27 -0000 1.62 +++ autofs.spec 3 May 2005 19:50:27 -0000 1.63 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems. Name: autofs %define version 4.1.4 -%define release 6 +%define release 7 Version: %{version} Release: %{release} Epoch: 1 @@ -123,6 +123,10 @@ %{_libdir}/autofs/* %changelog +* Tue May 3 2005 Jeff Moyer - 1:4.1.4-7 +- I reversed the checking for multimount entries, breaking those configs! + This update puts the code back the way it was before I broke it. + * Tue Apr 26 2005 Jeff Moyer - 1:4.1.4-6 - Fix a race between mounting a share and updating the cache in the parent process. If the mount completed first, the parent would not expire the From fedora-cvs-commits at redhat.com Tue May 3 19:51:29 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:51:29 -0400 Subject: rpms/GFS-kernel/devel GFS-kernel.spec, 1.47, 1.48 gfs-kernel-2.6.11.2-20050425.154843.FC4.patch, 1.3, NONE Message-ID: <200505031951.j43JpTXv024366@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24353 Modified Files: GFS-kernel.spec Removed Files: gfs-kernel-2.6.11.2-20050425.154843.FC4.patch Log Message: Removed patch and build with updated sources. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- GFS-kernel.spec 3 May 2005 19:43:35 -0000 1.47 +++ GFS-kernel.spec 3 May 2005 19:51:27 -0000 1.48 @@ -45,7 +45,6 @@ Provides: kernel-modules ExclusiveArch: i586 i686 x86_64 Source0: gfs-kernel-%{version}-%{subversion}.tar.gz -Patch1: gfs-kernel-2.6.11.2-20050425.154843.FC4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -102,7 +101,6 @@ ################################################################################ %prep %setup -q -n gfs-kernel-%{version}-%{subversion} -%patch1 -p1 -b .gcc4 # Put the version information into the necessary files sed -i -e '/RELEASE_NAME/s/""/"%{version}-%{release}"/' \ src/nolock/main.c src/gulm/gulm.h src/gfs/gfs.h src/harness/main.c @@ -204,6 +202,9 @@ %{_includedir}/linux %changelog +* Tue May 03 2005 Chris Feist +- Build new sources and remove patch. + * Fri Apr 29 2005 Chris Feist - Rebuild for new kernel - Adding support for i586, xen0 & xenU --- gfs-kernel-2.6.11.2-20050425.154843.FC4.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 3 19:51:46 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:51:46 -0400 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.48,1.49 Message-ID: <200505031951.j43JpkQ2024418@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24406 Modified Files: GFS-kernel.spec Log Message: Bumped rev. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- GFS-kernel.spec 3 May 2005 19:51:27 -0000 1.48 +++ GFS-kernel.spec 3 May 2005 19:51:44 -0000 1.49 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.11.4 -Release: 20050503.144108.FC4.0 +Release: 20050503.144108.FC4.1 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Tue May 3 19:56:05 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:56:05 -0400 Subject: rpms/rpm/devel rpm-4.4.1-matchpathcon.patch,1.4,1.5 Message-ID: <200505031956.j43Ju5gh018299@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18285 Modified Files: rpm-4.4.1-matchpathcon.patch Log Message: doh rpm-4.4.1-matchpathcon.patch: build/Makefile.am | 1 + build/files.c | 27 ++++++++++++++------------- lib/rpmfi.c | 13 ++++++------- lib/rpminstall.c | 14 ++++---------- lib/verify.c | 30 ++++++++++++------------------ python/Makefile.am | 1 + python/rpmts-py.c | 13 ++++--------- 7 files changed, 42 insertions(+), 57 deletions(-) Index: rpm-4.4.1-matchpathcon.patch =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.1-matchpathcon.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpm-4.4.1-matchpathcon.patch 3 May 2005 19:42:01 -0000 1.4 +++ rpm-4.4.1-matchpathcon.patch 3 May 2005 19:56:02 -0000 1.5 @@ -217,7 +217,7 @@ - fn = _free(fn); + const char *fn = rpmGetPath("%{?_install_file_context_path}", NULL); + if (fn != NULL && *fn != '\0') { -+ matchpatcon_init(fn); ++ matchpathcon_init(fn); } - sx = rpmsxFree(sx); + fn = _free(fn); From fedora-cvs-commits at redhat.com Tue May 3 19:56:48 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 15:56:48 -0400 Subject: rpms/rpm/devel rpm.spec,1.161,1.162 Message-ID: <200505031956.j43Jum9T018344@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18332 Modified Files: rpm.spec Log Message: bump Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- rpm.spec 3 May 2005 19:42:01 -0000 1.161 +++ rpm.spec 3 May 2005 19:56:46 -0000 1.162 @@ -20,7 +20,7 @@ %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 16 +Release: 17 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Patch0: rpm-4.4.1-posttrans.patch @@ -531,6 +531,9 @@ %{__includedir}/popt.h %changelog +* Tue May 03 2005 Paul Nasrat - 4.4.1-17 +- Fix typo + * Tue May 03 2005 Paul Nasrat - 4.4.1-16 - Yet more matchpathcon From fedora-cvs-commits at redhat.com Tue May 3 20:04:53 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 16:04:53 -0400 Subject: rpms/firefox/devel firefox.sh.in,1.7,1.8 firefox.spec,1.66,1.67 Message-ID: <200505032004.j43K4rQ6018544@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18530 Modified Files: firefox.sh.in firefox.spec Log Message: * Tue May 3 2005 Christopher Aillon - Patch from Marcel Mol supporting launching with filenames containing whitespace. Index: firefox.sh.in =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.sh.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- firefox.sh.in 3 May 2005 15:50:58 -0000 1.7 +++ firefox.sh.in 3 May 2005 20:04:51 -0000 1.8 @@ -168,7 +168,7 @@ # if it doesn't begin with a '/' and it exists when the pwd is # prepended to it then append the full path echo $opt | grep -e '^/' 2>/dev/null > /dev/null - if [ "${RETURN_VAL}" -ne "0" ] && [ -e `pwd`/$opt ]; then + if [ "${RETURN_VAL}" -ne "0" ] && [ -e "`pwd`/$opt" ]; then opt="`pwd`/$opt" fi exec $MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM "openurl($opt)" 2>/dev/null >/dev/null Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- firefox.spec 3 May 2005 19:12:19 -0000 1.66 +++ firefox.spec 3 May 2005 20:04:51 -0000 1.67 @@ -332,6 +332,10 @@ #--------------------------------------------------------------------- %changelog +* Tue May 3 2005 Christopher Aillon +- Patch from Marcel Mol supporting launching with filenames + containing whitespace. + * Tue May 3 2005 Christopher Aillon 0:1.0.3-3 - Firefox script fixes to support multilib installs. - Add upstream patch to fix bidi justification of pango From fedora-cvs-commits at redhat.com Tue May 3 20:07:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 16:07:56 -0400 Subject: rpms/mozilla/devel mozilla.sh.in,1.8,1.9 mozilla.spec,1.59,1.60 Message-ID: <200505032007.j43K7ueY018593@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/mozilla/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18579 Modified Files: mozilla.sh.in mozilla.spec Log Message: * Tue May 3 2005 Christopher Aillon - Add patch from Marcel Mol supporting launching with filenames containing whitespace Index: mozilla.sh.in =================================================================== RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.sh.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mozilla.sh.in 28 Apr 2005 05:14:10 -0000 1.8 +++ mozilla.sh.in 3 May 2005 20:07:54 -0000 1.9 @@ -159,7 +159,7 @@ # if it doesn't begin with a '/' and it exists when the pwd is # prepended to it then append the full path echo $opt | grep -e '^/' 2>/dev/null > /dev/null - if [ "${RETURN_VAL}" -ne "0" ] && [ -e `pwd`/$opt ]; then + if [ "${RETURN_VAL}" -ne "0" ] && [ -e "`pwd`/$opt" ]; then opt="`pwd`/$opt" fi exec $MOZ_CLIENT_PROGRAM "openurl($opt)" 2>/dev/null >/dev/null Index: mozilla.spec =================================================================== RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- mozilla.spec 28 Apr 2005 05:14:11 -0000 1.59 +++ mozilla.spec 3 May 2005 20:07:54 -0000 1.60 @@ -771,6 +771,10 @@ %{mozdir}/xpt_link %changelog +* Tue May 3 2005 Christopher Aillon +- Add patch from Marcel Mol supporting launching with filenames + containing whitespace + * Wed Apr 27 2005 Warren Togami - remove JVM version probing (#116445) - correct confusing PANGO vars in startup script From fedora-cvs-commits at redhat.com Tue May 3 20:21:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 16:21:10 -0400 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.183,1.184 Message-ID: <200505032021.j43KLAf5021846@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21834 Modified Files: openoffice.org.spec Log Message: X Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- openoffice.org.spec 3 May 2005 19:43:40 -0000 1.183 +++ openoffice.org.spec 3 May 2005 20:21:08 -0000 1.184 @@ -683,12 +683,14 @@ #while we include these libs we need this, if/when we move to system #libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped %define __find_provides %{_builddir}/SRC680_m%{ooo2ver}/find-provides -find_provides=`rpm --eval %%{__find_provides}` +#find_provides=`rpm --eval %%{__find_provides}` +find_provides=/usr/lib/rpm/redhat/find-provides echo "$find_provides | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_" > find-provides chmod +x find-provides %define __find_requires %{_builddir}/SRC680_m%{ooo2ver}/find-requires -find_requires=`rpm --eval %%{__find_requires}` +#find_requires=`rpm --eval %%{__find_requires}` +find_requires=/usr/lib/rpm/redhat/find-requires echo "$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_ | grep -v \(" > find-requires chmod +x find-requires #end ludicrous workaround From fedora-cvs-commits at redhat.com Tue May 3 20:56:47 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 16:56:47 -0400 Subject: rpms/HelixPlayer/devel HelixPlayer.spec,1.34,1.35 Message-ID: <200505032056.j43Kul8b012779@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/HelixPlayer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12767 Modified Files: HelixPlayer.spec Log Message: - remove compat-gcc32 requirement Index: HelixPlayer.spec =================================================================== RCS file: /cvs/dist/rpms/HelixPlayer/devel/HelixPlayer.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- HelixPlayer.spec 26 Apr 2005 20:49:11 -0000 1.34 +++ HelixPlayer.spec 3 May 2005 20:56:45 -0000 1.35 @@ -4,7 +4,7 @@ Name: HelixPlayer Version: 1.0.4 Epoch: 1 -Release: 3 +Release: 4 Group: Applications/Multimedia License: RPSL, GPL URL: https://player.helixcommunity.org/ @@ -23,11 +23,11 @@ %define libdepssuffix %{nil} %endif -%ifarch ppc -%define system_id SYSTEM_ID=linux-2.2-libc6-gcc32-powerpc -%else -%define system_id %{nil} -%endif +#%ifarch ppc +#%define system_id SYSTEM_ID=linux-2.2-libc6-gcc32-powerpc +#%else +#%define system_id %{nil} +#%endif Requires: libbluecurve.so%{libdepssuffix} %{_libdir}/mozilla/plugins @@ -37,7 +37,6 @@ BuildRequires: python BuildRequires: prelink BuildRequires: libogg-devel -BuildRequires: compat-gcc-32-c++ PreReq: desktop-file-utils >= %{desktop_file_utils_version} @@ -167,6 +166,9 @@ %{_datadir}/application-registry/hxplay.applications %changelog +* Tue May 03 2005 John (J5) Palmieri 1:1.0.4-4 +- remove compat-gcc32 requirement + * Tue Apr 26 2005 John (J5) Palmieri 1:1.0.4-3 - add nptl patch to fix compile with nptl From fedora-cvs-commits at redhat.com Tue May 3 20:57:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 16:57:10 -0400 Subject: rpms/firefox/devel firefox-1.0-pango-bidi-justify.patch,1.1,1.2 Message-ID: <200505032057.j43KvAIt012802@cvs.devel.redhat.com> Author: blizzard Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12788 Modified Files: firefox-1.0-pango-bidi-justify.patch Log Message: fix build problems with bidi patch firefox-1.0-pango-bidi-justify.patch: gfx/public/nsIRenderingContext.h | 8 +++ gfx/src/gtk/nsFontMetricsPango.cpp | 3 - layout/html/base/src/nsTextFrame.cpp | 86 ++++++++++++++++++++++++++--------- 3 files changed, 75 insertions(+), 22 deletions(-) Index: firefox-1.0-pango-bidi-justify.patch =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.0-pango-bidi-justify.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- firefox-1.0-pango-bidi-justify.patch 3 May 2005 15:50:58 -0000 1.1 +++ firefox-1.0-pango-bidi-justify.patch 3 May 2005 20:57:07 -0000 1.2 @@ -1,50 +1,6 @@ -Index: gfx/public/nsIRenderingContext.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/public/nsIRenderingContext.h,v -retrieving revision 1.62 -diff -u -r1.62 nsIRenderingContext.h ---- gfx/public/nsIRenderingContext.h 27 Nov 2004 08:22:21 -0000 1.62 -+++ gfx/public/nsIRenderingContext.h 14 Apr 2005 07:12:39 -0000 -@@ -835,6 +835,14 @@ - */ - #define NS_RENDERING_HINT_FAST_MEASURE 0x10 - -+/** -+ * This bit, when set, indicates that gfx performs glyph reordering of complex -+ * text after applying character or word spacing, and so expects to be passed -+ * text in logical order. When this bit is not set, gfx must be passed text in -+ * visual order if characters and word spacing are to be applied. -+ */ -+#define NS_RENDERING_HINT_REORDER_SPACED_TEXT 0x40 -+ - //flags for copy CopyOffScreenBits - - //when performing the blit, use the region, if any, -Index: gfx/src/gtk/nsFontMetricsPango.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp,v -retrieving revision 1.13 -diff -u -r1.13 nsFontMetricsPango.cpp ---- gfx/src/gtk/nsFontMetricsPango.cpp 23 Jan 2005 23:58:30 -0000 1.13 -+++ gfx/src/gtk/nsFontMetricsPango.cpp 14 Apr 2005 07:12:40 -0000 -@@ -1138,7 +1138,8 @@ - return (NS_RENDERING_HINT_BIDI_REORDERING | - NS_RENDERING_HINT_ARABIC_SHAPING | - NS_RENDERING_HINT_FAST_MEASURE | -- NS_RENDERING_HINT_TEXT_CLUSTERS); -+ NS_RENDERING_HINT_TEXT_CLUSTERS | -+ NS_RENDERING_HINT_REORDER_SPACED_TEXT); - } - - /* static */ -Index: layout/html/base/src/nsTextFrame.cpp -=================================================================== -RCS file: /cvsroot/mozilla/layout/html/base/src/Attic/nsTextFrame.cpp,v -retrieving revision 1.455.6.2 -diff -d -u -p -r1.455.6.2 nsTextFrame.cpp ---- layout/html/base/src/nsTextFrame.cpp 24 Nov 2004 18:39:34 -0000 1.455.6.2 -+++ layout/html/base/src/nsTextFrame.cpp 20 Apr 2005 19:21:11 -0000 -@@ -2931,12 +2931,21 @@ nsTextFrame::PaintTextSlowly(nsIPresCont +--- ./layout/html/base/src/nsTextFrame.cpp.SCREW 2005-05-03 15:53:09.000000000 -0400 ++++ ./layout/html/base/src/nsTextFrame.cpp 2005-05-03 16:45:25.000000000 -0400 +@@ -2967,12 +2967,21 @@ if (0 != textLength) { #ifdef IBMBIDI @@ -66,7 +22,7 @@ nsBidiPresUtils* bidiUtils; aPresContext->GetBidiUtils(&bidiUtils); -@@ -2949,8 +2958,19 @@ nsTextFrame::PaintTextSlowly(nsIPresCont +@@ -2985,8 +2994,19 @@ PRInt32 rememberTextLength = textLength; #endif // Since we paint char by char, handle the text like on non-bidi platform @@ -83,22 +39,22 @@ + // If we will be painting char by char, handle the text like on non-bidi platform bidiUtils->ReorderUnicodeText(text, textLength, charType, - level & 1, PR_FALSE); -+ isOddLevel, (paintCharByChar) ? PR_FALSE : isBidiSystem); ++ level & 1, (paintCharByChar) ? PR_FALSE : isBidiSystem); NS_ASSERTION(rememberTextLength == textLength, "Bidi formatting changed text length"); } } -@@ -2992,7 +3012,9 @@ nsTextFrame::PaintTextSlowly(nsIPresCont +@@ -3028,7 +3048,9 @@ sdptr->mStart = ip[sdptr->mStart] - mContentOffset; sdptr->mEnd = ip[sdptr->mEnd] - mContentOffset; #ifdef IBMBIDI - AdjustSelectionPointsForBidi(sdptr, textLength, CHARTYPE_IS_RTL(charType), level & 1, PR_FALSE); + AdjustSelectionPointsForBidi(sdptr, textLength, -+ CHARTYPE_IS_RTL(charType), isOddLevel, ++ CHARTYPE_IS_RTL(charType), level & 1, + (paintCharByChar) ? PR_FALSE : isBidiSystem); #endif sdptr = sdptr->mNext; } -@@ -3000,19 +3022,32 @@ nsTextFrame::PaintTextSlowly(nsIPresCont +@@ -3036,19 +3058,32 @@ DrawSelectionIterator iter(content, details,text,(PRUint32)textLength,aTextStyle, selectionValue, aPresContext, mStyleContext); if (!iter.IsDone() && iter.First()) { @@ -122,7 +78,7 @@ + { + nsTextDimensions frameDimensions; + GetTextDimensions(aRenderingContext, aTextStyle, text, -+ (PRInt32)textLength, iter.IsLast(), &frameDimensions); ++ (PRInt32)textLength, &frameDimensions); + currentX = dx + frameDimensions.width; + } +#endif @@ -144,7 +100,7 @@ if (iter.CurrentBackGroundColor(currentBKColor, &isCurrentBKColorTransparent)) {//DRAW RECT HERE!!! if (!isCurrentBKColorTransparent) { -@@ -3021,7 +3056,7 @@ nsTextFrame::PaintTextSlowly(nsIPresCont +@@ -3057,7 +3092,7 @@ } currentFGColor = EnsureDifferentColors(currentFGColor, currentBKColor); } @@ -153,7 +109,7 @@ if (isPaginated && !iter.IsBeforeOrAfter()) { aRenderingContext.SetColor(nsCSSRendering::TransformColor(aTextStyle.mColor->mColor,canDarkenColor)); -@@ -3035,11 +3070,13 @@ nsTextFrame::PaintTextSlowly(nsIPresCont +@@ -3071,11 +3106,13 @@ dy, width, details); } @@ -171,7 +127,7 @@ } else if (!isPaginated) { -@@ -3057,8 +3094,15 @@ nsTextFrame::PaintTextSlowly(nsIPresCont +@@ -3093,8 +3130,15 @@ delete details; } } @@ -188,3 +144,32 @@ void nsTextFrame::PaintAsciiText(nsIPresContext* aPresContext, +--- ./gfx/public/nsIRenderingContext.h.SCREW 2005-05-03 15:53:09.000000000 -0400 ++++ ./gfx/public/nsIRenderingContext.h 2005-05-03 15:53:09.000000000 -0400 +@@ -932,6 +932,14 @@ + */ + #define NS_RENDERING_HINT_TEXT_CLUSTERS 0x20 + ++/** ++ * This bit, when set, indicates that gfx performs glyph reordering of complex ++ * text after applying character or word spacing, and so expects to be passed ++ * text in logical order. When this bit is not set, gfx must be passed text in ++ * visual order if characters and word spacing are to be applied. ++ */ ++#define NS_RENDERING_HINT_REORDER_SPACED_TEXT 0x40 ++ + //flags for copy CopyOffScreenBits + + //when performing the blit, use the region, if any, +--- ./gfx/src/gtk/nsFontMetricsPango.cpp.SCREW 2005-05-03 15:53:09.000000000 -0400 ++++ ./gfx/src/gtk/nsFontMetricsPango.cpp 2005-05-03 15:53:09.000000000 -0400 +@@ -1138,7 +1138,8 @@ + return (NS_RENDERING_HINT_BIDI_REORDERING | + NS_RENDERING_HINT_ARABIC_SHAPING | + NS_RENDERING_HINT_FAST_MEASURE | +- NS_RENDERING_HINT_TEXT_CLUSTERS); ++ NS_RENDERING_HINT_TEXT_CLUSTERS | ++ NS_RENDERING_HINT_REORDER_SPACED_TEXT); + } + + /* static */ From fedora-cvs-commits at redhat.com Tue May 3 22:28:29 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 18:28:29 -0400 Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.84,1.85 Message-ID: <200505032228.j43MSTVG006157@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6143 Modified Files: redhat-artwork.spec Log Message: - Add a symlink for ftp share icons Index: redhat-artwork.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- redhat-artwork.spec 25 Apr 2005 17:22:26 -0000 1.84 +++ redhat-artwork.spec 3 May 2005 22:28:27 -0000 1.85 @@ -4,7 +4,7 @@ Summary: Artwork for Red Hat default look-and-feel Name: redhat-artwork Version: 0.122 -Release: 4 +Release: 5 URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz Source1: post-install-fixup.sh @@ -92,6 +92,9 @@ cd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/apps ln -s gnome-main-menu.png gnome-logo-icon-transparent.png +cd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/filesystems +ln -s ../mimetypes/fileshare.png gnome-fs-ftp.png + %clean rm -rf $RPM_BUILD_ROOT @@ -123,6 +126,9 @@ %config /root/.gtkrc %changelog +* Tue May 03 2005 John (J5) Palmieri 0.122-5 +- Add a symlink for ftp share icons + * Mon Apr 25 2005 Matthias Clasen 0.122-4 - Don't symlink the Bluecurve gdm theme to "Default", since that shows up as a duplicate "Bluecurve" entry in the From fedora-cvs-commits at redhat.com Tue May 3 22:58:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 18:58:38 -0400 Subject: rpms/gdb/devel gdb-6.3-partial-die-20050503.patch, NONE, 1.1 gdb.spec, 1.145, 1.146 Message-ID: <200505032258.j43MwcLi003526@cvs.devel.redhat.com> Author: jjohnstn Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3512 Modified Files: gdb.spec Added Files: gdb-6.3-partial-die-20050503.patch Log Message: * Tue May 03 2005 Jeff Johnston 6.3.0.0-1.21 - Bump up release number. * Tue May 03 2005 Jeff Johnston 6.3.0.0-1.20 - Bump up release number. * Tue May 03 2005 Jeff Johnston 6.3.0.0-1.19 - Fix for partial die in cache error - Bugzilla 137904 gdb-6.3-partial-die-20050503.patch: dwarf2read.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 69 insertions(+), 15 deletions(-) --- NEW FILE gdb-6.3-partial-die-20050503.patch --- 2005-04-07 Daniel Jacobowitz * dwarf2read.c (struct dwarf2_per_cu_data): Reduce length to 30 bits. Add load_all_dies flag. (load_partial_dies): Load all DIEs if per_cu->load_all_dies is set. Load DW_TAG_member by default. Remove internal_error call. (find_partial_die): Reload the compilation unit if we can not find a DIE in the cache. Call internal_error here if we still can not find the DIE. --- gdb-6.3/gdb/dwarf2read.c.fix 2005-05-03 13:39:18.000000000 -0400 +++ gdb-6.3/gdb/dwarf2read.c 2005-05-03 13:45:54.000000000 -0400 @@ -362,16 +362,22 @@ struct dwarf2_cu struct dwarf2_per_cu_data { - /* The start offset and length of this compilation unit. 2**31-1 + /* The start offset and length of this compilation unit. 2**30-1 bytes should suffice to store the length of any compilation unit - if it doesn't, GDB will fall over anyway. */ unsigned long offset; - unsigned long length : 31; + unsigned long length : 30; /* Flag indicating this compilation unit will be read in before any of the current compilation units are processed. */ unsigned long queued : 1; + /* This flag will be set if we need to load absolutely all DIEs + for this compilation unit, instead of just the ones we think + are interesting. It gets set if we look for a DIE in the + hash table and don't find it. */ + unsigned int load_all_dies : 1; + /* Set iff currently read in. */ struct dwarf2_cu *cu; @@ -5122,12 +5128,16 @@ load_partial_dies (bfd *abfd, char *info struct partial_die_info *parent_die, *last_die, *first_die = NULL; struct abbrev_info *abbrev; unsigned int bytes_read; + unsigned int load_all = 0; int nesting_level = 1; parent_die = NULL; last_die = NULL; + if (cu->per_cu && cu->per_cu->load_all_dies) + load_all = 1; + cu->partial_dies = htab_create_alloc_ex (cu->header.length / 12, partial_die_hash, @@ -5163,12 +5173,17 @@ load_partial_dies (bfd *abfd, char *info continue; } - /* Check whether this DIE is interesting enough to save. */ - if (!is_type_tag_for_partial (abbrev->tag) + /* Check whether this DIE is interesting enough to save. Normally + we would not be interested in members here, but there may be + later variables referencing them via DW_AT_specification (for + static members). */ + if (!load_all + && !is_type_tag_for_partial (abbrev->tag) && abbrev->tag != DW_TAG_enumerator && abbrev->tag != DW_TAG_subprogram && abbrev->tag != DW_TAG_variable - && abbrev->tag != DW_TAG_namespace) + && abbrev->tag != DW_TAG_namespace + && abbrev->tag != DW_TAG_member) { /* Otherwise we skip to the next sibling, if any. */ info_ptr = skip_one_die (info_ptr + bytes_read, abbrev, cu); @@ -5268,9 +5283,11 @@ load_partial_dies (bfd *abfd, char *info Adding more things than necessary to the hash table is harmless except for the performance cost. Adding too few will result in - internal errors in find_partial_die. */ + wasted time in find_partial_die, when we reread the compilation + unit with load_all_dies set. */ - if (abbrev->tag == DW_TAG_subprogram + if (load_all + || abbrev->tag == DW_TAG_subprogram || abbrev->tag == DW_TAG_variable || abbrev->tag == DW_TAG_namespace || part_die->is_declaration) @@ -5290,7 +5307,8 @@ load_partial_dies (bfd *abfd, char *info languages we have to, both so that we can get at method physnames to infer fully qualified class names, and for DW_AT_specification. */ if (last_die->has_children - && (last_die->tag == DW_TAG_namespace + && (load_all + || last_die->tag == DW_TAG_namespace || last_die->tag == DW_TAG_enumeration_type || (cu->language != language_c && (last_die->tag == DW_TAG_class_type @@ -5442,10 +5460,6 @@ find_partial_die_in_comp_unit (unsigned part_die.offset = offset; lookup_die = htab_find_with_hash (cu->partial_dies, &part_die, offset); - if (lookup_die == NULL) - internal_error (__FILE__, __LINE__, - "could not find partial DIE in cache\n"); - return lookup_die; } @@ -5454,11 +5468,16 @@ find_partial_die_in_comp_unit (unsigned static struct partial_die_info * find_partial_die (unsigned long offset, struct dwarf2_cu *cu) { - struct dwarf2_per_cu_data *per_cu; + struct dwarf2_per_cu_data *per_cu = NULL; + struct partial_die_info *pd = NULL; if (offset >= cu->header.offset && offset < cu->header.offset + cu->header.length) - return find_partial_die_in_comp_unit (offset, cu); + { + pd = find_partial_die_in_comp_unit (offset, cu); + if (pd != NULL) + return pd; + } per_cu = dwarf2_find_containing_comp_unit (offset, cu->objfile); @@ -5470,7 +5489,42 @@ find_partial_die (unsigned long offset, } per_cu->cu->last_used = 0; - return find_partial_die_in_comp_unit (offset, per_cu->cu); + pd = find_partial_die_in_comp_unit (offset, per_cu->cu); + + if (pd == NULL && per_cu->load_all_dies == 0) + { + struct cleanup *back_to; + struct partial_die_info comp_unit_die; + struct abbrev_info *abbrev; + unsigned int bytes_read; + char *info_ptr; + + per_cu->load_all_dies = 1; + + /* Re-read the DIEs. */ + back_to = make_cleanup (null_cleanup, 0); + if (per_cu->cu->dwarf2_abbrevs == NULL) + { + dwarf2_read_abbrevs (per_cu->cu->objfile->obfd, per_cu->cu); + back_to = make_cleanup (dwarf2_free_abbrev_table, per_cu->cu); + } + info_ptr = per_cu->cu->header.first_die_ptr; + abbrev = peek_die_abbrev (info_ptr, &bytes_read, per_cu->cu); + info_ptr = read_partial_die (&comp_unit_die, abbrev, bytes_read, + per_cu->cu->objfile->obfd, info_ptr, + per_cu->cu); + if (comp_unit_die.has_children) + load_partial_dies (per_cu->cu->objfile->obfd, info_ptr, 0, per_cu->cu); + do_cleanups (back_to); + + pd = find_partial_die_in_comp_unit (offset, per_cu->cu); + } + + if (pd == NULL) + internal_error (__FILE__, __LINE__, + "could not find partial DIE 0x%lx in cache [from module %s]\n", + offset, bfd_get_filename (cu->objfile->obfd)); + return pd; } /* Adjust PART_DIE before generating a symbol for it. This function Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- gdb.spec 27 Apr 2005 23:29:27 -0000 1.145 +++ gdb.spec 3 May 2005 22:58:36 -0000 1.146 @@ -11,7 +11,7 @@ Version: 6.3.0.0 # The release always contains a leading reserved number, start it at 0. -Release: 1.18 +Release: 1.21 License: GPL Group: Development/Debuggers @@ -213,6 +213,9 @@ # Ia64 patch for added libunwind support Patch154: gdb-6.3-ia64-sigtramp-20050427.patch +# Partial die in cache fix +Patch155: gdb-6.3-partial-die-20050503.patch + %ifarch ia64 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3 %else @@ -299,6 +302,7 @@ %patch152 -p1 %patch153 -p1 %patch154 -p1 +%patch155 -p1 # Change the version that gets printed at GDB startup, so it is RedHat # specific. @@ -467,6 +471,16 @@ # don't include the files in include, they are part of binutils %changelog +* Tue May 03 2005 Jeff Johnston 6.3.0.0-1.21 +- Bump up release number. + +* Tue May 03 2005 Jeff Johnston 6.3.0.0-1.20 +- Bump up release number. + +* Tue May 03 2005 Jeff Johnston 6.3.0.0-1.19 +- Fix for partial die in cache error +- Bugzilla 137904 + * Wed Apr 27 2005 Jeff Johnston 6.3.0.0-1.18 - Bump up release number. From fedora-cvs-commits at redhat.com Tue May 3 23:31:17 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 19:31:17 -0400 Subject: rpms/kernel/devel linux-2.6.12-usb-old_scheme_first.patch, NONE, 1.1 kernel-2.6.spec, 1.1284, 1.1285 linux-2.6.10-usb-use_both_schemes.patch, 1.4, NONE Message-ID: <200505032331.j43NVHMF000771@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv753 Modified Files: kernel-2.6.spec Added Files: linux-2.6.12-usb-old_scheme_first.patch Removed Files: linux-2.6.10-usb-use_both_schemes.patch Log Message: patch rename linux-2.6.12-usb-old_scheme_first.patch: hub.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6.12-usb-old_scheme_first.patch --- diff -urNp --exclude-from=/home/davej/.exclude linux-1301/drivers/usb/core/hub.c linux-1400/drivers/usb/core/hub.c --- linux-1301/drivers/usb/core/hub.c +++ linux-1400/drivers/usb/core/hub.c @@ -69,7 +69,7 @@ MODULE_PARM_DESC (blinkenlights, "true t * otherwise the new scheme is used. If that fails and "use_both_schemes" * is set, then the driver will make another attempt, using the other scheme. */ -static int old_scheme_first = 0; +static int old_scheme_first = 1; module_param(old_scheme_first, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(old_scheme_first, "start with the old device initialization scheme"); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1284 retrieving revision 1.1285 diff -u -r1.1284 -r1.1285 --- kernel-2.6.spec 3 May 2005 16:35:22 -0000 1.1284 +++ kernel-2.6.spec 3 May 2005 23:31:11 -0000 1.1285 @@ -309,7 +309,7 @@ Patch1300: linux-2.6.9-net-tr-irqlock-fix.patch # USB bits -Patch1400: linux-2.6.10-usb-use_both_schemes.patch +Patch1400: linux-2.6.12-usb-old_scheme_first.patch Patch1401: linux-2.6.12-rc3-ehci-misc-updates.patch Patch1402: linux-2.6.11-random-ehci-patch.patch --- linux-2.6.10-usb-use_both_schemes.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 3 23:37:31 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 19:37:31 -0400 Subject: rpms/gcc/devel gcc4-chk-pr21265.patch, NONE, 1.1 gcc4-fortran-pr15080.patch, NONE, 1.1 gcc4-pr21239.patch, NONE, 1.1 gcc4-pr21265.patch, NONE, 1.1 gcc4-pr21297.patch, NONE, 1.1 gcc4-pr21330.patch, NONE, 1.1 .cvsignore, 1.86, 1.87 gcc4.spec, 1.33, 1.34 sources, 1.88, 1.89 gcc4-gfortran-entry.patch, 1.1, NONE gcc4-pr20742.patch, 1.1, NONE gcc4-pr20768.patch, 1.3, NONE Message-ID: <200505032337.j43NbV7A000841@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv822 Modified Files: .cvsignore gcc4.spec sources Added Files: gcc4-chk-pr21265.patch gcc4-fortran-pr15080.patch gcc4-pr21239.patch gcc4-pr21265.patch gcc4-pr21297.patch gcc4-pr21330.patch Removed Files: gcc4-gfortran-entry.patch gcc4-pr20742.patch gcc4-pr20768.patch Log Message: 4.0.0-3 gcc4-chk-pr21265.patch: builtins.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) --- NEW FILE gcc4-chk-pr21265.patch --- 2005-05-03 Jakub Jelinek PR middle-end/21265 (expand_builtin_memory_chk): Copy CALL_EXPR_TAILCALL from EXP to the new CALL_EXPRs. --- gcc/builtins.c.jj 2005-05-02 09:51:51.000000000 +0200 +++ gcc/builtins.c 2005-05-03 13:33:40.000000000 +0200 @@ -9801,8 +9821,10 @@ expand_builtin_memory_chk (tree exp, rtx if (! fn) return 0; - return expand_expr (build_function_call_expr (fn, arglist), - target, mode, EXPAND_NORMAL); + fn = build_function_call_expr (fn, arglist); + if (TREE_CODE (fn) == CALL_EXPR) + CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp); + return expand_expr (fn, target, mode, EXPAND_NORMAL); } else if (fcode == BUILT_IN_MEMSET_CHK) return 0; @@ -9845,11 +9867,13 @@ expand_builtin_memory_chk (tree exp, rtx normal __memcpy_chk. */ if (readonly_data_expr (src)) { - tree const fn = built_in_decls[BUILT_IN_MEMCPY_CHK]; + tree fn = built_in_decls[BUILT_IN_MEMCPY_CHK]; if (!fn) return 0; - return expand_expr (build_function_call_expr (fn, arglist), - target, mode, EXPAND_NORMAL); + fn = build_function_call_expr (fn, arglist); + if (TREE_CODE (fn) == CALL_EXPR) + CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp); + return expand_expr (fn, target, mode, EXPAND_NORMAL); } } return 0; gcc4-fortran-pr15080.patch: trans-stmt.c | 106 ++++++++++++++++++++++++++--------------------------------- 1 files changed, 47 insertions(+), 59 deletions(-) --- NEW FILE gcc4-fortran-pr15080.patch --- 2005-05-04 Jakub Jelinek PR fortran/15080 * trans-stmt.c (generate_loop_for_temp_to_lhs): Remove SIZE and COUNT2 arguments. If LSS is gfc_ss_terminator, increment COUNT1 by 1, instead of incrementing COUNT2 and using COUNT1+COUNT2 increment COUNT1 and use just that as index. (generate_loop_for_rhs_to_temp): Likewise. (compute_overall_iter_number): Add INNER_SIZE_BODY argument. It non-NULL, add it to body. (allocate_temp_for_forall_nest): Add INNER_SIZE_BODY argument, propagate it down to compute_overall_iter_number. (gfc_trans_assign_need_temp): Remove COUNT2. Call compute_inner_temp_size into a new stmtblock_t. Adjust calls to allocate_temp_for_forall_nest, generate_loop_for_rhs_to_temp and generate_loop_for_temp_to_lhs. (gfc_trans_pointer_assign_need_temp, gfc_evaluate_where_mask): Adjust calls to allocate_temp_for_forall_nest. --- gcc/fortran/trans-stmt.c.jj 2005-05-04 01:14:09.000000000 +0200 +++ gcc/fortran/trans-stmt.c 2005-05-04 01:21:58.000000000 +0200 @@ -1518,15 +1518,14 @@ gfc_do_allocate (tree bytesize, tree siz /* Generate codes to copy the temporary to the actual lhs. */ static tree -generate_loop_for_temp_to_lhs (gfc_expr *expr, tree tmp1, tree size, - tree count3, tree count1, tree count2, tree wheremask) +generate_loop_for_temp_to_lhs (gfc_expr *expr, tree tmp1, tree count3, + tree count1, tree wheremask) { gfc_ss *lss; gfc_se lse, rse; stmtblock_t block, body; gfc_loopinfo loop1; tree tmp, tmp2; - tree index; tree wheremaskexpr; /* Walk the lhs. */ @@ -1550,8 +1549,10 @@ generate_loop_for_temp_to_lhs (gfc_expr gfc_add_block_to_block (&block, &lse.post); /* Increment the count1. */ - tmp = fold (build2 (PLUS_EXPR, TREE_TYPE (count1), count1, size)); + tmp = fold (build2 (PLUS_EXPR, TREE_TYPE (count1), count1, + gfc_index_one_node)); gfc_add_modify_expr (&block, count1, tmp); + tmp = gfc_finish_block (&block); } else @@ -1571,8 +1572,6 @@ generate_loop_for_temp_to_lhs (gfc_expr gfc_conv_loop_setup (&loop1); gfc_mark_ss_chain_used (lss, 1); - /* Initialize count2. */ - gfc_add_modify_expr (&block, count2, gfc_index_zero_node); /* Start the scalarized loop body. */ gfc_start_scalarized_body (&loop1, &body); @@ -1583,11 +1582,7 @@ generate_loop_for_temp_to_lhs (gfc_expr /* Form the expression of the temporary. */ if (lss != gfc_ss_terminator) - { - index = fold (build2 (PLUS_EXPR, gfc_array_index_type, - count1, count2)); - rse.expr = gfc_build_array_ref (tmp1, index); - } + rse.expr = gfc_build_array_ref (tmp1, count1); /* Translate expr. */ gfc_conv_expr (&lse, expr); @@ -1611,10 +1606,10 @@ generate_loop_for_temp_to_lhs (gfc_expr gfc_add_expr_to_block (&body, tmp); - /* Increment count2. */ + /* Increment count1. */ tmp = fold (build2 (PLUS_EXPR, gfc_array_index_type, - count2, gfc_index_one_node)); - gfc_add_modify_expr (&body, count2, tmp); + count1, gfc_index_one_node)); + gfc_add_modify_expr (&body, count1, tmp); /* Increment count3. */ if (count3) @@ -1630,9 +1625,6 @@ generate_loop_for_temp_to_lhs (gfc_expr gfc_add_block_to_block (&block, &loop1.post); gfc_cleanup_loop (&loop1); - /* Increment count1. */ - tmp = fold (build2 (PLUS_EXPR, TREE_TYPE (count1), count1, size)); - gfc_add_modify_expr (&block, count1, tmp); tmp = gfc_finish_block (&block); } return tmp; @@ -1644,15 +1636,15 @@ generate_loop_for_temp_to_lhs (gfc_expr not be freed. */ static tree -generate_loop_for_rhs_to_temp (gfc_expr *expr2, tree tmp1, tree size, - tree count3, tree count1, tree count2, - gfc_ss *lss, gfc_ss *rss, tree wheremask) +generate_loop_for_rhs_to_temp (gfc_expr *expr2, tree tmp1, tree count3, + tree count1, gfc_ss *lss, gfc_ss *rss, + tree wheremask) { stmtblock_t block, body1; gfc_loopinfo loop; gfc_se lse; gfc_se rse; - tree tmp, tmp2, index; + tree tmp, tmp2; tree wheremaskexpr; gfc_start_block (&block); @@ -1668,9 +1660,6 @@ generate_loop_for_rhs_to_temp (gfc_expr } else { - /* Initialize count2. */ - gfc_add_modify_expr (&block, count2, gfc_index_zero_node); - /* Initialize the loop. */ gfc_init_loopinfo (&loop); @@ -1691,8 +1680,7 @@ generate_loop_for_rhs_to_temp (gfc_expr gfc_conv_expr (&rse, expr2); /* Form the expression of the temporary. */ - index = fold (build2 (PLUS_EXPR, gfc_array_index_type, count1, count2)); - lse.expr = gfc_build_array_ref (tmp1, index); + lse.expr = gfc_build_array_ref (tmp1, count1); } /* Use the scalar assignment. */ @@ -1704,12 +1692,12 @@ generate_loop_for_rhs_to_temp (gfc_expr wheremaskexpr = gfc_build_array_ref (wheremask, count3); tmp2 = TREE_CHAIN (wheremask); while (tmp2) - { - tmp1 = gfc_build_array_ref (tmp2, count3); - wheremaskexpr = build2 (TRUTH_AND_EXPR, TREE_TYPE (tmp1), + { + tmp1 = gfc_build_array_ref (tmp2, count3); + wheremaskexpr = build2 (TRUTH_AND_EXPR, TREE_TYPE (tmp1), wheremaskexpr, tmp1); - tmp2 = TREE_CHAIN (tmp2); - } + tmp2 = TREE_CHAIN (tmp2); + } tmp = build3_v (COND_EXPR, wheremaskexpr, tmp, build_empty_stmt ()); } @@ -1721,10 +1709,10 @@ generate_loop_for_rhs_to_temp (gfc_expr } else { - /* Increment count2. */ + /* Increment count1. */ tmp = fold (build2 (PLUS_EXPR, gfc_array_index_type, - count2, gfc_index_one_node)); - gfc_add_modify_expr (&body1, count2, tmp); + count1, gfc_index_one_node)); + gfc_add_modify_expr (&body1, count1, tmp); /* Increment count3. */ if (count3) @@ -1742,11 +1730,8 @@ generate_loop_for_rhs_to_temp (gfc_expr gfc_cleanup_loop (&loop); /* TODO: Reuse lss and rss when copying temp->lhs. Need to be careful - as tree nodes in SS may not be valid in different scope. */ + as tree nodes in SS may not be valid in different scope. */ } - /* Increment count1. */ - tmp = fold (build2 (PLUS_EXPR, TREE_TYPE (count1), count1, size)); - gfc_add_modify_expr (&block, count1, tmp); tmp = gfc_finish_block (&block); return tmp; @@ -1824,7 +1809,7 @@ compute_inner_temp_size (gfc_expr *expr1 static tree compute_overall_iter_number (forall_info *nested_forall_info, tree inner_size, - stmtblock_t *block) + stmtblock_t *inner_size_body, stmtblock_t *block) { tree tmp, number; stmtblock_t body; @@ -1834,6 +1819,8 @@ compute_overall_iter_number (forall_info gfc_add_modify_expr (block, number, gfc_index_zero_node); gfc_start_block (&body); + if (inner_size_body) + gfc_add_block_to_block (&body, inner_size_body); if (nested_forall_info) tmp = build2 (PLUS_EXPR, gfc_array_index_type, number, inner_size); @@ -1858,8 +1845,8 @@ compute_overall_iter_number (forall_info static tree allocate_temp_for_forall_nest (forall_info * nested_forall_info, tree type, - tree inner_size, stmtblock_t * block, - tree * ptemp1) + tree inner_size, stmtblock_t * inner_size_body, + stmtblock_t * block, tree * ptemp1) { tree unit; tree temp1; @@ -1867,7 +1854,8 @@ allocate_temp_for_forall_nest (forall_in tree bytesize, size; /* Calculate the total size of temporary needed in forall construct. */ - size = compute_overall_iter_number (nested_forall_info, inner_size, block); + size = compute_overall_iter_number (nested_forall_info, inner_size, + inner_size_body, block); unit = TYPE_SIZE_UNIT (type); bytesize = fold (build2 (MULT_EXPR, gfc_array_index_type, size, unit)); @@ -1893,17 +1881,16 @@ gfc_trans_assign_need_temp (gfc_expr * e tree type; tree inner_size; gfc_ss *lss, *rss; - tree count, count1, count2; + tree count, count1; tree tmp, tmp1; tree ptemp1; tree mask, maskindex; forall_info *forall_tmp; + stmtblock_t inner_size_body; - /* Create vars. count1 is the current iterator number of the nested forall. - count2 is the current iterator number of the inner loops needed in the - assignment. */ + /* Create vars. count1 is the current iterator number of the nested + forall. */ count1 = gfc_create_var (gfc_array_index_type, "count1"); - count2 = gfc_create_var (gfc_array_index_type, "count2"); /* Count is the wheremask index. */ if (wheremask) @@ -1919,15 +1906,17 @@ gfc_trans_assign_need_temp (gfc_expr * e /* Calculate the size of temporary needed in the assignment. Return loop, lss and rss which are used in function generate_loop_for_rhs_to_temp(). */ - inner_size = compute_inner_temp_size (expr1, expr2, block, &lss, &rss); + gfc_init_block (&inner_size_body); + inner_size = compute_inner_temp_size (expr1, expr2, &inner_size_body, + &lss, &rss); /* The type of LHS. Used in function allocate_temp_for_forall_nest */ type = gfc_typenode_for_spec (&expr1->ts); /* Allocate temporary for nested forall construct according to the information in nested_forall_info and inner_size. */ - tmp1 = allocate_temp_for_forall_nest (nested_forall_info, type, - inner_size, block, &ptemp1); + tmp1 = allocate_temp_for_forall_nest (nested_forall_info, type, inner_size, + &inner_size_body, block, &ptemp1); /* Initialize the maskindexes. */ forall_tmp = nested_forall_info; @@ -1941,8 +1930,8 @@ gfc_trans_assign_need_temp (gfc_expr * e } /* Generate codes to copy rhs to the temporary . */ - tmp = generate_loop_for_rhs_to_temp (expr2, tmp1, inner_size, count, - count1, count2, lss, rss, wheremask); + tmp = generate_loop_for_rhs_to_temp (expr2, tmp1, count, count1, lss, rss, + wheremask); /* Generate body and loops according to the information in nested_forall_info. */ @@ -1968,8 +1957,7 @@ gfc_trans_assign_need_temp (gfc_expr * e gfc_add_modify_expr (block, count, gfc_index_zero_node); /* Generate codes to copy the temporary to lhs. */ - tmp = generate_loop_for_temp_to_lhs (expr1, tmp1, inner_size, count, - count1, count2, wheremask); + tmp = generate_loop_for_temp_to_lhs (expr1, tmp1, count, count1, wheremask); /* Generate body and loops according to the information in nested_forall_info. */ @@ -2022,8 +2010,8 @@ gfc_trans_pointer_assign_need_temp (gfc_ /* Allocate temporary for nested forall construct according to the information in nested_forall_info and inner_size. */ - tmp1 = allocate_temp_for_forall_nest (nested_forall_info, - type, inner_size, block, &ptemp1); + tmp1 = allocate_temp_for_forall_nest (nested_forall_info, type, + inner_size, NULL, block, &ptemp1); gfc_start_block (&body); gfc_init_se (&lse, NULL); lse.expr = gfc_build_array_ref (tmp1, count); @@ -2112,7 +2100,7 @@ gfc_trans_pointer_assign_need_temp (gfc_ /* Allocate temporary for nested forall construct. */ tmp1 = allocate_temp_for_forall_nest (nested_forall_info, parmtype, - inner_size, block, &ptemp1); + inner_size, NULL, block, &ptemp1); gfc_start_block (&body); gfc_init_se (&lse, NULL); lse.expr = gfc_build_array_ref (tmp1, count); @@ -2582,7 +2570,7 @@ gfc_evaluate_where_mask (gfc_expr * me, /* Allocate temporary for where mask. */ tmp = allocate_temp_for_forall_nest (nested_forall_info, boolean_type_node, - inner_size, block, &ptemp1); + inner_size, NULL, block, &ptemp1); /* Record the temporary address in order to free it later. */ if (ptemp1) { @@ -2595,7 +2583,7 @@ gfc_evaluate_where_mask (gfc_expr * me, /* Allocate temporary for !mask. */ ntmp = allocate_temp_for_forall_nest (nested_forall_info, boolean_type_node, - inner_size, block, &ptemp2); + inner_size, NULL, block, &ptemp2); /* Record the temporary in order to free it later. */ if (ptemp2) { gcc4-pr21239.patch: combine.c | 2 config/i386/i386.c | 21 +++++---- testsuite/gcc.dg/i386-sse-11.c | 92 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 10 deletions(-) --- NEW FILE gcc4-pr21239.patch --- 2005-05-03 Jakub Jelinek * config/i386/i386.c (ix86_expand_vector_set): Fix setting 3rd and 4th item in V4SF mode. PR rtl-optimization/21239 * combine.c (combine_simplify_rtx) : Fix a typo. * gcc.dg/i386-sse-11.c: New test. --- gcc/config/i386/i386.c.jj 2005-05-02 14:56:24.000000000 +0200 +++ gcc/config/i386/i386.c 2005-05-03 18:19:45.000000000 +0200 @@ -17022,32 +17022,35 @@ ix86_expand_vector_set (bool mmx_ok, rtx break; case 1: - /* tmp = op0 = A B C D */ + /* tmp = target = A B C D */ tmp = copy_to_reg (target); - - /* op0 = C C D D */ + /* target = A A B B */ emit_insn (gen_sse_unpcklps (target, target, target)); - - /* op0 = C C D X */ + /* target = X A B B */ ix86_expand_vector_set (false, target, val, 0); - - /* op0 = A B X D */ + /* target = A X C D */ emit_insn (gen_sse_shufps_1 (target, target, tmp, GEN_INT (1), GEN_INT (0), GEN_INT (2+4), GEN_INT (3+4))); return; case 2: + /* tmp = target = A B C D */ tmp = copy_to_reg (target); - ix86_expand_vector_set (false, target, val, 0); + /* tmp = X B C D */ + ix86_expand_vector_set (false, tmp, val, 0); + /* target = A B X D */ emit_insn (gen_sse_shufps_1 (target, target, tmp, GEN_INT (0), GEN_INT (1), GEN_INT (0+4), GEN_INT (3+4))); return; case 3: + /* tmp = target = A B C D */ tmp = copy_to_reg (target); - ix86_expand_vector_set (false, target, val, 0); + /* tmp = X B C D */ + ix86_expand_vector_set (false, tmp, val, 0); + /* target = A B X D */ emit_insn (gen_sse_shufps_1 (target, target, tmp, GEN_INT (0), GEN_INT (1), GEN_INT (2+4), GEN_INT (0+4))); --- gcc/combine.c.jj 2005-04-25 11:55:54.000000000 +0200 +++ gcc/combine.c 2005-05-03 15:59:29.000000000 +0200 @@ -4742,7 +4742,7 @@ combine_simplify_rtx (rtx x, enum machin if (GET_CODE (op0) == VEC_CONCAT) { HOST_WIDE_INT op0_size = GET_MODE_SIZE (GET_MODE (XEXP (op0, 0))); - if (op0_size < offset) + if (offset < op0_size) op0 = XEXP (op0, 0); else { --- gcc/testsuite/gcc.dg/i386-sse-11.c.jj 2005-05-03 16:08:18.000000000 +0200 +++ gcc/testsuite/gcc.dg/i386-sse-11.c 2005-05-03 18:22:42.000000000 +0200 @@ -0,0 +1,92 @@ +/* PR rtl-optimization/21239 */ +/* { dg-do run { target i?86-*-* x86_64-*-* } } */ +/* { dg-options "-O2 -msse2" } */ +#include +#include "i386-cpuid.h" + +extern void abort (void); + +void +foo (unsigned int x, double *y, const double *z) +{ + __m128d tmp; + while (x) + { + tmp = _mm_load_sd (z); + _mm_store_sd (y, tmp); + --x; ++z; ++y; + } +} + +void +bar (unsigned int x, float *y, const float *z) +{ + __m128 tmp; + unsigned int i; + for (i = 0; i < x; ++i) + { + tmp = (__m128) { *z, 0, 0, 0 }; + *y = __builtin_ia32_vec_ext_v4sf (tmp, 0); + ++z; ++y; + } + for (i = 0; i < x; ++i) + { + tmp = (__m128) { 0, *z, 0, 0 }; + *y = __builtin_ia32_vec_ext_v4sf (tmp, 1); + ++z; ++y; + } + for (i = 0; i < x; ++i) + { + tmp = (__m128) { 0, 0, *z, 0 }; + *y = __builtin_ia32_vec_ext_v4sf (tmp, 2); + ++z; ++y; + } + for (i = 0; i < x; ++i) + { + tmp = (__m128) { 0, 0, 0, *z }; + *y = __builtin_ia32_vec_ext_v4sf (tmp, 3); + ++z; ++y; + } +} + +void __attribute__((noinline)) +run_tests (void) +{ + unsigned int i; + double a[16], b[16]; + float c[16], d[16]; + for (i = 0; i < 16; ++i) + { + a[i] = 1; + b[i] = 2; + c[i] = 3; + d[i] = 4; + } + foo (16, a, b); + bar (4, c, d); + for (i = 0; i < 16; ++i) + { + if (a[i] != 2) + abort (); + if (c[i] != 4) + abort (); + } +} + +int +main () +{ + unsigned long cpu_facilities; + unsigned int i; + double a[19], b[19]; + + cpu_facilities = i386_cpuid (); + + if ((cpu_facilities & (bit_MMX | bit_SSE | bit_SSE2 | bit_CMOV)) + != (bit_MMX | bit_SSE | bit_SSE2 | bit_CMOV)) + /* If host has no vector support, pass. */ + return 0; + + run_tests (); + return 0; +} gcc4-pr21265.patch: builtins.c | 92 +++++++++++++++++++++++++----------------- expr.c | 31 ++++++++------ expr.h | 6 +- testsuite/gcc.dg/20050503-1.c | 49 ++++++++++++++++++++++ 4 files changed, 128 insertions(+), 50 deletions(-) --- NEW FILE gcc4-pr21265.patch --- 2005-05-03 Jakub Jelinek PR middle-end/21265 * expr.h (enum block_op_methods): Add BLOCK_OP_TAILCALL. (clear_storage): Add argument. * expr.c (emit_block_move_via_libcall, clear_storage_via_libcall): Add tailcall argument, set CALL_EXPR_TAILCALL of the CALL_EXPR to tailcall. (emit_block_move): Handle BLOCK_OP_TAILCALL method. (clear_storage): Add method argument, handle BLOCK_OP_TAILCALL. (store_expr, store_constructor): Adjust callers. * builtins.c (expand_builtin_memcpy): Pass BLOCK_OP_TAILCALL to emit_block_move if CALL_EXPR_TAILCALL (exp). (expand_builtin_memmove): Add ORIG_EXP argument, copy CALL_EXPR_TAILCALL from ORIG_EXP to the new CALL_EXPR. (expand_builtin_bcopy): Replace ARGLIST and TYPE arguments with EXP. Pass EXP to expand_builtin_memmove. (expand_builtin_memset): Add ORIG_EXP argument, pass BLOCK_OP_TAILCALL to clear_storage if CALL_EXPR_TAILCALL (orig_exp). (expand_builtin_bzero): Replace ARGLIST argument with EXP. Pass EXP to expand_builtin_memset. (expand_builtin_strcmp): Copy CALL_EXPR_TAILCALL from EXP to the new CALL_EXPR. (expand_builtin_strncmp): Likewise. (expand_builtin_printf): Replace ARGLIST argument with EXP. Copy CALL_EXPR_TAILCALL from EXP to the new CALL_EXPR. (expand_builtin_fprintf): Likewise. (expand_builtin): Adjust calls to expand_builtin_{memmove,bcopy,memset,bzero,{,f}printf}. * gcc.dg/20050503-1.c: New test. --- gcc/expr.h.jj 2005-04-25 11:55:59.000000000 +0200 +++ gcc/expr.h 2005-05-02 23:42:33.000000000 +0200 @@ -367,7 +367,9 @@ enum block_op_methods { BLOCK_OP_NORMAL, BLOCK_OP_NO_LIBCALL, - BLOCK_OP_CALL_PARM + BLOCK_OP_CALL_PARM, + /* Like BLOCK_OP_NORMAL, but the libcall can be tail call optimized. */ + BLOCK_OP_TAILCALL }; extern void init_block_move_fn (const char *); @@ -419,7 +421,7 @@ extern void use_group_regs (rtx *, rtx); /* Write zeros through the storage of OBJECT. If OBJECT has BLKmode, SIZE is its length in bytes. */ -extern rtx clear_storage (rtx, rtx); +extern rtx clear_storage (rtx, rtx, enum block_op_methods); /* Determine whether the LEN bytes can be moved by using several move instructions. Return nonzero if a call to move_by_pieces should --- gcc/expr.c.jj 2005-04-29 09:17:56.000000000 +0200 +++ gcc/expr.c 2005-05-02 23:42:33.000000000 +0200 @@ -126,7 +126,7 @@ static void move_by_pieces_1 (rtx (*) (r struct move_by_pieces *); static bool block_move_libcall_safe_for_call_parm (void); static bool emit_block_move_via_movmem (rtx, rtx, rtx, unsigned); -static rtx emit_block_move_via_libcall (rtx, rtx, rtx); +static rtx emit_block_move_via_libcall (rtx, rtx, rtx, bool); static tree emit_block_move_libcall_fn (int); static void emit_block_move_via_loop (rtx, rtx, rtx, unsigned); static rtx clear_by_pieces_1 (void *, HOST_WIDE_INT, enum machine_mode); @@ -135,7 +135,7 @@ static void store_by_pieces_1 (struct st static void store_by_pieces_2 (rtx (*) (rtx, ...), enum machine_mode, struct store_by_pieces *); static bool clear_storage_via_clrmem (rtx, rtx, unsigned); -static rtx clear_storage_via_libcall (rtx, rtx); +static rtx clear_storage_via_libcall (rtx, rtx, bool); static tree clear_storage_libcall_fn (int); static rtx compress_float_constant (rtx, rtx); static rtx get_subtarget (rtx); @@ -1148,6 +1148,7 @@ emit_block_move (rtx x, rtx y, rtx size, switch (method) { case BLOCK_OP_NORMAL: + case BLOCK_OP_TAILCALL: may_use_call = true; break; @@ -1196,7 +1197,8 @@ emit_block_move (rtx x, rtx y, rtx size, else if (emit_block_move_via_movmem (x, y, size, align)) ; else if (may_use_call) - retval = emit_block_move_via_libcall (x, y, size); + retval = emit_block_move_via_libcall (x, y, size, + method == BLOCK_OP_TAILCALL); else emit_block_move_via_loop (x, y, size, align); @@ -1325,7 +1327,7 @@ emit_block_move_via_movmem (rtx x, rtx y Return the return value from memcpy, 0 otherwise. */ static rtx -emit_block_move_via_libcall (rtx dst, rtx src, rtx size) +emit_block_move_via_libcall (rtx dst, rtx src, rtx size, bool tailcall) { rtx dst_addr, src_addr; tree call_expr, arg_list, fn, src_tree, dst_tree, size_tree; @@ -1367,6 +1369,7 @@ emit_block_move_via_libcall (rtx dst, rt call_expr = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (fn)), fn); call_expr = build3 (CALL_EXPR, TREE_TYPE (TREE_TYPE (fn)), call_expr, arg_list, NULL_TREE); + CALL_EXPR_TAILCALL (call_expr) = tailcall; retval = expand_expr (call_expr, NULL_RTX, VOIDmode, 0); @@ -2427,11 +2430,13 @@ store_by_pieces_2 (rtx (*genfun) (rtx, . its length in bytes. */ rtx -clear_storage (rtx object, rtx size) +clear_storage (rtx object, rtx size, enum block_op_methods method) { enum machine_mode mode = GET_MODE (object); unsigned int align; + gcc_assert (method == BLOCK_OP_NORMAL || method == BLOCK_OP_TAILCALL); + /* If OBJECT is not BLKmode and SIZE is the same size as its mode, just move a zero. Otherwise, do this a piece at a time. */ if (mode != BLKmode @@ -2468,7 +2473,8 @@ clear_storage (rtx object, rtx size) else if (clear_storage_via_clrmem (object, size, align)) ; else - return clear_storage_via_libcall (object, size); + return clear_storage_via_libcall (object, size, + method == BLOCK_OP_TAILCALL); return NULL; } @@ -2533,7 +2539,7 @@ clear_storage_via_clrmem (rtx object, rt Return the return value of memset, 0 otherwise. */ static rtx -clear_storage_via_libcall (rtx object, rtx size) +clear_storage_via_libcall (rtx object, rtx size, bool tailcall) { tree call_expr, arg_list, fn, object_tree, size_tree; enum machine_mode size_mode; @@ -2566,6 +2572,7 @@ clear_storage_via_libcall (rtx object, r call_expr = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (fn)), fn); call_expr = build3 (CALL_EXPR, TREE_TYPE (TREE_TYPE (fn)), call_expr, arg_list, NULL_TREE); + CALL_EXPR_TAILCALL (call_expr) = tailcall; retval = expand_expr (call_expr, NULL_RTX, VOIDmode, 0); @@ -4305,7 +4312,7 @@ store_expr (tree exp, rtx target, int ca } if (size != const0_rtx) - clear_storage (target, size); + clear_storage (target, size, BLOCK_OP_NORMAL); if (label) emit_label (label); @@ -4659,7 +4666,7 @@ store_constructor (tree exp, rtx target, && ! CONSTRUCTOR_ELTS (exp)) /* If the constructor is empty, clear the union. */ { - clear_storage (target, expr_size (exp)); + clear_storage (target, expr_size (exp), BLOCK_OP_NORMAL); cleared = 1; } @@ -4687,7 +4694,7 @@ store_constructor (tree exp, rtx target, || ((HOST_WIDE_INT) GET_MODE_SIZE (GET_MODE (target)) == size))) { - clear_storage (target, GEN_INT (size)); + clear_storage (target, GEN_INT (size), BLOCK_OP_NORMAL); cleared = 1; } @@ -4887,7 +4894,7 @@ store_constructor (tree exp, rtx target, if (REG_P (target)) emit_move_insn (target, CONST0_RTX (GET_MODE (target))); else - clear_storage (target, GEN_INT (size)); + clear_storage (target, GEN_INT (size), BLOCK_OP_NORMAL); cleared = 1; } @@ -5132,7 +5139,7 @@ store_constructor (tree exp, rtx target, if (REG_P (target)) emit_move_insn (target, CONST0_RTX (GET_MODE (target))); else - clear_storage (target, GEN_INT (size)); + clear_storage (target, GEN_INT (size), BLOCK_OP_NORMAL); cleared = 1; } --- gcc/builtins.c.jj 2005-05-02 09:51:51.000000000 +0200 +++ gcc/builtins.c 2005-05-03 13:33:40.000000000 +0200 @@ -111,15 +111,15 @@ static rtx expand_builtin_strspn (tree, static rtx expand_builtin_strcspn (tree, rtx, enum machine_mode); static rtx expand_builtin_memcpy (tree, rtx, enum machine_mode); static rtx expand_builtin_mempcpy (tree, tree, rtx, enum machine_mode, int); -static rtx expand_builtin_memmove (tree, tree, rtx, enum machine_mode); -static rtx expand_builtin_bcopy (tree, tree); +static rtx expand_builtin_memmove (tree, tree, rtx, enum machine_mode, tree); +static rtx expand_builtin_bcopy (tree); static rtx expand_builtin_strcpy (tree, rtx, enum machine_mode); static rtx expand_builtin_stpcpy (tree, rtx, enum machine_mode); static rtx builtin_strncpy_read_str (void *, HOST_WIDE_INT, enum machine_mode); static rtx expand_builtin_strncpy (tree, rtx, enum machine_mode); static rtx builtin_memset_read_str (void *, HOST_WIDE_INT, enum machine_mode); static rtx builtin_memset_gen_str (void *, HOST_WIDE_INT, enum machine_mode); -static rtx expand_builtin_memset (tree, rtx, enum machine_mode); +static rtx expand_builtin_memset (tree, rtx, enum machine_mode, tree); static rtx expand_builtin_bzero (tree); static rtx expand_builtin_strlen (tree, rtx, enum machine_mode); static rtx expand_builtin_strstr (tree, tree, rtx, enum machine_mode); @@ -2819,7 +2819,8 @@ expand_builtin_memcpy (tree exp, rtx tar /* Copy word part most expediently. */ dest_addr = emit_block_move (dest_mem, src_mem, len_rtx, - BLOCK_OP_NORMAL); + CALL_EXPR_TAILCALL (exp) + ? BLOCK_OP_TAILCALL : BLOCK_OP_NORMAL); if (dest_addr == 0) { @@ -2926,7 +2927,7 @@ expand_builtin_mempcpy (tree arglist, tr static rtx expand_builtin_memmove (tree arglist, tree type, rtx target, - enum machine_mode mode) + enum machine_mode mode, tree orig_exp) { if (!validate_arglist (arglist, POINTER_TYPE, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE)) @@ -2958,11 +2959,13 @@ expand_builtin_memmove (tree arglist, tr normal memcpy. */ if (readonly_data_expr (src)) { - tree const fn = implicit_built_in_decls[BUILT_IN_MEMCPY]; + tree fn = implicit_built_in_decls[BUILT_IN_MEMCPY]; if (!fn) return 0; - return expand_expr (build_function_call_expr (fn, arglist), - target, mode, EXPAND_NORMAL); + fn = build_function_call_expr (fn, arglist); + if (TREE_CODE (fn) == CALL_EXPR) + CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (orig_exp); + return expand_expr (fn, target, mode, EXPAND_NORMAL); } /* If length is 1 and we can expand memcpy call inline, @@ -2984,8 +2987,10 @@ expand_builtin_memmove (tree arglist, tr if we failed the caller should emit a normal call. */ static rtx -expand_builtin_bcopy (tree arglist, tree type) +expand_builtin_bcopy (tree exp) { + tree arglist = TREE_OPERAND (exp, 1); + tree type = TREE_TYPE (exp); tree src, dest, size, newarglist; if (!validate_arglist (arglist, @@ -3005,7 +3010,7 @@ expand_builtin_bcopy (tree arglist, tree newarglist = tree_cons (NULL_TREE, src, newarglist); newarglist = tree_cons (NULL_TREE, dest, newarglist); - return expand_builtin_memmove (newarglist, type, const0_rtx, VOIDmode); + return expand_builtin_memmove (newarglist, type, const0_rtx, VOIDmode, exp); } #ifndef HAVE_movstr @@ -3299,7 +3304,8 @@ builtin_memset_gen_str (void *data, HOST convenient). */ static rtx -expand_builtin_memset (tree arglist, rtx target, enum machine_mode mode) +expand_builtin_memset (tree arglist, rtx target, enum machine_mode mode, + tree orig_exp) { if (!validate_arglist (arglist, POINTER_TYPE, INTEGER_TYPE, INTEGER_TYPE, VOID_TYPE)) @@ -3385,7 +3391,9 @@ expand_builtin_memset (tree arglist, rtx dest_mem = get_memory_rtx (dest); set_mem_align (dest_mem, dest_align); - dest_addr = clear_storage (dest_mem, len_rtx); + dest_addr = clear_storage (dest_mem, len_rtx, + CALL_EXPR_TAILCALL (orig_exp) + ? BLOCK_OP_TAILCALL : BLOCK_OP_NORMAL); if (dest_addr == 0) { @@ -3401,8 +3409,9 @@ expand_builtin_memset (tree arglist, rtx if we failed the caller should emit a normal call. */ static rtx -expand_builtin_bzero (tree arglist) +expand_builtin_bzero (tree exp) { + tree arglist = TREE_OPERAND (exp, 1); tree dest, size, newarglist; if (!validate_arglist (arglist, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE)) @@ -3420,7 +3429,7 @@ expand_builtin_bzero (tree arglist) newarglist = tree_cons (NULL_TREE, integer_zero_node, newarglist); newarglist = tree_cons (NULL_TREE, dest, newarglist); - return expand_builtin_memset (newarglist, const0_rtx, VOIDmode); + return expand_builtin_memset (newarglist, const0_rtx, VOIDmode, exp); } /* Expand expression EXP, which is a call to the memcmp built-in function. @@ -3559,7 +3568,7 @@ expand_builtin_strcmp (tree exp, rtx tar tree len, len1, len2; rtx arg1_rtx, arg2_rtx, arg3_rtx; rtx result, insn; - tree fndecl; + tree fndecl, fn; int arg1_align = get_pointer_alignment (arg1, BIGGEST_ALIGNMENT) / BITS_PER_UNIT; @@ -3643,8 +3652,10 @@ expand_builtin_strcmp (tree exp, rtx tar arglist = build_tree_list (NULL_TREE, arg2); arglist = tree_cons (NULL_TREE, arg1, arglist); fndecl = get_callee_fndecl (exp); - exp = build_function_call_expr (fndecl, arglist); - return expand_call (exp, target, target == const0_rtx); + fn = build_function_call_expr (fndecl, arglist); + if (TREE_CODE (fn) == CALL_EXPR) + CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp); + return expand_call (fn, target, target == const0_rtx); } #endif return 0; @@ -3681,7 +3692,7 @@ expand_builtin_strncmp (tree exp, rtx ta tree len, len1, len2; rtx arg1_rtx, arg2_rtx, arg3_rtx; rtx result, insn; - tree fndecl; + tree fndecl, fn; int arg1_align = get_pointer_alignment (arg1, BIGGEST_ALIGNMENT) / BITS_PER_UNIT; @@ -3771,8 +3782,10 @@ expand_builtin_strncmp (tree exp, rtx ta arglist = tree_cons (NULL_TREE, arg2, arglist); arglist = tree_cons (NULL_TREE, arg1, arglist); fndecl = get_callee_fndecl (exp); - exp = build_function_call_expr (fndecl, arglist); - return expand_call (exp, target, target == const0_rtx); + fn = build_function_call_expr (fndecl, arglist); + if (TREE_CODE (fn) == CALL_EXPR) + CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp); + return expand_call (fn, target, target == const0_rtx); } #endif return 0; @@ -4704,15 +4717,16 @@ build_string_literal (int len, const cha return t; } -/* Expand a call to printf or printf_unlocked with argument list ARGLIST. +/* Expand EXP, a call to printf or printf_unlocked. Return 0 if a normal call should be emitted rather than transforming the function inline. If convenient, the result should be placed in TARGET with mode MODE. UNLOCKED indicates this is a printf_unlocked call. */ static rtx -expand_builtin_printf (tree arglist, rtx target, enum machine_mode mode, +expand_builtin_printf (tree exp, rtx target, enum machine_mode mode, bool unlocked) { + tree arglist = TREE_OPERAND (exp, 1); tree fn_putchar = unlocked ? implicit_built_in_decls[BUILT_IN_PUTCHAR_UNLOCKED] : implicit_built_in_decls[BUILT_IN_PUTCHAR]; @@ -4803,19 +4817,22 @@ expand_builtin_printf (tree arglist, rtx if (!fn) return 0; - return expand_expr (build_function_call_expr (fn, arglist), - target, mode, EXPAND_NORMAL); + fn = build_function_call_expr (fn, arglist); + if (TREE_CODE (fn) == CALL_EXPR) + CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp); + return expand_expr (fn, target, mode, EXPAND_NORMAL); } -/* Expand a call to fprintf or fprintf_unlocked with argument list ARGLIST. +/* Expand EXP, a call to fprintf or fprintf_unlocked. Return 0 if a normal call should be emitted rather than transforming the function inline. If convenient, the result should be placed in TARGET with mode MODE. UNLOCKED indicates this is a fprintf_unlocked call. */ static rtx -expand_builtin_fprintf (tree arglist, rtx target, enum machine_mode mode, +expand_builtin_fprintf (tree exp, rtx target, enum machine_mode mode, bool unlocked) { + tree arglist = TREE_OPERAND (exp, 1); tree fn_fputc = unlocked ? implicit_built_in_decls[BUILT_IN_FPUTC_UNLOCKED] : implicit_built_in_decls[BUILT_IN_FPUTC]; tree fn_fputs = unlocked ? implicit_built_in_decls[BUILT_IN_FPUTS_UNLOCKED] @@ -4897,8 +4914,10 @@ expand_builtin_fprintf (tree arglist, rt if (!fn) return 0; - return expand_expr (build_function_call_expr (fn, arglist), - target, mode, EXPAND_NORMAL); + fn = build_function_call_expr (fn, arglist); + if (TREE_CODE (fn) == CALL_EXPR) + CALL_EXPR_TAILCALL (fn) = CALL_EXPR_TAILCALL (exp); + return expand_expr (fn, target, mode, EXPAND_NORMAL); } /* Expand a call to sprintf with argument list ARGLIST. Return 0 if @@ -5861,25 +5880,26 @@ expand_builtin (tree exp, rtx target, rt break; case BUILT_IN_MEMMOVE: - target = expand_builtin_memmove (arglist, TREE_TYPE (exp), target, mode); + target = expand_builtin_memmove (arglist, TREE_TYPE (exp), target, + mode, exp); if (target) return target; break; case BUILT_IN_BCOPY: - target = expand_builtin_bcopy (arglist, TREE_TYPE (exp)); + target = expand_builtin_bcopy (exp); if (target) return target; break; case BUILT_IN_MEMSET: - target = expand_builtin_memset (arglist, target, mode); + target = expand_builtin_memset (arglist, target, mode, exp); if (target) return target; break; case BUILT_IN_BZERO: - target = expand_builtin_bzero (arglist); + target = expand_builtin_bzero (exp); if (target) return target; break; @@ -5956,13 +5976,13 @@ expand_builtin (tree exp, rtx target, rt return const0_rtx; case BUILT_IN_PRINTF: - target = expand_builtin_printf (arglist, target, mode, false); + target = expand_builtin_printf (exp, target, mode, false); if (target) return target; break; case BUILT_IN_PRINTF_UNLOCKED: - target = expand_builtin_printf (arglist, target, mode, true); + target = expand_builtin_printf (exp, target, mode, true); if (target) return target; break; @@ -5979,13 +5999,13 @@ expand_builtin (tree exp, rtx target, rt break; case BUILT_IN_FPRINTF: - target = expand_builtin_fprintf (arglist, target, mode, false); + target = expand_builtin_fprintf (exp, target, mode, false); if (target) return target; break; case BUILT_IN_FPRINTF_UNLOCKED: - target = expand_builtin_fprintf (arglist, target, mode, true); + target = expand_builtin_fprintf (exp, target, mode, true); if (target) return target; break; --- gcc/testsuite/gcc.dg/20050503-1.c.jj 2005-05-03 12:25:49.000000000 +0200 +++ gcc/testsuite/gcc.dg/20050503-1.c 2005-05-03 13:23:18.000000000 +0200 @@ -0,0 +1,49 @@ +/* PR middle-end/21265 + Test whether tail call information is propagated through builtin + expanders. */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +typedef __SIZE_TYPE__ size_t; + +#define F(n, rettype, name, args, callargs) \ +extern rettype name args; \ +rettype test##n args \ +{ \ + return name callargs; \ +} +#define F1(n, rettype, name, t1, callargs) \ + F (n, rettype, name, (t1 a1), callargs) +#define F2(n, rettype, name, t1, t2, callargs) \ + F (n, rettype, name, (t1 a1, t2 a2), callargs) +#define F3(n, rettype, name, t1, t2, t3, callargs) \ + F (n, rettype, name, (t1 a1, t2 a2, t3 a3), callargs) + +F3 (1a, void *, memcpy, void *, const void *, size_t, (a1, a2, a3)) +F3 (1b, void *, memcpy, void *, const void *, size_t, (a1, a2, 10)) +F3 (2a, void *, mempcpy, void *, const void *, size_t, (a1, a2, a3)) +F3 (2b, void *, mempcpy, void *, const void *, size_t, (a1, a2, 10)) +F3 (3a, void *, memmove, void *, const void *, size_t, (a1, a2, a3)) +F3 (3b, void *, memmove, void *, const void *, size_t, (a1, "abcdefghijklmno", a3)) +F3 (4a, void *, memset, void *, int, size_t, (a1, a2, a3)) +F3 (4b, void *, memset, void *, int, size_t, (a1, a2, 156)) +F3 (4c, void *, memset, void *, int, size_t, (a1, 0, a3)) +F3 (4d, void *, memset, void *, int, size_t, (a1, 0, 10000)) +F3 (5a, int, memcmp, const void *, const void *, size_t, (a1, a2, a3)) +F3 (5b, int, memcmp, const void *, const void *, size_t, (a1, "abcdefghijkl", a3)) +F2 (6, char *, strcpy, char *, const char *, (a1, a2)) +F2 (7, char *, stpcpy, char *, const char *, (a1, a2)) +F3 (8, char *, strncpy, char *, const char *, size_t, (a1, a2, a3)) +F3 (9, char *, stpncpy, char *, const char *, size_t, (a1, a2, a3)) +F2 (10, char *, strcat, char *, const char *, (a1, a2)) +F3 (11, char *, strncat, char *, const char *, size_t, (a1, a2, a3)) +F1 (12a, size_t, strlen, const char *, (a1)) +F1 (12b, size_t, strlen, const char *, ("foobar")) +F2 (13a, int, strcmp, const char *, const char *, (a1, a2)) +F2 (13b, int, strcmp, const char *, const char *, (a1, "abcdefghijklm")) +F3 (14a, int, strncmp, const char *, const char *, size_t, (a1, a2, a3)) +F3 (14b, int, strncmp, const char *, const char *, size_t, (a1, "abcdefghijklm", 10)) +F2 (15, char *, strchr, const char *, int, (a1, a2)) + +/* All the calls above should be tail call optimized on i?86/x86-64. */ +/* { dg-final { scan-assembler-not "call" { target i?86-*-linux* x86_64-*-linux* } } } */ gcc4-pr21297.patch: config/i386/i386.c | 9 ++++--- testsuite/gcc.c-torture/execute/20050502-2.c | 34 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) --- NEW FILE gcc4-pr21297.patch --- 2005-05-03 Jakub Jelinek PR target/21297 * config/i386/i386.c (legitimize_address): When canonicalizing ASHIFT into MULT, multiply by 1 << shift_count instead of 1 << log2 (shift_count). * gcc.c-torture/execute/20050502-2.c: New test. --- gcc/config/i386/i386.c.jj 2005-04-25 11:56:21.000000000 +0200 +++ gcc/config/i386/i386.c 2005-05-02 14:56:24.000000000 +0200 @@ -5902,9 +5902,10 @@ legitimize_address (rtx x, rtx oldx ATTR /* Canonicalize shifts by 0, 1, 2, 3 into multiply */ if (GET_CODE (x) == ASHIFT && GET_CODE (XEXP (x, 1)) == CONST_INT - && (log = (unsigned) exact_log2 (INTVAL (XEXP (x, 1)))) < 4) + && (unsigned HOST_WIDE_INT) INTVAL (XEXP (x, 1)) < 4) { changed = 1; + log = INTVAL (XEXP (x, 1)); x = gen_rtx_MULT (Pmode, force_reg (Pmode, XEXP (x, 0)), GEN_INT (1 << log)); } @@ -5915,9 +5916,10 @@ legitimize_address (rtx x, rtx oldx ATTR if (GET_CODE (XEXP (x, 0)) == ASHIFT && GET_CODE (XEXP (XEXP (x, 0), 1)) == CONST_INT - && (log = (unsigned) exact_log2 (INTVAL (XEXP (XEXP (x, 0), 1)))) < 4) + && (unsigned HOST_WIDE_INT) INTVAL (XEXP (XEXP (x, 0), 1)) < 4) { changed = 1; + log = INTVAL (XEXP (XEXP (x, 0), 1)); XEXP (x, 0) = gen_rtx_MULT (Pmode, force_reg (Pmode, XEXP (XEXP (x, 0), 0)), GEN_INT (1 << log)); @@ -5925,9 +5927,10 @@ legitimize_address (rtx x, rtx oldx ATTR if (GET_CODE (XEXP (x, 1)) == ASHIFT && GET_CODE (XEXP (XEXP (x, 1), 1)) == CONST_INT - && (log = (unsigned) exact_log2 (INTVAL (XEXP (XEXP (x, 1), 1)))) < 4) + && (unsigned HOST_WIDE_INT) INTVAL (XEXP (XEXP (x, 1), 1)) < 4) { changed = 1; + log = INTVAL (XEXP (XEXP (x, 1), 1)); XEXP (x, 1) = gen_rtx_MULT (Pmode, force_reg (Pmode, XEXP (XEXP (x, 1), 0)), GEN_INT (1 << log)); --- gcc/testsuite/gcc.c-torture/execute/20050502-2.c.jj 2005-05-02 15:09:29.000000000 +0200 +++ gcc/testsuite/gcc.c-torture/execute/20050502-2.c 2005-05-02 15:07:17.000000000 +0200 @@ -0,0 +1,34 @@ +/* PR target/21297 */ +typedef __SIZE_TYPE__ size_t; +extern int memcmp (const char *, const char *, size_t); +extern void abort (); + +void +foo (char *x) +{ + int i; + for (i = 0; i < 2; i++); + x[i + i] = '\0'; +} + +void +bar (char *x) +{ + int i; + for (i = 0; i < 2; i++); + x[i + i + i + i] = '\0'; +} + +int +main (void) +{ + char x[] = "IJKLMNOPQR"; + foo (x); + if (memcmp (x, "IJKL\0NOPQR", sizeof x) != 0) + abort (); + x[4] = 'M'; + bar (x); + if (memcmp (x, "IJKLMNOP\0R", sizeof x) != 0) + abort (); + return 0; +} gcc4-pr21330.patch: loop-unswitch.c | 5 +- testsuite/gcc.c-torture/execute/20050502-1.c | 67 +++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) --- NEW FILE gcc4-pr21330.patch --- 2005-05-02 Jakub Jelinek PR rtl-optimization/21330 * loop-unswitch.c (may_unswitch_on): Set *cinsn only when returning non-NULL. (unswitch_single_loop): Clear cinsn when retrying. * gcc.c-torture/execute/20050502-1.c: New test. --- gcc/loop-unswitch.c.jj 2005-04-04 13:06:28.000000000 +0200 +++ gcc/loop-unswitch.c 2005-05-03 07:38:46.000000000 +0200 @@ -223,11 +223,11 @@ may_unswitch_on (basic_block bb, struct if (at != BB_END (bb)) return NULL_RTX; - *cinsn = BB_END (bb); if (!rtx_equal_p (op[0], XEXP (test, 0)) || !rtx_equal_p (op[1], XEXP (test, 1))) return NULL_RTX; + *cinsn = BB_END (bb); return test; } @@ -266,7 +266,7 @@ unswitch_single_loop (struct loops *loop basic_block *bbs; struct loop *nloop; unsigned i; - rtx cond, rcond = NULL_RTX, conds, rconds, acond, cinsn = NULL_RTX; + rtx cond, rcond = NULL_RTX, conds, rconds, acond, cinsn; int repeat; edge e; @@ -321,6 +321,7 @@ unswitch_single_loop (struct loops *loop do { repeat = 0; + cinsn = NULL_RTX; /* Find a bb to unswitch on. */ bbs = get_loop_body (loop); --- gcc/testsuite/gcc.c-torture/execute/20050502-1.c.jj 2005-05-02 12:36:01.000000000 +0200 +++ gcc/testsuite/gcc.c-torture/execute/20050502-1.c 2005-05-02 12:35:39.000000000 +0200 @@ -0,0 +1,67 @@ +/* PR rtl-optimization/21330 */ + +extern void abort (void); +extern int strcmp (const char *, const char *); + +int +__attribute__((noinline)) +bar (const char **x) +{ + return *(*x)++; +} + +int +__attribute__((noinline)) +baz (int c) +{ + return c != '@'; +} + +void +__attribute__((noinline)) +foo (const char **w, char *x, _Bool y, _Bool z) +{ + char c = bar (w); + int i = 0; + + while (1) + { + x[i++] = c; + c = bar (w); + if (y && c == '\'') + break; + if (z && c == '\"') + break; + if (!y && !z && !baz (c)) + break; + } + x[i] = 0; +} + +int +main (void) +{ + char buf[64]; + const char *p; + p = "abcde'fgh"; + foo (&p, buf, 1, 0); + if (strcmp (p, "fgh") != 0 || strcmp (buf, "abcde") != 0) + abort (); + p = "ABCDEFG\"HI"; + foo (&p, buf, 0, 1); + if (strcmp (p, "HI") != 0 || strcmp (buf, "ABCDEFG") != 0) + abort (); + p = "abcd\"e'fgh"; + foo (&p, buf, 1, 1); + if (strcmp (p, "e'fgh") != 0 || strcmp (buf, "abcd") != 0) + abort (); + p = "ABCDEF'G\"HI"; + foo (&p, buf, 1, 1); + if (strcmp (p, "G\"HI") != 0 || strcmp (buf, "ABCDEF") != 0) + abort (); + p = "abcdef at gh"; + foo (&p, buf, 0, 0); + if (strcmp (p, "gh") != 0 || strcmp (buf, "abcdef") != 0) + abort (); + return 0; +} Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- .cvsignore 28 Apr 2005 17:32:52 -0000 1.86 +++ .cvsignore 3 May 2005 23:37:28 -0000 1.87 @@ -1 +1 @@ -gcc-4.0.0-20050428.tar.bz2 +gcc-4.0.0-20050504.tar.bz2 Index: gcc4.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc4.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- gcc4.spec 28 Apr 2005 17:32:52 -0000 1.33 +++ gcc4.spec 3 May 2005 23:37:28 -0000 1.34 @@ -1,6 +1,6 @@ -%define DATE 20050428 +%define DATE 20050504 %define gcc_version 4.0.0 -%define gcc_release 2 +%define gcc_release 3 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} alpha ia64 x86_64 s390 @@ -79,16 +79,19 @@ Patch7: gcc4-pr20249.patch Patch8: gcc4-g++-struct-layout.patch Patch9: gcc4-pr16104-test.patch -Patch10: gcc4-pr20768.patch +Patch10: gcc4-fortran-pr15080.patch Patch11: gcc4-pr20490.patch Patch12: gcc4-libstdc++-mt-alloc.patch Patch13: gcc4-struct-layout.patch Patch14: gcc4-ppc32-hwint32.patch -Patch15: gcc4-pr20742.patch -Patch16: gcc4-gfortran-entry.patch +Patch15: gcc4-pr21239.patch +Patch16: gcc4-pr21297.patch Patch17: gcc4-gfortran-namelist.patch Patch18: gcc4-java-awt-thread-init.patch Patch19: gcc4-java-x509-extension.patch +Patch20: gcc4-pr21330.patch +Patch21: gcc4-pr21265.patch +Patch22: gcc4-chk-pr21265.patch %define _gnu %{nil} %ifarch sparc @@ -407,16 +410,19 @@ %patch7 -p0 -b .pr20249~ %patch8 -p0 -b .g++-struct-layout~ %patch9 -p0 -b .pr16104-test~ -%patch10 -p0 -b .pr20768~ +%patch10 -p0 -b .fortran-pr15080~ %patch11 -p0 -b .pr20490~ %patch12 -p0 -b .libstdc++-mt-alloc~ %patch13 -p0 -b .struct-layout~ #%patch14 -p0 -b .ppc32-hwint32~ -%patch15 -p0 -b .pr20742~ -%patch16 -p0 -b .gfortran-entry~ +%patch15 -p0 -b .pr21239~ +%patch16 -p0 -b .pr21297~ %patch17 -p0 -b .gfortran-namelist~ %patch18 -p0 -b .java-awt-thread-init~ %patch19 -p0 -b .java-x509-extension~ +%patch20 -p0 -b .pr21330~ +%patch21 -p0 -b .pr21265~ +%patch22 -p0 -b .chk-pr21265~ perl -pi -e 's/4\.0\.0/4.0.0/' gcc/version.c perl -pi -e 's/"%{gcc_version}"/"%{gcc_version} \(release\)"/' gcc/version.c @@ -1411,6 +1417,21 @@ %endif %changelog +* Wed May 4 2005 Jakub Jelinek 4.0.0-3 +- update from CVS + - PRs middle-end/19985, bootstrap/20633, c++/15875, c++/19542, c/15698, + fortran/16861, java/21022, libfortran/17992, libfortran/19568, + libfortran/19595, libfortran/20005, libfortran/20092, + libfortran/20131, libfortran/20661, libfortran/20744, libgcj/21136, + libstdc++/21209, libstdc++/21286, rtl-optimization/21144, + target/16888, target/21098, treelang/21345 +- fix loop unswitching (PR rtl-optimization/21330) +- fix i386 ASHIFT to MULT address canonicalization (PR target/21297) +- propagate tail call info bit through builtin expanders (PR middle-end/21265) +- fix VEC_SELECT in combine (PR rtl-optimization/21239) +- fix i386 V4SFmode vector initialization +- fix Fortran FOREACH (PR fortran/15080) + * Thu Apr 28 2005 Jakub Jelinek 4.0.0-2 - update from CVS - PRs ada/18847, bootstrap/21215, c++/21087, c/20740, c/21159, c/21213, Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- sources 28 Apr 2005 17:32:52 -0000 1.88 +++ sources 3 May 2005 23:37:28 -0000 1.89 @@ -1 +1 @@ -da54cb1085690d869187cffe682947d2 gcc-4.0.0-20050428.tar.bz2 +745bfafd279c85a16cd3f20bd881bce7 gcc-4.0.0-20050504.tar.bz2 --- gcc4-gfortran-entry.patch DELETED --- --- gcc4-pr20742.patch DELETED --- --- gcc4-pr20768.patch DELETED --- From fedora-cvs-commits at redhat.com Wed May 4 00:44:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 20:44:10 -0400 Subject: rpms/mod_jk/devel mod_jk.spec,1.5,1.6 Message-ID: <200505040044.j440iABC027736@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/mod_jk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27724 Modified Files: mod_jk.spec Log Message: don't build tools subpackage - it has broken deps Index: mod_jk.spec =================================================================== RCS file: /cvs/dist/rpms/mod_jk/devel/mod_jk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mod_jk.spec 28 Apr 2005 16:57:00 -0000 1.5 +++ mod_jk.spec 4 May 2005 00:44:07 -0000 1.6 @@ -11,7 +11,7 @@ Summary: Tomcat mod_jk connector for Apache Name: mod_jk Version: 1.2.6 -Release: 3jpp_2fc +Release: 3jpp_3fc Epoch: 0 #Vendor: JPackage Project #Distribution: JPackage @@ -162,13 +162,16 @@ %defattr(0644,root,root,0755) %doc jk/docs/* -%files tools -%defattr(-,root,root,-) -%doc jk/tools/reports/README.txt -%{_bindir}/* +#%files tools +#%defattr(-,root,root,-) +#%doc jk/tools/reports/README.txt +#%{_bindir}/* %changelog +* Tue May 3 2005 Bill Nottingham - 0:1.2.6-3jpp_3fc +- temporarily disable -tools subpackage (#156757) + * Thu Apr 28 2005 Gary Benson - 0:1.2.6-3jpp_2fc - Actually build more than just an empty debuginfo package (#151415). From fedora-cvs-commits at redhat.com Wed May 4 00:54:31 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 May 2005 20:54:31 -0400 Subject: rpms/mod_jk/devel mod_jk.spec,1.6,1.7 Message-ID: <200505040054.j440sVOa006710@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/mod_jk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4680 Modified Files: mod_jk.spec Log Message: fix the -tools diabling Index: mod_jk.spec =================================================================== RCS file: /cvs/dist/rpms/mod_jk/devel/mod_jk.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_jk.spec 4 May 2005 00:44:07 -0000 1.6 +++ mod_jk.spec 4 May 2005 00:54:29 -0000 1.7 @@ -134,8 +134,8 @@ install -pm 0755 \ jk/native/apache-1.3/mod_jk.so.0.0.0 $RPM_BUILD_ROOT%{aplibdir}/mod_jk.so %endif -install -dm 0755 $RPM_BUILD_ROOT%{_bindir} -install -pm 0755 jk/tools/reports/*.pl $RPM_BUILD_ROOT%{_bindir} +#install -dm 0755 $RPM_BUILD_ROOT%{_bindir} +#install -pm 0755 jk/tools/reports/*.pl $RPM_BUILD_ROOT%{_bindir} %clean From fedora-cvs-commits at redhat.com Wed May 4 04:04:02 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 00:04:02 -0400 Subject: rpms/anaconda/devel .cvsignore, 1.107, 1.108 anaconda.spec, 1.222, 1.223 sources, 1.223, 1.224 Message-ID: <200505040404.j44442ds007828@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7805/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.2.0.59-1 on branch devel from anaconda-10.2.0.59-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- .cvsignore 3 May 2005 02:17:09 -0000 1.107 +++ .cvsignore 4 May 2005 04:04:00 -0000 1.108 @@ -1 +1 @@ -anaconda-10.2.0.58.tar.bz2 +anaconda-10.2.0.59.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.222 retrieving revision 1.223 diff -u -r1.222 -r1.223 --- anaconda.spec 3 May 2005 02:17:09 -0000 1.222 +++ anaconda.spec 4 May 2005 04:04:00 -0000 1.223 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.2.0.58 +Version: 10.2.0.59 Release: 1 License: GPL Summary: Graphical system installer @@ -69,6 +69,12 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue May 3 2005 Jeremy Katz - 10.2.0.59-1 +- Try to use the fb res on pmac +- Always reset terminal attrs on ppc (notting, #156411) +- Remove bogus preexisting LVM info when doing kickstart + installs (clumens, #156283) + * Mon May 2 2005 Jeremy Katz - 10.2.0.58-1 - Beep on CD insertion, not after - Fix language support selection (clumens) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- sources 3 May 2005 02:17:09 -0000 1.223 +++ sources 4 May 2005 04:04:00 -0000 1.224 @@ -1 +1 @@ -9f0b830adf01da27b3b65beedd7cfdde anaconda-10.2.0.58.tar.bz2 +2a656851a68728ff0d09935545021ed6 anaconda-10.2.0.59.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 4 05:56:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 01:56:00 -0400 Subject: rpms/firefox/devel firefox-1.0-uriloader.patch, 1.2, 1.3 firefox.spec, 1.67, 1.68 Message-ID: <200505040556.j445u01h029908@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29888 Modified Files: firefox-1.0-uriloader.patch firefox.spec Log Message: * Tue May 3 2005 Christopher Aillon 0:1.0.3-4 - Rebuild firefox-1.0-uriloader.patch: Makefile.in | 2 unix/nsGNOMERegistry.cpp | 27 ++++- unix/nsGNOMERegistry.h | 11 +- unix/nsMIMEInfoUnix.cpp | 196 ++++++++++++++++++++++++++++++++++++++++++ unix/nsMIMEInfoUnix.h | 48 ++++++++++ unix/nsOSHelperAppService.cpp | 27 ++--- 6 files changed, 284 insertions(+), 27 deletions(-) Index: firefox-1.0-uriloader.patch =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.0-uriloader.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- firefox-1.0-uriloader.patch 3 May 2005 19:12:19 -0000 1.2 +++ firefox-1.0-uriloader.patch 4 May 2005 05:55:58 -0000 1.3 @@ -439,3 +439,19 @@ if (handler.IsEmpty() && mailcap_description.IsEmpty()) { DoLookUpHandlerAndDescription(majorType, minorType, +Index: uriloader/exthandler/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v +retrieving revision 1.60 +diff -d -u -p -r1.60 Makefile.in +--- uriloader/exthandler/Makefile.in 2 May 2005 16:30:03 -0000 1.60 ++++ uriloader/exthandler/Makefile.in 4 May 2005 05:49:19 -0000 +@@ -102,7 +102,7 @@ endif + LOCAL_INCLUDES = -I$(srcdir) + + ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) +-OSHELPER += nsGNOMERegistry.cpp ++OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp + endif + + ifeq ($(MOZ_WIDGET_TOOLKIT),beos) Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- firefox.spec 3 May 2005 20:04:51 -0000 1.67 +++ firefox.spec 4 May 2005 05:55:58 -0000 1.68 @@ -10,7 +10,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.0.3 -Release: 3 +Release: 4 Epoch: 0 URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL @@ -332,6 +332,9 @@ #--------------------------------------------------------------------- %changelog +* Tue May 3 2005 Christopher Aillon 0:1.0.3-4 +- Rebuild + * Tue May 3 2005 Christopher Aillon - Patch from Marcel Mol supporting launching with filenames containing whitespace. From fedora-cvs-commits at redhat.com Wed May 4 08:28:14 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 04:28:14 -0400 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.184, 1.185 openoffice.org-1.9.75.ooo41904.singleton.patch, 1.1, NONE Message-ID: <200505040828.j448SEAD018907@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18895 Modified Files: openoffice.org.spec Removed Files: openoffice.org-1.9.75.ooo41904.singleton.patch Log Message: bump to next version Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- openoffice.org.spec 3 May 2005 20:21:08 -0000 1.184 +++ openoffice.org.spec 4 May 2005 08:28:12 -0000 1.185 @@ -1,4 +1,4 @@ -%define ooo2ver 99 +%define ooo2ver 100 #undef to get english only and no-langpacks for a quick smoketest build %define langpacks 1 %if %{langpacks} @@ -20,7 +20,7 @@ Summary: OpenOffice.org comprehensive office suite. Name: openoffice.org Version: 1.9.%{ooo2ver} -Release: 2 +Release: 1 Epoch: 1 License: LGPL/SISSL Group: Applications/Productivity @@ -55,42 +55,41 @@ Patch0: openoffice.org-1.9.80.NONE.skipuselessmodules.patch Patch1: openoffice.org-1.9.71s1.noregisterwizard.patch Patch2: openoffice.org-1.9.74.ooo41875.mktemp.patch -Patch3: openoffice.org-1.9.75.ooo41904.singleton.patch -Patch4: openoffice.org-1.9.84.ooo44843.sdcasting.patch -Patch5: openoffice.org-1.9.84.ooo44846.svxcasting.patch -Patch6: openoffice.org-1.9.84.NONE.dictionaries.contribdict.patch -Patch7: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch -Patch8: openoffice.org-1.9.84.ooo45162.svxcasting2.patch -Patch9: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch -Patch10: openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.patch -Patch11: openoffice.org-1.9.87.warnnoterroronmissing.patch -Patch12: openoffice.org-1.9.87.rh151357.patch -Patch13: openoffice.org-1.9.87.oooXXXXX.fragments.patch -Patch14: openoffice.org-1.9.88.NONE.gcc3gcj4.patch -Patch15: openoffice.org-1.9.88.rh133741.alwaysgtk.patch -Patch16: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch -Patch17: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch -Patch18: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch -Patch19: openoffice.org-1.9.89.ooo46528.stillnotpic.icu.patch -Patch20: openoffice.org-1.9.89.ooo44027.pthreadchange.patch -Patch21: openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch -Patch22: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch -Patch23: openoffice.org-1.9.89.rh152269.nfs.desktop.patch -Patch24: openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch -Patch25: workspace.db4.patch -Patch26: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch -Patch27: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch -Patch28: openoffice.org-1.9.92.oooXXXXX.addindic.patch -Patch29: workspace.db4-2.patch -Patch30: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch -Patch31: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch -Patch32: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch -Patch33: openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch -Patch34: openoffice.org-1.9.97.rh156067.noversionedicons.patch -Patch35: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch -Patch36: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch -Patch37: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch -Patch38: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch +Patch3: openoffice.org-1.9.84.ooo44843.sdcasting.patch +Patch4: openoffice.org-1.9.84.ooo44846.svxcasting.patch +Patch5: openoffice.org-1.9.84.NONE.dictionaries.contribdict.patch +Patch6: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch +Patch7: openoffice.org-1.9.84.ooo45162.svxcasting2.patch +Patch8: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch +Patch9: openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.patch +Patch10: openoffice.org-1.9.87.warnnoterroronmissing.patch +Patch11: openoffice.org-1.9.87.rh151357.patch +Patch12: openoffice.org-1.9.87.oooXXXXX.fragments.patch +Patch13: openoffice.org-1.9.88.NONE.gcc3gcj4.patch +Patch14: openoffice.org-1.9.88.rh133741.alwaysgtk.patch +Patch15: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch +Patch16: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch +Patch17: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch +Patch18: openoffice.org-1.9.89.ooo46528.stillnotpic.icu.patch +Patch19: openoffice.org-1.9.89.ooo44027.pthreadchange.patch +Patch20: openoffice.org-1.9.89.ooo46912.setjmpoutsidenamespace.binfilter.patch +Patch21: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch +Patch22: openoffice.org-1.9.89.rh152269.nfs.desktop.patch +Patch23: openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch +Patch24: workspace.db4.patch +Patch25: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch +Patch26: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch +Patch27: openoffice.org-1.9.92.oooXXXXX.addindic.patch +Patch28: workspace.db4-2.patch +Patch29: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch +Patch30: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch +Patch31: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch +Patch32: openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch +Patch33: openoffice.org-1.9.97.rh156067.noversionedicons.patch +Patch34: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch +Patch35: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch +Patch36: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch +Patch37: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch %define instdir %{_libdir}/openoffice.org%{version} @@ -642,56 +641,52 @@ %patch0 -p1 -b .skipuselessmodules.patch %patch1 -p1 -b .noregisterwizard %patch2 -p1 -b .ooo41875.mktemp.patch -%patch3 -p1 -b .ooo41904.singleton.patch -%patch4 -p1 -b .ooo44843.sdcasting.patch -%patch5 -p1 -b .ooo44846.svxcasting.patch -%patch6 -p1 -b .dictionaries.contribdict.patch -%patch7 -p1 -b .ooo45725.lingucomponent.contribdict.patch -%patch8 -p1 -b .ooo45162.svxcasting2.patch -%patch9 -p1 -b .usetwodotzeropath.patch -%patch10 -p1 -b .rh150650.gcjneedstoresolveallrequirements.patch -%patch11 -p1 -b .warnnoterroronmissing.patch -%patch12 -p1 -b .rh151357.patch -%patch13 -p1 -b .oooXXXXX.fragments.patch -%patch14 -p1 -b .gcc3gcj4.patch -%patch15 -p1 -b .rh133741.alwaysgtk.patch -%patch16 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch -%patch17 -p1 -b .ooo35627.parallel.cppumaker.patch -%patch18 -p1 -b .oooXXXXX.parallel.sysui.patch -%patch19 -p1 -b .ooo46528.stillnotpic.icu.patch -%patch20 -p1 -b .ooo44027.pthreadchange.patch -%patch21 -p1 -b .ooo46912.setjmpoutsidenamespace.binfilter.patch -%patch22 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch -%patch23 -p1 -b .rh152269.nfs.desktop.patch -%patch24 -p1 -b .gccXXXXX.hsqldbproblems.hsqldb.patch -%patch25 -p1 -R -b .workspace.db4.patch -%patch26 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch -%patch27 -p1 -b .ooo46585.sunmiscisnotstandard.filter.patch -%patch28 -p1 -b .oooXXXXX.addindic.patch -%patch29 -p1 -b .workspace.db4-2.patch -%patch30 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch -%patch31 -p1 -b .ooo35641.noxfonts.vcl.patch -%patch32 -p1 -b .ooo48256.nolongname.sysui.patch -%patch33 -p1 -b .ooo48362.checkzipresult.sc.patch -%patch34 -p1 -b .rh156067.noversionedicons.patch -%patch35 -p1 -b .ooo48600.rtfparseerror.svx.patch -%patch36 -p1 -b .gcc19870.gcjaccessproblem.filter.patch -%patch37 -p1 -b .ooo48610.searchalltemplates.wizards.patch -%patch38 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch - +%patch3 -p1 -b .ooo44843.sdcasting.patch +%patch4 -p1 -b .ooo44846.svxcasting.patch +%patch5 -p1 -b .dictionaries.contribdict.patch +%patch6 -p1 -b .ooo45725.lingucomponent.contribdict.patch +%patch7 -p1 -b .ooo45162.svxcasting2.patch +%patch8 -p1 -b .usetwodotzeropath.patch +%patch9 -p1 -b .rh150650.gcjneedstoresolveallrequirements.patch +%patch10 -p1 -b .warnnoterroronmissing.patch +%patch11 -p1 -b .rh151357.patch +%patch12 -p1 -b .oooXXXXX.fragments.patch +%patch13 -p1 -b .gcc3gcj4.patch +%patch14 -p1 -b .rh133741.alwaysgtk.patch +%patch15 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch +%patch16 -p1 -b .ooo35627.parallel.cppumaker.patch +%patch17 -p1 -b .oooXXXXX.parallel.sysui.patch +%patch18 -p1 -b .ooo46528.stillnotpic.icu.patch +%patch19 -p1 -b .ooo44027.pthreadchange.patch +%patch20 -p1 -b .ooo46912.setjmpoutsidenamespace.binfilter.patch +%patch21 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch +%patch22 -p1 -b .rh152269.nfs.desktop.patch +%patch23 -p1 -b .gccXXXXX.hsqldbproblems.hsqldb.patch +%patch24 -p1 -R -b .workspace.db4.patch +%patch25 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch +%patch26 -p1 -b .ooo46585.sunmiscisnotstandard.filter.patch +%patch27 -p1 -b .oooXXXXX.addindic.patch +%patch28 -p1 -b .workspace.db4-2.patch +%patch29 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch +%patch30 -p1 -b .ooo35641.noxfonts.vcl.patch +%patch31 -p1 -b .ooo48256.nolongname.sysui.patch +%patch32 -p1 -b .ooo48362.checkzipresult.sc.patch +%patch33 -p1 -b .rh156067.noversionedicons.patch +%patch34 -p1 -b .ooo48600.rtfparseerror.svx.patch +%patch35 -p1 -b .gcc19870.gcjaccessproblem.filter.patch +%patch36 -p1 -b .ooo48610.searchalltemplates.wizards.patch +%patch37 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch #start ludicrous workaround #while we include these libs we need this, if/when we move to system #libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped %define __find_provides %{_builddir}/SRC680_m%{ooo2ver}/find-provides -#find_provides=`rpm --eval %%{__find_provides}` -find_provides=/usr/lib/rpm/redhat/find-provides +find_provides=`rpm --eval %%{__find_provides}` echo "$find_provides | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_" > find-provides chmod +x find-provides %define __find_requires %{_builddir}/SRC680_m%{ooo2ver}/find-requires -#find_requires=`rpm --eval %%{__find_requires}` -find_requires=/usr/lib/rpm/redhat/find-requires -echo "$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_ | grep -v \(" > find-requires +find_requires=`rpm --eval %%{__find_requires}` +echo "$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_ | grep -v \("> find-requires chmod +x find-requires #end ludicrous workaround @@ -2441,6 +2436,10 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Wed May 04 2005 Caolan McNamara - 1:1.9.100-1 +- bump to next version +- drop finally integrated openoffice.org-1.9.75.ooo41904.singleton.patch + * Tue May 03 2005 Caolan McNamara - 1:1.9.99-2 - add openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch for gcj bug workaround - add openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch --- openoffice.org-1.9.75.ooo41904.singleton.patch DELETED --- From fedora-cvs-commits at redhat.com Wed May 4 08:32:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 04:32:44 -0400 Subject: rpms/openoffice.org/devel .cvsignore,1.42,1.43 sources,1.61,1.62 Message-ID: <200505040832.j448WiBE019022@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19009 Modified Files: .cvsignore sources Log Message: add sources Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 3 May 2005 09:58:35 -0000 1.42 +++ .cvsignore 4 May 2005 08:32:41 -0000 1.43 @@ -99,3 +99,4 @@ SRC680_m97.tar.bz2 SRC680_m98.tar.bz2 SRC680_m99.tar.bz2 +SRC680_m100.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 3 May 2005 09:58:35 -0000 1.61 +++ sources 4 May 2005 08:32:41 -0000 1.62 @@ -6,4 +6,4 @@ acf1fd0931af26b8bb68003a8e31d5c5 db-3.2.9.patch 4df5c7051b11411e0a970f6c91613942 db-3.2.9.tar.gz 176aa81d51a6ed28c5e9a14696a8d208 openoffice.org-jakubicons.tar.gz -91788bf3c11fc1b568c949fbcb0df69f SRC680_m99.tar.bz2 +97148b3f4c92817cce583a6485956dd5 SRC680_m100.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 4 08:45:21 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 04:45:21 -0400 Subject: rpms/xorg-x11/devel xorg-x11-6.8.2-radeon-display-bandwidth-calc-fix.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-fix-crtc2-offset-cntl.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-fix-divider-select.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-fix-mergedfb-bios-dividers.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-fix-one-mode-ddc.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-fix-pll-probing.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-lvds-probe-pll.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-no-vga.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-pll-errata-workarounds.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-pll2-tmds-no-odd-value.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-release-i2c-lines.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-reverse-ddc-option.patch, NONE, 1.1.2.1 xorg-x11-6.8.2-radeon-surface-cntl-dual-head.patch, NONE, 1.1.2.1 xorg-x11.spec, 1.193, 1.193.2.1 Message-ID: <200505040845.j448jLo8021844@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/xorg-x11/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21254 Modified Files: Tag: private-fc4-radeon-branch xorg-x11.spec Added Files: Tag: private-fc4-radeon-branch xorg-x11-6.8.2-radeon-display-bandwidth-calc-fix.patch xorg-x11-6.8.2-radeon-fix-crtc2-offset-cntl.patch xorg-x11-6.8.2-radeon-fix-divider-select.patch xorg-x11-6.8.2-radeon-fix-mergedfb-bios-dividers.patch xorg-x11-6.8.2-radeon-fix-one-mode-ddc.patch xorg-x11-6.8.2-radeon-fix-pll-probing.patch xorg-x11-6.8.2-radeon-lvds-probe-pll.patch xorg-x11-6.8.2-radeon-no-vga.patch xorg-x11-6.8.2-radeon-pll-errata-workarounds.patch xorg-x11-6.8.2-radeon-pll2-tmds-no-odd-value.patch xorg-x11-6.8.2-radeon-release-i2c-lines.patch xorg-x11-6.8.2-radeon-reverse-ddc-option.patch xorg-x11-6.8.2-radeon-surface-cntl-dual-head.patch Log Message: Ben's radeon patches xorg-x11-6.8.2-radeon-display-bandwidth-calc-fix.patch: radeon_driver.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xorg-x11-6.8.2-radeon-display-bandwidth-calc-fix.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:51:08.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:51:12.000000000 +1000 @@ -6104,7 +6104,7 @@ */ temp = INREG(RADEON_MEM_CNTL); data = (R300_MEM_NUM_CHANNELS_MASK & temp); - if (data == 2) { + if (data == 1) { if (R300_MEM_USE_CD_CH_ONLY & temp) { temp = INREG(R300_MC_IND_INDEX); temp &= ~R300_MC_IND_ADDR_MASK; xorg-x11-6.8.2-radeon-fix-crtc2-offset-cntl.patch: radeon_driver.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE xorg-x11-6.8.2-radeon-fix-crtc2-offset-cntl.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:51:16.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:51:19.000000000 +1000 @@ -6491,8 +6491,12 @@ ? RADEON_CRTC2_V_SYNC_POL : 0)); + /* This version of the driver doesn't do tiling, make sure it is disabled + * as the BIOS may have enabled it. 0 is a sane value for CRTC2_OFFSET_CNTL + * based on the documentation + */ save->crtc2_offset = 0; - save->crtc2_offset_cntl = INREG(RADEON_CRTC2_OFFSET_CNTL); + save->crtc2_offset_cntl = 0; /* this should be right */ if (info->MergedFB) { save->crtc2_pitch = (((info->CRT2pScrn->displayWidth * pScrn->bitsPerPixel) + xorg-x11-6.8.2-radeon-fix-divider-select.patch: radeon_driver.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) --- NEW FILE xorg-x11-6.8.2-radeon-fix-divider-select.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 16:40:48.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 16:41:44.000000000 +1000 @@ -5453,8 +5453,13 @@ By doing this we can avoid the blanking problem with some panels. */ if ((restore->ppll_ref_div == (INPLL(pScrn, RADEON_PPLL_REF_DIV) & RADEON_PPLL_REF_DIV_MASK)) && - (restore->ppll_div_3 == (INPLL(pScrn, RADEON_PPLL_DIV_3) & (RADEON_PPLL_POST3_DIV_MASK | RADEON_PPLL_FB3_DIV_MASK)))) - return; + (restore->ppll_div_3 == (INPLL(pScrn, RADEON_PPLL_DIV_3) & + (RADEON_PPLL_POST3_DIV_MASK | RADEON_PPLL_FB3_DIV_MASK)))) { + OUTREGP(RADEON_CLOCK_CNTL_INDEX, + RADEON_PLL_DIV_SEL, + ~(RADEON_PLL_DIV_SEL)); + return; + } } OUTPLLP(pScrn, RADEON_VCLK_ECP_CNTL, xorg-x11-6.8.2-radeon-fix-mergedfb-bios-dividers.patch: radeon_driver.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) --- NEW FILE xorg-x11-6.8.2-radeon-fix-mergedfb-bios-dividers.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:50:52.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:50:58.000000000 +1000 @@ -6857,8 +6857,8 @@ } /* Define PLL registers for requested video mode */ -static void RADEONInitPLLRegisters(RADEONSavePtr save, RADEONPLLPtr pll, - double dot_clock) +static void RADEONInitPLLRegisters(RADEONInfoPtr info, RADEONSavePtr save, + RADEONPLLPtr pll, double dot_clock) { unsigned long freq = dot_clock * 100; @@ -6882,6 +6882,13 @@ { 0, 0 } }; + if (info->UseBiosDividers) { + save->ppll_ref_div = info->RefDivider; + save->ppll_div_3 = info->FeedbackDivider | (info->PostDivider << 16); + save->htotal_cntl = 0; + return; + } + if (freq > pll->max_pll_freq) freq = pll->max_pll_freq; if (freq * 12 < pll->min_pll_freq) freq = pll->min_pll_freq / 12; @@ -7051,7 +7058,7 @@ return FALSE; dot_clock = (((RADEONMergedDisplayModePtr)mode->Private)->CRT1)->Clock / 1000.0; if (dot_clock) { - RADEONInitPLLRegisters(save, &info->pll, dot_clock); + RADEONInitPLLRegisters(info, save, &info->pll, dot_clock); } else { save->ppll_ref_div = info->SavedReg.ppll_ref_div; save->ppll_div_3 = info->SavedReg.ppll_div_3; @@ -7066,13 +7073,7 @@ return FALSE; dot_clock = mode->Clock/1000.0; if (dot_clock) { - if (info->UseBiosDividers) { - save->ppll_ref_div = info->RefDivider; - save->ppll_div_3 = info->FeedbackDivider | (info->PostDivider << 16); - save->htotal_cntl = 0; - } - else - RADEONInitPLLRegisters(save, &info->pll, dot_clock); + RADEONInitPLLRegisters(info, save, &info->pll, dot_clock); } else { save->ppll_ref_div = info->SavedReg.ppll_ref_div; save->ppll_div_3 = info->SavedReg.ppll_div_3; xorg-x11-6.8.2-radeon-fix-one-mode-ddc.patch: radeon_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE xorg-x11-6.8.2-radeon-fix-one-mode-ddc.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-14 15:26:08.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-14 15:26:56.000000000 +1000 @@ -3614,7 +3614,7 @@ } } - if ((modesFound <= 1) || (user_modes_found < user_modes_asked)) { + if ((modesFound < 1) || (user_modes_found < user_modes_asked)) { /* when panel size is not valid, try to validate * mode using xf86ValidateModes routine * This can happen when DDC is disabled. @@ -3879,7 +3879,7 @@ } } - if ((modesFound <= 1) || (user_modes_found < user_modes_asked)) { + if ((modesFound < 1) || (user_modes_found < user_modes_asked)) { /* when panel size is not valid, try to validate * mode using xf86ValidateModes routine * This can happen when DDC is disabled. xorg-x11-6.8.2-radeon-fix-pll-probing.patch: radeon_driver.c | 154 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 124 insertions(+), 30 deletions(-) --- NEW FILE xorg-x11-6.8.2-radeon-fix-pll-probing.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:51:19.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:51:22.000000000 +1000 @@ -1186,41 +1186,59 @@ return(bConnected ? MT_CRT : MT_NONE); } -#if defined(__powerpc__) static Bool RADEONProbePLLParameters(ScrnInfoPtr pScrn) { RADEONInfoPtr info = RADEONPTR(pScrn); RADEONPLLPtr pll = &info->pll; unsigned char *RADEONMMIO = info->MMIO; unsigned char ppll_div_sel; - unsigned Nx, M; + unsigned mpll_fb_div, spll_fb_div, M; unsigned xclk, tmp, ref_div; int hTotal, vTotal, num, denom, m, n; - float hz, vclk, xtal; + float hz, prev_xtal, vclk, xtal, mpll, spll; long start_secs, start_usecs, stop_secs, stop_usecs, total_usecs; - int i; - - for(i=0; i<1000000; i++) - if (((INREG(RADEON_CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) == 0) + long to1_secs, to1_usecs, to2_secs, to2_usecs; + unsigned int f1, f2, f3; + int tries = 0; + + prev_xtal = 0; + again: + xtal = 0; + if (++tries > 10) + goto failed; + + xf86getsecs(&to1_secs, &to1_usecs); + f1 = INREG(RADEON_CRTC_CRNT_FRAME); + for (;;) { + f2 = INREG(RADEON_CRTC_CRNT_FRAME); + if (f1 != f2) break; - + xf86getsecs(&to2_secs, &to2_usecs); + if ((to2_secs - to1_secs) > 1) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Clock not counting...\n"); + goto failed; + } + } xf86getsecs(&start_secs, &start_usecs); - - for(i=0; i<1000000; i++) - if (((INREG(RADEON_CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) != 0) - break; - - for(i=0; i<1000000; i++) - if (((INREG(RADEON_CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) == 0) + for(;;) { + f3 = INREG(RADEON_CRTC_CRNT_FRAME); + if (f3 != f2) break; - + xf86getsecs(&to2_secs, &to2_usecs); + if ((to2_secs - start_secs) > 1) + goto failed; + } xf86getsecs(&stop_secs, &stop_usecs); + if ((stop_secs - start_secs) != 0) + goto again; total_usecs = abs(stop_usecs - start_usecs); - hz = 1000000/total_usecs; + if (total_usecs == 0) + goto again; + hz = 1000000.0/(float)total_usecs; - hTotal = ((INREG(RADEON_CRTC_H_TOTAL_DISP) & 0x1ff) + 1) * 8; - vTotal = ((INREG(RADEON_CRTC_V_TOTAL_DISP) & 0x3ff) + 1); + hTotal = ((INREG(RADEON_CRTC_H_TOTAL_DISP) & 0x3ff) + 1) * 8; + vTotal = ((INREG(RADEON_CRTC_V_TOTAL_DISP) & 0xfff) + 1); vclk = (float)(hTotal * (float)(vTotal * hz)); switch((INPLL(pScrn, RADEON_PPLL_REF_DIV) & 0x30000) >> 16) { @@ -1243,8 +1261,7 @@ break; } - OUTREG(RADEON_CLOCK_CNTL_INDEX, 1); - ppll_div_sel = INREG8(RADEON_CLOCK_CNTL_DATA + 1) & 0x3; + ppll_div_sel = INREG8(RADEON_CLOCK_CNTL_INDEX + 1) & 0x3; n = (INPLL(pScrn, RADEON_PPLL_DIV_0 + ppll_div_sel) & 0x7ff); m = (INPLL(pScrn, RADEON_PPLL_REF_DIV) & 0x3ff); @@ -1282,23 +1299,93 @@ else if ((xtal > 29400000) && (xtal < 29600000)) xtal = 2950; else - return FALSE; + goto again; + failed: + if (xtal == 0) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Failed to probe xtal value ! " + "Using default 27Mhz\n"); + xtal = 2700; + } else { + if (prev_xtal == 0) { + prev_xtal = xtal; + tries = 0; + goto again; + } else if (prev_xtal != xtal) { + prev_xtal = 0; + goto again; + } + } tmp = INPLL(pScrn, RADEON_X_MPLL_REF_FB_DIV); ref_div = INPLL(pScrn, RADEON_PPLL_REF_DIV) & 0x3ff; - Nx = (tmp & 0xff00) >> 8; + /* Some sanity check based on the BIOS code .... */ + if (ref_div < 2) { + CARD32 tmp; + tmp = INPLL(pScrn, RADEON_PPLL_REF_DIV); + if (IS_R300_VARIANT || (info->ChipFamily == CHIP_FAMILY_RS300)) + ref_div = (tmp & R300_PPLL_REF_DIV_ACC_MASK) >> + R300_PPLL_REF_DIV_ACC_SHIFT; + else + ref_div = tmp & RADEON_PPLL_REF_DIV_MASK; + if (ref_div < 2) + ref_div = 12; + } + + /* Calculate "base" xclk straight from MPLL, though that isn't + * really useful (hopefully). This isn't called XCLK anymore on + * radeon's... + */ + mpll_fb_div = (tmp & 0xff00) >> 8; + spll_fb_div = (tmp & 0xff0000) >> 16; M = (tmp & 0xff); - xclk = RADEONDiv((2 * Nx * xtal), (2 * M)); + xclk = RADEONDiv((2 * mpll_fb_div * xtal), (M)); + + /* + * Calculate MCLK based on MCLK-A + */ + mpll = (2.0 * (float)mpll_fb_div * (xtal / 100.0)) / (float)M; + spll = (2.0 * (float)spll_fb_div * (xtal / 100.0)) / (float)M; + + tmp = INPLL(pScrn, RADEON_MCLK_CNTL) & 0x7; + switch(tmp) { + case 1: info->mclk = mpll; break; + case 2: info->mclk = mpll / 2.0; break; + case 3: info->mclk = mpll / 4.0; break; + case 4: info->mclk = mpll / 8.0; break; + case 7: info->mclk = spll; break; + default: + info->mclk = 200.00; + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Unsupported MCLKA source" + " setting %d, can't probe MCLK value !\n", tmp); + } + + /* + * Calculate SCLK + */ + tmp = INPLL(pScrn, RADEON_SCLK_CNTL) & 0x7; + switch(tmp) { + case 1: info->sclk = spll; break; + case 2: info->sclk = spll / 2.0; break; + case 3: info->sclk = spll / 4.0; break; + case 4: info->sclk = spll / 8.0; break; + case 7: info->sclk = mpll; + default: + info->sclk = 200.00; + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Unsupported SCLK source" + " setting %d, can't probe SCLK value !\n", tmp); + } /* we're done, hopefully these are sane values */ pll->reference_div = ref_div; pll->xclk = xclk; pll->reference_freq = xtal; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Probed PLL values: xtal: %f Mhz, " + "sclk: %f Mhz, mclk: %f Mhz\n", xtal/100.0, info->sclk, info->mclk); + return TRUE; } -#endif static void RADEONGetPanelInfoFromReg (ScrnInfoPtr pScrn) { @@ -1450,17 +1537,24 @@ xf86DrvMsg (pScrn->scrnIndex, X_WARNING, "Video BIOS not detected, using default clock settings!\n"); -#if defined(__powerpc__) - if (RADEONProbePLLParameters(pScrn)) return; -#endif + /* Default min/max PLL values */ + if (info->ChipFamily == CHIP_FAMILY_R420) { + pll->min_pll_freq = 20000; + pll->max_pll_freq = 50000; + } else { + pll->min_pll_freq = 12500; + pll->max_pll_freq = 35000; + } + + if (RADEONProbePLLParameters(pScrn)) + return; + if (info->IsIGP) pll->reference_freq = 1432; else pll->reference_freq = 2700; pll->reference_div = 12; - pll->min_pll_freq = 12500; - pll->max_pll_freq = 35000; pll->xclk = 10300; info->sclk = 200.00; xorg-x11-6.8.2-radeon-lvds-probe-pll.patch: radeon.man | 10 ++++ radeon_driver.c | 118 ++++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 91 insertions(+), 37 deletions(-) --- NEW FILE xorg-x11-6.8.2-radeon-lvds-probe-pll.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 16:02:39.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 16:11:48.000000000 +1000 @@ -118,6 +118,7 @@ static void RADEONGetMergedFBOptions(ScrnInfoPtr pScrn); static int RADEONValidateMergeModes(ScrnInfoPtr pScrn); static void RADEONSetDynamicClock(ScrnInfoPtr pScrn, int mode); +static void RADEONUpdatePanelSize(ScrnInfoPtr pScrn); /* psuedo xinerama support */ @@ -166,6 +167,7 @@ OPTION_SHOWCACHE, OPTION_VGA_ACCESS, OPTION_REVERSE_DDC, + OPTION_LVDS_PROBE_PLL, OPTION_DYNAMIC_CLOCKS } RADEONOpts; @@ -213,6 +215,7 @@ { OPTION_DYNAMIC_CLOCKS, "DynamicClocks", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_VGA_ACCESS, "VGAAccess", OPTV_BOOLEAN, {0}, TRUE }, { OPTION_REVERSE_DDC, "ReverseDDC", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_LVDS_PROBE_PLL, "LVDSProbePLL", OPTV_BOOLEAN, {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE } }; @@ -1412,7 +1415,25 @@ info->PanelXRes = 640; info->PanelYRes = 480; } - + + if (xf86ReturnOptValBool(info->Options, OPTION_LVDS_PROBE_PLL, TRUE)) { + CARD32 ppll_div_sel, ppll_val; + + ppll_div_sel = INREG8(RADEON_CLOCK_CNTL_INDEX + 1) & 0x3; + RADEONPllErrataAfterIndex(info); + ppll_val = INPLL(pScrn, RADEON_PPLL_DIV_0 + ppll_div_sel); + if ((ppll_val & 0x000707ff) == 0x1bb) + goto noprobe; + info->FeedbackDivider = ppll_val & 0x7ff; + info->PostDivider = (ppll_val >> 16) & 0x7; + info->RefDivider = info->pll.reference_div; + info->UseBiosDividers = TRUE; + + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Existing panel PLL dividers will be used.\n"); + } + noprobe: + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Panel size %dx%d is derived, this may not be correct.\n" "If not, use PanelSize option to overwrite this setting\n", @@ -1426,17 +1447,24 @@ if (!RADEONGetLVDSInfoFromBIOS(pScrn)) RADEONGetPanelInfoFromReg(pScrn); + /* The panel size we collected from BIOS may not be the + * maximum size supported by the panel. If not, we update + * it now. These will be used if no matching mode can be + * found from EDID data. + */ + RADEONUpdatePanelSize(pScrn); + + /* No timing information for the native mode, + * use whatever specified in the Modeline. + * If no Modeline specified, we'll just pick + * the VESA mode at 60Hz refresh rate which + * is likely to be the best for a flat panel. + */ if (info->DotClock == 0) { RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); DisplayModePtr tmp_mode = NULL; xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No valid timing info from BIOS.\n"); - /* No timing information for the native mode, - use whatever specified in the Modeline. - If no Modeline specified, we'll just pick - the VESA mode at 60Hz refresh rate which - is likely to be the best for a flat panel. - */ tmp_mode = pScrn->monitor->Modes; while(tmp_mode) { if ((tmp_mode->HDisplay == info->PanelXRes) && @@ -1507,6 +1535,8 @@ RADEONGetTMDSInfo(pScrn); if (!pScrn->monitor->DDC) RADEONGetHardCodedEDIDFromBIOS(pScrn); + else if (!info->IsSecondary) + RADEONUpdatePanelSize(pScrn); } } } @@ -2705,16 +2735,35 @@ xf86MonPtr ddc = pScrn->monitor->DDC; DisplayModePtr p; + if (info->UseBiosDividers && info->DotClock != 0) + return; + /* Go thru detailed timing table first */ for (j = 0; j < 4; j++) { if (ddc->det_mon[j].type == 0) { struct detailed_timings *d_timings = &ddc->det_mon[j].section.d_timings; - if (info->PanelXRes <= d_timings->h_active && - info->PanelYRes <= d_timings->v_active) { + int match = 0; - if (info->DotClock) continue; /* Timings already inited */ + /* If we didn't get a panel clock or guessed one, try to match the + * mode with the panel size. We do that because we _need_ a panel + * clock, or ValidateFPModes will fail, even when UseBiosDividers + * is set. + */ + if (info->DotClock == 0 && + info->PanelXRes == d_timings->h_active && + info->PanelYRes == d_timings->v_active) + match = 1; + /* If we don't have a BIOS provided panel data with fixed dividers, + * check for a larger panel size + */ + if (info->PanelXRes < d_timings->h_active && + info->PanelYRes < d_timings->v_active && + !info->UseBiosDividers) + match = 1; + + if (match) { info->PanelXRes = d_timings->h_active; info->PanelYRes = d_timings->v_active; info->DotClock = d_timings->clock / 1000; @@ -2724,10 +2773,24 @@ info->VOverPlus = d_timings->v_sync_off; info->VSyncWidth = d_timings->v_sync_width; info->VBlank = d_timings->v_blanking; + info->Flags = (d_timings->interlaced ? V_INTERLACE : 0); + if (d_timings->sync == 3) { + switch (d_timings->misc) { + case 0: info->Flags |= V_NHSYNC | V_NVSYNC; break; + case 1: info->Flags |= V_PHSYNC | V_NVSYNC; break; + case 2: info->Flags |= V_NHSYNC | V_PVSYNC; break; + case 3: info->Flags |= V_PHSYNC | V_PVSYNC; break; + } + } + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Panel infos found from DDC detailed: %dx%d\n", + info->PanelXRes, info->PanelYRes); } } } + if (info->UseBiosDividers && info->DotClock != 0) + return; + /* Search thru standard VESA modes from EDID */ for (j = 0; j < 8; j++) { if ((info->PanelXRes < ddc->timings2[j].hsize) && @@ -2749,26 +2812,14 @@ info->VOverPlus = p->VSyncStart - p->VDisplay; info->VSyncWidth = p->VSyncEnd - p->VSyncStart; info->DotClock = p->Clock; - info->Flags = - (ddc->det_mon[j].section.d_timings.interlaced - ? V_INTERLACE - : 0); - if (ddc->det_mon[j].section.d_timings.sync == 3) { - switch (ddc->det_mon[j].section.d_timings.misc) { - case 0: info->Flags |= V_NHSYNC | V_NVSYNC; break; - case 1: info->Flags |= V_PHSYNC | V_NVSYNC; break; - case 2: info->Flags |= V_NHSYNC | V_PVSYNC; break; - case 3: info->Flags |= V_PHSYNC | V_PVSYNC; break; - } - } + info->Flags = p->Flags; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Panel infos found from DDC VESA/EDID: %dx%d\n", + info->PanelXRes, info->PanelYRes); } } } } } - - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Panel size found from DDC: %dx%d\n", - info->PanelXRes, info->PanelYRes); } /* This function will sort all modes according to their resolution. @@ -2889,6 +2940,8 @@ /* Search thru standard VESA modes from EDID */ for (j = 0; j < 8; j++) { + if (ddc->timings2[j].hsize == 0 || ddc->timings2[j].vsize == 0) + continue; for (p = pScrn->monitor->Modes; p && p->next; p = p->next->next) { /* Ignore all double scan modes */ if ((ddc->timings2[j].hsize == p->HDisplay) && @@ -2978,19 +3031,10 @@ pScrn->virtualX = pScrn1->display->virtualX; pScrn->virtualY = pScrn1->display->virtualY; - if (pScrn->monitor->DDC && !info->UseBiosDividers) { + if (pScrn->monitor->DDC) { int maxVirtX = pScrn->virtualX; int maxVirtY = pScrn->virtualY; - if ((DisplayType != MT_CRT) && (!info->IsSecondary) && (!crtc2)) { - /* The panel size we collected from BIOS may not be the - * maximum size supported by the panel. If not, we update - * it now. These will be used if no matching mode can be - * found from EDID data. - */ - RADEONUpdatePanelSize(pScrn); - } - /* Collect all of the DDC modes */ first = last = ddcModes = RADEONDDCModes(pScrn); @@ -3682,7 +3726,8 @@ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Invalid PanelSize value: %s\n", s); } - } + } else + RADEONGetPanelInfo(pScrn); } if (pScrn->monitor->DDC) { @@ -4361,7 +4406,6 @@ RADEONGetBIOSInfo(pScrn, pInt10); if (!RADEONQueryConnectedMonitors(pScrn)) goto fail; RADEONGetClockInfo(pScrn); - RADEONGetPanelInfo(pScrn); /* collect MergedFB options */ /* only parse mergedfb options on the primary head. Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon.man =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon.man 2005-04-12 16:03:23.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon.man 2005-04-12 16:12:36.000000000 +1000 @@ -512,6 +512,16 @@ typically needed on the Radeon 9600 cards bundled with Apple G5s. The default is .B off. +.TP +.BI "Option \*qLVDSProbePLL\*q \*q" boolean \*q +When BIOS panel informations aren't available (like on PowerBooks), it +may still be necessary to use the firmware provided PLL values for the +panel or flickering will happen. This option will force probing of +the current value programmed in the chip when X is launched in that +case. This is only useful for LVDS panels (laptop internal panels). +The default is +.B on. +.TP .SH SEE ALSO __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) xorg-x11-6.8.2-radeon-no-vga.patch: radeon.h | 2 + radeon.man | 11 +++++ radeon_driver.c | 112 ++++++++++++++++++++++++++++++++++++-------------------- 3 files changed, 85 insertions(+), 40 deletions(-) --- NEW FILE xorg-x11-6.8.2-radeon-no-vga.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2004-12-17 11:13:18.000000000 +1100 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:50:29.000000000 +1000 @@ -164,6 +164,7 @@ OPTION_SUBPIXEL_ORDER, #endif OPTION_SHOWCACHE, + OPTION_VGA_ACCESS, OPTION_DYNAMIC_CLOCKS } RADEONOpts; @@ -209,6 +210,7 @@ #endif { OPTION_SHOWCACHE, "ShowCache", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_DYNAMIC_CLOCKS, "DynamicClocks", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_VGA_ACCESS, "VGAAccess", OPTV_BOOLEAN, {0}, TRUE }, { -1, NULL, OPTV_NONE, {0}, FALSE } }; @@ -4143,14 +4145,6 @@ return TRUE; } - if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE; - xf86LoaderReqSymLists(vgahwSymbols, NULL); - if (!vgaHWGetHWRec(pScrn)) { - RADEONFreeRec(pScrn); - goto fail2; - } - - vgaHWGetIOBase(VGAHWPTR(pScrn)); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "PCI bus %d card %d func %d\n", @@ -4179,6 +4173,32 @@ memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options); + /* By default, don't do VGA IOs on ppc */ +#ifdef __powerpc__ + info->VGAAccess = FALSE; +#else + info->VGAAccess = TRUE; +#endif + + xf86GetOptValBool(info->Options, OPTION_VGA_ACCESS, &info->VGAAccess); + if (info->VGAAccess) { + if (!xf86LoadSubModule(pScrn, "vgahw")) + info->VGAAccess = FALSE; + else { + xf86LoaderReqSymLists(vgahwSymbols, NULL); + if (!vgaHWGetHWRec(pScrn)) + info->VGAAccess = FALSE; + } + if (!info->VGAAccess) + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Loading VGA module failed," + " trying to run without it\n"); + } else + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VGAAccess option set to FALSE," + " VGA module load skipped\n"); + if (info->VGAAccess) + vgaHWGetIOBase(VGAHWPTR(pScrn)); + + if (!RADEONPreInitWeight(pScrn)) goto fail; @@ -4293,7 +4313,8 @@ if (pInt10) xf86FreeInt10(pInt10); - vgaHWFreeHWRec(pScrn); + if (info->VGAAccess) + vgaHWFreeHWRec(pScrn); fail2: if(info->MMIO) RADEONUnmapMMIO(pScrn); @@ -5731,7 +5752,6 @@ RADEONInfoPtr info = RADEONPTR(pScrn); unsigned char *RADEONMMIO = info->MMIO; RADEONSavePtr save = &info->SavedReg; - vgaHWPtr hwp = VGAHWPTR(pScrn); RADEONTRACE(("RADEONSave\n")); if (info->FBDev) { @@ -5740,19 +5760,23 @@ } if (!info->IsSecondary) { - vgaHWUnlock(hwp); + if (info->VGAAccess) { + vgaHWPtr hwp = VGAHWPTR(pScrn); + + vgaHWUnlock(hwp); #if defined(__powerpc__) - /* temporary hack to prevent crashing on PowerMacs when trying to - * read VGA fonts and colormap, will find a better solution - * in the future - */ - vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */ + /* temporary hack to prevent crashing on PowerMacs when trying to + * read VGA fonts and colormap, will find a better solution + * in the future. TODO: Check if there's actually some VGA stuff + * setup in the card at all !! + */ + vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */ #else - vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS); /* Save mode - * & fonts & cmap - */ + /* Save mode * & fonts & cmap */ + vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS); #endif - vgaHWLock(hwp); + vgaHWLock(hwp); + } save->dp_datatype = INREG(RADEON_DP_DATATYPE); save->rbbm_soft_reset = INREG(RADEON_RBBM_SOFT_RESET); save->clock_cntl_index = INREG(RADEON_CLOCK_CNTL_INDEX); @@ -5768,7 +5792,6 @@ RADEONInfoPtr info = RADEONPTR(pScrn); unsigned char *RADEONMMIO = info->MMIO; RADEONSavePtr restore = &info->SavedReg; - vgaHWPtr hwp = VGAHWPTR(pScrn); RADEONTRACE(("RADEONRestore\n")); @@ -5810,27 +5833,36 @@ usleep(100000); #endif - if (!info->IsSecondary) { - vgaHWUnlock(hwp); + if (info->VGAAccess) { + vgaHWPtr hwp = VGAHWPTR(pScrn); + if (!info->IsSecondary) { + vgaHWUnlock(hwp); #if defined(__powerpc__) - /* Temporary hack to prevent crashing on PowerMacs when trying to - * write VGA fonts, will find a better solution in the future - */ - vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE ); + /* Temporary hack to prevent crashing on PowerMacs when trying to + * write VGA fonts, will find a better solution in the future + */ + vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE ); #else - vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS ); + vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS ); #endif - vgaHWLock(hwp); - } else { - RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); - ScrnInfoPtr pScrn0; - vgaHWPtr hwp0; - - pScrn0 = pRADEONEnt->pPrimaryScrn; - hwp0 = VGAHWPTR(pScrn0); - vgaHWUnlock(hwp0); - vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE | VGA_SR_FONTS ); - vgaHWLock(hwp0); + vgaHWLock(hwp); + } else { + RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); + ScrnInfoPtr pScrn0 = pRADEONEnt->pPrimaryScrn; + RADEONInfoPtr info0 = RADEONPTR(pScrn0); + vgaHWPtr hwp0; + + if (info0->VGAAccess) { + hwp0 = VGAHWPTR(pScrn0); + vgaHWUnlock(hwp0); +#if defined(__powerpc__) + vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE); +#else + vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE | VGA_SR_FONTS ); +#endif + vgaHWLock(hwp0); + } + } } RADEONUnblank(pScrn); @@ -7349,7 +7381,7 @@ } } - if (xf86LoaderCheckSymbol("vgaHWFreeHWRec")) + if (info->VGAAccess && xf86LoaderCheckSymbol("vgaHWFreeHWRec")) vgaHWFreeHWRec(pScrn); RADEONFreeRec(pScrn); } Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon.man =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon.man 2004-09-04 09:26:19.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon.man 2005-04-12 14:37:58.000000000 +1000 @@ -494,6 +494,17 @@ with this enabled. The default is .B off. .TP +.BI "Option \*qVGAAccess\*q \*q" boolean \*q +Tell the driver if it can do legacy VGA IOs to the card. This is +necessary for properly resuming consoles when in VGA text mode, but +shouldn't be if the console is using radeonfb or some other graphic +mode driver. Some platforms like PowerPC have issues with those, and they aren't +necessary unless you have a real text mode in console. The default is +.B off +on PowerPC and +.B on +on other architectures. +.TP .SH SEE ALSO __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon.h =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon.h 2005-01-25 14:20:12.000000000 +1100 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon.h 2005-04-12 14:37:58.000000000 +1000 @@ -596,6 +596,8 @@ /* special handlings for DELL triple-head server */ Bool IsDellServer; + + Bool VGAAccess; } RADEONInfoRec, *RADEONInfoPtr; xorg-x11-6.8.2-radeon-pll-errata-workarounds.patch: radeon.h | 16 +++++ radeon_accel.c | 6 +- radeon_driver.c | 157 +++++++++++++++++++++++++++++++++++++------------------- radeon_macros.h | 10 --- radeon_video.c | 9 +-- 5 files changed, 132 insertions(+), 66 deletions(-) --- NEW FILE xorg-x11-6.8.2-radeon-pll-errata-workarounds.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 16:42:38.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 16:45:43.000000000 +1000 @@ -691,24 +691,49 @@ return TRUE; } -/* This function is required to workaround a hardware bug in some (all?) - * revisions of the R300. This workaround should be called after every - * CLOCK_CNTL_INDEX register access. If not, register reads afterward - * may not be correct. - */ -void R300CGWorkaround(ScrnInfoPtr pScrn) { - RADEONInfoPtr info = RADEONPTR(pScrn); +void RADEONPllErrataAfterIndex(RADEONInfoPtr info) +{ unsigned char *RADEONMMIO = info->MMIO; - CARD32 save, tmp; + + if (!(info->ChipErrata & CHIP_ERRATA_PLL_DUMMYREADS)) + return; - save = INREG(RADEON_CLOCK_CNTL_INDEX); - tmp = save & ~(0x3f | RADEON_PLL_WR_EN); - OUTREG(RADEON_CLOCK_CNTL_INDEX, tmp); - tmp = INREG(RADEON_CLOCK_CNTL_DATA); - OUTREG(RADEON_CLOCK_CNTL_INDEX, save); + /* This workaround is necessary on rv200 and RS200 or PLL + * reads may return garbage (among others...) + */ + (void)INREG(RADEON_CLOCK_CNTL_DATA); + (void)INREG(RADEON_CRTC_GEN_CNTL); } -/* Read PLL information */ +void RADEONPllErrataAfterData(RADEONInfoPtr info) +{ + unsigned char *RADEONMMIO = info->MMIO; + + /* This workarounds is necessary on RV100, RS100 and RS200 chips + * or the chip could hang on a subsequent access + */ + if (info->ChipErrata & CHIP_ERRATA_PLL_DELAY) { + /* we can't deal with posted writes here ... */ + usleep(5000); + } + + /* This function is required to workaround a hardware bug in some (all?) + * revisions of the R300. This workaround should be called after every + * CLOCK_CNTL_INDEX register access. If not, register reads afterward + * may not be correct. + */ + if (info->ChipErrata & CHIP_ERRATA_R300_CG) { + CARD32 save, tmp; + + save = INREG(RADEON_CLOCK_CNTL_INDEX); + tmp = save & ~(0x3f | RADEON_PLL_WR_EN); + OUTREG(RADEON_CLOCK_CNTL_INDEX, tmp); + tmp = INREG(RADEON_CLOCK_CNTL_DATA); + OUTREG(RADEON_CLOCK_CNTL_INDEX, save); + } +} + +/* Read PLL register */ unsigned RADEONINPLL(ScrnInfoPtr pScrn, int addr) { RADEONInfoPtr info = RADEONPTR(pScrn); @@ -716,12 +741,27 @@ CARD32 data; OUTREG8(RADEON_CLOCK_CNTL_INDEX, addr & 0x3f); + RADEONPllErrataAfterIndex(info); data = INREG(RADEON_CLOCK_CNTL_DATA); - if (info->R300CGWorkaround) R300CGWorkaround(pScrn); + RADEONPllErrataAfterData(info); return data; } +/* Write PLL information */ +void RADEONOUTPLL(ScrnInfoPtr pScrn, int addr, CARD32 data) +{ + RADEONInfoPtr info = RADEONPTR(pScrn); + unsigned char *RADEONMMIO = info->MMIO; + + OUTREG8(RADEON_CLOCK_CNTL_INDEX, (((addr) & 0x3f) | + RADEON_PLL_WR_EN)); + RADEONPllErrataAfterIndex(info); + OUTREG(RADEON_CLOCK_CNTL_DATA, data); + RADEONPllErrataAfterData(info); +} + + #if 0 /* Read PAL information (only used for debugging) */ static int RADEONINPAL(int idx) @@ -1267,6 +1307,7 @@ } ppll_div_sel = INREG8(RADEON_CLOCK_CNTL_INDEX + 1) & 0x3; + RADEONPllErrataAfterIndex(info); n = (INPLL(pScrn, RADEON_PPLL_DIV_0 + ppll_div_sel) & 0x7ff); m = (INPLL(pScrn, RADEON_PPLL_REF_DIV) & 0x3ff); @@ -2536,10 +2577,22 @@ info1->MergedFB = FALSE; } - info->R300CGWorkaround = - (info->ChipFamily == CHIP_FAMILY_R300 && - (INREG(RADEON_CONFIG_CNTL) & RADEON_CFG_ATI_REV_ID_MASK) - == RADEON_CFG_ATI_REV_A11); + /* Check chip errata */ + info->ChipErrata = 0; + + if (info->ChipFamily == CHIP_FAMILY_R300 && + (INREG(RADEON_CONFIG_CNTL) & RADEON_CFG_ATI_REV_ID_MASK) + == RADEON_CFG_ATI_REV_A11) + info->ChipErrata |= CHIP_ERRATA_R300_CG; + + if (info->ChipFamily == CHIP_FAMILY_RV200 || + info->ChipFamily == CHIP_FAMILY_RS200) + info->ChipErrata |= CHIP_ERRATA_PLL_DUMMYREADS; + + if (info->ChipFamily == CHIP_FAMILY_RV100 || + info->ChipFamily == CHIP_FAMILY_RS100 || + info->ChipFamily == CHIP_FAMILY_RS200) + info->ChipErrata |= CHIP_ERRATA_PLL_DELAY; info->MemCntl = INREG(RADEON_SDRAM_MODE_REG); info->BusCntl = INREG(RADEON_BUS_CNTL); @@ -5380,7 +5433,7 @@ if (info->IsMobility || info->IsIGP) { if (!(restore->lvds_gen_cntl & RADEON_LVDS_ON)) { - OUTPLL(RADEON_PIXCLKS_CNTL, tmpPixclksCntl); + OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmpPixclksCntl); } } } @@ -5458,6 +5511,7 @@ OUTREGP(RADEON_CLOCK_CNTL_INDEX, RADEON_PLL_DIV_SEL, ~(RADEON_PLL_DIV_SEL)); + RADEONPllErrataAfterIndex(info); return; } } @@ -5478,6 +5532,7 @@ OUTREGP(RADEON_CLOCK_CNTL_INDEX, RADEON_PLL_DIV_SEL, ~(RADEON_PLL_DIV_SEL)); + RADEONPllErrataAfterIndex(info); if (IS_R300_VARIANT || (info->ChipFamily == CHIP_FAMILY_RS300)) { @@ -5511,7 +5566,7 @@ RADEONPLLWriteUpdate(pScrn); RADEONPLLWaitForReadUpdateComplete(pScrn); - OUTPLL(RADEON_HTOTAL_CNTL, restore->htotal_cntl); + OUTPLL(pScrn, RADEON_HTOTAL_CNTL, restore->htotal_cntl); OUTPLLP(pScrn, RADEON_PPLL_CNTL, 0, @@ -5573,7 +5628,7 @@ RADEONPLL2WriteUpdate(pScrn); RADEONPLL2WaitForReadUpdateComplete(pScrn); - OUTPLL(RADEON_HTOTAL2_CNTL, restore->htotal_cntl2); + OUTPLL(pScrn, RADEON_HTOTAL2_CNTL, restore->htotal_cntl2); OUTPLLP(pScrn, RADEON_P2PLL_CNTL, 0, @@ -5933,7 +5988,7 @@ save->dp_datatype = INREG(RADEON_DP_DATATYPE); save->rbbm_soft_reset = INREG(RADEON_RBBM_SOFT_RESET); save->clock_cntl_index = INREG(RADEON_CLOCK_CNTL_INDEX); - if (info->R300CGWorkaround) R300CGWorkaround(pScrn); + RADEONPllErrataAfterIndex(info); } RADEONSaveMode(pScrn, save); @@ -5960,7 +6015,7 @@ RADEONBlank(pScrn); OUTREG(RADEON_CLOCK_CNTL_INDEX, restore->clock_cntl_index); - if (info->R300CGWorkaround) R300CGWorkaround(pScrn); + RADEONPllErrataAfterIndex(info); OUTREG(RADEON_RBBM_SOFT_RESET, restore->rbbm_soft_reset); OUTREG(RADEON_DP_DATATYPE, restore->dp_datatype); OUTREG(RADEON_GRPH_BUFFER_CNTL, restore->grph_buffer_cntl); @@ -7791,7 +7846,7 @@ ~(RADEON_LVDS_BLON | RADEON_LVDS_ON)); if (info->IsMobility || info->IsIGP) { - OUTPLL(RADEON_PIXCLKS_CNTL, tmpPixclksCntl); + OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmpPixclksCntl); } } else if (info->DisplayType == MT_CRT) { if ((pRADEONEnt->HasSecondary) || info->MergedFB) { @@ -8012,14 +8067,14 @@ RADEON_SCLK_FORCE_RE | RADEON_SCLK_FORCE_PB | RADEON_SCLK_FORCE_TAM | RADEON_SCLK_FORCE_TDM | RADEON_SCLK_FORCE_RB); - OUTPLL(RADEON_SCLK_CNTL, tmp); + OUTPLL(pScrn, RADEON_SCLK_CNTL, tmp); } else if (info->ChipFamily == CHIP_FAMILY_RV350) { /* for RV350/M10, no delays are required. */ tmp = INPLL(pScrn, R300_SCLK_CNTL2); tmp |= (R300_SCLK_FORCE_TCL | R300_SCLK_FORCE_GA | R300_SCLK_FORCE_CBA); - OUTPLL(R300_SCLK_CNTL2, tmp); + OUTPLL(pScrn, R300_SCLK_CNTL2, tmp); tmp = INPLL(pScrn, RADEON_SCLK_CNTL); tmp |= (RADEON_SCLK_FORCE_DISP2 | RADEON_SCLK_FORCE_CP | @@ -8030,11 +8085,11 @@ R300_SCLK_FORCE_PX | R300_SCLK_FORCE_TX | R300_SCLK_FORCE_US | RADEON_SCLK_FORCE_TV_SCLK | R300_SCLK_FORCE_SU | RADEON_SCLK_FORCE_OV0); - OUTPLL(RADEON_SCLK_CNTL, tmp); + OUTPLL(pScrn, RADEON_SCLK_CNTL, tmp); tmp = INPLL(pScrn, RADEON_SCLK_MORE_CNTL); tmp |= RADEON_SCLK_MORE_FORCEON; - OUTPLL(RADEON_SCLK_MORE_CNTL, tmp); + OUTPLL(pScrn, RADEON_SCLK_MORE_CNTL, tmp); tmp = INPLL(pScrn, RADEON_MCLK_CNTL); tmp |= (RADEON_FORCEON_MCLKA | @@ -8042,13 +8097,13 @@ RADEON_FORCEON_YCLKA | RADEON_FORCEON_YCLKB | RADEON_FORCEON_MC); - OUTPLL(RADEON_MCLK_CNTL, tmp); + OUTPLL(pScrn, RADEON_MCLK_CNTL, tmp); tmp = INPLL(pScrn, RADEON_VCLK_ECP_CNTL); tmp &= ~(RADEON_PIXCLK_ALWAYS_ONb | RADEON_PIXCLK_DAC_ALWAYS_ONb | R300_DISP_DAC_PIXCLK_DAC_BLANK_OFF); - OUTPLL(RADEON_VCLK_ECP_CNTL, tmp); + OUTPLL(pScrn, RADEON_VCLK_ECP_CNTL, tmp); tmp = INPLL(pScrn, RADEON_PIXCLKS_CNTL); tmp &= ~(RADEON_PIX2CLK_ALWAYS_ONb | @@ -8065,7 +8120,7 @@ R300_P2G2CLK_ALWAYS_ONb | R300_P2G2CLK_ALWAYS_ONb | R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF); - OUTPLL(RADEON_PIXCLKS_CNTL, tmp); + OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp); } else { tmp = INPLL(pScrn, RADEON_SCLK_CNTL); tmp |= (RADEON_SCLK_FORCE_CP | RADEON_SCLK_FORCE_E2); @@ -8102,7 +8157,7 @@ tmp |= ( R300_SCLK_FORCE_TCL | R300_SCLK_FORCE_GA | R300_SCLK_FORCE_CBA); - OUTPLL(R300_SCLK_CNTL2, tmp); + OUTPLL(pScrn, R300_SCLK_CNTL2, tmp); usleep(16000); } @@ -8119,7 +8174,7 @@ (info->ChipFamily == CHIP_FAMILY_RV280)) { tmp = INPLL(pScrn, RADEON_SCLK_MORE_CNTL); tmp |= RADEON_SCLK_MORE_FORCEON; - OUTPLL(RADEON_SCLK_MORE_CNTL, tmp); + OUTPLL(pScrn, RADEON_SCLK_MORE_CNTL, tmp); usleep(16000); } @@ -8138,7 +8193,7 @@ tmp = INPLL(pScrn, RADEON_VCLK_ECP_CNTL); tmp &= ~(RADEON_PIXCLK_ALWAYS_ONb | RADEON_PIXCLK_DAC_ALWAYS_ONb); - OUTPLL(RADEON_VCLK_ECP_CNTL, tmp); + OUTPLL(pScrn, RADEON_VCLK_ECP_CNTL, tmp); } xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Dynamic Clock Scaling Disabled\n"); break; @@ -8154,7 +8209,7 @@ RADEON_SCLK_FORCE_IDCT | RADEON_SCLK_FORCE_RE | RADEON_SCLK_FORCE_PB | RADEON_SCLK_FORCE_TAM | RADEON_SCLK_FORCE_TDM); - OUTPLL (RADEON_SCLK_CNTL, tmp); + OUTPLL(pScrn, RADEON_SCLK_CNTL, tmp); } else if ((info->ChipFamily == CHIP_FAMILY_R300) || (info->ChipFamily == CHIP_FAMILY_R350) || (info->ChipFamily == CHIP_FAMILY_RV350)) { @@ -8166,7 +8221,7 @@ tmp |= (R300_SCLK_TCL_MAX_DYN_STOP_LAT | R300_SCLK_GA_MAX_DYN_STOP_LAT | R300_SCLK_CBA_MAX_DYN_STOP_LAT); - OUTPLL(R300_SCLK_CNTL2, tmp); + OUTPLL(pScrn, R300_SCLK_CNTL2, tmp); tmp = INPLL(pScrn, RADEON_SCLK_CNTL); tmp &= ~(RADEON_SCLK_FORCE_DISP2 | RADEON_SCLK_FORCE_CP | @@ -8178,17 +8233,17 @@ R300_SCLK_FORCE_US | RADEON_SCLK_FORCE_TV_SCLK | R300_SCLK_FORCE_SU | RADEON_SCLK_FORCE_OV0); tmp |= RADEON_DYN_STOP_LAT_MASK; - OUTPLL(RADEON_SCLK_CNTL, tmp); + OUTPLL(pScrn, RADEON_SCLK_CNTL, tmp); tmp = INPLL(pScrn, RADEON_SCLK_MORE_CNTL); tmp &= ~RADEON_SCLK_MORE_FORCEON; tmp |= RADEON_SCLK_MORE_MAX_DYN_STOP_LAT; - OUTPLL(RADEON_SCLK_MORE_CNTL, tmp); + OUTPLL(pScrn, RADEON_SCLK_MORE_CNTL, tmp); tmp = INPLL(pScrn, RADEON_VCLK_ECP_CNTL); tmp |= (RADEON_PIXCLK_ALWAYS_ONb | RADEON_PIXCLK_DAC_ALWAYS_ONb); - OUTPLL(RADEON_VCLK_ECP_CNTL, tmp); + OUTPLL(pScrn, RADEON_VCLK_ECP_CNTL, tmp); tmp = INPLL(pScrn, RADEON_PIXCLKS_CNTL); tmp |= (RADEON_PIX2CLK_ALWAYS_ONb | @@ -8204,12 +8259,12 @@ R300_PIXCLK_TVO_ALWAYS_ONb | R300_P2G2CLK_ALWAYS_ONb | R300_P2G2CLK_ALWAYS_ONb); - OUTPLL(RADEON_PIXCLKS_CNTL, tmp); + OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp); tmp = INPLL(pScrn, RADEON_MCLK_MISC); tmp |= (RADEON_MC_MCLK_DYN_ENABLE | RADEON_IO_MCLK_DYN_ENABLE); - OUTPLL(RADEON_MCLK_MISC, tmp); + OUTPLL(pScrn, RADEON_MCLK_MISC, tmp); tmp = INPLL(pScrn, RADEON_MCLK_CNTL); tmp |= (RADEON_FORCEON_MCLKA | @@ -8238,19 +8293,19 @@ } } - OUTPLL(RADEON_MCLK_CNTL, tmp); + OUTPLL(pScrn, RADEON_MCLK_CNTL, tmp); } else { tmp = INPLL(pScrn, RADEON_SCLK_CNTL); tmp &= ~(R300_SCLK_FORCE_VAP); tmp |= RADEON_SCLK_FORCE_CP; - OUTPLL(RADEON_SCLK_CNTL, tmp); + OUTPLL(pScrn, RADEON_SCLK_CNTL, tmp); usleep(15000); tmp = INPLL(pScrn, R300_SCLK_CNTL2); tmp &= ~(R300_SCLK_FORCE_TCL | R300_SCLK_FORCE_GA | R300_SCLK_FORCE_CBA); - OUTPLL(R300_SCLK_CNTL2, tmp); + OUTPLL(pScrn, R300_SCLK_CNTL2, tmp); } } else { tmp = INPLL(pScrn, RADEON_CLK_PWRMGT_CNTL); @@ -8261,12 +8316,12 @@ tmp |= (RADEON_ENGIN_DYNCLK_MODE | (0x01 << RADEON_ACTIVE_HILO_LAT_SHIFT)); - OUTPLL(RADEON_CLK_PWRMGT_CNTL, tmp); + OUTPLL(pScrn, RADEON_CLK_PWRMGT_CNTL, tmp); usleep(15000); tmp = INPLL(pScrn, RADEON_CLK_PIN_CNTL); tmp |= RADEON_SCLK_DYN_START_CNTL; - OUTPLL(RADEON_CLK_PIN_CNTL, tmp); + OUTPLL(pScrn, RADEON_CLK_PIN_CNTL, tmp); usleep(15000); /* When DRI is enabled, setting DYN_STOP_LAT to zero can cause some R200 @@ -8287,7 +8342,7 @@ tmp |= RADEON_SCLK_FORCE_VIP; } - OUTPLL(RADEON_SCLK_CNTL, tmp); + OUTPLL(pScrn, RADEON_SCLK_CNTL, tmp); if ((info->ChipFamily == CHIP_FAMILY_RV200) || (info->ChipFamily == CHIP_FAMILY_RV250) || @@ -8302,7 +8357,7 @@ RADEON_CFG_ATI_REV_A13)) { tmp |= RADEON_SCLK_MORE_FORCEON; } - OUTPLL(RADEON_SCLK_MORE_CNTL, tmp); + OUTPLL(pScrn, RADEON_SCLK_MORE_CNTL, tmp); usleep(15000); } @@ -8327,14 +8382,14 @@ RADEON_PIXCLK_LVDS_ALWAYS_ONb | RADEON_PIXCLK_TMDS_ALWAYS_ONb); - OUTPLL(RADEON_PIXCLKS_CNTL, tmp); + OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmp); usleep(15000); tmp = INPLL(pScrn, RADEON_VCLK_ECP_CNTL); tmp |= (RADEON_PIXCLK_ALWAYS_ONb | RADEON_PIXCLK_DAC_ALWAYS_ONb); - OUTPLL(RADEON_VCLK_ECP_CNTL, tmp); + OUTPLL(pScrn, RADEON_VCLK_ECP_CNTL, tmp); usleep(15000); } xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Dynamic Clock Scaling Enabled\n"); Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon.h =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon.h 2005-04-12 16:40:48.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon.h 2005-04-12 16:42:39.000000000 +1000 @@ -273,6 +273,16 @@ (info->ChipFamily == CHIP_FAMILY_RV380) || \ (info->ChipFamily == CHIP_FAMILY_R420)) +/* + * Errata workarounds + */ +typedef enum { + CHIP_ERRATA_R300_CG = 0x00000001, + CHIP_ERRATA_PLL_DUMMYREADS = 0x00000002, + CHIP_ERRATA_PLL_DELAY = 0x00000004 +} RADEONErrata; + + typedef struct { CARD32 freq; @@ -285,6 +295,7 @@ PCITAG PciTag; int Chipset; RADEONChipFamily ChipFamily; + RADEONErrata ChipErrata; Bool FBDev; @@ -623,6 +634,8 @@ extern void RADEONEngineRestore(ScrnInfoPtr pScrn); extern unsigned RADEONINPLL(ScrnInfoPtr pScrn, int addr); +extern void RADEONOUTPLL(ScrnInfoPtr pScrn, int addr, CARD32 data); + extern void RADEONWaitForVerticalSync(ScrnInfoPtr pScrn); extern void RADEONWaitForVerticalSync2(ScrnInfoPtr pScrn); @@ -640,6 +653,9 @@ extern void RADEONResetVideo(ScrnInfoPtr pScrn); extern void R300CGWorkaround(ScrnInfoPtr pScrn); +extern void RADEONPllErrataAfterIndex(RADEONInfoPtr info); +extern void RADEONPllErrataAfterData(RADEONInfoPtr info); + #ifdef XF86DRI extern void RADEONAccelInitCP(ScreenPtr pScreen, XAAInfoRecPtr a); extern Bool RADEONDRIScreenInit(ScreenPtr pScreen); Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_macros.h =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_macros.h 2005-04-12 16:40:48.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_macros.h 2005-04-12 16:42:39.000000000 +1000 @@ -84,19 +84,14 @@ #define INPLL(pScrn, addr) RADEONINPLL(pScrn, addr) -#define OUTPLL(addr, val) \ -do { \ - OUTREG8(RADEON_CLOCK_CNTL_INDEX, (((addr) & 0x3f) | \ - RADEON_PLL_WR_EN)); \ - OUTREG(RADEON_CLOCK_CNTL_DATA, val); \ -} while (0) +#define OUTPLL(pScrn, addr, val) RADEONOUTPLL(pScrn, addr, val) #define OUTPLLP(pScrn, addr, val, mask) \ do { \ CARD32 tmp_ = INPLL(pScrn, addr); \ tmp_ &= (mask); \ tmp_ |= (val); \ - OUTPLL(addr, tmp_); \ + OUTPLL(pScrn, addr, tmp_); \ } while (0) #define OUTPAL_START(idx) \ @@ -138,5 +133,4 @@ } \ } while (0) - #endif Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c 2005-04-12 14:37:58.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c 2005-04-12 16:47:51.000000000 +1000 @@ -877,8 +877,8 @@ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Dotclock is %g Mhz, setting ecp_div to %d\n", info->ModeReg.dot_clock_freq/100.0, pPriv->ecp_div); #endif - OUTPLL(RADEON_VCLK_ECP_CNTL, (INPLL(pScrn, RADEON_VCLK_ECP_CNTL) & - 0xfffffCff) | (pPriv->ecp_div << 8)); + OUTPLL(pScrn, RADEON_VCLK_ECP_CNTL, (INPLL(pScrn, RADEON_VCLK_ECP_CNTL) & + 0xfffffCff) | (pPriv->ecp_div << 8)); /* I suspect we may need a usleep after writing to the PLL. if you play a video too soon after switching crtcs in mergedfb clone mode you get a temporary one pixel line of colorkey @@ -890,7 +890,8 @@ (info->ChipFamily == CHIP_FAMILY_RS300)) { /* Force the overlay clock on for integrated chips */ - OUTPLL(RADEON_VCLK_ECP_CNTL, (INPLL(pScrn, RADEON_VCLK_ECP_CNTL) | (1<<18))); + OUTPLL(pScrn, RADEON_VCLK_ECP_CNTL, + (INPLL(pScrn, RADEON_VCLK_ECP_CNTL) | (1<<18))); } info->adaptor = adapt; @@ -1312,7 +1313,7 @@ else ecp_div = 1; - OUTPLL(RADEON_VCLK_ECP_CNTL, (INPLL(pScrn, RADEON_VCLK_ECP_CNTL) & 0xfffffCff) | (ecp_div << 8)); + OUTPLL(pScrn, RADEON_VCLK_ECP_CNTL, (INPLL(pScrn, RADEON_VCLK_ECP_CNTL) & 0xfffffCff) | (ecp_div << 8)); /* I suspect we may need a usleep after writing to the PLL. if you play a video too soon after switching crtcs in mergedfb clone mode you get a temporary one pixel line of colorkey Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c 2005-04-12 15:57:37.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c 2005-04-12 16:46:29.000000000 +1000 @@ -171,7 +171,7 @@ RADEONEngineFlush(pScrn); clock_cntl_index = INREG(RADEON_CLOCK_CNTL_INDEX); - if (info->R300CGWorkaround) R300CGWorkaround(pScrn); + RADEONPllErrataAfterIndex(info); #if 0 /* taken care of by new PM code */ /* Some ASICs have bugs with dynamic-on feature, which are @@ -249,8 +249,8 @@ OUTREG(RADEON_RBBM_SOFT_RESET, rbbm_soft_reset); OUTREG(RADEON_CLOCK_CNTL_INDEX, clock_cntl_index); - OUTPLL(RADEON_MCLK_CNTL, mclk_cntl); - if (info->R300CGWorkaround) R300CGWorkaround(pScrn); + RADEONPllErrataAfterIndex(info); + OUTPLL(pScrn, RADEON_MCLK_CNTL, mclk_cntl); } /* Restore the acceleration hardware to its previous state */ xorg-x11-6.8.2-radeon-pll2-tmds-no-odd-value.patch: radeon_driver.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) --- NEW FILE xorg-x11-6.8.2-radeon-pll2-tmds-no-odd-value.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:57:59.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:59:59.000000000 +1000 @@ -6940,7 +6940,7 @@ /* Define PLL2 registers for requested video mode */ static void RADEONInitPLL2Registers(RADEONSavePtr save, RADEONPLLPtr pll, - double dot_clock) + double dot_clock, int no_odd_postdiv) { unsigned long freq = dot_clock * 100; @@ -6967,6 +6967,11 @@ if (freq * 12 < pll->min_pll_freq) freq = pll->min_pll_freq / 12; for (post_div = &post_divs[0]; post_div->divider; ++post_div) { + /* Odd post divider value don't work properly on the second digital + * output + */ + if (no_odd_postdiv && (post_div->divider & 1)) + continue; save->pll_output_freq_2 = post_div->divider * freq; if (save->pll_output_freq_2 >= pll->min_pll_freq && save->pll_output_freq_2 <= pll->max_pll_freq) break; @@ -7067,7 +7072,7 @@ if (info->IsSecondary) { if (!RADEONInitCrtc2Registers(pScrn, save, mode, info)) return FALSE; - RADEONInitPLL2Registers(save, &info->pll, dot_clock); + RADEONInitPLL2Registers(save, &info->pll, dot_clock, info->DisplayType != MT_CRT); } else if (info->MergedFB) { RADEONInitCommonRegisters(save, info); if (!RADEONInitCrtcRegisters(pScrn, save, @@ -7084,7 +7089,7 @@ RADEONInitCrtc2Registers(pScrn, save, ((RADEONMergedDisplayModePtr)mode->Private)->CRT2, info); dot_clock = (((RADEONMergedDisplayModePtr)mode->Private)->CRT2)->Clock / 1000.0; - RADEONInitPLL2Registers(save, &info->pll, dot_clock); + RADEONInitPLL2Registers(save, &info->pll, dot_clock, info->MergeType != MT_CRT); } else { if (!RADEONInitCrtcRegisters(pScrn, save, mode, info)) return FALSE; xorg-x11-6.8.2-radeon-release-i2c-lines.patch: radeon_driver.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE xorg-x11-6.8.2-radeon-release-i2c-lines.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 16:45:43.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 16:50:21.000000000 +1000 @@ -985,6 +985,9 @@ MonType = MT_NONE; } + OUTREG(info->DDCReg, INREG(info->DDCReg) & + ~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1)); + if (*MonInfo) { if ((*MonInfo)->rawData[0x14] & 0x80) { /* Note some laptops have a DVI output that uses internal TMDS, xorg-x11-6.8.2-radeon-reverse-ddc-option.patch: radeon.man | 7 +++++++ radeon_driver.c | 10 ++++++++++ 2 files changed, 17 insertions(+) --- NEW FILE xorg-x11-6.8.2-radeon-reverse-ddc-option.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:59:59.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 16:02:39.000000000 +1000 @@ -165,6 +165,7 @@ #endif OPTION_SHOWCACHE, OPTION_VGA_ACCESS, + OPTION_REVERSE_DDC, OPTION_DYNAMIC_CLOCKS } RADEONOpts; @@ -211,6 +212,7 @@ { OPTION_SHOWCACHE, "ShowCache", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_DYNAMIC_CLOCKS, "DynamicClocks", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_VGA_ACCESS, "VGAAccess", OPTV_BOOLEAN, {0}, TRUE }, + { OPTION_REVERSE_DDC, "ReverseDDC", OPTV_BOOLEAN, {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE } }; @@ -1706,6 +1708,14 @@ pRADEONEnt->PortInfo[1].DACType = DAC_PRIMARY; pRADEONEnt->PortInfo[1].TMDSType = TMDS_EXT; pRADEONEnt->PortInfo[1].ConnectorType = CONNECTOR_CRT; + + /* Some cards have the DDC lines swapped and we have no way to + * detect it yet (Mac cards) + */ + if (xf86ReturnOptValBool(info->Options, OPTION_REVERSE_DDC, FALSE)) { + pRADEONEnt->PortInfo[0].DDCType = DDC_VGA; + pRADEONEnt->PortInfo[1].DDCType = DDC_DVI; + } } /* always make TMDS_INT port first*/ Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon.man =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon.man 2005-04-12 14:37:58.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon.man 2005-04-12 16:03:23.000000000 +1000 @@ -505,6 +505,13 @@ .B on on other architectures. .TP +.BI "Option \*qReverseDDC\*q \*q" boolean \*q +When BIOS connector informations aren't available, use this option to +reverse the mapping of the 2 main DDC ports. Use this if the X serve +obviously detects the wrong display for each connector. This is +typically needed on the Radeon 9600 cards bundled with Apple G5s. The +default is +.B off. .SH SEE ALSO __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) xorg-x11-6.8.2-radeon-surface-cntl-dual-head.patch: radeon_accel.c | 5 +---- radeon_driver.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) --- NEW FILE xorg-x11-6.8.2-radeon-surface-cntl-dual-head.patch --- Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:51:39.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-04-12 15:57:59.000000000 +1000 @@ -6632,6 +6632,23 @@ } + /* We must set SURFACE_CNTL properly on the second screen too */ + save->surface_cntl = 0; +#if X_BYTE_ORDER == X_BIG_ENDIAN + /* Alhought we current onlu use aperture 0, also setting aperture 1 should not harm -ReneR */ + switch (pScrn->bitsPerPixel) { + case 16: + save->surface_cntl |= RADEON_NONSURF_AP0_SWP_16BPP; + save->surface_cntl |= RADEON_NONSURF_AP1_SWP_16BPP; + break; + + case 32: + save->surface_cntl |= RADEON_NONSURF_AP0_SWP_32BPP; + save->surface_cntl |= RADEON_NONSURF_AP1_SWP_32BPP; + break; + } +#endif + RADEONTRACE(("Pitch = %d bytes (virtualX = %d, displayWidth = %d)\n", save->crtc2_pitch, pScrn->virtualX, info->CurrentLayout.displayWidth)); Index: xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c =================================================================== --- xc-STABLE.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c 2005-04-12 14:37:58.000000000 +1000 +++ xc-STABLE/programs/Xserver/hw/xfree86/drivers/ati/radeon_accel.c 2005-04-12 15:57:37.000000000 +1000 @@ -291,10 +291,7 @@ OUTREGP(RADEON_DP_DATATYPE, 0, ~RADEON_HOST_BIG_ENDIAN_EN); #endif - /* Restore SURFACE_CNTL - only the first head contains valid data -ReneR */ - if (!info->IsSecondary) { - OUTREG(RADEON_SURFACE_CNTL, info->ModeReg.surface_cntl); - } + OUTREG(RADEON_SURFACE_CNTL, info->ModeReg.surface_cntl); RADEONWaitForFifo(pScrn, 1); OUTREG(RADEON_DEFAULT_SC_BOTTOM_RIGHT, (RADEON_DEFAULT_SC_RIGHT_MAX Index: xorg-x11.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v retrieving revision 1.193 retrieving revision 1.193.2.1 diff -u -r1.193 -r1.193.2.1 --- xorg-x11.spec 30 Apr 2005 17:48:54 -0000 1.193 +++ xorg-x11.spec 4 May 2005 08:45:19 -0000 1.193.2.1 @@ -18,7 +18,7 @@ Name: xorg-x11 Version: 6.8.2 -Release: 30 +Release: 30.radeon.1 #Release: 1.FC3.29 %define build_mharris_mode 0 @@ -472,7 +472,23 @@ # to the behavior we had pre-6.8.2. It's not the right patch going # forward, but until the dynamic clocks code is fixed properly, let's # stick to something that works. -Patch9335: xorg-x11-6.8.1-ati-radeon-dynamic-clocks-fix-2.patch +# Patch9335: xorg-x11-6.8.1-ati-radeon-dynamic-clocks-fix-2.patch + +# Bah. Fix the radeon code properly... perhaps. +# Patches from http://gate.crashing.org/~benh/xorg/ +Patch9400: xorg-x11-6.8.2-radeon-no-vga.patch +Patch9401: xorg-x11-6.8.2-radeon-fix-crtc2-offset-cntl.patch +Patch9402: xorg-x11-6.8.2-radeon-fix-pll-probing.patch +Patch9403: xorg-x11-6.8.2-radeon-display-bandwidth-calc-fix.patch +Patch9404: xorg-x11-6.8.2-radeon-fix-mergedfb-bios-dividers.patch +Patch9405: xorg-x11-6.8.2-radeon-surface-cntl-dual-head.patch +Patch9406: xorg-x11-6.8.2-radeon-pll2-tmds-no-odd-value.patch +Patch9407: xorg-x11-6.8.2-radeon-reverse-ddc-option.patch +Patch9408: xorg-x11-6.8.2-radeon-lvds-probe-pll.patch +Patch9409: xorg-x11-6.8.2-radeon-fix-divider-select.patch +Patch9410: xorg-x11-6.8.2-radeon-pll-errata-workarounds.patch +Patch9411: xorg-x11-6.8.2-radeon-release-i2c-lines.patch +Patch9412: xorg-x11-6.8.2-radeon-fix-one-mode-ddc.patch # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently). # Once a patch is determined to be safe to apply to other releases, it can @@ -1148,7 +1164,24 @@ %patch9333 -p0 -b .xpm-security-fix-CAN-2005-0605 %patch9334 -p0 -b .xorg.conf.man-dont-refer-to-nonexisting-example -%patch9335 -p0 -b .ati-radeon-dynamic-clocks-fix-2 +#%patch9335 -p0 -b .ati-radeon-dynamic-clocks-fix-2 + +cd xc +%patch9400 -p1 -b .radeon-no-vga +%patch9401 -p1 -b .radeon-fix-crtc2-offset-cntl +%patch9402 -p1 -b .radeon-fix-pll-probing +%patch9403 -p1 -b .radeon-display-bandwidth-calc-fix +%patch9404 -p1 -b .radeon-fix-mergedfb-bios-dividers +%patch9405 -p1 -b .radeon-surface-cntl-dual-head +%patch9406 -p1 -b .radeon-pll2-tmds-no-odd-value +%patch9407 -p1 -b .radeon-reverse-ddc-option +%patch9408 -p1 -b .radeon-lvds-probe-pll +%patch9409 -p1 -b .radeon-fix-divider-select +%patch9410 -p1 -b .radeon-pll-errata-workarounds +# Also patch9500 +#%patch9411 -p1 -b .radeon-release-i2c-lines +%patch9412 -p1 -b .radeon-fix-one-mode-ddc +cd .. # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently) %if %{build_fc4} @@ -3613,6 +3646,10 @@ [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 4 2005 David Woodhouse 6.8.2-30.radeon.1 +- Disable ati-radeon-dynamic-clocks-fix-2.patch and add BenH's patches + to attempt to fix the problem (and others) properly. + * Sat Apr 30 2005 Mike A. Harris 6.8.2-30 - Disabled xfs.init-fc4-startearly.patch as it breaks systems that /usr is on NFS. (FC4Blocker #156413) From fedora-cvs-commits at redhat.com Wed May 4 08:45:57 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 04:45:57 -0400 Subject: rpms/xorg-x11/devel Makefile,1.2,1.2.2.1 Message-ID: <200505040845.j448jvqQ022426@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/xorg-x11/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22414 Modified Files: Tag: private-fc4-radeon-branch Makefile Log Message: set collection Index: Makefile =================================================================== RCS file: /cvs/dist/rpms/xorg-x11/devel/Makefile,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- Makefile 9 Sep 2004 20:13:02 -0000 1.2 +++ Makefile 4 May 2005 08:45:55 -0000 1.2.2.1 @@ -2,6 +2,7 @@ # $Id$ NAME := xorg-x11 SPECFILE = $(firstword $(wildcard *.spec)) +COLLECTION := dist-fc4-scratch include ../common/Makefile.common From fedora-cvs-commits at redhat.com Wed May 4 08:52:02 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 04:52:02 -0400 Subject: rpms/net-snmp/devel net-snmp-5.2.1-ethtool.patch, NONE, 1.1 net-snmp.spec, 1.40, 1.41 Message-ID: <200505040852.j448q2Hp022532@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22518 Modified Files: net-snmp.spec Added Files: net-snmp-5.2.1-ethtool.patch Log Message: - report gigabit Ethernet speeds using Ethtool (#152480) net-snmp-5.2.1-ethtool.patch: interface_linux.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 2 deletions(-) --- NEW FILE net-snmp-5.2.1-ethtool.patch --- --- net-snmp-5.2.1/agent/mibgroup/if-mib/data_access/interface_linux.c.ethtool 2004-10-18 05:49:50.000000000 +0200 +++ net-snmp-5.2.1/agent/mibgroup/if-mib/data_access/interface_linux.c 2005-05-04 10:26:56.000000000 +0200 @@ -20,8 +20,25 @@ #include "if-mib/data_access/interface.h" #include "interface_ioctl.h" +#include +#ifndef u8 +typedef __uint8_t u8; +#endif +#ifndef u16 +typedef __uint16_t u16; +#endif +#ifndef u32 +typedef __uint32_t u32; +#endif + +#include +#include + unsigned int netsnmp_arch_interface_get_if_speed(int fd, const char *name); +/* old mii version */ +unsigned int +netsnmp_arch_interface_get_if_speed_mii(int fd, const char *name); void netsnmp_arch_interface_init(void) @@ -373,10 +390,39 @@ /** - * Determines network interface speed. + * Determines network interface speed from ETHTOOL_GSET + */ +unsigned int +netsnmp_arch_interface_get_if_speed(int fd, const char *name) { + struct ifreq ifr; + struct ethtool_cmd edata; + + memset(&ifr, 0, sizeof(ifr)); + edata.cmd = ETHTOOL_GSET; + + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)-1); + ifr.ifr_data = (char *) &edata; + + if (ioctl(fd, SIOCETHTOOL, &ifr) == -1) + { + DEBUGMSGTL(("mibII/interfaces", "ETHTOOL_GSET on %s failed\n", + ifr.ifr_name)); + return netsnmp_arch_interface_get_if_speed_mii(fd,name); + } + + if (edata.speed != SPEED_10 && edata.speed != SPEED_100 && + edata.speed != SPEED_1000) + /* try MII */ + return netsnmp_arch_interface_get_if_speed_mii(fd,name); + else /* return in bps */ + return edata.speed*1000*1000; +} + +/** + * Determines network interface speed from MII */ unsigned int -netsnmp_arch_interface_get_if_speed(int fd, const char *name) +netsnmp_arch_interface_get_if_speed_mii(int fd, const char *name) { unsigned int retspeed = 10000000; struct ifreq ifr; Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- net-snmp.spec 3 May 2005 07:57:37 -0000 1.40 +++ net-snmp.spec 4 May 2005 08:51:59 -0000 1.41 @@ -3,7 +3,7 @@ Summary: A collection of SNMP protocol tools and libraries. Name: net-snmp Version: 5.2.1 -Release: 10 +Release: 11 License: BSDish Group: System Environment/Daemons URL: http://net-snmp.sourceforge.net/ @@ -35,6 +35,7 @@ Patch17: net-snmp-5.2.1-typeclash.diff Patch18: net-snmp-5.1.2-agentx_register_callbacks_entry.patch Patch19: net-snmp-5.2.1-file_offset.patch +Patch20: net-snmp-5.2.1-ethtool.patch Prereq: /sbin/chkconfig Obsoletes: ucd-snmp @@ -152,6 +153,7 @@ %patch17 -b .typeclash %patch18 -p1 -b .reg_callbacks %patch19 -p1 -b .file_offset +%patch20 -p1 -b .ethtool # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -329,6 +331,9 @@ %{_libdir}/*.la %changelog +* Wed May 04 2005 Radek Vokal - 5.2.1-11 +- report gigabit Ethernet speeds using Ethtool (#152480) + * Tue Apr 19 2005 Radek Vokal - 5.2.1-10 - fixed missing requires for devel package (#155221) From fedora-cvs-commits at redhat.com Wed May 4 08:57:17 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 04:57:17 -0400 Subject: rpms/kdelibs/FC-3-embargo post-3.3.2-kdelibs-kimgio-fixed.diff, NONE, 1.1 kdelibs.spec, 1.86, 1.87 post-3.3.2-kdelibs-kimgio.diff, 1.1, NONE Message-ID: <200505040857.j448vHk2016362@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/FC-3-embargo In directory cvs.devel.redhat.com:/tmp/cvs-serv16348 Modified Files: kdelibs.spec Added Files: post-3.3.2-kdelibs-kimgio-fixed.diff Removed Files: post-3.3.2-kdelibs-kimgio.diff Log Message: new patch to fix kimgio input validation vulnerabilities, CAN-2005-1046 post-3.3.2-kdelibs-kimgio-fixed.diff: dds.cpp | 327 +++++++++++++++++++++++++++++------------- exr.cpp | 2 ico.cpp | 37 +++- jp2.cpp | 5 pcx.cpp | 164 ++++++++++----------- pcx.h | 13 - rgb.cpp | 65 ++++---- tga.cpp | 479 +++++++++++++++++++++++++++++++++++++++----------------------- tiffr.cpp | 4 xview.cpp | 38 +--- 10 files changed, 711 insertions(+), 423 deletions(-) --- NEW FILE post-3.3.2-kdelibs-kimgio-fixed.diff --- diff -u -3 -d -p -r1.4 -r1.4.2.1 --- dds.cpp 2 Aug 2004 20:34:50 -0000 1.4 +++ dds.cpp 19 Apr 2005 11:11:09 -0000 1.4.2.1 @@ -26,6 +26,12 @@ #include +#include // sqrtf + +#ifndef __USE_ISOC99 +#define sqrtf(x) ((float)sqrt(x)) +#endif + typedef Q_UINT32 uint; typedef Q_UINT16 ushort; typedef Q_UINT8 uchar; @@ -44,34 +50,71 @@ namespace { // Private. #define VERTICAL 2 #define CUBE_LAYOUT HORIZONTAL + struct Color8888 + { + uchar r, g, b, a; + }; - const uint FOURCC_DDS = MAKEFOURCC('D', 'D', 'S', ' '); - const uint FOURCC_DXT1 = MAKEFOURCC('D', 'X', 'T', '1'); - const uint FOURCC_DXT2 = MAKEFOURCC('D', 'X', 'T', '2'); - const uint FOURCC_DXT3 = MAKEFOURCC('D', 'X', 'T', '3'); - const uint FOURCC_DXT4 = MAKEFOURCC('D', 'X', 'T', '4'); - const uint FOURCC_DXT5 = MAKEFOURCC('D', 'X', 'T', '5'); + union Color565 + { + struct { + ushort b : 5; + ushort g : 6; + ushort r : 5; + } c; + ushort u; + }; - const uint DDSD_CAPS = 0x00000001l; - const uint DDSD_PIXELFORMAT = 0x00001000l; - const uint DDSD_WIDTH = 0x00000004l; - const uint DDSD_HEIGHT = 0x00000002l; - const uint DDSD_PITCH = 0x00000008l; + union Color1555 { + struct { + ushort b : 5; + ushort g : 5; + ushort r : 5; + ushort a : 1; + } c; + ushort u; + }; - const uint DDSCAPS_TEXTURE = 0x00001000l; - const uint DDSCAPS2_VOLUME = 0x00200000l; - const uint DDSCAPS2_CUBEMAP = 0x00000200l; + union Color4444 { + struct { + ushort b : 4; + ushort g : 4; + ushort r : 4; + ushort a : 4; + } c; + ushort u; + }; - const uint DDSCAPS2_CUBEMAP_POSITIVEX = 0x00000400l; - const uint DDSCAPS2_CUBEMAP_NEGATIVEX = 0x00000800l; - const uint DDSCAPS2_CUBEMAP_POSITIVEY = 0x00001000l; - const uint DDSCAPS2_CUBEMAP_NEGATIVEY = 0x00002000l; - const uint DDSCAPS2_CUBEMAP_POSITIVEZ = 0x00004000l; - const uint DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x00008000l; - const uint DDPF_RGB = 0x00000040l; - const uint DDPF_FOURCC = 0x00000004l; - const uint DDPF_ALPHAPIXELS = 0x00000001l; + static const uint FOURCC_DDS = MAKEFOURCC('D', 'D', 'S', ' '); + static const uint FOURCC_DXT1 = MAKEFOURCC('D', 'X', 'T', '1'); + static const uint FOURCC_DXT2 = MAKEFOURCC('D', 'X', 'T', '2'); + static const uint FOURCC_DXT3 = MAKEFOURCC('D', 'X', 'T', '3'); + static const uint FOURCC_DXT4 = MAKEFOURCC('D', 'X', 'T', '4'); + static const uint FOURCC_DXT5 = MAKEFOURCC('D', 'X', 'T', '5'); + static const uint FOURCC_RXGB = MAKEFOURCC('R', 'X', 'G', 'B'); + static const uint FOURCC_ATI2 = MAKEFOURCC('A', 'T', 'I', '2'); + + static const uint DDSD_CAPS = 0x00000001l; + static const uint DDSD_PIXELFORMAT = 0x00001000l; + static const uint DDSD_WIDTH = 0x00000004l; + static const uint DDSD_HEIGHT = 0x00000002l; + static const uint DDSD_PITCH = 0x00000008l; + + static const uint DDSCAPS_TEXTURE = 0x00001000l; + static const uint DDSCAPS2_VOLUME = 0x00200000l; + static const uint DDSCAPS2_CUBEMAP = 0x00000200l; + + static const uint DDSCAPS2_CUBEMAP_POSITIVEX = 0x00000400l; + static const uint DDSCAPS2_CUBEMAP_NEGATIVEX = 0x00000800l; + static const uint DDSCAPS2_CUBEMAP_POSITIVEY = 0x00001000l; + static const uint DDSCAPS2_CUBEMAP_NEGATIVEY = 0x00002000l; + static const uint DDSCAPS2_CUBEMAP_POSITIVEZ = 0x00004000l; + static const uint DDSCAPS2_CUBEMAP_NEGATIVEZ = 0x00008000l; + + static const uint DDPF_RGB = 0x00000040l; + static const uint DDPF_FOURCC = 0x00000004l; + static const uint DDPF_ALPHAPIXELS = 0x00000001l; enum DDSType { DDS_A8R8G8B8 = 0, @@ -84,6 +127,8 @@ namespace { // Private. DDS_DXT3 = 7, DDS_DXT4 = 8, DDS_DXT5 = 9, + DDS_RXGB = 10, + DDS_ATI2 = 11, DDS_UNKNOWN }; @@ -99,7 +144,7 @@ namespace { // Private. uint amask; }; - QDataStream & operator>> ( QDataStream & s, DDSPixelFormat & pf ) + static QDataStream & operator>> ( QDataStream & s, DDSPixelFormat & pf ) { s >> pf.size; s >> pf.flags; @@ -119,7 +164,7 @@ namespace { // Private. uint caps4; }; - QDataStream & operator>> ( QDataStream & s, DDSCaps & caps ) + static QDataStream & operator>> ( QDataStream & s, DDSCaps & caps ) { s >> caps.caps1; s >> caps.caps2; @@ -142,7 +187,7 @@ namespace { // Private. uint notused; }; - QDataStream & operator>> ( QDataStream & s, DDSHeader & header ) + static QDataStream & operator>> ( QDataStream & s, DDSHeader & header ) { s >> header.size; s >> header.flags; @@ -160,7 +205,7 @@ namespace { // Private. return s; } - bool IsValid( const DDSHeader & header ) + static bool IsValid( const DDSHeader & header ) { if( header.size != 124 ) { return false; @@ -180,7 +225,7 @@ namespace { // Private. // Get supported type. We currently support 10 different types. - DDSType GetType( const DDSHeader & header ) + static DDSType GetType( const DDSHeader & header ) { if( header.pf.flags & DDPF_RGB ) { if( header.pf.flags & DDPF_ALPHAPIXELS ) { @@ -212,27 +257,28 @@ namespace { // Private. return DDS_DXT4; case FOURCC_DXT5: return DDS_DXT5; + case FOURCC_RXGB: + return DDS_RXGB; + case FOURCC_ATI2: + return DDS_ATI2; } } return DDS_UNKNOWN; } - bool HasAlpha( const DDSHeader & header ) + static bool HasAlpha( const DDSHeader & header ) { return header.pf.flags & DDPF_ALPHAPIXELS; } - bool IsCubeMap( const DDSHeader & header ) + static bool IsCubeMap( const DDSHeader & header ) { return header.caps.caps2 & DDSCAPS2_CUBEMAP; } - bool IsSupported( const DDSHeader & header ) + static bool IsSupported( const DDSHeader & header ) { - /*if( IsCubeMap(header) ) { - return false; - }*/ if( header.caps.caps2 & DDSCAPS2_VOLUME ) { return false; } @@ -243,7 +289,7 @@ namespace { // Private. } - bool LoadA8R8G8B8( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadA8R8G8B8( QDataStream & s, const DDSHeader & header, QImage & img ) { const uint w = header.width; const uint h = header.height; @@ -260,7 +306,7 @@ namespace { // Private. return true; } - bool LoadR8G8B8( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadR8G8B8( QDataStream & s, const DDSHeader & header, QImage & img ) { const uint w = header.width; const uint h = header.height; @@ -277,7 +323,7 @@ namespace { // Private. return true; } - bool LoadA1R5G5B5( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadA1R5G5B5( QDataStream & s, const DDSHeader & header, QImage & img ) { const uint w = header.width; const uint h = header.height; @@ -285,13 +331,12 @@ namespace { // Private. for( uint y = 0; y < h; y++ ) { QRgb * scanline = (QRgb *) img.scanLine( y ); for( uint x = 0; x < w; x++ ) { - ushort u; - s >> u; - uchar r, g, b, a; - a = (u & header.pf.amask) != 0 ? 0xFF : 0; - r = ((u & header.pf.rmask) >> 10) << 3; - g = ((u & header.pf.gmask) >> 5) << 3; - b = (u & header.pf.bmask) << 3; + Color1555 color; + s >> color.u; + uchar a = (color.c.a != 0) ? 0xFF : 0; + uchar r = (color.c.r << 3) | (color.c.r >> 2); + uchar g = (color.c.g << 3) | (color.c.g >> 2); + uchar b = (color.c.b << 3) | (color.c.b >> 2); scanline[x] = qRgba(r, g, b, a); } } @@ -299,7 +344,7 @@ namespace { // Private. return true; } - bool LoadA4R4G4B4( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadA4R4G4B4( QDataStream & s, const DDSHeader & header, QImage & img ) { const uint w = header.width; const uint h = header.height; @@ -307,13 +352,12 @@ namespace { // Private. for( uint y = 0; y < h; y++ ) { QRgb * scanline = (QRgb *) img.scanLine( y ); for( uint x = 0; x < w; x++ ) { - unsigned short u; - s >> u; - uchar r, g, b, a; - a = ((u & header.pf.amask) >> 12) << 4; - r = ((u & header.pf.rmask) >> 8) << 4; - g = ((u & header.pf.gmask) >> 4) << 4; - b = (u & header.pf.bmask) << 4; + Color4444 color; + s >> color.u; + uchar a = (color.c.a << 4) | color.c.a; + uchar r = (color.c.r << 4) | color.c.r; + uchar g = (color.c.g << 4) | color.c.g; + uchar b = (color.c.b << 4) | color.c.b; scanline[x] = qRgba(r, g, b, a); } } @@ -321,7 +365,7 @@ namespace { // Private. return true; } - bool LoadR5G6B5( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadR5G6B5( QDataStream & s, const DDSHeader & header, QImage & img ) { const uint w = header.width; const uint h = header.height; @@ -329,12 +373,11 @@ namespace { // Private. for( uint y = 0; y < h; y++ ) { QRgb * scanline = (QRgb *) img.scanLine( y ); for( uint x = 0; x < w; x++ ) { - unsigned short u; - s >> u; - uchar r, g, b; - r = ((u & header.pf.rmask) >> 11) << 3; - g = ((u & header.pf.gmask) >> 5) << 2; - b = (u & header.pf.bmask) << 3; + Color565 color; + s >> color.u; + uchar r = (color.c.r << 3) | (color.c.r >> 2); + uchar g = (color.c.g << 2) | (color.c.g >> 4); + uchar b = (color.c.b << 3) | (color.c.b >> 2); scanline[x] = qRgb(r, g, b); } } @@ -342,22 +385,7 @@ namespace { // Private. return true; } - struct Color8888 - { - uchar r, g, b, a; - }; - - union Color565 - { - struct { - ushort b : 5; - ushort g : 6; - ushort r : 5; - } c; - ushort u; - }; - - QDataStream & operator>> ( QDataStream & s, Color565 & c ) + static QDataStream & operator>> ( QDataStream & s, Color565 & c ) { return s >> c.u; } @@ -400,17 +428,17 @@ namespace { // Private. color_array[2].b = (color_array[0].b + color_array[1].b) / 2; color_array[2].a = 0xFF; - // magenta to indicate transparent color. - color_array[3].r = color_array[2].r; - color_array[3].g = color_array[2].g; - color_array[3].b = color_array[2].b; + // Set all components to 0 to match DXT specs. + color_array[3].r = 0x00; // color_array[2].r; + color_array[3].g = 0x00; // color_array[2].g; + color_array[3].b = 0x00; // color_array[2].b; color_array[3].a = 0x00; } } }; - QDataStream & operator>> ( QDataStream & s, BlockDXT & c ) + static QDataStream & operator>> ( QDataStream & s, BlockDXT & c ) { return s >> c.col0 >> c.col1 >> c.row[0] >> c.row[1] >> c.row[2] >> c.row[3]; } @@ -419,7 +447,7 @@ namespace { // Private. ushort row[4]; }; - QDataStream & operator>> ( QDataStream & s, BlockDXTAlphaExplicit & c ) + static QDataStream & operator>> ( QDataStream & s, BlockDXTAlphaExplicit & c ) { return s >> c.row[0] >> c.row[1] >> c.row[2] >> c.row[3]; } @@ -485,13 +513,13 @@ namespace { // Private. } }; - QDataStream & operator>> ( QDataStream & s, BlockDXTAlphaLinear & c ) + static QDataStream & operator>> ( QDataStream & s, BlockDXTAlphaLinear & c ) { s >> c.alpha0 >> c.alpha1; return s >> c.bits[0] >> c.bits[1] >> c.bits[2] >> c.bits[3] >> c.bits[4] >> c.bits[5]; } - bool LoadDXT1( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadDXT1( QDataStream & s, const DDSHeader & header, QImage & img ) { const uint w = header.width; const uint h = header.height; @@ -530,7 +558,7 @@ namespace { // Private. return true; } - bool LoadDXT3( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadDXT3( QDataStream & s, const DDSHeader & header, QImage & img ) { const uint w = header.width; const uint h = header.height; @@ -575,14 +603,14 @@ namespace { // Private. return true; } - bool LoadDXT2( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadDXT2( QDataStream & s, const DDSHeader & header, QImage & img ) { if( !LoadDXT3(s, header, img) ) return false; //UndoPremultiplyAlpha(img); return true; } - bool LoadDXT5( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadDXT5( QDataStream & s, const DDSHeader & header, QImage & img ) { const uint w = header.width; const uint h = header.height; @@ -630,19 +658,122 @@ namespace { // Private. return true; } - - bool LoadDXT4( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadDXT4( QDataStream & s, const DDSHeader & header, QImage & img ) { if( !LoadDXT5(s, header, img) ) return false; //UndoPremultiplyAlpha(img); return true; } + static bool LoadRXGB( QDataStream & s, const DDSHeader & header, QImage & img ) + { + const uint w = header.width; + const uint h = header.height; + + BlockDXT block; + BlockDXTAlphaLinear alpha; + QRgb * scanline[4]; - typedef bool (* TextureLoader)( QDataStream & s, const DDSHeader & header, QImage img ); + for( uint y = 0; y < h; y += 4 ) { + for( uint j = 0; j < 4; j++ ) { + scanline[j] = (QRgb *) img.scanLine( y + j ); + } + for( uint x = 0; x < w; x += 4 ) { + + // Read 128bit color block. + s >> alpha; + s >> block; + + // Decode color block. + Color8888 color_array[4]; + block.GetColors(color_array); + + uchar alpha_array[8]; + alpha.GetAlphas(alpha_array); + + uchar bit_array[16]; + alpha.GetBits(bit_array); + + // bit masks = 00000011, 00001100, 00110000, 11000000 + const uint masks[4] = { 3, 3<<2, 3<<4, 3<<6 }; + const int shift[4] = { 0, 2, 4, 6 }; + + // Write color block. + for( uint j = 0; j < 4; j++ ) { + for( uint i = 0; i < 4; i++ ) { + if( img.valid( x+i, y+j ) ) { + uint idx = (block.row[j] & masks[i]) >> shift[i]; + color_array[idx].a = alpha_array[bit_array[j*4+i]]; + scanline[j][x+i] = qRgb(color_array[idx].a, color_array[idx].g, color_array[idx].b); + } + } + } + } + } + + return true; + } + + static bool LoadATI2( QDataStream & s, const DDSHeader & header, QImage & img ) + { + const uint w = header.width; + const uint h = header.height; + + BlockDXTAlphaLinear xblock; + BlockDXTAlphaLinear yblock; + QRgb * scanline[4]; + + for( uint y = 0; y < h; y += 4 ) { + for( uint j = 0; j < 4; j++ ) { + scanline[j] = (QRgb *) img.scanLine( y + j ); + } + for( uint x = 0; x < w; x += 4 ) { + + // Read 128bit color block. + s >> xblock; + s >> yblock; + + // Decode color block. + uchar xblock_array[8]; + xblock.GetAlphas(xblock_array); + + uchar xbit_array[16]; + xblock.GetBits(xbit_array); + + uchar yblock_array[8]; + yblock.GetAlphas(yblock_array); + + uchar ybit_array[16]; + yblock.GetBits(ybit_array); + + // Write color block. + for( uint j = 0; j < 4; j++ ) { + for( uint i = 0; i < 4; i++ ) { + if( img.valid( x+i, y+j ) ) { + const uchar nx = xblock_array[xbit_array[j*4+i]]; + const uchar ny = yblock_array[ybit_array[j*4+i]]; + + const float fx = float(nx) / 127.5f - 1.0f; + const float fy = float(ny) / 127.5f - 1.0f; + const float fz = sqrtf(1.0f - fx*fx - fy*fy); + const uchar nz = uchar((fz + 1.0f) * 127.5f); + + scanline[j][x+i] = qRgb(nx, ny, nz); + } + } + } + } + } + + return true; + } + + + + typedef bool (* TextureLoader)( QDataStream & s, const DDSHeader & header, QImage & img ); // Get an appropiate texture loader for the given type. - TextureLoader GetTextureLoader( DDSType type ) { + static TextureLoader GetTextureLoader( DDSType type ) { switch( type ) { case DDS_A8R8G8B8: return LoadA8R8G8B8; @@ -664,6 +795,10 @@ namespace { // Private. return LoadDXT4; case DDS_DXT5: return LoadDXT5; + case DDS_RXGB: + return LoadRXGB; + case DDS_ATI2: + return LoadATI2; default: return NULL; }; @@ -671,7 +806,7 @@ namespace { // Private. // Load a 2d texture. - bool LoadTexture( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadTexture( QDataStream & s, const DDSHeader & header, QImage & img ) { // Create dst image. if( !img.create( header.width, header.height, 32 )) { @@ -695,7 +830,7 @@ namespace { // Private. } - int FaceOffset( const DDSHeader & header ) { + static int FaceOffset( const DDSHeader & header ) { DDSType type = GetType( header ); @@ -727,11 +862,11 @@ namespace { // Private. } #if CUBE_LAYOUT == HORIZONTAL - int face_offset[6][2] = { {2, 1}, {0, 1}, {1, 0}, {1, 2}, {1, 1}, {3, 1} }; + static int face_offset[6][2] = { {2, 1}, {0, 1}, {1, 0}, {1, 2}, {1, 1}, {3, 1} }; #elif CUBE_LAYOUT == VERTICAL - int face_offset[6][2] = { {2, 1}, {0, 1}, {1, 0}, {1, 2}, {1, 1}, {1, 3} }; + static int face_offset[6][2] = { {2, 1}, {0, 1}, {1, 0}, {1, 2}, {1, 1}, {1, 3} }; #endif - int face_flags[6] = { + static int face_flags[6] = { DDSCAPS2_CUBEMAP_POSITIVEX, DDSCAPS2_CUBEMAP_NEGATIVEX, DDSCAPS2_CUBEMAP_POSITIVEY, @@ -741,7 +876,7 @@ namespace { // Private. }; // Load unwrapped cube map. - bool LoadCubeMap( QDataStream & s, const DDSHeader & header, QImage img ) + static bool LoadCubeMap( QDataStream & s, const DDSHeader & header, QImage & img ) { // Create dst image. #if CUBE_LAYOUT == HORIZONTAL diff -u -3 -d -p -r1.3 -r1.3.2.1 --- exr.cpp 9 Jun 2004 08:28:36 -0000 1.3 +++ exr.cpp 19 Apr 2005 11:11:09 -0000 1.3.2.1 @@ -136,6 +136,8 @@ void kimgio_exr_read( QImageIO *io ) file.readPixels (dw.min.y, dw.max.y); QImage image(width, height, 32, 0, QImage::BigEndian); + if( image.isNull()) + return; // somehow copy pixels into image for ( int y=0; y < height; y++ ) { diff -u -3 -d -p -r1.21 -r1.21.2.1 --- ico.cpp 9 Jun 2004 08:28:36 -0000 1.21 +++ ico.cpp 19 Apr 2005 11:11:09 -0000 1.21.2.1 @@ -113,6 +113,8 @@ namespace // closest size match precedes everything else if ( std::abs( int( lhs.width - size ) ) < std::abs( int( rhs.width - size ) ) ) return true; + else if ( std::abs( int( lhs.width - size ) ) > + std::abs( int( rhs.width - size ) ) ) return false; else if ( colors == 0 ) { // high/true color requested @@ -144,17 +146,31 @@ namespace header.biBitCount != 8 && header.biBitCount != 24 && header.biBitCount != 32 ) ) return false; - unsigned colors = header.biBitCount >= 24 ? - 0 : header.biClrUsed ? - header.biClrUsed : 1 << header.biBitCount; + unsigned paletteSize, paletteEntries; + + if (header.biBitCount > 8) + { + paletteEntries = 0; + paletteSize = 0; + } + else + { + paletteSize = (1 << header.biBitCount); + paletteEntries = paletteSize; + if (header.biClrUsed && header.biClrUsed < paletteSize) + paletteEntries = header.biClrUsed; + } + // Always create a 32-bit image to get the mask right + // Note: this is safe as rec.width, rec.height are bytes icon.create( rec.width, rec.height, 32 ); if ( icon.isNull() ) return false; icon.setAlphaBuffer( true ); - QMemArray< QRgb > colorTable( 1 << header.biBitCount ); + QMemArray< QRgb > colorTable( paletteSize ); + colorTable.fill( QRgb( 0 ) ); - for ( unsigned i = 0; i < colors; ++i ) + for ( unsigned i = 0; i < paletteEntries; ++i ) { unsigned char rgb[ 4 ]; stream.readRawBytes( reinterpret_cast< char* >( &rgb ), @@ -163,6 +179,7 @@ namespace } unsigned bpl = ( rec.width * header.biBitCount + 31 ) / 32 * 4; + unsigned char* buf = new unsigned char[ bpl ]; unsigned char** lines = icon.jumpTable(); for ( unsigned y = rec.height; !stream.atEnd() && y--; ) @@ -265,11 +282,13 @@ extern "C" void kimgio_ico_read( QImageI stream >> rec; icons.push_back( rec ); } - IconList::const_iterator selected = - requestedIndex >= 0 ? - std::min( icons.begin() + requestedIndex, icons.end() ) : - std::min_element( icons.begin(), icons.end(), + IconList::const_iterator selected; + if (requestedIndex >= 0) { + selected = std::min( icons.begin() + requestedIndex, icons.end() ); + } else { + selected = std::min_element( icons.begin(), icons.end(), LessDifference( requestedSize, requestedColors ) ); + } if ( stream.atEnd() || selected == icons.end() || offset + selected->offset > io->ioDevice()->size() ) return; diff -u -3 -d -p -r1.13 -r1.13.6.1 --- jp2.cpp 30 Sep 2003 12:49:01 -0000 1.13 +++ jp2.cpp 19 Apr 2005 11:11:09 -0000 1.13.6.1 @@ -157,8 +157,9 @@ namespace { void draw_view_gray( gs_t& gs, QImage& qti ) { - qti.create( jas_image_width( gs.image ), jas_image_height( gs.image ), - 8, 256 ); + if( !qti.create( jas_image_width( gs.image ), jas_image_height( gs.image ), + 8, 256 )) + return; for( int i = 0; i < 256; ++i ) qti.setColor( i, qRgb( i, i, i ) ); diff -u -3 -d -p -r1.11 -r1.11.6.1 --- pcx.cpp 23 Oct 2003 13:17:27 -0000 1.11 +++ pcx.cpp 19 Apr 2005 11:11:09 -0000 1.11.6.1 @@ -1,5 +1,5 @@ /* This file is part of the KDE project - Copyright (C) 2002-2003 Nadeem Hasan + Copyright (C) 2002-2005 Nadeem Hasan This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -44,6 +44,11 @@ static QDataStream &operator>>( QDataStr s >> ph.HScreenSize; s >> ph.VScreenSize; + // Skip the rest of the header + Q_UINT8 byte; + while ( s.device()->at() < 128 ) + s >> byte; + return s; } @@ -85,25 +90,22 @@ static QDataStream &operator<<( QDataStr return s; } -static PCXHEADER header; -static QImage img; -static Q_UINT16 w, h; - -void PCXHEADER::reset() +PCXHEADER::PCXHEADER() { + // Initialize all data to zero QByteArray dummy( 128 ); dummy.fill( 0 ); QDataStream s( dummy, IO_ReadOnly ); s >> *this; } -static void readLine( QDataStream &s, QByteArray &buf ) +static void readLine( QDataStream &s, QByteArray &buf, const PCXHEADER &header ) { Q_UINT32 i=0; Q_UINT32 size = buf.size(); Q_UINT8 byte, count; - if ( header.Encoding == 1 ) + if ( header.isCompressed() ) { // Uncompress the image data while ( i < size ) @@ -130,13 +132,14 @@ static void readLine( QDataStream &s, QB } } -static void readImage1( QDataStream &s ) +static void readImage1( QImage &img, QDataStream &s, const PCXHEADER &header ) { QByteArray buf( header.BytesPerLine ); - img.create( w, h, 1, 2, QImage::BigEndian ); + if(!img.create( header.width(), header.height(), 1, 2, QImage::BigEndian )) + return; - for ( int y=0; y> ( x%8 ) ) ) pixbuf[ x ] += ( 1 << i ); } uchar *p = img.scanLine( y ); - - for ( int x=0; x> flag; - kdDebug() << "Flag: " << flag << endl; + kdDebug( 399 ) << "Palette Flag: " << flag << endl; - if ( flag == 12 && header.Version == 5 ) + if ( flag == 12 && ( header.Version == 5 || header.Version == 2 ) ) { // Read the palette Q_UINT8 r, g, b; @@ -230,15 +235,16 @@ static void readImage8( QDataStream &s ) } } -static void readImage24( QDataStream &s ) +static void readImage24( QImage &img, QDataStream &s, const PCXHEADER &header ) { QByteArray r_buf( header.BytesPerLine ); QByteArray g_buf( header.BytesPerLine ); QByteArray b_buf( header.BytesPerLine ); - img.create( w, h, 32 ); + if(!img.create( header.width(), header.height(), 32 )) + return; - for ( int y=0; y> header; if ( header.Manufacturer != 10 || s.atEnd()) @@ -276,10 +283,8 @@ void kimgio_pcx_read( QImageIO *io ) return; } - w = ( header.XMax-header.XMin ) + 1; - h = ( header.YMax-header.YMin ) + 1; - - img.reset(); + int w = header.width(); + int h = header.height(); kdDebug( 399 ) << "Manufacturer: " << header.Manufacturer << endl; kdDebug( 399 ) << "Version: " << header.Version << endl; @@ -288,30 +293,27 @@ void kimgio_pcx_read( QImageIO *io ) kdDebug( 399 ) << "Width: " << w << endl; kdDebug( 399 ) << "Height: " << h << endl; kdDebug( 399 ) << "Window: " << header.XMin << "," << header.XMax << "," - << header.YMin << "," << header.YMax << endl; + << header.YMin << "," << header.YMax << endl; kdDebug( 399 ) << "BytesPerLine: " << header.BytesPerLine << endl; kdDebug( 399 ) << "NPlanes: " << header.NPlanes << endl; - // Skip the rest of the header - Q_UINT8 byte; - while ( s.device()->at() < 128 ) - s >> byte; + QImage img; if ( header.Bpp == 1 && header.NPlanes == 1 ) { - readImage1( s ); + readImage1( img, s, header ); } else if ( header.Bpp == 1 && header.NPlanes == 4 ) { - readImage4( s ); + readImage4( img, s, header ); } else if ( header.Bpp == 8 && header.NPlanes == 1 ) { - readImage8( s ); + readImage8( img, s, header ); } else if ( header.Bpp == 8 && header.NPlanes == 3 ) { - readImage24( s ); + readImage24( img, s, header ); } kdDebug( 399 ) << "Image Bytes: " << img.numBytes() << endl; @@ -359,7 +361,7 @@ static void writeLine( QDataStream &s, Q } } -static void writeImage1( QDataStream &s ) +static void writeImage1( QImage &img, QDataStream &s, PCXHEADER &header ) { img = img.convertBitOrder( QImage::BigEndian ); @@ -367,29 +369,27 @@ static void writeImage1( QDataStream &s header.NPlanes = 1; header.BytesPerLine = img.bytesPerLine(); - header.ColorMap.setColor( 0, qRgb( 0, 0, 0 ) ); - header.ColorMap.setColor( 1, qRgb( 255, 255, 255 ) ); - s << header; QByteArray buf( header.BytesPerLine ); - for ( int y=0; yioDevice() ); s.setByteOrder( QDataStream::LittleEndian ); - img = io->image(); + QImage img = io->image(); - w = img.width(); - h = img.height(); + int w = img.width(); + int h = img.height(); kdDebug( 399 ) << "Width: " << w << endl; kdDebug( 399 ) << "Height: " << h << endl; @@ -495,6 +495,8 @@ void kimgio_pcx_write( QImageIO *io ) kdDebug( 399 ) << "BytesPerLine: " << img.bytesPerLine() << endl; kdDebug( 399 ) << "Num Colors: " << img.numColors() << endl; + PCXHEADER header; + header.Manufacturer = 10; header.Version = 5; header.Encoding = 1; @@ -509,19 +511,19 @@ void kimgio_pcx_write( QImageIO *io ) if ( img.depth() == 1 ) { - writeImage1( s ); + writeImage1( img, s, header ); } else if ( img.depth() == 8 && img.numColors() <= 16 ) { - writeImage4( s ); + writeImage4( img, s, header ); } else if ( img.depth() == 8 ) { - writeImage8( s ); + writeImage8( img, s, header ); } else if ( img.depth() == 32 ) { - writeImage24( s ); + writeImage24( img, s, header ); } io->setStatus( 0 ); Index: pcx.h =================================================================== RCS file: /home/kde/kdelibs/kimgio/pcx.h,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -3 -d -p -r1.4 -r1.4.6.1 --- pcx.h 4 Jan 2003 00:48:25 -0000 1.4 +++ pcx.h 19 Apr 2005 11:11:09 -0000 1.4.6.1 @@ -49,7 +49,7 @@ class Palette rgb[ i ] = RGB( color ); } - QRgb color( int i ) + QRgb color( int i ) const { return qRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b ); } @@ -60,12 +60,11 @@ class Palette class PCXHEADER { public: - PCXHEADER() - { - reset(); - } + PCXHEADER(); - void reset(); + inline int width() const { return ( XMax-XMin ) + 1; } + inline int height() const { return ( YMax-YMin ) + 1; } + inline bool isCompressed() const { return ( Encoding==1 ); } Q_UINT8 Manufacturer; // Constant Flag, 10 = ZSoft .pcx Q_UINT8 Version; // Version information? @@ -99,7 +98,7 @@ class PCXHEADER // found only in PB IV/IV Plus Q_UINT16 VScreenSize; // Vertical screen size in pixels. New field // found only in PB IV/IV Plus -}; +} KDE_PACKED; #endif // PCX_H diff -u -3 -d -p -r1.25 -r1.25.2.1 --- rgb.cpp 9 Jun 2004 08:28:36 -0000 1.25 +++ rgb.cpp 19 Apr 2005 11:11:09 -0000 1.25.2.1 @@ -87,7 +87,9 @@ bool SGIImage::getRow(uchar *dest) int n, i; if (!m_rle) { for (i = 0; i < m_xsize; i++) { - *dest++ = uchar(*m_pos); + if(m_pos >= m_data.end()) + return false; + dest[i] = uchar(*m_pos); m_pos += m_bpc; } return true; @@ -120,7 +122,7 @@ bool SGIImage::readData(QImage& img) { QRgb *c; Q_UINT32 *start = m_starttab; - QCString lguard(m_xsize); + QByteArray lguard(m_xsize); uchar *line = (uchar *)lguard.data(); unsigned x, y; @@ -128,7 +130,7 @@ bool SGIImage::readData(QImage& img) m_pos = m_data.begin(); for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast(img.scanLine(m_ysize - y - 1)); + c = (QRgb *) img.scanLine(m_ysize - y - 1); if (m_rle) m_pos = m_data.begin() + *start++; if (!getRow(line)) @@ -166,11 +168,11 @@ bool SGIImage::readData(QImage& img) } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast(img.scanLine(m_ysize - y - 1)); if (m_rle) m_pos = m_data.begin() + *start++; if (!getRow(line)) return false; + c = (QRgb*) img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) *c = qRgba(qRed(*c), qGreen(*c), qBlue(*c), line[x]); } @@ -351,24 +353,32 @@ uchar SGIImage::intensity(uchar c) uint SGIImage::compact(uchar *d, uchar *s) { - uchar *dest = d, *src = s, patt, *cnt; - int n; - while (src - s < m_xsize) { - if (src - s + 1 == m_xsize) { // last bit - *dest++ = 0x81; - *dest++ = *src; + uchar *dest = d, *src = s, patt, *t, *end = s + m_xsize; + int i, n; + while (src < end) { + for (n = 0, t = src; t + 2 < end && !(*t == t[1] && *t == t[2]); t++) + n++; + + while (n) { + i = n > 126 ? 126 : n; + n -= i; + *dest++ = 0x80 | i; + while (i--) + *dest++ = *src++; + } + + if (src == end) break; - } else if (*src == src[1]) { - patt = *src++; - for (n = 1; src - s < m_xsize && n < 126 && *src == patt; src++) - n++; - *dest++ = n; + + patt = *src++; + for (n = 1; src < end && *src == patt; src++) + n++; + + while (n) { + i = n > 126 ? 126 : n; + n -= i; + *dest++ = i; *dest++ = patt; - } else { - cnt = dest++; - for (n = 0; src - s < m_xsize && n < 126 && *src != src[1]; n++) - *dest++ = *src++; - *cnt = 0x80 | n; } } *dest++ = 0; @@ -444,16 +454,12 @@ void SGIImage::writeHeader() kdDebug(399) << "Description: " << desc << endl; desc.truncate(79); - char id[] = "KDE kimgio", *s = id; for (i = 0; i < desc.length(); i++) m_imagename[i] = desc.latin1()[i]; for (; i < 80; i++) m_imagename[i] = '\0'; - if (desc.length() < 68) - for (i = 69; *s; i++) - m_imagename[i] = *s++; - m_stream.writeRawBytes(m_imagename, 80); + m_stream << m_colormap; for (i = 0; i < 404; i++) m_stream << Q_UINT8(0); @@ -551,13 +557,6 @@ bool SGIImage::writeImage(QImage& img) m_numrows = m_ysize * m_zsize; - // compressing a row with up to 11 pixels takes 11 or more bytes - // (start/length table: 8, smallest possible RLE packet: 3) - if (m_xsize <= 11) { - writeVerbatim(img); - return true; - } - m_starttab = new Q_UINT32[m_numrows]; m_rlemap.setBaseOffset(512 + m_numrows * 2 * sizeof(Q_UINT32)); @@ -579,7 +578,7 @@ bool SGIImage::writeImage(QImage& img) kdDebug(399) << "total savings: " << (verbatim_size - rle_size) << " bytes" << endl; kdDebug(399) << "compression: " << (rle_size * 100.0 / verbatim_size) << '%' << endl; - if (verbatim_size <= rle_size) + if (verbatim_size <= rle_size || m_io->quality() > 50) writeVerbatim(img); else writeRle(); diff -u -3 -d -p -r1.7 -r1.7.2.1 --- tga.cpp 1 Aug 2004 16:45:53 -0000 1.7 +++ tga.cpp 19 Apr 2005 11:11:09 -0000 1.7.2.1 @@ -1,5 +1,6 @@ /* This file is part of the KDE project Copyright (C) 2003 Dominik Seichter + Copyright (C) 2004 Ignacio Casta?o This program is free software; you can redistribute it and/or modify it under the terms of the Lesser GNU General Public @@ -9,213 +10,347 @@ /* this code supports: * reading: - * run length encoded true color tga files - * uncompressed true color tga files + * uncompressed and run length encoded indexed, grey and color tga files. + * image types 1, 2, 3, 9, 10 and 11. + * only RGB color maps with no more than 256 colors. + * pixel formats 8, 15, 24 and 32. * writing: * uncompressed true color tga files */ #include "tga.h" +#include + #include #include -/* - * uncompressed TGA magic header - */ -unsigned char targaMagic[12] = { 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +#include -/* - * compressed TGA magic header - */ -unsigned char compMagic[12] = { 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +typedef Q_UINT32 uint; +typedef Q_UINT16 ushort; +typedef Q_UINT8 uchar; -/* - * the origin of the image (default is TOP_LEFT) - */ -enum { TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT }; +namespace { // Private. -/* - * Read one pixel and return its color - */ -int getData( QDataStream* s, int bpp ) -{ - unsigned char* data = new unsigned char[bpp]; + // Header format of saved files. + uchar targaMagic[12] = { 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - for( int d = 0; d < bpp; d++ ) - *s >> data[d]; + enum TGAType { + TGA_TYPE_INDEXED = 1, + TGA_TYPE_RGB = 2, + TGA_TYPE_GREY = 3, + TGA_TYPE_RLE_INDEXED = 9, + TGA_TYPE_RLE_RGB = 10, + TGA_TYPE_RLE_GREY = 11 + }; - int color = 0; - if( bpp == 4 ) - color = qRgba( data[0], data[1], data[2], data[3] ); - else - color = qRgb( data[0], data[1], data[2] ); +#define TGA_INTERLEAVE_MASK 0xc0 +#define TGA_INTERLEAVE_NONE 0x00 +#define TGA_INTERLEAVE_2WAY 0x40 +#define TGA_INTERLEAVE_4WAY 0x80 - delete [] data; - return color; -} +#define TGA_ORIGIN_MASK 0x30 +#define TGA_ORIGIN_LEFT 0x00 +#define TGA_ORIGIN_RIGHT 0x10 +#define TGA_ORIGIN_LOWER 0x00 +#define TGA_ORIGIN_UPPER 0x20 -/* - * checks wether y is inside of the image - * when origin is of mode m - */ -bool checky( int y, int h, int m ) -{ - if( m == TOP_LEFT ) - return (y < h); - else if( m == BOTTOM_LEFT || m == BOTTOM_RIGHT ) - return ( y >= 0 ); + /** Tga Header. */ + struct TgaHeader { + uchar id_length; + uchar colormap_type; + uchar image_type; + ushort colormap_index; + ushort colormap_length; + uchar colormap_size; + ushort x_origin; + ushort y_origin; + ushort width; + ushort height; + uchar pixel_size; + uchar flags; + + enum { SIZE = 18 }; // const static int SIZE = 18; + }; - return false; -} + static QDataStream & operator>> ( QDataStream & s, TgaHeader & head ) + { + s >> head.id_length; + s >> head.colormap_type; + s >> head.image_type; + s >> head.colormap_index; + s >> head.colormap_length; + s >> head.colormap_size; + s >> head.x_origin; + s >> head.y_origin; + s >> head.width; + s >> head.height; + s >> head.pixel_size; + s >> head.flags; + return s; + } - /* - * checks wether x is inside of the image - * when origin is of mode m - */ - bool checkx( int x, int w, int m ) - { - if( m == TOP_LEFT || m == BOTTOM_LEFT ) - return (x < w); - else if( m == BOTTOM_RIGHT ) - return ( x >= 0 ); + static bool IsSupported( const TgaHeader & head ) + { + if( head.image_type != TGA_TYPE_INDEXED && + head.image_type != TGA_TYPE_RGB && + head.image_type != TGA_TYPE_GREY && + head.image_type != TGA_TYPE_RLE_INDEXED && + head.image_type != TGA_TYPE_RLE_RGB && + head.image_type != TGA_TYPE_RLE_GREY ) + { + return false; + } + if( head.image_type == TGA_TYPE_INDEXED || + head.image_type == TGA_TYPE_RLE_INDEXED ) + { + if( head.colormap_length > 256 || head.colormap_size != 24 ) + { + return false; + } + } + if( head.width == 0 || head.height == 0 ) + { + return false; + } + if( head.pixel_size != 8 && head.pixel_size != 16 && + head.pixel_size != 24 && head.pixel_size != 32 ) + { + return false; + } + return true; + } - return false; - } + struct Color555 { + ushort b : 5; + ushort g : 5; + ushort r : 5; + }; + + static bool HasAlpha( const TgaHeader & tga ) + { + return tga.pixel_size == 32; + } - void kimgio_tga_read( QImageIO *io ) - { - unsigned char header[6]; - bool compressed = false; + struct TgaHeaderInfo { + bool rle; + bool pal; + bool rgb; + bool grey; + bool supported; + + TgaHeaderInfo( const TgaHeader & tga ) : rle(false), pal(false), rgb(false), grey(false), supported(true) + { + switch( tga.image_type ) { + case TGA_TYPE_RLE_INDEXED: + rle = true; + // no break is intended! + case TGA_TYPE_INDEXED: + if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) { + supported = false; + } + pal = true; + break; + + case TGA_TYPE_RLE_RGB: + rle = true; + // no break is intended! + case TGA_TYPE_RGB: + rgb = true; + break; + + case TGA_TYPE_RLE_GREY: + rle = true; + // no break is intended! + case TGA_TYPE_GREY: + grey = true; + break; + + default: + // Error, unknown image type. + supported = false; + } + } + }; + - QDataStream s( io->ioDevice() ); - s.setByteOrder( QDataStream::LittleEndian ); - /* - * check whether it is a targa file or not - */ - for( int i = 0; i < 12; i++ ) { - unsigned char a; - s >> a; - if( a != targaMagic[i] && a!= compMagic[i]) { - io->setImage( 0 ); - io->setStatus( -1 ); - return; - } + static bool LoadTGA( QDataStream & s, const TgaHeader & tga, QImage &img ) + { + // Create image. + if( !img.create( tga.width, tga.height, 32 )) { + return false; + } - // check if it is a compressed targa file - if( i == 2 && a == compMagic[i] ) - compressed = true; - } + TgaHeaderInfo info(tga); + if( !info.supported ) { + // File not supported. + kdDebug(399) << "This TGA file is not supported." << endl; + return false; + } + + // Enable alpha buffer for transparent images. + if( HasAlpha( tga ) ) { + img.setAlphaBuffer( true ); + } - for( int i = 0; i < 6; i++ ) - s >> header[i]; - if( s.atEnd()) { - io->setImage( 0 ); - io->setStatus( -1 ); - return; - } + uint pixel_size = (tga.pixel_size/8); + uint size = tga.width * tga.height * pixel_size; - int width = header[1] * 256 + header[0]; - int height = header[3] * 256 + header[2]; - int bpp = header[4]; - int bit = header[5]; - int bytesPerPixel = bpp / 8; + + // Read palette. + char palette[768]; + if( info.pal ) { + // @todo Support palettes in other formats! + s.readRawBytes( palette, 3 * tga.colormap_length ); + } - /* Bit values: - * bit 0-3: number of alpha bits per fixel - * bit 4-5: origin of image: - * - 0 0 bottom left - * - 1 0 bottom right - * - 0 1 top left // that's what we write - * - 1 1 top right - */ + // Allocate image. + uchar * const image = new uchar[size]; - int mode; - if( (bit | 0) == 0 ) - mode = BOTTOM_LEFT; - else if( (bit & 8) == 8 ) - /* - * should be BOTTOM_RIGHT, - * but GIMP writes them this way. - */ - mode = BOTTOM_LEFT; - else if( (bit & 32) == 32 ) - mode = TOP_LEFT; - else - mode = TOP_LEFT; + if( info.rle ) { + // Decode image. + char * dst = (char *)image; + int num = size; + + while (num > 0) { + // Get packet header. + uchar c; + s >> c; + + uint count = (c & 0x7f) + 1; + num -= count * pixel_size; + + if (c & 0x80) { + // RLE pixels. + assert(pixel_size <= 8); + char pixel[8]; + s.readRawBytes( pixel, pixel_size ); + do { + memcpy(dst, pixel, pixel_size); + dst += pixel_size; + } while (--count); + } + else { + // Raw pixels. + count *= pixel_size; + s.readRawBytes( dst, count ); + dst += count; + } + } + } + else { + // Read raw image. + s.readRawBytes( (char *)image, size ); + } - if( bytesPerPixel != 3 && bytesPerPixel != 4 ) { - io->setImage( 0 ); - io->setStatus( -1 ); - return; - } + // Convert image to internal format. + int y_start, y_step, y_end; + if( tga.flags & TGA_ORIGIN_UPPER ) { + y_start = 0; + y_step = 1; + y_end = tga.height - 1; + } + else { + y_start = tga.height - 1; + y_step = -1; + y_end = 0; + } - QImage img; - if( !img.create( width, height, (bpp == 24 ? 32 : bpp) )) { - io->setImage( 0 ); - io->setStatus( -1 ); - return; - } + uchar * src = image; - /* - * Enable alpha buffer for transparent images - */ - if( img.depth() == 32 ) - img.setAlphaBuffer( true ); + for( int y = y_start; y != y_end; y += y_step ) { + QRgb * scanline = (QRgb *) img.scanLine( y ); + + if( info.pal ) { + // Paletted. + for( int x = 0; x < tga.width; x++ ) { + uchar idx = *src++; + scanline[x] = qRgb( palette[3*idx+2], palette[3*idx+1], palette[3*idx+0] ); + } + } + else if( info.grey ) { + // Greyscale. + for( int x = 0; x < tga.width; x++ ) { + scanline[x] = qRgb( *src, *src, *src ); + src++; + } + } + else { + // True Color. + if( tga.pixel_size == 16 ) { + for( int x = 0; x < tga.width; x++ ) { + Color555 c = *reinterpret_cast(src); + scanline[x] = qRgb( (c.r << 3) | (c.r >> 2), (c.g << 3) | (c.g >> 2), (c.b << 3) | (c.b >> 2) ); + src += 2; + } + } + else if( tga.pixel_size == 24 ) { + for( int x = 0; x < tga.width; x++ ) { + scanline[x] = qRgb( src[2], src[1], src[0] ); + src += 3; + } + } + else if( tga.pixel_size == 32 ) { + for( int x = 0; x < tga.width; x++ ) { + scanline[x] = qRgba( src[2], src[1], src[0], src[3] ); + src += 4; + } + } + } + } + // Free image. + delete [] image; + + return true; + } + +} // namespace - int x = 0; - int y = 0; - int addy = 1; - int addx = 1; - if( mode == BOTTOM_LEFT || mode == BOTTOM_RIGHT ) { - y = height - 1; - addy = -1; - } - if( mode == BOTTOM_RIGHT || mode == TOP_RIGHT ) { - x = width - 1; - addx = -1; - } +void kimgio_tga_read( QImageIO *io ) +{ + //kdDebug(399) << "Loading TGA file!" << endl; + + QDataStream s( io->ioDevice() ); + s.setByteOrder( QDataStream::LittleEndian ); + + + // Read image header. + TgaHeader tga; + s >> tga; + s.device()->at( TgaHeader::SIZE + tga.id_length ); + + // Check image file format. + if( s.atEnd() ) { + kdDebug(399) << "This TGA file is not valid." << endl; + io->setImage( 0 ); + io->setStatus( -1 ); + return; + } + + // Check supported file types. + if( !IsSupported(tga) ) { + kdDebug(399) << "This TGA file is not supported." << endl; + io->setImage( 0 ); + io->setStatus( -1 ); + return; + } + + + QImage img; + bool result = LoadTGA(s, tga, img); + + if( result == false ) { + kdDebug(399) << "Error loading TGA file." << endl; + io->setImage( 0 ); + io->setStatus( -1 ); + return; + } - /* - * we have to restore the value of x after each loop - */ - int oldx = x; - if( !compressed ) { - for( ; !s.atEnd() && checky( y, height, mode ); y += addy ) - for( x = oldx; checkx( x, width, mode ); x += addx ) { - img.setPixel( x, y, getData( &s, bytesPerPixel ) ); - } - } else { - unsigned char cur; - while( !s.atEnd() && checky( y, height, mode ) ) { - while( checkx( x, width, mode ) ) { - s >> cur; - if( (cur & 128) == 128 ) { - // found a RLE chunk - int length = (cur & 127) + 1; - int color = getData( &s, bytesPerPixel ); - for( int i = 0; i < length; i++ ) { - img.setPixel( x, y, color ); - x += addx; - } - } else { - int length = (cur & 127) + 1; - for( int i = 0; i < length; i++ ) { - img.setPixel( x, y, getData( &s, bytesPerPixel ) ); - x += addx; - } - } - } - y += addy; - x = oldx; - } - } - img = img.swapRGB(); - io->setImage( img ); io->setStatus( 0 ); } diff -u -3 -d -p -r1.12 -r1.12.2.1 --- tiffr.cpp 9 Jun 2004 08:28:36 -0000 1.12 +++ tiffr.cpp 19 Apr 2005 11:11:09 -0000 1.12.2.1 @@ -83,6 +83,10 @@ void kimgio_tiff_read( QImageIO *io ) return; QImage image( width, height, 32 ); + if( image.isNull()) { + TIFFClose( tiff ); + return; + } data = (uint32 *)image.bits(); //Sven: changed to %ld for 64bit machines diff -u -3 -d -p -r1.10 -r1.10.6.1 --- xview.cpp 6 Sep 2003 19:06:36 -0000 1.10 +++ xview.cpp 19 Apr 2005 11:11:09 -0000 1.10.6.1 @@ -7,12 +7,16 @@ #include #include +#include #include #include "xview.h" #define BUFSIZE 1024 +static const int b_255_3[]= {0,85,170,255}, // index*255/3 + rg_255_7[]={0,36,72,109,145,182,218,255}; // index *255/7 + void kimgio_xv_read( QImageIO *_imageio ) { int x=-1; @@ -48,10 +52,14 @@ void kimgio_xv_read( QImageIO *_imageio sscanf(str, "%d %d %d", &x, &y, &maxval); if (maxval != 255) return; + int blocksize = x*y; + if(x < 0 || y < 0 || blocksize < x || blocksize < y) + return; // now follows a binary block of x*y bytes. - int blocksize = x*y; - char *block = new char[ blocksize ]; + char *block = (char*) malloc(blocksize); + if(!block) + return; if (iodev->readBlock(block, blocksize) != blocksize ) { @@ -60,6 +68,10 @@ void kimgio_xv_read( QImageIO *_imageio // Create the image QImage image( x, y, 8, maxval + 1, QImage::BigEndian ); + if( image.isNull()) { + free(block); + return; + } // how do the color handling? they are absolute 24bpp // or at least can be calculated as such. @@ -67,29 +79,9 @@ void kimgio_xv_read( QImageIO *_imageio for ( int j = 0; j < 256; j++ ) { -// ----------- OLIVER EIDEN -// That is the old-code ! -/* r = ((int) ((j >> 5) & 0x07)) << 5; - g = ((int) ((j >> 2) & 0x07)) << 5; - b = ((int) ((j >> 0) & 0x03)) << 6;*/ - - -// That is the code-how xv, decode 3-3-2 pixmaps, it is slighly different, -// but yields much better visuals results -/* r = (((int) ((j >> 5) & 0x07)) *255) / 7; - g = (((int) ((j >> 2) & 0x07)) *255) / 7; - b = (((int) ((j >> 0) & 0x03)) *255) / 3;*/ - -// This is the same as xv, with multiplications/divisions replaced by indexing - -// Look-up table to avoid multiplications and divisons - static int b_255_3[]= {0,85,170,255}, // index*255/3 - rg_255_7[]={0,36,72,109,145,182,218,255}; // index *255/7 - r = rg_255_7[((j >> 5) & 0x07)]; g = rg_255_7[((j >> 2) & 0x07)]; b = b_255_3[((j >> 0) & 0x03)]; -// --------------- image.setColor( j, qRgb( r, g, b ) ); } @@ -102,7 +94,7 @@ void kimgio_xv_read( QImageIO *_imageio _imageio->setImage( image ); _imageio->setStatus( 0 ); - delete [] block; + free(block); return; } Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-3-embargo/kdelibs.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- kdelibs.spec 28 Apr 2005 16:24:56 -0000 1.86 +++ kdelibs.spec 4 May 2005 08:57:15 -0000 1.87 @@ -17,7 +17,7 @@ %define arts 1 Version: 3.3.1 -Release: 2.12.FC3 +Release: 2.13.FC3 Summary: K Desktop Environment - Libraries Name: kdelibs Url: http://www.kde.org/ @@ -75,7 +75,7 @@ Patch207: post-3.3.2-kdelibs-idn-2.patch # CAN-2005-1046, kimgio input validation vulnerabilities -Patch208: post-3.3.2-kdelibs-kimgio.diff +Patch208: post-3.3.2-kdelibs-kimgio-fixed.diff %if %{arts} Requires: arts >= %{arts_version} @@ -442,6 +442,9 @@ %doc %{_docdir}/HTML/en/kdelibs* %changelog +* Wed May 04 2005 Than Ngo 6:3.3.1-2.13.FC3 +- new patch to fix kimgio input validation vulnerabilities, CAN-2005-1046 + * Tue Apr 19 2005 Than Ngo 6:3.3.1-2.12.FC3 - apply patch to fix gcc warning #117938 --- post-3.3.2-kdelibs-kimgio.diff DELETED --- From fedora-cvs-commits at redhat.com Wed May 4 09:11:55 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 05:11:55 -0400 Subject: rpms/latex2html/devel .cvsignore, 1.2, 1.3 latex2html.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200505040911.j449Btbj016608@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/latex2html/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16593 Modified Files: .cvsignore latex2html.spec sources Log Message: - add latex2html, texexpand, pstoimg man pages (#60308) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/latex2html/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Mar 2005 11:38:16 -0000 1.2 +++ .cvsignore 4 May 2005 09:11:53 -0000 1.3 @@ -1,2 +1,3 @@ l2h-2002-2-1+jp2.0.patch.gz latex2html-2002-2-1.tar.bz2 +latex2html-manpages.tar.bz2 Index: latex2html.spec =================================================================== RCS file: /cvs/dist/rpms/latex2html/devel/latex2html.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- latex2html.spec 3 May 2005 13:43:14 -0000 1.2 +++ latex2html.spec 4 May 2005 09:11:53 -0000 1.3 @@ -4,12 +4,13 @@ Summary: Converts LaTeX documents to HTML Name: latex2html Version: 2002.2.1 -Release: 2 +Release: 3 License: Free To Use But Restricted (See LICENSE) Group: Applications/Publishing URL: http://www.latex2html.org/ Source0: http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/%{name}-%{latex2html_ver}.tar.bz2 Source1: cfgcache.pm +Source2: %{name}-manpages.tar.bz2 Patch0: latex2html-2K.1beta-tabularx.patch Patch1: teTeX-l2h-config.patch Patch3: latex2html-2K.1beta-DB.patch @@ -72,6 +73,7 @@ %build pushd %{name}-%{latex2html_ver} cp %{SOURCE1} cfgcache.pm +tar fxj %{SOURCE2} ./configure --program-prefix=%{?_program_prefix} \ --prefix=%{_prefix} \ @@ -146,6 +148,10 @@ perl -pi -e"s,$RPM_BUILD_ROOT,," cfgcache.pm perl -pi -e"s,$cfg{'GS_LIB'} = q'';,$cfg{'GS_LIB'} = q'%{_datadir}/ghostscript/`ghostscript --version`';," cfgcache.pm install -m0644 *.pm %{buildroot}%{_datadir}/latex2html + +# install man pages +mkdir -p %{buildroot}%{_mandir}/man1 +install -m0644 *.1 %{buildroot}%{_mandir}/man1 popd %if %{enable_japanese} @@ -199,7 +205,14 @@ %{_datadir}/jlatex2html/* %endif +%{_mandir}/man1/latex2html.1 +%{_mandir}/man1/texexpand.1 +%{_mandir}/man1/pstoimg.1 + %changelog +* Wed May 4 2005 Jindrich Novy 2002.2.1-3 +- add latex2html, texexpand, pstoimg man pages (#60308) + * Tue May 3 2005 Jindrich Novy 2002.2.1-2 - run texhash in the %%post and %%postun phase (#156660) Index: sources =================================================================== RCS file: /cvs/dist/rpms/latex2html/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Mar 2005 11:38:16 -0000 1.2 +++ sources 4 May 2005 09:11:53 -0000 1.3 @@ -1,2 +1,3 @@ 0b44186e870fa5790205231cbab0f789 l2h-2002-2-1+jp2.0.patch.gz e8374264303f56ef66c97ec2392eccbe latex2html-2002-2-1.tar.bz2 +e931367bddb503cbbbc60376354736e3 latex2html-manpages.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 4 09:22:24 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 05:22:24 -0400 Subject: rpms/latex2html/devel latex2html.spec,1.3,1.4 Message-ID: <200505040922.j449MObH019875@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/latex2html/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19863 Modified Files: latex2html.spec Log Message: - fix links to man pages Index: latex2html.spec =================================================================== RCS file: /cvs/dist/rpms/latex2html/devel/latex2html.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- latex2html.spec 4 May 2005 09:11:53 -0000 1.3 +++ latex2html.spec 4 May 2005 09:22:22 -0000 1.4 @@ -205,9 +205,9 @@ %{_datadir}/jlatex2html/* %endif -%{_mandir}/man1/latex2html.1 -%{_mandir}/man1/texexpand.1 -%{_mandir}/man1/pstoimg.1 +%{_mandir}/man1/latex2html.* +%{_mandir}/man1/texexpand.* +%{_mandir}/man1/pstoimg.* %changelog * Wed May 4 2005 Jindrich Novy 2002.2.1-3 From fedora-cvs-commits at redhat.com Wed May 4 09:34:14 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 05:34:14 -0400 Subject: rpms/lapack/FC-3 lapack.spec,1.14,1.15 Message-ID: <200505040934.j449YE1Z013725@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/lapack/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv13707 Modified Files: lapack.spec Log Message: fix bugs #138447, #143420, #138683 in fc3 (fc4 version is in extras) Index: lapack.spec =================================================================== RCS file: /cvs/dist/rpms/lapack/FC-3/lapack.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lapack.spec 11 Nov 2004 13:58:14 -0000 1.14 +++ lapack.spec 4 May 2005 09:34:12 -0000 1.15 @@ -1,7 +1,7 @@ Summary: The LAPACK libraries for numerical linear algebra. Name: lapack Version: 3.0 -Release: 25.3 +Release: 26.fc3 License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/lapack/ @@ -52,9 +52,12 @@ %build cd BLAS/SRC +RPM_OPT_O_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's|-O2|-O0|') +FFLAGS="$RPM_OPT_O_FLAGS" make dcabs1.o FFLAGS="$RPM_OPT_FLAGS" make static cp libblas.a ../.. make clean +FFLAGS="$RPM_OPT_O_FLAGS -fPIC" make dcabs1.o FFLAGS="$RPM_OPT_FLAGS -fPIC" make shared cp libblas.so.3.0.3 ../.. cd ../.. @@ -63,12 +66,12 @@ cd SRC # Some files don't like -O2, but -Os is fine RPM_OPT_SIZE_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's|-O2|-Os|') -FFLAGS="$RPM_OPT_SIZE_FLAGS" make dlamch.o slamch.o +FFLAGS="$RPM_OPT_SIZE_FLAGS" make dlamch.o slamch.o dgeev.o FFLAGS="$RPM_OPT_FLAGS" make static cp liblapack.a .. make clean -FFLAGS="$RPM_OPT_SIZE_FLAGS -fPIC" make dlamch.o slamch.o +FFLAGS="$RPM_OPT_SIZE_FLAGS -fPIC" make dlamch.o slamch.o dgeev.o FFLAGS="$RPM_OPT_FLAGS -fPIC" make shared cp liblapack.so.3.0.3 .. cd .. @@ -124,7 +127,10 @@ %{_libdir}/libblas.* %changelog -* Thu Nov 11 2004 Ivana Varekova +* Wed May 04 2005 Ivana Varekova 3.0-26.fc3 +- fix bugs #138791, #143420 + +* Thu Nov 11 2004 Ivana Varekova 3.0-25.3 - fix build problem bug #138447 * Tue Jun 15 2004 Elliot Lee From fedora-cvs-commits at redhat.com Wed May 4 09:44:22 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 05:44:22 -0400 Subject: rpms/rusers/devel netkit-rusers-0.17-rup-stack.patch, NONE, 1.1 rusers.spec, 1.15, 1.16 Message-ID: <200505040944.j449iMCR013832@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/rusers/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13816 Modified Files: rusers.spec Added Files: netkit-rusers-0.17-rup-stack.patch Log Message: - Fixed rup stack problem (#154396) netkit-rusers-0.17-rup-stack.patch: rup.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) --- NEW FILE netkit-rusers-0.17-rup-stack.patch --- --- netkit-rusers-0.17/rup/rup.c.orig 2005-04-11 10:00:09.000000000 -0400 +++ netkit-rusers-0.17/rup/rup.c 2005-04-11 10:01:46.000000000 -0400 @@ -54,6 +54,8 @@ #define HOST_WIDTH 24 +static statstime remote_host_stat; + static int print_rup_data(const char *host, statstime *host_stat); static int printtime; /* print the remote host(s)'s time */ @@ -244,7 +246,6 @@ onehost(const char *host) { CLIENT *rstat_clnt; - statstime host_stat; struct timeval timeout = { 25, 0 }; rstat_clnt = clnt_create(host, RSTATPROG, RSTATVERS_TIME, "udp"); @@ -253,11 +254,11 @@ return; } - memset(&host_stat, 0, sizeof(host_stat)); + memset(&remote_host_stat, 0, sizeof(remote_host_stat)); if (clnt_call(rstat_clnt, RSTATPROC_STATS, (xdrproc_t) xdr_void, NULL, (xdrproc_t) xdr_statstime, - (caddr_t) &host_stat, + (caddr_t) &remote_host_stat, timeout) != RPC_SUCCESS) { @@ -266,9 +267,9 @@ } if (sort_type != SORT_NONE) { - remember_rup_data(host, &host_stat); + remember_rup_data(host, &remote_host_stat); } else { - print_rup_data(host, &host_stat); + print_rup_data(host, &remote_host_stat); } clnt_destroy(rstat_clnt); } @@ -300,7 +301,6 @@ void allhosts(void) { - statstime host_stat; enum clnt_stat clnt_stat; int i; @@ -312,7 +312,7 @@ clnt_stat = clnt_broadcast(RSTATPROG, RSTATVERS_TIME, RSTATPROC_STATS, (xdrproc_t) xdr_void, NULL, (xdrproc_t) xdr_statstime, - (char *) &host_stat, + (char *) &remote_host_stat, (resultproc_t) rstat_reply); if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT) { warnx("%s", clnt_sperrno(clnt_stat)); Index: rusers.spec =================================================================== RCS file: /cvs/dist/rpms/rusers/devel/rusers.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- rusers.spec 2 Mar 2005 16:57:44 -0000 1.15 +++ rusers.spec 4 May 2005 09:44:20 -0000 1.16 @@ -5,7 +5,7 @@ Summary: Displays the users logged into machines on the local network. Name: rusers Version: 0.17 -Release: 43 +Release: 44 License: BSD Group: System Environment/Daemons Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz @@ -23,6 +23,7 @@ Patch8: netkit-rusers-0.17-rup.patch Patch9: netkit-rusers-0.17-rup-timeout.patch Patch10: netkit-rusers-0.17-procps.patch +Patch11: netkit-rusers-0.17-rup-stack.patch Buildroot: %{_tmppath}/%{name}-root BuildRequires: procps libselinux-devel @@ -64,6 +65,7 @@ %patch8 -p1 -b .rup %patch9 -p1 -b .rup-timeout %patch10 -p1 -b .procps +%patch11 -p1 -b .rup-stack %build cat > MCONFIG < 0.17-44 +- Fixed rup stack problem (#154396) + * Wed Mar 02 2005 Phil Knirsch 0.17-43 - bump release and rebuild with gcc 4 From fedora-cvs-commits at redhat.com Wed May 4 09:57:49 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 05:57:49 -0400 Subject: rpms/php/devel php-5.0.4-streamcopy.patch, NONE, 1.1 php-5.0.4-xmldom.patch, NONE, 1.1 php.spec, 1.74, 1.75 Message-ID: <200505040957.j449vnBN011022@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11006 Modified Files: php.spec Added Files: php-5.0.4-streamcopy.patch php-5.0.4-xmldom.patch Log Message: * Tue May 3 2005 Joe Orton 5.0.4-9 - build simplexml_import_dom even with shared dom (#156434) - prevent truncation of copied files to ~2Mb (#155916) - install /usr/bin/php from CLI build alongside CGI - enable sysvmsg extension (#142988) php-5.0.4-streamcopy.patch: php_streams.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE php-5.0.4-streamcopy.patch --- Prevent truncation of copied files to ~2Mb. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155916 --- php-5.0.4/main/php_streams.h.streamcopy +++ php-5.0.4/main/php_streams.h @@ -413,7 +413,7 @@ * Uses mmap if the src is a plain file and at offset 0 * To ensure we don't take up too much memory when reading large files, set the default mmap length * at this many bytes */ -#define PHP_STREAM_COPY_ALL 2000000 +#define PHP_STREAM_COPY_ALL ((size_t)-1) BEGIN_EXTERN_C() PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size_t maxlen STREAMS_DC TSRMLS_DC); php-5.0.4-xmldom.patch: simplexml.c | 4 ---- 1 files changed, 4 deletions(-) --- NEW FILE php-5.0.4-xmldom.patch --- --- php-5.0.4/ext/simplexml/simplexml.c.xmldom +++ php-5.0.4/ext/simplexml/simplexml.c @@ -1557,7 +1557,6 @@ return php_sxe_get_first_node(sxe, node TSRMLS_CC); } -#ifdef HAVE_DOM /* {{{ proto simplemxml_element simplexml_import_dom(domNode node [, string class_name]) Get a simplexml_element object from dom to allow for processing */ PHP_FUNCTION(simplexml_import_dom) @@ -1610,14 +1609,11 @@ } } /* }}} */ -#endif function_entry simplexml_functions[] = { PHP_FE(simplexml_load_file, NULL) PHP_FE(simplexml_load_string, NULL) -#ifdef HAVE_DOM PHP_FE(simplexml_import_dom, NULL) -#endif {NULL, NULL, NULL} }; Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/devel/php.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- php.spec 25 Apr 2005 13:59:09 -0000 1.74 +++ php.spec 4 May 2005 09:57:47 -0000 1.75 @@ -7,7 +7,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php Version: 5.0.4 -Release: 8 +Release: 9 License: The PHP License Group: Development/Languages URL: http://www.php.net/ @@ -34,11 +34,13 @@ Patch14: php-5.0.3-sprintf.patch Patch16: php-5.0.3-gdheaders.patch Patch17: php-5.0.3-gcc4.patch +Patch18: php-5.0.4-streamcopy.patch # Fixes for extension modules Patch21: php-4.3.1-odbc.patch Patch22: php-4.3.11-shutdown.patch Patch23: php-5.0.4-bug32282.patch +Patch24: php-5.0.4-xmldom.patch # Functional changes Patch30: php-5.0.4-dlopen.patch @@ -334,10 +336,12 @@ %patch13 -p1 -b .phpize64 %patch16 -p1 -b .gdheaders %patch17 -p1 -b .gcc4 +%patch18 -p1 -b .streamcopy %patch21 -p1 -b .odbc %patch22 -p1 -b .shutdown %patch23 -p1 -b .bug32282 +%patch24 -p1 -b .xmldom %patch30 -p1 -b .dlopen %patch31 -p1 -b .easter @@ -426,8 +430,7 @@ --enable-ftp \ --enable-magic-quotes \ --enable-sockets \ - --enable-sysvsem \ - --enable-sysvshm \ + --enable-sysvsem --enable-sysvshm --enable-sysvmsg \ --enable-track-vars \ --enable-trans-sid \ --enable-yp \ @@ -515,12 +518,13 @@ pushd build-cgi make install INSTALL_ROOT=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%{_bindir}/php $RPM_BUILD_ROOT%{_bindir}/php-cgi +# Install the CLI SAPI as /usr/bin/php +make install-cli INSTALL_ROOT=$RPM_BUILD_ROOT popd -# Install the Apache module and CLI +# Install the Apache module pushd build-apache make install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT -make install-cli INSTALL_ROOT=$RPM_BUILD_ROOT popd # Install the default configuration file and icons @@ -636,6 +640,12 @@ %endif %changelog +* Tue May 3 2005 Joe Orton 5.0.4-9 +- build simplexml_import_dom even with shared dom (#156434) +- prevent truncation of copied files to ~2Mb (#155916) +- install /usr/bin/php from CLI build alongside CGI +- enable sysvmsg extension (#142988) + * Mon Apr 25 2005 Joe Orton 5.0.4-8 - prevent build of builtin dba as well as shared extension From fedora-cvs-commits at redhat.com Wed May 4 10:14:24 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 06:14:24 -0400 Subject: rpms/tomcat5/devel .cvsignore,1.5,1.6 tomcat5.spec,1.13,1.14 Message-ID: <200505041014.j44AEOVe011203@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11190 Modified Files: .cvsignore tomcat5.spec Log Message: BC-compile Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Mar 2005 18:05:22 -0000 1.5 +++ .cvsignore 4 May 2005 10:14:22 -0000 1.6 @@ -1,4 +1,4 @@ jakarta-tomcat-5.0.30-src.tar.gz tomcat5-5.0.30 -noarch +i386 *.src.rpm Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- tomcat5.spec 26 Apr 2005 11:02:18 -0000 1.13 +++ tomcat5.spec 4 May 2005 10:14:22 -0000 1.14 @@ -2,7 +2,7 @@ %define full_name jakarta-%{name} %define version 5.0.30 %define majversion 5.0 -%define release 5jpp_1fc +%define release 5jpp_2fc %define section free %define summary Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API @@ -35,7 +35,6 @@ License: %{license} Group: Networking/Daemons URL: http://jakarta.apache.org/tomcat/ -BuildArch: noarch Source: http://jakarta.apache.org/builds/jakarta-tomcat-5.0/release/v%{version}/src/%{packdname}.tar.gz Source3: TOMCAT4.README.RPM Source4: %{name}-%{majversion}.init @@ -126,6 +125,8 @@ BuildRequires: xerces-j2 >= 0:2.6.2 BuildRequires: xml-commons-apis BuildRequires: jakarta-taglibs-standard >= 0:1.1.0 +BuildRequires: gcc-java >= 4.0.0-0.43 +ExclusiveArch: i386 x86_64 ppc %description Server that conforms to the Servlet 2.4 and JSP 2.0 @@ -335,9 +336,30 @@ jsse.jar=$(build-classpath jsse/jsse) EOBP ant -Dbuild.compiler=modern -Djava.home=%{java_home} build - popd +# BC-compile everything +pushd %{packdname} +for jar in jakarta-tomcat-5/build/bin/bootstrap.jar \ + jakarta-tomcat-5/build/common/lib/{naming,jasper}-*.jar \ + jakarta-tomcat-5/build/server/lib/{catalina,tomcat,servlets}*.jar \ + jakarta-servletapi-5/jsr15[24]/dist/lib/*.jar; do + [ `basename $jar .jar` = catalina-ant ] && continue + opts="$RPM_OPT_FLAGS -fPIC" + case `basename $jar .jar` in + catalina|catalina-optional) + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21362 + opts=`echo "$opts" | sed 's:-O.:-O0:'` + ;; + esac + aot-compile $jar lib`basename $jar`.so "$opts" +done +mv libbootstrap.jar.so libtomcat-bootstrap.jar.so +mv libjasper-compiler.jar.so libjasper5-compiler.jar.so +mv libjasper-runtime.jar.so libjasper5-runtime.jar.so +mv libservlet-api.jar.so libservletapi5.jar.so +mv libjsp-api.jar.so libjspapi.jar.so +popd %install rm -rf $RPM_BUILD_ROOT @@ -527,6 +549,49 @@ ln -s %{name}-jasper-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jasper popd +# solibs +pushd %{packdname} +mkdir -p $RPM_BUILD_ROOT%{_libdir} +for so in *.so; do + vso=`echo $so | sed "s|\.jar|-%{version}.jar|"` + cp -p $so $RPM_BUILD_ROOT%{_libdir}/$vso + ln -sf $vso $RPM_BUILD_ROOT%{_libdir}/$so +done +popd + +# gcjdb +gcjdbdir=`gcj-dbtool -p %{_libdir}`.d +mkdir -p $RPM_BUILD_ROOT$gcjdbdir +for db in %{name} %{name}-jasper %{name}-servlet-2.4-api; do + gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/$db-%{version}.db 80000 +done +for so in $RPM_BUILD_ROOT%{_libdir}/*-%{version}.jar.so; do + base=`basename $so -%{version}.jar.so | cut -c 4-` + pkg=%{name} + case $base in + tomcat-bootstrap) + jar=%{bindir}/bootstrap.jar + ;; + naming*) + jar=%{commondir}/lib/$base.jar + ;; + catalina*|tomcat*|servlets*) + jar=%{serverdir}/lib/$base.jar + ;; + jasper*) + jar=%{_javadir}/$base-%{version}.jar + pkg=%{name}-jasper + ;; + *api*) + jar=%{_javadir}/$base-%{version}.jar + pkg=%{name}-servlet-2.4-api + ;; + *) exit 1 + esac + gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/$pkg-%{version}.db \ + $RPM_BUILD_ROOT$jar \ + %{_libdir}/lib$base-%{version}.jar.so +done %clean @@ -568,6 +633,28 @@ build-jar-repository %{commondir}/endorsed jaxp_parser_impl xml-commons-apis 2>&1 +rebuild-gcj-db %{_libdir} + + +%postun +rebuild-gcj-db %{_libdir} + + +%post jasper +rebuild-gcj-db %{_libdir} + + +%postun jasper +rebuild-gcj-db %{_libdir} + + +%post servlet-2.4-api +rebuild-gcj-db %{_libdir} + + +%postun servlet-2.4-api +rebuild-gcj-db %{_libdir} + %post servlet-2.4-api-javadoc rm -f %{_javadocdir}/servletapi5 @@ -722,11 +809,19 @@ %{serverdir}/lib/* # %{tempdir}/README.txt +%attr(0755,root,root) %{_libdir}/libnaming*.jar.so +%attr(0755,root,root) %{_libdir}/libcatalina*.jar.so +%attr(0755,root,root) %{_libdir}/libtomcat*.jar.so +%attr(0755,root,root) %{_libdir}/libservlets*.jar.so +%{_libdir}/*/*/%{name}-%{version}.db + %files servlet-2.4-api %defattr(-,root,root) %doc %{packdname}/jakarta-tomcat-5/LICENSE %{_javadir}/servletapi5*.jar %{_javadir}/jspapi*.jar +%attr(0755,root,root) %{_libdir}/lib*api*.jar.so +%{_libdir}/*/*/%{name}-servlet-2.4-api-%{version}.db %files servlet-2.4-api-javadoc %defattr(-,root,root) @@ -742,6 +837,8 @@ %doc %{packdname}/jakarta-tomcat-jasper/jasper2/doc/* %{_javadir}/jasper*.jar %{_bindir}/j* +%attr(0755,root,root) %{_libdir}/libjasper*.jar.so +%{_libdir}/*/*/%{name}-jasper-%{version}.db %files jasper-javadoc %defattr(-,root,root) @@ -773,6 +870,9 @@ %{serverdir}/webapps/* %changelog +* Wed May 4 2005 Gary Benson 0:5.0.30-5jpp_2fc +- BC-compile. + * Tue Apr 26 2005 Gary Benson 0:5.0.30-5jpp_1fc - Upgrade to 5.0.30-5jpp. From fedora-cvs-commits at redhat.com Wed May 4 10:31:20 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 06:31:20 -0400 Subject: rpms/kdelibs/devel post-3.4.0-kdelibs-kimgio-fixed.diff, NONE, 1.1 kdelibs.spec, 1.93, 1.94 Message-ID: <200505041031.j44AVK1O008315@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8288 Modified Files: kdelibs.spec Added Files: post-3.4.0-kdelibs-kimgio-fixed.diff Log Message: kimgio input validation vulnerabilities post-3.4.0-kdelibs-kimgio-fixed.diff: exr.cpp | 2 g3r.cpp | 2 jp2.cpp | 5 + pcx.cpp | 164 +++++++++++++++++++++++++++++++------------------------------- pcx.h | 13 ++-- psd.cpp | 26 ++++++++- rgb.cpp | 10 ++- tiffr.cpp | 4 + xcf.cpp | 74 +++++++++++++++++++++++---- xcf.h | 4 - xview.cpp | 38 +++++--------- 11 files changed, 205 insertions(+), 137 deletions(-) --- NEW FILE post-3.4.0-kdelibs-kimgio-fixed.diff --- diff -u -3 -d -p -r1.4 -r1.4.2.1 --- exr.cpp 22 Nov 2004 03:48:27 -0000 1.4 +++ exr.cpp 19 Apr 2005 10:48:00 -0000 1.4.2.1 @@ -136,6 +136,8 @@ KDE_EXPORT void kimgio_exr_read( QImageI file.readPixels (dw.min.y, dw.max.y); QImage image(width, height, 32, 0, QImage::BigEndian); + if( image.isNull()) + return; // somehow copy pixels into image for ( int y=0; y < height; y++ ) { diff -u -3 -d -p -r1.4 -r1.4.2.1 --- g3r.cpp 22 Nov 2004 03:48:27 -0000 1.4 +++ g3r.cpp 18 Apr 2005 13:08:44 -0000 1.4.2.1 @@ -28,7 +28,7 @@ KDE_EXPORT void kimgio_g3_read( QImageIO QImage image(width, height, 1, 0, QImage::BigEndian); - if (scanlength != image.bytesPerLine()) + if (image.isNull() || scanlength != image.bytesPerLine()) { TIFFClose(tiff); return; diff -u -3 -d -p -r1.14 -r1.14.2.1 --- jp2.cpp 22 Nov 2004 03:48:27 -0000 1.14 +++ jp2.cpp 19 Apr 2005 10:48:00 -0000 1.14.2.1 @@ -157,8 +157,9 @@ namespace { void draw_view_gray( gs_t& gs, QImage& qti ) { - qti.create( jas_image_width( gs.image ), jas_image_height( gs.image ), - 8, 256 ); + if( !qti.create( jas_image_width( gs.image ), jas_image_height( gs.image ), + 8, 256 )) + return; for( int i = 0; i < 256; ++i ) qti.setColor( i, qRgb( i, i, i ) ); diff -u -3 -d -p -r1.12 -r1.12.2.2 --- pcx.cpp 22 Nov 2004 03:48:27 -0000 1.12 +++ pcx.cpp 19 Apr 2005 10:48:00 -0000 1.12.2.2 @@ -1,5 +1,5 @@ /* This file is part of the KDE project - Copyright (C) 2002-2003 Nadeem Hasan + Copyright (C) 2002-2005 Nadeem Hasan This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -44,6 +44,11 @@ static QDataStream &operator>>( QDataStr s >> ph.HScreenSize; s >> ph.VScreenSize; + // Skip the rest of the header + Q_UINT8 byte; + while ( s.device()->at() < 128 ) + s >> byte; + return s; } @@ -85,25 +90,22 @@ static QDataStream &operator<<( QDataStr return s; } -static PCXHEADER header; -static QImage img; -static Q_UINT16 w, h; - -void PCXHEADER::reset() +PCXHEADER::PCXHEADER() { + // Initialize all data to zero QByteArray dummy( 128 ); dummy.fill( 0 ); QDataStream s( dummy, IO_ReadOnly ); s >> *this; } -static void readLine( QDataStream &s, QByteArray &buf ) +static void readLine( QDataStream &s, QByteArray &buf, const PCXHEADER &header ) { Q_UINT32 i=0; Q_UINT32 size = buf.size(); Q_UINT8 byte, count; - if ( header.Encoding == 1 ) + if ( header.isCompressed() ) { // Uncompress the image data while ( i < size ) @@ -130,13 +132,14 @@ static void readLine( QDataStream &s, QB } } -static void readImage1( QDataStream &s ) +static void readImage1( QImage &img, QDataStream &s, const PCXHEADER &header ) { QByteArray buf( header.BytesPerLine ); - img.create( w, h, 1, 2, QImage::BigEndian ); + if(!img.create( header.width(), header.height(), 1, 2, QImage::BigEndian )) + return; - for ( int y=0; y> ( x%8 ) ) ) pixbuf[ x ] += ( 1 << i ); } uchar *p = img.scanLine( y ); - - for ( int x=0; x> flag; - kdDebug() << "Flag: " << flag << endl; + kdDebug( 399 ) << "Palette Flag: " << flag << endl; - if ( flag == 12 && header.Version == 5 ) + if ( flag == 12 && ( header.Version == 5 || header.Version == 2 ) ) { // Read the palette Q_UINT8 r, g, b; @@ -230,15 +235,16 @@ static void readImage8( QDataStream &s ) } } -static void readImage24( QDataStream &s ) +static void readImage24( QImage &img, QDataStream &s, const PCXHEADER &header ) { QByteArray r_buf( header.BytesPerLine ); QByteArray g_buf( header.BytesPerLine ); QByteArray b_buf( header.BytesPerLine ); - img.create( w, h, 32 ); + if(!img.create( header.width(), header.height(), 32 )) + return; - for ( int y=0; y> header; if ( header.Manufacturer != 10 || s.atEnd()) @@ -276,10 +283,8 @@ KDE_EXPORT void kimgio_pcx_read( QImageI return; } - w = ( header.XMax-header.XMin ) + 1; - h = ( header.YMax-header.YMin ) + 1; - - img.reset(); + int w = header.width(); + int h = header.height(); kdDebug( 399 ) << "Manufacturer: " << header.Manufacturer << endl; kdDebug( 399 ) << "Version: " << header.Version << endl; @@ -288,30 +293,27 @@ KDE_EXPORT void kimgio_pcx_read( QImageI kdDebug( 399 ) << "Width: " << w << endl; kdDebug( 399 ) << "Height: " << h << endl; kdDebug( 399 ) << "Window: " << header.XMin << "," << header.XMax << "," - << header.YMin << "," << header.YMax << endl; + << header.YMin << "," << header.YMax << endl; kdDebug( 399 ) << "BytesPerLine: " << header.BytesPerLine << endl; kdDebug( 399 ) << "NPlanes: " << header.NPlanes << endl; - // Skip the rest of the header - Q_UINT8 byte; - while ( s.device()->at() < 128 ) - s >> byte; + QImage img; if ( header.Bpp == 1 && header.NPlanes == 1 ) { - readImage1( s ); + readImage1( img, s, header ); } else if ( header.Bpp == 1 && header.NPlanes == 4 ) { - readImage4( s ); + readImage4( img, s, header ); } else if ( header.Bpp == 8 && header.NPlanes == 1 ) { - readImage8( s ); + readImage8( img, s, header ); } else if ( header.Bpp == 8 && header.NPlanes == 3 ) { - readImage24( s ); + readImage24( img, s, header ); } kdDebug( 399 ) << "Image Bytes: " << img.numBytes() << endl; @@ -359,7 +361,7 @@ static void writeLine( QDataStream &s, Q } } -static void writeImage1( QDataStream &s ) +static void writeImage1( QImage &img, QDataStream &s, PCXHEADER &header ) { img = img.convertBitOrder( QImage::BigEndian ); @@ -367,29 +369,27 @@ static void writeImage1( QDataStream &s header.NPlanes = 1; header.BytesPerLine = img.bytesPerLine(); - header.ColorMap.setColor( 0, qRgb( 0, 0, 0 ) ); - header.ColorMap.setColor( 1, qRgb( 255, 255, 255 ) ); - s << header; QByteArray buf( header.BytesPerLine ); - for ( int y=0; yioDevice() ); s.setByteOrder( QDataStream::LittleEndian ); - img = io->image(); + QImage img = io->image(); - w = img.width(); - h = img.height(); + int w = img.width(); + int h = img.height(); kdDebug( 399 ) << "Width: " << w << endl; kdDebug( 399 ) << "Height: " << h << endl; @@ -495,6 +495,8 @@ KDE_EXPORT void kimgio_pcx_write( QImage kdDebug( 399 ) << "BytesPerLine: " << img.bytesPerLine() << endl; kdDebug( 399 ) << "Num Colors: " << img.numColors() << endl; + PCXHEADER header; + header.Manufacturer = 10; header.Version = 5; header.Encoding = 1; @@ -509,19 +511,19 @@ KDE_EXPORT void kimgio_pcx_write( QImage if ( img.depth() == 1 ) { - writeImage1( s ); + writeImage1( img, s, header ); } else if ( img.depth() == 8 && img.numColors() <= 16 ) { - writeImage4( s ); + writeImage4( img, s, header ); } else if ( img.depth() == 8 ) { - writeImage8( s ); + writeImage8( img, s, header ); } else if ( img.depth() == 32 ) { - writeImage24( s ); + writeImage24( img, s, header ); } io->setStatus( 0 ); Index: pcx.h =================================================================== RCS file: /home/kde/kdelibs/kimgio/pcx.h,v retrieving revision 1.4 retrieving revision 1.4.8.1 diff -u -3 -d -p -r1.4 -r1.4.8.1 --- pcx.h 4 Jan 2003 00:48:25 -0000 1.4 +++ pcx.h 19 Apr 2005 10:48:00 -0000 1.4.8.1 @@ -49,7 +49,7 @@ class Palette rgb[ i ] = RGB( color ); } - QRgb color( int i ) + QRgb color( int i ) const { return qRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b ); } @@ -60,12 +60,11 @@ class Palette class PCXHEADER { public: - PCXHEADER() - { - reset(); - } + PCXHEADER(); - void reset(); + inline int width() const { return ( XMax-XMin ) + 1; } + inline int height() const { return ( YMax-YMin ) + 1; } + inline bool isCompressed() const { return ( Encoding==1 ); } Q_UINT8 Manufacturer; // Constant Flag, 10 = ZSoft .pcx Q_UINT8 Version; // Version information? @@ -99,7 +98,7 @@ class PCXHEADER // found only in PB IV/IV Plus Q_UINT16 VScreenSize; // Vertical screen size in pixels. New field // found only in PB IV/IV Plus -}; +} KDE_PACKED; #endif // PCX_H diff -u -3 -d -p -r1.1 -r1.1.2.1 --- psd.cpp 16 Dec 2004 09:59:07 -0000 1.1 +++ psd.cpp 19 Apr 2005 10:48:00 -0000 1.1.2.1 @@ -66,6 +66,19 @@ namespace { // Private. s >> header.color_mode; return s; } + static bool seekBy(QDataStream& s, unsigned int bytes) + { + char buf[4096]; + while (bytes) { + unsigned int num= QMIN(bytes,sizeof(buf)); + unsigned int l = num; + s.readRawBytes(buf, l); + if(l != num) + return false; + bytes -= num; + } + return true; + } // Check that the header is a valid PSD. static bool IsValid( const PSDHeader & header ) @@ -149,10 +162,8 @@ namespace { // Private. if( compression ) { // Skip row lengths. - ushort w; - for(uint i = 0; i < header.height * header.channel_count; i++) { - s >> w; - } + if(!seekBy(s, header.height*header.channel_count*sizeof(ushort))) + return false; // Read RLE data. for(uint channel = 0; channel < channel_num; channel++) { @@ -162,6 +173,8 @@ namespace { // Private. uint count = 0; while( count < pixel_count ) { uchar c; + if(s.atEnd()) + return false; s >> c; uint len = c; @@ -169,6 +182,9 @@ namespace { // Private. // Copy next len+1 bytes literally. len++; count += len; + if ( count > pixel_count ) + return false; + while( len != 0 ) { s >> *ptr; ptr += 4; @@ -181,6 +197,8 @@ namespace { // Private. len ^= 0xFF; len += 2; count += len; + if(s.atEnd() || count > pixel_count) + return false; uchar val; s >> val; while( len != 0 ) { diff -u -3 -d -p -r1.31 -r1.31.2.1 --- rgb.cpp 10 Jan 2005 19:54:19 -0000 1.31 +++ rgb.cpp 19 Apr 2005 10:48:00 -0000 1.31.2.1 @@ -87,7 +87,9 @@ bool SGIImage::getRow(uchar *dest) int n, i; if (!m_rle) { for (i = 0; i < m_xsize; i++) { - *dest++ = uchar(*m_pos); + if(m_pos >= m_data.end()) + return false; + dest[i] = uchar(*m_pos); m_pos += m_bpc; } return true; @@ -120,7 +122,7 @@ bool SGIImage::readData(QImage& img) { QRgb *c; Q_UINT32 *start = m_starttab; - QCString lguard(m_xsize); + QByteArray lguard(m_xsize); uchar *line = (uchar *)lguard.data(); unsigned x, y; @@ -128,7 +130,7 @@ bool SGIImage::readData(QImage& img) m_pos = m_data.begin(); for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast(img.scanLine(m_ysize - y - 1)); + c = (QRgb *) img.scanLine(m_ysize - y - 1); if (m_rle) m_pos = m_data.begin() + *start++; if (!getRow(line)) @@ -166,11 +168,11 @@ bool SGIImage::readData(QImage& img) } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast(img.scanLine(m_ysize - y - 1)); if (m_rle) m_pos = m_data.begin() + *start++; if (!getRow(line)) return false; + c = (QRgb*) img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) *c = qRgba(qRed(*c), qGreen(*c), qBlue(*c), line[x]); } diff -u -3 -d -p -r1.14 -r1.14.2.1 --- tiffr.cpp 22 Nov 2004 03:52:18 -0000 1.14 +++ tiffr.cpp 19 Apr 2005 10:48:00 -0000 1.14.2.1 @@ -84,6 +84,10 @@ KDE_EXPORT void kimgio_tiff_read( QImage return; QImage image( width, height, 32 ); + if( image.isNull()) { + TIFFClose( tiff ); + return; + } data = (uint32 *)image.bits(); //Sven: changed to %ld for 64bit machines diff -u -3 -d -p -r1.3 -r1.3.2.1 --- xcf.cpp 22 Nov 2004 03:48:27 -0000 1.3 +++ xcf.cpp 19 Apr 2005 10:48:00 -0000 1.3.2.1 @@ -234,10 +234,10 @@ bool XCFImageFormat::loadImageProperties property.readBytes(tag, size); Q_UINT32 flags; - char* data; + char* data=0; property >> flags >> data; - if (strcmp(tag, "gimp-comment") == 0) + if (tag && strncmp(tag, "gimp-comment", strlen("gimp-comment")) == 0) xcf_image.image.setText("Comment", 0, data); delete[] tag; @@ -257,6 +257,9 @@ bool XCFImageFormat::loadImageProperties case PROP_COLORMAP: property >> xcf_image.num_colors; + if(xcf_image.num_colors < 0 || xcf_image.num_colors > 65535) + return false; + xcf_image.palette.reserve(xcf_image.num_colors); for (int i = 0; i < xcf_image.num_colors; i++) { @@ -307,6 +310,9 @@ bool XCFImageFormat::loadProperty(QDataS return false; } + if(size > 65535 || size < 4) + return false; + size = 3 * (size - 4) + 4; data = new char[size]; @@ -336,19 +342,21 @@ bool XCFImageFormat::loadProperty(QDataS } size = 0; - } else - xcf_io.readBytes(data, size); + } else { + xcf_io >> size; + if(size >256000) + return false; + data = new char[size]; + xcf_io.readRawBytes(data, size); + } if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << " data, size " << size << endl; return false; } - if (size != 0) { - bytes.resize(size); - for (uint i = 0; i < size; i++) - bytes[i] = data[i]; - delete[] data; + if (size != 0 && data) { + bytes.assign(data,size); } return true; @@ -401,7 +409,8 @@ bool XCFImageFormat::loadLayer(QDataStre // Allocate the individual tile QImages based on the size and type // of this layer. - composeTiles(xcf_image); + if( !composeTiles(xcf_image)) + return false; xcf_io.device()->at(layer.hierarchy_offset); // As tiles are loaded, they are copied into the layers tiles by @@ -425,7 +434,8 @@ bool XCFImageFormat::loadLayer(QDataStre // of the QImage. if (!xcf_image.initialized) { - initializeImage(xcf_image); + if( !initializeImage(xcf_image)) + return false; copyLayerToImage(xcf_image); xcf_image.initialized = true; } else @@ -516,7 +526,7 @@ bool XCFImageFormat::loadLayerProperties * QImage structures for each of them. * \param xcf_image contains the current layer. */ -void XCFImageFormat::composeTiles(XCFImage& xcf_image) +bool XCFImageFormat::composeTiles(XCFImage& xcf_image) { Layer& layer(xcf_image.layer); @@ -556,48 +566,67 @@ void XCFImageFormat::composeTiles(XCFIma switch (layer.type) { case RGB_GIMAGE: layer.image_tiles[j][i] = QImage(tile_width, tile_height, 32, 0); + if( layer.image_tiles[j][i].isNull()) + return false; layer.image_tiles[j][i].setAlphaBuffer(false); break; case RGBA_GIMAGE: layer.image_tiles[j][i] = QImage(tile_width, tile_height, 32, 0); + if( layer.image_tiles[j][i].isNull()) + return false; layer.image_tiles[j][i].setAlphaBuffer(true); break; case GRAY_GIMAGE: layer.image_tiles[j][i] = QImage(tile_width, tile_height, 8, 256); + if( layer.image_tiles[j][i].isNull()) + return false; setGrayPalette(layer.image_tiles[j][i]); break; case GRAYA_GIMAGE: layer.image_tiles[j][i] = QImage(tile_width, tile_height, 8, 256); + if( layer.image_tiles[j][i].isNull()) + return false; setGrayPalette(layer.image_tiles[j][i]); layer.alpha_tiles[j][i] = QImage( tile_width, tile_height, 8, 256); + if( layer.alpha_tiles[j][i].isNull()) + return false; setGrayPalette(layer.alpha_tiles[j][i]); break; case INDEXED_GIMAGE: layer.image_tiles[j][i] = QImage(tile_width, tile_height, 8, xcf_image.num_colors); + if( layer.image_tiles[j][i].isNull()) + return false; setPalette(xcf_image, layer.image_tiles[j][i]); break; case INDEXEDA_GIMAGE: layer.image_tiles[j][i] = QImage(tile_width, tile_height,8, xcf_image.num_colors); + if( layer.image_tiles[j][i].isNull()) + return false; setPalette(xcf_image, layer.image_tiles[j][i]); layer.alpha_tiles[j][i] = QImage(tile_width, tile_height, 8, 256); + if( layer.alpha_tiles[j][i].isNull()) + return false; setGrayPalette(layer.alpha_tiles[j][i]); } if (layer.mask_offset != 0) { layer.mask_tiles[j][i] = QImage(tile_width, tile_height, 8, 256); + if( layer.mask_tiles[j][i].isNull()) + return false; setGrayPalette(layer.mask_tiles[j][i]); } } } + return true; } @@ -1072,7 +1101,7 @@ void XCFImageFormat::assignMaskBytes(Lay * For indexed images, translucency is an all or nothing effect. * \param xcf_image contains image info and bottom-most layer. */ -void XCFImageFormat::initializeImage(XCFImage& xcf_image) +bool XCFImageFormat::initializeImage(XCFImage& xcf_image) { // (Aliases to make the code look a little better.) Layer& layer(xcf_image.layer); @@ -1082,12 +1111,16 @@ void XCFImageFormat::initializeImage(XCF case RGB_GIMAGE: if (layer.opacity == OPAQUE_OPACITY) { image.create( xcf_image.width, xcf_image.height, 32); + if( image.isNull()) + return false; image.fill(qRgb(255, 255, 255)); break; } // else, fall through to 32-bit representation case RGBA_GIMAGE: image.create(xcf_image.width, xcf_image.height, 32); + if( image.isNull()) + return false; image.fill(qRgba(255, 255, 255, 0)); // Turning this on prevents fill() from affecting the alpha channel, // by the way. @@ -1097,6 +1130,8 @@ void XCFImageFormat::initializeImage(XCF case GRAY_GIMAGE: if (layer.opacity == OPAQUE_OPACITY) { image.create(xcf_image.width, xcf_image.height, 8, 256); + if( image.isNull()) + return false; setGrayPalette(image); image.fill(255); break; @@ -1104,6 +1139,8 @@ void XCFImageFormat::initializeImage(XCF case GRAYA_GIMAGE: image.create(xcf_image.width, xcf_image.height, 32); + if( image.isNull()) + return false; image.fill(qRgba(255, 255, 255, 0)); image.setAlphaBuffer(true); break; @@ -1125,12 +1162,16 @@ void XCFImageFormat::initializeImage(XCF image.create(xcf_image.width, xcf_image.height, 1, xcf_image.num_colors, QImage::LittleEndian); + if( image.isNull()) + return false; image.fill(0); setPalette(xcf_image, image); } else if (xcf_image.num_colors <= 256) { image.create(xcf_image.width, xcf_image.height, 8, xcf_image.num_colors, QImage::LittleEndian); + if( image.isNull()) + return false; image.fill(0); setPalette(xcf_image, image); } @@ -1147,6 +1188,8 @@ void XCFImageFormat::initializeImage(XCF image.create(xcf_image.width, xcf_image.height, 1, xcf_image.num_colors, QImage::LittleEndian); + if( image.isNull()) + return false; image.fill(0); setPalette(xcf_image, image); image.setAlphaBuffer(true); @@ -1160,6 +1203,8 @@ void XCFImageFormat::initializeImage(XCF xcf_image.palette[0] = qRgba(255, 255, 255, 0); image.create( xcf_image.width, xcf_image.height, 8, xcf_image.num_colors); + if( image.isNull()) + return false; image.fill(0); setPalette(xcf_image, image); image.setAlphaBuffer(true); @@ -1168,6 +1213,8 @@ void XCFImageFormat::initializeImage(XCF // true color. (There is no equivalent PNG representation output // from The GIMP as of v1.2.) image.create(xcf_image.width, xcf_image.height, 32); + if( image.isNull()) + return false; image.fill(qRgba(255, 255, 255, 0)); image.setAlphaBuffer(true); } @@ -1176,6 +1223,7 @@ void XCFImageFormat::initializeImage(XCF image.setDotsPerMeterX((int)(xcf_image.x_resolution * INCHESPERMETER)); image.setDotsPerMeterY((int)(xcf_image.y_resolution * INCHESPERMETER)); + return true; } Index: xcf.h =================================================================== RCS file: /home/kde/kdelibs/kimgio/xcf.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -3 -d -p -r1.1 -r1.1.2.1 --- xcf.h 13 Aug 2004 18:31:44 -0000 1.1 +++ xcf.h 19 Apr 2005 10:48:00 -0000 1.1.2.1 @@ -176,7 +176,7 @@ private: bool loadProperty(QDataStream& xcf_io, PropType& type, QByteArray& bytes); bool loadLayer(QDataStream& xcf_io, XCFImage& xcf_image); bool loadLayerProperties(QDataStream& xcf_io, Layer& layer); - void composeTiles(XCFImage& xcf_image); + bool composeTiles(XCFImage& xcf_image); void setGrayPalette(QImage& image); void setPalette(XCFImage& xcf_image, QImage& image); static void assignImageBytes(Layer& layer, uint i, uint j); @@ -185,7 +185,7 @@ private: static void assignMaskBytes(Layer& layer, uint i, uint j); bool loadMask(QDataStream& xcf_io, Layer& layer); bool loadChannelProperties(QDataStream& xcf_io, Layer& layer); - void initializeImage(XCFImage& xcf_image); + bool initializeImage(XCFImage& xcf_image); bool loadTileRLE(QDataStream& xcf_io, uchar* tile, int size, int data_length, Q_INT32 bpp); static void copyLayerToImage(XCFImage& xcf_image); diff -u -3 -d -p -r1.12 -r1.12.2.1 --- xview.cpp 22 Nov 2004 03:52:18 -0000 1.12 +++ xview.cpp 19 Apr 2005 10:48:00 -0000 1.12.2.1 @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -15,6 +16,9 @@ #define BUFSIZE 1024 +static const int b_255_3[]= {0,85,170,255}, // index*255/3 + rg_255_7[]={0,36,72,109,145,182,218,255}; // index *255/7 + KDE_EXPORT void kimgio_xv_read( QImageIO *_imageio ) { int x=-1; @@ -50,10 +54,14 @@ KDE_EXPORT void kimgio_xv_read( QImageIO sscanf(str, "%d %d %d", &x, &y, &maxval); if (maxval != 255) return; + int blocksize = x*y; + if(x < 0 || y < 0 || blocksize < x || blocksize < y) + return; // now follows a binary block of x*y bytes. - int blocksize = x*y; - char *block = new char[ blocksize ]; + char *block = (char*) malloc(blocksize); + if(!block) + return; if (iodev->readBlock(block, blocksize) != blocksize ) { @@ -62,6 +70,10 @@ KDE_EXPORT void kimgio_xv_read( QImageIO // Create the image QImage image( x, y, 8, maxval + 1, QImage::BigEndian ); + if( image.isNull()) { + free(block); + return; + } // how do the color handling? they are absolute 24bpp // or at least can be calculated as such. @@ -69,29 +81,9 @@ KDE_EXPORT void kimgio_xv_read( QImageIO for ( int j = 0; j < 256; j++ ) { -// ----------- OLIVER EIDEN -// That is the old-code ! -/* r = ((int) ((j >> 5) & 0x07)) << 5; - g = ((int) ((j >> 2) & 0x07)) << 5; - b = ((int) ((j >> 0) & 0x03)) << 6;*/ - - -// That is the code-how xv, decode 3-3-2 pixmaps, it is slighly different, -// but yields much better visuals results -/* r = (((int) ((j >> 5) & 0x07)) *255) / 7; - g = (((int) ((j >> 2) & 0x07)) *255) / 7; - b = (((int) ((j >> 0) & 0x03)) *255) / 3;*/ - -// This is the same as xv, with multiplications/divisions replaced by indexing - -// Look-up table to avoid multiplications and divisons - static int b_255_3[]= {0,85,170,255}, // index*255/3 - rg_255_7[]={0,36,72,109,145,182,218,255}; // index *255/7 - r = rg_255_7[((j >> 5) & 0x07)]; g = rg_255_7[((j >> 2) & 0x07)]; b = b_255_3[((j >> 0) & 0x03)]; -// --------------- image.setColor( j, qRgb( r, g, b ) ); } @@ -104,7 +96,7 @@ KDE_EXPORT void kimgio_xv_read( QImageIO _imageio->setImage( image ); _imageio->setStatus( 0 ); - delete [] block; + free(block); return; } Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- kdelibs.spec 13 Apr 2005 13:17:27 -0000 1.93 +++ kdelibs.spec 4 May 2005 10:31:15 -0000 1.94 @@ -22,7 +22,7 @@ %define arts 1 Version: 3.4.0 -Release: 5 +Release: 6 Summary: K Desktop Environment - Libraries Name: kdelibs Url: http://www.kde.org/ @@ -51,6 +51,10 @@ Patch33: kdelibs-3.3.2-ppc.patch Patch34: kdelibs-3.4.0-qtdoc.patch +# security fixes +# Patch100, CAN-2005-1046, kimgio input validation vulnerabilities +Patch100: post-3.4.0-kdelibs-kimgio-fixed.diff + # gcc4 workaround Patch200: admin-visibility.patch Patch201: kdelibs-3.4.0-gcc4-pr20973-workaround.patch @@ -171,6 +175,9 @@ %patch32 -p1 -b .cups %patch33 -p1 -b .ppc %patch34 -p1 -b .qtdoc +pushd kimgio +%patch100 -p0 -b .CAN-2005-1046 +popd %patch200 -p1 -b .gcc4 %patch201 -p1 -b .gcc4-pr20973 @@ -383,6 +390,9 @@ %doc %{_docdir}/HTML/en/kdelibs* %changelog +* Wed May 04 2005 Than Ngo 6:3.4.0-6 +- kimgio input validation vulnerabilities, CAN-2005-1046 + * Wed Apr 13 2005 Than Ngo 6:3.4.0-5 - more fixes from CVS stable branch - fix kbuildsycoca crashes with signal 11 on kde startup #154246 From fedora-cvs-commits at redhat.com Wed May 4 10:32:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 06:32:52 -0400 Subject: rpms/patch/devel patch.spec,1.14,1.15 patch-stripcr.patch,1.1,NONE Message-ID: <200505041032.j44AWpRL008391@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/patch/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8379 Modified Files: patch.spec Removed Files: patch-stripcr.patch Log Message: * Wed May 4 2005 Tim Waugh 2.5.4-24 - Reverted last change (bug #154283, bug #156762). Index: patch.spec =================================================================== RCS file: /cvs/dist/rpms/patch/devel/patch.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- patch.spec 29 Apr 2005 15:42:30 -0000 1.14 +++ patch.spec 4 May 2005 10:32:49 -0000 1.15 @@ -1,7 +1,7 @@ Summary: The GNU patch command, for modifying/upgrading files. Name: patch Version: 2.5.4 -Release: 23 +Release: 24 License: GPL URL: http://www.gnu.org/software/patch/patch.html Group: Development/Tools @@ -11,7 +11,6 @@ Patch3: patch-2.5.4-sigsegv.patch Patch4: patch-2.5.4-ifdef.patch Patch5: patch-2.5.4-program_name.patch -Patch6: patch-stripcr.patch Buildroot: %{_tmppath}/%{name}-%{version}-root %description @@ -31,7 +30,6 @@ %patch3 -p1 -b .sigsegv %patch4 -p1 -b .ifdef %patch5 -p1 -b .program_name -%patch6 -p1 -b .stripcr %build CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" @@ -58,6 +56,9 @@ %{_mandir}/*/* %changelog +* Wed May 4 2005 Tim Waugh 2.5.4-24 +- Reverted last change (bug #154283, bug #156762). + * Fri Apr 29 2005 Tim Waugh 2.5.4-23 - Applied patch from Toshio Kuratomi to avoid problems with DOS-format newlines (bug #154283). --- patch-stripcr.patch DELETED --- From fedora-cvs-commits at redhat.com Wed May 4 10:38:47 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 06:38:47 -0400 Subject: rpms/apr/FC-3 apr.spec,1.18,1.19 Message-ID: <200505041038.j44AclUX008525@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/apr/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv8513 Modified Files: apr.spec Log Message: * Wed May 4 2005 Joe Orton 0.9.4-25 - rebuild to fix bundled libtool for gcc 3.4.3 Index: apr.spec =================================================================== RCS file: /cvs/dist/rpms/apr/FC-3/apr.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- apr.spec 19 Jan 2005 09:29:42 -0000 1.18 +++ apr.spec 4 May 2005 10:38:45 -0000 1.19 @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime library Name: apr Version: 0.9.4 -Release: 24.2 +Release: 25 License: Apache Software License Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -44,7 +44,9 @@ %package devel Group: Development/Libraries Summary: APR library development kit -Requires: apr = %{version}-%{release} +Requires: apr = %{version}-%{release}, gcc = %(gcc -dumpversion) +# shipped libtool hard-codes paths to gcc libraries in versioned dir + Conflicts: subversion-devel < 0.20.1-2 %description devel @@ -149,6 +151,9 @@ %{_includedir}/apr-%{aprver}/*.h %changelog +* Wed May 4 2005 Joe Orton 0.9.4-25 +- rebuild to fix bundled libtool for gcc 3.4.3 + * Wed Jan 19 2005 Joe Orton 0.9.4-24.2 - rebuild to fix bundled libtool (#140810) From fedora-cvs-commits at redhat.com Wed May 4 10:58:17 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 06:58:17 -0400 Subject: rpms/kdewebdev/devel post-3.3.2-kdewebdev-kommander-fixed.diff, NONE, 1.1 kdewebdev.spec, 1.11, 1.12 Message-ID: <200505041058.j44AwHbc005561@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdewebdev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5537 Modified Files: kdewebdev.spec Added Files: post-3.3.2-kdewebdev-kommander-fixed.diff Log Message: apply patch to fix CAN-2005-0754, Kommander untrusted code execution post-3.3.2-kdewebdev-kommander-fixed.diff: instance.cpp | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+) --- NEW FILE post-3.3.2-kdewebdev-kommander-fixed.diff --- Index: kommander/executor/instance.cpp =================================================================== RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v retrieving revision 1.42 retrieving revision 1.42.2.1 diff -u -3 -d -p -r1.42 -r1.42.2.1 --- kommander/executor/instance.cpp 20 Jul 2004 19:04:40 -0000 1.42 +++ kommander/executor/instance.cpp 21 Apr 2005 23:35:59 -0000 1.42.2.1 @@ -131,6 +131,35 @@ bool Instance::build(QFile *a_file) bool Instance::run(QFile *a_file) { + // Check whether extension is *.kmdr + if (!m_uiFileName.fileName().endsWith(".kmdr")) { + KMessageBox::error(0, i18n("This file does not have a .kmdr extension. As a security precaution " + "Kommander will only run Kommander scripts with a clear identity."), + i18n("Wrong Extension")); + return false; + } + + // Check whether file is not in some temporary directory. + QStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); + tmpDirs += KGlobal::dirs()->resourceDirs("cache"); + tmpDirs.append("/tmp/"); + tmpDirs.append("/var/tmp/"); + + bool inTemp = false; + for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I) + if (m_uiFileName.directory(false).startsWith(*I)) + inTemp = true; + + if (inTemp) + { + if (KMessageBox::warningYesNo(0, i18n("This dialog is running from your /tmp directory. " + " This may mean that it was run from a KMail attachment or from a webpage. " + "

Any script contained in this dialog will have write access to all of your home directory; " + "running such dialogs may be dangerous: " + "

are you sure you want to continue?")) == KMessageBox::No) + return false; + } + /* add runtime arguments */ if (m_cmdArguments) { QString args; Index: kdewebdev.spec =================================================================== RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kdewebdev.spec 19 Apr 2005 15:37:46 -0000 1.11 +++ kdewebdev.spec 4 May 2005 10:58:15 -0000 1.12 @@ -8,7 +8,7 @@ %define kde_version 3.4.0 Version: 3.4.0 -Release: 2 +Release: 3 Summary: WEB Development package for the K Desktop Environment. Name: kdewebdev Url: http://quanta.sourceforge.net/ @@ -28,6 +28,10 @@ Patch0: javascript.patch Patch1: admin-visibility.patch +# security fixes +# KDE Security Advisory: Kommander untrusted code execution CAN-2005-0754 +Patch100: post-3.3.2-kdewebdev-kommander-fixed.diff + Prereq: /sbin/ldconfig Requires: kdelibs >= %{kde_version} @@ -58,6 +62,7 @@ %setup -q -a 1 -a 2 -a 3 -a 4 -a 5 %patch0 -p0 -b .javascript %patch1 -p1 -b .gcc +%patch100 -p0 -b .CAN-2005-0754 %build QTDIR="" && . /etc/profile.d/qt.sh @@ -145,6 +150,10 @@ %{_includedir}/* %changelog +* Wed May 04 2005 Than Ngo 6:3.4.0-3 +- apply patch to fix CAN-2005-0754, Kommander untrusted code execution, + thanks to KDE security team + * Tue Apr 19 2005 Than Ngo 6:3.4.0-2 - add kdesdk in buildrequires #155054 From fedora-cvs-commits at redhat.com Wed May 4 11:15:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 07:15:41 -0400 Subject: rpms/jakarta-commons-modeler/devel .cvsignore, 1.3, 1.4 jakarta-commons-modeler.spec, 1.8, 1.9 Message-ID: <200505041115.j44BFfNP008925@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-modeler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8912 Modified Files: .cvsignore jakarta-commons-modeler.spec Log Message: BC-compile Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Mar 2005 15:55:16 -0000 1.3 +++ .cvsignore 4 May 2005 11:15:39 -0000 1.4 @@ -1,4 +1,4 @@ modeler-1.1-src.tar.gz commons-modeler-1.1-src -noarch +i386 *.src.rpm Index: jakarta-commons-modeler.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jakarta-commons-modeler.spec 7 Mar 2005 14:28:54 -0000 1.8 +++ jakarta-commons-modeler.spec 4 May 2005 11:15:39 -0000 1.9 @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 1.1 -%define release 3jpp_1fc +%define release 3jpp_2fc %define section free Name: %{name} @@ -27,6 +27,7 @@ BuildRequires: jakarta-commons-collections >= 2.0 BuildRequires: jakarta-commons-digester >= 1.2 BuildRequires: jakarta-commons-logging >= 1.0 +BuildRequires: gcc-java >= 4.0.0-0.43 Requires: jaxp_parser_impl Requires: xml-commons-apis Requires: jaxp_transform_impl @@ -35,7 +36,7 @@ Requires: jakarta-commons-collections >= 2.0 Requires: jakarta-commons-digester >= 1.2 Requires: jakarta-commons-logging >= 1.0 -BuildArch: noarch +ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Provides: %{short_name} Obsoletes: %{short_name} @@ -66,6 +67,11 @@ ant dist +aot-compile \ + dist/%{short_name}.jar \ + lib%{name}-%{version}.jar.so \ + "$RPM_OPT_FLAGS -fPIC" + %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} @@ -75,6 +81,17 @@ # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +# solibs +install -d -m 755 $RPM_BUILD_ROOT%{_libdir} +install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir} +ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so +# gcjdb +gcjdbdir=`gcj-dbtool -p %{_libdir}`.d +mkdir -p $RPM_BUILD_ROOT$gcjdbdir +gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000 +gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \ + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \ + %{_libdir}/lib%{name}-%{version}.jar.so %clean rm -rf $RPM_BUILD_ROOT @@ -89,17 +106,28 @@ ln -sf %{short_name}-%{version}.jar %{short_name}.jar popd &> /dev/null +%post +rebuild-gcj-db %{_libdir} + +%postun +rebuild-gcj-db %{_libdir} + %files %defattr(-,root,root) %doc STATUS.html RELEASE-NOTES.txt PROPOSAL.html %{_javadir}/* +%attr(0755,root,root) %{_libdir}/lib*.jar.so +%{_libdir}/*/*/%{name}-%{version}.db %files javadoc %defattr(-,root,root) %{_javadocdir}/%{name}-%{version} %changelog -* Mon Mar 7 2005 Gary Benson 0:1.1-3jpp_1fc +* Wed May 4 2005 Gary Benson - 0:1.1-3jpp_2fc +- BC-compile. + +* Mon Mar 7 2005 Gary Benson - 0:1.1-3jpp_1fc - Build into Fedora. * Fri Oct 22 2004 Fernando Nasser - 0:1.1-3jpp_1rh From fedora-cvs-commits at redhat.com Wed May 4 11:39:07 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 07:39:07 -0400 Subject: rpms/jakarta-commons-digester/devel .cvsignore, 1.4, 1.5 jakarta-commons-digester.spec, 1.10, 1.11 Message-ID: <200505041139.j44Bd71w002847@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-digester/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2834 Modified Files: .cvsignore jakarta-commons-digester.spec Log Message: BC-compile Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Jan 2005 14:50:20 -0000 1.4 +++ .cvsignore 4 May 2005 11:39:04 -0000 1.5 @@ -1,4 +1,4 @@ commons-digester-1.6-src.tar.gz commons-digester-1.6-src -noarch +i386 *.src.rpm Index: jakarta-commons-digester.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jakarta-commons-digester.spec 20 Jan 2005 14:50:20 -0000 1.10 +++ jakarta-commons-digester.spec 4 May 2005 11:39:04 -0000 1.11 @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 1.6 -%define release 2jpp_1fc +%define release 2jpp_2fc %define section free Name: %{name} @@ -21,10 +21,11 @@ BuildRequires: jakarta-commons-collections >= 0:3.0 BuildRequires: jakarta-commons-logging >= 0:1.0 BuildRequires: jpackage-utils > 0:1.5 +BuildRequires: gcc-java >= 4.0.0-0.43 Requires: jakarta-commons-beanutils >= 0:1.3 Requires: jakarta-commons-collections >= 0:3.0 Requires: jakarta-commons-logging >= 0:1.0 -BuildArch: noarch +ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot # RHEL3 and FC2 Obsoletes: %{short_name} <= 1.4.1 @@ -56,6 +57,11 @@ rm ../LICENSE +aot-compile \ + dist/%{short_name}.jar \ + lib%{name}-%{version}.jar.so \ + "$RPM_OPT_FLAGS -fPIC" + %install rm -rf $RPM_BUILD_ROOT @@ -70,6 +76,19 @@ mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +# solibs +install -d -m 755 $RPM_BUILD_ROOT%{_libdir} +install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir} +ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so + +# gcjdb +gcjdbdir=`gcj-dbtool -p %{_libdir}`.d +mkdir -p $RPM_BUILD_ROOT$gcjdbdir +gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000 +gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \ + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \ + %{_libdir}/lib%{name}-%{version}.jar.so + %clean rm -rf $RPM_BUILD_ROOT @@ -77,6 +96,12 @@ rm -f %{_javadir}/%{short_name}*.jar rm -f %{_javadir}/%{name}*.jar +%post +rebuild-gcj-db %{_libdir} + +%postun +rebuild-gcj-db %{_libdir} + %triggerpostun -- commons-digester < 1.5 pushd %{_javadir} &> /dev/null ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar @@ -96,12 +121,17 @@ %defattr(0644,root,root,0755) %doc LICENSE.txt PROPOSAL.html STATUS.html RELEASE-NOTES.txt %{_javadir}/* +%attr(0755,root,root) %{_libdir}/lib*.jar.so +%{_libdir}/*/*/%{name}-%{version}.db %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} %changelog +* Wed May 4 2005 Gary Benson - 0:1.6-2jpp_2fc +- BC-compile the main jarfile. + * Thu Jan 20 2005 Gary Benson - 0:1.6-2jpp_1fc - Build into Fedora. From fedora-cvs-commits at redhat.com Wed May 4 12:41:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 08:41:00 -0400 Subject: rpms/jakarta-commons-collections/devel .cvsignore, 1.4, 1.5 jakarta-commons-collections.spec, 1.10, 1.11 Message-ID: <200505041241.j44Cf0jT029517@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-collections/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29504 Modified Files: .cvsignore jakarta-commons-collections.spec Log Message: BC-compile Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Jan 2005 12:46:41 -0000 1.4 +++ .cvsignore 4 May 2005 12:40:58 -0000 1.5 @@ -1,4 +1,4 @@ commons-collections-3.1-src.tar.gz commons-collections-3.1 -noarch +i386 *.src.rpm Index: jakarta-commons-collections.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jakarta-commons-collections.spec 20 Jan 2005 12:58:39 -0000 1.10 +++ jakarta-commons-collections.spec 4 May 2005 12:40:58 -0000 1.11 @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 3.1 -%define release 1jpp_1fc +%define release 1jpp_2fc %define section free %define with_tests %{?_with_tests:1}%{!?_without_tests:0} @@ -21,8 +21,8 @@ BuildRequires: ant-junit BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: coreutils - -BuildArch: noarch +BuildRequires: gcc-java >= 4.0.0-0.43 +ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot # RHEL3 and FC2 Obsoletes: %{short_name} <= 0:2.1 @@ -61,6 +61,11 @@ ant -Djava.io.tmpdir=. test %endif +aot-compile \ + build/%{short_name}-%{version}.jar \ + lib%{name}-%{version}.jar.so \ + "$RPM_OPT_FLAGS -fPIC" + %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} @@ -70,6 +75,17 @@ # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +# solibs +install -d -m 755 $RPM_BUILD_ROOT%{_libdir} +install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir} +ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so +# gcjdb +gcjdbdir=`gcj-dbtool -p %{_libdir}`.d +mkdir -p $RPM_BUILD_ROOT$gcjdbdir +gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000 +gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \ + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \ + %{_libdir}/lib%{name}-%{version}.jar.so %clean rm -rf $RPM_BUILD_ROOT @@ -79,6 +95,12 @@ rm -f %{_javadir}/%{short_name}*.jar rm -f %{_javadir}/%{name}*.jar +%post +rebuild-gcj-db %{_libdir} + +%postun +rebuild-gcj-db %{_libdir} + %triggerpostun -- commons-collections < 3.0 pushd %{_javadir} &> /dev/null ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar @@ -98,12 +120,17 @@ %defattr(0644,root,root,0755) %doc PROPOSAL.html README.txt STATUS.html LICENSE.txt RELEASE-NOTES.html %{_javadir}/* +%attr(0755,root,root) %{_libdir}/lib*.jar.so +%{_libdir}/*/*/%{name}-%{version}.db %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} %changelog +* Wed May 4 2005 Gary Benson - 0:3.1-1jpp_2fc +- BC-compile. + * Thu Jan 20 2005 Gary Benson - 0:3.1-1jpp_1fc - Build into Fedora. From fedora-cvs-commits at redhat.com Wed May 4 12:51:08 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 08:51:08 -0400 Subject: rpms/jakarta-commons-beanutils/devel .cvsignore, 1.4, 1.5 jakarta-commons-beanutils.spec, 1.10, 1.11 Message-ID: <200505041251.j44Cp8Yj000353@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv337 Modified Files: .cvsignore jakarta-commons-beanutils.spec Log Message: BC-compile Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Jan 2005 14:42:10 -0000 1.4 +++ .cvsignore 4 May 2005 12:51:06 -0000 1.5 @@ -1,4 +1,4 @@ commons-beanutils-1.7.0-src.tar.gz commons-beanutils-1.7.0-src -noarch +i386 *.src.rpm Index: jakarta-commons-beanutils.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jakarta-commons-beanutils.spec 20 Jan 2005 15:04:02 -0000 1.10 +++ jakarta-commons-beanutils.spec 4 May 2005 12:51:06 -0000 1.11 @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 1.7.0 -%define release 1jpp_1fc +%define release 1jpp_2fc %define section free Name: %{name} @@ -21,10 +21,11 @@ BuildRequires: jakarta-commons-logging >= 0:1.0 BuildRequires: jpackage-utils > 0:1.5 BuildRequires: coreutils +BuildRequires: gcc-java >= 4.0.0-0.43 Requires: jakarta-commons-collections >= 0:2.0 Requires: jakarta-commons-logging >= 0:1.0 -BuildArch: noarch +ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot # RHEL3 and FC2 Obsoletes: %{short_name} <= 1.6.1 @@ -53,6 +54,11 @@ export CLASSPATH=%(build-classpath commons-collections commons-logging) ant jar javadoc +aot-compile \ + dist/%{short_name}.jar \ + lib%{name}-%{version}.jar.so \ + "$RPM_OPT_FLAGS -fPIC" + %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} @@ -62,6 +68,17 @@ # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +# solibs +install -d -m 755 $RPM_BUILD_ROOT%{_libdir} +install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir} +ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so +# gcjdb +gcjdbdir=`gcj-dbtool -p %{_libdir}`.d +mkdir -p $RPM_BUILD_ROOT$gcjdbdir +gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000 +gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \ + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \ + %{_libdir}/lib%{name}-%{version}.jar.so %clean rm -rf $RPM_BUILD_ROOT @@ -70,6 +87,12 @@ rm -f %{_javadir}/%{short_name}*.jar rm -f %{_javadir}/%{name}*.jar +%post +rebuild-gcj-db %{_libdir} + +%postun +rebuild-gcj-db %{_libdir} + %triggerpostun -- commons-beanutils < 1.7 pushd %{_javadir} &> /dev/null ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar @@ -89,12 +112,17 @@ %defattr(0644,root,root,0755) %doc PROPOSAL.html STATUS.html RELEASE-NOTES.txt LICENSE.txt %{_javadir}/* +%attr(0755,root,root) %{_libdir}/lib*.jar.so +%{_libdir}/*/*/%{name}-%{version}.db %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} %changelog +* Wed May 4 2005 Gary Benson - 0:1.7.0-1jpp_2fc +- BC-compile. + * Thu Jan 20 2005 Gary Benson - 0:1.7.0-1jpp_1fc - Build into Fedora. From fedora-cvs-commits at redhat.com Wed May 4 13:09:36 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 09:09:36 -0400 Subject: rpms/jakarta-commons-collections/devel jakarta-commons-collections-javadoc-nonet.patch, NONE, 1.1 jakarta-commons-collections.spec, 1.11, 1.12 Message-ID: <200505041309.j44D9a29026861@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-collections/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26847 Modified Files: jakarta-commons-collections.spec Added Files: jakarta-commons-collections-javadoc-nonet.patch Log Message: Do not fetch stuff from sun.com during javadoc generation jakarta-commons-collections-javadoc-nonet.patch: build.xml | 3 --- 1 files changed, 3 deletions(-) --- NEW FILE jakarta-commons-collections-javadoc-nonet.patch --- --- commons-collections-3.1/build.xml~ 2004-06-23 00:17:14.000000000 +0100 +++ commons-collections-3.1/build.xml 2005-05-04 13:58:44.000000000 +0100 @@ -80,7 +80,6 @@ - @@ -362,7 +361,6 @@ author="true" version="true" use="true" - link="${javadoc.links}" overview="${source.java}/org/apache/commons/collections/overview.html" doctitle="${component.title} ${component.version} API;" windowtitle="${component.title} ${component.version} API" @@ -470,7 +468,6 @@ access="protected" author="false" version="false" - link="${javadoc.links}" overview="${source.test}/org/apache/commons/collections/overview.html" doctitle="${tf.title} ${tf.version} API;" windowtitle="${tf.title} ${tf.version} API" Index: jakarta-commons-collections.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jakarta-commons-collections.spec 4 May 2005 12:40:58 -0000 1.11 +++ jakarta-commons-collections.spec 4 May 2005 13:09:33 -0000 1.12 @@ -16,6 +16,7 @@ #Vendor: JPackage Project #Distribution: JPackage Source0: http://www.apache.org/dist/jakarta/commons/collections/source/commons-collections-3.1-src.tar.gz +Patch1: %{name}-javadoc-nonet.patch Url: http://jakarta.apache.org/commons/%{base_name}/ BuildRequires: ant BuildRequires: ant-junit @@ -51,6 +52,7 @@ %prep %setup -q -n %{short_name}-%{version} +%patch1 -p1 -b .orig # remove all binary libs find . -name "*.jar" -exec rm -f {} \; @@ -130,6 +132,7 @@ %changelog * Wed May 4 2005 Gary Benson - 0:3.1-1jpp_2fc - BC-compile. +- Do not fetch stuff from sun.com during javadoc generation. * Thu Jan 20 2005 Gary Benson - 0:3.1-1jpp_1fc - Build into Fedora. From fedora-cvs-commits at redhat.com Wed May 4 13:13:54 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 09:13:54 -0400 Subject: rpms/mod_jk/devel mod_jk.spec,1.7,1.8 Message-ID: <200505041313.j44DDsAA026964@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/mod_jk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26952 Modified Files: mod_jk.spec Log Message: * Wed May 4 2005 Joe Orton 0:1.2.6-3jpp_4fc - add dependency on httpd-mmn - package NOTICE in docdir per ASL2.0 requirements Index: mod_jk.spec =================================================================== RCS file: /cvs/dist/rpms/mod_jk/devel/mod_jk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_jk.spec 4 May 2005 00:54:29 -0000 1.7 +++ mod_jk.spec 4 May 2005 13:13:51 -0000 1.8 @@ -11,7 +11,7 @@ Summary: Tomcat mod_jk connector for Apache Name: mod_jk Version: 1.2.6 -Release: 3jpp_3fc +Release: 3jpp_4fc Epoch: 0 #Vendor: JPackage Project #Distribution: JPackage @@ -24,9 +24,11 @@ Patch0: jakarta-tomcat-connectors-jk-1.2.6-libtool-tag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libtool, %{apxs}, %{_bindir}/perl +BuildRequires: libtool, %{apxs}, %{_bindir}/perl, httpd-devel BuildRequires: java-devel, jpackage-utils >= 0:1.5.38 +Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel) + %description Tomcat mod_jk connector for Apache. @@ -153,7 +155,7 @@ %if %{?_with_apache1:0}%{!?_with_apache1:1} %files %defattr(-,root,root,-) -%doc LICENSE _ap20/mod_jk.conf.sample workers.properties.sample +%doc LICENSE NOTICE _ap20/mod_jk.conf.sample workers.properties.sample %doc jk/native/README jk/native/CHANGES.txt %{aplibdir}/* %endif @@ -169,6 +171,10 @@ %changelog +* Wed May 4 2005 Joe Orton 0:1.2.6-3jpp_4fc +- add dependency on httpd-mmn +- package NOTICE in docdir per ASL2.0 requirements + * Tue May 3 2005 Bill Nottingham - 0:1.2.6-3jpp_3fc - temporarily disable -tools subpackage (#156757) From fedora-cvs-commits at redhat.com Wed May 4 13:24:30 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 09:24:30 -0400 Subject: rpms/jakarta-commons-logging/devel .cvsignore, 1.4, 1.5 jakarta-commons-logging.spec, 1.11, 1.12 Message-ID: <200505041324.j44DOUFG003198@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-logging/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2530 Modified Files: .cvsignore jakarta-commons-logging.spec Log Message: BC-compile Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Oct 2004 13:55:30 -0000 1.4 +++ .cvsignore 4 May 2005 13:24:27 -0000 1.5 @@ -1,4 +1,4 @@ commons-logging-1.0.4-src.tar.gz commons-logging-1.0.4-src -noarch +i386 *.src.rpm Index: jakarta-commons-logging.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jakarta-commons-logging.spec 11 Jan 2005 17:59:08 -0000 1.11 +++ jakarta-commons-logging.spec 4 May 2005 13:24:27 -0000 1.12 @@ -6,7 +6,7 @@ Name: %{name} Version: 1.0.4 -Release: 2jpp_1fc +Release: 2jpp_2fc Epoch: 0 Summary: Jakarta Commons Logging Package License: Apache Software License @@ -17,8 +17,9 @@ Source0: http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-1.0.4-src.tar.gz BuildRequires: ant, jpackage-utils >= 0:1.5, log4j, avalon-logkit, avalon-framework, junit BuildRequires: coreutils +BuildRequires: gcc-java >= 4.0.0-0.43 Patch1: %{name}-junitclasspath.patch -BuildArch: noarch +ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot # RHEL3 and FC2 Obsoletes: %{short_name} <= 0:1.0.2 @@ -64,6 +65,12 @@ ant test %endif +aot-compile \ + dist/%{short_name}.jar \ + lib%{name}-%{version}.jar.so \ + "$RPM_OPT_FLAGS -fPIC" +# also covers %{short_name}-api.jar + # ----------------------------------------------------------------------------- %install @@ -78,6 +85,17 @@ # javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +# solibs +install -d -m 755 $RPM_BUILD_ROOT%{_libdir} +install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir} +ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so +# gcjdb +gcjdbdir=`gcj-dbtool -p %{_libdir}`.d +mkdir -p $RPM_BUILD_ROOT$gcjdbdir +gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000 +gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \ + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \ + %{_libdir}/lib%{name}-%{version}.jar.so # ----------------------------------------------------------------------------- @@ -90,6 +108,12 @@ rm -f %{_javadir}/%{short_name}*.jar rm -f %{_javadir}/%{name}*.jar +%post +rebuild-gcj-db %{_libdir} + +%postun +rebuild-gcj-db %{_libdir} + %triggerpostun -- commons-logging < 1.1 pushd %{_javadir} &> /dev/null ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar @@ -113,6 +137,8 @@ %defattr(0644,root,root,0755) %doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt %{_javadir}/* +%attr(0755,root,root) %{_libdir}/lib*.jar.so +%{_libdir}/*/*/%{name}-%{version}.db %files javadoc %defattr(0644,root,root,0755) @@ -121,10 +147,13 @@ # ----------------------------------------------------------------------------- %changelog -* Tue Jan 11 2005 Gary Benson 0:1.0.4-2jpp_1fc +* Wed May 4 2005 Gary Benson - 0:1.0.4-2jpp_2fc +- BC-compile. + +* Tue Jan 11 2005 Gary Benson - 0:1.0.4-2jpp_1fc - Sync with RHAPS. -* Thu Nov 4 2004 Gary Benson 0:1.0.4-1jpp_2fc +* Thu Nov 4 2004 Gary Benson - 0:1.0.4-1jpp_2fc - Build into Fedora. * Thu Oct 21 2004 Fernando Nasser - 0:1.0.4-2jpp_1rh From fedora-cvs-commits at redhat.com Wed May 4 13:49:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 09:49:41 -0400 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.63,1.64 Message-ID: <200505041349.j44Dnfht027484@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27472 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- cman-kernel.spec 2 May 2005 17:25:34 -0000 1.63 +++ cman-kernel.spec 4 May 2005 13:49:39 -0000 1.64 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1282_FC4 +%define kernel_version 2.6.11-1.1284_FC4 %define subversion 20050425.154843.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.11.3 -Release: 20050425.154843.FC4.5 +Release: 20050425.154843.FC4.6 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Wed May 4 13:49:49 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 09:49:49 -0400 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.49,1.50 Message-ID: <200505041349.j44Dnnrp027539@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27527 Modified Files: GFS-kernel.spec Log Message: Updated Kernel Version Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- GFS-kernel.spec 3 May 2005 19:51:44 -0000 1.49 +++ GFS-kernel.spec 4 May 2005 13:49:47 -0000 1.50 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1282_FC4 +%define kernel_version 2.6.11-1.1284_FC4 %define subversion 20050503.144108.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.11.4 -Release: 20050503.144108.FC4.1 +Release: 20050503.144108.FC4.2 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Wed May 4 13:49:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 09:49:56 -0400 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.40,1.41 Message-ID: <200505041349.j44DnuA2027597@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27585 Modified Files: dlm-kernel.spec Log Message: Updated Kernel Version Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- dlm-kernel.spec 2 May 2005 17:26:24 -0000 1.40 +++ dlm-kernel.spec 4 May 2005 13:49:53 -0000 1.41 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1282_FC4 +%define kernel_version 2.6.11-1.1284_FC4 %define subversion 20050425.154843.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.11.3 -Release: 20050425.154843.FC4.6 +Release: 20050425.154843.FC4.7 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Wed May 4 13:50:03 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 09:50:03 -0400 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.46,1.47 Message-ID: <200505041350.j44Do3BC027657@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27642 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gnbd-kernel.spec 2 May 2005 17:26:30 -0000 1.46 +++ gnbd-kernel.spec 4 May 2005 13:50:01 -0000 1.47 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1282_FC4 +%define kernel_version 2.6.11-1.1284_FC4 %define subversion 20050420.133124.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.11.2 -Release: 20050420.133124.FC4.10 +Release: 20050420.133124.FC4.11 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Wed May 4 14:06:33 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 10:06:33 -0400 Subject: rpms/httpd/devel httpd-2.0.54-ldapconn.patch, NONE, 1.1 httpd-2.0.54-userdir.patch, NONE, 1.1 httpd.spec, 1.66, 1.67 Message-ID: <200505041406.j44E6Xl0021662@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/httpd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21646 Modified Files: httpd.spec Added Files: httpd-2.0.54-ldapconn.patch httpd-2.0.54-userdir.patch Log Message: * Wed May 4 2005 Joe Orton 2.0.54-7 - mod_userdir: fix memory allocation issue (upstream #34588) - mod_ldap: fix memory corruption issue (Brad Nicholes, upstream #34618) httpd-2.0.54-ldapconn.patch: util_ldap.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) --- NEW FILE httpd-2.0.54-ldapconn.patch --- --- httpd-2.0.54/modules/experimental/util_ldap.c.ldapconn +++ httpd-2.0.54/modules/experimental/util_ldap.c @@ -241,6 +241,8 @@ int result = 0; int failures = 0; int version = LDAP_VERSION3; + int rc = LDAP_SUCCESS; + struct timeval timeOut = {10,0}; /* 10 second connection timeout */ util_ldap_state_t *st = (util_ldap_state_t *)ap_get_module_config( r->server->module_config, &ldap_module); @@ -317,6 +319,19 @@ /* always default to LDAP V3 */ ldap_set_option(ldc->ldap, LDAP_OPT_PROTOCOL_VERSION, &version); +#ifdef LDAP_OPT_NETWORK_TIMEOUT + if (st->connectionTimeout > 0) { + timeOut.tv_sec = st->connectionTimeout; + } + + if (st->connectionTimeout >= 0) { + rc = ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, (void *)&timeOut); + if (APR_SUCCESS != rc) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, + "LDAP: Could not set the connection timeout" ); + } + } +#endif } @@ -1405,7 +1420,6 @@ void *data; const char *userdata_key = "util_ldap_init"; - struct timeval timeOut = {10,0}; /* 10 second connection timeout */ /* util_ldap_post_config() will be called twice. Don't bother * going through all of the initialization on the first call @@ -1630,20 +1644,6 @@ "LDAP: SSL support unavailable" ); } -#ifdef LDAP_OPT_NETWORK_TIMEOUT - if (st->connectionTimeout > 0) { - timeOut.tv_sec = st->connectionTimeout; - } - - if (st->connectionTimeout >= 0) { - rc = ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, (void *)&timeOut); - if (APR_SUCCESS != rc) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, - "LDAP: Could not set the connection timeout" ); - } - } -#endif - return(OK); } httpd-2.0.54-userdir.patch: mod_userdir.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE httpd-2.0.54-userdir.patch --- http://svn.apache.org/viewcvs?rev=165151&view=rev --- httpd-2.0.54/modules/mappers/mod_userdir.c.userdir +++ httpd-2.0.54/modules/mappers/mod_userdir.c @@ -330,7 +330,7 @@ return NULL; } - if ((ugid = apr_palloc(r->pool, sizeof(ap_unix_identity_t *))) == NULL) { + if ((ugid = apr_palloc(r->pool, sizeof(*ugid))) == NULL) { return NULL; } Index: httpd.spec =================================================================== RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- httpd.spec 27 Apr 2005 14:33:45 -0000 1.66 +++ httpd.spec 4 May 2005 14:06:31 -0000 1.67 @@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.0.54 -Release: 6 +Release: 7 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -48,6 +48,8 @@ Patch29: httpd-2.0.48-workerhup.patch Patch30: httpd-2.0.48-davmisc.patch Patch31: httpd-2.0.54-ssltrans.patch +Patch32: httpd-2.0.54-userdir.patch +Patch33: httpd-2.0.54-ldapconn.patch # Features/functional changes Patch70: httpd-2.0.48-release.patch Patch71: httpd-2.0.40-xfsz.patch @@ -152,6 +154,8 @@ %patch29 -p1 -b .workerhup %patch30 -p1 -b .davmisc %patch31 -p1 -b .ssltrans +%patch32 -p1 -b .userdir +%patch33 -p1 -b .ldapconn %patch71 -p0 -b .xfsz %patch72 -p1 -b .pod @@ -547,6 +551,10 @@ %{_libdir}/httpd/build/libtool %changelog +* Wed May 4 2005 Joe Orton 2.0.54-7 +- mod_userdir: fix memory allocation issue (upstream #34588) +- mod_ldap: fix memory corruption issue (Brad Nicholes, upstream #34618) + * Tue Apr 26 2005 Joe Orton 2.0.54-6 - fix key/cert locations in post script From fedora-cvs-commits at redhat.com Wed May 4 14:08:17 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 10:08:17 -0400 Subject: rpms/rdist/devel rdist-6.1.5-stat64.patch, NONE, 1.1 rdist.spec, 1.14, 1.15 Message-ID: <200505041408.j44E8HNK021752@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/rdist/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21738 Modified Files: rdist.spec Added Files: rdist-6.1.5-stat64.patch Log Message: - Fixed incorrect use of statfs return values (#147481) rdist-6.1.5-stat64.patch: filesys.c | 4 ++-- server.c | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) --- NEW FILE rdist-6.1.5-stat64.patch --- --- rdist-6.1.5/src/filesys.c.stat64 2005-05-04 14:11:03.000000000 +0200 +++ rdist-6.1.5/src/filesys.c 2005-05-04 14:11:10.000000000 +0200 @@ -430,8 +430,8 @@ */ int getfilesysinfo(file, freespace, freefiles) char *file; - long *freespace; - long *freefiles; + fsblkcnt_t *freespace; + fsfilcnt_t *freefiles; { #if defined(STATFS_TYPE) static statfs_t statfsbuf; --- rdist-6.1.5/src/server.c.stat64 2005-05-04 14:11:23.000000000 +0200 +++ rdist-6.1.5/src/server.c 2005-05-04 14:20:34.000000000 +0200 @@ -62,8 +62,8 @@ int catname = 0; /* cat name to target name */ char *sptarget[32]; /* stack of saved ptarget's for directories */ char *fromhost = NULL; /* Client hostname */ -static long min_freespace = 0; /* Minimium free space on a filesystem */ -static long min_freefiles = 0; /* Minimium free # files on a filesystem */ +static fsblkcnt_t min_freespace = 0; /* Minimium free space on a filesystem */ +static fsfilcnt_t min_freefiles = 0; /* Minimium free # files on a filesystem */ int oumask; /* Old umask */ /* @@ -1326,7 +1326,7 @@ fatalerr("Expected digit, got '%s'.", cp); return; } - min_freespace = (unsigned long) atoi(cp); + min_freespace = (fsblkcnt_t) atoll(cp); break; case SC_FREEFILES: /* Minimium free files */ @@ -1334,7 +1334,7 @@ fatalerr("Expected digit, got '%s'.", cp); return; } - min_freefiles = (unsigned long) atoi(cp); + min_freefiles = (fsfilcnt_t) atoll(cp); break; case SC_LOGGING: /* Logging options */ @@ -1364,7 +1364,8 @@ time_t mtime, atime; char *owner, *group, *file; char new[MAXPATHLEN]; - long freespace = -1, freefiles = -1; + fsfilcnt_t freefiles = -1; + fsblkcnt_t freespace = -1; char *cp = cmd; /* @@ -1499,7 +1500,7 @@ */ if (min_freespace || min_freefiles) { /* Convert file size to kilobytes */ - long fsize = (long) (size / 1024); + fsblkcnt_t fsize = (fsblkcnt_t) (size / 1024); if (getfilesysinfo(target, &freespace, &freefiles) != 0) return; @@ -1511,14 +1512,14 @@ if (min_freespace && (freespace >= 0) && (freespace - fsize < min_freespace)) { error( - "%s: Not enough free space on filesystem: min %d free %d", + "%s: Not enough free space on filesystem: min %lld free %lld", target, min_freespace, freespace); return; } if (min_freefiles && (freefiles >= 0) && (freefiles - 1 < min_freefiles)) { error( - "%s: Not enough free files on filesystem: min %d free %d", + "%s: Not enough free files on filesystem: min %lld free %lld", target, min_freefiles, freefiles); return; } Index: rdist.spec =================================================================== RCS file: /cvs/dist/rpms/rdist/devel/rdist.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- rdist.spec 2 Mar 2005 16:54:28 -0000 1.14 +++ rdist.spec 4 May 2005 14:08:15 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Maintains identical copies of files on multiple machines. Name: rdist Version: 6.1.5 -Release: 40 +Release: 41 Epoch: 1 License: BSD Group: Applications/System @@ -20,6 +20,7 @@ Patch9: rdist-6.1.5-svr4.patch Patch10: rdist-6.1.5-ssh.patch Patch11: rdist-6.1.5-mkstemp.patch +Patch12: rdist-6.1.5-stat64.patch URL: http://www.MagniComp.com/rdist BuildRoot: %{_tmppath}/%{name}-root BuildPreReq: byacc @@ -50,6 +51,7 @@ %patch9 -p1 -b .svr4 %patch10 -p1 -b .ssh %patch11 -p1 -b .mkstemp +%patch12 -p1 -b .stat64 %build make @@ -83,6 +85,9 @@ %{_mandir}/man8/rdist.8* %changelog +* Wed May 04 2005 Phil Knirsch 6.1.5-41 +- Fixed incorrect use of statfs return values (#147481) + * Wed Mar 02 2005 Phil Knirsch 6.1.5-40 - bump release and rebuild with gcc 4 From fedora-cvs-commits at redhat.com Wed May 4 14:11:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 10:11:41 -0400 Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec, 1.7, 1.8 Message-ID: <200505041411.j44EBeIW021896@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/device-mapper-multipath/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21884 Modified Files: device-mapper-multipath.spec Log Message: By default, disable the multipathd service. Index: device-mapper-multipath.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- device-mapper-multipath.spec 19 Apr 2005 17:55:28 -0000 1.7 +++ device-mapper-multipath.spec 4 May 2005 14:11:38 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Tools to manage multipath devices using device-mapper. Name: device-mapper-multipath Version: 0.4.4 -Release: 2.0 +Release: 2.1 License: GPL Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ @@ -57,6 +57,7 @@ %post /sbin/chkconfig --add multipathd +/sbin/chkconfig --levels 0123456 off %preun if [ "$1" = 0 ]; then @@ -76,6 +77,9 @@ /var/cache/multipath %changelog +* Wed May 04 2005 Alasdair Kergon - 0.4.4-2.1 +- By default, disable the multipathd service. + * Tue Apr 19 2005 Alasdair Kergon - 0.4.4-2.0 - Fix core dump from last build. From fedora-cvs-commits at redhat.com Wed May 4 14:18:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 10:18:38 -0400 Subject: rpms/gnome-terminal/devel ne.po, NONE, 1.1 gnome-terminal.spec, 1.16, 1.17 Message-ID: <200505041418.j44EIc60025370@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25357 Modified Files: gnome-terminal.spec Added Files: ne.po Log Message: - Fix ne translation (bug 152240). --- NEW FILE ne.po --- # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: gnome-terminal\n" "POT-Creation-Date: 2004-07-13 15:38+0200\n" "PO-Revision-Date: 2005-03-09 06:21+0800\n" "Last-Translator: Rajeev Shrestha \n" "Language-Team: Nepali \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Nepali\n" "X-Poedit-Country: NEPAL\n" "X-Poedit-SourceCharset: utf-8\n" #: gnome-terminal.desktop.in.in.h:1 msgid "Command line" msgstr "command line" #: gnome-terminal.desktop.in.in.h:2 #: src/gnome-terminal.schemas.in.h:109 #: src/terminal-accels.c:172 #: src/terminal-profile.c:276 #: src/terminal-window.c:783 #: src/terminal.c:1205 #: src/terminal.c:1553 msgid "Terminal" msgstr "?????????????????????" #: src/eggcellrendererkeys.c:160 #: src/eggcellrendererkeys.c:161 msgid "Accelerator key" msgstr "??????????????????????????? ?????? " #: src/eggcellrendererkeys.c:170 #: src/eggcellrendererkeys.c:171 msgid "Accelerator modifiers" msgstr "????????????????????????????????? ??????????????????" #: src/eggcellrendererkeys.c:180 msgid "Accelerator Mode" msgstr "??????????????????????????? ??????????????????" #: src/eggcellrendererkeys.c:181 msgid "The type of accelerator." msgstr "????????????????????????????????? ?????????????????????" #: src/eggcellrendererkeys.c:219 #: src/gnome-terminal.glade2.h:33 #: src/terminal-accels.c:717 msgid "Disabled" msgstr "??????????????????" #: src/eggcellrendererkeys.c:330 #: src/eggcellrendererkeys.c:564 msgid "Type a new accelerator, or press Backspace to clear" msgstr "???????????? ???????????? ??????????????????????????? ???????????? ??????, ?????? ????????? ???????????? ?????????????????????????????? ??????????????????????????????" #: src/eggcellrendererkeys.c:567 msgid "Type a new accelerator" msgstr "???????????? ??????????????????????????? ??????????????????????????????" #: src/encoding.c:55 msgid "Current Locale" msgstr "????????????????????? ?????????????????????" #: src/encoding.c:58 #: src/encoding.c:84 #: src/encoding.c:127 #: src/encoding.c:175 #: src/encoding.c:199 msgid "Western" msgstr "????????????????????????" #: src/encoding.c:60 #: src/encoding.c:129 #: src/encoding.c:155 #: src/encoding.c:195 msgid "Central European" msgstr "??????????????????????????? ????????????????????????" #: src/encoding.c:62 msgid "South European" msgstr "???????????? ????????????????????????" #: src/encoding.c:64 #: src/encoding.c:80 #: src/encoding.c:209 msgid "Baltic" msgstr "?????????????????????" #: src/encoding.c:66 #: src/encoding.c:131 #: src/encoding.c:144 #: src/encoding.c:148 #: src/encoding.c:159 #: src/encoding.c:197 msgid "Cyrillic" msgstr "?????????????????????" #: src/encoding.c:68 #: src/encoding.c:137 #: src/encoding.c:153 #: src/encoding.c:207 msgid "Arabic" msgstr "??????????????????" #: src/encoding.c:70 #: src/encoding.c:165 #: src/encoding.c:201 msgid "Greek" msgstr "???????????????" #: src/encoding.c:72 msgid "Hebrew Visual" msgstr "?????????????????? ?????????????????? " #: src/encoding.c:74 #: src/encoding.c:135 #: src/encoding.c:171 #: src/encoding.c:205 msgid "Hebrew" msgstr "?????????????????? " #: src/encoding.c:76 #: src/encoding.c:133 #: src/encoding.c:179 #: src/encoding.c:203 msgid "Turkish" msgstr "??????????????????" #: src/encoding.c:78 msgid "Nordic" msgstr "??????????????????" #: src/encoding.c:82 msgid "Celtic" msgstr "?????????????????????" #: src/encoding.c:86 #: src/encoding.c:177 msgid "Romanian" msgstr "????????????????????????" #: src/encoding.c:89 #: src/encoding.c:91 #: src/encoding.c:93 #: src/encoding.c:95 #: src/encoding.c:97 msgid "Unicode" msgstr "?????????????????????" #: src/encoding.c:100 msgid "Armenian" msgstr "???????????????????????????" #: src/encoding.c:102 #: src/encoding.c:104 #: src/encoding.c:113 msgid "Chinese Traditional" msgstr "??????????????????????????? ?????????????????? " #: src/encoding.c:106 msgid "Cyrillic/Russian" msgstr "?????????????????????/???????????????" #: src/encoding.c:109 #: src/encoding.c:140 #: src/encoding.c:184 msgid "Japanese" msgstr "??????????????????" #: src/encoding.c:111 #: src/encoding.c:142 #: src/encoding.c:146 #: src/encoding.c:190 msgid "Korean" msgstr "??????????????????" #: src/encoding.c:116 #: src/encoding.c:118 #: src/encoding.c:120 #: src/encoding.c:124 msgid "Chinese Simplified" msgstr "????????? ??????????????????" #: src/encoding.c:122 msgid "Georgian" msgstr "?????????????????????" #: src/encoding.c:150 #: src/encoding.c:181 msgid "Cyrillic/Ukrainian" msgstr "?????????????????????/??????????????????????????????" #: src/encoding.c:157 [...1837 lines suppressed...] #: src/terminal.c:990 #, c-format msgid "Option \"%s\" requires an argument giving the geometry\n" msgstr "\"%s\" ??????????????????????????? geometry ???????????? ???????????? ?????????????????????????????? ?????????????????? ????????????\n" #: src/terminal.c:999 #, c-format msgid "Two \"%s\" options given for one window\n" msgstr "???????????? ???????????????????????? ?????????????????? ?????????????????? \"%s\" ??????????????????????????? ??????????????????\n" #: src/terminal.c:1009 msgid "Two geometries given for one window\n" msgstr "???????????? ???????????????????????? ?????????????????? ?????????????????? geometries ??????????????????\n" #: src/terminal.c:1035 #, c-format msgid "Option \"%s\" requires an argument giving the title\n" msgstr "\"%s\" ??????????????????????????? ?????????????????? ???????????? ???????????? ?????????????????????????????? ?????????????????? ????????????\n" #: src/terminal.c:1043 #: src/terminal.c:1066 #: src/terminal.c:1108 #, c-format msgid "Two \"%s\" options given for one tab\n" msgstr "???????????? ????????????????????? ?????????????????? ?????????????????? \"%s\" ??????????????????????????? ??????????????????\n" #: src/terminal.c:1058 #, c-format msgid "Option \"%s\" requires an argument giving the directory\n" msgstr "\"%s\" ??????????????????????????? ??????????????????????????? ???????????? ???????????? ?????????????????????????????? ?????????????????? ????????????\n" #: src/terminal.c:1078 msgid "Option --default-working-directory requires an argument giving the directory\n" msgstr "?????????????????? ??????????????????????????? ???????????????????????? ???????????????????????????????????? ??????????????????????????? ???????????? ???????????? ?????????????????????????????? ?????????????????? ????????????\n" #: src/terminal.c:1084 msgid "Two --default-working-directories given\n" msgstr "?????????????????? ??????????????????????????? ???????????????????????? ???????????????????????????????????? ???????????????\n" #: src/terminal.c:1100 #, c-format msgid "Option \"%s\" requires an argument giving the zoom factor\n" msgstr "\"%s\" ??????????????????????????? ????????? ???????????? ???????????? ???????????? ?????????????????????????????? ?????????????????? ????????????\n" #: src/terminal.c:1123 #, c-format msgid "\"%s\" is not a valid zoom factor\n" msgstr "\"%s\" ??????????????? ????????? ???????????? ????????????\n" #: src/terminal.c:1131 #, c-format msgid "Zoom factor \"%g\" is too small, using %g\n" msgstr "\"%g\"????????? ???????????? ???????????? ???????????? ???, %g ?????? ?????????????????? ???????????????\n" #: src/terminal.c:1138 #, c-format msgid "Zoom factor \"%g\" is too large, using %g\n" msgstr "\"%g\"????????? ???????????? ???????????? ???????????? ???, %g ?????? ?????????????????? ???????????????\n" #: src/terminal.c:1159 #, c-format msgid "Option --%s is no longer supported in this version of gnome-terminal; you might want to create a profile with the desired setting, and use the new --window-with-profile option\n" msgstr "" #: src/terminal.c:1165 #, c-format msgid "\"%s\" option given twice\n" msgstr "\"%s\" ?????????????????? ????????????????????? ???????????????\n" #: src/terminal.c:1170 #: src/terminal.c:1311 #, c-format msgid "\"%s\" option requires an argument\n" msgstr "\"%s\" ??????????????????????????? ???????????? ?????????????????????????????? ?????????????????? ????????????\n" #: src/terminal.c:1289 #, c-format msgid "No argument given to \"%s\" option\n" msgstr "\"%s\" ??????????????????????????? ???????????? ?????????????????????????????? ?????????????????? ?????????\n" #: src/terminal.c:1423 #, c-format msgid "No such profile '%s', using default profile\n" msgstr "'%s' ???????????????????????? ?????????, ??????????????????????????????????????? ?????????????????????????????? ?????????????????? ???????????????\n" #: src/terminal.c:1603 #, c-format msgid "Invalid argument: \"%s\"\n" msgstr "?????????????????? ????????????:\"%s\" \n" #: src/terminal.c:1676 #, c-format msgid "There was an error subscribing to notification of terminal profile list changes. (%s)\n" msgstr "" #: src/terminal.c:1905 #, c-format msgid "Invalid geometry string \"%s\"\n" msgstr "\"%s\" ???????????????????????? ??????????????? ??????????????????\n" #: src/terminal.c:1970 #, c-format msgid "There was an error getting the list of terminal profiles. (%s)\n" msgstr "????????????????????? ??????????????????????????????????????? ???????????? ??????????????????????????? ?????????????????? ???(%s)\n" #: src/terminal.c:2269 #, c-format msgid "You already have a profile called \"%s\"" msgstr "\"%s\" ????????? ???????????? ???????????????????????? ????????????????????? ??????????????? ???????????? ?????? ???" #: src/terminal.c:2280 msgid "The profile you selected as a base for your new profile no longer exists" msgstr "?????????????????? ???????????? ?????????????????????????????? ???????????? ???????????? ?????????????????? ???????????? ???????????????????????? ?????????????????????????????? ???????????? " #: src/terminal.c:2375 msgid "Enter profile name" msgstr "?????????????????????????????? ????????? ?????????" #: src/terminal.c:2385 msgid "Choose base profile" msgstr "????????? ????????????????????? ??????????????????????????????" #: src/terminal.c:2524 msgid "Profile list" msgstr "?????????????????????????????? ???????????? " #: src/terminal.c:2593 msgid "You must select one or more profiles to delete." msgstr "?????????????????? ???????????? ?????? ???????????? ????????????????????????????????? ?????????????????????????????????" #: src/terminal.c:2604 msgid "You must have at least one profile; you can't delete all of them." msgstr "????????????????????? ????????????????????? ???????????? ???????????????????????? ???????????? ????????????; ???????????? ????????? ?????????????????? ?????????????????????????????????" #: src/terminal.c:2611 #, c-format msgid "Delete this profile?\n" msgid_plural "Delete these %d profiles?\n" msgstr[0] "" msgstr[1] "" #: src/terminal.c:2632 #, c-format msgid "Delete profile \"%s\"?" msgstr "\"%s\" profile ???????????????????????????????" #: src/terminal.c:2654 msgid "Delete Profile" msgstr "???????????????????????? ?????????????????????????????? " #: src/terminal.c:2927 msgid "Profiles" msgstr "?????????????????????????????????" #: src/terminal.c:2968 msgid "_Profiles:" msgstr "?????????????????????????????????:" #: src/terminal.c:3000 msgid "Click to open new profile dialog" msgstr "???????????? ???????????????????????? ??????????????? ??????????????? ??????????????????????????????" #: src/terminal.c:3008 msgid "Click to open edit profile dialog" msgstr "???????????? ???????????????????????? ??????????????? ????????????????????? ???????????? ??????????????????????????????" #: src/terminal.c:3016 msgid "Click to delete selected profile" msgstr "???????????????????????? ???????????????????????? ?????????????????? ??????????????????????????????" #: src/terminal.c:3021 msgid "Profile _used when launching a new terminal:" msgstr "???????????? ???????????? ????????????????????? ?????????????????? ?????????????????? ???????????? ????????????????????????:" #: src/terminal.c:3077 msgid "Click button to choose profile" msgstr "???????????? ???????????????????????? ??????????????? ????????? ??????????????????????????????" #: src/terminal.c:3494 #, c-format msgid "There was an error displaying help: %s" msgstr "?????????????????? ????????????????????? ?????????????????? ?????????????????? : %s " #: src/terminal.c:3565 #, c-format msgid "The file \"%s\" is missing. This indicates that the application is installed incorrectly." msgstr "\"%s\" ???????????? ???????????? ???????????? ?????? ??????????????????????????? ????????? ????????????????????? ????????????????????? ???????????? ??????????????????" #: src/terminal.c:3729 msgid "It appears that you do not have gnome-terminal.server installed in a valid location. Factory mode disabled.\n" msgstr "??????????????? ????????????????????? ????????????????????????????????? ??????????????? ????????????????????? ????????????????????? ?????????????????? ????????? ??????????????? ???????????????????????? ????????????????????? ?????????????????? ?????????????????????\n" #: src/terminal.c:3732 msgid "Error registering terminal with the activation service; factory mode disabled.\n" msgstr "???????????????????????????????????? ????????????????????? ????????????????????? ??????????????? ??????????????? ??????????????????; ????????????????????? ?????????????????? ?????????????????? ?????????????????? \n" #: src/terminal.c:3768 msgid "Failed to retrieve terminal server from activation server\n" msgstr "?????????????????????????????? ?????????????????????????????????????????? ????????????????????? ????????????????????????????????? ??????????????? ????????????\n" Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnome-terminal.spec 25 Mar 2005 19:12:29 -0000 1.16 +++ gnome-terminal.spec 4 May 2005 14:18:36 -0000 1.17 @@ -13,9 +13,10 @@ Summary: GNOME Terminal Name: gnome-terminal Version: 2.10.0 -Release: 1 +Release: 2 URL: http://www.gnome.org/ -Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.3/gnome-terminal-%{version}.tar.bz2 +Source0: gnome-terminal-%{version}.tar.bz2 +Source1: ne.po License: GPL Group: User Interface/Desktops @@ -49,6 +50,7 @@ %prep %setup -q +cp ${RPM_SOURCE_DIR}/ne.po po %build @@ -98,6 +100,9 @@ %{_datadir}/application-registry/gnome-terminal.applications %changelog +* Wed May 4 2005 Ray Strode 2.10.0-2 +- Fix ne translation (bug 152240). + * Fri Mar 25 2005 Christopher Aillon 2.10.0-1 - Update to 2.10.0 From fedora-cvs-commits at redhat.com Wed May 4 15:00:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 11:00:44 -0400 Subject: rpms/gnome-panel/devel gnome-panel-2.10.1-fix-recent-items-crash.patch, NONE, 1.1 gnome-panel.spec, 1.66, 1.67 Message-ID: <200505041500.j44F0iYF016874@cvs.devel.redhat.com> Author: markmc Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16855 Modified Files: gnome-panel.spec Added Files: gnome-panel-2.10.1-fix-recent-items-crash.patch Log Message: * Wed May 4 2005 Mark McLoughlin 2.10.1-9 - Fix crash with "Recent Documents" menu (bug #156633) gnome-panel-2.10.1-fix-recent-items-crash.patch: egg-recent-model.c | 6 ++++++ panel-recent.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE gnome-panel-2.10.1-fix-recent-items-crash.patch --- --- gnome-panel-2.10.1/gnome-panel/panel-recent.c.fix-recent-items-crash 2005-05-04 15:44:22.000000000 +0100 +++ gnome-panel-2.10.1/gnome-panel/panel-recent.c 2005-05-04 15:44:34.000000000 +0100 @@ -234,7 +234,6 @@ menu_item, 0); view = egg_recent_view_gtk_new (menu, NULL); - g_object_unref (G_OBJECT (menu)); egg_recent_view_gtk_set_tooltip_func (view, recent_documents_tooltip_func, --- gnome-panel-2.10.1/gnome-panel/egg-recent-model.c.fix-recent-items-crash 2005-05-04 15:42:57.000000000 +0100 +++ gnome-panel-2.10.1/gnome-panel/egg-recent-model.c 2005-05-04 15:43:48.000000000 +0100 @@ -643,6 +643,8 @@ static gboolean egg_recent_model_changed_timeout (EggRecentModel *model) { + model->priv->changed_timeout = 0; + egg_recent_model_changed (model); return FALSE; @@ -929,6 +931,10 @@ { EggRecentModel *model = EGG_RECENT_MODEL (object); + if (model->priv->changed_timeout > 0) { + g_source_remove (model->priv->changed_timeout); + } + egg_recent_model_monitor (model, FALSE); Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- gnome-panel.spec 2 May 2005 13:18:24 -0000 1.66 +++ gnome-panel.spec 4 May 2005 15:00:27 -0000 1.67 @@ -23,7 +23,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.10.1 -Release: 8 +Release: 9 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2 Source1: redhat-panel-default-setup.entries @@ -74,6 +74,7 @@ Patch1: gnome-panel-2.10.0-remove-screenshot-menuitem.patch Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch Patch3: gnome-panel-2.10.1-no-huge-icons.patch +Patch4: gnome-panel-2.10.1-fix-recent-items-crash.patch %description @@ -99,6 +100,7 @@ %patch1 -p1 -b .remove-screenshot-menuitem %patch2 -p1 -b .speak-to-us-ye-old-wise-fish %patch3 -p1 -b .no-huge-icons +%patch4 -p1 -b .fix-recent-items-crash cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas @@ -237,6 +239,9 @@ %{_datadir}/gtk-doc %changelog +* Wed May 4 2005 Mark McLoughlin 2.10.1-9 +- Fix crash with "Recent Documents" menu (bug #156633) + * Mon May 2 2005 Mark McLoughlin 2.10.1-8 - Update to new OpenOffice.org .desktop file locations in openoffice.org-1.9.97-3 (bug #156064) From fedora-cvs-commits at redhat.com Wed May 4 15:03:23 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 11:03:23 -0400 Subject: rpms/kernel/devel/configs config-ppc64-generic,1.7,1.8 Message-ID: <200505041503.j44F3NgX017120@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv17063/configs Modified Files: config-ppc64-generic Log Message: * Wed May 4 2005 Jeremy Katz - enable radeonfb and agp on ppc64 to fix X on the G5 Index: config-ppc64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ppc64-generic,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config-ppc64-generic 21 Apr 2005 04:25:03 -0000 1.7 +++ config-ppc64-generic 4 May 2005 15:03:20 -0000 1.8 @@ -75,7 +75,6 @@ # CONFIG_NET_SB1000 is not set # CONFIG_AMD8111_ETH is not set # CONFIG_DE4X5 is not set -# CONFIG_AGP is not set # CONFIG_ISDN is not set CONFIG_GENERIC_ISA_DMA=y @@ -85,8 +84,9 @@ CONFIG_DEBUG_STACK_USAGE=y CONFIG_PM=y +CONFIG_AGP_UNINORTH=y # CONFIG_FB_VGA16 is not set -# CONFIG_FB_RADEON is not set +CONFIG_FB_RADEON=y # CONFIG_FB_ATY is not set # CONFIG_FB_ATY128 is not set # CONFIG_VIDEO_ZORAN is not set From fedora-cvs-commits at redhat.com Wed May 4 15:03:23 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 11:03:23 -0400 Subject: rpms/kernel/devel kernel-2.6.spec,1.1285,1.1286 Message-ID: <200505041503.j44F3NOn017113@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17063 Modified Files: kernel-2.6.spec Log Message: * Wed May 4 2005 Jeremy Katz - enable radeonfb and agp on ppc64 to fix X on the G5 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1285 retrieving revision 1.1286 diff -u -r1.1285 -r1.1286 --- kernel-2.6.spec 3 May 2005 23:31:11 -0000 1.1285 +++ kernel-2.6.spec 4 May 2005 15:03:20 -0000 1.1286 @@ -1205,6 +1205,9 @@ %endif %changelog +* Wed May 4 2005 Jeremy Katz +- enable radeonfb and agp on ppc64 to fix X on the G5 + * Tue May 3 2005 Dave Jones - Disable usbmon/debugfs again for now until SELinux policy is fixed. From fedora-cvs-commits at redhat.com Wed May 4 15:22:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 11:22:38 -0400 Subject: rpms/system-config-bind/FC-3 system-config-bind.spec, 1.9, 1.10 sources, 1.9, 1.10 .cvsignore, 1.3, 1.4 Message-ID: <200505041522.j44FMcLN020837@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv20822 Modified Files: system-config-bind.spec sources .cvsignore Log Message: New s-c-b version 4.0.0 Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-3/system-config-bind.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- system-config-bind.spec 9 Sep 2004 12:57:39 -0000 1.9 +++ system-config-bind.spec 4 May 2005 15:22:36 -0000 1.10 @@ -1,382 +1,105 @@ -# [for (x)emacs] -*- mode: RPM-SPEC; coding: utf-8 -*- -Summary: A Red Hat DNS configuration tool. -Name: system-config-bind -Version: 2.0.3 -Release: 1 -License: GPL -Group: Applications/System -Source: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root -BuildArch: noarch -BuildPreReq: python2 >= 2.2 -Requires: python2 >= 2.2.2 -Requires: gtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas, pygtk2 -Requires: bind -Requires: 4Suite -Requires: usermode -Obsoletes: redhat-config-bind -Obsoletes: bindconf +Summary: The Red Hat BIND DNS Configuration Tool. +Name: system-config-bind +Version: 4.0.0 +Release: 11 +License: GPL +Group: Applications/System +URL: http://people.redhat.com/~jvdias/system-config-bind +Source0: %{name}-%{version}-%{release}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildArch: noarch +BuildRequires: python, gettext, make +Requires: python >= 2.2 +Requires: pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas +Requires: bind, bind-utils +Obsoletes: redhat-config-bind +Obsoletes: bindconf + +%define debug_package %{nil} %description -The system-config-bind package contains a utility for configuring basic Domain -Name System (DNS) settings. +The system-config-bind package provides a graphical user interface (GUI) to +configure the Berkeley Internet Name Domain (BIND) Domain Name System (DNS) +server, "named", with a set of python modules. +Users new to BIND configuration can use this tool to quickly set up a working +DNS server. %prep %setup -q %build -%configure -make +rm -rf $RPM_BUILD_ROOT +make %install -rm -fr $RPM_BUILD_ROOT -%makeinstall - -install -D system-config-bind.desktop $RPM_BUILD_ROOT/usr/share/applications/system-config-bind.desktop - -%__mkdir_p \ -$RPM_BUILD_ROOT/{usr/bin,usr/sbin,usr/share/system-config-bind,usr/share/applications} - -%__mkdir_p $RPM_BUILD_ROOT/etc/security/console.apps \ - $RPM_BUILD_ROOT/etc/pam.d -%__install -m644 system-config-bind.console $RPM_BUILD_ROOT/etc/security/console.apps/%{name} -%__install -m644 named.custom $RPM_BUILD_ROOT/etc -%__ln_s %{name} $RPM_BUILD_ROOT/etc/security/console.apps/bindconf - -%__install -m644 system-config-bind.pam $RPM_BUILD_ROOT/etc/pam.d/%{name} -%__ln_s %{name} $RPM_BUILD_ROOT/etc/pam.d/bindconf - -%__ln_s consolehelper $RPM_BUILD_ROOT/usr/bin/%{name} -%__ln_s %{name}-gui $RPM_BUILD_ROOT/usr/sbin/system-config-bind -%__ln_s consolehelper $RPM_BUILD_ROOT/usr/bin/bindconf - -#mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT/%{_docdir}/%{name} - -%find_lang %{name} +make install ROOT=%{buildroot} +%find_lang %{name} || touch %{name}.lang; %clean -rm -fr $RPM_BUILD_ROOT - -%preun +rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang -%defattr(-,root,root) -%doc doc/*.html -%doc doc/figs -%doc doc/stylesheet-images -/usr/bin/%{name} +%defattr(-,root,named,-) +/usr/share/system-config-bind +/usr/sbin/system-config-bind +/usr/sbin/system-config-bind-gui +/usr/bin/system-config-bind /usr/bin/bindconf -/usr/sbin/%{name}-gui -/usr/sbin/%{name} -/usr/share/%{name} -/usr/share/applications/%{name}.desktop -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -%config(noreplace) /etc/named.custom -%config(noreplace) /etc/pam.d/%{name} -%config(noreplace) /etc/pam.d/bindconf -%config /etc/security/console.apps/%{name} -%config /etc/security/console.apps/bindconf +/usr/share/applications/system-config-bind.desktop +/usr/share/icons/hicolor/48x48/apps/system-config-bind.png +/etc/security/console.apps/system-config-bind +/etc/security/console.apps/bindconf +/etc/pam.d/bindconf +/etc/pam.d/system-config-bind +%doc scb_manual.pdf + +%post +if [ "$1" = "1" ]; then + if [ -f /etc/pam.d/bindconf ] && [ -f /etc/pam.d/system-config-bind ] && [ ! -L /etc/pam.d/bindconf ]; then + /bin/rm -f /etc/pam.d/bindconf; + /bin/ln -s /etc/pam.d/system-config-bind /etc/pam.d/bindconf; + fi + if [ -f /etc/security/console.apps/bindconf ] && [ -f /etc/security/console.apps/system-config-bind ] && [ ! -L /etc/security/console.apps/bindconf ]; then + /bin/rm -f /etc/security/console.apps/bindconf; + /bin/ln -s /etc/security/console.apps/system-config-bind /etc/security/console.apps/bindconf; + fi + /bin/touch --no-create %{_datadir}/icons/hicolor + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor + fi +fi + +%postun +if [ "$1" -eq 0 ]; then + /bin/touch --no-create %{_datadir}/icons/hicolor + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor + fi; +fi; %changelog -* Tue Jul 13 2004 Dan Walsh 2.0.3-1 -- Add IPV6 support -- Add modifications supplied by Ivan Gyurdiev - -* Thu Jul 1 2004 Dan Walsh 2.0.2-10 -- Fix many minor problems with GUI - -* Tue Jun 15 2004 Dan Walsh 2.0.2-9 -- Fix Zone handling of SOA Records - -* Wed Jun 8 2004 Dan Walsh 2.0.1-7 -- Handle case where zone files spec does not have file option - -* Wed Jun 8 2004 Dan Walsh 2.0.1-6 -- Handle case where /etc/named.conf does not exists - -* Wed Apr 28 2004 Dan Walsh 2.0.1-5 -- Fix ns_value entry - -* Tue Mar 24 2004 Dan Walsh 2.0.1-4 -- Add additional languages - -* Tue Jan 6 2004 Dan Walsh 2.0.1-3 -- Remove 2.2 hard coding. - -* Mon Jan 5 2004 Dan Walsh 2.0.1-2 -- Default new slave zones to slave directory - -* Wed Nov 5 2003 Dan Walsh 2.0.1-1 -- Enhance to better supporte more named.conf files - -* Wed Oct 22 2003 Dan Walsh 2.0.0-18 -- Add translations - -* Wed Oct 22 2003 Dan Walsh 2.0.0-17 -- Fix getSerial - -* Tue Oct 7 2003 Dan Walsh 2.0.0-16 -- Allow wildcard hostnames. - -* Wed Oct 1 2003 Dan Walsh 2.0.0-15 -- Bump - -* Wed Oct 1 2003 Dan Walsh 2.0.0-14 -- Fix pathing problem on hammer - -* Thu Sep 4 2003 Bill Nottingham 2.0.0-13 -- rebuild - -* Thu Sep 4 2003 Bill Nottingham 2.0.0-12 -- remove buildreq on libglade-devel - -* Tue Sep 2 2003 Daniel J Walsh 2.0.0-11 -- Bump - -* Tue Sep 2 2003 Daniel J Walsh 2.0.0-10 -- Fix getDirectory in Conf to catch all exceptions - -* Fri Aug 22 2003 Daniel J Walsh 2.0.0-9 -- More bug fixes - -* Fri Aug 22 2003 Daniel J Walsh 2.0.0-8 -- Bump - -* Fri Aug 22 2003 Daniel J Walsh 2.0.0-7 -- Fix problems in saving rev zones. - -* Tue Aug 19 2003 Daniel J Walsh 2.0.0-6 -- bump version - -* Tue Aug 19 2003 Daniel J Walsh 2.0.0-5 -- Requires python 2.2.2 - -* Tue Aug 19 2003 Daniel J Walsh 2.0.0-4 -- Fix requires - -* Thu Jul 31 2003 Daniel J Walsh 2.0.0-3 -- Fix sort routines in gui. - -* Tue Jul 29 2003 Daniel J Walsh 2.0.0-2 -- Fix glade location - -* Tue Jan 28 2003 Daniel J Walsh 2.0.0-1 -- Eliminate alchemist and simplify interface - -* Tue Jan 28 2003 Daniel J Walsh 1.9.0-13 -- Fix icon - -* Mon Jan 27 2003 Daniel J Walsh 1.9.0-12 -- Only install docs in one directory - -* Tue Jan 14 2003 Daniel J Walsh 1.9.0-11 -- Update Help Information - -* Thu Jan 9 2003 Daniel J Walsh 1.9.0-10 -- added StartupNotify=true - -* Fri Jan 3 2003 Daniel J Walsh 1.9.0-9 -- fix to create name service correctly - -* Tue Dec 24 2002 Daniel J Walsh 1.9.0-8 -- Make data entry easier -- Eliminate options from XSL - -* Fri Dec 6 2002 Daniel J Walsh 1.9.0-7 -- Fix error catching on invalid display - -* Mon Dec 2 2002 Dan Walsh 1.9.0-6 -- Fix unable to access DISPLAY exception - -* Fri Nov 1 2002 Dan Walsh 1.9.0-4 -- change gui layout and add save button - -* Thu Oct 10 2002 Dan Walsh 1.9.0-3 -- Cleanup GUI -- Confirm all delete operations - -* Tue Oct 8 2002 Dan Walsh 1.9.0-2 -- Fix Handling of Serial Numbers - -* Wed Oct 2 2002 Dan Walsh 1.9.0-1 -- Fix Slave Master List. - -* Wed Sep 5 2002 Dan Walsh 1.8.1-19 -- Fix bad exception name - -* Tue Sep 4 2002 Dan Walsh 1.8.1-18 -- Update translations - -* Thu Aug 29 2002 Trond Eivind Glomsr??d 1.8.1-17 -- Update translations - -* Thu Aug 29 2002 Dan Walsh 1.8.1-16 -- Update po files -- Fix Forward Double-Click problem - -* Tue Aug 20 2002 Dan Walsh 1.8.1-15 -- Use gnome url_show for help - -* Mon Aug 19 2002 Dan Walsh 1.8.1-14 -- Fix handling of MX records on cancel -- fix handling of serial button for reverse zones -- fix adding foward zone problem. - -* Fri Aug 9 2002 Dan Walsh 1.8.1-13 -- Don't ask to save when there are no changes -- fix bug where records get added when user presses cancel - -* Fri Aug 9 2002 Dan Walsh 1.8.1-12 -- remove mandatory named.ca - -* Thu Aug 8 2002 Dan Walsh 1.8.1-11 -- Update Help Documentation -- Latest Translations -- Fix string substitution code -- Eliminate Hash code use - -* Wed Aug 7 2002 Dan Walsh 1.8.1-10 -- Fix to use error messages on a single line -- Additional Help Documentation -- Changed headers and help names - -* Tue Aug 6 2002 Dan Walsh 1.8.1-9 -- Fix problems with Nameserver adding -- Fix problems with slave zones redisplay - -* Tue Aug 6 2002 Dan Walsh 1.8.1-8 -- Move gif files into figs directory - -* Tue Aug 6 2002 Dan Walsh 1.8.1-7 -- Fix handling of SOA record. -- Improve error messages. - -* Mon Aug 5 2002 Dan Walsh 1.8.1-6 -- Converted to use intltool - -* Fri Aug 2 2002 Dan Walsh 1.8.1-5 -- updated to remove conflict with previous version. - -* Fri Aug 2 2002 Dan Walsh 1.8.1-4 -- Add latest languages -- Update to build on Milan - -* Fri Jul 26 2002 Dan Walsh 1.8.1-3 -- Fix PAM file to use pam_timestamp - -* Tue Jul 23 2002 Dan Walsh 1.8.1-2 -- fix desktop files -- rename package to redhat-config-bind - -* Thu Jul 18 2002 Daniel Walsh 1.7.0-1 -- Fix mx record handling from the front screen. -- fix edit on main screen to save data - -* Wed Jul 17 2002 Daniel Walsh 1.6.6-1 -- added add record button to front screen -- show records in tree widget on front screen -- There are some major changes in UI on the front screen. -- fix help screens - -* Thu Jun 27 2002 Daniel Walsh 1.6.5-1 -- ported to gnome2 and gtk2 - -* Mon Apr 15 2002 Trond Eivind Glomsr??d 1.6.2-1 -- Update translations - -* Wed Mar 27 2002 Jonathan Blandford 1.6.1-2 -- change redhat-config-bindconf to redhat-config-bind -- Fix desktop file string - -* Thu Aug 30 2001 Trond Eivind Glomsr??d 1.6.1-1 -- remove the duplicate icon from kontrol-panel -- fix po-files (#52668) -- mark various config files as config(noreplace) - -* Tue Aug 28 2001 Harald Hoyer 1.6-5 -- changed mode to 0422 for newly created zone files #52678 - -* Tue Aug 14 2001 Tim Powers 1.6-4 -- rebuilt to hopefully fix rpm verify problem - -* Wed Aug 8 2001 Alexander Larsson 1.6-3 -- Install desktop file in serverconf: -- Install icon in /usr/share/pixmaps - -* Tue Jul 31 2001 Harald Hoyer 1.6-2 -- added softlinks to redhat-config-bindconf - -* Mon Jul 30 2001 Harald Hoyer 1.6-1 -- added BuildPreReq for libglade-devel (#44727) - -* Thu Jul 19 2001 Harald Hoyer 1.5-1 -- better regex for domain names (#43078) -- fixed about dialog -- added control section to named.conf (#44751) - -* Tue Mar 20 2001 Harald Hoyer 1.4-1 -- Updated German translation -- Added more len(NULL) exception preventions - -* Sun Mar 18 2001 Yukihiro Nakai 1.4-1 -- Update Japanese translation -- Add Japanese trasnlation to *.desktop - -* Thu Mar 08 2001 Harald Hoyer 1.3-1 -- added documentation - -* Mon Mar 05 2001 Harald Hoyer 1.2-1 -- added noreplace for the real user configuration file -- specfile cleanups - -* Thu Mar 01 2001 Harald Hoyer 1.1-1 -- fixed PTR list bug -- fixed specfile: BUGS entry in files - -* Wed Feb 28 2001 Elliot Lee 1.0-1 -- Release - -* Tue Feb 27 2001 Trond Eivind Glomsr??d -- i18n update - -* Fri Feb 23 2001 Elliot Lee 0.12-1 -- Update to new version - -* Thu Feb 22 2001 Harald Hoyer 0.11 -- more fixes and tests - -* Wed Feb 21 2001 Elliot Lee 0.10-1 -- Update - -* Thu Feb 15 2001 Harald Hoyer 0.8-2 -- integrated elliots distcheck changes - -* Wed Feb 14 2001 Elliot Lee 0.4-1 -- new version - -* Tue Feb 13 2001 Harald Hoyer 0.8 -- major GUI changes from and -- switched to automake - -* Fri Feb 10 2001 Harald Hoyer 0.7-1/2/3 -- fixed zone.conf.xsl -- fixed named.conf.xsl -- fixed bindconf.py typo -- added default Contact - -* Wed Feb 08 2001 Harald Hoyer 0.6-1 -- fixed TTLs in newly created zones -- added i18n in spec file -- fixed some unlink errors +* Wed Apr 27 2005 Jason Vas Dias - 4.0.0-10 +- Add User Guide & Manual in /usr/share/doc/system-config-bind-%{version} -* Wed Feb 07 2001 Harald Hoyer 0.5-1 -- switched to xslt and new data layer +* Wed Apr 27 2005 Miloslav Trmac - 4.0.0-9 +- Remove dependency on 4Suite (#155113) -* Wed Jan 24 2001 Elliot Lee 0.4-1 -- New version +* Wed Apr 27 2005 Jeremy Katz - 4.0.0-8 +- silence %%post -* Mon Jan 22 2001 Elliot Lee 0.2-1 -- Make a changelog entry because the build system wants one. Die, build system! +* Mon Apr 04 2005 Jason Vas Dias - 4.0.0-7 +- fix bug 153035: gtk.FALSE/TRUE deprecation warnings + +* Mon Mar 28 2005 Christopher Aillon +- added .spec file icon cache update + +* Tue Mar 08 2005 Jason Vas Dias - 4.0.0-4 +- fix bug 150011 +- Add DNSsec capabilities. + +* Sun Feb 01 2005 Jason Vas Dias - 4.0.0-3 +- fix bugs 146475, 146606, 143780 + +* Fri Dec 17 2004 Jason Vas Dias - 4.0.0-1 +- Initial build. -* Thu Jan 18 2001 Elliot Lee 0.1-1 -- Initial specfile Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 9 Sep 2004 12:57:39 -0000 1.9 +++ sources 4 May 2005 15:22:36 -0000 1.10 @@ -1 +1 @@ -65540acdfc6e639e63850545789b7717 system-config-bind-2.0.3.tar.gz +0e1524a5b169d86e591a939fb49a31df system-config-bind-4.0.0-11.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Sep 2004 12:57:39 -0000 1.3 +++ .cvsignore 4 May 2005 15:22:36 -0000 1.4 @@ -1 +1,2 @@ system-config-bind-2.0.3.tar.gz +system-config-bind-4.0.0-11.tar.gz From fedora-cvs-commits at redhat.com Wed May 4 16:07:24 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:07:24 -0400 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.47,1.48 Message-ID: <200505041607.j44G7Osx011903@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11891 Modified Files: gnbd-kernel.spec Log Message: Added ppc & ppc64 archs. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gnbd-kernel.spec 4 May 2005 13:50:01 -0000 1.47 +++ gnbd-kernel.spec 4 May 2005 16:07:21 -0000 1.48 @@ -38,7 +38,7 @@ Requires: kernel = %{kernel_version} Requires: /lib/modules/%{kernel_version} Provides: kernel-modules -ExclusiveArch: i586 i686 x86_64 +ExclusiveArch: i586 i686 x86_64 ppc ppc64 Source0: %{name}-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Wed May 4 16:07:46 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:07:46 -0400 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.64,1.65 Message-ID: <200505041607.j44G7kP5011951@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11921 Modified Files: cman-kernel.spec Log Message: Added ppc & ppc64 archs. Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- cman-kernel.spec 4 May 2005 13:49:39 -0000 1.64 +++ cman-kernel.spec 4 May 2005 16:07:43 -0000 1.65 @@ -39,7 +39,7 @@ Requires: kernel = %{kernel_version} Requires: /lib/modules/%{kernel_version} Provides: kernel-modules -ExclusiveArch: i586 i686 x86_64 +ExclusiveArch: i586 i686 x86_64 ppc ppc64 Source0: %{name}-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Wed May 4 16:08:02 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:08:02 -0400 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.41,1.42 Message-ID: <200505041608.j44G82nK011977@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11962 Modified Files: dlm-kernel.spec Log Message: Added ppc & ppc64 archs. Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- dlm-kernel.spec 4 May 2005 13:49:53 -0000 1.41 +++ dlm-kernel.spec 4 May 2005 16:07:59 -0000 1.42 @@ -42,7 +42,7 @@ Requires: /lib/modules/%{kernel_version} Requires: cman-kernel >= 2.6.11 Provides: kernel-modules -ExclusiveArch: i586 i686 x86_64 +ExclusiveArch: i586 i686 x86_64 ppc ppc64 Source0: %{name}-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Wed May 4 16:08:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:08:43 -0400 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.50,1.51 Message-ID: <200505041608.j44G8hRS012008@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11996 Modified Files: GFS-kernel.spec Log Message: Added ppc & ppc64 archs. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- GFS-kernel.spec 4 May 2005 13:49:47 -0000 1.50 +++ GFS-kernel.spec 4 May 2005 16:08:41 -0000 1.51 @@ -43,7 +43,7 @@ Requires: kernel = %{kernel_version} Requires: /lib/modules/%{kernel_version} Provides: kernel-modules -ExclusiveArch: i586 i686 x86_64 +ExclusiveArch: i586 i686 x86_64 ppc ppc64 Source0: gfs-kernel-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Wed May 4 16:10:34 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:10:34 -0400 Subject: rpms/dhcp/FC-3 dhcp-3.0.1-dhclient-script-DHCLIENT_USE_GATEWAY.patch, NONE, 1.1 dhcp.spec, 1.40, 1.41 Message-ID: <200505041610.j44GAYc7012076@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv12062 Modified Files: dhcp.spec Added Files: dhcp-3.0.1-dhclient-script-DHCLIENT_USE_GATEWAY.patch Log Message: fix bug 149780: dhclient-script will now only honor $GATEWAY if $DHCLIENT_USE_GATEWAY is also set dhcp-3.0.1-dhclient-script-DHCLIENT_USE_GATEWAY.patch: linux | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) --- NEW FILE dhcp-3.0.1-dhclient-script-DHCLIENT_USE_GATEWAY.patch --- --- dhcp-3.0.1/client/scripts/linux.dhclient-script-DHCP_USE_GATEWAY 2005-05-04 11:30:03.147918000 -0400 +++ dhcp-3.0.1/client/scripts/linux 2005-05-04 11:46:13.502540000 -0400 @@ -20,10 +20,13 @@ # by the dhclient C code, and passed on. function save_previous() { - if [ -e $1 -a ! -e $1.predhclient ]; then - mv $1 $1.predhclient + if [ -e $1 ]; then + /bin/mv $1 $1.predhclient + else + echo ''> $1.predhclient fi } + make_resolv_conf() { if [ "${PEERDNS}" == "no" ]; then return @@ -189,11 +192,11 @@ route del default; fi; fi; - if [[ ( -z "$GATEWAYDEV" && -z "$GATEWAY" ) || ( -z "$GATEWAY" && ( "$GATEWAYDEV" = "$interface") ) ]]; then + if [[ ( -z "$GATEWAYDEV" && (-z "$GATEWAY" || -z "$DHCLIENT_USE_GATEWAY") ) || ( (-z "$GATEWAY" || -z "$DHCLIENT_USE_GATEWAY") && ( "$GATEWAYDEV" = "$interface") ) ]]; then for router in $new_routers; do add_default_gateway $router && break; done - elif [[ ( -z "$GATEWAYDEV" || ( "$GATEWAYDEV" = "$interface" ) ) && ( -n "$GATEWAY" ) ]]; then + elif [[ ( -z "$GATEWAYDEV" || ( "$GATEWAYDEV" = "$interface" ) ) && ( -n "$GATEWAY" && -n "$DHCLIENT_USE_GATEWAY" ) ]]; then routerSubnet=`mask $GATEWAY $new_subnet_mask` mySubnet=`mask $new_ip_address $new_subnet_mask` if [ "$routerSubnet" = "$mySubnet" ]; then Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/FC-3/dhcp.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- dhcp.spec 25 Feb 2005 01:55:31 -0000 1.40 +++ dhcp.spec 4 May 2005 16:10:32 -0000 1.41 @@ -2,7 +2,7 @@ Name: dhcp Epoch: 7 Version: 3.0.1 -Release: 40_FC3 +Release: 42_FC3 Copyright: distributable Group: System Environment/Daemons Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz @@ -41,6 +41,7 @@ Patch136: dhcp-3.0.1-dhclient-restorecon.patch Patch137: dhcp-3.0.1-dhclient-config.patch Patch138: dhcp-3.0.1-pid_file_excl.patch +Patch139: dhcp-3.0.1-dhclient-script-DHCLIENT_USE_GATEWAY.patch URL: http://isc.org/products/DHCP/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -120,6 +121,7 @@ %patch136 -p1 -b .dhclient-restorecon %patch137 -p1 -b .dhclient-config %patch138 -p1 -b .pid_file_excl +%patch139 -p1 -b .dhclient-script-DHCLIENT_USE_GATEWAY cp %SOURCE1 . cat <site.conf @@ -240,6 +242,10 @@ %{_mandir}/man3/* %changelog +* Wed May 04 2005 Jason Vas Dias 7:3.0.1-42_FC3 +- fix bug 149780: require DHCLIENT_USE_GATEWAY setting for dhclient-script + to honor GATEWAY setting + * Thu Feb 24 2005 Jason Vas Dias 7:3.0.1-40_FC3 - fix bug 143640: allow only one dhclient to configure an interface From fedora-cvs-commits at redhat.com Wed May 4 16:43:02 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:43:02 -0400 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.48,1.49 Message-ID: <200505041643.j44Gh2VU009430@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9418 Modified Files: gnbd-kernel.spec Log Message: Added kernel requirement line. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- gnbd-kernel.spec 4 May 2005 16:07:21 -0000 1.48 +++ gnbd-kernel.spec 4 May 2005 16:42:59 -0000 1.49 @@ -36,7 +36,7 @@ Conflicts: GFS <= 6.0 Conflicts: GFS-modules Requires: kernel = %{kernel_version} -Requires: /lib/modules/%{kernel_version} +Requires: /lib/modules/%{kernel_version}/build Provides: kernel-modules ExclusiveArch: i586 i686 x86_64 ppc ppc64 Source0: %{name}-%{version}-%{subversion}.tar.gz From fedora-cvs-commits at redhat.com Wed May 4 16:45:19 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:45:19 -0400 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.65,1.66 Message-ID: <200505041645.j44GjJJP011956@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11491 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- cman-kernel.spec 4 May 2005 16:07:43 -0000 1.65 +++ cman-kernel.spec 4 May 2005 16:45:16 -0000 1.66 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1284_FC4 +%define kernel_version 2.6.11-1.1286_FC4 %define subversion 20050425.154843.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.11.3 -Release: 20050425.154843.FC4.6 +Release: 20050425.154843.FC4.7 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Wed May 4 16:45:27 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:45:27 -0400 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.51,1.52 Message-ID: <200505041645.j44GjRQq012826@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12814 Modified Files: GFS-kernel.spec Log Message: Updated Kernel Version Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- GFS-kernel.spec 4 May 2005 16:08:41 -0000 1.51 +++ GFS-kernel.spec 4 May 2005 16:45:24 -0000 1.52 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1284_FC4 +%define kernel_version 2.6.11-1.1286_FC4 %define subversion 20050503.144108.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.11.4 -Release: 20050503.144108.FC4.2 +Release: 20050503.144108.FC4.3 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Wed May 4 16:45:34 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:45:34 -0400 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.42,1.43 Message-ID: <200505041645.j44GjYQh012880@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12868 Modified Files: dlm-kernel.spec Log Message: Updated Kernel Version Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- dlm-kernel.spec 4 May 2005 16:07:59 -0000 1.42 +++ dlm-kernel.spec 4 May 2005 16:45:31 -0000 1.43 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1284_FC4 +%define kernel_version 2.6.11-1.1286_FC4 %define subversion 20050425.154843.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.11.3 -Release: 20050425.154843.FC4.7 +Release: 20050425.154843.FC4.8 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Wed May 4 16:45:42 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:45:42 -0400 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.49,1.50 Message-ID: <200505041645.j44Gjg1Q012933@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12922 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gnbd-kernel.spec 4 May 2005 16:42:59 -0000 1.49 +++ gnbd-kernel.spec 4 May 2005 16:45:39 -0000 1.50 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.11-1.1284_FC4 +%define kernel_version 2.6.11-1.1286_FC4 %define subversion 20050420.133124.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.11.2 -Release: 20050420.133124.FC4.11 +Release: 20050420.133124.FC4.12 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Wed May 4 16:52:22 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:52:22 -0400 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.50,1.51 Message-ID: <200505041652.j44GqMxM013138@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13126 Modified Files: gnbd-kernel.spec Log Message: Removed ppc64 Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gnbd-kernel.spec 4 May 2005 16:45:39 -0000 1.50 +++ gnbd-kernel.spec 4 May 2005 16:52:20 -0000 1.51 @@ -38,7 +38,7 @@ Requires: kernel = %{kernel_version} Requires: /lib/modules/%{kernel_version}/build Provides: kernel-modules -ExclusiveArch: i586 i686 x86_64 ppc ppc64 +ExclusiveArch: i586 i686 x86_64 ppc Source0: %{name}-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Wed May 4 16:52:37 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:52:37 -0400 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.51,1.52 Message-ID: <200505041652.j44Gqbal013191@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13179 Modified Files: gnbd-kernel.spec Log Message: Bumped rev. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- gnbd-kernel.spec 4 May 2005 16:52:20 -0000 1.51 +++ gnbd-kernel.spec 4 May 2005 16:52:35 -0000 1.52 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.11.2 -Release: 20050420.133124.FC4.12 +Release: 20050420.133124.FC4.13 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Wed May 4 16:53:14 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:53:14 -0400 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.66,1.67 Message-ID: <200505041653.j44GrEeW013256@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13244 Modified Files: cman-kernel.spec Log Message: Removed ppc64. Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- cman-kernel.spec 4 May 2005 16:45:16 -0000 1.66 +++ cman-kernel.spec 4 May 2005 16:53:11 -0000 1.67 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.11.3 -Release: 20050425.154843.FC4.7 +Release: 20050425.154843.FC4.8 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules @@ -39,7 +39,7 @@ Requires: kernel = %{kernel_version} Requires: /lib/modules/%{kernel_version} Provides: kernel-modules -ExclusiveArch: i586 i686 x86_64 ppc ppc64 +ExclusiveArch: i586 i686 x86_64 ppc Source0: %{name}-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Wed May 4 16:54:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:54:00 -0400 Subject: rpms/mkinitrd/devel .cvsignore, 1.58, 1.59 mkinitrd.spec, 1.58, 1.59 sources, 1.60, 1.61 Message-ID: <200505041654.j44Gs0ci013359@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13343 Modified Files: .cvsignore mkinitrd.spec sources Log Message: update to 4.2.11 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- .cvsignore 3 May 2005 18:44:51 -0000 1.58 +++ .cvsignore 4 May 2005 16:53:56 -0000 1.59 @@ -1 +1 @@ -mkinitrd-4.2.10.tar.bz2 +mkinitrd-4.2.11.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- mkinitrd.spec 3 May 2005 18:44:51 -0000 1.58 +++ mkinitrd.spec 4 May 2005 16:53:56 -0000 1.59 @@ -1,6 +1,6 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 4.2.10 +Version: 4.2.11 Release: 1 License: GPL Group: System Environment/Base @@ -57,6 +57,11 @@ %attr(644,root,root) %{_mandir}/man8/grubby.8* %changelog +* Wed May 4 2005 Peter Jones - 4.2.11-1 +- don't copy "rw" option into the initrd; use "ro" instead if it's + the only option. +- Don't print "unmounting old ..." messages in nash if we're set to quiet + * Tue May 3 2005 Peter Jones - 4.2.10-1 - set umask explicitly Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 3 May 2005 18:44:51 -0000 1.60 +++ sources 4 May 2005 16:53:56 -0000 1.61 @@ -1 +1 @@ -b8425f0a15f2c59312c38a4dcde16784 mkinitrd-4.2.10.tar.bz2 +b0dabac7539771b0187f2f0523aac8c5 mkinitrd-4.2.11.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 4 16:54:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:54:41 -0400 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.43,1.44 Message-ID: <200505041654.j44GsfK3030589@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28809 Modified Files: dlm-kernel.spec Log Message: Removed ppc64. Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- dlm-kernel.spec 4 May 2005 16:45:31 -0000 1.43 +++ dlm-kernel.spec 4 May 2005 16:54:38 -0000 1.44 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.11.3 -Release: 20050425.154843.FC4.8 +Release: 20050425.154843.FC4.9 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. @@ -42,7 +42,7 @@ Requires: /lib/modules/%{kernel_version} Requires: cman-kernel >= 2.6.11 Provides: kernel-modules -ExclusiveArch: i586 i686 x86_64 ppc ppc64 +ExclusiveArch: i586 i686 x86_64 ppc Source0: %{name}-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Wed May 4 16:55:05 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:55:05 -0400 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.52,1.53 Message-ID: <200505041655.j44Gt5oc007240@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6954 Modified Files: GFS-kernel.spec Log Message: Removed ppc64. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- GFS-kernel.spec 4 May 2005 16:45:24 -0000 1.52 +++ GFS-kernel.spec 4 May 2005 16:55:03 -0000 1.53 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.11.4 -Release: 20050503.144108.FC4.3 +Release: 20050503.144108.FC4.4 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules @@ -43,7 +43,7 @@ Requires: kernel = %{kernel_version} Requires: /lib/modules/%{kernel_version} Provides: kernel-modules -ExclusiveArch: i586 i686 x86_64 ppc ppc64 +ExclusiveArch: i586 i686 x86_64 ppc Source0: gfs-kernel-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Wed May 4 16:59:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 12:59:56 -0400 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.44,1.45 Message-ID: <200505041659.j44GxuN1007334@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7322 Modified Files: dlm-kernel.spec Log Message: Removed ppc. Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- dlm-kernel.spec 4 May 2005 16:54:38 -0000 1.44 +++ dlm-kernel.spec 4 May 2005 16:59:54 -0000 1.45 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.11.3 -Release: 20050425.154843.FC4.9 +Release: 20050425.154843.FC4.10 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. @@ -42,7 +42,7 @@ Requires: /lib/modules/%{kernel_version} Requires: cman-kernel >= 2.6.11 Provides: kernel-modules -ExclusiveArch: i586 i686 x86_64 ppc +ExclusiveArch: i586 i686 x86_64 Source0: %{name}-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Wed May 4 17:00:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 13:00:38 -0400 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.53,1.54 Message-ID: <200505041700.j44H0cVw007405@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7390 Modified Files: GFS-kernel.spec Log Message: Removed ppc. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- GFS-kernel.spec 4 May 2005 16:55:03 -0000 1.53 +++ GFS-kernel.spec 4 May 2005 17:00:35 -0000 1.54 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.11.4 -Release: 20050503.144108.FC4.4 +Release: 20050503.144108.FC4.5 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules @@ -43,7 +43,7 @@ Requires: kernel = %{kernel_version} Requires: /lib/modules/%{kernel_version} Provides: kernel-modules -ExclusiveArch: i586 i686 x86_64 ppc +ExclusiveArch: i586 i686 x86_64 Source0: gfs-kernel-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Wed May 4 17:41:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 13:41:44 -0400 Subject: rpms/rpm/devel rpm-4.4.1-matchpathcon.patch, 1.5, 1.6 rpm.spec, 1.162, 1.163 Message-ID: <200505041741.j44HfiT4005045@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5031 Modified Files: rpm-4.4.1-matchpathcon.patch rpm.spec Log Message: missing fsm.c patch rpm-4.4.1-matchpathcon.patch: build/Makefile.am | 1 + build/files.c | 27 ++++++++++++++------------- lib/fsm.c | 7 +++---- lib/rpmfi.c | 13 ++++++------- lib/rpminstall.c | 14 ++++---------- lib/verify.c | 30 ++++++++++++------------------ python/Makefile.am | 1 + python/rpmts-py.c | 13 ++++--------- 8 files changed, 45 insertions(+), 61 deletions(-) Index: rpm-4.4.1-matchpathcon.patch =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.1-matchpathcon.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rpm-4.4.1-matchpathcon.patch 3 May 2005 19:56:02 -0000 1.5 +++ rpm-4.4.1-matchpathcon.patch 4 May 2005 17:41:41 -0000 1.6 @@ -1,5 +1,5 @@ --- rpm-4.4.1/lib/rpmfi.c.matchpathcon 2005-02-10 03:30:28.000000000 -0500 -+++ rpm-4.4.1/lib/rpmfi.c 2005-05-03 12:03:07.674849000 -0400 ++++ rpm-4.4.1/lib/rpmfi.c 2005-05-04 13:39:26.819604000 -0400 @@ -16,7 +16,7 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" @@ -58,7 +58,7 @@ if (fcontextp) *fcontextp = av; --- rpm-4.4.1/lib/verify.c.matchpathcon 2004-10-24 15:36:30.000000000 -0400 -+++ rpm-4.4.1/lib/verify.c 2005-05-03 12:03:07.692829000 -0400 ++++ rpm-4.4.1/lib/verify.c 2005-05-04 13:39:26.830591000 -0400 @@ -128,20 +128,19 @@ if (rc == -1) *res |= (RPMVERIFY_LGETFILECONFAIL|RPMVERIFY_CONTEXTS); @@ -109,8 +109,8 @@ } ovsflags = rpmtsSetVSFlags(ts, vsflags); ---- rpm-4.4.1/lib/rpminstall.c.matchpathcon 2005-05-03 12:03:07.661860000 -0400 -+++ rpm-4.4.1/lib/rpminstall.c 2005-05-03 12:03:07.701823000 -0400 +--- rpm-4.4.1/lib/rpminstall.c.matchpathcon 2005-05-04 13:39:26.792632000 -0400 ++++ rpm-4.4.1/lib/rpminstall.c 2005-05-04 13:39:26.841580000 -0400 @@ -310,16 +310,10 @@ /* Initialize security context patterns (if not already done). */ @@ -132,8 +132,26 @@ } (void) rpmtsSetFlags(ts, ia->transFlags); +--- rpm-4.4.1/lib/fsm.c.matchpathcon 2005-05-04 13:40:00.372015000 -0400 ++++ rpm-4.4.1/lib/fsm.c 2005-05-04 13:38:43.723741000 -0400 +@@ -634,12 +634,11 @@ + if (ts != NULL && rpmtsSELinuxEnabled(ts) == 1 && + !(rpmtsFlags(ts) & RPMTRANS_FLAG_NOCONTEXTS)) + { +- rpmsx sx = rpmtsREContext(ts); ++ security_context_t scon == NULL; + +- if (sx != NULL) { ++ if ( matchpathcon(fsm->path, st->st_mode, &scon) == 0 && scon != NULL) { + /* Get file security context from patterns. */ +- fsm->fcontext = rpmsxFContext(sx, fsm->path, st->st_mode); +- sx = rpmsxFree(sx); ++ fsm->fcontext = scon; + } else { + int i = fsm->ix; + --- rpm-4.4.1/build/Makefile.am.matchpathcon 2005-01-17 13:46:16.000000000 -0500 -+++ rpm-4.4.1/build/Makefile.am 2005-05-03 12:03:07.707813000 -0400 ++++ rpm-4.4.1/build/Makefile.am 2005-05-04 13:39:26.848572000 -0400 @@ -35,6 +35,7 @@ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ @@ -143,7 +161,7 @@ rpmfile.h: --- rpm-4.4.1/build/files.c.matchpathcon 2005-01-04 11:35:05.000000000 -0500 -+++ rpm-4.4.1/build/files.c 2005-05-03 14:22:39.841438000 -0400 ++++ rpm-4.4.1/build/files.c 2005-05-04 13:39:26.859562000 -0400 @@ -23,7 +23,7 @@ #define _RPMFI_INTERNAL #include "rpmfi.h" @@ -202,7 +220,7 @@ (void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE, --- rpm-4.4.1/python/rpmts-py.c.matchpathcon 2005-02-12 22:12:07.000000000 -0500 -+++ rpm-4.4.1/python/rpmts-py.c 2005-05-03 12:03:07.727793000 -0400 ++++ rpm-4.4.1/python/rpmts-py.c 2005-05-04 13:39:26.870555000 -0400 @@ -1182,16 +1182,11 @@ /* Initialize security context patterns (if not already done). */ @@ -224,8 +242,8 @@ } if (_rpmts_debug) ---- rpm-4.4.1/python/Makefile.am.matchpathcon 2005-05-03 15:39:52.814388000 -0400 -+++ rpm-4.4.1/python/Makefile.am 2005-05-03 15:40:15.835346000 -0400 +--- rpm-4.4.1/python/Makefile.am.matchpathcon 2005-01-25 22:39:57.000000000 -0500 ++++ rpm-4.4.1/python/Makefile.am 2005-05-04 13:39:26.879541000 -0400 @@ -34,6 +34,7 @@ $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/popt/libpopt.la \ Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- rpm.spec 3 May 2005 19:56:46 -0000 1.162 +++ rpm.spec 4 May 2005 17:41:41 -0000 1.163 @@ -20,7 +20,7 @@ %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 17 +Release: 18 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Patch0: rpm-4.4.1-posttrans.patch @@ -531,6 +531,9 @@ %{__includedir}/popt.h %changelog +* Wed May 04 2005 Paul Nasrat - 4.4.1-18 +- Add missing fsm.c from matchpathcon patches + * Tue May 03 2005 Paul Nasrat - 4.4.1-17 - Fix typo From fedora-cvs-commits at redhat.com Wed May 4 17:52:28 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 13:52:28 -0400 Subject: rpms/rpm/devel rpm-4.4.1-matchpathcon.patch, 1.6, 1.7 rpm.spec, 1.163, 1.164 Message-ID: <200505041752.j44HqSAi008428@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8414 Modified Files: rpm-4.4.1-matchpathcon.patch rpm.spec Log Message: doh rpm-4.4.1-matchpathcon.patch: build/Makefile.am | 1 + build/files.c | 27 ++++++++++++++------------- lib/fsm.c | 7 +++---- lib/rpmfi.c | 13 ++++++------- lib/rpminstall.c | 14 ++++---------- lib/verify.c | 30 ++++++++++++------------------ python/Makefile.am | 1 + python/rpmts-py.c | 13 ++++--------- 8 files changed, 45 insertions(+), 61 deletions(-) Index: rpm-4.4.1-matchpathcon.patch =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.1-matchpathcon.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpm-4.4.1-matchpathcon.patch 4 May 2005 17:41:41 -0000 1.6 +++ rpm-4.4.1-matchpathcon.patch 4 May 2005 17:52:24 -0000 1.7 @@ -133,13 +133,13 @@ (void) rpmtsSetFlags(ts, ia->transFlags); --- rpm-4.4.1/lib/fsm.c.matchpathcon 2005-05-04 13:40:00.372015000 -0400 -+++ rpm-4.4.1/lib/fsm.c 2005-05-04 13:38:43.723741000 -0400 ++++ rpm-4.4.1/lib/fsm.c 2005-05-04 13:51:42.184501000 -0400 @@ -634,12 +634,11 @@ if (ts != NULL && rpmtsSELinuxEnabled(ts) == 1 && !(rpmtsFlags(ts) & RPMTRANS_FLAG_NOCONTEXTS)) { - rpmsx sx = rpmtsREContext(ts); -+ security_context_t scon == NULL; ++ security_context_t scon = NULL; - if (sx != NULL) { + if ( matchpathcon(fsm->path, st->st_mode, &scon) == 0 && scon != NULL) { Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- rpm.spec 4 May 2005 17:41:41 -0000 1.163 +++ rpm.spec 4 May 2005 17:52:24 -0000 1.164 @@ -20,7 +20,7 @@ %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 18 +Release: 18.1 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Patch0: rpm-4.4.1-posttrans.patch @@ -531,6 +531,10 @@ %{__includedir}/popt.h %changelog +* Wed May 04 2005 Paul Nasrat - 4.4.1-18.1 +- Fix typo +- Fix typo + * Wed May 04 2005 Paul Nasrat - 4.4.1-18 - Add missing fsm.c from matchpathcon patches From fedora-cvs-commits at redhat.com Wed May 4 18:09:20 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 14:09:20 -0400 Subject: rpms/gnome-desktop/devel gnome-desktop-2.10.0-setup-gettext.patch, NONE, 1.1 gnome-desktop.spec, 1.27, 1.28 Message-ID: <200505041809.j44I9KmU002599@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2584 Modified Files: gnome-desktop.spec Added Files: gnome-desktop-2.10.0-setup-gettext.patch Log Message: - run gettext initialization routines on startup (bug 155659). gnome-desktop-2.10.0-setup-gettext.patch: gnome-ditem-edit.c | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE gnome-desktop-2.10.0-setup-gettext.patch --- --- gnome-desktop-2.10.0/libgnome-desktop/gnome-ditem-edit.c 2005-03-24 11:11:00.804883832 +0900 +++ gnome-desktop-2.10.0/libgnome-desktop/gnome-ditem-edit.c 2005-03-24 11:11:03.240513560 +0900 @@ -124,6 +124,10 @@ object_class = (GtkObjectClass*) klass; gobject_class = (GObjectClass*) klass; + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + ditem_edit_signals[CHANGED] = g_signal_new ("changed", G_TYPE_FROM_CLASS (object_class), Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gnome-desktop.spec 17 Mar 2005 20:14:19 -0000 1.27 +++ gnome-desktop.spec 4 May 2005 18:09:17 -0000 1.28 @@ -24,6 +24,7 @@ Patch1: gnome-desktop-2.1.90-kdetheme.patch Patch2: gnome-desktop-2.9.91-desktop.patch +Patch3: gnome-desktop-2.10.0-setup-gettext.patch Requires: redhat-artwork Requires: redhat-menus @@ -77,6 +78,7 @@ %patch1 -p1 -b .kdetheme %patch2 -p1 -b .menu +%patch3 -p1 -b .setup-gettext cp -f %{SOURCE2} pixmaps/ cp -f %{SOURCE3} pixmaps/ @@ -132,6 +134,9 @@ #%{_datadir}/gtk-doc %changelog +* Wed May 4 2005 Ray Strode - 2.10.0-2 +- run gettext initialization routines on startup (bug 155659). + * Thu Mar 17 2005 Ray Strode - 2.10.0-1 - Update to upstream version 2.10.0 From fedora-cvs-commits at redhat.com Wed May 4 18:33:17 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 14:33:17 -0400 Subject: rpms/NetworkManager/devel NetworkManager-0.4-aplist-fix-hidden.patch, NONE, 1.1 NetworkManager-0.4-assert-fix.patch, NONE, 1.1 NetworkManager-0.4-devup.patch, NONE, 1.1 NetworkManager-0.4-leak-fixes.patch, NONE, 1.1 NetworkManager-0.4-novarargs.patch, NONE, 1.1 NetworkManager-0.4-use-thread-join.patch, NONE, 1.1 NetworkManager.spec, 1.42, 1.43 Message-ID: <200505041833.j44IXHAg032367@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32344 Modified Files: NetworkManager.spec Added Files: NetworkManager-0.4-aplist-fix-hidden.patch NetworkManager-0.4-assert-fix.patch NetworkManager-0.4-devup.patch NetworkManager-0.4-leak-fixes.patch NetworkManager-0.4-novarargs.patch NetworkManager-0.4-use-thread-join.patch Log Message: * Wed May 4 2005 Dan Williams - 0.4-9.cvs20050404 - Fix some memory leaks (Tom Parker) - Join to threads rather than spinning for their completion (Tom Parker) - Fix misuse of a g_assert() (Colin Walters) - Fix return checking of an ioctl() (Bill Moss) - Better detection and matching of hidden access points (Bill Moss) - Don't use varargs, and therefore don't crash on PPC (Peter Jones) NetworkManager-0.4-aplist-fix-hidden.patch: NetworkManagerAPList.c | 145 ++++++++++++++++++++++++++++++++++++++++--------- NetworkManagerAPList.h | 1 NetworkManagerPolicy.c | 2 3 files changed, 123 insertions(+), 25 deletions(-) --- NEW FILE NetworkManager-0.4-aplist-fix-hidden.patch --- --- NetworkManager-0.4/src/NetworkManagerPolicy.c.aplist-fix-hidden 2005-03-31 12:02:41.000000000 -0500 +++ NetworkManager-0.4/src/NetworkManagerPolicy.c 2005-05-04 11:36:18.000000000 -0400 @@ -515,6 +515,8 @@ } else nm_device_copy_allowed_to_dev_list (dev, data->allowed_ap_list); + + nm_ap_list_remove_duplicate_essids (nm_device_ap_list_get (dev)); } } --- NetworkManager-0.4/src/NetworkManagerAPList.h.aplist-fix-hidden 2005-02-25 16:19:21.000000000 -0500 +++ NetworkManager-0.4/src/NetworkManagerAPList.h 2005-05-04 11:37:17.000000000 -0400 @@ -38,6 +38,7 @@ void nm_ap_list_append_ap (NMAccessPointList *list, NMAccessPoint *ap); void nm_ap_list_remove_ap (NMAccessPointList *list, NMAccessPoint *ap); +void nm_ap_list_remove_duplicate_essids (NMAccessPointList *list); NMAccessPoint * nm_ap_list_get_ap_by_essid (NMAccessPointList *list, const char *network); NMAccessPoint * nm_ap_list_get_ap_by_address (NMAccessPointList *list, const struct ether_addr *addr); --- NetworkManager-0.4/src/NetworkManagerAPList.c.aplist-fix-hidden 2005-05-04 11:31:13.000000000 -0400 +++ NetworkManager-0.4/src/NetworkManagerAPList.c 2005-05-04 11:36:18.000000000 -0400 @@ -192,6 +192,80 @@ nm_ap_list_unlock (list); } +/* nm_ap_list_remove_duplicate_essids + * + */ +void nm_ap_list_remove_duplicate_essids (NMAccessPointList *list) +{ + NMAccessPoint *removal_ap; + NMAccessPoint *list_ap_max; + GSList *elt_i = NULL; + GSList *elt_j = NULL; + GSList *elt_max = NULL; + GSList *removal_list = NULL; + GSList *elt; + gint8 max_strength = 0; + gint8 strengthj = 0; + + g_return_if_fail (list != NULL); + + if (!nm_ap_list_lock (list)) + { + nm_warning ("nm_ap_list_append_ap() could not acquire AP list mutex." ); + return; + } + + for (elt_i = list->ap_list; elt_i; elt_i = g_slist_next (elt_i)) + { + NMAccessPoint *list_ap_i = (NMAccessPoint *)(elt_i->data); + gboolean found = FALSE; + + for (elt_j = list->ap_list; elt_j < elt_i; elt_j = g_slist_next (elt_j)) + { + NMAccessPoint *list_ap_j = (NMAccessPoint *)(elt_j->data); + + if ((found = (nm_null_safe_strcmp (nm_ap_get_essid (list_ap_i), nm_ap_get_essid (list_ap_j)) == 0))) + break; + } + + if (found) + continue; + + elt_max = elt_i; + list_ap_max = (NMAccessPoint *)(elt_i->data); + max_strength = nm_ap_get_strength (list_ap_i); + + for (elt_j = g_slist_next (elt_i); elt_j; elt_j = g_slist_next (elt_j)) + { + NMAccessPoint *list_ap_j = (NMAccessPoint *)(elt_j->data); + + strengthj = nm_ap_get_strength (list_ap_j); + if (nm_null_safe_strcmp (nm_ap_get_essid (list_ap_i), nm_ap_get_essid (list_ap_j)) == 0) + { + if (strengthj > max_strength) + { + removal_list = g_slist_append (removal_list, list_ap_max); + list_ap_max = list_ap_j; + max_strength = strengthj; + } + else + removal_list = g_slist_append (removal_list, list_ap_j); + } + } + } + nm_ap_list_unlock (list); + + for (elt = removal_list; elt; elt = g_slist_next (elt)) + { + if ((removal_ap = (NMAccessPoint *)(elt->data))) + { + nm_ap_list_remove_ap (list, removal_ap); + } + } + g_slist_free (removal_list); + +} + /* * nm_ap_list_get_ap_by_essid @@ -382,49 +456,70 @@ gboolean nm_ap_list_merge_scanned_ap (NMAccessPointList *list, NMAccessPoint *merge_ap, gboolean *new, gboolean *strength_changed) { - NMAccessPoint *list_ap; - gboolean success = FALSE; + NMAccessPoint *list_ap_addr, *list_ap_essid; + gboolean success = FALSE; g_return_val_if_fail (list != NULL, FALSE); g_return_val_if_fail (merge_ap != NULL, FALSE); g_return_val_if_fail (new != NULL, FALSE); g_return_val_if_fail (strength_changed != NULL, FALSE); - if (!(list_ap = nm_ap_list_get_ap_by_address (list, nm_ap_get_address (merge_ap)))) - list_ap = nm_ap_list_get_ap_by_essid (list, nm_ap_get_essid (merge_ap)); + if ((list_ap_addr = nm_ap_list_get_ap_by_address (list, nm_ap_get_address (merge_ap)))) + { - if (list_ap) + /* First, we check for an address match. If the merge AP has the + * same address as a list AP, the merge AP and the list AP + * must be the same physical AP. The list AP properties must be from + * a previous scan so the time_last_seen's are not equal. + * Update encryption, authentication method, + * strength, and the time_last_seen. */ + + const GTimeVal *merge_ap_seen = nm_ap_get_last_seen (merge_ap); + const GTimeVal *list_ap_addr_seen = nm_ap_get_last_seen (list_ap_addr); + + nm_ap_set_encrypted (list_ap_addr, nm_ap_get_encrypted (merge_ap)); + nm_ap_set_auth_method (list_ap_addr, nm_ap_get_auth_method (merge_ap)); + if (nm_ap_get_strength (merge_ap) != nm_ap_get_strength (list_ap_addr)) + { + nm_ap_set_strength (list_ap_addr, nm_ap_get_strength (merge_ap)); + *strength_changed = TRUE; + } + nm_ap_set_last_seen (list_ap_addr, merge_ap_seen); + } + else if ((list_ap_essid = nm_ap_list_get_ap_by_essid (list, nm_ap_get_essid (merge_ap)))) { - const GTimeVal *merge_ap_seen = nm_ap_get_last_seen (merge_ap); - const GTimeVal *list_ap_seen = nm_ap_get_last_seen (list_ap); - /* Merge some properties on the AP that are new from scan to scan. */ - nm_ap_set_encrypted (list_ap, nm_ap_get_encrypted (merge_ap)); - nm_ap_set_auth_method (list_ap, nm_ap_get_auth_method (merge_ap)); - - /* Don't update the strength on the existing AP if the timestamp is - * the same as the AP we're going to merge (which means that they were - * found in the same scan, have the same ESSID, but are different APs) - * and the existing AP's strength is greater than the one we're about - * to merge. This helps keep the ESSID's reported strength that of the - * strongest AP we can see. - */ - if (!( (list_ap_seen->tv_sec == merge_ap_seen->tv_sec) - && (nm_ap_get_strength (list_ap) > nm_ap_get_strength (merge_ap)))) + /* Second, we check for an ESSID match. In this case, + * a list AP has the same non-NULL ESSID as the merge AP. Update the + * encryption and authentication method. Update the strength and address + * except when the time_last_seen of the list AP is the same as the + * time_last_seen of the merge AP and the strength of the list AP is greater + * than or equal to the strength of the merge AP. If the time_last_seen's are + * equal, the merge AP and the list AP come from the same scan. + * Update the time_last_seen. */ + + const GTimeVal *merge_ap_seen = nm_ap_get_last_seen (merge_ap); + const GTimeVal *list_ap_essid_seen = nm_ap_get_last_seen (list_ap_essid); + + nm_ap_set_encrypted (list_ap_essid, nm_ap_get_encrypted (merge_ap)); + nm_ap_set_auth_method (list_ap_essid, nm_ap_get_auth_method (merge_ap)); + + if (!((list_ap_essid_seen->tv_sec == merge_ap_seen->tv_sec) + && (nm_ap_get_strength (list_ap_essid) >= nm_ap_get_strength (merge_ap)))) { - nm_ap_set_strength (list_ap, nm_ap_get_strength (merge_ap)); + nm_ap_set_strength (list_ap_essid, nm_ap_get_strength (merge_ap)); + nm_ap_set_address (list_ap_essid, nm_ap_get_address (merge_ap)); *strength_changed = TRUE; } - - nm_ap_set_last_seen (list_ap, merge_ap_seen); + nm_ap_set_last_seen (list_ap_essid, merge_ap_seen); } else { - /* Add the whole AP, list takes ownership. */ + /* Add the merge AP to the list. */ + nm_ap_list_append_ap (list, merge_ap); *new = TRUE; } - return TRUE; } NetworkManager-0.4-assert-fix.patch: nm-dbus-nm.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE NetworkManager-0.4-assert-fix.patch --- --- NetworkManager-0.4/src/nm-dbus-nm.c.assert-fix 2005-05-04 11:24:05.000000000 -0400 +++ NetworkManager-0.4/src/nm-dbus-nm.c 2005-05-04 11:24:41.000000000 -0400 @@ -129,7 +129,10 @@ * (something which should never happen), die. */ if (!appended) - g_assert ("Device list existed, but no devices were in it."); + { + nm_warning ("Device list existed, but no devices were in it."); + g_assert_not_reached (); + } dbus_message_iter_close_container (&iter, &iter_array); nm_unlock_mutex (data->data->dev_list_mutex, __FUNCTION__); NetworkManager-0.4-devup.patch: NetworkManagerDevice.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) --- NEW FILE NetworkManager-0.4-devup.patch --- --- NetworkManager-0.4/src/NetworkManagerDevice.c.devup 2005-05-04 11:28:55.000000000 -0400 +++ NetworkManager-0.4/src/NetworkManagerDevice.c 2005-05-04 11:29:37.000000000 -0400 @@ -1557,8 +1557,7 @@ /* Get flags already there */ strcpy (ifr.ifr_name, nm_device_get_iface (dev)); - err = ioctl (sk, SIOCGIFFLAGS, &ifr); - if (!err) + if (ioctl (sk, SIOCGIFFLAGS, &ifr) != -1) { /* If the interface doesn't have those flags already, * set them on it. @@ -1567,7 +1566,7 @@ { ifr.ifr_flags &= ~IFF_UP; ifr.ifr_flags |= IFF_UP & flags; - if ((err = ioctl (sk, SIOCSIFFLAGS, &ifr))) + if (ioctl (sk, SIOCSIFFLAGS, &ifr) == -1) nm_warning ("nm_device_set_up_down() could not bring device %s %s. errno = %d", nm_device_get_iface (dev), (up ? "up" : "down"), errno ); } /* Make sure we have a valid MAC address, some cards reload firmware when they NetworkManager-0.4-leak-fixes.patch: NetworkManager.c | 2 ++ NetworkManagerAPList.c | 1 + NetworkManagerDevice.c | 3 ++- NetworkManagerUtils.c | 1 + nm-netlink-monitor.c | 4 +++- 5 files changed, 9 insertions(+), 2 deletions(-) --- NEW FILE NetworkManager-0.4-leak-fixes.patch --- Index: src/NetworkManager.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/NetworkManager.c,v retrieving revision 1.67 diff -u -r1.67 NetworkManager.c --- src/NetworkManager.c 6 Apr 2005 16:45:48 -0000 1.67 +++ src/NetworkManager.c 14 Apr 2005 11:12:17 -0000 @@ -526,6 +526,8 @@ g_main_loop_unref (data->main_loop); g_main_context_unref (data->main_context); + g_io_channel_unref(data->sigterm_iochannel); + memset (data, 0, sizeof (NMData)); } Index: src/NetworkManagerAPList.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/NetworkManagerAPList.c,v retrieving revision 1.36 diff -u -r1.36 NetworkManagerAPList.c --- src/NetworkManagerAPList.c 6 Apr 2005 19:05:10 -0000 1.36 +++ src/NetworkManagerAPList.c 14 Apr 2005 11:12:17 -0000 @@ -116,6 +116,7 @@ nm_unlock_mutex (list->mutex, __FUNCTION__); g_mutex_free (list->mutex); + g_free(list); } } Index: src/NetworkManagerDevice.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/NetworkManagerDevice.c,v retrieving revision 1.121 diff -u -r1.121 NetworkManagerDevice.c --- src/NetworkManagerDevice.c 6 Apr 2005 19:16:31 -0000 1.121 +++ src/NetworkManagerDevice.c 14 Apr 2005 11:12:17 -0000 @@ -842,7 +842,8 @@ if (g_file_get_contents (carrier_path, &contents, &length, NULL)) { link = (gboolean) atoi (contents); g_free (contents); - } + } + g_free(carrier_path); /* We say that non-carrier-detect devices always have a link, because * they never get auto-selected by NM. User has to force them on us, Index: src/NetworkManagerUtils.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/NetworkManagerUtils.c,v retrieving revision 1.33 diff -u -r1.33 NetworkManagerUtils.c --- src/NetworkManagerUtils.c 6 Apr 2005 16:45:48 -0000 1.33 +++ src/NetworkManagerUtils.c 14 Apr 2005 11:12:17 -0000 @@ -448,6 +448,7 @@ if (parent_udi && libhal_device_property_exists (ctx, parent_udi, "info.linux.driver", NULL)) driver_name = libhal_device_get_property_string (ctx, parent_udi, "info.linux.driver", NULL); + g_free(parent_udi); } return (driver_name); Index: src/nm-netlink-monitor.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/nm-netlink-monitor.c,v retrieving revision 1.4 diff -u -r1.4 nm-netlink-monitor.c --- src/nm-netlink-monitor.c 17 Mar 2005 21:43:21 -0000 1.4 +++ src/nm-netlink-monitor.c 14 Apr 2005 11:12:17 -0000 @@ -569,7 +569,7 @@ NmNetlinkMonitor *monitor) { GError *error; - gchar *received_bytes; + gchar *received_bytes=NULL; gboolean processing_is_done; gsize num_received_bytes; guint num_bytes_to_process; @@ -711,6 +711,8 @@ g_free (interface_name); } } + if (received_bytes!=NULL) + g_free(received_bytes); return TRUE; } NetworkManager-0.4-novarargs.patch: src/NetworkManagerDevice.c | 141 ++++++++++++++++++++++--------------- src/NetworkManagerUtils.c | 75 ++++++++----------- src/NetworkManagerUtils.h | 18 ++-- vpn-daemons/vpnc/nm-vpnc-service.c | 0 4 files changed, 132 insertions(+), 102 deletions(-) --- NEW FILE NetworkManager-0.4-novarargs.patch --- Index: src/NetworkManagerDevice.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/NetworkManagerDevice.c,v retrieving revision 1.123 diff -u -r1.123 NetworkManagerDevice.c --- src/NetworkManagerDevice.c 15 Apr 2005 20:00:28 -0000 1.123 +++ src/NetworkManagerDevice.c 21 Apr 2005 18:01:19 -0000 @@ -259,6 +259,7 @@ { NMDevice *dev; GError *error = NULL; + nm_completion_args args; g_return_val_if_fail (iface != NULL, NULL); g_return_val_if_fail (strlen (iface) > 0, NULL); @@ -392,11 +393,13 @@ } /* Block until our device thread has actually had a chance to start. */ + args[0] = &dev->worker_started; + args[1] = "nm_device_new(): waiting for device's worker thread to start"; + args[2] = (void *)LOG_INFO; + args[3] = 0; nm_wait_for_completion (NM_COMPLETION_TRIES_INFINITY, - G_USEC_PER_SEC / 20, nm_completion_boolean_test, NULL, - &dev->worker_started, - "nm_device_new(): waiting for device's worker thread to start", - LOG_INFO, 0); + G_USEC_PER_SEC / 20, nm_completion_boolean_test, NULL, args); + nm_info ("nm_device_new(): device's worker thread started, continuing."); return (dev); @@ -1564,16 +1567,13 @@ } /* I really wish nm_v_wait_for_completion_or_timeout could translate these - * to first class args instead of a va_list, so these helpers could be nice - * and _tiny_. - * - * ... and we can probably do that with __builtin_apply(), or libffi, - * but that's kindof cheating. */ -gboolean nm_completion_device_is_up_test(int tries, va_list args) -{ - NMDevice *dev = va_arg(args, NMDevice *); - gboolean *err = va_arg(args, gboolean *); - gboolean cancelable = va_arg(args, gboolean); + * to first class args instead of a all this void * arg stuff, so these + * helpers could be nice and _tiny_. */ +gboolean nm_completion_device_is_up_test(int tries, nm_completion_args args) +{ + NMDevice *dev = args[0]; + gboolean *err = args[1]; + gboolean cancelable = (gboolean)args[2]; g_return_val_if_fail(dev != NULL, TRUE); g_return_val_if_fail(err != NULL, TRUE); @@ -1598,13 +1598,17 @@ gboolean nm_device_bring_up_wait (NMDevice *dev, gboolean cancelable) { gboolean err = FALSE; + nm_completion_args args; g_return_val_if_fail (dev != NULL, TRUE); nm_device_bring_up (dev); + + args[0] = dev; + args[1] = &err; + args[2] = (void *)cancelable; nm_wait_for_completion(400, G_USEC_PER_SEC / 200, NULL, - nm_completion_device_is_up_test, dev, - &err, cancelable); + nm_completion_device_is_up_test, args); if (err) nm_info ("failed to bring device up"); return err; @@ -1617,11 +1621,11 @@ nm_device_set_up_down (dev, FALSE); } -gboolean nm_completion_device_is_down_test(int tries, va_list args) +gboolean nm_completion_device_is_down_test(int tries, nm_completion_args args) { - NMDevice *dev = va_arg(args, NMDevice *); - gboolean *err = va_arg(args, gboolean *); - gboolean cancelable = va_arg(args, gboolean); + NMDevice *dev = args[0]; + gboolean *err = args[1]; + gboolean cancelable = (gboolean)args[2]; g_return_val_if_fail(dev != NULL, TRUE); g_return_val_if_fail(err != NULL, TRUE); @@ -1639,13 +1643,17 @@ gboolean nm_device_bring_down_wait (NMDevice *dev, gboolean cancelable) { gboolean err = FALSE; + nm_completion_args args; g_return_val_if_fail (dev != NULL, TRUE); nm_device_bring_down (dev); + + args[0] = dev; + args[1] = &err; + args[2] = (void *)cancelable; nm_wait_for_completion(400, G_USEC_PER_SEC / 200, NULL, - nm_completion_device_is_down_test, dev, - &err, cancelable); + nm_completion_device_is_down_test, args); if (err) nm_info ("failed to bring device down"); return err; @@ -1848,13 +1856,13 @@ } -static gboolean nm_dwwfl_test (int tries, va_list args) +static gboolean nm_dwwfl_test (int tries, nm_completion_args args) { - NMDevice *dev = va_arg (args, NMDevice *); - guint *assoc_count = va_arg (args, guint *); - double *last_freq = va_arg (args, double *); - char *essid = va_arg (args, char *); - int required = va_arg (args, int); + NMDevice *dev = args[0]; + guint *assoc_count = args[1]; + double *last_freq = args[2]; + char *essid = args[3]; + int required = (int)args[4]; double cur_freq = nm_device_get_frequency (dev); gboolean assoc = nm_device_wireless_is_associated (dev); @@ -1902,6 +1910,7 @@ double last_freq = 0; guint assoc_count = 0; struct timeval timeout = { .tv_sec = 0, .tv_usec = 0 }; + nm_completion_args args; /* we want to sleep for a very short amount of time, to minimize * hysteresis on the boundaries of our required time. But we @@ -1927,9 +1936,13 @@ * associated, the driver stops scanning. To detect that, we look * for the essid and frequency to remain constant for 3 seconds. * When it remains constant, we assume it's a real link. */ + args[0] = dev; + args[1] = &assoc; + args[2] = &last_freq; + args[3] = (void *)essid; + args[4] = (void *)(required_tries * 2); nm_wait_for_timeout (&timeout, G_USEC_PER_SEC / delay, - nm_dwwfl_test, nm_dwwfl_test, dev, &assoc, - &last_freq, essid, required_tries * 2); + nm_dwwfl_test, nm_dwwfl_test, args); /* If we've had a reasonable association count, we say we have a link */ if (assoc > required_tries) @@ -1938,10 +1951,10 @@ } -static gboolean nm_device_link_test(int tries, va_list args) +static gboolean nm_device_link_test(int tries, nm_completion_args args) { - NMDevice *dev = va_arg(args, NMDevice *); - gboolean *err = va_arg(args, gboolean *); + NMDevice *dev = args[0]; + gboolean *err = args[1]; g_return_val_if_fail(dev != NULL, TRUE); g_return_val_if_fail(err != NULL, TRUE); @@ -1960,10 +1973,13 @@ gboolean err; const gint delay = (G_USEC_PER_SEC * nm_device_get_association_pause_value (dev)) / interval; const gint max_cycles = timeout * interval; + nm_completion_args args; g_return_val_if_fail (dev != NULL, TRUE); - nm_wait_for_completion (max_cycles, delay, NULL, nm_device_link_test, dev, &err); + args[0] = dev; + args[1] = &err; + nm_wait_for_completion (max_cycles, delay, NULL, nm_device_link_test, args); return !err; } @@ -2229,11 +2245,11 @@ /* this gets called without the scan mutex held */ -static gboolean nm_wa_test (int tries, va_list args) +static gboolean nm_wa_test (int tries, nm_completion_args args) { - NMDevice *dev = va_arg (args, NMDevice *); - NMAccessPoint **best_ap = va_arg (args, NMAccessPoint **); - gboolean *err = va_arg (args, gboolean *); + NMDevice *dev = args[0]; + NMAccessPoint **best_ap = args[1]; + gboolean *err = args[2]; g_return_val_if_fail(dev != NULL, TRUE); g_return_val_if_fail(best_ap != NULL, TRUE); @@ -2283,10 +2299,10 @@ } -static gboolean nm_dukr_test (int tries, va_list args) +static gboolean nm_dukr_test (int tries, nm_completion_args args) { - NMDevice *dev = va_arg (args, NMDevice *); - gboolean *err = va_arg (args, gboolean *); + NMDevice *dev = args[0]; + gboolean *err = args[1]; g_return_val_if_fail (dev != NULL, TRUE); g_return_val_if_fail (err != NULL, TRUE); @@ -2321,6 +2337,7 @@ gboolean need_key = FALSE; gboolean found_ap = FALSE; gboolean err = FALSE; + nm_completion_args args; g_return_val_if_fail (dev != NULL, FALSE); g_return_val_if_fail (dev->app_data != NULL, FALSE); @@ -2346,7 +2363,11 @@ nm_device_set_now_scanning (dev, TRUE); /* Get an access point to connect to */ - nm_wait_for_completion (NM_COMPLETION_TRIES_INFINITY, G_USEC_PER_SEC / 50, nm_wa_test, NULL, dev, &best_ap, &err); + args[0] = dev; + args[1] = &best_ap; + args[2] = &err; + nm_wait_for_completion (NM_COMPLETION_TRIES_INFINITY, G_USEC_PER_SEC / 50, + nm_wa_test, NULL, args); if (err) { /* Wierd as it may seem, we lock here to balance the unlock in "out:" */ @@ -2397,8 +2418,11 @@ /* Wait for the key to come back */ nm_debug ("Activation (%s/wireless): asking for user key.", nm_device_get_iface (dev)); - nm_wait_for_completion (NM_COMPLETION_TRIES_INFINITY, G_USEC_PER_SEC / 20, - nm_dukr_test, nm_dukr_test, dev, &err); + + args[0] = dev; + args[1] = &err; + nm_wait_for_completion (NM_COMPLETION_TRIES_INFINITY, + G_USEC_PER_SEC / 20, nm_dukr_test, nm_dukr_test, args); nm_debug ("Activation (%s/wireless): user key received.", nm_device_get_iface (dev)); /* Done waiting, grab lock again */ @@ -2706,9 +2730,9 @@ } -static gboolean nm_ac_test (int tries, va_list args) +static gboolean nm_ac_test (int tries, nm_completion_args args) { - NMDevice *dev = va_arg (args, NMDevice *); + NMDevice *dev = args[0]; g_return_val_if_fail (dev != NULL, TRUE); @@ -2743,6 +2767,8 @@ */ void nm_device_activation_cancel (NMDevice *dev) { + nm_completion_args args; + g_return_if_fail (dev != NULL); if (nm_device_is_activating (dev)) @@ -2754,8 +2780,9 @@ * The other problem with waiting here is that we hold up dbus traffic * that we should respond to. */ + args[0] = dev; nm_wait_for_completion(NM_COMPLETION_TRIES_INFINITY, - G_USEC_PER_SEC / 20, nm_ac_test, NULL, dev); + G_USEC_PER_SEC / 20, nm_ac_test, NULL, args); nm_debug ("Activation (%s/wireless): cancelled.", nm_device_get_iface(dev)); } } @@ -3638,12 +3665,13 @@ } -static gboolean nm_completion_scan_has_results (int tries, va_list args) +static gboolean nm_completion_scan_has_results (int tries, + nm_completion_args args) { - NMDevice *dev = va_arg (args, NMDevice *); - gboolean *err = va_arg (args, gboolean *); - int sk = va_arg (args, int); - NMWirelessScanResults *scan_results = va_arg (args, NMWirelessScanResults *); + NMDevice *dev = args[0]; + gboolean *err = args[1]; + NMSock *sk = args[2]; + NMWirelessScanResults *scan_results = args[3]; int rc; g_return_val_if_fail (dev != NULL, TRUE); @@ -3747,6 +3775,7 @@ double orig_freq = 0; int orig_rate = 0; const int max_wait = G_USEC_PER_SEC * nm_device_get_association_pause_value (dev) /2; + nm_completion_args args; orig_mode = nm_device_get_mode (dev); if (orig_mode == NETWORK_MODE_ADHOC) @@ -3762,9 +3791,13 @@ nm_device_set_frequency (dev, 0); scan_results = g_malloc0 (sizeof (NMWirelessScanResults)); + + args[0] = dev; + args[1] = &err; + args[2] = sk; + args[3] = scan_results; nm_wait_for_completion(max_wait, max_wait/20, - nm_completion_scan_has_results, NULL, - dev, &err, sk, scan_results); + nm_completion_scan_has_results, NULL, args); nm_device_set_mode (dev, orig_mode); /* Only set frequency if ad-hoc mode */ Index: src/NetworkManagerUtils.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/NetworkManagerUtils.c,v retrieving revision 1.34 diff -u -r1.34 NetworkManagerUtils.c --- src/NetworkManagerUtils.c 15 Apr 2005 20:00:28 -0000 1.34 +++ src/NetworkManagerUtils.c 21 Apr 2005 18:01:23 -0000 @@ -651,7 +651,7 @@ const guint interval_usecs, nm_completion_func test_func, nm_completion_func action_func, - va_list args) + nm_completion_args args) { int try; gboolean finished = FALSE; @@ -690,21 +690,19 @@ } } +/* these should probably be moved to NetworkManagerUtils.h as macros + * since they don't do varargs stuff any more */ void nm_wait_for_completion_or_timeout( const int max_tries, const struct timeval *max_time, const guint interval_usecs, nm_completion_func test_func, nm_completion_func action_func, - ...) + nm_completion_args args) { - va_list ap; - va_start(ap, action_func); - nm_v_wait_for_completion_or_timeout(max_tries, max_time, interval_usecs, test_func, - action_func, ap); - va_end(ap); + action_func, args); } void nm_wait_for_completion( @@ -712,15 +710,11 @@ const guint interval_usecs, nm_completion_func test_func, nm_completion_func action_func, - ...) + nm_completion_args args) { - va_list ap; - va_start(ap, action_func); - nm_v_wait_for_completion_or_timeout(max_tries, NULL, interval_usecs, test_func, - action_func, ap); - va_end(ap); + action_func, args); } void nm_wait_for_timeout( @@ -728,24 +722,19 @@ const guint interval_usecs, nm_completion_func test_func, nm_completion_func action_func, - ...) + nm_completion_args args) { - va_list ap; - va_start(ap, action_func); - - nm_v_wait_for_completion_or_timeout(-1, max_time, - interval_usecs, test_func, - action_func, ap); - va_end(ap); + nm_v_wait_for_completion_or_timeout(-1, max_time, interval_usecs, + test_func, action_func, args); } /* you can use these, but they're really just examples */ -gboolean nm_completion_boolean_test(int tries, va_list args) +gboolean nm_completion_boolean_test(int tries, nm_completion_args args) { - gboolean *condition = va_arg(args, gboolean *); - char *message = va_arg(args, char *); - int log_level = va_arg(args, int); - int log_interval = va_arg(args, int); + gboolean *condition = (gboolean *)args[0]; + char *message = (char *)args[1]; + int log_level = (int)args[2]; + int log_interval = (int)args[3]; g_return_val_if_fail (condition != NULL, TRUE); @@ -767,14 +756,16 @@ return FALSE; } -gboolean nm_completion_boolean_function1_test(int tries, va_list args) +gboolean nm_completion_boolean_function1_test(int tries, + nm_completion_args args) { - nm_completion_boolean_function_1 condition = - va_arg(args, nm_completion_boolean_function_1); - char *message = va_arg(args, char *); - int log_level = va_arg(args, int); - int log_interval = va_arg(args, int); - u_int64_t arg0 = va_arg(args, unsigned long long); + nm_completion_boolean_function_1 condition = args[0]; + char *message = args[1]; + int log_level = (int)args[2]; + int log_interval = (int)args[3]; + u_int64_t arg0; + + memcpy(&arg0, &args[4], sizeof (arg0)); g_return_val_if_fail (condition, TRUE); @@ -788,15 +779,17 @@ return FALSE; } -gboolean nm_completion_boolean_function2_test(int tries, va_list args) +gboolean nm_completion_boolean_function2_test(int tries, + nm_completion_args args) { - nm_completion_boolean_function_2 condition = - va_arg(args, nm_completion_boolean_function_2); - char *message = va_arg(args, char *); - int log_level = va_arg(args, int); - int log_interval = va_arg(args, int); - u_int64_t arg0 = va_arg(args, unsigned long long); - u_int64_t arg1 = va_arg(args, unsigned long long); + nm_completion_boolean_function_2 condition = args[0]; + char *message = args[1]; + int log_level = (int)args[2]; + int log_interval = (int)args[3]; + u_int64_t arg0, arg1; + + memcpy(&arg0, &args[4], sizeof (arg0)); + memcpy(&arg1, &args[4]+sizeof (arg0), sizeof (arg1)); g_return_val_if_fail (condition, TRUE); Index: src/NetworkManagerUtils.h =================================================================== RCS file: /cvs/gnome/NetworkManager/src/NetworkManagerUtils.h,v retrieving revision 1.13 diff -u -r1.13 NetworkManagerUtils.h --- src/NetworkManagerUtils.h 6 Apr 2005 16:45:48 -0000 1.13 +++ src/NetworkManagerUtils.h 21 Apr 2005 18:01:23 -0000 @@ -66,7 +66,9 @@ #define NM_COMPLETION_TRIES_INFINITY -1 -typedef gboolean (*nm_completion_func)(int tries, va_list args); +typedef void * nm_completion_args[8]; + +typedef gboolean (*nm_completion_func)(int tries, nm_completion_args args); typedef gboolean (*nm_completion_boolean_function_1)(u_int64_t arg); typedef gboolean (*nm_completion_boolean_function_2)( u_int64_t arg0, u_int64_t arg1); @@ -76,7 +78,7 @@ const guint interval_usecs, nm_completion_func test_func, nm_completion_func action_func, - ...); + nm_completion_args args); void nm_wait_for_completion_or_timeout( const int max_tries, @@ -84,18 +86,20 @@ const guint interval_usecs, nm_completion_func test_func, nm_completion_func action_func, - ...); + nm_completion_args args); void nm_wait_for_timeout( const struct timeval *max_time, const guint interval_usecs, nm_completion_func test_func, nm_completion_func action_func, - ...); + nm_completion_args args); -gboolean nm_completion_boolean_test(int tries, va_list args); -gboolean nm_completion_boolean_function1_test(int tries, va_list args); -gboolean nm_completion_boolean_function2_test(int tries, va_list args); +gboolean nm_completion_boolean_test(int tries, nm_completion_args args); +gboolean nm_completion_boolean_function1_test(int tries, + nm_completion_args args); +gboolean nm_completion_boolean_function2_test(int tries, + nm_completion_args args); #define nm_completion_boolean_function_test nm_completion_boolean_function1_test #endif Index: vpn-daemons/vpnc/nm-vpnc-service.c NetworkManager-0.4-use-thread-join.patch: NetworkManagerDevice.c | 9 ++++----- NetworkManagerDevicePrivate.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) --- NEW FILE NetworkManager-0.4-use-thread-join.patch --- Index: src/NetworkManagerDevice.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/NetworkManagerDevice.c,v retrieving revision 1.121 diff -u -r1.121 NetworkManagerDevice.c --- src/NetworkManagerDevice.c 6 Apr 2005 19:16:31 -0000 1.121 +++ src/NetworkManagerDevice.c 14 Apr 2005 14:13:32 -0000 @@ -381,7 +381,8 @@ nm_system_device_update_config_info (dev); } - if (!g_thread_create (nm_device_worker, dev, FALSE, &error)) + dev->worker = g_thread_create (nm_device_worker, dev, TRUE, &error); + if (!dev->worker) { nm_error ("could not create device worker thread. (glib said: '%s')", error->message); g_error_free (error); @@ -512,7 +513,6 @@ dev->loop = NULL; dev->context = NULL; - dev->worker_done = TRUE; nm_device_unref (dev); return NULL; @@ -525,9 +525,8 @@ if (dev->loop) g_main_loop_quit (dev->loop); - nm_wait_for_completion(NM_COMPLETION_TRIES_INFINITY, 300, - nm_completion_boolean_test, NULL, &dev->worker_done, - NULL, NULL, 0); + g_thread_join(dev->worker); + dev->worker = NULL; } Index: src/NetworkManagerDevicePrivate.h =================================================================== RCS file: /cvs/gnome/NetworkManager/src/NetworkManagerDevicePrivate.h,v retrieving revision 1.11 diff -u -r1.11 NetworkManagerDevicePrivate.h --- src/NetworkManagerDevicePrivate.h 1 Apr 2005 21:30:12 -0000 1.11 +++ src/NetworkManagerDevicePrivate.h 14 Apr 2005 14:13:32 -0000 @@ -106,7 +106,7 @@ GMainContext *context; GMainLoop *loop; - gboolean worker_done; + GThread *worker; gboolean worker_started; guint renew_timeout; guint rebind_timeout; Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- NetworkManager.spec 27 Apr 2005 05:17:34 -0000 1.42 +++ NetworkManager.spec 4 May 2005 18:33:15 -0000 1.43 @@ -13,6 +13,12 @@ URL: http://people.redhat.com/dcbw/NetworkManager/ Source: %{name}-%{version}.cvs20050404.tar.gz Patch0: NetworkManager-0.4-newdbus.patch +Patch1: NetworkManager-0.4-leak-fixes.patch +Patch2: NetworkManager-0.4-use-thread-join.patch +Patch3: NetworkManager-0.4-assert-fix.patch +Patch4: NetworkManager-0.4-devup.patch +Patch5: NetworkManager-0.4-aplist-fix-hidden.patch +Patch6: NetworkManager-0.4-novarargs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root PreReq: chkconfig @@ -86,7 +92,13 @@ %prep %setup -q -%patch0 -p1 +%patch0 -p1 -b .dbus-0.32 +%patch1 -p0 -b .leak-fixes +%patch2 -p0 -b .use-thread-join +%patch3 -p1 -b .assert-fix +%patch4 -p1 -b .devup +%patch5 -p1 -b .aplist-fix-hidden +%patch6 -p0 -b .no-varargs %build @@ -168,6 +180,14 @@ %changelog +* Wed May 4 2005 Dan Williams - 0.4-9.cvs20050404 +- Fix some memory leaks (Tom Parker) +- Join to threads rather than spinning for their completion (Tom Parker) +- Fix misuse of a g_assert() (Colin Walters) +- Fix return checking of an ioctl() (Bill Moss) +- Better detection and matching of hidden access points (Bill Moss) +- Don't use varargs, and therefore don't crash on PPC (Peter Jones) + * Wed Apr 27 2005 Jeremy Katz - 0.4-8.cvs20050404 - fix build with newer dbus From fedora-cvs-commits at redhat.com Wed May 4 18:33:33 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 14:33:33 -0400 Subject: rpms/NetworkManager/devel NetworkManager.spec,1.43,1.44 Message-ID: <200505041833.j44IXXje032410@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32398 Modified Files: NetworkManager.spec Log Message: Bump revision Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- NetworkManager.spec 4 May 2005 18:33:15 -0000 1.43 +++ NetworkManager.spec 4 May 2005 18:33:31 -0000 1.44 @@ -7,7 +7,7 @@ Name: NetworkManager Summary: Network link manager and user applications Version: 0.4 -Release: 8.cvs20050404 +Release: 9.cvs20050404 Group: System Environment/Base License: GPL URL: http://people.redhat.com/dcbw/NetworkManager/ From fedora-cvs-commits at redhat.com Wed May 4 18:37:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 14:37:00 -0400 Subject: rpms/NetworkManager/devel NetworkManager-0.4-novarargs.patch, 1.1, 1.2 Message-ID: <200505041837.j44Ib0xS032509@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32495 Modified Files: NetworkManager-0.4-novarargs.patch Log Message: Fix up patch, NMSock -> int NetworkManager-0.4-novarargs.patch: src/NetworkManagerDevice.c | 141 ++++++++++++++++++++++--------------- src/NetworkManagerUtils.c | 75 ++++++++----------- src/NetworkManagerUtils.h | 18 ++-- vpn-daemons/vpnc/nm-vpnc-service.c | 0 4 files changed, 132 insertions(+), 102 deletions(-) Index: NetworkManager-0.4-novarargs.patch =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager-0.4-novarargs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NetworkManager-0.4-novarargs.patch 4 May 2005 18:33:15 -0000 1.1 +++ NetworkManager-0.4-novarargs.patch 4 May 2005 18:36:57 -0000 1.2 @@ -295,7 +295,7 @@ - NMWirelessScanResults *scan_results = va_arg (args, NMWirelessScanResults *); + NMDevice *dev = args[0]; + gboolean *err = args[1]; -+ NMSock *sk = args[2]; ++ int sk = args[2]; + NMWirelessScanResults *scan_results = args[3]; int rc; From fedora-cvs-commits at redhat.com Wed May 4 18:43:20 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 14:43:20 -0400 Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.85,1.86 Message-ID: <200505041843.j44IhKUS000704@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv684 Modified Files: redhat-artwork.spec Log Message: - Add a symlink for openoffice icons so we have matching bluecurve icons instead of the ugly upstream ones Index: redhat-artwork.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- redhat-artwork.spec 3 May 2005 22:28:27 -0000 1.85 +++ redhat-artwork.spec 4 May 2005 18:43:18 -0000 1.86 @@ -4,7 +4,7 @@ Summary: Artwork for Red Hat default look-and-feel Name: redhat-artwork Version: 0.122 -Release: 5 +Release: 6 URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz Source1: post-install-fixup.sh @@ -92,6 +92,29 @@ cd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/apps ln -s gnome-main-menu.png gnome-logo-icon-transparent.png +#link open office icons to the redhat ones in bluecurve +ln -s icon-db-user.png openofficeorg-19-base.png +ln -s redhat-spreadsheet.png openofficeorg-19-calc.png +ln -s icon-vector-editor.png openofficeorg-19-draw.png +ln -s redhat-presentations.png openofficeorg-19-impress.png +ln -s icon-calculator.png openofficeorg-19-math.png +ln -s redhat-word-processor.png openofficeorg-19-writer.png + +cd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/32x32/apps +ln -s icon-db-user.png openofficeorg-19-base.png +ln -s redhat-spreadsheet.png openofficeorg-19-calc.png +ln -s icon-vector-editor.png openofficeorg-19-draw.png +ln -s redhat-presentations.png openofficeorg-19-impress.png +ln -s icon-calculator.png openofficeorg-19-math.png +ln -s redhat-word-processor.png openofficeorg-19-writer.png + +cd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/16x16/apps +ln -s icon-db-user.png openofficeorg-19-base.png +ln -s redhat-spreadsheet.png openofficeorg-19-calc.png +ln -s icon-vector-editor.png openofficeorg-19-draw.png +ln -s redhat-presentations.png openofficeorg-19-impress.png +ln -s icon-calculator.png openofficeorg-19-math.png +ln -s redhat-word-processor.png openofficeorg-19-writer.png cd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/filesystems ln -s ../mimetypes/fileshare.png gnome-fs-ftp.png @@ -126,6 +149,10 @@ %config /root/.gtkrc %changelog +* Tue May 03 2005 John (J5) Palmieri 0.122-6 +- Add a symlink for openoffice icons so we have matching + bluecurve icons instead of the ugly upstream ones + * Tue May 03 2005 John (J5) Palmieri 0.122-5 - Add a symlink for ftp share icons From fedora-cvs-commits at redhat.com Wed May 4 18:46:40 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 14:46:40 -0400 Subject: rpms/fedora-release/devel .cvsignore, 1.4, 1.5 fedora-release.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200505041846.j44IkeNO004000@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/fedora-release/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3986 Modified Files: .cvsignore fedora-release.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Apr 2005 21:47:16 -0000 1.4 +++ .cvsignore 4 May 2005 18:46:37 -0000 1.5 @@ -1 +1 @@ -fedora-release-3.91.tar.gz +fedora-release-3.92.tar.gz Index: fedora-release.spec =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fedora-release.spec 6 Apr 2005 21:49:59 -0000 1.8 +++ fedora-release.spec 4 May 2005 18:46:37 -0000 1.9 @@ -1,4 +1,4 @@ -%define release_version 3.91 +%define release_version 3.92 %define release_name Pre-FC4 %define builtin_release_version Rawhide %define builtin_release_name Rawhide Index: sources =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Apr 2005 21:47:16 -0000 1.6 +++ sources 4 May 2005 18:46:37 -0000 1.7 @@ -1 +1 @@ -6bedb3a2d4ba314a67b828774ffaf1f7 fedora-release-3.91.tar.gz +9f3467150e41eb1d6d9eaf0d34a399a6 fedora-release-3.92.tar.gz From fedora-cvs-commits at redhat.com Wed May 4 18:53:35 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 14:53:35 -0400 Subject: rpms/glibc/devel .cvsignore, 1.99, 1.100 glibc-fedora.patch, 1.84, 1.85 glibc.spec, 1.150, 1.151 sources, 1.116, 1.117 Message-ID: <200505041853.j44IrZZE004221@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4198/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.3.5-6 on branch devel from glibc-2.3.5-6.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- .cvsignore 3 May 2005 10:14:26 -0000 1.99 +++ .cvsignore 4 May 2005 18:53:32 -0000 1.100 @@ -1,2 +1,2 @@ -glibc-20050503T0852.tar.bz2 -glibc-fedora-20050503T0852.tar.bz2 +glibc-20050504T1818.tar.bz2 +glibc-fedora-20050504T1818.tar.bz2 glibc-fedora.patch: ChangeLog | 31 - ChangeLog.11 | 21 ChangeLog.12 | 12 ChangeLog.15 | 45 ++ Versions.def | 2 csu/elf-init.c | 18 debug/Versions | 6 debug/fgets_chk.c | 2 debug/fgets_u_chk.c | 2 debug/getcwd_chk.c | 3 debug/getwd_chk.c | 3 debug/pread64_chk.c | 3 debug/pread_chk.c | 3 debug/read_chk.c | 3 debug/readlink_chk.c | 3 debug/recv_chk.c | 3 debug/recvfrom_chk.c | 3 debug/tst-chk1.c | 9 elf/dl-load.c | 30 + elf/dl-support.c | 5 elf/ldconfig.c | 25 - elf/rtld.c | 104 ++++ elf/tst-tls10.h | 4 iconv/iconvconfig.c | 55 +- include/features.h | 10 intl/locale.alias | 2 libio/bits/stdio2.h | 34 - libio/stdio.h | 2 linuxthreads/ChangeLog | 34 + linuxthreads/Makefile | 7 linuxthreads/cancel.c | 1 linuxthreads/lockfile.c | 6 linuxthreads/semaphore.h | 1 linuxthreads/sysdeps/alpha/tls.h | 46 +- linuxthreads/sysdeps/i386/tls.h | 9 linuxthreads/sysdeps/ia64/tls.h | 9 linuxthreads/sysdeps/powerpc/tls.h | 12 linuxthreads/sysdeps/pthread/Makefile | 12 linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym | 13 linuxthreads/sysdeps/s390/tls.h | 9 linuxthreads/sysdeps/sh/tls.h | 9 linuxthreads/sysdeps/sparc/tls.h | 9 linuxthreads/sysdeps/x86_64/tls.h | 9 linuxthreads/tst-tls1.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 + localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/en_US | 1 localedata/locales/no_NO | 69 +++ localedata/locales/zh_TW | 6 math/Versions | 9 nptl/ChangeLog | 10 nptl/Makefile | 8 nptl/descr.h | 4 nptl/pthread_cond_destroy.c | 30 + nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nscd/connections.c | 52 ++ nscd/nscd.c | 8 nscd/nscd.conf | 4 nscd/nscd_conf.c | 5 posix/Makefile | 19 posix/bits/unistd.h | 58 -- posix/getconf.speclist.h | 15 socket/bits/socket2.h | 18 sysdeps/generic/dl-cache.h | 8 sysdeps/generic/w_exp2.c | 4 sysdeps/i386/Versions | 7 sysdeps/i386/bits/atomic.h | 410 +++++++++++++++++++ sysdeps/ia64/Makefile | 4 sysdeps/ia64/Versions | 7 sysdeps/ia64/ia64libgcc.S | 350 ---------------- sysdeps/ia64/libgcc-compat.c | 84 +++ sysdeps/m68k/Versions | 7 sysdeps/mips/mips64/Versions | 7 sysdeps/sparc/sparc64/Versions | 7 sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/readonly-area.c | 5 sysdeps/unix/sysv/linux/tcsetattr.c | 32 + sysdeps/x86_64/Versions | 7 version.h | 2 89 files changed, 1459 insertions(+), 609 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- glibc-fedora.patch 3 May 2005 10:14:26 -0000 1.84 +++ glibc-fedora.patch 4 May 2005 18:53:32 -0000 1.85 @@ -1,19 +1,6 @@ ---- glibc-20050503T0852/ChangeLog 2 May 2005 20:15:34 -0000 1.9349 -+++ glibc-20050503T0852-fedora/ChangeLog 3 May 2005 09:39:07 -0000 1.8782.2.98 -@@ -1,3 +1,12 @@ -+2005-04-29 Jakub Jelinek -+ -+ * sysdeps/posix/posix_fallocate.c (posix_fallocate): If len == 0, -+ call ftruncate if offset is bigger than current size. Make sure -+ the file is offset + len bytes long if that is more than current size. -+ Don't overwrite previous content of the file. -+ * sysdeps/posix/posix_fallocate64.c (__posix_fallocate64_l64): -+ Likewise. -+ - 2005-05-02 Roland McGrath - - [BZ #924] -@@ -98,6 +107,14 @@ +--- glibc-20050504T1818/ChangeLog 4 May 2005 17:58:13 -0000 1.9353 ++++ glibc-20050504T1818-fedora/ChangeLog 4 May 2005 18:33:27 -0000 1.8782.2.100 +@@ -247,6 +247,14 @@ * nscd/connections.c (nscd_run): Use time() value in prune_cache call, not timeout value, since the latter might be from another clock. @@ -28,7 +15,7 @@ 2005-04-27 Roland McGrath [BZ #877] -@@ -713,17 +730,6 @@ +@@ -862,17 +870,6 @@ 2005-03-28 Roland McGrath @@ -46,7 +33,7 @@ * locale/langinfo.h (_NL_LOCALE_NAME): New macro. [__USE_GNU] (NL_LOCALE_NAME): New macro. * locale/nl_langinfo.c: Grok special item value for _NL_LOCALE_NAME, -@@ -1792,6 +1798,18 @@ +@@ -1941,6 +1938,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -65,8 +52,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20050503T0852/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20050503T0852-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050504T1818/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20050504T1818-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -116,8 +103,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20050503T0852/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20050503T0852-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050504T1818/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20050504T1818-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -144,8 +131,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20050503T0852/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20050503T0852-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20050504T1818/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20050504T1818-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -226,8 +213,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20050503T0852/Versions.def 28 Mar 2005 20:42:44 -0000 1.61 -+++ glibc-20050503T0852-fedora/Versions.def 24 Mar 2005 08:18:51 -0000 1.58.2.3 +--- glibc-20050504T1818/Versions.def 28 Mar 2005 20:42:44 -0000 1.61 ++++ glibc-20050504T1818-fedora/Versions.def 24 Mar 2005 08:18:51 -0000 1.58.2.3 @@ -20,7 +20,6 @@ libc { GLIBC_2.3.2 GLIBC_2.3.3 @@ -244,16 +231,16 @@ } libnsl { GLIBC_2.0 ---- glibc-20050503T0852/version.h 20 Dec 2004 23:37:41 -0000 1.67 -+++ glibc-20050503T0852-fedora/version.h 15 Apr 2005 09:32:42 -0000 1.65.2.4 +--- glibc-20050504T1818/version.h 20 Dec 2004 23:37:41 -0000 1.67 ++++ glibc-20050504T1818-fedora/version.h 15 Apr 2005 09:32:42 -0000 1.65.2.4 @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ #define RELEASE "development" -#define VERSION "2.3.90" +#define VERSION "2.3.5" ---- glibc-20050503T0852/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 -+++ glibc-20050503T0852-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 +--- glibc-20050504T1818/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 ++++ glibc-20050504T1818-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 @@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo extern void (*__init_array_end []) (void) attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden; @@ -279,8 +266,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20050503T0852/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 -+++ glibc-20050503T0852-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 +--- glibc-20050504T1818/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 ++++ glibc-20050504T1818-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 @@ -18,10 +18,4 @@ libc { __printf_chk; __fprintf_chk; __vprintf_chk; __vfprintf_chk; __gets_chk; @@ -292,8 +279,8 @@ - __recv_chk; __recvfrom_chk; - } } ---- glibc-20050503T0852/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050503T0852-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050504T1818/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050504T1818-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -30,6 +30,7 @@ #include #include @@ -307,8 +294,8 @@ return result; } +#endif ---- glibc-20050503T0852/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050503T0852-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050504T1818/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050504T1818-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -30,6 +30,7 @@ #include #include @@ -322,8 +309,8 @@ return result; } +#endif ---- glibc-20050503T0852/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 -+++ glibc-20050503T0852-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 +--- glibc-20050504T1818/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 ++++ glibc-20050504T1818-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 @@ -20,7 +20,7 @@ #include #include @@ -338,8 +325,8 @@ return __getcwd (buf, size); } +#endif ---- glibc-20050503T0852/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050503T0852-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 +--- glibc-20050504T1818/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 ++++ glibc-20050504T1818-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 @@ -20,7 +20,7 @@ #include #include @@ -354,8 +341,8 @@ link_warning (getwd, "the `getwd' function is dangerous and should not be used.") +#endif ---- glibc-20050503T0852/debug/pread64_chk.c 19 Mar 2005 00:08:11 -0000 1.4 -+++ glibc-20050503T0852-fedora/debug/pread64_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 +--- glibc-20050504T1818/debug/pread64_chk.c 19 Mar 2005 00:08:11 -0000 1.4 ++++ glibc-20050504T1818-fedora/debug/pread64_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 @@ -19,7 +19,7 @@ #include #include @@ -370,8 +357,8 @@ return __pread64 (fd, buf, nbytes, offset); } +#endif ---- glibc-20050503T0852/debug/pread_chk.c 19 Mar 2005 00:07:31 -0000 1.4 -+++ glibc-20050503T0852-fedora/debug/pread_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 +--- glibc-20050504T1818/debug/pread_chk.c 19 Mar 2005 00:07:31 -0000 1.4 ++++ glibc-20050504T1818-fedora/debug/pread_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 @@ -19,7 +19,7 @@ #include #include @@ -386,8 +373,8 @@ return __pread (fd, buf, nbytes, offset); } +#endif ---- glibc-20050503T0852/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 -+++ glibc-20050503T0852-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 +--- glibc-20050504T1818/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 ++++ glibc-20050504T1818-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 @@ -23,7 +23,7 @@ # include #endif @@ -402,8 +389,8 @@ #endif } +#endif ---- glibc-20050503T0852/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 -+++ glibc-20050503T0852-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 +--- glibc-20050504T1818/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 ++++ glibc-20050504T1818-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 @@ -23,7 +23,7 @@ # include #endif @@ -418,8 +405,8 @@ #endif } +#endif ---- glibc-20050503T0852/debug/recv_chk.c 6 Mar 2005 21:24:42 -0000 1.2 -+++ glibc-20050503T0852-fedora/debug/recv_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 +--- glibc-20050504T1818/debug/recv_chk.c 6 Mar 2005 21:24:42 -0000 1.2 ++++ glibc-20050504T1818-fedora/debug/recv_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 @@ -19,7 +19,7 @@ #include #include @@ -434,8 +421,8 @@ return __recv (fd, buf, n, flags); } +#endif ---- glibc-20050503T0852/debug/recvfrom_chk.c 6 Mar 2005 21:24:16 -0000 1.2 -+++ glibc-20050503T0852-fedora/debug/recvfrom_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 +--- glibc-20050504T1818/debug/recvfrom_chk.c 6 Mar 2005 21:24:16 -0000 1.2 ++++ glibc-20050504T1818-fedora/debug/recvfrom_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 @@ -19,7 +19,7 @@ #include #include @@ -450,8 +437,8 @@ return __recvfrom (fd, buf, n, flags, addr, addr_len); } +#endif ---- glibc-20050503T0852/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 -+++ glibc-20050503T0852-fedora/debug/tst-chk1.c 19 Mar 2005 21:04:10 -0000 1.1.2.10 +--- glibc-20050504T1818/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 ++++ glibc-20050504T1818-fedora/debug/tst-chk1.c 19 Mar 2005 21:04:10 -0000 1.1.2.10 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -489,8 +476,8 @@ CHK_FAIL_START if (getwd (getcwdbuf + 2) != getcwdbuf + 2) FAIL (); ---- glibc-20050503T0852/elf/dl-load.c 26 Apr 2005 04:25:58 -0000 1.268 -+++ glibc-20050503T0852-fedora/elf/dl-load.c 27 Apr 2005 11:40:21 -0000 1.249.2.12 +--- glibc-20050504T1818/elf/dl-load.c 26 Apr 2005 04:25:58 -0000 1.268 ++++ glibc-20050504T1818-fedora/elf/dl-load.c 27 Apr 2005 11:40:21 -0000 1.249.2.12 @@ -644,7 +644,7 @@ _dl_init_paths (const char *llp) /* First set up the rest of the default search directory entries. */ @@ -535,8 +522,8 @@ static void __attribute__ ((noreturn, noinline)) lose (int code, int fd, const char *name, char *realname, struct link_map *l, ---- glibc-20050503T0852/elf/dl-support.c 7 Apr 2005 20:57:04 -0000 1.88 -+++ glibc-20050503T0852-fedora/elf/dl-support.c 15 Apr 2005 09:32:44 -0000 1.84.2.5 +--- glibc-20050504T1818/elf/dl-support.c 7 Apr 2005 20:57:04 -0000 1.88 ++++ glibc-20050504T1818-fedora/elf/dl-support.c 15 Apr 2005 09:32:44 -0000 1.84.2.5 @@ -281,6 +281,11 @@ _dl_non_dynamic_init (void) if (_dl_platform != NULL) _dl_platformlen = strlen (_dl_platform); @@ -549,8 +536,8 @@ /* Scan for a program header telling us the stack is nonexecutable. */ if (_dl_phdr != NULL) for (uint_fast16_t i = 0; i < _dl_phnum; ++i) ---- glibc-20050503T0852/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 -+++ glibc-20050503T0852-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 +--- glibc-20050504T1818/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 ++++ glibc-20050504T1818-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 @@ -953,17 +953,19 @@ search_dirs (void) @@ -632,8 +619,8 @@ } search_dirs (); ---- glibc-20050503T0852/elf/rtld.c 7 Apr 2005 20:56:48 -0000 1.351 -+++ glibc-20050503T0852-fedora/elf/rtld.c 27 Apr 2005 11:40:21 -0000 1.330.2.18 +--- glibc-20050504T1818/elf/rtld.c 7 Apr 2005 20:56:48 -0000 1.351 ++++ glibc-20050504T1818-fedora/elf/rtld.c 27 Apr 2005 11:40:21 -0000 1.330.2.18 @@ -1335,6 +1335,59 @@ ld.so does not support TLS, but program ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded; ++GL(dl_load_adds); @@ -752,8 +739,8 @@ if (__builtin_expect (*first_preload != NULL, 0)) { /* Set up PRELOADS with a vector of the preloaded libraries. */ ---- glibc-20050503T0852/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 -+++ glibc-20050503T0852-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 +--- glibc-20050504T1818/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 ++++ glibc-20050504T1818-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 @@ -1,8 +1,8 @@ #include #include @@ -765,8 +752,8 @@ # define USE_TLS__THREAD struct A ---- glibc-20050503T0852/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 -+++ glibc-20050503T0852-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 +--- glibc-20050504T1818/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 ++++ glibc-20050504T1818-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -843,8 +830,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20050503T0852/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 -+++ glibc-20050503T0852-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 +--- glibc-20050504T1818/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 ++++ glibc-20050504T1818-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 @@ -262,7 +262,13 @@ # define __USE_REENTRANT 1 #endif @@ -869,8 +856,8 @@ #define __GLIBC_PREREQ(maj, min) \ ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) ---- glibc-20050503T0852/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20050503T0852-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20050504T1818/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20050504T1818-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -880,8 +867,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20050503T0852/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 -+++ glibc-20050503T0852-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 +--- glibc-20050504T1818/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 ++++ glibc-20050504T1818-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -895,8 +882,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20050503T0852/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20050503T0852-fedora/libio/bits/stdio2.h 19 Mar 2005 20:18:03 -0000 1.1.2.5 +--- glibc-20050504T1818/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20050504T1818-fedora/libio/bits/stdio2.h 19 Mar 2005 20:18:03 -0000 1.1.2.5 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -967,8 +954,8 @@ return __fgets_unlocked_alias (__s, __n, __stream); } #endif ---- glibc-20050503T0852/linuxthreads/ChangeLog 27 Apr 2005 16:56:50 -0000 1.846 -+++ glibc-20050503T0852-fedora/linuxthreads/ChangeLog 27 Apr 2005 19:25:34 -0000 1.817.2.23 +--- glibc-20050504T1818/linuxthreads/ChangeLog 27 Apr 2005 16:56:50 -0000 1.846 ++++ glibc-20050504T1818-fedora/linuxthreads/ChangeLog 27 Apr 2005 19:25:34 -0000 1.817.2.23 @@ -813,6 +813,12 @@ (pthread_barrierattr_setpshared): Return EINVAL if pshared is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED. @@ -1017,8 +1004,8 @@ * descr.h (struct _pthread_descr_struct): Provide p_res member even if USE_TLS && HAVE___THREAD. * sysdeps/pthread/res-state.c (__res_state): Return __resp ---- glibc-20050503T0852/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 -+++ glibc-20050503T0852-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 +--- glibc-20050504T1818/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 ++++ glibc-20050504T1818-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 @@ -245,15 +245,18 @@ $(addprefix $(objpfx), \ $(filter-out $(tests-static) $(tests-reverse) unload, \ $(tests) $(test-srcs))): $(objpfx)libpthread.so \ @@ -1040,8 +1027,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a ---- glibc-20050503T0852/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 -+++ glibc-20050503T0852-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 +--- glibc-20050504T1818/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 ++++ glibc-20050504T1818-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 @@ -230,5 +230,6 @@ void __pthread_perform_cleanup(char *cur } @@ -1049,8 +1036,8 @@ + THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); __libc_thread_freeres (); } ---- glibc-20050503T0852/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 -+++ glibc-20050503T0852-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 +--- glibc-20050504T1818/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 ++++ glibc-20050504T1818-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 @@ -74,7 +74,11 @@ __fresetlockfiles (void) __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); @@ -1064,8 +1051,8 @@ __pthread_mutexattr_destroy (&attr); ---- glibc-20050503T0852/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 -+++ glibc-20050503T0852-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 +--- glibc-20050504T1818/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 ++++ glibc-20050504T1818-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 @@ -21,6 +21,7 @@ # define __need_timespec # include @@ -1074,8 +1061,8 @@ #ifndef _PTHREAD_DESCR_DEFINED /* Thread descriptors. Needed for `sem_t' definition. */ ---- glibc-20050503T0852/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 -+++ glibc-20050503T0852-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 +--- glibc-20050504T1818/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 ++++ glibc-20050504T1818-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 @@ -2,7 +2,7 @@ #include #include @@ -1085,8 +1072,8 @@ struct tls_obj { ---- glibc-20050503T0852/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 -+++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 +--- glibc-20050504T1818/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 ++++ glibc-20050504T1818-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 @@ -58,54 +58,76 @@ typedef struct # include @@ -1176,8 +1163,8 @@ /* Get the thread descriptor definition. */ # include ---- glibc-20050503T0852/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 -+++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 +--- glibc-20050504T1818/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 ++++ glibc-20050504T1818-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 @@ -86,7 +86,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1194,8 +1181,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050503T0852/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 -+++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 +--- glibc-20050504T1818/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 ++++ glibc-20050504T1818-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 @@ -65,7 +65,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1212,8 +1199,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050503T0852/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 -+++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 +--- glibc-20050504T1818/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 ++++ glibc-20050504T1818-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 @@ -69,11 +69,19 @@ typedef struct # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) @@ -1236,8 +1223,8 @@ TCB + 0x7000 (per the ABI). This implies that TCB address is TP - 0x7000. As we define TLS_DTV_AT_TP we can assume that the pthread_descr is allocated immediately ahead of the ---- glibc-20050503T0852/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 -+++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 +--- glibc-20050504T1818/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 ++++ glibc-20050504T1818-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 @@ -12,3 +12,15 @@ endif ifeq ($(subdir),posix) CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../linuxthreads/Banner)\"" @@ -1254,8 +1241,8 @@ + @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ +endif +endif ---- glibc-20050503T0852/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 +--- glibc-20050504T1818/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050504T1818-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 @@ -0,0 +1,13 @@ +#ifdef HAVE_TLS_SUPPORT +# ifndef HAVE_FORCED_UNWIND @@ -1270,8 +1257,8 @@ +#ifdef HAVE_TLS_SUPPORT +NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) +#endif ---- glibc-20050503T0852/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 -+++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 +--- glibc-20050504T1818/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 ++++ glibc-20050504T1818-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 @@ -77,7 +77,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1288,8 +1275,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050503T0852/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 -+++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 +--- glibc-20050504T1818/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 ++++ glibc-20050504T1818-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1306,8 +1293,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050503T0852/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 -+++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 +--- glibc-20050504T1818/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 ++++ glibc-20050504T1818-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1324,8 +1311,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050503T0852/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 -+++ glibc-20050503T0852-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 +--- glibc-20050504T1818/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 ++++ glibc-20050504T1818-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 @@ -71,7 +71,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1342,8 +1329,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050503T0852/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 -+++ glibc-20050503T0852-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 +--- glibc-20050504T1818/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 ++++ glibc-20050504T1818-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1435,8 +1422,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20050503T0852/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20050503T0852-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20050504T1818/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20050504T1818-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 @@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -1480,8 +1467,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20050503T0852/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20050503T0852-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20050504T1818/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 ++++ glibc-20050504T1818-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1490,8 +1477,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20050503T0852/localedata/SUPPORTED 28 Apr 2005 14:21:30 -0000 1.75 -+++ glibc-20050503T0852-fedora/localedata/SUPPORTED 3 May 2005 09:28:25 -0000 1.71.2.5 +--- glibc-20050504T1818/localedata/SUPPORTED 28 Apr 2005 14:21:30 -0000 1.75 ++++ glibc-20050504T1818-fedora/localedata/SUPPORTED 3 May 2005 09:28:25 -0000 1.71.2.5 @@ -68,6 +68,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1533,8 +1520,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20050503T0852/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20050503T0852-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20050504T1818/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20050504T1818-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -1549,8 +1536,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20050503T0852/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20050503T0852-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20050504T1818/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20050504T1818-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -1562,8 +1549,8 @@ date_fmt "/ / " ---- glibc-20050503T0852/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 -+++ glibc-20050503T0852-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 +--- glibc-20050504T1818/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 ++++ glibc-20050504T1818-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 @@ -100,7 +100,6 @@ mon " "";/ "";/ @@ -1572,8 +1559,8 @@ % Appropriate date and time representation (%c) % "%a %d %b %Y %r %Z" d_t_fmt "" ---- glibc-20050503T0852/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050503T0852-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20050504T1818/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050504T1818-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1644,8 +1631,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20050503T0852/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20050503T0852-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20050504T1818/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20050504T1818-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1673,8 +1660,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20050503T0852/math/Versions 28 Mar 2005 20:42:43 -0000 1.9 -+++ glibc-20050503T0852-fedora/math/Versions 26 Feb 2000 01:04:00 -0000 1.8 +--- glibc-20050504T1818/math/Versions 28 Mar 2005 20:42:43 -0000 1.9 ++++ glibc-20050504T1818-fedora/math/Versions 26 Feb 2000 01:04:00 -0000 1.8 @@ -94,7 +94,7 @@ libm { } GLIBC_2.1 { @@ -1696,9 +1683,9 @@ - exp2l; - } } ---- glibc-20050503T0852/nptl/ChangeLog 27 Apr 2005 16:53:38 -0000 1.776 -+++ glibc-20050503T0852-fedora/nptl/ChangeLog 27 Apr 2005 19:25:34 -0000 1.706.2.43 -@@ -620,6 +620,11 @@ +--- glibc-20050504T1818/nptl/ChangeLog 4 May 2005 06:17:28 -0000 1.778 ++++ glibc-20050504T1818-fedora/nptl/ChangeLog 4 May 2005 07:51:21 -0000 1.706.2.44 +@@ -630,6 +630,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1710,7 +1697,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -2694,6 +2699,11 @@ +@@ -2704,6 +2709,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1722,8 +1709,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20050503T0852/nptl/Makefile 27 Apr 2005 09:55:18 -0000 1.167 -+++ glibc-20050503T0852-fedora/nptl/Makefile 27 Apr 2005 11:31:25 -0000 1.157.2.10 +--- glibc-20050504T1818/nptl/Makefile 27 Apr 2005 09:55:18 -0000 1.167 ++++ glibc-20050504T1818-fedora/nptl/Makefile 27 Apr 2005 11:31:25 -0000 1.157.2.10 @@ -499,15 +499,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1746,8 +1733,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20050503T0852/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 -+++ glibc-20050503T0852-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 +--- glibc-20050504T1818/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 ++++ glibc-20050504T1818-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 @@ -27,9 +27,13 @@ #include #include @@ -1762,8 +1749,8 @@ #include "../nptl_db/thread_db.h" #include #ifdef HAVE_FORCED_UNWIND ---- glibc-20050503T0852/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20050503T0852-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20050504T1818/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 ++++ glibc-20050504T1818-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 @@ -44,15 +44,35 @@ __pthread_cond_destroy (cond) broadcasted, but still are using the pthread_cond_t structure, pthread_cond_destroy needs to wait for them. */ @@ -1805,8 +1792,8 @@ } return 0; ---- glibc-20050503T0852/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050503T0852-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20050504T1818/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050504T1818-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1814,8 +1801,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20050503T0852/nscd/connections.c 28 Apr 2005 06:26:10 -0000 1.67 -+++ glibc-20050503T0852-fedora/nscd/connections.c 28 Apr 2005 09:10:12 -0000 1.55.2.8 +--- glibc-20050504T1818/nscd/connections.c 28 Apr 2005 06:26:10 -0000 1.67 ++++ glibc-20050504T1818-fedora/nscd/connections.c 28 Apr 2005 09:10:12 -0000 1.55.2.8 @@ -21,6 +21,7 @@ #include #include @@ -1906,8 +1893,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20050503T0852/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 -+++ glibc-20050503T0852-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 +--- glibc-20050504T1818/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 ++++ glibc-20050504T1818-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 @@ -122,9 +122,16 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1933,8 +1920,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20050503T0852/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 -+++ glibc-20050503T0852-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +--- glibc-20050504T1818/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 ++++ glibc-20050504T1818-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 @@ -31,8 +31,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1946,8 +1933,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20050503T0852/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 -+++ glibc-20050503T0852-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 +--- glibc-20050504T1818/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 ++++ glibc-20050504T1818-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 @@ -230,7 +230,10 @@ nscd_parse_file (const char *fname, stru if (strcmp (arg2, "no") == 0) dbs[cnt].shared = 0; @@ -1960,8 +1947,8 @@ break; } if (cnt == lastdb) ---- glibc-20050503T0852/posix/Makefile 14 Apr 2005 21:19:34 -0000 1.184 -+++ glibc-20050503T0852-fedora/posix/Makefile 15 Apr 2005 09:32:51 -0000 1.171.2.12 +--- glibc-20050504T1818/posix/Makefile 14 Apr 2005 21:19:34 -0000 1.184 ++++ glibc-20050504T1818-fedora/posix/Makefile 15 Apr 2005 09:32:51 -0000 1.171.2.12 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1995,8 +1982,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20050503T0852/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050503T0852-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20050504T1818/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050504T1818-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -2013,8 +2000,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20050503T0852/posix/bits/unistd.h 20 Mar 2005 16:48:41 -0000 1.8 -+++ glibc-20050503T0852-fedora/posix/bits/unistd.h 20 Mar 2005 18:12:27 -0000 1.3.2.4 +--- glibc-20050504T1818/posix/bits/unistd.h 20 Mar 2005 16:48:41 -0000 1.8 ++++ glibc-20050504T1818-fedora/posix/bits/unistd.h 20 Mar 2005 18:12:27 -0000 1.3.2.4 @@ -21,25 +21,19 @@ # error "Never include directly; use instead." #endif @@ -2132,8 +2119,8 @@ - return __getwd_alias (__buf); -} -#endif ---- glibc-20050503T0852/socket/bits/socket2.h 19 Mar 2005 00:13:57 -0000 1.5 -+++ glibc-20050503T0852-fedora/socket/bits/socket2.h 19 Mar 2005 20:18:08 -0000 1.2.2.5 +--- glibc-20050504T1818/socket/bits/socket2.h 19 Mar 2005 00:13:57 -0000 1.5 ++++ glibc-20050504T1818-fedora/socket/bits/socket2.h 19 Mar 2005 20:18:08 -0000 1.2.2.5 @@ -21,24 +21,18 @@ # error "Never include directly; use instead." #endif @@ -2174,8 +2161,8 @@ + __chk_fail (); return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len); } ---- glibc-20050503T0852/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20050503T0852-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20050504T1818/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20050504T1818-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -2191,8 +2178,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20050503T0852/sysdeps/generic/w_exp2.c 28 Mar 2005 20:42:42 -0000 1.3 -+++ glibc-20050503T0852-fedora/sysdeps/generic/w_exp2.c 6 Jun 2001 12:40:16 -0000 1.2 +--- glibc-20050504T1818/sysdeps/generic/w_exp2.c 28 Mar 2005 20:42:42 -0000 1.3 ++++ glibc-20050504T1818-fedora/sysdeps/generic/w_exp2.c 6 Jun 2001 12:40:16 -0000 1.2 @@ -31,6 +31,6 @@ __exp2 (double x) /* wrapper exp2 */ } weak_alias (__exp2, exp2) @@ -2202,8 +2189,8 @@ +strong_alias (__exp2, __expl2) +weak_alias (__exp2, expl2) #endif ---- glibc-20050503T0852/sysdeps/i386/Versions 28 Mar 2005 20:42:43 -0000 1.5 -+++ glibc-20050503T0852-fedora/sysdeps/i386/Versions 29 Apr 2003 22:47:20 -0000 1.4 +--- glibc-20050504T1818/sysdeps/i386/Versions 28 Mar 2005 20:42:43 -0000 1.5 ++++ glibc-20050504T1818-fedora/sysdeps/i386/Versions 29 Apr 2003 22:47:20 -0000 1.4 @@ -20,10 +20,3 @@ libc { __strspn_cg; __strspn_g; __strstr_cg; __strstr_g; } @@ -2215,8 +2202,8 @@ - exp2l; - } -} ---- glibc-20050503T0852/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050503T0852-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 +--- glibc-20050504T1818/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050504T1818-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 @@ -0,0 +1,410 @@ +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -2628,8 +2615,8 @@ + + +#define atomic_delay() asm ("rep; nop") ---- glibc-20050503T0852/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20050503T0852-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20050504T1818/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20050504T1818-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -2641,8 +2628,8 @@ endif endif ---- glibc-20050503T0852/sysdeps/ia64/Versions 28 Mar 2005 20:42:43 -0000 1.10 -+++ glibc-20050503T0852-fedora/sysdeps/ia64/Versions 3 May 2002 07:10:31 -0000 1.9 +--- glibc-20050504T1818/sysdeps/ia64/Versions 28 Mar 2005 20:42:43 -0000 1.10 ++++ glibc-20050504T1818-fedora/sysdeps/ia64/Versions 3 May 2002 07:10:31 -0000 1.9 @@ -12,10 +12,3 @@ libc { __multi3; } @@ -2654,8 +2641,8 @@ - exp2l; - } -} ---- glibc-20050503T0852/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20050503T0852-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20050504T1818/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20050504T1818-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3007,8 +2994,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20050503T0852/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050503T0852-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050504T1818/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050504T1818-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3094,8 +3081,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20050503T0852/sysdeps/m68k/Versions 28 Mar 2005 20:42:42 -0000 1.2 -+++ glibc-20050503T0852-fedora/sysdeps/m68k/Versions 29 Jan 1999 09:06:03 -0000 1.1 +--- glibc-20050504T1818/sysdeps/m68k/Versions 28 Mar 2005 20:42:42 -0000 1.2 ++++ glibc-20050504T1818-fedora/sysdeps/m68k/Versions 29 Jan 1999 09:06:03 -0000 1.1 @@ -4,10 +4,3 @@ libc { __divdi3; __moddi3; __udivdi3; __umoddi3; } @@ -3107,8 +3094,8 @@ - exp2l; - } -} ---- glibc-20050503T0852/sysdeps/mips/mips64/Versions 28 Mar 2005 20:42:43 -0000 1.1 -+++ glibc-20050503T0852-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000 +--- glibc-20050504T1818/sysdeps/mips/mips64/Versions 28 Mar 2005 20:42:43 -0000 1.1 ++++ glibc-20050504T1818-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -libm { - GLIBC_2.1 { @@ -3117,158 +3104,8 @@ - exp2l; - } -} ---- glibc-20050503T0852/sysdeps/posix/posix_fallocate.c 22 Aug 2003 18:08:29 -0000 1.5 -+++ glibc-20050503T0852-fedora/sysdeps/posix/posix_fallocate.c 3 May 2005 09:39:16 -0000 1.5.2.1 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2000, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -29,9 +29,8 @@ posix_fallocate (int fd, __off_t offset, - { - struct stat64 st; - struct statfs f; -- size_t step; - -- /* `off_t? is a signed type. Therefore we can determine whether -+ /* `off_t' is a signed type. Therefore we can determine whether - OFFSET + LEN is too large if it is a negative value. */ - if (offset < 0 || len < 0) - return EINVAL; -@@ -47,24 +46,48 @@ posix_fallocate (int fd, __off_t offset, - if (! S_ISREG (st.st_mode)) - return ENODEV; - -+ if (len == 0) -+ { -+ if (st.st_size < offset) -+ { -+ int ret = __ftruncate (fd, offset); -+ -+ if (ret != 0) -+ ret = errno; -+ return ret; -+ } -+ return 0; -+ } -+ - /* We have to know the block size of the filesystem to get at least some - sort of performance. */ - if (__fstatfs (fd, &f) != 0) - return errno; - -- /* Align OFFSET to block size and adjust LEN. */ -- step = (offset + f.f_bsize - 1) % ~f.f_bsize; -- offset += step; -+ /* Try to play safe. */ -+ if (f.f_bsize == 0) -+ f.f_bsize = 512; - - /* Write something to every block. */ -- while (len > step) -+ for (offset += (len - 1) % f.f_bsize; len > 0; offset += f.f_bsize) - { -- len -= step; -+ len -= f.f_bsize; -+ -+ if (offset < st.st_size) -+ { -+ unsigned char c; -+ ssize_t rsize = __pread (fd, &c, 1, offset); -+ -+ if (rsize < 0) -+ return errno; -+ /* If there is a non-zero byte, the block must have been -+ allocated already. */ -+ else if (rsize == 1 && c != 0) -+ continue; -+ } - - if (__pwrite (fd, "", 1, offset) != 1) - return errno; -- -- offset += step; - } - - return 0; ---- glibc-20050503T0852/sysdeps/posix/posix_fallocate64.c 10 Mar 2004 09:28:25 -0000 1.5 -+++ glibc-20050503T0852-fedora/sysdeps/posix/posix_fallocate64.c 3 May 2005 09:39:16 -0000 1.5.2.1 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 2000, 2003, 2004, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -29,9 +29,8 @@ __posix_fallocate64_l64 (int fd, __off64 - { - struct stat64 st; - struct statfs64 f; -- size_t step; - -- /* `off64_t? is a signed type. Therefore we can determine whether -+ /* `off64_t' is a signed type. Therefore we can determine whether - OFFSET + LEN is too large if it is a negative value. */ - if (offset < 0 || len < 0) - return EINVAL; -@@ -47,24 +46,48 @@ __posix_fallocate64_l64 (int fd, __off64 - if (! S_ISREG (st.st_mode)) - return ENODEV; - -+ if (len == 0) -+ { -+ if (st.st_size < offset) -+ { -+ int ret = __ftruncate64 (fd, offset); -+ -+ if (ret != 0) -+ ret = errno; -+ return ret; -+ } -+ return 0; -+ } -+ - /* We have to know the block size of the filesystem to get at least some - sort of performance. */ - if (__fstatfs64 (fd, &f) != 0) - return errno; - -- /* Align OFFSET to block size and adjust LEN. */ -- step = (offset + f.f_bsize - 1) % ~f.f_bsize; -- offset += step; -+ /* Try to play safe. */ -+ if (f.f_bsize == 0) -+ f.f_bsize = 512; - - /* Write something to every block. */ -- while (len > step) -+ for (offset += (len - 1) % f.f_bsize; len > 0; offset += f.f_bsize) - { -- len -= step; -+ len -= f.f_bsize; -+ -+ if (offset < st.st_size) -+ { -+ unsigned char c; -+ ssize_t rsize = __pread64 (fd, &c, 1, offset); -+ -+ if (rsize < 0) -+ return errno; -+ /* If there is a non-zero byte, the block must have been -+ allocated already. */ -+ else if (rsize == 1 && c != 0) -+ continue; -+ } - - if (__pwrite64 (fd, "", 1, offset) != 1) - return errno; -- -- offset += step; - } - - return 0; ---- glibc-20050503T0852/sysdeps/sparc/sparc64/Versions 28 Mar 2005 20:42:42 -0000 1.2 -+++ glibc-20050503T0852-fedora/sysdeps/sparc/sparc64/Versions 19 May 1999 14:21:36 -0000 1.1 +--- glibc-20050504T1818/sysdeps/sparc/sparc64/Versions 28 Mar 2005 20:42:42 -0000 1.2 ++++ glibc-20050504T1818-fedora/sysdeps/sparc/sparc64/Versions 19 May 1999 14:21:36 -0000 1.1 @@ -5,10 +5,3 @@ libc { __align_cpy_8; __align_cpy_16; } @@ -3280,8 +3117,8 @@ - exp2l; - } -} ---- glibc-20050503T0852/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20050503T0852-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20050504T1818/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20050504T1818-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -3296,8 +3133,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20050503T0852/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20050504T1818/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20050504T1818-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -3307,8 +3144,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20050503T0852/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 -+++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 +--- glibc-20050504T1818/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 ++++ glibc-20050504T1818-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 @@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t FILE *fp = fopen ("/proc/self/maps", "rc"); @@ -3321,8 +3158,8 @@ /* We need no locking. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); ---- glibc-20050503T0852/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20050504T1818/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20050504T1818-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -3368,8 +3205,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20050503T0852/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050504T1818/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050504T1818-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -3430,8 +3267,8 @@ + } while (0) + +#include_next ---- glibc-20050503T0852/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20050504T1818/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20050504T1818-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -3464,29 +3301,29 @@ + } while (0) + #include_next ---- glibc-20050503T0852/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050504T1818/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050504T1818-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050503T0852/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050504T1818/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050504T1818-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050503T0852/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20050503T0852-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20050504T1818/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20050504T1818-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20050503T0852/sysdeps/x86_64/Versions 28 Mar 2005 20:42:42 -0000 1.3 -+++ glibc-20050503T0852-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000 +--- glibc-20050504T1818/sysdeps/x86_64/Versions 28 Mar 2005 20:42:42 -0000 1.3 ++++ glibc-20050504T1818-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -libm { - GLIBC_2.1 { Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- glibc.spec 3 May 2005 10:14:26 -0000 1.150 +++ glibc.spec 4 May 2005 18:53:32 -0000 1.151 @@ -1,9 +1,9 @@ -%define glibcdate 20050503T0852 +%define glibcdate 20050504T1818 %define glibcname glibc -%define glibcsrcdir glibc-20050503T0852 +%define glibcsrcdir glibc-20050504T1818 %define glibc_release_tarballs 0 %define glibcversion 2.3.5 -%define glibcrelease 5 +%define glibcrelease 6 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 sparc64 ppc ppc64 @@ -499,10 +499,10 @@ mkdir build-%{_target_cpu}-linux ; cd build-%{_target_cpu}-linux GCC=gcc %ifarch %{ix86} -BuildFlags="-march=%{_target_cpu}" +BuildFlags="-march=%{_target_cpu} -fasynchronous-unwind-tables" %endif %ifarch i686 -BuildFlags="-march=i686 -mtune=pentium4" +BuildFlags="-march=i686 -mtune=pentium4 -fasynchronous-unwind-tables" %endif %ifarch alphaev6 BuildFlags="-mcpu=ev6" @@ -1344,6 +1344,12 @@ %endif %changelog +* Wed May 4 2005 Jakub Jelinek 2.3.5-6 +- update from CVS + - fix cancellation on i?86 + - add call frame information to i?86 assembly + - build i?86 glibc with -fasynchronous-unwind-tables + * Tue May 3 2005 Jakub Jelinek 2.3.5-5 - update from CVS - add some more UTF-8 locales (#156115) Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- sources 3 May 2005 10:14:26 -0000 1.116 +++ sources 4 May 2005 18:53:32 -0000 1.117 @@ -1,2 +1,2 @@ -1c17083d3eef7549ac0ea98ecb094c48 glibc-20050503T0852.tar.bz2 -2cf649e0b771b370c06620987b85334b glibc-fedora-20050503T0852.tar.bz2 +c1022359f010726f5a0689e9808b51ac glibc-20050504T1818.tar.bz2 +f12c90bba6dc3500ac8fc867e2996304 glibc-fedora-20050504T1818.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 4 19:01:26 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 15:01:26 -0400 Subject: rpms/NetworkManager/devel NetworkManager-0.4-dhcp-socket-leak-fix.patch, NONE, 1.1 NetworkManager.spec, 1.44, 1.45 Message-ID: <200505041901.j44J1Q6Q030643@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30579 Modified Files: NetworkManager.spec Added Files: NetworkManager-0.4-dhcp-socket-leak-fix.patch Log Message: * Wed May 4 2005 Dan Williams - 0.4-10.cvs20050404 - Fix leak of a socket in DHCP code NetworkManager-0.4-dhcp-socket-leak-fix.patch: dhcpcd.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE NetworkManager-0.4-dhcp-socket-leak-fix.patch --- Index: dhcpcd.c =================================================================== RCS file: /cvs/gnome/NetworkManager/dhcpcd/Attic/dhcpcd.c,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- NetworkManager-0.4/dhcpcd/dhcpcd.c 13 Feb 2005 22:10:02 -0000 1.7 +++ NetworkManager-0.4/dhcpcd/dhcpcd.c 6 Apr 2005 16:38:40 -0000 1.7.2.1 @@ -245,6 +245,8 @@ if (iface->foo_sk >= 0) close (iface->foo_sk); + if (iface->sk) + close (iface->sk); free (iface->iface); free (iface->client_options); free (iface); Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- NetworkManager.spec 4 May 2005 18:33:31 -0000 1.44 +++ NetworkManager.spec 4 May 2005 19:01:09 -0000 1.45 @@ -7,7 +7,7 @@ Name: NetworkManager Summary: Network link manager and user applications Version: 0.4 -Release: 9.cvs20050404 +Release: 10.cvs20050404 Group: System Environment/Base License: GPL URL: http://people.redhat.com/dcbw/NetworkManager/ @@ -19,6 +19,7 @@ Patch4: NetworkManager-0.4-devup.patch Patch5: NetworkManager-0.4-aplist-fix-hidden.patch Patch6: NetworkManager-0.4-novarargs.patch +Patch7: NetworkManager-0.4-dhcp-socket-leak-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root PreReq: chkconfig @@ -99,6 +100,7 @@ %patch4 -p1 -b .devup %patch5 -p1 -b .aplist-fix-hidden %patch6 -p0 -b .no-varargs +%patch7 -p1 -b .dhcp-socket-leak-fix %build @@ -180,6 +182,9 @@ %changelog +* Wed May 4 2005 Dan Williams - 0.4-10.cvs20050404 +- Fix leak of a socket in DHCP code + * Wed May 4 2005 Dan Williams - 0.4-9.cvs20050404 - Fix some memory leaks (Tom Parker) - Join to threads rather than spinning for their completion (Tom Parker) From fedora-cvs-commits at redhat.com Wed May 4 19:04:20 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 15:04:20 -0400 Subject: rpms/glibc/devel glibc.spec,1.151,1.152 Message-ID: <200505041904.j44J4KYx030787@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30775 Modified Files: glibc.spec Log Message: 2.3.5-6 Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- glibc.spec 4 May 2005 18:53:32 -0000 1.151 +++ glibc.spec 4 May 2005 19:04:18 -0000 1.152 @@ -499,10 +499,10 @@ mkdir build-%{_target_cpu}-linux ; cd build-%{_target_cpu}-linux GCC=gcc %ifarch %{ix86} -BuildFlags="-march=%{_target_cpu} -fasynchronous-unwind-tables" +BuildFlags="-march=%{_target_cpu}" %endif %ifarch i686 -BuildFlags="-march=i686 -mtune=pentium4 -fasynchronous-unwind-tables" +BuildFlags="-march=i686 -mtune=pentium4" %endif %ifarch alphaev6 BuildFlags="-mcpu=ev6" @@ -1348,7 +1348,6 @@ - update from CVS - fix cancellation on i?86 - add call frame information to i?86 assembly - - build i?86 glibc with -fasynchronous-unwind-tables * Tue May 3 2005 Jakub Jelinek 2.3.5-5 - update from CVS From fedora-cvs-commits at redhat.com Wed May 4 19:31:45 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 15:31:45 -0400 Subject: rpms/autofs/devel autofs-4.1.4-deferred-syslog.patch, NONE, 1.1 autofs.spec, 1.63, 1.64 Message-ID: <200505041931.j44JVjHT028258@cvs.devel.redhat.com> Author: jmoyer Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28238 Modified Files: autofs.spec Added Files: autofs-4.1.4-deferred-syslog.patch Log Message: - Add in the deferred syslog patch. This fixes a hung automounter issue related to unsafe calls to syslog in signal handler context. autofs-4.1.4-deferred-syslog.patch: daemon/automount.c | 74 ++++++ include/automount.h | 57 +++- lib/Makefile | 9 lib/vsprintf.c | 594 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 717 insertions(+), 17 deletions(-) --- NEW FILE autofs-4.1.4-deferred-syslog.patch --- --- autofs-4.1.4/lib/vsprintf.c.orig 2005-05-04 15:01:25.000000000 -0400 +++ autofs-4.1.4/lib/vsprintf.c 2005-05-04 15:01:44.000000000 -0400 @@ -0,0 +1,594 @@ +/* + * Stolen from the linux kernel. + * + * License: GPL + */ +/*------------------ Original Copyright -----------------*/ +/* + * linux/lib/vsprintf.c + * + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ +/* + * Wirzenius wrote this portably, Torvalds fucked it up :-) + */ + +/* + * Fri Jul 13 2001 Crutcher Dunnavant + * - changed to provide snprintf and vsnprintf functions + * So Feb 1 16:51:32 CET 2004 Juergen Quade + * - scnprintf and vscnprintf + */ + +/* Also copied from: */ + +/* + * linux/lib/string.c + * + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +/* + * stupid library routines.. The optimized versions should generally be found + * as inline code in + * + * These are buggy as well.. + * + * * Fri Jun 25 1999, Ingo Oeser + * - Added strsep() which will replace strtok() soon (because strsep() is + * reentrant and should be faster). Use only strsep() in new code, please. + * + * * Sat Feb 09 2002, Jason Thomas , + * Matthew Hawkins + * - Kissed strtok() goodbye + */ +/*-------------------------------------------------------*/ + +#include +#include +#include +#include +#include +#include + +#define BITS_PER_LONG __WORDSIZE +#define PAGE_SIZE getpagesize() + + +#if BITS_PER_LONG == 64 + +# define do_div(n,base) ({ \ + uint32_t __base = (base); \ + uint32_t __rem; \ + __rem = ((uint64_t)(n)) % __base; \ + (n) = ((uint64_t)(n)) / __base; \ + __rem; \ + }) + +#elif BITS_PER_LONG == 32 + +/* Not needed on 64bit architectures */ +uint32_t __div64_32(uint64_t *n, uint32_t base) +{ + uint64_t rem = *n; + uint64_t b = base; + uint64_t res, d = 1; + uint32_t high = rem >> 32; + + /* Reduce the thing a bit first */ + res = 0; + if (high >= base) { + high /= base; + res = (uint64_t) high << 32; + rem -= (uint64_t) (high*base) << 32; + } + + while ((int64_t)b > 0 && b < rem) { + b = b+b; + d = d+d; + } + + do { + if (rem >= b) { + rem -= b; + res += d; + } + b >>= 1; + d >>= 1; + } while (d); + + *n = res; + return rem; +} + +/* The unnecessary pointer compare is there + * to check for type safety (n must be 64bit) + */ +# define do_div(n,base) ({ \ + uint32_t __base = (base); \ + uint32_t __rem; \ + (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \ + if (((n) >> 32) == 0) { \ + __rem = (uint32_t)(n) % __base; \ + (n) = (uint32_t)(n) / __base; \ + } else \ + __rem = __div64_32(&(n), __base); \ + __rem; \ + }) + +# else + +# error do_div() does not yet support the C64 + +#endif /* BITS_PER_LONG */ + + +/** + * strnlen - Find the length of a length-limited string + * @s: The string to be sized + * @count: The maximum number of bytes to search + */ +size_t strnlen(const char * s, size_t count) +{ + const char *sc; + + for (sc = s; count-- && *sc != '\0'; ++sc) + /* nothing */; + return sc - s; +} + +/** + * simple_strtoul - convert a string to an unsigned long + * @cp: The start of the string + * @endp: A pointer to the end of the parsed string will be placed here + * @base: The number base to use + */ +unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base) +{ + unsigned long result = 0,value; + + if (!base) { + base = 10; + if (*cp == '0') { + base = 8; + cp++; + if ((toupper(*cp) == 'X') && isxdigit(cp[1])) { + cp++; + base = 16; + } + } + } else if (base == 16) { + if (cp[0] == '0' && toupper(cp[1]) == 'X') + cp += 2; + } + while (isxdigit(*cp) && + (value = isdigit(*cp) ? *cp-'0' : toupper(*cp)-'A'+10) < base) { + result = result*base + value; + cp++; + } + if (endp) + *endp = (char *)cp; + return result; +} + +/** + * simple_strtol - convert a string to a signed long + * @cp: The start of the string + * @endp: A pointer to the end of the parsed string will be placed here + * @base: The number base to use + */ +long simple_strtol(const char *cp,char **endp,unsigned int base) +{ + if(*cp=='-') + return -simple_strtoul(cp+1,endp,base); + return simple_strtoul(cp,endp,base); +} + +/** + * simple_strtoull - convert a string to an unsigned long long + * @cp: The start of the string + * @endp: A pointer to the end of the parsed string will be placed here + * @base: The number base to use + */ +unsigned long long simple_strtoull(const char *cp,char **endp,unsigned int base) +{ + unsigned long long result = 0,value; + + if (!base) { + base = 10; + if (*cp == '0') { + base = 8; + cp++; + if ((toupper(*cp) == 'X') && isxdigit(cp[1])) { + cp++; + base = 16; + } + } + } else if (base == 16) { + if (cp[0] == '0' && toupper(cp[1]) == 'X') + cp += 2; + } + while (isxdigit(*cp) && (value = isdigit(*cp) ? *cp-'0' : (islower(*cp) + ? toupper(*cp) : *cp)-'A'+10) < base) { + result = result*base + value; + cp++; + } + if (endp) + *endp = (char *)cp; + return result; +} + +/** + * simple_strtoll - convert a string to a signed long long + * @cp: The start of the string + * @endp: A pointer to the end of the parsed string will be placed here + * @base: The number base to use + */ +long long simple_strtoll(const char *cp,char **endp,unsigned int base) +{ + if(*cp=='-') + return -simple_strtoull(cp+1,endp,base); + return simple_strtoull(cp,endp,base); +} + +static int skip_atoi(const char **s) +{ + int i=0; + + while (isdigit(**s)) + i = i*10 + *((*s)++) - '0'; + return i; +} + +#define ZEROPAD 1 /* pad with zero */ +#define SIGN 2 /* unsigned/signed long */ +#define PLUS 4 /* show plus */ +#define SPACE 8 /* space if plus */ +#define LEFT 16 /* left justified */ +#define SPECIAL 32 /* 0x */ +#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ + +static char * number(char * buf, char * end, unsigned long long num, int base, int size, int precision, int type) +{ + char c,sign,tmp[66]; + const char *digits; + static const char small_digits[] = "0123456789abcdefghijklmnopqrstuvwxyz"; + static const char large_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + int i; + + digits = (type & LARGE) ? large_digits : small_digits; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return NULL; + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + if (type & SIGN) { + if ((signed long long) num < 0) { + sign = '-'; + num = - (signed long long) num; + size--; + } else if (type & PLUS) { + sign = '+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; + } + } + if (type & SPECIAL) { + if (base == 16) + size -= 2; + else if (base == 8) + size--; + } + i = 0; + if (num == 0) + tmp[i++]='0'; + else while (num != 0) + tmp[i++] = digits[do_div(num,base)]; + if (i > precision) + precision = i; + size -= precision; + if (!(type&(ZEROPAD+LEFT))) { + while(size-->0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + } + if (sign) { + if (buf <= end) + *buf = sign; + ++buf; + } + if (type & SPECIAL) { + if (base==8) { + if (buf <= end) + *buf = '0'; + ++buf; + } else if (base==16) { + if (buf <= end) + *buf = '0'; + ++buf; + if (buf <= end) + *buf = digits[33]; + ++buf; + } + } + if (!(type & LEFT)) { + while (size-- > 0) { + if (buf <= end) + *buf = c; + ++buf; + } + } + while (i < precision--) { + if (buf <= end) + *buf = '0'; + ++buf; + } + while (i-- > 0) { + if (buf <= end) + *buf = tmp[i]; + ++buf; + } + while (size-- > 0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + return buf; +} + +/** + * vsnprintf_int - Format a string and place it in a buffer + * @buf: The buffer to place the result into + * @size: The size of the buffer, including the trailing null space + * @fmt: The format string to use + * @args: Arguments for the format string + * + * The return value is the number of characters which would + * be generated for the given input, excluding the trailing + * '\0', as per ISO C99. If you want to have the exact + * number of characters written into @buf as return value + * (not including the trailing '\0'), use vscnprintf. If the + * return is greater than or equal to @size, the resulting + * string is truncated. + * + * Call this function if you are already dealing with a va_list. + * You probably want snprintf instead. + */ +int vsnprintf_int(char *buf, size_t size, const char *fmt, va_list args) +{ + int len; + unsigned long long num; + int i, base; + char *str, *end, c; + const char *s; + + int flags; /* flags to number() */ + + int field_width; /* width of output field */ + int precision; /* min. # of digits for integers; max + number of chars for from string */ + int qualifier; /* 'h', 'l', or 'L' for integer fields */ + /* 'z' support added 23/7/1999 S.H. */ + /* 'z' changed to 'Z' --davidm 1/25/99 */ + + /* Reject out-of-range values early */ + if ((int) size < 0) + return 0; + + str = buf; + end = buf + size - 1; + + if (end < buf - 1) { + end = ((void *) -1); + size = end - buf + 1; + } + + for (; *fmt ; ++fmt) { + if (*fmt != '%') { + if (str <= end) + *str = *fmt; + ++str; + continue; + } + + /* process flags */ + flags = 0; + repeat: + ++fmt; /* this also skips first '%' */ + switch (*fmt) { + case '-': flags |= LEFT; goto repeat; + case '+': flags |= PLUS; goto repeat; + case ' ': flags |= SPACE; goto repeat; + case '#': flags |= SPECIAL; goto repeat; + case '0': flags |= ZEROPAD; goto repeat; + } + + /* get field width */ + field_width = -1; + if (isdigit(*fmt)) + field_width = skip_atoi(&fmt); + else if (*fmt == '*') { + ++fmt; + /* it's the next argument */ + field_width = va_arg(args, int); + if (field_width < 0) { + field_width = -field_width; + flags |= LEFT; + } + } + + /* get the precision */ + precision = -1; + if (*fmt == '.') { + ++fmt; + if (isdigit(*fmt)) + precision = skip_atoi(&fmt); + else if (*fmt == '*') { + ++fmt; + /* it's the next argument */ + precision = va_arg(args, int); + } + if (precision < 0) + precision = 0; + } + + /* get the conversion qualifier */ + qualifier = -1; + if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || + *fmt =='Z' || *fmt == 'z') { + qualifier = *fmt; + ++fmt; + if (qualifier == 'l' && *fmt == 'l') { + qualifier = 'L'; + ++fmt; + } + } + + /* default base */ + base = 10; + + switch (*fmt) { + case 'c': + if (!(flags & LEFT)) { + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + } + c = (unsigned char) va_arg(args, int); + if (str <= end) + *str = c; + ++str; + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + continue; + + case 's': + s = va_arg(args, char *); + if ((unsigned long)s < PAGE_SIZE) + s = ""; + + len = strnlen(s, precision); + + if (!(flags & LEFT)) { + while (len < field_width--) { + if (str <= end) + *str = ' '; + ++str; + } + } + for (i = 0; i < len; ++i) { + if (str <= end) + *str = *s; + ++str; ++s; + } + while (len < field_width--) { + if (str <= end) + *str = ' '; + ++str; + } + continue; + + case 'p': + if (field_width == -1) { + field_width = 2*sizeof(void *); + flags |= ZEROPAD; + } + str = number(str, end, + (unsigned long) va_arg(args, void *), + 16, field_width, precision, flags); + continue; + + + case 'n': + /* FIXME: + * What does C99 say about the overflow case here? */ + if (qualifier == 'l') { + long * ip = va_arg(args, long *); + *ip = (str - buf); + } else if (qualifier == 'Z' || qualifier == 'z') { + size_t * ip = va_arg(args, size_t *); + *ip = (str - buf); + } else { + int * ip = va_arg(args, int *); + *ip = (str - buf); + } + continue; + + case '%': + if (str <= end) + *str = '%'; + ++str; + continue; + + /* integer number formats - set up the flags and "break" */ + case 'o': + base = 8; + break; + + case 'X': + flags |= LARGE; + case 'x': + base = 16; + break; + + case 'd': + case 'i': + flags |= SIGN; + case 'u': + break; + + default: + if (str <= end) + *str = '%'; + ++str; + if (*fmt) { + if (str <= end) + *str = *fmt; + ++str; + } else { + --fmt; + } + continue; + } + if (qualifier == 'L') + num = va_arg(args, long long); + else if (qualifier == 'l') { + num = va_arg(args, unsigned long); + if (flags & SIGN) + num = (signed long) num; + } else if (qualifier == 'Z' || qualifier == 'z') { + num = va_arg(args, size_t); + } else if (qualifier == 'h') { + num = (unsigned short) va_arg(args, int); + if (flags & SIGN) + num = (signed short) num; + } else { + num = va_arg(args, unsigned int); + if (flags & SIGN) + num = (signed int) num; + } + str = number(str, end, num, base, + field_width, precision, flags); + } + if (str <= end) + *str = '\0'; + else if (size > 0) + /* don't write out a null byte if the buf size is zero */ + *end = '\0'; + /* the trailing null byte doesn't count towards the total + * ++str; + */ + return str-buf; +} --- autofs-4.1.4/lib/Makefile.orig 2005-05-04 13:54:45.000000000 -0400 +++ autofs-4.1.4/lib/Makefile 2005-05-04 15:04:30.000000000 -0400 @@ -9,10 +9,11 @@ RPCGEN = /usr/bin/rpcgen RANLIB = /usr/bin/ranlib -SRCS = cache.c listmount.c cat_path.c rpc_subs.c mounts.c lock.c nsswitch.c +SRCS = cache.c listmount.c cat_path.c rpc_subs.c mounts.c lock.c nsswitch.c \ + vsprintf.c RPCS = mount.h mount_clnt.c mount_xdr.c OBJS = cache.o mount_clnt.o mount_xdr.o listmount.o \ - cat_path.o rpc_subs.o mounts.o lock.o nsswitch.o + cat_path.o rpc_subs.o mounts.o lock.o nsswitch.o vsprintf.o LIB = autofs.a @@ -48,6 +49,10 @@ $(CC) $(CFLAGS) -o listmount.o -c listmount.c $(STRIP) listmount.o +vsprintf.o: vsprintf.c + $(CC) $(CFLAGS) -o vsprintf.o -c vsprintf.c + $(STRIP) vsprintf.o + install: all clean: --- autofs-4.1.4/daemon/automount.c.orig 2005-03-06 04:43:55.000000000 -0500 +++ autofs-4.1.4/daemon/automount.c 2005-05-04 15:01:44.000000000 -0400 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -64,6 +65,7 @@ sigset_t ready_sigs; /* signals only accepted in ST_READY */ sigset_t lock_sigs; /* signals blocked for locking */ sigset_t sigchld_mask; +int in_interrupt = 0; /* keeps us from logging in a signal handler */ struct autofs_point ap; @@ -79,6 +81,72 @@ static int handle_packet_expire(const struct autofs_packet_expire *pkt); static int umount_all(int force); +#define LOGQUEUE_LINE_LEN 128 +#define LOGQUEUE_MAX 128 +struct log_queue { + int pri; + char buf[LOGQUEUE_LINE_LEN]; +} logbuf[LOGQUEUE_MAX]; +static int ringlen; + +static void block_signals(sigset_t *set) +{ + sigset_t allsigs; + + sigfillset(&allsigs); + sigprocmask(SIG_BLOCK, &allsigs, set); +} + +static void unblock_signals(sigset_t *set) +{ + sigprocmask(SIG_SETMASK, set, NULL); +} + +void flush_logs(void) +{ + int i; + sigset_t set; + + block_signals(&set); + assert(!in_interrupt); + for (i = 0; i < ringlen; i++) + syslog(logbuf[i].pri, logbuf[i].buf); + ringlen = 0; + unblock_signals(&set); +} + +void queue_syslog(int priority, const char *format, ...) +{ + va_list args; + struct log_queue *rp; + sigset_t set; + + assert(in_interrupt); + + block_signals(&set); + if (ringlen >= LOGQUEUE_MAX) { +#ifdef DEBUG + /* + * We want to know if we are exceeding the max number of + * log entrise. + */ + *(void *)0 = 0; +#else + unblock_signals(&set); + return; +#endif + } + rp = &logbuf[ringlen]; + ringlen++; + unblock_signals(&set); + + va_start(args, format); + vsnprintf_int(rp->buf, LOGQUEUE_LINE_LEN, format, args); + va_end(args); + rp->buf[LOGQUEUE_LINE_LEN - 1] = '\0'; + rp->pri = priority; +} + int mkdir_path(const char *path, mode_t mode) { char *buf = alloca(strlen(path) + 1); @@ -490,6 +558,7 @@ int save_errno = errno; enum states next = ap.state; + in_interrupt++; switch (sig) { default: /* all the "can't happen" signals */ error("process %d got unexpected signal %d!", getpid(), sig); @@ -521,6 +590,7 @@ debug("sig %d switching from %d to %d", sig, ap.state, next); errno = save_errno; + in_interrupt--; } static int send_ready(unsigned int wait_queue_token) @@ -661,6 +731,7 @@ int save_errno = errno; enum states next; + in_interrupt++; if (sig != SIGCHLD) return; @@ -669,6 +740,7 @@ nextstate(next); errno = save_errno; + in_interrupt--; } static int st_ready(void) @@ -1487,6 +1559,7 @@ { int save_errno = errno; + in_interrupt++; switch (sig) { default: /* all the signals not handled */ error("process %d got unexpected signal %d!", getpid(), sig); @@ -1518,6 +1591,7 @@ break; } errno = save_errno; + in_interrupt--; } int supervisor(char *path) --- autofs-4.1.4/include/automount.h.orig 2005-05-04 13:54:45.000000000 -0400 +++ autofs-4.1.4/include/automount.h 2005-05-04 15:03:34.000000000 -0400 @@ -13,6 +13,7 @@ #include #include #include +#include #include "config.h" /* We MUST have the paths to mount(8) and umount(8) */ @@ -116,6 +117,7 @@ }; extern struct autofs_point ap; +extern int in_interrupt; /* Standard function used by daemon or modules */ @@ -281,6 +283,9 @@ int is_mounted(const char *table, const char *path); int has_fstab_option(const char *path, const char *opt); int allow_owner_mount(const char *); +int vsnprintf_int(char *buf, size_t size, const char *fmt, va_list args); +void flush_logs(void); +void queue_syslog(int pri, const char *format, ...); /* nsswitch parsing */ #define MAPTYPE_FILE 1 @@ -294,21 +299,43 @@ extern int do_verbose; extern int do_debug; -#define info(msg, args...) \ -if (do_verbose || do_debug) \ - syslog(LOG_INFO, msg, ##args); - -#define warn(msg, args...) \ -if (do_verbose || do_debug) \ - syslog(LOG_WARNING, msg, ##args); - -#define error(msg, args...) syslog(LOG_ERR, msg, ##args); - -#define crit(msg, args...) syslog(LOG_CRIT, msg, ##args); - -#define debug(msg, args...) \ -if (do_debug) \ - syslog(LOG_DEBUG, msg, ##args); +#define safe_syslog(pri, msg, args...) \ +do { \ + if (in_interrupt) \ + queue_syslog(pri, msg, ##args); \ + else { \ + flush_logs(); \ + syslog(pri, msg, ##args); \ + } \ +} while (0) + +#define info(msg, args...) \ +do { \ + if (do_verbose || do_debug) \ + safe_syslog(LOG_INFO, msg, ##args); \ +} while (0) + +#define warn(msg, args...) \ +do { \ + if (do_verbose || do_debug) \ + safe_syslog(LOG_INFO, msg, ##args); \ +} while (0) + +#define error(msg, args...) \ +do { \ + safe_syslog(LOG_ERR, msg, ##args); \ +} while (0) + +#define crit(msg, args...) \ +do { \ + safe_syslog(LOG_CRIT, msg, ##args); \ +} while (0) + +#define debug(msg, args...) \ +do { \ + if (do_debug) \ + safe_syslog(LOG_DEBUG, msg, ##args); \ +} while (0) #endif Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- autofs.spec 3 May 2005 19:50:27 -0000 1.63 +++ autofs.spec 4 May 2005 19:31:39 -0000 1.64 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems. Name: autofs %define version 4.1.4 -%define release 7 +%define release 8 Version: %{version} Release: %{release} Epoch: 1 @@ -21,6 +21,7 @@ Patch8: autofs-4.1.3-alt-master-ldap.patch Patch9: autofs-4.1.4-check-is-multi.patch Patch10: autofs-4.1.4-cache-update-race-fix.patch +Patch11: autofs-4.1.4-deferred-syslog.patch Buildroot: /var/tmp/autofs-tmp BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl @@ -70,6 +71,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -123,6 +125,10 @@ %{_libdir}/autofs/* %changelog +* Wed May 4 2005 Jeff Moyer - 1:4.1.4-8 +- Add in the deferred syslog patch. This fixes a hung automounter issue + related to unsafe calls to syslog in signal handler context. + * Tue May 3 2005 Jeff Moyer - 1:4.1.4-7 - I reversed the checking for multimount entries, breaking those configs! This update puts the code back the way it was before I broke it. From fedora-cvs-commits at redhat.com Wed May 4 19:43:55 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 15:43:55 -0400 Subject: rpms/thunderbird/devel firefox-1.0-download-to-desktop.patch, NONE, 1.1 firefox-1.0-gfxshared_s.patch, NONE, 1.1 firefox-1.0-pango-bidi-justify.patch, NONE, 1.1 firefox-1.0-pango-direction.patch, NONE, 1.1 firefox-1.0-uriloader.patch, NONE, 1.1 thunderbird.sh.in, 1.3, 1.4 thunderbird.spec, 1.29, 1.30 Message-ID: <200505041943.j44JhtX5029127@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29107 Modified Files: thunderbird.sh.in thunderbird.spec Added Files: firefox-1.0-download-to-desktop.patch firefox-1.0-gfxshared_s.patch firefox-1.0-pango-bidi-justify.patch firefox-1.0-pango-direction.patch firefox-1.0-uriloader.patch Log Message: * Wed May 4 2005 Christopher Aillon 1.0.2-3 - Don't have downloads "disappear" when downloading to desktop (#139015) - Fix for some more cursor issues in textareas (149991, 150002, 152089) - Add upstream patch to fix bidi justification of pango - Add patch to fix launching of helper applications - Add patch to properly link against libgfxshared_s.a - Fix multilib conflicts firefox-1.0-download-to-desktop.patch: toolkit/mozapps/downloads/content/downloads.js | 3 +++ toolkit/mozapps/downloads/content/pref-downloads.js | 3 +++ toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in | 3 +++ xpcom/io/SpecialSystemDirectory.cpp | 8 ++++++++ xpcom/io/SpecialSystemDirectory.h | 1 + xpcom/io/nsDirectoryService.cpp | 6 ++++++ xpcom/io/nsDirectoryService.h | 1 + xpcom/io/nsDirectoryServiceDefs.h | 1 + 8 files changed, 26 insertions(+) --- NEW FILE firefox-1.0-download-to-desktop.patch --- Index: xpcom/io/SpecialSystemDirectory.cpp =================================================================== RCS file: /cvsroot/mozilla/xpcom/io/SpecialSystemDirectory.cpp,v retrieving revision 1.9 diff -d -u -p -6 -r1.9 SpecialSystemDirectory.cpp --- xpcom/io/SpecialSystemDirectory.cpp 2 Mar 2004 08:20:25 -0000 1.9 +++ xpcom/io/SpecialSystemDirectory.cpp 15 Dec 2004 14:18:25 -0000 @@ -564,12 +564,20 @@ GetSpecialSystemDirectory(SystemDirector aFile); case Unix_LibDirectory: return NS_NewNativeLocalFile(nsDependentCString("/usr/local/lib/netscape/"), PR_TRUE, aFile); + case Unix_DesktopDirectory: + { + nsCAutoString desktopDir(PR_GetEnv("HOME")); + if (!desktopDir.IsEmpty()) + desktopDir.Append("/Desktop"); + return NS_NewNativeLocalFile(desktopDir, PR_TRUE, aFile); + } + case Unix_HomeDirectory: #ifdef VMS { char *pHome; pHome = getenv("HOME"); if (*pHome == '/') { Index: xpcom/io/SpecialSystemDirectory.h =================================================================== RCS file: /cvsroot/mozilla/xpcom/io/SpecialSystemDirectory.h,v retrieving revision 1.3 diff -d -u -p -6 -r1.3 SpecialSystemDirectory.h --- xpcom/io/SpecialSystemDirectory.h 7 Apr 2003 07:02:30 -0000 1.3 +++ xpcom/io/SpecialSystemDirectory.h 15 Dec 2004 14:18:25 -0000 @@ -93,12 +93,13 @@ enum SystemDirectories { Win_Printhood = 226, Win_Cookies = 227, Unix_LocalDirectory = 301, Unix_LibDirectory = 302, Unix_HomeDirectory = 303, + Unix_DesktopDirectory = 304, BeOS_SettingsDirectory = 401, BeOS_HomeDirectory = 402, BeOS_DesktopDirectory = 403, BeOS_SystemDirectory = 404, Index: xpcom/io/nsDirectoryService.cpp =================================================================== RCS file: /cvsroot/mozilla/xpcom/io/nsDirectoryService.cpp,v retrieving revision 1.69 diff -d -u -p -6 -r1.69 nsDirectoryService.cpp --- xpcom/io/nsDirectoryService.cpp 15 Jan 2004 06:14:13 -0000 1.69 +++ xpcom/io/nsDirectoryService.cpp 15 Dec 2004 14:18:25 -0000 @@ -397,12 +397,13 @@ nsIAtom* nsDirectoryService::sAppdata = nsIAtom* nsDirectoryService::sPrinthood = nsnull; nsIAtom* nsDirectoryService::sWinCookiesDirectory = nsnull; #elif defined (XP_UNIX) nsIAtom* nsDirectoryService::sLocalDirectory = nsnull; nsIAtom* nsDirectoryService::sLibDirectory = nsnull; nsIAtom* nsDirectoryService::sHomeDirectory = nsnull; +nsIAtom* nsDirectoryService::sDesktopDirectory = nsnull; #elif defined (XP_OS2) nsIAtom* nsDirectoryService::sSystemDirectory = nsnull; nsIAtom* nsDirectoryService::sOS2Directory = nsnull; nsIAtom* nsDirectoryService::sHomeDirectory = nsnull; nsIAtom* nsDirectoryService::sDesktopDirectory = nsnull; #elif defined (XP_BEOS) @@ -506,12 +507,13 @@ static const nsStaticAtom directory_atom { NS_WIN_PRINTHOOD, &nsDirectoryService::sPrinthood }, { NS_WIN_COOKIES_DIR, &nsDirectoryService::sWinCookiesDirectory }, #elif defined (XP_UNIX) { NS_UNIX_LOCAL_DIR, &nsDirectoryService::sLocalDirectory }, { NS_UNIX_LIB_DIR, &nsDirectoryService::sLibDirectory }, { NS_UNIX_HOME_DIR, &nsDirectoryService::sHomeDirectory }, + { NS_UNIX_DESKTOP_DIR, &nsDirectoryService::sDesktopDirectory }, #elif defined (XP_OS2) { NS_OS_SYSTEM_DIR, &nsDirectoryService::sSystemDirectory }, { NS_OS2_DIR, &nsDirectoryService::sOS2Directory }, { NS_OS2_HOME_DIR, &nsDirectoryService::sHomeDirectory }, { NS_OS2_DESKTOP_DIR, &nsDirectoryService::sDesktopDirectory }, #elif defined (XP_BEOS) @@ -1095,12 +1097,16 @@ nsDirectoryService::GetFile(const char * rv = GetSpecialSystemDirectory(Unix_LibDirectory, getter_AddRefs(localFile)); } else if (inAtom == nsDirectoryService::sHomeDirectory) { rv = GetSpecialSystemDirectory(Unix_HomeDirectory, getter_AddRefs(localFile)); } + else if (inAtom == nsDirectoryService::sDesktopDirectory) + { + rv = GetSpecialSystemDirectory(Unix_DesktopDirectory, getter_AddRefs(localFile)); + } #elif defined (XP_OS2) else if (inAtom == nsDirectoryService::sSystemDirectory) { rv = GetSpecialSystemDirectory(OS2_SystemDirectory, getter_AddRefs(localFile)); } else if (inAtom == nsDirectoryService::sOS2Directory) Index: xpcom/io/nsDirectoryService.h =================================================================== RCS file: /cvsroot/mozilla/xpcom/io/nsDirectoryService.h,v retrieving revision 1.27 diff -d -u -p -6 -r1.27 nsDirectoryService.h --- xpcom/io/nsDirectoryService.h 15 Jan 2004 06:14:13 -0000 1.27 +++ xpcom/io/nsDirectoryService.h 15 Dec 2004 14:18:25 -0000 @@ -154,12 +154,13 @@ public: static nsIAtom *sPrinthood; static nsIAtom *sWinCookiesDirectory; #elif defined (XP_UNIX) static nsIAtom *sLocalDirectory; static nsIAtom *sLibDirectory; static nsIAtom *sHomeDirectory; + static nsIAtom *sDesktopDirectory; #elif defined (XP_OS2) static nsIAtom *sSystemDirectory; static nsIAtom *sOS2Directory; static nsIAtom *sHomeDirectory; static nsIAtom *sDesktopDirectory; #elif defined (XP_BEOS) Index: xpcom/io/nsDirectoryServiceDefs.h =================================================================== RCS file: /cvsroot/mozilla/xpcom/io/nsDirectoryServiceDefs.h,v retrieving revision 1.24.32.1 diff -d -u -p -6 -r1.24.32.1 nsDirectoryServiceDefs.h --- xpcom/io/nsDirectoryServiceDefs.h 17 May 2004 21:38:15 -0000 1.24.32.1 +++ xpcom/io/nsDirectoryServiceDefs.h 15 Dec 2004 14:18:25 -0000 @@ -175,12 +175,13 @@ #define NS_WIN_PRINTHOOD "PrntHd" #define NS_WIN_COOKIES_DIR "CookD" #elif defined (XP_UNIX) #define NS_UNIX_LOCAL_DIR "Locl" #define NS_UNIX_LIB_DIR "LibD" #define NS_UNIX_HOME_DIR "Home" + #define NS_UNIX_DESKTOP_DIR "Desktop" #elif defined (XP_OS2) #define NS_OS2_DIR "OS2Dir" #define NS_OS2_HOME_DIR "Home" #define NS_OS2_DESKTOP_DIR "Desk" #elif defined (XP_BEOS) #define NS_BEOS_SETTINGS_DIR "Setngs" Index: toolkit/mozapps/downloads/content/downloads.js =================================================================== RCS file: /cvsroot/mozilla/toolkit/mozapps/downloads/content/downloads.js,v retrieving revision 1.21.2.2.2.7 diff -d -u -p -6 -r1.21.2.2.2.7 downloads.js --- toolkit/mozapps/downloads/content/downloads.js 26 Oct 2004 06:40:37 -0000 1.21.2.2.2.7 +++ toolkit/mozapps/downloads/content/downloads.js 15 Dec 2004 14:18:25 -0000 @@ -735,12 +735,15 @@ function initAutoDownloadDisplay() #ifdef XP_MACOSX return aFolderType == "Desktop" ? "UsrDsk" : "UsrDocs"; #endif #ifdef XP_OS2 return aFolderType == "Desktop" ? "Desk" : "Home"; #endif +#ifdef XP_UNIX + return aFolderType == "Desktop" ? "Desktop" : "Home"; +#endif return "Home"; } function getDownloadsFolder(aFolder) { var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"] Index: toolkit/mozapps/downloads/content/pref-downloads.js =================================================================== RCS file: /cvsroot/mozilla/toolkit/mozapps/downloads/content/pref-downloads.js,v retrieving revision 1.10.14.5 diff -d -u -p -6 -r1.10.14.5 pref-downloads.js --- toolkit/mozapps/downloads/content/pref-downloads.js 21 Oct 2004 05:47:15 -0000 1.10.14.5 +++ toolkit/mozapps/downloads/content/pref-downloads.js 15 Dec 2004 14:18:25 -0000 @@ -319,12 +319,15 @@ function getSpecialFolderKey(aFolderType #ifdef XP_MACOSX return aFolderType == "Desktop" ? "UsrDsk" : "UsrDocs"; #endif #ifdef XP_OS2 return aFolderType == "Desktop" ? "Desk" : "Home"; #endif +#ifdef XP_UNIX + return aFolderType == "Desktop" ? "Desktop" : "Home"; +#endif return "Home"; } function getDownloadsFolder(aFolder) { var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"].getService(Components.interfaces.nsIProperties); Index: toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in =================================================================== RCS file: /cvsroot/mozilla/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in,v retrieving revision 1.4.6.8 diff -d -u -p -6 -r1.4.6.8 nsHelperAppDlg.js.in --- toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in 5 Nov 2004 08:54:09 -0000 1.4.6.8 +++ toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in 15 Dec 2004 14:18:25 -0000 @@ -145,12 +145,15 @@ nsUnknownContentTypeDialog.prototype = { #ifdef XP_MACOSX return aFolderType == "Desktop" ? "UsrDsk" : "UsrDocs"; #endif #ifdef XP_OS2 return aFolderType == "Desktop" ? "Desk" : "Home"; #endif +#ifdef XP_UNIX + return aFolderType == "Desktop" ? "Desktop" : "Home"; +#endif return "Home"; } function getDownloadsFolder(aFolder) { var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"].getService(Components.interfaces.nsIProperties); firefox-1.0-gfxshared_s.patch: Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE firefox-1.0-gfxshared_s.patch --- Index: gfx/src/gtk/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/gfx/src/gtk/Makefile.in,v retrieving revision 1.114 diff -u -p -r1.114 Makefile.in --- gfx/src/gtk/Makefile.in 7 Sep 2004 17:53:10 -0000 1.114 +++ gfx/src/gtk/Makefile.in 23 Sep 2004 00:03:07 -0000 @@ -162,6 +162,8 @@ ifdef MOZ_ENABLE_FREETYPE2 SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)gfxft2_s.$(LIB_SUFFIX) endif +EXTRA_DSO_LDOPTS = $(DIST)/lib/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) + include $(topsrcdir)/config/rules.mk ifdef MOZ_ENABLE_XINERAMA @@ -172,7 +174,6 @@ ifdef MOZ_ENABLE_GTK EXTRA_DSO_LDOPTS += \ $(LIBS_DIR) \ -lgkgfx \ - -lgfxshared_s \ $(GFX_XINERAMA_LIBS) \ -lgtksuperwin \ $(MOZ_COMPONENT_LIBS) \ @@ -193,7 +194,6 @@ ifdef MOZ_ENABLE_GTK2 EXTRA_DSO_LDOPTS += \ $(LIBS_DIR) \ -lgkgfx \ - -lgfxshared_s \ $(GFX_XINERAMA_LIBS) \ $(MOZ_JS_LIBS) \ $(MOZ_UNICHARUTIL_LIBS) \ firefox-1.0-pango-bidi-justify.patch: gfx/public/nsIRenderingContext.h | 8 +++ gfx/src/gtk/nsFontMetricsPango.cpp | 3 - layout/html/base/src/nsTextFrame.cpp | 86 ++++++++++++++++++++++++++--------- 3 files changed, 75 insertions(+), 22 deletions(-) --- NEW FILE firefox-1.0-pango-bidi-justify.patch --- --- ./layout/html/base/src/nsTextFrame.cpp.SCREW 2005-05-03 15:53:09.000000000 -0400 +++ ./layout/html/base/src/nsTextFrame.cpp 2005-05-03 16:45:25.000000000 -0400 @@ -2967,12 +2967,21 @@ if (0 != textLength) { #ifdef IBMBIDI + PRBool isRightToLeftOnBidiPlatform = PR_FALSE; + PRBool isBidiSystem = PR_FALSE; + PRUint32 hints = 0; + aRenderingContext.GetHints(hints); + PRBool paintCharByChar = (0 == (hints & NS_RENDERING_HINT_REORDER_SPACED_TEXT)) && + ((0 != aTextStyle.mLetterSpacing) || + (0 != aTextStyle.mWordSpacing) || + aTextStyle.mJustifying); PRBool bidiEnabled; PRUint8 level = 0; nsCharType charType = eCharType_LeftToRight; aPresContext->GetBidiEnabled(&bidiEnabled); if (bidiEnabled) { + isBidiSystem = aPresContext->IsBidiSystem(); nsBidiPresUtils* bidiUtils; aPresContext->GetBidiUtils(&bidiUtils); @@ -2985,8 +2994,19 @@ PRInt32 rememberTextLength = textLength; #endif // Since we paint char by char, handle the text like on non-bidi platform + isRightToLeftOnBidiPlatform = (!paintCharByChar && + isBidiSystem && + (eCharType_RightToLeft == charType || + eCharType_RightToLeftArabic == charType)); + if (isRightToLeftOnBidiPlatform) { + // indicate that the platform should use its native + // capabilities to reorder the text with right-to-left + // base direction + aRenderingContext.SetRightToLeftText(PR_TRUE); + } + // If we will be painting char by char, handle the text like on non-bidi platform bidiUtils->ReorderUnicodeText(text, textLength, charType, - level & 1, PR_FALSE); + level & 1, (paintCharByChar) ? PR_FALSE : isBidiSystem); NS_ASSERTION(rememberTextLength == textLength, "Bidi formatting changed text length"); } } @@ -3028,7 +3048,9 @@ sdptr->mStart = ip[sdptr->mStart] - mContentOffset; sdptr->mEnd = ip[sdptr->mEnd] - mContentOffset; #ifdef IBMBIDI - AdjustSelectionPointsForBidi(sdptr, textLength, CHARTYPE_IS_RTL(charType), level & 1, PR_FALSE); + AdjustSelectionPointsForBidi(sdptr, textLength, + CHARTYPE_IS_RTL(charType), level & 1, + (paintCharByChar) ? PR_FALSE : isBidiSystem); #endif sdptr = sdptr->mNext; } @@ -3036,19 +3058,32 @@ DrawSelectionIterator iter(content, details,text,(PRUint32)textLength,aTextStyle, selectionValue, aPresContext, mStyleContext); if (!iter.IsDone() && iter.First()) { - nscoord currentX = dx; - nsTextDimensions newDimensions;//temp - while (!iter.IsDone()) - { - PRUnichar *currenttext = iter.CurrentTextUnicharPtr(); - PRUint32 currentlength= iter.CurrentLength(); - //TextStyle ¤tStyle = iter.CurrentStyle(); - nscolor currentFGColor = iter.CurrentForeGroundColor(); - nscolor currentBKColor; - PRBool isCurrentBKColorTransparent; - GetTextDimensions(aRenderingContext,aTextStyle,currenttext, (PRInt32)currentlength,&newDimensions); - if (newDimensions.width) - { + nscoord currentX = dx; + nsTextDimensions newDimensions;//temp +#ifdef IBMBIDI // Simon - display substrings RTL in RTL frame + if (isRightToLeftOnBidiPlatform) + { + nsTextDimensions frameDimensions; + GetTextDimensions(aRenderingContext, aTextStyle, text, + (PRInt32)textLength, &frameDimensions); + currentX = dx + frameDimensions.width; + } +#endif + while (!iter.IsDone()) + { + PRUnichar *currenttext = iter.CurrentTextUnicharPtr(); + PRUint32 currentlength= iter.CurrentLength(); + //TextStyle ¤tStyle = iter.CurrentStyle(); + nscolor currentFGColor = iter.CurrentForeGroundColor(); + nscolor currentBKColor; + PRBool isCurrentBKColorTransparent; + GetTextDimensions(aRenderingContext,aTextStyle,currenttext, (PRInt32)currentlength,&newDimensions); + if (newDimensions.width) + { +#ifdef IBMBIDI + if (isRightToLeftOnBidiPlatform) + currentX -= newDimensions.width; +#endif if (iter.CurrentBackGroundColor(currentBKColor, &isCurrentBKColorTransparent)) {//DRAW RECT HERE!!! if (!isCurrentBKColorTransparent) { @@ -3057,7 +3092,7 @@ } currentFGColor = EnsureDifferentColors(currentFGColor, currentBKColor); } - } + } if (isPaginated && !iter.IsBeforeOrAfter()) { aRenderingContext.SetColor(nsCSSRendering::TransformColor(aTextStyle.mColor->mColor,canDarkenColor)); @@ -3071,11 +3106,13 @@ dy, width, details); } +#ifdef IBMBIDI + if (!isRightToLeftOnBidiPlatform) +#endif //increment twips X start but remember to get ready for next draw by reducing current x by letter spacing amount - currentX+=newDimensions.width;// + aTextStyle.mLetterSpacing; - - iter.Next(); - } + currentX+=newDimensions.width;// + aTextStyle.mLetterSpacing; + iter.Next(); + } } else if (!isPaginated) { @@ -3093,8 +3130,15 @@ delete details; } } +#ifdef IBMBIDI + if (isRightToLeftOnBidiPlatform) { + // indicate that future text should not be reordered with + // right-to-left base direction + aRenderingContext.SetRightToLeftText(PR_FALSE); + } +#endif // IBMBIDI } -} +} void nsTextFrame::PaintAsciiText(nsIPresContext* aPresContext, --- ./gfx/public/nsIRenderingContext.h.SCREW 2005-05-03 15:53:09.000000000 -0400 +++ ./gfx/public/nsIRenderingContext.h 2005-05-03 15:53:09.000000000 -0400 @@ -932,6 +932,14 @@ */ #define NS_RENDERING_HINT_TEXT_CLUSTERS 0x20 +/** + * This bit, when set, indicates that gfx performs glyph reordering of complex + * text after applying character or word spacing, and so expects to be passed + * text in logical order. When this bit is not set, gfx must be passed text in + * visual order if characters and word spacing are to be applied. + */ +#define NS_RENDERING_HINT_REORDER_SPACED_TEXT 0x40 + //flags for copy CopyOffScreenBits //when performing the blit, use the region, if any, --- ./gfx/src/gtk/nsFontMetricsPango.cpp.SCREW 2005-05-03 15:53:09.000000000 -0400 +++ ./gfx/src/gtk/nsFontMetricsPango.cpp 2005-05-03 15:53:09.000000000 -0400 @@ -1138,7 +1138,8 @@ return (NS_RENDERING_HINT_BIDI_REORDERING | NS_RENDERING_HINT_ARABIC_SHAPING | NS_RENDERING_HINT_FAST_MEASURE | - NS_RENDERING_HINT_TEXT_CLUSTERS); + NS_RENDERING_HINT_TEXT_CLUSTERS | + NS_RENDERING_HINT_REORDER_SPACED_TEXT); } /* static */ firefox-1.0-pango-direction.patch: nsFontMetricsPango.cpp | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE firefox-1.0-pango-direction.patch --- --- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.foo 2005-03-28 14:20:47.000000000 -0500 +++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2005-03-28 14:23:45.000000000 -0500 @@ -1258,6 +1258,10 @@ mLTRPangoContext = pango_xft_get_context(GDK_DISPLAY(), 0); mPangoContext = mLTRPangoContext; + // Make sure that this is set LTR - RTL text will be set using the + // RTL context. + pango_context_set_base_dir(mPangoContext, PANGO_DIRECTION_LTR); + // Set the color map so we can draw later. gdk_pango_context_set_colormap(mPangoContext, gdk_rgb_get_cmap()); firefox-1.0-uriloader.patch: Makefile.in | 2 unix/nsGNOMERegistry.cpp | 27 ++++- unix/nsGNOMERegistry.h | 11 +- unix/nsMIMEInfoUnix.cpp | 196 ++++++++++++++++++++++++++++++++++++++++++ unix/nsMIMEInfoUnix.h | 48 ++++++++++ unix/nsOSHelperAppService.cpp | 27 ++--- 6 files changed, 284 insertions(+), 27 deletions(-) --- NEW FILE firefox-1.0-uriloader.patch --- Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v retrieving revision 1.8 diff -d -u -p -r1.8 nsGNOMERegistry.cpp --- uriloader/exthandler/unix/nsGNOMERegistry.cpp 6 Mar 2004 14:41:00 -0000 1.8 +++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 3 May 2005 19:09:20 -0000 @@ -42,7 +42,7 @@ #include "nsString.h" #include "nsIComponentManager.h" #include "nsILocalFile.h" -#include "nsMIMEInfoImpl.h" +#include "nsMIMEInfoUnix.h" #include "nsAutoPtr.h" #include @@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient; typedef struct _GnomeProgram GnomeProgram; typedef struct _GnomeModuleInfo GnomeModuleInfo; -typedef struct { +struct GnomeVFSMimeApplication { char *id; char *name; char *command; /* there is more here, but we don't need it */ -} GnomeVFSMimeApplication; +}; typedef GConfClient * (*_gconf_client_get_default_fn)(); typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *, @@ -231,7 +231,7 @@ nsGNOMERegistry::LoadURL(nsIURI *aURL) return NS_ERROR_FAILURE; } -/* static */ already_AddRefed +/* static */ already_AddRefed nsGNOMERegistry::GetFromExtension(const char *aFileExt) { if (!gconfLib) @@ -253,7 +253,7 @@ nsGNOMERegistry::GetFromExtension(const return GetFromType(mimeType); } -/* static */ already_AddRefed +/* static */ already_AddRefed nsGNOMERegistry::GetFromType(const char *aMIMEType) { if (!gconfLib) @@ -263,10 +263,11 @@ nsGNOMERegistry::GetFromType(const char if (!handlerApp) return nsnull; - nsRefPtr mimeInfo = new nsMIMEInfoImpl(); + nsRefPtr mimeInfo = new nsMIMEInfoUnix(); NS_ENSURE_TRUE(mimeInfo, nsnull); mimeInfo->SetMIMEType(aMIMEType); + mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp); // Get the list of extensions and append then to the mimeInfo. GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType); @@ -289,11 +290,21 @@ nsGNOMERegistry::GetFromType(const char return nsnull; } - gchar *commandPath = g_find_program_in_path(nativeCommand); + gchar **argv; + gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL); + if (!res) { + NS_ERROR("Could not convert helper app command to filesystem encoding"); + _gnome_vfs_mime_application_free(handlerApp); + return nsnull; + } + + gchar *commandPath = g_find_program_in_path(argv[0]); g_free(nativeCommand); + g_strfreev(argv); if (!commandPath) { + NS_WARNING("could not find command in path"); _gnome_vfs_mime_application_free(handlerApp); return nsnull; } @@ -311,7 +322,7 @@ nsGNOMERegistry::GetFromType(const char _gnome_vfs_mime_application_free(handlerApp); - nsMIMEInfoBase* retval; + nsMIMEInfoUnix* retval; NS_ADDREF((retval = mimeInfo)); return retval; } Index: uriloader/exthandler/unix/nsGNOMERegistry.h =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v retrieving revision 1.2 diff -d -u -p -r1.2 nsGNOMERegistry.h --- uriloader/exthandler/unix/nsGNOMERegistry.h 23 Feb 2004 22:49:27 -0000 1.2 +++ uriloader/exthandler/unix/nsGNOMERegistry.h 3 May 2005 18:21:35 -0000 @@ -35,10 +35,13 @@ * * ***** END LICENSE BLOCK ***** */ +#ifndef nsGNOMERegistry_h__ +#define nsGNOMERegistry_h__ + #include "nsIURI.h" #include "nsCOMPtr.h" -class nsMIMEInfoBase; +class nsMIMEInfoUnix; class nsGNOMERegistry { @@ -49,7 +52,9 @@ class nsGNOMERegistry static nsresult LoadURL(nsIURI *aURL); - static already_AddRefed GetFromExtension(const char *aFileExt); + static already_AddRefed GetFromExtension(const char *aFileExt); - static already_AddRefed GetFromType(const char *aMIMEType); + static already_AddRefed GetFromType(const char *aMIMEType); }; + +#endif // nsGNOMERegistry_h__ Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp =================================================================== RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 3 May 2005 18:21:35 -0000 @@ -0,0 +1,196 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org Code. + * + * The Initial Developer of the Original Code is + * Red Hat, Inc. + * Portions created by the Initial Developer are Copyright (C) 2005 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Christopher Aillon (Original author) + * + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsMIMEInfoUnix.h" +#include "prlink.h" +#include "prmem.h" +#include +#include + +static PRLibrary *gnomeLib; +static PRLibrary *vfsLib; + +typedef struct _GnomeProgram GnomeProgram; +typedef struct _GnomeModuleInfo GnomeModuleInfo; + +typedef enum { + GNOME_VFS_OK // there's more but we don't care about them. +} GnomeVFSResult; + +typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn) + (GnomeVFSMimeApplication *app, + GList *uris); +typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *); +typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *); +typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *, + const GnomeModuleInfo *, int, + char **, const char *, ...); +typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *); +typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)(); +typedef GnomeProgram * (*_gnome_program_get_fn)(); +typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *); + +#define DECL_FUNC_PTR(func) static _##func##_fn _##func + +DECL_FUNC_PTR(gnome_vfs_mime_application_launch); +DECL_FUNC_PTR(gnome_vfs_mime_application_free); +DECL_FUNC_PTR(gnome_vfs_mime_application_copy); +DECL_FUNC_PTR(gnome_vfs_mime_application_get_name); +DECL_FUNC_PTR(gnome_program_init); +DECL_FUNC_PTR(gnome_program_get); +DECL_FUNC_PTR(libgnome_module_info_get); +DECL_FUNC_PTR(gnome_vfs_make_uri_from_input); + +static PRLibrary * +LoadVersionedLibrary(const char* libName, const char* libVersion) +{ + char *platformLibName = PR_GetLibraryName(nsnull, libName); + nsCAutoString versionLibName(platformLibName); + versionLibName.Append(libVersion); + PR_Free(platformLibName); + return PR_LoadLibrary(versionLibName.get()); +} + +static void +Cleanup() +{ + // Unload all libraries + if (gnomeLib) + PR_UnloadLibrary(gnomeLib); + if (vfsLib) + PR_UnloadLibrary(vfsLib); + + gnomeLib = vfsLib = nsnull; +} + +static void +InitGnomeVFS() +{ + static PRBool initialized = PR_FALSE; + + if (initialized) + return; + + #define ENSURE_LIB(lib) \ + PR_BEGIN_MACRO \ + if (!lib) { \ + Cleanup(); \ + return; \ + } \ + PR_END_MACRO + + #define GET_LIB_FUNCTION(lib, func, failure) \ + PR_BEGIN_MACRO \ + _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \ + if (!_##func) { \ + failure; \ + } \ + PR_END_MACRO + + // Attempt to open libgnome + gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); + ENSURE_LIB(gnomeLib); + + GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup()); + GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup()); + GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup()); + + // Attempt to open libgnomevfs + vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); + ENSURE_LIB(vfsLib); + + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */); + GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup()); + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup()); + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup()); + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup()); + + // Initialize GNOME, if it's not already initialized. It's not + // necessary to tell GNOME about our actual command line arguments. + + if (!_gnome_program_get()) { + char *argv[1] = { "gecko" }; + _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(), + 1, argv, NULL); + } + + // Note: after GNOME has been initialized, do not ever unload these + // libraries. They register atexit handlers, so if they are unloaded, we'll + // crash on exit. +} + +void +nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app) +{ + if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) { + mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app); + + mPreferredAction = nsIMIMEInfo::useSystemDefault; + + const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication); + if (name) + mDefaultAppDescription = NS_ConvertUTF8toUCS2(name); + } +} + +nsMIMEInfoUnix::~nsMIMEInfoUnix() +{ + if (mDefaultVFSApplication) + _gnome_vfs_mime_application_free(mDefaultVFSApplication); +} + +nsresult +nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile) +{ + NS_ENSURE_ARG_POINTER(aFile); + + InitGnomeVFS(); + + if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) { + nsCAutoString nativePath; + aFile->GetNativePath(nativePath); + + gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get()); + + GList *uris = NULL; + uris = g_list_append(uris, uri); + + GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris); + + g_free(uri); + g_list_free(uris); + + if (result != GNOME_VFS_OK) + return NS_ERROR_FAILURE; + + return NS_OK; + } + + if (!mDefaultApplication) + return NS_ERROR_FILE_NOT_FOUND; + + return LaunchWithIProcess(mDefaultApplication, aFile); +} Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h =================================================================== RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ uriloader/exthandler/unix/nsMIMEInfoUnix.h 3 May 2005 18:21:35 -0000 @@ -0,0 +1,48 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org Code. + * + * The Initial Developer of the Original Code is + * Red Hat, Inc. + * Portions created by the Initial Developer are Copyright (C) 2005 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Christopher Aillon (Original author) + * + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef nsMimeInfoUnix_h__ +#define nsMimeInfoUnix_h__ + +#include "nsMIMEInfoImpl.h" + +struct GnomeVFSMimeApplication; + +class nsMIMEInfoUnix : public nsMIMEInfoImpl +{ +public: + nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {} + virtual ~nsMIMEInfoUnix(); + + void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); + +protected: + virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); + + GnomeVFSMimeApplication *mDefaultVFSApplication; +}; + +#endif // nsMimeInfoUnix_h__ Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v retrieving revision 1.50.6.2 diff -d -u -p -r1.50.6.2 nsOSHelperAppService.cpp --- uriloader/exthandler/unix/nsOSHelperAppService.cpp 20 Oct 2004 13:32:38 -0000 1.50.6.2 +++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 3 May 2005 18:21:35 -0000 @@ -27,6 +27,7 @@ #include "nsOSHelperAppService.h" #ifdef MOZ_WIDGET_GTK2 #include "nsGNOMERegistry.h" +#include "nsMIMEInfoUnix.h" #endif #include "nsISupports.h" #include "nsString.h" @@ -1453,6 +1454,17 @@ nsOSHelperAppService::GetFromType(const LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType)); +#ifdef MOZ_WIDGET_GTK2 + // Look in GNOME registry first since it is the preferred method in GNOME, + // should trump the mailcap entry + LOG(("Looking in GNOME registry\n")); + nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get(); + if (gnomeInfo) { + LOG(("Got MIMEInfo from GNOME registry\n")); + return gnomeInfo; + } +#endif + // extract the major and minor types NS_ConvertASCIItoUTF16 mimeType(aMIMEType); nsAString::const_iterator start_iter, end_iter, @@ -1489,21 +1501,6 @@ nsOSHelperAppService::GetFromType(const mozillaFlags, PR_TRUE); - - if (handler.IsEmpty() && extensions.IsEmpty() && - mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) { - // No useful data yet - -#ifdef MOZ_WIDGET_GTK2 - LOG(("Looking in GNOME registry\n")); - nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get(); - if (gnomeInfo) { - LOG(("Got MIMEInfo from GNOME registry\n")); - return gnomeInfo; - } -#endif - } - if (handler.IsEmpty() && mailcap_description.IsEmpty()) { DoLookUpHandlerAndDescription(majorType, minorType, Index: uriloader/exthandler/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v retrieving revision 1.60 diff -d -u -p -r1.60 Makefile.in --- uriloader/exthandler/Makefile.in 2 May 2005 16:30:03 -0000 1.60 +++ uriloader/exthandler/Makefile.in 4 May 2005 05:49:19 -0000 @@ -102,7 +102,7 @@ endif LOCAL_INCLUDES = -I$(srcdir) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -OSHELPER += nsGNOMERegistry.cpp +OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp endif ifeq ($(MOZ_WIDGET_TOOLKIT),beos) Index: thunderbird.sh.in =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.sh.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- thunderbird.sh.in 28 Apr 2005 05:19:56 -0000 1.3 +++ thunderbird.sh.in 4 May 2005 19:43:53 -0000 1.4 @@ -4,8 +4,14 @@ # (based on the Mozilla RPM launch script) # -MOZILLA_FIVE_HOME=TBDIR -MRE_HOME=TBDIR +MOZ_LIB_DIR="/usr/lib" +if [ -x "/usr/lib64/thunderbird-TBIRD_VERSION/thunderbird-bin" ] +then + MOZ_LIB_DIR="/usr/lib64" +fi + +MOZILLA_FIVE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION" +MRE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION" export MOZILLA_FIVE_HOME MRE_HOME MOZ_PROGRAM=$MRE_HOME/thunderbird @@ -17,7 +23,7 @@ ## you may use MOZ_DISABLE_PANGO=1 to force disabling of pango ## #MOZ_DISABLE_PANGO=1 -#export MOZ_DISABLE_PANG +#export MOZ_DISABLE_PANGO function check_running() { $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- thunderbird.spec 28 Apr 2005 05:19:56 -0000 1.29 +++ thunderbird.spec 4 May 2005 19:43:53 -0000 1.30 @@ -8,7 +8,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.0.2 -Release: 2 +Release: 3 Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -25,12 +25,13 @@ Source100: find-external-requires Patch1: thunderbird-0.7.3-freetype-compile.patch -Patch2: firefox-1.0-gcc4-compile.patch -Patch3: firefox-1.0-recv-fortify.patch +Patch2: firefox-1.0-prdtoa.patch +Patch3: firefox-1.0-gcc4-compile.patch +Patch4: firefox-1.0-recv-fortify.patch +Patch5: firefox-1.0-gfxshared_s.patch Patch10: thunderbird-0.7.3-psfonts.patch Patch11: thunderbird-0.7.3-gnome-uriloader.patch -Patch12: firefox-1.0-prdtoa.patch # customization patches Patch24: thunderbird-0.8-default-applications.patch @@ -41,10 +42,13 @@ Patch31: firefox-1.0-pango-selection.patch Patch32: firefox-1.0-pango-space-width.patch Patch33: firefox-1.0-pango-rounding.patch +Patch34: firefox-1.0-pango-direction.patch +Patch35: firefox-1.0-pango-bidi-justify.patch # local bugfixes -Patch40: firefox-PR1-gnome-vfs-default-app.patch Patch41: thunderbird-0.8.0-stack-direction.patch +Patch42: firefox-1.0-download-to-desktop.patch +Patch43: firefox-1.0-uriloader.patch # Backported patches, intended for upstream Patch90: firefox-PR1-gtk-file-chooser-morefixes.patch @@ -91,18 +95,23 @@ %if %{freetype_fc3} %patch1 -p0 -b .freetype %endif -%patch2 -p0 -b .gcc4 -%patch3 -p0 -b .recv-fortify +%patch2 -p0 +%patch3 -p0 -b .gcc4 +%patch4 -p0 -b .recv-fortify +%patch5 -p0 %patch10 -p1 -b .psfonts %patch11 -p1 -b .gnome-uriloader -%patch12 -p0 %patch24 -p1 %patch25 -p1 %patch30 -p1 %patch31 -p1 %patch32 -p1 -%patch40 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p0 %patch41 -p0 +%patch42 -p0 +%patch43 -p0 %patch90 -p0 -b .gtk-file-chooser-morefixes %patch101 -p0 -b .pkgconfig %patch103 -p0 @@ -143,9 +152,10 @@ --add-category Network \ %{SOURCE1} -install -m755 %{SOURCE3} %{buildroot}%{_bindir}/mozilla-thunderbird -perl -pi -e 's|TBDIR|%{tbdir}|g' %{buildroot}%{_bindir}/mozilla-thunderbird -( cd %{buildroot}%{_bindir} ; ln -s mozilla-thunderbird thunderbird ) +# set up the thunderbird start script +%{__cat} %{SOURCE3} | %{__sed} -e 's,TBIRD_VERSION,%{version},g' > \ + $RPM_BUILD_ROOT%{_bindir}/thunderbird +%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/thunderbird install -m755 %{SOURCE6} %{buildroot}%{tbdir}/open-browser.sh perl -pi -e 's|LIBDIR|%{_libdir}|g' %{buildroot}%{tbdir}/open-browser.sh @@ -184,6 +194,14 @@ #=============================================================================== %changelog +* Wed May 4 2005 Christopher Aillon 1.0.2-3 +- Don't have downloads "disappear" when downloading to desktop (#139015) +- Fix for some more cursor issues in textareas (149991, 150002, 152089) +- Add upstream patch to fix bidi justification of pango +- Add patch to fix launching of helper applications +- Add patch to properly link against libgfxshared_s.a +- Fix multilib conflicts + * Wed Apr 27 2005 Warren Togami - correct confusing PANGO vars in startup script From fedora-cvs-commits at redhat.com Wed May 4 20:08:57 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 16:08:57 -0400 Subject: rpms/evolution-connector/devel ximian-connector-2.2.2-noinst-ltlibraries.patch, NONE, 1.1 evolution-connector.spec, 1.25, 1.26 regenerate-patch.sh, 1.4, 1.5 ximian-connector-2.1.4-generated-autotool.patch, 1.3, 1.4 Message-ID: <200505042008.j44K8vRL027101@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-connector/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27081 Modified Files: evolution-connector.spec regenerate-patch.sh ximian-connector-2.1.4-generated-autotool.patch Added Files: ximian-connector-2.2.2-noinst-ltlibraries.patch Log Message: * Wed May 4 2005 David Malcolm - 2.2.2-3 - updated noinst patch: libexchange is now a convenience library again; use -R syntax to express path to Evolution's private libraries rather than -Wl since libtool cannot properly intrepret the latter; regenerated resulting patch. ximian-connector-2.2.2-noinst-ltlibraries.patch: Makefile.am | 4 +--- 1 files changed, 1 insertion(+), 3 deletions(-) --- NEW FILE ximian-connector-2.2.2-noinst-ltlibraries.patch --- --- ximian-connector-2.2.2/lib/Makefile.am.noinst_ltlibraries 2005-04-12 16:37:58.000000000 -0400 +++ ximian-connector-2.2.2/lib/Makefile.am 2005-04-12 16:38:11.000000000 -0400 @@ -9,11 +9,9 @@ -I$(top_srcdir) \ -I$(top_srcdir)/xntlm -EVOLUTION_privlib_LTLIBRARIES = \ +noinst_LTLIBRARIES = \ libexchange.la - - PROP_GENERATED = e2k-propnames.h e2k-propnames.c e2k-proptags.h mapi_properties = $(top_srcdir)/docs/mapi-properties Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- evolution-connector.spec 3 May 2005 03:08:19 -0000 1.25 +++ evolution-connector.spec 4 May 2005 20:08:54 -0000 1.26 @@ -10,7 +10,7 @@ Name: evolution-connector Version: 2.2.2 -Release: 2 +Release: 3 License: GPL Group: Applications/Productivity URL: http://ftp.gnome.org/pub/gnome/sources/ximian-connector/2.1/ @@ -19,7 +19,7 @@ # Patches we apply to the autotool files: Patch0: ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch -#Patch1: ximian-connector-2.2.2-noinst-ltlibraries.patch +Patch1: ximian-connector-2.2.2-noinst-ltlibraries.patch # Patch generated against a pristine source tree after applying the # above patches and then rerunning the autotools. This patch will contain @@ -62,7 +62,7 @@ fi export LIBS %configure --with-openldap=%{_libdir}/evolution-openldap --with-static-ldap -make LDFLAGS="-Wl,-rpath %{plibdir}" +make LDFLAGS="-R %{plibdir}" %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT @@ -91,6 +91,11 @@ %{_datadir}/ximian-connector/%{evo_major}/ui/ximian-connector.xml %changelog +* Wed May 4 2005 David Malcolm - 2.2.2-3 +- updated noinst patch: libexchange is now a convenience library again; use -R +syntax to express path to Evolution's private libraries rather than -Wl since +libtool cannot properly intrepret the latter; regenerated resulting patch. + * Mon May 2 2005 David Malcolm - 2.2.2-2 - disabling noinst patch as not yet applied Index: regenerate-patch.sh =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/regenerate-patch.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- regenerate-patch.sh 3 May 2005 03:03:12 -0000 1.4 +++ regenerate-patch.sh 4 May 2005 20:08:54 -0000 1.5 @@ -2,7 +2,7 @@ BASE_NAME=ximian-connector-2.2.2 TARBALL_NAME=$BASE_NAME.tar.bz2 -INPUT_PATCHES="ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch" +INPUT_PATCHES="ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch ximian-connector-2.2.2-noinst-ltlibraries.patch" OUTPUT_PATCH=ximian-connector-2.1.4-generated-autotool.patch # Ensure we have the tarball: ximian-connector-2.1.4-generated-autotool.patch: Makefile.in | 477 - acinclude.m4 | 22 aclocal.m4 |14807 ++++++++++++++++++++++----------------------- addressbook/Makefile.in | 370 - autom4te.cache |only calendar/Makefile.in | 374 - camel/Makefile.in | 433 - configure | 1802 +++-- docs/Makefile.in | 343 - docs/ietf/Makefile.in | 239 docs/reference/Makefile.in | 274 lib/Makefile.am | 4 lib/Makefile.in | 555 - mail/Makefile.in | 366 - shell/Makefile.in | 450 - storage/Makefile.in | 593 + xntlm/Makefile.in | 362 - 17 files changed, 11558 insertions(+), 9913 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 ximian-connector-2.1.4-generated-autotool.patch Index: ximian-connector-2.1.4-generated-autotool.patch =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/ximian-connector-2.1.4-generated-autotool.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ximian-connector-2.1.4-generated-autotool.patch 3 May 2005 03:03:12 -0000 1.3 +++ ximian-connector-2.1.4-generated-autotool.patch 4 May 2005 20:08:54 -0000 1.4 @@ -1,6 +1,6 @@ diff --recursive -up ximian-connector-2.2.2-pristine/acinclude.m4 ximian-connector-2.2.2-patched/acinclude.m4 --- ximian-connector-2.2.2-pristine/acinclude.m4 2004-08-13 14:16:45.000000000 -0400 -+++ ximian-connector-2.2.2-patched/acinclude.m4 2005-05-02 22:20:38.000000000 -0400 ++++ ximian-connector-2.2.2-patched/acinclude.m4 2005-05-04 15:06:53.000000000 -0400 @@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [ AC_ARG_WITH(openldap, [ --with-openldap=[no/yes/PREFIX] Enable LDAP support in evolution]) AC_ARG_WITH(static-ldap, [ --with-static-ldap=[no/yes] Link LDAP support statically into evolution ]) @@ -54,10 +54,9 @@ else LDAP_LIBS="-lldap $LDAP_LIBS" fi], -Only in ximian-connector-2.2.2-pristine: acinclude.m4.autotool-results diff --recursive -up ximian-connector-2.2.2-pristine/aclocal.m4 ximian-connector-2.2.2-patched/aclocal.m4 --- ximian-connector-2.2.2-pristine/aclocal.m4 2005-04-06 09:16:16.000000000 -0400 -+++ ximian-connector-2.2.2-patched/aclocal.m4 2005-05-02 22:20:46.000000000 -0400 ++++ ximian-connector-2.2.2-patched/aclocal.m4 2005-05-04 15:06:58.000000000 -0400 @@ -1,7 +1,7 @@ -# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- +# generated automatically by aclocal 1.9.5 -*- Autoconf -*- @@ -69,7 +68,7 @@ # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -11,3703 +11,3704 @@ +@@ -11,3703 +11,3760 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @@ -982,6 +981,10 @@ + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; -esac +- +-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-enable_win32_dll=yes, enable_win32_dll=no) + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do @@ -1009,9 +1012,10 @@ +AC_SUBST($1)dnl +]) --AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) --AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], --enable_win32_dll=yes, enable_win32_dll=no) +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], @@ -1019,31 +1023,31 @@ + [USE_NLS=yes + AC_SUBST(USE_NLS) --AC_ARG_ENABLE([libtool-lock], -- [AC_HELP_STRING([--disable-libtool-lock], -- [avoid locking (might break parallel builds)])]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ gt_cv_have_gettext=no - -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default -+ CATOBJEXT=NONE -+ XGETTEXT=: -+ INTLLIBS= ++ gt_cv_have_gettext=no -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" +-# _LT_AC_SYS_COMPILER +-# ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], +-[AC_REQUIRE([AC_PROG_CC])dnl + # + # First check in libc + # @@ -1071,11 +1075,6 @@ + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi --# _LT_AC_SYS_COMPILER --# ------------------- --AC_DEFUN([_LT_AC_SYS_COMPILER], --[AC_REQUIRE([AC_PROG_CC])dnl -- -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} + # @@ -1512,14 +1511,14 @@ - fi -fi -fi - +- -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi -- + -AC_SUBST(ECHO) -])])# _LT_AC_PROG_ECHO_BACKSLASH + warning_flags= @@ -2175,6 +2174,13 @@ -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= +- +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. @@ -2193,17 +2199,15 @@ + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL -- case $host_os in -- beos*) -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ;; - - mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; + +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], @@ -2212,13 +2216,6 @@ +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -- cygwin*) -- lt_cv_dlopen="dlopen" -- lt_cv_dlopen_libs= -- ;; -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], @@ -2228,9 +2225,8 @@ - lt_cv_dlopen_self=yes - ]) - ;; -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+AC_SUBST(LIBTOOL)dnl ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - *) - AC_CHECK_FUNC([shl_load], @@ -2252,20 +2248,26 @@ - ]) - ;; - esac -+# Prevent multiple expansion [...9791 lines suppressed...] dir=''; \ fi; \ -@@ -667,16 +699,18 @@ distdir: $(DISTFILES) +@@ -667,16 +673,15 @@ distdir: $(DISTFILES) fi; \ done $(MAKE) $(AM_MAKEFLAGS) \ @@ -22299,15 +23596,12 @@ - $(mkinstalldirs) $(DESTDIR)$(EVOLUTION_privlibdir) - -install: install-am -+ for dir in "$(DESTDIR)$(EVOLUTION_privlibdir)"; do \ -+ test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am -@@ -687,7 +721,7 @@ install-am: all-am +@@ -687,7 +692,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ @@ -22316,7 +23610,7 @@ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: -@@ -696,7 +730,7 @@ clean-generic: +@@ -696,7 +701,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -22325,14 +23619,13 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -704,18 +738,21 @@ maintainer-clean-generic: +@@ -704,23 +709,26 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-EVOLUTION_privlibLTLIBRARIES clean-generic clean-libtool \ -- clean-noinstPROGRAMS mostlyclean-am -+clean-am: clean-EVOLUTION_privlibLTLIBRARIES clean-generic \ -+ clean-libtool clean-noinstPROGRAMS mostlyclean-am ++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - @@ -22352,7 +23645,13 @@ info: info-am info-am: -@@ -731,7 +768,8 @@ install-man: + +-install-data-am: install-EVOLUTION_privlibLTLIBRARIES ++install-data-am: + + install-exec-am: + +@@ -731,7 +739,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am @@ -22362,10 +23661,11 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -@@ -739,21 +777,29 @@ mostlyclean: mostlyclean-am +@@ -739,21 +748,27 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool +-uninstall-am: uninstall-EVOLUTION_privlibLTLIBRARIES uninstall-info-am +pdf: pdf-am + +pdf-am: @@ -22374,41 +23674,34 @@ + +ps-am: + - uninstall-am: uninstall-EVOLUTION_privlibLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-info-am -.PHONY: GTAGS all all-am check check-am clean \ -+.PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-EVOLUTION_privlibLTLIBRARIES clean-generic clean-libtool \ +- clean-EVOLUTION_privlibLTLIBRARIES clean-generic clean-libtool \ - clean-noinstPROGRAMS distclean distclean-compile \ - distclean-depend distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-EVOLUTION_privlibLTLIBRARIES install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -+ clean-noinstPROGRAMS ctags dist-hook distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-EVOLUTION_privlibLTLIBRARIES install-am \ -+ install-data install-data-am install-exec install-exec-am \ -+ install-info install-info-am install-man install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ ++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ ++ ctags dist-hook distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool tags uninstall \ - uninstall-EVOLUTION_privlibLTLIBRARIES uninstall-am \ - uninstall-info-am + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-EVOLUTION_privlibLTLIBRARIES \ -+ uninstall-am uninstall-info-am ++ tags uninstall uninstall-am uninstall-info-am e2k-propnames.h: $(e2k_propnames_h_in) $(mapi_properties) -Only in ximian-connector-2.2.2-pristine: libtool -Only in ximian-connector-2.2.2-pristine/mail: .deps -Only in ximian-connector-2.2.2-pristine/mail: Makefile diff --recursive -up ximian-connector-2.2.2-pristine/mail/Makefile.in ximian-connector-2.2.2-patched/mail/Makefile.in --- ximian-connector-2.2.2-pristine/mail/Makefile.in 2005-04-06 09:16:33.000000000 -0400 -+++ ximian-connector-2.2.2-patched/mail/Makefile.in 2005-05-02 22:20:56.000000000 -0400 ++++ ximian-connector-2.2.2-patched/mail/Makefile.in 2005-05-04 15:07:08.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. @@ -23025,10 +24318,9 @@ uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. -Only in ximian-connector-2.2.2-pristine: Makefile diff --recursive -up ximian-connector-2.2.2-pristine/Makefile.in ximian-connector-2.2.2-patched/Makefile.in --- ximian-connector-2.2.2-pristine/Makefile.in 2005-04-06 09:16:31.000000000 -0400 -+++ ximian-connector-2.2.2-patched/Makefile.in 2005-05-02 22:20:57.000000000 -0400 ++++ ximian-connector-2.2.2-patched/Makefile.in 2005-05-04 15:07:09.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. @@ -23820,14 +25112,9 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -Only in ximian-connector-2.2.2-pristine/po: Makefile -Only in ximian-connector-2.2.2-pristine/po: Makefile.in -Only in ximian-connector-2.2.2-pristine/po: POTFILES -Only in ximian-connector-2.2.2-pristine/shell: .deps -Only in ximian-connector-2.2.2-pristine/shell: Makefile diff --recursive -up ximian-connector-2.2.2-pristine/shell/Makefile.in ximian-connector-2.2.2-patched/shell/Makefile.in --- ximian-connector-2.2.2-pristine/shell/Makefile.in 2005-04-06 09:16:33.000000000 -0400 -+++ ximian-connector-2.2.2-patched/shell/Makefile.in 2005-05-02 22:20:57.000000000 -0400 ++++ ximian-connector-2.2.2-patched/shell/Makefile.in 2005-05-04 15:07:08.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. @@ -24569,12 +25856,9 @@ e-shell-marshal.h: e-shell-marshal.list -Only in ximian-connector-2.2.2-pristine: stamp-h1 -Only in ximian-connector-2.2.2-pristine/storage: .deps -Only in ximian-connector-2.2.2-pristine/storage: Makefile diff --recursive -up ximian-connector-2.2.2-pristine/storage/Makefile.in ximian-connector-2.2.2-patched/storage/Makefile.in --- ximian-connector-2.2.2-pristine/storage/Makefile.in 2005-04-06 09:16:34.000000000 -0400 -+++ ximian-connector-2.2.2-patched/storage/Makefile.in 2005-05-02 22:20:57.000000000 -0400 ++++ ximian-connector-2.2.2-patched/storage/Makefile.in 2005-05-04 15:07:09.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. @@ -25531,13 +26815,9 @@ install-exec-local: ximian-connector-setup -Only in ximian-connector-2.2.2-pristine/xntlm: .deps -Only in ximian-connector-2.2.2-pristine/xntlm: .libs -Only in ximian-connector-2.2.2-pristine/xntlm: libxntlm.la -Only in ximian-connector-2.2.2-pristine/xntlm: Makefile diff --recursive -up ximian-connector-2.2.2-pristine/xntlm/Makefile.in ximian-connector-2.2.2-patched/xntlm/Makefile.in --- ximian-connector-2.2.2-pristine/xntlm/Makefile.in 2005-04-06 09:16:34.000000000 -0400 -+++ ximian-connector-2.2.2-patched/xntlm/Makefile.in 2005-05-02 22:20:57.000000000 -0400 ++++ ximian-connector-2.2.2-patched/xntlm/Makefile.in 2005-05-04 15:07:09.000000000 -0400 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. @@ -26145,9 +27425,3 @@ uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. -Only in ximian-connector-2.2.2-pristine/xntlm: xntlm-des.lo -Only in ximian-connector-2.2.2-pristine/xntlm: xntlm-des.o -Only in ximian-connector-2.2.2-pristine/xntlm: xntlm.lo -Only in ximian-connector-2.2.2-pristine/xntlm: xntlm-md4.lo -Only in ximian-connector-2.2.2-pristine/xntlm: xntlm-md4.o -Only in ximian-connector-2.2.2-pristine/xntlm: xntlm.o From fedora-cvs-commits at redhat.com Wed May 4 20:24:34 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 16:24:34 -0400 Subject: rpms/thunderbird/devel thunderbird.spec,1.30,1.31 Message-ID: <200505042024.j44KOYn7012470@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12071 Modified Files: thunderbird.spec Log Message: no longer using mozilla-thunderbird Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- thunderbird.spec 4 May 2005 19:43:53 -0000 1.30 +++ thunderbird.spec 4 May 2005 20:24:32 -0000 1.31 @@ -184,7 +184,6 @@ %files %defattr(-,root,root,-) -%attr(755,root,root) %{_bindir}/mozilla-thunderbird %attr(755,root,root) %{_bindir}/thunderbird %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop %attr(644,root,root) %{_datadir}/pixmaps/thunderbird-icon.png From fedora-cvs-commits at redhat.com Wed May 4 20:34:44 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 16:34:44 -0400 Subject: rpms/mozilla/devel firefox-1.0-pango-bidi-justify.patch, NONE, 1.1 firefox-1.0-pango-direction.patch, NONE, 1.1 firefox-1.0-uriloader.patch, NONE, 1.1 mozilla.spec, 1.60, 1.61 Message-ID: <200505042034.j44KYivZ024750@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/mozilla/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24732 Modified Files: mozilla.spec Added Files: firefox-1.0-pango-bidi-justify.patch firefox-1.0-pango-direction.patch firefox-1.0-uriloader.patch Log Message: * Wed May 4 2005 Christopher Aillon 37:1.7.7-3 - Fix for some more cursor issues in textareas - Add upstream patch to fix bidi justification of pango - Add patch to fix launching of helper applications firefox-1.0-pango-bidi-justify.patch: gfx/public/nsIRenderingContext.h | 8 +++ gfx/src/gtk/nsFontMetricsPango.cpp | 3 - layout/html/base/src/nsTextFrame.cpp | 86 ++++++++++++++++++++++++++--------- 3 files changed, 75 insertions(+), 22 deletions(-) --- NEW FILE firefox-1.0-pango-bidi-justify.patch --- --- ./layout/html/base/src/nsTextFrame.cpp.SCREW 2005-05-03 15:53:09.000000000 -0400 +++ ./layout/html/base/src/nsTextFrame.cpp 2005-05-03 16:45:25.000000000 -0400 @@ -2967,12 +2967,21 @@ if (0 != textLength) { #ifdef IBMBIDI + PRBool isRightToLeftOnBidiPlatform = PR_FALSE; + PRBool isBidiSystem = PR_FALSE; + PRUint32 hints = 0; + aRenderingContext.GetHints(hints); + PRBool paintCharByChar = (0 == (hints & NS_RENDERING_HINT_REORDER_SPACED_TEXT)) && + ((0 != aTextStyle.mLetterSpacing) || + (0 != aTextStyle.mWordSpacing) || + aTextStyle.mJustifying); PRBool bidiEnabled; PRUint8 level = 0; nsCharType charType = eCharType_LeftToRight; aPresContext->GetBidiEnabled(&bidiEnabled); if (bidiEnabled) { + isBidiSystem = aPresContext->IsBidiSystem(); nsBidiPresUtils* bidiUtils; aPresContext->GetBidiUtils(&bidiUtils); @@ -2985,8 +2994,19 @@ PRInt32 rememberTextLength = textLength; #endif // Since we paint char by char, handle the text like on non-bidi platform + isRightToLeftOnBidiPlatform = (!paintCharByChar && + isBidiSystem && + (eCharType_RightToLeft == charType || + eCharType_RightToLeftArabic == charType)); + if (isRightToLeftOnBidiPlatform) { + // indicate that the platform should use its native + // capabilities to reorder the text with right-to-left + // base direction + aRenderingContext.SetRightToLeftText(PR_TRUE); + } + // If we will be painting char by char, handle the text like on non-bidi platform bidiUtils->ReorderUnicodeText(text, textLength, charType, - level & 1, PR_FALSE); + level & 1, (paintCharByChar) ? PR_FALSE : isBidiSystem); NS_ASSERTION(rememberTextLength == textLength, "Bidi formatting changed text length"); } } @@ -3028,7 +3048,9 @@ sdptr->mStart = ip[sdptr->mStart] - mContentOffset; sdptr->mEnd = ip[sdptr->mEnd] - mContentOffset; #ifdef IBMBIDI - AdjustSelectionPointsForBidi(sdptr, textLength, CHARTYPE_IS_RTL(charType), level & 1, PR_FALSE); + AdjustSelectionPointsForBidi(sdptr, textLength, + CHARTYPE_IS_RTL(charType), level & 1, + (paintCharByChar) ? PR_FALSE : isBidiSystem); #endif sdptr = sdptr->mNext; } @@ -3036,19 +3058,32 @@ DrawSelectionIterator iter(content, details,text,(PRUint32)textLength,aTextStyle, selectionValue, aPresContext, mStyleContext); if (!iter.IsDone() && iter.First()) { - nscoord currentX = dx; - nsTextDimensions newDimensions;//temp - while (!iter.IsDone()) - { - PRUnichar *currenttext = iter.CurrentTextUnicharPtr(); - PRUint32 currentlength= iter.CurrentLength(); - //TextStyle ¤tStyle = iter.CurrentStyle(); - nscolor currentFGColor = iter.CurrentForeGroundColor(); - nscolor currentBKColor; - PRBool isCurrentBKColorTransparent; - GetTextDimensions(aRenderingContext,aTextStyle,currenttext, (PRInt32)currentlength,&newDimensions); - if (newDimensions.width) - { + nscoord currentX = dx; + nsTextDimensions newDimensions;//temp +#ifdef IBMBIDI // Simon - display substrings RTL in RTL frame + if (isRightToLeftOnBidiPlatform) + { + nsTextDimensions frameDimensions; + GetTextDimensions(aRenderingContext, aTextStyle, text, + (PRInt32)textLength, &frameDimensions); + currentX = dx + frameDimensions.width; + } +#endif + while (!iter.IsDone()) + { + PRUnichar *currenttext = iter.CurrentTextUnicharPtr(); + PRUint32 currentlength= iter.CurrentLength(); + //TextStyle ¤tStyle = iter.CurrentStyle(); + nscolor currentFGColor = iter.CurrentForeGroundColor(); + nscolor currentBKColor; + PRBool isCurrentBKColorTransparent; + GetTextDimensions(aRenderingContext,aTextStyle,currenttext, (PRInt32)currentlength,&newDimensions); + if (newDimensions.width) + { +#ifdef IBMBIDI + if (isRightToLeftOnBidiPlatform) + currentX -= newDimensions.width; +#endif if (iter.CurrentBackGroundColor(currentBKColor, &isCurrentBKColorTransparent)) {//DRAW RECT HERE!!! if (!isCurrentBKColorTransparent) { @@ -3057,7 +3092,7 @@ } currentFGColor = EnsureDifferentColors(currentFGColor, currentBKColor); } - } + } if (isPaginated && !iter.IsBeforeOrAfter()) { aRenderingContext.SetColor(nsCSSRendering::TransformColor(aTextStyle.mColor->mColor,canDarkenColor)); @@ -3071,11 +3106,13 @@ dy, width, details); } +#ifdef IBMBIDI + if (!isRightToLeftOnBidiPlatform) +#endif //increment twips X start but remember to get ready for next draw by reducing current x by letter spacing amount - currentX+=newDimensions.width;// + aTextStyle.mLetterSpacing; - - iter.Next(); - } + currentX+=newDimensions.width;// + aTextStyle.mLetterSpacing; + iter.Next(); + } } else if (!isPaginated) { @@ -3093,8 +3130,15 @@ delete details; } } +#ifdef IBMBIDI + if (isRightToLeftOnBidiPlatform) { + // indicate that future text should not be reordered with + // right-to-left base direction + aRenderingContext.SetRightToLeftText(PR_FALSE); + } +#endif // IBMBIDI } -} +} void nsTextFrame::PaintAsciiText(nsIPresContext* aPresContext, --- ./gfx/public/nsIRenderingContext.h.SCREW 2005-05-03 15:53:09.000000000 -0400 +++ ./gfx/public/nsIRenderingContext.h 2005-05-03 15:53:09.000000000 -0400 @@ -932,6 +932,14 @@ */ #define NS_RENDERING_HINT_TEXT_CLUSTERS 0x20 +/** + * This bit, when set, indicates that gfx performs glyph reordering of complex + * text after applying character or word spacing, and so expects to be passed + * text in logical order. When this bit is not set, gfx must be passed text in + * visual order if characters and word spacing are to be applied. + */ +#define NS_RENDERING_HINT_REORDER_SPACED_TEXT 0x40 + //flags for copy CopyOffScreenBits //when performing the blit, use the region, if any, --- ./gfx/src/gtk/nsFontMetricsPango.cpp.SCREW 2005-05-03 15:53:09.000000000 -0400 +++ ./gfx/src/gtk/nsFontMetricsPango.cpp 2005-05-03 15:53:09.000000000 -0400 @@ -1138,7 +1138,8 @@ return (NS_RENDERING_HINT_BIDI_REORDERING | NS_RENDERING_HINT_ARABIC_SHAPING | NS_RENDERING_HINT_FAST_MEASURE | - NS_RENDERING_HINT_TEXT_CLUSTERS); + NS_RENDERING_HINT_TEXT_CLUSTERS | + NS_RENDERING_HINT_REORDER_SPACED_TEXT); } /* static */ firefox-1.0-pango-direction.patch: nsFontMetricsPango.cpp | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE firefox-1.0-pango-direction.patch --- --- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.foo 2005-03-28 14:20:47.000000000 -0500 +++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2005-03-28 14:23:45.000000000 -0500 @@ -1258,6 +1258,10 @@ mLTRPangoContext = pango_xft_get_context(GDK_DISPLAY(), 0); mPangoContext = mLTRPangoContext; + // Make sure that this is set LTR - RTL text will be set using the + // RTL context. + pango_context_set_base_dir(mPangoContext, PANGO_DIRECTION_LTR); + // Set the color map so we can draw later. gdk_pango_context_set_colormap(mPangoContext, gdk_rgb_get_cmap()); firefox-1.0-uriloader.patch: Makefile.in | 2 unix/nsGNOMERegistry.cpp | 27 ++++- unix/nsGNOMERegistry.h | 11 +- unix/nsMIMEInfoUnix.cpp | 196 ++++++++++++++++++++++++++++++++++++++++++ unix/nsMIMEInfoUnix.h | 48 ++++++++++ unix/nsOSHelperAppService.cpp | 27 ++--- 6 files changed, 284 insertions(+), 27 deletions(-) --- NEW FILE firefox-1.0-uriloader.patch --- Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v retrieving revision 1.8 diff -d -u -p -r1.8 nsGNOMERegistry.cpp --- uriloader/exthandler/unix/nsGNOMERegistry.cpp 6 Mar 2004 14:41:00 -0000 1.8 +++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 3 May 2005 19:09:20 -0000 @@ -42,7 +42,7 @@ #include "nsString.h" #include "nsIComponentManager.h" #include "nsILocalFile.h" -#include "nsMIMEInfoImpl.h" +#include "nsMIMEInfoUnix.h" #include "nsAutoPtr.h" #include @@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient; typedef struct _GnomeProgram GnomeProgram; typedef struct _GnomeModuleInfo GnomeModuleInfo; -typedef struct { +struct GnomeVFSMimeApplication { char *id; char *name; char *command; /* there is more here, but we don't need it */ -} GnomeVFSMimeApplication; +}; typedef GConfClient * (*_gconf_client_get_default_fn)(); typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *, @@ -231,7 +231,7 @@ nsGNOMERegistry::LoadURL(nsIURI *aURL) return NS_ERROR_FAILURE; } -/* static */ already_AddRefed +/* static */ already_AddRefed nsGNOMERegistry::GetFromExtension(const char *aFileExt) { if (!gconfLib) @@ -253,7 +253,7 @@ nsGNOMERegistry::GetFromExtension(const return GetFromType(mimeType); } -/* static */ already_AddRefed +/* static */ already_AddRefed nsGNOMERegistry::GetFromType(const char *aMIMEType) { if (!gconfLib) @@ -263,10 +263,11 @@ nsGNOMERegistry::GetFromType(const char if (!handlerApp) return nsnull; - nsRefPtr mimeInfo = new nsMIMEInfoImpl(); + nsRefPtr mimeInfo = new nsMIMEInfoUnix(); NS_ENSURE_TRUE(mimeInfo, nsnull); mimeInfo->SetMIMEType(aMIMEType); + mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp); // Get the list of extensions and append then to the mimeInfo. GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType); @@ -289,11 +290,21 @@ nsGNOMERegistry::GetFromType(const char return nsnull; } - gchar *commandPath = g_find_program_in_path(nativeCommand); + gchar **argv; + gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL); + if (!res) { + NS_ERROR("Could not convert helper app command to filesystem encoding"); + _gnome_vfs_mime_application_free(handlerApp); + return nsnull; + } + + gchar *commandPath = g_find_program_in_path(argv[0]); g_free(nativeCommand); + g_strfreev(argv); if (!commandPath) { + NS_WARNING("could not find command in path"); _gnome_vfs_mime_application_free(handlerApp); return nsnull; } @@ -311,7 +322,7 @@ nsGNOMERegistry::GetFromType(const char _gnome_vfs_mime_application_free(handlerApp); - nsMIMEInfoBase* retval; + nsMIMEInfoUnix* retval; NS_ADDREF((retval = mimeInfo)); return retval; } Index: uriloader/exthandler/unix/nsGNOMERegistry.h =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v retrieving revision 1.2 diff -d -u -p -r1.2 nsGNOMERegistry.h --- uriloader/exthandler/unix/nsGNOMERegistry.h 23 Feb 2004 22:49:27 -0000 1.2 +++ uriloader/exthandler/unix/nsGNOMERegistry.h 3 May 2005 18:21:35 -0000 @@ -35,10 +35,13 @@ * * ***** END LICENSE BLOCK ***** */ +#ifndef nsGNOMERegistry_h__ +#define nsGNOMERegistry_h__ + #include "nsIURI.h" #include "nsCOMPtr.h" -class nsMIMEInfoBase; +class nsMIMEInfoUnix; class nsGNOMERegistry { @@ -49,7 +52,9 @@ class nsGNOMERegistry static nsresult LoadURL(nsIURI *aURL); - static already_AddRefed GetFromExtension(const char *aFileExt); + static already_AddRefed GetFromExtension(const char *aFileExt); - static already_AddRefed GetFromType(const char *aMIMEType); + static already_AddRefed GetFromType(const char *aMIMEType); }; + +#endif // nsGNOMERegistry_h__ Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp =================================================================== RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 3 May 2005 18:21:35 -0000 @@ -0,0 +1,196 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org Code. + * + * The Initial Developer of the Original Code is + * Red Hat, Inc. + * Portions created by the Initial Developer are Copyright (C) 2005 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Christopher Aillon (Original author) + * + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsMIMEInfoUnix.h" +#include "prlink.h" +#include "prmem.h" +#include +#include + +static PRLibrary *gnomeLib; +static PRLibrary *vfsLib; + +typedef struct _GnomeProgram GnomeProgram; +typedef struct _GnomeModuleInfo GnomeModuleInfo; + +typedef enum { + GNOME_VFS_OK // there's more but we don't care about them. +} GnomeVFSResult; + +typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn) + (GnomeVFSMimeApplication *app, + GList *uris); +typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *); +typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *); +typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *, + const GnomeModuleInfo *, int, + char **, const char *, ...); +typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *); +typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)(); +typedef GnomeProgram * (*_gnome_program_get_fn)(); +typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *); + +#define DECL_FUNC_PTR(func) static _##func##_fn _##func + +DECL_FUNC_PTR(gnome_vfs_mime_application_launch); +DECL_FUNC_PTR(gnome_vfs_mime_application_free); +DECL_FUNC_PTR(gnome_vfs_mime_application_copy); +DECL_FUNC_PTR(gnome_vfs_mime_application_get_name); +DECL_FUNC_PTR(gnome_program_init); +DECL_FUNC_PTR(gnome_program_get); +DECL_FUNC_PTR(libgnome_module_info_get); +DECL_FUNC_PTR(gnome_vfs_make_uri_from_input); + +static PRLibrary * +LoadVersionedLibrary(const char* libName, const char* libVersion) +{ + char *platformLibName = PR_GetLibraryName(nsnull, libName); + nsCAutoString versionLibName(platformLibName); + versionLibName.Append(libVersion); + PR_Free(platformLibName); + return PR_LoadLibrary(versionLibName.get()); +} + +static void +Cleanup() +{ + // Unload all libraries + if (gnomeLib) + PR_UnloadLibrary(gnomeLib); + if (vfsLib) + PR_UnloadLibrary(vfsLib); + + gnomeLib = vfsLib = nsnull; +} + +static void +InitGnomeVFS() +{ + static PRBool initialized = PR_FALSE; + + if (initialized) + return; + + #define ENSURE_LIB(lib) \ + PR_BEGIN_MACRO \ + if (!lib) { \ + Cleanup(); \ + return; \ + } \ + PR_END_MACRO + + #define GET_LIB_FUNCTION(lib, func, failure) \ + PR_BEGIN_MACRO \ + _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \ + if (!_##func) { \ + failure; \ + } \ + PR_END_MACRO + + // Attempt to open libgnome + gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); + ENSURE_LIB(gnomeLib); + + GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup()); + GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup()); + GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup()); + + // Attempt to open libgnomevfs + vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); + ENSURE_LIB(vfsLib); + + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */); + GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup()); + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup()); + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup()); + GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup()); + + // Initialize GNOME, if it's not already initialized. It's not + // necessary to tell GNOME about our actual command line arguments. + + if (!_gnome_program_get()) { + char *argv[1] = { "gecko" }; + _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(), + 1, argv, NULL); + } + + // Note: after GNOME has been initialized, do not ever unload these + // libraries. They register atexit handlers, so if they are unloaded, we'll + // crash on exit. +} + +void +nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app) +{ + if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) { + mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app); + + mPreferredAction = nsIMIMEInfo::useSystemDefault; + + const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication); + if (name) + mDefaultAppDescription = NS_ConvertUTF8toUCS2(name); + } +} + +nsMIMEInfoUnix::~nsMIMEInfoUnix() +{ + if (mDefaultVFSApplication) + _gnome_vfs_mime_application_free(mDefaultVFSApplication); +} + +nsresult +nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile) +{ + NS_ENSURE_ARG_POINTER(aFile); + + InitGnomeVFS(); + + if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) { + nsCAutoString nativePath; + aFile->GetNativePath(nativePath); + + gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get()); + + GList *uris = NULL; + uris = g_list_append(uris, uri); + + GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris); + + g_free(uri); + g_list_free(uris); + + if (result != GNOME_VFS_OK) + return NS_ERROR_FAILURE; + + return NS_OK; + } + + if (!mDefaultApplication) + return NS_ERROR_FILE_NOT_FOUND; + + return LaunchWithIProcess(mDefaultApplication, aFile); +} Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h =================================================================== RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ uriloader/exthandler/unix/nsMIMEInfoUnix.h 3 May 2005 18:21:35 -0000 @@ -0,0 +1,48 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org Code. + * + * The Initial Developer of the Original Code is + * Red Hat, Inc. + * Portions created by the Initial Developer are Copyright (C) 2005 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Christopher Aillon (Original author) + * + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef nsMimeInfoUnix_h__ +#define nsMimeInfoUnix_h__ + +#include "nsMIMEInfoImpl.h" + +struct GnomeVFSMimeApplication; + +class nsMIMEInfoUnix : public nsMIMEInfoImpl +{ +public: + nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {} + virtual ~nsMIMEInfoUnix(); + + void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); + +protected: + virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); + + GnomeVFSMimeApplication *mDefaultVFSApplication; +}; + +#endif // nsMimeInfoUnix_h__ Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v retrieving revision 1.50.6.2 diff -d -u -p -r1.50.6.2 nsOSHelperAppService.cpp --- uriloader/exthandler/unix/nsOSHelperAppService.cpp 20 Oct 2004 13:32:38 -0000 1.50.6.2 +++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 3 May 2005 18:21:35 -0000 @@ -27,6 +27,7 @@ #include "nsOSHelperAppService.h" #ifdef MOZ_WIDGET_GTK2 #include "nsGNOMERegistry.h" +#include "nsMIMEInfoUnix.h" #endif #include "nsISupports.h" #include "nsString.h" @@ -1453,6 +1454,17 @@ nsOSHelperAppService::GetFromType(const LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType)); +#ifdef MOZ_WIDGET_GTK2 + // Look in GNOME registry first since it is the preferred method in GNOME, + // should trump the mailcap entry + LOG(("Looking in GNOME registry\n")); + nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get(); + if (gnomeInfo) { + LOG(("Got MIMEInfo from GNOME registry\n")); + return gnomeInfo; + } +#endif + // extract the major and minor types NS_ConvertASCIItoUTF16 mimeType(aMIMEType); nsAString::const_iterator start_iter, end_iter, @@ -1489,21 +1501,6 @@ nsOSHelperAppService::GetFromType(const mozillaFlags, PR_TRUE); - - if (handler.IsEmpty() && extensions.IsEmpty() && - mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) { - // No useful data yet - -#ifdef MOZ_WIDGET_GTK2 - LOG(("Looking in GNOME registry\n")); - nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get(); - if (gnomeInfo) { - LOG(("Got MIMEInfo from GNOME registry\n")); - return gnomeInfo; - } -#endif - } - if (handler.IsEmpty() && mailcap_description.IsEmpty()) { DoLookUpHandlerAndDescription(majorType, minorType, Index: uriloader/exthandler/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v retrieving revision 1.60 diff -d -u -p -r1.60 Makefile.in --- uriloader/exthandler/Makefile.in 2 May 2005 16:30:03 -0000 1.60 +++ uriloader/exthandler/Makefile.in 4 May 2005 05:49:19 -0000 @@ -102,7 +102,7 @@ endif LOCAL_INCLUDES = -I$(srcdir) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -OSHELPER += nsGNOMERegistry.cpp +OSHELPER += nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp endif ifeq ($(MOZ_WIDGET_TOOLKIT),beos) Index: mozilla.spec =================================================================== RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- mozilla.spec 3 May 2005 20:07:54 -0000 1.60 +++ mozilla.spec 4 May 2005 20:34:42 -0000 1.61 @@ -9,7 +9,7 @@ Name: mozilla Summary: Web browser and mail reader Version: 1.7.7 -Release: 2 +Release: 3 Epoch: 37 License: MPL/NPL/GPL/LGPL Source0: mozilla-source-%{version}.tar.bz2 @@ -40,17 +40,17 @@ Patch21: mozilla-default-plugin-less-annoying.patch Patch22: mozilla-1.7-psfonts.patch - Patch25: mozilla-nspr-packages.patch Patch26: mozilla-1.6-gnome-uriloader.patch Patch27: mozilla-1.4.1-ppc64.patch Patch28: mozilla-1.6-frameload.patch - Patch30: mozilla-1.7.3-pango-render.patch Patch31: firefox-1.0-pango-selection.patch Patch32: firefox-1.0-pango-space-width.patch Patch33: firefox-1.0-pango-rounding.patch +Patch34: firefox-1.0-pango-direction.patch +Patch35: firefox-1.0-pango-bidi-justify.patch Patch91: mozilla-1.7.3-gtk-file-chooser-trunk.patch Patch92: mozilla-1.7.3-gtk-file-chooser-updates.patch @@ -62,7 +62,7 @@ Patch103: firefox-1.0-gtk-system-colors.patch Patch104: mozilla-1.7.5-g-application-name.patch Patch105: firefox-1.0-remote-intern-atoms.patch - +Patch106: firefox-1.0-uriloader.patch Buildroot: %{_tmppath}/%{name}-root Prefix: /usr @@ -197,6 +197,8 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 +%patch35 -p0 # GTK+ File Chooser %patch91 -p0 @@ -211,6 +213,7 @@ %patch103 -p0 %patch104 -p0 %patch105 -p0 +%patch106 -p0 # set up our default bookmarks /bin/cp %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html @@ -771,6 +774,11 @@ %{mozdir}/xpt_link %changelog +* Wed May 4 2005 Christopher Aillon 37:1.7.7-3 +- Fix for some more cursor issues in textareas (149991, 150002, 152089) +- Add upstream patch to fix bidi justification of pango +- Add patch to fix launching of helper applications + * Tue May 3 2005 Christopher Aillon - Add patch from Marcel Mol supporting launching with filenames containing whitespace From fedora-cvs-commits at redhat.com Wed May 4 20:35:45 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 16:35:45 -0400 Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.28,1.29 Message-ID: <200505042035.j44KZj0i024827@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24811 Modified Files: gnome-desktop.spec Log Message: rev release Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gnome-desktop.spec 4 May 2005 18:09:17 -0000 1.28 +++ gnome-desktop.spec 4 May 2005 20:35:41 -0000 1.29 @@ -11,7 +11,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc. Name: gnome-desktop Version: 2.10.0 -Release: 1 +Release: 2 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2 Source1: %{name}-2.8.0-extrapo.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 4 23:13:11 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 19:13:11 -0400 Subject: rpms/openldap/devel .cvsignore, 1.16, 1.17 openldap.spec, 1.34, 1.35 sources, 1.17, 1.18 Message-ID: <200505042313.j44NDBqc011732@cvs.devel.redhat.com> Author: nalin Update of /cvs/dist/rpms/openldap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11717 Modified Files: .cvsignore openldap.spec sources Log Message: update to 2.2.26 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 1 Feb 2005 00:19:35 -0000 1.16 +++ .cvsignore 4 May 2005 23:13:09 -0000 1.17 @@ -10,3 +10,6 @@ openldap-2.2.20.tgz db-4.3.27.tar.gz openldap-2.2.23.tgz +openldap-2.2.24.tgz +openldap-2.2.25.tgz +openldap-2.2.26.tgz Index: openldap.spec =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- openldap.spec 27 Apr 2005 00:07:44 -0000 1.34 +++ openldap.spec 4 May 2005 23:13:09 -0000 1.35 @@ -3,7 +3,7 @@ %define ldbm_backend berkeley %define version_20 2.0.27 %define version_21 2.1.30 -%define version_22 2.2.24 +%define version_22 2.2.26 %define nss_ldap_prefix %{_libdir}/nss_ldap-openldap %define nss_ldap_includedir %{nss_ldap_prefix}/include %define nss_ldap_libdir %{nss_ldap_prefix}/%{_lib} @@ -346,6 +346,7 @@ --enable-cleartext \ --enable-crypt \ --enable-spasswd \ + --enable-lmpasswd \ --enable-modules \ --disable-sql \ \ @@ -708,6 +709,13 @@ %endif %changelog +* Wed May 4 2005 Nalin Dahyabhai 2.2.26-1 +- update to 2.2.26 (stable 20050429) +- enable the lmpasswd scheme + +* Tue Apr 26 2005 Nalin Dahyabhai 2.2.25-1 +- update to 2.2.25 (release) + * Tue Apr 26 2005 Nalin Dahyabhai 2.2.24-1 - update to 2.2.24 (stable 20050318) - export KRB5_KTNAME in the init script, in case it was set in the sysconfig Index: sources =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 27 Apr 2005 00:24:23 -0000 1.17 +++ sources 4 May 2005 23:13:09 -0000 1.18 @@ -4,5 +4,4 @@ a1e6508c471dd47205a3492cf57110a6 openldap-2.0.27.tgz e2ae8148c4bed07d7a70edd930bdc403 openldap-2.1.30.tgz fcc481d52c3b80e20a328f8c0cb042bd db-4.3.27.tar.gz -383691dbabe05ee2b72a3e9db2042a82 openldap-2.2.24.tgz -866c685ae21148ef0db810cd049a1cab openldap-2.2.25.tgz +afc8700b5738da863b30208e1d3e9de8 openldap-2.2.26.tgz From fedora-cvs-commits at redhat.com Wed May 4 23:37:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 19:37:59 -0400 Subject: rpms/openldap/devel ldap.init,1.12,1.13 openldap.spec,1.35,1.36 Message-ID: <200505042337.j44NbxpI008750@cvs.devel.redhat.com> Author: nalin Update of /cvs/dist/rpms/openldap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8737 Modified Files: ldap.init openldap.spec Log Message: - print a warning if slaptest fails, slaptest -u succeeds, and one of the directories listed as the storage location for a given suffix in slapd.conf contains a readable file named __db.001 (#118678) Index: ldap.init =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/ldap.init,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ldap.init 27 Apr 2005 00:10:58 -0000 1.12 +++ ldap.init 4 May 2005 23:37:57 -0000 1.13 @@ -112,7 +112,17 @@ fi done # Check the configuration file. - action "Checking configuration files for $prog: " $slaptest || exit 1 + if ! action $"Checking configuration files for $prog: " $slaptest ; then + if $slaptest -u > /dev/null 2> /dev/null ; then + dirs=`LANG=C egrep '^directory[[:space:]]+[[:print:]]+$' /etc/openldap/slapd.conf | awk '{print $2}'` + for directory in $dirs ; do + if test -r $directory/__db.001 ; then + echo -n $"stale lock files may be present in $directory" ; warning ; echo + fi + done + fi + exit 1 + fi } function start() { Index: openldap.spec =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- openldap.spec 4 May 2005 23:13:09 -0000 1.35 +++ openldap.spec 4 May 2005 23:37:57 -0000 1.36 @@ -712,6 +712,9 @@ * Wed May 4 2005 Nalin Dahyabhai 2.2.26-1 - update to 2.2.26 (stable 20050429) - enable the lmpasswd scheme +- print a warning if slaptest fails, slaptest -u succeeds, and one of the + directories listed as the storage location for a given suffix in slapd.conf + contains a readable file named __db.001 (#118678) * Tue Apr 26 2005 Nalin Dahyabhai 2.2.25-1 - update to 2.2.25 (release) From fedora-cvs-commits at redhat.com Thu May 5 01:59:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 21:59:00 -0400 Subject: rpms/eclipse/devel eclipse.spec,1.121,1.122 Message-ID: <200505050159.j451x0VN026740@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26728 Modified Files: eclipse.spec Log Message: - Re-enable jdt.ui/jdt.jar.so and require gcj 4.0.0-2 (rh#151296). Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- eclipse.spec 2 May 2005 21:22:29 -0000 1.121 +++ eclipse.spec 5 May 2005 01:58:58 -0000 1.122 @@ -23,7 +23,7 @@ Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 0.M6.14 +Release: 0.M6.15 License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -104,7 +104,7 @@ BuildRequires: mozilla-nspr-devel >= 37:1.7.7 BuildRequires: xorg-x11-devel %if %{gcj_support} -BuildRequires: gcc-java >= 4.0.0-1 +BuildRequires: gcc-java >= 4.0.0-2 BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_18rh %else BuildRequires: java-devel >= 1.4.2 @@ -133,7 +133,7 @@ Obsoletes: ecj Provides: ecj %if %{gcj_support} -Requires: libgcj >= 4.0.0-1 +Requires: libgcj >= 4.0.0-2 Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh %else Requires: java >= 1.4.2 @@ -152,7 +152,7 @@ Provides: %{name}-gtk2 = %{epoch}:%{version}-%{release} %if %{gcj_support} Requires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh -Requires: libgcj >= 4.0.0-1 +Requires: libgcj >= 4.0.0-2 Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh %else Requires: java >= 1.4.2 @@ -188,7 +188,7 @@ Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-ecj = %{epoch}:%{version}-%{release} %if %{gcj_support} -Requires: libgcj >= 4.0.0-1 +Requires: libgcj >= 4.0.0-2 Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh %endif @@ -210,7 +210,7 @@ Requires: %{name}-platform-devel = %{epoch}:%{version}-%{release} %if %{gcj_support} Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh -Requires: libgcj >= 4.0.0-1 +Requires: libgcj >= 4.0.0-2 %endif %package pde-devel @@ -232,7 +232,7 @@ Group: Text Editors/Integrated Development Environments (IDE) %if %{gcj_support} Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh -Requires: libgcj >= 4.0.0-1 +Requires: libgcj >= 4.0.0-2 %endif %description -n %{libname}-gtk2 @@ -529,10 +529,6 @@ # see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919 mv \ .%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak} - # FIXME: temporarily remove org.eclipse.jdt.ui_3.1.0/jdt_3.1.0.jar.so - # see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151296 - mv \ - .%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_%{eclipse_majmin}.%{eclipse_micro}/jdt.jar.so{,.bak} pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0 gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \ @@ -1039,6 +1035,9 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0 %changelog +* Wed May 4 2005 Ben Konrath 3.1.0_fc-0.M6.15 +- Re-enable jdt.ui/jdt.jar.so and require gcj 4.0.0-2 (rh#151296). + * Mon May 2 2005 Ben Konrath 3.1.0_fc-0.M6.14 - Replace temporary patch to debug.ui with upstream patch to swt (rh#155853). From fedora-cvs-commits at redhat.com Thu May 5 02:01:59 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 22:01:59 -0400 Subject: rpms/booty/devel .cvsignore, 1.23, 1.24 booty.spec, 1.23, 1.24 sources, 1.23, 1.24 Message-ID: <200505050201.j4521xJA026843@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26824/devel Modified Files: .cvsignore booty.spec sources Log Message: auto-import booty-0.52-1 on branch devel from booty-0.52-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 13 Apr 2005 19:58:36 -0000 1.23 +++ .cvsignore 5 May 2005 02:01:51 -0000 1.24 @@ -1 +1 @@ -booty-0.51.tar.bz2 +booty-0.52.tar.bz2 Index: booty.spec =================================================================== RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- booty.spec 13 Apr 2005 19:58:36 -0000 1.23 +++ booty.spec 5 May 2005 02:01:52 -0000 1.24 @@ -1,6 +1,6 @@ Summary: simple python bootloader config lib Name: booty -Version: 0.51 +Version: 0.52 Release: 1 License: LGPL Source0: %{name}-%{version}.tar.bz2 @@ -34,6 +34,13 @@ %changelog +* Wed May 4 2005 Jeremy Katz - 0.52-1 +- add enablecdboot, enableofboot, and enablenetboot to yaboot.conf +- try to detect mac os x and set up dual boot on pmac + +* Mon May 2 2005 Jeremy Katz +- add handling for sx8 device names + * Wed Apr 13 2005 Peter Jones 0.51-1 - make upgrades work with /boot on raid Index: sources =================================================================== RCS file: /cvs/dist/rpms/booty/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 13 Apr 2005 19:58:36 -0000 1.23 +++ sources 5 May 2005 02:01:52 -0000 1.24 @@ -1 +1 @@ -eeeaad1bc27e7c67410a8b909deef150 booty-0.51.tar.bz2 +5fc6a53267b4ddfab85ba8eb5a134eaf booty-0.52.tar.bz2 From fedora-cvs-commits at redhat.com Thu May 5 03:34:46 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 23:34:46 -0400 Subject: rpms/system-config-bind/FC-3 system-config-bind.spec, 1.10, 1.11 sources, 1.10, 1.11 .cvsignore, 1.4, 1.5 Makefile, 1.1, 1.2 Message-ID: <200505050334.j453Ykau018092@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv18078 Modified Files: system-config-bind.spec sources .cvsignore Makefile Log Message: fix bug 156884: regenerate .glade for FC-3; handle named.conf with no options clause Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-3/system-config-bind.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- system-config-bind.spec 4 May 2005 15:22:36 -0000 1.10 +++ system-config-bind.spec 5 May 2005 03:34:44 -0000 1.11 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.0 -Release: 11 +Release: 12 License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind @@ -78,6 +78,10 @@ fi; %changelog +* Wed May 04 2005 Jason Vas Dias - 4.0.0-12 +- fix bug 156884: regenerate system-config-bind.glade for FC-3; + handle named.conf with NO options clause . + * Wed Apr 27 2005 Jason Vas Dias - 4.0.0-10 - Add User Guide & Manual in /usr/share/doc/system-config-bind-%{version} Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 4 May 2005 15:22:36 -0000 1.10 +++ sources 5 May 2005 03:34:44 -0000 1.11 @@ -1 +1 @@ -0e1524a5b169d86e591a939fb49a31df system-config-bind-4.0.0-11.tar.gz +b5385647bd6f655d7714c6aff189fe08 system-config-bind-4.0.0-12.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 May 2005 15:22:36 -0000 1.4 +++ .cvsignore 5 May 2005 03:34:44 -0000 1.5 @@ -1,2 +1,3 @@ system-config-bind-2.0.3.tar.gz system-config-bind-4.0.0-11.tar.gz +system-config-bind-4.0.0-12.tar.gz Index: Makefile =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-3/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 9 Sep 2004 12:55:14 -0000 1.1 +++ Makefile 5 May 2005 03:34:44 -0000 1.2 @@ -4,3 +4,9 @@ SPECFILE = $(firstword $(wildcard *.spec)) include ../common/Makefile.common + + +tar: + tar -cpf - system-config-bind-$(VERSION)/{Makefile,*.py,profiles,pixmaps,system-config-bind{.glade,.desktop,.desktop.in,.console,.pam},scb_manual.{pdf,odt},po} | gzip > system-config-bind-$(VERSION)-$(RELEASE).tar.gz + + From fedora-cvs-commits at redhat.com Thu May 5 03:42:16 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 May 2005 23:42:16 -0400 Subject: rpms/system-config-bind/devel system-config-bind.spec, 1.25, 1.26 sources, 1.22, 1.23 .cvsignore, 1.7, 1.8 Message-ID: <200505050342.j453gGes018175@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18165 Modified Files: system-config-bind.spec sources .cvsignore Log Message: handle named.conf with NO options clause. Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- system-config-bind.spec 28 Apr 2005 02:57:53 -0000 1.25 +++ system-config-bind.spec 5 May 2005 03:42:14 -0000 1.26 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.0 -Release: 11 +Release: 12_FC4 License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind @@ -78,6 +78,9 @@ fi; %changelog +* Wed May 04 2005 Jason Vas Dias - 4.0.0-12 +- fix bug 156884: handle named.conf with NO options clause . + * Wed Apr 27 2005 Jason Vas Dias - 4.0.0-10 - Add User Guide & Manual in /usr/share/doc/system-config-bind-%{version} Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 28 Apr 2005 17:22:00 -0000 1.22 +++ sources 5 May 2005 03:42:14 -0000 1.23 @@ -1 +1 @@ -0e1524a5b169d86e591a939fb49a31df system-config-bind-4.0.0-11.tar.gz +e4862d3b47b602361f293ccf6e400dee system-config-bind-4.0.0-12_FC4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Apr 2005 02:58:11 -0000 1.7 +++ .cvsignore 5 May 2005 03:42:14 -0000 1.8 @@ -3,3 +3,4 @@ system-config-bind-4.0.0-7.tar.gz system-config-bind-4.0.0-10.tar.gz system-config-bind-4.0.0-11.tar.gz +system-config-bind-4.0.0-12_FC4.tar.gz From fedora-cvs-commits at redhat.com Thu May 5 06:22:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 02:22:25 -0400 Subject: rpms/ethereal/devel ethereal.spec, 1.31, 1.32 sources, 1.24, 1.25 ethereal-capture_ui_utils.patch, 1.1, NONE Message-ID: <200505050622.j456MP1g008268@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/ethereal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8254 Modified Files: ethereal.spec sources Removed Files: ethereal-capture_ui_utils.patch Log Message: - update to upstream, many security flaws fixed Index: ethereal.spec =================================================================== RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ethereal.spec 27 Apr 2005 11:32:47 -0000 1.31 +++ ethereal.spec 5 May 2005 06:22:22 -0000 1.32 @@ -3,7 +3,7 @@ Summary: Network traffic analyzer Name: ethereal Version: 0.10.11 -Release: 0.pre2 +Release: 1 License: GPL Group: Applications/Internet Source0: http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2 @@ -13,7 +13,6 @@ Source4: ethereal.png Patch1: ethereal-0.10.0a-ia64-segfault.patch Patch3: ethereal-0.10.8-htmlview.patch -Patch4: ethereal-capture_ui_utils.patch Url: http://www.ethereal.com/ BuildRoot: %{_tmppath}/%{name}-root Requires: libpcap >= 0.6 @@ -52,11 +51,10 @@ %setup -q %patch1 -p1 -b .ia64 %patch3 -p1 -b .htmlview -%patch4 -p1 -b .any %build #./autogen.sh -export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -g" +export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS" export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS" export LDFLAGS="$LDFLAGS -lm" %configure \ @@ -154,6 +152,9 @@ %changelog +* Thu May 05 2005 Radek Vokal 0.10.11-1 +- update to upstream, many security flaws fixed + * Wed Apr 27 2005 Radek Vokal 0.10.11-0.pre2 - nasty bug found, capture segfault when no interface selected Index: sources =================================================================== RCS file: /cvs/dist/rpms/ethereal/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 27 Apr 2005 09:23:01 -0000 1.24 +++ sources 5 May 2005 06:22:22 -0000 1.25 @@ -1 +1 @@ -a03762ace88bd6a0277d4912a21bd5ee ethereal-0.10.11.tar.bz2 +03aa7fe2cbef9aa0654637cdc60e0458 ethereal-0.10.11.tar.bz2 --- ethereal-capture_ui_utils.patch DELETED --- From fedora-cvs-commits at redhat.com Thu May 5 06:48:55 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 02:48:55 -0400 Subject: rpms/ethereal/FC-3 .cvsignore, 1.21, 1.22 ethereal.spec, 1.22, 1.23 sources, 1.22, 1.23 Message-ID: <200505050648.j456mtxf007300@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/ethereal/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv7282 Modified Files: .cvsignore ethereal.spec sources Log Message: - new release, several security flaws fixed Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ethereal/FC-3/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 14 Mar 2005 13:12:44 -0000 1.21 +++ .cvsignore 5 May 2005 06:48:53 -0000 1.22 @@ -1 +1 @@ -ethereal-0.10.10.tar.bz2 +ethereal-0.10.11.tar.bz2 Index: ethereal.spec =================================================================== RCS file: /cvs/dist/rpms/ethereal/FC-3/ethereal.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ethereal.spec 14 Mar 2005 13:12:44 -0000 1.22 +++ ethereal.spec 5 May 2005 06:48:53 -0000 1.23 @@ -2,7 +2,7 @@ Summary: Network traffic analyzer Name: ethereal -Version: 0.10.10 +Version: 0.10.11 Release: 1.FC3.1 License: GPL Group: Applications/Internet @@ -12,7 +12,6 @@ Source3: ethereal.desktop Source4: ethereal.png Patch1: ethereal-0.10.0a-ia64-segfault.patch -Patch2: ethereal-0.10.6-old.patch Patch3: ethereal-0.10.8-htmlview.patch Url: http://www.ethereal.com/ BuildRoot: %{_tmppath}/%{name}-root @@ -50,7 +49,6 @@ %prep %setup -q %patch1 -p1 -b .ia64 -%patch2 -p1 -b .old %patch3 -p1 -b .htmlview %build @@ -147,6 +145,9 @@ %changelog +* Thu May 05 2005 Radek Vokal 0.10.11-1.FC3.1 +- new release, several security flaws fixed + * Mon Mar 14 2005 Radek Vokal 0.10.10-1.FC3.1 - new release, fixes three security and stability-related issues (#150706) - a buffer overflow in the Etheric dissector. (CAN-2005-0704) Index: sources =================================================================== RCS file: /cvs/dist/rpms/ethereal/FC-3/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 14 Mar 2005 13:12:44 -0000 1.22 +++ sources 5 May 2005 06:48:53 -0000 1.23 @@ -1 +1 @@ -5addaf1db088a8b51941e4db191b0ab0 ethereal-0.10.10.tar.bz2 +03aa7fe2cbef9aa0654637cdc60e0458 ethereal-0.10.11.tar.bz2 From fedora-cvs-commits at redhat.com Thu May 5 07:56:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 03:56:56 -0400 Subject: rpms/mc/devel mc-utf8.patch,1.5,1.6 mc.spec,1.53,1.54 Message-ID: <200505050756.j457uuGU028638@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28622 Modified Files: mc-utf8.patch mc.spec Log Message: - update from CVS - sync with .utf8 patch - fix broken charset conversion feature in the .utf8 patch, Andrew V. Samoilov (#154516) mc-utf8.patch: acinclude.m4 | 16 - edit/edit-widget.h | 14 + edit/edit.c | 266 +++++++++++++++++++-------- edit/edit.h | 61 ++++-- edit/editcmd.c | 512 +++++++++++++++++++++++++++++++++++++++++++++-------- edit/editdraw.c | 115 ++++++++--- edit/editkeys.c | 29 ++- edit/wordproc.c | 81 ++++++-- src/achown.c | 6 src/boxes.c | 50 ++--- src/dialog.c | 2 src/file.c | 9 src/filegui.c | 47 +++- src/find.c | 10 - src/help.c | 24 ++ src/hotlist.c | 14 - src/layout.c | 26 +- src/learn.c | 2 src/main.c | 2 src/menu.c | 123 +++++++++++- src/menu.h | 2 src/myslang.h | 4 src/option.c | 20 +- src/panelize.c | 8 src/screen.c | 268 ++++++++++++++++++++------- src/util.c | 323 ++++++++++++++++++++++++++++++--- src/util.h | 7 src/view.c | 61 ++++++ src/widget.c | 375 +++++++++++++++++++++++++++++++------- src/widget.h | 16 + src/wtools.c | 14 - 31 files changed, 2002 insertions(+), 505 deletions(-) Index: mc-utf8.patch =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc-utf8.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mc-utf8.patch 24 Mar 2005 14:34:59 -0000 1.5 +++ mc-utf8.patch 5 May 2005 07:56:54 -0000 1.6 @@ -1,5 +1,5 @@ ---- mc-4.6.1a/edit/editdraw.c.utf8 2005-02-22 18:00:38.000000000 +0100 -+++ mc-4.6.1a/edit/editdraw.c 2005-03-24 15:02:11.176347960 +0100 +--- mc-4.6.1a/edit/editdraw.c.utf8 2005-04-27 23:02:59.000000000 +0200 ++++ mc-4.6.1a/edit/editdraw.c 2005-05-05 09:32:02.694567152 +0200 @@ -61,7 +61,7 @@ static void status_string (WEdit * edit, char *s, int w) @@ -9,22 +9,26 @@ /* * If we are at the end of file, print , -@@ -69,9 +69,14 @@ static void status_string (WEdit * edit, +@@ -69,11 +69,16 @@ static void status_string (WEdit * edit, * as decimal and as hex. */ if (edit->curs1 < edit->last_byte) { - unsigned char cur_byte = edit_get_byte (edit, edit->curs1); -+ mc_wchar_t cur_byte = edit_get_byte (edit, edit->curs1); ++ mc_wchar_t cur_byte = edit_get_byte (edit, edit->curs1); +#ifndef UTF8 - g_snprintf (byte_str, sizeof(byte_str), "%c %3d 0x%02X", - is_printable(cur_byte) ? cur_byte : '.', + g_snprintf (byte_str, sizeof (byte_str), "%c %3d 0x%02X", + is_printable (cur_byte) ? cur_byte : '.', +- (int) cur_byte, +- (unsigned) cur_byte); +#else /* UTF8 */ -+ g_snprintf (byte_str, sizeof(byte_str), "%lc %3d 0x%02X", -+ iswprint(cur_byte) ? cur_byte : '.', ++ g_snprintf (byte_str, sizeof(byte_str), "%lc %3d 0x%02X", ++ iswprint(cur_byte) ? cur_byte : '.', +#endif /* UTF8 */ - cur_byte, - cur_byte); ++ (int) cur_byte, ++ (unsigned) cur_byte); } else { + strcpy (byte_str, ""); + } @@ -198,11 +203,16 @@ void edit_scroll_screen_over_cursor (WEd #define lowlevel_set_color(x) attrset(MY_COLOR_PAIR(color)) #endif @@ -224,7 +228,7 @@ print_to_widget (edit, row, start_col, start_col_real, end_col, line); } --- mc-4.6.1a/edit/editkeys.c.utf8 2005-02-22 18:00:38.000000000 +0100 -+++ mc-4.6.1a/edit/editkeys.c 2005-03-24 15:02:11.177347808 +0100 ++++ mc-4.6.1a/edit/editkeys.c 2005-05-05 09:32:02.695567000 +0200 @@ -177,10 +177,10 @@ static long const common_key_map[] = { * 'command' is one of the editor commands from editcmddef.h. */ @@ -280,7 +284,7 @@ return 0; } --- mc-4.6.1a/edit/wordproc.c.utf8 2005-02-22 18:00:38.000000000 +0100 -+++ mc-4.6.1a/edit/wordproc.c 2005-03-24 15:02:11.178347656 +0100 ++++ mc-4.6.1a/edit/wordproc.c 2005-05-05 09:32:02.696566848 +0200 @@ -41,7 +41,12 @@ #define tab_width option_tab_spacing @@ -507,15 +511,15 @@ g_free (t); return; } ---- mc-4.6.1a/edit/editcmd.c.utf8 2005-03-17 22:18:23.000000000 +0100 -+++ mc-4.6.1a/edit/editcmd.c 2005-03-24 15:19:16.066540968 +0100 +--- mc-4.6.1a/edit/editcmd.c.utf8 2005-05-04 01:40:15.000000000 +0200 ++++ mc-4.6.1a/edit/editcmd.c 2005-05-05 09:32:02.701566088 +0200 @@ -60,7 +60,7 @@ #define edit_get_save_file(f,h) input_expand_dialog (h, _(" Enter file name: "), f) struct selection { -- unsigned char * text; -+ mc_wchar_t * text; - int len; +- char *text; ++ mc_wchar_t *text; + int len; }; @@ -83,12 +83,16 @@ int edit_confirm_save = 1; @@ -536,8 +540,8 @@ +#endif } - static const char *strcasechr (const unsigned char *s, int c) -@@ -122,11 +126,11 @@ static void *memmove (void *dest, const + static const char * +@@ -123,11 +127,11 @@ static void *memmove (void *dest, const #endif /* !HAVE_MEMMOVE */ /* #define itoa MY_itoa <---- this line is now in edit.h */ @@ -552,7 +556,7 @@ int j = i; *s-- = 0; do { -@@ -211,6 +215,48 @@ void edit_refresh_cmd (WEdit * edit) +@@ -212,6 +216,48 @@ void edit_refresh_cmd (WEdit * edit) doupdate(); } @@ -601,7 +605,7 @@ /* If 0 (quick save) then a) create/truncate file, b) save to ; if 1 (safe save) then a) save to , -@@ -318,32 +364,48 @@ edit_save_file (WEdit *edit, const char +@@ -319,32 +365,48 @@ edit_save_file (WEdit *edit, const char buf = 0; filelen = edit->last_byte; while (buf <= (edit->curs1 >> S_EDIT_BUF_SIZE) - 1) { @@ -653,7 +657,7 @@ EDIT_BUF_SIZE) != EDIT_BUF_SIZE) { filelen = -1; break; -@@ -656,13 +718,21 @@ edit_delete_macro (WEdit * edit, int k) +@@ -657,13 +719,21 @@ edit_delete_macro (WEdit * edit, int k) if (!n || n == EOF) break; n = 0; @@ -675,7 +679,7 @@ fprintf (g, ";\n"); } } -@@ -695,7 +765,11 @@ int edit_save_macro_cmd (WEdit * edit, s +@@ -696,7 +766,11 @@ int edit_save_macro_cmd (WEdit * edit, s if (f) { fprintf (f, ("key '%d 0': "), s); for (i = 0; i < n; i++) @@ -687,7 +691,7 @@ fprintf (f, ";\n"); fclose (f); if (saved_macros_loaded) { -@@ -745,10 +819,18 @@ int edit_load_macro_cmd (WEdit * edit, s +@@ -746,10 +820,18 @@ int edit_load_macro_cmd (WEdit * edit, s saved_macro[i++] = s; if (!found) { *n = 0; @@ -706,7 +710,7 @@ } fscanf (f, ";\n"); if (s == k) -@@ -895,7 +977,7 @@ int eval_marks (WEdit * edit, long *star +@@ -896,7 +978,7 @@ int eval_marks (WEdit * edit, long *star #define space_width 1 static void @@ -715,7 +719,7 @@ { long cursor; int i, col; -@@ -943,7 +1025,7 @@ edit_block_copy_cmd (WEdit *edit) +@@ -944,7 +1026,7 @@ edit_block_copy_cmd (WEdit *edit) { long start_mark, end_mark, current = edit->curs1; int size, x; @@ -724,7 +728,7 @@ edit_update_curs_col (edit); x = edit->curs_col; -@@ -988,7 +1070,7 @@ edit_block_move_cmd (WEdit *edit) +@@ -989,7 +1071,7 @@ edit_block_move_cmd (WEdit *edit) { long count; long current; @@ -733,7 +737,7 @@ long start_mark, end_mark; int deleted = 0; int x = 0; -@@ -1049,7 +1131,7 @@ edit_block_move_cmd (WEdit *edit) +@@ -1050,7 +1132,7 @@ edit_block_move_cmd (WEdit *edit) edit_push_action (edit, COLUMN_ON); column_highlighting = 0; } else { @@ -742,7 +746,7 @@ edit_cursor_move (edit, start_mark - edit->curs1); edit_scroll_screen_over_cursor (edit); count = start_mark; -@@ -1387,7 +1469,11 @@ static long sargs[NUM_REPL_ARGS][256 / s +@@ -1388,7 +1470,11 @@ static long sargs[NUM_REPL_ARGS][256 / s /* This function is a modification of mc-3.2.10/src/view.c:regexp_view_search() */ /* returns -3 on error in pattern, -1 on not found, found_len = 0 if either */ static int @@ -754,7 +758,7 @@ int match_bol, int icase, int *found_len, void *d) { static regex_t r; -@@ -1396,6 +1482,11 @@ string_regexp_search (char *pattern, cha +@@ -1397,6 +1483,11 @@ string_regexp_search (char *pattern, cha regmatch_t *pmatch; static regmatch_t s[1]; @@ -766,7 +770,7 @@ pmatch = (regmatch_t *) d; if (!pmatch) pmatch = s; -@@ -1415,13 +1506,51 @@ string_regexp_search (char *pattern, cha +@@ -1416,13 +1507,51 @@ string_regexp_search (char *pattern, cha old_type = match_type; old_icase = icase; } @@ -818,7 +822,7 @@ *found_len = pmatch[0].rm_eo - pmatch[0].rm_so; return (pmatch[0].rm_so); } -@@ -1429,13 +1558,29 @@ string_regexp_search (char *pattern, cha +@@ -1430,13 +1559,29 @@ string_regexp_search (char *pattern, cha /* thanks to Liviu Daia for getting this (and the above) routines to work properly - paul */ @@ -849,7 +853,7 @@ int n = 0; for (p = 0; p < l; p++) /* count conversions... */ -@@ -1444,19 +1589,22 @@ edit_find_string (long start, unsigned c +@@ -1445,19 +1590,22 @@ edit_find_string (long start, unsigned c n++; if (replace_scanf || replace_regexp) { @@ -879,7 +883,7 @@ if (replace_case) { for (p = start; p < last_byte && p < start + MAX_REPL_LEN; p++) buf[p - start] = (*get_byte) (data, p); -@@ -1470,20 +1618,36 @@ edit_find_string (long start, unsigned c +@@ -1471,20 +1619,36 @@ edit_find_string (long start, unsigned c } buf[(q = p - start)] = 0; @@ -917,7 +921,7 @@ if (q + start < last_byte) { if (replace_case) { buf[q] = (*get_byte) (data, q + start); -@@ -1497,7 +1661,11 @@ edit_find_string (long start, unsigned c +@@ -1498,7 +1662,11 @@ edit_find_string (long start, unsigned c start++; buf++; /* move the window along */ if (buf == mbuf + MAX_REPL_LEN) { /* the window is about to go past the end of array, so... */ @@ -929,7 +933,7 @@ buf = mbuf; } q--; -@@ -1523,10 +1691,17 @@ edit_find_string (long start, unsigned c +@@ -1524,10 +1692,17 @@ edit_find_string (long start, unsigned c buf = mbuf; while (q) { @@ -947,7 +951,7 @@ return -3; } else if (found_start == -1) /* not found: try next line */ -@@ -1537,15 +1712,27 @@ edit_find_string (long start, unsigned c +@@ -1538,15 +1713,27 @@ edit_find_string (long start, unsigned c match_bol = 0; continue; } @@ -977,7 +981,7 @@ memmove (mbuf, buf, q); p = start + q; move_win = 1; -@@ -1555,36 +1742,59 @@ edit_find_string (long start, unsigned c +@@ -1556,36 +1743,59 @@ edit_find_string (long start, unsigned c } } } else { @@ -1045,7 +1049,7 @@ return -2; } -@@ -1598,9 +1808,14 @@ edit_find_forwards (long search_start, u +@@ -1599,9 +1809,14 @@ edit_find_forwards (long search_start, u while ((p = edit_find_string (p, exp, len, last_byte, get_byte, data, once_only, d)) >= 0) { if (replace_whole) { @@ -1060,7 +1064,7 @@ return p; if (once_only) return -2; -@@ -1632,6 +1847,7 @@ edit_find (long search_start, unsigned c +@@ -1633,6 +1848,7 @@ edit_find (long search_start, unsigned c #define is_digit(x) ((x) >= '0' && (x) <= '9') @@ -1068,7 +1072,7 @@ #define snprint(v) { \ *p1++ = *p++; \ *p1 = '\0'; \ -@@ -1639,33 +1855,48 @@ edit_find (long search_start, unsigned c +@@ -1640,33 +1856,48 @@ edit_find (long search_start, unsigned c if (n >= (size_t) (e - s)) goto nospc; \ s += n; \ } @@ -1125,7 +1129,7 @@ s += n; q = p; p1 = q1; -@@ -1693,45 +1924,78 @@ static int snprintf_p (char *str, size_t +@@ -1694,45 +1925,78 @@ static int snprintf_p (char *str, size_t *p1++ = *p++; if (*p == '*') { p++; @@ -1214,7 +1218,7 @@ snprint (*va_arg (ap, long *)); } else if (*p == 'p') { snprint (*va_arg (ap, void **)); -@@ -1740,10 +2004,17 @@ static int snprintf_p (char *str, size_t +@@ -1741,10 +2005,17 @@ static int snprintf_p (char *str, size_t q = p; } va_end (ap); @@ -1232,7 +1236,7 @@ return s + n - str; nospc: va_end (ap); -@@ -1922,8 +2193,11 @@ edit_replace_cmd (WEdit *edit, int again +@@ -1923,8 +2194,11 @@ edit_replace_cmd (WEdit *edit, int again } } if (replace_yes) { /* delete then insert new */ @@ -1245,7 +1249,7 @@ int ret = 0; /* we need to fill in sargs just like with scanf */ -@@ -1932,17 +2206,25 @@ edit_replace_cmd (WEdit *edit, int again +@@ -1933,17 +2207,25 @@ edit_replace_cmd (WEdit *edit, int again for (k = 1; k < NUM_REPL_ARGS && pmatch[k].rm_eo >= 0; k++) { @@ -1272,7 +1276,7 @@ edit-> search_start - -@@ -1959,9 +2241,15 @@ edit_replace_cmd (WEdit *edit, int again +@@ -1960,9 +2242,15 @@ edit_replace_cmd (WEdit *edit, int again sargs[k - 1][0] = 0; } if (!ret) @@ -1288,7 +1292,7 @@ if (ret >= 0) { times_replaced++; while (i--) -@@ -1981,10 +2269,18 @@ edit_replace_cmd (WEdit *edit, int again +@@ -1982,10 +2270,18 @@ edit_replace_cmd (WEdit *edit, int again times_replaced++; while (i--) edit_delete (edit); @@ -1307,7 +1311,7 @@ } /* so that we don't find the same string again */ if (replace_backwards) { -@@ -2157,16 +2453,17 @@ edit_ok_to_exit (WEdit *edit) +@@ -2158,16 +2454,17 @@ edit_ok_to_exit (WEdit *edit) #define TEMP_BUF_LEN 1024 /* Return a null terminated length of text. Result must be g_free'd */ @@ -1329,7 +1333,7 @@ x = edit_move_forward3 (edit, edit_bol (edit, start), 0, start); c = edit_get_byte (edit, start); -@@ -2199,11 +2496,15 @@ edit_save_block (WEdit * edit, const cha +@@ -2200,11 +2497,15 @@ edit_save_block (WEdit * edit, const cha return 0; if (column_highlighting) { @@ -1346,7 +1350,7 @@ if (r < 0) break; p += r; -@@ -2211,15 +2512,19 @@ edit_save_block (WEdit * edit, const cha +@@ -2212,15 +2513,19 @@ edit_save_block (WEdit * edit, const cha } g_free (block); } else { @@ -1368,7 +1372,7 @@ start = end; } g_free (buf); -@@ -2558,17 +2863,20 @@ edit_block_process_cmd (WEdit *edit, con +@@ -2559,17 +2864,20 @@ edit_block_process_cmd (WEdit *edit, con /* prints at the cursor */ /* returns the number of chars printed */ @@ -1391,7 +1395,7 @@ static void pipe_mail (WEdit *edit, char *to, char *subject, char *cc) { FILE *p = 0; -@@ -2662,15 +2970,20 @@ void edit_mail_dialog (WEdit * edit) +@@ -2663,15 +2971,20 @@ void edit_mail_dialog (WEdit * edit) /* find first character of current word */ static int edit_find_word_start (WEdit *edit, long *word_start, int *word_len) { @@ -1414,7 +1418,7 @@ return 0; /* search start of word to be completed */ -@@ -2680,11 +2993,19 @@ static int edit_find_word_start (WEdit * +@@ -2681,11 +2994,19 @@ static int edit_find_word_start (WEdit * return 0; last = c; @@ -1435,7 +1439,7 @@ return 0; *word_start = edit->curs1 - (i - 1); /* start found */ -@@ -2717,7 +3038,7 @@ edit_collect_completions (WEdit *edit, l +@@ -2718,7 +3039,7 @@ edit_collect_completions (WEdit *edit, l int *num) { int len, max_len = 0, i, skip; @@ -1444,7 +1448,7 @@ /* collect max MAX_WORD_COMPLETIONS completions */ while (*num < MAX_WORD_COMPLETIONS) { -@@ -2738,7 +3059,11 @@ edit_collect_completions (WEdit *edit, l +@@ -2739,7 +3060,11 @@ edit_collect_completions (WEdit *edit, l buffers1[start >> S_EDIT_BUF_SIZE][start & M_EDIT_BUF_SIZE]; skip = 0; for (i = 0; i < *num; i++) { @@ -1456,7 +1460,7 @@ (&compl[i].text[word_len], &bufpos[word_len], max (len, compl[i].len) - word_len) == 0) { skip = 1; -@@ -2748,7 +3073,7 @@ edit_collect_completions (WEdit *edit, l +@@ -2749,7 +3074,7 @@ edit_collect_completions (WEdit *edit, l if (skip) continue; @@ -1465,7 +1469,7 @@ compl[*num].len = len; for (i = 0; i < len; i++) compl[*num].text[i] = *(bufpos + i); -@@ -2762,6 +3087,18 @@ edit_collect_completions (WEdit *edit, l +@@ -2763,6 +3088,18 @@ edit_collect_completions (WEdit *edit, l return max_len; } @@ -1484,7 +1488,7 @@ /* let the user select its preferred completion */ static void -@@ -2771,9 +3108,13 @@ edit_completion_dialog (WEdit *edit, int +@@ -2772,9 +3109,13 @@ edit_completion_dialog (WEdit *edit, int int start_x, start_y, offset, i; char *curr = NULL; Dlg_head *compl_dlg; @@ -1498,7 +1502,7 @@ /* calculate the dialog metrics */ compl_dlg_h = num_compl + 2; -@@ -2809,8 +3150,16 @@ edit_completion_dialog (WEdit *edit, int +@@ -2810,8 +3151,16 @@ edit_completion_dialog (WEdit *edit, int add_widget (compl_dlg, compl_list); /* fill the listbox with the completions */ @@ -1515,7 +1519,7 @@ /* pop up the dialog */ run_dlg (compl_dlg); -@@ -2818,9 +3167,17 @@ edit_completion_dialog (WEdit *edit, int +@@ -2819,9 +3168,17 @@ edit_completion_dialog (WEdit *edit, int /* apply the choosen completion */ if (compl_dlg->ret_value == B_ENTER) { listbox_get_current (compl_list, &curr, NULL); @@ -1534,7 +1538,7 @@ } /* destroy dialog before return */ -@@ -2837,8 +3194,9 @@ edit_complete_word_cmd (WEdit *edit) +@@ -2838,8 +3195,9 @@ edit_complete_word_cmd (WEdit *edit) { int word_len = 0, i, num_compl = 0, max_len; long word_start = 0; @@ -1546,7 +1550,7 @@ struct selection compl[MAX_WORD_COMPLETIONS]; /* completions */ /* don't want to disturb another search */ -@@ -2855,16 +3213,32 @@ edit_complete_word_cmd (WEdit *edit) +@@ -2856,16 +3214,32 @@ edit_complete_word_cmd (WEdit *edit) /* prepare match expression */ bufpos = &edit->buffers1[word_start >> S_EDIT_BUF_SIZE] [word_start & M_EDIT_BUF_SIZE]; @@ -1580,7 +1584,7 @@ if (num_compl > 0) { /* insert completed word if there is only one match */ --- mc-4.6.1a/edit/edit.c.utf8 2005-02-22 18:00:38.000000000 +0100 -+++ mc-4.6.1a/edit/edit.c 2005-03-24 15:02:11.188346136 +0100 ++++ mc-4.6.1a/edit/edit.c 2005-05-05 09:32:02.705565480 +0200 @@ -103,7 +103,7 @@ char *option_backup_ext = "~"; static void edit_move_to_prev_col (WEdit *edit, long p); static void user_menu (WEdit *edit); @@ -2182,8 +2186,8 @@ if (edit->overwrite) { if (edit_get_byte (edit, edit->curs1) != '\n') edit_delete (edit); ---- mc-4.6.1a/edit/edit-widget.h.utf8 2004-12-03 18:09:27.000000000 +0100 -+++ mc-4.6.1a/edit/edit-widget.h 2005-03-24 15:02:11.188346136 +0100 +--- mc-4.6.1a/edit/edit-widget.h.utf8 2005-05-04 01:40:15.000000000 +0200 ++++ mc-4.6.1a/edit/edit-widget.h 2005-05-05 09:32:02.706565328 +0200 @@ -25,6 +25,11 @@ struct syntax_rule { unsigned char border; }; @@ -2196,22 +2200,21 @@ struct WEdit { Widget widget; -@@ -37,8 +42,12 @@ struct WEdit { +@@ -37,8 +42,11 @@ struct WEdit { /* dynamic buffers and cursor position for editor: */ long curs1; /* position of the cursor from the beginning of the file. */ long curs2; /* position from the end of the file */ -- unsigned char *buffers1[MAXBUFF + 1]; /* all data up to curs1 */ -- unsigned char *buffers2[MAXBUFF + 1]; /* all data from end of file down to curs2 */ +- char *buffers1[MAXBUFF + 1]; /* all data up to curs1 */ +- char *buffers2[MAXBUFF + 1]; /* all data from end of file down to curs2 */ + mc_wchar_t *buffers1[MAXBUFF + 1]; /* all data up to curs1 */ + mc_wchar_t *buffers2[MAXBUFF + 1]; /* all data from end of file down to curs2 */ + + unsigned char charbuf[MB_LEN_MAX]; + int charpoint; -+ /* search variables */ long search_start; /* First character to start searching from */ -@@ -82,7 +91,7 @@ struct WEdit { +@@ -82,7 +90,7 @@ struct WEdit { /* undo stack and pointers */ unsigned long stack_pointer; @@ -2220,8 +2223,8 @@ unsigned long stack_size; unsigned long stack_size_mask; unsigned long stack_bottom; ---- mc-4.6.1a/edit/edit.h.utf8 2005-02-22 18:00:38.000000000 +0100 -+++ mc-4.6.1a/edit/edit.h 2005-03-24 15:02:11.205343552 +0100 +--- mc-4.6.1a/edit/edit.h.utf8 2005-05-04 01:26:51.000000000 +0200 ++++ mc-4.6.1a/edit/edit.h 2005-05-05 09:32:02.707565176 +0200 @@ -23,6 +23,27 @@ #ifndef MC_EDIT_H #define MC_EDIT_H @@ -2336,7 +2339,7 @@ #define get_sys_error(s) (s) --- mc-4.6.1a/src/help.c.utf8 2005-02-08 23:33:52.000000000 +0100 -+++ mc-4.6.1a/src/help.c 2005-03-24 15:02:11.206343400 +0100 ++++ mc-4.6.1a/src/help.c 2005-05-05 09:32:02.709564872 +0200 @@ -453,10 +453,28 @@ static void help_show (Dlg_head *h, cons #ifndef HAVE_SLANG addch (acs_map [c]); @@ -2380,7 +2383,7 @@ if (!filename) g_free (hlpfile); --- mc-4.6.1a/src/learn.c.utf8 2005-02-08 10:04:03.000000000 +0100 -+++ mc-4.6.1a/src/learn.c 2005-03-24 15:02:11.208343096 +0100 ++++ mc-4.6.1a/src/learn.c 2005-05-05 09:32:02.710564720 +0200 @@ -237,7 +237,7 @@ init_learn (void) learn_but[0].x = 78 / 2 + 4; @@ -2391,7 +2394,7 @@ learn_title = _(learn_title); i18n_flag = 1; --- mc-4.6.1a/src/main.c.utf8 2005-02-08 20:59:45.000000000 +0100 -+++ mc-4.6.1a/src/main.c 2005-03-24 15:02:11.210342792 +0100 ++++ mc-4.6.1a/src/main.c 2005-05-05 09:32:02.712564416 +0200 @@ -1609,7 +1609,7 @@ update_xterm_title_path (void) if (xterm_flag && xterm_title) { p = s = g_strdup (strip_home_and_password (current_panel->cwd)); @@ -2402,7 +2405,7 @@ } while (*++s); fprintf (stdout, "\33]0;mc - %s\7", p); --- mc-4.6.1a/src/myslang.h.utf8 2005-03-19 18:27:36.000000000 +0100 -+++ mc-4.6.1a/src/myslang.h 2005-03-24 15:02:11.211342640 +0100 ++++ mc-4.6.1a/src/myslang.h 2005-05-05 09:32:02.713564264 +0200 @@ -11,6 +11,10 @@ #endif /* HAVE_SLANG_SLANG_H */ #endif @@ -2414,8 +2417,8 @@ enum { KEY_BACKSPACE = 400, KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, ---- mc-4.6.1a/src/util.c.utf8 2005-03-23 06:29:06.000000000 +0100 -+++ mc-4.6.1a/src/util.c 2005-03-24 15:02:11.215342032 +0100 +--- mc-4.6.1a/src/util.c.utf8 2005-04-13 20:47:12.000000000 +0200 ++++ mc-4.6.1a/src/util.c 2005-05-05 09:32:02.716563808 +0200 @@ -24,6 +24,9 @@ #include @@ -2854,9 +2857,9 @@ } *w = 0; return s; ---- mc-4.6.1a/src/util.h.utf8 2005-02-08 11:46:01.000000000 +0100 -+++ mc-4.6.1a/src/util.h 2005-03-24 15:02:11.216341880 +0100 -@@ -94,6 +94,13 @@ void init_uid_gid_cache (void); +--- mc-4.6.1a/src/util.h.utf8 2005-04-14 20:16:04.000000000 +0200 ++++ mc-4.6.1a/src/util.h 2005-05-05 09:32:02.717563656 +0200 +@@ -108,6 +108,13 @@ void init_uid_gid_cache (void); char *get_group (int); char *get_owner (int); @@ -2871,7 +2874,7 @@ #define MIN_I18NTIMELENGTH 10 #define STD_I18NTIMELENGTH 12 --- mc-4.6.1a/src/widget.c.utf8 2005-02-08 23:33:52.000000000 +0100 -+++ mc-4.6.1a/src/widget.c 2005-03-24 15:02:11.231339600 +0100 ++++ mc-4.6.1a/src/widget.c 2005-05-05 09:32:02.720563200 +0200 @@ -35,6 +35,9 @@ #include "global.h" @@ -3589,7 +3592,7 @@ } --- mc-4.6.1a/src/dialog.c.utf8 2005-02-08 19:25:31.000000000 +0100 -+++ mc-4.6.1a/src/dialog.c 2005-03-24 15:02:11.232339448 +0100 ++++ mc-4.6.1a/src/dialog.c 2005-05-05 09:32:02.722562896 +0200 @@ -166,7 +166,7 @@ common_dialog_repaint (struct Dlg_head * if (h->title) { @@ -3600,7 +3603,7 @@ } } --- mc-4.6.1a/src/hotlist.c.utf8 2005-02-08 10:04:03.000000000 +0100 -+++ mc-4.6.1a/src/hotlist.c 2005-03-24 15:02:11.234339144 +0100 ++++ mc-4.6.1a/src/hotlist.c 2005-05-05 09:32:02.724562592 +0200 @@ -555,7 +555,7 @@ init_i18n_stuff(int list_type, int cols) row = hotlist_but [i].y; @@ -3662,7 +3665,7 @@ strip_password (label_string, 1); --- mc-4.6.1a/src/panelize.c.utf8 2005-02-08 10:04:03.000000000 +0100 -+++ mc-4.6.1a/src/panelize.c 2005-03-24 15:02:11.235338992 +0100 ++++ mc-4.6.1a/src/panelize.c 2005-05-05 09:32:02.725562440 +0200 @@ -127,7 +127,7 @@ init_panelize (void) i = sizeof (panelize_but) / sizeof (panelize_but[0]); while (i--) { @@ -3687,8 +3690,8 @@ #endif /* ENABLE_NLS */ ---- mc-4.6.1a/src/layout.c.utf8 2005-02-08 23:33:52.000000000 +0100 -+++ mc-4.6.1a/src/layout.c 2005-03-24 15:02:11.236338840 +0100 +--- mc-4.6.1a/src/layout.c.utf8 2005-04-14 20:24:02.000000000 +0200 ++++ mc-4.6.1a/src/layout.c 2005-05-05 09:32:02.728561984 +0200 @@ -370,36 +370,36 @@ init_layout (void) while (i--) { @@ -3763,7 +3766,7 @@ widget_set_size (&the_menubar->widget, 0, 0, 1, COLS); --- mc-4.6.1a/src/menu.h.utf8 2004-12-03 20:17:47.000000000 +0100 -+++ mc-4.6.1a/src/menu.h 2005-03-24 15:02:11.236338840 +0100 ++++ mc-4.6.1a/src/menu.h 2005-05-05 09:32:02.729561832 +0200 @@ -21,6 +21,8 @@ typedef struct Menu { menu_entry *entries; int start_x; /* position relative to menubar start */ @@ -3773,8 +3776,8 @@ } Menu; extern int menubar_visible; ---- mc-4.6.1a/src/screen.c.utf8 2005-03-17 23:40:11.000000000 +0100 -+++ mc-4.6.1a/src/screen.c 2005-03-24 15:02:11.239338384 +0100 +--- mc-4.6.1a/src/screen.c.utf8 2005-05-03 17:16:57.000000000 +0200 ++++ mc-4.6.1a/src/screen.c 2005-05-05 09:32:02.732561376 +0200 @@ -171,22 +171,59 @@ add_permission_string (char *dest, int w static const char * string_file_name (file_entry *fe, int len) @@ -4079,7 +4082,7 @@ if (!isstatus && panel->split){ if (second_column) -@@ -1094,6 +1201,12 @@ paint_frame (WPanel *panel) +@@ -1093,6 +1200,12 @@ paint_frame (WPanel *panel) int side, width; const char *txt; @@ -4092,7 +4095,7 @@ if (!panel->split) adjust_top_file (panel); -@@ -1118,16 +1231,37 @@ paint_frame (WPanel *panel) +@@ -1117,16 +1230,37 @@ paint_frame (WPanel *panel) if (format->string_fn){ txt = format->title; @@ -4133,7 +4136,7 @@ attrset (NORMAL_COLOR); one_vline (); --- mc-4.6.1a/src/file.c.utf8 2005-02-08 10:04:03.000000000 +0100 -+++ mc-4.6.1a/src/file.c 2005-03-24 15:02:11.240338232 +0100 ++++ mc-4.6.1a/src/file.c 2005-05-05 09:32:02.735560920 +0200 @@ -165,15 +165,20 @@ static const unsigned char * do_transform_source (FileOpContext *ctx, const unsigned char *source) { @@ -4172,10 +4175,10 @@ return fntarget; } ---- mc-4.6.1a/src/view.c.utf8 2005-02-08 10:53:51.000000000 +0100 -+++ mc-4.6.1a/src/view.c 2005-03-24 15:02:11.242337928 +0100 -@@ -41,6 +41,10 @@ - #endif +--- mc-4.6.1a/src/view.c.utf8 2005-04-27 20:39:21.000000000 +0200 ++++ mc-4.6.1a/src/view.c 2005-05-05 09:31:08.000000000 +0200 +@@ -43,6 +43,10 @@ + #include #include +#ifdef UTF8 @@ -4185,7 +4188,7 @@ #include "global.h" #include "tty.h" #include "cmd.h" /* For view_other_cmd */ -@@ -825,7 +829,7 @@ view_status (WView *view) +@@ -773,7 +777,7 @@ view_status (WView *view) if (!i18n_adjust) { file_label = _("File: %s"); @@ -4194,7 +4197,7 @@ } if (w < i18n_adjust + 6) -@@ -880,7 +884,11 @@ view_display_clean (WView *view, int hei +@@ -830,7 +834,11 @@ view_display_clean (WView *view, int hei widget_erase ((Widget *) view); } @@ -4206,61 +4209,60 @@ #define view_add_one_vline() one_vline() #define view_add_string(view,s) addstr (s) #define view_gotoyx(v,r,c) widget_move (v,r,c) -@@ -1101,6 +1109,12 @@ display (WView *view) +@@ -1049,6 +1057,12 @@ display (WView *view) + view_place_cursor (view); } else { - /* the get_byte() call below might modify view->last_byte */ - for (; row < height && ((void) (c = get_byte (view, from)), from < view->last_byte); from++) { + for (; row < bottom && (c = get_byte (view, from)) != -1; from++) { +#ifdef UTF8 -+ mbstate_t mbs; -+ char mbbuf[MB_LEN_MAX]; -+ int mblen; -+ wchar_t wc; ++ mbstate_t mbs; ++ char mbbuf[MB_LEN_MAX]; ++ int mblen; ++ wchar_t wc; +#endif /* UTF8 */ - if ((c == '\n') || (col >= width && view->wrap_mode)) { - col = frame_shift; + if ((c == '\n') || (col >= right && view->text_wrap_mode)) { + col = left; row++; -@@ -1113,7 +1127,38 @@ display (WView *view) - col = ((col - frame_shift) / 8) * 8 + 8 + frame_shift; +@@ -1061,7 +1075,37 @@ display (WView *view) + col = ((col - left) / 8) * 8 + 8 + left; continue; } +#ifndef UTF8 - if (view->viewer_nroff_flag && c == '\b') { -+ + if (view->text_nroff_mode && c == '\b') { +#else /* UTF8 */ -+ mblen = 1; -+ mbbuf[0] = c; ++ mblen = 1; ++ mbbuf[0] = convert_to_display_c (c); + -+ while (mblen < MB_LEN_MAX) { -+ int res; -+ memset (&mbs, 0, sizeof (mbs)); -+ res = mbrtowc(&wc, mbbuf, mblen, &mbs); -+ if (res <= 0 && res != -2) { -+ wc = '.'; -+ mblen = 1; -+ break; -+ } -+ if (res == mblen) -+ break; -+ -+ mbbuf[mblen] = get_byte (view, from + mblen); -+ mblen++; -+ } -+ -+ if (mblen == MB_LEN_MAX) { -+ wc = '.'; -+ mblen = 1; -+ } ++ while (mblen < MB_LEN_MAX) { ++ int res; ++ memset (&mbs, 0, sizeof (mbs)); ++ res = mbrtowc (&wc, mbbuf, mblen, &mbs); ++ if (res <= 0 && res != -2) { ++ wc = '.'; ++ mblen = 1; ++ break; ++ } ++ if (res == mblen) ++ break; ++ ++ mbbuf[mblen] = convert_to_display_c (get_byte (view, from + mblen)); ++ mblen++; ++ } ++ ++ if (mblen == MB_LEN_MAX) { ++ wc = '.'; ++ mblen = 1; ++ } + -+ from += mblen - 1; ++ from += mblen - 1; + -+ if (view->viewer_nroff_flag && wc == '\b') { ++ if (view->text_nroff_mode && wc == '\b') { +#endif /* UTF8 */ int c_prev; int c_next; -@@ -1151,12 +1196,24 @@ display (WView *view) - && col < width - view->start_col) { - view_gotoyx (view, row, col + view->start_col); +@@ -1102,12 +1146,23 @@ display (WView *view) + && col < right + view->dpy_text_start_col) { + view_gotoyx (view, row, col - view->dpy_text_start_col); +#ifndef UTF8 c = convert_to_display_c (c); @@ -4270,7 +4272,6 @@ - view_add_character (view, c); +#else /* UTF8 */ -+ wc = convert_to_display_c (wc); + if (!iswprint (wc)) + wc = '.'; + view_add_character (view, wc); @@ -4286,7 +4287,7 @@ col++; if (boldflag != MARK_NORMAL) { --- mc-4.6.1a/src/wtools.c.utf8 2005-02-08 23:33:52.000000000 +0100 -+++ mc-4.6.1a/src/wtools.c 2005-03-24 15:02:11.243337776 +0100 ++++ mc-4.6.1a/src/wtools.c 2005-05-05 09:32:02.738560464 +0200 @@ -49,11 +49,11 @@ create_listbox_window (int cols, int lin /* Adjust sizes */ lines = (lines > LINES - 6) ? LINES - 6 : lines; @@ -4347,7 +4348,7 @@ #endif /* ENABLE_NLS */ --- mc-4.6.1a/src/find.c.utf8 2005-02-08 23:33:52.000000000 +0100 -+++ mc-4.6.1a/src/find.c 2005-03-24 15:02:11.244337624 +0100 ++++ mc-4.6.1a/src/find.c 2005-05-05 09:32:02.739560312 +0200 @@ -217,7 +217,7 @@ find_parameters (char **start_dir, char int l1, maxlen = 0; @@ -4387,7 +4388,7 @@ i18n_flag = 1; } --- mc-4.6.1a/src/widget.h.utf8 2005-02-08 10:58:40.000000000 +0100 -+++ mc-4.6.1a/src/widget.h 2005-03-24 15:02:11.245337472 +0100 ++++ mc-4.6.1a/src/widget.h 2005-05-05 09:32:02.740560160 +0200 @@ -22,6 +22,7 @@ typedef struct WButton { char *text; /* text of button */ int hotkey; /* hot KEY */ @@ -4431,7 +4432,7 @@ int need_push; /* need to push the current Input on hist? */ char **completions; /* Possible completions array */ --- mc-4.6.1a/src/boxes.c.utf8 2005-02-08 10:04:03.000000000 +0100 -+++ mc-4.6.1a/src/boxes.c 2005-03-24 15:02:11.246337320 +0100 ++++ mc-4.6.1a/src/boxes.c 2005-05-05 09:32:02.742559856 +0200 @@ -153,23 +153,23 @@ display_init (int radio_sel, char *init_ display_title = _(display_title); for (i = 0; i < LIST_TYPES; i++) { @@ -4605,7 +4606,7 @@ i18n_flag = 1; } --- mc-4.6.1a/src/achown.c.utf8 2005-03-17 23:03:31.000000000 +0100 -+++ mc-4.6.1a/src/achown.c 2005-03-24 15:02:11.247337168 +0100 ++++ mc-4.6.1a/src/achown.c 2005-05-05 09:32:02.743559704 +0200 @@ -579,6 +579,12 @@ init_chown_advanced (void) b_att[2] = button_new (XTRACT (6)); b_user = button_new (XTRACT (5)); @@ -4620,7 +4621,7 @@ add_widget (ch_dlg, b_group); add_widget (ch_dlg, b_user); --- mc-4.6.1a/src/menu.c.utf8 2005-02-08 10:04:03.000000000 +0100 -+++ mc-4.6.1a/src/menu.c 2005-03-24 15:02:11.248337016 +0100 ++++ mc-4.6.1a/src/menu.c 2005-05-05 09:32:02.744559552 +0200 @@ -22,6 +22,7 @@ #include @@ -4824,7 +4825,7 @@ g_free (menu->help_node); g_free (menu); --- mc-4.6.1a/src/option.c.utf8 2005-02-08 10:04:03.000000000 +0100 -+++ mc-4.6.1a/src/option.c 2005-03-24 15:02:11.249336864 +0100 ++++ mc-4.6.1a/src/option.c 2005-05-05 09:32:02.745559400 +0200 @@ -123,12 +123,12 @@ init_configure (void) title2 = _(" Pause after run... "); title3 = _(" Other options "); @@ -4873,7 +4874,7 @@ i18n_config_flag = 1; } --- mc-4.6.1a/src/filegui.c.utf8 2005-02-08 10:04:03.000000000 +0100 -+++ mc-4.6.1a/src/filegui.c 2005-03-24 15:02:11.251336560 +0100 ++++ mc-4.6.1a/src/filegui.c 2005-05-05 09:32:02.746559248 +0200 @@ -65,6 +65,7 @@ #include "filegui.h" #include "key.h" /* get_event */ @@ -5019,8 +5020,8 @@ + g_free(def_text); return dest_dir; } ---- mc-4.6.1a/acinclude.m4.utf8 2005-03-19 22:53:24.000000000 +0100 -+++ mc-4.6.1a/acinclude.m4 2005-03-24 15:26:09.502689120 +0100 +--- mc-4.6.1a/acinclude.m4.utf8 2005-04-26 19:29:58.000000000 +0200 ++++ mc-4.6.1a/acinclude.m4 2005-05-05 09:32:02.747559096 +0200 @@ -769,14 +769,14 @@ AC_DEFUN([MC_WITH_SLANG], [ fi Index: mc.spec =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- mc.spec 4 Apr 2005 07:29:29 -0000 1.53 +++ mc.spec 5 May 2005 07:56:54 -0000 1.54 @@ -1,12 +1,12 @@ Summary: User-friendly text console file manager and visual shell. Name: mc Version: 4.6.1a -Release: 0.8 +Release: 0.9 Epoch: 1 License: GPL Group: System Environment/Shells #Source0: http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-%{version}.tar.gz -%define date 20050324 +%define date 20050504 Source0: mc-%{version}-%{date}.tar.bz2 URL: http://www.ibiblio.org/mc/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -174,6 +174,12 @@ %dir %{_datadir}/mc %changelog +* Thu May 04 2005 Jindrich Novy 4.6.1a-0.9 +- update from CVS +- sync with .utf8 patch +- fix broken charset conversion feature in the .utf8 patch, + Andrew V. Samoilov (#154516) + * Mon Apr 04 2005 Jindrich Novy 4.6.1a-0.8 - fix truncation to lower 32bits in statfs (src/mountlist.c) From fedora-cvs-commits at redhat.com Thu May 5 08:03:24 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 04:03:24 -0400 Subject: rpms/mc/devel .cvsignore,1.18,1.19 sources,1.20,1.21 Message-ID: <200505050803.j4583OeF029170@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29156 Modified Files: .cvsignore sources Log Message: - upload the new source tarball Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mc/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 24 Mar 2005 14:42:47 -0000 1.18 +++ .cvsignore 5 May 2005 08:03:22 -0000 1.19 @@ -10,3 +10,4 @@ mc-4.6.1a-20050202.tar.bz2 mc-4.6.1a-20050309.tar.bz2 mc-4.6.1a-20050324.tar.bz2 +mc-4.6.1a-20050504.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/mc/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 24 Mar 2005 14:42:47 -0000 1.20 +++ sources 5 May 2005 08:03:22 -0000 1.21 @@ -1 +1 @@ -5dcc9c6202cfdbd09f872a3f8a273faa mc-4.6.1a-20050324.tar.bz2 +0b513e4ddd5ac05d7ab444b6465f92d9 mc-4.6.1a-20050504.tar.bz2 From fedora-cvs-commits at redhat.com Thu May 5 08:46:02 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 04:46:02 -0400 Subject: rpms/gnutls/FC-3 gnutls-1.0.20-can-2005-1431.patch, NONE, 1.1 gnutls.spec, 1.3, 1.4 Message-ID: <200505050846.j458k2LZ029597@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/gnutls/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv29583 Modified Files: gnutls.spec Added Files: gnutls-1.0.20-can-2005-1431.patch Log Message: * Thu May 5 2005 Tomas Mraz 1.0.20-3.1.1 - fixed possible DOS attack - CAN-2005-1431 (#156857) gnutls-1.0.20-can-2005-1431.patch: gnutls_cipher.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gnutls-1.0.20-can-2005-1431.patch --- Corrected bug in record packet parsing that could lead to a denial of service attack. --- /cvs/gnutls/gnutls/lib/gnutls_cipher.c 2004/02/27 17:51:58 2.70.2.4 +++ /cvs/gnutls/gnutls/lib/gnutls_cipher.c 2005/04/27 17:43:56 2.70.2.5 @@ -448,7 +448,7 @@ /* Check the pading bytes (TLS 1.x) */ - if ( ver >= GNUTLS_TLS1) + if ( ver >= GNUTLS_TLS1 && pad_failed==0) for (i=2;i 1.0.20-3.1.1 +- fixed possible DOS attack - CAN-2005-1431 (#156857) + * Tue Sep 21 2004 Jeff Johnson 1.0.20-3 - rebuild with release++, otherwise unchanged. From fedora-cvs-commits at redhat.com Thu May 5 11:26:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 07:26:04 -0400 Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 1.11, 1.12 Message-ID: <200505051126.j45BQ4rU009021@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-digester/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8937/jakarta-commons-digester/devel Modified Files: jakarta-commons-digester.spec Log Message: Add dependencies for %post and %postun scriptlets (#156901) Index: jakarta-commons-digester.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jakarta-commons-digester.spec 4 May 2005 11:39:04 -0000 1.11 +++ jakarta-commons-digester.spec 5 May 2005 11:26:02 -0000 1.12 @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 1.6 -%define release 2jpp_2fc +%define release 2jpp_3fc %define section free Name: %{name} @@ -12,8 +12,6 @@ Summary: Jakarta Commons Digester Package License: Apache Software License Group: Development/Libraries/Java -#Vendor: JPackage Project -#Distribution: JPackage Source0: http://www.apache.org/dist/jakarta/commons/digester/source/commons-digester-%{version}-src.tar.gz URL: http://jakarta.apache.org/commons/digester/ BuildRequires: ant @@ -21,14 +19,17 @@ BuildRequires: jakarta-commons-collections >= 0:3.0 BuildRequires: jakarta-commons-logging >= 0:1.0 BuildRequires: jpackage-utils > 0:1.5 -BuildRequires: gcc-java >= 4.0.0-0.43 Requires: jakarta-commons-beanutils >= 0:1.3 Requires: jakarta-commons-collections >= 0:3.0 Requires: jakarta-commons-logging >= 0:1.0 -ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot # RHEL3 and FC2 Obsoletes: %{short_name} <= 1.4.1 +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: i386 x86_64 ppc %description The goal of Digester project is to create and maintain a XML -> Java @@ -129,6 +130,9 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Thu May 5 2005 Gary Benson - 0:1.6-2jpp_3fc +- Add dependencies for %post and %postun scriptlets (#156901). + * Wed May 4 2005 Gary Benson - 0:1.6-2jpp_2fc - BC-compile the main jarfile. From fedora-cvs-commits at redhat.com Thu May 5 11:26:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 07:26:04 -0400 Subject: rpms/ant/devel ant.spec,1.33,1.34 Message-ID: <200505051126.j45BQ4OJ008997@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/ant/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8937/ant/devel Modified Files: ant.spec Log Message: Add dependencies for %post and %postun scriptlets (#156901) Index: ant.spec =================================================================== RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ant.spec 29 Apr 2005 11:28:41 -0000 1.33 +++ ant.spec 5 May 2005 11:26:02 -0000 1.34 @@ -3,7 +3,7 @@ Name: ant Version: 1.6.2 -Release: 3jpp_5fc +Release: 3jpp_6fc Epoch: 0 Summary: Ant build tool for java Summary(it): Tool per la compilazione di programmi java @@ -11,8 +11,6 @@ License: Apache Software License URL: http://ant.apache.org/ Group: Development/Build Tools -#Vendor: JPackage Project -#Distribution: JPackage Source0: http://www.apache.org/dist/ant/source/apache-ant-1.6.2-src.tar.gz # Ant configuration file which is edited when each optional subpackage # is installed/uninstalled @@ -28,12 +26,15 @@ BuildRequires: jaxp_parser_impl BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: java-devel -BuildRequires: gcc-java >= 4.0.0-0.43 -ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Obsoletes: ant-optional ant-optional-full -# RHUG -Obsoletes: ant-devel ant-libs ant-core +# RHEL3 and FC2 +Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2 +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: i386 x86_64 ppc %description Ant is a platform-independent build tool for java. It's used by apache @@ -626,6 +627,9 @@ # ----------------------------------------------------------------------------- %changelog +* Thu May 5 2005 Gary Benson 0:1.6.2-3jpp_6fc +- Add dependencies for %post and %postun scriptlets (#156901). + * Fri Apr 29 2005 Gary Benson 0:1.6.2-3jpp_5fc - BC-compile the two core jars. - Own /usr/share/java/ant. From fedora-cvs-commits at redhat.com Thu May 5 11:26:05 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 07:26:05 -0400 Subject: rpms/tomcat5/devel tomcat5.spec,1.14,1.15 Message-ID: <200505051126.j45BQ5Ga009053@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8937/tomcat5/devel Modified Files: tomcat5.spec Log Message: Add dependencies for %post and %postun scriptlets (#156901) Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- tomcat5.spec 4 May 2005 10:14:22 -0000 1.14 +++ tomcat5.spec 5 May 2005 11:26:03 -0000 1.15 @@ -2,7 +2,7 @@ %define full_name jakarta-%{name} %define version 5.0.30 %define majversion 5.0 -%define release 5jpp_2fc +%define release 5jpp_3fc %define section free %define summary Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API @@ -125,8 +125,11 @@ BuildRequires: xerces-j2 >= 0:2.6.2 BuildRequires: xml-commons-apis BuildRequires: jakarta-taglibs-standard >= 0:1.1.0 -BuildRequires: gcc-java >= 4.0.0-0.43 -ExclusiveArch: i386 x86_64 ppc +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: i386 x86_64 ppc %description Server that conforms to the Servlet 2.4 and JSP 2.0 @@ -143,6 +146,8 @@ Obsoletes: servletapi5 Provides: servletapi5 Summary: Java servlet and JSP API classes +# libgcj aot-compiled native libraries +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh %description servlet-2.4-api This subproject contains the source code for the implementation classes @@ -170,6 +175,8 @@ Obsoletes: jasper5 Provides: jasper5 Summary: Apache JSP Engine, RI for Servlet JSP 2.0 API +# libgcj aot-compiled native libraries +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh %description jasper JSP engine that conforms to the JSP 2.0 @@ -870,6 +877,9 @@ %{serverdir}/webapps/* %changelog +* Thu May 5 2005 Gary Benson 0:5.0.30-5jpp_3fc +- Add dependencies for %post and %postun scriptlets (#156901). + * Wed May 4 2005 Gary Benson 0:5.0.30-5jpp_2fc - BC-compile. From fedora-cvs-commits at redhat.com Thu May 5 11:26:05 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 07:26:05 -0400 Subject: rpms/xerces-j2/devel xerces-j2.spec,1.15,1.16 Message-ID: <200505051126.j45BQ5Oj009062@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/xerces-j2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8937/xerces-j2/devel Modified Files: xerces-j2.spec Log Message: Add dependencies for %post and %postun scriptlets (#156901) Index: xerces-j2.spec =================================================================== RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xerces-j2.spec 29 Apr 2005 12:55:01 -0000 1.15 +++ xerces-j2.spec 5 May 2005 11:26:03 -0000 1.16 @@ -1,7 +1,7 @@ %define name xerces-j2 %define version 2.6.2 %define cvs_version 2_6_2 -%define release 4jpp_4fc +%define release 4jpp_5fc %define section free Name: %{name} @@ -29,11 +29,14 @@ BuildRequires: xml-commons-resolver BuildRequires: xml-commons-apis BuildRequires: coreutils -BuildRequires: gcc-java >= 4.0.0-0.43 -ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot # RHEL3 and FC2 Obsoletes: xerces-j <= 0:2.2 +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: i386 x86_64 ppc %description Welcome to the future! Xerces2 is the next generation of high @@ -280,6 +283,9 @@ %changelog +* Thu May 5 2005 Gary Benson 0:2.6.2-4jpp_5fc +- Add dependencies for %post and %postun scriptlets (#156901). + * Fri Apr 29 2005 Gary Benson 0:2.6.2-4jpp_4fc - BC-compile. From fedora-cvs-commits at redhat.com Thu May 5 11:26:05 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 07:26:05 -0400 Subject: rpms/xml-commons/devel xml-commons.spec,1.14,1.15 Message-ID: <200505051126.j45BQ5b7009069@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/xml-commons/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8937/xml-commons/devel Modified Files: xml-commons.spec Log Message: Add dependencies for %post and %postun scriptlets (#156901) Index: xml-commons.spec =================================================================== RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xml-commons.spec 3 May 2005 16:24:23 -0000 1.14 +++ xml-commons.spec 5 May 2005 11:26:03 -0000 1.15 @@ -3,7 +3,7 @@ Summary: Common code for XML projects Name: xml-commons Version: 1.0 -Release: 0.b2.6jpp_11fc +Release: 0.b2.6jpp_12fc Epoch: 0 License: Apache Software License URL: http://xml.apache.org/commons/ @@ -15,12 +15,12 @@ Requires: jpackage-utils >= 0:1.5 BuildRequires: ant, jpackage-utils >= 0:1.5 BuildRequires: coreutils -BuildRequires: gcc-java >= 4.0.0-0.43 -ExclusiveArch: i386 x86_64 ppc Group: Text Processing/Markup/XML BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -#Vendor: JPackage Project -#Distribution: JPackage +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: i386 x86_64 ppc %description xml-commons is focused on common code and guidelines for xml projects. @@ -36,6 +36,8 @@ Summary: APIs subproject of %{name} Group: Text Processing/Markup/XML Requires: %{name} = %{epoch}:%{version}-%{release} +# libgcj aot-compiled native libraries +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh %description apis APIs subproject of %{name}. @@ -203,6 +205,9 @@ # ----------------------------------------------------------------------------- %changelog +* Thu May 5 2005 Gary Benson - 0:1.0-0.b2.6jpp_12fc +- Add dependencies for %post and %postun scriptlets (#156901). + * Tue May 3 2005 Gary Benson - 0:1.0-0.b2.6jpp_11fc - BC-compile the API jar. From fedora-cvs-commits at redhat.com Thu May 5 11:26:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 07:26:04 -0400 Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec, 1.11, 1.12 Message-ID: <200505051126.j45BQ4EH009006@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8937/jakarta-commons-beanutils/devel Modified Files: jakarta-commons-beanutils.spec Log Message: Add dependencies for %post and %postun scriptlets (#156901) Index: jakarta-commons-beanutils.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jakarta-commons-beanutils.spec 4 May 2005 12:51:06 -0000 1.11 +++ jakarta-commons-beanutils.spec 5 May 2005 11:26:02 -0000 1.12 @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 1.7.0 -%define release 1jpp_2fc +%define release 1jpp_3fc %define section free Name: %{name} @@ -12,8 +12,6 @@ Summary: Jakarta Commons BeanUtils Package License: Apache Software License Group: Development/Libraries/Java -#Vendor: JPackage Project -#Distribution: JPackage Source0: http://www.apache.org/dist/jakarta/commons/beanutils/source/commons-beanutils-1.7.0-src.tar.gz Url: http://jakarta.apache.org/commons/%{base_name}/ BuildRequires: ant @@ -21,14 +19,16 @@ BuildRequires: jakarta-commons-logging >= 0:1.0 BuildRequires: jpackage-utils > 0:1.5 BuildRequires: coreutils -BuildRequires: gcc-java >= 4.0.0-0.43 - Requires: jakarta-commons-collections >= 0:2.0 Requires: jakarta-commons-logging >= 0:1.0 -ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot # RHEL3 and FC2 Obsoletes: %{short_name} <= 1.6.1 +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: i386 x86_64 ppc %description The scope of this package is to create a package of Java utility methods @@ -120,6 +120,9 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Thu May 5 2005 Gary Benson - 0:1.7.0-1jpp_3fc +- Add dependencies for %post and %postun scriptlets (#156901). + * Wed May 4 2005 Gary Benson - 0:1.7.0-1jpp_2fc - BC-compile. From fedora-cvs-commits at redhat.com Thu May 5 11:26:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 07:26:04 -0400 Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec, 1.9, 1.10 Message-ID: <200505051126.j45BQ499009038@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-modeler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8937/jakarta-commons-modeler/devel Modified Files: jakarta-commons-modeler.spec Log Message: Add dependencies for %post and %postun scriptlets (#156901) Index: jakarta-commons-modeler.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jakarta-commons-modeler.spec 4 May 2005 11:15:39 -0000 1.9 +++ jakarta-commons-modeler.spec 5 May 2005 11:26:02 -0000 1.10 @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 1.1 -%define release 3jpp_2fc +%define release 3jpp_3fc %define section free Name: %{name} @@ -12,8 +12,6 @@ Summary: Jakarta Commons Modeler Package License: Apache Software License Group: Development/Libraries/Java -#Vendor: JPackage Project -#Distribution: JPackage Source0: %{base_name}-%{version}-src.tar.gz #Patch: %{name}.no-licence.build.patch Url: http://jakarta.apache.org/commons/%{base_name} @@ -27,7 +25,6 @@ BuildRequires: jakarta-commons-collections >= 2.0 BuildRequires: jakarta-commons-digester >= 1.2 BuildRequires: jakarta-commons-logging >= 1.0 -BuildRequires: gcc-java >= 4.0.0-0.43 Requires: jaxp_parser_impl Requires: xml-commons-apis Requires: jaxp_transform_impl @@ -36,10 +33,14 @@ Requires: jakarta-commons-collections >= 2.0 Requires: jakarta-commons-digester >= 1.2 Requires: jakarta-commons-logging >= 1.0 -ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot -Provides: %{short_name} -Obsoletes: %{short_name} +# RHEL3 and FC2 +Obsoletes: %{short_name} <= 0:1.0 +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: i386 x86_64 ppc %description The Modeler project shall create and maintain a set of Java @@ -124,6 +125,9 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Thu May 5 2005 Gary Benson - 0:1.1-3jpp_3fc +- Add dependencies for %post and %postun scriptlets (#156901). + * Wed May 4 2005 Gary Benson - 0:1.1-3jpp_2fc - BC-compile. From fedora-cvs-commits at redhat.com Thu May 5 11:26:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 07:26:04 -0400 Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec, 1.12, 1.13 Message-ID: <200505051126.j45BQ4w8009029@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-logging/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8937/jakarta-commons-logging/devel Modified Files: jakarta-commons-logging.spec Log Message: Add dependencies for %post and %postun scriptlets (#156901) Index: jakarta-commons-logging.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jakarta-commons-logging.spec 4 May 2005 13:24:27 -0000 1.12 +++ jakarta-commons-logging.spec 5 May 2005 11:26:02 -0000 1.13 @@ -6,23 +6,24 @@ Name: %{name} Version: 1.0.4 -Release: 2jpp_2fc +Release: 2jpp_3fc Epoch: 0 Summary: Jakarta Commons Logging Package License: Apache Software License Group: Development/Libraries/Java -#Distribution: JPackage -#Vendor: JPackage Project URL: http://jakarta.apache.org/commons/%{base_name}/ Source0: http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-1.0.4-src.tar.gz BuildRequires: ant, jpackage-utils >= 0:1.5, log4j, avalon-logkit, avalon-framework, junit BuildRequires: coreutils -BuildRequires: gcc-java >= 4.0.0-0.43 Patch1: %{name}-junitclasspath.patch -ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot # RHEL3 and FC2 Obsoletes: %{short_name} <= 0:1.0.2 +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: i386 x86_64 ppc %description The commons-logging package provides a simple, component oriented @@ -147,6 +148,9 @@ # ----------------------------------------------------------------------------- %changelog +* Thu May 5 2005 Gary Benson - 0:1.0.4-2jpp_3fc +- Add dependencies for %post and %postun scriptlets (#156901). + * Wed May 4 2005 Gary Benson - 0:1.0.4-2jpp_2fc - BC-compile. From fedora-cvs-commits at redhat.com Thu May 5 11:26:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 07:26:04 -0400 Subject: rpms/jakarta-commons-collections/devel jakarta-commons-collections.spec, 1.12, 1.13 Message-ID: <200505051126.j45BQ4I8009013@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-collections/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8937/jakarta-commons-collections/devel Modified Files: jakarta-commons-collections.spec Log Message: Add dependencies for %post and %postun scriptlets (#156901) Index: jakarta-commons-collections.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jakarta-commons-collections.spec 4 May 2005 13:09:33 -0000 1.12 +++ jakarta-commons-collections.spec 5 May 2005 11:26:02 -0000 1.13 @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 3.1 -%define release 1jpp_2fc +%define release 1jpp_3fc %define section free %define with_tests %{?_with_tests:1}%{!?_without_tests:0} @@ -13,8 +13,6 @@ Summary: Jakarta Commons Collections Package License: Apache Software License v2 Group: Development/Libraries/Java -#Vendor: JPackage Project -#Distribution: JPackage Source0: http://www.apache.org/dist/jakarta/commons/collections/source/commons-collections-3.1-src.tar.gz Patch1: %{name}-javadoc-nonet.patch Url: http://jakarta.apache.org/commons/%{base_name}/ @@ -22,11 +20,14 @@ BuildRequires: ant-junit BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: coreutils -BuildRequires: gcc-java >= 4.0.0-0.43 -ExclusiveArch: i386 x86_64 ppc BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot # RHEL3 and FC2 Obsoletes: %{short_name} <= 0:2.1 +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: i386 x86_64 ppc %description The introduction of the Collections API by Sun in JDK 1.2 has been a @@ -130,6 +131,9 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Thu May 5 2005 Gary Benson - 0:3.1-1jpp_3fc +- Add dependencies for %post and %postun scriptlets (#156901). + * Wed May 4 2005 Gary Benson - 0:3.1-1jpp_2fc - BC-compile. - Do not fetch stuff from sun.com during javadoc generation. From fedora-cvs-commits at redhat.com Thu May 5 11:26:05 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 07:26:05 -0400 Subject: rpms/mx4j/devel mx4j.spec,1.13,1.14 Message-ID: <200505051126.j45BQ5fB009045@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/mx4j/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8937/mx4j/devel Modified Files: mx4j.spec Log Message: Add dependencies for %post and %postun scriptlets (#156901) Index: mx4j.spec =================================================================== RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mx4j.spec 29 Apr 2005 16:56:21 -0000 1.13 +++ mx4j.spec 5 May 2005 11:26:02 -0000 1.14 @@ -1,6 +1,6 @@ %define name mx4j %define version 2.1.0 -%define release 1jpp_5fc +%define release 1jpp_6fc %define section free %define use_nonfree %{?_with_nonfree:1}%{!?_without_nonfree:0} @@ -13,8 +13,6 @@ Summary: Open source implementation of JMX Java API License: Apache License Group: Development/Libraries/Java -#Vendor: JPackage Project -#Distribution: JPackage Source0: %{name}-%{version}-src.tar.gz Source1: %{name}-build.policy Source2: CatalogManager.properties @@ -63,8 +61,6 @@ BuildRequires: xml-commons-resolver BuildRequires: xml-commons #BuildRequires: xmlunit -BuildRequires: gcc-java >= 4.0.0-0.43 -ExclusiveArch: i386 x86_64 ppc Requires: /usr/sbin/update-alternatives Requires: jaf Requires: javamail >= 1.2-5jpp @@ -83,6 +79,11 @@ Buildroot: %{_tmppath}/%{name}-%{version}-buildroot Obsoletes: openjmx Provides: jmxri +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: i386 x86_64 ppc %description OpenJMX is an open source implementation of the @@ -259,6 +260,9 @@ %doc dist/docs/* %changelog +* Thu May 5 2005 Gary Benson 0:2.1.0-1jpp_6fc +- Add dependencies for %post and %postun scriptlets (#156901). + * Fri Apr 29 2005 Gary Benson 0:2.1.0-1jpp_5fc - BC-compile the combined jarfile. From fedora-cvs-commits at redhat.com Thu May 5 12:02:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 08:02:00 -0400 Subject: rpms/a2ps/devel a2ps-U.patch,NONE,1.1 a2ps.spec,1.25,1.26 Message-ID: <200505051202.j45C20Fm006666@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/a2ps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6652 Modified Files: a2ps.spec Added Files: a2ps-U.patch Log Message: * Thu May 5 2005 Tim Waugh 4.13b-47 - Make pdiff use diff(1) properly (bug #156916). a2ps-U.patch: pdiff.in | 2 +- pdiff.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE a2ps-U.patch --- --- a2ps-4.13/contrib/pdiff.in.U 2005-05-05 12:46:05.000000000 +0100 +++ a2ps-4.13/contrib/pdiff.in 2005-05-05 12:47:34.000000000 +0100 @@ -182,7 +182,7 @@ # We need the total number of lines lines=`wc -l $file1 $file2 | sed -n 3p` lines=`set -- $lines && echo $1` - $diff_prog $diff_options -$lines $file1 $file2 \ + $diff_prog $diff_options -U$lines $file1 $file2 \ | $a2ps -gEudiff $a2ps_options || exit 1 ;; esac --- a2ps-4.13/contrib/pdiff.m4.U 2005-05-05 12:47:54.000000000 +0100 +++ a2ps-4.13/contrib/pdiff.m4 2005-05-05 12:53:10.000000000 +0100 @@ -100,7 +100,7 @@ # We need the total number of lines lines=`wc -l $file1 $file2 | sed -n 3p` lines=`set -- $lines && echo $1` - $diff_prog $diff_options -$lines $file1 $file2 \ + $diff_prog $diff_options -U$lines $file1 $file2 \ | $a2ps -gEudiff $a2ps_options || exit 1 ;; esac Index: a2ps.spec =================================================================== RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- a2ps.spec 23 Mar 2005 16:14:53 -0000 1.25 +++ a2ps.spec 5 May 2005 12:01:58 -0000 1.26 @@ -1,5 +1,5 @@ %define ver 4.13b -%define rel 46 +%define rel 47 Summary: Converts text and other types of files to PostScript(TM). Name: a2ps @@ -35,6 +35,7 @@ Patch26: a2ps-make-fonts-map.patch Patch27: a2ps-netscape.patch Patch28: a2ps-wdiff.patch +Patch29: a2ps-U.patch Requires: fileutils sh-utils info BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo Url: http://www.inf.enst.fr/~demaille/a2ps/ @@ -112,6 +113,9 @@ # Make pdiff default to not requiring wdiff (bug #68537). %patch28 -p1 -b .wdiff +# Make pdiff use diff(1) properly (bug #156916). +%patch29 -p1 -b .U + # Fix reference to a2ps binary (bug #112930). perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el libtoolize --copy --force @@ -222,6 +226,9 @@ %dir %{_datadir}/a2ps %changelog +* Thu May 5 2005 Tim Waugh 4.13b-47 +- Make pdiff use diff(1) properly (bug #156916). + * Wed Mar 23 2005 Tim Waugh 4.13b-46 - Make pdiff default to not requiring wdiff (bug #68537). From fedora-cvs-commits at redhat.com Thu May 5 13:07:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:07:51 -0400 Subject: rpms/jakarta-commons-collections/devel jakarta-commons-collections.spec, 1.13, 1.14 Message-ID: <200505051307.j45D7pdE000933@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-collections/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv860/jakarta-commons-collections/devel Modified Files: jakarta-commons-collections.spec Log Message: Use %{ix86} not i386 (Thanks Joe) Index: jakarta-commons-collections.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jakarta-commons-collections.spec 5 May 2005 11:26:02 -0000 1.13 +++ jakarta-commons-collections.spec 5 May 2005 13:07:49 -0000 1.14 @@ -27,7 +27,7 @@ BuildRequires: gcc-java >= 4.0.0-0.43 BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description The introduction of the Collections API by Sun in JDK 1.2 has been a From fedora-cvs-commits at redhat.com Thu May 5 13:07:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:07:51 -0400 Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec, 1.12, 1.13 Message-ID: <200505051307.j45D7pFS000925@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv860/jakarta-commons-beanutils/devel Modified Files: jakarta-commons-beanutils.spec Log Message: Use %{ix86} not i386 (Thanks Joe) Index: jakarta-commons-beanutils.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jakarta-commons-beanutils.spec 5 May 2005 11:26:02 -0000 1.12 +++ jakarta-commons-beanutils.spec 5 May 2005 13:07:48 -0000 1.13 @@ -28,7 +28,7 @@ BuildRequires: gcc-java >= 4.0.0-0.43 BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description The scope of this package is to create a package of Java utility methods From fedora-cvs-commits at redhat.com Thu May 5 13:07:50 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:07:50 -0400 Subject: rpms/ant/devel ant.spec,1.34,1.35 Message-ID: <200505051307.j45D7orX000917@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/ant/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv860/ant/devel Modified Files: ant.spec Log Message: Use %{ix86} not i386 (Thanks Joe) Index: ant.spec =================================================================== RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ant.spec 5 May 2005 11:26:02 -0000 1.34 +++ ant.spec 5 May 2005 13:07:48 -0000 1.35 @@ -34,7 +34,7 @@ BuildRequires: gcc-java >= 4.0.0-0.43 BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description Ant is a platform-independent build tool for java. It's used by apache From fedora-cvs-commits at redhat.com Thu May 5 13:07:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:07:51 -0400 Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 1.12, 1.13 Message-ID: <200505051307.j45D7pwo000942@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-digester/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv860/jakarta-commons-digester/devel Modified Files: jakarta-commons-digester.spec Log Message: Use %{ix86} not i386 (Thanks Joe) Index: jakarta-commons-digester.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jakarta-commons-digester.spec 5 May 2005 11:26:02 -0000 1.12 +++ jakarta-commons-digester.spec 5 May 2005 13:07:49 -0000 1.13 @@ -29,7 +29,7 @@ BuildRequires: gcc-java >= 4.0.0-0.43 BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description The goal of Digester project is to create and maintain a XML -> Java From fedora-cvs-commits at redhat.com Thu May 5 13:07:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:07:51 -0400 Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec, 1.13, 1.14 Message-ID: <200505051307.j45D7p6U000950@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-logging/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv860/jakarta-commons-logging/devel Modified Files: jakarta-commons-logging.spec Log Message: Use %{ix86} not i386 (Thanks Joe) Index: jakarta-commons-logging.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jakarta-commons-logging.spec 5 May 2005 11:26:02 -0000 1.13 +++ jakarta-commons-logging.spec 5 May 2005 13:07:49 -0000 1.14 @@ -23,7 +23,7 @@ BuildRequires: gcc-java >= 4.0.0-0.43 BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description The commons-logging package provides a simple, component oriented From fedora-cvs-commits at redhat.com Thu May 5 13:07:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:07:51 -0400 Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec, 1.10, 1.11 Message-ID: <200505051307.j45D7pL3000963@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-modeler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv860/jakarta-commons-modeler/devel Modified Files: jakarta-commons-modeler.spec Log Message: Use %{ix86} not i386 (Thanks Joe) Index: jakarta-commons-modeler.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jakarta-commons-modeler.spec 5 May 2005 11:26:02 -0000 1.10 +++ jakarta-commons-modeler.spec 5 May 2005 13:07:49 -0000 1.11 @@ -40,7 +40,7 @@ BuildRequires: gcc-java >= 4.0.0-0.43 BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description The Modeler project shall create and maintain a set of Java From fedora-cvs-commits at redhat.com Thu May 5 13:07:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:07:52 -0400 Subject: rpms/tomcat5/devel tomcat5.spec,1.15,1.16 Message-ID: <200505051307.j45D7pFS000991@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv860/tomcat5/devel Modified Files: tomcat5.spec Log Message: Use %{ix86} not i386 (Thanks Joe) Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- tomcat5.spec 5 May 2005 11:26:03 -0000 1.15 +++ tomcat5.spec 5 May 2005 13:07:49 -0000 1.16 @@ -129,7 +129,7 @@ BuildRequires: gcc-java >= 4.0.0-0.43 BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description Server that conforms to the Servlet 2.4 and JSP 2.0 From fedora-cvs-commits at redhat.com Thu May 5 13:07:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:07:52 -0400 Subject: rpms/xerces-j2/devel xerces-j2.spec,1.16,1.17 Message-ID: <200505051307.j45D7qlh001005@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/xerces-j2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv860/xerces-j2/devel Modified Files: xerces-j2.spec Log Message: Use %{ix86} not i386 (Thanks Joe) Index: xerces-j2.spec =================================================================== RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xerces-j2.spec 5 May 2005 11:26:03 -0000 1.16 +++ xerces-j2.spec 5 May 2005 13:07:49 -0000 1.17 @@ -36,7 +36,7 @@ BuildRequires: gcc-java >= 4.0.0-0.43 BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description Welcome to the future! Xerces2 is the next generation of high From fedora-cvs-commits at redhat.com Thu May 5 13:07:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:07:52 -0400 Subject: rpms/mx4j/devel mx4j.spec,1.14,1.15 Message-ID: <200505051307.j45D7q4W000970@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/mx4j/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv860/mx4j/devel Modified Files: mx4j.spec Log Message: Use %{ix86} not i386 (Thanks Joe) Index: mx4j.spec =================================================================== RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mx4j.spec 5 May 2005 11:26:02 -0000 1.14 +++ mx4j.spec 5 May 2005 13:07:49 -0000 1.15 @@ -83,7 +83,7 @@ BuildRequires: gcc-java >= 4.0.0-0.43 BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description OpenJMX is an open source implementation of the From fedora-cvs-commits at redhat.com Thu May 5 13:07:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:07:52 -0400 Subject: rpms/xml-commons/devel xml-commons.spec,1.15,1.16 Message-ID: <200505051307.j45D7qwM001013@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/xml-commons/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv860/xml-commons/devel Modified Files: xml-commons.spec Log Message: Use %{ix86} not i386 (Thanks Joe) Index: xml-commons.spec =================================================================== RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xml-commons.spec 5 May 2005 11:26:03 -0000 1.15 +++ xml-commons.spec 5 May 2005 13:07:49 -0000 1.16 @@ -20,7 +20,7 @@ # libgcj aot-compiled native libraries BuildRequires: gcc-java >= 4.0.0-0.43 BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh -ExclusiveArch: i386 x86_64 ppc +ExclusiveArch: %{ix86} x86_64 ppc %description xml-commons is focused on common code and guidelines for xml projects. From fedora-cvs-commits at redhat.com Thu May 5 13:19:07 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 09:19:07 -0400 Subject: rpms/regexp/devel .cvsignore,1.3,1.4 regexp.spec,1.10,1.11 Message-ID: <200505051319.j45DJ75U004355@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/regexp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4342 Modified Files: .cvsignore regexp.spec Log Message: BC-compile Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/regexp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Oct 2004 13:55:30 -0000 1.3 +++ .cvsignore 5 May 2005 13:19:04 -0000 1.4 @@ -1,5 +1,5 @@ jakarta-regexp-1.3.tar.gz jakarta-regexp-1.3 -noarch +i386 *.src.rpm Index: regexp.spec =================================================================== RCS file: /cvs/dist/rpms/regexp/devel/regexp.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- regexp.spec 11 Jan 2005 15:00:42 -0000 1.10 +++ regexp.spec 5 May 2005 13:19:04 -0000 1.11 @@ -1,7 +1,7 @@ %define name regexp %define full_name jakarta-%{name} %define version 1.3 -%define release 1jpp_4fc +%define release 1jpp_5fc %define section free Name: %{name} @@ -11,17 +11,19 @@ Summary: Simple regular expressions API License: Apache Software License Group: Development/Libraries/Java -#Distribution: JPackage -#Vendor: JPackage Project Url: http://jakarta.apache.org/%{name}/ Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz BuildRequires: ant BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: coreutils -Buildarch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-buildroot # RHEL3 and FC2 Obsoletes: %{full_name} <= 0:1.2 +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: %{ix86} x86_64 ppc %description Regexp is a 100% Pure Java Regular Expression package that was @@ -48,6 +50,11 @@ mkdir lib ant -Djakarta-site2.dir=. jar javadocs +aot-compile \ + build/%{full_name}-%{version}.jar \ + lib%{name}-%{version}.jar.so \ + "$RPM_OPT_FLAGS -fPIC" + %install # jars @@ -58,6 +65,17 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} rm -rf docs/api +# solibs +install -d -m 755 $RPM_BUILD_ROOT%{_libdir} +install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir} +ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so +# gcjdb +gcjdbdir=`gcj-dbtool -p %{_libdir}`.d +mkdir -p $RPM_BUILD_ROOT$gcjdbdir +gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000 +gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \ + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \ + %{_libdir}/lib%{name}-%{version}.jar.so %clean rm -rf $RPM_BUILD_ROOT @@ -66,6 +84,12 @@ rm -f %{_javadir}/%{full_name}.jar rm -f %{_javadir}/%{name}.jar +%post +rebuild-gcj-db %{_libdir} + +%postun +rebuild-gcj-db %{_libdir} + %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} @@ -79,12 +103,17 @@ %defattr(0644,root,root,0755) %doc LICENSE.txt %{_javadir}/*.jar +%attr(0755,root,root) %{_libdir}/lib*.jar.so +%{_libdir}/*/*/%{name}-%{version}.db %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} %changelog +* Thu May 5 2005 Gary Benson 0:1.3-1jpp_5fc +- BC-compile. + * Tue Jan 11 2005 Gary Benson 0:1.3-1jpp_4fc - Sync with RHAPS. From fedora-cvs-commits at redhat.com Thu May 5 14:13:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 10:13:43 -0400 Subject: rpms/parted/devel parted-1.6.22-mac-parts.patch, NONE, 1.1 parted.spec, 1.48, 1.49 Message-ID: <200505051413.j45EDhRK027866@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/parted/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27852 Modified Files: parted.spec Added Files: parted-1.6.22-mac-parts.patch Log Message: Added upstream patch to display certain Apple_Free partitions (#154479). parted-1.6.22-mac-parts.patch: disk_mac.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) --- NEW FILE parted-1.6.22-mac-parts.patch --- --- parted-1.6.22/libparted/disk_mac.c 27 Mar 2005 10:46:45 -0000 1.7 +++ parted-1.6.22/libparted/disk_mac.c 20 Apr 2005 13:38:44 -0000 1.8 @@ -357,7 +357,13 @@ static int _rawpart_cmp_type (MacRawPartition* raw_part, char* type) { - return strcasecmp (raw_part->type, type) == 0; + return strncasecmp (raw_part->type, type, 32) == 0; +} + +static int +_rawpart_cmp_name (MacRawPartition* raw_part, char* name) +{ + return strncasecmp (raw_part->name, name, 32) == 0; } static int @@ -447,9 +453,10 @@ static int _rawpart_is_active (MacRawPartition* raw_part) { - if (_rawpart_cmp_type (raw_part, "Apple_Void")) + if (_rawpart_cmp_type (raw_part, "Apple_Free") + && _rawpart_cmp_name (raw_part, "Extra")) return 0; - if (_rawpart_cmp_type (raw_part, "Apple_Free")) + if (_rawpart_cmp_type (raw_part, "Apple_Void")) return 0; if (_rawpart_cmp_type (raw_part, "Apple_Scratch")) return 0; Index: parted.spec =================================================================== RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- parted.spec 23 Mar 2005 15:39:41 -0000 1.48 +++ parted.spec 5 May 2005 14:13:41 -0000 1.49 @@ -4,7 +4,7 @@ Summary: The GNU disk partition manipulation program. Name: parted Version: 1.6.22 -Release: 1 +Release: 2 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz Patch0: parted-1.6.3-fat.c.patch Patch3: parted-1.6.19-sx8.patch @@ -14,6 +14,7 @@ Patch151: parted-1.6.3-aix.patch Patch152: parted-1.6.15-dasd_geometry.patch Patch153: parted-1.6.22-mac-lvm.patch +Patch154: parted-1.6.22-mac-parts.patch Buildroot: %{_tmppath}/%{name}-root License: GPL @@ -51,6 +52,7 @@ %patch151 -p1 -b .aix %patch152 -p1 -b .dasd_geometry %patch153 -p1 -b .mac-lvm +%patch154 -p1 -b .mac-parts iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_ mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8 @@ -99,6 +101,9 @@ %{_libdir}/*.a* %changelog +* Thu May 05 2005 Chris Lumens 1.6.22-2 +- Added upstream patch to display certain Apple_Free partitions (#154479). + * Wed Mar 23 2005 Chris Lumens 1.6.22-1 - Updated to 1.6.22. - Get rid of separate gc4 patch that's now included upstream. From fedora-cvs-commits at redhat.com Thu May 5 14:43:30 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 10:43:30 -0400 Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec, 1.8, 1.9 Message-ID: <200505051443.j45EhU7F025222@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/device-mapper-multipath/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25210 Modified Files: device-mapper-multipath.spec Log Message: Fix last fix. Index: device-mapper-multipath.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- device-mapper-multipath.spec 4 May 2005 14:11:38 -0000 1.8 +++ device-mapper-multipath.spec 5 May 2005 14:43:28 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Tools to manage multipath devices using device-mapper. Name: device-mapper-multipath Version: 0.4.4 -Release: 2.1 +Release: 2.2 License: GPL Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ @@ -57,7 +57,7 @@ %post /sbin/chkconfig --add multipathd -/sbin/chkconfig --levels 0123456 off +/sbin/chkconfig --levels 0123456 multipathd off %preun if [ "$1" = 0 ]; then @@ -77,6 +77,9 @@ /var/cache/multipath %changelog +* Thu May 05 2005 Alasdair Kergon - 0.4.4-2.2 +- Fix last fix. + * Wed May 04 2005 Alasdair Kergon - 0.4.4-2.1 - By default, disable the multipathd service. From fedora-cvs-commits at redhat.com Thu May 5 14:56:26 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 10:56:26 -0400 Subject: rpms/tomcat5/devel tomcat5-5.0.30-no-daemon.patch, NONE, 1.1 jasper5_command.patch, 1.1, 1.2 tomcat5.spec, 1.16, 1.17 tomcat5-5.0.30-no-jsvc-tar.patch, 1.1, NONE Message-ID: <200505051456.j45EuQPs022278@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22262 Modified Files: jasper5_command.patch tomcat5.spec Added Files: tomcat5-5.0.30-no-daemon.patch Removed Files: tomcat5-5.0.30-no-jsvc-tar.patch Log Message: Remove references to the never used commons-daemon tomcat5-5.0.30-no-daemon.patch: build.xml | 4 ---- 1 files changed, 4 deletions(-) --- NEW FILE tomcat5-5.0.30-no-daemon.patch --- --- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml~ 2005-05-05 15:10:04.000000000 +0100 +++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml 2005-05-05 15:22:29.000000000 +0100 @@ -141,10 +141,6 @@ - - - jasper5_command.patch: jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh | 2 - jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh | 30 ++++++++------- 2 files changed, 17 insertions(+), 15 deletions(-) Index: jasper5_command.patch =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/jasper5_command.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jasper5_command.patch 26 Apr 2005 11:02:18 -0000 1.1 +++ jasper5_command.patch 5 May 2005 14:56:23 -0000 1.2 @@ -11,7 +11,7 @@ # 1. owned by the user --- jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh.orig 2004-01-28 07:32:45.000000000 -0500 +++ jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh 2004-01-28 07:21:07.000000000 -0500 -@@ -53,26 +53,29 @@ +@@ -53,26 +53,28 @@ fi # Get standard Java environment variables @@ -49,12 +49,11 @@ +commons-el \ +commons-collections \ +commons-logging \ -+commons-daemon \ +) # For Cygwin, switch paths to Windows format before running java if $cygwin; then -@@ -103,7 +106,7 @@ +@@ -103,7 +105,7 @@ else Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tomcat5.spec 5 May 2005 13:07:49 -0000 1.16 +++ tomcat5.spec 5 May 2005 14:56:23 -0000 1.17 @@ -44,14 +44,14 @@ Source9: %{name}-%{majversion}.relink Patch1: %{name}-%{version}.patch Patch2: %{name}-%{majversion}.link_admin_jar.patch -Patch3: %{name}-%{version}-no-jsvc-tar.patch Patch4: %{name}-%{version}-cluster-pathelement.patch Patch5: %{name}-%{version}-skip-build-on-install.patch Patch6: %{name}-%{version}-javaxssl.patch Patch7: %{jname}_command.patch Patch8: %{name}-%{version}-bootstrap.MF.patch Patch9: %{name}-%{version}-catalina.sh.patch -Patch10: %{name}-%{version}-nojspc.patch +Patch10: %{name}-%{version}-nojspc.patch +Patch11: %{name}-%{version}-no-daemon.patch BuildRoot: %{_tmppath}/%{name}-root-%{version} Obsoletes: tomcat tomcat-libs tomcat-devel tomcat-test @@ -67,7 +67,6 @@ # jakarta packages Requires: jakarta-commons-beanutils >= 0:1.7.0 Requires: jakarta-commons-collections >= 0:3.1 -Requires: jakarta-commons-daemon Requires: jakarta-commons-dbcp >= 0:1.2.1 Requires: jakarta-commons-digester >= 0:1.3 Requires: jakarta-commons-modeler @@ -99,7 +98,6 @@ BuildRequires: xalan-j2 BuildRequires: jakarta-commons-beanutils >= 0:1.7.0 BuildRequires: jakarta-commons-collections >= 0:3.1 -BuildRequires: jakarta-commons-daemon BuildRequires: jakarta-commons-dbcp >= 0:1.2.1 BuildRequires: jakarta-commons-digester >= 0:1.3 BuildRequires: jakarta-commons-logging >= 0:1.0.4 @@ -170,7 +168,6 @@ Requires: jakarta-commons-el >= 0:1.0 Requires: jakarta-commons-collections >= 0:2.1 Requires: jakarta-commons-logging >= 0:1.0.3 -Requires: jakarta-commons-daemon >= 0:1.0 Requires: %{name}-servlet-2.4-api = %{epoch}:%{version}-%{release} Obsoletes: jasper5 Provides: jasper5 @@ -219,7 +216,6 @@ # %patch0 %patch1 -p2 %patch2 -p2 -# %patch3 -p2 -b .nojsvc %patch4 -p2 -b .cluster %patch5 -p2 -b .skip %patch6 -p0 @@ -227,6 +223,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p2 -b .orig +%patch11 -p2 -b .orig %build @@ -266,7 +263,6 @@ commons-beanutils.jar=$(build-classpath commons-beanutils) commons-fileupload.jar=$(build-classpath commons-fileupload) commons-collections.jar=$(build-classpath commons-collections) -commons-daemon.jar=$(build-classpath commons-daemon) commons-dbcp.jar=$(build-classpath commons-dbcp) commons-digester.jar=$(build-classpath commons-digester) commons-el.jar=$(build-classpath commons-el) @@ -320,7 +316,6 @@ junit.jar=$(build-classpath junit) commons-beanutils.jar=$(build-classpath commons-beanutils) commons-collections.jar=$(build-classpath commons-collections) -commons-daemon.jar=$(build-classpath commons-daemon) commons-digester.jar=$(build-classpath commons-digester) commons-fileupload.jar=$(build-classpath commons-fileupload) commons-logging.jar=$(build-classpath commons-logging) @@ -877,6 +872,9 @@ %{serverdir}/webapps/* %changelog +* Thu May 5 2005 Gary Benson +- Remove references to the never used commons-daemon. + * Thu May 5 2005 Gary Benson 0:5.0.30-5jpp_3fc - Add dependencies for %post and %postun scriptlets (#156901). --- tomcat5-5.0.30-no-jsvc-tar.patch DELETED --- From fedora-cvs-commits at redhat.com Thu May 5 15:06:01 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:06:01 -0400 Subject: rpms/rhpl/devel .cvsignore, 1.35, 1.36 rhpl.spec, 1.38, 1.39 sources, 1.37, 1.38 Message-ID: <200505051506.j45F61fe022433@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/rhpl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22411/devel Modified Files: .cvsignore rhpl.spec sources Log Message: auto-import rhpl-0.162-1 on branch devel from rhpl-0.162-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 3 May 2005 02:02:14 -0000 1.35 +++ .cvsignore 5 May 2005 15:05:59 -0000 1.36 @@ -1 +1 @@ -rhpl-0.161.tar.gz +rhpl-0.162.tar.gz Index: rhpl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- rhpl.spec 3 May 2005 02:02:14 -0000 1.38 +++ rhpl.spec 5 May 2005 15:05:59 -0000 1.39 @@ -1,6 +1,6 @@ Summary: Library of python code used by programs in Red Hat Linux Name: rhpl -Version: 0.161 +Version: 0.162 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -38,6 +38,9 @@ %{_datadir}/rhpl %changelog +* Thu May 5 2005 Jeremy Katz - 0.162-1 +- look up monitor in MonitorsDB if we can't probe horiz/vert + * Mon May 2 2005 Jeremy Katz - 0.161-1 - Only default to fbdev X server on ppc64pseries, not all ppc (#149188) - Set UseFBDev on ppc boxes using ati video cards (#149188) Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 3 May 2005 02:02:14 -0000 1.37 +++ sources 5 May 2005 15:05:59 -0000 1.38 @@ -1 +1 @@ -7c33c6361f73b5bfe4892ad6b7b71dd3 rhpl-0.161.tar.gz +463dfdba90ebbd03dd04425d50a44f7f rhpl-0.162.tar.gz From fedora-cvs-commits at redhat.com Thu May 5 15:16:18 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:16:18 -0400 Subject: rpms/hwdata/devel .cvsignore, 1.44, 1.45 hwdata.spec, 1.43, 1.44 sources, 1.45, 1.46 Message-ID: <200505051516.j45FGIKE025819@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/hwdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25797/devel Modified Files: .cvsignore hwdata.spec sources Log Message: auto-import hwdata-0.157-1 on branch devel from hwdata-0.157-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 11 Apr 2005 01:43:12 -0000 1.44 +++ .cvsignore 5 May 2005 15:16:16 -0000 1.45 @@ -1 +1 @@ -hwdata-0.156.tar.gz +hwdata-0.157.tar.gz Index: hwdata.spec =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- hwdata.spec 11 Apr 2005 01:43:12 -0000 1.43 +++ hwdata.spec 5 May 2005 15:16:16 -0000 1.44 @@ -1,6 +1,6 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.156 +Version: 0.157 Release: 1 License: GPL/MIT Group: System Environment/Base @@ -36,6 +36,9 @@ /usr/X11R6/lib/X11/Cards %changelog +* Thu May 5 2005 Jeremy Katz - 0.157-1 +- add 20" Apple Cinema Display + * Sun Apr 10 2005 Mike A. Harris 0.156-1 - Update SiS entries in Cards/pcitable to match what Xorg X11 6.8.2 supports Index: sources =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 11 Apr 2005 01:43:12 -0000 1.45 +++ sources 5 May 2005 15:16:16 -0000 1.46 @@ -1 +1 @@ -28f8e4d0a2f230346de86ca46f30760e hwdata-0.156.tar.gz +43aead63d46c9a3a2c3f2d846fca7a29 hwdata-0.157.tar.gz From fedora-cvs-commits at redhat.com Thu May 5 15:21:02 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:21:02 -0400 Subject: rpms/cman/devel cman.spec,1.8,1.9 Message-ID: <200505051521.j45FL2AQ025948@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25936 Modified Files: cman.spec Log Message: Don't turn on init script by default. Index: cman.spec =================================================================== RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cman.spec 25 Apr 2005 23:14:50 -0000 1.8 +++ cman.spec 5 May 2005 15:21:00 -0000 1.9 @@ -13,7 +13,7 @@ Name: cman Version: 1.0 -Release: 0.pre33.2 +Release: 0.pre33.3 License: GPL Group: System Environment/Base Summary: cman - The Cluster Manager @@ -49,7 +49,7 @@ %post /sbin/chkconfig --add cman - +/sbin/chkconfig cman off %preun if [ "$1" = 0 ]; then /sbin/chkconfig --del cman From fedora-cvs-commits at redhat.com Thu May 5 15:23:24 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:23:24 -0400 Subject: rpms/ccs/devel ccs.spec,1.10,1.11 Message-ID: <200505051523.j45FNO4a026026@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/ccs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26014 Modified Files: ccs.spec Log Message: Turn off init script. Index: ccs.spec =================================================================== RCS file: /cvs/dist/rpms/ccs/devel/ccs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ccs.spec 19 Apr 2005 19:34:04 -0000 1.10 +++ ccs.spec 5 May 2005 15:23:21 -0000 1.11 @@ -11,7 +11,7 @@ ############################################################################### Name: ccs Version: 0.25 -Release: 0.1 +Release: 0.2 License: GPL Group: System Environment/Base Summary: CCS - The Cluster Configuration System @@ -53,6 +53,7 @@ %post /sbin/chkconfig --add ccsd +/sbin/chkconfig ccsd off %preun if [ "$1" = 0 ]; then From fedora-cvs-commits at redhat.com Thu May 5 15:25:06 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:25:06 -0400 Subject: rpms/tomcat5/devel tomcat5.spec,1.17,1.18 Message-ID: <200505051525.j45FP6Pt019841@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19830 Modified Files: tomcat5.spec Log Message: Add a runtime dependency on puretls Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- tomcat5.spec 5 May 2005 14:56:23 -0000 1.17 +++ tomcat5.spec 5 May 2005 15:25:03 -0000 1.18 @@ -2,7 +2,7 @@ %define full_name jakarta-%{name} %define version 5.0.30 %define majversion 5.0 -%define release 5jpp_3fc +%define release 5jpp_4fc %define section free %define summary Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API @@ -63,6 +63,7 @@ Requires: xerces-j2 >= 0:2.6.2 Requires: xml-commons-apis Requires: regexp >= 0:1.3 +Requires: puretls #Requires: tyrex >= 0:1.0.1 # jakarta packages Requires: jakarta-commons-beanutils >= 0:1.7.0 @@ -872,8 +873,9 @@ %{serverdir}/webapps/* %changelog -* Thu May 5 2005 Gary Benson +* Thu May 5 2005 Gary Benson 0:5.0.30-5jpp_4fc - Remove references to the never used commons-daemon. +- Add a runtime dependency on puretls. * Thu May 5 2005 Gary Benson 0:5.0.30-5jpp_3fc - Add dependencies for %post and %postun scriptlets (#156901). From fedora-cvs-commits at redhat.com Thu May 5 15:30:58 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:30:58 -0400 Subject: rpms/mkinitrd/devel .cvsignore, 1.59, 1.60 mkinitrd.spec, 1.59, 1.60 sources, 1.61, 1.62 Message-ID: <200505051530.j45FUw7u020031@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20009 Modified Files: .cvsignore mkinitrd.spec sources Log Message: update to 4.2.12 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 4 May 2005 16:53:56 -0000 1.59 +++ .cvsignore 5 May 2005 15:30:44 -0000 1.60 @@ -1 +1 @@ -mkinitrd-4.2.11.tar.bz2 +mkinitrd-4.2.12.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- mkinitrd.spec 4 May 2005 16:53:56 -0000 1.59 +++ mkinitrd.spec 5 May 2005 15:30:47 -0000 1.60 @@ -1,6 +1,6 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 4.2.11 +Version: 4.2.12 Release: 1 License: GPL Group: System Environment/Base @@ -57,6 +57,9 @@ %attr(644,root,root) %{_mandir}/man8/grubby.8* %changelog +* Wed May 4 2005 Peter Jones - 4.2.12-1 +- Don't copy "console=" arguments from /proc/cmdline to init + * Wed May 4 2005 Peter Jones - 4.2.11-1 - don't copy "rw" option into the initrd; use "ro" instead if it's the only option. Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 4 May 2005 16:53:56 -0000 1.61 +++ sources 5 May 2005 15:30:48 -0000 1.62 @@ -1 +1 @@ -b0dabac7539771b0187f2f0523aac8c5 mkinitrd-4.2.11.tar.bz2 +90eec41bbb130ddcffabfb2e2e12f0d9 mkinitrd-4.2.12.tar.bz2 From fedora-cvs-commits at redhat.com Thu May 5 15:32:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:32:43 -0400 Subject: rpms/ccs/devel ccs.spec,1.11,1.12 Message-ID: <200505051532.j45FWhNg020086@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/ccs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20073 Modified Files: ccs.spec Log Message: Updated init script functionality. Index: ccs.spec =================================================================== RCS file: /cvs/dist/rpms/ccs/devel/ccs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ccs.spec 5 May 2005 15:23:21 -0000 1.11 +++ ccs.spec 5 May 2005 15:32:41 -0000 1.12 @@ -11,7 +11,7 @@ ############################################################################### Name: ccs Version: 0.25 -Release: 0.2 +Release: 0.3 License: GPL Group: System Environment/Base Summary: CCS - The Cluster Configuration System @@ -52,8 +52,10 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add ccsd -/sbin/chkconfig ccsd off +if [ "$1" = 1 ]; then + /sbin/chkconfig --add ccsd + /sbin/chkconfig ccsd off +fi %preun if [ "$1" = 0 ]; then @@ -77,6 +79,9 @@ %{_includedir}/ccs.h %changelog +* Tue May 05 2005 Chris Feist +- Only update init script run levels on install (and don't automatically + start init scripts). * Mon Dec 20 2004 Chris Feist - Update for new upstream sources * Fri Dec 10 2004 Chris Feist From fedora-cvs-commits at redhat.com Thu May 5 15:47:09 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:47:09 -0400 Subject: rpms/fence/devel fence.spec,1.5,1.6 Message-ID: <200505051547.j45Fl94H023849@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/fence/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23835 Modified Files: fence.spec Log Message: Updated init scripts to not auto start on install. Index: fence.spec =================================================================== RCS file: /cvs/dist/rpms/fence/devel/fence.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fence.spec 20 Apr 2005 16:39:47 -0000 1.5 +++ fence.spec 5 May 2005 15:47:06 -0000 1.6 @@ -12,7 +12,7 @@ Name: fence Version: 1.27 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Summary: fence - The cluster I/O fencing system @@ -44,7 +44,10 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add fenced +if [ "$1" = 1 ]; then + /sbin/chkconfig --add fenced + /sbin/chkconfig fenced off +fi %preun if [ "$1" = 0 ]; then From fedora-cvs-commits at redhat.com Thu May 5 15:47:33 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:47:33 -0400 Subject: rpms/libidn/devel libidn-0.5.15-pr29const.patch, NONE, 1.1 libidn.spec, 1.18, 1.19 Message-ID: <200505051547.j45FlXhg023907@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/libidn/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23893 Modified Files: libidn.spec Added Files: libidn-0.5.15-pr29const.patch Log Message: * Thu May 5 2005 Joe Orton 0.5.15-2 - constify data tables in pr29.c - clean up pre/post/postun requires libidn-0.5.15-pr29const.patch: pr29.c | 58 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) --- NEW FILE libidn-0.5.15-pr29const.patch --- --- libidn-0.5.15/lib/pr29.c.pr29const +++ libidn-0.5.15/lib/pr29.c @@ -590,11 +590,11 @@ * 09D7 BENGALI AU LENGTH MARK */ -static uint32_t pr29_1_1[] = { +static const uint32_t pr29_1_1[] = { 0x09C7, 0 }; -static uint32_t pr29_1_2[] = { +static const uint32_t pr29_1_2[] = { 0x09BE, 0x09D7, 0 }; @@ -604,11 +604,11 @@ * 0B57 ORIYA AU LENGTH MARK */ -static uint32_t pr29_2_1[] = { +static const uint32_t pr29_2_1[] = { 0x0B47, 0 }; -static uint32_t pr29_2_2[] = { +static const uint32_t pr29_2_2[] = { 0x0B3E, 0x0B56, 0x0B57, 0 }; @@ -617,11 +617,11 @@ * 0BD7 TAMIL AU LENGTH MARK */ -static uint32_t pr29_3_1[] = { +static const uint32_t pr29_3_1[] = { 0x0BC6, 0 }; -static uint32_t pr29_3_2[] = { +static const uint32_t pr29_3_2[] = { 0x0BBE, 0x0BD7, 0 }; @@ -629,11 +629,11 @@ * 0BC7 TAMIL VOWEL SIGN EE 0BBE TAMIL VOWEL SIGN AA */ -static uint32_t pr29_4_1[] = { +static const uint32_t pr29_4_1[] = { 0x0BC7, 0 }; -static uint32_t pr29_4_2[] = { +static const uint32_t pr29_4_2[] = { 0x0BBE, 0 }; @@ -641,11 +641,11 @@ * 0B92 TAMIL LETTER O 0BD7 TAMIL AU LENGTH MARK */ -static uint32_t pr29_5_1[] = { +static const uint32_t pr29_5_1[] = { 0x0B92, 0 }; -static uint32_t pr29_5_2[] = { +static const uint32_t pr29_5_2[] = { 0x0BD7, 0 }; @@ -655,11 +655,11 @@ * 0CD6 KANNADA AI LENGTH MARK */ -static uint32_t pr29_6_1[] = { +static const uint32_t pr29_6_1[] = { 0x0CC6, 0 }; -static uint32_t pr29_6_2[] = { +static const uint32_t pr29_6_2[] = { 0x0CC2, 0xCD5, 0xCD6, 0 }; @@ -668,11 +668,11 @@ * 0CCA KANNADA VOWEL SIGN O 0CD5 KANNADA LENGTH MARK */ -static uint32_t pr29_7_1[] = { +static const uint32_t pr29_7_1[] = { 0x0CBF, 0xCCA, 0 }; -static uint32_t pr29_7_2[] = { +static const uint32_t pr29_7_2[] = { 0x0CD5, 0 }; @@ -680,11 +680,11 @@ * 0D47 MALAYALAM VOWEL SIGN EE 0D3E MALAYALAM VOWEL SIGN AA */ -static uint32_t pr29_8_1[] = { +static const uint32_t pr29_8_1[] = { 0x0D47, 0 }; -static uint32_t pr29_8_2[] = { +static const uint32_t pr29_8_2[] = { 0x0D3E, 0 }; @@ -693,11 +693,11 @@ * 0D57 MALAYALAM AU LENGTH MARK */ -static uint32_t pr29_9_1[] = { +static const uint32_t pr29_9_1[] = { 0x0D46, 0 }; -static uint32_t pr29_9_2[] = { +static const uint32_t pr29_9_2[] = { 0x0D3E, 0x0D57, 0 }; @@ -705,11 +705,11 @@ * 1025 MYANMAR LETTER U 102E MYANMAR VOWEL SIGN II */ -static uint32_t pr29_10_1[] = { +static const uint32_t pr29_10_1[] = { 0x1025, 0 }; -static uint32_t pr29_10_2[] = { +static const uint32_t pr29_10_2[] = { 0x102E, 0 }; @@ -718,11 +718,11 @@ * 0DDF SINHALA VOWEL SIGN GAYANUKITTA */ -static uint32_t pr29_11_1[] = { +static const uint32_t pr29_11_1[] = { 0x0DD9, 0 }; -static uint32_t pr29_11_2[] = { +static const uint32_t pr29_11_2[] = { 0x0DCF, 0x0DDF, 0 }; @@ -731,13 +731,13 @@ * 1161..1175 HANGUL JUNGSEONG A..I [21 instances] */ -static uint32_t pr29_12_1[] = { +static const uint32_t pr29_12_1[] = { 0x1100, 0x1101, 0x1102, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110A, 0x110B, 0x110C, 0x110D, 0x110E, 0x110F, 0x1110, 0x1111, 0x1112, 0 }; -static uint32_t pr29_12_2[] = { +static const uint32_t pr29_12_2[] = { 0x1161, 0x1162, 0x1163, 0x1164, 0x1165, 0x1166, 0x1167, 0x1168, 0x1169, 0x116A, 0x116B, 0x116C, 0x116D, 0x116E, 0x116F, 0x1170, 0x1171, 0x1172, 0x1173, 0x1174, 0x1175, 0 @@ -749,7 +749,7 @@ * 11A8..11C2 HANGUL JONGSEONG KIYEOK..HIEUH [27 instances] */ -static uint32_t pr29_13_1[] = { +static const uint32_t pr29_13_1[] = { 0xAC00, /* LV # Lo HANGUL SYLLABLE GA */ 0xAC1C, /* LV # Lo HANGUL SYLLABLE GAE */ 0xAC38, /* LV # Lo HANGUL SYLLABLE GYA */ @@ -1152,7 +1152,7 @@ 0 }; -static uint32_t pr29_13_2[] = { +static const uint32_t pr29_13_2[] = { 0x11A8, 0x11A9, 0x11AA, 0x11AB, 0x11AC, 0x11AD, 0x11AE, 0x11AF, 0x11B0, 0x11B1, 0x11B2, 0x11B3, 0x11B4, 0x11B5, 0x11B6, 0x11B7, 0x11B8, 0x11B9, 0x11BA, 0x11BB, 0x11BC, 0x11BD, 0x11BE, 0x11BF, @@ -1161,11 +1161,11 @@ typedef struct { - uint32_t *first; - uint32_t *last; + const uint32_t *first; + const uint32_t *last; } Pr29; -static Pr29 pr29[] = { +static const Pr29 pr29[] = { {&pr29_1_1[0], &pr29_1_2[0]}, {&pr29_2_1[0], &pr29_2_2[0]}, {&pr29_3_1[0], &pr29_3_2[0]}, Index: libidn.spec =================================================================== RCS file: /cvs/dist/rpms/libidn/devel/libidn.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libidn.spec 20 Mar 2005 09:41:19 -0000 1.18 +++ libidn.spec 5 May 2005 15:47:31 -0000 1.19 @@ -1,14 +1,17 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.5.15 -Release: 1 +Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz +Patch0: libidn-0.5.15-pr29const.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig, gettext -Prereq: /sbin/ldconfig, /sbin/install-info +Requires(post): /sbin/install-info +Requires(postun): /sbin/ldconfig +Requires(pre): /sbin/ldconfig, /sbin/install-info %description GNU Libidn is an implementation of the Stringprep, Punycode and @@ -28,6 +31,7 @@ %prep %setup -q +%patch0 -p1 -b .pr29const %build %configure @@ -83,6 +87,10 @@ %{_mandir}/man3/* %changelog +* Thu May 5 2005 Joe Orton 0.5.15-2 +- constify data tables in pr29.c +- clean up pre/post/postun requires + * Sun Mar 20 2005 Joe Orton 0.5.15-1 - update to 0.5.15 From fedora-cvs-commits at redhat.com Thu May 5 15:51:48 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:51:48 -0400 Subject: rpms/rgmanager/devel rgmanager.spec,1.8,1.9 Message-ID: <200505051551.j45FpmMA024026@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/rgmanager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24014 Modified Files: rgmanager.spec Log Message: Turn of init scripts on install. Index: rgmanager.spec =================================================================== RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rgmanager.spec 26 Apr 2005 19:57:50 -0000 1.8 +++ rgmanager.spec 5 May 2005 15:51:46 -0000 1.9 @@ -12,7 +12,7 @@ Name: rgmanager Version: 1.9.31 -Release: 0 +Release: 1 License: GPL,LGPL Group: System Environment/Base Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux @@ -48,7 +48,10 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add rgmanager +if [ "$1" = 1 ]; then + /sbin/chkconfig --add rgmanager + /sbin/chkconfig rgmanager off +fi %preun if [ "$1" = 0 ]; then From fedora-cvs-commits at redhat.com Thu May 5 15:53:56 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:53:56 -0400 Subject: rpms/gtk-doc/devel gtk-doc-1.3-colon.patch, NONE, 1.1 gtk-doc.spec, 1.13, 1.14 Message-ID: <200505051553.j45FruGe024177@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk-doc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24160 Modified Files: gtk-doc.spec Added Files: gtk-doc-1.3-colon.patch Log Message: Accept ":" in ids gtk-doc-1.3-colon.patch: gtk-doc.dcl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE gtk-doc-1.3-colon.patch --- --- gtk-doc-1.3/gtk-doc.dcl.colon 2005-05-05 11:51:25.259630000 -0400 +++ gtk-doc-1.3/gtk-doc.dcl 2005-05-05 11:51:37.601276000 -0400 @@ -61,8 +61,8 @@ NAMING LCNMSTRT "" UCNMSTRT "" - LCNMCHAR ".-_" - UCNMCHAR ".-_" + LCNMCHAR ".-_:" + UCNMCHAR ".-_:" NAMECASE GENERAL YES ENTITY NO Index: gtk-doc.spec =================================================================== RCS file: /cvs/dist/rpms/gtk-doc/devel/gtk-doc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gtk-doc.spec 26 Jan 2005 16:43:55 -0000 1.13 +++ gtk-doc.spec 5 May 2005 15:53:53 -0000 1.14 @@ -1,7 +1,7 @@ Summary: API documentation generation tool for GTK+ and GNOME Name: gtk-doc Version: 1.3 -Release: 1 +Release: 2 License: LGPL Group: Development/Tools Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.3/gtk-doc-1.3.tar.bz2 @@ -11,6 +11,8 @@ BuildPrereq: docbook-utils jade libxslt docbook-style-xsl Requires: docbook-utils jade /usr/bin/cmp libxslt docbook-style-xsl +Patch0: gtk-doc-1.3-colon.patch + Source1: filter-requires-gtk-doc.sh %define __perl_requires %{SOURCE1} @@ -24,6 +26,7 @@ %setup -q # Move this doc file to avoid name collisions mv doc/README doc/README.docs +%patch0 -p1 -b .colon %build %configure --enable-public-id @@ -50,6 +53,9 @@ %{_datadir}/pkgconfig/gtk-doc.pc %changelog +* Thu May 5 2005 Matthias Clasen 1.3-1 +- accept ':' in ids + * Wed Jan 26 2005 Matthias Clasen 1.3-1 - update to 1.3 From fedora-cvs-commits at redhat.com Thu May 5 15:53:58 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:53:58 -0400 Subject: rpms/cman/devel cman.spec,1.9,1.10 Message-ID: <200505051553.j45FrwLT024200@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24188 Modified Files: cman.spec Log Message: Don't start init scripts on initial install. Index: cman.spec =================================================================== RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cman.spec 5 May 2005 15:21:00 -0000 1.9 +++ cman.spec 5 May 2005 15:53:56 -0000 1.10 @@ -13,7 +13,7 @@ Name: cman Version: 1.0 -Release: 0.pre33.3 +Release: 0.pre33.4 License: GPL Group: System Environment/Base Summary: cman - The Cluster Manager @@ -48,8 +48,11 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add cman -/sbin/chkconfig cman off +if [ "$1" = 1 ]; then + /sbin/chkconfig --add cman + /sbin/chkconfig cman off +fi + %preun if [ "$1" = 0 ]; then /sbin/chkconfig --del cman From fedora-cvs-commits at redhat.com Thu May 5 15:56:35 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:56:35 -0400 Subject: rpms/GFS/devel GFS.spec,1.7,1.8 Message-ID: <200505051556.j45FuZYZ018052@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18040 Modified Files: GFS.spec Log Message: Don't startup init scripts on first install. Index: GFS.spec =================================================================== RCS file: /cvs/dist/rpms/GFS/devel/GFS.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- GFS.spec 26 Apr 2005 20:00:51 -0000 1.7 +++ GFS.spec 5 May 2005 15:56:33 -0000 1.8 @@ -13,7 +13,7 @@ Name: GFS Version: 6.1 -Release: 0.pre22.1 +Release: 0.pre22.2 License: GPL Group: System Environment/Kernel Summary: GFS - The Global File System @@ -45,7 +45,10 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add gfs +if [ "$1" = 1 ]; then + /sbin/chkconfig --add gfs + /sbin/chkconfig gfs off +fi if [ -z "`grep "^kernel\.panic_on_oops" /etc/sysctl.conf`" ]; then echo "" >> /etc/sysctl.conf From fedora-cvs-commits at redhat.com Thu May 5 15:57:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 11:57:41 -0400 Subject: rpms/gulm/devel gulm.spec,1.8,1.9 Message-ID: <200505051557.j45FvfrC018104@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gulm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18092 Modified Files: gulm.spec Log Message: Don't start init scripts on initial install. Index: gulm.spec =================================================================== RCS file: /cvs/dist/rpms/gulm/devel/gulm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gulm.spec 26 Apr 2005 20:17:45 -0000 1.8 +++ gulm.spec 5 May 2005 15:57:39 -0000 1.9 @@ -13,7 +13,7 @@ Name: gulm Version: 1.0 -Release: 0.pre28.3 +Release: 0.pre28.4 License: GPL Group: System Environment/Daemons Summary: gulm - One possible lock manager for GFS @@ -55,9 +55,10 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add lock_gulmd -# Turn gulmd off for default fedora install -/sbin/chkconfig lock_gulmd off +if [ "$1" = 1 ]; then + /sbin/chkconfig --add lock_gulmd + /sbin/chkconfig lock_gulmd off +fi %preun if [ "$1" = 0 ]; then From fedora-cvs-commits at redhat.com Thu May 5 16:08:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 12:08:38 -0400 Subject: rpms/cman/devel cman.spec,1.10,1.11 Message-ID: <200505051608.j45G8cOl018328@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18316 Modified Files: cman.spec Log Message: Don't build ia64. Index: cman.spec =================================================================== RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cman.spec 5 May 2005 15:53:56 -0000 1.10 +++ cman.spec 5 May 2005 16:08:36 -0000 1.11 @@ -13,7 +13,7 @@ Name: cman Version: 1.0 -Release: 0.pre33.4 +Release: 0.pre33.5 License: GPL Group: System Environment/Base Summary: cman - The Cluster Manager @@ -23,7 +23,7 @@ Conflicts: GFS-modules Requires: ccs Requires: cman-kernel >= 2.6.11 -ExclusiveArch: i386 ia64 x86_64 +ExclusiveArch: i386 x86_64 Source0: %{name}-%{version}-%{subversion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot From fedora-cvs-commits at redhat.com Thu May 5 16:24:29 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 12:24:29 -0400 Subject: rpms/udev/devel start_udev,1.35,1.36 udev.spec,1.84,1.85 Message-ID: <200505051624.j45GOT6A001587@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24385 Modified Files: start_udev udev.spec Log Message: better check for mounted /dev (#156862) Index: start_udev =================================================================== RCS file: /cvs/dist/rpms/udev/devel/start_udev,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- start_udev 2 Mar 2005 16:19:37 -0000 1.35 +++ start_udev 5 May 2005 16:24:22 -0000 1.36 @@ -200,7 +200,7 @@ echo -n "$STRING " # mount the tmpfs on ${udev_root%/}, if not already done -LANG=C fgrep -q "none ${udev_root%/} " /proc/mounts || { +LANG=C awk "\$2 == \"${udev_root%/}\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && { if LANG=C fgrep -q "none ${udev_root%/}/pts " /proc/mounts; then PTSDIR=$(mktemp -d) mount --move $udev_root/pts "$PTSDIR" Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- udev.spec 27 Apr 2005 04:49:20 -0000 1.84 +++ udev.spec 5 May 2005 16:24:26 -0000 1.85 @@ -7,7 +7,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 057 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base %if !%{with_persistent} @@ -288,6 +288,9 @@ %endif %changelog +* Thu May 5 2005 Bill Nottingham - 057-4 +- better check for mounted tmpfs on /dev (#156862) + * Wed Apr 27 2005 Peter Jones - 057-3 - use udevstart rather than udev for udevstart.static From fedora-cvs-commits at redhat.com Thu May 5 16:25:38 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 12:25:38 -0400 Subject: rpms/udev/devel udev.spec,1.85,1.86 Message-ID: <200505051625.j45GPceD015731@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15719 Modified Files: udev.spec Log Message: beta blocker, need to get this built Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- udev.spec 5 May 2005 16:24:26 -0000 1.85 +++ udev.spec 5 May 2005 16:25:34 -0000 1.86 @@ -4,6 +4,8 @@ %define with_persistent 0 + +ExcludeArch: s390 s390x Summary: A userspace implementation of devfs Name: udev Version: 057 From fedora-cvs-commits at redhat.com Thu May 5 16:38:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 12:38:51 -0400 Subject: rpms/jakarta-commons-el/devel .cvsignore, 1.3, 1.4 jakarta-commons-el.spec, 1.4, 1.5 Message-ID: <200505051638.j45GcpEG016038@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jakarta-commons-el/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16025 Modified Files: .cvsignore jakarta-commons-el.spec Log Message: BC-compile Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-el/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Jan 2005 17:04:23 -0000 1.3 +++ .cvsignore 5 May 2005 16:38:49 -0000 1.4 @@ -1,5 +1,5 @@ commons-el-1.0-src.tar.gz jakarta-servletapi-5-src.tar.gz commons-el-1.0-src -noarch +i386 *.src.rpm Index: jakarta-commons-el.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jakarta-commons-el.spec 20 Jan 2005 17:04:23 -0000 1.4 +++ jakarta-commons-el.spec 5 May 2005 16:38:49 -0000 1.5 @@ -6,22 +6,24 @@ Name: %{name} Version: 1.0 -Release: 2jpp_1fc +Release: 2jpp_2fc Epoch: 0 Summary: The Jakarta Commons Extension Language License: Apache Software License Group: Development/Libraries/Java -#Vendor: JPackage Project -#Distribution: JPackage URL: http://jakarta.apache.org/commons/el/ Source0: http://archive.apache.org/dist/jakarta/commons/el/source/commons-el-%{version}-src.tar.gz Source1: jakarta-servletapi-5-src.tar.gz Patch0: %{short_name}-%{version}-license.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildArch: noarch BuildRequires: ant, junit BuildRequires: jpackage-utils >= 0:1.5.30 BuildRequires: servletapi5, log4j +# libgcj aot-compiled native libraries +BuildRequires: gcc-java >= 4.0.0-0.43 +BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh +ExclusiveArch: %{ix86} x86_64 ppc %description An implementation of standard interfaces and abstract classes for @@ -66,6 +68,11 @@ -Dj2se.javadoc=%{_javadocdir}/java \ jar javadoc +aot-compile \ + dist/%{short_name}.jar \ + lib%{name}-%{version}.jar.so \ + "$RPM_OPT_FLAGS -fPIC" + %install rm -rf $RPM_BUILD_ROOT @@ -81,11 +88,30 @@ cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +# solibs +install -d -m 755 $RPM_BUILD_ROOT%{_libdir} +install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir} +ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so + +# gcjdb +gcjdbdir=`gcj-dbtool -p %{_libdir}`.d +mkdir -p $RPM_BUILD_ROOT$gcjdbdir +gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000 +gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \ + $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \ + %{_libdir}/lib%{name}-%{version}.jar.so + %clean rm -rf $RPM_BUILD_ROOT +%post +rebuild-gcj-db %{_libdir} + +%postun +rebuild-gcj-db %{_libdir} + %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} @@ -95,6 +121,8 @@ %defattr(0644,root,root,0755) %doc LICENSE.txt STATUS.html %{_javadir}/* +%attr(0755,root,root) %{_libdir}/lib*.jar.so +%{_libdir}/*/*/%{name}-%{version}.db %files javadoc %defattr(0644,root,root,0755) @@ -103,6 +131,9 @@ %changelog +* Thu May 5 2005 Gary Benson - 0:1.0-2jpp_2fc +- BC-compile. + * Thu Jan 20 2005 Gary Benson - 0:1.0-2jpp_1fc - Build into Fedora. From fedora-cvs-commits at redhat.com Thu May 5 16:58:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 12:58:10 -0400 Subject: rpms/ccs/devel ccs-0.25-norun.patch,NONE,1.1 ccs.spec,1.12,1.13 Message-ID: <200505051658.j45GwAcS013290@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/ccs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13275 Modified Files: ccs.spec Added Files: ccs-0.25-norun.patch Log Message: Added patch to disable starting up the init scripts. ccs-0.25-norun.patch: ccsd | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ccs-0.25-norun.patch --- --- ccs-0.25/init.d/ccsd.norun 2005-05-05 11:54:14.000000000 -0500 +++ ccs-0.25/init.d/ccsd 2005-05-05 11:54:23.000000000 -0500 @@ -2,7 +2,7 @@ # # ccsd start/stop ccsd # -# chkconfig: 345 20 80 +# chkconfig: - 20 80 # description: Starts and stops ccsd # # Index: ccs.spec =================================================================== RCS file: /cvs/dist/rpms/ccs/devel/ccs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ccs.spec 5 May 2005 15:32:41 -0000 1.12 +++ ccs.spec 5 May 2005 16:58:08 -0000 1.13 @@ -11,7 +11,7 @@ ############################################################################### Name: ccs Version: 0.25 -Release: 0.3 +Release: 0.4 License: GPL Group: System Environment/Base Summary: CCS - The Cluster Configuration System @@ -21,6 +21,7 @@ Requires: magma ExclusiveArch: i386 ia64 x86_64 Source0: %{name}-%{version}.tar.gz +Patch1: ccs-0.25-norun.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description @@ -36,6 +37,7 @@ %prep %setup -q +%patch1 -p1 -b .norun %build ./configure --libdir=%{_libdir} --mandir=%{_mandir} @@ -52,10 +54,7 @@ rm -rf $RPM_BUILD_ROOT %post -if [ "$1" = 1 ]; then - /sbin/chkconfig --add ccsd - /sbin/chkconfig ccsd off -fi +/sbin/chkconfig --add ccsd %preun if [ "$1" = 0 ]; then @@ -80,8 +79,7 @@ %changelog * Tue May 05 2005 Chris Feist -- Only update init script run levels on install (and don't automatically - start init scripts). +- Added patch to disable starting up the init scripts. * Mon Dec 20 2004 Chris Feist - Update for new upstream sources * Fri Dec 10 2004 Chris Feist From fedora-cvs-commits at redhat.com Thu May 5 17:01:45 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 13:01:45 -0400 Subject: rpms/fence/devel fence-1.27-norun.patch, NONE, 1.1 fence.spec, 1.6, 1.7 Message-ID: <200505051701.j45H1jKo013443@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/fence/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13432 Modified Files: fence.spec Added Files: fence-1.27-norun.patch Log Message: Added patch to disable starting up the init scripts. fence-1.27-norun.patch: fenced | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE fence-1.27-norun.patch --- --- fence-1.27/init.d/fenced.norun 2005-05-05 11:59:21.000000000 -0500 +++ fence-1.27/init.d/fenced 2005-05-05 11:59:27.000000000 -0500 @@ -1,6 +1,6 @@ #!/bin/bash # -# chkconfig: 345 23 77 +# chkconfig: - 23 77 # description: Starts and stops fence domain # # Index: fence.spec =================================================================== RCS file: /cvs/dist/rpms/fence/devel/fence.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fence.spec 5 May 2005 15:47:06 -0000 1.6 +++ fence.spec 5 May 2005 17:01:40 -0000 1.7 @@ -12,7 +12,7 @@ Name: fence Version: 1.27 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Summary: fence - The cluster I/O fencing system @@ -21,6 +21,7 @@ Conflicts: GFS-modules ExclusiveArch: i386 x86_64 Source0: %{name}-%{version}.tar.gz +Patch1: fence-1.27-norun.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description @@ -28,6 +29,7 @@ %prep %setup -q +%patch1 -p1 -b .norun %build ./configure --mandir=%{_mandir} @@ -44,10 +46,7 @@ rm -rf $RPM_BUILD_ROOT %post -if [ "$1" = 1 ]; then - /sbin/chkconfig --add fenced - /sbin/chkconfig fenced off -fi +/sbin/chkconfig --add fenced %preun if [ "$1" = 0 ]; then @@ -62,6 +61,8 @@ %{_mandir} %changelog +* Thu May 05 2005 Chris Feist +- Added patch to disable starting up the init scripts. * Mon Dec 20 2004 Chris Feist - Rebuild for with new sources. * Mon Dec 13 2004 Chris Feist From fedora-cvs-commits at redhat.com Thu May 5 17:03:48 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 13:03:48 -0400 Subject: rpms/cman/devel cman-1.0-pre33-norun.patch, NONE, 1.1 cman.spec, 1.11, 1.12 Message-ID: <200505051703.j45H3m04013586@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13572 Modified Files: cman.spec Added Files: cman-1.0-pre33-norun.patch Log Message: Added patch to disable starting up the init scripts. cman-1.0-pre33-norun.patch: cman | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE cman-1.0-pre33-norun.patch --- --- cman-1.0-pre33/init.d/cman.norun 2005-05-05 12:02:18.000000000 -0500 +++ cman-1.0-pre33/init.d/cman 2005-05-05 12:02:22.000000000 -0500 @@ -1,6 +1,6 @@ #!/bin/bash # -# chkconfig: 345 21 79 +# chkconfig: - 21 79 # description: Starts and stops cman # # Index: cman.spec =================================================================== RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cman.spec 5 May 2005 16:08:36 -0000 1.11 +++ cman.spec 5 May 2005 17:03:46 -0000 1.12 @@ -13,7 +13,7 @@ Name: cman Version: 1.0 -Release: 0.pre33.5 +Release: 0.pre33.6 License: GPL Group: System Environment/Base Summary: cman - The Cluster Manager @@ -25,6 +25,7 @@ Requires: cman-kernel >= 2.6.11 ExclusiveArch: i386 x86_64 Source0: %{name}-%{version}-%{subversion}.tar.gz +Patch1: cman-1.0-pre33-norun.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description @@ -32,6 +33,7 @@ %prep %setup -q -n %{name}-%{version}-%{subversion} +%patch -p1 -b .norun %build ./configure --mandir=%{_mandir} @@ -66,6 +68,9 @@ %{_mandir} %changelog +* Thu May 05 2005 Chris Feist +- Added patch to disable starting up the init scripts. + * Mon Dec 20 2004 Chris Feist - Rebuild with new sources. From fedora-cvs-commits at redhat.com Thu May 5 17:04:36 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 13:04:36 -0400 Subject: rpms/system-config-bind/devel system-config-bind.spec,1.26,1.27 Message-ID: <200505051704.j45H4arj013649@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13636 Modified Files: system-config-bind.spec Log Message: fix bug 156913: correct %attrs for config files Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- system-config-bind.spec 5 May 2005 03:42:14 -0000 1.26 +++ system-config-bind.spec 5 May 2005 17:04:34 -0000 1.27 @@ -45,12 +45,12 @@ /usr/sbin/system-config-bind-gui /usr/bin/system-config-bind /usr/bin/bindconf -/usr/share/applications/system-config-bind.desktop -/usr/share/icons/hicolor/48x48/apps/system-config-bind.png -/etc/security/console.apps/system-config-bind -/etc/security/console.apps/bindconf -/etc/pam.d/bindconf -/etc/pam.d/system-config-bind +%attr(644,root,named) /usr/share/applications/system-config-bind.desktop +%attr(644,root,named) /usr/share/icons/hicolor/48x48/apps/system-config-bind.png +%attr(644,root,named) /etc/security/console.apps/system-config-bind +%attr(644,root,named) /etc/security/console.apps/bindconf +%attr(644,root,named) /etc/pam.d/bindconf +%attr(644,root,named) /etc/pam.d/system-config-bind %doc scb_manual.pdf %post From fedora-cvs-commits at redhat.com Thu May 5 17:05:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 13:05:52 -0400 Subject: rpms/cman/devel cman.spec,1.12,1.13 Message-ID: <200505051705.j45H5qHG013732@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13720 Modified Files: cman.spec Log Message: Fixed patch number. Index: cman.spec =================================================================== RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cman.spec 5 May 2005 17:03:46 -0000 1.12 +++ cman.spec 5 May 2005 17:05:50 -0000 1.13 @@ -13,7 +13,7 @@ Name: cman Version: 1.0 -Release: 0.pre33.6 +Release: 0.pre33.7 License: GPL Group: System Environment/Base Summary: cman - The Cluster Manager @@ -33,7 +33,7 @@ %prep %setup -q -n %{name}-%{version}-%{subversion} -%patch -p1 -b .norun +%patch1 -p1 -b .norun %build ./configure --mandir=%{_mandir} From fedora-cvs-commits at redhat.com Thu May 5 17:06:23 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 13:06:23 -0400 Subject: rpms/rgmanager/devel rgmanager-1.9.31-norun.patch, NONE, 1.1 rgmanager.spec, 1.9, 1.10 Message-ID: <200505051706.j45H6NnJ013793@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/rgmanager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13774 Modified Files: rgmanager.spec Added Files: rgmanager-1.9.31-norun.patch Log Message: Added patch to disable starting up the init scripts. rgmanager-1.9.31-norun.patch: rgmanager | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE rgmanager-1.9.31-norun.patch --- --- rgmanager-1.9.31/init.d/rgmanager.norun 2005-05-05 12:04:34.000000000 -0500 +++ rgmanager-1.9.31/init.d/rgmanager 2005-05-05 12:04:43.000000000 -0500 @@ -7,7 +7,7 @@ # any later version. # # description: Starts and stops Red Hat Service (resource group) Manager -# chkconfig: 2345 99 01 +# chkconfig: - 99 01 # # Source function library Index: rgmanager.spec =================================================================== RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rgmanager.spec 5 May 2005 15:51:46 -0000 1.9 +++ rgmanager.spec 5 May 2005 17:06:21 -0000 1.10 @@ -12,7 +12,7 @@ Name: rgmanager Version: 1.9.31 -Release: 1 +Release: 2 License: GPL,LGPL Group: System Environment/Base Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux @@ -25,6 +25,7 @@ BuildRequires: magma ccs-devel magma-devel ExclusiveArch: i386 ia64 x86_64 Source: %{name}-%{version}.tar.gz +Patch1: rgmanager-1.9.31-norun.patch Buildroot: %{_tmppath}/%{name}-%{version}-buildroot %description Red Hat Resource Group Manager provides high availability of critical server @@ -32,6 +33,7 @@ %prep %setup -q +%patch1 -p1 -b .norun %build ./configure @@ -67,6 +69,9 @@ %config /etc/init.d/rgmanager %changelog +* Thu May 05 2005 Chris Feist +- Added patch to disable starting up the init scripts. + * Mon Dec 20 2004 Chris Feist - Rebuild with new sources. From fedora-cvs-commits at redhat.com Thu May 5 17:09:26 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 13:09:26 -0400 Subject: rpms/gulm/devel gulm-1.0-pre28-norun.patch, NONE, 1.1 gulm.spec, 1.9, 1.10 Message-ID: <200505051709.j45H9QB4013885@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gulm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13870 Modified Files: gulm.spec Added Files: gulm-1.0-pre28-norun.patch Log Message: Added patch to disable starting up the init scripts. gulm-1.0-pre28-norun.patch: lock_gulmd | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gulm-1.0-pre28-norun.patch --- --- gulm-1.0-pre28/init.d/lock_gulmd.norun 2005-05-05 12:07:54.000000000 -0500 +++ gulm-1.0-pre28/init.d/lock_gulmd 2005-05-05 12:08:01.000000000 -0500 @@ -2,7 +2,7 @@ # # # -# chkconfig: 345 22 78 +# chkconfig: 22 78 # description: start/stop the gulm lock daemon # # Index: gulm.spec =================================================================== RCS file: /cvs/dist/rpms/gulm/devel/gulm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gulm.spec 5 May 2005 15:57:39 -0000 1.9 +++ gulm.spec 5 May 2005 17:09:24 -0000 1.10 @@ -13,7 +13,7 @@ Name: gulm Version: 1.0 -Release: 0.pre28.4 +Release: 0.pre28.5 License: GPL Group: System Environment/Daemons Summary: gulm - One possible lock manager for GFS @@ -24,6 +24,7 @@ ExclusiveArch: i386 ia64 x86_64 Source0: %{name}-%{version}-%{subversion}.tar.gz Patch1: gulm-1.0-pre28-gcc4.patch +Patch2: gulm-1.0-pre28-norun.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description @@ -39,6 +40,7 @@ %prep %setup -q -n %{name}-%{version}-%{subversion} %patch1 -p1 +%patch2 -p1 -b .norun %build ./configure --libdir=%{_libdir} --incdir=%{_includedir} --mandir=%{_mandir} @@ -82,6 +84,9 @@ %changelog +* Thu May 05 2005 Chris Feist +- Added patch to disable starting up the init scripts. + * Mon Dec 20 2004 Chris Feist - Rebuild for with new sources. From fedora-cvs-commits at redhat.com Thu May 5 17:11:17 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 13:11:17 -0400 Subject: rpms/GFS/devel gfs-6.1-pre22-norun.patch,NONE,1.1 GFS.spec,1.8,1.9 Message-ID: <200505051711.j45HBHKu013998@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13984 Modified Files: GFS.spec Added Files: gfs-6.1-pre22-norun.patch Log Message: Added patch to disable starting up the init scripts. gfs-6.1-pre22-norun.patch: gfs | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gfs-6.1-pre22-norun.patch --- --- gfs-6.1-pre22/init.d/gfs.norun 2005-05-05 12:09:52.000000000 -0500 +++ gfs-6.1-pre22/init.d/gfs 2005-05-05 12:09:56.000000000 -0500 @@ -2,7 +2,7 @@ # # # -# chkconfig: 345 26 74 +# chkconfig: - 26 74 # description: mount/unmount gfs filesystems configured in /etc/fstab # # Index: GFS.spec =================================================================== RCS file: /cvs/dist/rpms/GFS/devel/GFS.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- GFS.spec 5 May 2005 15:56:33 -0000 1.8 +++ GFS.spec 5 May 2005 17:11:15 -0000 1.9 @@ -13,7 +13,7 @@ Name: GFS Version: 6.1 -Release: 0.pre22.2 +Release: 0.pre22.3 License: GPL Group: System Environment/Kernel Summary: GFS - The Global File System @@ -22,6 +22,7 @@ ExclusiveArch: i386 x86_64 Requires: initscripts >= 7.93.2.EL-1 Source0: gfs-%{version}-%{subversion}.tar.gz +Patch1: gfs-6.1-pre22-norun.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description @@ -29,6 +30,7 @@ %prep %setup -q -n gfs-%{version}-%{subversion} +%patch1 -p1 -b .norun %build ./configure --mandir=%{_mandir} @@ -72,6 +74,9 @@ %changelog +* Thu May 05 2005 Chris Feist +- Added patch to disable starting up the init scripts. + * Wed Dec 22 2004 Chris Feist - Added code to re-read sysctl.conf. From fedora-cvs-commits at redhat.com Thu May 5 17:45:10 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 13:45:10 -0400 Subject: rpms/gphoto2/devel gen-libgphoto-hal-fdi, NONE, 1.1 gphoto2.spec, 1.30, 1.31 Message-ID: <200505051745.j45HjAWY011938@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11466 Modified Files: gphoto2.spec Added Files: gen-libgphoto-hal-fdi Log Message: * Mon May 2 2005 David Zeuthen 2.1.5-8 - Build and install hal device information files --- NEW FILE gen-libgphoto-hal-fdi --- #!/bin/bash # Generate a HAL device information file exporting what cameras are supported # by libgphoto2. # # This script was coded by Pozsar Balazs and slightly # tweaked by David Zeuthen . cat < EOF $DESTDIR/usr/lib/libgphoto2/print-usb-usermap | grep -v '^#' | tr -s ' ' | cut -d' ' -f 3,4 | sort -u | grep -v "^0x0000" | while read ven dev; do cat < camera camera libgphoto2 EOF done cat < EOF Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gphoto2.spec 29 Mar 2005 09:45:11 -0000 1.30 +++ gphoto2.spec 5 May 2005 17:45:07 -0000 1.31 @@ -5,12 +5,13 @@ %define libpkg libgphoto2 %define libver 2.1.5 Version: %{pkgver} -Release: 7 +Release: 8 License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-root Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.gz Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.gz +Source2: gen-libgphoto-hal-fdi Patch1: gphoto2-hotplug.patch Patch2: gphoto2-gcc4.patch Patch3: gphoto2-memset.patch @@ -28,7 +29,7 @@ BuildRequires: lockdev-devel BuildRequires: libexif-devel BuildRequires: libjpeg-devel, readline-devel -BuildRequires: libtool, pkgconfig +BuildRequires: libtool, pkgconfig, sharutils #################################### %description @@ -110,6 +111,9 @@ install -d -m755 %{buildroot}/etc/hotplug/usb/ install -m755 packaging/linux-hotplug/usbcam.console %{buildroot}/etc/hotplug/usb/usbcam +install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/ +%{SOURCE2} > %{buildroot}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi + popd export tagname=CC @@ -154,7 +158,7 @@ %{_libdir}/*.so.* %{_libdir}/libgphoto2 %{_mandir}/man1/gphoto2.1* - +/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi #################################### %post @@ -195,6 +199,9 @@ # ChangeLog ######################################################################## %changelog +* Mon May 2 2005 David Zeuthen 2.1.5-8 +- Build and install hal device information files + * Tue Mar 29 2005 Tim Waugh - Re-enable docs. From fedora-cvs-commits at redhat.com Thu May 5 17:48:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 13:48:41 -0400 Subject: rpms/selinux-policy-targeted/FC-3 policy-20050104.patch, 1.31, 1.32 selinux-policy-targeted.spec, 1.201, 1.202 Message-ID: <200505051748.j45Hmfg4014729@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-targeted/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv14715 Modified Files: policy-20050104.patch selinux-policy-targeted.spec Log Message: * Thu Apr 7 2005 Dan Walsh 1.17.30-3.2 - Update unconfined_t to use proc_net policy-20050104.patch: Makefile | 47 +++-- attrib.te | 18 ++ domains/program/crond.te | 7 domains/program/ldconfig.te | 21 ++ domains/program/login.te | 2 domains/program/logrotate.te | 24 +- domains/program/mount.te | 2 domains/program/ssh.te | 7 domains/program/syslogd.te | 40 +++- domains/program/unused/acct.te | 6 domains/program/unused/apache.te | 283 +++++++++++++++++++++++----------- domains/program/unused/arpwatch.te | 26 +++ domains/program/unused/cups.te | 58 ++++++ domains/program/unused/dhcpc.te | 5 domains/program/unused/dhcpd.te | 18 +- domains/program/unused/dovecot.te | 3 domains/program/unused/ftpd.te | 2 domains/program/unused/hald.te | 3 domains/program/unused/howl.te | 2 domains/program/unused/innd.te | 7 domains/program/unused/ipsec.te | 9 - domains/program/unused/iptables.te | 3 domains/program/unused/mailman.te | 29 ++- domains/program/unused/mdadm.te | 3 domains/program/unused/mta.te | 24 ++ domains/program/unused/mysqld.te | 24 +- domains/program/unused/named.te | 39 +++- domains/program/unused/nscd.te | 62 +++---- domains/program/unused/ntpd.te | 23 ++ domains/program/unused/portmap.te | 20 ++ domains/program/unused/postfix.te | 2 domains/program/unused/postgresql.te | 62 +++++-- domains/program/unused/procmail.te | 1 domains/program/unused/rpcd.te | 2 domains/program/unused/rpm.te | 5 domains/program/unused/rsync.te | 2 domains/program/unused/samba.te | 4 domains/program/unused/sendmail.te | 2 domains/program/unused/slrnpull.te | 1 domains/program/unused/snmpd.te | 24 +- domains/program/unused/spamd.te | 2 domains/program/unused/squid.te | 21 +- domains/program/unused/udev.te | 5 domains/program/unused/updfstab.te | 1 domains/program/unused/winbind.te | 35 ++++ domains/program/unused/xdm.te | 4 domains/program/unused/ypbind.te | 15 + domains/program/unused/ypserv.te | 7 domains/user.te | 6 file_contexts/distros.fc | 76 ++++++--- file_contexts/program/apache.fc | 14 + file_contexts/program/arpwatch.fc | 3 file_contexts/program/cups.fc | 5 file_contexts/program/dhcpd.fc | 2 file_contexts/program/ipsec.fc | 11 - file_contexts/program/mailman.fc | 15 - file_contexts/program/mta.fc | 5 file_contexts/program/mysqld.fc | 4 file_contexts/program/named.fc | 17 +- file_contexts/program/nscd.fc | 3 file_contexts/program/ntpd.fc | 2 file_contexts/program/postgresql.fc | 23 +- file_contexts/program/sendmail.fc | 1 file_contexts/program/snmpd.fc | 3 file_contexts/program/squid.fc | 2 file_contexts/program/winbind.fc | 10 + file_contexts/types.fc | 161 ++++++------------- flask/access_vectors | 31 +++ flask/security_classes | 6 genfs_contexts | 2 macros/base_user_macros.te | 9 - macros/core_macros.te | 98 ++++++++--- macros/global_macros.te | 95 +++-------- macros/network_macros.te | 172 ++++++++++++++++++++ macros/program/apache_macros.te | 144 +++++++++-------- macros/program/kerberos_macros.te | 11 + macros/program/mount_macros.te | 2 macros/program/mozilla_macros.te | 2 macros/program/mta_macros.te | 5 macros/program/newrole_macros.te | 2 macros/program/spamassassin_macros.te | 5 macros/program/ssh_agent_macros.te | 2 macros/program/ssh_macros.te | 2 macros/program/su_macros.te | 2 macros/program/userhelper_macros.te | 3 macros/program/xauth_macros.te | 2 macros/program/xserver_macros.te | 4 macros/program/ypbind_macros.te | 24 -- man/man8/httpd_selinux.8 | 108 ++++++++++++ man/man8/named_selinux.8 | 29 +++ net_contexts | 83 +++++++-- targeted/assert.te | 4 targeted/domains/program/hotplug.te | 4 targeted/domains/program/initrc.te | 2 targeted/domains/program/sendmail.te | 17 ++ targeted/domains/unconfined.te | 38 ++++ tunables/distro.tun | 2 tunables/tunable.tun | 21 +- types/device.te | 6 types/file.te | 85 ++++++---- types/network.te | 55 ++++-- types/procfs.te | 4 102 files changed, 1701 insertions(+), 755 deletions(-) Index: policy-20050104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-3/policy-20050104.patch,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- policy-20050104.patch 22 Apr 2005 16:40:12 -0000 1.31 +++ policy-20050104.patch 5 May 2005 17:48:38 -0000 1.32 @@ -757,8 +757,8 @@ +allow arpwatch_t sbin_t:dir { search }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/cups.te policy-1.17.30/domains/program/unused/cups.te --- nsapolicy/domains/program/unused/cups.te 2004-10-09 21:07:28.000000000 -0400 -+++ policy-1.17.30/domains/program/unused/cups.te 2005-03-21 23:08:51.000000000 -0500 -@@ -20,7 +20,6 @@ ++++ policy-1.17.30/domains/program/unused/cups.te 2005-04-26 08:11:29.000000000 -0400 +@@ -20,10 +20,10 @@ can_network(cupsd_t) can_ypbind(cupsd_t) @@ -766,7 +766,11 @@ logdir_domain(cupsd) tmp_domain(cupsd) -@@ -52,8 +51,6 @@ ++file_type_auto_trans(cupsd_t, tmp_t, cupsd_tmp_t, fifo_file) + + allow cupsd_t devpts_t:dir search; + +@@ -52,13 +52,11 @@ # write to spool allow cupsd_t var_spool_t:dir search; @@ -775,7 +779,13 @@ # this is not ideal, and allowing setattr access to cupsd_etc_t is wrong file_type_auto_trans(cupsd_t, cupsd_etc_t, cupsd_rw_etc_t, file) file_type_auto_trans(cupsd_t, var_t, cupsd_rw_etc_t, file) -@@ -165,11 +162,55 @@ + allow cupsd_t cupsd_rw_etc_t:dir { setattr rw_dir_perms }; +-allow cupsd_t cupsd_etc_t:file setattr; ++allow cupsd_t cupsd_etc_t:file rw_file_perms; + allow cupsd_t cupsd_etc_t:dir setattr; + + allow cupsd_t { etc_t etc_runtime_t }:file { getattr read ioctl }; +@@ -165,11 +163,55 @@ dontaudit cupsd_t selinux_config_t:dir search; dontaudit cupsd_t selinux_config_t:file { getattr read }; @@ -2806,7 +2816,7 @@ +/usr/lib(64)?/[^/]*thunderbird[^/]*/mozilla-xremote-client -- system_u:object_r:bin_t diff --exclude-from=exclude -N -u -r nsapolicy/flask/access_vectors policy-1.17.30/flask/access_vectors --- nsapolicy/flask/access_vectors 2004-10-09 21:07:28.000000000 -0400 -+++ policy-1.17.30/flask/access_vectors 2005-04-22 11:36:40.000000000 -0400 ++++ policy-1.17.30/flask/access_vectors 2005-05-05 13:45:16.000000000 -0400 @@ -118,6 +118,7 @@ { execute_no_trans @@ -2835,17 +2845,19 @@ } class udp_socket -@@ -240,6 +247,9 @@ +@@ -240,6 +247,11 @@ siginh setrlimit rlimitinh + dyntransition + setcurrent + execmem ++ execstack ++ execheap } -@@ -287,6 +297,8 @@ +@@ -287,6 +299,8 @@ compute_user setenforce # was avc_toggle in system class setbool @@ -2854,7 +2866,7 @@ } -@@ -341,6 +353,8 @@ +@@ -341,6 +355,8 @@ sys_tty_config mknod lease @@ -2863,7 +2875,7 @@ } -@@ -539,6 +553,8 @@ +@@ -539,6 +555,8 @@ { nlmsg_read nlmsg_write @@ -2872,7 +2884,7 @@ } class netlink_ip6fw_socket -@@ -575,3 +591,16 @@ +@@ -575,3 +593,16 @@ shmemgrp shmemhost } @@ -3151,7 +3163,7 @@ ')dnl end general_domain_access diff --exclude-from=exclude -N -u -r nsapolicy/macros/global_macros.te policy-1.17.30/macros/global_macros.te --- nsapolicy/macros/global_macros.te 2004-10-09 21:07:28.000000000 -0400 -+++ policy-1.17.30/macros/global_macros.te 2005-04-22 11:45:53.000000000 -0400 ++++ policy-1.17.30/macros/global_macros.te 2005-05-05 13:41:30.000000000 -0400 @@ -89,9 +89,10 @@ allow $1 ld_so_t:file rx_file_perms; #allow $1 ld_so_t:file execute_no_trans; @@ -3247,6 +3259,83 @@ read_locale($1_t) +@@ -536,6 +478,8 @@ + # + define(`unconfined_domain', ` + ++typeattribute $1 unrestricted; ++ + # Mount/unmount any filesystem. + allow $1 fs_type:filesystem *; + +@@ -543,7 +487,8 @@ + allow $1 file_type:filesystem *; + + # Create/access any file in a labeled filesystem; +-allow $1 file_type:dir_file_class_set *; ++allow $1 file_type:{ file chr_file } ~execmod; ++allow $1 file_type:{ dir lnk_file sock_file fifo_file blk_file } *; + allow $1 sysctl_t:{ dir file } *; + allow $1 device_type:devfile_class_set *; + allow $1 mtrr_device_t:file *; +@@ -552,7 +497,7 @@ + # pseudo filesystem types that are applied to both the filesystem + # and its files. + allow $1 { unlabeled_t fs_type }:dir_file_class_set *; +-allow $1 proc_fs: file *; ++allow $1 proc_fs:{ dir file } *; + + # For /proc/pid + r_dir_file($1,domain) +@@ -566,9 +511,10 @@ + allow $1 node_type:node *; + allow $1 netif_type:netif *; + allow $1 port_type:{ tcp_socket udp_socket } { send_msg recv_msg }; ++allow $1 port_type:tcp_socket name_connect; + + # Bind to any network address. +-allow $1 port_type:{ tcp_socket udp_socket } { name_bind }; ++allow $1 port_type:{ tcp_socket udp_socket } name_bind; + allow $1 node_type:{ tcp_socket udp_socket rawip_socket } node_bind; + allow $1 file_type:{ unix_stream_socket unix_dgram_socket } name_bind; + +@@ -580,10 +526,27 @@ + allow $1 domain:fifo_file rw_file_perms; + + # Act upon any other process. +-allow $1 domain:process ~transition; ++allow $1 domain:process ~{ transition dyntransition execmem }; + # Transition to myself, to make get_ordered_context_list happy. + allow $1 self:process transition; + ++if (allow_execmem) { ++# Allow making anonymous memory executable, e.g. ++# for runtime-code generation or executable stack. ++allow $1 self:process execmem; ++} ++ ++if (allow_execmem && allow_execstack) { ++# Allow making the stack executable via mprotect. ++allow $1 self:process execstack; ++} ++ ++if (allow_execmod) { ++# Allow text relocations on system shared libraries, e.g. libGL. ++allow $1 texrel_shlib_t:file execmod; ++allow $1 home_type:file execmod; ++} ++ + # Create/access any System V IPC objects. + allow $1 domain:{ sem msgq shm } *; + allow $1 domain:msg { send receive }; +@@ -612,5 +575,7 @@ + ifdef(`nscd.te', ` + allow $1 nscd_t:nscd *; + ') ++r_dir_file($1, proc_net_t) + + ')dnl end unconfined_domain ++ diff --exclude-from=exclude -N -u -r nsapolicy/macros/network_macros.te policy-1.17.30/macros/network_macros.te --- nsapolicy/macros/network_macros.te 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.17.30/macros/network_macros.te 2005-04-22 11:45:39.000000000 -0400 @@ -4399,7 +4488,7 @@ +domain_auto_trans(initrc_t, sendmail_exec_t, sendmail_t) diff --exclude-from=exclude -N -u -r nsapolicy/targeted/domains/unconfined.te policy-1.17.30/targeted/domains/unconfined.te --- nsapolicy/targeted/domains/unconfined.te 2004-10-09 21:07:28.000000000 -0400 -+++ policy-1.17.30/targeted/domains/unconfined.te 2005-04-22 12:30:05.000000000 -0400 ++++ policy-1.17.30/targeted/domains/unconfined.te 2005-05-05 13:44:38.000000000 -0400 @@ -4,7 +4,7 @@ # is not explicitly confined. It has no restrictions. # It needs to be carefully protected from the confined domains. @@ -4425,13 +4514,17 @@ # User home directory type. type user_home_t, file_type, sysadmfile; -@@ -37,4 +41,28 @@ +@@ -37,4 +41,32 @@ user_typealias(user) allow unconfined_t unlabeled_t:filesystem *; -allow unlabeled_t unlabeled_t:filesystem { associate }; +allow unlabeled_t unlabeled_t:filesystem associate; + ++# Allow making the stack executable via mprotect. ++# Also requires allow_execmem. ++bool allow_execstack true; ++ +# Allow execution of anonymous mappings, e.g. executable stack. +bool allow_execmem true; + Index: selinux-policy-targeted.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-3/selinux-policy-targeted.spec,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- selinux-policy-targeted.spec 22 Apr 2005 16:40:12 -0000 1.201 +++ selinux-policy-targeted.spec 5 May 2005 17:48:38 -0000 1.202 @@ -8,7 +8,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.17.30 -Release: 3.1 +Release: 3.2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz @@ -214,6 +214,9 @@ exit 0 %changelog +* Thu Apr 7 2005 Dan Walsh 1.17.30-3.2 +- Update unconfined_t to use proc_net + * Thu Apr 7 2005 Dan Walsh 1.17.30-2.98 - Upgrade to latest apache policy From fedora-cvs-commits at redhat.com Thu May 5 17:52:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 13:52:04 -0400 Subject: rpms/redhat-artwork/devel redhat-artwork-0.122-padding-fix.patch, NONE, 1.1 redhat-artwork.spec, 1.86, 1.87 Message-ID: <200505051752.j45Hq4gg014856@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14842 Modified Files: redhat-artwork.spec Added Files: redhat-artwork-0.122-padding-fix.patch Log Message: * Add patch that changes the ythickness of the bluecurve-menu-item style in the bluecurve theme so the menu applet does not expand the default panel size which causes launchers icons in the panel to be scaled and become blured (Bug #146980) redhat-artwork-0.122-padding-fix.patch: gtkrc | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE redhat-artwork-0.122-padding-fix.patch --- --- redhat-artwork-0.122/art/gtk/Bluecurve/gtk-2.0/gtkrc.padding-fix 2005-05-05 13:40:14.000000000 -0400 +++ redhat-artwork-0.122/art/gtk/Bluecurve/gtk-2.0/gtkrc 2005-05-05 13:40:37.000000000 -0400 @@ -73,7 +73,7 @@ style "bluecurve-menu-item" = "bluecurve-default" { xthickness = 3 - ythickness = 4 + ythickness = 3 bg[SELECTED] = "#4464ac" fg[PRELIGHT] = "#ffffff" Index: redhat-artwork.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- redhat-artwork.spec 4 May 2005 18:43:18 -0000 1.86 +++ redhat-artwork.spec 5 May 2005 17:52:02 -0000 1.87 @@ -4,7 +4,7 @@ Summary: Artwork for Red Hat default look-and-feel Name: redhat-artwork Version: 0.122 -Release: 6 +Release: 7 URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz Source1: post-install-fixup.sh @@ -12,6 +12,7 @@ Source3: throbbers.tar.bz2 Patch0: redhat-artwork-0.121-clearlooks.patch Patch1: redhat-artwork-0.122-throbbers.patch +Patch2: redhat-artwork-0.122-padding-fix.patch Group: User Interface/Desktops License: GPL BuildRoot: %{_tmppath}/%{name}-root @@ -47,6 +48,7 @@ tar xjf %{SOURCE3} %patch0 -p1 -b .clearlooks %patch1 -p1 -b .throbbers +%patch2 -p1 -b .padding-fix mkdir post-install (cd post-install; tar xzvf %{SOURCE2}) @@ -149,6 +151,12 @@ %config /root/.gtkrc %changelog +* Thu May 05 2005 John (J5) Palmieri 0.122-7 +- Add patch that changes the ythickness of the bluecurve-menu-item + style in the bluecurve theme so the menu applet does not expand + the default panel size which causes launchers icons in the panel + to be scaled and become blured (Bug #146980) + * Tue May 03 2005 John (J5) Palmieri 0.122-6 - Add a symlink for openoffice icons so we have matching bluecurve icons instead of the ugly upstream ones From fedora-cvs-commits at redhat.com Thu May 5 18:00:53 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 14:00:53 -0400 Subject: rpms/selinux-policy-targeted/FC-3 policy-20050104.patch,1.32,1.33 Message-ID: <200505051800.j45I0rTl008774@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-targeted/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv8750 Modified Files: policy-20050104.patch Log Message: * Thu Apr 7 2005 Dan Walsh 1.17.30-3.2 - Update unconfined_t to use proc_net policy-20050104.patch: Makefile | 47 +++-- attrib.te | 18 ++ domains/program/crond.te | 7 domains/program/ldconfig.te | 21 ++ domains/program/login.te | 2 domains/program/logrotate.te | 24 +- domains/program/mount.te | 2 domains/program/ssh.te | 7 domains/program/syslogd.te | 40 +++- domains/program/unused/acct.te | 6 domains/program/unused/apache.te | 283 +++++++++++++++++++++++----------- domains/program/unused/arpwatch.te | 26 +++ domains/program/unused/cups.te | 58 ++++++ domains/program/unused/dhcpc.te | 5 domains/program/unused/dhcpd.te | 18 +- domains/program/unused/dovecot.te | 3 domains/program/unused/ftpd.te | 2 domains/program/unused/hald.te | 3 domains/program/unused/howl.te | 2 domains/program/unused/innd.te | 7 domains/program/unused/ipsec.te | 9 - domains/program/unused/iptables.te | 3 domains/program/unused/mailman.te | 29 ++- domains/program/unused/mdadm.te | 3 domains/program/unused/mta.te | 24 ++ domains/program/unused/mysqld.te | 24 +- domains/program/unused/named.te | 39 +++- domains/program/unused/nscd.te | 62 +++---- domains/program/unused/ntpd.te | 23 ++ domains/program/unused/portmap.te | 20 ++ domains/program/unused/postfix.te | 2 domains/program/unused/postgresql.te | 62 +++++-- domains/program/unused/procmail.te | 1 domains/program/unused/rpcd.te | 2 domains/program/unused/rpm.te | 5 domains/program/unused/rsync.te | 2 domains/program/unused/samba.te | 4 domains/program/unused/sendmail.te | 2 domains/program/unused/slrnpull.te | 1 domains/program/unused/snmpd.te | 24 +- domains/program/unused/spamd.te | 2 domains/program/unused/squid.te | 21 +- domains/program/unused/udev.te | 5 domains/program/unused/updfstab.te | 1 domains/program/unused/winbind.te | 35 ++++ domains/program/unused/xdm.te | 4 domains/program/unused/ypbind.te | 15 + domains/program/unused/ypserv.te | 7 domains/user.te | 6 file_contexts/distros.fc | 76 ++++++--- file_contexts/program/apache.fc | 14 + file_contexts/program/arpwatch.fc | 3 file_contexts/program/cups.fc | 5 file_contexts/program/dhcpd.fc | 2 file_contexts/program/ipsec.fc | 11 - file_contexts/program/mailman.fc | 15 - file_contexts/program/mta.fc | 5 file_contexts/program/mysqld.fc | 4 file_contexts/program/named.fc | 17 +- file_contexts/program/nscd.fc | 3 file_contexts/program/ntpd.fc | 2 file_contexts/program/postgresql.fc | 23 +- file_contexts/program/sendmail.fc | 1 file_contexts/program/snmpd.fc | 3 file_contexts/program/squid.fc | 2 file_contexts/program/winbind.fc | 10 + file_contexts/types.fc | 161 ++++++------------- flask/access_vectors | 31 +++ flask/security_classes | 6 genfs_contexts | 2 macros/base_user_macros.te | 9 - macros/core_macros.te | 98 ++++++++--- macros/global_macros.te | 93 +++-------- macros/network_macros.te | 172 ++++++++++++++++++++ macros/program/apache_macros.te | 144 +++++++++-------- macros/program/kerberos_macros.te | 11 + macros/program/mount_macros.te | 2 macros/program/mozilla_macros.te | 2 macros/program/mta_macros.te | 5 macros/program/newrole_macros.te | 2 macros/program/spamassassin_macros.te | 5 macros/program/ssh_agent_macros.te | 2 macros/program/ssh_macros.te | 2 macros/program/su_macros.te | 2 macros/program/userhelper_macros.te | 3 macros/program/xauth_macros.te | 2 macros/program/xserver_macros.te | 4 macros/program/ypbind_macros.te | 24 -- man/man8/httpd_selinux.8 | 108 ++++++++++++ man/man8/named_selinux.8 | 29 +++ net_contexts | 83 +++++++-- targeted/assert.te | 4 targeted/domains/program/hotplug.te | 4 targeted/domains/program/initrc.te | 2 targeted/domains/program/sendmail.te | 17 ++ targeted/domains/unconfined.te | 38 ++++ tunables/distro.tun | 2 tunables/tunable.tun | 21 +- types/device.te | 6 types/file.te | 85 ++++++---- types/network.te | 55 ++++-- types/procfs.te | 4 102 files changed, 1699 insertions(+), 755 deletions(-) Index: policy-20050104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-3/policy-20050104.patch,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- policy-20050104.patch 5 May 2005 17:48:38 -0000 1.32 +++ policy-20050104.patch 5 May 2005 18:00:50 -0000 1.33 @@ -3163,7 +3163,7 @@ ')dnl end general_domain_access diff --exclude-from=exclude -N -u -r nsapolicy/macros/global_macros.te policy-1.17.30/macros/global_macros.te --- nsapolicy/macros/global_macros.te 2004-10-09 21:07:28.000000000 -0400 -+++ policy-1.17.30/macros/global_macros.te 2005-05-05 13:41:30.000000000 -0400 ++++ policy-1.17.30/macros/global_macros.te 2005-05-05 13:58:33.000000000 -0400 @@ -89,9 +89,10 @@ allow $1 ld_so_t:file rx_file_perms; #allow $1 ld_so_t:file execute_no_trans; @@ -3259,16 +3259,7 @@ read_locale($1_t) -@@ -536,6 +478,8 @@ - # - define(`unconfined_domain', ` - -+typeattribute $1 unrestricted; -+ - # Mount/unmount any filesystem. - allow $1 fs_type:filesystem *; - -@@ -543,7 +487,8 @@ +@@ -543,7 +485,8 @@ allow $1 file_type:filesystem *; # Create/access any file in a labeled filesystem; @@ -3278,7 +3269,7 @@ allow $1 sysctl_t:{ dir file } *; allow $1 device_type:devfile_class_set *; allow $1 mtrr_device_t:file *; -@@ -552,7 +497,7 @@ +@@ -552,7 +495,7 @@ # pseudo filesystem types that are applied to both the filesystem # and its files. allow $1 { unlabeled_t fs_type }:dir_file_class_set *; @@ -3287,7 +3278,7 @@ # For /proc/pid r_dir_file($1,domain) -@@ -566,9 +511,10 @@ +@@ -566,9 +509,10 @@ allow $1 node_type:node *; allow $1 netif_type:netif *; allow $1 port_type:{ tcp_socket udp_socket } { send_msg recv_msg }; @@ -3299,7 +3290,7 @@ allow $1 node_type:{ tcp_socket udp_socket rawip_socket } node_bind; allow $1 file_type:{ unix_stream_socket unix_dgram_socket } name_bind; -@@ -580,10 +526,27 @@ +@@ -580,10 +524,27 @@ allow $1 domain:fifo_file rw_file_perms; # Act upon any other process. @@ -3328,7 +3319,7 @@ # Create/access any System V IPC objects. allow $1 domain:{ sem msgq shm } *; allow $1 domain:msg { send receive }; -@@ -612,5 +575,7 @@ +@@ -612,5 +573,7 @@ ifdef(`nscd.te', ` allow $1 nscd_t:nscd *; ') From fedora-cvs-commits at redhat.com Thu May 5 18:07:01 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 14:07:01 -0400 Subject: rpms/anaconda/devel .cvsignore, 1.108, 1.109 anaconda.spec, 1.223, 1.224 sources, 1.224, 1.225 Message-ID: <200505051807.j45I71E7008981@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8959/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.2.0.60-1 on branch devel from anaconda-10.2.0.60-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- .cvsignore 4 May 2005 04:04:00 -0000 1.108 +++ .cvsignore 5 May 2005 18:06:58 -0000 1.109 @@ -1 +1 @@ -anaconda-10.2.0.59.tar.bz2 +anaconda-10.2.0.60.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- anaconda.spec 4 May 2005 04:04:00 -0000 1.223 +++ anaconda.spec 5 May 2005 18:06:58 -0000 1.224 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.2.0.59 +Version: 10.2.0.60 Release: 1 License: GPL Summary: Graphical system installer @@ -11,6 +11,8 @@ Requires: anaconda-help, system-logos Obsoletes: anaconda-images <= 10 Url: http://fedora.redhat.com/projects/anaconda-installer/ +# temporary due to buildsys horkage +ExcludeArch: s390 s390x BuildRoot: %{_tmppath}/anaconda-%{PACKAGE_VERSION} @@ -69,6 +71,14 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu May 5 2005 Jeremy Katz - 10.2.0.60-1 +- Better handling of the langsupport group (clumens) +- Don't install the gfs stuff for all kernel variants, that brings in kernel-smp on an everything install (#156849) +- Don't grow a partition beyond the largest freespace on a drive +- HFS+ support +- Pull in more selinux policy files to try to get /home labeled right +- Fix typo causing segfault (pnasrat) + * Tue May 3 2005 Jeremy Katz - 10.2.0.59-1 - Try to use the fb res on pmac - Always reset terminal attrs on ppc (notting, #156411) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.224 retrieving revision 1.225 diff -u -r1.224 -r1.225 --- sources 4 May 2005 04:04:00 -0000 1.224 +++ sources 5 May 2005 18:06:58 -0000 1.225 @@ -1 +1 @@ -2a656851a68728ff0d09935545021ed6 anaconda-10.2.0.59.tar.bz2 +a75329ef94bf24e73b333f2ae612d4be anaconda-10.2.0.60.tar.bz2 From fedora-cvs-commits at redhat.com Thu May 5 18:21:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 14:21:04 -0400 Subject: rpms/gjdoc/devel gjdoc-0.7.4.singleQuotes.patch, NONE, 1.1 gjdoc-0.7.4.whitespacebeforemembername.patch, NONE, 1.1 gjdoc.spec, 1.19, 1.20 Message-ID: <200505051821.j45IL48K012565@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/gjdoc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12549 Modified Files: gjdoc.spec Added Files: gjdoc-0.7.4.singleQuotes.patch gjdoc-0.7.4.whitespacebeforemembername.patch Log Message: * Thu May 05 2005 Andrew Overholt 0.7.4-5 - Add patch to handle single quotes in options (Julian Scheid). - Add patch to handle lack of whitespace before member names (Julian). gjdoc-0.7.4.singleQuotes.patch: Main.java | 1 + 1 files changed, 1 insertion(+) --- NEW FILE gjdoc-0.7.4.singleQuotes.patch --- Index: src/gnu/classpath/tools/gjdoc/Main.java =================================================================== RCS file: /cvsroot/classpath/gjdoc/src/gnu/classpath/tools/gjdoc/Main.java,v retrieving revision 1.66 retrieving revision 1.67 diff -u -p -r1.66 -r1.67 --- src/gnu/classpath/tools/gjdoc/Main.java 27 Apr 2005 23:00:58 -0000 1.66 +++ src/gnu/classpath/tools/gjdoc/Main.java 4 May 2005 15:41:28 -0000 1.67 @@ -880,6 +880,7 @@ public final class Main st.resetSyntax(); st.wordChars('\u0000', '\uffff'); st.quoteChar('\"'); + st.quoteChar('\''); st.whitespaceChars(' ', ' '); st.whitespaceChars('\t', '\t'); st.whitespaceChars('\r', '\r'); gjdoc-0.7.4.whitespacebeforemembername.patch: ChangeLog | 16 ++++++ src/gnu/classpath/tools/doclets/AbstractDoclet.java | 8 ++- src/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java | 23 ++++---- src/gnu/classpath/tools/gjdoc/MemberDocImpl.java | 34 ++++++++----- 4 files changed, 58 insertions(+), 23 deletions(-) --- NEW FILE gjdoc-0.7.4.whitespacebeforemembername.patch --- Index: ChangeLog =================================================================== RCS file: /cvsroot/classpath/gjdoc/ChangeLog,v retrieving revision 1.194 retrieving revision 1.196 diff -u -p -r1.194 -r1.196 --- ChangeLog 27 Apr 2005 23:00:59 -0000 1.194 +++ ChangeLog 5 May 2005 01:17:38 -0000 1.196 @@ -1 +1,17 @@ +2005-05-05 Julian Scheid + + * src/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java + (createFromSource): Do not require whitespace to separate type + dimension qualifier from member name. Replace some uses of String + by StringBuffer. + + * src/gnu/classpath/tools/gjdoc/MemberDocImpl.java + (parseModifiers): Likewise. + + * src/gnu/classpath/tools/doclets/AbstractDoclet.java (addUsedBy): + Use TreeMap instead of HashMap for deterministic usage type sort + order. + (UsageType): Implements Comparable + (UsageType.compareTo): New method. + 2005-05-04 Julian Scheid * src/gnu/classpath/tools/gjdoc/Main.java: Handle single quotes in Index: src/gnu/classpath/tools/doclets/AbstractDoclet.java =================================================================== RCS file: /cvsroot/classpath/gjdoc/src/gnu/classpath/tools/doclets/AbstractDoclet.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- src/gnu/classpath/tools/doclets/AbstractDoclet.java 27 Apr 2005 23:00:59 -0000 1.23 +++ src/gnu/classpath/tools/doclets/AbstractDoclet.java 5 May 2005 01:17:38 -0000 1.24 @@ -772,7 +772,7 @@ public abstract class AbstractDoclet Map usageTypeToUsersMap = (Map)packageToUsageTypeMap.get(userPackage); if (null == usageTypeToUsersMap) { - usageTypeToUsersMap = new HashMap(); + usageTypeToUsersMap = new TreeMap(); packageToUsageTypeMap.put(userPackage, usageTypeToUsersMap); } @@ -909,6 +909,7 @@ public abstract class AbstractDoclet } protected static class UsageType + implements Comparable { public static final UsageType CLASS_DERIVED_FROM = new UsageType("class-derived-from"); public static final UsageType CLASS_IMPLEMENTING = new UsageType("class-implementing"); @@ -925,6 +926,11 @@ public abstract class AbstractDoclet this.id = id; } + public int compareTo(Object other) + { + return this.id.compareTo(((UsageType)other).id); + } + public String toString() { return "UsageType{id=" + id + "}"; } Index: src/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java =================================================================== RCS file: /cvsroot/classpath/gjdoc/src/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- src/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java 8 Mar 2005 15:08:26 -0000 1.9 +++ src/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java 5 May 2005 01:17:38 -0000 1.10 @@ -94,13 +94,16 @@ public class ExecutableMemberDocImpl ext char[] source, int startIndex, int endIndex) throws IOException, ParseException { int lastchar=32; - String methodName=""; + StringBuffer methodName=new StringBuffer(); for (int i=startIndex; i=0 && Parser.WHITESPACE.indexOf(source[i])<0) - methodName=""+source[i]; - else if (Parser.WHITESPACE.indexOf(source[i])<0) - methodName+=source[i]; - + if ((Parser.WHITESPACE.indexOf(lastchar)>=0 && Parser.WHITESPACE.indexOf(source[i])<0) + || (lastchar == ']' && Parser.WHITESPACE.indexOf(source[i])<0 && '[' != source[i])) { + methodName.setLength(0); + methodName.append(source[i]); + } + else if (Parser.WHITESPACE.indexOf(source[i])<0) { + methodName.append(source[i]); + } lastchar=source[i]; } @@ -108,7 +111,7 @@ public class ExecutableMemberDocImpl ext SourcePosition position = DocImpl.getPosition(containingClass, source, startIndex); - if (methodName.equals(((ClassDocImpl)containingClass).getClassName())) { + if (methodName.toString().equals(((ClassDocImpl)containingClass).getClassName())) { // Constructor @@ -129,7 +132,7 @@ public class ExecutableMemberDocImpl ext rc.accessLevel=ACCESS_PUBLIC; int ndx=rc.parseModifiers(source, startIndex, endIndex); - String name=""; + StringBuffer name = new StringBuffer(); final int STATE_NORMAL=1; final int STATE_STARC=2; @@ -148,7 +151,7 @@ public class ExecutableMemberDocImpl ext state=STATE_STARC; } else { - name+=source[ndx]; + name.append(source[ndx]); } } else if (state==STATE_SLASHC) { @@ -163,7 +166,7 @@ public class ExecutableMemberDocImpl ext } ++ndx; } - rc.setName(name.trim()); + rc.setName(name.toString().trim()); state=STATE_NORMAL; Index: src/gnu/classpath/tools/gjdoc/MemberDocImpl.java =================================================================== RCS file: /cvsroot/classpath/gjdoc/src/gnu/classpath/tools/gjdoc/MemberDocImpl.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- src/gnu/classpath/tools/gjdoc/MemberDocImpl.java 20 Dec 2004 21:27:52 -0000 1.11 +++ src/gnu/classpath/tools/gjdoc/MemberDocImpl.java 5 May 2005 01:17:37 -0000 1.12 @@ -55,8 +55,11 @@ public abstract class MemberDocImpl exte int state = STATE_NORMAL; - String word = ""; + StringBuffer word = new StringBuffer(); + StringBuffer typeNameBuf = new StringBuffer(); int lastWordStart = startIndex; + int firstChar = 0; + int lastChar = 0; for (; startIndex=0) { - if (word.length()>0 && !word.endsWith(".")) { - if (processModifier(word)) { + else if (Parser.WHITESPACE.indexOf(source[startIndex])>=0 + || (startIndex > 0 && source[startIndex-1] == ']' && source[startIndex] != '[')) { + if (word.length()>0 && lastChar != '.') { + if (processModifier(word.toString())) { } - else if (typeName==null && !isConstructor()) { - typeName=word; + else if (typeNameBuf.length()==0 && !isConstructor()) { + typeNameBuf.setLength(0); + typeNameBuf.append(word); } - else if ((word.startsWith("[") || word.startsWith("]")) && !isConstructor()) { - typeName+=word; + else if ((firstChar=='[' || firstChar==']') && !isConstructor()) { + typeNameBuf.append(word); } else { + typeName = typeNameBuf.toString(); return lastWordStart; - //throw new Error("In FieldComponent: cannot understand word '"+word+"' (typeName="+typeName+", name="+name()+")"); } - word=""; + word.setLength(0); lastWordStart=startIndex; } } else { if (lastWordStart<0) lastWordStart=startIndex; - word+=source[startIndex]; + lastChar = source[startIndex]; + if (0 == word.length()) { + firstChar = lastChar; + } + word.append((char)lastChar); } } + typeName = typeNameBuf.toString(); return startIndex; - } public Type type() { Index: gjdoc.spec =================================================================== RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gjdoc.spec 29 Apr 2005 21:14:56 -0000 1.19 +++ gjdoc.spec 5 May 2005 18:21:02 -0000 1.20 @@ -2,7 +2,7 @@ Name: gjdoc Version: 0.7.4 -Release: 4 +Release: 5 URL: http://savannah.gnu.org/projects/classpath/ License: GPL Summary: GNU Javadoc @@ -14,6 +14,8 @@ Patch2: gjdoc-0.7.4.ignoreoptioncase.patch Patch3: gjdoc-0.7.4.noexternalpackagelist.patch Patch4: gjdoc-0.7.4.nullURL.patch +Patch5: gjdoc-0.7.4.singleQuotes.patch +Patch6: gjdoc-0.7.4.whitespacebeforemembername.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: gcc-java >= 4.0.0-1 @@ -31,6 +33,8 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p0 +%patch6 -p0 %build %configure @@ -52,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 05 2005 Andrew Overholt 0.7.4-5 +- Add patch to handle single quotes in options (Julian Scheid). +- Add patch to handle lack of whitespace before member names (Julian). + * Thu Apr 28 2005 Andrew Overholt 0.7.4-4 - Add patches to ignore option case and deal with some error cases (Julian Scheid). From fedora-cvs-commits at redhat.com Thu May 5 18:21:47 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 14:21:47 -0400 Subject: rpms/gulm/devel gulm.spec,1.10,1.11 Message-ID: <200505051821.j45ILla6012594@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gulm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12582 Modified Files: gulm.spec Log Message: Fixed init script handling. Index: gulm.spec =================================================================== RCS file: /cvs/dist/rpms/gulm/devel/gulm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gulm.spec 5 May 2005 17:09:24 -0000 1.10 +++ gulm.spec 5 May 2005 18:21:45 -0000 1.11 @@ -13,7 +13,7 @@ Name: gulm Version: 1.0 -Release: 0.pre28.5 +Release: 0.pre28.6 License: GPL Group: System Environment/Daemons Summary: gulm - One possible lock manager for GFS @@ -57,10 +57,7 @@ rm -rf $RPM_BUILD_ROOT %post -if [ "$1" = 1 ]; then /sbin/chkconfig --add lock_gulmd - /sbin/chkconfig lock_gulmd off -fi %preun if [ "$1" = 0 ]; then From fedora-cvs-commits at redhat.com Thu May 5 18:31:04 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 14:31:04 -0400 Subject: rpms/eclipse/devel eclipse.spec,1.122,1.123 Message-ID: <200505051831.j45IV4qh006669@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6642 Modified Files: eclipse.spec Log Message: * Thu May 05 2005 Andrew Overholt 3.1.0_fc-0.M6.15 - Rebuild with new gjdoc (rh#152049). Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- eclipse.spec 5 May 2005 01:58:58 -0000 1.122 +++ eclipse.spec 5 May 2005 18:30:59 -0000 1.123 @@ -1035,7 +1035,10 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0 %changelog -* Wed May 4 2005 Ben Konrath 3.1.0_fc-0.M6.15 +* Thu May 05 2005 Andrew Overholt 3.1.0_fc-0.M6.15 +- Rebuild with new gjdoc (rh#152049). + +* Wed May 4 2005 Ben Konrath - Re-enable jdt.ui/jdt.jar.so and require gcj 4.0.0-2 (rh#151296). * Mon May 2 2005 Ben Konrath 3.1.0_fc-0.M6.14 From fedora-cvs-commits at redhat.com Thu May 5 18:31:49 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 14:31:49 -0400 Subject: rpms/control-center/devel control-center-2.10.1-fix-popunder-bug.patch, NONE, 1.1 control-center.spec, 1.69, 1.70 Message-ID: <200505051831.j45IVngA006761@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6739 Modified Files: control-center.spec Added Files: control-center-2.10.1-fix-popunder-bug.patch Log Message: - Don't pop up accessibility dialogs under currently focused window control-center-2.10.1-fix-popunder-bug.patch: gnome-settings-accessibility-keyboard.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE control-center-2.10.1-fix-popunder-bug.patch --- --- control-center-2.10.1/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c.fix-popunder-bug 2005-05-05 14:27:57.000000000 -0400 +++ control-center-2.10.1/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c 2005-05-05 14:28:10.000000000 -0400 @@ -374,6 +374,7 @@ warning_dialog_post (GtkWidget *dialog, if (!dialog) { + guint32 timestamp; dialog = gtk_dialog_new_with_buttons (title, NULL, 0, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, @@ -382,6 +383,10 @@ warning_dialog_post (GtkWidget *dialog, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + gtk_widget_realize (dialog); + timestamp = gdk_x11_get_server_time (dialog->window); + gdk_x11_window_set_user_time (dialog->window, timestamp); + g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (response), Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- control-center.spec 27 Apr 2005 04:22:35 -0000 1.69 +++ control-center.spec 5 May 2005 18:31:47 -0000 1.70 @@ -20,7 +20,7 @@ Summary: GNOME Control Center. Name: control-center Version: 2.10.1 -Release: 4 +Release: 5 Epoch: 1 License: GPL/LGPL Group: User Interface/Desktops @@ -30,6 +30,7 @@ Patch3: control-center-2.9.4-filesel.patch Patch4: control-center-2.10.1-mark-tool-buttons-important.patch Patch5: control-center-2.10.1-icon.patch +Patch6: control-center-2.10.1-fix-popunder-bug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.gnome.org @@ -90,6 +91,7 @@ %patch3 -p1 -b .filesel %patch4 -p1 -b .mark-tool-buttons-important %patch5 -p1 -b .icon +%patch6 -p1 -b .fix-popunder-bug %build @@ -191,6 +193,10 @@ # (also its headers) %changelog +* Thu May 5 2005 Ray Strode - 1:2.10.1-5 +- Don't pop up accessibility dialogs under currently focused + window + * Wed Apr 27 2005 Jeremy Katz - 1:2.10.1-4 - run gtk-update-icon-cache with -q From fedora-cvs-commits at redhat.com Thu May 5 18:41:00 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 14:41:00 -0400 Subject: rpms/comps-extras/devel .cvsignore, 1.10, 1.11 comps-extras.spec, 1.14, 1.15 sources, 1.14, 1.15 Message-ID: <200505051841.j45If0l0007185@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/comps-extras/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7171 Modified Files: .cvsignore comps-extras.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 2 May 2005 20:39:04 -0000 1.10 +++ .cvsignore 5 May 2005 18:40:58 -0000 1.11 @@ -1 +1 @@ -comps-extras-10.2.tar.gz +comps-extras-10.3.tar.gz Index: comps-extras.spec =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/comps-extras.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- comps-extras.spec 2 May 2005 20:39:04 -0000 1.14 +++ comps-extras.spec 5 May 2005 18:40:58 -0000 1.15 @@ -1,6 +1,6 @@ Summary: Images for components and tools for working with the comps file Name: comps-extras -Version: 10.2 +Version: 10.3 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -33,6 +33,9 @@ %changelog +* Thu May 5 2005 Bill Nottingham - 10.3-1 +- updated icons () + * Mon May 2 2005 Bill Nottingham - 10.2-1 - add some icons Index: sources =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 May 2005 20:57:58 -0000 1.14 +++ sources 5 May 2005 18:40:58 -0000 1.15 @@ -1 +1 @@ -35a047e22d9ab19ca774a361a33940e2 comps-extras-10.2.tar.gz +71fdc8b4a76e47150b24725dda2598c7 comps-extras-10.3.tar.gz From fedora-cvs-commits at redhat.com Thu May 5 18:43:51 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 14:43:51 -0400 Subject: rpms/GFS-kernel/devel .cvsignore, 1.13, 1.14 GFS-kernel.spec, 1.54, 1.55 sources, 1.14, 1.15 Message-ID: <200505051843.j45IhoL9007341@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7327 Modified Files: .cvsignore GFS-kernel.spec sources Log Message: Updated Sources (automated). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 3 May 2005 19:43:35 -0000 1.13 +++ .cvsignore 5 May 2005 18:43:48 -0000 1.14 @@ -9,3 +9,4 @@ gfs-kernel-2.6.11.2-20050425.154843.FC4.tar.gz gfs-kernel-2.6.11.3-20050426.134031.FC4.tar.gz gfs-kernel-2.6.11.4-20050503.144108.FC4.tar.gz +gfs-kernel-2.6.11.5-20050505.133825.FC4.tar.gz Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- GFS-kernel.spec 4 May 2005 17:00:35 -0000 1.54 +++ GFS-kernel.spec 5 May 2005 18:43:48 -0000 1.55 @@ -13,7 +13,7 @@ %define buildsmp 1 %define buildxen 1 %define kernel_version 2.6.11-1.1286_FC4 -%define subversion 20050503.144108.FC4 +%define subversion 20050505.133825.FC4 %ifnarch i686 x86_64 %define buildsmp 0 @@ -24,8 +24,8 @@ %endif Name: GFS-kernel -Version: 2.6.11.4 -Release: 20050503.144108.FC4.5 +Version: 2.6.11.5 +Release: 20050505.133825.FC4.0 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules Index: sources =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 3 May 2005 19:43:35 -0000 1.14 +++ sources 5 May 2005 18:43:48 -0000 1.15 @@ -1 +1 @@ -aa93b2305d14facee0aceea3b6ac790e gfs-kernel-2.6.11.4-20050503.144108.FC4.tar.gz +7dc35d902c02b0abe36f157c9c84762d gfs-kernel-2.6.11.5-20050505.133825.FC4.tar.gz From fedora-cvs-commits at redhat.com Thu May 5 19:00:54 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 15:00:54 -0400 Subject: rpms/NetworkManager/devel NetworkManager-0.4-dont-kill-nifd.patch, NONE, 1.1 NetworkManager.spec, 1.45, 1.46 Message-ID: <200505051900.j45J0sXc004614@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4597 Modified Files: NetworkManager.spec Added Files: NetworkManager-0.4-dont-kill-nifd.patch Log Message: * Thu May 5 2005 Dan Williams - 0.4-11.cvs22050404 - #rh154391# NetworkManager dies on startup (don't force-kill nifd) NetworkManager-0.4-dont-kill-nifd.patch: NetworkManagerRedHat.c | 4 ---- 1 files changed, 4 deletions(-) --- NEW FILE NetworkManager-0.4-dont-kill-nifd.patch --- --- NetworkManager-0.4/src/backends/NetworkManagerRedHat.c.dont-kill-nifd 2005-05-05 14:57:48.000000000 -0400 +++ NetworkManager-0.4/src/backends/NetworkManagerRedHat.c 2005-05-05 14:57:56.000000000 -0400 @@ -39,10 +39,6 @@ { /* Kill any dhclients lying around */ nm_system_kill_all_dhcp_daemons (); - - /* Stop nifd since we respawn mDNSResponder ourselves */ - if (nm_spawn_process ("/etc/init.d/nifd status") != 0) - nm_spawn_process ("/etc/init.d/nifd stop"); } Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- NetworkManager.spec 4 May 2005 19:01:09 -0000 1.45 +++ NetworkManager.spec 5 May 2005 19:00:47 -0000 1.46 @@ -7,7 +7,7 @@ Name: NetworkManager Summary: Network link manager and user applications Version: 0.4 -Release: 10.cvs20050404 +Release: 11.cvs20050404 Group: System Environment/Base License: GPL URL: http://people.redhat.com/dcbw/NetworkManager/ @@ -20,6 +20,7 @@ Patch5: NetworkManager-0.4-aplist-fix-hidden.patch Patch6: NetworkManager-0.4-novarargs.patch Patch7: NetworkManager-0.4-dhcp-socket-leak-fix.patch +Patch8: NetworkManager-0.4-dont-kill-nifd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root PreReq: chkconfig @@ -101,6 +102,7 @@ %patch5 -p1 -b .aplist-fix-hidden %patch6 -p0 -b .no-varargs %patch7 -p1 -b .dhcp-socket-leak-fix +%patch8 -p1 -b .dont-kill-nifd %build @@ -182,6 +184,9 @@ %changelog +* Thu May 5 2005 Dan Williams - 0.4-11.cvs22050404 +- #rh154391# NetworkManager dies on startup (don't force-kill nifd) + * Wed May 4 2005 Dan Williams - 0.4-10.cvs20050404 - Fix leak of a socket in DHCP code From fedora-cvs-commits at redhat.com Thu May 5 19:44:41 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 15:44:41 -0400 Subject: rpms/gnupg/devel gnupg-1.4.1-gcc.patch, 1.1, 1.2 gnupg.spec, 1.32, 1.33 Message-ID: <200505051944.j45JifhF002037@cvs.devel.redhat.com> Author: nalin Update of /cvs/dist/rpms/gnupg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2023 Modified Files: gnupg-1.4.1-gcc.patch gnupg.spec Log Message: - fix the execstack problem correctly this time (arjanv) gnupg-1.4.1-gcc.patch: configure.ac | 1 + mpi/Makefile.am | 5 +++++ 2 files changed, 6 insertions(+) Index: gnupg-1.4.1-gcc.patch =================================================================== RCS file: /cvs/dist/rpms/gnupg/devel/gnupg-1.4.1-gcc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnupg-1.4.1-gcc.patch 16 Mar 2005 19:57:07 -0000 1.1 +++ gnupg-1.4.1-gcc.patch 5 May 2005 19:44:38 -0000 1.2 @@ -9,7 +9,7 @@ # work and add one to cpp .S files +if USING_GCC +.S.o: -+ $(COMPILE) -c $< ++ $(COMPILE) $(AM_CCASFLAGS) -c $< +else .S.o: $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > _$*.s Index: gnupg.spec =================================================================== RCS file: /cvs/dist/rpms/gnupg/devel/gnupg.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gnupg.spec 28 Apr 2005 16:57:42 -0000 1.32 +++ gnupg.spec 5 May 2005 19:44:38 -0000 1.33 @@ -1,7 +1,7 @@ Summary: A GNU utility for secure communication and data storage. Name: gnupg Version: 1.4.1 -Release: 2 +Release: 3 License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2 @@ -38,7 +38,7 @@ %ifarch ppc64 configure_flags=--disable-asm %endif -CFLAGS="$RPM_OPT_FLAGS -fPIE -DPIC -Wa,--noexecstack" ; export CFLAGS +CFLAGS="$RPM_OPT_FLAGS -fPIE -DPIC" ; export CFLAGS LDFLAGS="$RPM_OPT_FLAGS -pie -Wl,-z,relro,-z,now" ; export LDFLAGS %configure \ --disable-rpath \ @@ -86,6 +86,9 @@ %{_mandir}/man7/* %changelog +* Thu May 5 2005 Nalin Dahyabhai 1.4.1-3 +- fix the execstack problem correctly this time (arjanv) + * Thu Apr 28 2005 Nalin Dahyabhai 1.4.1-2 - add -Wa,--noexecstack back to CFLAGS when invoking configure, the --enable-noexecstack flag only seems to affect asm modules From fedora-cvs-commits at redhat.com Thu May 5 19:49:01 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 15:49:01 -0400 Subject: rpms/anaconda/devel .cvsignore, 1.109, 1.110 anaconda.spec, 1.224, 1.225 sources, 1.225, 1.226 Message-ID: <200505051949.j45Jn1q3005424@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5402/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.2.0.61-1 on branch devel from anaconda-10.2.0.61-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- .cvsignore 5 May 2005 18:06:58 -0000 1.109 +++ .cvsignore 5 May 2005 19:48:58 -0000 1.110 @@ -1 +1 @@ -anaconda-10.2.0.60.tar.bz2 +anaconda-10.2.0.61.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.224 retrieving revision 1.225 diff -u -r1.224 -r1.225 --- anaconda.spec 5 May 2005 18:06:58 -0000 1.224 +++ anaconda.spec 5 May 2005 19:48:58 -0000 1.225 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.2.0.60 +Version: 10.2.0.61 Release: 1 License: GPL Summary: Graphical system installer @@ -71,9 +71,13 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu May 5 2005 Jeremy Katz - 10.2.0.61-1 +- and fix pkgorder for the gfs stuff + * Thu May 5 2005 Jeremy Katz - 10.2.0.60-1 - Better handling of the langsupport group (clumens) -- Don't install the gfs stuff for all kernel variants, that brings in kernel-smp on an everything install (#156849) +- Don't install the gfs stuff for all kernel variants, that brings in + kernel-smp on an everything install (#156849) - Don't grow a partition beyond the largest freespace on a drive - HFS+ support - Pull in more selinux policy files to try to get /home labeled right Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- sources 5 May 2005 18:06:58 -0000 1.225 +++ sources 5 May 2005 19:48:59 -0000 1.226 @@ -1 +1 @@ -a75329ef94bf24e73b333f2ae612d4be anaconda-10.2.0.60.tar.bz2 +b23e16db16ed2469c1c8fbf3b8418211 anaconda-10.2.0.61.tar.bz2 From fedora-cvs-commits at redhat.com Thu May 5 19:55:26 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 15:55:26 -0400 Subject: rpms/system-config-lvm/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 system-config-lvm.spec, 1.8, 1.9 Message-ID: <200505051955.j45JtQON031776@cvs.devel.redhat.com> Author: jparsons Update of /cvs/dist/rpms/system-config-lvm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31765 Modified Files: .cvsignore sources system-config-lvm.spec Log Message: Fix for bzi56957 and bz155419 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-lvm/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 Apr 2005 18:43:16 -0000 1.9 +++ .cvsignore 5 May 2005 19:55:24 -0000 1.10 @@ -6,3 +6,4 @@ system-config-lvm-0.9.21.tar.gz system-config-lvm-0.9.22.tar.gz system-config-lvm-0.9.25.tar.gz +system-config-lvm-0.9.26.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-lvm/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Apr 2005 18:43:16 -0000 1.9 +++ sources 5 May 2005 19:55:24 -0000 1.10 @@ -1 +1 @@ -d6f9e87c135db470af9d04b369eeacb7 system-config-lvm-0.9.25.tar.gz +316c7ef91fe208d6ece97785ab10f285 system-config-lvm-0.9.26.tar.gz Index: system-config-lvm.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- system-config-lvm.spec 14 Apr 2005 18:43:16 -0000 1.8 +++ system-config-lvm.spec 5 May 2005 19:55:24 -0000 1.9 @@ -1,7 +1,7 @@ # -*- RPM-SPEC -*- Summary: A utility for graphically configuring Logical Volumes. Name: system-config-lvm -Version: 0.9.25 +Version: 0.9.26 Release: 1.0 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz @@ -51,6 +51,8 @@ %config %{_sysconfdir}/security/console.apps/system-config-lvm %changelog +* Thu May 05 2005 Jim Parsons 0.9.26-1.0 + - Fix for bz156957 * Thu Apr 14 2005 Jim Parsons 0.9.25-1.0 - Version bump. * Thu Apr 14 2005 Jim Parsons 0.9.24-1.0 From fedora-cvs-commits at redhat.com Thu May 5 19:56:43 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 15:56:43 -0400 Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <200505051956.j45JuhvP031851@cvs.devel.redhat.com> Author: jpound Update of /cvs/dist/rpms/eclipse-bugzilla/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31802 Modified Files: eclipse-bugzilla.spec sources Log Message: Fix provider expansion when adding queries. Add name pairings for default urls. Index: eclipse-bugzilla.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- eclipse-bugzilla.spec 2 May 2005 19:17:57 -0000 1.15 +++ eclipse-bugzilla.spec 5 May 2005 19:56:41 -0000 1.16 @@ -22,7 +22,7 @@ Summary: %{pkg_summary} Name: %{eclipse_name}-bugzilla Version: %{version_majmin}.%{version_micro}_fc -Release: 14 +Release: 15 License: Common Public License v1.0 Group: Text Editors/Integrated Development Environments (IDE) #URL: @@ -178,6 +178,10 @@ %endif %changelog +* Thu May 05 2005 Jeff Pound 0.1.0_fc-15 +- Fix provider expansion when adding queries. +- Add name parings for default urls. + * Mon May 02 2005 Jeff Pound 0.1.0_fc-14 - Fix default bugzilla.redhat.com url. Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 2 May 2005 19:17:57 -0000 1.8 +++ sources 5 May 2005 19:56:41 -0000 1.9 @@ -1 +1 @@ -32bd647d447adef5eb8e992efd0f439f eclipse-bugzilla.tar.gz +85630a030459cd700ee8b5759c3d1a3b eclipse-bugzilla.tar.gz From fedora-cvs-commits at redhat.com Thu May 5 19:57:25 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 15:57:25 -0400 Subject: rpms/gnome-desktop/devel gnome-desktop.spec, 1.29, 1.30 gnome-desktop-2.10.0-setup-gettext.patch, 1.1, NONE Message-ID: <200505051957.j45JvPsj031956@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31892 Modified Files: gnome-desktop.spec Removed Files: gnome-desktop-2.10.0-setup-gettext.patch Log Message: - Revert previous patch--it was wrong(bug 155659). Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gnome-desktop.spec 4 May 2005 20:35:41 -0000 1.29 +++ gnome-desktop.spec 5 May 2005 19:57:23 -0000 1.30 @@ -11,7 +11,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc. Name: gnome-desktop Version: 2.10.0 -Release: 2 +Release: 3 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2 Source1: %{name}-2.8.0-extrapo.tar.bz2 @@ -24,7 +24,6 @@ Patch1: gnome-desktop-2.1.90-kdetheme.patch Patch2: gnome-desktop-2.9.91-desktop.patch -Patch3: gnome-desktop-2.10.0-setup-gettext.patch Requires: redhat-artwork Requires: redhat-menus @@ -78,7 +77,6 @@ %patch1 -p1 -b .kdetheme %patch2 -p1 -b .menu -%patch3 -p1 -b .setup-gettext cp -f %{SOURCE2} pixmaps/ cp -f %{SOURCE3} pixmaps/ @@ -134,6 +132,9 @@ #%{_datadir}/gtk-doc %changelog +* Thu May 5 2005 Ray Strode - 2.10.0-3 +- Revert previous patch--it was wrong(bug 155659). + * Wed May 4 2005 Ray Strode - 2.10.0-2 - run gettext initialization routines on startup (bug 155659). --- gnome-desktop-2.10.0-setup-gettext.patch DELETED --- From fedora-cvs-commits at redhat.com Thu May 5 20:00:52 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 16:00:52 -0400 Subject: rpms/kernel/devel linux-2.6.12-rc3-audit-git.patch, NONE, 1.1 kernel-2.6.spec, 1.1286, 1.1287 Message-ID: <200505052000.j45K0qmg032227@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32203 Modified Files: kernel-2.6.spec Added Files: linux-2.6.12-rc3-audit-git.patch Log Message: import audit code from upstream linux-2.6.12-rc3-audit-git.patch: arch/i386/kernel/ptrace.c | 19 +++----- arch/ia64/kernel/ptrace.c | 21 +++++---- arch/mips/kernel/ptrace.c | 38 ++++++++++++---- arch/ppc64/kernel/ptrace.c | 15 ++++-- arch/s390/kernel/ptrace.c | 21 ++++----- arch/um/kernel/ptrace.c | 21 +++++---- arch/x86_64/kernel/ptrace.c | 21 ++++++--- fs/namei.c | 20 +++++--- fs/proc/base.c | 2 include/asm-um/ptrace-i386.h | 2 include/asm-um/ptrace-x86_64.h | 2 include/asm-um/thread_info.h | 4 + include/linux/audit.h | 64 ++++++++++++++++++++++++---- include/linux/netlink.h | 1 init/Kconfig | 2 kernel/audit.c | 93 ++++++++++++++++++++++++++--------------- kernel/auditsc.c | 47 +++++++++++++------- net/netlink/af_netlink.c | 3 + 18 files changed, 269 insertions(+), 127 deletions(-) --- NEW FILE linux-2.6.12-rc3-audit-git.patch --- Index: arch/i386/kernel/ptrace.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/arch/i386/kernel/ptrace.c (mode:100644 sha1:e8c965ce86eb2ddcc824c8c13d6988a426cb374b) +++ 022276b3625a432c7132e39776e7e448445087ac/arch/i386/kernel/ptrace.c (mode:100644 sha1:e34f651fa13c001de7b84967c0882d71bda35c1e) @@ -683,24 +683,18 @@ /* do the secure computing check first */ secure_computing(regs->orig_eax); - if (unlikely(current->audit_context)) { - if (!entryexit) - audit_syscall_entry(current, regs->orig_eax, - regs->ebx, regs->ecx, - regs->edx, regs->esi); - else - audit_syscall_exit(current, regs->eax); - } + if (unlikely(current->audit_context) && entryexit) + audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), regs->eax); if (!(current->ptrace & PT_PTRACED)) - return; + goto out; /* Fake a debug trap */ if (test_thread_flag(TIF_SINGLESTEP)) send_sigtrap(current, regs, 0); if (!test_thread_flag(TIF_SYSCALL_TRACE)) - return; + goto out; /* the 0x80 provides a way for the tracing parent to distinguish between a syscall stop and SIGTRAP delivery */ @@ -715,4 +709,9 @@ send_sig(current->exit_code, current, 1); current->exit_code = 0; } + out: + if (unlikely(current->audit_context) && !entryexit) + audit_syscall_entry(current, AUDIT_ARCH_I386, regs->orig_eax, + regs->ebx, regs->ecx, regs->edx, regs->esi); + } Index: arch/ia64/kernel/ptrace.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/arch/ia64/kernel/ptrace.c (mode:100644 sha1:c253fd5914fcb6e4144f1bc8dc2930a22dbde161) +++ 022276b3625a432c7132e39776e7e448445087ac/arch/ia64/kernel/ptrace.c (mode:100644 sha1:907464ee7273221468afa4c59cc811042ed2fd11) @@ -1596,20 +1596,25 @@ long arg4, long arg5, long arg6, long arg7, struct pt_regs regs) { - long syscall; + if (test_thread_flag(TIF_SYSCALL_TRACE) + && (current->ptrace & PT_PTRACED)) + syscall_trace(); if (unlikely(current->audit_context)) { - if (IS_IA32_PROCESS(®s)) + long syscall; + int arch; + + if (IS_IA32_PROCESS(®s)) { syscall = regs.r1; - else + arch = AUDIT_ARCH_I386; + } else { syscall = regs.r15; + arch = AUDIT_ARCH_IA64; + } - audit_syscall_entry(current, syscall, arg0, arg1, arg2, arg3); + audit_syscall_entry(current, arch, syscall, arg0, arg1, arg2, arg3); } - if (test_thread_flag(TIF_SYSCALL_TRACE) - && (current->ptrace & PT_PTRACED)) - syscall_trace(); } /* "asmlinkage" so the input arguments are preserved... */ @@ -1620,7 +1625,7 @@ struct pt_regs regs) { if (unlikely(current->audit_context)) - audit_syscall_exit(current, regs.r8); + audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8); if (test_thread_flag(TIF_SYSCALL_TRACE) && (current->ptrace & PT_PTRACED)) Index: arch/mips/kernel/ptrace.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/arch/mips/kernel/ptrace.c (mode:100644 sha1:a2f899c2f4d495cd224b1e0966b3a201be987d87) +++ 022276b3625a432c7132e39776e7e448445087ac/arch/mips/kernel/ptrace.c (mode:100644 sha1:92e70ca3bff9d60bb6bf51a660f75b09496d089c) @@ -301,25 +301,38 @@ return ret; } +static inline int audit_arch(void) +{ +#ifdef CONFIG_CPU_LITTLE_ENDIAN +#ifdef CONFIG_MIPS64 + if (!(current->thread.mflags & MF_32BIT_REGS)) + return AUDIT_ARCH_MIPSEL64; +#endif /* MIPS64 */ + return AUDIT_ARCH_MIPSEL; + +#else /* big endian... */ +#ifdef CONFIG_MIPS64 + if (!(current->thread.mflags & MF_32BIT_REGS)) + return AUDIT_ARCH_MIPS64; +#endif /* MIPS64 */ + return AUDIT_ARCH_MIPS; + +#endif /* endian */ +} + /* * Notification of system call entry/exit * - triggered by current->work.syscall_trace */ asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit) { - if (unlikely(current->audit_context)) { - if (!entryexit) - audit_syscall_entry(current, regs->regs[2], - regs->regs[4], regs->regs[5], - regs->regs[6], regs->regs[7]); - else - audit_syscall_exit(current, regs->regs[2]); - } + if (unlikely(current->audit_context) && entryexit) + audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]), regs->regs[2]); if (!test_thread_flag(TIF_SYSCALL_TRACE)) - return; + goto out; if (!(current->ptrace & PT_PTRACED)) - return; + goto out; /* The 0x80 provides a way for the tracing parent to distinguish between a syscall stop and SIGTRAP delivery */ @@ -335,4 +348,9 @@ send_sig(current->exit_code, current, 1); current->exit_code = 0; } + out: + if (unlikely(current->audit_context) && !entryexit) + audit_syscall_entry(current, audit_arch(), regs->regs[2], + regs->regs[4], regs->regs[5], + regs->regs[6], regs->regs[7]); } Index: arch/ppc64/kernel/ptrace.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/arch/ppc64/kernel/ptrace.c (mode:100644 sha1:5a846324ca8cc981cfa3fd2d9bf566ab21858ebb) +++ 022276b3625a432c7132e39776e7e448445087ac/arch/ppc64/kernel/ptrace.c (mode:100644 sha1:9f8c6087ae568aaa9a7a2dd999ce65d3ea9828b9) @@ -305,14 +305,17 @@ void do_syscall_trace_enter(struct pt_regs *regs) { + if (test_thread_flag(TIF_SYSCALL_TRACE) + && (current->ptrace & PT_PTRACED)) + do_syscall_trace(); + if (unlikely(current->audit_context)) - audit_syscall_entry(current, regs->gpr[0], + audit_syscall_entry(current, + test_thread_flag(TIF_32BIT)?AUDIT_ARCH_PPC:AUDIT_ARCH_PPC64, + regs->gpr[0], regs->gpr[3], regs->gpr[4], regs->gpr[5], regs->gpr[6]); - if (test_thread_flag(TIF_SYSCALL_TRACE) - && (current->ptrace & PT_PTRACED)) - do_syscall_trace(); } void do_syscall_trace_leave(struct pt_regs *regs) @@ -320,7 +323,9 @@ secure_computing(regs->gpr[0]); if (unlikely(current->audit_context)) - audit_syscall_exit(current, regs->result); + audit_syscall_exit(current, + (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS, + regs->result); if ((test_thread_flag(TIF_SYSCALL_TRACE) || test_thread_flag(TIF_SINGLESTEP)) Index: arch/s390/kernel/ptrace.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/arch/s390/kernel/ptrace.c (mode:100644 sha1:9f0d73e3f5f727ddbdffe498fcccb65acb48bc8e) +++ 022276b3625a432c7132e39776e7e448445087ac/arch/s390/kernel/ptrace.c (mode:100644 sha1:26889366929a1ac3d9162a2ba357dd837a143877) @@ -712,18 +712,13 @@ asmlinkage void syscall_trace(struct pt_regs *regs, int entryexit) { - if (unlikely(current->audit_context)) { - if (!entryexit) - audit_syscall_entry(current, regs->gprs[2], - regs->orig_gpr2, regs->gprs[3], - regs->gprs[4], regs->gprs[5]); - else - audit_syscall_exit(current, regs->gprs[2]); - } + if (unlikely(current->audit_context) && entryexit) + audit_syscall_exit(current, AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]); + if (!test_thread_flag(TIF_SYSCALL_TRACE)) - return; + goto out; if (!(current->ptrace & PT_PTRACED)) - return; + goto out; ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) ? 0x80 : 0)); @@ -736,4 +731,10 @@ send_sig(current->exit_code, current, 1); current->exit_code = 0; } + out: + if (unlikely(current->audit_context) && !entryexit) + audit_syscall_entry(current, + test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X, + regs->gprs[2], regs->orig_gpr2, regs->gprs[3], + regs->gprs[4], regs->gprs[5]); } Index: arch/um/kernel/ptrace.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/arch/um/kernel/ptrace.c (mode:100644 sha1:e50e60ff5d275bca5664b2db0b26e2f7b3e2129d) +++ 022276b3625a432c7132e39776e7e448445087ac/arch/um/kernel/ptrace.c (mode:100644 sha1:959b2d2490df273bdd2051cd65bb01ab7acb3004) @@ -337,15 +337,18 @@ if (unlikely(current->audit_context)) { if (!entryexit) - audit_syscall_entry(current, - UPT_SYSCALL_NR(®s->regs), - UPT_SYSCALL_ARG1(®s->regs), - UPT_SYSCALL_ARG2(®s->regs), - UPT_SYSCALL_ARG3(®s->regs), - UPT_SYSCALL_ARG4(®s->regs)); - else - audit_syscall_exit(current, - UPT_SYSCALL_RET(®s->regs)); + audit_syscall_entry(current, + HOST_AUDIT_ARCH, + UPT_SYSCALL_NR(regs), + UPT_SYSCALL_ARG1(regs), + UPT_SYSCALL_ARG2(regs), + UPT_SYSCALL_ARG3(regs), + UPT_SYSCALL_ARG4(regs)); + else { + int res = UPT_SYSCALL_RET(regs); + audit_syscall_exit(current, AUDITSC_RESULT(res), + res); + } } /* Fake a debug trap */ Index: arch/x86_64/kernel/ptrace.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/arch/x86_64/kernel/ptrace.c (mode:100644 sha1:c64b9c97c7459d035c3e4852d7d2e18508010ce7) +++ 022276b3625a432c7132e39776e7e448445087ac/arch/x86_64/kernel/ptrace.c (mode:100644 sha1:e26e86bb56fe53381e2016e4f478dbdc37ec0294) @@ -635,20 +635,29 @@ /* do the secure computing check first */ secure_computing(regs->orig_rax); - if (unlikely(current->audit_context)) - audit_syscall_entry(current, regs->orig_rax, - regs->rdi, regs->rsi, - regs->rdx, regs->r10); - if (test_thread_flag(TIF_SYSCALL_TRACE) && (current->ptrace & PT_PTRACED)) syscall_trace(regs); + + if (unlikely(current->audit_context)) { + if (test_thread_flag(TIF_IA32)) { + audit_syscall_entry(current, AUDIT_ARCH_I386, + regs->orig_rax, + regs->rbx, regs->rcx, + regs->rdx, regs->rsi); + } else { + audit_syscall_entry(current, AUDIT_ARCH_X86_64, + regs->orig_rax, + regs->rdi, regs->rsi, + regs->rdx, regs->r10); + } + } } asmlinkage void syscall_trace_leave(struct pt_regs *regs) { if (unlikely(current->audit_context)) - audit_syscall_exit(current, regs->rax); + audit_syscall_exit(current, AUDITSC_RESULT(regs->rax), regs->rax); if ((test_thread_flag(TIF_SYSCALL_TRACE) || test_thread_flag(TIF_SINGLESTEP)) Index: fs/namei.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/fs/namei.c (mode:100644 sha1:9e4aef2a1a21d44a9ba54b00f5ac284dd590f331) +++ 022276b3625a432c7132e39776e7e448445087ac/fs/namei.c (mode:100644 sha1:0f76fd75591bd0d5c3fbf44a2540519a972a44a2) @@ -686,11 +686,11 @@ /* * Name resolution. + * This is the basic name resolution function, turning a pathname into + * the final dentry. We expect 'base' to be positive and a directory. * - * This is the basic name resolution function, turning a pathname - * into the final dentry. - * - * We expect 'base' to be positive and a directory. + * Returns 0 and nd will have valid dentry and mnt on success. + * Returns error and drops reference to input namei data on failure. */ static fastcall int __link_path_walk(const char * name, struct nameidata *nd) { @@ -929,8 +929,10 @@ return link_path_walk(name, nd); } -/* SMP-safe */ -/* returns 1 if everything is done */ +/* + * SMP-safe: Returns 1 and nd will have valid dentry and mnt, if + * everything is done. Returns 0 and drops input nd, if lookup failed; + */ static int __emul_lookup_dentry(const char *name, struct nameidata *nd) { if (path_walk(name, nd)) @@ -994,9 +996,10 @@ } } +/* Returns 0 and nd will be valid on success; Retuns error, otherwise. */ int fastcall path_lookup(const char *name, unsigned int flags, struct nameidata *nd) { - int retval; + int retval = 0; nd->last_type = LAST_ROOT; /* if there are only slashes... */ nd->flags = flags; @@ -1009,7 +1012,7 @@ nd->dentry = dget(current->fs->altroot); read_unlock(¤t->fs->lock); if (__emul_lookup_dentry(name,nd)) - return 0; + goto out; /* found in altroot */ read_lock(¤t->fs->lock); } nd->mnt = mntget(current->fs->rootmnt); @@ -1021,6 +1024,7 @@ read_unlock(¤t->fs->lock); current->total_link_count = 0; retval = link_path_walk(name, nd); +out: if (unlikely(current->audit_context && nd && nd->dentry && nd->dentry->d_inode)) audit_inode(name, nd->dentry->d_inode); Index: fs/proc/base.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/fs/proc/base.c (mode:100644 sha1:07cafdf74ef2f343b4eef2e8f0356d69a7f8e6f4) +++ 022276b3625a432c7132e39776e7e448445087ac/fs/proc/base.c (mode:100644 sha1:e31903aadd96f6f3a4cc327c67f9163352da262f) @@ -820,7 +820,7 @@ goto out_free_page; } - length = audit_set_loginuid(task->audit_context, loginuid); + length = audit_set_loginuid(task, loginuid); if (likely(length == 0)) length = count; Index: include/asm-um/ptrace-i386.h =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/include/asm-um/ptrace-i386.h (mode:100644 sha1:9e47590ec293b7c9e444f8fd02e0ffd9f3f3b942) +++ 022276b3625a432c7132e39776e7e448445087ac/include/asm-um/ptrace-i386.h (mode:100644 sha1:04222f35c43e2cd0a64b9b28e390be9953104ee6) @@ -6,6 +6,8 @@ #ifndef __UM_PTRACE_I386_H #define __UM_PTRACE_I386_H +#define HOST_AUDIT_ARCH AUDIT_ARCH_I386 + #include "sysdep/ptrace.h" #include "asm/ptrace-generic.h" Index: include/asm-um/ptrace-x86_64.h =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/include/asm-um/ptrace-x86_64.h (mode:100644 sha1:c34be39b78b2262277b6abdf2c38dd5e30afb6af) +++ 022276b3625a432c7132e39776e7e448445087ac/include/asm-um/ptrace-x86_64.h (mode:100644 sha1:be51219a8ffe468a600dc8727f9a9b83e90c0f3d) @@ -14,6 +14,8 @@ #include "asm/ptrace-generic.h" #undef signal_fault +#define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64 + void signal_fault(struct pt_regs_subarch *regs, void *frame, char *where); #define FS_BASE (21 * sizeof(unsigned long)) Index: include/asm-um/thread_info.h =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/include/asm-um/thread_info.h (mode:100644 sha1:bffb577bc54e3b88b1706a0c9e49d489e05bcd87) +++ 022276b3625a432c7132e39776e7e448445087ac/include/asm-um/thread_info.h (mode:100644 sha1:a10ea155907efbf3d455f21eec33b95bfa9239ad) @@ -72,12 +72,14 @@ */ #define TIF_RESTART_BLOCK 4 #define TIF_MEMDIE 5 +#define TIF_SYSCALL_AUDIT 6 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG) -#define _TIF_RESTART_BLOCK (1 << TIF_RESTART_BLOCK) +#define _TIF_MEMDIE (1 << TIF_MEMDIE) +#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) #endif Index: include/linux/audit.h =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/include/linux/audit.h (mode:100644 sha1:3628f7cfb1789c16ff9e5f6d20e76e9b6d69672e) +++ 022276b3625a432c7132e39776e7e448445087ac/include/linux/audit.h (mode:100644 sha1:19f04b04979878ffcfa2706a9acb98421537226d) @@ -1,4 +1,4 @@ -/* audit.h -- Auditing support -*- linux-c -*- +/* audit.h -- Auditing support * * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * All Rights Reserved. @@ -24,6 +24,9 @@ #ifndef _LINUX_AUDIT_H_ #define _LINUX_AUDIT_H_ +#include +#include + /* Request and reply types */ #define AUDIT_GET 1000 /* Get status */ #define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ @@ -67,6 +70,7 @@ #define AUDIT_FSGID 8 #define AUDIT_LOGINUID 9 #define AUDIT_PERS 10 +#define AUDIT_ARCH 11 /* These are ONLY useful when checking * at syscall exit time (AUDIT_AT_EXIT). */ @@ -96,6 +100,38 @@ #define AUDIT_FAIL_PRINTK 1 #define AUDIT_FAIL_PANIC 2 +/* distinguish syscall tables */ +#define __AUDIT_ARCH_64BIT 0x80000000 +#define __AUDIT_ARCH_LE 0x40000000 +#define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_ARMEB (EM_ARM) +#define AUDIT_ARCH_CRIS (EM_CRIS|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_FRV (EM_FRV) +#define AUDIT_ARCH_H8300 (EM_H8_300) +#define AUDIT_ARCH_I386 (EM_386|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_IA64 (EM_IA_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_M32R (EM_M32R) +#define AUDIT_ARCH_M68K (EM_68K) +#define AUDIT_ARCH_MIPS (EM_MIPS) +#define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT) +#define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_PARISC (EM_PARISC) +#define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT) +#define AUDIT_ARCH_PPC (EM_PPC) +#define AUDIT_ARCH_PPC64 (EM_PPC64|__AUDIT_ARCH_64BIT) +#define AUDIT_ARCH_S390 (EM_S390) +#define AUDIT_ARCH_S390X (EM_S390|__AUDIT_ARCH_64BIT) +#define AUDIT_ARCH_SH (EM_SH) +#define AUDIT_ARCH_SHEL (EM_SH|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_SH64 (EM_SH|__AUDIT_ARCH_64BIT) +#define AUDIT_ARCH_SHEL64 (EM_SH|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_SPARC (EM_SPARC) +#define AUDIT_ARCH_SPARC64 (EM_SPARC64|__AUDIT_ARCH_64BIT) +#define AUDIT_ARCH_V850 (EM_V850|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_X86_64 (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) + #ifndef __KERNEL__ struct audit_message { struct nlmsghdr nlh; @@ -129,32 +165,36 @@ struct audit_context; struct inode; +#define AUDITSC_INVALID 0 +#define AUDITSC_SUCCESS 1 +#define AUDITSC_FAILURE 2 +#define AUDITSC_RESULT(x) ( ((long)(x))<0?AUDITSC_FAILURE:AUDITSC_SUCCESS ) #ifdef CONFIG_AUDITSYSCALL /* These are defined in auditsc.c */ /* Public API */ extern int audit_alloc(struct task_struct *task); extern void audit_free(struct task_struct *task); -extern void audit_syscall_entry(struct task_struct *task, +extern void audit_syscall_entry(struct task_struct *task, int arch, int major, unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3); -extern void audit_syscall_exit(struct task_struct *task, int return_code); +extern void audit_syscall_exit(struct task_struct *task, int failed, long return_code); extern void audit_getname(const char *name); extern void audit_putname(const char *name); extern void audit_inode(const char *name, const struct inode *inode); /* Private API (for audit.c only) */ extern int audit_receive_filter(int type, int pid, int uid, int seq, - void *data); + void *data, uid_t loginuid); extern void audit_get_stamp(struct audit_context *ctx, - struct timespec *t, int *serial); -extern int audit_set_loginuid(struct audit_context *ctx, uid_t loginuid); + struct timespec *t, unsigned int *serial); +extern int audit_set_loginuid(struct task_struct *task, uid_t loginuid); extern uid_t audit_get_loginuid(struct audit_context *ctx); extern int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode); #else #define audit_alloc(t) ({ 0; }) #define audit_free(t) do { ; } while (0) -#define audit_syscall_entry(t,a,b,c,d,e) do { ; } while (0) -#define audit_syscall_exit(t,r) do { ; } while (0) +#define audit_syscall_entry(t,ta,a,b,c,d,e) do { ; } while (0) +#define audit_syscall_exit(t,f,r) do { ; } while (0) #define audit_getname(n) do { ; } while (0) #define audit_putname(n) do { ; } while (0) #define audit_inode(n,i) do { ; } while (0) @@ -174,11 +214,15 @@ const char *fmt, ...) __attribute__((format(printf,2,3))); extern void audit_log_end(struct audit_buffer *ab); +extern void audit_log_hex(struct audit_buffer *ab, + const unsigned char *buf, + size_t len); +extern void audit_log_untrustedstring(struct audit_buffer *ab, + const char *string); extern void audit_log_d_path(struct audit_buffer *ab, const char *prefix, struct dentry *dentry, struct vfsmount *vfsmnt); - /* Private API (for auditsc.c only) */ extern void audit_send_reply(int pid, int seq, int type, int done, int multi, @@ -190,6 +234,8 @@ #define audit_log_vformat(b,f,a) do { ; } while (0) #define audit_log_format(b,f,...) do { ; } while (0) #define audit_log_end(b) do { ; } while (0) +#define audit_log_hex(a,b,l) do { ; } while (0) +#define audit_log_untrustedstring(a,s) do { ; } while (0) #define audit_log_d_path(b,p,d,v) do { ; } while (0) #endif #endif Index: include/linux/netlink.h =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/include/linux/netlink.h (mode:100644 sha1:f731abdc1a29a9cd1d5290d6a8121414377e88df) +++ 022276b3625a432c7132e39776e7e448445087ac/include/linux/netlink.h (mode:100644 sha1:b2738ac8bc999f30c0840f318c5da73d95214fed) @@ -110,6 +110,7 @@ __u32 dst_pid; __u32 dst_groups; kernel_cap_t eff_cap; + __u32 loginuid; /* Login (audit) uid */ }; #define NETLINK_CB(skb) (*(struct netlink_skb_parms*)&((skb)->cb)) Index: init/Kconfig =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/init/Kconfig (mode:100644 sha1:40d286d1d118f5c5d65498ad911a84a9d047cdb1) +++ 022276b3625a432c7132e39776e7e448445087ac/init/Kconfig (mode:100644 sha1:d920baed109a4c0bfb91d85e436626ccac886fbb) @@ -173,7 +173,7 @@ config AUDITSYSCALL bool "Enable system-call auditing support" - depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64) + depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64 || UML) default y if SECURITY_SELINUX help Enable low-overhead system-call auditing infrastructure that Index: kernel/audit.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/kernel/audit.c (mode:100644 sha1:ac26d4d960d3366d0473ede3533ab89446b75dc3) +++ 022276b3625a432c7132e39776e7e448445087ac/kernel/audit.c (mode:100644 sha1:9c4f1af0c794674404810d7caff0131218cbc950) @@ -1,4 +1,4 @@ -/* audit.c -- Auditing support -*- linux-c -*- +/* audit.c -- Auditing support * Gateway between the kernel (e.g., selinux) and the user-space audit daemon. * System-call specific features have moved to auditsc.c * @@ -38,7 +38,7 @@ * 6) Support low-overhead kernel-based filtering to minimize the * information that must be passed to user-space. * - * Example user-space utilities: http://people.redhat.com/faith/audit/ + * Example user-space utilities: http://people.redhat.com/sgrubb/audit/ */ #include @@ -142,7 +142,6 @@ int total; int type; int pid; - int count; /* Times requeued */ }; void audit_set_type(struct audit_buffer *ab, int type) @@ -239,36 +238,36 @@ } -static int audit_set_rate_limit(int limit) +static int audit_set_rate_limit(int limit, uid_t loginuid) { int old = audit_rate_limit; audit_rate_limit = limit; - audit_log(current->audit_context, "audit_rate_limit=%d old=%d", - audit_rate_limit, old); + audit_log(NULL, "audit_rate_limit=%d old=%d by auid %u", + audit_rate_limit, old, loginuid); return old; } -static int audit_set_backlog_limit(int limit) +static int audit_set_backlog_limit(int limit, uid_t loginuid) { int old = audit_backlog_limit; audit_backlog_limit = limit; - audit_log(current->audit_context, "audit_backlog_limit=%d old=%d", - audit_backlog_limit, old); + audit_log(NULL, "audit_backlog_limit=%d old=%d by auid %u", + audit_backlog_limit, old, loginuid); return old; } -static int audit_set_enabled(int state) +static int audit_set_enabled(int state, uid_t loginuid) { int old = audit_enabled; if (state != 0 && state != 1) return -EINVAL; audit_enabled = state; - audit_log(current->audit_context, "audit_enabled=%d old=%d", - audit_enabled, old); + audit_log(NULL, "audit_enabled=%d old=%d by auid %u", + audit_enabled, old, loginuid); return old; } -static int audit_set_failure(int state) +static int audit_set_failure(int state, uid_t loginuid) { int old = audit_failure; if (state != AUDIT_FAIL_SILENT @@ -276,8 +275,8 @@ && state != AUDIT_FAIL_PANIC) return -EINVAL; audit_failure = state; - audit_log(current->audit_context, "audit_failure=%d old=%d", - audit_failure, old); + audit_log(NULL, "audit_failure=%d old=%d by auid %u", + audit_failure, old, loginuid); return old; } @@ -344,6 +343,7 @@ int err; struct audit_buffer *ab; u16 msg_type = nlh->nlmsg_type; + uid_t loginuid; /* loginuid of sender */ err = audit_netlink_ok(NETLINK_CB(skb).eff_cap, msg_type); if (err) @@ -351,6 +351,7 @@ pid = NETLINK_CREDS(skb)->pid; uid = NETLINK_CREDS(skb)->uid; + loginuid = NETLINK_CB(skb).loginuid; seq = nlh->nlmsg_seq; data = NLMSG_DATA(nlh); @@ -371,34 +372,36 @@ return -EINVAL; status_get = (struct audit_status *)data; if (status_get->mask & AUDIT_STATUS_ENABLED) { - err = audit_set_enabled(status_get->enabled); + err = audit_set_enabled(status_get->enabled, loginuid); if (err < 0) return err; } if (status_get->mask & AUDIT_STATUS_FAILURE) { - err = audit_set_failure(status_get->failure); + err = audit_set_failure(status_get->failure, loginuid); if (err < 0) return err; } if (status_get->mask & AUDIT_STATUS_PID) { int old = audit_pid; audit_pid = status_get->pid; - audit_log(current->audit_context, - "audit_pid=%d old=%d", audit_pid, old); + audit_log(NULL, "audit_pid=%d old=%d by auid %u", + audit_pid, old, loginuid); } if (status_get->mask & AUDIT_STATUS_RATE_LIMIT) - audit_set_rate_limit(status_get->rate_limit); + audit_set_rate_limit(status_get->rate_limit, loginuid); if (status_get->mask & AUDIT_STATUS_BACKLOG_LIMIT) - audit_set_backlog_limit(status_get->backlog_limit); + audit_set_backlog_limit(status_get->backlog_limit, + loginuid); break; case AUDIT_USER: ab = audit_log_start(NULL); if (!ab) break; /* audit_panic has been called */ audit_log_format(ab, - "user pid=%d uid=%d length=%d msg='%.1024s'", + "user pid=%d uid=%d length=%d loginuid=%u" + " msg='%.1024s'", pid, uid, (int)(nlh->nlmsg_len - ((char *)data - (char *)nlh)), - (char *)data); + loginuid, (char *)data); ab->type = AUDIT_USER; ab->pid = pid; audit_log_end(ab); @@ -411,7 +414,7 @@ case AUDIT_LIST: #ifdef CONFIG_AUDITSYSCALL err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid, - uid, seq, data); + uid, seq, data, loginuid); #else err = -EOPNOTSUPP; #endif @@ -480,7 +483,7 @@ if (ab->len == 0) return; - skb = skb_peek(&ab->sklist); + skb = skb_peek_tail(&ab->sklist); if (!skb || skb_tailroom(skb) <= ab->len + extra) { skb = alloc_skb(2 * ab->len + extra, GFP_ATOMIC); if (!skb) { @@ -519,9 +522,9 @@ retval = netlink_unicast(audit_sock, skb, audit_pid, MSG_DONTWAIT); } - if (retval == -EAGAIN && ab->count < 5) { - ++ab->count; - skb_queue_tail(&ab->sklist, skb); + if (retval == -EAGAIN && + (atomic_read(&audit_backlog)) < audit_backlog_limit) { + skb_queue_head(&ab->sklist, skb); audit_log_end_irq(ab); return 1; } @@ -537,8 +540,8 @@ if (!audit_pid) { /* No daemon */ int offset = ab->nlh ? NLMSG_SPACE(0) : 0; int len = skb->len - offset; - printk(KERN_ERR "%*.*s\n", - len, len, skb->data + offset); + skb->data[offset + len] = '\0'; + printk(KERN_ERR "%s\n", skb->data + offset); } kfree_skb(skb); ab->nlh = NULL; @@ -617,7 +620,7 @@ struct audit_buffer *ab = NULL; unsigned long flags; struct timespec t; - int serial = 0; + unsigned int serial; if (!audit_initialized) return NULL; @@ -659,15 +662,16 @@ ab->total = 0; ab->type = AUDIT_KERNEL; ab->pid = 0; - ab->count = 0; #ifdef CONFIG_AUDITSYSCALL if (ab->ctx) audit_get_stamp(ab->ctx, &t, &serial); else #endif + { t = CURRENT_TIME; - + serial = 0; + } audit_log_format(ab, "audit(%lu.%03lu:%u): ", t.tv_sec, t.tv_nsec/1000000, serial); return ab; @@ -717,6 +721,29 @@ va_end(args); } +void audit_log_hex(struct audit_buffer *ab, const unsigned char *buf, size_t len) +{ + int i; + + for (i=0; i 0x7f) { + audit_log_hex(ab, string, strlen(string)); + return; + } + p++; + } + audit_log_format(ab, "\"%s\"", string); +} + + /* This is a helper-function to print the d_path without using a static * buffer or allocating another buffer in addition to the one in * audit_buffer. */ Index: kernel/auditsc.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/kernel/auditsc.c (mode:100644 sha1:6f1931381bc9eae1ff454c943036c5b077c4a8a6) +++ 022276b3625a432c7132e39776e7e448445087ac/kernel/auditsc.c (mode:100644 sha1:37b3ac94bc47492d026ae697cc92b1d4ddd70bd5) @@ -1,4 +1,4 @@ -/* auditsc.c -- System-call auditing support -*- linux-c -*- +/* auditsc.c -- System-call auditing support * Handles all system-call specific auditing features. * * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. @@ -123,7 +123,7 @@ int major; /* syscall number */ unsigned long argv[4]; /* syscall arguments */ int return_valid; /* return code is valid */ - int return_code;/* syscall return code */ + long return_code;/* syscall return code */ int auditable; /* 1 if record should be written */ int name_count; struct audit_names names[AUDIT_NAMES]; @@ -135,6 +135,7 @@ uid_t uid, euid, suid, fsuid; gid_t gid, egid, sgid, fsgid; unsigned long personality; + int arch; #if AUDIT_DEBUG int put_count; @@ -250,7 +251,8 @@ return 0; } -int audit_receive_filter(int type, int pid, int uid, int seq, void *data) +int audit_receive_filter(int type, int pid, int uid, int seq, void *data, + uid_t loginuid) { u32 flags; struct audit_entry *entry; @@ -285,6 +287,7 @@ err = audit_add_rule(entry, &audit_entlist); if (!err && (flags & AUDIT_AT_EXIT)) err = audit_add_rule(entry, &audit_extlist); + audit_log(NULL, "auid %u added an audit rule\n", loginuid); break; case AUDIT_DEL: flags =((struct audit_rule *)data)->flags; @@ -294,6 +297,7 @@ err = audit_del_rule(data, &audit_entlist); if (!err && (flags & AUDIT_AT_EXIT)) err = audit_del_rule(data, &audit_extlist); + audit_log(NULL, "auid %u removed an audit rule\n", loginuid); break; default: return -EINVAL; @@ -348,6 +352,10 @@ case AUDIT_PERS: result = (tsk->personality == value); break; + case AUDIT_ARCH: + if (ctx) + result = (ctx->arch == value); + break; case AUDIT_EXIT: if (ctx && ctx->return_valid) @@ -355,7 +363,7 @@ break; case AUDIT_SUCCESS: if (ctx && ctx->return_valid) - result = (ctx->return_code >= 0); + result = (ctx->return_valid == AUDITSC_SUCCESS); break; case AUDIT_DEVMAJOR: if (ctx) { @@ -648,8 +656,11 @@ audit_log_format(ab, "syscall=%d", context->major); if (context->personality != PER_LINUX) audit_log_format(ab, " per=%lx", context->personality); + audit_log_format(ab, " arch=%x", context->arch); if (context->return_valid) - audit_log_format(ab, " exit=%d", context->return_code); + audit_log_format(ab, " success=%s exit=%ld", + (context->return_valid==AUDITSC_SUCCESS)?"yes":"no", + context->return_code); audit_log_format(ab, " a0=%lx a1=%lx a2=%lx a3=%lx items=%d" " pid=%d loginuid=%d uid=%d gid=%d" @@ -696,9 +707,10 @@ if (!ab) continue; /* audit_panic has been called */ audit_log_format(ab, "item=%d", i); - if (context->names[i].name) - audit_log_format(ab, " name=%s", - context->names[i].name); + if (context->names[i].name) { + audit_log_format(ab, " name="); + audit_log_untrustedstring(ab, context->names[i].name); + } if (context->names[i].ino != (unsigned long)-1) audit_log_format(ab, " inode=%lu dev=%02x:%02x mode=%#o" " uid=%d gid=%d rdev=%02x:%02x", @@ -772,7 +784,7 @@ * then the record will be written at syscall exit time (otherwise, it * will only be written if another part of the kernel requests that it * be written). */ -void audit_syscall_entry(struct task_struct *tsk, int major, +void audit_syscall_entry(struct task_struct *tsk, int arch, int major, unsigned long a1, unsigned long a2, unsigned long a3, unsigned long a4) { @@ -826,6 +838,7 @@ if (!audit_enabled) return; + context->arch = arch; context->major = major; context->argv[0] = a1; context->argv[1] = a2; @@ -849,13 +862,13 @@ * filtering, or because some other part of the kernel write an audit * message), then write out the syscall information. In call cases, * free the names stored from getname(). */ -void audit_syscall_exit(struct task_struct *tsk, int return_code) +void audit_syscall_exit(struct task_struct *tsk, int valid, long return_code) { struct audit_context *context; get_task_struct(tsk); task_lock(tsk); - context = audit_get_context(tsk, 1, return_code); + context = audit_get_context(tsk, valid, return_code); task_unlock(tsk); /* Not having a context here is ok, since the parent may have @@ -868,6 +881,7 @@ context->in_syscall = 0; context->auditable = 0; + if (context->previous) { struct audit_context *new_context = context->previous; context->previous = NULL; @@ -981,7 +995,7 @@ } void audit_get_stamp(struct audit_context *ctx, - struct timespec *t, int *serial) + struct timespec *t, unsigned int *serial) { if (ctx) { t->tv_sec = ctx->ctime.tv_sec; @@ -996,20 +1010,21 @@ extern int audit_set_type(struct audit_buffer *ab, int type); -int audit_set_loginuid(struct audit_context *ctx, uid_t loginuid) +int audit_set_loginuid(struct task_struct *task, uid_t loginuid) { - if (ctx) { + if (task->audit_context) { struct audit_buffer *ab; ab = audit_log_start(NULL); if (ab) { audit_log_format(ab, "login pid=%d uid=%u " "old loginuid=%u new loginuid=%u", - ctx->pid, ctx->uid, ctx->loginuid, loginuid); + task->pid, task->uid, + task->audit_context->loginuid, loginuid); audit_set_type(ab, AUDIT_LOGIN); audit_log_end(ab); } - ctx->loginuid = loginuid; + task->audit_context->loginuid = loginuid; } return 0; } Index: net/netlink/af_netlink.c =================================================================== --- 173f941991f1b68da820e9926a3b7ebdd3a2c8b9/net/netlink/af_netlink.c (mode:100644 sha1:4ee392066148e771925f601c5159f6d0960776af) +++ 022276b3625a432c7132e39776e7e448445087ac/net/netlink/af_netlink.c (mode:100644 sha1:733bf52cef3e72c663a9f4bc7f90cecab421c706) @@ -49,6 +49,8 @@ #include #include #include +#include + #include #include @@ -904,6 +906,7 @@ NETLINK_CB(skb).groups = nlk->groups; NETLINK_CB(skb).dst_pid = dst_pid; NETLINK_CB(skb).dst_groups = dst_groups; + NETLINK_CB(skb).loginuid = audit_get_loginuid(current->audit_context); memcpy(NETLINK_CREDS(skb), &siocb->scm->creds, sizeof(struct ucred)); /* What can I do? Netlink is asynchronous, so that Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1286 retrieving revision 1.1287 diff -u -r1.1286 -r1.1287 --- kernel-2.6.spec 4 May 2005 15:03:20 -0000 1.1286 +++ kernel-2.6.spec 5 May 2005 20:00:41 -0000 1.1287 @@ -339,6 +339,7 @@ Patch1801: linux-2.6.11-net-flush-sysctl-perms.patch Patch1810: linux-2.6.11-libata-promise-pata-on-sata.patch Patch1820: linux-2.6.12-input-kill-stupid-messages.patch +Patch1830: linux-2.6.12-rc3-audit-git.patch Patch2000: linux-2.6.11-vm-taint.patch Patch2001: linux-2.6.9-vm-oomkiller-debugging.patch @@ -764,6 +765,8 @@ %patch1810 -p1 # The input layer spews crap no-one cares about. %patch1820 -p1 +# Audit code from git tree which was imported into 2.6.12-rc4 +%patch1830 -p1 # # VM related fixes. @@ -1205,6 +1208,9 @@ %endif %changelog +* Thu May 5 2005 David Woodhouse +- Import audit fixes from upstream + * Wed May 4 2005 Jeremy Katz - enable radeonfb and agp on ppc64 to fix X on the G5 From fedora-cvs-commits at redhat.com Thu May 5 20:12:21 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 16:12:21 -0400 Subject: rpms/filesystem/devel filesystem.spec,1.16,1.17 Message-ID: <200505052012.j45KCLpE032412@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/filesystem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32400 Modified Files: filesystem.spec Log Message: remove /initrd Index: filesystem.spec =================================================================== RCS file: /cvs/dist/rpms/filesystem/devel/filesystem.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- filesystem.spec 20 Apr 2005 18:55:39 -0000 1.16 +++ filesystem.spec 5 May 2005 20:12:19 -0000 1.17 @@ -1,6 +1,6 @@ Summary: The basic directory layout for a Linux system. Name: filesystem -Version: 2.3.2 +Version: 2.3.3 Release: 1 License: Public Domain Group: System Environment/Base @@ -24,7 +24,7 @@ mkdir -p mnt/{floppy,cdrom} \ bin boot \ etc/{X11/{applnk,sysconfig,serverconfig,starthere},opt,xinetd.d,skel,sysconfig,pki} \ - home initrd lib/modules %{_lib}/tls media mnt opt proc root sbin selinux srv sys tmp \ + home lib/modules %{_lib}/tls media mnt opt proc root sbin selinux srv sys tmp \ usr/{bin,etc,games,include,%{_lib}/{games,gcc-lib,tls},lib/{games,gcc-lib,locale},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{man/man{1,2,3,4,5,6,7,8,9,n},info},libexec,include,},sbin,share/{applications,doc,dict,info,man/man{1,2,3,4,5,6,7,8,9,n},doc,misc,empty,pixmaps,xsessions},src,X11R6/{bin,include,lib,%{_lib}/tls,man,share}} \ var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp} @@ -42,7 +42,6 @@ /boot /etc /home -/initrd /lib %ifarch x86_64 ppc ppc64 sparc sparc64 s390 s390x /%{_lib} @@ -94,6 +93,9 @@ /var/yp %changelog +* Thu May 5 2005 Peter Jones - 2.3.3-1 +- remove /initrd, since mkinitrd we don't use it anymore by default + * Wed Apr 20 2005 John Dennis - 2.3.2-1 - add /etc/pki, a place to store keys and certificates From fedora-cvs-commits at redhat.com Thu May 5 20:13:37 2005 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 May 2005 16:13:37 -0400 Subject: rpms/kernel/FC-3 jwltest-b44-bounce-bufs.patch, NONE, 1.1.18.1 jwltest-bonding-2_6_12-rc2.patch, NONE, 1.1.12.1 jwltest-bonding-sysfs.patch, NONE, 1.1.12.1 jwltest-e100-update-3_4_8-k2.patch, NONE, 1.1.4.1 jwltest-e1000-update-5_7_6-k2.patch, NONE, 1.1.16.1 jwltest-e1000-update-6_0_54-k2.patch, NONE, 1.1.4.1 jwltest-e1000-watchdog.patch, NONE, 1.1.16.1 jwltest-e1000-workqueue-flush.patch, NONE, 1.1.16.1 jwltest-ipw2100-1_1_0.patch, NONE, 1.1.14.1 jwltest-ixgb-update-1_0_90-k2.patch, NONE, 1.1.4.1 jwltest-ixgb-update-1_0_95-k2.patch, NONE, 1.1.4.1 kernel-2.6.spec, 1.821, 1.821.2.1 linux-2.6.9-module_version.patch, 1.6, 1.6.16.1 Message-ID: <200505052013.j45KDb4g032458@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv32435 Modified Files: Tag: private-linville-fc3-jwltest-9-branch kernel-2.6.spec linux-2.6.9-module_version.patch Added Files: Tag: private-linville-fc3-jwltest-9-branch jwltest-b44-bounce-bufs.patch jwltest-bonding-2_6_12-rc2.patch jwltest-bonding-sysfs.patch jwltest-e100-update-3_4_8-k2.patch jwltest-e1000-update-5_7_6-k2.patch jwltest-e1000-update-6_0_54-k2.patch jwltest-e1000-watchdog.patch jwltest-e1000-workqueue-flush.patch jwltest-ipw2100-1_1_0.patch jwltest-ixgb-update-1_0_90-k2.patch jwltest-ixgb-update-1_0_95-k2.patch Log Message: jwltest-b44-bounce-bufs.patch: b44.c | 36 +++++++++++++++++++++--------------- b44.h | 3 +-- 2 files changed, 22 insertions(+), 17 deletions(-) --- NEW FILE jwltest-b44-bounce-bufs.patch --- --- linux-2.6.11/drivers/net/b44.h.orig 2005-03-09 16:44:40.753866914 -0500 +++ linux-2.6.11/drivers/net/b44.h 2005-03-09 16:44:50.197605243 -0500 @@ -397,7 +397,6 @@ struct b44 { struct ring_info *rx_buffers; struct ring_info *tx_buffers; - unsigned char *tx_bufs; u32 dma_offset; u32 flags; @@ -429,7 +428,7 @@ struct b44 { struct pci_dev *pdev; struct net_device *dev; - dma_addr_t rx_ring_dma, tx_ring_dma,tx_bufs_dma; + dma_addr_t rx_ring_dma, tx_ring_dma; u32 rx_pending; u32 tx_pending; --- linux-2.6.11/drivers/net/b44.c.orig 2005-03-09 16:44:40.755866647 -0500 +++ linux-2.6.11/drivers/net/b44.c 2005-03-09 16:44:50.199604976 -0500 @@ -908,6 +908,7 @@ static void b44_tx_timeout(struct net_de static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct b44 *bp = netdev_priv(dev); + struct sk_buff *bounce_skb; dma_addr_t mapping; u32 len, entry, ctrl; @@ -923,15 +924,31 @@ static int b44_start_xmit(struct sk_buff return 1; } - entry = bp->tx_prod; mapping = pci_map_single(bp->pdev, skb->data, len, PCI_DMA_TODEVICE); if(mapping+len > B44_DMA_MASK) { /* Chip can't handle DMA to/from >1GB, use bounce buffer */ - pci_unmap_single(bp->pdev, mapping, len,PCI_DMA_TODEVICE); - memcpy(bp->tx_bufs+entry*TX_PKT_BUF_SZ,skb->data,skb->len); - mapping = pci_map_single(bp->pdev, bp->tx_bufs+entry*TX_PKT_BUF_SZ, len, PCI_DMA_TODEVICE); + pci_unmap_single(bp->pdev, mapping, len, PCI_DMA_TODEVICE); + + bounce_skb = __dev_alloc_skb(TX_PKT_BUF_SZ, + GFP_ATOMIC|GFP_DMA); + if (!bounce_skb) + return NETDEV_TX_BUSY; + + mapping = pci_map_single(bp->pdev, bounce_skb->data, + len, PCI_DMA_TODEVICE); + if(mapping+len > B44_DMA_MASK) { + pci_unmap_single(bp->pdev, mapping, + len, PCI_DMA_TODEVICE); + dev_kfree_skb_any(bounce_skb); + return NETDEV_TX_BUSY; + } + + memcpy(skb_put(bounce_skb, len), skb->data, skb->len); + dev_kfree_skb_any(skb); + skb = bounce_skb; } + entry = bp->tx_prod; bp->tx_buffers[entry].skb = skb; pci_unmap_addr_set(&bp->tx_buffers[entry], mapping, mapping); @@ -1078,11 +1095,6 @@ static void b44_free_consistent(struct b bp->tx_ring, bp->tx_ring_dma); bp->tx_ring = NULL; } - if (bp->tx_bufs) { - pci_free_consistent(bp->pdev, B44_TX_RING_SIZE * TX_PKT_BUF_SZ, - bp->tx_bufs, bp->tx_bufs_dma); - bp->tx_bufs = NULL; - } } /* @@ -1105,12 +1117,6 @@ static int b44_alloc_consistent(struct b goto out_err; memset(bp->tx_buffers, 0, size); - size = B44_TX_RING_SIZE * TX_PKT_BUF_SZ; - bp->tx_bufs = pci_alloc_consistent(bp->pdev, size, &bp->tx_bufs_dma); - if (!bp->tx_bufs) - goto out_err; - memset(bp->tx_bufs, 0, size); - size = DMA_TABLE_BYTES; bp->rx_ring = pci_alloc_consistent(bp->pdev, size, &bp->rx_ring_dma); if (!bp->rx_ring) jwltest-bonding-2_6_12-rc2.patch: bond_3ad.c | 2 +- bond_3ad.h | 1 - bond_alb.c | 16 +++++++++------- bond_main.c | 54 ++++++++++++++++++++---------------------------------- bonding.h | 1 + bonding_compat.h | 7 +++++++ 6 files changed, 38 insertions(+), 43 deletions(-) --- NEW FILE jwltest-bonding-2_6_12-rc2.patch --- --- linux-2.6.11/drivers/net/bonding/bond_3ad.h.orig 2005-04-08 10:48:26.717400547 -0400 +++ linux-2.6.11/drivers/net/bonding/bond_3ad.h 2005-04-08 10:48:44.236065061 -0400 @@ -290,7 +290,6 @@ void bond_3ad_initialize(struct bonding int bond_3ad_bind_slave(struct slave *slave); void bond_3ad_unbind_slave(struct slave *slave); void bond_3ad_state_machine_handler(struct bonding *bond); -void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length); void bond_3ad_adapter_speed_changed(struct slave *slave); void bond_3ad_adapter_duplex_changed(struct slave *slave); void bond_3ad_handle_link_change(struct slave *slave, char link); --- linux-2.6.11/drivers/net/bonding/bonding.h.orig 2005-04-08 10:48:26.724399614 -0400 +++ linux-2.6.11/drivers/net/bonding/bonding.h 2005-04-08 11:05:22.161032308 -0400 @@ -33,6 +33,7 @@ #include #include #include +#include "bonding_compat.h" #include "bond_3ad.h" #include "bond_alb.h" --- linux-2.6.11/drivers/net/bonding/bonding_compat.h.orig 2005-04-08 11:03:31.727754295 -0400 +++ linux-2.6.11/drivers/net/bonding/bonding_compat.h 2005-04-08 11:05:02.030715962 -0400 @@ -0,0 +1,7 @@ +#ifndef __BONDING_COMPAT_H__ +#define __BONDING_COMPAT_H__ + +#define dev_set_mac_address(dev, sa) \ + (dev)->set_mac_address((dev), (sa)) + +#endif /* __BONDING_COMPAT_H__ */ --- linux-2.6.11/drivers/net/bonding/bond_3ad.c.orig 2005-04-08 10:48:26.715400814 -0400 +++ linux-2.6.11/drivers/net/bonding/bond_3ad.c 2005-04-08 10:48:44.231065728 -0400 @@ -2175,7 +2175,7 @@ out: * received frames (loopback). Since only the payload is given to this * function, it check for loopback. */ -void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length) +static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u16 length) { struct port *port; --- linux-2.6.11/drivers/net/bonding/bond_main.c.orig 2005-04-08 10:48:26.726399348 -0400 +++ linux-2.6.11/drivers/net/bonding/bond_main.c 2005-04-08 10:48:44.257062262 -0400 @@ -793,29 +793,20 @@ struct vlan_entry *bond_next_vlan(struct * @skb: hw accel VLAN tagged skb to transmit * @slave_dev: slave that is supposed to xmit this skbuff * - * When the bond gets an skb to tarnsmit that is + * When the bond gets an skb to transmit that is * already hardware accelerated VLAN tagged, and it * needs to relay this skb to a slave that is not * hw accel capable, the skb needs to be "unaccelerated", * i.e. strip the hwaccel tag and re-insert it as part * of the payload. - * - * Assumption - once a VLAN device is created over the bond device, all - * packets are going to be hardware accelerated VLAN tagged since the IP - * binding is done over the VLAN device */ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev) { unsigned short vlan_id; - int res; if (!list_empty(&bond->vlan_list) && - !(slave_dev->features & NETIF_F_HW_VLAN_TX)) { - res = vlan_get_tag(skb, &vlan_id); - if (res) { - return -EINVAL; - } - + !(slave_dev->features & NETIF_F_HW_VLAN_TX) && + vlan_get_tag(skb, &vlan_id) == 0) { skb->dev = slave_dev; skb = vlan_put_tag(skb, vlan_id); if (!skb) { @@ -1719,7 +1710,7 @@ static int bond_enslave(struct net_devic */ memcpy(addr.sa_data, bond_dev->dev_addr, bond_dev->addr_len); addr.sa_family = slave_dev->type; - res = slave_dev->set_mac_address(slave_dev, &addr); + res = dev_set_mac_address(slave_dev, &addr); if (res) { dprintk("Error %d calling set_mac_address\n", res); goto err_free; @@ -1849,8 +1840,8 @@ static int bond_enslave(struct net_devic if (bond_update_speed_duplex(new_slave) && (new_slave->link != BOND_LINK_DOWN)) { printk(KERN_WARNING DRV_NAME - ": Warning: failed to get speed/duplex from %s, speed " - "forced to 100Mbps, duplex forced to Full.\n", + ": Warning: failed to get speed and duplex from %s, " + "assumed to be 100Mb/sec and Full.\n", new_slave->dev->name); if (bond->params.mode == BOND_MODE_8023AD) { @@ -1991,7 +1982,7 @@ err_close: err_restore_mac: memcpy(addr.sa_data, new_slave->perm_hwaddr, ETH_ALEN); addr.sa_family = slave_dev->type; - slave_dev->set_mac_address(slave_dev, &addr); + dev_set_mac_address(slave_dev, &addr); err_free: kfree(new_slave); @@ -2171,7 +2162,7 @@ static int bond_release(struct net_devic /* restore original ("permanent") mac address */ memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN); addr.sa_family = slave_dev->type; - slave_dev->set_mac_address(slave_dev, &addr); + dev_set_mac_address(slave_dev, &addr); } /* restore the original state of the @@ -2262,7 +2253,7 @@ static int bond_release_all(struct net_d /* restore original ("permanent") mac address*/ memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN); addr.sa_family = slave_dev->type; - slave_dev->set_mac_address(slave_dev, &addr); + dev_set_mac_address(slave_dev, &addr); } /* restore the original state of the IFF_NOARP flag that might have @@ -3898,12 +3889,7 @@ static int bond_change_mtu(struct net_de bond_for_each_slave(bond, slave, i) { dprintk("s %p s->p %p c_m %p\n", slave, slave->prev, slave->dev->change_mtu); - if (slave->dev->change_mtu) { - res = slave->dev->change_mtu(slave->dev, new_mtu); - } else { - slave->dev->mtu = new_mtu; - res = 0; - } + res = dev_set_mtu(slave->dev, new_mtu); if (res) { /* If we failed to set the slave's mtu to the new value @@ -3929,14 +3915,10 @@ unwind: bond_for_each_slave_from_to(bond, slave, i, bond->first_slave, stop_at) { int tmp_res; - if (slave->dev->change_mtu) { - tmp_res = slave->dev->change_mtu(slave->dev, bond_dev->mtu); - if (tmp_res) { - dprintk("unwind err %d dev %s\n", tmp_res, - slave->dev->name); - } - } else { - slave->dev->mtu = bond_dev->mtu; + tmp_res = dev_set_mtu(slave->dev, bond_dev->mtu); + if (tmp_res) { + dprintk("unwind err %d dev %s\n", tmp_res, + slave->dev->name); } } @@ -3988,7 +3970,7 @@ static int bond_set_mac_address(struct n goto unwind; } - res = slave->dev->set_mac_address(slave->dev, addr); + res = dev_set_mac_address(slave->dev, addr); if (res) { /* TODO: consider downing the slave * and retry ? @@ -4014,7 +3996,7 @@ unwind: bond_for_each_slave_from_to(bond, slave, i, bond->first_slave, stop_at) { int tmp_res; - tmp_res = slave->dev->set_mac_address(slave->dev, &tmp_sa); + tmp_res = dev_set_mac_address(slave->dev, &tmp_sa); if (tmp_res) { dprintk("unwind err %d dev %s\n", tmp_res, slave->dev->name); @@ -4306,6 +4288,10 @@ static int __init bond_init(struct net_d */ bond_dev->features |= NETIF_F_VLAN_CHALLENGED; + /* don't acquire bond device's xmit_lock when + * transmitting */ + bond_dev->features |= NETIF_F_LLTX; + /* By default, we declare the bond to be fully * VLAN hardware accelerated capable. Special * care is taken in the various xmit functions --- linux-2.6.11/drivers/net/bonding/bond_alb.c.orig 2005-04-08 10:48:26.719400281 -0400 +++ linux-2.6.11/drivers/net/bonding/bond_alb.c 2005-04-08 10:48:44.241064395 -0400 @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -275,7 +276,7 @@ static struct slave *tlb_get_least_loade } /* Caller must hold bond lock for read */ -struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index, u32 skb_len) +static struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index, u32 skb_len) { struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); struct tlb_client_info *hash_table; @@ -627,7 +628,7 @@ static void rlb_req_update_subnet_client } /* Caller must hold both bond and ptr locks for read */ -struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bond) +static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bond) { struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); struct arp_pkt *arp = (struct arp_pkt *)skb->nh.raw; @@ -954,9 +955,9 @@ static int alb_set_slave_mac_addr(struct /* each slave will receive packets destined to a different mac */ memcpy(s_addr.sa_data, addr, dev->addr_len); s_addr.sa_family = dev->type; - if (dev->set_mac_address(dev, &s_addr)) { + if (dev_set_mac_address(dev, &s_addr)) { printk(KERN_ERR DRV_NAME - ": Error: dev->set_mac_address of dev %s failed! ALB " + ": Error: dev_set_mac_address of dev %s failed! ALB " "mode requires that the base driver support setting " "the hw address also when the network device's " "interface is open\n", @@ -1209,7 +1210,7 @@ static int alb_set_mac_address(struct bo /* save net_device's current hw address */ memcpy(tmp_addr, slave->dev->dev_addr, ETH_ALEN); - res = slave->dev->set_mac_address(slave->dev, addr); + res = dev_set_mac_address(slave->dev, addr); /* restore net_device's hw address */ memcpy(slave->dev->dev_addr, tmp_addr, ETH_ALEN); @@ -1229,7 +1230,7 @@ unwind: stop_at = slave; bond_for_each_slave_from_to(bond, slave, i, bond->first_slave, stop_at) { memcpy(tmp_addr, slave->dev->dev_addr, ETH_ALEN); - slave->dev->set_mac_address(slave->dev, &sa); + dev_set_mac_address(slave->dev, &sa); memcpy(slave->dev->dev_addr, tmp_addr, ETH_ALEN); } @@ -1300,7 +1301,8 @@ int bond_alb_xmit(struct sk_buff *skb, s switch (ntohs(skb->protocol)) { case ETH_P_IP: if ((memcmp(eth_data->h_dest, mac_bcast, ETH_ALEN) == 0) || - (skb->nh.iph->daddr == ip_bcast)) { + (skb->nh.iph->daddr == ip_bcast) || + (skb->nh.iph->protocol == IPPROTO_IGMP)) { do_tx_balance = 0; break; } jwltest-bonding-sysfs.patch: Makefile | 2 bond_3ad.c | 74 ++- bond_alb.c | 61 +- bond_main.c | 408 +++++++++++------ bond_sysfs.c | 1348 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ bonding.h | 35 + 6 files changed, 1733 insertions(+), 195 deletions(-) --- NEW FILE jwltest-bonding-sysfs.patch --- --- linux-2.6.11/drivers/net/bonding/bonding.h.orig 2005-04-13 20:24:00.556480998 -0400 +++ linux-2.6.11/drivers/net/bonding/bonding.h 2005-04-13 20:20:13.113828694 -0400 @@ -33,12 +33,13 @@ #include #include #include +#include #include "bonding_compat.h" #include "bond_3ad.h" #include "bond_alb.h" -#define DRV_VERSION "2.6.1" -#define DRV_RELDATE "October 29, 2004" +#define DRV_VERSION "3.1.6" +#define DRV_RELDATE "April 8, 2005" #define DRV_NAME "bonding" #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver" @@ -148,13 +149,18 @@ struct bond_params { u32 arp_targets[BOND_MAX_ARP_TARGETS]; }; +struct bond_parm_tbl { + char *modename; + int mode; +}; + struct vlan_entry { struct list_head vlan_list; unsigned short vlan_id; }; struct slave { - struct net_device *dev; /* first - usefull for panic debug */ + struct net_device *dev; /* first - useful for panic debug */ struct slave *next; struct slave *prev; s16 delay; @@ -180,7 +186,7 @@ struct slave { * beforehand. */ struct bonding { - struct net_device *dev; /* first - usefull for panic debug */ + struct net_device *dev; /* first - useful for panic debug */ struct slave *first_slave; struct slave *curr_active_slave; struct slave *current_arp_slave; @@ -204,6 +210,7 @@ struct bonding { struct bond_params params; struct list_head vlan_list; struct vlan_group *vlgrp; + u32 my_ip; }; /** @@ -248,6 +255,26 @@ extern inline void bond_set_slave_active struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr); int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); +int bond_create(char *name, struct bond_params *params, struct bonding **newbond); +void bond_deinit(struct net_device *bond_dev); +int bond_create_sysfs(void); +void bond_destroy_sysfs(void); +void bond_destroy_sysfs_entry(struct bonding *bond); +int bond_create_sysfs_entry(struct bonding *bond); +int bond_create_slave_symlinks(struct net_device *master, struct net_device *slave); +void bond_destroy_slave_symlinks(struct net_device *master, struct net_device *slave); +int bond_check_abi_ver(void); +int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, struct slave **vassal); +int bond_release(struct net_device *bond_dev, struct net_device *slave_dev); +int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev); +void bond_mii_monitor(struct net_device *bond_dev); +void bond_loadbalance_arp_mon(struct net_device *bond_dev); +void bond_activebackup_arp_mon(struct net_device *bond_dev); +void bond_set_mode_ops(struct net_device *bond_dev, int mode); +int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl); +const char *bond_mode_name(int mode); +void bond_select_active_slave(struct bonding *bond); +void bond_change_active_slave(struct bonding *bond, struct slave *new_active); #endif /* _LINUX_BONDING_H */ --- linux-2.6.11/drivers/net/bonding/bond_sysfs.c.orig 2005-04-13 20:24:00.566479664 -0400 +++ linux-2.6.11/drivers/net/bonding/bond_sysfs.c 2005-04-13 20:17:54.578314141 -0400 @@ -0,0 +1,1348 @@ + +/* + * Copyright(c) 2004 Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The full GNU General Public License is included in this distribution in the + * file called LICENSE. + * + * + * Changes: + * + * 2004/12/12 - Mitch Williams + * - Initial creation of sysfs interface. + * + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* #define BONDING_DEBUG 1 */ +#include "bonding.h" +#define to_class_dev(obj) container_of(obj,struct class_device,kobj) +#define to_net_dev(class) container_of(class, struct net_device, class_dev) +#define to_bond(cd) ((struct bonding *)(to_net_dev(cd)->priv)) + +/*---------------------------- Declarations -------------------------------*/ + +/* Macros for real simple parsing of text. */ +#define eat_nonalnum(str,whence,max) \ + while (whence < max) {if (!isalnum(str[whence])) whence++; else break;}; +#define find_next_nonalpha(str,whence,max) \ + while (whence < max) {if (isalnum(str[whence])) whence++; else break;}; + +extern struct list_head bond_dev_list; +extern struct bond_params bonding_defaults; +extern struct bond_parm_tbl bond_mode_tbl[]; +extern struct bond_parm_tbl bond_lacp_tbl[]; + +static struct class *netdev_class; +/*--------------------------- Data Structures -----------------------------*/ + +/* Bonding sysfs lock. Why can't we just use the subsytem lock? + * Because kobject_register tries to acquire the subsystem lock. If + * we already hold the lock (which we would if the user was creating + * a new bond through the sysfs interface), we deadlock. + */ + +struct rw_semaphore bonding_rwsem; + + + + +/*------------------------------ Functions --------------------------------*/ + +/* + * "show" function for the bond_masters attribute. + * The class parameter is ignored. + */ +static ssize_t bonding_show_bonds(struct class *cls, char *buffer) +{ + int res = 0; + struct bonding *bond; + + down_read(&(bonding_rwsem)); + + list_for_each_entry(bond, &bond_dev_list, bond_list) { + res += sprintf(buffer + res, "%s ", + bond->dev->name); + if (res > (PAGE_SIZE - IFNAMSIZ)) { + dprintk("eek! too many bonds!\n"); + break; + } + } + res += sprintf(buffer + res, "\n"); + res++; + up_read(&(bonding_rwsem)); + return res; +} + +/* + * "store" function for the bond_masters attribute. This is what + * creates and deletes entire bonds. + * + * The class parameter is ignored. + * + * This function uses the eat_nonalnum and eat_alnum macros, define + * above. Why not use sscanf()? Scanf can get strings, but can't filter [...2347 lines suppressed...] +err: + rtnl_lock(); bond_free_all(); - + bond_destroy_sysfs(); rtnl_unlock(); - +out: return res; + } static void __exit bonding_exit(void) { unregister_netdevice_notifier(&bond_netdev_notifier); - rtnl_lock(); bond_free_all(); + bond_destroy_sysfs(); rtnl_unlock(); } --- linux-2.6.11/drivers/net/bonding/Makefile.orig 2005-04-13 20:24:00.543482733 -0400 +++ linux-2.6.11/drivers/net/bonding/Makefile 2005-04-13 20:17:54.579314007 -0400 @@ -4,5 +4,5 @@ obj-$(CONFIG_BONDING) += bonding.o -bonding-objs := bond_main.o bond_3ad.o bond_alb.o +bonding-objs := bond_main.o bond_3ad.o bond_alb.o bond_sysfs.o --- linux-2.6.11/drivers/net/bonding/bond_alb.c.orig 2005-04-13 20:24:00.561480331 -0400 +++ linux-2.6.11/drivers/net/bonding/bond_alb.c 2005-04-13 20:19:01.222421416 -0400 @@ -198,20 +198,21 @@ static int tlb_initialize(struct bonding { struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); int size = TLB_HASH_TABLE_SIZE * sizeof(struct tlb_client_info); + struct tlb_client_info *new_hashtbl; int i; spin_lock_init(&(bond_info->tx_hashtbl_lock)); - _lock_tx_hashtbl(bond); - - bond_info->tx_hashtbl = kmalloc(size, GFP_KERNEL); - if (!bond_info->tx_hashtbl) { + new_hashtbl = kmalloc(size, GFP_KERNEL); + if (!new_hashtbl) { printk(KERN_ERR DRV_NAME - ": Error: %s: Failed to allocate TLB hash table\n", + ": %s: Error: Failed to allocate TLB hash table\n", bond->dev->name); - _unlock_tx_hashtbl(bond); return -1; } + _lock_tx_hashtbl(bond); + + bond_info->tx_hashtbl = new_hashtbl; memset(bond_info->tx_hashtbl, 0, size); @@ -514,7 +515,8 @@ static void rlb_update_client(struct rlb client_info->mac_dst); if (!skb) { printk(KERN_ERR DRV_NAME - ": Error: failed to create an ARP packet\n"); + ": %s: Error: failed to create an ARP packet\n", + client_info->slave->dev->master->name); continue; } @@ -524,7 +526,8 @@ static void rlb_update_client(struct rlb skb = vlan_put_tag(skb, client_info->vlan_id); if (!skb) { printk(KERN_ERR DRV_NAME - ": Error: failed to insert VLAN tag\n"); + ": %s: Error: failed to insert VLAN tag\n", + client_info->slave->dev->master->name); continue; } } @@ -607,8 +610,9 @@ static void rlb_req_update_subnet_client if (!client_info->slave) { printk(KERN_ERR DRV_NAME - ": Error: found a client with no channel in " - "the client's hash table\n"); + ": %s: Error: found a client with no channel in " + "the client's hash table\n", + bond->dev->name); continue; } /*update all clients using this src_ip, that are not assigned @@ -798,21 +802,22 @@ static int rlb_initialize(struct bonding { struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); struct packet_type *pk_type = &(BOND_ALB_INFO(bond).rlb_pkt_type); + struct rlb_client_info *new_hashtbl; int size = RLB_HASH_TABLE_SIZE * sizeof(struct rlb_client_info); int i; spin_lock_init(&(bond_info->rx_hashtbl_lock)); - _lock_rx_hashtbl(bond); - - bond_info->rx_hashtbl = kmalloc(size, GFP_KERNEL); - if (!bond_info->rx_hashtbl) { + new_hashtbl = kmalloc(size, GFP_KERNEL); + if (!new_hashtbl) { printk(KERN_ERR DRV_NAME - ": Error: %s: Failed to allocate RLB hash table\n", + ": %s: Error: Failed to allocate RLB hash table\n", bond->dev->name); - _unlock_rx_hashtbl(bond); return -1; } + _lock_rx_hashtbl(bond); + + bond_info->rx_hashtbl = new_hashtbl; bond_info->rx_hashtbl_head = RLB_NULL_INDEX; @@ -928,7 +933,8 @@ static void alb_send_learning_packets(st skb = vlan_put_tag(skb, vlan->vlan_id); if (!skb) { printk(KERN_ERR DRV_NAME - ": Error: failed to insert VLAN tag\n"); + ": %s: Error: failed to insert VLAN tag\n", + bond->dev->name); continue; } } @@ -957,11 +963,11 @@ static int alb_set_slave_mac_addr(struct s_addr.sa_family = dev->type; if (dev_set_mac_address(dev, &s_addr)) { printk(KERN_ERR DRV_NAME - ": Error: dev_set_mac_address of dev %s failed! ALB " + ": %s: Error: dev_set_mac_address of dev %s failed! ALB " "mode requires that the base driver support setting " "the hw address also when the network device's " "interface is open\n", - dev->name); + dev->master->name, dev->name); return -EOPNOTSUPP; } return 0; @@ -1111,9 +1117,9 @@ static int alb_handle_addr_collision_on_ * of the new slave */ printk(KERN_ERR DRV_NAME - ": Error: the hw address of slave %s is not " + ": %s: Error: the hw address of slave %s is not " "unique - cannot enslave it!", - slave->dev->name); + bond->dev->name, slave->dev->name); return -EINVAL; } @@ -1159,16 +1165,16 @@ static int alb_handle_addr_collision_on_ bond->alb_info.rlb_enabled); printk(KERN_WARNING DRV_NAME - ": Warning: the hw address of slave %s is in use by " + ": %s: Warning: the hw address of slave %s is in use by " "the bond; giving it the hw address of %s\n", - slave->dev->name, free_mac_slave->dev->name); + bond->dev->name, slave->dev->name, free_mac_slave->dev->name); } else if (has_bond_addr) { printk(KERN_ERR DRV_NAME - ": Error: the hw address of slave %s is in use by the " + ": %s: Error: the hw address of slave %s is in use by the " "bond; couldn't find a slave with a free hw address to " "give it (this should not have happened)\n", - slave->dev->name); + bond->dev->name, slave->dev->name); return -EFAULT; } @@ -1256,8 +1262,11 @@ int bond_alb_initialize(struct bonding * tlb_deinitialize(bond); return res; } + } else { + bond->alb_info.rlb_enabled = 0; } + return 0; } @@ -1415,7 +1424,7 @@ void bond_alb_monitor(struct bonding *bo read_lock(&bond->curr_slave_lock); bond_for_each_slave(bond, slave, i) { - alb_send_learning_packets(slave,slave->dev->dev_addr); + alb_send_learning_packets(slave, slave->dev->dev_addr); } read_unlock(&bond->curr_slave_lock); jwltest-e100-update-3_4_8-k2.patch: e100.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 139 insertions(+), 26 deletions(-) --- NEW FILE jwltest-e100-update-3_4_8-k2.patch --- --- linux-2.6.11/drivers/net/e100.c.orig 2005-04-29 15:09:55.396191442 -0400 +++ linux-2.6.11/drivers/net/e100.c 2005-04-29 15:09:27.792869860 -0400 @@ -155,9 +155,9 @@ #define DRV_NAME "e100" #define DRV_EXT "-NAPI" -#define DRV_VERSION "3.3.6-k2"DRV_EXT +#define DRV_VERSION "3.4.8-k2"DRV_EXT #define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver" -#define DRV_COPYRIGHT "Copyright(c) 1999-2004 Intel Corporation" +#define DRV_COPYRIGHT "Copyright(c) 1999-2005 Intel Corporation" #define PFX DRV_NAME ": " #define E100_WATCHDOG_PERIOD (2 * HZ) @@ -210,11 +210,17 @@ static struct pci_device_id e100_id_tabl INTEL_8255X_ETHERNET_DEVICE(0x1069, 6), INTEL_8255X_ETHERNET_DEVICE(0x106A, 6), INTEL_8255X_ETHERNET_DEVICE(0x106B, 6), + INTEL_8255X_ETHERNET_DEVICE(0x1091, 7), + INTEL_8255X_ETHERNET_DEVICE(0x1092, 7), + INTEL_8255X_ETHERNET_DEVICE(0x1093, 7), + INTEL_8255X_ETHERNET_DEVICE(0x1094, 7), + INTEL_8255X_ETHERNET_DEVICE(0x1095, 7), INTEL_8255X_ETHERNET_DEVICE(0x1209, 0), INTEL_8255X_ETHERNET_DEVICE(0x1229, 0), INTEL_8255X_ETHERNET_DEVICE(0x2449, 2), INTEL_8255X_ETHERNET_DEVICE(0x2459, 2), INTEL_8255X_ETHERNET_DEVICE(0x245D, 2), + INTEL_8255X_ETHERNET_DEVICE(0x27DC, 7), { 0, } }; MODULE_DEVICE_TABLE(pci, e100_id_table); @@ -269,6 +275,12 @@ enum scb_status { rus_mask = 0x3C, }; +enum ru_state { + RU_SUSPENDED = 0, + RU_RUNNING = 1, + RU_UNINITIALIZED = -1, +}; + enum scb_stat_ack { stat_ack_not_ours = 0x00, stat_ack_sw_gen = 0x04, @@ -510,7 +522,7 @@ struct nic { struct rx *rx_to_use; struct rx *rx_to_clean; struct rfd blank_rfd; - int ru_running; + enum ru_state ru_running; spinlock_t cb_lock ____cacheline_aligned; spinlock_t cmd_lock; @@ -539,6 +551,7 @@ struct nic { struct timer_list watchdog; struct timer_list blink_timer; struct mii_if_info mii; + struct work_struct tx_timeout_task; enum loopback loopback; struct mem *mem; @@ -770,7 +783,7 @@ static int e100_eeprom_save(struct nic * return 0; } -#define E100_WAIT_SCB_TIMEOUT 40 +#define E100_WAIT_SCB_TIMEOUT 20000 /* we might have to wait 100ms!!! */ static inline int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr) { unsigned long flags; @@ -840,6 +853,10 @@ static inline int e100_exec_cb(struct ni * because the controller is too busy, so * let's just queue the command and try again * when another command is scheduled. */ + if(err == -ENOSPC) { + //request a reset + schedule_work(&nic->tx_timeout_task); + } break; } else { nic->cuc_cmd = cuc_resume; @@ -884,7 +901,7 @@ static void mdio_write(struct net_device static void e100_get_defaults(struct nic *nic) { - struct param_range rfds = { .min = 64, .max = 256, .count = 64 }; + struct param_range rfds = { .min = 16, .max = 256, .count = 64 }; struct param_range cbs = { .min = 64, .max = 256, .count = 64 }; pci_read_config_byte(nic->pdev, PCI_REVISION_ID, &nic->rev_id); @@ -899,8 +916,9 @@ static void e100_get_defaults(struct nic /* Quadwords to DMA into FIFO before starting frame transmit */ nic->tx_threshold = 0xE0; - nic->tx_command = cpu_to_le16(cb_tx | cb_i | cb_tx_sf | - ((nic->mac >= mac_82558_D101_A4) ? cb_cid : 0)); + /* no interrupt for every tx completion, delay = 256us if not 557*/ + nic->tx_command = cpu_to_le16(cb_tx | cb_tx_sf | + ((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i)); /* Template for a freshly allocated RFD */ nic->blank_rfd.command = cpu_to_le16(cb_el); @@ -964,7 +982,8 @@ static void e100_configure(struct nic *n if(nic->flags & multicast_all) config->multicast_all = 0x1; /* 1=accept, 0=no */ - if(!(nic->flags & wol_magic)) + /* disable WoL when up */ + if(netif_running(nic->netdev) || !(nic->flags & wol_magic)) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ if(nic->mac >= mac_82558_D101_A4) { @@ -1203,7 +1222,9 @@ static void e100_update_stats(struct nic } } - e100_exec_cmd(nic, cuc_dump_reset, 0); + + if(e100_exec_cmd(nic, cuc_dump_reset, 0)) + DPRINTK(TX_ERR, DEBUG, "exec cuc_dump_reset failed\n"); } static void e100_adjust_adaptive_ifs(struct nic *nic, int speed, int duplex) @@ -1279,12 +1300,15 @@ static inline void e100_xmit_prepare(str struct sk_buff *skb) { cb->command = nic->tx_command; + /* interrupt every 16 packets regardless of delay */ + if((nic->cbs_avail & ~15) == nic->cbs_avail) cb->command |= cb_i; cb->u.tcb.tbd_array = cb->dma_addr + offsetof(struct cb, u.tcb.tbd); cb->u.tcb.tcb_byte_count = 0; cb->u.tcb.threshold = nic->tx_threshold; cb->u.tcb.tbd_count = 1; cb->u.tcb.tbd.buf_addr = cpu_to_le32(pci_map_single(nic->pdev, skb->data, skb->len, PCI_DMA_TODEVICE)); + // check for mapping failure? cb->u.tcb.tbd.size = cpu_to_le16(skb->len); } @@ -1297,7 +1321,8 @@ static int e100_xmit_frame(struct sk_buf /* SW workaround for ICH[x] 10Mbps/half duplex Tx hang. Issue a NOP command followed by a 1us delay before issuing the Tx command. */ - e100_exec_cmd(nic, cuc_nop, 0); + if(e100_exec_cmd(nic, cuc_nop, 0)) + DPRINTK(TX_ERR, DEBUG, "exec cuc_nop failed\n"); udelay(1); } @@ -1415,12 +1440,18 @@ static int e100_alloc_cbs(struct nic *ni return 0; } -static inline void e100_start_receiver(struct nic *nic) +static inline void e100_start_receiver(struct nic *nic, struct rx *rx) { + if(!nic->rxs) return; + if(RU_SUSPENDED != nic->ru_running) return; + + /* handle init time starts */ + if(!rx) rx = nic->rxs; + /* (Re)start RU if suspended or idle and RFA is non-NULL */ - if(!nic->ru_running && nic->rx_to_clean->skb) { - e100_exec_cmd(nic, ruc_start, nic->rx_to_clean->dma_addr); - nic->ru_running = 1; + if(rx->skb) { + e100_exec_cmd(nic, ruc_start, rx->dma_addr); + nic->ru_running = RU_RUNNING; } } @@ -1437,6 +1468,13 @@ static inline int e100_rx_alloc_skb(stru rx->dma_addr = pci_map_single(nic->pdev, rx->skb->data, RFD_BUF_LEN, PCI_DMA_BIDIRECTIONAL); + if(pci_dma_mapping_error(rx->dma_addr)) { + dev_kfree_skb_any(rx->skb); + rx->skb = 0; + rx->dma_addr = 0; + return -ENOMEM; + } + /* Link the RFD to end of RFA by linking previous RFD to * this one, and clearing EL bit of previous. */ if(rx->prev->skb) { @@ -1471,7 +1509,7 @@ static inline int e100_rx_indicate(struc /* If data isn't ready, nothing to indicate */ if(unlikely(!(rfd_status & cb_complete))) - return -EAGAIN; + return -ENODATA; /* Get actual data size */ actual_size = le16_to_cpu(rfd->actual_size) & 0x3FFF; @@ -1482,6 +1520,10 @@ static inline int e100_rx_indicate(struc pci_unmap_single(nic->pdev, rx->dma_addr, RFD_BUF_LEN, PCI_DMA_FROMDEVICE); + /* this allows for a fast restart without re-enabling interrupts */ + if(le16_to_cpu(rfd->command) & cb_el) + nic->ru_running = RU_SUSPENDED; + /* Pull off the RFD and put the actual data (minus eth hdr) */ skb_reserve(skb, sizeof(struct rfd)); skb_put(skb, actual_size); @@ -1514,20 +1556,45 @@ static inline void e100_rx_clean(struct unsigned int work_to_do) { struct rx *rx; + int restart_required = 0; + struct rx *rx_to_start = NULL; + + /* are we already rnr? then pay attention!!! this ensures that + * the state machine progression never allows a start with a + * partially cleaned list, avoiding a race between hardware + * and rx_to_clean when in NAPI mode */ + if(RU_SUSPENDED == nic->ru_running) + restart_required = 1; /* Indicate newly arrived packets */ for(rx = nic->rx_to_clean; rx->skb; rx = nic->rx_to_clean = rx->next) { - if(e100_rx_indicate(nic, rx, work_done, work_to_do)) + int err = e100_rx_indicate(nic, rx, work_done, work_to_do); + if(-EAGAIN == err) { + /* hit quota so have more work to do, restart once + * cleanup is complete */ + restart_required = 0; + break; + } else if(-ENODATA == err) break; /* No more to clean */ } + /* save our starting point as the place we'll restart the receiver */ + if(restart_required) + rx_to_start = nic->rx_to_clean; + /* Alloc new skbs to refill list */ for(rx = nic->rx_to_use; !rx->skb; rx = nic->rx_to_use = rx->next) { if(unlikely(e100_rx_alloc_skb(nic, rx))) break; /* Better luck next time (see watchdog) */ } - e100_start_receiver(nic); + if(restart_required) { + // ack the rnr? + writeb(stat_ack_rnr, &nic->csr->scb.stat_ack); + e100_start_receiver(nic, rx_to_start); + if(work_done) + (*work_done)++; + } } static void e100_rx_clean_list(struct nic *nic) @@ -1535,6 +1602,8 @@ static void e100_rx_clean_list(struct ni struct rx *rx; unsigned int i, count = nic->params.rfds.count; + nic->ru_running = RU_UNINITIALIZED; + if(nic->rxs) { for(rx = nic->rxs, i = 0; i < count; rx++, i++) { if(rx->skb) { @@ -1548,7 +1617,6 @@ static void e100_rx_clean_list(struct ni } nic->rx_to_use = nic->rx_to_clean = NULL; - nic->ru_running = 0; } static int e100_rx_alloc_list(struct nic *nic) @@ -1557,6 +1625,7 @@ static int e100_rx_alloc_list(struct nic unsigned int i, count = nic->params.rfds.count; nic->rx_to_use = nic->rx_to_clean = NULL; + nic->ru_running = RU_UNINITIALIZED; if(!(nic->rxs = kmalloc(sizeof(struct rx) * count, GFP_ATOMIC))) return -ENOMEM; @@ -1572,6 +1641,7 @@ static int e100_rx_alloc_list(struct nic } nic->rx_to_use = nic->rx_to_clean = nic->rxs; + nic->ru_running = RU_SUSPENDED; return 0; } @@ -1593,7 +1663,7 @@ static irqreturn_t e100_intr(int irq, vo /* We hit Receive No Resource (RNR); restart RU after cleaning */ if(stat_ack & stat_ack_rnr) - nic->ru_running = 0; + nic->ru_running = RU_SUSPENDED; e100_disable_irq(nic); netif_rx_schedule(netdev); @@ -1663,6 +1733,7 @@ static int e100_change_mtu(struct net_de return 0; } +#ifdef CONFIG_PM static int e100_asf(struct nic *nic) { /* ASF can be enabled from eeprom */ @@ -1671,6 +1742,7 @@ static int e100_asf(struct nic *nic) !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) && ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE)); } +#endif static int e100_up(struct nic *nic) { @@ -1683,13 +1755,16 @@ static int e100_up(struct nic *nic) if((err = e100_hw_init(nic))) goto err_clean_cbs; e100_set_multicast_list(nic->netdev); - e100_start_receiver(nic); + e100_start_receiver(nic, 0); mod_timer(&nic->watchdog, jiffies); if((err = request_irq(nic->pdev->irq, e100_intr, SA_SHIRQ, nic->netdev->name, nic->netdev))) goto err_no_irq; - e100_enable_irq(nic); netif_wake_queue(nic->netdev); + netif_poll_enable(nic->netdev); + /* enable ints _after_ enabling poll, preventing a race between + * disable ints+schedule */ + e100_enable_irq(nic); return 0; err_no_irq: @@ -1703,11 +1778,13 @@ err_rx_clean_list: static void e100_down(struct nic *nic) { + /* wait here for poll to complete */ + netif_poll_disable(nic->netdev); + netif_stop_queue(nic->netdev); e100_hw_reset(nic); free_irq(nic->pdev->irq, nic->netdev); del_timer_sync(&nic->watchdog); netif_carrier_off(nic->netdev); - netif_stop_queue(nic->netdev); e100_clean_cbs(nic); e100_rx_clean_list(nic); } @@ -1716,6 +1793,15 @@ static void e100_tx_timeout(struct net_d { struct nic *nic = netdev_priv(netdev); + /* Reset outside of interrupt context, to avoid request_irq + * in interrupt context */ + schedule_work(&nic->tx_timeout_task); +} + +static void e100_tx_timeout_task(struct net_device *netdev) +{ + struct nic *nic = netdev_priv(netdev); + DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n", readb(&nic->csr->scb.status)); e100_down(netdev_priv(netdev)); @@ -1749,7 +1835,7 @@ static int e100_loopback_test(struct nic mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, BMCR_LOOPBACK); - e100_start_receiver(nic); + e100_start_receiver(nic, 0); if(!(skb = dev_alloc_skb(ETH_DATA_LEN))) { err = -ENOMEM; @@ -1869,7 +1955,6 @@ static int e100_set_wol(struct net_devic else nic->flags &= ~wol_magic; - pci_enable_wake(nic->pdev, 0, nic->flags & (wol_magic | e100_asf(nic))); e100_exec_cb(nic, NULL, e100_configure); return 0; @@ -2223,6 +2308,7 @@ static int __devinit e100_probe(struct p e100_get_defaults(nic); + /* locks must be initialized before calling hw_reset */ spin_lock_init(&nic->cb_lock); spin_lock_init(&nic->cmd_lock); @@ -2240,6 +2326,9 @@ static int __devinit e100_probe(struct p nic->blink_timer.function = e100_blink_led; nic->blink_timer.data = (unsigned long)nic; + INIT_WORK(&nic->tx_timeout_task, + (void (*)(void *))e100_tx_timeout_task, netdev); + if((err = e100_alloc(nic))) { DPRINTK(PROBE, ERR, "Cannot alloc driver memory, aborting.\n"); goto err_out_iounmap; @@ -2263,7 +2352,8 @@ static int __devinit e100_probe(struct p (nic->eeprom[eeprom_id] & eeprom_id_wol)) nic->flags |= wol_magic; - pci_enable_wake(pdev, 0, nic->flags & (wol_magic | e100_asf(nic))); + /* ack any pending wake events, disable PME */ + pci_enable_wake(pdev, 0, 0); strcpy(netdev->name, "eth%d"); if((err = register_netdev(netdev))) { @@ -2335,7 +2425,10 @@ static int e100_resume(struct pci_dev *p pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); - e100_hw_init(nic); + /* ack any pending wake events, disable PME */ + pci_enable_wake(pdev, 0, 0); + if(e100_hw_init(nic)) + DPRINTK(HW, ERR, "e100_hw_init failed\n"); netif_device_attach(netdev); if(netif_running(netdev)) @@ -2345,6 +2438,21 @@ static int e100_resume(struct pci_dev *p } #endif + +static void e100_shutdown(struct device *dev) +{ + struct pci_dev *pdev = container_of(dev, struct pci_dev, dev); + struct net_device *netdev = pci_get_drvdata(pdev); + struct nic *nic = netdev_priv(netdev); + +#ifdef CONFIG_PM + pci_enable_wake(pdev, 0, nic->flags & (wol_magic | e100_asf(nic))); +#else + pci_enable_wake(pdev, 0, nic->flags & (wol_magic)); +#endif +} + + static struct pci_driver e100_driver = { .name = DRV_NAME, .id_table = e100_id_table, @@ -2354,6 +2462,11 @@ static struct pci_driver e100_driver = { .suspend = e100_suspend, .resume = e100_resume, #endif + + .driver = { + .shutdown = e100_shutdown, + } + }; static int __init e100_init_module(void) jwltest-e1000-update-5_7_6-k2.patch: e1000.h | 3 e1000_ethtool.c | 11 +- e1000_hw.c | 86 +++++++++-------- e1000_hw.h | 11 +- e1000_main.c | 275 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 5 files changed, 309 insertions(+), 77 deletions(-) --- NEW FILE jwltest-e1000-update-5_7_6-k2.patch --- --- linux-2.6.11/drivers/net/e1000/e1000_hw.c.orig 2005-03-18 15:21:34.767630045 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_hw.c 2005-03-18 15:22:07.541256468 -0500 @@ -1572,7 +1572,8 @@ e1000_phy_force_speed_duplex(struct e100 if(mii_status_reg & MII_SR_LINK_STATUS) break; msec_delay(100); } - if((i == 0) && (hw->phy_type == e1000_phy_m88)) { + if((i == 0) && + (hw->phy_type == e1000_phy_m88)) { /* We didn't get link. Reset the DSP and wait again for link. */ ret_val = e1000_phy_reset_dsp(hw); if(ret_val) { @@ -2503,7 +2504,7 @@ e1000_read_phy_reg(struct e1000_hw *hw, } } - ret_val = e1000_read_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT & reg_addr, + ret_val = e1000_read_phy_reg_ex(hw, MAX_PHY_REG_ADDRESS & reg_addr, phy_data); return ret_val; @@ -2609,7 +2610,7 @@ e1000_write_phy_reg(struct e1000_hw *hw, } } - ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT & reg_addr, + ret_val = e1000_write_phy_reg_ex(hw, MAX_PHY_REG_ADDRESS & reg_addr, phy_data); return ret_val; @@ -2955,8 +2956,7 @@ e1000_phy_m88_get_info(struct e1000_hw * /* Check polarity status */ ret_val = e1000_check_polarity(hw, &polarity); if(ret_val) - return ret_val; - + return ret_val; phy_info->cable_polarity = polarity; ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data); @@ -2966,9 +2966,9 @@ e1000_phy_m88_get_info(struct e1000_hw * phy_info->mdix_mode = (phy_data & M88E1000_PSSR_MDIX) >> M88E1000_PSSR_MDIX_SHIFT; - if(phy_data & M88E1000_PSSR_1000MBS) { - /* Cable Length Estimation and Local/Remote Receiver Informatoion - * are only valid at 1000 Mbps + if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) { + /* Cable Length Estimation and Local/Remote Receiver Information + * are only valid at 1000 Mbps. */ phy_info->cable_length = ((phy_data & M88E1000_PSSR_CABLE_LENGTH) >> M88E1000_PSSR_CABLE_LENGTH_SHIFT); @@ -4639,41 +4639,44 @@ e1000_get_bus_info(struct e1000_hw *hw) { uint32_t status; - if(hw->mac_type < e1000_82543) { + switch (hw->mac_type) { + case e1000_82542_rev2_0: + case e1000_82542_rev2_1: hw->bus_type = e1000_bus_type_unknown; hw->bus_speed = e1000_bus_speed_unknown; hw->bus_width = e1000_bus_width_unknown; - return; - } - - status = E1000_READ_REG(hw, STATUS); - hw->bus_type = (status & E1000_STATUS_PCIX_MODE) ? - e1000_bus_type_pcix : e1000_bus_type_pci; + break; + default: + status = E1000_READ_REG(hw, STATUS); + hw->bus_type = (status & E1000_STATUS_PCIX_MODE) ? + e1000_bus_type_pcix : e1000_bus_type_pci; - if(hw->device_id == E1000_DEV_ID_82546EB_QUAD_COPPER) { - hw->bus_speed = (hw->bus_type == e1000_bus_type_pci) ? - e1000_bus_speed_66 : e1000_bus_speed_120; - } else if(hw->bus_type == e1000_bus_type_pci) { - hw->bus_speed = (status & E1000_STATUS_PCI66) ? - e1000_bus_speed_66 : e1000_bus_speed_33; - } else { - switch (status & E1000_STATUS_PCIX_SPEED) { - case E1000_STATUS_PCIX_SPEED_66: - hw->bus_speed = e1000_bus_speed_66; - break; - case E1000_STATUS_PCIX_SPEED_100: - hw->bus_speed = e1000_bus_speed_100; - break; - case E1000_STATUS_PCIX_SPEED_133: - hw->bus_speed = e1000_bus_speed_133; - break; - default: - hw->bus_speed = e1000_bus_speed_reserved; - break; + if(hw->device_id == E1000_DEV_ID_82546EB_QUAD_COPPER) { + hw->bus_speed = (hw->bus_type == e1000_bus_type_pci) ? + e1000_bus_speed_66 : e1000_bus_speed_120; + } else if(hw->bus_type == e1000_bus_type_pci) { + hw->bus_speed = (status & E1000_STATUS_PCI66) ? + e1000_bus_speed_66 : e1000_bus_speed_33; + } else { + switch (status & E1000_STATUS_PCIX_SPEED) { + case E1000_STATUS_PCIX_SPEED_66: + hw->bus_speed = e1000_bus_speed_66; + break; + case E1000_STATUS_PCIX_SPEED_100: + hw->bus_speed = e1000_bus_speed_100; + break; + case E1000_STATUS_PCIX_SPEED_133: + hw->bus_speed = e1000_bus_speed_133; + break; + default: + hw->bus_speed = e1000_bus_speed_reserved; + break; + } } + hw->bus_width = (status & E1000_STATUS_BUS64) ? + e1000_bus_width_64 : e1000_bus_width_32; + break; } - hw->bus_width = (status & E1000_STATUS_BUS64) ? - e1000_bus_width_64 : e1000_bus_width_32; } /****************************************************************************** * Reads a value from one of the devices registers using port I/O (as opposed @@ -4738,6 +4741,7 @@ e1000_get_cable_length(struct e1000_hw * uint16_t agc_value = 0; uint16_t cur_agc, min_agc = IGP01E1000_AGC_LENGTH_TABLE_SIZE; uint16_t i, phy_data; + uint16_t cable_length; DEBUGFUNC("e1000_get_cable_length"); @@ -4749,10 +4753,11 @@ e1000_get_cable_length(struct e1000_hw * &phy_data); if(ret_val) return ret_val; + cable_length = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >> + M88E1000_PSSR_CABLE_LENGTH_SHIFT; /* Convert the enum value to ranged values */ - switch((phy_data & M88E1000_PSSR_CABLE_LENGTH) >> - M88E1000_PSSR_CABLE_LENGTH_SHIFT) { + switch (cable_length) { case e1000_cable_length_50: *min_length = 0; *max_length = e1000_igp_cable_length_50; @@ -4919,8 +4924,7 @@ e1000_check_downshift(struct e1000_hw *h return ret_val; hw->speed_downgraded = (phy_data & IGP01E1000_PLHR_SS_DOWNGRADE) ? 1 : 0; - } - else if(hw->phy_type == e1000_phy_m88) { + } else if(hw->phy_type == e1000_phy_m88) { ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data); if(ret_val) --- linux-2.6.11/drivers/net/e1000/e1000_hw.h.orig 2005-03-18 15:21:34.770629645 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_hw.h 2005-03-18 15:22:07.549255401 -0500 @@ -369,6 +369,7 @@ int32_t e1000_set_d3_lplu_state(struct e #define E1000_DEV_ID_82546GB_SERDES 0x107B #define E1000_DEV_ID_82546GB_PCIE 0x108A #define E1000_DEV_ID_82547EI 0x1019 + #define NODE_ADDRESS_SIZE 6 #define ETH_LENGTH_OF_ADDRESS 6 @@ -1734,6 +1735,9 @@ struct e1000_hw { #define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */ #define PHY_EXT_STATUS 0x0F /* Extended Status Reg */ +#define MAX_PHY_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */ +#define MAX_PHY_MULTI_PAGE_REG 0xF /* Registers equal on all pages */ + /* M88E1000 Specific Registers */ #define M88E1000_PHY_SPEC_CTRL 0x10 /* PHY Specific Control Register */ #define M88E1000_PHY_SPEC_STATUS 0x11 /* PHY Specific Status Register */ @@ -1794,8 +1798,7 @@ struct e1000_hw { #define IGP01E1000_ANALOG_REGS_PAGE 0x20C0 -#define MAX_PHY_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */ -#define MAX_PHY_MULTI_PAGE_REG 0xF /*Registers that are equal on all pages*/ + /* PHY Control Register */ #define MII_CR_SPEED_SELECT_MSB 0x0040 /* bits 6,13: 10=1000, 01=100, 00=10 */ #define MII_CR_COLL_TEST_ENABLE 0x0080 /* Collision test enable */ @@ -2098,7 +2101,11 @@ struct e1000_hw { #define IGP01E1000_ANALOG_FUSE_FINE_1 0x0080 #define IGP01E1000_ANALOG_FUSE_FINE_10 0x0500 + /* Bit definitions for valid PHY IDs. */ +/* I = Integrated + * E = External + */ #define M88E1000_E_PHY_ID 0x01410C50 #define M88E1000_I_PHY_ID 0x01410C30 #define M88E1011_I_PHY_ID 0x01410C20 --- linux-2.6.11/drivers/net/e1000/e1000.h.orig 2005-03-18 15:21:34.764630445 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000.h 2005-03-18 15:22:07.532257669 -0500 @@ -138,6 +138,7 @@ struct e1000_adapter; #define E1000_RX_BUFFER_WRITE 16 /* Must be power of 2 */ #define AUTO_ALL_MODES 0 +#define E1000_EEPROM_82544_APM 0x0004 #define E1000_EEPROM_APME 0x0400 #ifndef E1000_MASTER_SLAVE @@ -209,6 +210,7 @@ struct e1000_adapter { /* TX */ struct e1000_desc_ring tx_ring; + struct e1000_buffer previous_buffer_info; spinlock_t tx_lock; uint32_t txd_cmd; uint32_t tx_int_delay; @@ -222,6 +224,7 @@ struct e1000_adapter { uint32_t tx_fifo_size; atomic_t tx_fifo_stall; boolean_t pcix_82544; + boolean_t detect_tx_hung; /* RX */ struct e1000_desc_ring rx_ring; --- linux-2.6.11/drivers/net/e1000/e1000_ethtool.c.orig 2005-03-18 15:21:34.762630712 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_ethtool.c 2005-03-18 15:22:07.526258470 -0500 @@ -1310,7 +1310,7 @@ e1000_run_loopback_test(struct e1000_ada struct e1000_desc_ring *txdr = &adapter->test_tx_ring; struct e1000_desc_ring *rxdr = &adapter->test_rx_ring; struct pci_dev *pdev = adapter->pdev; - int i; + int i, ret_val; E1000_WRITE_REG(&adapter->hw, RDT, rxdr->count - 1); @@ -1330,11 +1330,12 @@ e1000_run_loopback_test(struct e1000_ada rxdr->buffer_info[i].length, PCI_DMA_FROMDEVICE); - if (!e1000_check_lbtest_frame(rxdr->buffer_info[i++].skb, 1024)) - return 0; - } while (i < 64); + ret_val = e1000_check_lbtest_frame(rxdr->buffer_info[i].skb, + 1024); + i++; + } while (ret_val != 0 && i < 64); - return 13; + return ret_val; } static int --- linux-2.6.11/drivers/net/e1000/e1000_main.c.orig 2005-03-18 15:21:34.773629245 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_main.c 2005-03-18 15:22:07.557254333 -0500 @@ -35,6 +35,14 @@ * - More errlogging support from Jon Mason * - Fix TSO issues on PPC64 machines -- Jon Mason * + * 5.7.1 12/16/04 + * - Resurrect 82547EI/GI related fix in e1000_intr to avoid deadlocks. This + * fix was removed as it caused system instability. The suspected cause of + * this is the called to e1000_irq_disable in e1000_intr. Inlined the + * required piece of e1000_irq_disable into e1000_intr - Anton Blanchard + * 5.7.0 12/10/04 + * - include fix to the condition that determines when to quit NAPI - Robert Olsson + * - use netif_poll_{disable/enable} to synchronize between NAPI and i/f up/down * 5.6.5 11/01/04 * - Enabling NETIF_F_SG without checksum offload is illegal - John Mason @@ -57,7 +65,7 @@ char e1000_driver_string[] = "Intel(R) P #else #define DRIVERNAPI "-NAPI" #endif -char e1000_driver_version[] = "5.6.10.1-k2"DRIVERNAPI; +char e1000_driver_version[] = "5.7.6-k2"DRIVERNAPI; char e1000_copyright[] = "Copyright (c) 1999-2004 Intel Corporation."; /* e1000_pci_tbl - PCI Device ID Table @@ -81,6 +89,7 @@ static struct pci_device_id e1000_pci_tb INTEL_E1000_ETHERNET_DEVICE(0x1011), INTEL_E1000_ETHERNET_DEVICE(0x1012), INTEL_E1000_ETHERNET_DEVICE(0x1013), + INTEL_E1000_ETHERNET_DEVICE(0x1014), INTEL_E1000_ETHERNET_DEVICE(0x1015), INTEL_E1000_ETHERNET_DEVICE(0x1016), INTEL_E1000_ETHERNET_DEVICE(0x1017), @@ -308,6 +317,9 @@ e1000_up(struct e1000_adapter *adapter) mod_timer(&adapter->watchdog_timer, jiffies); e1000_irq_enable(adapter); +#ifdef CONFIG_E1000_NAPI + netif_poll_enable(netdev); +#endif return 0; } @@ -321,6 +333,10 @@ e1000_down(struct e1000_adapter *adapter del_timer_sync(&adapter->tx_fifo_stall_timer); del_timer_sync(&adapter->watchdog_timer); del_timer_sync(&adapter->phy_info_timer); + +#ifdef CONFIG_E1000_NAPI + netif_poll_disable(netdev); +#endif adapter->link_speed = 0; adapter->link_duplex = 0; netif_carrier_off(netdev); @@ -414,6 +430,7 @@ e1000_probe(struct pci_dev *pdev, int i; int err; uint16_t eeprom_data; + uint16_t eeprom_apme_mask = E1000_EEPROM_APME; if((err = pci_enable_device(pdev))) return err; @@ -510,9 +527,6 @@ e1000_probe(struct pci_dev *pdev, } #ifdef NETIF_F_TSO - /* Disbaled for now until root-cause is found for - * hangs reported against non-IA archs. TSO can be - * enabled using ethtool -K eth tso on */ if((adapter->hw.mac_type >= e1000_82544) && (adapter->hw.mac_type != e1000_82547)) netdev->features |= NETIF_F_TSO; @@ -584,6 +598,11 @@ e1000_probe(struct pci_dev *pdev, case e1000_82542_rev2_1: case e1000_82543: break; + case e1000_82544: + e1000_read_eeprom(&adapter->hw, + EEPROM_INIT_CONTROL2_REG, 1, &eeprom_data); + eeprom_apme_mask = E1000_EEPROM_82544_APM; + break; case e1000_82546: case e1000_82546_rev_3: if((E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_FUNC_1) @@ -598,7 +617,7 @@ e1000_probe(struct pci_dev *pdev, EEPROM_INIT_CONTROL3_PORT_A, 1, &eeprom_data); break; } - if(eeprom_data & E1000_EEPROM_APME) + if(eeprom_data & eeprom_apme_mask) adapter->wol |= E1000_WUFC_MAG; /* reset the hardware with the new settings */ @@ -807,6 +826,31 @@ e1000_close(struct net_device *netdev) } /** + * e1000_check_64k_bound - check that memory doesn't cross 64kB boundary + * @adapter: address of board private structure + * @begin: address of beginning of memory + * @end: address of end of memory + **/ +static inline boolean_t +e1000_check_64k_bound(struct e1000_adapter *adapter, + void *start, unsigned long len) +{ + unsigned long begin = (unsigned long) start; + unsigned long end = begin + len; + + /* first rev 82545 and 82546 need to not allow any memory + * write location to cross a 64k boundary due to errata 23 */ + if (adapter->hw.mac_type == e1000_82545 || + adapter->hw.mac_type == e1000_82546 ) { + + /* check buffer doesn't cross 64kB */ + return ((begin ^ (end - 1)) >> 16) != 0 ? FALSE : TRUE; + } + + return TRUE; +} + +/** * e1000_setup_tx_resources - allocate Tx resources (Descriptors) * @adapter: board private structure * @@ -824,7 +868,7 @@ e1000_setup_tx_resources(struct e1000_ad txdr->buffer_info = vmalloc(size); if(!txdr->buffer_info) { DPRINTK(PROBE, ERR, - "Unble to Allocate Memory for the Transmit descriptor ring\n"); + "Unable to Allocate Memory for the Transmit descriptor ring\n"); return -ENOMEM; } memset(txdr->buffer_info, 0, size); @@ -836,11 +880,42 @@ e1000_setup_tx_resources(struct e1000_ad txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma); if(!txdr->desc) { +setup_tx_desc_die: DPRINTK(PROBE, ERR, - "Unble to Allocate Memory for the Transmit descriptor ring\n"); + "Unable to Allocate Memory for the Transmit descriptor ring\n"); vfree(txdr->buffer_info); return -ENOMEM; } + + /* fix for errata 23, cant cross 64kB boundary */ + if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) { + void *olddesc = txdr->desc; + dma_addr_t olddma = txdr->dma; + DPRINTK(TX_ERR,ERR,"txdr align check failed: %u bytes at %p\n", + txdr->size, txdr->desc); + /* try again, without freeing the previous */ + txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma); + /* failed allocation, critial failure */ + if(!txdr->desc) { + pci_free_consistent(pdev, txdr->size, olddesc, olddma); + goto setup_tx_desc_die; + } + + if (!e1000_check_64k_bound(adapter, txdr->desc, txdr->size)) { + /* give up */ + pci_free_consistent(pdev, txdr->size, + txdr->desc, txdr->dma); + pci_free_consistent(pdev, txdr->size, olddesc, olddma); + DPRINTK(PROBE, ERR, + "Unable to Allocate aligned Memory for the Transmit" + " descriptor ring\n"); + vfree(txdr->buffer_info); + return -ENOMEM; + } else { + /* free old, move on with the new one since its okay */ + pci_free_consistent(pdev, txdr->size, olddesc, olddma); + } + } memset(txdr->desc, 0, txdr->size); txdr->next_to_use = 0; @@ -945,7 +1020,7 @@ e1000_setup_rx_resources(struct e1000_ad rxdr->buffer_info = vmalloc(size); if(!rxdr->buffer_info) { DPRINTK(PROBE, ERR, - "Unble to Allocate Memory for the Recieve descriptor ring\n"); + "Unable to Allocate Memory for the Recieve descriptor ring\n"); return -ENOMEM; } memset(rxdr->buffer_info, 0, size); @@ -958,11 +1033,43 @@ e1000_setup_rx_resources(struct e1000_ad rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma); if(!rxdr->desc) { +setup_rx_desc_die: DPRINTK(PROBE, ERR, "Unble to Allocate Memory for the Recieve descriptor ring\n"); vfree(rxdr->buffer_info); return -ENOMEM; } + + /* fix for errata 23, cant cross 64kB boundary */ + if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) { + void *olddesc = rxdr->desc; + dma_addr_t olddma = rxdr->dma; + DPRINTK(RX_ERR,ERR, + "rxdr align check failed: %u bytes at %p\n", + rxdr->size, rxdr->desc); + /* try again, without freeing the previous */ + rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma); + /* failed allocation, critial failure */ + if(!rxdr->desc) { + pci_free_consistent(pdev, rxdr->size, olddesc, olddma); + goto setup_rx_desc_die; + } + + if (!e1000_check_64k_bound(adapter, rxdr->desc, rxdr->size)) { + /* give up */ + pci_free_consistent(pdev, rxdr->size, + rxdr->desc, rxdr->dma); + pci_free_consistent(pdev, rxdr->size, olddesc, olddma); + DPRINTK(PROBE, ERR, + "Unable to Allocate aligned Memory for the" + " Receive descriptor ring\n"); + vfree(rxdr->buffer_info); + return -ENOMEM; + } else { + /* free old, move on with the new one since its okay */ + pci_free_consistent(pdev, rxdr->size, olddesc, olddma); + } + } memset(rxdr->desc, 0, rxdr->size); rxdr->next_to_clean = 0; @@ -1096,6 +1203,7 @@ e1000_unmap_and_free_tx_resource(struct struct e1000_buffer *buffer_info) { struct pci_dev *pdev = adapter->pdev; + if(buffer_info->dma) { pci_unmap_page(pdev, buffer_info->dma, @@ -1124,6 +1232,11 @@ e1000_clean_tx_ring(struct e1000_adapter /* Free all the Tx ring sk_buffs */ + if (likely(adapter->previous_buffer_info.skb != NULL)) { + e1000_unmap_and_free_tx_resource(adapter, + &adapter->previous_buffer_info); + } + for(i = 0; i < tx_ring->count; i++) { buffer_info = &tx_ring->buffer_info[i]; e1000_unmap_and_free_tx_resource(adapter, buffer_info); @@ -1425,7 +1538,6 @@ e1000_watchdog(unsigned long data) struct e1000_adapter *adapter = (struct e1000_adapter *) data; struct net_device *netdev = adapter->netdev; struct e1000_desc_ring *txdr = &adapter->tx_ring; - unsigned int i; uint32_t link; e1000_check_for_link(&adapter->hw); @@ -1505,12 +1617,8 @@ e1000_watchdog(unsigned long data) /* Cause software interrupt to ensure rx ring is cleaned */ E1000_WRITE_REG(&adapter->hw, ICS, E1000_ICS_RXDMT0); - /* Early detection of hung controller */ - i = txdr->next_to_clean; - if(txdr->buffer_info[i].dma && - time_after(jiffies, txdr->buffer_info[i].time_stamp + HZ) && - !(E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_TXOFF)) - netif_stop_queue(netdev); + /* Force detection of hung controller every watchdog period*/ + adapter->detect_tx_hung = TRUE; /* Reset the timer */ mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ); @@ -1522,7 +1630,7 @@ e1000_watchdog(unsigned long data) #define E1000_TX_FLAGS_VLAN_MASK 0xffff0000 #define E1000_TX_FLAGS_VLAN_SHIFT 16 -static inline boolean_t +static inline int e1000_tso(struct e1000_adapter *adapter, struct sk_buff *skb) { #ifdef NETIF_F_TSO @@ -1531,8 +1639,19 @@ e1000_tso(struct e1000_adapter *adapter, uint32_t cmd_length = 0; uint16_t ipcse, tucse, mss; uint8_t ipcss, ipcso, tucss, tucso, hdr_len; +#if 0 /* Not in RHEL4 (see below)... */ + int err; +#endif if(skb_shinfo(skb)->tso_size) { +#if 0 /* Not in RHEL4... */ + if (skb_header_cloned(skb)) { + err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC); + if (err) + return err; + } +#endif + hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2)); mss = skb_shinfo(skb)->tso_size; skb->nh.iph->tot_len = 0; @@ -1569,11 +1688,11 @@ e1000_tso(struct e1000_adapter *adapter, if(++i == adapter->tx_ring.count) i = 0; adapter->tx_ring.next_to_use = i; - return TRUE; + return 1; } #endif - return FALSE; + return 0; } static inline boolean_t @@ -1798,6 +1917,7 @@ e1000_xmit_frame(struct sk_buff *skb, st unsigned int nr_frags = 0; unsigned int mss = 0; int count = 0; + int tso; unsigned int f; len -= skb->data_len; @@ -1869,7 +1989,13 @@ e1000_xmit_frame(struct sk_buff *skb, st first = adapter->tx_ring.next_to_use; - if(likely(e1000_tso(adapter, skb))) + tso = e1000_tso(adapter, skb); + if (tso < 0) { + dev_kfree_skb_any(skb); + return NETDEV_TX_OK; + } + + if (likely(tso)) tx_flags |= E1000_TX_FLAGS_TSO; else if(likely(e1000_tx_csum(adapter, skb))) tx_flags |= E1000_TX_FLAGS_CSUM; @@ -2151,10 +2277,28 @@ e1000_intr(int irq, void *data, struct p __netif_rx_schedule(netdev); } #else + /* Writing IMC and IMS is needed for 82547. + Due to Hub Link bus being occupied, an interrupt + de-assertion message is not able to be sent. + When an interrupt assertion message is generated later, + two messages are re-ordered and sent out. + That causes APIC to think 82547 is in de-assertion + state, while 82547 is in assertion state, resulting + in dead lock. Writing IMC forces 82547 into + de-assertion state. + */ + if(hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2){ + atomic_inc(&adapter->irq_sem); + E1000_WRITE_REG(&adapter->hw, IMC, ~0); + } + for(i = 0; i < E1000_MAX_INTR; i++) if(unlikely(!e1000_clean_rx_irq(adapter) & !e1000_clean_tx_irq(adapter))) break; + + if(hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2) + e1000_irq_enable(adapter); #endif return IRQ_HANDLED; @@ -2174,24 +2318,21 @@ e1000_clean(struct net_device *netdev, i int tx_cleaned; int work_done = 0; - if (!netif_carrier_ok(netdev)) - goto quit_polling; - tx_cleaned = e1000_clean_tx_irq(adapter); e1000_clean_rx_irq(adapter, &work_done, work_to_do); *budget -= work_done; netdev->quota -= work_done; - /* if no Rx and Tx cleanup work was done, exit the polling mode */ - if(!tx_cleaned || (work_done < work_to_do) || + /* if no Tx and not enough Rx work done, exit the polling mode */ + if((!tx_cleaned && (work_done < work_to_do)) || !netif_running(netdev)) { -quit_polling: netif_rx_complete(netdev); + netif_rx_complete(netdev); e1000_irq_enable(adapter); return 0; } - return (work_done >= work_to_do); + return 1; } #endif @@ -2215,11 +2356,34 @@ e1000_clean_tx_irq(struct e1000_adapter eop_desc = E1000_TX_DESC(*tx_ring, eop); while(eop_desc->upper.data & cpu_to_le32(E1000_TXD_STAT_DD)) { + /* pre-mature writeback of Tx descriptors */ + /* clear (free buffers and unmap pci_mapping) */ + /* previous_buffer_info */ + if (likely(adapter->previous_buffer_info.skb != NULL)) { + e1000_unmap_and_free_tx_resource(adapter, + &adapter->previous_buffer_info); + } + for(cleaned = FALSE; !cleaned; ) { tx_desc = E1000_TX_DESC(*tx_ring, i); buffer_info = &tx_ring->buffer_info[i]; + cleaned = (i == eop); + + /* pre-mature writeback of Tx descriptors */ + /* save the cleaning of the this for the */ + /* next iteration */ + if (cleaned) { + memcpy(&adapter->previous_buffer_info, + buffer_info, + sizeof(struct e1000_buffer)); + memset(buffer_info, + 0, + sizeof(struct e1000_buffer)); + } else { + e1000_unmap_and_free_tx_resource(adapter, + buffer_info); + } - e1000_unmap_and_free_tx_resource(adapter, buffer_info); tx_desc->buffer_addr = 0; tx_desc->lower.data = 0; tx_desc->upper.data = 0; @@ -2241,6 +2405,16 @@ e1000_clean_tx_irq(struct e1000_adapter netif_wake_queue(netdev); spin_unlock(&adapter->tx_lock); + + if(adapter->detect_tx_hung) { + /* detect a transmit hang in hardware, this serializes the + * check with the clearing of time_stamp and movement of i */ + adapter->detect_tx_hung = FALSE; + if(tx_ring->buffer_info[i].dma && + time_after(jiffies, tx_ring->buffer_info[i].time_stamp + HZ) && + !(E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_TXOFF)) + netif_stop_queue(netdev); + } return cleaned; } @@ -2407,19 +2581,43 @@ e1000_alloc_rx_buffers(struct e1000_adap struct e1000_rx_desc *rx_desc; struct e1000_buffer *buffer_info; struct sk_buff *skb; - unsigned int i; + unsigned int i, bufsz; i = rx_ring->next_to_use; buffer_info = &rx_ring->buffer_info[i]; while(!buffer_info->skb) { - skb = dev_alloc_skb(adapter->rx_buffer_len + NET_IP_ALIGN); + bufsz = adapter->rx_buffer_len + NET_IP_ALIGN; + skb = dev_alloc_skb(bufsz); if(unlikely(!skb)) { /* Better luck next round */ break; } + /* fix for errata 23, cant cross 64kB boundary */ + if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) { + struct sk_buff *oldskb = skb; + DPRINTK(RX_ERR,ERR, + "skb align check failed: %u bytes at %p\n", + bufsz, skb->data); + /* try again, without freeing the previous */ + skb = dev_alloc_skb(bufsz); + if (!skb) { + dev_kfree_skb(oldskb); + break; + } + if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) { + /* give up */ + dev_kfree_skb(skb); + dev_kfree_skb(oldskb); + break; /* while !buffer_info->skb */ + } else { + /* move on with the new one */ + dev_kfree_skb(oldskb); + } + } + /* Make buffer alignment 2 beyond a 16 byte boundary * this will result in a 16 byte aligned IP header after * the 14 byte MAC header is removed @@ -2435,6 +2633,25 @@ e1000_alloc_rx_buffers(struct e1000_adap adapter->rx_buffer_len, PCI_DMA_FROMDEVICE); + /* fix for errata 23, cant cross 64kB boundary */ + if(!e1000_check_64k_bound(adapter, + (void *)(unsigned long)buffer_info->dma, + adapter->rx_buffer_len)) { + DPRINTK(RX_ERR,ERR, + "dma align check failed: %u bytes at %ld\n", + adapter->rx_buffer_len, (unsigned long)buffer_info->dma); + + dev_kfree_skb(skb); + buffer_info->skb = NULL; + + pci_unmap_single(pdev, + buffer_info->dma, + adapter->rx_buffer_len, + PCI_DMA_FROMDEVICE); + + break; /* while !buffer_info->skb */ + } + rx_desc = E1000_RX_DESC(*rx_ring, i); rx_desc->buffer_addr = cpu_to_le64(buffer_info->dma); jwltest-e1000-update-6_0_54-k2.patch: e1000.h | 37 e1000_ethtool.c | 105 +- e1000_hw.c | 2147 +++++++++++++++++++++++++++++++++++++++++++------------- e1000_hw.h | 570 ++++++++++++++ e1000_main.c | 1149 +++++++++++++++++++++++------ e1000_osdep.h | 32 e1000_param.c | 3 7 files changed, 3250 insertions(+), 793 deletions(-) --- NEW FILE jwltest-e1000-update-6_0_54-k2.patch --- --- linux-2.6.11/drivers/net/e1000/e1000_osdep.h.orig 2005-04-29 14:33:35.000000000 -0400 +++ linux-2.6.11/drivers/net/e1000/e1000_osdep.h 2005-04-29 14:31:12.000000000 -0400 @@ -1,7 +1,7 @@ /******************************************************************************* - Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved. + Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -42,7 +42,12 @@ #include #ifndef msec_delay -#define msec_delay(x) msleep(x) +#define msec_delay(x) do { if(in_interrupt()) { \ + /* Don't mdelay in interrupt context! */ \ + BUG(); \ + } else { \ + msleep(x); \ + } } while(0) /* Some workarounds require millisecond delays and are run during interrupt * context. Most notably, when establishing link, the phy may need tweaking @@ -96,6 +101,29 @@ typedef enum { (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \ ((offset) << 2))) +#define E1000_READ_REG_ARRAY_DWORD E1000_READ_REG_ARRAY +#define E1000_WRITE_REG_ARRAY_DWORD E1000_WRITE_REG_ARRAY + +#define E1000_WRITE_REG_ARRAY_WORD(a, reg, offset, value) ( \ + writew((value), ((a)->hw_addr + \ + (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \ + ((offset) << 1)))) + +#define E1000_READ_REG_ARRAY_WORD(a, reg, offset) ( \ + readw((a)->hw_addr + \ + (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \ + ((offset) << 1))) + +#define E1000_WRITE_REG_ARRAY_BYTE(a, reg, offset, value) ( \ + writeb((value), ((a)->hw_addr + \ + (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \ + (offset)))) + +#define E1000_READ_REG_ARRAY_BYTE(a, reg, offset) ( \ + readb((a)->hw_addr + \ + (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \ + (offset))) + #define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, STATUS) #endif /* _E1000_OSDEP_H_ */ --- linux-2.6.11/drivers/net/e1000/e1000_hw.c.orig 2005-04-29 14:33:03.000000000 -0400 +++ linux-2.6.11/drivers/net/e1000/e1000_hw.c 2005-04-29 14:31:12.000000000 -0400 @@ -1,7 +1,7 @@ /******************************************************************************* - Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved. + Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -63,10 +63,11 @@ static uint16_t e1000_shift_in_ee_bits(s static int32_t e1000_acquire_eeprom(struct e1000_hw *hw); static void e1000_release_eeprom(struct e1000_hw *hw); static void e1000_standby_eeprom(struct e1000_hw *hw); -static int32_t e1000_id_led_init(struct e1000_hw * hw); static int32_t e1000_set_vco_speed(struct e1000_hw *hw); static int32_t e1000_polarity_reversal_workaround(struct e1000_hw *hw); static int32_t e1000_set_phy_mode(struct e1000_hw *hw); +static int32_t e1000_host_if_read_cookie(struct e1000_hw *hw, uint8_t *buffer); +static uint8_t e1000_calculate_mng_checksum(char *buffer, uint32_t length); /* IGP cable length table */ static const @@ -80,6 +81,17 @@ uint16_t e1000_igp_cable_length_table[IG 100, 100, 100, 100, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120}; +static const +uint16_t e1000_igp_2_cable_length_table[IGP02E1000_AGC_LENGTH_TABLE_SIZE] = + { 8, 13, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, + 22, 24, 27, 30, 32, 35, 37, 40, 42, 44, 47, 49, 51, 54, 56, 58, + 32, 35, 38, 41, 44, 47, 50, 53, 55, 58, 61, 63, 66, 69, 71, 74, + 43, 47, 51, 54, 58, 61, 64, 67, 71, 74, 77, 80, 82, 85, 88, 90, + 57, 62, 66, 70, 74, 77, 81, 85, 88, 91, 94, 97, 100, 103, 106, 108, + 73, 78, 82, 87, 91, 95, 98, 102, 105, 109, 112, 114, 117, 119, 122, 124, + 91, 96, 101, 105, 109, 113, 116, 119, 122, 125, 127, 128, 128, 128, 128, 128, + 108, 113, 117, 121, 124, 127, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128}; + /****************************************************************************** * Set the phy type member in the hw struct. @@ -91,10 +103,14 @@ e1000_set_phy_type(struct e1000_hw *hw) { DEBUGFUNC("e1000_set_phy_type"); + if(hw->mac_type == e1000_undefined) + return -E1000_ERR_PHY_TYPE; + switch(hw->phy_id) { case M88E1000_E_PHY_ID: case M88E1000_I_PHY_ID: case M88E1011_I_PHY_ID: + case M88E1111_I_PHY_ID: hw->phy_type = e1000_phy_m88; break; case IGP01E1000_I_PHY_ID: @@ -128,7 +144,6 @@ e1000_phy_init_script(struct e1000_hw *h DEBUGFUNC("e1000_phy_init_script"); - if(hw->phy_init_script) { msec_delay(20); @@ -271,6 +286,7 @@ e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_82546GB_FIBER: case E1000_DEV_ID_82546GB_SERDES: case E1000_DEV_ID_82546GB_PCIE: + case E1000_DEV_ID_82546GB_QUAD_COPPER: hw->mac_type = e1000_82546_rev_3; break; case E1000_DEV_ID_82541EI: @@ -289,12 +305,19 @@ e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_82547GI: hw->mac_type = e1000_82547_rev_2; break; + case E1000_DEV_ID_82573E: + case E1000_DEV_ID_82573E_IAMT: + hw->mac_type = e1000_82573; + break; default: /* Should never have loaded on this device */ return -E1000_ERR_MAC_TYPE; } switch(hw->mac_type) { + case e1000_82573: + hw->eeprom_semaphore_present = TRUE; + /* fall through */ case e1000_82541: case e1000_82547: case e1000_82541_rev_2: @@ -360,6 +383,9 @@ e1000_reset_hw(struct e1000_hw *hw) uint32_t icr; uint32_t manc; uint32_t led_ctrl; + uint32_t timeout; + uint32_t extcnf_ctrl; + int32_t ret_val; DEBUGFUNC("e1000_reset_hw"); @@ -369,6 +395,15 @@ e1000_reset_hw(struct e1000_hw *hw) e1000_pci_clear_mwi(hw); } + if(hw->bus_type == e1000_bus_type_pci_express) { + /* Prevent the PCI-E bus from sticking if there is no TLP connection + * on the last TLP read/write transaction when MAC is reset. + */ + if(e1000_disable_pciex_master(hw) != E1000_SUCCESS) { + DEBUGOUT("PCI-E Master disable polling has failed.\n"); + } + } + /* Clear interrupt mask to stop board from generating interrupts */ DEBUGOUT("Masking off all interrupts\n"); E1000_WRITE_REG(hw, IMC, 0xffffffff); @@ -393,10 +428,32 @@ e1000_reset_hw(struct e1000_hw *hw) /* Must reset the PHY before resetting the MAC */ if((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) { - E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_PHY_RST)); + E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_PHY_RST)); msec_delay(5); } + /* Must acquire the MDIO ownership before MAC reset. + * Ownership defaults to firmware after a reset. */ + if(hw->mac_type == e1000_82573) { + timeout = 10; + + extcnf_ctrl = E1000_READ_REG(hw, EXTCNF_CTRL); + extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP; + + do { + E1000_WRITE_REG(hw, EXTCNF_CTRL, extcnf_ctrl); + extcnf_ctrl = E1000_READ_REG(hw, EXTCNF_CTRL); + + if(extcnf_ctrl & E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP) + break; + else + extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP; [...5789 lines suppressed...] + */ + rx_desc->read.buffer_addr[j+1] = + cpu_to_le64(ps_page_dma->ps_page_dma[j]); + } + + skb = dev_alloc_skb(adapter->rx_ps_bsize0 + NET_IP_ALIGN); + + if(unlikely(!skb)) + break; + + /* Make buffer alignment 2 beyond a 16 byte boundary + * this will result in a 16 byte aligned IP header after + * the 14 byte MAC header is removed + */ + skb_reserve(skb, NET_IP_ALIGN); + + skb->dev = netdev; + + buffer_info->skb = skb; + buffer_info->length = adapter->rx_ps_bsize0; + buffer_info->dma = pci_map_single(pdev, skb->data, + adapter->rx_ps_bsize0, + PCI_DMA_FROMDEVICE); + + rx_desc->read.buffer_addr[0] = cpu_to_le64(buffer_info->dma); + + if(unlikely((i & ~(E1000_RX_BUFFER_WRITE - 1)) == i)) { + /* Force memory writes to complete before letting h/w + * know there are new descriptors to fetch. (Only + * applicable for weak-ordered memory model archs, + * such as IA-64). */ + wmb(); + /* Hardware increments by 16 bytes, but packet split + * descriptors are 32 bytes...so we increment tail + * twice as much. + */ + E1000_WRITE_REG(&adapter->hw, RDT, i<<1); + } + + if(unlikely(++i == rx_ring->count)) i = 0; + buffer_info = &rx_ring->buffer_info[i]; + ps_page = &rx_ring->ps_page[i]; + ps_page_dma = &rx_ring->ps_page_dma[i]; + } + +no_buffers: + rx_ring->next_to_use = i; +} + +/** * e1000_smartspeed - Workaround for SmartSpeed on 82541 and 82547 controllers. * @adapter: **/ @@ -2858,9 +3462,10 @@ void e1000_pci_set_mwi(struct e1000_hw *hw) { struct e1000_adapter *adapter = hw->back; + int ret_val = pci_set_mwi(adapter->pdev); - int ret; - ret = pci_set_mwi(adapter->pdev); + if(ret_val) + DPRINTK(PROBE, ERR, "Error in setting MWI\n"); } void @@ -2919,6 +3524,7 @@ e1000_vlan_rx_register(struct net_device rctl |= E1000_RCTL_VFE; rctl &= ~E1000_RCTL_CFIEN; E1000_WRITE_REG(&adapter->hw, RCTL, rctl); + e1000_update_mng_vlan(adapter); } else { /* disable VLAN tag insert/strip */ ctrl = E1000_READ_REG(&adapter->hw, CTRL); @@ -2929,6 +3535,10 @@ e1000_vlan_rx_register(struct net_device rctl = E1000_READ_REG(&adapter->hw, RCTL); rctl &= ~E1000_RCTL_VFE; E1000_WRITE_REG(&adapter->hw, RCTL, rctl); + if(adapter->mng_vlan_id != (uint16_t)E1000_MNG_VLAN_NONE) { + e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id); + adapter->mng_vlan_id = E1000_MNG_VLAN_NONE; + } } e1000_irq_enable(adapter); @@ -2939,7 +3549,10 @@ e1000_vlan_rx_add_vid(struct net_device { struct e1000_adapter *adapter = netdev->priv; uint32_t vfta, index; - + if((adapter->hw.mng_cookie.status & + E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) && + (vid == adapter->mng_vlan_id)) + return; /* add VID to filter table */ index = (vid >> 5) & 0x7F; vfta = E1000_READ_REG_ARRAY(&adapter->hw, VFTA, index); @@ -2960,6 +3573,10 @@ e1000_vlan_rx_kill_vid(struct net_device e1000_irq_enable(adapter); + if((adapter->hw.mng_cookie.status & + E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) && + (vid == adapter->mng_vlan_id)) + return; /* remove VID from filter table */ index = (vid >> 5) & 0x7F; vfta = E1000_READ_REG_ARRAY(&adapter->hw, VFTA, index); @@ -3006,8 +3623,7 @@ e1000_set_spd_dplx(struct e1000_adapter break; case SPEED_1000 + DUPLEX_HALF: /* not supported */ default: - DPRINTK(PROBE, ERR, - "Unsupported Speed/Duplexity configuration\n"); + DPRINTK(PROBE, ERR, "Unsupported Speed/Duplex configuration\n"); return -EINVAL; } return 0; @@ -3035,7 +3651,7 @@ e1000_suspend(struct pci_dev *pdev, uint { struct net_device *netdev = pci_get_drvdata(pdev); struct e1000_adapter *adapter = netdev->priv; - uint32_t ctrl, ctrl_ext, rctl, manc, status; + uint32_t ctrl, ctrl_ext, rctl, manc, status, swsm; uint32_t wufc = adapter->wol; netif_device_detach(netdev); @@ -3077,6 +3693,9 @@ e1000_suspend(struct pci_dev *pdev, uint E1000_WRITE_REG(&adapter->hw, CTRL_EXT, ctrl_ext); } + /* Allow time for pending master requests to run */ + e1000_disable_pciex_master(&adapter->hw); + E1000_WRITE_REG(&adapter->hw, WUC, E1000_WUC_PME_EN); E1000_WRITE_REG(&adapter->hw, WUFC, wufc); pci_enable_wake(pdev, 3, 1); @@ -3101,6 +3720,16 @@ e1000_suspend(struct pci_dev *pdev, uint } } + switch(adapter->hw.mac_type) { + case e1000_82573: + swsm = E1000_READ_REG(&adapter->hw, SWSM); + E1000_WRITE_REG(&adapter->hw, SWSM, + swsm & ~E1000_SWSM_DRV_LOAD); + break; + default: + break; + } + pci_disable_device(pdev); state = (state > 0) ? 3 : 0; @@ -3115,13 +3744,12 @@ e1000_resume(struct pci_dev *pdev) { struct net_device *netdev = pci_get_drvdata(pdev); struct e1000_adapter *adapter = netdev->priv; - uint32_t manc, ret; + uint32_t manc, ret, swsm; pci_set_power_state(pdev, 0); pci_restore_state(pdev); ret = pci_enable_device(pdev); - if (pdev->is_busmaster) - pci_set_master(pdev); + pci_set_master(pdev); pci_enable_wake(pdev, 3, 0); pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */ @@ -3141,10 +3769,19 @@ e1000_resume(struct pci_dev *pdev) E1000_WRITE_REG(&adapter->hw, MANC, manc); } + switch(adapter->hw.mac_type) { + case e1000_82573: + swsm = E1000_READ_REG(&adapter->hw, SWSM); + E1000_WRITE_REG(&adapter->hw, SWSM, + swsm | E1000_SWSM_DRV_LOAD); + break; + default: + break; + } + return 0; } #endif - #ifdef CONFIG_NET_POLL_CONTROLLER /* * Polling 'interrupt' - used by things like netconsole to send skbs @@ -3152,7 +3789,7 @@ e1000_resume(struct pci_dev *pdev) * the interrupt routine is executing. */ static void -e1000_netpoll (struct net_device *netdev) +e1000_netpoll(struct net_device *netdev) { struct e1000_adapter *adapter = netdev->priv; disable_irq(adapter->pdev->irq); jwltest-e1000-watchdog.patch: e1000.h | 1 + e1000_main.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) --- NEW FILE jwltest-e1000-watchdog.patch --- --- linux-2.6.11/drivers/net/e1000/e1000.h.orig 2005-03-18 15:25:19.291666832 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000.h 2005-03-18 15:26:23.723067936 -0500 @@ -203,6 +203,7 @@ struct e1000_adapter { spinlock_t stats_lock; atomic_t irq_sem; struct work_struct tx_timeout_task; + struct work_struct watchdog_task; uint8_t fc_autoneg; struct timer_list blink_timer; --- linux-2.6.11/drivers/net/e1000/e1000_main.c.orig 2005-03-18 15:25:19.381654822 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_main.c 2005-03-18 15:26:23.728067269 -0500 @@ -143,6 +143,7 @@ static void e1000_clean_rx_ring(struct e static void e1000_set_multi(struct net_device *netdev); static void e1000_update_phy_info(unsigned long data); static void e1000_watchdog(unsigned long data); +static void e1000_watchdog_task(struct e1000_adapter *adapter); static void e1000_82547_tx_fifo_stall(unsigned long data); static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev); static struct net_device_stats * e1000_get_stats(struct net_device *netdev); @@ -576,6 +577,9 @@ e1000_probe(struct pci_dev *pdev, adapter->watchdog_timer.function = &e1000_watchdog; adapter->watchdog_timer.data = (unsigned long) adapter; + INIT_WORK(&adapter->watchdog_task, + (void (*)(void *))e1000_watchdog_task, adapter); + init_timer(&adapter->phy_info_timer); adapter->phy_info_timer.function = &e1000_update_phy_info; adapter->phy_info_timer.data = (unsigned long) adapter; @@ -1531,13 +1535,20 @@ e1000_82547_tx_fifo_stall(unsigned long /** * e1000_watchdog - Timer Call-back - * @data: pointer to netdev cast into an unsigned long + * @data: pointer to adapter cast into an unsigned long **/ - static void e1000_watchdog(unsigned long data) { struct e1000_adapter *adapter = (struct e1000_adapter *) data; + + /* Do the rest outside of interrupt context */ + schedule_work(&adapter->watchdog_task); +} + +static void +e1000_watchdog_task(struct e1000_adapter *adapter) +{ struct net_device *netdev = adapter->netdev; struct e1000_desc_ring *txdr = &adapter->tx_ring; uint32_t link; jwltest-e1000-workqueue-flush.patch: e1000_main.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE jwltest-e1000-workqueue-flush.patch --- --- linux-2.6.11/drivers/net/e1000/e1000_main.c.orig 2005-03-18 15:28:40.346833843 -0500 +++ linux-2.6.11/drivers/net/e1000/e1000_main.c 2005-03-18 15:29:22.822164850 -0500 @@ -666,6 +666,8 @@ e1000_remove(struct pci_dev *pdev) struct e1000_adapter *adapter = netdev->priv; uint32_t manc; + flush_scheduled_work(); + if(adapter->hw.mac_type >= e1000_82540 && adapter->hw.media_type == e1000_media_type_copper) { manc = E1000_READ_REG(&adapter->hw, MANC); jwltest-ipw2100-1_1_0.patch: Documentation/networking/README.ipw2100 | 162 drivers/net/wireless/Kconfig | 55 drivers/net/wireless/Makefile | 4 drivers/net/wireless/ipw2100.c | 8649 ++++++++++++++++++++++++++++++ drivers/net/wireless/ipw2100.h | 1278 ++++ drivers/net/wireless/ipw2100/LICENSE | 339 - drivers/net/wireless/ipw2100/Makefile | 15 drivers/net/wireless/ipw2100/ipw2100.c | 8972 -------------------------------- drivers/net/wireless/ipw2100/ipw2100.h | 1287 ---- 9 files changed, 10064 insertions(+), 10697 deletions(-) --- NEW FILE jwltest-ipw2100-1_1_0.patch --- --- /dev/null 2004-02-23 16:02:56.000000000 -0500 +++ linux-2.6.9/drivers/net/wireless/ipw2100.h 2005-03-24 13:25:56.222518588 -0500 @@ -0,0 +1,1278 @@ +/****************************************************************************** + + Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved. + + This program is free software; you can redistribute it and/or modify it + under the terms of version 2 of the GNU General Public License as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 + Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + The full GNU General Public License is included in this distribution in the + file called LICENSE. + + Contact Information: + James P. Ketrenos + Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 + +******************************************************************************/ +#ifndef _IPW2100_H +#define _IPW2100_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // new driver API + +#include + +#include + +#ifndef IRQ_NONE +typedef void irqreturn_t; +#define IRQ_NONE +#define IRQ_HANDLED +#define IRQ_RETVAL(x) +#endif + +#if WIRELESS_EXT < 17 +#define IW_QUAL_QUAL_INVALID 0x10 +#define IW_QUAL_LEVEL_INVALID 0x20 +#define IW_QUAL_NOISE_INVALID 0x40 +#endif + +#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) ) +#define pci_dma_sync_single_for_cpu pci_dma_sync_single +#define pci_dma_sync_single_for_device pci_dma_sync_single +#endif + +#ifndef HAVE_FREE_NETDEV +#define free_netdev(x) kfree(x) +#endif + + + +struct ipw2100_priv; +struct ipw2100_tx_packet; +struct ipw2100_rx_packet; + +#ifdef CONFIG_IPW_DEBUG +enum { IPW_DEBUG_ENABLED = 1 }; +extern u32 ipw2100_debug_level; +#define IPW_DEBUG(level, message...) \ +do { \ + if (ipw2100_debug_level & (level)) { \ + printk(KERN_DEBUG "ipw2100: %c %s ", \ + in_interrupt() ? 'I' : 'U', __FUNCTION__); \ + printk(message); \ + } \ +} while (0) +#else +enum { IPW_DEBUG_ENABLED = 0 }; +#define IPW_DEBUG(level, message...) do {} while (0) +#endif /* CONFIG_IPW_DEBUG */ + +#define IPW_DL_UNINIT 0x80000000 +#define IPW_DL_NONE 0x00000000 +#define IPW_DL_ALL 0x7FFFFFFF + +/* + * To use the debug system; + * + * If you are defining a new debug classification, simply add it to the #define + * list here in the form of: + * + * #define IPW_DL_xxxx VALUE + * + * shifting value to the left one bit from the previous entry. xxxx should be + * the name of the classification (for example, WEP) + * + * You then need to either add a IPW2100_xxxx_DEBUG() macro definition for your + * classification, or use IPW_DEBUG(IPW_DL_xxxx, ...) whenever you want + * to send output to that classification. + * + * To add your debug level to the list of levels seen when you perform + * + * % cat /proc/net/ipw2100/debug_level + * + * you simply need to add your entry to the ipw2100_debug_levels array. + * + * If you do not see debug_level in /proc/net/ipw2100 then you do not have + * CONFIG_IPW_DEBUG defined in your kernel configuration + * + */ + +#define IPW_DL_ERROR (1<<0) +#define IPW_DL_WARNING (1<<1) +#define IPW_DL_INFO (1<<2) +#define IPW_DL_WX (1<<3) +#define IPW_DL_HC (1<<5) +#define IPW_DL_STATE (1<<6) + +#define IPW_DL_NOTIF (1<<10) +#define IPW_DL_SCAN (1<<11) +#define IPW_DL_ASSOC (1<<12) +#define IPW_DL_DROP (1<<13) + +#define IPW_DL_IOCTL (1<<14) +#define IPW_DL_RF_KILL (1<<17) + + +#define IPW_DL_MANAGE (1<<15) +#define IPW_DL_FW (1<<16) + +#define IPW_DL_FRAG (1<<21) +#define IPW_DL_WEP (1<<22) +#define IPW_DL_TX (1<<23) +#define IPW_DL_RX (1<<24) +#define IPW_DL_ISR (1<<25) +#define IPW_DL_IO (1<<26) +#define IPW_DL_TRACE (1<<28) + +#define IPW_DEBUG_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a) +#define IPW_DEBUG_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a) +#define IPW_DEBUG_INFO(f...) IPW_DEBUG(IPW_DL_INFO, ## f) +#define IPW_DEBUG_WX(f...) IPW_DEBUG(IPW_DL_WX, ## f) +#define IPW_DEBUG_SCAN(f...) IPW_DEBUG(IPW_DL_SCAN, ## f) +#define IPW_DEBUG_NOTIF(f...) IPW_DEBUG(IPW_DL_NOTIF, ## f) +#define IPW_DEBUG_TRACE(f...) IPW_DEBUG(IPW_DL_TRACE, ## f) +#define IPW_DEBUG_RX(f...) IPW_DEBUG(IPW_DL_RX, ## f) +#define IPW_DEBUG_TX(f...) IPW_DEBUG(IPW_DL_TX, ## f) +#define IPW_DEBUG_ISR(f...) IPW_DEBUG(IPW_DL_ISR, ## f) +#define IPW_DEBUG_MANAGEMENT(f...) IPW_DEBUG(IPW_DL_MANAGE, ## f) +#define IPW_DEBUG_WEP(f...) IPW_DEBUG(IPW_DL_WEP, ## f) +#define IPW_DEBUG_HC(f...) IPW_DEBUG(IPW_DL_HC, ## f) +#define IPW_DEBUG_FRAG(f...) IPW_DEBUG(IPW_DL_FRAG, ## f) +#define IPW_DEBUG_FW(f...) IPW_DEBUG(IPW_DL_FW, ## f) +#define IPW_DEBUG_RF_KILL(f...) IPW_DEBUG(IPW_DL_RF_KILL, ## f) +#define IPW_DEBUG_DROP(f...) IPW_DEBUG(IPW_DL_DROP, ## f) +#define IPW_DEBUG_IO(f...) IPW_DEBUG(IPW_DL_IO, ## f) +#define IPW_DEBUG_IOCTL(f...) IPW_DEBUG(IPW_DL_IOCTL, ## f) +#define IPW_DEBUG_STATE(f, a...) IPW_DEBUG(IPW_DL_STATE | IPW_DL_ASSOC | IPW_DL_INFO, f, ## a) +#define IPW_DEBUG_ASSOC(f, a...) IPW_DEBUG(IPW_DL_ASSOC | IPW_DL_INFO, f, ## a) + + +#define VERIFY(f) \ +{ \ + int status = 0; \ + status = f; \ + if(status) \ + return status; \ +} + +enum { + IPW_HW_STATE_DISABLED = 1, + IPW_HW_STATE_ENABLED = 0 +}; + +struct ssid_context { + char ssid[IW_ESSID_MAX_SIZE + 1]; + int ssid_len; + unsigned char bssid[ETH_ALEN]; + int port_type; + int channel; + +}; + +extern const char *port_type_str[]; +extern const char *band_str[]; + +#define NUMBER_OF_BD_PER_COMMAND_PACKET 1 [...20511 lines suppressed...] +- 802.1x (tested with XSupplicant 1.0.1) + +Enabled (but not supported) features: - Monitor/RFMon mode -- transmit power control -- long/short preamble support -- power states support (ACPI) +- WPA/WPA2 -TODO ------------- ----- ----- ---- --- -- - -- Fix bugs... The biggies: - C3 corruption - Fragmentation +The distinction between officially supported and enabled is a reflection +on the amount of validation and interoperability testing that has been +performed on a given feature. -Command Line Parameters ------------- ----- ----- ---- --- -- - +=========================== +2. Command Line Parameters +--------------------------- If the driver is built as a module, the following optional parameters are used by entering them on the command line with the modprobe command using this @@ -34,54 +61,82 @@ syntax: modprobe ipw2100 [