From fedora-cvs-commits at redhat.com Tue May 1 00:31:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Apr 2007 20:31:09 -0400 Subject: rpms/anaconda/devel .cvsignore, 1.408, 1.409 anaconda.spec, 1.539, 1.540 sources, 1.533, 1.534 Message-ID: <200705010031.l410V9UH028147@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28080/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.56-1 on branch devel from anaconda-11.2.0.56-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.408 retrieving revision 1.409 diff -u -r1.408 -r1.409 --- .cvsignore 23 Apr 2007 21:49:39 -0000 1.408 +++ .cvsignore 1 May 2007 00:31:07 -0000 1.409 @@ -1 +1 @@ -anaconda-11.2.0.55.tar.bz2 +anaconda-11.2.0.56.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.539 retrieving revision 1.540 diff -u -r1.539 -r1.540 --- anaconda.spec 23 Apr 2007 21:49:39 -0000 1.539 +++ anaconda.spec 1 May 2007 00:31:07 -0000 1.540 @@ -1,7 +1,7 @@ %define livearches %{ix86} x86_64 Name: anaconda -Version: 11.2.0.55 +Version: 11.2.0.56 Release: 1 License: GPL Summary: Graphical system installer @@ -142,6 +142,24 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Apr 30 2007 Jeremy Katz - 11.2.0.56-1 +- Don't write out ipv6 disabling bits (dcantrell, #237642) +- Load pata_pcmcia late (#237674) +- Fix release notes to display nicely with the livecd running at 800x600 +- Add support for spufs (pnasrat, #237725) +- Add libidn for ping (#237745) +- Fix selinux context of /root (clumens, #237834) +- Fix for mirror errors (dlehman) +- Fix splittree (Joel Andres Granados, #233384) +- Fix ppc32 netboot (pnasrat, #237988) +- Fix %packages for media installs (clumens, #231121, #235881) +- Fix rescue mode networking (dcantrell, #238080) +- Adjust for unbreaking the yum API +- Fix rescue mode traceback (#238261) +- Fix for iscsi not being present (#238424) +- Fix for upgrades with LVM (clumens, #234938) +- Give some feedback while erases are being processed (#238256) + * Mon Apr 23 2007 Jeremy Katz - 11.2.0.55-1 - Fix FTP/HTTP installs booted from disc1/rescueCD - Ensure kickstart scripts are executed with the right cwd (clumens, #237317) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.533 retrieving revision 1.534 diff -u -r1.533 -r1.534 --- sources 23 Apr 2007 21:49:39 -0000 1.533 +++ sources 1 May 2007 00:31:07 -0000 1.534 @@ -1 +1 @@ -a75ad5317409417ebbca5205348d08ec anaconda-11.2.0.55.tar.bz2 +83c5d144e3f8c292c7e6636f4fb4a16d anaconda-11.2.0.56.tar.bz2 From fedora-cvs-commits at redhat.com Tue May 1 00:44:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Apr 2007 20:44:07 -0400 Subject: rpms/kernel/devel/configs config-generic,1.306,1.307 Message-ID: <200705010044.l410i7Cx005069@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv4994/configs Modified Files: config-generic Log Message: wireless-dev and iwlwifi updates Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- config-generic 13 Apr 2007 20:44:51 -0000 1.306 +++ config-generic 1 May 2007 00:44:05 -0000 1.307 @@ -1192,7 +1192,6 @@ CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y CONFIG_CFG80211=m -CONFIG_CFG80211_WEXT_COMPAT=y # CONFIG_NL80211 is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set @@ -1212,15 +1211,10 @@ # CONFIG_BCM43XX_MAC80211_PIO_MODE is not set CONFIG_RT2X00=y CONFIG_RT2400PCI=m -# CONFIG_RT2400PCI_DEBUG is not set CONFIG_RT2500PCI=m -# CONFIG_RT2500PCI_DEBUG is not set CONFIG_RT61PCI=m -# CONFIG_RT61PCI_DEBUG is not set CONFIG_RT2500USB=m -# CONFIG_RT2500USB_DEBUG is not set CONFIG_RT73USB=m -# CONFIG_RT73USB_DEBUG is not set # CONFIG_RT2X00_DEBUG is not set CONFIG_ADM8211=m CONFIG_P54_COMMON=m @@ -1248,8 +1242,6 @@ CONFIG_AIRO_CS=m CONFIG_PCMCIA_ATMEL=m CONFIG_PCMCIA_WL3501=m -CONFIG_NET_WIRELESS=y -CONFIG_NET_WIRELESS_RTNETLINK=y CONFIG_HOSTAP=m CONFIG_HOSTAP_PCI=m From fedora-cvs-commits at redhat.com Tue May 1 00:44:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Apr 2007 20:44:07 -0400 Subject: rpms/kernel/devel linux-2.6-wireless.patch, NONE, 1.1 git-iwlwifi.patch, 1.4, 1.5 git-wireless-dev.patch, 1.7, 1.8 kernel-2.6.spec, 1.3120, 1.3121 Message-ID: <200705010044.l410i7xv005055@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4994 Modified Files: git-iwlwifi.patch git-wireless-dev.patch kernel-2.6.spec Added Files: linux-2.6-wireless.patch Log Message: wireless-dev and iwlwifi updates linux-2.6-wireless.patch: CREDITS | 6 Documentation/feature-removal-schedule.txt | 11 MAINTAINERS | 21 drivers/net/Makefile | 2 drivers/net/wireless/Kconfig | 120 - drivers/net/wireless/bcm43xx/Kconfig | 3 drivers/net/wireless/hostap/Kconfig | 3 drivers/net/wireless/zd1211rw/Kconfig | 3 include/linux/Kbuild | 1 include/linux/netdevice.h | 4 include/linux/nl80211.h | 38 include/net/cfg80211.h | 40 include/net/iw_handler.h | 21 include/net/wext.h | 24 include/net/wireless.h | 139 + net/Kconfig | 11 net/Makefile | 2 net/core/Makefile | 1 net/core/dev.c | 34 net/core/rtnetlink.c | 31 net/core/wireless.c | 2371 ----------------------------- net/ieee80211/Kconfig | 3 net/wireless/Kconfig | 16 net/wireless/Makefile | 4 net/wireless/core.c | 224 ++ net/wireless/core.h | 49 net/wireless/sysfs.c | 80 net/wireless/sysfs.h | 9 net/wireless/wext.c | 1509 ++++++++++++++++++ 29 files changed, 2234 insertions(+), 2546 deletions(-) --- NEW FILE linux-2.6-wireless.patch --- --- /dev/null 2007-04-17 21:17:54.747954992 -0400 +++ linux-2.6.21.noarch/include/net/wireless.h 2007-04-30 19:41:49.000000000 -0400 @@ -0,0 +1,139 @@ +#ifndef __NET_WIRELESS_H +#define __NET_WIRELESS_H + +/* + * 802.11 device management + * + * Copyright 2007 Johannes Berg + */ + +#include +#include +#include +#include + +/** + * struct wiphy - wireless hardware description + * @idx: the wiphy index assigned to this item + * @class_dev: the class device representing /sys/class/ieee80211/ + */ +struct wiphy { + /* assign these fields before you register the wiphy */ + + /* permanent MAC address */ + u8 perm_addr[ETH_ALEN]; + + /* If multiple wiphys are registered and you're handed e.g. + * a regular netdev with assigned ieee80211_ptr, you won't + * know whether it points to a wiphy your driver has registered + * or not. Assign this to something global to your driver to + * help determine whether you own this wiphy or not. */ + void *privid; + + /* fields below are read-only, assigned by cfg80211 */ + + /* the item in /sys/class/ieee80211/ points to this, + * you need use set_wiphy_dev() (see below) */ + struct device dev; + + /* dir in debugfs: ieee80211/ */ + struct dentry *debugfsdir; + + char priv[0] __attribute__((__aligned__(NETDEV_ALIGN))); +}; + +/** struct wireless_dev - wireless per-netdev state + * + * This structure must be allocated by the driver/stack + * that uses the ieee80211_ptr field in struct net_device + * (this is intentional so it can be allocated along with + * the netdev.) + * + * @wiphy: pointer to hardware description + */ +struct wireless_dev { + struct wiphy *wiphy; + + /* private to the generic wireless code */ + struct list_head list; + struct net_device *netdev; +}; + +/** + * wiphy_priv - return priv from wiphy + */ +static inline void *wiphy_priv(struct wiphy *wiphy) +{ + BUG_ON(!wiphy); + return &wiphy->priv; +} + +/** + * set_wiphy_dev - set device pointer for wiphy + */ +static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev) +{ + wiphy->dev.parent = dev; +} + +/** + * wiphy_dev - get wiphy dev pointer + */ +static inline struct device *wiphy_dev(struct wiphy *wiphy) +{ + return wiphy->dev.parent; +} + +/** + * wiphy_name - get wiphy name + */ +static inline char *wiphy_name(struct wiphy *wiphy) +{ + return wiphy->dev.bus_id; +} + +/** + * wdev_priv - return wiphy priv from wireless_dev + */ +static inline void *wdev_priv(struct wireless_dev *wdev) +{ + BUG_ON(!wdev); + return wiphy_priv(wdev->wiphy); +} + +/** + * wiphy_new - create a new wiphy for use with cfg80211 + * + * create a new wiphy and associate the given operations with it. + * @sizeof_priv bytes are allocated for private use. + * + * the returned pointer must be assigned to each netdev's + * ieee80211_ptr for proper operation. + */ +struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv); + +/** + * wiphy_register - register a wiphy with cfg80211 + * + * register the given wiphy + * + * Returns a non-negative wiphy index or a negative error code. + */ +extern int wiphy_register(struct wiphy *wiphy); + +/** + * wiphy_unregister - deregister a wiphy from cfg80211 + * + * unregister a device with the given priv pointer. + * After this call, no more requests can be made with this priv + * pointer, but the call may sleep to wait for an outstanding + * request that is being handled. + */ +extern void wiphy_unregister(struct wiphy *wiphy); + +/** + * wiphy_free - free wiphy + */ +extern void wiphy_free(struct wiphy *wiphy); + +#endif /* __NET_WIRELESS_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 +++ linux-2.6.21.noarch/include/net/cfg80211.h 2007-04-30 19:44:47.000000000 -0400 @@ -0,0 +1,40 @@ +#ifndef __NET_CFG80211_H +#define __NET_CFG80211_H + +#include +#include +#include + +/* + * 802.11 configuration in-kernel interface + * + * Copyright 2006 Johannes Berg + */ + +/* from net/wireless.h */ +struct wiphy; + +/** + * struct cfg80211_ops - backend description for wireless configuration + * + * This struct is registered by fullmac card drivers and/or wireless stacks + * in order to handle configuration requests on their interfaces. + * + * All callbacks except where otherwise noted should return 0 + * on success or a negative error code. + * + * All operations are currently invoked under rtnl for consistency with the + * wireless extensions but this is subject to reevaluation as soon as this + * code is used more widely and we have a first user without wext. + * + * @add_virtual_intf: create a new virtual interface with the given name + * + * @del_virtual_intf: remove the virtual interface determined by ifindex. + */ +struct cfg80211_ops { + int (*add_virtual_intf)(struct wiphy *wiphy, char *name, + unsigned int type); + int (*del_virtual_intf)(struct wiphy *wiphy, int ifindex); +}; + +#endif /* __NET_CFG80211_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 +++ linux-2.6.21.noarch/include/net/wext.h 2007-04-30 19:45:37.000000000 -0400 @@ -0,0 +1,24 @@ +#ifndef __NET_WEXT_H +#define __NET_WEXT_H + +/* + * wireless extensions interface to the core code + */ + +#ifdef CONFIG_WIRELESS_EXT +extern int wext_proc_init(void); +extern int wext_handle_ioctl(struct ifreq *ifr, unsigned int cmd, + void __user *arg); [...4833 lines suppressed...] + +/*------------------------------------------------------------------*/ +/* + * Standard Wireless Handler : get Spy List + */ +int iw_handler_get_spy(struct net_device * dev, + struct iw_request_info * info, + union iwreq_data * wrqu, + char * extra) +{ + struct iw_spy_data * spydata = get_spydata(dev); + struct sockaddr * address = (struct sockaddr *) extra; + int i; + + /* Make sure driver is not buggy or using the old API */ + if (!spydata) + return -EOPNOTSUPP; + + wrqu->data.length = spydata->spy_number; + + /* Copy addresses. */ + for (i = 0; i < spydata->spy_number; i++) { + memcpy(address[i].sa_data, spydata->spy_address[i], ETH_ALEN); + address[i].sa_family = AF_UNIX; + } + /* Copy stats to the user buffer (just after). */ + if (spydata->spy_number > 0) + memcpy(extra + (sizeof(struct sockaddr) *spydata->spy_number), + spydata->spy_stat, + sizeof(struct iw_quality) * spydata->spy_number); + /* Reset updated flags. */ + for (i = 0; i < spydata->spy_number; i++) + spydata->spy_stat[i].updated &= ~IW_QUAL_ALL_UPDATED; + return 0; +} +EXPORT_SYMBOL(iw_handler_get_spy); + +/*------------------------------------------------------------------*/ +/* + * Standard Wireless Handler : set spy threshold + */ +int iw_handler_set_thrspy(struct net_device * dev, + struct iw_request_info *info, + union iwreq_data * wrqu, + char * extra) +{ + struct iw_spy_data * spydata = get_spydata(dev); + struct iw_thrspy * threshold = (struct iw_thrspy *) extra; + + /* Make sure driver is not buggy or using the old API */ + if (!spydata) + return -EOPNOTSUPP; + + /* Just do it */ + memcpy(&(spydata->spy_thr_low), &(threshold->low), + 2 * sizeof(struct iw_quality)); + + /* Clear flag */ + memset(spydata->spy_thr_under, '\0', sizeof(spydata->spy_thr_under)); + + return 0; +} +EXPORT_SYMBOL(iw_handler_set_thrspy); + +/*------------------------------------------------------------------*/ +/* + * Standard Wireless Handler : get spy threshold + */ +int iw_handler_get_thrspy(struct net_device * dev, + struct iw_request_info *info, + union iwreq_data * wrqu, + char * extra) +{ + struct iw_spy_data * spydata = get_spydata(dev); + struct iw_thrspy * threshold = (struct iw_thrspy *) extra; + + /* Make sure driver is not buggy or using the old API */ + if (!spydata) + return -EOPNOTSUPP; + + /* Just do it */ + memcpy(&(threshold->low), &(spydata->spy_thr_low), + 2 * sizeof(struct iw_quality)); + + return 0; +} +EXPORT_SYMBOL(iw_handler_get_thrspy); + +/*------------------------------------------------------------------*/ +/* + * Prepare and send a Spy Threshold event + */ +static void iw_send_thrspy_event(struct net_device * dev, + struct iw_spy_data * spydata, + unsigned char * address, + struct iw_quality * wstats) +{ + union iwreq_data wrqu; + struct iw_thrspy threshold; + + /* Init */ + wrqu.data.length = 1; + wrqu.data.flags = 0; + /* Copy address */ + memcpy(threshold.addr.sa_data, address, ETH_ALEN); + threshold.addr.sa_family = ARPHRD_ETHER; + /* Copy stats */ + memcpy(&(threshold.qual), wstats, sizeof(struct iw_quality)); + /* Copy also thresholds */ + memcpy(&(threshold.low), &(spydata->spy_thr_low), + 2 * sizeof(struct iw_quality)); + + /* Send event to user space */ + wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold); +} + +/* ---------------------------------------------------------------- */ +/* + * Call for the driver to update the spy data. + * For now, the spy data is a simple array. As the size of the array is + * small, this is good enough. If we wanted to support larger number of + * spy addresses, we should use something more efficient... + */ +void wireless_spy_update(struct net_device * dev, + unsigned char * address, + struct iw_quality * wstats) +{ + struct iw_spy_data * spydata = get_spydata(dev); + int i; + int match = -1; + + /* Make sure driver is not buggy or using the old API */ + if (!spydata) + return; + + /* Update all records that match */ + for (i = 0; i < spydata->spy_number; i++) + if (!compare_ether_addr(address, spydata->spy_address[i])) { + memcpy(&(spydata->spy_stat[i]), wstats, + sizeof(struct iw_quality)); + match = i; + } + + /* Generate an event if we cross the spy threshold. + * To avoid event storms, we have a simple hysteresis : we generate + * event only when we go under the low threshold or above the + * high threshold. */ + if (match >= 0) { + if (spydata->spy_thr_under[match]) { + if (wstats->level > spydata->spy_thr_high.level) { + spydata->spy_thr_under[match] = 0; + iw_send_thrspy_event(dev, spydata, + address, wstats); + } + } else { + if (wstats->level < spydata->spy_thr_low.level) { + spydata->spy_thr_under[match] = 1; + iw_send_thrspy_event(dev, spydata, + address, wstats); + } + } + } +} +EXPORT_SYMBOL(wireless_spy_update); --- linux-2.6.21.noarch/net/Kconfig.orig 2007-04-30 19:29:14.000000000 -0400 +++ linux-2.6.21.noarch/net/Kconfig 2007-04-30 19:41:49.000000000 -0400 @@ -219,14 +219,17 @@ endmenu source "net/ax25/Kconfig" source "net/irda/Kconfig" source "net/bluetooth/Kconfig" -source "net/ieee80211/Kconfig" - -config WIRELESS_EXT - bool config FIB_RULES bool +menu "Wireless" + +source "net/wireless/Kconfig" +source "net/ieee80211/Kconfig" + +endmenu + endif # if NET endmenu # Networking --- linux-2.6.21.noarch/net/ieee80211/Kconfig.orig 2007-04-30 19:29:14.000000000 -0400 +++ linux-2.6.21.noarch/net/ieee80211/Kconfig 2007-04-30 19:41:49.000000000 -0400 @@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP config IEEE80211_CRYPT_TKIP tristate "IEEE 802.11i TKIP encryption" - depends on IEEE80211 && NET_RADIO + depends on IEEE80211 + select WIRELESS_EXT select CRYPTO select CRYPTO_MICHAEL_MIC select CRYPTO_ECB git-iwlwifi.patch: Kconfig | 1 Makefile | 1 iwlwifi/Kconfig | 52 iwlwifi/Makefile | 2 iwlwifi/base.c |12347 ++++++++++++++++++++++++++++++++++++++++++++++++++ iwlwifi/iwl-3945-rs.c | 962 +++ iwlwifi/iwl-3945-rs.h | 89 iwlwifi/iwlwifi.h | 1296 +++++ iwlwifi/iwlwifi_hw.h | 1973 +++++++ 9 files changed, 16723 insertions(+) Index: git-iwlwifi.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- git-iwlwifi.patch 27 Apr 2007 19:16:57 -0000 1.4 +++ git-iwlwifi.patch 1 May 2007 00:44:04 -0000 1.5 @@ -1,10 +1,10 @@ rsync://www.intellinuxwireless.org/repos/iwlwifi.git -commit 440a9ee592a409e926f77633ce41ccad7be6c429 +commit db63be081b46f80a784cb0a1ae67a074d92aabf8 ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-04-27 14:33:00.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-27 14:33:42.000000000 -0400 -@@ -0,0 +1,12363 @@ +--- /dev/null 2007-04-17 21:17:54.747954992 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-30 20:21:52.000000000 -0400 +@@ -0,0 +1,12347 @@ +/****************************************************************************** + + Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. @@ -113,7 +113,7 @@ + +#include "iwlwifi.h" + -+#define IWLWIFI_VERSION "0.0.14k" ++#define IWLWIFI_VERSION "0.0.15k" + +#define DRV_DESCRIPTION "Intel(R) Wireless Link driver for Linux" +#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" @@ -1685,7 +1685,7 @@ + if (ipw_is_associated(priv)) + add_time = ipw_usecs_to_beacons( + params->start_time - priv->last_tsf, -+ priv->rxon_timing.beaconInterval); ++ priv->rxon_timing.beacon_interval); + + memset(&spectrum, 0, sizeof(spectrum)); + @@ -1700,7 +1700,7 @@ + spectrum.start_time = + ipw_add_beacon_time(priv->last_beacon_time, + add_time, -+ priv->rxon_timing.beaconInterval); ++ priv->rxon_timing.beacon_interval); + else + spectrum.start_time = params->start_time; + @@ -3773,7 +3773,7 @@ +{ + const struct ipw_eeprom_txpower_group *chnl_grp = NULL; + s32 index0, index1; -+ s32 rPower = 2 * requested_power; ++ s32 power = 2 * requested_power; + s32 i; + const struct ipw_eeprom_txpower_sample *samples; + s32 gains0, gains1; @@ -3783,19 +3783,19 @@ + chnl_grp = &priv->eeprom.groups[setting_index]; + samples = chnl_grp->samples; + for (i = 0; i < 5; i++) { -+ if (rPower == samples[i].power) { ++ if (power == samples[i].power) { + *new_index = samples[i].gain_index; + return 0; + } + } + -+ if (rPower > samples[1].power) { ++ if (power > samples[1].power) { + index0 = 0; + index1 = 1; -+ } else if (rPower > samples[2].power) { ++ } else if (power > samples[2].power) { + index0 = 1; + index1 = 2; -+ } else if (rPower > samples[3].power) { ++ } else if (power > samples[3].power) { + index0 = 2; + index1 = 3; + } else { @@ -3809,7 +3809,7 @@ + gains0 = (s32) samples[index0].gain_index * (1 << 19); + gains1 = (s32) samples[index1].gain_index * (1 << 19); + res = gains0 + (gains1 - gains0) * -+ ((s32) rPower - (s32) samples[index0].power) / denominator + ++ ((s32) power - (s32) samples[index0].power) / denominator + + (1 << 18); + *new_index = res >> 19; + return 0; @@ -4034,10 +4034,10 @@ +{ + struct ipw_bt_cmd bt_cmd = { + .flags = 3, -+ .leadTime = 0xAA, -+ .maxKill = 1, -+ .killAckMask = 0, -+ .killCTSMask = 0, ++ .lead_time = 0xAA, ++ .max_kill = 1, ++ .kill_ack_mask = 0, ++ .kill_cts_mask = 0, + }; + + return ipw_send_cmd_pdu(priv, REPLY_BT_CONFIG, @@ -4221,7 +4221,7 @@ + priv->rxon_timing.timestamp.dw[1] = priv->timestamp1; + priv->rxon_timing.timestamp.dw[0] = priv->timestamp0; + -+ priv->rxon_timing.listenInterval = INTEL_CONN_LISTEN_INTERVAL; ++ priv->rxon_timing.listen_interval = INTEL_CONN_LISTEN_INTERVAL; + + tsf = priv->timestamp1; + tsf = ((tsf << 32) | priv->timestamp0); @@ -4230,35 +4230,35 @@ + + if (priv->iw_mode == IEEE80211_IF_TYPE_STA) { + if (conf->beacon_int == 0) { -+ priv->rxon_timing.beaconInterval = 100; -+ priv->rxon_timing.beaconTimerInitVal = 102400; ++ priv->rxon_timing.beacon_interval = 100; ++ priv->rxon_timing.beacon_init_val = 102400; + } else { -+ priv->rxon_timing.beaconInterval = conf->beacon_int; -+ priv->rxon_timing.beaconInterval = ++ priv->rxon_timing.beacon_interval = conf->beacon_int; ++ priv->rxon_timing.beacon_interval = + ipw_adjust_beacon_interval(priv-> + rxon_timing. -+ beaconInterval); ++ beacon_interval); + } + -+ priv->rxon_timing.atimWindow = 0; ++ priv->rxon_timing.atim_window = 0; + } else { -+ priv->rxon_timing.beaconInterval = ++ priv->rxon_timing.beacon_interval = + ipw_adjust_beacon_interval(conf->beacon_int); + /*MAC80211 we need to get atim_window from upper stack + for now we set to 0 TODO */ -+ priv->rxon_timing.atimWindow = 0; ++ priv->rxon_timing.atim_window = 0; + } + -+ interval_tm_unit = (priv->rxon_timing.beaconInterval * 1024); ++ interval_tm_unit = (priv->rxon_timing.beacon_interval * 1024); + result = do_div(tsf, interval_tm_unit); -+ priv->rxon_timing.beaconTimerInitVal = ++ priv->rxon_timing.beacon_init_val = + (u32) ((u64) interval_tm_unit - result); + + IPW_DEBUG_ASSOC + ("beacon interval %d beacon timer %d beacon tim %d\n", -+ priv->rxon_timing.beaconInterval, -+ priv->rxon_timing.beaconTimerInitVal, -+ priv->rxon_timing.atimWindow); ++ priv->rxon_timing.beacon_interval, ++ priv->rxon_timing.beacon_init_val, ++ priv->rxon_timing.atim_window); + return rc; +} +#endif @@ -4295,41 +4295,6 @@ +#define IEEE80211_ERP_USE_PROTECTION (0x02) +#define IEEE80211_ERP_BARKER_PREAMBLE_MODE (0x04) + -+union ht_cap_info { -+ struct { -+ u16 advancedCodingCapability:1; -+ u16 supportedChannelWidthSet:1; -+ u16 mimoPowerSaveMode:2; -+ u16 greenField:1; -+ u16 shortGI20:1; -+ u16 shortGI40:1; -+ u16 TxStbc:1; -+ u16 RxStbc:1; -+ u16 beamForming:1; -+ u16 delayedBA:1; -+ u16 maximalAMsduSize:1; -+ u16 cckModeAt40MHz:1; -+ u16 psmpSupport:1; -+ u16 stbcControlFrameSupport:1; -+ u16 lSigTxOpProtectionSupport:1; -+ }; -+ u16 val; -+} __attribute__ ((packed)); -+ -+union ht_param_info { -+ struct { -+ u8 maxRxAMpduFactor:2; -+ u8 mpduDensity:3; -+ u8 reserved:3; -+ }; -+ u8 val; -+} __attribute__ ((packed)); -+ -+#define CFG_HT_RX_AMPDU_FACTOR_DEF (0x3) -+#define HT_IE_MAX_AMSDU_SIZE_4K (0) -+#define CFG_HT_MPDU_DENSITY_2USEC (0x5) -+#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_2USEC -+ +/* + fill in all required fields and ie for probe request frame +*/ @@ -5264,7 +5229,7 @@ + rxb = list_entry(element, struct ipw_rx_mem_buffer, list); + rxb->skb = + alloc_skb(priv->hw_setting.rx_buffer_size, -+ GFP_DMA | __GFP_NOWARN | GFP_ATOMIC); ++ __GFP_NOWARN | GFP_ATOMIC); + if (!rxb->skb) { + printk(KERN_CRIT + "%s: Can not allocate SKB buffers.\n", @@ -6515,8 +6480,8 @@ + priv->stations[i].current_rate.s.rate = R_1M; + memset(&priv->stations[i].sta, 0, sizeof(struct ipw_addsta_cmd)); + memcpy(priv->stations[i].sta.sta.MACAddr, bssid, ETH_ALEN); -+ priv->stations[i].sta.ctrlAddModify = 0; -+ priv->stations[i].sta.sta.staID = i; ++ priv->stations[i].sta.control = 0; ++ priv->stations[i].sta.sta.sta_id = i; + priv->stations[i].sta.station_flags = 0; + + //todoG do we need this @@ -6584,7 +6549,7 @@ + STA_CONTROL_MODIFY_MSK; + priv->stations[sta_id].sta.tx_rate.rate_n_flags = tx_rate; + priv->stations[sta_id].current_rate.rate_n_flags = tx_rate; -+ priv->stations[sta_id].sta.ctrlAddModify = ++ priv->stations[sta_id].sta.control = + STA_CONTROL_MODIFY_MSK; + + spin_unlock_irqrestore(&priv->sta_lock, flags_spin); @@ -8700,9 +8665,9 @@ + } + + case REPLY_ERROR:{ -+ u32 err_type = pkt->u.err_resp.enumErrorType; -+ u8 cmd_id = pkt->u.err_resp.currentCmdID; -+ u16 seq = pkt->u.err_resp.erroneousCmdSeqNum; ++ u32 err_type = pkt->u.err_resp.error_type; ++ u8 cmd_id = pkt->u.err_resp.cmd_id; ++ u16 seq = pkt->u.err_resp.bad_cmd_seq_num; + u32 info = pkt->u.err_resp.error_info; + IPW_ERROR("Error Reply type 0x%08X " + "cmd %s (0x%02X) " @@ -8783,17 +8748,17 @@ + break; + + case BEACON_NOTIFICATION:{ -+ struct BeaconNtfSpecifics *beacon = ++ struct beacon_notif_specifics *beacon = + &(pkt->u.beacon_status); + IPW_DEBUG_INFO + ("beacon status %x retries %d iss %d " + "tsf %d %d rate %d\n", -+ beacon->bconNotifHdr.status, -+ beacon->bconNotifHdr. ++ beacon->beacon_notif_hdr.status, ++ beacon->beacon_notif_hdr. + failure_frame, -+ beacon->ibssMgrStatus, -+ beacon->highTSF, beacon->lowTSF, -+ beacon->bconNotifHdr.rate); ++ beacon->ibss_mgr_status, ++ beacon->high_tsf, beacon->low_tsf, ++ beacon->beacon_notif_hdr.rate); + + } + break; @@ -9245,6 +9210,14 @@ + return 0; +} + ++static inline u16* ieee80211_get_qos_ctrl(struct ieee80211_hdr *hdr) ++{ ++ int hdr_len=ieee80211_get_hdrlen(hdr->frame_control); ++ if (hdr_len == 26) ++ return (u16 *)((u8 *) hdr + (hdr_len) - QOS_CONTROL_LEN); ++ return NULL; ++} ++ +/* + handle build REPLY_TX command notification. +*/ @@ -9256,6 +9229,7 @@ +{ + u32 tx_flags; + u16 fc = le16_to_cpu(hdr->frame_control); ++ u16 *qc; + + tx_flags = cmd->cmd.tx.tx_flags; + @@ -9282,14 +9256,12 @@ + cmd->cmd.tx.sta_id = std_id; + if (ieee80211_get_morefrag(hdr)) + tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK; -+ if (ieee80211_get_hdrlen(fc) == 26) { -+ u16 *qc = (u16 *)((u8 *)hdr + -+ (ieee80211_get_hdrlen(fc) - -+ QOS_CONTROL_LEN)); -+ cmd->cmd.tx.tid_tspec = (u8)(*qc & 0xF); -+ } else ++ qc = ieee80211_get_qos_ctrl(hdr); ++ if (qc) ++ cmd->cmd.tx.tid_tspec = (u8)(*qc & 0xf); ++ else + tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK; -+ ++ + if (ctrl->flags & IEEE80211_TXCTL_USE_RTS_CTS) { + tx_flags |= TX_CMD_FLG_RTS_MSK; + tx_flags &= ~TX_CMD_FLG_CTS_MSK; @@ -9429,7 +9401,6 @@ + return IPW3945_BROADCAST_ID; +} + -+ +/* + start REPLY_TX command process +*/ @@ -9448,9 +9419,10 @@ + u8 id, hdr_len, unicast; + u8 sta_id; + u16 seq_number = 0; -+ int rc; + u16 fc; + int len_org = 0, wait_write_ptr = 0; ++ u16 *qc; ++ int rc; + + if (priv->status & STATUS_RF_KILL_MASK) + goto drop; @@ -9473,12 +9445,15 @@ + + IPW_DEBUG_RATE("station Id %d\n", sta_id); + -+ if (ieee80211_get_hdrlen(fc) == 26) { -+ seq_number = priv->stations[sta_id].tid[tx_id].seq_number; ++ qc = ieee80211_get_qos_ctrl(hdr); ++ if (qc) { ++ u8 tid = (u8)(*qc * 0xf); ++ seq_number = priv->stations[sta_id].tid[tid].seq_number; + if (!(ieee80211_get_morefrag(hdr))) -+ priv->stations[sta_id].tid[tx_id].seq_number += 0x10; -+ if (WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) -+ hdr->seq_ctrl |= cpu_to_le16(seq_number); ++ priv->stations[sta_id].tid[tid].seq_number += 0x10; ++ ++ hdr->seq_ctrl = cpu_to_le16(seq_number) | ++ (hdr->seq_ctrl & 0xf); + } + + tfd = (u8 *) (&txq->bd[q->first_empty * q->element_size]); @@ -9517,10 +9492,15 @@ + if (ctl->key_idx != -1) + ipw_build_tx_cmd_hwcrypto(priv, ctl, out_cmd, skb, 0); + -+ phys_addr = pci_map_single(priv->pci_dev, skb->data + hdr_len, -+ skb->len - hdr_len, PCI_DMA_TODEVICE); + len = skb->len - hdr_len; -+ attach_buffer_to_tfd_frame(priv, tfd, phys_addr, len); ++ ++ /* 802.11 null functions have no payload... */ ++ if (len) { ++ phys_addr = pci_map_single(priv->pci_dev, skb->data + hdr_len, ++ skb->len - hdr_len, ++ PCI_DMA_TODEVICE); ++ attach_buffer_to_tfd_frame(priv, tfd, phys_addr, len); ++ } + + out_cmd->cmd.tx.len = skb->len; + if (priv->is_3945) @@ -9991,24 +9971,24 @@ + } else { + max_sleep = + (cmd-> -+ SleepInterval[PMC_TCMD_SLEEP_INTRVL_TABLE_SIZE - ++ sleep_interval[PMC_TCMD_SLEEP_INTRVL_TABLE_SIZE - + 1] / period) * period; + cmd->flags |= PMC_TCMD_FLAG_SLEEP_OVER_DTIM_MSK; + } + + for (i = 0; i < PMC_TCMD_SLEEP_INTRVL_TABLE_SIZE; i++) { -+ if (cmd->SleepInterval[i] > max_sleep) -+ cmd->SleepInterval[i] = max_sleep; ++ if (cmd->sleep_interval[i] > max_sleep) ++ cmd->sleep_interval[i] = max_sleep; + } + + IPW_DEBUG_POWER("Flags value = 0x%08X\n", cmd->flags); -+ IPW_DEBUG_POWER("Tx timeout = %u\n", cmd->TxDataTimeout); -+ IPW_DEBUG_POWER("Rx timeout = %u\n", cmd->RxDataTimeout); ++ IPW_DEBUG_POWER("Tx timeout = %u\n", cmd->tx_data_timeout); ++ IPW_DEBUG_POWER("Rx timeout = %u\n", cmd->rx_data_timeout); + IPW_DEBUG_POWER + ("Sleep interval vector = { %d , %d , %d , %d , %d }\n", -+ cmd->SleepInterval[0], cmd->SleepInterval[1], -+ cmd->SleepInterval[2], cmd->SleepInterval[3], -+ cmd->SleepInterval[4]); ++ cmd->sleep_interval[0], cmd->sleep_interval[1], ++ cmd->sleep_interval[2], cmd->sleep_interval[3], ++ cmd->sleep_interval[4]); + + return rc; +} @@ -10895,7 +10875,7 @@ + keyconf->keylen); + priv->stations[sta_id].sta.key.key_flags = key_flags; + priv->stations[sta_id].sta.sta.modify_mask |= STA_MODIFY_KEY_MASK; -+ priv->stations[sta_id].sta.ctrlAddModify |= STA_CONTROL_MODIFY_MSK; ++ priv->stations[sta_id].sta.control |= STA_CONTROL_MODIFY_MSK; + + spin_unlock_irqrestore(&priv->sta_lock, flags); + @@ -11683,6 +11663,10 @@ + + priv->status |= STATUS_EXIT_PENDING; + ++ /* prevent ipw_down from queuing priv->up ++ * when we are in fw error */ ++ priv->status &= ~STATUS_FW_ERROR; ++ + ipw_down(priv); + + mutex_unlock(&priv->mutex); @@ -11901,7 +11885,7 @@ + +static int ipw3945_stop_tx_queue(struct ipw_priv *priv) +{ -+ int queueId; ++ int id; + int rc; + unsigned long flags; + @@ -11916,11 +11900,11 @@ + ipw_write_restricted_reg(priv, SCD_MODE_REG, 0); + + /* reset TFD queues */ -+ for (queueId = TFD_QUEUE_MIN; queueId < TFD_QUEUE_MAX; queueId++) { -+ ipw_write_restricted(priv, FH_TCSR_CONFIG(queueId), 0x0); ++ for (id = TFD_QUEUE_MIN; id < TFD_QUEUE_MAX; id++) { ++ ipw_write_restricted(priv, FH_TCSR_CONFIG(id), 0x0); + ipw_poll_restricted_bit(priv, FH_TSSR_TX_STATUS, + ALM_FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE -+ (queueId), 1000); ++ (id), 1000); + } + + ipw_release_restricted_access(priv); @@ -12368,13 +12352,13 @@ + + return 0; +} ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile.orig 2007-04-27 14:33:00.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile 2007-04-27 14:33:25.000000000 -0400 +--- /dev/null 2007-04-17 21:17:54.747954992 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile 2007-04-30 20:19:23.000000000 -0400 @@ -0,0 +1,2 @@ +iwlwifi-objs := base.o +obj-$(CONFIG_IWLWIFI) += iwlwifi.o ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-04-27 14:33:00.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-04-27 14:33:42.000000000 -0400 +--- /dev/null 2007-04-17 21:17:54.747954992 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-04-30 20:21:52.000000000 -0400 @@ -0,0 +1,1296 @@ +/****************************************************************************** + @@ -13672,8 +13656,8 @@ +#define IPW3945_RX_BUF_SIZE 3000 + +#endif /* __iwlwifi_h__ */ ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig.orig 2007-04-27 14:33:00.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig 2007-04-27 14:33:25.000000000 -0400 +--- /dev/null 2007-04-17 21:17:54.747954992 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig 2007-04-30 20:19:23.000000000 -0400 @@ -0,0 +1,52 @@ +config IWLWIFI + tristate "Intel PRO/Wireless 3945ABG Network Connection adapter" @@ -13727,8 +13711,8 @@ + If this is your first time using this driver, you should say Y here + as the debug information can assist others in helping you resolve + any problems you may encounter. ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.h.orig 2007-04-27 14:33:50.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.h 2007-04-27 14:33:42.000000000 -0400 +--- /dev/null 2007-04-17 21:17:54.747954992 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.h 2007-04-30 20:21:52.000000000 -0400 @@ -0,0 +1,89 @@ +#ifndef __iwl_3945_rs_h__ +#define __iwl_3945_rs_h__ @@ -13819,8 +13803,8 @@ +static int ipw_rate_scale_rxon_handle(struct ipw_priv *priv, s32 sta_id); + +#endif ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h.orig 2007-04-27 14:33:00.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h 2007-04-27 14:33:42.000000000 -0400 +--- /dev/null 2007-04-17 21:17:54.747954992 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h 2007-04-30 20:21:52.000000000 -0400 @@ -0,0 +1,1973 @@ +/****************************************************************************** + @@ -13963,10 +13947,10 @@ + */ + +struct ipw_error_resp { -+ u32 enumErrorType; //7:4 -+ u8 currentCmdID; //8 ++ u32 error_type; //7:4 ++ u8 cmd_id; //8 + u8 reserved1; //9 -+ u16 erroneousCmdSeqNum; //11:10 ++ u16 bad_cmd_seq_num; //11:10 + u16 reserved2; //13:12 + u32 error_info; //17:14 + union tsf timestamp; //all TSF //25:18 @@ -14101,10 +14085,10 @@ + */ +struct ipw_rxon_time_cmd { + union tsf timestamp; // all TSF //11:4 -+ u16 beaconInterval; //13:12 -+ u16 atimWindow; //15:14 -+ u32 beaconTimerInitVal; //19:16 -+ u16 listenInterval; //21:20 ++ u16 beacon_interval; //13:12 ++ u16 atim_window; //15:14 ++ u32 beacon_init_val; //19:16 ++ u16 listen_interval; //21:20 + u16 reserved; //23:22 +} __attribute__ ((packed)); + @@ -14190,13 +14174,13 @@ +struct sta_id_modify { + u8 MACAddr[ETH_ALEN]; + u16 reserved1; -+ u8 staID; ++ u8 sta_id; + u8 modify_mask; + u16 reserved2; +} __attribute__ ((packed)); + +struct ipw_addsta_cmd { -+ u8 ctrlAddModify; ++ u8 control; + u8 reserved[3]; + struct sta_id_modify sta; + struct ipw_keyinfo key; @@ -14707,11 +14691,11 @@ +// Command Notification and Response Headers are Covered by the + +// Beacon Notification -+struct BeaconNtfSpecifics { -+ struct ipw_tx_resp bconNotifHdr; //15:4 -+ u32 lowTSF; //19:16 -+ u32 highTSF; //23:20 -+ u32 ibssMgrStatus; //27:24 ++struct beacon_notif_specifics { ++ struct ipw_tx_resp beacon_notif_hdr; //15:4 ++ u32 low_tsf; //19:16 ++ u32 high_tsf; //23:20 ++ u32 ibss_mgr_status; //27:24 +} __attribute__ ((packed)); + +// TxBeacon Command @@ -14852,7 +14836,7 @@ + * '01' force Mac sleep + * '10' force xtal sleep + * '11' Illegal set -+ * NOTE: if SleepInterval[SLEEP_INTRVL_TABLE_SIZE-1] > DTIM period then ++ * NOTE: if sleep_interval[SLEEP_INTRVL_TABLE_SIZE-1] > DTIM period then + * ucode assume sleep over DTIM is allowed and we don't need to wakeup + * for every DTIM. + */ @@ -14863,9 +14847,9 @@ + +struct ipw_powertable_cmd { + u32 flags; -+ u32 RxDataTimeout; -+ u32 TxDataTimeout; -+ u32 SleepInterval[PMC_TCMD_SLEEP_INTRVL_TABLE_SIZE]; ++ u32 rx_data_timeout; ++ u32 tx_data_timeout; ++ u32 sleep_interval[PMC_TCMD_SLEEP_INTRVL_TABLE_SIZE]; +} __attribute__ ((packed)); + +struct ipw_sleep_notification { @@ -14893,11 +14877,11 @@ + +struct ipw_bt_cmd { + u8 flags; -+ u8 leadTime; -+ u8 maxKill; ++ u8 lead_time; ++ u8 max_kill; + u8 reserved; -+ u32 killAckMask; -+ u32 killCTSMask; ++ u32 kill_ack_mask; ++ u32 kill_cts_mask; +} __attribute__ ((packed)); + +struct rx_phy_statistics { @@ -15724,7 +15708,7 @@ + struct ipw_error_resp err_resp; + struct ipw_card_state_notif card_state_notif; + struct ipw_notif_statistics stats; -+ struct BeaconNtfSpecifics beacon_status; ++ struct beacon_notif_specifics beacon_status; + struct ipw_add_sta_resp add_sta; + struct ipw_sleep_notification sleep_notif; + struct ipw_spectrum_resp spectrum; @@ -15795,8 +15779,8 @@ +#define IPW_RX_BUF_SIZE 3000 + +#endif /* __iwlwifi_hw_h__ */ ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.c.orig 2007-04-27 14:33:48.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.c 2007-04-27 14:33:42.000000000 -0400 +--- /dev/null 2007-04-17 21:17:54.747954992 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.c 2007-04-30 20:21:52.000000000 -0400 @@ -0,0 +1,962 @@ +/*************** RATE-SCALING functions ***********************/ + @@ -16760,15 +16744,15 @@ + priv->rate_control.alloc_sta = rs_alloc_sta; + priv->rate_control.free_sta = rs_free_sta; +} ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-04-27 14:33:00.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile 2007-04-27 14:33:25.000000000 -0400 +--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-04-30 20:16:33.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/Makefile 2007-04-30 20:19:23.000000000 -0400 @@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211) += adm8211/ obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/ obj-$(CONFIG_RTL818X) += rtl818x/ +obj-$(CONFIG_IWLWIFI) += iwlwifi/ ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-04-27 14:33:00.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig 2007-04-27 14:33:25.000000000 -0400 +--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-04-30 20:16:33.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/Kconfig 2007-04-30 20:19:23.000000000 -0400 @@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad source "drivers/net/wireless/mac80211/p54/Kconfig" source "drivers/net/wireless/mac80211/zd1211rw/Kconfig" git-wireless-dev.patch: .mailmap | 1 CREDITS | 31 MAINTAINERS | 49 drivers/Kconfig | 2 drivers/Makefile | 1 drivers/misc/Kconfig | 6 drivers/misc/Makefile | 1 drivers/misc/eeprom_93cx6.c | 347 + drivers/net/wireless/Kconfig | 2 drivers/net/wireless/Makefile | 3 drivers/net/wireless/bcm43xx/Kconfig | 1 drivers/net/wireless/mac80211/Kconfig | 6 drivers/net/wireless/mac80211/Makefile | 6 drivers/net/wireless/mac80211/README | 2 drivers/net/wireless/mac80211/adm8211/Kconfig | 25 drivers/net/wireless/mac80211/adm8211/Makefile | 1 drivers/net/wireless/mac80211/adm8211/adm8211.c | 2172 ++++++ drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 + drivers/net/wireless/mac80211/bcm43xx/Kconfig | 101 drivers/net/wireless/mac80211/bcm43xx/Makefile | 18 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 885 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1383 ++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1110 +++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 92 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 4029 ++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4286 +++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 309 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 603 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 250 drivers/net/wireless/mac80211/p54/Kconfig | 10 drivers/net/wireless/mac80211/p54/Makefile | 4 drivers/net/wireless/mac80211/p54/net2280.h | 452 + drivers/net/wireless/mac80211/p54/prism54.h | 77 drivers/net/wireless/mac80211/p54/prism54common.c | 821 ++ drivers/net/wireless/mac80211/p54/prism54common.h | 328 + drivers/net/wireless/mac80211/p54/prism54magic.h | 77 drivers/net/wireless/mac80211/p54/prism54pci.c | 700 ++ drivers/net/wireless/mac80211/p54/prism54pci.h | 106 drivers/net/wireless/mac80211/p54/prism54usb.c | 946 ++ drivers/net/wireless/mac80211/p54/prism54usb.h | 133 drivers/net/wireless/mac80211/rt2x00/Kconfig | 99 drivers/net/wireless/mac80211/rt2x00/Makefile | 14 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 1769 +++++ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 918 ++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 1951 ++++++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1185 +++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 1729 +++++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 738 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1057 +++ drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c | 353 + drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h | 72 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c | 831 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h | 128 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c | 426 + drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c | 587 + drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 83 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c | 637 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 120 drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 2332 +++++++ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1348 ++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 1966 ++++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 937 ++ drivers/net/wireless/mac80211/rtl818x/Kconfig | 9 drivers/net/wireless/mac80211/rtl818x/Makefile | 2 drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 726 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 747 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 30 drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 180 drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19 drivers/net/wireless/mac80211/zd1211rw/Makefile | 11 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1679 +++++ drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 910 ++ drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 700 ++ drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 250 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 170 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 80 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 436 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 491 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1337 ++++ drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 241 drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82 drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29 drivers/net/wireless/zd1211rw/Kconfig | 1 drivers/ssb/Kconfig | 93 drivers/ssb/Makefile | 11 drivers/ssb/driver_chipcommon.c | 402 + drivers/ssb/driver_mipscore.c | 258 drivers/ssb/driver_pcicore.c | 556 + drivers/ssb/main.c | 1047 +++ drivers/ssb/pci.c | 672 ++ drivers/ssb/pcihost_wrapper.c | 104 drivers/ssb/pcmcia.c | 256 drivers/ssb/scan.c | 407 + drivers/ssb/ssb_private.h | 151 drivers/usb/host/Kconfig | 13 drivers/usb/host/ohci-hcd.c | 21 drivers/usb/host/ohci-ssb.c | 254 include/linux/crc-itu-t.h | 27 include/linux/eeprom_93cx6.h | 77 include/linux/ieee80211.h | 403 + include/linux/nl80211.h | 263 include/linux/ssb/ssb.h | 403 + include/linux/ssb/ssb_driver_chipcommon.h | 387 + include/linux/ssb/ssb_driver_extif.h | 163 include/linux/ssb/ssb_driver_mips.h | 47 include/linux/ssb/ssb_driver_pci.h | 108 include/linux/ssb/ssb_regs.h | 294 include/net/cfg80211.h | 114 include/net/iw_handler.h | 8 include/net/mac80211.h | 1060 +++ lib/Kconfig | 8 lib/Makefile | 1 lib/crc-itu-t.c | 64 net/Kconfig | 1 net/Makefile | 2 net/mac80211/Kconfig | 81 net/mac80211/Makefile | 20 net/mac80211/aes_ccm.c | 155 net/mac80211/aes_ccm.h | 26 net/mac80211/debugfs.c | 433 + net/mac80211/debugfs.h | 16 net/mac80211/debugfs_key.c | 253 net/mac80211/debugfs_key.h | 34 net/mac80211/debugfs_netdev.c | 440 + net/mac80211/debugfs_netdev.h | 30 net/mac80211/debugfs_sta.c | 247 net/mac80211/debugfs_sta.h | 12 net/mac80211/hostapd_ioctl.h | 344 + net/mac80211/ieee80211.c | 5095 ++++++++++++++++ net/mac80211/ieee80211_cfg.c | 72 net/mac80211/ieee80211_cfg.h | 9 net/mac80211/ieee80211_common.h | 98 net/mac80211/ieee80211_i.h | 812 ++ net/mac80211/ieee80211_iface.c | 353 + net/mac80211/ieee80211_ioctl.c | 3180 +++++++++ net/mac80211/ieee80211_key.h | 106 net/mac80211/ieee80211_led.c | 91 net/mac80211/ieee80211_led.h | 32 net/mac80211/ieee80211_rate.c | 140 net/mac80211/ieee80211_rate.h | 144 net/mac80211/ieee80211_sta.c | 3217 ++++++++++ net/mac80211/michael.c | 104 net/mac80211/michael.h | 20 net/mac80211/rc80211_simple.c | 432 + net/mac80211/sta_info.c | 464 + net/mac80211/sta_info.h | 167 net/mac80211/tkip.c | 341 + net/mac80211/tkip.h | 36 net/mac80211/wep.c | 328 + net/mac80211/wep.h | 40 net/mac80211/wme.c | 688 ++ net/mac80211/wme.h | 39 net/mac80211/wpa.c | 846 ++ net/mac80211/wpa.h | 31 net/wireless/Kconfig | 17 net/wireless/Makefile | 1 net/wireless/core.c | 143 net/wireless/core.h | 32 net/wireless/nl80211.c | 993 +++ net/wireless/nl80211.h | 24 net/wireless/sysfs.c | 50 181 files changed, 79055 insertions(+), 3 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 git-wireless-dev.patch Index: git-wireless-dev.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/git-wireless-dev.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- git-wireless-dev.patch 25 Apr 2007 18:07:00 -0000 1.7 +++ git-wireless-dev.patch 1 May 2007 00:44:04 -0000 1.8 @@ -1,175 +1,14 @@ git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git -commit 6295da8ac8ad909dbe49d4c02ee9902fbdb04704 +commit 1fd8ffe72853ed41a0d3b489a2d94959aef6af80 --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/net/wireless.h 2007-04-25 11:20:17.000000000 -0400 -@@ -0,0 +1,159 @@ -+#ifndef __NET_WIRELESS_H -+#define __NET_WIRELESS_H -+ -+/* -+ * 802.11 device management -+ * -+ * Copyright 2007 Johannes Berg -+ */ -+ -+#include -+#include -+#include -+#include -+ -+/** -+ * struct wiphy - wireless hardware description -+ * @idx: the wiphy index assigned to this item -+ * @class_dev: the class device representing /sys/class/ieee80211/ -+ */ -+struct wiphy { -+ /* assign these fields before you register the wiphy */ -+ -+ /* permanent MAC address */ -+ u8 perm_addr[ETH_ALEN]; -+ -+ /* If multiple wiphys are registered and you're handed e.g. -+ * a regular netdev with assigned ieee80211_ptr, you won't -+ * know whether it points to a wiphy your driver has registered -+ * or not. Assign this to something global to your driver to -+ * help determine whether you own this wiphy or not. */ -+ void *privid; -+ -+ /* fields below are read-only, assigned by cfg80211 */ -+ -+ /* the item in /sys/class/ieee80211/ points to this, -+ * you need use set_wiphy_dev() (see below) */ -+ struct device dev; -+ -+ /* dir in debugfs: ieee80211/ */ -+ struct dentry *debugfsdir; -+ -+ char priv[0] __attribute__((__aligned__(NETDEV_ALIGN))); -+}; -+ -+/** struct wireless_dev - wireless per-netdev state -+ * -+ * This structure must be allocated by the driver/stack -+ * that uses the ieee80211_ptr field in struct net_device -+ * (this is intentional so it can be allocated along with -+ * the netdev.) -+ * -+ * @wiphy: pointer to hardware description -+ */ -+struct wireless_dev { -+ struct wiphy *wiphy; -+ -+ /* private to the generic wireless code */ -+ struct list_head list; -+ struct net_device *netdev; -+}; -+ -+/** -+ * wiphy_priv - return priv from wiphy -+ */ -+static inline void *wiphy_priv(struct wiphy *wiphy) -+{ -+ BUG_ON(!wiphy); -+ return &wiphy->priv; -+} -+ -+/** -+ * set_wiphy_dev - set device pointer for wiphy -+ */ -+static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev) -+{ -+ wiphy->dev.parent = dev; -+} -+ -+/** -+ * wiphy_dev - get wiphy dev pointer -+ */ -+static inline struct device *wiphy_dev(struct wiphy *wiphy) -+{ -+ return wiphy->dev.parent; -+} -+ -+/** -+ * wiphy_name - get wiphy name -+ */ -+static inline char *wiphy_name(struct wiphy *wiphy) -+{ -+ return wiphy->dev.bus_id; -+} -+ -+/** -+ * wdev_priv - return wiphy priv from wireless_dev -+ */ -+static inline void *wdev_priv(struct wireless_dev *wdev) -+{ -+ BUG_ON(!wdev); -+ return wiphy_priv(wdev->wiphy); -+} -+ -+/** -+ * wiphy_new - create a new wiphy for use with cfg80211 -+ * -+ * create a new wiphy and associate the given operations with it. -+ * @sizeof_priv bytes are allocated for private use. -+ * -+ * the returned pointer must be assigned to each netdev's -+ * ieee80211_ptr for proper operation. -+ */ -+struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv); -+ -+/** -+ * wiphy_register - register a wiphy with cfg80211 -+ * -+ * register the given wiphy -+ * -+ * Returns a non-negative wiphy index or a negative error code. -+ */ -+extern int wiphy_register(struct wiphy *wiphy); -+ -+/** -+ * wiphy_unregister - deregister a wiphy from cfg80211 -+ * -+ * unregister a device with the given priv pointer. -+ * After this call, no more requests can be made with this priv -+ * pointer, but the call may sleep to wait for an outstanding -+ * request that is being handled. -+ */ -+extern void wiphy_unregister(struct wiphy *wiphy); -+ -+/** -+ * wiphy_free - free wiphy -+ */ -+extern void wiphy_free(struct wiphy *wiphy); -+ -+ -+/* -+ * internal definitions for wireless -+ */ -+ -+#if defined(CONFIG_CFG80211_WEXT_COMPAT) || defined(CONFIG_WIRELESS_EXT) -+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg); -+int wireless_proc_init(void); -+#else -+static inline -+int wext_ioctl(unsigned int cmd, struct ifreq *ifreq, void __user *arg) -+{ -+ return -EINVAL; -+} -+static inline int wireless_proc_init(void) -+{ -+ return 0; -+} -+#endif -+ -+#endif /* __NET_WIRELESS_H */ ---- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/net/mac80211.h 2007-04-25 11:20:17.000000000 -0400 -@@ -0,0 +1,1103 @@ ++++ linux-2.6.21.noarch/include/net/mac80211.h 2007-04-30 20:04:50.000000000 -0400 +@@ -0,0 +1,1060 @@ +/* + * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface + * Copyright 2002-2005, Devicescape Software, Inc. ++ * Copyright 2006-2007 Jiri Benc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as @@ -221,7 +60,9 @@ + * freq, and val fields. Other fields will be filled in by 80211.o based on + * hostapd information and low-level driver does not need to use them. The + * limits for each channel will be provided in 'struct ieee80211_conf' when -+ * configuring the low-level driver with hw->config callback. */ ++ * configuring the low-level driver with hw->config callback. If a device has ++ * a default regulatory domain, IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED ++ * can be set to let the driver configure all fields */ +struct ieee80211_channel { + short chan; /* channel number (IEEE 802.11) */ + short freq; /* frequency in MHz */ @@ -385,9 +226,6 @@ [...37310 lines suppressed...] + return 0; + } @@ -88288,7 +78878,7 @@ + !ieee80211_sta_match_ssid(ifsta, bss->ssid, bss->ssid_len)) + continue; + -+ if (top_rssi < bss->rssi) { ++ if (!selected || top_rssi < bss->rssi) { + selected = bss; + top_rssi = bss->rssi; + } @@ -88305,16 +78895,18 @@ + ieee80211_sta_set_bssid(dev, selected->bssid); + ieee80211_rx_bss_put(dev, selected); + ifsta->state = IEEE80211_AUTHENTICATE; ++ rtnl_unlock(); + ieee80211_sta_reset_auth(dev, ifsta); + return 0; + } else { + if (ifsta->state != IEEE80211_AUTHENTICATE) { -+ ieee80211_sta_start_scan(dev, NULL, 0);; ++ ieee80211_sta_start_scan(dev, NULL, 0); + ifsta->state = IEEE80211_AUTHENTICATE; + set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request); + } else + ifsta->state = IEEE80211_DISABLED; + } ++ rtnl_unlock(); + return -1; +} + @@ -88764,19 +79356,24 @@ + printk(KERN_DEBUG "%s: failed to restore operational" + "channel after scan\n", dev->name); + ++ if (!(local->hw.flags & IEEE80211_HW_NO_PROBE_FILTERING) && ++ ieee80211_if_config(dev)) ++ printk(KERN_DEBUG "%s: failed to restore operational" ++ "BSSID after scan\n", dev->name); ++ + memset(&wrqu, 0, sizeof(wrqu)); + wireless_send_event(dev, SIOCGIWSCAN, &wrqu, NULL); + -+ spin_lock_bh(&local->sub_if_lock); ++ read_lock(&local->sub_if_lock); + list_for_each_entry(sdata, &local->sub_if_list, list) { + if (sdata->type == IEEE80211_IF_TYPE_STA) { + if (sdata->u.sta.associated) + ieee80211_send_nullfunc(local, sdata, 0); -+ ieee80211_sta_timer((unsigned long)&sdata->u.sta); ++ ieee80211_sta_timer((unsigned long)sdata); + } + netif_wake_queue(sdata->dev); + } -+ spin_unlock_bh(&local->sub_if_lock); ++ read_unlock(&local->sub_if_lock); + + sdata = IEEE80211_DEV_TO_SUB_IF(dev); + if (sdata->type == IEEE80211_IF_TYPE_IBSS) { @@ -88864,7 +79461,8 @@ + } + + if (local->sta_scanning) -+ schedule_delayed_work(&local->scan_work, next_delay); ++ queue_delayed_work(local->hw.workqueue, &local->scan_work, ++ next_delay); +} + + @@ -88912,14 +79510,14 @@ + + local->sta_scanning = 1; + -+ spin_lock_bh(&local->sub_if_lock); ++ read_lock(&local->sub_if_lock); + list_for_each_entry(sdata, &local->sub_if_list, list) { + netif_stop_queue(sdata->dev); + if (sdata->type == IEEE80211_IF_TYPE_STA && + sdata->u.sta.associated) + ieee80211_send_nullfunc(local, sdata, 1); + } -+ spin_unlock_bh(&local->sub_if_lock); ++ read_unlock(&local->sub_if_lock); + + if (ssid) { + local->scan_ssid_len = ssid_len; @@ -88932,8 +79530,15 @@ + list); + local->scan_channel_idx = 0; + local->scan_dev = dev; ++ ++ if (!(local->hw.flags & IEEE80211_HW_NO_PROBE_FILTERING) && ++ ieee80211_if_config(dev)) ++ printk(KERN_DEBUG "%s: failed to set BSSID for scan\n", ++ dev->name); ++ + /* TODO: start scan as soon as all nullfunc frames are ACKed */ -+ schedule_delayed_work(&local->scan_work, IEEE80211_CHANNEL_TIME); ++ queue_delayed_work(local->hw.workqueue, &local->scan_work, ++ IEEE80211_CHANNEL_TIME); + + return 0; +} @@ -88955,7 +79560,7 @@ + } + + set_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request); -+ schedule_work(&ifsta->work); ++ queue_work(local->hw.workqueue, &ifsta->work); + return 0; +} + @@ -89010,6 +79615,10 @@ + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = SIOCGIWFREQ; ++ iwe.u.freq.m = bss->channel; ++ iwe.u.freq.e = 0; ++ current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, ++ IW_EV_FREQ_LEN); + iwe.u.freq.m = bss->freq * 100000; + iwe.u.freq.e = 1; + current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, @@ -89163,7 +79772,6 @@ + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); + struct sta_info *sta; + struct ieee80211_sub_if_data *sdata = NULL; -+ struct net_device *sta_dev = NULL; + + /* TODO: Could consider removing the least recently used entry and + * allow new one to be added. */ @@ -89175,26 +79783,13 @@ + return NULL; + } + -+ spin_lock_bh(&local->sub_if_lock); -+ list_for_each_entry(sdata, &local->sub_if_list, list) -+ if (sdata->type == IEEE80211_IF_TYPE_IBSS && -+ memcmp(bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) { -+ sta_dev = sdata->dev; -+ break; -+ } -+ spin_unlock_bh(&local->sub_if_lock); -+ -+ if (!sta_dev) -+ return NULL; -+ + printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n", -+ dev->name, MAC_ARG(addr), sta_dev->name); ++ local->mdev->name, MAC_ARG(addr), dev->name); + + sta = sta_info_add(local, dev, addr, GFP_ATOMIC); + if (!sta) + return NULL; + -+ sta->dev = sta_dev; + sta->supp_rates = sdata->u.sta.supp_rates_bits; + + rate_control_rate_init(sta, local); @@ -89240,7 +79835,7 @@ + return 0; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h 2007-04-25 11:20:17.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.h 2007-04-30 20:04:51.000000000 -0400 @@ -0,0 +1,9 @@ +/* + * mac80211 configuration hooks for cfg80211 @@ -89252,7 +79847,7 @@ + +#endif /* __IEEE80211_CFG_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/debugfs.h 2007-04-25 11:20:17.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/debugfs.h 2007-04-30 20:04:51.000000000 -0400 @@ -0,0 +1,16 @@ +#ifndef __MAC80211_DEBUGFS_H +#define __MAC80211_DEBUGFS_H @@ -89270,20 +79865,8 @@ +#endif + +#endif /* __MAC80211_DEBUGFS_H */ ---- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig 2007-04-25 11:19:13.000000000 -0400 -+++ linux-2.6.20.noarch/net/ieee80211/Kconfig 2007-04-25 11:20:17.000000000 -0400 -@@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP - - config IEEE80211_CRYPT_TKIP - tristate "IEEE 802.11i TKIP encryption" -- depends on IEEE80211 && NET_RADIO -+ depends on IEEE80211 -+ select WIRELESS_EXT - select CRYPTO - select CRYPTO_MICHAEL_MIC - select CRYPTO_ECB ---- linux-2.6.20.noarch/.mailmap.orig 2007-04-25 11:19:13.000000000 -0400 -+++ linux-2.6.20.noarch/.mailmap 2007-04-25 11:20:17.000000000 -0400 +--- linux-2.6.21.noarch/.mailmap.orig 2007-04-30 20:04:37.000000000 -0400 ++++ linux-2.6.21.noarch/.mailmap 2007-04-30 20:04:51.000000000 -0400 @@ -57,6 +57,7 @@ Jean Tourrilhes Jeff Garzik Jens Axboe Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.3120 retrieving revision 1.3121 diff -u -r1.3120 -r1.3121 --- kernel-2.6.spec 30 Apr 2007 21:32:36 -0000 1.3120 +++ kernel-2.6.spec 1 May 2007 00:44:05 -0000 1.3121 @@ -597,10 +597,11 @@ Patch2205: linux-2.6-libata-debug.patch # Wireless bits -Patch2300: git-wireless-dev.patch -Patch2301: git-iwlwifi.patch -Patch2302: git-iwlwifi-fixes.patch -Patch2303: linux-2.6-zd1211rw-mac80211-queue-limit.patch +Patch2300: linux-2.6-wireless.patch +Patch2301: git-wireless-dev.patch +Patch2302: git-iwlwifi.patch +Patch2303: git-iwlwifi-fixes.patch +Patch2304: linux-2.6-zd1211rw-mac80211-queue-limit.patch # ACPI bits @@ -1340,14 +1341,16 @@ # Make libata debugging info runtime selectable. #%patch2205 -p1 -# Add the new wireless stack and drivers from wireless-dev +# Add critical wireless updates from 2.6.22 %patch2300 -p1 -# ...and the iwlwifi driver from Intel +# Add the new wireless stack and drivers from wireless-dev %patch2301 -p1 -# ...plus some fixes not yet in Intel's tree +# ...and the iwlwifi driver from Intel %patch2302 -p1 -# limite queueing of URBs to zd1211rw-mac80211 driver +# ...plus some fixes not yet in Intel's tree %patch2303 -p1 +# limite queueing of URBs to zd1211rw-mac80211 driver +%patch2304 -p1 # ACPI patches @@ -2337,6 +2340,12 @@ # - tux. %changelog +* Mon Apr 30 2007 John W. Linville +- Add critical post-2.6.21 wireless updates +- Update git-wireless-dev.patch +- Update git-iwlwifi.patch (iwlwifi version 0.0.15) +- Remove unused wireless config options + * Mon Apr 30 2007 Dave Jones - Fix oops in sis900 driver. From fedora-cvs-commits at redhat.com Tue May 1 00:48:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Apr 2007 20:48:13 -0400 Subject: rpms/anaconda/devel .cvsignore, 1.409, 1.410 anaconda.spec, 1.540, 1.541 sources, 1.534, 1.535 Message-ID: <200705010048.l410mD0M008090@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8027/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.57-1 on branch devel from anaconda-11.2.0.57-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.409 retrieving revision 1.410 diff -u -r1.409 -r1.410 --- .cvsignore 1 May 2007 00:31:07 -0000 1.409 +++ .cvsignore 1 May 2007 00:48:11 -0000 1.410 @@ -1 +1 @@ -anaconda-11.2.0.56.tar.bz2 +anaconda-11.2.0.57.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.540 retrieving revision 1.541 diff -u -r1.540 -r1.541 --- anaconda.spec 1 May 2007 00:31:07 -0000 1.540 +++ anaconda.spec 1 May 2007 00:48:11 -0000 1.541 @@ -1,7 +1,7 @@ %define livearches %{ix86} x86_64 Name: anaconda -Version: 11.2.0.56 +Version: 11.2.0.57 Release: 1 License: GPL Summary: Graphical system installer @@ -142,6 +142,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Apr 30 2007 Jeremy Katz - 11.2.0.57-1 +- fix build + * Mon Apr 30 2007 Jeremy Katz - 11.2.0.56-1 - Don't write out ipv6 disabling bits (dcantrell, #237642) - Load pata_pcmcia late (#237674) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.534 retrieving revision 1.535 diff -u -r1.534 -r1.535 --- sources 1 May 2007 00:31:07 -0000 1.534 +++ sources 1 May 2007 00:48:11 -0000 1.535 @@ -1 +1 @@ -83c5d144e3f8c292c7e6636f4fb4a16d anaconda-11.2.0.56.tar.bz2 +04fe73b39eeb8960eaec59a1ae38c2ca anaconda-11.2.0.57.tar.bz2 From fedora-cvs-commits at redhat.com Tue May 1 02:27:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Apr 2007 22:27:24 -0400 Subject: rpms/xen/devel xen-mem-pre-balloon.patch, NONE, 1.1 xen-net-bridge.patch, NONE, 1.1 xen-remove-python-path-check.patch, NONE, 1.1 xen-xs-transactions.patch, NONE, 1.1 xen-blktap-error-returns.patch, 1.1, 1.2 xen-blktap-no-aio-epoll.patch, 1.2, 1.3 xen-dumpdir.patch, 1.1, 1.2 xen-initscript.patch, 1.6, 1.7 xen-pvfb-compat.patch, 1.1, 1.2 xen.spec, 1.171, 1.172 xen-boot-raw-tap.patch, 1.1, NONE xen-hotplug-error-reporting.patch, 1.1, NONE xen-network-iptables-bridge.patch, 1.3, NONE xen-pvfb-compat-nohvm.patch, 1.1, NONE xen-pvfb-terminate.patch, 1.1, NONE xen-pygrub-memcorruption.patch, 1.1, NONE xen-qemu-close-fds.patch, 1.1, NONE xen-vnc-mouse-buttons.patch, 1.1, NONE xen-vnclisten-config.patch, 1.1, NONE Message-ID: <200705010227.l412ROrW007092@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7073 Modified Files: xen-blktap-error-returns.patch xen-blktap-no-aio-epoll.patch xen-dumpdir.patch xen-initscript.patch xen-pvfb-compat.patch xen.spec Added Files: xen-mem-pre-balloon.patch xen-net-bridge.patch xen-remove-python-path-check.patch xen-xs-transactions.patch Removed Files: xen-boot-raw-tap.patch xen-hotplug-error-reporting.patch xen-network-iptables-bridge.patch xen-pvfb-compat-nohvm.patch xen-pvfb-terminate.patch xen-pygrub-memcorruption.patch xen-qemu-close-fds.patch xen-vnc-mouse-buttons.patch xen-vnclisten-config.patch Log Message: Updated to xen 3.0.5-rc4 xen-mem-pre-balloon.patch: XendDomainInfo.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE xen-mem-pre-balloon.patch --- diff -rup xen-3.0.5-testing.hg-rc4/tools/python/xen/xend/XendDomainInfo.py xen-3.0.5-testing.hg-rc4.new/tools/python/xen/xend/XendDomainInfo.py --- xen-3.0.5-testing.hg-rc4/tools/python/xen/xend/XendDomainInfo.py 2007-04-30 16:03:09.000000000 -0400 +++ xen-3.0.5-testing.hg-rc4.new/tools/python/xen/xend/XendDomainInfo.py 2007-04-30 16:02:05.000000000 -0400 @@ -1468,9 +1468,9 @@ class XendDomainInfo: raise VmError("HVM guest support is unavailable: is VT/AMD-V " "supported by your CPU and enabled in your " "BIOS?") - # Hack to pre-reserve some memory for HVM setup. - # Needed because Xen allocates 1MB by default immediately. - balloon.free(2*1024) # 2MB should be plenty + # Hack to pre-reserve some memory for domain setup. + # Needed because Xen allocates 1MB by default immediately. + balloon.free(2*1024) # 2MB should be plenty self.domid = xc.domain_create( domid = 0, xen-net-bridge.patch: examples/network-bridge | 142 +++++++++++++------------------------- examples/network-bridge~ |only examples/vif-bridge | 30 +++++++- examples/xen-network-common.sh | 20 +---- examples/xend-config.sxp | 13 ++- ioemu/patches/qemu-target-i386-dm | 3 ioemu/target-i386-dm/qemu-ifup | 30 +++++++- 7 files changed, 124 insertions(+), 114 deletions(-) --- NEW FILE xen-net-bridge.patch --- diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/examples/network-bridge xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/network-bridge --- xen-3.0.5-testing.hg-rc2-14889/tools/examples/network-bridge 2007-04-23 19:21:23.000000000 -0400 +++ xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/network-bridge 2007-04-26 11:14:10.000000000 -0400 @@ -5,9 +5,10 @@ # The script name to use is defined in /etc/xen/xend-config.sxp # in the network-script field. # -# This script creates a bridge (default xenbr${vifnum}), adds a device -# (default eth${vifnum}) to it, copies the IP addresses from the device -# to the bridge and adjusts the routes accordingly. +# This script creates a bridge (default ${netdev}), adds a device +# (defaults to the device on the default gateway route) to it, copies +# the IP addresses from the device to the bridge and adjusts the routes +# accordingly. # # If all goes well, this should ensure that networking stays up. # However, some configurations are upset by this, especially @@ -20,31 +21,27 @@ # # Vars: # -# vifnum Virtual device number to use (default 0). Numbers >=8 -# require the netback driver to have nloopbacks set to a -# higher value than its default of 8. -# bridge The bridge to use (default xenbr${vifnum}). -# netdev The interface to add to the bridge (default eth${vifnum}). +# bridge The bridge to use (default ${netdev}). +# netdev The interface to add to the bridge (default gateway device). # antispoof Whether to use iptables to prevent spoofing (default no). # # Internal Vars: # pdev="p${netdev}" -# vdev="veth${vifnum}" -# vif0="vif0.${vifnum}" +# tdev=tmpbridge # # start: -# Creates the bridge -# Copies the IP and MAC addresses from netdev to vdev +# Creates the bridge as tdev +# Copies the IP and MAC addresses from pdev to bridge # Renames netdev to be pdev -# Renames vdev to be netdev -# Enslaves pdev, vdev to bridge +# Renames tdev to bridge +# Enslaves pdev to bridge # # stop: -# Removes netdev from the bridge -# Transfers addresses, routes from netdev to pdev -# Renames netdev to vdev +# Removes pdev from the bridge +# Transfers addresses, routes from bridge to pdev +# Renames bridge to tdev # Renames pdev to netdev -# Deletes bridge +# Deletes tdev # # status: # Print addresses, interfaces, routes @@ -59,15 +56,13 @@ dir=$(dirname "$0") findCommand "$@" evalVariables "$@" -vifnum=${vifnum:-$(ip route list | awk '/^default / { print $NF }' | sed 's/^[^0-9]*//')} -vifnum=${vifnum:-0} -bridge=${bridge:-xenbr${vifnum}} -netdev=${netdev:-eth${vifnum}} +netdev=${netdev:-$(ip route list | awk '/^default / { print $NF }' | + sed 's/.* dev //')} +bridge=${bridge:-${netdev}} antispoof=${antispoof:-no} pdev="p${netdev}" -vdev="veth${vifnum}" -vif0="vif0.${vifnum}" +tdev=tmpbridge get_ip_info() { addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'` @@ -157,7 +152,6 @@ antispoofing () { iptables -P FORWARD DROP iptables -F FORWARD iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT - iptables -A FORWARD -m physdev --physdev-in ${vif0} -j ACCEPT } # Usage: show_status dev bridge @@ -184,53 +178,27 @@ op_start () { fi if link_exists "$pdev"; then - # The device is already up. - return - fi - if link_exists veth0 && ! link_exists "$vdev"; then - echo " -Link $vdev is missing. -This may be because you have reached the limit of the number of interfaces -that the loopback driver supports. If the loopback driver is a module, you -may raise this limit by passing it as a parameter (nloopbacks=); if the -driver is compiled statically into the kernel, then you may set the parameter -using netloop.nloopbacks= on the domain 0 kernel command line. -" >&2 - exit 1 + # The device is already up. + return fi - create_bridge ${bridge} + create_bridge ${tdev} - if link_exists "$vdev"; then - mac=`ip link show ${netdev} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'` - preiftransfer ${netdev} - transfer_addrs ${netdev} ${vdev} - if ! ifdown ${netdev}; then - # If ifdown fails, remember the IP details. - get_ip_info ${netdev} - ip link set ${netdev} down - ip addr flush ${netdev} - fi - ip link set ${netdev} name ${pdev} - ip link set ${vdev} name ${netdev} - - setup_bridge_port ${pdev} - setup_bridge_port ${vif0} - ip link set ${netdev} addr ${mac} arp on - - ip link set ${bridge} up - add_to_bridge ${bridge} ${vif0} - add_to_bridge2 ${bridge} ${pdev} - do_ifup ${netdev} - else - ip link set ${bridge} arp on - ip link set ${bridge} multicast on - # old style without ${vdev} - transfer_addrs ${netdev} ${bridge} - transfer_routes ${netdev} ${bridge} - # Attach the real interface to the bridge. - add_to_bridge ${bridge} ${netdev} + preiftransfer ${netdev} + transfer_addrs ${netdev} ${tdev} + if ! ifdown ${netdev}; then + # If ifdown fails, remember the IP details. + get_ip_info ${netdev} + ip link set ${netdev} down + ip addr flush ${netdev} fi + ip link set ${netdev} name ${pdev} + ip link set ${tdev} name ${bridge} + + setup_bridge_port ${pdev} + + add_to_bridge2 ${bridge} ${pdev} + do_ifup ${bridge} if [ ${antispoof} = 'yes' ] ; then antispoofing @@ -245,31 +213,21 @@ op_stop () { return fi - if link_exists "$pdev"; then - ip link set dev ${vif0} down - mac=`ip link show ${netdev} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'` - transfer_addrs ${netdev} ${pdev} - if ! ifdown ${netdev}; then - get_ip_info ${netdev} - fi - ip link set ${netdev} down arp off - ip link set ${netdev} addr fe:ff:ff:ff:ff:ff - ip link set ${pdev} down - ip addr flush ${netdev} - ip link set ${pdev} addr ${mac} arp on - - brctl delif ${bridge} ${pdev} - brctl delif ${bridge} ${vif0} - ip link set ${bridge} down - - ip link set ${netdev} name ${vdev} - ip link set ${pdev} name ${netdev} - do_ifup ${netdev} - else - transfer_routes ${bridge} ${netdev} - ip link set ${bridge} down + transfer_addrs ${bridge} ${pdev} + if ! ifdown ${bridge}; then + get_ip_info ${bridge} fi - brctl delbr ${bridge} + ip link set ${pdev} down + ip addr flush ${bridge} + + brctl delif ${bridge} ${pdev} + ip link set ${bridge} down + + ip link set ${bridge} name ${tdev} + ip link set ${pdev} name ${netdev} + do_ifup ${netdev} + + brctl delbr ${tdev} } # adds $dev to $bridge but waits for $dev to be in running state first Only in xen-3.0.5-testing.hg-rc2-14889.new/tools/examples: network-bridge~ diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/examples/vif-bridge xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/vif-bridge --- xen-3.0.5-testing.hg-rc2-14889/tools/examples/vif-bridge 2007-04-23 19:21:23.000000000 -0400 +++ xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/vif-bridge 2007-04-26 11:06:37.000000000 -0400 @@ -44,6 +44,32 @@ then then fatal "Could not find bridge, and none was specified" fi +else + # + # Old style bridge setup with netloop, used to have a bridge name + # of xenbrX, enslaving pethX and vif0.X, and then configuring + # eth0. + # + # New style bridge setup does not use netloop, so the bridge name + # is ethX and the physical device is enslaved pethX + # + # So if... + # + # - User asks for xenbrX + # - AND xenbrX doesn't exist + # - AND there is a ethX device which is a bridge + # + # ..then we translate xenbrX to ethX + # + # This lets old config files work without modification + # + if [ ! -e "/sys/class/net/$bridge" ] && [ "${bridge:0:5}" == "xenbr" ] + then + if [ -e "/sys/class/net/eth${bridge:5}/bridge" ] + then + bridge="eth${bridge:5}" + fi + fi fi RET=0 @@ -65,10 +91,8 @@ case "$command" in ;; esac -handle_iptable - log debug "Successful vif-bridge $command for $vif, bridge $bridge." -if [ "$command" = "online" ] +if [ "$command" == "online" ] then success fi diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/examples/xend-config.sxp xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/xend-config.sxp --- xen-3.0.5-testing.hg-rc2-14889/tools/examples/xend-config.sxp 2007-04-26 11:06:17.000000000 -0400 +++ xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/xend-config.sxp 2007-04-26 11:06:37.000000000 -0400 @@ -118,9 +118,7 @@ ## # To bridge network traffic, like this: # -# dom0: fake eth0 -> vif0.0 -+ -# | -# bridge -> real eth0 -> the network +# dom0: ----------------- bridge -> real eth0 -> the network # | # domU: fake eth0 -> vifN.0 -+ # @@ -143,6 +141,13 @@ # yourself a wrapper script, and call network-bridge from it, as appropriate. # (network-script network-bridge) +#### LAPTOP USERS ! ##### +# For laptops, or machines where network interfaces come/go on-the-fly, +# or are otherwise managed by NetworkManager, comment out the above line. +# Then, uncomment the line below, and use libvirt's virtual networking +# capability which sets up a isolated bridge + NAT forwarding +#(network-script /bin/true) +#### LAPTOP USERS ! ##### # The script used to control virtual interfaces. This can be overridden on a # per-vif basis when creating a domain or a configuring a new vif. The @@ -162,12 +167,14 @@ ## Use the following if network traffic is routed, as an alternative to the # settings for bridged networking given above. +# NB: Obsolete. See note above for LAPTOP USERS #(network-script network-route) #(vif-script vif-route) ## Use the following if network traffic is routed with NAT, as an alternative # to the settings for bridged networking given above. +# NB: Obsolete. See note above for LAPTOP USERS #(network-script network-nat) #(vif-script vif-nat) diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/examples/xen-network-common.sh xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/xen-network-common.sh --- xen-3.0.5-testing.hg-rc2-14889/tools/examples/xen-network-common.sh 2007-04-23 19:21:23.000000000 -0400 +++ xen-3.0.5-testing.hg-rc2-14889.new/tools/examples/xen-network-common.sh 2007-04-26 11:06:37.000000000 -0400 @@ -90,8 +90,6 @@ find_dhcpd_init_file() } # configure interfaces which act as pure bridge ports: -# - make quiet: no arp, no multicast (ipv6 autoconf) -# - set mac address to fe:ff:ff:ff:ff:ff setup_bridge_port() { local dev="$1" @@ -99,9 +97,6 @@ setup_bridge_port() { ip link set ${dev} down # ... and configure it - ip link set ${dev} arp off - ip link set ${dev} multicast off - ip link set ${dev} addr fe:ff:ff:ff:ff:ff ip addr flush ${dev} } @@ -114,15 +109,14 @@ create_bridge () { brctl addbr ${bridge} brctl stp ${bridge} off brctl setfd ${bridge} 0 - ip link set ${bridge} arp off - ip link set ${bridge} multicast off + # Setting these to zero stops guest<->LAN traffic + # traversing the bridge from hitting the *tables + # rulesets. guest<->host traffic still gets processed + # by the host's iptables rules so this isn't a hole + sysctl -q -w "net.bridge.bridge-nf-call-arptables=0" + sysctl -q -w "net.bridge.bridge-nf-call-ip6tables=0" + sysctl -q -w "net.bridge.bridge-nf-call-iptables=0" fi - - # A small MTU disables IPv6 (and therefore IPv6 addrconf). - mtu=$(ip link show ${bridge} | sed -n 's/.* mtu \([0-9]\+\).*/\1/p') - ip link set ${bridge} mtu 68 - ip link set ${bridge} up - ip link set ${bridge} mtu ${mtu:-1500} } # Usage: add_to_bridge bridge dev diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/ioemu/patches/qemu-target-i386-dm xen-3.0.5-testing.hg-rc2-14889.new/tools/ioemu/patches/qemu-target-i386-dm --- xen-3.0.5-testing.hg-rc2-14889/tools/ioemu/patches/qemu-target-i386-dm 2007-04-23 19:21:23.000000000 -0400 +++ xen-3.0.5-testing.hg-rc2-14889.new/tools/ioemu/patches/qemu-target-i386-dm 2007-04-26 11:06:37.000000000 -0400 @@ -1353,7 +1353,7 @@ Index: ioemu/target-i386-dm/qemu-ifup =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ ioemu/target-i386-dm/qemu-ifup 2006-12-08 01:41:11.000000000 +0000 -@@ -0,0 +1,10 @@ +@@ -0,0 +1,16 @@ +#!/bin/sh + +#. /etc/rc.d/init.d/functions @@ -1362,5 +1362,11 @@ Index: ioemu/target-i386-dm/qemu-ifup +echo -c 'config qemu network with xen bridge for ' +echo $* + ++bridge=$2 ++ ++if [ ! -e /sys/class/net/$bridge ]; then ++ bridge=$(brctl show | sed -n '2s/[[:blank:]].*//p') ++fi ++ +ifconfig $1 0.0.0.0 up -+brctl addif $2 $1 ++brctl addif $bridge $1 diff -rup xen-3.0.5-testing.hg-rc2-14889/tools/ioemu/target-i386-dm/qemu-ifup xen-3.0.5-testing.hg-rc2-14889.new/tools/ioemu/target-i386-dm/qemu-ifup --- xen-3.0.5-testing.hg-rc2-14889/tools/ioemu/target-i386-dm/qemu-ifup 2007-04-23 19:21:23.000000000 -0400 +++ xen-3.0.5-testing.hg-rc2-14889.new/tools/ioemu/target-i386-dm/qemu-ifup 2007-04-26 11:06:37.000000000 -0400 @@ -5,5 +5,33 @@ echo 'config qemu network with xen bridge for ' $* +bridge=$2 + +# +# Old style bridge setup with netloop, used to have a bridge name +# of xenbrX, enslaving pethX and vif0.X, and then configuring +# eth0. +# +# New style bridge setup does not use netloop, so the bridge name +# is ethX and the physical device is enslaved pethX +# +# So if... +# +# - User asks for xenbrX +# - AND xenbrX doesn't exist +# - AND there is a ethX device which is a bridge +# +# ..then we translate xenbrX to ethX +# +# This lets old config files work without modification +# +if [ ! -e "/sys/class/net/$bridge" ] && [ "${bridge:0:5}" == "xenbr" ] +then + if [ -e "/sys/class/net/eth${bridge:5}/bridge" ] + then + bridge="eth${bridge:5}" + fi +fi + ifconfig $1 0.0.0.0 up -brctl addif $2 $1 +brctl addif $bridge $1 xen-remove-python-path-check.patch: xend | 8 -------- 1 files changed, 8 deletions(-) --- NEW FILE xen-remove-python-path-check.patch --- diff -rup xen-unstable.hg-3.0.5-pre-14797.orig/tools/misc/xend xen-unstable.hg-3.0.5-pre-14797.new/tools/misc/xend --- xen-unstable.hg-3.0.5-pre-14797.orig/tools/misc/xend 2007-04-11 19:10:35.000000000 -0400 +++ xen-unstable.hg-3.0.5-pre-14797.new/tools/misc/xend 2007-04-11 19:12:38.000000000 -0400 @@ -31,14 +31,6 @@ import signal import time import commands -result = commands.getstatusoutput(os.path.join(os.path.dirname(sys.argv[0]), - 'xen-python-path')) -if result[0] != 0: - print >>sys.stderr, result[1] - sys.exit(1) - -sys.path.append(result[1]) - from xen.xend.server import SrvDaemon class CheckError(ValueError): xen-xs-transactions.patch: XendConfig.py | 64 ++++++++++++++++++++++++-------------------- XendDomain.py | 11 ++++++- XendDomainInfo.py | 59 +++++++++++++++++++++++++++++++++++++--- server/ConsoleController.py | 9 ++++-- server/DevController.py | 33 +++++++++++++++++----- server/blkif.py | 17 ++++++++--- server/netif.py | 9 ++++-- server/pciif.py | 4 +- server/tpmif.py | 4 +- server/vfbif.py | 9 ++++-- 10 files changed, 159 insertions(+), 60 deletions(-) --- NEW FILE xen-xs-transactions.patch --- diff -r 8ca89a9e54a7 tools/python/xen/xend/XendConfig.py --- a/tools/python/xen/xend/XendConfig.py Wed Apr 25 09:44:20 2007 +0100 +++ b/tools/python/xen/xend/XendConfig.py Wed Apr 25 12:52:29 2007 -0400 @@ -26,6 +26,7 @@ from xen.xend.XendDevices import XendDev from xen.xend.XendDevices import XendDevices from xen.xend.PrettyPrint import prettyprintstring from xen.xend.XendConstants import DOM_STATE_HALTED +from xen.xend.xenstore.xstransact import xstransact log = logging.getLogger("xend.XendConfig") log.setLevel(logging.WARN) @@ -884,36 +885,43 @@ class XendConfig(dict): # Marshall devices (running or from configuration) if not ignore_devices: - for cls in XendDevices.valid_devices(): - found = False + txn = xstransact() + try: + for cls in XendDevices.valid_devices(): + found = False - # figure if there is a dev controller is valid and running - if domain and domain.getDomid() != None: - try: - controller = domain.getDeviceController(cls) - configs = controller.configurations() - for config in configs: - if sxp.name(config) in ('vbd', 'tap'): - # The bootable flag is never written to the - # store as part of the device config. - dev_uuid = sxp.child_value(config, 'uuid') - dev_type, dev_cfg = self['devices'][dev_uuid] - is_bootable = dev_cfg.get('bootable', 0) - config.append(['bootable', int(is_bootable)]) - - sxpr.append(['device', config]) - - found = True - except: - log.exception("dumping sxp from device controllers") - pass + # figure if there is a dev controller is valid and running + if domain and domain.getDomid() != None: + try: + controller = domain.getDeviceController(cls) + configs = controller.configurations(txn) + for config in configs: + if sxp.name(config) in ('vbd', 'tap'): + # The bootable flag is never written to the + # store as part of the device config. + dev_uuid = sxp.child_value(config, 'uuid') + dev_type, dev_cfg = self['devices'][dev_uuid] + is_bootable = dev_cfg.get('bootable', 0) + config.append(['bootable', int(is_bootable)]) + + sxpr.append(['device', config]) + + found = True + except: + log.exception("dumping sxp from device controllers") + pass - # if we didn't find that device, check the existing config - # for a device in the same class - if not found: - for dev_type, dev_info in self.all_devices_sxpr(): - if dev_type == cls: - sxpr.append(['device', dev_info]) + # if we didn't find that device, check the existing config + # for a device in the same class + if not found: + for dev_type, dev_info in self.all_devices_sxpr(): + if dev_type == cls: + sxpr.append(['device', dev_info]) + + txn.commit() + except: + txn.abort() + raise return sxpr diff -r 8ca89a9e54a7 tools/python/xen/xend/XendDomain.py --- a/tools/python/xen/xend/XendDomain.py Wed Apr 25 09:44:20 2007 +0100 +++ b/tools/python/xen/xend/XendDomain.py Wed Apr 25 12:53:38 2007 -0400 @@ -391,13 +391,22 @@ class XendDomain: @rtype: None """ + txn = xstransact() + try: + self._refreshTxn(txn, refresh_shutdown) + txn.commit() + except: + txn.abort() + raise + + def _refreshTxn(self, transaction, refresh_shutdown): running = self._running_domains() # Add domains that are not already tracked but running in Xen, # and update domain state for those that are running and tracked. for dom in running: domid = dom['domid'] if domid in self.domains: - self.domains[domid].update(dom, refresh_shutdown) + self.domains[domid].update(dom, refresh_shutdown, transaction) elif domid not in self.domains and dom['dying'] != 1: try: new_dom = XendDomainInfo.recreate(dom, False) diff -r 8ca89a9e54a7 tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py Wed Apr 25 09:44:20 2007 +0100 +++ b/tools/python/xen/xend/XendDomainInfo.py Wed Apr 25 12:55:05 2007 -0400 @@ -704,12 +704,15 @@ class XendDomainInfo: self._update_consoles() - def _update_consoles(self): + def _update_consoles(self, transaction = None): if self.domid == None or self.domid == 0: return # Update VT100 port if it exists - self.console_port = self.readDom('console/port') + if transaction is None: + self.console_port = self.readDom('console/port') + else: + self.console_port = self.readDomTxn(transaction, 'console/port') if self.console_port is not None: serial_consoles = self.info.console_get_all('vt100') if not serial_consoles: @@ -722,7 +725,10 @@ class XendDomainInfo: # Update VNC port if it exists and write to xenstore - vnc_port = self.readDom('console/vnc-port') + if transaction is None: + vnc_port = self.readDom('console/vnc-port') + else: + vnc_port = self.readDomTxn(transaction, 'console/vnc-port') if vnc_port is not None: for dev_uuid, (dev_type, dev_info) in self.info['devices'].items(): if dev_type == 'vfb': @@ -757,6 +763,27 @@ class XendDomainInfo: def storeVm(self, *args): return xstransact.Store(self.vmpath, *args) + + def _readVmTxn(self, transaction, *args): + paths = map(lambda x: self.vmpath + "/" + x, args) + return transaction.read(*paths) + + def _writeVmTxn(self, transaction, *args): + paths = map(lambda x: self.vmpath + "/" + x, args) + return transaction.write(*paths) + + def _removeVmTxn(self, transaction, *args): + paths = map(lambda x: self.vmpath + "/" + x, args) + return transaction.remove(*paths) + + def _gatherVmTxn(self, transaction, *args): + paths = map(lambda x: self.vmpath + "/" + x, args) + return transaction.gather(paths) + + def storeVmTxn(self, transaction, *args): + paths = map(lambda x: self.vmpath + "/" + x, args) + return transaction.store(*paths) + # # Function to update xenstore /dom/* # @@ -775,6 +802,28 @@ class XendDomainInfo: def storeDom(self, *args): return xstransact.Store(self.dompath, *args) + + + def readDomTxn(self, transaction, *args): + paths = map(lambda x: self.vmpath + "/" + x, args) + return transaction.read(*paths) + + def gatherDomTxn(self, transaction, *args): + paths = map(lambda x: self.vmpath + "/" + x, args) + return transaction.gather(*paths) + + def _writeDomTxn(self, transaction, *args): + paths = map(lambda x: self.vmpath + "/" + x, args) + return transaction.write(*paths) + + def _removeDomTxn(self, transaction, *args): + paths = map(lambda x: self.vmpath + "/" + x, args) + return transaction.remove(*paths) + + def storeDomTxn(self, transaction, *args): + paths = map(lambda x: self.vmpath + "/" + x, args) + return transaction.store(*paths) + def _recreateDom(self): complete(self.dompath, lambda t: self._recreateDomFunc(t)) @@ -2062,7 +2111,7 @@ class XendDomainInfo: (" as domain %s" % str(dom.domid)) or "")) - def update(self, info = None, refresh = True): + def update(self, info = None, refresh = True, transaction = None): """Update with info from xc.domain_getinfo(). """ log.trace("XendDomainInfo.update(%s) on domain %s", info, @@ -2094,7 +2143,7 @@ class XendDomainInfo: # TODO: we should eventually get rid of old_dom_states self.info.update_config(info) - self._update_consoles() + self._update_consoles(transaction) if refresh: self.refreshShutdown(info) diff -r 8ca89a9e54a7 tools/python/xen/xend/server/ConsoleController.py --- a/tools/python/xen/xend/server/ConsoleController.py Wed Apr 25 09:44:20 2007 +0100 +++ b/tools/python/xen/xend/server/ConsoleController.py Wed Apr 25 12:57:05 2007 -0400 @@ -19,9 +19,12 @@ class ConsoleController(DevController): return (self.allocateDeviceID(), back, {}) - def getDeviceConfiguration(self, devid): - result = DevController.getDeviceConfiguration(self, devid) - devinfo = self.readBackend(devid, *self.valid_cfg) + def getDeviceConfiguration(self, devid, transaction = None): + result = DevController.getDeviceConfiguration(self, devid, transaction) + if transaction is None: + devinfo = self.readBackend(devid, *self.valid_cfg) + else: + devinfo = self.readBackendTxn(transaction, devid, *self.valid_cfg) config = dict(zip(self.valid_cfg, devinfo)) config = dict([(key, val) for key, val in config.items() if val != None]) diff -r 8ca89a9e54a7 tools/python/xen/xend/server/DevController.py --- a/tools/python/xen/xend/server/DevController.py Wed Apr 25 09:44:20 2007 +0100 +++ b/tools/python/xen/xend/server/DevController.py Wed Apr 25 12:57:05 2007 -0400 @@ -225,15 +225,15 @@ class DevController: self.vm._removeVm("device/%s/%d" % (self.deviceClass, devid)) - def configurations(self): - return map(self.configuration, self.deviceIDs()) - - - def configuration(self, devid): + def configurations(self, transaction = None): + return map(lambda x: self.configuration(x, transaction), self.deviceIDs(transaction)) + + + def configuration(self, devid, transaction = None): """@return an s-expression giving the current configuration of the specified device. This would be suitable for giving to {@link #createDevice} in order to recreate that device.""" - configDict = self.getDeviceConfiguration(devid) + configDict = self.getDeviceConfiguration(devid, transaction) sxpr = [self.deviceClass] for key, val in configDict.items(): if isinstance(val, (types.ListType, types.TupleType)): @@ -259,13 +259,16 @@ class DevController: 'id', devid]] - def getDeviceConfiguration(self, devid): + def getDeviceConfiguration(self, devid, transaction = None): """Returns the configuration of a device. @note: Similar to L{configuration} except it returns a dict. @return: dict """ - backdomid = xstransact.Read(self.frontendPath(devid), "backend-id") + if transaction is None: + backdomid = xstransact.Read(self.frontendPath(devid), "backend-id") + else: + backdomid = transaction.read(self.frontendPath(devid) + "/backend-id") if backdomid is None: raise VmError("Device %s not connected" % devid) @@ -393,14 +396,28 @@ class DevController: else: raise VmError("Device %s not connected" % devid) + def readBackendTxn(self, transaction, devid, *args): + frontpath = self.frontendPath(devid) + backpath = transaction.read(frontpath + "/backend") + if backpath: + paths = map(lambda x: backpath + "/" + x, args) + return transaction.read(*paths) + else: + raise VmError("Device %s not connected" % devid) + def readFrontend(self, devid, *args): return xstransact.Read(self.frontendPath(devid), *args) + + def readFrontendTxn(self, transaction, devid, *args): + paths = map(lambda x: self.frontendPath(devid) + "/" + x, args) + return transaction.read(*paths) def deviceIDs(self, transaction = None): """@return The IDs of each of the devices currently configured for this instance's deviceClass. """ fe = self.backendRoot() + if transaction: return map(lambda x: int(x.split('/')[-1]), transaction.list(fe)) else: diff -r 8ca89a9e54a7 tools/python/xen/xend/server/blkif.py --- a/tools/python/xen/xend/server/blkif.py Wed Apr 25 09:44:20 2007 +0100 +++ b/tools/python/xen/xend/server/blkif.py Wed Apr 25 12:57:05 2007 -0400 @@ -107,19 +107,26 @@ class BlkifController(DevController): (self.deviceClass, devid, config)) - def getDeviceConfiguration(self, devid): + def getDeviceConfiguration(self, devid, transaction = None): """Returns the configuration of a device. @note: Similar to L{configuration} except it returns a dict. @return: dict """ - config = DevController.getDeviceConfiguration(self, devid) - devinfo = self.readBackend(devid, 'dev', 'type', 'params', 'mode', - 'uuid') + config = DevController.getDeviceConfiguration(self, devid, transaction) + if transaction is None: + devinfo = self.readBackend(devid, 'dev', 'type', 'params', 'mode', + 'uuid') + else: + devinfo = self.readBackendTxn(transaction, devid, + 'dev', 'type', 'params', 'mode', 'uuid') dev, typ, params, mode, uuid = devinfo if dev: - dev_type = self.readFrontend(devid, 'device-type') + if transaction is None: + dev_type = self.readFrontend(devid, 'device-type') + else: + dev_type = self.readFrontendTxn(transaction, devid, 'device-type') if dev_type: dev += ':' + dev_type config['dev'] = dev diff -r 8ca89a9e54a7 tools/python/xen/xend/server/netif.py --- a/tools/python/xen/xend/server/netif.py Wed Apr 25 09:44:20 2007 +0100 +++ b/tools/python/xen/xend/server/netif.py Wed Apr 25 12:57:05 2007 -0400 @@ -149,16 +149,19 @@ class NetifController(DevController): return (devid, back, front) - def getDeviceConfiguration(self, devid): + def getDeviceConfiguration(self, devid, transaction = None): """@see DevController.configuration""" - result = DevController.getDeviceConfiguration(self, devid) + result = DevController.getDeviceConfiguration(self, devid, transaction) config_path = "device/%s/%d/" % (self.deviceClass, devid) devinfo = () for x in ( 'script', 'ip', 'bridge', 'mac', 'type', 'vifname', 'rate', 'uuid', 'model' ): - y = self.vm._readVm(config_path + x) + if transaction is None: + y = self.vm._readVm(config_path + x) + else: + y = self.vm._readVmTxn(transaction, config_path + x) devinfo += (y,) (script, ip, bridge, mac, typ, vifname, rate, uuid, model) = devinfo diff -r 8ca89a9e54a7 tools/python/xen/xend/server/pciif.py --- a/tools/python/xen/xend/server/pciif.py Wed Apr 25 09:44:20 2007 +0100 +++ b/tools/python/xen/xend/server/pciif.py Wed Apr 25 12:57:05 2007 -0400 @@ -78,8 +78,8 @@ class PciController(DevController): back['uuid'] = config.get('uuid','') return (0, back, {}) - def getDeviceConfiguration(self, devid): - result = DevController.getDeviceConfiguration(self, devid) + def getDeviceConfiguration(self, devid, transaction = None): + result = DevController.getDeviceConfiguration(self, devid, transaction) num_devs = self.readBackend(devid, 'num_devs') pci_devs = [] diff -r 8ca89a9e54a7 tools/python/xen/xend/server/tpmif.py --- a/tools/python/xen/xend/server/tpmif.py Wed Apr 25 09:44:20 2007 +0100 +++ b/tools/python/xen/xend/server/tpmif.py Wed Apr 25 12:57:05 2007 -0400 @@ -67,9 +67,9 @@ class TPMifController(DevController): return (devid, back, front) - def getDeviceConfiguration(self, devid): + def getDeviceConfiguration(self, devid, transaction = None): """Returns the configuration of a device""" - result = DevController.getDeviceConfiguration(self, devid) + result = DevController.getDeviceConfiguration(self, devid, transaction) (instance, uuid, type) = \ self.readBackend(devid, 'instance', diff -r 8ca89a9e54a7 tools/python/xen/xend/server/vfbif.py --- a/tools/python/xen/xend/server/vfbif.py Wed Apr 25 09:44:20 2007 +0100 +++ b/tools/python/xen/xend/server/vfbif.py Wed Apr 25 12:57:05 2007 -0400 @@ -35,10 +35,13 @@ class VfbifController(DevController): return (devid, back, {}) - def getDeviceConfiguration(self, devid): - result = DevController.getDeviceConfiguration(self, devid) + def getDeviceConfiguration(self, devid, transaction = None): + result = DevController.getDeviceConfiguration(self, devid, transaction) - devinfo = self.readBackend(devid, *CONFIG_ENTRIES) + if transaction is None: + devinfo = self.readBackend(devid, *CONFIG_ENTRIES) + else: + devinfo = self.readBackendTxn(transaction, devid, *CONFIG_ENTRIES) return dict([(CONFIG_ENTRIES[i], devinfo[i]) for i in range(len(CONFIG_ENTRIES)) if devinfo[i] is not None]) xen-blktap-error-returns.patch: blktapctrl.c | 5 ++++- block-aio.c | 33 +++++++++++++++++++++++++-------- block-qcow.c | 21 ++++++++++++++++----- block-vmdk.c | 6 ++++-- 4 files changed, 49 insertions(+), 16 deletions(-) Index: xen-blktap-error-returns.patch =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen-blktap-error-returns.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-blktap-error-returns.patch 11 Jan 2007 17:21:07 -0000 1.1 +++ xen-blktap-error-returns.patch 1 May 2007 02:27:22 -0000 1.2 @@ -1,6 +1,6 @@ -diff -rup xen-3.0.4_1-src/tools/blktap/drivers/blktapctrl.c xen-3.0.4_1-src-new/tools/blktap/drivers/blktapctrl.c ---- xen-3.0.4_1-src/tools/blktap/drivers/blktapctrl.c 2007-01-08 10:00:46.000000000 -0500 -+++ xen-3.0.4_1-src-new/tools/blktap/drivers/blktapctrl.c 2007-01-11 10:47:55.000000000 -0500 +diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/blktap/drivers/blktapctrl.c xen-unstable.hg-3.0.5-pre-14797.new/tools/blktap/drivers/blktapctrl.c +--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/blktap/drivers/blktapctrl.c 2007-04-11 19:10:30.000000000 -0400 ++++ xen-unstable.hg-3.0.5-pre-14797.new/tools/blktap/drivers/blktapctrl.c 2007-04-13 11:32:14.000000000 -0400 @@ -673,7 +673,10 @@ int main(int argc, char *argv[]) __init_blkif(); snprintf(buf, sizeof(buf), "BLKTAPCTRL[%d]", getpid()); @@ -13,44 +13,45 @@ print_drivers(); init_driver_list(); -Only in xen-3.0.4_1-src-new/tools/blktap/drivers: blktapctrl.c~ -diff -rup xen-3.0.4_1-src/tools/blktap/drivers/block-aio.c xen-3.0.4_1-src-new/tools/blktap/drivers/block-aio.c ---- xen-3.0.4_1-src/tools/blktap/drivers/block-aio.c 2007-01-11 10:40:51.000000000 -0500 -+++ xen-3.0.4_1-src-new/tools/blktap/drivers/block-aio.c 2007-01-11 10:56:53.000000000 -0500 -@@ -188,13 +188,27 @@ int tdaio_open (struct td_state *s, cons +diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/blktap/drivers/block-aio.c xen-unstable.hg-3.0.5-pre-14797.new/tools/blktap/drivers/block-aio.c +--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/blktap/drivers/block-aio.c 2007-04-13 11:32:01.000000000 -0400 ++++ xen-unstable.hg-3.0.5-pre-14797.new/tools/blktap/drivers/block-aio.c 2007-04-13 11:33:22.000000000 -0400 +@@ -203,13 +203,27 @@ int tdaio_open (struct disk_driver *dd, prv->fd = fd; - pipe(prv->command_fd); - pipe(prv->completion_fd); -+ if ((ret = pipe(prv->command_fd)) < 0) { -+ DPRINTF("Unable to create command pipe\n"); -+ goto done; -+ } -+ if ((ret = pipe(prv->completion_fd)) < 0) { -+ DPRINTF("Unable to create completion pipe\n"); -+ goto done; -+ } - -- ret = pthread_create(&prv->aio_thread, NULL, +- +- ret = pthread_create(&prv->aio_thread, NULL, - tdaio_completion_thread, prv); -+ if ((ret = pthread_create(&prv->aio_thread, NULL, -+ tdaio_completion_thread, prv)) != 0) { -+ ret = -1; -+ DPRINTF("Unable to create completion thread\n"); -+ goto done; -+ } - ret = 0; +- ret = 0; - write(prv->command_fd[1], &ret, sizeof(ret)); -+ if (write(prv->command_fd[1], &ret, sizeof(ret)) < 0) { -+ ret = -1; -+ DPRINTF("Cannot initialize command pipe\n"); -+ goto done; -+ } ++ if ((ret = pipe(prv->command_fd)) < 0) { ++ DPRINTF("Unable to create command pipe\n"); ++ goto done; ++ } ++ if ((ret = pipe(prv->completion_fd)) < 0) { ++ DPRINTF("Unable to create completion pipe\n"); ++ goto done; ++ } ++ ++ if ((ret = pthread_create(&prv->aio_thread, NULL, ++ tdaio_completion_thread, prv)) != 0) { ++ ret = -1; ++ DPRINTF("Unable to create completion thread\n"); ++ goto done; ++ } ++ ret = 0; ++ if (write(prv->command_fd[1], &ret, sizeof(ret)) < 0) { ++ ret = -1; ++ DPRINTF("Cannot initialize command pipe\n"); ++ goto done; ++ } - + init_fds(dd); ret = get_image_info(s, fd); -@@ -371,7 +385,10 @@ repeat: +@@ -382,7 +396,10 @@ repeat: goto repeat; } @@ -62,25 +63,10 @@ return rsp; } -Only in xen-3.0.4_1-src-new/tools/blktap/drivers: block-aio.c~ -diff -rup xen-3.0.4_1-src/tools/blktap/drivers/block-qcow.c xen-3.0.4_1-src-new/tools/blktap/drivers/block-qcow.c ---- xen-3.0.4_1-src/tools/blktap/drivers/block-qcow.c 2007-01-08 10:00:46.000000000 -0500 -+++ xen-3.0.4_1-src-new/tools/blktap/drivers/block-qcow.c 2007-01-11 11:15:35.000000000 -0500 -@@ -441,8 +441,11 @@ static int qtruncate(int fd, off_t lengt - return -1; - } - -- } else if(sparse && (st.st_size > length)) -- ftruncate(fd, length); -+ } else if(sparse && (st.st_size > length)) { -+ if (ftruncate(fd, length) < 0) { -+ return -1; -+ } -+ } - - return 1; - } -@@ -669,7 +672,10 @@ found: +diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/blktap/drivers/block-qcow.c xen-unstable.hg-3.0.5-pre-14797.new/tools/blktap/drivers/block-qcow.c +--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/blktap/drivers/block-qcow.c 2007-04-11 19:10:30.000000000 -0400 ++++ xen-unstable.hg-3.0.5-pre-14797.new/tools/blktap/drivers/block-qcow.c 2007-04-13 11:36:55.000000000 -0400 +@@ -707,7 +707,10 @@ found: } memcpy(tmp_ptr2, l2_ptr, 4096); lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET); @@ -92,9 +78,9 @@ free(tmp_ptr2); } return cluster_offset; -@@ -1149,20 +1155,25 @@ int tdqcow_close(struct td_state *bs) +@@ -1112,20 +1115,26 @@ int tdqcow_close(struct disk_driver *dd) { - struct tdqcow_state *s = (struct tdqcow_state *)bs->private; + struct tdqcow_state *s = (struct tdqcow_state *)dd->private; uint32_t cksum, out; - int fd, offset; + int fd, offset, ret = 0; @@ -102,27 +88,27 @@ /*Update the hdr cksum*/ if(s->min_cluster_alloc == s->l2_size) { cksum = gen_cksum((char *)s->l1_table, s->l1_size * sizeof(uint64_t)); -- printf("Writing cksum: %d",cksum); + printf("Writing cksum: %d",cksum); - fd = open(s->name, O_WRONLY | O_LARGEFILE); /*Open without O_DIRECT*/ -+ if ((fd = open(s->name, O_WRONLY | O_LARGEFILE)) < 0) { /*Open without O_DIRECT*/ -+ ret = -1; -+ goto cleanup; -+ } ++ if ((fd = open(s->name, O_WRONLY | O_LARGEFILE)) < 0) { /*Open without O_DIRECT*/ ++ ret = -1; ++ goto cleanup; ++ } offset = sizeof(QCowHeader) + sizeof(uint32_t); lseek(fd, offset, SEEK_SET); out = cpu_to_be32(cksum); - write(fd, &out, sizeof(uint32_t)); -+ if ((ret = write(fd, &out, sizeof(uint32_t))) < 0) { -+ ret = -1; -+ } ++ if ((ret = write(fd, &out, sizeof(uint32_t))) < 0) { ++ ret = -1; ++ } close(fd); } -+ cleanup: ++ cleanup: + io_destroy(s->aio_ctx); free(s->name); free(s->l1_table); - free(s->l2_cache); -@@ -1249,7 +1260,9 @@ int qcow_create(const char *filename, ui +@@ -1212,7 +1221,9 @@ int qcow_create(const char *filename, ui strncpy(backing_filename, backing_file, sizeof(backing_filename)); } else { @@ -133,11 +119,10 @@ if (stat(backing_filename, &st) != 0) { return -1; } -Only in xen-3.0.4_1-src-new/tools/blktap/drivers: block-qcow.c~ -diff -rup xen-3.0.4_1-src/tools/blktap/drivers/block-vmdk.c xen-3.0.4_1-src-new/tools/blktap/drivers/block-vmdk.c ---- xen-3.0.4_1-src/tools/blktap/drivers/block-vmdk.c 2007-01-08 10:00:47.000000000 -0500 -+++ xen-3.0.4_1-src-new/tools/blktap/drivers/block-vmdk.c 2007-01-11 11:02:07.000000000 -0500 -@@ -268,8 +268,10 @@ static uint64_t get_cluster_offset(struc +diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/blktap/drivers/block-vmdk.c xen-unstable.hg-3.0.5-pre-14797.new/tools/blktap/drivers/block-vmdk.c +--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/blktap/drivers/block-vmdk.c 2007-04-11 19:10:30.000000000 -0400 ++++ xen-unstable.hg-3.0.5-pre-14797.new/tools/blktap/drivers/block-vmdk.c 2007-04-13 11:32:14.000000000 -0400 +@@ -283,8 +283,10 @@ static uint64_t get_cluster_offset(struc if (!allocate) return 0; cluster_offset = lseek(prv->fd, 0, SEEK_END); @@ -150,4 +135,3 @@ cluster_offset >>= 9; /* update L2 table */ tmp = cpu_to_le32(cluster_offset); -Only in xen-3.0.4_1-src-new/tools/blktap/drivers: block-vmdk.c~ xen-blktap-no-aio-epoll.patch: block-aio.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 80 insertions(+), 23 deletions(-) Index: xen-blktap-no-aio-epoll.patch =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen-blktap-no-aio-epoll.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xen-blktap-no-aio-epoll.patch 24 Oct 2006 17:19:36 -0000 1.2 +++ xen-blktap-no-aio-epoll.patch 1 May 2007 02:27:22 -0000 1.3 @@ -1,13 +1,7 @@ ---- a/tools/blktap/drivers/block-aio.c 2006-09-21 13:45:44.000000000 +0100 -+++ b/tools/blktap/drivers/block-aio.c 2006-09-21 19:58:18.000000000 +0100 -@@ -38,20 +38,13 @@ - #include - #include - #include -+#include - #include - #include - #include +diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/blktap/drivers/block-aio.c xen-unstable.hg-3.0.5-pre-14797.new/tools/blktap/drivers/block-aio.c +--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/blktap/drivers/block-aio.c 2007-04-11 19:10:30.000000000 -0400 ++++ xen-unstable.hg-3.0.5-pre-14797.new/tools/blktap/drivers/block-aio.c 2007-04-13 11:17:08.000000000 -0400 +@@ -44,14 +44,6 @@ #include #include "tapdisk.h" @@ -22,17 +16,17 @@ #define MAX_AIO_REQS (MAX_REQUESTS * MAX_SEGMENTS_PER_REQ) struct pending_aio { -@@ -71,19 +64,24 @@ +@@ -72,12 +64,18 @@ struct tdaio_state { int iocb_free_count; struct iocb *iocb_queue[MAX_AIO_REQS]; int iocb_queued; - int poll_fd; /* NB: we require aio_poll support */ struct io_event aio_events[MAX_AIO_REQS]; + -+ pthread_t aio_thread; ++ pthread_t aio_thread; + /* pipe fds for communication with the aio completion thread */ -+ int command_fd[2]; -+ int completion_fd[2]; ++ int command_fd[2]; ++ int completion_fd[2]; }; #define IOCB_IDX(_s, _io) ((_io) - (_s)->iocb_list) @@ -42,14 +36,7 @@ /*Get Image size, secsize*/ static int get_image_info(struct td_state *s, int fd) { - int ret; - long size; - unsigned long total_size; -- struct statvfs statBuf; - struct stat stat; - - ret = fstat(fd, &stat); -@@ -108,7 +106,6 @@ +@@ -109,7 +107,6 @@ static int get_image_info(struct td_stat /*Get the sector size*/ #if defined(BLKSSZGET) { @@ -57,7 +44,16 @@ s->sector_size = DEFAULT_SECTOR_SIZE; ioctl(fd, BLKSSZGET, &s->sector_size); -@@ -151,11 +148,10 @@ +@@ -148,7 +145,7 @@ static inline void init_fds(struct disk_ + for(i = 0; i < MAX_IOFD; i++) + dd->io_fd[i] = 0; + +- dd->io_fd[0] = prv->poll_fd; ++ dd->io_fd[0] = prv->completion_fd[0]; + } + + /* Open the disk file and initialize aio state. */ +@@ -163,11 +160,10 @@ int tdaio_open (struct disk_driver *dd, prv->iocb_free_count = MAX_AIO_REQS; prv->iocb_queued = 0; @@ -72,60 +68,50 @@ if (ret == -EAGAIN) { DPRINTF("Couldn't setup AIO context. If you are " "trying to concurrently use a large number " -@@ -164,9 +160,7 @@ +@@ -176,9 +172,7 @@ int tdaio_open (struct disk_driver *dd, "(e.g. 'echo echo 1048576 > /proc/sys/fs/" "aio-max-nr')\n"); } else { - DPRINTF("Couldn't get fd for AIO poll support. This " - "is probably because your kernel does not " - "have the aio-poll patch applied.\n"); -+ DPRINTF("Couldn't setup AIO context.\n"); ++ DPRINTF("Couldn't setup AIO context.\n"); } goto done; } -@@ -194,6 +188,15 @@ +@@ -209,6 +203,14 @@ int tdaio_open (struct disk_driver *dd, prv->fd = fd; + pipe(prv->command_fd); + pipe(prv->completion_fd); -+ -+ ret = pthread_create(&prv->aio_thread, NULL, ++ ++ ret = pthread_create(&prv->aio_thread, NULL, + tdaio_completion_thread, prv); + ret = 0; + write(prv->command_fd[1], &ret, sizeof(ret)); + -+ + init_fds(dd); ret = get_image_info(s, fd); - done: - return ret; -@@ -281,7 +284,7 @@ - /*initialise the FD array*/ - for(i=0;ipoll_fd; -+ fds[0] = prv->completion_fd[0]; - return fds; - } -@@ -296,17 +299,61 @@ +@@ -306,17 +308,62 @@ int tdaio_close(struct disk_driver *dd) return 0; } -+/* ++/* + * We don't have any way to do epoll on aio events in a normal kernel, so -+ * wait for aio events in a separate thread and return completion status ++ * wait for aio events in a separate thread and return completion status + * that via a pipe that can be waited on normally. -+ * ++ * + * To keep locking problems between the completion thread and the submit + * thread to a minimum, there's a handshake which allows only one thread + * to be doing work on the completion queue at a time: -+ * ++ * + * 1) main thread sends completion thread a command via the command pipe; -+ * 2) completion thread waits for aio events and returns the number ++ * 2) completion thread waits for aio events and returns the number + * received on the completion pipe + * 3) main thread processes the received prv->aio_events events -+ * 4) loop back to 1) to let the completion thread refill the aio_events ++ * 4) loop back to 1) to let the completion thread refill the aio_events + * buffer. + * + * This workaround needs to disappear once the kernel provides a single @@ -134,34 +120,35 @@ + +static void *tdaio_completion_thread(void *arg) +{ -+ struct tdaio_state *prv = (struct tdaio_state *) arg; -+ int command; -+ int nr_events; -+ int rc; -+ -+ while (1) { -+ rc = read(prv->command_fd[0], &command, sizeof(command)); -+ -+ do { -+ /* Non-blocking test for completed io. */ -+ rc = io_getevents(prv->aio_ctx, 0, -+ MAX_AIO_REQS, prv->aio_events, -+ NULL); -+ if (rc) { -+ nr_events = rc; -+ rc = write(prv->completion_fd[1], &nr_events, -+ sizeof(nr_events)); -+ } -+ } while (!rc); -+ } ++ struct tdaio_state *prv = (struct tdaio_state *) arg; ++ int command; ++ int nr_events; ++ int rc; ++ ++ while (1) { ++ rc = read(prv->command_fd[0], &command, sizeof(command)); ++ ++ do { ++ /* Non-blocking test for completed io. */ ++ rc = io_getevents(prv->aio_ctx, 1, ++ MAX_AIO_REQS, prv->aio_events, ++ NULL); ++ if (rc) { ++ nr_events = rc; ++ rc = write(prv->completion_fd[1], &nr_events, ++ sizeof(nr_events)); ++ } ++ } while (!rc); ++ } +} + - int tdaio_do_callbacks(struct td_state *s, int sid) ++ + int tdaio_do_callbacks(struct disk_driver *dd, int sid) { - int ret, i, rsp = 0; + int ret, i, nr_events, rsp = 0; struct io_event *ep; - struct tdaio_state *prv = (struct tdaio_state *)s->private; + struct tdaio_state *prv = (struct tdaio_state *)dd->private; /* Non-blocking test for completed io. */ - ret = io_getevents(prv->aio_ctx, 0, MAX_AIO_REQS, prv->aio_events, @@ -170,18 +157,18 @@ - for (ep=prv->aio_events,i=ret; i-->0; ep++) { + ret = read(prv->completion_fd[0], &nr_events, sizeof(nr_events)); + -+repeat: ++repeat: + for (ep=prv->aio_events,i=nr_events; i-->0; ep++) { struct iocb *io = ep->obj; struct pending_aio *pio; -@@ -320,6 +367,16 @@ +@@ -327,6 +374,16 @@ int tdaio_do_callbacks(struct disk_drive prv->iocb_free[prv->iocb_free_count++] = io; } + + if (nr_events) { -+ nr_events = io_getevents(prv->aio_ctx, 0, ++ nr_events = io_getevents(prv->aio_ctx, 0, + MAX_AIO_REQS, prv->aio_events, + NULL); + goto repeat; @@ -191,15 +178,4 @@ + return rsp; } - ---- xen-unstable-11539/tools/blktap/drivers/block-aio.c.~1~ 2006-09-25 19:27:39.000000000 +0100 -+++ xen-unstable-11539/tools/blktap/drivers/block-aio.c 2006-09-25 20:00:24.000000000 +0100 -@@ -331,7 +331,7 @@ - - do { - /* Non-blocking test for completed io. */ -- rc = io_getevents(prv->aio_ctx, 0, -+ rc = io_getevents(prv->aio_ctx, 1, - MAX_AIO_REQS, prv->aio_events, - NULL); - if (rc) { + xen-dumpdir.patch: Makefile | 2 +- debugger/gdb/README | 2 +- python/xen/xend/XendDomainInfo.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: xen-dumpdir.patch =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen-dumpdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-dumpdir.patch 22 Jan 2007 16:43:12 -0000 1.1 +++ xen-dumpdir.patch 1 May 2007 02:27:22 -0000 1.2 @@ -1,7 +1,7 @@ -diff -ru xen-3.0.4_1-src/tools/debugger/gdb/README xen-3.0.4_1-src-new/tools/debugger/gdb/README ---- xen-3.0.4_1-src/tools/debugger/gdb/README 2007-01-08 10:00:47.000000000 -0500 -+++ xen-3.0.4_1-src-new/tools/debugger/gdb/README 2007-01-22 11:28:33.000000000 -0500 -@@ -33,6 +33,6 @@ +diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/debugger/gdb/README xen-unstable.hg-3.0.5-pre-14797.new/tools/debugger/gdb/README +--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/debugger/gdb/README 2007-04-11 19:10:30.000000000 -0400 ++++ xen-unstable.hg-3.0.5-pre-14797.new/tools/debugger/gdb/README 2007-04-13 10:37:35.000000000 -0400 +@@ -33,6 +33,6 @@ To debug a crashed domU guest: 1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before starting xend. 2. When the domain crashes, a core file is written to @@ -9,22 +9,22 @@ + '/var/lib/xen/dump/..core'. 3. Run 'gdbserver-xen 127.0.0.1:9999 --file '. 4. Connect to the server as for a running guest. -diff -ru xen-3.0.4_1-src/tools/Makefile xen-3.0.4_1-src-new/tools/Makefile ---- xen-3.0.4_1-src/tools/Makefile 2007-01-08 10:00:46.000000000 -0500 -+++ xen-3.0.4_1-src-new/tools/Makefile 2007-01-22 11:28:13.000000000 -0500 -@@ -41,7 +41,7 @@ +diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/Makefile xen-unstable.hg-3.0.5-pre-14797.new/tools/Makefile +--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/Makefile 2007-04-11 19:10:30.000000000 -0400 ++++ xen-unstable.hg-3.0.5-pre-14797.new/tools/Makefile 2007-04-13 10:37:59.000000000 -0400 +@@ -41,7 +41,7 @@ install: check $(MAKE) -C $$subdir $@; \ done $(MAKE) ioemuinstall -- $(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump -+ $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xen/dump - $(INSTALL_DIR) -p $(DESTDIR)/var/log/xen +- $(INSTALL_DIR) $(DESTDIR)/var/xen/dump ++ $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump + $(INSTALL_DIR) $(DESTDIR)/var/log/xen .PHONY: clean -diff -ru xen-3.0.4_1-src/tools/python/xen/xend/XendDomainInfo.py xen-3.0.4_1-src-new/tools/python/xen/xend/XendDomainInfo.py ---- xen-3.0.4_1-src/tools/python/xen/xend/XendDomainInfo.py 2007-01-08 10:00:50.000000000 -0500 -+++ xen-3.0.4_1-src-new/tools/python/xen/xend/XendDomainInfo.py 2007-01-22 11:29:03.000000000 -0500 -@@ -1151,7 +1151,7 @@ +diff -rupN xen-unstable.hg-3.0.5-pre-14797.orig/tools/python/xen/xend/XendDomainInfo.py xen-unstable.hg-3.0.5-pre-14797.new/tools/python/xen/xend/XendDomainInfo.py +--- xen-unstable.hg-3.0.5-pre-14797.orig/tools/python/xen/xend/XendDomainInfo.py 2007-04-11 19:10:36.000000000 -0400 ++++ xen-unstable.hg-3.0.5-pre-14797.new/tools/python/xen/xend/XendDomainInfo.py 2007-04-13 10:37:35.000000000 -0400 +@@ -1269,7 +1269,7 @@ class XendDomainInfo: try: if not corefile: this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime()) xen-initscript.patch: xend | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 8 deletions(-) Index: xen-initscript.patch =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen-initscript.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xen-initscript.patch 18 Jan 2007 18:19:04 -0000 1.6 +++ xen-initscript.patch 1 May 2007 02:27:22 -0000 1.7 @@ -1,6 +1,6 @@ -diff -ruN xen-3.0.4_1-src.orig/tools/examples/init.d/xend xen-3.0.4_1-src.new/tools/examples/init.d/xend ---- xen-3.0.4_1-src.orig/tools/examples/init.d/xend 2007-01-08 10:00:48.000000000 -0500 -+++ xen-3.0.4_1-src.new/tools/examples/init.d/xend 2007-01-18 12:41:07.000000000 -0500 +diff -rup xen-3.0.5-testing.hg-rc3-14934/tools/examples/init.d/xend xen-3.0.5-testing.hg-rc3-14934.new/tools/examples/init.d/xend +--- xen-3.0.5-testing.hg-rc3-14934/tools/examples/init.d/xend 2007-04-26 19:31:46.000000000 -0400 ++++ xen-3.0.5-testing.hg-rc3-14934.new/tools/examples/init.d/xend 2007-04-26 19:32:47.000000000 -0400 @@ -7,40 +7,66 @@ # chkconfig: 2345 98 01 # description: Starts and stops the Xen control daemon. @@ -42,10 +42,10 @@ start) - xend start + echo -n $"Starting $prog: " -+ modprobe blkbk -+ modprobe blktap -+ modprobe netbk -+ modprobe netloop ++ modprobe blkbk 2>/dev/null ++ modprobe blktap 2>/dev/null ++ modprobe xenblktap 2>/dev/null ++ modprobe netbk 2>/dev/null + /usr/sbin/xend start await_daemons_up ;; @@ -75,7 +75,7 @@ await_daemons_up ;; *) -@@ -50,5 +76,12 @@ +@@ -50,5 +76,12 @@ case "$1" in exit 1 esac xen-pvfb-compat.patch: b/tools/xenfb/oldxenfb.c | 611 ++++++++++++++++++++++++++++++++++ b/tools/xenfb/oldxenfb.h | 108 ++++++ b/tools/xenfb/oldxenkbd.h | 92 +++++ tools/python/xen/xend/server/vfbif.py | 3 tools/python/xen/xm/create.py | 18 + tools/xenfb/Makefile | 15 tools/xenfb/sdlfb.c | 11 tools/xenfb/vncfb.c | 11 tools/xenfb/xenfb.c | 57 +++ tools/xenfb/xenfb.h | 2 10 files changed, 925 insertions(+), 3 deletions(-) Index: xen-pvfb-compat.patch =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen-pvfb-compat.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-pvfb-compat.patch 23 Jan 2007 17:35:26 -0000 1.1 +++ xen-pvfb-compat.patch 1 May 2007 02:27:22 -0000 1.2 @@ -1,9 +1,10 @@ diff -r a2618d3912e7 tools/python/xen/xend/server/vfbif.py --- a/tools/python/xen/xend/server/vfbif.py Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/python/xen/xend/server/vfbif.py Tue Dec 05 10:29:17 2006 +0100 -@@ -37,5 +37,8 @@ class VfbifController(DevController): - def createDevice(self, config): - DevController.createDevice(self, config) +@@ -50,6 +50,9 @@ class VfbifController(DevController): + # is HVM, so qemu-dm will handle the vfb. + return + + # old frontend compatibility + self.vm._writeDom("console/use_graphics", "1") + # /old @@ -44,12 +45,12 @@ @@ -13,12 +17,14 @@ all: build .PHONY: build - build: mk-symlinks + build: - $(MAKE) vncfb sdlfb + $(MAKE) vncfb sdlfb vncfbo sdlfbo install: all - $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)/xen/bin + $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin $(INSTALL_PROG) vncfb $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-vncfb $(INSTALL_PROG) sdlfb $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-sdlfb + $(INSTALL_PROG) vncfbo $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-vncfbo Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- xen.spec 14 Mar 2007 20:30:05 -0000 1.171 +++ xen.spec 1 May 2007 02:27:22 -0000 1.172 @@ -2,26 +2,23 @@ Summary: Xen is a virtual machine monitor Name: xen -Version: 3.0.4 -Release: 9%{dist} +Version: 3.0.5 +Release: 0.rc4.1%{dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html -Source0: http://bits.xensource.com/oss-xen/release/3.0.4-1/src.tgz/xen-3.0.4_1-src.tgz +Source0: xen-3.0.5-testing.hg-rc4.tar.gz Source1: http://download.sf.net/libvncserver/LibVNCServer-0.8.2.tar.gz Patch1: xen-initscript.patch +Patch2: xen-remove-python-path-check.patch Patch3: xen-compile-fixes.patch -Patch6: xen-network-iptables-bridge.patch +Patch6: xen-net-bridge.patch +Patch7: xen-mem-pre-balloon.patch Patch13: xen-dumpdir.patch -Patch14: xen-pygrub-memcorruption.patch -Patch15: xen-vnclisten-config.patch -Patch16: xen-hotplug-error-reporting.patch -Patch17: xen-vnc-mouse-buttons.patch Patch18: xen-block-readonly.patch + Patch20: xen-blktap-no-aio-epoll.patch Patch21: xen-blktap-error-returns.patch -Patch22: xen-boot-raw-tap.patch -Patch23: xen-qemu-close-fds.patch Patch24: xen-remove-vnc-monitor.patch # Patches to modify the default config of xend @@ -32,11 +29,12 @@ # Hack to support guest kernels using old PVFB protocol # from FC5/6 days. Can kill off once FC6 is EOL'd Patch150: xen-pvfb-compat.patch -Patch151: xen-pvfb-compat-nohvm.patch -Patch152: xen-pvfb-terminate.patch Patch251: pygrub-manykernels.patch +# Performance fix for listing domains +Patch280: xen-xs-transactions.patch + # libVNCserver patches Patch300: vnc-thread-fixes.patch @@ -95,22 +93,18 @@ virtual machines. %prep -%setup -q -n xen-3.0.4_1-src -a 1 +%setup -q -n xen-3.0.5-testing.hg-rc4 -a 1 %patch1 -p1 -b .init +%patch2 -p1 %patch3 -p1 -b .compile %patch6 -p1 +%patch7 -p1 %patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 %patch18 -p1 # blktap patches %patch20 -p1 %patch21 -p1 -%patch22 -p1 -%patch23 -p1 %patch24 -p1 # config patches @@ -120,12 +114,13 @@ # pvfb compat %patch150 -p1 -%patch151 -p0 -%patch152 -p1 # upstream patches %patch251 -p1 +# performance patch +%patch280 -p1 + # libVNCserver patches pushd LibVNCServer-0.8.2 # thread locking fixes @@ -185,6 +180,8 @@ # avoid conflicting with qemu (#199759) rm -f %{buildroot}/%{_mandir}/man*/qemu* +#find_lang xen-xm + %post /sbin/chkconfig --add xend /sbin/chkconfig --add xendomains @@ -198,6 +195,7 @@ %clean rm -rf $RPM_BUILD_ROOT +#files -f xen-xm.lang %files %defattr(-,root,root) %doc COPYING README @@ -215,7 +213,10 @@ %dir /usr/lib/xen/boot /usr/lib/xen/boot/hvmloader %endif +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.dtd %dir %{_datadir}/%{name}/qemu +%dir %{_datadir}/%{name}/qemu/keymaps %{_datadir}/%{name}/qemu/keymaps/* %dir %{_localstatedir}/lib/%{name} %{_localstatedir}/lib/%{name}/* @@ -226,7 +227,7 @@ %config(noreplace) %{_sysconfdir}/sysconfig/xendomains %dir %{_localstatedir}/lib/xenstored %dir %{_localstatedir}/run/xenstored -%dir %{_localstatedir}/run/xend +%dir %attr(0700,root,root) %{_localstatedir}/run/xend %dir %attr(0700,root,root) /var/log/xen %files libs @@ -243,6 +244,28 @@ %{_libdir}/*.a %changelog +* Mon Apr 30 2007 Daniel P. Berrange - 3.0.5-0.rc4.1.fc7 +- Updated to 3.0.5 rc4, changeset 14993 +- Reduce number of xenstore transactions used for listing domains +- Hack to pre-balloon 2 MB for PV guests as well as HVM + +* Thu Apr 26 2007 Daniel P. Berrange - 3.0.5-0.rc3.14934.2.fc7 +- Fixed display of bootloader menu with xm create -c +- Added modprobe for both xenblktap & blktap to deal with rename issues +- Hack to pre-balloon 10 MB for HVM guests + +* Thu Apr 26 2007 Daniel P. Berrange - 3.0.5-0.rc3.14934.1.fc7 +- Updated to 3.0.5 rc3, changeset 14934 +- Fixed networking for service xend restart & minor IPv6 tweak + +* Tue Apr 24 2007 Daniel P. Berrange - 3.0.5-0.rc2.14889.2.fc7 +- Fixed vfb/vkbd device startup race + +* Tue Apr 24 2007 Daniel P. Berrange - 3.0.5-0.rc2.14889.1.fc7 +- Updated to xen 3.0.5 rc2, changeset 14889 +- Remove use of netloop from network-bridge script +- Add backcompat support to vif-bridge script to translate xenbrN to ethN + * Wed Mar 14 2007 Daniel P. Berrange - 3.0.4-9.fc7 - Disable access to QEMU monitor over VNC (CVE-2007-0998, bz 230295) --- xen-boot-raw-tap.patch DELETED --- --- xen-hotplug-error-reporting.patch DELETED --- --- xen-network-iptables-bridge.patch DELETED --- --- xen-pvfb-compat-nohvm.patch DELETED --- --- xen-pvfb-terminate.patch DELETED --- --- xen-pygrub-memcorruption.patch DELETED --- --- xen-qemu-close-fds.patch DELETED --- --- xen-vnc-mouse-buttons.patch DELETED --- --- xen-vnclisten-config.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 1 02:42:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Apr 2007 22:42:38 -0400 Subject: rpms/scim/devel initial-locale-hotkey-186861.patch, 1.4, 1.5 scim-system-config, 1.1, 1.2 scim.spec, 1.84, 1.85 Message-ID: <200705010242.l412gcPr028489@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/scim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28321 Modified Files: initial-locale-hotkey-186861.patch scim-system-config scim.spec Log Message: - unrevert the last changes to initial-locale-hotkey-186861.patch to allow no hotkey to be set and define Ctrl+space as the default hotkey for all locale again in system config - require im-chooser initial-locale-hotkey-186861.patch: scim_hotkey.cpp | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) Index: initial-locale-hotkey-186861.patch =================================================================== RCS file: /cvs/dist/rpms/scim/devel/initial-locale-hotkey-186861.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- initial-locale-hotkey-186861.patch 19 Apr 2007 03:40:38 -0000 1.4 +++ initial-locale-hotkey-186861.patch 1 May 2007 02:42:35 -0000 1.5 @@ -1,7 +1,10 @@ ---- scim-1.4.5/src/scim_hotkey.cpp.8-hotkey 2005-06-18 23:19:35.000000000 +1000 -+++ scim-1.4.5/src/scim_hotkey.cpp 2006-12-12 16:22:59.000000000 +1000 -@@ -332,9 +332,9 @@ - "Control+space", +--- scim-1.4.5/src/scim_hotkey.cpp.8-hotkey~ 2005-06-18 23:19:35.000000000 +1000 ++++ scim-1.4.5/src/scim_hotkey.cpp 2007-04-17 10:15:41.000000000 +1000 +@@ -329,12 +329,12 @@ + static char *__scim_frontend_hotkey_defaults [] = + { + 0, +- "Control+space", "", "", - "Control+Alt+Down,Control+Shift+Shift_L+KeyRelease,Control+Shift+Shift_R+KeyRelease", @@ -10,6 +13,7 @@ + "", + "", + "", ++ "", 0 }; Index: scim-system-config =================================================================== RCS file: /cvs/dist/rpms/scim/devel/scim-system-config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scim-system-config 11 Apr 2007 08:18:47 -0000 1.1 +++ scim-system-config 1 May 2007 02:42:35 -0000 1.2 @@ -26,28 +26,9 @@ /Hotkeys/FrontEnd/PreviousFactory/zh_SG = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R /Hotkeys/FrontEnd/PreviousFactory/zh_TW = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R /Hotkeys/FrontEnd/ShowFactoryMenu = -/Hotkeys/FrontEnd/Trigger = -/Hotkeys/FrontEnd/Trigger/as_IN = Control+space -/Hotkeys/FrontEnd/Trigger/bn_BD = Control+space -/Hotkeys/FrontEnd/Trigger/bn_IN = Control+space -/Hotkeys/FrontEnd/Trigger/gu_IN = Control+space -/Hotkeys/FrontEnd/Trigger/hi_IN = Control+space +/Hotkeys/FrontEnd/Trigger = Control+space /Hotkeys/FrontEnd/Trigger/ja_JP = Zenkaku_Hankaku,Alt+grave,Control+space -/Hotkeys/FrontEnd/Trigger/kn_IN = Control+space /Hotkeys/FrontEnd/Trigger/ko_KR = Alt+Alt_L+KeyRelease,Shift+space,Control+space,Hangul -/Hotkeys/FrontEnd/Trigger/ml_IN = Control+space -/Hotkeys/FrontEnd/Trigger/mr_IN = Control+space -/Hotkeys/FrontEnd/Trigger/or_IN = Control+space -/Hotkeys/FrontEnd/Trigger/pa_IN = Control+space -/Hotkeys/FrontEnd/Trigger/si_LK = Control+space -/Hotkeys/FrontEnd/Trigger/ta_IN = Control+space -/Hotkeys/FrontEnd/Trigger/te_IN = Control+space -/Hotkeys/FrontEnd/Trigger/th_TH = Control+space -/Hotkeys/FrontEnd/Trigger/ur_IN = Control+space -/Hotkeys/FrontEnd/Trigger/zh_CN = Control+space -/Hotkeys/FrontEnd/Trigger/zh_HK = Control+space -/Hotkeys/FrontEnd/Trigger/zh_SG = Control+space -/Hotkeys/FrontEnd/Trigger/zh_TW = Control+space /Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta+Super+Hyper /Panel/Gtk/Color/ActiveBackground = light sky blue /Panel/Gtk/Color/ActiveText = black Index: scim.spec =================================================================== RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- scim.spec 19 Apr 2007 03:40:38 -0000 1.84 +++ scim.spec 1 May 2007 02:42:35 -0000 1.85 @@ -3,7 +3,7 @@ Name: scim Version: 1.4.5 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -25,11 +25,7 @@ Requires: %{name}-libs = %{version}-%{release} # for xinputrc (fc6) Requires: xorg-x11-xinit >= 1.0.2-5 -#- require other im-scim.so too on multilib archs (G Rajesh, #188398) -## require 32bit gtk IM module for 64bit multilib arches -#%%ifarch x86_64 s390x -#Requires: %{_prefix}/lib/gtk-2.0/immodules/im-scim.so -#%%endif +Requires: im-chooser Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives Obsoletes: iiimf-gtk <= 1:12.2, iiimf-gnome-im-switcher <= 1:12.2, iiimf-server <= 1:12.2, iiimf-x <= 1:12.2 @@ -254,6 +250,12 @@ %changelog +* Tue May 1 2007 Jens Petersen - 1.4.5-16 +- unrevert the last changes to initial-locale-hotkey-186861.patch to allow + no hotkey to be set and define Ctrl+space as default hotkey for all locale + again in system config +- require im-chooser + * Wed Apr 18 2007 Warren Togami - 1.4.5-15 - revert previous change made in #235435 due to a more complete solution in #236974. SCIM will no longer start by default on non-Asian locales. From fedora-cvs-commits at redhat.com Tue May 1 03:04:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Apr 2007 23:04:46 -0400 Subject: rpms/xen/devel .cvsignore, 1.29, 1.30 sources, 1.44, 1.45 xen.spec, 1.172, 1.173 Message-ID: <200705010304.l4134k5t011843@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11783 Modified Files: .cvsignore sources xen.spec Log Message: Update source tar.gz entry Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xen/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 11 Jan 2007 17:21:58 -0000 1.29 +++ .cvsignore 1 May 2007 03:04:44 -0000 1.30 @@ -1,2 +1,2 @@ LibVNCServer-0.8.2.tar.gz -xen-3.0.4_1-src.tgz +xen-3.0.5-testing.hg-rc4.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xen/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 11 Jan 2007 17:21:58 -0000 1.44 +++ sources 1 May 2007 03:04:44 -0000 1.45 @@ -1,2 +1,2 @@ 17a18e398af6c1730f72068022a152aa LibVNCServer-0.8.2.tar.gz -e85e16ad3dc354338e3ac4a8951f9649 xen-3.0.4_1-src.tgz +9159d457c35de26626a09f358eeb5faa xen-3.0.5-testing.hg-rc4.tar.gz Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- xen.spec 1 May 2007 02:27:22 -0000 1.172 +++ xen.spec 1 May 2007 03:04:44 -0000 1.173 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.5 -Release: 0.rc4.1%{dist} +Release: 0.rc4.2%{dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -244,6 +244,9 @@ %{_libdir}/*.a %changelog +* Mon Apr 30 2007 Daniel P. Berrange - 3.0.5-0.rc4.2.fc7 +- Redo failed build. + * Mon Apr 30 2007 Daniel P. Berrange - 3.0.5-0.rc4.1.fc7 - Updated to 3.0.5 rc4, changeset 14993 - Reduce number of xenstore transactions used for listing domains From fedora-cvs-commits at redhat.com Tue May 1 03:18:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Apr 2007 23:18:07 -0400 Subject: rpms/xen/devel xen.spec,1.173,1.174 Message-ID: <200705010318.l413I7Ks021696@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21639 Modified Files: xen.spec Log Message: Added BR on gettext Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- xen.spec 1 May 2007 03:04:44 -0000 1.173 +++ xen.spec 1 May 2007 03:18:04 -0000 1.174 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.5 -Release: 0.rc4.2%{dist} +Release: 0.rc4.3%{dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -52,6 +52,7 @@ # for the VMX "bios" BuildRequires: dev86 %endif +BuildRequires: gettext Requires: bridge-utils Requires: udev >= 059 Requires: python-virtinst @@ -244,6 +245,9 @@ %{_libdir}/*.a %changelog +* Mon Apr 30 2007 Daniel P. Berrange - 3.0.5-0.rc4.3.fc7 +- Added BR on gettext + * Mon Apr 30 2007 Daniel P. Berrange - 3.0.5-0.rc4.2.fc7 - Redo failed build. From fedora-cvs-commits at redhat.com Tue May 1 04:58:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 00:58:37 -0400 Subject: rpms/rpm/devel rpm-4.4.2-prefer-elf32.patch, NONE, 1.1 rpm.spec, 1.229, 1.230 Message-ID: <200705010458.l414wbCT031543@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31466 Modified Files: rpm.spec Added Files: rpm-4.4.2-prefer-elf32.patch Log Message: * Tue May 01 2007 Paul Nasrat - 4.4.2-46 - Configurable policy for prefered ELF (#235757) - Resolves: rhbz#235757 rpm-4.4.2-prefer-elf32.patch: rpmts.c | 6 ++++++ rpmts.h | 9 +++++++++ transaction.c | 16 +++++++++------- 3 files changed, 24 insertions(+), 7 deletions(-) --- NEW FILE rpm-4.4.2-prefer-elf32.patch --- --- rpm-4.4.2/lib/transaction.c.prefer32 2007-04-25 12:10:25.000000000 +0100 +++ rpm-4.4.2/lib/transaction.c 2007-04-25 12:38:32.000000000 +0100 @@ -122,6 +122,7 @@ static int handleInstInstalledFiles(cons /*@modifies ts, fi, rpmGlobalMacroContext, fileSystem, internalState @*/ { uint_32 tscolor = rpmtsColor(ts); + uint_32 prefcolor = rpmtsPrefColor(ts); uint_32 otecolor, tecolor; uint_32 oFColor, FColor; const char * altNEVR = NULL; @@ -199,11 +200,11 @@ static int handleInstInstalledFiles(cons /* Resolve file conflicts to prefer Elf64 (if not forced). */ if (tscolor != 0 && FColor != 0 && FColor != oFColor) { - if (oFColor & 0x2) { + if (oFColor & prefcolor) { fi->actions[fileNum] = FA_SKIPCOLOR; rConflicts = 0; } else - if (FColor & 0x2) { + if (FColor & prefcolor) { fi->actions[fileNum] = FA_CREATE; rConflicts = 0; } @@ -458,6 +459,7 @@ static void handleOverlappedFiles(const if (fi != NULL) while ((i = rpmfiNext(fi)) >= 0) { uint_32 tscolor = rpmtsColor(ts); + uint_32 prefcolor = rpmtsPrefColor(ts); uint_32 oFColor, FColor; struct fingerPrint_s * fiFps; int otherPkgNum, otherFileNum; @@ -570,19 +572,19 @@ assert(otherFi != NULL); rConflicts = reportConflicts; /* Resolve file conflicts to prefer Elf64 (if not forced) ... */ if (tscolor != 0) { - if (FColor & 0x2) { - /* ... last Elf64 file is installed ... */ + if (FColor & prefcolor) { + /* ... last file of preferred colour is installed ... */ if (!XFA_SKIPPING(fi->actions[i])) { /* XXX static helpers are order dependent. Ick. */ if (strcmp(fn, "/usr/sbin/libgcc_post_upgrade") && strcmp(fn, "/usr/sbin/glibc_post_upgrade")) - otherFi->actions[otherFileNum] = FA_SKIP; + otherFi->actions[otherFileNum] = FA_SKIPCOLOR; } fi->actions[i] = FA_CREATE; rConflicts = 0; } else - if (oFColor & 0x2) { - /* ... first Elf64 file is installed ... */ + if (oFColor & prefcolor) { + /* ... first file of preferred colour is installed ... */ if (XFA_SKIPPING(fi->actions[i])) otherFi->actions[otherFileNum] = FA_CREATE; fi->actions[i] = FA_SKIPCOLOR; --- rpm-4.4.2/lib/rpmts.c.prefer32 2005-02-13 03:12:03.000000000 +0000 +++ rpm-4.4.2/lib/rpmts.c 2007-04-25 12:37:45.000000000 +0100 @@ -1475,6 +1475,11 @@ uint_32 rpmtsSetColor(rpmts ts, uint_32 return ocolor; } +uint_32 rpmtsPrefColor(rpmts ts) +{ + return (ts != NULL ? ts->prefcolor : 0); +} + rpmop rpmtsOp(rpmts ts, rpmtsOpX opx) { rpmop op = NULL; @@ -1554,6 +1559,7 @@ rpmts rpmtsCreate(void) ts->delta = 5; ts->color = rpmExpandNumeric("%{?_transaction_color}"); + ts->prefcolor = rpmExpandNumeric("%{?_prefer_color}")?:2; ts->numRemovedPackages = 0; ts->allocedRemovedPackages = ts->delta; --- rpm-4.4.2/lib/rpmts.h.prefer32 2005-01-04 16:35:05.000000000 +0000 +++ rpm-4.4.2/lib/rpmts.h 2007-04-25 12:33:39.000000000 +0100 @@ -309,6 +309,7 @@ struct rpmts_s { int_32 tid; /*!< Transaction id. */ uint_32 color; /*!< Transaction color bits. */ + uint_32 prefcolor; /*!< Preferred file color. */ rpmVSFlags vsflags; /*!< Signature/digest verification flags. */ @@ -983,6 +984,14 @@ uint_32 rpmtsColor(rpmts ts) /*@*/; /** + * Retrieve prefered file color + * @param ts transaction set + * @return color bits + */ +uint_32 rpmtsPrefColor(rpmts ts) + /*@*/; + +/** * Set color bits of transaction set. * @param ts transaction set * @param color new color bits Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- rpm.spec 23 Apr 2007 10:37:25 -0000 1.229 +++ rpm.spec 1 May 2007 04:58:35 -0000 1.230 @@ -17,7 +17,7 @@ Name: rpm Version: 4.4.2 %{expand: %%define rpm_version %{version}} -Release: 45%{?dist} +Release: 46%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source: rpm-%{rpm_version}.tar.gz @@ -67,6 +67,7 @@ Patch41: rpm-4.4.2-cdiff.patch Patch42: rpm-4.4.2-docflags.patch Patch43: rpm-debugedit-incremental-fix.patch +Patch44: rpm-4.4.2-prefer-elf32.patch License: GPL Requires: patch > 2.5 Prereq: shadow-utils @@ -212,6 +213,7 @@ %patch41 -p1 -b .cdiff %patch42 -p1 -b .docflags %patch43 -p1 -b .debugcan2 +%patch44 -p1 -b .elfprefer # rebuild configure for ipv6 autoconf @@ -573,6 +575,9 @@ %{__includedir}/popt.h %changelog +* Tue May 01 2007 Paul Nasrat - 4.4.2-46 +- Configurable policy for prefered ELF (#235757) + * Mon Apr 23 2007 Paul Nasrat - 4.4.2-45 - Fix debugedit for relative paths (#232222) From fedora-cvs-commits at redhat.com Tue May 1 07:46:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 03:46:32 -0400 Subject: rpms/gimp/devel gimp.spec,1.123,1.124 Message-ID: <200705010746.l417kWgu015238@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15224 Modified Files: gimp.spec Log Message: don't let gimp-plugin-mgr --uninstall fail %pre/%preun scriptlets Index: gimp.spec =================================================================== RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- gimp.spec 30 Apr 2007 19:37:26 -0000 1.123 +++ gimp.spec 1 May 2007 07:46:30 -0000 1.124 @@ -273,7 +273,7 @@ # First, remove old symlinks which are possibly in an old location (before a # major version update) if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then - %{_sbindir}/gimp-plugin-mgr --uninstall '*' + %{_sbindir}/gimp-plugin-mgr --uninstall '*' || : fi %post @@ -288,7 +288,7 @@ %preun # Only delete symlinks when uninstalling if [ "$1" = "0" ]; then - %{_sbindir}/gimp-plugin-mgr --uninstall '*' + %{_sbindir}/gimp-plugin-mgr --uninstall '*' || : fi %postun @@ -421,6 +421,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue May 01 2007 Nils Philippsen - 2:2.2.14-5 +- don't let gimp-plugin-mgr --uninstall fail %%pre/%%preun scriptlets + * Mon Apr 30 2007 Nils Philippsen - 2:2.2.14-4 - fix plugin symlinks handling better (#238337) From fedora-cvs-commits at redhat.com Tue May 1 07:50:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 03:50:01 -0400 Subject: rpms/gimp/devel gimp.spec,1.124,1.125 Message-ID: <200705010750.l417o140015294@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15276 Modified Files: gimp.spec Log Message: Resolves: #238337 Index: gimp.spec =================================================================== RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- gimp.spec 1 May 2007 07:46:30 -0000 1.124 +++ gimp.spec 1 May 2007 07:49:59 -0000 1.125 @@ -422,7 +422,7 @@ %changelog * Tue May 01 2007 Nils Philippsen - 2:2.2.14-5 -- don't let gimp-plugin-mgr --uninstall fail %%pre/%%preun scriptlets +- don't let gimp-plugin-mgr --uninstall fail %%pre/%%preun scriptlets (#238337) * Mon Apr 30 2007 Nils Philippsen - 2:2.2.14-4 - fix plugin symlinks handling better (#238337) From fedora-cvs-commits at redhat.com Tue May 1 07:51:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 03:51:25 -0400 Subject: rpms/gimp/devel gimp.spec,1.125,1.126 Message-ID: <200705010751.l417pPql015375@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15357 Modified Files: gimp.spec Log Message: bump release Index: gimp.spec =================================================================== RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- gimp.spec 1 May 2007 07:49:59 -0000 1.125 +++ gimp.spec 1 May 2007 07:51:22 -0000 1.126 @@ -43,7 +43,7 @@ %define age 0 %define minorver 200 %define microver %(ver=%{version}; echo ${ver##*.*.}) -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 2 License: GPL, LGPL Group: Applications/Multimedia From fedora-cvs-commits at redhat.com Tue May 1 08:58:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 04:58:34 -0400 Subject: rpms/eclipse/FC-6 eclipse-launcher-addplatformtotildeeclipse.patch, 1.3, 1.4 eclipse.spec, 1.356, 1.357 Message-ID: <200705010858.l418wYB0016411@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16134 Modified Files: eclipse-launcher-addplatformtotildeeclipse.patch eclipse.spec Log Message: * Tue May 01 2007 Ben Konrath 3.2.2-5.fc6 - Bug fix in launcher-addplatformtotildeeclipse.patch. - Resolves: #238107. eclipse-launcher-addplatformtotildeeclipse.patch: eclipse.c | 2 + gtk/eclipseGtk.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) Index: eclipse-launcher-addplatformtotildeeclipse.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-launcher-addplatformtotildeeclipse.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eclipse-launcher-addplatformtotildeeclipse.patch 30 Apr 2007 17:58:46 -0000 1.3 +++ eclipse-launcher-addplatformtotildeeclipse.patch 1 May 2007 08:58:31 -0000 1.4 @@ -4,7 +4,7 @@ retrieving revision 1.71 diff -u -r1.71 eclipse.c --- library/eclipse.c 25 Apr 2006 14:31:50 -0000 1.71 -+++ library/eclipse.c 30 Apr 2007 17:43:21 -0000 ++++ library/eclipse.c 1 May 2007 08:48:33 -0000 @@ -512,6 +513,8 @@ /* Get the command to start the Java VM. */ vmCommandArgs = getVMCommand( argc, argv ); @@ -20,8 +20,8 @@ retrieving revision 1.27 diff -u -r1.27 eclipseGtk.c --- library/gtk/eclipseGtk.c 27 Mar 2006 18:25:42 -0000 1.27 -+++ library/gtk/eclipseGtk.c 30 Apr 2007 17:43:21 -0000 -@@ -335,3 +335,95 @@ ++++ library/gtk/eclipseGtk.c 1 May 2007 08:48:33 -0000 +@@ -335,3 +335,109 @@ gtk_main_quit(); return FALSE; } @@ -43,6 +43,12 @@ + /* If platform.xml doesn't exist, Eclipse has yet to be started. + * We don't have worry about doing anything now and in the future + * so add the appropriate file to ~/.eclipse. */ ++ if (g_mkdir(g_strconcat(g_get_home_dir(), "/.eclipse", NULL), 493) < 0) ++ { ++ g_print("Error creating ~/.eclipse/."); ++ g_print(g_strconcat(error->message, "\n\0", NULL)); ++ g_free(error); ++ } + if (g_file_set_contents(touched, "\0", -1, &error) == FALSE) + { + g_print("Error touching ~/.eclipse/.homedirmodified-fedora."); @@ -105,14 +111,22 @@ + } + + /* At this point platform_xml exists and touched does not exist. */ -+ if (g_remove (platform_xml) < 0) ++ if (g_remove(platform_xml) < 0) + { + g_print("Error writing platform.xml in ~/.eclipse.\ + You should remove ~/.eclipse before restarting Eclipse:\0"); + g_print(g_strconcat(error->message, "\n\0", NULL)); + g_free(error); ++ g_free(platform_xml); ++ g_free(touched); ++ return; ++ } ++ if (g_file_set_contents(touched, "\0", -1, &error) == FALSE) ++ { ++ g_print("Error touching ~/.eclipse/.homedirmodified-fedora."); ++ g_print(g_strconcat(error->message, "\n\0", NULL)); ++ g_free(error); + } -+ + g_free(platform_xml); + g_free(touched); + return; Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v retrieving revision 1.356 retrieving revision 1.357 diff -u -r1.356 -r1.357 --- eclipse.spec 30 Apr 2007 17:58:46 -0000 1.356 +++ eclipse.spec 1 May 2007 08:58:31 -0000 1.357 @@ -19,6 +19,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} +Release: 5%{?dist} Release: 4%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) @@ -1763,6 +1764,10 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Tue May 01 2007 Ben Konrath 3.2.2-5.fc6 +- Bug fix in launcher-addplatformtotildeeclipse.patch. +- Resolves: #238107. + * Mon Apr 30 2007 Ben Konrath 3.2.2-4.fc6 - Add workaround in launcher-addplatformtotildeeclipse.patch for problems caused by bug #238107. From fedora-cvs-commits at redhat.com Tue May 1 08:59:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 04:59:49 -0400 Subject: rpms/eclipse/FC-6 eclipse.spec,1.357,1.358 Message-ID: <200705010859.l418xnZX017436@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17382 Modified Files: eclipse.spec Log Message: Fix duplicate Release entries problem Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v retrieving revision 1.357 retrieving revision 1.358 diff -u -r1.357 -r1.358 --- eclipse.spec 1 May 2007 08:58:31 -0000 1.357 +++ eclipse.spec 1 May 2007 08:59:47 -0000 1.358 @@ -20,7 +20,6 @@ Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} Release: 5%{?dist} -Release: 4%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ From fedora-cvs-commits at redhat.com Tue May 1 09:33:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 05:33:05 -0400 Subject: rpms/control-center/devel control-center-trunk-set-face-perms-4.patch, NONE, 1.1 control-center.spec, 1.248, 1.249 Message-ID: <200705010933.l419X5ks008591@cvs.devel.redhat.com> Author: bnocera Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8372 Modified Files: control-center.spec Added Files: control-center-trunk-set-face-perms-4.patch Log Message: * Tue May 01 2007 - Bastien Nocera - 2.18.0-15 - Add a patch to set the permissions on ~/.face so that GDM can show them (#236393) control-center-trunk-set-face-perms-4.patch: gnome-about-me.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) --- NEW FILE control-center-trunk-set-face-perms-4.patch --- Index: gnome-about-me.c =================================================================== --- gnome-about-me.c (revision 7519) +++ gnome-about-me.c (working copy) @@ -23,6 +23,7 @@ # include #endif +#include #include #include #include @@ -452,7 +453,7 @@ GladeXML *dialog; EContactPhoto *photo; gchar *file; - FILE *fp; + GError *error; guchar *data; gsize length; @@ -515,12 +516,19 @@ /* Save the image for GDM */ /* FIXME: I would have to read the default used by the gdmgreeter program */ - file = g_strdup_printf ("%s/.face", g_get_home_dir ()); - fp = fopen (file, "wb"); - fwrite (photo->data.inlined.data, 1, photo->data.inlined.length, fp); - fclose (fp); + error = NULL; + file = g_build_filename (g_get_home_dir (), ".face", NULL); + if (g_file_set_contents (file, + photo->data.inlined.data, + photo->data.inlined.length, + &error) != FALSE) { + g_chmod (file, 0644); + } else { + g_warning ("Could not create %s: %s", file, error->message); + g_error_free (error); + } - g_free (file); + g_free (file); e_contact_photo_free (photo); Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- control-center.spec 18 Apr 2007 15:18:29 -0000 1.248 +++ control-center.spec 1 May 2007 09:33:02 -0000 1.249 @@ -21,7 +21,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.18.0 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 License: GPL/LGPL Group: User Interface/Desktops @@ -61,6 +61,9 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=430889 Patch16: control-center-2.18.0-be-more-async.patch +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=236393 +Patch17: control-center-trunk-set-face-perms-4.patch + # call the Fedora/RHEL graphical passwd changing apps Patch95: control-center-2.17.91-passwd.patch Patch96: control-center-2.18.0-gecos.patch @@ -327,6 +330,10 @@ %{_libdir}/pkgconfig/* %changelog +* Tue May 01 2007 - Bastien Nocera - 2.18.0-15 +- Add a patch to set the permissions on ~/.face so that GDM can + show them (#236393) + * Wed Apr 18 2007 Soren Sandmann - 2.18.0-14 - Add control-center-2.18.0-gnome-bg.patch contents. Apply it again From fedora-cvs-commits at redhat.com Tue May 1 10:20:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 06:20:55 -0400 Subject: rpms/control-center/devel control-center.spec,1.249,1.250 Message-ID: <200705011020.l41AKtlA007448@cvs.devel.redhat.com> Author: bnocera Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7434 Modified Files: control-center.spec Log Message: * Tue May 01 2007 - Bastien Nocera - 2.18.0-16 - Add missing dbus-x11 dependency, otherwise gnome-settings-daemon cannot be started (#204706) Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- control-center.spec 1 May 2007 09:33:02 -0000 1.249 +++ control-center.spec 1 May 2007 10:20:53 -0000 1.250 @@ -21,7 +21,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.18.0 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 License: GPL/LGPL Group: User Interface/Desktops @@ -92,6 +92,7 @@ Requires: gnome-menus >= %{gnome_menus_version} Requires: usermode >= %{usermode_version} Requires: gnome-desktop >= %{gnome_desktop_version} +Requires: dbus-x11 BuildRequires: autoconf automake libtool BuildRequires: esound-devel @@ -330,6 +331,10 @@ %{_libdir}/pkgconfig/* %changelog +* Tue May 01 2007 - Bastien Nocera - 2.18.0-16 +- Add missing dbus-x11 dependency, otherwise gnome-settings-daemon + cannot be started (#204706) + * Tue May 01 2007 - Bastien Nocera - 2.18.0-15 - Add a patch to set the permissions on ~/.face so that GDM can show them (#236393) From fedora-cvs-commits at redhat.com Tue May 1 12:07:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 08:07:00 -0400 Subject: rpms/gimp/FC-6 .cvsignore, 1.28, 1.29 gimp.spec, 1.111, 1.112 sources, 1.28, 1.29 Message-ID: <200705011207.l41C70oW030791@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv30762 Modified Files: .cvsignore gimp.spec sources Log Message: don't let gimp-plugin-mgr --uninstall fail %%pre/%%preun scriptlets (#238337) don't erroneously delete symlinks to external plugins when updating (#238337) avoid buffer overflow in sunras plugin (#238422) version 2.2.14 don't BuildRequire gimp-print/gutenprint anymore own used directories in gimp-devel (#233794) s/%%redhat/%%rhel/g change defaults for use of modular X and lcms (#224156) Resolves: #238337, #238422, #233794, #224156 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gimp/FC-6/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 25 Aug 2006 16:19:30 -0000 1.28 +++ .cvsignore 1 May 2007 12:06:57 -0000 1.29 @@ -1 +1 @@ -gimp-2.2.13.tar.bz2 +gimp-2.2.14.tar.bz2 Index: gimp.spec =================================================================== RCS file: /cvs/dist/rpms/gimp/FC-6/gimp.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- gimp.spec 25 Aug 2006 16:24:36 -0000 1.111 +++ gimp.spec 1 May 2007 12:06:57 -0000 1.112 @@ -4,13 +4,14 @@ # # modular_x: modular X deps # lcms: lcms support +# gutenprint: gutenprint support (instead of gimp-print) # python: python support # mp: multi processor support # static: build static libraries # print: build the print plugin (if you don't build it externally) # convenience: install convenience symlinks -%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5 +%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 5 || 0%{?rhel} >= 5 %define _enable_modularX 0%{!?_without_modular_x:1} %define _enable_lcms 0%{!?_without_lcms:1} %else @@ -18,6 +19,12 @@ %define _enable_lcms 0%{?_with_lcms:1} %endif +%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6 +%define _enable_gutenprint 0%{!?_without_gutenprint:1} +%else +%define _enable_gutenprint 0%{?_with_gutenprint:1} +%endif + %define _enable_python 0%{!?_without_python:1} %define _enable_mp 0%{!?_without_mp:1} %define _enable_static 0%{!?_without_static:1} @@ -29,14 +36,14 @@ Summary: GNU Image Manipulation Program Name: gimp -Version: 2.2.13 +Version: 2.2.14 %define binver 2.2 %define gimp_lang_ver 20 %define interfacever 2.0 %define age 0 %define minorver 200 %define microver %(ver=%{version}; echo ${ver##*.*.}) -Release: 1%{?dist} +Release: 5%{?dist} Epoch: 2 License: GPL, LGPL Group: Applications/Multimedia @@ -67,7 +74,6 @@ %else BuildRequires: xorg-x11-devel %endif -BuildRequires: gimp-print-devel >= 4.2.0 BuildRequires: automake >= 1.7 BuildRequires: autoconf >= 2.54 BuildRequires: libtool >= 1.5 @@ -84,7 +90,6 @@ Requires: gtk2 >= 2.4.14 Requires: pango >= 1.6.0 Requires: fontconfig >= 2.2.0 -Requires: gimp-print >= 4.2.0 Requires(post): /usr/bin/update-desktop-database Requires(post): hicolor-icon-theme Requires(postun): /usr/bin/update-desktop-database @@ -97,6 +102,7 @@ Patch4: gimp-2.2.4-gifload.patch Patch5: gimp-2.2.11-htmlview.patch Patch6: gimp-2.2.11-gimptool.patch +Patch7: gimp-2.2.14-sunras-overflow.patch %description GIMP (GNU Image Manipulation Program) is a powerful image composition and @@ -138,7 +144,7 @@ Python support: %_enable_python MP support: %_enable_mp build static libs: %_enable_static -build print plugin: %_enable_print +build internal print plugin: %_enable_print include convenience symlinks: %_enable_convenience @@ -151,6 +157,7 @@ %patch4 -p1 -b .gifload %patch5 -p1 -b .htmlview %patch6 -p1 -b .gimptool +%patch7 -p1 -b .sunras-overflow %build libtoolize --copy --force @@ -262,16 +269,27 @@ %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%pre +# First, remove old symlinks which are possibly in an old location (before a +# major version update) +if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then + %{_sbindir}/gimp-plugin-mgr --uninstall '*' || : +fi + %post /usr/bin/update-desktop-database %{_datadir}/applications touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi +# Then re-add the symlinks %{_sbindir}/gimp-plugin-mgr --install '*' %preun -%{_sbindir}/gimp-plugin-mgr --uninstall '*' +# Only delete symlinks when uninstalling +if [ "$1" = "0" ]; then + %{_sbindir}/gimp-plugin-mgr --uninstall '*' || : +fi %postun if [ "$1" = "0" ]; then @@ -390,6 +408,9 @@ %{_libdir}/*.so %{_libdir}/*.a +%dir %{_libdir}/gimp +%dir %{_libdir}/gimp/%{interfacever} +%dir %{_libdir}/gimp/%{interfacever}/modules %{_libdir}/gimp/%{interfacever}/modules/*.a %ifnos linux %{_libdir}/*.la @@ -400,6 +421,69 @@ %{_libdir}/pkgconfig/* %changelog +* Tue May 01 2007 Nils Philippsen - 2:2.2.14-5 +- don't let gimp-plugin-mgr --uninstall fail %%pre/%%preun scriptlets (#238337) + +* Mon Apr 30 2007 Nils Philippsen - 2:2.2.14-4 +- fix plugin symlinks handling better (#238337) + +* Mon Apr 30 2007 Nils Philippsen - 2:2.2.14-3 +- don't erroneously delete symlinks to external plugins when updating (#238337) + +* Mon Apr 30 2007 Nils Philippsen - 2:2.2.14-2 +- avoid buffer overflow in sunras plugin (#238422) + +* Tue Apr 24 2007 Nils Philippsen - 2:2.2.14-1 +- version 2.2.14 + + Bugs fixed in GIMP 2.2.14 + ========================= + + - avoid crashing on newer versions of the winicon format (bug #352899) + - fixed crash in Postscript plug-in (bug #353381) + - fixed handling of TABs in the text tool (bug #353132) + - fixed bug in Depth Merge plug-in (bug #355219) + - fixed bug in GimpDrawablePreview widget (bug #353639) + - fixed bug in Line Nove script (bug #357433) + - fixed bug in Ripple plug-in (bug #357431) + - save locale independent files from Fractal Explorer plug-in (bug #360095) + - fixed bug in Super Nova plug-in (bug #340073) + - be more robust against broken XCF files (bug #357809) + - fixed drawing issues in Image Map plug-in (bug #311621) + - fixed smoothing option in Fractal Explorer plug-in (bug #372671) + - load channels in the proper order when opening an XCF file (bug #378003) + - deal with floating selections in the Burn-In Animation script (bug #384096) + - fixed clipping in the GimpPreviewArea widget (bug #392692) + - fixed a potential crash in gimp-remote (bug #392111) + - work around a file-chooser problem on Windows (bug #398726) + - fixed markup of the gimp(1) manual page (bug #401145) + - fixed the fix for the right-to-left layout in layers dialog (bug #348347) + - fixed PSD save plug-in on 64bit architectures (bug #335130) + - added missing dependency in gimpui-2.0.pc file (bug #356394) + - fixed a crash in the PSD save plug-in (bug #395385) + - improved robustness of transform tool preview code (bug #420595) + - improved forward compatibility of XCF loader (bug #316207) + - don't crash in the Compressor plug-in if files can't be opened (bug #422444) + - fixed sensitivity of input fields in the Lighting plug-in (bug #359833) + +- don't BuildRequire gimp-print/gutenprint anymore + +* Mon Mar 26 2007 Nils Philippsen - 2:2.2.13-3 +- use gutenprint per default for current development/future distribution + versions (Fedora >= 7, RHEL >= 6) + +* Mon Mar 26 2007 Nils Philippsen - 2:2.2.13-2 +- own used directories in gimp-devel (#233794) + +* Wed Feb 21 2007 Nils Philippsen +- s/%%redhat/%%rhel/g + +* Wed Feb 07 2007 Nils Philippsen +- really change defaults for use of modular X and lcms (#224156) + +* Thu Feb 01 2007 Nils Philippsen +- change defaults for use of modular X and lcms (#224156) + * Fri Aug 25 2006 Nils Philippsen - 2:2.2.13-1 - version 2.2.13 - remove obsolete filename patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/gimp/FC-6/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 25 Aug 2006 16:19:30 -0000 1.28 +++ sources 1 May 2007 12:06:57 -0000 1.29 @@ -1 +1 @@ -d84a4a476a0c4fae24602db67f6fe49a gimp-2.2.13.tar.bz2 +2f47dd66d714a970356e275dd1d3caac gimp-2.2.14.tar.bz2 From fedora-cvs-commits at redhat.com Tue May 1 12:08:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 08:08:18 -0400 Subject: rpms/gimp/FC-6 gimp-2.2.14-sunras-overflow.patch,NONE,1.1 Message-ID: <200705011208.l41C8IgS030869@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv30852 Added Files: gimp-2.2.14-sunras-overflow.patch Log Message: avoid buffer overflow in sunras plugin (#238422) gimp-2.2.14-sunras-overflow.patch: ChangeLog | 7 +++++++ plug-ins/common/sunras.c | 21 +++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) --- NEW FILE gimp-2.2.14-sunras-overflow.patch --- --- gimp-2.2.14/ChangeLog.sunras-overflow 2007-04-17 23:58:21.000000000 +0200 +++ gimp-2.2.14/ChangeLog 2007-04-30 15:38:06.000000000 +0200 @@ -0,0 +1,7 @@ +2007-04-27 Sven Neumann + + Merged from trunk: + + * plug-ins/common/sunras.c (set_color_table): guard against a + possible stack overflow. + --- gimp-2.2.14/plug-ins/common/sunras.c.sunras-overflow 2007-04-17 23:11:23.000000000 +0200 +++ gimp-2.2.14/plug-ins/common/sunras.c 2007-04-30 15:36:33.000000000 +0200 @@ -102,8 +102,7 @@ gint32 image_ID, gint32 drawable_ID); -static void set_color_table (gint32, L_SUNFILEHEADER *, unsigned char *); - +static void set_color_table (gint32, L_SUNFILEHEADER *, const guchar *); static gint32 create_new_image (const gchar *filename, guint width, guint height, @@ -865,19 +864,20 @@ static void set_color_table (gint32 image_ID, L_SUNFILEHEADER *sunhdr, - guchar *suncolmap) + const guchar *suncolmap) { - int ncols, j; - guchar ColorMap[256*3]; + guchar ColorMap[256 * 3]; + gint ncols, j; ncols = sunhdr->l_ras_maplength / 3; - if (ncols <= 0) return; + if (ncols <= 0) + return; - for (j = 0; j < ncols; j++) + for (j = 0; j < MIN (ncols, 256); j++) { - ColorMap[j*3] = suncolmap[j]; - ColorMap[j*3+1] = suncolmap[j+ncols]; - ColorMap[j*3+2] = suncolmap[j+2*ncols]; + ColorMap[j * 3 + 0] = suncolmap[j]; + ColorMap[j * 3 + 1] = suncolmap[j + ncols]; + ColorMap[j * 3 + 2] = suncolmap[j + 2 * ncols]; } #ifdef DEBUG @@ -886,6 +886,7 @@ printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j, ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]); #endif + gimp_image_set_colormap (image_ID, ColorMap, ncols); } From fedora-cvs-commits at redhat.com Tue May 1 12:41:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 08:41:23 -0400 Subject: rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.28, 1.29 openoffice.org.spec, 1.1168, 1.1169 Message-ID: <200705011241.l41CfNvR018908@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18854 Modified Files: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch openoffice.org.spec Log Message: Resolves: rhbz#203495 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: inc/cupsmgr.hxx | 0 inc/jobset.hxx | 0 inc/print.h | 0 inc/print.hxx | 0 inc/printdlg.hxx | 0 inc/psprint/ppdparser.hxx | 0 inc/psprint/printerinfomanager.hxx | 0 inc/salframe.hxx | 0 inc/window.hxx | 0 psprint/inc/cupsmgr.hxx | 2 psprint/inc/psprint/ppdparser.hxx | 4 psprint/inc/psprint/printerinfomanager.hxx | 2 psprint/source/printer/cupsmgr.cxx | 23 psprint/source/printer/printerinfomanager.cxx | 8 psprint/source/printergfx/printerjob.cxx | 3 sfx2/source/view/viewprn.cxx | 1 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/dialogs/printdlg.hrc | 0 source/dialogs/printdlg.src | 0 source/gdi/jobset.cxx | 0 source/gdi/print.cxx | 0 source/printer/cupsmgr.cxx | 0 source/printergfx/printerjob.cxx | 0 source/window/window.cxx | 0 svtools/inc/printdlg.hxx | 3 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 601 +++++++++++++++++++++++++- svtools/source/dialogs/printdlg.hrc | 2 svtools/source/dialogs/printdlg.src | 10 svtools/util/makefile.mk | 8 unx/gtk/window/gtkframe.cxx | 0 unx/inc/plugins/gtk/gtkframe.hxx | 0 util/makefile.mk | 0 vcl/inc/jobset.hxx | 3 vcl/inc/print.h | 2 vcl/inc/print.hxx | 3 vcl/inc/salframe.hxx | 3 vcl/inc/window.hxx | 3 vcl/source/gdi/jobset.cxx | 194 ++++++++ vcl/source/gdi/print.cxx | 11 vcl/source/window/window.cxx | 10 vcl/unx/gtk/window/gtkframe.cxx | 11 vcl/unx/inc/plugins/gtk/gtkframe.hxx | 3 44 files changed, 898 insertions(+), 16 deletions(-) Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 29 Mar 2007 12:29:34 -0000 1.28 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 1 May 2007 12:41:20 -0000 1.29 @@ -456,12 +456,13 @@ diff -u -r1.9 printdlg.hxx --- openoffice.org.orig/svtools/inc/printdlg.hxx 8 Sep 2005 10:06:06 -0000 1.9 +++ openoffice.org/svtools/inc/printdlg.hxx 16 Nov 2006 14:14:18 -0000 -@@ -140,6 +140,8 @@ +@@ -140,6 +140,9 @@ Link maOKHdlLink; // Link zum OK-Handler String maAllFilterStr; + String maPaperFormatStr; + String maOrientationStr; ++ unsigned long mnNativeHandle; SVT_DLLPRIVATE void ImplCheckOK(); SVT_DLLPRIVATE void ImplInitControls(); @@ -535,14 +536,15 @@ using namespace rtl; struct SvtPrinterImpl -@@ -139,7 +185,9 @@ +@@ -139,7 +185,10 @@ maBtnHelp ( this, SvtResId( BTN_HELP ) ), maFlSepCopiesRange( this, SvtResId( FL_SEPCOPIESRANGE ) ), maFlSepButtonLine( this, SvtResId( FL_SEPBUTTONLINE ) ), - maAllFilterStr ( SvtResId( STR_ALLFILTER ) ) + maAllFilterStr ( SvtResId( STR_ALLFILTER ) ), + maPaperFormatStr ( SvtResId( STR_PAPER_PAPER_TXT ) ), -+ maOrientationStr ( SvtResId( STR_PAPER_ORIENTATION_TXT ) ) ++ maOrientationStr ( SvtResId( STR_PAPER_ORIENTATION_TXT ) ), ++ mnNativeHandle(0) { FreeResource(); @@ -788,7 +790,7 @@ short PrintDialog::Execute() { if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() ) -@@ -625,15 +908,300 @@ +@@ -625,15 +908,308 @@ ImplInitControls(); ImplModifyControlHdl( NULL ); @@ -803,10 +805,13 @@ - if ( TEMPPRINTER() ) - mpPrinter->SetPrinterProps( TEMPPRINTER() ); - ImplFillDialogData(); ++ unsigned long handle = GetParent() ? GetParent()->GetNativeHandle() : 0; ++ GtkWindow *parent = handle ? GTK_WINDOW(handle) : NULL; ++ + static ourhandle aHandle; + if (!aHandle.pDialog) + { -+ aHandle.pDialog = gtk_print_unix_dialog_new (NULL, NULL); ++ aHandle.pDialog = gtk_print_unix_dialog_new (NULL, parent); + + rtl::OString aOptions(OUStringToOString(maBtnOptions.GetText(), RTL_TEXTENCODING_UTF8)); + aOptions = aOptions.replace('~','_'); @@ -854,6 +859,11 @@ + g_object_get(G_OBJECT(box),"parent", &aHandle.notebook,NULL); + } + ++ //make this the child of the OOo document window, and make it ++ //the parent of the future OOo options window ++ if (parent) gtk_window_set_transient_for(GTK_WINDOW(aHandle.pDialog), parent); ++ mnNativeHandle = reinterpret_cast(aHandle.pDialog); ++ + GtkPrintSettings* pTempSettings = gtk_print_unix_dialog_get_settings(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog)); + if (const QueueInfo* pInfo = (const QueueInfo*)(maLbName.GetEntryData(maLbName.GetSelectEntryPos()))) + { @@ -1195,3 +1205,113 @@ +VCL_DLLPUBLIC void ImplDeletePrnQueueList(); #endif // _SV_PRINT_H +--- openoffice.org.orig/sfx2/source/view/viewprn.cxx 2007-05-01 13:18:31.000000000 +0100 ++++ openoffice.org/sfx2/source/view/viewprn.cxx 2007-05-01 13:18:44.000000000 +0100 +@@ -175,6 +175,7 @@ + + // Dialog ausf"uhren + SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( _pParent, _pViewSh, _pOptions ); ++ pDlg->SetNativeParent(_pParent ? _pParent->NativeHandle() : 0); + if ( _bHelpDisabled ) + pDlg->DisableHelp(); + if ( pDlg->Execute() == RET_OK ) +Index: inc/salframe.hxx +=================================================================== +RCS file: /cvs/gsl/vcl/inc/Attic/salframe.hxx,v +retrieving revision 1.30 +diff -u -r1.30 salframe.hxx +--- openoffice.org.orig/vcl/inc/salframe.hxx 1 Nov 2006 15:28:55 -0000 1.30 ++++ openoffice.org/vcl/inc/salframe.hxx 1 May 2007 12:21:25 -0000 +@@ -313,6 +313,9 @@ + // (e.g. input methods, printer update handlers). + long CallCallback( USHORT nEvent, const void* pEvent ) const + { return m_pProc ? m_pProc( m_pInst, const_cast(this), nEvent, pEvent ) : 0; } ++ ++ virtual unsigned long GetNativeHandle() const { return 0; } ++ virtual void SetNativeParent(unsigned long nParent) {} + }; + + +Index: inc/window.hxx +=================================================================== +RCS file: /cvs/gsl/vcl/inc/Attic/window.hxx,v +retrieving revision 1.80.24.1 +diff -u -r1.80.24.1 window.hxx +--- openoffice.org.orig/vcl/inc/window.hxx 19 Jan 2007 16:10:11 -0000 1.80.24.1 ++++ openoffice.org/vcl/inc/window.hxx 1 May 2007 12:21:29 -0000 +@@ -1087,6 +1087,9 @@ + /* mark Window for deletion in top of event queue + */ + void doLazyDelete(); ++ ++ unsigned long GetNativeHandle() const; ++ void SetNativeParent(unsigned long nParent); + }; + + +Index: source/window/window.cxx +=================================================================== +RCS file: /cvs/gsl/vcl/source/window/window.cxx,v +retrieving revision 1.249.24.3 +diff -u -r1.249.24.3 window.cxx +--- openoffice.org.orig/vcl/source/window/window.cxx 26 Jan 2007 12:14:38 -0000 1.249.24.3 ++++ openoffice.org/vcl/source/window/window.cxx 1 May 2007 12:21:53 -0000 +@@ -4267,6 +4272,16 @@ + pFocusWin->mpFontCache->Release( pFontEntry ); + } + ++unsigned long Window::GetNativeHandle() const ++{ ++ return ImplGetFrame() ? ImplGetFrame()->GetNativeHandle() : 0; ++} ++ ++void Window::SetNativeParent(unsigned long nParent) ++{ ++ if (ImplGetFrame()) ImplGetFrame()->SetNativeParent(nParent); ++} ++ + // ----------------------------------------------------------------------- + + Window::Window( WindowType nType ) +Index: unx/gtk/window/gtkframe.cxx +=================================================================== +RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v +retrieving revision 1.59 +diff -u -r1.59 gtkframe.cxx +--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 21 Dec 2006 12:04:26 -0000 1.59 ++++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 1 May 2007 12:22:00 -0000 +@@ -759,6 +762,17 @@ + return pWindow->GetAccessible( bCreate ); + } + ++unsigned long GtkSalFrame::GetNativeHandle() const ++{ ++ return reinterpret_cast(m_pWindow); ++} ++ ++void GtkSalFrame::SetNativeParent(unsigned long nParent) ++{ ++ if (GtkWindow* pNativeParent = GTK_WINDOW(nParent)) ++ gtk_window_set_transient_for( m_pWindow, pNativeParent ); ++} ++ + void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle ) + { + if( nStyle & SAL_FRAME_STYLE_DEFAULT ) // ensure default style +Index: unx/inc/plugins/gtk/gtkframe.hxx +=================================================================== +RCS file: /cvs/gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx,v +retrieving revision 1.25 +diff -u -r1.25 gtkframe.hxx +--- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkframe.hxx 1 Nov 2006 15:30:08 -0000 1.25 ++++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkframe.hxx 1 May 2007 12:22:02 -0000 +@@ -383,6 +383,9 @@ + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessible( bool bCreate = true ); + + static AtkRole GetAtkRole( GtkWindow* window ); ++ ++ virtual unsigned long GetNativeHandle() const; ++ virtual void SetNativeParent(unsigned long nParent); + }; + + Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1168 retrieving revision 1.1169 diff -u -r1.1168 -r1.1169 --- openoffice.org.spec 24 Apr 2007 19:39:00 -0000 1.1168 +++ openoffice.org.spec 1 May 2007 12:41:20 -0000 1.1169 @@ -2635,6 +2635,8 @@ * Tue Apr 24 2007 Caolan McNamara - 1:2.2.0-14.7-unreleased - remove gnome icons to that mist inheritance from bluecurve will give the bluecurve panel icons +- Resolves: rhbz#203495 add some magic to allow native and OOo dialogs to + interleave and keep parent child transient logic correct * Tue Apr 17 2007 Caolan McNamara - 1:2.2.0-14.6 - merge openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch From fedora-cvs-commits at redhat.com Tue May 1 12:52:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 08:52:14 -0400 Subject: rpms/samba/FC-6 samba-3.0.24-fhs-compliance.patch,1.1,NONE Message-ID: <200705011252.l41CqEoa026815@cvs.devel.redhat.com> Author: ssorce Update of /cvs/dist/rpms/samba/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26620/FC-6 Removed Files: samba-3.0.24-fhs-compliance.patch Log Message: commit removeal of old file --- samba-3.0.24-fhs-compliance.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 1 13:05:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 09:05:27 -0400 Subject: rpms/kernel/devel git-iwlwifi.patch, 1.5, 1.6 kernel-2.6.spec, 1.3121, 1.3122 Message-ID: <200705011305.l41D5R9V003645@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3597 Modified Files: git-iwlwifi.patch kernel-2.6.spec Log Message: update iwlwifi (0.0.16) git-iwlwifi.patch: Kconfig | 1 Makefile | 1 iwlwifi/Kconfig | 52 iwlwifi/Makefile | 2 iwlwifi/base.c |12341 ++++++++++++++++++++++++++++++++++++++++++++++++++ iwlwifi/iwl-3945-rs.c | 962 +++ iwlwifi/iwl-3945-rs.h | 89 iwlwifi/iwlwifi.h | 1296 +++++ iwlwifi/iwlwifi_hw.h | 1977 ++++++++ 9 files changed, 16721 insertions(+) Index: git-iwlwifi.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- git-iwlwifi.patch 1 May 2007 00:44:04 -0000 1.5 +++ git-iwlwifi.patch 1 May 2007 13:05:24 -0000 1.6 @@ -1,10 +1,6 @@ -rsync://www.intellinuxwireless.org/repos/iwlwifi.git - -commit db63be081b46f80a784cb0a1ae67a074d92aabf8 - --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-30 20:21:52.000000000 -0400 -@@ -0,0 +1,12347 @@ ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-05-01 08:59:35.000000000 -0400 +@@ -0,0 +1,12341 @@ +/****************************************************************************** + + Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. @@ -113,7 +109,7 @@ + +#include "iwlwifi.h" + -+#define IWLWIFI_VERSION "0.0.15k" ++#define IWLWIFI_VERSION "0.0.16k" + +#define DRV_DESCRIPTION "Intel(R) Wireless Link driver for Linux" +#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" @@ -4668,7 +4664,7 @@ + return rc; +} + -+static void ipw_set_supported_rates(struct ipw_priv *priv) ++static void ipw_set_rate(struct ipw_priv *priv) +{ + struct ieee80211_hw_mode *hw = NULL; + struct ieee80211_rate *rate; @@ -4702,11 +4698,6 @@ + + IPW_DEBUG_RATE("Set active_rate = %0x, active_rate_basic = %0x\n", + priv->active_rate, priv->active_rate_basic); -+} -+ -+static int ipw_set_rate(struct ipw_priv *priv) -+{ -+ ipw_set_supported_rates(priv); + + /** + * If a basic rate is configured, then use it (adding R_1M_MSK) @@ -4728,8 +4719,6 @@ + else + priv->staging_rxon.ofdm_basic_rates = + R_6M_MSK | R_12M_MSK | R_24M_MSK; -+ -+ return 0; +} + +static void ipw_init_hw_rates(struct ipw_priv *priv, struct ieee80211_rate *rates) @@ -9448,12 +9437,13 @@ + qc = ieee80211_get_qos_ctrl(hdr); + if (qc) { + u8 tid = (u8)(*qc * 0xf); -+ seq_number = priv->stations[sta_id].tid[tid].seq_number; ++ seq_number = priv->stations[sta_id].tid[tid].seq_number & ++ IEEE80211_SCTL_SEQ; + if (!(ieee80211_get_morefrag(hdr))) + priv->stations[sta_id].tid[tid].seq_number += 0x10; + + hdr->seq_ctrl = cpu_to_le16(seq_number) | -+ (hdr->seq_ctrl & 0xf); ++ (hdr->seq_ctrl & IEEE80211_SCTL_SEQ); + } + + tfd = (u8 *) (&txq->bd[q->first_empty * q->element_size]); @@ -9503,10 +9493,13 @@ + } + + out_cmd->cmd.tx.len = skb->len; -+ if (priv->is_3945) -+ *control_flags = TFD_CTL_COUNT_SET(2) | -+ TFD_CTL_PAD_SET(U32_PAD(len)); -+ else if (len_org == len) ++ if (priv->is_3945) { ++ if (!len) ++ *control_flags = TFD_CTL_COUNT_SET(1); ++ else ++ *control_flags = TFD_CTL_COUNT_SET(2) | ++ TFD_CTL_PAD_SET(U32_PAD(len)); ++ } else if (len_org == len) + out_cmd->cmd.tx.tx_flags |= 0x100000; + + //todoG need this for burst mode later on @@ -9545,7 +9538,6 @@ + txq->need_update = 0; + } + -+ + rc = priv->hw_setting.tx_queue_update_wr_ptr(priv, txq, tx_id, len); + q->first_empty = ipw_queue_inc_wrap(q->first_empty, q->n_bd); + txq->need_update = 1; @@ -10744,6 +10736,11 @@ + return 0; +} + ++/** ++ * We ignore conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME since it seems to ++ * be set inappropriately and the driver currently sets the hardware up to ++ * use it whenever needed. ++ */ +static int d_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) +{ + struct ipw_priv *priv = hw->priv; @@ -10781,18 +10778,8 @@ + + ipw_set_flags_for_phymode(priv, conf->phymode); + -+ spin_unlock_irqrestore(&priv->lock, flags); -+ -+#if 0 -+ /* Check for long / short preamble change */ -+ if (check_bits(conf->flags, IEEE80211_CONF_SHORT_SLOT_TIME)) -+ priv->staging_rxon.flags |= RXON_FLG_SHORT_SLOT_MSK; -+ else -+ priv->staging_rxon.flags &= ~RXON_FLG_SHORT_SLOT_MSK; -+#endif -+ -+ spin_lock_irqsave(&priv->lock, flags); + priv->only_active_channel = 0; ++ + spin_unlock_irqrestore(&priv->lock, flags); + + mutex_lock(&priv->mutex); @@ -10808,9 +10795,12 @@ + ipw_set_power(priv, conf); + + ipw_set_rate(priv); -+ ipw_commit_rxon(priv); -+ -+// reg_set_txpower(priv, conf->power_level); ++ ++ if (memcmp(&priv->active_rxon, ++ &priv->staging_rxon, sizeof(priv->staging_rxon))) ++ ipw_commit_rxon(priv); ++ else ++ IPW_DEBUG_INFO("No re-sending same RXON configuration.\n"); + + mutex_unlock(&priv->mutex); + @@ -12353,12 +12343,12 @@ + return 0; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile 2007-04-30 20:19:23.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/Makefile 2007-05-01 08:59:19.000000000 -0400 @@ -0,0 +1,2 @@ +iwlwifi-objs := base.o +obj-$(CONFIG_IWLWIFI) += iwlwifi.o --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-04-30 20:21:52.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-05-01 08:59:35.000000000 -0400 @@ -0,0 +1,1296 @@ +/****************************************************************************** + @@ -13657,7 +13647,7 @@ + +#endif /* __iwlwifi_h__ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig 2007-04-30 20:19:23.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/Kconfig 2007-05-01 08:59:19.000000000 -0400 @@ -0,0 +1,52 @@ +config IWLWIFI + tristate "Intel PRO/Wireless 3945ABG Network Connection adapter" @@ -13712,7 +13702,7 @@ + as the debug information can assist others in helping you resolve + any problems you may encounter. --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.h 2007-04-30 20:21:52.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.h 2007-05-01 08:59:35.000000000 -0400 @@ -0,0 +1,89 @@ +#ifndef __iwl_3945_rs_h__ +#define __iwl_3945_rs_h__ @@ -13804,8 +13794,8 @@ + +#endif --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h 2007-04-30 20:21:52.000000000 -0400 -@@ -0,0 +1,1973 @@ ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi_hw.h 2007-05-01 08:59:35.000000000 -0400 +@@ -0,0 +1,1977 @@ +/****************************************************************************** + + Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. @@ -14315,6 +14305,10 @@ + /* activate TX calibration. */ + TX_CMD_FLG_CALIB_MSK = (1 << 17), + ++ /* signals that 2 bytes pad was inserted ++ after the MAC header */ ++ TX_CMD_FLG_MH_PAD_MSK = (1 << 20), ++ + /* HCCA-AP - disable duration overwriting. */ + TX_CMD_FLG_DUR_MSK = (1 << 25), +}; @@ -15780,7 +15774,7 @@ + +#endif /* __iwlwifi_hw_h__ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.c 2007-04-30 20:21:52.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945-rs.c 2007-05-01 08:59:35.000000000 -0400 @@ -0,0 +1,962 @@ +/*************** RATE-SCALING functions ***********************/ + @@ -16744,15 +16738,15 @@ + priv->rate_control.alloc_sta = rs_alloc_sta; + priv->rate_control.free_sta = rs_free_sta; +} ---- linux-2.6.21.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-04-30 20:16:33.000000000 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/Makefile 2007-04-30 20:19:23.000000000 -0400 +--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-05-01 08:59:01.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/Makefile 2007-05-01 08:59:19.000000000 -0400 @@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211) += adm8211/ obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/ obj-$(CONFIG_RTL818X) += rtl818x/ +obj-$(CONFIG_IWLWIFI) += iwlwifi/ ---- linux-2.6.21.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-04-30 20:16:33.000000000 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/Kconfig 2007-04-30 20:19:23.000000000 -0400 +--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-05-01 08:59:01.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/Kconfig 2007-05-01 08:59:19.000000000 -0400 @@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad source "drivers/net/wireless/mac80211/p54/Kconfig" source "drivers/net/wireless/mac80211/zd1211rw/Kconfig" Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.3121 retrieving revision 1.3122 diff -u -r1.3121 -r1.3122 --- kernel-2.6.spec 1 May 2007 00:44:05 -0000 1.3121 +++ kernel-2.6.spec 1 May 2007 13:05:24 -0000 1.3122 @@ -2340,6 +2340,9 @@ # - tux. %changelog +* Mon May 01 2007 John W. Linville +- Update git-iwlwifi.patch (iwlwifi version 0.0.16) + * Mon Apr 30 2007 John W. Linville - Add critical post-2.6.21 wireless updates - Update git-wireless-dev.patch From fedora-cvs-commits at redhat.com Tue May 1 13:44:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 09:44:32 -0400 Subject: rpms/policycoreutils/devel .cvsignore, 1.150, 1.151 policycoreutils-rhat.patch, 1.301, 1.302 policycoreutils.spec, 1.409, 1.410 sources, 1.155, 1.156 Message-ID: <200705011344.l41DiVmV022585@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22566 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Tue May 1 2007 Dan Walsh 2.0.15-1 - Updated version of policycoreutils * Merged po file updates from Dan Walsh. - Fix semanage to be able to modify prefix in user record Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- .cvsignore 26 Apr 2007 00:28:19 -0000 1.150 +++ .cvsignore 1 May 2007 13:44:29 -0000 1.151 @@ -148,3 +148,4 @@ policycoreutils-2.0.10.tgz policycoreutils-2.0.13.tgz policycoreutils-2.0.14.tgz +policycoreutils-2.0.15.tgz policycoreutils-rhat.patch: Makefile | 2 +- audit2allow/Makefile | 3 ++- restorecon/restorecon.c | 15 +++++++++++---- restorecond/restorecond.c | 12 +++++++----- semanage/semanage | 2 +- semanage/seobject.py | 10 +++++++--- 6 files changed, 29 insertions(+), 15 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.301 retrieving revision 1.302 diff -u -r1.301 -r1.302 --- policycoreutils-rhat.patch 25 Apr 2007 15:32:00 -0000 1.301 +++ policycoreutils-rhat.patch 1 May 2007 13:44:29 -0000 1.302 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.10/audit2allow/Makefile +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.14/audit2allow/Makefile --- nsapolicycoreutils/audit2allow/Makefile 2007-02-07 12:11:49.000000000 -0500 -+++ policycoreutils-2.0.10/audit2allow/Makefile 2007-04-24 14:43:23.000000000 -0400 ++++ policycoreutils-2.0.14/audit2allow/Makefile 2007-04-30 08:57:42.000000000 -0400 @@ -1,6 +1,7 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr @@ -18,29 +18,18 @@ -mkdir -p $(MANDIR)/man1 install -m 644 audit2allow.1 $(MANDIR)/man1/ -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2why/Makefile policycoreutils-2.0.10/audit2why/Makefile ---- nsapolicycoreutils/audit2why/Makefile 2006-11-16 17:14:26.000000000 -0500 -+++ policycoreutils-2.0.10/audit2why/Makefile 2007-04-24 14:43:23.000000000 -0400 -@@ -1,6 +1,6 @@ - # Installation directories. - PREFIX ?= ${DESTDIR}/usr --BINDIR ?= $(PREFIX)/sbin -+BINDIR ?= $(PREFIX)/bin - LIBDIR ?= ${PREFIX}/lib - MANDIR ?= $(PREFIX)/share/man - LOCALEDIR ?= /usr/share/locale -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.10/Makefile +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.14/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-2.0.10/Makefile 2007-04-24 14:43:23.000000000 -0400 ++++ policycoreutils-2.0.14/Makefile 2007-04-30 08:57:42.000000000 -0400 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.10/restorecon/restorecon.c +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.14/restorecon/restorecon.c --- nsapolicycoreutils/restorecon/restorecon.c 2007-04-24 10:36:17.000000000 -0400 -+++ policycoreutils-2.0.10/restorecon/restorecon.c 2007-04-24 14:43:23.000000000 -0400 ++++ policycoreutils-2.0.14/restorecon/restorecon.c 2007-04-30 08:57:42.000000000 -0400 @@ -16,6 +16,7 @@ * -v Show changes in file labels. * -o filename save list of files with incorrect context @@ -96,9 +85,9 @@ case 'i': file_exist = 0; break; -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.10/restorecond/restorecond.c +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.14/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2007-02-22 08:53:22.000000000 -0500 -+++ policycoreutils-2.0.10/restorecond/restorecond.c 2007-04-24 14:43:23.000000000 -0400 ++++ policycoreutils-2.0.14/restorecond/restorecond.c 2007-04-30 08:57:42.000000000 -0400 @@ -210,9 +210,10 @@ } @@ -125,9 +114,21 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.10/semanage/seobject.py +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.14/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2007-01-16 15:08:21.000000000 -0500 ++++ policycoreutils-2.0.14/semanage/semanage 2007-05-01 09:31:57.000000000 -0400 +@@ -279,7 +279,7 @@ + + if object == "user": + rlist = roles.split() +- OBJECT.modify(target, rlist, selevel, serange) ++ OBJECT.modify(target, rlist, selevel, serange, prefix) + + if object == "port": + OBJECT.modify(target, proto, serange, setype) +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.14/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2007-04-12 12:43:06.000000000 -0400 -+++ policycoreutils-2.0.10/semanage/seobject.py 2007-04-24 14:43:23.000000000 -0400 ++++ policycoreutils-2.0.14/semanage/seobject.py 2007-04-30 08:57:42.000000000 -0400 @@ -210,6 +210,7 @@ os.write(fd, self.out()) os.close(fd) Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.409 retrieving revision 1.410 diff -u -r1.409 -r1.410 --- policycoreutils.spec 30 Apr 2007 13:00:48 -0000 1.409 +++ policycoreutils.spec 1 May 2007 13:44:29 -0000 1.410 @@ -5,8 +5,8 @@ %define sepolgenver 1.0.8 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 2.0.14 -Release: 2%{?dist} +Version: 2.0.15 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,11 @@ fi %changelog +* Tue May 1 2007 Dan Walsh 2.0.15-1 +- Updated version of policycoreutils + * Merged po file updates from Dan Walsh. +- Fix semanage to be able to modify prefix in user record + * Mon Apr 30 2007 Dan Walsh 2.0.14-2 - Fix title on system-config-selinux Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- sources 26 Apr 2007 00:28:19 -0000 1.155 +++ sources 1 May 2007 13:44:29 -0000 1.156 @@ -1,2 +1,2 @@ 4d6e57c7fc396efbcf96b7accab4ba30 sepolgen-1.0.8.tgz -5be8860197a4c917ffc94bb01980c3d7 policycoreutils-2.0.14.tgz +98f81c2aa453561e101c1c9a04d1565b policycoreutils-2.0.15.tgz From fedora-cvs-commits at redhat.com Tue May 1 15:14:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 11:14:29 -0400 Subject: rpms/xen/devel xen-checkpoint-default.patch, NONE, 1.1 xen.spec, 1.174, 1.175 Message-ID: <200705011514.l41FETeW004386@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4335 Modified Files: xen.spec Added Files: xen-checkpoint-default.patch Log Message: Fixed op_save RPC API xen-checkpoint-default.patch: XendDomain.py | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xen-checkpoint-default.patch --- diff -rup xen-3.0.5-testing.hg-rc4/tools/python/xen/xend/XendDomain.py xen-3.0.5-testing.hg-rc4.new/tools/python/xen/xend/XendDomain.py --- xen-3.0.5-testing.hg-rc4/tools/python/xen/xend/XendDomain.py 2007-05-01 08:03:14.000000000 -0400 +++ xen-3.0.5-testing.hg-rc4.new/tools/python/xen/xend/XendDomain.py 2007-05-01 08:03:44.000000000 -0400 @@ -1236,7 +1236,7 @@ class XendDomain: XendCheckpoint.save(sock.fileno(), dominfo, True, live, dst) sock.close() - def domain_save(self, domid, dst, checkpoint): + def domain_save(self, domid, dst, checkpoint=False): """Start saving a domain to file. @param domid: Domain ID or Name Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- xen.spec 1 May 2007 03:18:04 -0000 1.174 +++ xen.spec 1 May 2007 15:14:27 -0000 1.175 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.5 -Release: 0.rc4.3%{dist} +Release: 0.rc4.4%{dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -14,6 +14,7 @@ Patch3: xen-compile-fixes.patch Patch6: xen-net-bridge.patch Patch7: xen-mem-pre-balloon.patch +Patch8: xen-checkpoint-default.patch Patch13: xen-dumpdir.patch Patch18: xen-block-readonly.patch @@ -100,6 +101,7 @@ %patch3 -p1 -b .compile %patch6 -p1 %patch7 -p1 +%patch8 -p1 %patch13 -p1 %patch18 -p1 @@ -245,6 +247,9 @@ %{_libdir}/*.a %changelog +* Tue May 1 2007 Daniel P. Berrange - 3.0.5-0.rc4.4.fc7 +- Fix op_save RPC API + * Mon Apr 30 2007 Daniel P. Berrange - 3.0.5-0.rc4.3.fc7 - Added BR on gettext From fedora-cvs-commits at redhat.com Tue May 1 15:24:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 11:24:34 -0400 Subject: rpms/kernel-xen-2.6/devel .cvsignore, 1.4, 1.4.2.1 kernel-xen.spec, 1.20, 1.20.2.1 sources, 1.4, 1.4.2.1 xen-version-strings.patch, 1.2, 1.2.2.1 Message-ID: <200705011524.l41FOYTS011530@cvs.devel.redhat.com> Author: ehabkost Update of /cvs/dist/rpms/kernel-xen-2.6/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11152 Modified Files: Tag: private-ehabkost-xen-3_0_5-rc4-branch .cvsignore kernel-xen.spec sources xen-version-strings.patch Log Message: Updating Xen HV to 3.0.5-rc4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- .cvsignore 30 Apr 2007 22:09:41 -0000 1.4 +++ .cvsignore 1 May 2007 15:24:32 -0000 1.4.2.1 @@ -4,3 +4,4 @@ linux-2.6.20.tar.bz2 patch-2.6.20.3.bz2 xen-3.0.5-rc3-14934.tar.bz2 +xen-3.0.5-rc4-1668299c0ea4.tar.bz2 Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -u -r1.20 -r1.20.2.1 --- kernel-xen.spec 30 Apr 2007 22:37:02 -0000 1.20 +++ kernel-xen.spec 1 May 2007 15:24:32 -0000 1.20.2.1 @@ -37,7 +37,7 @@ %define make_target bzImage %define kernel_image x86 -%define xen_hv_cset 14934 +%define xen_hv_cset 1668299c0ea4 %define xen_flags verbose=y crash_debug=y %define xen_target vmlinuz %define xen_image vmlinuz @@ -255,7 +255,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: xen-3.0.5-rc3-%{xen_hv_cset}.tar.bz2 +Source1: xen-3.0.5-rc4-%{xen_hv_cset}.tar.bz2 Source2: Config.mk Source10: COPYING.modules @@ -1108,7 +1108,7 @@ rm -rf xen fi %setup -D -T -q -n kernel-%{version} -a1 -cd xen-3.0.5-rc3-%{xen_hv_cset}/xen +cd xen-3.0.5-rc4-%{xen_hv_cset}/xen # Any necessary hypervisor patches go here %patch20000 -p1 %patch20001 -p1 @@ -1337,7 +1337,7 @@ %if %{includexen} %if %{buildxen} - cd xen-3.0.5-rc3-%{xen_hv_cset}/xen + cd xen-3.0.5-rc4-%{xen_hv_cset}/xen mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot make %{?_smp_mflags} %{xen_flags} install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL} @@ -2002,6 +2002,9 @@ # - tux. %changelog +* Tue May 01 2007 Eduardo Habkost +- Updated Xen Hypervisor to 3.0.5-rc5, hg cset 1668299c0ea4 + * Fri Apr 27 2007 Eduardo Habkost - Updated Xen Hypervisor to 3.0.5-rc3, hg cset 14934 - Included checksum patches to fix bug #223258 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/sources,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- sources 30 Apr 2007 22:09:41 -0000 1.4 +++ sources 1 May 2007 15:24:32 -0000 1.4.2.1 @@ -4,3 +4,4 @@ 34b0f354819217e6a345f48ebbd8f13e linux-2.6.20.tar.bz2 30764d4152c727b8ec7b709ab5464ec3 patch-2.6.20.3.bz2 f8922a14df26193321284bbf90feacac xen-3.0.5-rc3-14934.tar.bz2 +132273f958ac0f5f1b209312a066fb66 xen-3.0.5-rc4-1668299c0ea4.tar.bz2 xen-version-strings.patch: Makefile | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Index: xen-version-strings.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/xen-version-strings.patch,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- xen-version-strings.patch 30 Apr 2007 22:09:41 -0000 1.2 +++ xen-version-strings.patch 1 May 2007 15:24:32 -0000 1.2.2.1 @@ -6,8 +6,8 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 3 export XEN_SUBVERSION = 0 --export XEN_EXTRAVERSION ?= .5-rc3$(XEN_VENDORVERSION) -+export XEN_BASEVERSION ?= .5-rc3$(XEN_VENDORVERSION) +-export XEN_EXTRAVERSION ?= .5-rc4$(XEN_VENDORVERSION) ++export XEN_BASEVERSION ?= .5-rc4$(XEN_VENDORVERSION) +export XEN_BUILDER ?= +export XEN_BUILDVERSION ?= +export XEN_EXTRAVERSION ?= $(XEN_BASEVERSION)$(XEN_BUILDVERSION) From fedora-cvs-commits at redhat.com Tue May 1 15:29:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 11:29:51 -0400 Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.20.2.1,1.20.2.2 Message-ID: <200705011529.l41FTp3B015415@cvs.devel.redhat.com> Author: ehabkost Update of /cvs/dist/rpms/kernel-xen-2.6/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15374 Modified Files: Tag: private-ehabkost-xen-3_0_5-rc4-branch kernel-xen.spec Log Message: Duh. Correcting version number o changelog text Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v retrieving revision 1.20.2.1 retrieving revision 1.20.2.2 diff -u -r1.20.2.1 -r1.20.2.2 --- kernel-xen.spec 1 May 2007 15:24:32 -0000 1.20.2.1 +++ kernel-xen.spec 1 May 2007 15:29:48 -0000 1.20.2.2 @@ -2003,7 +2003,7 @@ %changelog * Tue May 01 2007 Eduardo Habkost -- Updated Xen Hypervisor to 3.0.5-rc5, hg cset 1668299c0ea4 +- Updated Xen Hypervisor to 3.0.5-rc4, hg cset 1668299c0ea4 * Fri Apr 27 2007 Eduardo Habkost - Updated Xen Hypervisor to 3.0.5-rc3, hg cset 14934 From fedora-cvs-commits at redhat.com Tue May 1 15:39:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 11:39:09 -0400 Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.20.2.2,1.20.2.3 Message-ID: <200705011539.l41Fd9rt016255@cvs.devel.redhat.com> Author: ehabkost Update of /cvs/dist/rpms/kernel-xen-2.6/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16802 Modified Files: Tag: private-ehabkost-xen-3_0_5-rc4-branch kernel-xen.spec Log Message: Use a xen_hv_version macro This will avoid having to update many different places when updating the xen HV tarball. Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -u -r1.20.2.2 -r1.20.2.3 --- kernel-xen.spec 1 May 2007 15:29:48 -0000 1.20.2.2 +++ kernel-xen.spec 1 May 2007 15:39:07 -0000 1.20.2.3 @@ -37,6 +37,7 @@ %define make_target bzImage %define kernel_image x86 +%define xen_hv_version 3.0.5-rc4 %define xen_hv_cset 1668299c0ea4 %define xen_flags verbose=y crash_debug=y %define xen_target vmlinuz @@ -255,7 +256,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: xen-3.0.5-rc4-%{xen_hv_cset}.tar.bz2 +Source1: xen-%{xen_hv_version}-%{xen_hv_cset}.tar.bz2 Source2: Config.mk Source10: COPYING.modules @@ -1108,7 +1109,7 @@ rm -rf xen fi %setup -D -T -q -n kernel-%{version} -a1 -cd xen-3.0.5-rc4-%{xen_hv_cset}/xen +cd xen-%{xen_hv_version}-%{xen_hv_cset}/xen # Any necessary hypervisor patches go here %patch20000 -p1 %patch20001 -p1 @@ -1337,7 +1338,7 @@ %if %{includexen} %if %{buildxen} - cd xen-3.0.5-rc4-%{xen_hv_cset}/xen + cd xen-%{xen_hv_version}-%{xen_hv_cset}/xen mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot make %{?_smp_mflags} %{xen_flags} install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL} From fedora-cvs-commits at redhat.com Tue May 1 15:57:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 11:57:44 -0400 Subject: rpms/evolution/devel evolution-2.9.1-kill-ememory.patch, 1.1, 1.2 evolution.spec, 1.251, 1.252 Message-ID: <200705011557.l41FviZS016592@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16576 Modified Files: evolution-2.9.1-kill-ememory.patch evolution.spec Log Message: * Tue May 01 2007 Matthew Barnes - 2.10.1-10.fc7 - Revise patch for GNOME bug #363695 to fix RH bug #238497 (crash sorting "To" column). evolution-2.9.1-kill-ememory.patch: message-list.c | 156 ++++++++++++++++++++------------------------------------- message-list.h | 3 - 2 files changed, 58 insertions(+), 101 deletions(-) Index: evolution-2.9.1-kill-ememory.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.9.1-kill-ememory.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-2.9.1-kill-ememory.patch 27 Oct 2006 22:27:55 -0000 1.1 +++ evolution-2.9.1-kill-ememory.patch 1 May 2007 15:57:42 -0000 1.2 @@ -122,7 +122,7 @@ return (void *)(str ? str : ""); case COL_TO_NORM: - return (void *) get_normalised_string (message_list, msg_info, col); -+ str = camel_message_info_to (str); ++ str = camel_message_info_to (msg_info); + return (void *) get_normalised_string (message_list, str); case COL_SIZE: return GINT_TO_POINTER (camel_message_info_size(msg_info)); Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- evolution.spec 30 Apr 2007 19:22:54 -0000 1.251 +++ evolution.spec 1 May 2007 15:57:42 -0000 1.252 @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -747,6 +747,10 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue May 01 2007 Matthew Barnes - 2.10.1-10.fc7 +- Revise patch for GNOME bug #363695 to fix RH bug #238497 + (crash sorting "To" column). + * Mon Apr 30 2007 Matthew Barnes - 2.10.1-9.fc7 - Revise some patches so that we don't have to run autoreconf. - Remove patch for GNOME bug #427939 (use a different work-around). From fedora-cvs-commits at redhat.com Tue May 1 15:59:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 11:59:54 -0400 Subject: rpms/kernel/devel linux-2.6-powerpc-slabalign.patch, NONE, 1.1 kernel-2.6.spec, 1.3122, 1.3123 Message-ID: <200705011559.l41FxsQU016715@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16694 Modified Files: kernel-2.6.spec Added Files: linux-2.6-powerpc-slabalign.patch Log Message: fix slab alignment on ppc32 with slab debugging linux-2.6-powerpc-slabalign.patch: processor.h | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE linux-2.6-powerpc-slabalign.patch --- diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h index a26c32e..30f7e59 100644 --- a/include/asm-powerpc/processor.h +++ b/include/asm-powerpc/processor.h @@ -270,6 +270,9 @@ static inline void prefetchw(const void *x) #define HAVE_ARCH_PICK_MMAP_LAYOUT #endif +/* Force slab alignment to work for uint64_t */ +#define ARCH_KMALLOC_MINALIGN 8 + #endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_PROCESSOR_H */ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.3122 retrieving revision 1.3123 diff -u -r1.3122 -r1.3123 --- kernel-2.6.spec 1 May 2007 13:05:24 -0000 1.3122 +++ kernel-2.6.spec 1 May 2007 15:59:52 -0000 1.3123 @@ -400,7 +400,7 @@ # 300 - 399 ppc(64) Patch300: linux-2.6-g5-therm-shutdown.patch -Patch301: linux-2.6-cell-mambo-drivers.patch +Patch301: linux-2.6-powerpc-slabalign.patch Patch302: linux-2.6-systemsim-work.patch Patch303: linux-2.6-ppc32-ucmpdi2.patch Patch304: linux-2.6-ibmvscsi-schizo.patch @@ -1047,8 +1047,8 @@ # # Alleviate G5 thermal shutdown problems %patch300 -p1 -# Support the IBM Mambo simulator; core as well as disk and network drivers. -#%patch301 -p1 +# Ensure slab objects are aligned enough for a uint64_t (#235392) +%patch301 -p1 #%patch302 -p1 # Temporary hack to work around GCC PR #25724 / #21237 %patch303 -p1 @@ -2340,6 +2340,9 @@ # - tux. %changelog +* Tue May 1 2007 David Woodhouse +- Set ARCH_KMALLOC_MINALIGN to 8 on PowerPC (#235392) + * Mon May 01 2007 John W. Linville - Update git-iwlwifi.patch (iwlwifi version 0.0.16) From fedora-cvs-commits at redhat.com Tue May 1 16:05:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 12:05:52 -0400 Subject: rpms/system-config-lvm/devel .cvsignore, 1.21, 1.22 sources, 1.23, 1.24 system-config-lvm.spec, 1.25, 1.26 Message-ID: <200705011605.l41G5qnm017298@cvs.devel.redhat.com> Author: kupcevic Update of /cvs/dist/rpms/system-config-lvm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17268/devel Modified Files: .cvsignore sources system-config-lvm.spec Log Message: auto-import system-config-lvm-1.1.1-1.0.fc7 on branch devel from system-config-lvm-1.1.1-1.0.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-lvm/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 14 Jun 2006 16:29:11 -0000 1.21 +++ .cvsignore 1 May 2007 16:05:49 -0000 1.22 @@ -1 +1 @@ -system-config-lvm-1.0.18.tar.gz +system-config-lvm-1.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-lvm/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 14 Jun 2006 17:28:39 -0000 1.23 +++ sources 1 May 2007 16:05:49 -0000 1.24 @@ -1 +1 @@ -e82db0a496bf768f5a878542cf032802 system-config-lvm-1.0.18.tar.gz +1a56429059d218ea6f74c09cb3f2dded system-config-lvm-1.1.1.tar.gz Index: system-config-lvm.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- system-config-lvm.spec 14 Jun 2006 17:28:39 -0000 1.25 +++ system-config-lvm.spec 1 May 2007 16:05:49 -0000 1.26 @@ -1,8 +1,8 @@ # -*- RPM-SPEC -*- Summary: A utility for graphically configuring Logical Volumes. Name: system-config-lvm -Version: 1.0.18 -Release: 1.2.FC6 +Version: 1.1.1 +Release: 1.0%{?dist} URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: /sbin/chkconfig Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas +Requires: urw-fonts Requires: lvm2 >= 2.00.20 Requires: rhpl >= 0.148.2 Requires: python >= 2.3 @@ -52,96 +53,159 @@ %config %{_sysconfdir}/security/console.apps/system-config-lvm %changelog +* Tue May 01 2007 Stanko Kupcevic 1.1.1-1.0 + - Update pam file + - Update translation files + +* Mon Jan 22 2007 Stanko Kupcevic 1.0.22-1.0 + - Fixed 223518 (s-c-lvm fails to probe CS5 properly) + - Resolves: bz223518 + +* Mon Dec 18 2006 Stanko Kupcevic 1.0.21-1.0 + - Fixed 216569 (some messages not localized) + - Fixed 218126 (Can't resize ext3 fs online) + - Resolves: bz216569, bz218126 + +* Mon Oct 16 2006 Stanko Kupcevic 1.0.20-1.0 + - Updated translation files + +* Mon Jul 10 2006 Stanko Kupcevic 1.0.19-1.0 + - Version bump + * Thu Jun 01 2006 Stanko Kupcevic 1.0.18-1.0 - Version bump + * Fri May 12 2006 Stanko Kupcevic 1.0.17-1.0 - Fixes for 175077, 171117, 175131, 176967, enable mirroring, 159455, 159456 + * Thu Feb 16 2006 Jim Parsons 1.0.16-1.0 - Disabled mirroring support in UI. + * Mon Feb 14 2006 Stanko Kupcevic 1.0.14-1.0 - Fixes for bz180281, 159457, 180269. Mirroring support available with constants in lvmui_constants file by setting MIRRORING_UI_SUPPORT to True + * Fri Feb 10 2006 Stanko Kupcevic 1.0.13-1.0 - Fix failure to display all unused space + * Mon Feb 06 2006 Stanko Kupcevic 1.0.12-1.0 - Under certain conditions, labels might show partially + * Fri Feb 03 2006 Stanko Kupcevic 1.0.11-1.0 - Fixes for bz175077,169860,178128,161917,171117,175131,178195 + * Thu Jan 05 2006 Stanko Kupcevic 1.0.10-1.0 - Fix for bz176967 + * Fri Dec 2 2005 Jim Parsons 1.0.9-1.0 - Removed cLVM test. + * Mon Nov 14 2005 Jim Parsons 1.0.8-1.0 - Fixes for bz171744,171746,171747,171751,171753,171754,171755,171758,159457 + * Mon Sep 26 2005 Jim Parsons 1.0.7-1.0 - Version bump. + * Mon Sep 26 2005 Jim Parsons 1.0.6-1.0 - Version bump for FC. + * Wed Sep 13 2005 Stanko Kupcevic 1.0.5-1.0 - Fix for bz167671. + * Wed Sep 08 2005 Stanko Kupcevic 1.0.4-1.0 - Fix for bz167662, 167643. + * Mon Aug 15 2005 Stanko Kupcevic 1.0.3-1.0 - Fix for bz159457: Temporary removal of mirroring support. + * Tue Aug 02 2005 Jim Parsons 1.0.2-1.0 - Major new release that supports snapshotting, mirroring, and resizing. + * Mon Jul 26 2005 Stanko Kupcevic 0.9.52-1.0 - Alpha release: Strings, minor bugs, GFS, GFS2, mirrors on diff HDs + * Fri Jul 15 2005 Stanko Kupcevic 0.9.51-1.0 - Alpha release: mirroring, multipath, GPT, zoom, ... + * Tue Jun 21 2005 Stanko Kupcevic 0.9.50-1.0 - Alpha release: snapshotting, resizing, lv properties + * Thu May 26 2005 Jim Parsons 0.9.33-1.0 - Version bump for rhel + * Thu May 26 2005 Jim Parsons 0.9.32-1.0 - Fix for 158872; x86_64 pam file path + * Mon May 23 2005 Jim Parsons 0.9.31-1.0 - Version bump for RHEL4 + * Mon May 23 2005 Jim Parsons 0.9.30-1.0 - Fixed bz157744 + * Tue May 17 2005 Jim Parsons 0.9.29-1.0 - Version Bump + * Tue May 17 2005 Jim Parsons 0.9.28-1.0 - Version Bump + * Tue May 17 2005 Jim Parsons 0.9.27-1.0 - Fix for bz154458,153042,155438,157743 + * 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 - Changed permissions on Icon file. + * Thu Apr 14 2005 Jim Parsons 0.9.23-1.0 - Subtle change to .desktop file moves app launcher to system settings + * Wed Apr 06 2005 Jim Parsons 0.9.22-1.0 - Version Bump. + * Wed Apr 06 2005 Jim Parsons 0.9.21-1.0 - Changed path to lvm command for Fedora. + * Mon Feb 21 2005 Jim Parsons 0.9.20-1.0 - Added desktop icon file. + * Mon Feb 21 2005 Jim Parsons 0.9.19-1.0 - Added desktop file. + * Wed Nov 24 2004 Jim Parsons 0.9.18-1.0 - Adjustments to configure.in so this builds in fedora as well as RHEL. + * Tue Nov 23 2004 Jim Parsons 0.9.17-1.0 - Fixes for bz140413 and bz 140562 + * Tue Nov 23 2004 Jim Parsons 0.9.16-1.0 - Strips whitespace off of all incoming command handler args. + * Tue Nov 23 2004 Jim Parsons 0.9.15-1.0 - Fixes for two small nits. + * Mon Nov 22 2004 Jim Parsons 0.9.14-1.0 - Fixes for bz140413, 140386, 140355, 140359, 140419, 138103, 140529. + * Thu Nov 18 2004 Jim Parsons 0.9.12-1.0 - Fix for bz137041, 139711 plus require for new RHPL pkg. + * Tue Nov 16 2004 Jim Parsons 0.9.11-1.0 - Fix for bz138019 -- extent segs correct for stripe corner case + * Mon Nov 15 2004 Jim Parsons 0.9.10-1.0 - Fixes for bz137291, 138008, and 137122 + * Thu Nov 11 2004 Jim Parsons 0.9.9-1.0 - Fixes for bz137111, 138887, 138006,138097. Also removed fstab checkbox and added it as a feature at 138831 for next release. + * Wed Nov 10 2004 Jim Parsons 0.9.8-1.0 - Fixes for bz137930, 137872, 137292, 137052, 137054 + * Tue Nov 9 2004 Jim Parsons 0.9.7-1.0 - Improved handling of garbage in the size string -- try catch in place now that traps for ValueError @@ -157,21 +221,28 @@ - Fixed tree selection mechanism by preventing multiple VG selection. - Handle delete-event on VG creation dialog, so it is hidden. - Fixed bz137099, 137071, 137869, 137434, 138085 + * Mon Nov 1 2004 Jim Parsons 0.9.6-1.0 - Changed gtk.mainloop to gtk.main to address bz137288. + * Mon Nov 1 2004 Jim Parsons 0.9.5-1.0 - Added Menubar to address bz137293. + * Fri Oct 29 2004 Jim Parsons 0.9.4-1.0 - Fixes for bz137190 empty vg name field validation, - bz137048 removes resizable checkbox for vgcreate, - bz137208 unique vg name checking fixed, - bz137107 remove autobackup checkbox, - bz137231 warn on extend vg when init'ing a new entity. + * Tue Oct 26 2004 Jim Parsons 0.9.3-1.0 - Version bump. + * Tue Oct 26 2004 Jim Parsons 0.9.2-1.0 - Fixed bz137118 warningMessage error. This is a critical mustfix. + * Wed Oct 20 2004 Jim Parsons 0.9.1-2.5 - Fixed size selection issue, bz136217. + * Wed Sep 01 2004 Jim Parsons 0.9.1-1 - Initial copy From fedora-cvs-commits at redhat.com Tue May 1 16:26:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 12:26:51 -0400 Subject: rpms/kernel/devel kernel-2.6.spec,1.3123,1.3124 Message-ID: <200705011626.l41GQpfZ017569@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17547 Modified Files: kernel-2.6.spec Log Message: * Tue May 01 2007 Dave Jones - i8xx_tco watchdog driver has been obsoleted by the iTCO_wdt driver. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.3123 retrieving revision 1.3124 diff -u -r1.3123 -r1.3124 --- kernel-2.6.spec 1 May 2007 15:59:52 -0000 1.3123 +++ kernel-2.6.spec 1 May 2007 16:26:49 -0000 1.3124 @@ -2340,6 +2340,9 @@ # - tux. %changelog +* Tue May 01 2007 Dave Jones +- i8xx_tco watchdog driver has been obsoleted by the iTCO_wdt driver. + * Tue May 1 2007 David Woodhouse - Set ARCH_KMALLOC_MINALIGN to 8 on PowerPC (#235392) From fedora-cvs-commits at redhat.com Tue May 1 16:26:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 12:26:51 -0400 Subject: rpms/kernel/devel/configs config-generic,1.307,1.308 Message-ID: <200705011626.l41GQpFW017578@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv17547/configs Modified Files: config-generic Log Message: * Tue May 01 2007 Dave Jones - i8xx_tco watchdog driver has been obsoleted by the iTCO_wdt driver. Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- config-generic 1 May 2007 00:44:05 -0000 1.307 +++ config-generic 1 May 2007 16:26:49 -0000 1.308 @@ -1770,7 +1770,7 @@ # CONFIG_ADVANTECH_WDT is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_IB700_WDT is not set -CONFIG_I8XX_TCO=m +# CONFIG_I8XX_TCO is not set # CONFIG_MIXCOMWD is not set # CONFIG_SCx200_WDT is not set # CONFIG_60XX_WDT is not set From fedora-cvs-commits at redhat.com Tue May 1 16:31:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 12:31:49 -0400 Subject: rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.29, 1.30 Message-ID: <200705011631.l41GVniE031205@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31163 Modified Files: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch Log Message: missing Get openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: inc/cupsmgr.hxx | 0 inc/jobset.hxx | 0 inc/print.h | 0 inc/print.hxx | 0 inc/printdlg.hxx | 0 inc/psprint/ppdparser.hxx | 0 inc/psprint/printerinfomanager.hxx | 0 inc/salframe.hxx | 0 inc/window.hxx | 0 psprint/inc/cupsmgr.hxx | 2 psprint/inc/psprint/ppdparser.hxx | 4 psprint/inc/psprint/printerinfomanager.hxx | 2 psprint/source/printer/cupsmgr.cxx | 23 psprint/source/printer/printerinfomanager.cxx | 8 psprint/source/printergfx/printerjob.cxx | 3 sfx2/source/view/viewprn.cxx | 1 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/dialogs/printdlg.hrc | 0 source/dialogs/printdlg.src | 0 source/gdi/jobset.cxx | 0 source/gdi/print.cxx | 0 source/printer/cupsmgr.cxx | 0 source/printergfx/printerjob.cxx | 0 source/window/window.cxx | 0 svtools/inc/printdlg.hxx | 3 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 601 +++++++++++++++++++++++++- svtools/source/dialogs/printdlg.hrc | 2 svtools/source/dialogs/printdlg.src | 10 svtools/util/makefile.mk | 8 unx/gtk/window/gtkframe.cxx | 0 unx/inc/plugins/gtk/gtkframe.hxx | 0 util/makefile.mk | 0 vcl/inc/jobset.hxx | 3 vcl/inc/print.h | 2 vcl/inc/print.hxx | 3 vcl/inc/salframe.hxx | 3 vcl/inc/window.hxx | 3 vcl/source/gdi/jobset.cxx | 194 ++++++++ vcl/source/gdi/print.cxx | 11 vcl/source/window/window.cxx | 10 vcl/unx/gtk/window/gtkframe.cxx | 11 vcl/unx/inc/plugins/gtk/gtkframe.hxx | 3 44 files changed, 898 insertions(+), 16 deletions(-) Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 1 May 2007 12:41:20 -0000 1.29 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 1 May 2007 16:31:47 -0000 1.30 @@ -1211,7 +1211,7 @@ // Dialog ausf"uhren SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( _pParent, _pViewSh, _pOptions ); -+ pDlg->SetNativeParent(_pParent ? _pParent->NativeHandle() : 0); ++ pDlg->SetNativeParent(_pParent ? _pParent->GetNativeHandle() : 0); if ( _bHelpDisabled ) pDlg->DisableHelp(); if ( pDlg->Execute() == RET_OK ) From fedora-cvs-commits at redhat.com Tue May 1 16:40:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 12:40:32 -0400 Subject: rpms/python-virtinst/devel virtinst-0.103.0-accelerate.patch, NONE, 1.1 virtinst-0.103.0-default-net.patch, NONE, 1.1 virtinst-0.103.0-features-xml.patch, NONE, 1.1 virtinst-0.103.0-rhel5-client.patch, NONE, 1.1 python-virtinst.spec, 1.18, 1.19 Message-ID: <200705011640.l41GeW5d004815@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/python-virtinst/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4756 Modified Files: python-virtinst.spec Added Files: virtinst-0.103.0-accelerate.patch virtinst-0.103.0-default-net.patch virtinst-0.103.0-features-xml.patch virtinst-0.103.0-rhel5-client.patch Log Message: Fixed KVM install. Fixed RHEL5 client install. Remove xenism in default network & uri virtinst-0.103.0-accelerate.patch: virt-install | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE virtinst-0.103.0-accelerate.patch --- changeset: 161:00984cdd0c55 user: Mark McLoughlin date: Mon Apr 30 11:43:24 2007 -0400 files: virt-install description: [et-mgmt-tools] [patch 1/4] Typo in kvm support Patch from David Lutterkort Fixes a minor type in kvm support where we reference a non-existent module. Signed-off-by: Mark McLoughlin diff -r 71f2046b9805 -r 00984cdd0c55 virt-install --- a/virt-install Wed Apr 25 15:56:03 2007 -0400 +++ b/virt-install Mon Apr 30 11:43:24 2007 -0400 @@ -519,9 +519,9 @@ def main(): hvm = True type = "qemu" if options.accelerate: - if util.is_kvm_capable(): + if virtinst.util.is_kvm_capable(): type = "kvm" - elif util.is_kqemu_capable(): + elif virtinst.util.is_kqemu_capable(): type = "kqemu" if hvm: virtinst-0.103.0-default-net.patch: virt-install | 23 +++++++++++------------ virtinst/util.py | 43 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 50 insertions(+), 16 deletions(-) --- NEW FILE virtinst-0.103.0-default-net.patch --- changeset: 165:5b37d71c88b6 user: "Daniel P. Berrange " date: Tue May 01 11:31:32 2007 -0400 summary: Automatically pick sensible default networking if no arg is listed, rather than defaulting to xenbr0. Pick sensible connect URI based on host OS diff -r cdbbe109cf8d -r 5b37d71c88b6 virt-install --- a/virt-install Mon Apr 30 11:44:00 2007 -0400 +++ b/virt-install Tue May 01 11:31:32 2007 -0400 @@ -42,11 +42,6 @@ def prompt_for_input(prompt = "", val = print prompt + " ", return sys.stdin.readline().strip() - -def check_xen(): - if not os.path.isdir("/proc/xen"): - print >> sys.stderr, "Can only install guests if running under a Xen kernel!" - sys.exit(1) ### General input gathering functions def get_full_virt(): @@ -216,7 +211,8 @@ def get_networks(macs, bridges, networks macs = [ None ] * len(networks) else: if os.getuid() == 0: - networks = ["bridge:" + virtinst.util.default_bridge()] + net = virtinst.util.default_network() + networks = [net[0] + ":" + net[1]] else: networks = ["user"] if macs != None: @@ -274,9 +270,12 @@ def get_paravirt_extraargs(extra, guest) ### fullvirt input gathering functions -def get_fullvirt_cdrom(cdpath, guest): - while 1: - cdpath = prompt_for_input("What would you like to use for the virtual CD image?", cdpath) +def get_fullvirt_cdrom(cdpath, location, guest): + if cdpath is None and location is not None: + cdpath = location + + while 1: + cdpath = prompt_for_input("What is the virtual CD image, CD device or install location?", cdpath) try: guest.location = cdpath break @@ -353,7 +352,8 @@ def parse_args(): help="Use kernel acceleration capabilities") parser.add_option("", "--connect", type="string", dest="connect", action="callback", callback=check_before_store, - help="Connect to hypervisor with URI") + help="Connect to hypervisor with URI", + default=virtinst.util.default_connection()) # fullvirt options parser.add_option("-v", "--hvm", action="store_true", dest="fullvirt", @@ -484,7 +484,6 @@ def main(): # check to ensure we're really on a xen kernel if conn.getType() == "Xen": type = "xen" - check_xen() if os.geteuid() != 0: print >> sys.stderr, "Must be root to install guests" @@ -544,7 +543,7 @@ def main(): get_paravirt_extraargs(options.extra, guest) continue_inst = False else: - get_fullvirt_cdrom(options.cdrom, guest) + get_fullvirt_cdrom(options.cdrom, options.location, guest) if options.noacpi: guest.features["acpi"] = False if options.noapic: diff -r cdbbe109cf8d -r 5b37d71c88b6 virtinst/util.py --- a/virtinst/util.py Mon Apr 30 11:44:00 2007 -0400 +++ b/virtinst/util.py Tue May 01 11:31:32 2007 -0400 @@ -16,7 +16,7 @@ import os.path import os.path from sys import stderr -def default_bridge(): +def default_route(): route_file = "/proc/net/route" d = file(route_file) @@ -30,12 +30,47 @@ def default_bridge(): try: route = int(info[1],16) if route == 0: - defn = int(info[0][-1]) - break + return info[0] except ValueError: continue + return None - return "xenbr%d"%(defn) +# Legacy for compat only. +def default_bridge(): + rt = default_route() + defn = int(rt[-1]) + + if defn is None: + return "xenbr0" + else: + return "xenbr%d"%(defn) + +def default_network(): + dev = default_route() + + if dev is not None: + # New style peth0 == phys dev, eth0 == bridge, eth0 == default route + if os.path.exists("/sys/class/net/%s/bridge" % dev): + return ["bridge", dev] + + # Old style, peth0 == phys dev, eth0 == netloop, xenbr0 == bridge, + # vif0.0 == netloop enslaved, eth0 == default route + defn = int(dev[-1]) + if os.path.exists("/sys/class/net/peth%d/brport" % defn) and \ + os.path.exists("/sys/class/net/xenbr%d/bridge" % defn): + return ["bridge", "xenbr%d" % defn] + + return ["network", "default"] + +def default_connection(): + if os.path.exists("/var/lib/xend") and os.path.exists("/proc/xen"): + return "xen" + elif os.path.exists("/usr/bin/qemu"): + if os.getuid() == 0: + return "qemu:///system" + else: + return "qemu:///session" + return None def get_cpu_flags(): f = open("/proc/cpuinfo") virtinst-0.103.0-features-xml.patch: FullVirtGuest.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE virtinst-0.103.0-features-xml.patch --- changeset: 162:ba44389ce195 user: Mark McLoughlin date: Mon Apr 30 11:43:35 2007 -0400 files: virtinst/FullVirtGuest.py description: [et-mgmt-tools] [patch 2/4] Fix typo in hvm kernel/initrd XML Fixes a minor typo in the libvirt XML we output when booting qemu with a kernel/initrd - the block should be outside the block. Signed-off-by: Mark McLoughlin diff -r 00984cdd0c55 -r ba44389ce195 virtinst/FullVirtGuest.py --- a/virtinst/FullVirtGuest.py Mon Apr 30 11:43:24 2007 -0400 +++ b/virtinst/FullVirtGuest.py Mon Apr 30 11:43:35 2007 -0400 @@ -185,10 +185,10 @@ class FullVirtGuest(Guest.XenGuest): %(kernel)s %(initrd)s %(extra)s - - %(features)s - - """ % \ + + + %(features)s + """ % \ { "kernel": self.kernel, \ "initrd": self.initrd, \ "extra": self.extraargs, \ virtinst-0.103.0-rhel5-client.patch: DistroManager.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE virtinst-0.103.0-rhel5-client.patch --- changeset: 166:42e9479fa521 tag: tip user: "Daniel P. Berrange " date: Tue May 01 11:33:16 2007 -0400 summary: Added logic to detect RHEL5 client distro flavour diff -r 5b37d71c88b6 -r 42e9479fa521 virtinst/DistroManager.py --- a/virtinst/DistroManager.py Tue May 01 11:31:32 2007 -0400 +++ b/virtinst/DistroManager.py Tue May 01 11:33:16 2007 -0400 @@ -214,7 +214,10 @@ class RHELImageStore(RedHatImageStore): class RHELImageStore(RedHatImageStore): def isValidStore(self, fetcher, progresscb): if fetcher.hasFile("Server", progresscb): - logging.debug("Detected a RHEL 5 distro") + logging.debug("Detected a RHEL 5 Server distro") + return True + if fetcher.hasFile("Client", progresscb): + logging.debug("Detected a RHEL 5 Client distro") return True if fetcher.hasFile("RedHat", progresscb): logging.debug("Detected a RHEL 4 distro") Index: python-virtinst.spec =================================================================== RCS file: /cvs/dist/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- python-virtinst.spec 17 Apr 2007 16:34:29 -0000 1.18 +++ python-virtinst.spec 1 May 2007 16:40:30 -0000 1.19 @@ -3,9 +3,13 @@ Summary: Python modules for starting Xen guest installations Name: python-virtinst Version: 0.103.0 -Release: 2%{?dist} +Release: 3%{?dist} Source0: virtinst-%{version}.tar.gz Patch0: virtinst-0.103.0-urlgrabber-import.patch +Patch1: virtinst-0.103.0-accelerate.patch +Patch2: virtinst-0.103.0-default-net.patch +Patch3: virtinst-0.103.0-rhel5-client.patch +Patch4: virtinst-0.103.0-features-xml.patch License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,6 +36,10 @@ %setup -q -n virtinst-%{version} %patch0 -p1 -b .urlgrabber-import +%patch1 -p1 -b .accelerate +%patch2 -p1 -b .defaultnet +%patch3 -p1 -b .rhel5client +%patch4 -p1 -b .features %build python setup.py build @@ -53,6 +61,13 @@ %{_sbindir}/virt-install %changelog +* Tue May 1 2007 Daniel P. Berrange - 0.103.0-3.fc7 +- Fixed module import when using --accelerate +- Fixed detection of RHEL5 client distro +- Fixed default 'network's selection & default URI choice to + not be Xen specific +- Fixed features XML when using initrd for fullvirt + * Tue Apr 17 2007 Mark McLoughlin - 0.103.0-2.fc7 - Fix urlgrabber import error From fedora-cvs-commits at redhat.com Tue May 1 17:23:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 13:23:45 -0400 Subject: rpms/kernel-xen-2.6/devel linux-2.6-fix-x86_64-smp.patch, NONE, 1.1.2.1 linux-2.6-fix-x86_64-vgetcpu.patch, NONE, 1.1.2.1 kernel-xen.spec, 1.20.2.3, 1.20.2.4 Message-ID: <200705011723.l41HNjba003586@cvs.devel.redhat.com> Author: ehabkost Update of /cvs/dist/rpms/kernel-xen-2.6/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3422 Modified Files: Tag: private-ehabkost-xen-3_0_5-rc4-branch kernel-xen.spec Added Files: Tag: private-ehabkost-xen-3_0_5-rc4-branch linux-2.6-fix-x86_64-smp.patch linux-2.6-fix-x86_64-vgetcpu.patch Log Message: Added smp and vgetcpu fixes (bug #238015) linux-2.6-fix-x86_64-smp.patch: time-xen.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-fix-x86_64-smp.patch --- --- linux-2.6.20.noarch/arch/x86_64/kernel/time-xen.c~orig 2007-04-26 02:05:31.000000000 -0700 +++ linux-2.6.20.noarch/arch/x86_64/kernel/time-xen.c 2007-04-26 02:02:27.000000000 -0700 @@ -985,7 +985,7 @@ void time_resume(void) #ifdef CONFIG_SMP static char timer_name[NR_CPUS][15]; -void local_setup_timer(unsigned int cpu) +int local_setup_timer(unsigned int cpu) { int seq; @@ -1009,6 +1009,7 @@ void local_setup_timer(unsigned int cpu) timer_name[cpu], NULL); BUG_ON(per_cpu(timer_irq, cpu) < 0); + return 0; } void local_teardown_timer(unsigned int cpu) linux-2.6-fix-x86_64-vgetcpu.patch: vsyscall.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) --- NEW FILE linux-2.6-fix-x86_64-vgetcpu.patch --- --- linux-2.6.20.noarch/arch/x86_64/kernel/vsyscall.c~orig 2007-04-26 02:05:31.000000000 -0700 +++ linux-2.6.20.noarch/arch/x86_64/kernel/vsyscall.c 2007-04-26 15:11:02.000000000 -0700 @@ -40,6 +40,9 @@ #include #include #include +#ifdef CONFIG_XEN +#include +#endif #define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr))) #define __syscall_clobber "r11","rcx","memory" @@ -246,12 +249,11 @@ #endif -#ifndef CONFIG_XEN /* Assume __initcall executes before all user space. Hopefully kmod doesn't violate that. We'll find out if it does. */ static void __cpuinit vsyscall_set_cpu(int cpu) { - unsigned long *d; + unsigned long *d, n; unsigned long node = 0; #ifdef CONFIG_NUMA node = cpu_to_node[cpu]; @@ -263,10 +265,15 @@ in user space in vgetcpu. 12 bits for the CPU and 8 bits for the node. */ d = (unsigned long *)(cpu_gdt(cpu) + GDT_ENTRY_PER_CPU); - *d = 0x0f40000000000ULL; - *d |= cpu; - *d |= (node & 0xf) << 12; - *d |= (node >> 4) << 48; + n = 0x0f40000000000ULL; + n |= cpu; + n |= (node & 0xf) << 12; + n |= (node >> 4) << 48; +#ifndef CONFIG_XEN + *d = n; +#else + HYPERVISOR_update_descriptor(virt_to_machine(d), n); +#endif } static void __cpuinit cpu_vsyscall_init(void *arg) @@ -283,7 +290,6 @@ smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1); return NOTIFY_DONE; } -#endif static void __init map_vsyscall(void) { @@ -320,10 +326,8 @@ #ifdef CONFIG_SYSCTL register_sysctl_table(kernel_root_table2, 0); #endif -#ifndef CONFIG_XEN on_each_cpu(cpu_vsyscall_init, NULL, 0, 1); hotcpu_notifier(cpu_vsyscall_notifier, 0); -#endif return 0; } Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v retrieving revision 1.20.2.3 retrieving revision 1.20.2.4 diff -u -r1.20.2.3 -r1.20.2.4 --- kernel-xen.spec 1 May 2007 15:39:07 -0000 1.20.2.3 +++ kernel-xen.spec 1 May 2007 17:23:43 -0000 1.20.2.4 @@ -374,6 +374,9 @@ Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch Patch954: linux-2.6-xen-execshield.patch Patch955: linux-2.6-xen-tux.patch +# smp/vgetcpu fixes (#238015) +Patch956: linux-2.6-fix-x86_64-smp.patch +Patch957: linux-2.6-fix-x86_64-vgetcpu.patch # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems @@ -890,6 +893,9 @@ # Xen exec-shield bits %patch954 -p1 %patch955 -p1 +# smp/vgetcpu fixes (#238015) +%patch956 -p1 +%patch957 -p1 %endif # @@ -2005,6 +2011,7 @@ %changelog * Tue May 01 2007 Eduardo Habkost - Updated Xen Hypervisor to 3.0.5-rc4, hg cset 1668299c0ea4 +- Added smp and vgetcpu fixes (bug #238015) * Fri Apr 27 2007 Eduardo Habkost - Updated Xen Hypervisor to 3.0.5-rc3, hg cset 14934 From fedora-cvs-commits at redhat.com Tue May 1 17:48:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 13:48:28 -0400 Subject: rpms/kernel/FC-6/configs config-generic, 1.268, 1.268.10.1 config-powerpc64-iseries, 1.16, 1.16.24.1 config-s390-generic, 1.22, 1.22.58.1 Message-ID: <200705011748.l41HmSsf009372@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv9327/configs Modified Files: Tag: private-linville-jwltest-fc6-33-branch config-generic config-powerpc64-iseries config-s390-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v retrieving revision 1.268 retrieving revision 1.268.10.1 diff -u -r1.268 -r1.268.10.1 --- config-generic 29 Mar 2007 22:19:24 -0000 1.268 +++ config-generic 1 May 2007 17:48:26 -0000 1.268.10.1 @@ -933,6 +933,9 @@ # CONFIG_TIPC_DEBUG is not set CONFIG_NETLABEL=y +CONFIG_CFG80211=m +# CONFIG_CFG80211_WEXT_COMPAT is not set +# CONFIG_NL80211 is not set # # QoS and/or fair queueing @@ -1091,6 +1094,7 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m +CONFIG_B44_PCI=y CONFIG_BNX2=m CONFIG_QLA3XXX=m # CONFIG_DGRS is not set @@ -1178,26 +1182,27 @@ # CONFIG_SLIP_MODE_SLIP6 is not set # -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y - -# -# Obsolete Wireless cards support (pre-802.11) +# Wireless LAN # +CONFIG_WLAN_PRE80211=y # CONFIG_STRIP is not set # CONFIG_ARLAN is not set CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m - -# -# Wireless 802.11 Frequency Hopping cards support -# +CONFIG_WLAN_80211=y # CONFIG_PCMCIA_RAYCS is not set -# -# Wireless 802.11b ISA/PCI cards support -# +CONFIG_MAC80211=m +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +CONFIG_MAC80211_DEBUG=y +# CONFIG_MAC80211_VERBOSE_DEBUG is not set +CONFIG_MAC80211_LOWTX_FRAME_DUMP=y +CONFIG_TKIP_DEBUG=y +CONFIG_MAC80211_DEBUG_COUNTERS=y +CONFIG_HOSTAPD_WPA_TESTING=y +CONFIG_MAC80211_IBSS_DEBUG=y +CONFIG_MAC80211_VERBOSE_PS_DEBUG=y CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m @@ -1212,6 +1217,33 @@ CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +CONFIG_BCM43XX_MAC80211=m +CONFIG_BCM43XX_MAC80211_PCI=y +CONFIG_BCM43XX_MAC80211_PCMCIA=y +CONFIG_BCM43XX_MAC80211_DEBUG=y +CONFIG_BCM43XX_MAC80211_DMA=y +CONFIG_BCM43XX_MAC80211_PIO=y +CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_MAC80211_DMA_MODE is not set +# CONFIG_BCM43XX_MAC80211_PIO_MODE is not set +CONFIG_RT2X00=y +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2X00_DEBUGFS=m +# CONFIG_RT2X00_DEBUG is not set +CONFIG_ADM8211=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_ZD1211RW_MAC80211=m +CONFIG_ZD1211RW_MAC80211_DEBUG=y +CONFIG_RTL818X=y +CONFIG_RTL8187=m +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_DEBUG=y CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1223,10 +1255,6 @@ CONFIG_PRISM54=m CONFIG_BCM43XX=m CONFIG_BCM43XX_DEBUG=y - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_SPECTRUM=m CONFIG_AIRO_CS=m @@ -1561,6 +1589,7 @@ CONFIG_N_HDLC=m # CONFIG_STALDRV is not set # CONFIG_IBM_ASM is not set +CONFIG_SONICS_SILICON_BACKPLANE=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_TCG_TPM=m @@ -1848,6 +1877,14 @@ CONFIG_MAX_RAW_DEVS=8192 CONFIG_HANGCHECK_TIMER=m +CONFIG_SSB=m +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SILENT=n +CONFIG_SSB_DEBUG=n +CONFIG_SSB_SERIAL=n +CONFIG_SSB_DRIVER_PCICORE=y + # # Multimedia devices # @@ -2233,6 +2270,7 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_CS=m +# CONFIG_USB_OHCI_HCD_SSB is not set # # USB Device Class drivers @@ -2780,6 +2818,8 @@ # CONFIG_CRC16=m CONFIG_CRC32=m +CONFIG_CRC_ITU_T=m +CONFIG_EEPROM_93CX6=m CONFIG_CRC_CCITT=m CONFIG_ZLIB_INFLATE=y Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-powerpc64-iseries,v retrieving revision 1.16 retrieving revision 1.16.24.1 diff -u -r1.16 -r1.16.24.1 --- config-powerpc64-iseries 15 Feb 2007 17:29:30 -0000 1.16 +++ config-powerpc64-iseries 1 May 2007 17:48:26 -0000 1.16.24.1 @@ -58,6 +58,7 @@ CONFIG_SCSI_IBMVSCSI=m CONFIG_SERIAL_ICOM=m # CONFIG_ISDN is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set # CONFIG_DVB is not set # CONFIG_VIDEO_DEV is not set Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-s390-generic,v retrieving revision 1.22 retrieving revision 1.22.58.1 diff -u -r1.22 -r1.22.58.1 --- config-s390-generic 21 Dec 2006 21:45:14 -0000 1.22 +++ config-s390-generic 1 May 2007 17:48:26 -0000 1.22.58.1 @@ -116,6 +116,7 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_NET_RADIO is not set +# CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set # The s390 CPU does not have hardware support for big pages at all. From fedora-cvs-commits at redhat.com Tue May 1 17:48:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 13:48:27 -0400 Subject: rpms/kernel/FC-6 jwltest-iwlwifi-fixes.patch, NONE, 1.1.10.1 jwltest-iwlwifi.patch, NONE, 1.1.22.1 jwltest-mac80211-backport-2_6_20-fixup.patch, NONE, 1.1.12.1 jwltest-mac80211-backport.patch, NONE, 1.1.22.1 kernel-2.6.spec, 1.2944, 1.2944.6.1 Message-ID: <200705011748.l41HmRfN009351@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9327 Modified Files: Tag: private-linville-jwltest-fc6-33-branch kernel-2.6.spec Added Files: Tag: private-linville-jwltest-fc6-33-branch jwltest-iwlwifi-fixes.patch jwltest-iwlwifi.patch jwltest-mac80211-backport-2_6_20-fixup.patch jwltest-mac80211-backport.patch Log Message: jwltest-iwlwifi-fixes.patch: base.c | 2 +- iwlwifi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE jwltest-iwlwifi-fixes.patch --- --- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-05-01 13:02:21.000000000 -0400 +++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-05-01 13:04:05.000000000 -0400 @@ -9927,7 +9927,7 @@ static int ipw_update_power_cmd(struct i u8 period = 0; struct ipw_power_mgr *pow_data; - if ((mode < IPW_POWER_MODE_CAM) || (mode > IPW_POWER_INDEX_5)) { + if (mode > IPW_POWER_INDEX_5) { IPW_DEBUG_POWER("Error invalid power mode \n"); return -1; } --- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h.orig 2007-05-01 13:02:21.000000000 -0400 +++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/iwlwifi.h 2007-05-01 13:04:05.000000000 -0400 @@ -180,7 +180,7 @@ do { if (ipw_debug_level & (level)) \ #define IPW_DL_QOS (1<<31) #define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a) -#define IPW_WARNING(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a) +#define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a) #define IPW_DEBUG_INFO(f, a...) IPW_DEBUG(IPW_DL_INFO, f, ## a) #define IPW_DEBUG_MAC80211(f, a...) IPW_DEBUG(IPW_DL_MAC80211, f, ## a) jwltest-iwlwifi.patch: Kconfig | 1 Makefile | 1 iwlwifi/Kconfig | 52 iwlwifi/Makefile | 2 iwlwifi/base.c |12341 ++++++++++++++++++++++++++++++++++++++++++++++++++ iwlwifi/iwl-3945-rs.c | 962 +++ iwlwifi/iwl-3945-rs.h | 89 iwlwifi/iwlwifi.h | 1296 +++++ iwlwifi/iwlwifi_hw.h | 1977 ++++++++ 9 files changed, 16721 insertions(+) --- NEW FILE jwltest-iwlwifi.patch --- --- /dev/null 2007-04-17 21:17:54.747954992 -0400 +++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-05-01 13:02:21.000000000 -0400 @@ -0,0 +1,12341 @@ +/****************************************************************************** + + Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. + + Portions of this file are derived from the ipw3945 project, as well + as portions of the ieee80211 subsystem header files. + + 802.11 status code portion of this file from ethereal-0.10.6: + Copyright 2000, Axis Communications AB + Ethereal - Network traffic analyzer + By Gerald Combs + Copyright 1998 Gerald Combs + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110, 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 + +******************************************************************************/ + +/* + * Theory of operation: + * + * The primary NIC mode of operation is configured within the RXON command. + * As such, there are two instances of RXON data -- staging_rxon and + * active_rxon. The former is used to configure the device, the later to + * reflect the actual currently active configuration. + * + * After configuring staging_rxon, it is activated by calling + * ipw_commit_rxon(). The ipw_commit_rxon() will ensure the correct sequence + * of commands are invoked on the hardware to result in Tx being possible + * (if the channel is appropriate for Tx) + * + * About the threading and lock model of the driver... + * + * There are three paths of execution through the driver. + * + * 1. ioctl based (wireless extensions, netdev, etc.) + * 2. interrupt based + * 3. scheduled work queue items + * + * As soon as an interrupt comes in, it schedules a tasklet. That tasklet, + * when run, does any HW checks, pulls any data from the read queue, + * and schedules other layers to do the actual work. + * + * NOTE: This driver is a work in progress. It is currently structured + * in a way that we can add support for the next wireless adapter + * available from Intel. + * + * Our current focus is as follows: + * 1. Get the driver working w/ mac80211 in STA(client) mode. + * 2. Clean up the dual-driver code from function redirection to + * if/else switches where the code detlas are minimal. + * 3. Evaluate the amount of delta between the hardware versions and + * possibly split iwlwifi into multiple drivers for each piece of + * HW, sharing as much base code as possible (would result in + * multiple driver files on disk vs. a single module that works + * with multiple hardware types) + * 4. Document the uCode regulatory enforcement + * 5. Document the rate scaling capabilities of the 3945 + * 6. Provide an initial rate scaling algorithm tailored for the + * statistic data exposed by the 3945. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//#define BIT(x) (1 << (x)) +#include +#include + +#include <../net/mac80211/ieee80211_rate.h> + +#include + +#ifndef ETH_P_80211_RAW +#define ETH_P_80211_RAW (ETH_P_ECONET + 1) +#endif + +#include +#include + +#include "iwlwifi.h" + +#define IWLWIFI_VERSION "0.0.16k" + +#define DRV_DESCRIPTION "Intel(R) Wireless Link driver for Linux" +#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" +#define DRV_VERSION IWLWIFI_VERSION + +MODULE_DESCRIPTION(DRV_DESCRIPTION); +MODULE_VERSION(DRV_VERSION); +MODULE_AUTHOR(DRV_COPYRIGHT); +MODULE_LICENSE("GPL"); + +/*MAC80211 move this to mac80211 files */ +#define IEEE80211_FC(type, stype) cpu_to_le16((type << 2) | (stype << 4)) + +#define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010 + +#define IEEE80211_24GHZ_BAND (1<<0) +#define IEEE80211_52GHZ_BAND (1<<1) + +#define IEEE80211_OFDM_SHIFT_MASK_A 4 + +/*MAC80211 end */ + +static u32 ipw_debug_level; + +static int param_disable_hw_scan = 0; +static int param_debug = 0; +static int param_channel = 0; +static int param_mode = 0; +static int param_auto_create = 1; /* def: create new adhoc network if needed */ +static int param_led = 1; /* def: use LEDs */ +static int param_disable = 0; /* def: enable radio */ +static int param_antenna = 0; /* def: 0 = both antennas (use diversity) */ +static int param_hwcrypto = 0; /* def: using software encryption */ +static int param_qos_enable = 1; +static int param_rtap_iface = 0; + +static const char ipw_modes[] = { + 'a', 'b', 'g', '?' +}; + +#define LD_TIME_LINK_ON 300 + +static int ipw_power_init_handle(struct ipw_priv *priv); + +static int ipw_queue_tx_hcmd(struct ipw_priv *priv, struct ipw_host_cmd *cmd); + +static int ipw_rate_scale_rxon_handle(struct ipw_priv *priv, s32 sta_id); +static u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid); +static void ipw_clear_stations_table(struct ipw_priv *priv); + +static void ipw_link_up(struct ipw_priv *priv); + +static int ipw_wx_set_powermode(struct ipw_priv *priv, int mode); + +#define SLP PMC_TCMD_FLAG_DRIVER_ALLOW_SLEEP_MSK + +#define MSEC_TO_USEC 1024 + +/* default power management (not Tx power) table values */ +static struct ipw_power_vec_entry range_0[IPW_POWER_AC] = { // for tim 0-10 + {{0, 0 * MSEC_TO_USEC, 0 * MSEC_TO_USEC, {0, 0, 0, 0, 0}}, 0}, + {{SLP, 200 * MSEC_TO_USEC, 500 * MSEC_TO_USEC, + {1, 2, 3, 4, 4}}, 0}, + {{SLP, 200 * MSEC_TO_USEC, 300 * MSEC_TO_USEC, + {2, 4, 6, 7, 7}}, 0}, + {{SLP, 50 * MSEC_TO_USEC, 100 * MSEC_TO_USEC, + {2, 6, 9, 9, 10}}, 0}, + {{SLP, 50 * MSEC_TO_USEC, 25 * MSEC_TO_USEC, + {2, 7, 9, 9, 10}}, 1}, + {{SLP, 25 * MSEC_TO_USEC, 25 * MSEC_TO_USEC, + {4, 7, 10, 10, 10}}, 1} +}; + +static struct ipw_power_vec_entry range_1[IPW_POWER_AC] = { // for tim > 10 + {{0, 0 * MSEC_TO_USEC, 0 * MSEC_TO_USEC, {0, 0, 0, 0, 0}}, 0}, + {{SLP, 200 * MSEC_TO_USEC, 500 * MSEC_TO_USEC, + {1, 2, 3, 4, 0xFF}}, 0}, + {{SLP, 200 * MSEC_TO_USEC, 300 * MSEC_TO_USEC, + {2, 4, 6, 7, 0xFF}}, 0}, + {{SLP, 50 * MSEC_TO_USEC, 100 * MSEC_TO_USEC, + {2, 6, 9, 9, 0xFF}}, 0}, + {{SLP, 50 * MSEC_TO_USEC, 25 * MSEC_TO_USEC, + {2, 7, 9, 9, 0xFF}}, 0}, + {{SLP, 25 * MSEC_TO_USEC, 25 * MSEC_TO_USEC, + {4, 7, 10, 10, 0xFF}}, 0} +}; + [...16355 lines suppressed...] +{ + u8 low = IPW_INVALID_RATE; + u8 high = IPW_INVALID_RATE; + u16 high_low; + int index; + struct ipw_rate_scale_priv *scale_priv; + struct ipw_rate_scale_data *window = NULL; + int current_tpt = IPW_INVALID_VALUE; + int low_tpt = IPW_INVALID_VALUE; + int high_tpt = IPW_INVALID_VALUE; + u32 fail_count; + s8 scale_action = 0; + unsigned long flags; + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; + struct sta_info *sta; + u16 fc, rate_mask; + struct ipw_priv *priv = (struct ipw_priv *)priv_rate; + + IPW_DEBUG_RATE("enter\n"); + + memset(extra, 0, sizeof(*extra)); + + fc = le16_to_cpu(hdr->frame_control); + if ((WLAN_FC_GET_TYPE(fc) != IEEE80211_FTYPE_DATA) || + (is_multicast_ether_addr(hdr->addr1))) { + /* Send management frames and broadcast/multicast data using + * lowest rate. */ + /* TODO: this could probably be improved.. */ + IPW_DEBUG_RATE("leave: lowest rate (not data or is " + "multicast)\n"); + + return ipw_get_lowest_rate(local); + } + + sta = sta_info_get(local, hdr->addr1); + if (!sta || !sta->rate_ctrl_priv) { + IPW_DEBUG_RATE("leave: No STA priv data to update!\n"); + if (sta) + sta_info_put(sta); + return NULL; + } + + rate_mask = sta->supp_rates; + index = min(sta->txrate & 0xffff, IPW_MAX_RATES - 1); + + spin_lock_irqsave(&priv->lq_mngr.lock, flags); + + scale_priv = (struct ipw_rate_scale_priv*) + sta->rate_ctrl_priv; + + if (scale_priv->start_rate != IPW_INVALID_RATE) { + index = scale_priv->start_rate; + scale_priv->start_rate = IPW_INVALID_RATE; + } + + window = &(scale_priv->win[index]); + + fail_count = window->counter - window->success_counter; + + if (((fail_count <= IPW_RATE_SCALE_MIN_FAILURE_TH) && + (window->success_counter < IPW_RATE_SCALE_MIN_SUCCESS_TH)) + || (priv->lq_mngr.expected_tpt == NULL)) { + + window->average_tpt = IPW_INVALID_VALUE; + spin_unlock_irqrestore(&priv->lq_mngr.lock, flags); + + IPW_DEBUG_RATE("Invalid average_tpt on rate %d: " + "counter: %d, success_counter: %d, " + "expected_tpt is %sNULL\n", + index, + window->counter, + window->success_counter, + priv->lq_mngr.expected_tpt ? "not " : ""); + goto out; + + } + + window->average_tpt = ((window->success_ratio * + priv->lq_mngr. + expected_tpt[index] + 64) / 128); + + high_low = ipw_get_adjacent_rate(priv, index, rate_mask); + low = high_low & 0xff; + high = (high_low >> 8) & 0xff; + + current_tpt = window->average_tpt; + + if (low != IPW_INVALID_RATE) + low_tpt = scale_priv->win[low].average_tpt; + + if (high != IPW_INVALID_RATE) + high_tpt = scale_priv->win[high].average_tpt; + + spin_unlock_irqrestore(&priv->lq_mngr.lock, flags); + + scale_action = 1; + + if ((window->success_ratio < IPW_RATE_SCALE_DECREASE_TH) || + !current_tpt) { + IPW_DEBUG_RATE("decrease rate because of low success_ratio\n"); + scale_action = -1; + } else if ((low_tpt == IPW_INVALID_VALUE) && + (high_tpt == IPW_INVALID_VALUE)) { + scale_action = 1; + } else if ((low_tpt != IPW_INVALID_VALUE) && + (high_tpt != IPW_INVALID_VALUE) + && (low_tpt < current_tpt) + && (high_tpt < current_tpt)) { + IPW_DEBUG_RATE("No action -- low [%d] & high [%d] < " + "current_tpt [%d]\n", + low_tpt, high_tpt, current_tpt); + scale_action = 0; + } else { + if (high_tpt != IPW_INVALID_VALUE) { + if (high_tpt > current_tpt) + scale_action = 1; + else { + IPW_DEBUG_RATE + ("decrease rate because of high tpt\n"); + scale_action = -1; + } + } else if (low_tpt != IPW_INVALID_VALUE) { + if (low_tpt > current_tpt) { + IPW_DEBUG_RATE + ("decrease rate because of low tpt\n"); + scale_action = -1; + } else + scale_action = 1; + } + } + + if ((window->success_ratio > IPW_RATE_SCALE_HIGH_TH) || + (current_tpt > (128 * window->average_tpt))) { + IPW_DEBUG_RATE("No action -- success_ratio [%d] > HIGH_TH or " + "current_tpt [%d] > average_tpt [%d]\n", + window->success_ratio, + current_tpt, 128 * window->average_tpt); + scale_action = 0; + } + + switch (scale_action) { + case -1: + if (low != IPW_INVALID_RATE) + index = low; + break; + + case 1: + if (high != IPW_INVALID_RATE) + index = high; + + break; + + case 0: + default: + break; + } + + IPW_DEBUG_RATE("Selected %d (action %d) - low %d high %d\n", + index, scale_action, low, high); + + out: + + sta->last_txrate = index; + sta->txrate = sta->last_txrate; + sta_info_put(sta); + + IPW_DEBUG_RATE("leave: %d\n", index); + return &priv->ieee_rates[index]; +} + + +static char* rs_name = "iwlwifi rate-scale"; +static void ipw_set_rate_scale_handlers(struct ipw_priv *priv) +{ + priv->rate_control.module = NULL; + priv->rate_control.name = rs_name; + priv->rate_control.tx_status = &rs_tx_status; + priv->rate_control.get_rate = &rs_get_rate; + priv->rate_control.rate_init = rs_rate_init; + priv->rate_control.clear = rs_clear; + priv->rate_control.alloc = rs_alloc; + priv->rate_control.free = rs_free; + priv->rate_control.alloc_sta = rs_alloc_sta; + priv->rate_control.free_sta = rs_free_sta; +} --- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-05-01 13:01:48.000000000 -0400 +++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile 2007-05-01 13:02:21.000000000 -0400 @@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211) += adm8211/ obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/ obj-$(CONFIG_RTL818X) += rtl818x/ +obj-$(CONFIG_IWLWIFI) += iwlwifi/ --- linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-05-01 13:01:48.000000000 -0400 +++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig 2007-05-01 13:02:21.000000000 -0400 @@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad source "drivers/net/wireless/mac80211/p54/Kconfig" source "drivers/net/wireless/mac80211/zd1211rw/Kconfig" source "drivers/net/wireless/mac80211/rtl818x/Kconfig" +source "drivers/net/wireless/mac80211/iwlwifi/Kconfig" jwltest-mac80211-backport-2_6_20-fixup.patch: core.c | 6 ++++-- nl80211.c | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) --- NEW FILE jwltest-mac80211-backport-2_6_20-fixup.patch --- --- linux-2.6.20.noarch/net/wireless/nl80211.c.orig 2007-04-12 12:57:55.000000000 -0400 +++ linux-2.6.20.noarch/net/wireless/nl80211.c 2007-04-12 12:57:51.000000000 -0400 @@ -694,6 +694,7 @@ static int nl80211_rename_wiphy(struct s struct cfg80211_registered_device *rdev; int result; +#if 0 /* Not in FC6 */ if (!info->attrs[NL80211_ATTR_WIPHY_NAME]) return -EINVAL; @@ -705,6 +706,9 @@ static int nl80211_rename_wiphy(struct s cfg80211_put_dev(rdev); return result; +#else + return -EINVAL; +#endif } static int nl80211_key_cmd(struct sk_buff *skb, struct genl_info *info) --- linux-2.6.20.noarch/net/wireless/core.c.orig 2007-04-12 12:55:32.000000000 -0400 +++ linux-2.6.20.noarch/net/wireless/core.c 2007-04-12 12:58:36.000000000 -0400 @@ -141,6 +141,7 @@ void cfg80211_put_dev(struct cfg80211_re mutex_unlock(&drv->mtx); } +#if 0 /* Not in FC6 */ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, char *newname) { @@ -172,6 +173,7 @@ int cfg80211_dev_rename(struct cfg80211_ return 0; } +#endif /* exported functions */ @@ -291,7 +293,7 @@ static int cfg80211_netdev_notifier_call case NETDEV_REGISTER: mutex_lock(&rdev->devlist_mtx); list_add(&dev->ieee80211_ptr->list, &rdev->netdev_list); - if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, + if (sysfs_create_link(&dev->class_dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { printk(KERN_ERR "wireless: failed to add phy80211 symlink to netdev!\n"); } @@ -301,7 +303,7 @@ static int cfg80211_netdev_notifier_call case NETDEV_UNREGISTER: mutex_lock(&rdev->devlist_mtx); if (!list_empty(&dev->ieee80211_ptr->list)) { - sysfs_remove_link(&dev->dev.kobj, "phy80211"); + sysfs_remove_link(&dev->class_dev.kobj, "phy80211"); list_del_init(&dev->ieee80211_ptr->list); } mutex_unlock(&rdev->devlist_mtx); jwltest-mac80211-backport.patch: CREDITS | 37 MAINTAINERS | 70 drivers/Kconfig | 2 drivers/Makefile | 1 drivers/misc/Kconfig | 6 drivers/misc/Makefile | 1 drivers/misc/eeprom_93cx6.c | 347 + drivers/net/Makefile | 2 drivers/net/wireless/Kconfig | 120 drivers/net/wireless/Makefile | 3 drivers/net/wireless/bcm43xx/Kconfig | 4 drivers/net/wireless/hostap/Kconfig | 3 drivers/net/wireless/mac80211/Kconfig | 6 drivers/net/wireless/mac80211/Makefile | 6 drivers/net/wireless/mac80211/README | 2 drivers/net/wireless/mac80211/adm8211/Kconfig | 25 drivers/net/wireless/mac80211/adm8211/Makefile | 1 drivers/net/wireless/mac80211/adm8211/adm8211.c | 2172 ++++++ drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 + drivers/net/wireless/mac80211/bcm43xx/Kconfig | 101 drivers/net/wireless/mac80211/bcm43xx/Makefile | 18 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 885 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1383 ++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1110 +++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 92 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 4029 ++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4286 +++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 309 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 603 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 250 drivers/net/wireless/mac80211/p54/Kconfig | 10 drivers/net/wireless/mac80211/p54/Makefile | 4 drivers/net/wireless/mac80211/p54/net2280.h | 452 + drivers/net/wireless/mac80211/p54/prism54.h | 77 drivers/net/wireless/mac80211/p54/prism54common.c | 821 ++ drivers/net/wireless/mac80211/p54/prism54common.h | 328 + drivers/net/wireless/mac80211/p54/prism54magic.h | 77 drivers/net/wireless/mac80211/p54/prism54pci.c | 700 ++ drivers/net/wireless/mac80211/p54/prism54pci.h | 106 drivers/net/wireless/mac80211/p54/prism54usb.c | 946 ++ drivers/net/wireless/mac80211/p54/prism54usb.h | 133 drivers/net/wireless/mac80211/rt2x00/Kconfig | 99 drivers/net/wireless/mac80211/rt2x00/Makefile | 14 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 1769 +++++ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 918 ++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 1951 ++++++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1185 +++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 1729 +++++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 738 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1057 +++ drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c | 353 + drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h | 72 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c | 831 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h | 128 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c | 426 + drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c | 587 + drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 83 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c | 637 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 120 drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 2332 +++++++ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1348 ++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 1966 ++++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 937 ++ drivers/net/wireless/mac80211/rtl818x/Kconfig | 9 drivers/net/wireless/mac80211/rtl818x/Makefile | 2 drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 726 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 747 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 30 drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 180 drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19 drivers/net/wireless/mac80211/zd1211rw/Makefile | 11 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1679 +++++ drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 910 ++ drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 700 ++ drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 250 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 170 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 80 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 436 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 491 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1337 ++++ drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 241 drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82 drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29 drivers/net/wireless/zd1211rw/Kconfig | 4 drivers/ssb/Kconfig | 93 drivers/ssb/Makefile | 11 drivers/ssb/driver_chipcommon.c | 402 + drivers/ssb/driver_mipscore.c | 258 drivers/ssb/driver_pcicore.c | 556 + drivers/ssb/main.c | 1047 +++ drivers/ssb/pci.c | 672 ++ drivers/ssb/pcihost_wrapper.c | 104 drivers/ssb/pcmcia.c | 256 drivers/ssb/scan.c | 407 + drivers/ssb/ssb_private.h | 151 drivers/usb/host/Kconfig | 13 drivers/usb/host/ohci-hcd.c | 6 drivers/usb/host/ohci-ssb.c | 254 fs/compat_ioctl.c | 9 include/linux/Kbuild | 1 include/linux/crc-itu-t.h | 27 include/linux/eeprom_93cx6.h | 77 include/linux/ieee80211.h | 403 + include/linux/netdevice.h | 4 include/linux/nl80211.h | 301 include/linux/ssb/ssb.h | 403 + include/linux/ssb/ssb_driver_chipcommon.h | 387 + include/linux/ssb/ssb_driver_extif.h | 163 include/linux/ssb/ssb_driver_mips.h | 47 include/linux/ssb/ssb_driver_pci.h | 108 include/linux/ssb/ssb_regs.h | 294 include/linux/wireless.h | 21 include/net/cfg80211.h | 154 include/net/iw_handler.h | 43 include/net/mac80211.h | 1060 +++ include/net/wext.h | 24 include/net/wireless.h | 139 lib/Kconfig | 8 lib/Makefile | 1 lib/crc-itu-t.c | 64 net/Kconfig | 12 net/Makefile | 4 net/core/Makefile | 1 net/core/dev.c | 34 net/core/rtnetlink.c | 29 net/core/wireless.c | 2353 ------- net/ieee80211/Kconfig | 3 net/mac80211/Kconfig | 81 net/mac80211/Makefile | 20 net/mac80211/aes_ccm.c | 155 net/mac80211/aes_ccm.h | 26 net/mac80211/debugfs.c | 433 + net/mac80211/debugfs.h | 16 net/mac80211/debugfs_key.c | 253 net/mac80211/debugfs_key.h | 34 net/mac80211/debugfs_netdev.c | 440 + net/mac80211/debugfs_netdev.h | 30 net/mac80211/debugfs_sta.c | 247 net/mac80211/debugfs_sta.h | 12 net/mac80211/hostapd_ioctl.h | 344 + net/mac80211/ieee80211.c | 5095 ++++++++++++++++ net/mac80211/ieee80211_cfg.c | 72 net/mac80211/ieee80211_cfg.h | 9 net/mac80211/ieee80211_common.h | 98 net/mac80211/ieee80211_i.h | 812 ++ net/mac80211/ieee80211_iface.c | 353 + net/mac80211/ieee80211_ioctl.c | 3180 +++++++++ net/mac80211/ieee80211_key.h | 106 net/mac80211/ieee80211_led.c | 91 net/mac80211/ieee80211_led.h | 32 net/mac80211/ieee80211_rate.c | 140 net/mac80211/ieee80211_rate.h | 144 net/mac80211/ieee80211_sta.c | 3217 ++++++++++ net/mac80211/michael.c | 104 net/mac80211/michael.h | 20 net/mac80211/rc80211_simple.c | 432 + net/mac80211/sta_info.c | 464 + net/mac80211/sta_info.h | 167 net/mac80211/tkip.c | 341 + net/mac80211/tkip.h | 36 net/mac80211/wep.c | 328 + net/mac80211/wep.h | 40 net/mac80211/wme.c | 688 ++ net/mac80211/wme.h | 39 net/mac80211/wpa.c | 846 ++ net/mac80211/wpa.h | 31 net/wireless/Kconfig | 31 net/wireless/Makefile | 5 net/wireless/core.c | 367 + net/wireless/core.h | 81 net/wireless/nl80211.c | 993 +++ net/wireless/nl80211.h | 24 net/wireless/sysfs.c | 130 net/wireless/sysfs.h | 9 net/wireless/wext.c | 1509 ++++ 195 files changed, 81312 insertions(+), 2519 deletions(-) --- NEW FILE jwltest-mac80211-backport.patch --- --- /dev/null 2007-04-17 21:17:54.747954992 -0400 +++ linux-2.6.20.noarch/include/net/wireless.h 2007-05-01 12:50:27.000000000 -0400 @@ -0,0 +1,139 @@ +#ifndef __NET_WIRELESS_H +#define __NET_WIRELESS_H + +/* + * 802.11 device management + * + * Copyright 2007 Johannes Berg + */ + +#include +#include +#include +#include + +/** + * struct wiphy - wireless hardware description + * @idx: the wiphy index assigned to this item + * @class_dev: the class device representing /sys/class/ieee80211/ + */ +struct wiphy { + /* assign these fields before you register the wiphy */ + + /* permanent MAC address */ + u8 perm_addr[ETH_ALEN]; + + /* If multiple wiphys are registered and you're handed e.g. + * a regular netdev with assigned ieee80211_ptr, you won't + * know whether it points to a wiphy your driver has registered + * or not. Assign this to something global to your driver to + * help determine whether you own this wiphy or not. */ + void *privid; + + /* fields below are read-only, assigned by cfg80211 */ + + /* the item in /sys/class/ieee80211/ points to this, + * you need use set_wiphy_dev() (see below) */ + struct device dev; + + /* dir in debugfs: ieee80211/ */ + struct dentry *debugfsdir; + + char priv[0] __attribute__((__aligned__(NETDEV_ALIGN))); +}; + +/** struct wireless_dev - wireless per-netdev state + * + * This structure must be allocated by the driver/stack + * that uses the ieee80211_ptr field in struct net_device + * (this is intentional so it can be allocated along with + * the netdev.) + * + * @wiphy: pointer to hardware description + */ +struct wireless_dev { + struct wiphy *wiphy; + + /* private to the generic wireless code */ + struct list_head list; + struct net_device *netdev; +}; + +/** + * wiphy_priv - return priv from wiphy + */ +static inline void *wiphy_priv(struct wiphy *wiphy) +{ + BUG_ON(!wiphy); + return &wiphy->priv; +} + +/** + * set_wiphy_dev - set device pointer for wiphy + */ +static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev) +{ + wiphy->dev.parent = dev; +} + +/** + * wiphy_dev - get wiphy dev pointer + */ +static inline struct device *wiphy_dev(struct wiphy *wiphy) +{ + return wiphy->dev.parent; +} + +/** + * wiphy_name - get wiphy name + */ +static inline char *wiphy_name(struct wiphy *wiphy) +{ + return wiphy->dev.bus_id; +} + +/** + * wdev_priv - return wiphy priv from wireless_dev + */ +static inline void *wdev_priv(struct wireless_dev *wdev) +{ + BUG_ON(!wdev); + return wiphy_priv(wdev->wiphy); +} + +/** + * wiphy_new - create a new wiphy for use with cfg80211 + * + * create a new wiphy and associate the given operations with it. + * @sizeof_priv bytes are allocated for private use. + * + * the returned pointer must be assigned to each netdev's + * ieee80211_ptr for proper operation. + */ +struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv); + +/** + * wiphy_register - register a wiphy with cfg80211 + * + * register the given wiphy + * + * Returns a non-negative wiphy index or a negative error code. + */ +extern int wiphy_register(struct wiphy *wiphy); + +/** + * wiphy_unregister - deregister a wiphy from cfg80211 + * + * unregister a device with the given priv pointer. + * After this call, no more requests can be made with this priv + * pointer, but the call may sleep to wait for an outstanding + * request that is being handled. + */ +extern void wiphy_unregister(struct wiphy *wiphy); + +/** + * wiphy_free - free wiphy + */ +extern void wiphy_free(struct wiphy *wiphy); + +#endif /* __NET_WIRELESS_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 +++ linux-2.6.20.noarch/include/net/mac80211.h 2007-05-01 12:50:27.000000000 -0400 @@ -0,0 +1,1060 @@ +/* + * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface + * Copyright 2002-2005, Devicescape Software, Inc. + * Copyright 2006-2007 Jiri Benc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef MAC80211_H +#define MAC80211_H + +#include +#include +#include +#include +#include +#include +#include +#include + +/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be + * called in hardware interrupt context. The low-level driver must not call any + * other functions in hardware interrupt context. If there is a need for such + * call, the low-level driver should first ACK the interrupt and perform the + * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in + * software interrupt context). + */ + +/* + * Frame format used when passing frame between low-level hardware drivers + * and IEEE 802.11 driver the same as used in the wireless media, i.e., + * buffers start with IEEE 802.11 header and include the same octets that + * are sent over air. + * + * If hardware uses IEEE 802.3 headers (and perform 802.3 <-> 802.11 + * conversion in firmware), upper layer 802.11 code needs to be changed to + * support this. + * + * If the receive frame format is not the same as the real frame sent + * on the wireless media (e.g., due to padding etc.), upper layer 802.11 code + * could be updated to provide support for such format assuming this would + * optimize the performance, e.g., by removing need to re-allocation and + * copying of the data. + */ + +#define IEEE80211_CHAN_W_SCAN 0x00000001 +#define IEEE80211_CHAN_W_ACTIVE_SCAN 0x00000002 +#define IEEE80211_CHAN_W_IBSS 0x00000004 + +/* Channel information structure. Low-level driver is expected to fill in chan, + * freq, and val fields. Other fields will be filled in by 80211.o based on + * hostapd information and low-level driver does not need to use them. The [...84597 lines suppressed...] + if (bss) { + char *buf; + buf = kmalloc(30, GFP_ATOMIC); + if (buf) { + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "tsf=%016llx", (unsigned long long)(bss->timestamp)); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, + &iwe, buf); + kfree(buf); + } + } + + do { + char *buf; + + if (!(local->scan_flags & IEEE80211_SCAN_EXTRA_INFO)) + break; + + buf = kmalloc(100, GFP_ATOMIC); + if (!buf) + break; + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "bcn_int=%d", bss->beacon_int); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "capab=0x%04x", bss->capability); + iwe.u.data.length = strlen(buf); + current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, + buf); + + kfree(buf); + break; + } while (0); + + return current_ev; +} + + +int ieee80211_sta_scan_results(struct net_device *dev, char *buf, size_t len) +{ + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); + char *current_ev = buf; + char *end_buf = buf + len; + struct ieee80211_sta_bss *bss; + + spin_lock_bh(&local->sta_bss_lock); + list_for_each_entry(bss, &local->sta_bss_list, list) { + if (buf + len - current_ev <= IW_EV_ADDR_LEN) { + spin_unlock_bh(&local->sta_bss_lock); + return -E2BIG; + } + current_ev = ieee80211_sta_scan_result(dev, bss, current_ev, + end_buf); + } + spin_unlock_bh(&local->sta_bss_lock); + return current_ev - buf; +} + + +int ieee80211_sta_set_extra_ie(struct net_device *dev, char *ie, size_t len) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + kfree(ifsta->extra_ie); + if (len == 0) { + ifsta->extra_ie = NULL; + ifsta->extra_ie_len = 0; + return 0; + } + ifsta->extra_ie = kmalloc(len, GFP_KERNEL); + if (!ifsta->extra_ie) { + ifsta->extra_ie_len = 0; + return -ENOMEM; + } + memcpy(ifsta->extra_ie, ie, len); + ifsta->extra_ie_len = len; + return 0; +} + + +struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev, + struct sk_buff *skb, u8 *bssid, + u8 *addr) +{ + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); + struct sta_info *sta; + struct ieee80211_sub_if_data *sdata = NULL; + + /* TODO: Could consider removing the least recently used entry and + * allow new one to be added. */ + if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) { + if (net_ratelimit()) { + printk(KERN_DEBUG "%s: No room for a new IBSS STA " + "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr)); + } + return NULL; + } + + printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n", + local->mdev->name, MAC_ARG(addr), dev->name); + + sta = sta_info_add(local, dev, addr, GFP_ATOMIC); + if (!sta) + return NULL; + + sta->supp_rates = sdata->u.sta.supp_rates_bits; + + rate_control_rate_init(sta, local); + + return sta; /* caller will call sta_info_put() */ +} + + +int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + + printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n", + dev->name, reason); + + if (sdata->type != IEEE80211_IF_TYPE_STA && + sdata->type != IEEE80211_IF_TYPE_IBSS) + return -EINVAL; + + ieee80211_send_deauth(dev, ifsta, reason); + ieee80211_set_disassoc(dev, ifsta, 1); + return 0; +} + + +int ieee80211_sta_disassociate(struct net_device *dev, u16 reason) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_if_sta *ifsta = &sdata->u.sta; + + printk(KERN_DEBUG "%s: disassociate(reason=%d)\n", + dev->name, reason); + + if (sdata->type != IEEE80211_IF_TYPE_STA) + return -EINVAL; + + if (!ifsta->associated) + return -1; + + ieee80211_send_disassoc(dev, ifsta, reason); + ieee80211_set_disassoc(dev, ifsta, 0); + return 0; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 +++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h 2007-05-01 12:50:32.000000000 -0400 @@ -0,0 +1,9 @@ +/* + * mac80211 configuration hooks for cfg80211 + */ +#ifndef __IEEE80211_CFG_H +#define __IEEE80211_CFG_H + +extern struct cfg80211_ops mac80211_config_ops; + +#endif /* __IEEE80211_CFG_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 +++ linux-2.6.20.noarch/net/mac80211/debugfs.h 2007-05-01 12:50:32.000000000 -0400 @@ -0,0 +1,16 @@ +#ifndef __MAC80211_DEBUGFS_H +#define __MAC80211_DEBUGFS_H + +#ifdef CONFIG_MAC80211_DEBUGFS +extern void debugfs_hw_add(struct ieee80211_local *local); +extern void debugfs_hw_del(struct ieee80211_local *local); +extern int mac80211_open_file_generic(struct inode *inode, struct file *file); +#else +static inline void debugfs_hw_add(struct ieee80211_local *local) +{ + return; +} +static inline void debugfs_hw_del(struct ieee80211_local *local) {} +#endif + +#endif /* __MAC80211_DEBUGFS_H */ --- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig 2007-05-01 12:49:35.000000000 -0400 +++ linux-2.6.20.noarch/net/ieee80211/Kconfig 2007-05-01 12:50:32.000000000 -0400 @@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP config IEEE80211_CRYPT_TKIP tristate "IEEE 802.11i TKIP encryption" - depends on IEEE80211 && NET_RADIO + depends on IEEE80211 + select WIRELESS_EXT select CRYPTO select CRYPTO_MICHAEL_MIC select CRYPTO_ECB Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2944 retrieving revision 1.2944.6.1 diff -u -r1.2944 -r1.2944.6.1 --- kernel-2.6.spec 10 Apr 2007 21:15:52 -0000 1.2944 +++ kernel-2.6.spec 1 May 2007 17:48:25 -0000 1.2944.6.1 @@ -54,7 +54,7 @@ # that the kernel isn't the stock distribution kernel, for example, # by setting the define to ".local" or ".bz123456" # -#% define buildid .local +%define buildid .jwltest.33 # %define sublevel 20 %define kversion 2.6.%{sublevel} @@ -586,6 +586,14 @@ Patch5060: linux-2.6-olpc-battery.patch # +# mac80211 backport +# +Patch6000: jwltest-mac80211-backport.patch +Patch6001: jwltest-mac80211-backport-2_6_20-fixup.patch +Patch6002: jwltest-iwlwifi.patch +Patch6003: jwltest-iwlwifi-fixes.patch + +# # 10000 to 20000 is for stuff that has to come last due to the # amount of drivers they touch. But only these should go here. # Not patches you're too lazy for to put in the proper place. @@ -1366,6 +1374,12 @@ # final stuff # +# mac80211 stuff +%patch6000 -p1 +%patch6001 -p1 +%patch6002 -p1 +%patch6003 -p1 + # # misc small stuff to make things compile or otherwise improve performance # From fedora-cvs-commits at redhat.com Tue May 1 18:25:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 14:25:20 -0400 Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.55,1.56 Message-ID: <200705011825.l41IPKol011048@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11034 Modified Files: xorg-x11-drv-i810.spec Log Message: * Tue May 01 2007 Adam Jackson 2.0.0-2 - Rebuild for final RANDR 1.2 ABI. Fixes segfault at startup. (#238575) Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- xorg-x11-drv-i810.spec 24 Apr 2007 02:48:10 -0000 1.55 +++ xorg-x11-drv-i810.spec 1 May 2007 18:25:18 -0000 1.56 @@ -7,7 +7,7 @@ Summary: Xorg X11 i810 video driver(s) Name: xorg-x11-drv-i810 Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -28,7 +28,7 @@ BuildRequires: pkgconfig BuildRequires: autoconf automake libtool -BuildRequires: xorg-x11-server-sdk >= 1.2.99.903-1 +BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-3.fc7 BuildRequires: libXvMC-devel BuildRequires: mesa-libGL-devel >= 6.5-9 BuildRequires: libdrm-devel >= 2.0-1 @@ -100,6 +100,9 @@ %{_libdir}/libI810XvMC.so %changelog +* Tue May 01 2007 Adam Jackson 2.0.0-2 +- Rebuild for final RANDR 1.2 ABI. Fixes segfault at startup. (#238575) + * Mon Apr 23 2007 Adam Jackson 2.0.0-1 - xf86-video-intel 2.0.0. Change the version number to match, why not. - Add a Virtual provides for xorg-x11-drv-intel, since we should probably From fedora-cvs-commits at redhat.com Tue May 1 20:18:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 16:18:58 -0400 Subject: rpms/evolution/devel evolution-2.10.1-e-attachment-bar.patch, NONE, 1.1 evolution.spec, 1.252, 1.253 Message-ID: <200705012018.l41KIw7r010794@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10772 Modified Files: evolution.spec Added Files: evolution-2.10.1-e-attachment-bar.patch Log Message: * Tue May 01 2007 Matthew Barnes - 2.10.1-10.fc7 - Revise patch for GNOME bug #363695 to fix RH bug #238497 (crash sorting "To" column). From fedora-cvs-commits at redhat.com Tue May 1 20:53:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 16:53:31 -0400 Subject: rpms/selinux-policy/devel policy-20070501.patch, NONE, 1.1 .cvsignore, 1.112, 1.113 selinux-policy.spec, 1.445, 1.446 sources, 1.120, 1.121 policy-20070219.patch, 1.64, NONE Message-ID: <200705012053.l41KrVOQ008228@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8177 Modified Files: .cvsignore selinux-policy.spec sources Added Files: policy-20070501.patch Removed Files: policy-20070219.patch Log Message: * Mon Apr 30 2007 Dan Walsh 2.6.2-1 - Update to latest from upstream policy-20070501.patch: Changelog | 2 Rules.modular | 12 + policy/flask/access_vectors | 4 policy/global_booleans | 2 policy/global_tunables | 15 - policy/mls | 31 ++- policy/modules/admin/acct.te | 1 policy/modules/admin/alsa.fc | 1 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 53 +++++ policy/modules/admin/amtu.te | 57 +++++ policy/modules/admin/bootloader.te | 3 policy/modules/admin/consoletype.te | 10 policy/modules/admin/dmesg.te | 1 policy/modules/admin/kudzu.te | 6 policy/modules/admin/logrotate.te | 1 policy/modules/admin/logwatch.te | 6 policy/modules/admin/netutils.te | 1 policy/modules/admin/readahead.te | 6 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 85 ++++++-- policy/modules/admin/rpm.te | 2 policy/modules/admin/su.if | 14 - policy/modules/admin/sudo.if | 9 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 40 +++ policy/modules/admin/vbetool.te | 1 policy/modules/apps/gnome.if | 26 ++ policy/modules/apps/gpg.fc | 2 policy/modules/apps/loadkeys.if | 44 +--- policy/modules/apps/mozilla.if | 1 policy/modules/apps/slocate.te | 2 policy/modules/apps/uml.if | 27 -- policy/modules/kernel/corecommands.fc | 6 policy/modules/kernel/corecommands.if | 20 + policy/modules/kernel/corenetwork.te.in | 16 + policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 36 +++ policy/modules/kernel/domain.if | 18 + policy/modules/kernel/domain.te | 46 ++++ policy/modules/kernel/files.fc | 1 policy/modules/kernel/files.if | 83 +++++++- policy/modules/kernel/filesystem.if | 39 +++ policy/modules/kernel/filesystem.te | 19 + policy/modules/kernel/kernel.if | 42 +++- policy/modules/kernel/kernel.te | 3 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/selinux.if | 38 +++ policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 21 +- policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 2 policy/modules/services/aide.te | 4 policy/modules/services/amavis.if | 19 + policy/modules/services/amavis.te | 4 policy/modules/services/apache.fc | 14 - policy/modules/services/apache.if | 171 +++++++++++++++- policy/modules/services/apache.te | 79 +++++++ policy/modules/services/apcupsd.fc | 9 policy/modules/services/apcupsd.if | 108 ++++++++++ policy/modules/services/apcupsd.te | 92 ++++++++ policy/modules/services/automount.te | 2 policy/modules/services/avahi.if | 19 + policy/modules/services/avahi.te | 4 policy/modules/services/bind.te | 1 policy/modules/services/clamav.te | 1 policy/modules/services/consolekit.te | 33 ++- policy/modules/services/cron.fc | 1 policy/modules/services/cron.if | 33 +-- policy/modules/services/cron.te | 48 +++- policy/modules/services/cups.te | 13 + policy/modules/services/cvs.te | 1 policy/modules/services/cyrus.te | 1 policy/modules/services/dbus.if | 67 ++++++ policy/modules/services/dbus.te | 7 policy/modules/services/dhcp.te | 2 policy/modules/services/djbdns.te | 5 policy/modules/services/dovecot.fc | 2 policy/modules/services/dovecot.if | 40 +++ policy/modules/services/dovecot.te | 59 +++++ policy/modules/services/ftp.te | 5 policy/modules/services/hal.fc | 8 policy/modules/services/hal.if | 77 +++++++ policy/modules/services/hal.te | 151 ++++++++++++++ policy/modules/services/inetd.te | 5 policy/modules/services/kerberos.if | 79 ++----- policy/modules/services/kerberos.te | 34 +++ policy/modules/services/mailman.if | 19 + policy/modules/services/mta.if | 19 + policy/modules/services/mta.te | 2 policy/modules/services/nis.if | 4 policy/modules/services/nis.te | 4 policy/modules/services/nscd.te | 15 + policy/modules/services/ntp.te | 4 policy/modules/services/oddjob.te | 2 policy/modules/services/pcscd.te | 1 policy/modules/services/pegasus.if | 18 + policy/modules/services/pegasus.te | 9 policy/modules/services/postfix.if | 20 + policy/modules/services/postfix.te | 29 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 7 policy/modules/services/pyzor.te | 7 policy/modules/services/radius.te | 4 policy/modules/services/rlogin.te | 1 policy/modules/services/rpc.if | 5 policy/modules/services/rpc.te | 2 policy/modules/services/rpcbind.fc | 6 policy/modules/services/rpcbind.if | 104 ++++++++++ policy/modules/services/rpcbind.te | 83 ++++++++ policy/modules/services/rsync.te | 1 policy/modules/services/rwho.fc | 2 policy/modules/services/rwho.if | 85 ++++++++ policy/modules/services/rwho.te | 31 +-- policy/modules/services/samba.fc | 3 policy/modules/services/samba.if | 86 ++++++++ policy/modules/services/samba.te | 92 ++++++++ policy/modules/services/sasl.te | 1 policy/modules/services/sendmail.if | 22 ++ policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.te | 17 + policy/modules/services/spamassassin.te | 12 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 22 ++ policy/modules/services/squid.te | 12 + policy/modules/services/ssh.if | 39 +++ policy/modules/services/ssh.te | 9 policy/modules/services/w3c.fc | 2 policy/modules/services/w3c.if | 1 policy/modules/services/w3c.te | 14 + policy/modules/system/application.fc | 1 policy/modules/system/application.if | 104 ++++++++++ policy/modules/system/application.te | 14 + policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 183 +++++++++++++++-- policy/modules/system/authlogin.te | 37 +++ policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 1 policy/modules/system/fusermount.fc | 6 policy/modules/system/fusermount.if | 41 +++ policy/modules/system/fusermount.te | 50 ++++ policy/modules/system/getty.te | 3 policy/modules/system/hostname.te | 14 + policy/modules/system/init.if | 44 ++++ policy/modules/system/init.te | 41 +++ policy/modules/system/ipsec.if | 20 + policy/modules/system/ipsec.te | 1 policy/modules/system/iptables.te | 5 policy/modules/system/libraries.fc | 4 policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 12 + policy/modules/system/logging.if | 141 +++++++++++++ policy/modules/system/logging.te | 23 +- policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 8 policy/modules/system/modutils.te | 7 policy/modules/system/mount.fc | 3 policy/modules/system/mount.if | 37 +++ policy/modules/system/mount.te | 70 ++++++ policy/modules/system/raid.te | 1 policy/modules/system/selinuxutil.fc | 1 policy/modules/system/selinuxutil.if | 6 policy/modules/system/selinuxutil.te | 76 ++++--- policy/modules/system/sysnetwork.te | 5 policy/modules/system/udev.te | 12 + policy/modules/system/unconfined.fc | 1 policy/modules/system/unconfined.if | 15 - policy/modules/system/unconfined.te | 24 ++ policy/modules/system/userdomain.if | 329 +++++++++++++++++++------------- policy/modules/system/userdomain.te | 81 +++++-- policy/modules/system/xen.te | 35 +++ policy/support/misc_patterns.spt | 5 policy/support/obj_perm_sets.spt | 12 + 175 files changed, 3836 insertions(+), 556 deletions(-) --- NEW FILE policy-20070501.patch --- diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-2.6.2/Changelog --- nsaserefpolicy/Changelog 2007-04-30 22:35:02.000000000 -0400 +++ serefpolicy-2.6.2/Changelog 2007-04-30 10:52:21.000000000 -0400 @@ -1,6 +1,3 @@ -- Patch to allow amavis to read spamassassin libraries from Dan Walsh. -- Patch to allow slocate to getattr other filesystems and directories on those - filesystems from Dan Walsh. - Fixes for RHEL4 from the CLIP project. - Replace the old lrrd fc entries with munin ones. - Move program admin template usage out of userdom_admin_user_template() to @@ -8,8 +5,6 @@ parties. - Fix clockspeed_run_cli() declaration, it was incorrectly defined as a template instead of an interface. -- Added modules: - rwho (Nalin Dahyabhai) * Tue Apr 17 2007 Chris PeBenito - 20070417 - Patch for sasl's use of kerberos from Dan Walsh. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.6.2/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2007-02-26 09:43:33.000000000 -0500 +++ serefpolicy-2.6.2/policy/flask/access_vectors 2007-04-30 11:26:06.000000000 -0400 @@ -598,6 +598,8 @@ shmempwd shmemgrp shmemhost + getserv + shmemserv } # Define the access vector interpretation for controlling @@ -623,6 +625,8 @@ send recv relabelto + flow_in + flow_out } class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.6.2/policy/global_booleans --- nsaserefpolicy/policy/global_booleans 2006-11-16 17:15:26.000000000 -0500 +++ serefpolicy-2.6.2/policy/global_booleans 2007-04-30 11:26:06.000000000 -0400 @@ -4,7 +4,6 @@ # file should be used. # -ifdef(`strict_policy',` ## ##

## Enabling secure mode disallows programs, such as @@ -13,7 +12,6 @@ ##

## gen_bool(secure_mode,false) -') ## ##

diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.6.2/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-03-26 16:24:14.000000000 -0400 +++ serefpolicy-2.6.2/policy/global_tunables 2007-04-30 11:26:06.000000000 -0400 @@ -102,12 +102,6 @@ ## gen_tunable(use_samba_home_dirs,false) -######################################## -# -# Strict policy specific -# - -ifdef(`strict_policy',` ## ##

## Allow email client to various content. @@ -143,4 +137,11 @@ ##

## gen_tunable(write_untrusted_content,false) -') + +## +##

+## Allow users to connect to console (s390) +##

+## +gen_tunable(allow_console_login,false) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.6.2/policy/mls --- nsaserefpolicy/policy/mls 2007-03-09 13:02:20.000000000 -0500 +++ serefpolicy-2.6.2/policy/mls 2007-04-30 11:26:06.000000000 -0400 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or - (( t2 == mlsfilewriteinrange ) and ( l1 dom l2 ) and ( h1 domby h2 )) or ( t1 == mlsfilewrite ) or + (( t2 == mlsrangedobject ) and ( l1 dom l2 ) and ( h1 domby h2 )) or ( t2 == mlstrustedobject )); +# Directory "write" ops mlsconstrain dir { add_name remove_name reparent rmdir } - ((( l1 dom l2 ) and ( l1 domby h2 )) or + (( l1 eq l2 ) or + (( t1 == mlsfilewriteinrange ) and ( l1 dom l2 ) and ( l1 domby h2 )) or (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or ( t1 == mlsfilewrite ) or ( t2 == mlstrustedobject )); @@ -165,8 +167,20 @@ mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } relabelto ( h1 dom h2 ); +# the socket "read+write" ops +# (Socket FDs are generally bidirectional, equivalent to open(..., O_RDWR), +# require equal levels for unprivileged subjects, or read *and* write overrides) +mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { accept connect } + (( l1 eq l2 ) or + (((( t1 == mlsnetreadtoclr ) and ( h1 dom l2 )) or + ( t1 == mlsnetread )) and + ((( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or + (( t1 == mlsnetwritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or + ( t1 == mlsnetwrite )))); + + # the socket "read" ops (note the check is dominance of the low level) -mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { read getattr listen accept getopt recv_msg } +mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { read getattr listen getopt recv_msg } (( l1 dom l2 ) or (( t1 == mlsnetreadtoclr ) and ( h1 dom l2 )) or ( t1 == mlsnetread )); @@ -177,8 +191,9 @@ ( t1 == mlsnetread )); # the socket "write" ops -mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { write setattr relabelfrom connect setopt shutdown } - ((( l1 dom l2 ) and ( l1 domby h2 )) or +mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { write setattr relabelfrom setopt shutdown } + (( l1 eq l2 ) or + (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or (( t1 == mlsnetwritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or ( t1 == mlsnetwrite )); @@ -274,7 +289,8 @@ # the netif/node "write" ops (implicit single level socket doing the write) mlsconstrain { netif node } { tcp_send udp_send rawip_send } - (( l1 dom l2 ) and ( l1 domby h2 )); + (( l1 eq l2 ) or + (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 ))); # these access vectors have no MLS restrictions # node enforce_dest @@ -581,7 +597,8 @@ ( t2 == unlabeled_t )); mlsconstrain association { sendto } - ((( l1 dom l2 ) and ( l1 domby h2 )) or + (( l1 eq l2 ) or + (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or ( t2 == unlabeled_t )); mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.6.2/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2007-03-26 10:39:08.000000000 -0400 +++ serefpolicy-2.6.2/policy/modules/admin/acct.te 2007-04-30 11:26:06.000000000 -0400 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; init_system_domain(acct_t,acct_exec_t) +application_executable_file(acct_exec_t) type acct_data_t; logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-2.6.2/policy/modules/admin/alsa.fc --- nsaserefpolicy/policy/modules/admin/alsa.fc 2006-11-16 17:15:26.000000000 -0500 +++ serefpolicy-2.6.2/policy/modules/admin/alsa.fc 2007-04-30 11:26:06.000000000 -0400 @@ -1,4 +1,5 @@ /etc/alsa/pcm(/.*)? gen_context(system_u:object_r:alsa_etc_rw_t,s0) +/etc/asound(/.*)? gen_context(system_u:object_r:alsa_etc_rw_t,s0) /usr/bin/ainit -- gen_context(system_u:object_r:alsa_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.2/policy/modules/admin/amtu.fc --- nsaserefpolicy/policy/modules/admin/amtu.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-2.6.2/policy/modules/admin/amtu.fc 2007-04-30 11:26:06.000000000 -0400 @@ -0,0 +1,3 @@ + +/usr/bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.6.2/policy/modules/admin/amtu.if --- nsaserefpolicy/policy/modules/admin/amtu.if 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-2.6.2/policy/modules/admin/amtu.if 2007-04-30 11:26:06.000000000 -0400 @@ -0,0 +1,53 @@ +## +## abstract Machine Test Utility +## + +######################################## +## [...8057 lines suppressed...] +# tunable_policy(`allow_sysadm_manage_security',` + userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal) +# ') ', ` userdom_security_admin_template(sysadm_t,sysadm_r,admin_terminal) ') @@ -504,15 +520,15 @@ unconfined_alias_domain(sysadm_t) # User home directory type. - type user_home_t alias { staff_home_t sysadm_home_t }, home_type, user_home_type; - files_type(user_home_t) - files_associate_tmp(user_home_t) - fs_associate_tmpfs(user_home_t) - - type user_home_dir_t alias { staff_home_dir_t sysadm_home_dir_t }, home_dir_type, home_type, user_home_dir_type; - files_type(user_home_dir_t) - files_associate_tmp(user_home_dir_t) - fs_associate_tmpfs(user_home_dir_t) + typealias user_home_t alias { staff_home_t sysadm_home_t }; +# files_type(user_home_t) +# files_associate_tmp(user_home_t) +# fs_associate_tmpfs(user_home_t) + + typealias user_home_dir_t alias { staff_home_dir_t sysadm_home_dir_t }; +# files_type(user_home_dir_t) +# files_associate_tmp(user_home_dir_t) +# fs_associate_tmpfs(user_home_dir_t) # compatibility for switching from strict # dominance { role secadm_r { role system_r; }} @@ -548,4 +564,13 @@ optional_policy(` samba_per_role_template(user) ') + + optional_policy(` + gnome_per_role_template(user, user_t, user_r) + ') + +') + +tunable_policy(`allow_console_login', ` + term_use_console(userdomain) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.6.2/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2007-04-23 09:36:02.000000000 -0400 +++ serefpolicy-2.6.2/policy/modules/system/xen.te 2007-04-30 11:26:06.000000000 -0400 @@ -25,6 +25,10 @@ domain_type(xend_t) init_daemon_domain(xend_t, xend_exec_t) +# tmp files +type xend_tmp_t; +files_tmp_file(xend_tmp_t) + # var/lib files type xend_var_lib_t; files_type(xend_var_lib_t) @@ -88,6 +92,7 @@ allow xend_t xen_image_t:dir list_dir_perms; manage_dirs_pattern(xend_t,xen_image_t,xen_image_t) manage_files_pattern(xend_t,xen_image_t,xen_image_t) +read_lnk_files_pattern(xend_t,xen_image_t,xen_image_t) rw_blk_files_pattern(xend_t,xen_image_t,xen_image_t) allow xend_t xenctl_t:fifo_file manage_file_perms; @@ -105,6 +110,10 @@ manage_sock_files_pattern(xend_t,xend_var_log_t,xend_var_log_t) logging_log_filetrans(xend_t,xend_var_log_t,{ sock_file file dir }) +allow xend_t xend_tmp_t:dir create_dir_perms; +allow xend_t xend_tmp_t:file create_file_perms; +files_tmp_filetrans(xend_t, xend_tmp_t, { file dir }) + # var/lib files for xend manage_dirs_pattern(xend_t,xend_var_lib_t,xend_var_lib_t) manage_files_pattern(xend_t,xend_var_lib_t,xend_var_lib_t) @@ -165,8 +174,13 @@ files_manage_etc_runtime_files(xend_t) files_etc_filetrans_etc_runtime(xend_t,file) files_read_usr_files(xend_t) +files_read_default_symlinks(xend_t) + +#tunable_policy(`xen_use_raw_disk',` + storage_raw_read_fixed_disk(xend_t) + storage_raw_write_fixed_disk(xend_t) +#') -storage_raw_read_fixed_disk(xend_t) storage_raw_read_removable_device(xend_t) term_getattr_all_user_ptys(xend_t) @@ -284,6 +298,12 @@ files_read_usr_files(xenstored_t) +#tunable_policy(`xen_use_raw_disk',` + storage_raw_read_fixed_disk(xenstored_t) + storage_raw_write_fixed_disk(xenstored_t) +#') +storage_raw_read_removable_device(xenstored_t) + term_use_generic_ptys(xenstored_t) term_use_console(xenconsoled_t) @@ -317,6 +337,11 @@ allow xm_t xen_image_t:dir rw_dir_perms; allow xm_t xen_image_t:file read_file_perms; +allow xm_t xen_image_t:blk_file r_file_perms; + +#tunable_policy(`xen_use_raw_disk',` + storage_raw_read_fixed_disk(xm_t) +#') kernel_read_system_state(xm_t) kernel_read_kernel_sysctls(xm_t) @@ -352,3 +377,11 @@ xen_append_log(xm_t) xen_stream_connect(xm_t) xen_stream_connect_xenstore(xm_t) + +#Should have a boolean wrapping these +fs_list_auto_mountpoints(xend_t) +files_search_mnt(xend_t) +fs_write_nfs_files(xend_t) +fs_read_nfs_files(xend_t) +fs_getattr_all_fs(xend_t) +fs_read_dos_files(xend_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_patterns.spt serefpolicy-2.6.2/policy/support/misc_patterns.spt --- nsaserefpolicy/policy/support/misc_patterns.spt 2007-01-02 12:57:51.000000000 -0500 +++ serefpolicy-2.6.2/policy/support/misc_patterns.spt 2007-04-30 11:26:06.000000000 -0400 @@ -41,11 +41,6 @@ # # Other process permissions # -define(`send_audit_msgs_pattern',` - allow $1 self:capability audit_write; - allow $1 self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; -') - define(`ps_process_pattern',` allow $1 $2:dir { search getattr read }; allow $1 $2:{ file lnk_file } { read getattr }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.6.2/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-01-02 12:57:51.000000000 -0500 +++ serefpolicy-2.6.2/policy/support/obj_perm_sets.spt 2007-04-30 11:26:06.000000000 -0400 @@ -215,7 +215,7 @@ define(`getattr_file_perms',`{ getattr }') define(`setattr_file_perms',`{ setattr }') define(`read_file_perms',`{ getattr read lock ioctl }') -define(`mmap_file_perms',`{ getattr read execute }') +define(`mmap_file_perms',`{ getattr read execute ioctl }') define(`exec_file_perms',`{ getattr read execute execute_no_trans }') define(`append_file_perms',`{ getattr append lock ioctl }') define(`write_file_perms',`{ getattr write append lock ioctl }') @@ -324,3 +324,13 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }') + +define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control } +') + +define(`all_nscd', `{ getpwd getgrp gethost getstat admin shmempwd shmemgrp shmemhost } ') +define(`all_dbus', `{ acquire_svc send_msg } ') +define(`all_passwd', `{ passwd chfn chsh rootok crontab } ') +define(`all_association', `{ sendto recvfrom setcontext polmatch } ') + + diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.6.2/Rules.modular --- nsaserefpolicy/Rules.modular 2007-03-22 14:30:10.000000000 -0400 +++ serefpolicy-2.6.2/Rules.modular 2007-04-30 11:26:06.000000000 -0400 @@ -167,7 +167,7 @@ # these have to run individually because order matters: $(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true $(verbose) $(GREP) '^fs_use_(xattr|task|trans)' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true - $(verbose) $(GREP) ^genfscon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true + $(verbose) $(GREP) genfscon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true $(verbose) $(GREP) ^portcon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true $(verbose) $(GREP) ^netifcon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true $(verbose) $(GREP) ^nodecon $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true @@ -219,6 +219,16 @@ ######################################## # +# Validate File Contexts +# +validatefc: $(base_pkg) $(base_fc) + @echo "Validating file context." + $(verbose) $(SEMOD_EXP) $(base_pkg) $(tmpdir)/policy.tmp + $(verbose) $(SETFILES) -c $(tmpdir)/policy.tmp $(base_fc) + @echo "Success." + +######################################## +# # Clean the sources # clean: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- .cvsignore 23 Apr 2007 17:00:48 -0000 1.112 +++ .cvsignore 1 May 2007 20:53:29 -0000 1.113 @@ -114,3 +114,4 @@ serefpolicy-2.5.11.tgz serefpolicy-2.5.12.tgz serefpolicy-2.6.1.tgz +serefpolicy-2.6.2.tgz Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.445 retrieving revision 1.446 diff -u -r1.445 -r1.446 --- selinux-policy.spec 27 Apr 2007 17:23:49 -0000 1.445 +++ selinux-policy.spec 1 May 2007 20:53:29 -0000 1.446 @@ -16,12 +16,12 @@ %define CHECKPOLICYVER 2.0.1-2 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.6.1 -Release: 3%{?dist} +Version: 2.6.2 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz -patch: policy-20070219.patch +patch: policy-20070501.patch Source1: modules-targeted.conf Source2: booleans-targeted.conf Source3: Makefile.devel @@ -246,7 +246,7 @@ " > /etc/selinux/config ln -sf ../selinux/config /etc/sysconfig/selinux - restorecon /etc/selinux/config 2> /dev/null + restorecon -R /etc/selinux/config /var/log 2> /dev/null else . /etc/selinux/config # if first time update booleans.local needs to be copied to sandbox @@ -358,6 +358,12 @@ %endif %changelog +* Mon Apr 30 2007 Dan Walsh 2.6.2-1 +- Update to latest from upstream + +* Fri Apr 27 2007 Dan Walsh 2.6.1-4 +- Allow pcscd_t to send itself signals + * Fri Apr 27 2007 Dan Walsh 2.6.1-3 - Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- sources 23 Apr 2007 17:00:48 -0000 1.120 +++ sources 1 May 2007 20:53:29 -0000 1.121 @@ -1 +1 @@ -45c746832144dbac9073a3d8e6524a59 serefpolicy-2.6.1.tgz +6c71fff9af0e76ec96150c819d0613b5 serefpolicy-2.6.2.tgz --- policy-20070219.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 1 21:26:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 17:26:34 -0400 Subject: rpms/samba/devel samba.spec, 1.116, 1.117 samba-3.0.24-vista-patchset.patch, 1.1, NONE samba-3.0.24-vista_msdfs_errcodes.patch, 1.1, NONE samba-3.0.25rc2-idmap-fix.patch, 1.1, NONE samba-3.0.25rc2-pie.patch, 1.2, NONE Message-ID: <200705012126.l41LQYVf031471@cvs.devel.redhat.com> Author: ssorce Update of /cvs/dist/rpms/samba/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31316 Modified Files: samba.spec Removed Files: samba-3.0.24-vista-patchset.patch samba-3.0.24-vista_msdfs_errcodes.patch samba-3.0.25rc2-idmap-fix.patch samba-3.0.25rc2-pie.patch Log Message: prepare for a make build Index: samba.spec =================================================================== RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- samba.spec 30 Apr 2007 15:13:41 -0000 1.116 +++ samba.spec 1 May 2007 21:26:32 -0000 1.117 @@ -46,8 +46,6 @@ #Patch112: samba-3.0.15pre2-bug106483.patch #Patch113: samba-3.0.21-warnings.patch Patch200: samba-3.0.25rc1-inotifiy.patch -#Patch201: samba-3.0.25rc2-idmap-fix.patch -#Patch202: samba-3.0.25rc2-pie.patch Requires(pre): samba-common = %{epoch}:%{version}-%{release} @@ -170,8 +168,6 @@ #%patch112 -p1 -b .bug106483 #%patch113 -p1 -b .warnings %patch200 -p0 -b .inotify -#%patch201 -p0 -b .idmap-fix -#%patch202 -p0 -b .pie # crap rm -f examples/VFS/.cvsignore --- samba-3.0.24-vista-patchset.patch DELETED --- --- samba-3.0.24-vista_msdfs_errcodes.patch DELETED --- --- samba-3.0.25rc2-idmap-fix.patch DELETED --- --- samba-3.0.25rc2-pie.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 1 21:43:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 17:43:08 -0400 Subject: rpms/audit/devel .cvsignore, 1.77, 1.78 audit.spec, 1.134, 1.135 sources, 1.93, 1.94 Message-ID: <200705012143.l41Lh8df002743@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2727 Modified Files: .cvsignore audit.spec sources Log Message: * Tue May 01 2007 Steve Grubb 1.5.3-1 - Change buffer size to prevent truncation of DAEMON events with large labels - Fix memory leaks in auparse (John Dennis) - Update syscall tables for 2.6.21 kernel - Update capp & lspp rules - New python bindings for libauparse (John Dennis) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- .cvsignore 5 Apr 2007 22:44:18 -0000 1.77 +++ .cvsignore 1 May 2007 21:43:06 -0000 1.78 @@ -74,3 +74,4 @@ audit-1.5.tar.gz audit-1.5.1.tar.gz audit-1.5.2.tar.gz +audit-1.5.3.tar.gz Index: audit.spec =================================================================== RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- audit.spec 5 Apr 2007 22:44:18 -0000 1.134 +++ audit.spec 1 May 2007 21:43:06 -0000 1.135 @@ -1,6 +1,6 @@ Summary: User space tools for 2.6 kernel auditing Name: audit -Version: 1.5.2 +Version: 1.5.3 Release: 1%{?dist} License: GPL Group: System Environment/Daemons @@ -155,11 +155,9 @@ %files libs-python %defattr(-,root,root) -%attr(750,root,root) /sbin/audispd %{_libdir}/python?.?/site-packages/_audit.so -%{_libdir}/python?.?/site-packages/_auparse.so +%{_libdir}/python?.?/site-packages/auparse.so /usr/lib/python?.?/site-packages/audit.py* -/usr/lib/python?.?/site-packages/auparse.py* %files %defattr(-,root,root,-) @@ -171,6 +169,7 @@ %attr(755,root,root) /sbin/ausearch %attr(755,root,root) /sbin/aureport %attr(750,root,root) /sbin/autrace +%attr(750,root,root) /sbin/audispd %attr(755,root,root) /etc/rc.d/init.d/auditd %attr(750,root,root) %{_var}/log/audit %attr(750,root,root) %dir /etc/audit @@ -182,6 +181,13 @@ %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd %changelog +* Tue May 01 2007 Steve Grubb 1.5.3-1 +- Change buffer size to prevent truncation of DAEMON events with large labels +- Fix memory leaks in auparse (John Dennis) +- Update syscall tables for 2.6.21 kernel +- Update capp & lspp rules +- New python bindings for libauparse (John Dennis) + * Thu Apr 04 2007 Steve Grubb 1.5.2-1 - New event dispatcher (James Antill) - Apply patches fixing man pages and Makefile.am (Philipp Hahn) Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- sources 5 Apr 2007 23:11:05 -0000 1.93 +++ sources 1 May 2007 21:43:06 -0000 1.94 @@ -1 +1,2 @@ fbc39e41b185e7ebdbc6493105533790 audit-1.5.2.tar.gz +82d79054ae0b939e5372a07da19c784f audit-1.5.3.tar.gz From fedora-cvs-commits at redhat.com Tue May 1 21:43:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 17:43:35 -0400 Subject: rpms/audit/devel sources,1.94,1.95 Message-ID: <200705012143.l41LhZO6002774@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2756 Modified Files: sources Log Message: update sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- sources 1 May 2007 21:43:06 -0000 1.94 +++ sources 1 May 2007 21:43:33 -0000 1.95 @@ -1,2 +1 @@ -fbc39e41b185e7ebdbc6493105533790 audit-1.5.2.tar.gz 82d79054ae0b939e5372a07da19c784f audit-1.5.3.tar.gz From fedora-cvs-commits at redhat.com Tue May 1 21:45:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 17:45:12 -0400 Subject: rpms/eclipse-cdt/devel .cvsignore, 1.27, 1.28 eclipse-cdt.spec, 1.74, 1.75 sources, 1.32, 1.33 Message-ID: <200705012145.l41LjC8t002880@cvs.devel.redhat.com> Author: jjohnstn Update of /cvs/dist/rpms/eclipse-cdt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2860 Modified Files: .cvsignore eclipse-cdt.spec sources Log Message: * Mon Apr 16 2007 Jeff Johnston 3.1.2-3 - Add missing gif to org.eclipse.cdt.make.ui. - Resolves: #236558 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 28 Feb 2007 00:19:06 -0000 1.27 +++ .cvsignore 1 May 2007 21:45:10 -0000 1.28 @@ -7,3 +7,4 @@ eclipse-cdt-fetched-src-3.1.2.tar.bz2 eclipse-cdt-autotools-0.0.8.tar.gz eclipse-cdt-autotools-0.0.8.1.tar.gz +eclipse-cdt-target_filter.gif.gz Index: eclipse-cdt.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- eclipse-cdt.spec 28 Feb 2007 00:19:06 -0000 1.74 +++ eclipse-cdt.spec 1 May 2007 21:45:10 -0000 1.75 @@ -18,7 +18,7 @@ Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 2%{?dist} +Release: 3%{?dist} License: Eclipse Public License / CPL Group: Development/Tools URL: http://www.eclipse.org/cdt @@ -55,6 +55,11 @@ Source2: %{name}-cppunit-20061102.tar.gz +# Binary gif file that is currently missing from the CDT. Since +# binary patches are not possible, the gif is included as a source file. + +Source3: %{name}-target_filter.gif.gz + # Patch to add special "ForAllElements" targets to CDT sdk/customTargets.xml. Patch1: %{name}-no-cvs2-patch # Patch to remove tests from CDT build.xml. @@ -136,6 +141,11 @@ %patch6 -p0 %patch7 -p0 %patch11 -p0 +# Following is a patch to the CDT which is missing a b/w version +# of an icon. This patch can be removed once fixed upstream. +pushd results/plugins/org.eclipse.cdt.make.ui/icons/dtool16 +tar -xzf %{SOURCE3} +popd popd # Autotools stuff @@ -305,6 +315,10 @@ %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html %changelog +* Mon Apr 16 2007 Jeff Johnston 3.1.2-3 +- Add missing gif to org.eclipse.cdt.make.ui. +- Resolves: #236558 + * Tue Feb 27 2007 Jeff Johnston 3.1.2-2 - Resolves: #229891, #230253, #205310, #229893 - Rebase autotools to 0.0.8.1 source. Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 28 Feb 2007 00:19:06 -0000 1.32 +++ sources 1 May 2007 21:45:10 -0000 1.33 @@ -1,3 +1,4 @@ 5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz 00ce7b1810685e56375f8df48cc9ae26 eclipse-cdt-fetched-src-3.1.2.tar.bz2 622927df0c7bc770dbb43579e3668fa9 eclipse-cdt-autotools-0.0.8.1.tar.gz +2d4ae0a2131ba1efc896d981072cc091 eclipse-cdt-target_filter.gif.gz From fedora-cvs-commits at redhat.com Tue May 1 21:52:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 17:52:54 -0400 Subject: rpms/audit/devel sources,1.95,1.96 Message-ID: <200705012152.l41LqsYu003329@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3314 Modified Files: sources Log Message: update sources file Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- sources 1 May 2007 21:43:33 -0000 1.95 +++ sources 1 May 2007 21:52:52 -0000 1.96 @@ -1 +1 @@ -82d79054ae0b939e5372a07da19c784f audit-1.5.3.tar.gz +088a215fac649e4cdb578f1efdfa585f audit-1.5.3.tar.gz From fedora-cvs-commits at redhat.com Tue May 1 21:53:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 17:53:28 -0400 Subject: rpms/kernel/devel .cvsignore, 1.617, 1.618 kernel-2.6.spec, 1.3124, 1.3125 sources, 1.580, 1.581 Message-ID: <200705012153.l41LrSec003421@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3403 Modified Files: .cvsignore kernel-2.6.spec sources Log Message: * Tue May 01 2007 Dave Jones - Update sparse to 0.3 and reenable. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.617 retrieving revision 1.618 diff -u -r1.617 -r1.618 --- .cvsignore 29 Apr 2007 21:04:48 -0000 1.617 +++ .cvsignore 1 May 2007 21:53:26 -0000 1.618 @@ -1,7 +1,7 @@ clog kernel-2.6.*.config temp-* -sparse-0.2.tar.bz2 +sparse-0.3.tar.gz kernel-2.6.21 linux-2.6.21.tar.bz2 patch-2.6.21.1.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.3124 retrieving revision 1.3125 diff -u -r1.3124 -r1.3125 --- kernel-2.6.spec 1 May 2007 16:26:49 -0000 1.3124 +++ kernel-2.6.spec 1 May 2007 21:53:26 -0000 1.3125 @@ -37,7 +37,7 @@ %define with_modsign 1 # Whether or not to do C=1 builds with sparse -%define usesparse 0 +%define usesparse 1 # Whether or not to apply the Xen patches -- leave this enabled %define includexen 0 @@ -326,7 +326,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 #Source1: xen-%{xen_hv_cset}.tar.bz2 Source2: Config.mk -%define sparsever 0.2 +%define sparsever 0.3 Source3: sparse-%{sparsever}.tar.bz2 Source10: COPYING.modules @@ -1448,7 +1448,7 @@ %if %{usesparse} # Build sparse. -perl -p -i -e 's/-O /-O2 -finline-functions /' sparse-0.2/Makefile +perl -p -i -e 's/-O /-O2 -finline-functions /' sparse-%{sparsever}/Makefile make -C sparse-%{sparsever} # Pass these options to kernel builds. @@ -2341,6 +2341,9 @@ %changelog * Tue May 01 2007 Dave Jones +- Update sparse to 0.3 and reenable. + +* Tue May 01 2007 Dave Jones - i8xx_tco watchdog driver has been obsoleted by the iTCO_wdt driver. * Tue May 1 2007 David Woodhouse Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.580 retrieving revision 1.581 diff -u -r1.580 -r1.581 --- sources 29 Apr 2007 21:04:49 -0000 1.580 +++ sources 1 May 2007 21:53:26 -0000 1.581 @@ -1,3 +1,3 @@ -2618cbcc9c9ac1c3c04be903fe3338a7 sparse-0.2.tar.bz2 +daa548bb52f64f00498ad646e5786c0a sparse-0.3.tar.gz 1b515f588078dfa7f4bab2634bd17e80 linux-2.6.21.tar.bz2 c4c368f173af267a564948065ffc1689 patch-2.6.21.1.bz2 From fedora-cvs-commits at redhat.com Tue May 1 21:59:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 17:59:05 -0400 Subject: rpms/kernel/devel .cvsignore,1.618,1.619 sources,1.581,1.582 Message-ID: <200705012159.l41Lx5GX003576@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3561 Modified Files: .cvsignore sources Log Message: bz2 not gz Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.618 retrieving revision 1.619 diff -u -r1.618 -r1.619 --- .cvsignore 1 May 2007 21:53:26 -0000 1.618 +++ .cvsignore 1 May 2007 21:59:03 -0000 1.619 @@ -1,7 +1,7 @@ clog kernel-2.6.*.config temp-* -sparse-0.3.tar.gz +sparse-0.3.tar.bz2 kernel-2.6.21 linux-2.6.21.tar.bz2 patch-2.6.21.1.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.581 retrieving revision 1.582 diff -u -r1.581 -r1.582 --- sources 1 May 2007 21:53:26 -0000 1.581 +++ sources 1 May 2007 21:59:03 -0000 1.582 @@ -1,3 +1,3 @@ -daa548bb52f64f00498ad646e5786c0a sparse-0.3.tar.gz +6a54daf167fad7faedded8ec84db2dba sparse-0.3.tar.bz2 1b515f588078dfa7f4bab2634bd17e80 linux-2.6.21.tar.bz2 c4c368f173af267a564948065ffc1689 patch-2.6.21.1.bz2 From fedora-cvs-commits at redhat.com Tue May 1 22:02:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 18:02:32 -0400 Subject: rpms/audit/devel sources,1.96,1.97 Message-ID: <200705012202.l41M2WI9003819@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3794 Modified Files: sources Log Message: update sources file Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- sources 1 May 2007 21:52:52 -0000 1.96 +++ sources 1 May 2007 22:02:30 -0000 1.97 @@ -1 +1 @@ -088a215fac649e4cdb578f1efdfa585f audit-1.5.3.tar.gz +5c7ceb1f62b07ab6b31a067f4f035912 audit-1.5.3.tar.gz From fedora-cvs-commits at redhat.com Tue May 1 22:09:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 18:09:25 -0400 Subject: rpms/audit/devel sources,1.97,1.98 Message-ID: <200705012209.l41M9P49003965@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3950 Modified Files: sources Log Message: update sources file Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- sources 1 May 2007 22:02:30 -0000 1.97 +++ sources 1 May 2007 22:09:23 -0000 1.98 @@ -1 +1 @@ -5c7ceb1f62b07ab6b31a067f4f035912 audit-1.5.3.tar.gz +e94acafeb5fe8cf581b013ee5f02d95c audit-1.5.3.tar.gz From fedora-cvs-commits at redhat.com Tue May 1 22:22:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 18:22:11 -0400 Subject: rpms/eclipse-cdt/FC-6 eclipse-cdt-recursive-single-line-rule.patch, NONE, 1.1 eclipse-cdt.spec, 1.67, 1.68 Message-ID: <200705012222.l41MMBaW004247@cvs.devel.redhat.com> Author: jjohnstn Update of /cvs/dist/rpms/eclipse-cdt/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv4230 Modified Files: eclipse-cdt.spec Added Files: eclipse-cdt-recursive-single-line-rule.patch Log Message: * Tue May 01 2007 Jeff Johnston 3.1.2-4 - Add patch to fix backwards text entry in new configure files. - Resovles: #238493 eclipse-cdt-recursive-single-line-rule.patch: RecursiveSingleLineRule.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE eclipse-cdt-recursive-single-line-rule.patch --- --- ./com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java.fix 2007-05-01 17:53:06.000000000 -0400 +++ ./com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java 2007-05-01 17:53:53.000000000 -0400 @@ -125,10 +125,12 @@ public class RecursiveSingleLineRule ext } public IToken evaluate(ICharacterScanner scanner, boolean resume) { - int column; + int column = scanner.getColumn(); + // Check if we are at EOF, in which case rules don't hold + if (column < 0) + return Token.UNDEFINED; if (!resume) { evalIndex = 0; - column = scanner.getColumn(); // Check if we are within outer rule boundaries. if (column >= endIndex || column < startIndex) { // If not, then we should evaluate to see if the Index: eclipse-cdt.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/eclipse-cdt.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- eclipse-cdt.spec 16 Apr 2007 22:22:49 -0000 1.67 +++ eclipse-cdt.spec 1 May 2007 22:22:09 -0000 1.68 @@ -18,7 +18,7 @@ Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 3%{?dist} +Release: 4%{?dist} License: Eclipse Public License / CPL Group: Development/Tools URL: http://www.eclipse.org/cdt @@ -86,6 +86,8 @@ # Patch to ManagedMake builder to prevent running make after Makefile generation # failure. Patch11: %{name}-managedbuild-failcheck.patch +# Patch to fix RecursiveSingleLineRule so it properly recognizes EOF +Patch12: %{name}-recursive-single-line-rule.patch BuildRequires: eclipse-pde %if %{gcj_support} @@ -153,6 +155,7 @@ mkdir autotools pushd autotools tar -xzf %{SOURCE1} +%patch12 -p0 popd # Cppunit stuff @@ -315,6 +318,10 @@ %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html %changelog +* Tue May 01 2007 Jeff Johnston 3.1.2-4 +- Add patch to fix backwards text entry in new configure files. +- Resovles: #238493 + * Mon Apr 16 2007 Jeff Johnston 3.1.2-3 - Add missing gif to org.eclipse.cdt.make.ui. - Resolves: #236558 From fedora-cvs-commits at redhat.com Tue May 1 23:47:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 19:47:01 -0400 Subject: rpms/cairo/devel .cvsignore, 1.30, 1.31 cairo.spec, 1.72, 1.73 sources, 1.30, 1.31 Message-ID: <200705012347.l41Nl177027627@cvs.devel.redhat.com> Author: cworth Update of /cvs/dist/rpms/cairo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27610 Modified Files: .cvsignore cairo.spec sources Log Message: Update to 1.4.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 16 Apr 2007 14:20:00 -0000 1.30 +++ .cvsignore 1 May 2007 23:46:58 -0000 1.31 @@ -1 +1 @@ -cairo-1.4.4.tar.gz +cairo-1.4.6.tar.gz Index: cairo.spec =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- cairo.spec 16 Apr 2007 14:20:00 -0000 1.72 +++ cairo.spec 1 May 2007 23:46:58 -0000 1.73 @@ -3,7 +3,7 @@ Summary: A vector graphics library Name: cairo -Version: 1.4.4 +Version: 1.4.6 Release: 1%{?dist} URL: http://cairographics.org Source0: http://cairographics.org/releases/%{name}-%{version}.tar.gz @@ -82,7 +82,10 @@ %{_datadir}/gtk-doc/html/cairo %changelog -* Mon Apr 16 2007 Carl Worth 1.4.4-1 +* Tue May 1 2007 Carl Worth 1.4.6-1 +- Update to 1.4.6 + +* Mon Apr 16 2007 Carl Worth 1.4.4-1 - Update to 1.4.4 * Tue Mar 20 2007 Carl Worth 1.4.2-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 16 Apr 2007 14:20:00 -0000 1.30 +++ sources 1 May 2007 23:46:58 -0000 1.31 @@ -1 +1 @@ -a609118644e1d958d977821c6fd765a9 cairo-1.4.4.tar.gz +ae16e73f9dca46ac93b4ce435e93773c cairo-1.4.6.tar.gz From fedora-cvs-commits at redhat.com Wed May 2 02:47:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 22:47:29 -0400 Subject: rpms/kernel/FC-6/configs config-generic, 1.268, 1.268.12.1 config-s390-generic, 1.22, 1.22.60.1 Message-ID: <200705020247.l422lTx3013362@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv13216/configs Modified Files: Tag: private-linville-netdev-fc6-11-branch config-generic config-s390-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v retrieving revision 1.268 retrieving revision 1.268.12.1 diff -u -r1.268 -r1.268.12.1 --- config-generic 29 Mar 2007 22:19:24 -0000 1.268 +++ config-generic 2 May 2007 02:47:27 -0000 1.268.12.1 @@ -637,7 +637,10 @@ CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_MD5SIG=y +CONFIG_TCP_MD5SIG_DEBUG=y # # Networking options @@ -646,6 +649,7 @@ CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=m @@ -703,6 +707,7 @@ CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -725,6 +730,7 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m @@ -782,6 +788,7 @@ CONFIG_NF_CONNTRACK_IRC=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_IPV4=m @@ -848,6 +855,7 @@ CONFIG_IP6_NF_MATCH_FRAG=m CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m CONFIG_IP6_NF_MATCH_OPTS=m CONFIG_IP6_NF_MATCH_OWNER=m CONFIG_IP6_NF_MATCH_RT=m @@ -884,6 +892,7 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=y CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m @@ -1091,8 +1100,10 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m +CONFIG_B44_PCI=y CONFIG_BNX2=m CONFIG_QLA3XXX=m +CONFIG_ATL1=m # CONFIG_DGRS is not set # CONFIG_EEPRO100 is not set CONFIG_E100=m @@ -1117,6 +1128,7 @@ CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_RHINE_NAPI=y CONFIG_VIA_VELOCITY=m +CONFIG_SC92031=m CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m @@ -1153,9 +1165,12 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m +CONFIG_PASEMI_MAC=m +CONFIG_VIOC=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1_NAPI=y +CONFIG_CHELSIO_T3=m CONFIG_FDDI=y # CONFIG_DEFXX is not set @@ -1183,18 +1198,33 @@ CONFIG_NET_RADIO=y # -# Obsolete Wireless cards support (pre-802.11) +# Wireless LAN # +CONFIG_WLAN_PRE80211=y # CONFIG_STRIP is not set # CONFIG_ARLAN is not set CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m - -# -# Wireless 802.11 Frequency Hopping cards support -# +CONFIG_WLAN_80211=y # CONFIG_PCMCIA_RAYCS is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +CONFIG_MAC80211_DEBUG=y +# CONFIG_MAC80211_VERBOSE_DEBUG is not set +# CONFIG_MAC80211_LOWTX_FRAME_DUMP is not set +CONFIG_TKIP_DEBUG=y +CONFIG_MAC80211_DEBUG_COUNTERS=y +# CONFIG_HOSTAPD_WPA_TESTING is not set +CONFIG_MAC80211_IBSS_DEBUG=y +# CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set + +CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT_COMPAT=y +CONFIG_CFG80211_WEXTNL_COMPAT=y +CONFIG_NL80211=y + # # Wireless 802.11b ISA/PCI cards support # @@ -1212,6 +1242,8 @@ CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_USB_DEBUG=y CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1221,6 +1253,7 @@ CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PRISM54=m +CONFIG_PRISM54_USB=m CONFIG_BCM43XX=m CONFIG_BCM43XX_DEBUG=y @@ -1242,6 +1275,30 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_CS=m +CONFIG_BCM43XX_MAC80211=m +CONFIG_BCM43XX_MAC80211_PCI=y +CONFIG_BCM43XX_MAC80211_PCMCIA=y +CONFIG_BCM43XX_MAC80211_DEBUG=y +CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y +CONFIG_RT2X00=y +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2X00_DEBUGFS=m +CONFIG_RT2X00_DEBUG=y +CONFIG_ADM8211=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_ZD1211RW_MAC80211=m +CONFIG_ZD1211RW_MAC80211_DEBUG=y +CONFIG_RTL818X=y +CONFIG_RTL8187=m +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_DEBUG=y + # # Token Ring devices # @@ -1848,6 +1905,14 @@ CONFIG_MAX_RAW_DEVS=8192 CONFIG_HANGCHECK_TIMER=m +CONFIG_SSB=m +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SILENT=n +CONFIG_SSB_DEBUG=n +CONFIG_SSB_SERIAL=n +CONFIG_SSB_DRIVER_PCICORE=y + # # Multimedia devices # @@ -2233,6 +2298,7 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_CS=m +CONFIG_USB_OHCI_HCD_SSB=y # # USB Device Class drivers @@ -2780,6 +2846,8 @@ # CONFIG_CRC16=m CONFIG_CRC32=m +CONFIG_CRC_ITU_T=m +CONFIG_EEPROM_93CX6=m CONFIG_CRC_CCITT=m CONFIG_ZLIB_INFLATE=y Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-s390-generic,v retrieving revision 1.22 retrieving revision 1.22.60.1 diff -u -r1.22 -r1.22.60.1 --- config-s390-generic 21 Dec 2006 21:45:14 -0000 1.22 +++ config-s390-generic 2 May 2007 02:47:27 -0000 1.22.60.1 @@ -106,6 +106,7 @@ CONFIG_LCS=m CONFIG_CTC=m CONFIG_IUCV=m +CONFIG_AFIUCV=m CONFIG_QETH=m CONFIG_QETH_IPV6=y CONFIG_QETH_VLAN=y From fedora-cvs-commits at redhat.com Wed May 2 02:53:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 1 May 2007 22:53:16 -0400 Subject: rpms/selinux-policy/devel selinux-policy.spec, 1.446, 1.447 sources, 1.121, 1.122 Message-ID: <200705020253.l422rG6B017567@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17516 Modified Files: selinux-policy.spec sources Log Message: * Mon Apr 30 2007 Dan Walsh 2.6.2-1 - Update to latest from upstream Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.446 retrieving revision 1.447 diff -u -r1.446 -r1.447 --- selinux-policy.spec 1 May 2007 20:53:29 -0000 1.446 +++ selinux-policy.spec 2 May 2007 02:53:14 -0000 1.447 @@ -162,12 +162,13 @@ selinuxenabled; \ if [ $? == 0 -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \ fixfiles -C ${FILE_CONTEXT}.pre restore; \ + restorecon -R /var/log 2> /dev/null; \ rm -f ${FILE_CONTEXT}.pre; \ fi; %description SELinux Reference Policy - modular. -Based off of reference policy: Checked out revision 2261. +Based off of reference policy: Checked out revision 2282. %prep %setup -q -n serefpolicy-%{version} @@ -246,7 +247,7 @@ " > /etc/selinux/config ln -sf ../selinux/config /etc/sysconfig/selinux - restorecon -R /etc/selinux/config /var/log 2> /dev/null + restorecon /etc/selinux/config 2> /dev/null else . /etc/selinux/config # if first time update booleans.local needs to be copied to sandbox Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- sources 1 May 2007 20:53:29 -0000 1.121 +++ sources 2 May 2007 02:53:14 -0000 1.122 @@ -1 +1 @@ -6c71fff9af0e76ec96150c819d0613b5 serefpolicy-2.6.2.tgz +9d4a51d5eb19dcf85fa1e28bfb27d048 serefpolicy-2.6.2.tgz From fedora-cvs-commits at redhat.com Wed May 2 04:25:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 00:25:42 -0400 Subject: rpms/gimp/FC-5 gimp-2.2.14-sunras-overflow.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 gimp.spec, 1.98, 1.99 sources, 1.28, 1.29 Message-ID: <200705020425.l424PgkV013398@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv13383 Modified Files: .cvsignore gimp.spec sources Added Files: gimp-2.2.14-sunras-overflow.patch Log Message: don't let gimp-plugin-mgr --uninstall fail %%pre/%%preun scriptlets (#238337) don't erroneously delete symlinks to external plugins when updating (#238337) avoid buffer overflow in sunras plugin (#238422) version 2.2.14 don't BuildRequire gimp-print/gutenprint anymore own used directories in gimp-devel (#233794) s/%%redhat/%%rhel/g change defaults for use of modular X and lcms (#224156) Resolves: #238337, #238422, #233794, #224156 gimp-2.2.14-sunras-overflow.patch: ChangeLog | 7 +++++++ plug-ins/common/sunras.c | 21 +++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) --- NEW FILE gimp-2.2.14-sunras-overflow.patch --- --- gimp-2.2.14/ChangeLog.sunras-overflow 2007-04-17 23:58:21.000000000 +0200 +++ gimp-2.2.14/ChangeLog 2007-04-30 15:38:06.000000000 +0200 @@ -0,0 +1,7 @@ +2007-04-27 Sven Neumann + + Merged from trunk: + + * plug-ins/common/sunras.c (set_color_table): guard against a + possible stack overflow. + --- gimp-2.2.14/plug-ins/common/sunras.c.sunras-overflow 2007-04-17 23:11:23.000000000 +0200 +++ gimp-2.2.14/plug-ins/common/sunras.c 2007-04-30 15:36:33.000000000 +0200 @@ -102,8 +102,7 @@ gint32 image_ID, gint32 drawable_ID); -static void set_color_table (gint32, L_SUNFILEHEADER *, unsigned char *); - +static void set_color_table (gint32, L_SUNFILEHEADER *, const guchar *); static gint32 create_new_image (const gchar *filename, guint width, guint height, @@ -865,19 +864,20 @@ static void set_color_table (gint32 image_ID, L_SUNFILEHEADER *sunhdr, - guchar *suncolmap) + const guchar *suncolmap) { - int ncols, j; - guchar ColorMap[256*3]; + guchar ColorMap[256 * 3]; + gint ncols, j; ncols = sunhdr->l_ras_maplength / 3; - if (ncols <= 0) return; + if (ncols <= 0) + return; - for (j = 0; j < ncols; j++) + for (j = 0; j < MIN (ncols, 256); j++) { - ColorMap[j*3] = suncolmap[j]; - ColorMap[j*3+1] = suncolmap[j+ncols]; - ColorMap[j*3+2] = suncolmap[j+2*ncols]; + ColorMap[j * 3 + 0] = suncolmap[j]; + ColorMap[j * 3 + 1] = suncolmap[j + ncols]; + ColorMap[j * 3 + 2] = suncolmap[j + 2 * ncols]; } #ifdef DEBUG @@ -886,6 +886,7 @@ printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j, ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]); #endif + gimp_image_set_colormap (image_ID, ColorMap, ncols); } Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gimp/FC-5/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 28 Aug 2006 07:13:56 -0000 1.28 +++ .cvsignore 2 May 2007 04:25:39 -0000 1.29 @@ -1 +1 @@ -gimp-2.2.13.tar.bz2 +gimp-2.2.14.tar.bz2 Index: gimp.spec =================================================================== RCS file: /cvs/dist/rpms/gimp/FC-5/gimp.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- gimp.spec 28 Aug 2006 07:13:56 -0000 1.98 +++ gimp.spec 2 May 2007 04:25:39 -0000 1.99 @@ -4,13 +4,14 @@ # # modular_x: modular X deps # lcms: lcms support +# gutenprint: gutenprint support (instead of gimp-print) # python: python support # mp: multi processor support # static: build static libraries # print: build the print plugin (if you don't build it externally) # convenience: install convenience symlinks -%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5 +%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 5 || 0%{?rhel} >= 5 %define _enable_modularX 0%{!?_without_modular_x:1} %define _enable_lcms 0%{!?_without_lcms:1} %else @@ -18,6 +19,12 @@ %define _enable_lcms 0%{?_with_lcms:1} %endif +%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6 +%define _enable_gutenprint 0%{!?_without_gutenprint:1} +%else +%define _enable_gutenprint 0%{?_with_gutenprint:1} +%endif + %define _enable_python 0%{!?_without_python:1} %define _enable_mp 0%{!?_without_mp:1} %define _enable_static 0%{!?_without_static:1} @@ -29,14 +36,14 @@ Summary: GNU Image Manipulation Program Name: gimp -Version: 2.2.13 +Version: 2.2.14 %define binver 2.2 %define gimp_lang_ver 20 %define interfacever 2.0 %define age 0 %define minorver 200 %define microver %(ver=%{version}; echo ${ver##*.*.}) -Release: 1%{?dist} +Release: 5%{?dist} Epoch: 2 License: GPL, LGPL Group: Applications/Multimedia @@ -67,7 +74,6 @@ %else BuildRequires: xorg-x11-devel %endif -BuildRequires: gimp-print-devel >= 4.2.0 BuildRequires: automake >= 1.7 BuildRequires: autoconf >= 2.54 BuildRequires: libtool >= 1.5 @@ -84,7 +90,6 @@ Requires: gtk2 >= 2.4.14 Requires: pango >= 1.6.0 Requires: fontconfig >= 2.2.0 -Requires: gimp-print >= 4.2.0 Requires(post): /usr/bin/update-desktop-database Requires(post): hicolor-icon-theme Requires(postun): /usr/bin/update-desktop-database @@ -97,6 +102,7 @@ Patch4: gimp-2.2.4-gifload.patch Patch5: gimp-2.2.11-htmlview.patch Patch6: gimp-2.2.11-gimptool.patch +Patch7: gimp-2.2.14-sunras-overflow.patch %description GIMP (GNU Image Manipulation Program) is a powerful image composition and @@ -138,7 +144,7 @@ Python support: %_enable_python MP support: %_enable_mp build static libs: %_enable_static -build print plugin: %_enable_print +build internal print plugin: %_enable_print include convenience symlinks: %_enable_convenience @@ -151,6 +157,7 @@ %patch4 -p1 -b .gifload %patch5 -p1 -b .htmlview %patch6 -p1 -b .gimptool +%patch7 -p1 -b .sunras-overflow %build libtoolize --copy --force @@ -262,16 +269,27 @@ %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +%pre +# First, remove old symlinks which are possibly in an old location (before a +# major version update) +if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then + %{_sbindir}/gimp-plugin-mgr --uninstall '*' || : +fi + %post /usr/bin/update-desktop-database %{_datadir}/applications touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi +# Then re-add the symlinks %{_sbindir}/gimp-plugin-mgr --install '*' %preun -%{_sbindir}/gimp-plugin-mgr --uninstall '*' +# Only delete symlinks when uninstalling +if [ "$1" = "0" ]; then + %{_sbindir}/gimp-plugin-mgr --uninstall '*' || : +fi %postun if [ "$1" = "0" ]; then @@ -390,6 +408,9 @@ %{_libdir}/*.so %{_libdir}/*.a +%dir %{_libdir}/gimp +%dir %{_libdir}/gimp/%{interfacever} +%dir %{_libdir}/gimp/%{interfacever}/modules %{_libdir}/gimp/%{interfacever}/modules/*.a %ifnos linux %{_libdir}/*.la @@ -400,6 +421,69 @@ %{_libdir}/pkgconfig/* %changelog +* Tue May 01 2007 Nils Philippsen - 2:2.2.14-5 +- don't let gimp-plugin-mgr --uninstall fail %%pre/%%preun scriptlets (#238337) + +* Mon Apr 30 2007 Nils Philippsen - 2:2.2.14-4 +- fix plugin symlinks handling better (#238337) + +* Mon Apr 30 2007 Nils Philippsen - 2:2.2.14-3 +- don't erroneously delete symlinks to external plugins when updating (#238337) + +* Mon Apr 30 2007 Nils Philippsen - 2:2.2.14-2 +- avoid buffer overflow in sunras plugin (#238422) + +* Tue Apr 24 2007 Nils Philippsen - 2:2.2.14-1 +- version 2.2.14 + + Bugs fixed in GIMP 2.2.14 + ========================= + + - avoid crashing on newer versions of the winicon format (bug #352899) + - fixed crash in Postscript plug-in (bug #353381) + - fixed handling of TABs in the text tool (bug #353132) + - fixed bug in Depth Merge plug-in (bug #355219) + - fixed bug in GimpDrawablePreview widget (bug #353639) + - fixed bug in Line Nove script (bug #357433) + - fixed bug in Ripple plug-in (bug #357431) + - save locale independent files from Fractal Explorer plug-in (bug #360095) + - fixed bug in Super Nova plug-in (bug #340073) + - be more robust against broken XCF files (bug #357809) + - fixed drawing issues in Image Map plug-in (bug #311621) + - fixed smoothing option in Fractal Explorer plug-in (bug #372671) + - load channels in the proper order when opening an XCF file (bug #378003) + - deal with floating selections in the Burn-In Animation script (bug #384096) + - fixed clipping in the GimpPreviewArea widget (bug #392692) + - fixed a potential crash in gimp-remote (bug #392111) + - work around a file-chooser problem on Windows (bug #398726) + - fixed markup of the gimp(1) manual page (bug #401145) + - fixed the fix for the right-to-left layout in layers dialog (bug #348347) + - fixed PSD save plug-in on 64bit architectures (bug #335130) + - added missing dependency in gimpui-2.0.pc file (bug #356394) + - fixed a crash in the PSD save plug-in (bug #395385) + - improved robustness of transform tool preview code (bug #420595) + - improved forward compatibility of XCF loader (bug #316207) + - don't crash in the Compressor plug-in if files can't be opened (bug #422444) + - fixed sensitivity of input fields in the Lighting plug-in (bug #359833) + +- don't BuildRequire gimp-print/gutenprint anymore + +* Mon Mar 26 2007 Nils Philippsen - 2:2.2.13-3 +- use gutenprint per default for current development/future distribution + versions (Fedora >= 7, RHEL >= 6) + +* Mon Mar 26 2007 Nils Philippsen - 2:2.2.13-2 +- own used directories in gimp-devel (#233794) + +* Wed Feb 21 2007 Nils Philippsen +- s/%%redhat/%%rhel/g + +* Wed Feb 07 2007 Nils Philippsen +- really change defaults for use of modular X and lcms (#224156) + +* Thu Feb 01 2007 Nils Philippsen +- change defaults for use of modular X and lcms (#224156) + * Fri Aug 25 2006 Nils Philippsen - 2:2.2.13-1 - version 2.2.13 - remove obsolete filename patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/gimp/FC-5/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 28 Aug 2006 07:13:56 -0000 1.28 +++ sources 2 May 2007 04:25:39 -0000 1.29 @@ -1 +1 @@ -d84a4a476a0c4fae24602db67f6fe49a gimp-2.2.13.tar.bz2 +2f47dd66d714a970356e275dd1d3caac gimp-2.2.14.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 2 05:10:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 01:10:17 -0400 Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.27,1.28 Message-ID: <200705020510.l425AHnU021451@cvs.devel.redhat.com> Author: llim Update of /cvs/dist/rpms/redhat-lsb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21393 Modified Files: redhat-lsb.spec Log Message: fixed bug 232918: /usr/sbin/redhat_lsb_trigger.i386 segfaults; in specfile Index: redhat-lsb.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- redhat-lsb.spec 21 Feb 2007 02:03:16 -0000 1.27 +++ redhat-lsb.spec 2 May 2007 05:10:15 -0000 1.28 @@ -49,7 +49,7 @@ Summary: LSB support for Red Hat Linux Name: redhat-lsb Version: 3.1 -Release: 13 +Release: 14.fc7 URL: http://www.linuxbase.org/ Source0: %{name}-%{version}-%{srcrelease}.tar.bz2 Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz @@ -379,8 +379,11 @@ ln -snf ../../../sbin/chkconfig $RPM_BUILD_ROOT/usr/lib/lsb/remove_initd ln -snf mail $RPM_BUILD_ROOT/bin/mailx -gcc $RPM_OPT_FLAGS -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \ +#gcc $RPM_OPT_FLAGS -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \ +# -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE +gcc $RPM_OPT_FLAGS -fno-stack-protector -Os -static -o redhat_lsb_trigger{.%{_target_cpu},.c} -DLSBSOVER='"%{lsbsover}"' \ -DLDSO='"%{ldso}"' -DLSBLDSO='"/%{_lib}/%{lsbldso}"' -D_GNU_SOURCE + install -m 700 redhat_lsb_trigger.%{_target_cpu} \ $RPM_BUILD_ROOT/usr/sbin/redhat_lsb_trigger.%{_target_cpu} @@ -433,6 +436,9 @@ /usr/sbin/redhat_lsb_trigger.%{_target_cpu} %changelog +* Wed May 2 2007 Lawrence Lim - 3.1-14.fc7 +- fixed Bug 232918 for new glibc version + * Wed Feb 21 2007 Lawrence Lim - 3.1-13 - fixed Bug 226363 From fedora-cvs-commits at redhat.com Wed May 2 07:35:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 03:35:33 -0400 Subject: rpms/scim/devel scim.spec,1.85,1.86 Message-ID: <200705020735.l427ZXlO002852@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/scim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1826 Modified Files: scim.spec Log Message: - remove scim-setup from the desktop preferences menu since it is confusing with im-chooser and can be started directly from the scim command menu Index: scim.spec =================================================================== RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- scim.spec 1 May 2007 02:42:35 -0000 1.85 +++ scim.spec 2 May 2007 07:35:30 -0000 1.86 @@ -3,7 +3,7 @@ Name: scim Version: 1.4.5 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -145,7 +145,7 @@ --delete-original \ --vendor fedora \ --remove-category Applications \ - --add-category X-GNOME-PersonalSettings \ + --remove-category Settings \ --dir ${RPM_BUILD_ROOT}/%{_datadir}/applications \ ${RPM_BUILD_ROOT}/%{_datadir}/applications/scim-setup.desktop @@ -250,10 +250,14 @@ %changelog +* Wed May 2 2007 Jens Petersen - 1.4.5-17 +- remove scim-setup from the desktop preferences menu since it is confusing + with im-chooser and can be started directly from the scim command menu + * Tue May 1 2007 Jens Petersen - 1.4.5-16 - unrevert the last changes to initial-locale-hotkey-186861.patch to allow - no hotkey to be set and define Ctrl+space as default hotkey for all locale - again in system config + no hotkey to be set and define Ctrl+space as the default hotkey for all + locale again in system config - require im-chooser * Wed Apr 18 2007 Warren Togami - 1.4.5-15 From fedora-cvs-commits at redhat.com Wed May 2 10:18:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 06:18:26 -0400 Subject: rpms/udev/devel udev-rules.patch,1.33,1.34 udev.spec,1.202,1.203 Message-ID: <200705021018.l42AIPl0025846@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25830 Modified Files: udev-rules.patch udev.spec Log Message: - do not skip all events on modprobe (#238385) - Resolves: rhbz#238385 udev-rules.patch: 05-udev-early.rules | 15 ++++++++++++--- 50-udev.rules | 15 ++++----------- 95-pam-console.rules | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) Index: udev-rules.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- udev-rules.patch 27 Apr 2007 12:55:55 -0000 1.33 +++ udev-rules.patch 2 May 2007 10:18:23 -0000 1.34 @@ -1,10 +1,5 @@ ---- udev-106/etc/udev/redhat/95-pam-console.rules.rhrules 2007-03-03 18:42:09.000000000 +0100 -+++ udev-106/etc/udev/redhat/95-pam-console.rules 2007-04-27 14:54:37.000000000 +0200 -@@ -1 +1 @@ --ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}" -+ENV{STARTUP}!="1", ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}" --- udev-106/etc/udev/redhat/50-udev.rules.rhrules 2007-03-03 18:42:09.000000000 +0100 -+++ udev-106/etc/udev/redhat/50-udev.rules 2007-04-27 14:54:37.000000000 +0200 ++++ udev-106/etc/udev/redhat/50-udev.rules 2007-05-02 12:15:07.000000000 +0200 @@ -41,9 +41,6 @@ KERNEL=="hvc*", NAME="%k", GROUP="uucp", MODE="0660" KERNEL=="hvsi*", NAME="%k", GROUP="uucp", MODE="0660" @@ -25,6 +20,15 @@ # floppy devices KERNEL=="fd[01]*", GROUP="floppy", MODE="0660" # fix floppy devices +@@ -212,7 +206,7 @@ + KERNEL=="vbi0", SYMLINK+="vbi" + KERNEL=="null", SYMLINK+="XOR" + +-KERNEL=="tun", NAME="net/%k" ++KERNEL=="tun", NAME="net/%k", MODE="0666" + + KERNEL=="device-mapper", NAME="mapper/control" + @@ -233,6 +227,7 @@ KERNEL=="pktcdvd", NAME="%k/control" @@ -66,9 +70,14 @@ + RUN+="socket:/org/kernel/udev/monitor" +--- udev-106/etc/udev/redhat/95-pam-console.rules.rhrules 2007-03-03 18:42:09.000000000 +0100 ++++ udev-106/etc/udev/redhat/95-pam-console.rules 2007-05-02 12:04:15.000000000 +0200 +@@ -1 +1 @@ +-ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}" ++ENV{STARTUP}!="1", ACTION=="add", SYSFS{dev}=="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}" --- udev-106/etc/udev/redhat/05-udev-early.rules.rhrules 2007-03-03 18:42:09.000000000 +0100 -+++ udev-106/etc/udev/redhat/05-udev-early.rules 2007-04-27 14:55:00.000000000 +0200 -@@ -1,10 +1,17 @@ ++++ udev-106/etc/udev/redhat/05-udev-early.rules 2007-05-02 12:07:55.000000000 +0200 +@@ -1,10 +1,19 @@ # sysfs is populated after the event is sent ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" -ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" @@ -79,13 +88,15 @@ SUBSYSTEM=="module", OPTIONS="ignore_device" + -+ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}", OPTIONS="last_rule" ++ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}", GOTO="skip_wait" + +# pnp devices -+ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'", OPTIONS="last_rule" ++ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'" + +ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" + +ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" + ++LABEL="skip_wait" ++ ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule" Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- udev.spec 27 Apr 2007 13:47:00 -0000 1.202 +++ udev.spec 2 May 2007 10:18:23 -0000 1.203 @@ -6,7 +6,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 106 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -352,6 +352,10 @@ %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Wed May 02 2007 Harald Hoyer - 106-4 +- do not skip all events on modprobe (#238385) +- Resolves: rhbz#238385 + * Fri Apr 27 2007 Harald Hoyer - 106-3 - modprobe only on modalias (bug #238140) - make startup messages visible again From fedora-cvs-commits at redhat.com Wed May 2 10:46:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 06:46:43 -0400 Subject: rpms/aspell-bg/devel aspell-bg.spec,1.15,1.16 Message-ID: <200705021046.l42Akh05017879@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell-bg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17559 Modified Files: aspell-bg.spec Log Message: - Resolves: 238426 convert bulgarian.kbd file Index: aspell-bg.spec =================================================================== RCS file: /cvs/dist/rpms/aspell-bg/devel/aspell-bg.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- aspell-bg.spec 28 Mar 2007 11:40:00 -0000 1.15 +++ aspell-bg.spec 2 May 2007 10:46:40 -0000 1.16 @@ -4,7 +4,7 @@ Name: aspell-%{lang} Epoch: 50 Version: 0.50 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL Group: Applications/Text URL: http://aspell.net/ @@ -25,11 +25,11 @@ %build ./configure make %{?_smp_mflags} +iconv -f windows-1251 -t utf-8 bulgarian.kbd %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT @@ -39,6 +39,10 @@ %{_libdir}/aspell-0.60/* %changelog +* Wed May 2 2007 Ivana Varekova - 50:0.50-15 +- Resolves: 238426 + convert bulgarian.kbd file + * Wed Mar 28 2007 Ivana Varekova - 50:0.50-14 - variable DESTDIR is set in make command From fedora-cvs-commits at redhat.com Wed May 2 12:49:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 08:49:42 -0400 Subject: rpms/alsa-utils/devel alsa-utils.spec, 1.52, 1.53 alsaunmute.c, 1.12, 1.13 Message-ID: <200705021249.l42CngZ4011704@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11656 Modified Files: alsa-utils.spec alsaunmute.c Log Message: added fix for #238442 (unmute Mono channel for w4550, xw4600, xw6600, and xw8600) Index: alsa-utils.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- alsa-utils.spec 18 Apr 2007 12:28:22 -0000 1.52 +++ alsa-utils.spec 2 May 2007 12:49:40 -0000 1.53 @@ -4,7 +4,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: 1.0.14 -Release: 0.5%{?prever_dot}%{?dist} +Release: 0.6%{?prever_dot}%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -74,6 +74,10 @@ /usr/share/locale/* %changelog +* Wed May 2 2007 Martin Stransky 1.0.14-0.6.rc2 +- added fix for #238442 (unmute Mono channel for w4550, + xw4600, xw6600, and xw8600) + * Wed Apr 18 2007 Martin Stransky 1.0.14-0.5.rc2 - added more funcionality to salsa (save/load sound settings), moved volume settings to /etc/alsa/ Index: alsaunmute.c =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/alsaunmute.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- alsaunmute.c 10 Apr 2007 11:22:40 -0000 1.12 +++ alsaunmute.c 2 May 2007 12:49:40 -0000 1.13 @@ -96,6 +96,9 @@ // Specific config for snd-intel8x0 (xw8000) {"Master Mono", 75, 1, 0, 0, "snd-intel8x0"}, + // Specific config for snd_hda_intel (xw8600/xw6600/xw4600/xw4450) + {"Master Mono", 75, 1, 0, 0, "snd_hda_intel"}, + // Specific config for snd-ens1371 {"IEC958", 0, 0, 0, 0, "snd-ens1371"}, {"iSpeaker", 75, 1, 0, 0, "snd-hda-intel"} From fedora-cvs-commits at redhat.com Wed May 2 13:35:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 09:35:16 -0400 Subject: rpms/eclipse/devel eclipse-launcher-addplatformtotildeeclipse.patch, 1.3, 1.4 eclipse.spec, 1.425, 1.426 Message-ID: <200705021335.l42DZGm1010285@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9801 Modified Files: eclipse-launcher-addplatformtotildeeclipse.patch eclipse.spec Log Message: * Wed May 02 2007 Ben Konrath 3.2.2-12 - Fix additional problem with launcher-addplatformtotildeeclipse.patch. - Resolves: #238109. eclipse-launcher-addplatformtotildeeclipse.patch: eclipse.c | 2 + gtk/eclipseGtk.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) Index: eclipse-launcher-addplatformtotildeeclipse.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-launcher-addplatformtotildeeclipse.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eclipse-launcher-addplatformtotildeeclipse.patch 30 Apr 2007 18:03:28 -0000 1.3 +++ eclipse-launcher-addplatformtotildeeclipse.patch 2 May 2007 13:35:13 -0000 1.4 @@ -4,7 +4,7 @@ retrieving revision 1.71 diff -u -r1.71 eclipse.c --- library/eclipse.c 25 Apr 2006 14:31:50 -0000 1.71 -+++ library/eclipse.c 30 Apr 2007 17:43:21 -0000 ++++ library/eclipse.c 1 May 2007 08:48:33 -0000 @@ -512,6 +513,8 @@ /* Get the command to start the Java VM. */ vmCommandArgs = getVMCommand( argc, argv ); @@ -20,8 +20,8 @@ retrieving revision 1.27 diff -u -r1.27 eclipseGtk.c --- library/gtk/eclipseGtk.c 27 Mar 2006 18:25:42 -0000 1.27 -+++ library/gtk/eclipseGtk.c 30 Apr 2007 17:43:21 -0000 -@@ -335,3 +335,95 @@ ++++ library/gtk/eclipseGtk.c 1 May 2007 08:48:33 -0000 +@@ -335,3 +335,109 @@ gtk_main_quit(); return FALSE; } @@ -43,6 +43,12 @@ + /* If platform.xml doesn't exist, Eclipse has yet to be started. + * We don't have worry about doing anything now and in the future + * so add the appropriate file to ~/.eclipse. */ ++ if (g_mkdir(g_strconcat(g_get_home_dir(), "/.eclipse", NULL), 493) < 0) ++ { ++ g_print("Error creating ~/.eclipse/."); ++ g_print(g_strconcat(error->message, "\n\0", NULL)); ++ g_free(error); ++ } + if (g_file_set_contents(touched, "\0", -1, &error) == FALSE) + { + g_print("Error touching ~/.eclipse/.homedirmodified-fedora."); @@ -105,14 +111,22 @@ + } + + /* At this point platform_xml exists and touched does not exist. */ -+ if (g_remove (platform_xml) < 0) ++ if (g_remove(platform_xml) < 0) + { + g_print("Error writing platform.xml in ~/.eclipse.\ + You should remove ~/.eclipse before restarting Eclipse:\0"); + g_print(g_strconcat(error->message, "\n\0", NULL)); + g_free(error); ++ g_free(platform_xml); ++ g_free(touched); ++ return; ++ } ++ if (g_file_set_contents(touched, "\0", -1, &error) == FALSE) ++ { ++ g_print("Error touching ~/.eclipse/.homedirmodified-fedora."); ++ g_print(g_strconcat(error->message, "\n\0", NULL)); ++ g_free(error); + } -+ + g_free(platform_xml); + g_free(touched); + return; Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.425 retrieving revision 1.426 diff -u -r1.425 -r1.426 --- eclipse.spec 30 Apr 2007 18:03:28 -0000 1.425 +++ eclipse.spec 2 May 2007 13:35:13 -0000 1.426 @@ -19,7 +19,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 11%{?dist} +Release: 12%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1718,6 +1718,10 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Wed May 02 2007 Ben Konrath 3.2.2-12 +- Fix additional problem with launcher-addplatformtotildeeclipse.patch. +- Resolves: #238109. + * Mon Apr 30 2007 Ben Konrath 3.2.2-11 - Add workaround in launcher-addplatformtotildeeclipse.patch for problems caused by bug #238109. From fedora-cvs-commits at redhat.com Wed May 2 14:01:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 10:01:41 -0400 Subject: rpms/minicom/FC-6 minicom-2.2-drop-privs.patch, NONE, 1.1 minicom-2.2-esc.patch, NONE, 1.1 minicom-2.2-gotodir.patch, NONE, 1.1 minicom-2.2-ncurses.patch, NONE, 1.1 minicom-2.2-rh.patch, NONE, 1.1 minicom-2.2-setlocale.patch, NONE, 1.1 minicom-2.2-spaces.patch, NONE, 1.1 minicom-2.2-staticbuf.patch, NONE, 1.1 minicom-2.2-umask.patch, NONE, 1.1 minicom-2.2-wchar.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 minicom.spec, 1.23, 1.24 sources, 1.5, 1.6 minicom-2.00.0-gcc4.patch, 1.1, NONE minicom-2.00.0-gotodir.patch, 1.1, NONE minicom-2.00.0-inssp.patch, 1.1, NONE minicom-2.00.0-offby1.patch, 1.1, NONE minicom-2.1-debug.patch, 1.1, NONE minicom-2.1-esc.patch, 1.1, NONE minicom-2.1-rh.patch, 1.1, NONE minicom-2.1-staticbuf.patch, 1.1, NONE minicom-drop-privs.patch, 1.1, NONE minicom-umask.patch, 1.1, NONE minicom.desktop, 1.1, NONE Message-ID: <200705021401.l42E1fFd009160@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/minicom/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8985 Modified Files: .cvsignore minicom.spec sources Added Files: minicom-2.2-drop-privs.patch minicom-2.2-esc.patch minicom-2.2-gotodir.patch minicom-2.2-ncurses.patch minicom-2.2-rh.patch minicom-2.2-setlocale.patch minicom-2.2-spaces.patch minicom-2.2-staticbuf.patch minicom-2.2-umask.patch minicom-2.2-wchar.patch Removed Files: minicom-2.00.0-gcc4.patch minicom-2.00.0-gotodir.patch minicom-2.00.0-inssp.patch minicom-2.00.0-offby1.patch minicom-2.1-debug.patch minicom-2.1-esc.patch minicom-2.1-rh.patch minicom-2.1-staticbuf.patch minicom-drop-privs.patch minicom-umask.patch minicom.desktop Log Message: - update to 2.2 (#237906) - handle filenames with spaces (#98655) - add requires for lrzsz - spec cleanup Resolves: #98655 #237906 minicom-2.2-drop-privs.patch: minicom.c | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE minicom-2.2-drop-privs.patch --- --- minicom-2.2/src/minicom.c.privs 2005-10-31 13:13:51.000000000 +0100 +++ minicom-2.2/src/minicom.c 2007-03-09 13:08:23.000000000 +0100 @@ -1124,6 +1124,8 @@ use_status = 1; break; case 'C': /* Capturing */ + setegid(real_gid); + seteuid(real_uid); capfp = sfopen(optarg, "a"); if (capfp == NULL) { werror(_("Cannot open capture file")); @@ -1131,6 +1133,8 @@ } docap = 1; vt_set(addlf, -1, capfp, docap, -1, -1, -1, -1); + seteuid(eff_uid); + setegid(eff_gid); break; case 'S': /* start Script */ strncpy(scr_name, optarg, 33); minicom-2.2-esc.patch: vt100.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE minicom-2.2-esc.patch --- --- minicom-2.2/src/vt100.c.esc 2006-04-02 11:52:30.000000000 +0200 +++ minicom-2.2/src/vt100.c 2007-03-09 13:10:38.000000000 +0100 @@ -1041,7 +1041,7 @@ fputc(P_CONVCAP[0] == 'Y' ? vt_inmap[c] : c, vt_capfp); c = vt_inmap[c]; /* conversion 04.09.97 / jl */ #if TRANSLATE - if (vt_type == VT100 && vt_asis == 0) + if (vt_type == VT100 && vt_trans[vt_charset] && vt_asis == 0) c = vt_trans[vt_charset][c]; #endif /* FIXME: This is wrong, but making it right would require minicom-2.2-gotodir.patch: file.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) --- NEW FILE minicom-2.2-gotodir.patch --- --- minicom-2.2/src/file.c.gotodir 2005-08-14 22:39:30.000000000 +0200 +++ minicom-2.2/src/file.c 2007-03-09 10:59:51.000000000 +0100 @@ -277,6 +277,8 @@ int initial_y = (76 - (WHAT_NR_OPTIONS * WHAT_WIDTH >= 76 ? 74 : WHAT_NR_OPTIONS * WHAT_WIDTH)) / 2; size_t i; + int rval; + char * new_prev_dir; cur = 0; ocur = 0; @@ -290,11 +292,6 @@ dprev = -1; tag_cnt = 0; - /* got to do some error-checking here!!! Maybe use mcd(), too! */ - if (prev_dir != NULL) - free(prev_dir); - prev_dir = getcwd(NULL, BUFSIZ); - /* * get last directory */ @@ -324,7 +321,30 @@ if (strlen(work_dir) > 1 && work_dir[strlen(work_dir) - 1] == '/') work_dir[strlen(work_dir) - 1] = (char)0; - chdir(work_dir); + /* get the current working directory, which will become the prev_dir, on success */ + new_prev_dir = getcwd(NULL, BUFSIZ); + if (new_prev_dir == NULL) { + return -1; + } + + rval = chdir(work_dir); + if (rval == 0) { + /* was able to change to new working directory */ + free(prev_dir); + prev_dir = new_prev_dir; + } + else { + /* Could not change to the new working directory */ + wbell(); + werror( + _("Could not change to directory %s (%s)"), + work_dir, + strerror(errno)); + + /* restore the previous working directory */ + free(work_dir); + work_dir = set_work_dir(new_prev_dir, strlen(new_prev_dir)); + } /* All right, draw the file directory! */ @@ -429,7 +449,7 @@ wredraw(dsub, 1); } - return 0; + return rval; } minicom-2.2-ncurses.patch: configure | 2 +- src/port.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE minicom-2.2-ncurses.patch --- --- minicom-2.2/configure.ncurses 2006-10-16 09:54:20.000000000 +0200 +++ minicom-2.2/configure 2007-03-08 19:01:21.000000000 +0100 @@ -6067,7 +6067,7 @@ LIBS="$LIBS $TERMLIBS" -if test "x$termlib" = xncurses; then +if test "x$termlib" = xncurses || test "x$termlib" = xtinfo; then for ac_header in ncurses/termcap.h do --- minicom-2.2/src/port.h.ncurses 2005-10-31 11:31:38.000000000 +0100 +++ minicom-2.2/src/port.h 2007-03-08 18:59:52.000000000 +0100 @@ -29,6 +29,8 @@ #endif #ifdef HAVE_TERMCAP_H # include +#elif defined (HAVE_NCURSES_TERMCAP_H) +# include #else char *tgetstr(void), *tgoto(void); int tgetent(void), tputs(void), tgetnum(void), tgetflag(void); minicom-2.2-rh.patch: main.c | 39 ++++++++++++++++++++++++++++++++++----- minicom.c | 2 +- minicom.h | 4 +++- updown.c | 8 +++++++- 4 files changed, 45 insertions(+), 8 deletions(-) --- NEW FILE minicom-2.2-rh.patch --- --- minicom-2.2/src/main.c.rh 2005-10-31 13:13:51.000000000 +0100 +++ minicom-2.2/src/main.c 2007-03-09 13:10:12.000000000 +0100 @@ -82,7 +82,7 @@ } set_privs(); if (lockfile[0]) - unlink(lockfile); + ttyunlock(lockfile); if (P_CALLIN[0]) fastsystem(P_CALLIN, NULL, NULL, NULL); if (real_uid) @@ -154,10 +154,13 @@ int open_term(int doinit) { struct stat stt; +#ifdef NOTNOW char buf[128]; - int fd, n = 0; + int fd; int pid; int mask; +#endif + int n = 0; #ifdef HAVE_ERRNO_H int s_errno; #endif @@ -165,6 +168,8 @@ /* Upgrade our status. */ set_privs(); +#ifdef NOTNOW + /* First see if the lock file directory is present. */ if (P_LOCK[0] && stat(P_LOCK, &stt) == 0) { @@ -236,6 +241,30 @@ close(fd); } +#else + lockfile[0] = 0; + if (doinit >= 0) { + int rc = ttylock(dial_tty); + if (rc < 0) { + if (access(dial_tty, W_OK) == -1) + fprintf(stderr, _("Device %s access failed: %s.\n"), + dial_tty, strerror(errno)); + else + fprintf(stderr, _("Device %s lock failed: %s.\n"), + dial_tty, strerror(-rc)); + } else if (rc > 0) { + fprintf(stderr, _("Device %s is locked.\n"), dial_tty); + } else if (rc == 0) { + snprintf(lockfile, sizeof(lockfile), "%s", dial_tty); + } + if (rc) { + if (stdwin) wclose(stdwin, 1); + drop_privs(); + return(-1); + } + } +#endif + /* Run a special program to disable callin if needed. */ if (doinit > 0 && P_CALLOUT[0]) { if (fastsystem(P_CALLOUT, NULL, NULL, NULL) < 0) { @@ -243,7 +272,7 @@ wclose(stdwin, 1); fprintf(stderr, _("Could not setup for dial out.\n")); if (lockfile[0]) - unlink(lockfile); + ttyunlock(lockfile); drop_privs(); return -1; } @@ -303,12 +332,12 @@ fprintf(stderr, _("minicom: cannot open %s. Sorry.\n"), dial_tty); #endif if (lockfile[0]) - unlink(lockfile); + ttyunlock(lockfile); drop_privs(); return -1; } if (lockfile[0]) - unlink(lockfile); + ttyunlock(lockfile); werror(_("Cannot open %s!"), dial_tty); drop_privs(); return -1; --- minicom-2.2/src/minicom.h.rh 2005-10-31 12:10:57.000000000 +0100 +++ minicom-2.2/src/minicom.h 2007-03-09 13:10:12.000000000 +0100 @@ -29,6 +29,8 @@ #include "vt100.h" #include "libport.h" +#include + #ifdef USE_SOCKET #include #include @@ -78,7 +80,7 @@ EXTERN int escape; /* Escape code. */ EXTERN int disable_online_time; /* disable online time display */ -EXTERN char lockfile[128]; /* UUCP lock file of terminal */ +EXTERN char lockfile[1024]; /* UUCP lock file of terminal */ EXTERN char homedir[256]; /* Home directory of user */ EXTERN char logfname[PARS_VAL_LEN]; /* Name of the logfile */ EXTERN char username[16]; /* Who is using minicom? */ --- minicom-2.2/src/minicom.c.rh 2007-03-09 13:10:12.000000000 +0100 +++ minicom-2.2/src/minicom.c 2007-03-09 13:10:12.000000000 +0100 @@ -1532,7 +1532,7 @@ set_privs(); keyboard(KUNINSTALL, 0); if (lockfile[0]) - unlink(lockfile); + ttyunlock(lockfile); close(portfd); /* Please - if your system doesn't have uid_t and/or gid_t, define 'em * conditionally in "port.h". --- minicom-2.2/src/updown.c.rh 2005-08-14 22:39:30.000000000 +0200 +++ minicom-2.2/src/updown.c 2007-03-09 13:10:12.000000000 +0100 @@ -380,8 +380,10 @@ { int status; int pid, n; +#ifdef NOTNOW char buf[81]; int fd; +#endif /* Clear screen, set keyboard modes etc. */ wleave(); @@ -395,7 +397,7 @@ /* Remove lockfile */ set_privs(); if (lockfile[0]) - unlink(lockfile); + ttyunlock(lockfile); setgid((gid_t)real_gid); setuid((uid_t)real_uid); @@ -416,6 +418,7 @@ /* Re-create lockfile */ if (lockfile[0]) { set_privs(); +#ifdef NOTNOW n = umask(022); /* Create lockfile compatible with UUCP-1.2 */ if ((fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, 0666)) < 0) { @@ -427,6 +430,9 @@ close(fd); } umask(n); +#else + ttylock(lockfile); +#endif drop_privs(); } m_flush(portfd); minicom-2.2-setlocale.patch: intl.h | 3 --- 1 files changed, 3 deletions(-) --- NEW FILE minicom-2.2-setlocale.patch --- --- minicom-2.2/src/intl.h.setlocale 2003-03-30 20:55:51.000000000 +0200 +++ minicom-2.2/src/intl.h 2007-03-08 18:01:03.000000000 +0100 @@ -3,9 +3,6 @@ #ifdef HAVE_LOCALE_H # include #endif -#if !HAVE_SETLOCALE -# define setlocale(Category, Locale) /* empty */ -#endif #define N_(Str) (Str) minicom-2.2-spaces.patch: file.c | 16 ++++++++++++++-- util.c | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) --- NEW FILE minicom-2.2-spaces.patch --- Patch from Debian's minicom_2.2-5.diff.gz: minicom-2.2/debian/patches/bug199924.diff --- minicom-2.2.orig/src/util.c 2005-11-09 00:34:25.000000000 +0100 +++ minicom-2.2/src/util.c 2006-10-19 17:38:18.000000000 +0200 @@ -116,7 +116,7 @@ /* Delete escape-characters ment for the shell */ p = cmd; - while ((p = strchr(p, '\\'))) + while ((p = strchr(p, '\\')) && *(p+1) != ' ') memmove(p, p + 1, strlen(p+1)); /* Split line into words */ --- minicom-2.2.orig/src/file.c 2005-08-14 22:39:30.000000000 +0200 +++ minicom-2.2/src/file.c 2006-10-19 17:43:10.000000000 +0200 @@ -529,6 +529,8 @@ { GETSDIR_ENTRY *my_d; int indxr, len; + int i; + char *j; my_d = d; for (indxr = nrents, len = 0; indxr; --indxr, ++my_d) @@ -548,8 +550,18 @@ for (indxr = nrents; indxr; --indxr, ++my_d) if (my_d->cflags & FL_TAG) { /* this could be *much* more efficient */ - strcat(ret_buf, my_d->fname); - strcat(ret_buf, " "); + for (i = strlen(ret_buf), j = my_d->fname; *j; j++) { + if (*j == ' ') { + if ((ret_buf = (char*)realloc(ret_buf, ++len)) == NULL) { + file_tell(_("Too many files tagged - buffer would overflow")); + return(NULL); + } + ret_buf[i++] = '\\'; + } + ret_buf[i++] = *j; + } + ret_buf[i++] = ' '; + ret_buf[i] = '\0'; } ret_buf[strlen(ret_buf) - 1] = (char)0; minicom-2.2-staticbuf.patch: updown.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 99 insertions(+), 25 deletions(-) --- NEW FILE minicom-2.2-staticbuf.patch --- --- minicom-2.2/src/updown.c.staticbuf 2007-03-09 13:10:38.000000000 +0100 +++ minicom-2.2/src/updown.c 2007-03-09 13:10:38.000000000 +0100 @@ -87,40 +87,83 @@ * Translate %b to the current bps rate, and * %l to the current tty port. * %f to the serial port file descriptor + * + * Caller must free the returned string */ static char *translate(char *s) { - static char buf[128]; - char str_portfd[8]; /* kino */ - int i; + char * ptr; + char * translation; + size_t translation_length; + char str_portfd[8]; /* kino */ + + /* determine how many bytes we'll need for the translated version */ + translation_length = 0; + for (ptr = s; *ptr != '\0'; ptr++) { + if (*ptr != '%') { + translation_length++; + } + else { + switch(*++ptr) { + + case 'l': /* tty port */ + translation_length += strlen(dial_tty); + break; + + case 'b': /* baud rate (bbp) */ + translation_length += strlen(P_BAUDRATE); + break; + + case 'f': /* serial port file descriptor */ + sprintf(str_portfd, "%d", portfd); + translation_length += strlen(str_portfd); + break; + + default: /* treat all other escape sequences literally */ + translation_length += 2; + break; + } + } + } + + translation = malloc(translation_length + 1); + if (translation == NULL) { + do_log("out of memory"); + return NULL; + } - for (i = 0; *s && i < 127; i++, s++) { + /* now copy and translate s into the allocated buffer */ + for (ptr = translation; *s != '\0'; s++) { if (*s != '%') { - buf[i] = *s; + *ptr++ = *s; continue; } - switch (*++s) { - case 'l': - strncpy(buf + i, dial_tty, sizeof(buf)-i); - i += strlen(dial_tty) - 1; + switch(*++s) { + case 'l': /* tty port */ + strcpy(ptr, dial_tty); + ptr += strlen(dial_tty); break; - case 'b': - strncpy(buf + i, P_BAUDRATE, sizeof(buf)-i); - i += strlen(P_BAUDRATE) - 1; + + case 'b': /* baud rate (bbp) */ + strcpy(ptr, P_BAUDRATE); + ptr += strlen(P_BAUDRATE); break; - case 'f': + + case 'f': /* serial port file descriptor */ sprintf(str_portfd, "%d", portfd); - strncpy(buf + i, str_portfd, sizeof(buf)-i); - i += strlen(str_portfd) - 1; + strcpy(ptr, str_portfd); + ptr += strlen(str_portfd); break; - default: - buf[i++] = '%'; - buf[i] = *s; + + default: /* treat all other escape sequences literally */ + *ptr++ = '%'; + *ptr++ = *s; break; } } - buf[i] = 0; - return buf; + *ptr = '\0'; + + return translation; } /* @@ -181,7 +224,8 @@ const char *s =""; int pipefd[2]; int n, status; - char cmdline[128]; + char * cmdline = NULL; + char * translated_cmdline = NULL; WIN *win = (WIN *)NULL; if (mcd(what == 'U' ? P_UPDIR : P_DOWNDIR) < 0) @@ -213,6 +257,7 @@ #if 1 { int multiple; /* 0:only directory, 1:one file, -1:any number */ + size_t cmdline_length; if (P_MUL(g)=='Y') /* need file(s), or just a directory? */ @@ -232,7 +277,13 @@ } /* discard directory if "multiple" == 0 */ - snprintf(cmdline, sizeof(cmdline), "%s %s", P_PPROG(g), multiple == 0? "" : s); + cmdline_length = strlen(P_PPROG(g)) + strlen((char*) (multiple == 0 ? "" : s)) + 1; /* + 1 for ' ' */ + cmdline = malloc(cmdline_length + 1); /* + 1 for NUL */ + if (cmdline == NULL) { + werror(_("Out of memory: could allocate buffer for command line")); + return; + } + snprintf(cmdline, cmdline_length + 1, "%s %s", P_PPROG(g), multiple == 0 ? "" : s); } #endif @@ -258,6 +309,8 @@ } else wreturn(); mcd(""); + if(cmdline) + free(cmdline); return; case 0: /* Child */ if (P_PIORED(g) == 'Y') { @@ -276,11 +329,21 @@ set_privs(); setgid((gid_t)real_gid); setuid((uid_t)real_uid); - fastexec(translate(cmdline)); + translated_cmdline = translate(cmdline); + if (translated_cmdline != NULL) { + fastexec(translated_cmdline); + free(translated_cmdline); + } + if(cmdline) + free(cmdline); exit(1); default: /* Parent */ break; } + + if(cmdline) + free(cmdline); + if (win) { setcbreak(1); /* Cbreak, no echo. */ enab_sig(1, 0); /* But enable SIGINT */ @@ -384,6 +447,7 @@ char buf[81]; int fd; #endif + char * translated_cmdline; /* Clear screen, set keyboard modes etc. */ wleave(); @@ -404,7 +468,11 @@ for (n = 0; n < _NSIG; n++) signal(n, SIG_DFL); - fastexec(translate(P_KERMIT)); + translated_cmdline = translate(P_KERMIT); + if (translated_cmdline != NULL) { + fastexec(translated_cmdline); + free(translated_cmdline); + } exit(1); default: /* Parent */ break; @@ -518,6 +586,7 @@ char buf[81]; char scr_lines[5]; char cmdline[128]; + char *translated_cmdline; char *ptr; WIN *w; int done = 0; @@ -623,7 +692,12 @@ mc_setenv("LOGIN", scr_user); mc_setenv("PASS", scr_passwd); mc_setenv("TERMLIN", scr_lines); /* jl 13.09.97 */ - fastexec(translate(cmdline)); + translated_cmdline = translate(cmdline); + + if (translated_cmdline != NULL) { + fastexec(translated_cmdline); + free(translated_cmdline); + } exit(1); default: /* Parent */ break; minicom-2.2-umask.patch: config.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE minicom-2.2-umask.patch --- --- minicom-2.2/src/config.c.umask 2006-04-02 11:52:30.000000000 +0200 +++ minicom-2.2/src/config.c 2007-03-09 13:09:21.000000000 +0100 @@ -1248,6 +1248,7 @@ } writepars(fp, 1); fclose(fp); + chmod( parfile, (mode_t) 0644 ); werror(_("Configuration saved")); } else { /* Mortals save their own configuration */ minicom-2.2-wchar.patch: minicom.c | 1 - window.c | 1 - 2 files changed, 2 deletions(-) --- NEW FILE minicom-2.2-wchar.patch --- --- minicom-2.2/src/minicom.c.wchar 2007-03-09 13:09:01.000000000 +0100 +++ minicom-2.2/src/minicom.c 2007-03-09 13:09:01.000000000 +0100 @@ -27,7 +27,6 @@ RCSID(PKG_VER "$Id: minicom.c,v 1.29 2005/10/31 12:13:51 al-guest Exp $") #include -#include #include #define EXTERN --- minicom-2.2/src/window.c.wchar 2005-11-06 20:20:57.000000000 +0100 +++ minicom-2.2/src/window.c 2007-03-09 13:09:01.000000000 +0100 @@ -23,7 +23,6 @@ #include #include -#include #include "port.h" #include "minicom.h" Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/minicom/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 15 Jul 2005 12:35:55 -0000 1.5 +++ .cvsignore 2 May 2007 14:01:39 -0000 1.6 @@ -1,2 +1 @@ -minicom-2.00.0.src.tar.bz2 -minicom-2.1.tar.gz +minicom-2.2.tar.gz Index: minicom.spec =================================================================== RCS file: /cvs/dist/rpms/minicom/FC-6/minicom.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- minicom.spec 26 Jul 2006 10:35:33 -0000 1.23 +++ minicom.spec 2 May 2007 14:01:39 -0000 1.24 @@ -1,31 +1,27 @@ -%define with_desktop_menu_entry 0 - Summary: A text-based modem control and terminal emulation program. Name: minicom -Version: 2.1 -Release: 3 +Version: 2.2 +Release: 1%{?dist} +URL: http://alioth.debian.org/projects/minicom/ License: GPL Group: Applications/Communications ExcludeArch: s390 s390x -BuildRoot: %{_tmppath}/%{name}-root -BuildPrereq: lockdev-devel >= 1.0.0-13 ncurses-devel -PreReq: coreutils -Requires: lockdev -URL: http://alioth.debian.org/projects/minicom/ - -Source: ftp://metalab.unc.edu/pub/Linux/apps/serialcomm/dialout/minicom-%{version}.tar.gz -Source1: minicom.desktop -Patch2: minicom-drop-privs.patch -Patch4: minicom-umask.patch - -Patch8: minicom-2.1-rh.patch -Patch10: minicom-2.1-staticbuf.patch -Patch11: minicom-2.1-esc.patch -Patch12: minicom-2.00.0-inssp.patch -Patch13: minicom-2.00.0-gotodir.patch -Patch14: minicom-2.00.0-offby1.patch -Patch15: minicom-2.00.0-gcc4.patch -Patch16: minicom-2.1-debug.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: lockdev-devel ncurses-devel +Requires: lockdev lrzsz + +Source: minicom-%{version}.tar.gz + +Patch1: minicom-2.2-ncurses.patch +Patch2: minicom-2.2-drop-privs.patch +Patch3: minicom-2.2-wchar.patch +Patch4: minicom-2.2-umask.patch +Patch5: minicom-2.2-setlocale.patch +Patch6: minicom-2.2-spaces.patch +Patch7: minicom-2.2-gotodir.patch +Patch8: minicom-2.2-rh.patch +Patch9: minicom-2.2-esc.patch +Patch10: minicom-2.2-staticbuf.patch %description Minicom is a simple text-based modem control and terminal emulation @@ -35,54 +31,50 @@ %prep %setup -q +%patch1 -p1 -b .ncurses %patch2 -p1 -b .privs +%patch3 -p1 -b .wchar %patch4 -p1 -b .umask +%patch5 -p1 -b .setlocale +%patch6 -p1 -b .spaces +%patch7 -p1 -b .gotodir %patch8 -p1 -b .rh +%patch9 -p1 -b .esc %patch10 -p1 -b .staticbuf -%patch11 -p1 -b .esc -%patch12 -p1 -b .ins -%patch13 -p1 -b .gotodir -%patch14 -p1 -b .offby1 -%patch15 -p1 -b .gcc4 -%patch16 -p1 - %build %configure -make - +make %{?_smp_mflags} %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -%makeinstall -mkdir -p $RPM_BUILD_ROOT/etc -%if %{with_desktop_menu_entry} -install -d $RPM_BUILD_ROOT/etc/X11/applnk/Internet -install -m 644 %SOURCE1 $RPM_BUILD_ROOT/etc/X11/applnk/Internet/minicom.desktop -%endif -install -m 644 doc/minicom.users $RPM_BUILD_ROOT/etc/minicom.users +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} +install -p -m 644 doc/minicom.users $RPM_BUILD_ROOT%{_sysconfdir}/minicom.users -%find_lang %name +%find_lang %{name} %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%files -f %name.lang +%files -f %{name}.lang %defattr(-,root,root) -%doc doc -#%attr(0644,root,root) -%config(noreplace) /etc/minicom.users +%doc AUTHORS NEWS TODO doc/* +%config(noreplace) %{_sysconfdir}/minicom.users # DO NOT MAKE minicom SUID/SGID anything. -%attr(0755,root,uucp) %{_bindir}/minicom +%{_bindir}/minicom %{_bindir}/runscript %{_bindir}/xminicom %{_bindir}/ascii-xfr %{_mandir}/man1/* -%if %{with_desktop_menu_entry} -%config(missingok) /etc/X11/applnk/Internet/minicom.desktop -%endif %changelog +* Wed May 02 2007 Miroslav Lichvar 2.2-1 +- update to 2.2 (#237906) +- handle filenames with spaces (#98655) +- add requires for lrzsz +- spec cleanup + * Tue Jul 18 2006 Martin Stransky 2.1-3 - removed unnecessary debug output (#199707) @@ -187,7 +179,7 @@ - Disabled most patches as they are either included now, not needed, or it has yet to be determined. -* Fri Oct 12 2001 Trond Eivind Glomsr?d 1.83.1-17 +* Fri Oct 12 2001 Trond Eivind Glomsr??d 1.83.1-17 - Delete bad entries in ko.po, fix charset in ja.po * Tue Aug 28 2001 Jeff Johnson Index: sources =================================================================== RCS file: /cvs/dist/rpms/minicom/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Jul 2005 12:35:55 -0000 1.5 +++ sources 2 May 2007 14:01:39 -0000 1.6 @@ -1 +1 @@ -1c8f3b247c38fb16c3c2170df9fc102a minicom-2.1.tar.gz +13933c8777839f00e3730df23599dc93 minicom-2.2.tar.gz --- minicom-2.00.0-gcc4.patch DELETED --- --- minicom-2.00.0-gotodir.patch DELETED --- --- minicom-2.00.0-inssp.patch DELETED --- --- minicom-2.00.0-offby1.patch DELETED --- --- minicom-2.1-debug.patch DELETED --- --- minicom-2.1-esc.patch DELETED --- --- minicom-2.1-rh.patch DELETED --- --- minicom-2.1-staticbuf.patch DELETED --- --- minicom-drop-privs.patch DELETED --- --- minicom-umask.patch DELETED --- --- minicom.desktop DELETED --- From fedora-cvs-commits at redhat.com Wed May 2 14:20:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 10:20:22 -0400 Subject: rpms/system-config-date/devel .cvsignore, 1.59, 1.60 sources, 1.63, 1.64 system-config-date.spec, 1.68, 1.69 Message-ID: <200705021420.l42EKMZq009671@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-date/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9649 Modified Files: .cvsignore sources system-config-date.spec Log Message: pick up updated translations (#237930) don't use underscore in default timezone in textmode tool add scrollbars to timezone canvas (#230690) scroll to city selected via treeview don't resize window due to excessively long comments of cities Resolves: #237930, #230690 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 25 Apr 2007 12:36:51 -0000 1.59 +++ .cvsignore 2 May 2007 14:20:20 -0000 1.60 @@ -1 +1 @@ -system-config-date-1.8.96.tar.bz2 +system-config-date-1.9.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 25 Apr 2007 12:36:51 -0000 1.63 +++ sources 2 May 2007 14:20:20 -0000 1.64 @@ -1 +1 @@ -81e2dc017d862d850038554d2d6618e6 system-config-date-1.8.96.tar.bz2 +475699b9b31ec80d1cf8fd34c8882e40 system-config-date-1.9.0.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- system-config-date.spec 25 Apr 2007 12:36:51 -0000 1.68 +++ system-config-date.spec 2 May 2007 14:20:20 -0000 1.69 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.8.96 +Version: 1.9.0 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/date License: GPL @@ -96,6 +96,17 @@ %config(noreplace) %{_sysconfdir}/ntp/ntpservers %changelog +* Wed May 02 2007 Nils Philippsen 1.9.0 +- pick up updated translations (#237930) + +* Sat Apr 28 2007 Nils Philippsen +- don't use underscore in default timezone in textmode tool + +* Fri Apr 27 2007 Nils Philippsen +- add scrollbars to timezone canvas (#230690) +- scroll to city selected via treeview +- don't resize window due to excessively long comments of cities + * Wed Apr 25 2007 Nils Philippsen 1.8.96 - handle missing /etc/ntp.conf gracefully (#237777) - versionize obsoletes From fedora-cvs-commits at redhat.com Wed May 2 14:33:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 10:33:50 -0400 Subject: rpms/kernel/FC-6 mac80211.patch,1.1.12.1,1.1.12.2 Message-ID: <200705021433.l42EXoas025147@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25078 Modified Files: Tag: private-linville-netdev-fc6-11-branch mac80211.patch Log Message: mac80211.patch: CREDITS | 37 MAINTAINERS | 69 drivers/Kconfig | 2 drivers/Makefile | 1 drivers/base/core.c | 1 drivers/misc/Kconfig | 6 drivers/misc/Makefile | 1 drivers/misc/eeprom_93cx6.c | 347 + drivers/net/Makefile | 2 drivers/net/wireless/Kconfig | 120 drivers/net/wireless/Makefile | 3 drivers/net/wireless/bcm43xx/Kconfig | 4 drivers/net/wireless/hostap/Kconfig | 3 drivers/net/wireless/mac80211/Kconfig | 6 drivers/net/wireless/mac80211/Makefile | 6 drivers/net/wireless/mac80211/README | 2 drivers/net/wireless/mac80211/adm8211/Kconfig | 25 drivers/net/wireless/mac80211/adm8211/Makefile | 1 drivers/net/wireless/mac80211/adm8211/adm8211.c | 2172 ++++++ drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 + drivers/net/wireless/mac80211/bcm43xx/Kconfig | 101 drivers/net/wireless/mac80211/bcm43xx/Makefile | 18 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 885 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1383 ++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1110 +++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 92 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 4029 ++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4286 +++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 309 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 603 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 250 drivers/net/wireless/mac80211/p54/Kconfig | 10 drivers/net/wireless/mac80211/p54/Makefile | 4 drivers/net/wireless/mac80211/p54/net2280.h | 452 + drivers/net/wireless/mac80211/p54/prism54.h | 77 drivers/net/wireless/mac80211/p54/prism54common.c | 821 ++ drivers/net/wireless/mac80211/p54/prism54common.h | 328 + drivers/net/wireless/mac80211/p54/prism54magic.h | 77 drivers/net/wireless/mac80211/p54/prism54pci.c | 700 ++ drivers/net/wireless/mac80211/p54/prism54pci.h | 106 drivers/net/wireless/mac80211/p54/prism54usb.c | 946 ++ drivers/net/wireless/mac80211/p54/prism54usb.h | 133 drivers/net/wireless/mac80211/rt2x00/Kconfig | 99 drivers/net/wireless/mac80211/rt2x00/Makefile | 14 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 1769 +++++ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 918 ++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 1951 ++++++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1185 +++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 1729 +++++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 738 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1057 +++ drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c | 353 + drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h | 72 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c | 831 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h | 128 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c | 426 + drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c | 587 + drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 83 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c | 637 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 120 drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 2332 +++++++ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1348 ++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 1966 ++++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 937 ++ drivers/net/wireless/mac80211/rtl818x/Kconfig | 9 drivers/net/wireless/mac80211/rtl818x/Makefile | 2 drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 726 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 747 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 30 drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 180 drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19 drivers/net/wireless/mac80211/zd1211rw/Makefile | 11 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1679 +++++ drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 910 ++ drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 700 ++ drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 250 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 170 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 80 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 436 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 491 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1337 ++++ drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 241 drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82 drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29 drivers/net/wireless/zd1211rw/Kconfig | 4 drivers/ssb/Kconfig | 93 drivers/ssb/Makefile | 11 drivers/ssb/driver_chipcommon.c | 402 + drivers/ssb/driver_mipscore.c | 258 drivers/ssb/driver_pcicore.c | 556 + drivers/ssb/main.c | 1047 +++ drivers/ssb/pci.c | 672 ++ drivers/ssb/pcihost_wrapper.c | 104 drivers/ssb/pcmcia.c | 256 drivers/ssb/scan.c | 407 + drivers/ssb/ssb_private.h | 151 drivers/usb/host/Kconfig | 13 drivers/usb/host/ohci-hcd.c | 6 drivers/usb/host/ohci-ssb.c | 254 include/linux/Kbuild | 1 include/linux/crc-itu-t.h | 27 include/linux/eeprom_93cx6.h | 77 include/linux/ieee80211.h | 403 + include/linux/netdevice.h | 4 include/linux/nl80211.h | 301 include/linux/ssb/ssb.h | 403 + include/linux/ssb/ssb_driver_chipcommon.h | 387 + include/linux/ssb/ssb_driver_extif.h | 163 include/linux/ssb/ssb_driver_mips.h | 47 include/linux/ssb/ssb_driver_pci.h | 108 include/linux/ssb/ssb_regs.h | 294 include/linux/wireless.h | 11 include/net/cfg80211.h | 154 include/net/iw_handler.h | 13 include/net/mac80211.h | 1060 +++ include/net/wext.h | 24 include/net/wireless.h | 139 lib/Kconfig | 8 lib/Makefile | 1 lib/crc-itu-t.c | 64 net/Kconfig | 12 net/Makefile | 4 net/core/Makefile | 1 net/core/dev.c | 34 net/core/rtnetlink.c | 30 net/core/wireless.c | 2369 ------- net/ieee80211/Kconfig | 3 net/mac80211/Kconfig | 81 net/mac80211/Makefile | 20 net/mac80211/aes_ccm.c | 155 net/mac80211/aes_ccm.h | 26 net/mac80211/debugfs.c | 433 + net/mac80211/debugfs.h | 16 net/mac80211/debugfs_key.c | 253 net/mac80211/debugfs_key.h | 34 net/mac80211/debugfs_netdev.c | 440 + net/mac80211/debugfs_netdev.h | 30 net/mac80211/debugfs_sta.c | 247 net/mac80211/debugfs_sta.h | 12 net/mac80211/hostapd_ioctl.h | 344 + net/mac80211/ieee80211.c | 5095 ++++++++++++++++ net/mac80211/ieee80211_cfg.c | 72 net/mac80211/ieee80211_cfg.h | 9 net/mac80211/ieee80211_common.h | 98 net/mac80211/ieee80211_i.h | 812 ++ net/mac80211/ieee80211_iface.c | 353 + net/mac80211/ieee80211_ioctl.c | 3180 +++++++++ net/mac80211/ieee80211_key.h | 106 net/mac80211/ieee80211_led.c | 91 net/mac80211/ieee80211_led.h | 32 net/mac80211/ieee80211_rate.c | 140 net/mac80211/ieee80211_rate.h | 144 net/mac80211/ieee80211_sta.c | 3217 ++++++++++ net/mac80211/michael.c | 104 net/mac80211/michael.h | 20 net/mac80211/rc80211_simple.c | 432 + net/mac80211/sta_info.c | 464 + net/mac80211/sta_info.h | 167 net/mac80211/tkip.c | 341 + net/mac80211/tkip.h | 36 net/mac80211/wep.c | 328 + net/mac80211/wep.h | 40 net/mac80211/wme.c | 688 ++ net/mac80211/wme.h | 39 net/mac80211/wpa.c | 846 ++ net/mac80211/wpa.h | 31 net/wireless/Kconfig | 31 net/wireless/Makefile | 5 net/wireless/core.c | 367 + net/wireless/core.h | 81 net/wireless/nl80211.c | 993 +++ net/wireless/nl80211.h | 24 net/wireless/sysfs.c | 130 net/wireless/sysfs.h | 9 net/wireless/wext.c | 1509 ++++ 195 files changed, 81275 insertions(+), 2524 deletions(-) Index: mac80211.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/Attic/mac80211.patch,v retrieving revision 1.1.12.1 retrieving revision 1.1.12.2 diff -u -r1.1.12.1 -r1.1.12.2 --- mac80211.patch 2 May 2007 02:47:26 -0000 1.1.12.1 +++ mac80211.patch 2 May 2007 14:33:47 -0000 1.1.12.2 @@ -1,5 +1,5 @@ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/net/wireless.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/net/wireless.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,139 @@ +#ifndef __NET_WIRELESS_H +#define __NET_WIRELESS_H @@ -141,7 +141,7 @@ + +#endif /* __NET_WIRELESS_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/net/mac80211.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/net/mac80211.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,1060 @@ +/* + * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface @@ -1204,7 +1204,7 @@ + +#endif /* MAC80211_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/net/cfg80211.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/net/cfg80211.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,154 @@ +#ifndef __NET_CFG80211_H +#define __NET_CFG80211_H @@ -1361,7 +1361,7 @@ + +#endif /* __NET_CFG80211_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/net/wext.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/net/wext.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,24 @@ +#ifndef __NET_WEXT_H +#define __NET_WEXT_H @@ -1387,8 +1387,8 @@ +#endif + +#endif /* __NET_WEXT_H */ ---- linux-2.6.20.noarch/include/net/iw_handler.h.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/include/net/iw_handler.h 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/include/net/iw_handler.h.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/include/net/iw_handler.h 2007-05-02 10:32:13.000000000 -0400 @@ -437,19 +437,6 @@ struct iw_public_data { extern int dev_get_wireless_info(char * buffer, char **start, off_t offset, int length); @@ -1410,7 +1410,7 @@ /* Send a single event to user space */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/linux/nl80211.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/nl80211.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,301 @@ +#ifndef __LINUX_NL80211_H +#define __LINUX_NL80211_H @@ -1713,8 +1713,8 @@ +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1) + +#endif /* __LINUX_NL80211_H */ ---- linux-2.6.20.noarch/include/linux/netdevice.h.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/include/linux/netdevice.h 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/include/linux/netdevice.h.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/netdevice.h 2007-05-02 10:32:13.000000000 -0400 @@ -42,6 +42,8 @@ struct vlan_group; struct ethtool_ops; @@ -1733,8 +1733,8 @@ /* * Cache line mostly used on receive path (including eth_type_trans()) ---- linux-2.6.20.noarch/include/linux/wireless.h.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/include/linux/wireless.h 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/include/linux/wireless.h.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/wireless.h 2007-05-02 10:32:13.000000000 -0400 @@ -1100,4 +1100,15 @@ struct iw_event #define IW_EV_QUAL_PK_LEN (IW_EV_LCP_PK_LEN + sizeof(struct iw_quality)) #define IW_EV_POINT_PK_LEN (IW_EV_LCP_LEN + 4) @@ -1752,7 +1752,7 @@ + #endif /* _LINUX_WIRELESS_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/linux/eeprom_93cx6.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/eeprom_93cx6.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,77 @@ +/* + Copyright (C) 2004 - 2006 rt2x00 SourceForge Project @@ -1832,7 +1832,7 @@ +extern void eeprom_93cx6_multiwrite(struct eeprom_93cx6 *eeprom, + const u8 word, __le16 *data, const u16 words); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/linux/ieee80211.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/ieee80211.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,403 @@ +/* + * IEEE 802.11 defines @@ -2238,7 +2238,7 @@ + +#endif /* IEEE80211_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/linux/crc-itu-t.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/crc-itu-t.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,27 @@ +/* + * crc-itu-t.h - CRC ITU-T V.41 routine @@ -2267,8 +2267,8 @@ +} + +#endif /* CRC_ITU_T_H */ ---- linux-2.6.20.noarch/include/linux/Kbuild.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/include/linux/Kbuild 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/include/linux/Kbuild.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/Kbuild 2007-05-02 10:32:13.000000000 -0400 @@ -115,6 +115,7 @@ header-y += netrom.h header-y += nfs2.h header-y += nfs4_mount.h @@ -2278,7 +2278,7 @@ header-y += param.h header-y += pci_regs.h --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/linux/ssb/ssb_driver_extif.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/ssb/ssb_driver_extif.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,163 @@ +/* + * Hardware-specific External Interface I/O core definitions @@ -2444,7 +2444,7 @@ +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_EXTIFCORE_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/linux/ssb/ssb.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/ssb/ssb.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,403 @@ +#ifndef LINUX_SSB_H_ +#define LINUX_SSB_H_ @@ -2850,7 +2850,7 @@ +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/linux/ssb/ssb_driver_pci.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/ssb/ssb_driver_pci.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,108 @@ +#ifndef LINUX_SSB_PCICORE_H_ +#define LINUX_SSB_PCICORE_H_ @@ -2961,7 +2961,7 @@ +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_PCICORE_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/linux/ssb/ssb_regs.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/ssb/ssb_regs.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,294 @@ +#ifndef LINUX_SSB_REGS_H_ +#define LINUX_SSB_REGS_H_ @@ -3258,7 +3258,7 @@ +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_REGS_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/linux/ssb/ssb_driver_mips.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/ssb/ssb_driver_mips.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,47 @@ +#ifndef LINUX_SSB_MIPSCORE_H_ +#define LINUX_SSB_MIPSCORE_H_ @@ -3308,7 +3308,7 @@ +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_MIPSCORE_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,387 @@ +#ifndef LINUX_SSB_CHIPCO_H_ +#define LINUX_SSB_CHIPCO_H_ @@ -3697,8 +3697,8 @@ + +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_CHIPCO_H_ */ ---- linux-2.6.20.noarch/CREDITS.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/CREDITS 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/CREDITS.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/CREDITS 2007-05-02 10:32:13.000000000 -0400 @@ -317,6 +317,12 @@ S: 2322 37th Ave SW S: Seattle, Washington 98126-2010 S: USA @@ -3778,8 +3778,8 @@ N: Lars Wirzenius E: liw at iki.fi D: Linux System Administrator's Guide, author, former maintainer ---- linux-2.6.20.noarch/MAINTAINERS.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/MAINTAINERS 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/MAINTAINERS.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/MAINTAINERS 2007-05-02 10:32:13.000000000 -0400 @@ -268,6 +268,14 @@ M: khali at linux-fr.org L: lm-sensors at lm-sensors.org S: Maintained @@ -3962,15 +3962,25 @@ L: zd1211-devs at lists.sourceforge.net (subscribers-only) S: Maintained ---- linux-2.6.20.noarch/drivers/misc/Makefile.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/misc/Makefile 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/base/core.c.orig 2007-05-02 10:32:38.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/base/core.c 2007-05-02 10:32:55.000000000 -0400 +@@ -956,6 +956,7 @@ int device_rename(struct device *dev, ch + + return error; + } ++EXPORT_SYMBOL_GPL(device_rename); + + + static int device_move_class_links(struct device *dev, +--- linux-2.6.20.noarch/drivers/misc/Makefile.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/misc/Makefile 2007-05-02 10:32:13.000000000 -0400 @@ -10,3 +10,4 @@ obj-$(CONFIG_LKDTM) += lkdtm.o obj-$(CONFIG_TIFM_CORE) += tifm_core.o obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o obj-$(CONFIG_SGI_IOC4) += ioc4.o +obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/misc/eeprom_93cx6.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/misc/eeprom_93cx6.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,347 @@ +/* + Copyright (C) 2004 - 2006 rt2x00 SourceForge Project @@ -4319,8 +4329,8 @@ + eeprom_93cx6_write(eeprom, word + i, le16_to_cpu(data[i])); +} +EXPORT_SYMBOL_GPL(eeprom_93cx6_multiwrite); ---- linux-2.6.20.noarch/drivers/misc/Kconfig.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/misc/Kconfig 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/misc/Kconfig.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/misc/Kconfig 2007-05-02 10:32:13.000000000 -0400 @@ -88,4 +88,10 @@ config MSI_LAPTOP If you have an MSI S270 laptop, say Y or M here. @@ -4332,15 +4342,15 @@ + The driver supports both read as well as write commands. + endmenu ---- linux-2.6.20.noarch/drivers/Makefile.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/Makefile 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/Makefile.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/Makefile 2007-05-02 10:32:13.000000000 -0400 @@ -81,3 +81,4 @@ obj-$(CONFIG_GENERIC_TIME) += clocksourc obj-$(CONFIG_DMA_ENGINE) += dma/ obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/ +obj-$(CONFIG_SSB) += ssb/ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/usb/host/ohci-ssb.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/usb/host/ohci-ssb.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,254 @@ +/* + * Sonics Silicon Backplane @@ -4596,8 +4606,8 @@ + .suspend = ssb_ohci_suspend, + .resume = ssb_ohci_resume, +}; ---- linux-2.6.20.noarch/drivers/usb/host/Kconfig.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/usb/host/Kconfig 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/usb/host/Kconfig.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/usb/host/Kconfig 2007-05-02 10:32:13.000000000 -0400 @@ -115,6 +115,19 @@ config USB_OHCI_HCD_PCI Enables support for PCI-bus plug-in USB controller cards. If unsure, say Y. @@ -4618,8 +4628,8 @@ config USB_OHCI_BIG_ENDIAN bool depends on USB_OHCI_HCD ---- linux-2.6.20.noarch/drivers/usb/host/ohci-hcd.c.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/usb/host/ohci-hcd.c 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/usb/host/ohci-hcd.c.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/usb/host/ohci-hcd.c 2007-05-02 10:32:13.000000000 -0400 @@ -901,6 +901,11 @@ MODULE_LICENSE ("GPL"); #include "ohci-pnx4008.c" #endif @@ -4640,8 +4650,8 @@ ) #error "missing bus glue for ohci-hcd" #endif ---- linux-2.6.20.noarch/drivers/Kconfig.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/Kconfig 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/Kconfig.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/Kconfig 2007-05-02 10:32:13.000000000 -0400 @@ -56,6 +56,8 @@ source "drivers/w1/Kconfig" source "drivers/hwmon/Kconfig" @@ -4652,7 +4662,7 @@ source "drivers/media/Kconfig" --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/scan.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/scan.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,407 @@ +/* + * Sonics Silicon Backplane @@ -5062,7 +5072,7 @@ + goto out; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/main.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/main.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,1047 @@ +/* + * Sonics Silicon Backplane @@ -6112,7 +6122,7 @@ +} +module_exit(ssb_modexit) --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/pcihost_wrapper.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/pcihost_wrapper.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,104 @@ +/* + * Sonics Silicon Backplane @@ -6219,7 +6229,7 @@ +} +EXPORT_SYMBOL(ssb_pcihost_register); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/Makefile 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/Makefile 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,11 @@ +ssb-builtin-drivers-y += driver_chipcommon.o +ssb-builtin-drivers-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o @@ -6233,7 +6243,7 @@ +ssb-objs := main.o scan.o \ + $(ssb-hostsupport-y) $(ssb-builtin-drivers-y) --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/pcmcia.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/pcmcia.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,256 @@ +/* + * Sonics Silicon Backplane @@ -6492,7 +6502,7 @@ + return -ENODEV; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/driver_chipcommon.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/driver_chipcommon.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,402 @@ +/* + * Sonics Silicon Backplane @@ -6897,7 +6907,7 @@ +} +#endif /* CONFIG_SSB_SERIAL */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/Kconfig 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/Kconfig 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,93 @@ +menu "Sonics Silicon Backplane" + @@ -6993,7 +7003,7 @@ + +endmenu --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/driver_pcicore.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/driver_pcicore.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,556 @@ +/* + * Sonics Silicon Backplane @@ -7552,7 +7562,7 @@ +} +EXPORT_SYMBOL(ssb_pcicore_dev_irqvecs_enable); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/driver_mipscore.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/driver_mipscore.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,258 @@ +/* + * Sonics Silicon Backplane @@ -7813,7 +7823,7 @@ + ssb_mips_flash_detect(mcore); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/ssb_private.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/ssb_private.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,151 @@ +#ifndef LINUX_SSB_PRIVATE_H_ +#define LINUX_SSB_PRIVATE_H_ @@ -7967,7 +7977,7 @@ + +#endif /* LINUX_SSB_PRIVATE_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/ssb/pci.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/ssb/pci.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,672 @@ +/* + * Sonics Silicon Backplane PCI-Hostbus related functions. @@ -8641,8 +8651,8 @@ + device_remove_file(&pdev->dev, &dev_attr_ssb_sprom); + return err; +} ---- linux-2.6.20.noarch/drivers/net/Makefile.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/Makefile 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/net/Makefile.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/Makefile 2007-05-02 10:32:13.000000000 -0400 @@ -206,7 +206,7 @@ obj-$(CONFIG_TR) += tokenring/ obj-$(CONFIG_WAN) += wan/ obj-$(CONFIG_ARCNET) += arcnet/ @@ -8652,8 +8662,8 @@ obj-$(CONFIG_NET_TULIP) += tulip/ obj-$(CONFIG_HAMRADIO) += hamradio/ obj-$(CONFIG_IRDA) += irda/ ---- linux-2.6.20.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/net/wireless/bcm43xx/Kconfig.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/bcm43xx/Kconfig 2007-05-02 10:32:13.000000000 -0400 @@ -1,6 +1,8 @@ config BCM43XX tristate "Broadcom BCM43xx wireless support" @@ -8664,8 +8674,8 @@ select FW_LOADER select HW_RANDOM ---help--- ---- linux-2.6.20.noarch/drivers/net/wireless/Makefile.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/Makefile 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/net/wireless/Makefile.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/Makefile 2007-05-02 10:32:13.000000000 -0400 @@ -46,3 +46,6 @@ obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs obj-$(CONFIG_USB_ZD1201) += zd1201.o @@ -8673,8 +8683,8 @@ + +# Drivers using Devicescape IEEE 802.11 stack (net/mac80211) +obj-y += mac80211/ ---- linux-2.6.20.noarch/drivers/net/wireless/hostap/Kconfig.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/hostap/Kconfig 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/net/wireless/hostap/Kconfig.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/hostap/Kconfig 2007-05-02 10:32:13.000000000 -0400 @@ -1,6 +1,7 @@ config HOSTAP tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)" @@ -8684,8 +8694,8 @@ select IEEE80211 select IEEE80211_CRYPT_WEP ---help--- ---- linux-2.6.20.noarch/drivers/net/wireless/Kconfig.orig 2007-05-01 22:37:17.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/Kconfig 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/net/wireless/Kconfig.orig 2007-05-02 10:31:59.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/Kconfig 2007-05-02 10:32:13.000000000 -0400 @@ -2,47 +2,21 @@ # Wireless LAN device configuration # @@ -8952,7 +8962,7 @@ endmenu - --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,885 @@ +#ifndef BCM43xx_H_ +#define BCM43xx_H_ @@ -9840,7 +9850,7 @@ + +#endif /* BCM43xx_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,376 @@ +/* + @@ -10219,7 +10229,7 @@ + bcm43xx_phy_write(dev, BCM43xx_PHY_GTABDATA, value); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,1110 @@ +/* + @@ -11332,7 +11342,7 @@ + bcm43xx_loctl_current(dev)->used = 1; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,56 @@ +#ifndef BCM43xx_LEDS_H_ +#define BCM43xx_LEDS_H_ @@ -11391,7 +11401,7 @@ + +#endif /* BCM43xx_LEDS_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/Makefile 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/Makefile 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,18 @@ +obj-$(CONFIG_BCM43XX_MAC80211) += bcm43xx-mac80211.o + @@ -11412,7 +11422,7 @@ + bcm43xx_lo.o \ + $(bcm43xx-mac80211-obj-y) --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,41 @@ +/* + @@ -11456,7 +11466,7 @@ + +#endif /* BCM43xx_POWER_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,170 @@ +#ifndef BCM43xx_PIO_H_ +#define BCM43xx_PIO_H_ @@ -11629,7 +11639,7 @@ +#endif /* CONFIG_BCM43XX_MAC80211_PIO */ +#endif /* BCM43xx_PIO_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,1383 @@ +/* + @@ -13015,7 +13025,7 @@ + bcm43xx_power_saving_ctl_bits(ring->dev, -1, -1); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,433 @@ +/* + @@ -13451,7 +13461,7 @@ + printk("\n"); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,163 @@ +/* + @@ -13617,7 +13627,7 @@ + pcmcia_unregister_driver(&bcm43xx_pcmcia_driver); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,4029 @@ +/* + @@ -17649,7 +17659,7 @@ +module_init(bcm43xx_init) +module_exit(bcm43xx_exit) --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,232 @@ +/* + @@ -17884,7 +17894,7 @@ + device_remove_file(dev, &dev_attr_interference); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,28 @@ +#ifndef BCM43xx_TABLES_H_ +#define BCM43xx_TABLES_H_ @@ -17915,7 +17925,7 @@ + +#endif /* BCM43xx_TABLES_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,92 @@ +#ifndef BCM43xx_LO_H_ +#define BCM43xx_LO_H_ @@ -18010,7 +18020,7 @@ + +#endif /* BCM43xx_LO_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/Kconfig 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/Kconfig 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,101 @@ +config BCM43XX_MAC80211 + tristate "Broadcom BCM43xx wireless support (mac80211 stack)" @@ -18114,7 +18124,7 @@ + +endchoice --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,82 @@ +/* + @@ -18199,7 +18209,7 @@ + } +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,671 @@ +/* + @@ -18873,7 +18883,7 @@ + tasklet_schedule(&pio->queue3->txtask); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,156 @@ +/* + @@ -19032,7 +19042,7 @@ + +#endif /* BCM43xx_MAIN_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,309 @@ +#ifndef BCM43xx_PHY_H_ +#define BCM43xx_PHY_H_ @@ -19344,7 +19354,7 @@ + +#endif /* BCM43xx_PHY_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,250 @@ +#ifndef BCM43xx_XMIT_H_ +#define BCM43xx_XMIT_H_ @@ -19597,7 +19607,7 @@ + +#endif /* BCM43xx_XMIT_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,22 @@ +#ifndef BCM43xx_PCMCIA_H_ +#define BCM43xx_PCMCIA_H_ @@ -19622,7 +19632,7 @@ +#endif /* CONFIG_BCM43XX_MAC80211_PCMCIA */ +#endif /* BCM43xx_PCMCIA_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,300 @@ +/* + @@ -19925,7 +19935,7 @@ + spin_unlock_irqrestore(&dev->wl->leds_lock, flags); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,4286 @@ +/* + @@ -24214,7 +24224,7 @@ + dprintk(KERN_INFO PFX "Radio turned off\n"); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef BCM43xx_SYSFS_H_ +#define BCM43xx_SYSFS_H_ @@ -24226,7 +24236,7 @@ + +#endif /* BCM43xx_SYSFS_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,361 @@ +#ifndef BCM43xx_DMA_H_ +#define BCM43xx_DMA_H_ @@ -24590,7 +24600,7 @@ +#endif /* CONFIG_BCM43XX_MAC80211_DMA */ +#endif /* BCM43xx_DMA_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,603 @@ +/* + @@ -25196,7 +25206,7 @@ + bcm43xx_handle_txstatus(dev, &status); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,110 @@ +#ifndef BCM43xx_DEBUGFS_H_ +#define BCM43xx_DEBUGFS_H_ @@ -25309,12 +25319,12 @@ + +#endif /* BCM43xx_DEBUGFS_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/README 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/README 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,2 @@ +This directory contains IEEE 802.11 wireless LAN drivers that are using +Devicescape IEEE 802.11 stack (net/mac80211). --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Makefile 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,6 @@ +obj-$(CONFIG_BCM43XX_MAC80211) += bcm43xx/ +obj-$(CONFIG_RT2X00) += rt2x00/ @@ -25323,7 +25333,7 @@ +obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/ +obj-$(CONFIG_RTL818X) += rtl818x/ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/rtl818x.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/rtl818x.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,180 @@ +#ifndef RTL818X_H +#define RTL818X_H @@ -25506,12 +25516,12 @@ + +#endif /* RTL818X_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/Makefile 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/Makefile 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,2 @@ +rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o +obj-$(CONFIG_RTL8187) += rtl8187.o --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,30 @@ +#ifndef RTL8187_RTL8225_H +#define RTL8187_RTL8225_H @@ -25544,7 +25554,7 @@ + +#endif /* RTL8187_RTL8225_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/Kconfig 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/Kconfig 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,9 @@ +config RTL818X + bool @@ -25556,7 +25566,7 @@ + select RTL818X + select EEPROM_93CX6 --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,747 @@ + +/* @@ -26306,7 +26316,7 @@ + + --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/rtl8187.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/rtl8187.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,126 @@ +#ifndef RTL8187_H +#define RTL8187_H @@ -26435,7 +26445,7 @@ + +#endif /* RTL8187_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,726 @@ + +/* @@ -27164,7 +27174,7 @@ +module_init(rtl8187_init); +module_exit(rtl8187_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,1185 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28352,7 +28362,7 @@ + +#endif /* RT2500PCI_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h 2007-05-02 10:32:13.000000000 -0400 @@ -0,0 +1,120 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -28475,7 +28485,7 @@ + +#endif /* RT2X00USB_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,1729 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -30207,7 +30217,7 @@ +module_init(rt2500usb_init); +module_exit(rt2500usb_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,1057 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -31267,7 +31277,7 @@ + +#endif /* RT2X00_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,1348 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -32618,7 +32628,7 @@ + +#endif /* RT61PCI_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,128 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -32749,7 +32759,7 @@ + +#endif /* RT2X00LIB_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/Makefile 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/Makefile 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,14 @@ +rt2x00lib-objs := rt2x00dev.o rt2x00mac.o + @@ -32766,7 +32776,7 @@ +obj-$(CONFIG_RT2500USB) += rt2500usb.o +obj-$(CONFIG_RT73USB) += rt73usb.o --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,83 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -32852,7 +32862,7 @@ + +#endif /* RT2X00PCI_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,587 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -33442,7 +33452,7 @@ +module_init(rt2x00pci_init); +module_exit(rt2x00pci_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,637 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -34082,7 +34092,7 @@ +module_init(rt2x00usb_init); +module_exit(rt2x00usb_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500pci.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,1951 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -36036,7 +36046,7 @@ +module_init(rt2500pci_init); +module_exit(rt2500pci_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2500usb.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,738 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -36777,7 +36787,7 @@ + +#endif /* RT2500USB_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/Kconfig 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,99 @@ +config RT2X00 + tristate "Ralink driver support" @@ -36879,7 +36889,7 @@ + ---help--- + Enable debugging output for all rt2x00 modules --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt61pci.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,2332 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -39214,7 +39224,7 @@ +module_init(rt61pci_init); +module_exit(rt61pci_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,937 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -40154,7 +40164,7 @@ + +#endif /* RT73USB_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,918 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -41075,7 +41085,7 @@ + +#endif /* RT2400PCI_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt73usb.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,1966 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -43044,7 +43054,7 @@ +module_init(rt73usb_init); +module_exit(rt73usb_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,353 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -43400,7 +43410,7 @@ + kfree(intf); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,831 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -44234,7 +44244,7 @@ +module_init(rt2x00lib_init); +module_exit(rt2x00lib_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2400pci.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,1769 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -46006,7 +46016,7 @@ +module_init(rt2400pci_init); +module_exit(rt2400pci_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,72 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -46081,7 +46091,7 @@ + +#endif /* RT2X00DEBUG_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,426 @@ +/* + Copyright (C) 2004 - 2007 rt2x00 SourceForge Project @@ -46510,7 +46520,7 @@ +} +EXPORT_SYMBOL_GPL(rt2x00lib_conf_tx); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,6 @@ +source "drivers/net/wireless/mac80211/bcm43xx/Kconfig" +source "drivers/net/wireless/mac80211/rt2x00/Kconfig" @@ -46519,7 +46529,7 @@ +source "drivers/net/wireless/mac80211/zd1211rw/Kconfig" +source "drivers/net/wireless/mac80211/rtl818x/Kconfig" --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54usb.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54usb.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,946 @@ + +/* @@ -47468,7 +47478,7 @@ +module_init(p54u_init); +module_exit(p54u_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/net2280.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/net2280.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,452 @@ +#ifndef NET2280_H +#define NET2280_H @@ -47923,14 +47933,14 @@ +} __attribute__ ((packed)); +#endif /* NET2280_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/Makefile 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/Makefile 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,4 @@ +obj-$(CONFIG_P54_COMMON) += prism54common.o +obj-$(CONFIG_P54_USB) += prism54usb.o +obj-$(CONFIG_P54_PCI) += prism54pci.o + --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54usb.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54usb.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,133 @@ +#ifndef PRISM54USB_H +#define PRISM54USB_H @@ -48066,7 +48076,7 @@ + +#endif /* PRISM54USB_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54common.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54common.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,821 @@ + +/* @@ -48890,7 +48900,7 @@ +module_init(p54_init); +module_exit(p54_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54common.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54common.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,328 @@ +#ifndef PRISM54COMMON_H +#define PRISM54COMMON_H @@ -49221,7 +49231,7 @@ + +#endif /* PRISM54COMMON_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/Kconfig 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,10 @@ +config P54_COMMON + tristate "Softmac Prism54 support" @@ -49234,7 +49244,7 @@ + tristate "Prism54 PCI support" + depends on P54_COMMON && PCI --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54pci.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54pci.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,106 @@ +#ifndef PRISM54PCI_H +#define PRISM54PCI_H @@ -49343,7 +49353,7 @@ +#endif /* PRISM54USB_H */ +#endif /* PRISM54PCI_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54magic.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54magic.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,77 @@ +#ifndef PRISM54MAGIC_H +#define PRISM54MAGIC_H @@ -49423,7 +49433,7 @@ + +#endif /* PRISM54MAGIC_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,77 @@ +#ifndef PRISM54_H +#define PRISM54_H @@ -49503,7 +49513,7 @@ + +#endif /* PRISM54_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54pci.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/p54/prism54pci.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,700 @@ + +/* @@ -50206,7 +50216,7 @@ +module_init(p54p_init); +module_exit(p54p_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,436 @@ +/* zd_rf_al2230.c: Functions for the AL2230 RF controller + * @@ -50645,7 +50655,7 @@ + return 0; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,910 @@ +/* zd_chip.h + * @@ -51558,7 +51568,7 @@ + +#endif /* _ZD_CHIP_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,700 @@ +/* zd_mac.c + * @@ -52261,7 +52271,7 @@ + zd_chip_control_leds(&mac->chip, LED_OFF); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/Makefile 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/Makefile 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,11 @@ +obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw-mac80211.o + @@ -52275,7 +52285,7 @@ +endif + --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_chip.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,1679 @@ +/* zd_chip.c + * @@ -53957,7 +53967,7 @@ + return zd_iowrite32a(chip, ioreqs, ARRAY_SIZE(ioreqs)); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,491 @@ +/* zd_rf_al7230b.c: Functions for the AL7230B RF controller + * @@ -54451,7 +54461,7 @@ + return 0; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,170 @@ +/* zd_rf.c + * @@ -54624,7 +54634,7 @@ +} + --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,1337 @@ +/* zd_usb.c + * @@ -55964,7 +55974,7 @@ + return r; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_def.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_def.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,57 @@ +/* zd_def.h + * @@ -56024,7 +56034,7 @@ + +#endif /* _ZD_DEF_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/Kconfig 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,19 @@ +config ZD1211RW_MAC80211 + tristate "ZyDAS ZD1211/ZD1211B USB support (mac80211 stack)" @@ -56046,7 +56056,7 @@ + problems. + --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,80 @@ +/* zd_rf.h + * @@ -56129,7 +56139,7 @@ + +#endif /* _ZD_RF_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_usb.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,241 @@ +/* zd_usb.h: Header for USB interface implemented by ZD1211 chip + * @@ -56373,7 +56383,7 @@ + +#endif /* _ZD_USB_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,279 @@ +/* zd_rf_rfmd.c: Functions for the RFMD RF controller + * @@ -56655,7 +56665,7 @@ + return 0; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,67 @@ +#ifndef _ZD_IEEE80211_H +#define _ZD_IEEE80211_H @@ -56725,7 +56735,7 @@ + +#endif /* _ZD_IEEE80211_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,29 @@ +/* zd_util.h + * @@ -56757,7 +56767,7 @@ + +#endif /* _ZD_UTIL_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_mac.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,250 @@ +/* zd_mac.h + * @@ -57010,7 +57020,7 @@ + +#endif /* _ZD_MAC_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/zd1211rw/zd_util.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,82 @@ +/* zd_util.c + * @@ -57095,7 +57105,7 @@ + return (u8 *)buffer + (buffer_size - tail_size); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,2172 @@ + +/* @@ -59270,11 +59280,11 @@ +module_init(adm8211_init); +module_exit(adm8211_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/adm8211/Makefile 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/adm8211/Makefile 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1 @@ +obj-$(CONFIG_ADM8211) += adm8211.o --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/adm8211/Kconfig 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/adm8211/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,25 @@ +config ADM8211 + tristate "ADMtek ADM8211 support" @@ -59302,7 +59312,7 @@ + + Thanks to Infineon-ADMtek for their support of this driver. --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/adm8211/adm8211.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,622 @@ +#ifndef ADM8211_H +#define ADM8211_H @@ -59926,8 +59936,8 @@ +}; + +#endif /* ADM8211_H */ ---- linux-2.6.20.noarch/drivers/net/wireless/zd1211rw/Kconfig.orig 2007-05-01 22:37:18.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/zd1211rw/Kconfig 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/drivers/net/wireless/zd1211rw/Kconfig.orig 2007-05-02 10:32:00.000000000 -0400 ++++ linux-2.6.20.noarch/drivers/net/wireless/zd1211rw/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -1,6 +1,8 @@ config ZD1211RW tristate "ZyDAS ZD1211/ZD1211B USB-wireless support" @@ -59938,8 +59948,8 @@ select FW_LOADER ---help--- This is an experimental driver for the ZyDAS ZD1211/ZD1211B wireless ---- linux-2.6.20.noarch/lib/Makefile.orig 2007-05-01 22:37:18.000000000 -0400 -+++ linux-2.6.20.noarch/lib/Makefile 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/lib/Makefile.orig 2007-05-02 10:32:00.000000000 -0400 ++++ linux-2.6.20.noarch/lib/Makefile 2007-05-02 10:32:14.000000000 -0400 @@ -40,6 +40,7 @@ obj-$(CONFIG_BITREVERSE) += bitrev.o obj-$(CONFIG_CRC_CCITT) += crc-ccitt.o obj-$(CONFIG_CRC16) += crc16.o @@ -59948,8 +59958,8 @@ obj-$(CONFIG_LIBCRC32C) += libcrc32c.o obj-$(CONFIG_GENERIC_IOMAP) += iomap.o obj-$(CONFIG_GENERIC_ALLOCATOR) += genalloc.o ---- linux-2.6.20.noarch/lib/Kconfig.orig 2007-05-01 22:37:18.000000000 -0400 -+++ linux-2.6.20.noarch/lib/Kconfig 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/lib/Kconfig.orig 2007-05-02 10:32:00.000000000 -0400 ++++ linux-2.6.20.noarch/lib/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -33,6 +33,14 @@ config CRC32 kernel tree does. Such modules that use library CRC32 functions require M here. @@ -59966,7 +59976,7 @@ tristate "CRC32c (Castagnoli, et al) Cyclic Redundancy-Check" help --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/lib/crc-itu-t.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/lib/crc-itu-t.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,64 @@ +/* + * crc-itu-t.c @@ -60032,8 +60042,8 @@ + +MODULE_DESCRIPTION("CRC ITU-T V.41 calculations"); +MODULE_LICENSE("GPL"); ---- linux-2.6.20.noarch/net/Makefile.orig 2007-05-01 22:37:18.000000000 -0400 -+++ linux-2.6.20.noarch/net/Makefile 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/net/Makefile.orig 2007-05-02 10:32:00.000000000 -0400 ++++ linux-2.6.20.noarch/net/Makefile 2007-05-02 10:32:14.000000000 -0400 @@ -44,6 +44,8 @@ obj-$(CONFIG_ECONET) += econet/ obj-$(CONFIG_VLAN_8021Q) += 8021q/ obj-$(CONFIG_IP_DCCP) += dccp/ @@ -60049,8 +60059,8 @@ endif + +obj-y += wireless/ ---- linux-2.6.20.noarch/net/core/dev.c.orig 2007-05-01 22:37:18.000000000 -0400 -+++ linux-2.6.20.noarch/net/core/dev.c 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/net/core/dev.c.orig 2007-05-02 10:32:00.000000000 -0400 ++++ linux-2.6.20.noarch/net/core/dev.c 2007-05-02 10:32:14.000000000 -0400 @@ -109,7 +109,7 @@ #include #include @@ -60114,8 +60124,8 @@ return -EINVAL; } } ---- linux-2.6.20.noarch/net/core/Makefile.orig 2007-05-01 22:37:18.000000000 -0400 -+++ linux-2.6.20.noarch/net/core/Makefile 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/net/core/Makefile.orig 2007-05-02 10:32:00.000000000 -0400 ++++ linux-2.6.20.noarch/net/core/Makefile 2007-05-02 10:32:14.000000000 -0400 @@ -13,7 +13,6 @@ obj-y += dev.o ethtool.o dev_mcast obj-$(CONFIG_XFRM) += flow.o obj-$(CONFIG_SYSFS) += net-sysfs.o @@ -60124,8 +60134,8 @@ obj-$(CONFIG_NETPOLL) += netpoll.o obj-$(CONFIG_NET_DMA) += user_dma.o obj-$(CONFIG_FIB_RULES) += fib_rules.o ---- linux-2.6.20.noarch/net/core/rtnetlink.c.orig 2007-05-01 22:37:18.000000000 -0400 -+++ linux-2.6.20.noarch/net/core/rtnetlink.c 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/net/core/rtnetlink.c.orig 2007-05-02 10:32:00.000000000 -0400 ++++ linux-2.6.20.noarch/net/core/rtnetlink.c 2007-05-02 10:32:14.000000000 -0400 @@ -52,10 +52,6 @@ #include #include @@ -60177,8 +60187,8 @@ nskb = nlmsg_new(if_nlmsg_size(iw_buf_len), GFP_KERNEL); if (nskb == NULL) { err = -ENOBUFS; ---- linux-2.6.20.noarch/net/core/wireless.c.orig 2007-05-01 22:37:18.000000000 -0400 -+++ linux-2.6.20.noarch/net/core/wireless.c 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/net/core/wireless.c.orig 2007-05-02 10:32:00.000000000 -0400 ++++ linux-2.6.20.noarch/net/core/wireless.c 2007-05-02 10:32:14.000000000 -0400 @@ -1,2369 +0,0 @@ -/* - * This file implement the Wireless Extensions APIs. @@ -62550,7 +62560,7 @@ -EXPORT_SYMBOL(wireless_send_event); -EXPORT_SYMBOL(wireless_spy_update); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/wireless/nl80211.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/wireless/nl80211.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,24 @@ +#ifndef __NET_WIRELESS_NL80211_H +#define __NET_WIRELESS_NL80211_H @@ -62577,7 +62587,7 @@ + +#endif /* __NET_WIRELESS_NL80211_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/wireless/nl80211.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/wireless/nl80211.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,993 @@ +/* + * This is the new netlink-based wireless configuration interface. @@ -63573,7 +63583,7 @@ + genl_unregister_family(&nl80211_fam); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/wireless/sysfs.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/wireless/sysfs.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,130 @@ +/* + * This file provides /sys/class/ieee80211// @@ -63706,7 +63716,7 @@ + class_unregister(&ieee80211_class); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/wireless/Makefile 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/wireless/Makefile 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,5 @@ +obj-$(CONFIG_WIRELESS_EXT) += wext.o +obj-$(CONFIG_CFG80211) += cfg80211.o @@ -63714,7 +63724,7 @@ +cfg80211-y += core.o sysfs.o +cfg80211-$(CONFIG_NL80211) += nl80211.o --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/wireless/core.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/wireless/core.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,81 @@ +/* + * Wireless configuration interface internals. @@ -63798,7 +63808,7 @@ + +#endif /* __NET_WIRELESS_CORE_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/wireless/Kconfig 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/wireless/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,31 @@ +config CFG80211 + tristate "Improved wireless configuration API" @@ -63832,7 +63842,7 @@ + Say N (if you can) unless you know you need wireless + extensions for external modules. --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/wireless/sysfs.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/wireless/sysfs.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,9 @@ +#ifndef __WIRELESS_SYSFS_H +#define __WIRELESS_SYSFS_H @@ -63844,7 +63854,7 @@ + +#endif /* __WIRELESS_SYSFS_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/wireless/core.c 2007-05-01 22:40:31.000000000 -0400 ++++ linux-2.6.20.noarch/net/wireless/core.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,367 @@ +/* + * This is the linux wireless configuration interface. @@ -64214,7 +64224,7 @@ +} +module_exit(cfg80211_exit); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/wireless/wext.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/wireless/wext.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,1509 @@ +/* + * This file implement the Wireless Extensions APIs. @@ -65725,8 +65735,8 @@ + } +} +EXPORT_SYMBOL(wireless_spy_update); ---- linux-2.6.20.noarch/net/Kconfig.orig 2007-05-01 22:37:18.000000000 -0400 -+++ linux-2.6.20.noarch/net/Kconfig 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/net/Kconfig.orig 2007-05-02 10:32:00.000000000 -0400 ++++ linux-2.6.20.noarch/net/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -219,14 +219,18 @@ endmenu source "net/ax25/Kconfig" source "net/irda/Kconfig" @@ -65751,7 +65761,7 @@ endmenu # Networking --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/wme.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/wme.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,688 @@ +/* + * Copyright 2004, Instant802 Networks, Inc. @@ -66442,7 +66452,7 @@ +#endif +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/debugfs_netdev.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/debugfs_netdev.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,440 @@ +/* + * Copyright (c) 2006 Jiri Benc @@ -66885,7 +66895,7 @@ + notif_registered = 0; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/rc80211_simple.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/rc80211_simple.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,432 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -67320,7 +67330,7 @@ +MODULE_DESCRIPTION("Simple rate control algorithm for ieee80211"); +MODULE_LICENSE("GPL"); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/wep.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/wep.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,40 @@ +/* + * Software WEP encryption implementation @@ -67363,7 +67373,7 @@ + +#endif /* WEP_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/aes_ccm.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/aes_ccm.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,155 @@ +/* + * Copyright 2003-2004, Instant802 Networks, Inc. @@ -67521,7 +67531,7 @@ + crypto_free_cipher(tfm); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/sta_info.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/sta_info.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,167 @@ +/* + * Copyright 2002-2005, Devicescape Software, Inc. @@ -67691,7 +67701,7 @@ + +#endif /* STA_INFO_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/michael.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/michael.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,104 @@ +/* + * Michael MIC implementation - optimized for TKIP MIC operations @@ -67798,7 +67808,7 @@ + michael_put32(r, mic + 4); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/debugfs.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/debugfs.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,433 @@ +/* + * mac80211 debugfs for wireless PHYs @@ -68234,7 +68244,7 @@ + local->debugfs.keys = NULL; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_led.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_led.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,32 @@ +/* + * Copyright 2006, Johannes Berg @@ -68269,7 +68279,7 @@ +} +#endif --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/debugfs_sta.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/debugfs_sta.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,12 @@ +#ifndef __MAC80211_DEBUGFS_STA_H +#define __MAC80211_DEBUGFS_STA_H @@ -68284,7 +68294,7 @@ + +#endif /* __MAC80211_DEBUGFS_STA_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/Makefile 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/Makefile 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,20 @@ +obj-$(CONFIG_MAC80211) += mac80211.o rc80211_simple.o + @@ -68307,7 +68317,7 @@ + ieee80211_cfg.o \ + $(mac80211-objs-y) --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/michael.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/michael.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,20 @@ +/* + * Michael MIC implementation - optimized for TKIP MIC operations @@ -68330,7 +68340,7 @@ + +#endif /* MICHAEL_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_ioctl.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_ioctl.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,3180 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -71513,7 +71523,7 @@ + .get_wireless_stats = ieee80211_get_wireless_stats, +}; --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/aes_ccm.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/aes_ccm.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,26 @@ +/* + * Copyright 2003-2004, Instant802 Networks, Inc. @@ -71542,7 +71552,7 @@ + +#endif /* AES_CCM_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/debugfs_netdev.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/debugfs_netdev.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,30 @@ +/* routines exported for sysfs handling */ + @@ -71575,7 +71585,7 @@ + +#endif /* __IEEE80211_SYSFS_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/tkip.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/tkip.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,341 @@ +/* + * Copyright 2002-2004, Instant802 Networks, Inc. @@ -71919,7 +71929,7 @@ + + --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_i.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_i.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,812 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -72734,7 +72744,7 @@ + +#endif /* IEEE80211_I_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_key.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_key.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,106 @@ +/* + * Copyright 2002-2004, Instant802 Networks, Inc. @@ -72843,7 +72853,7 @@ + +#endif /* IEEE80211_KEY_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_iface.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_iface.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,353 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -73199,7 +73209,7 @@ + free_netdev(dev); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/sta_info.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/sta_info.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,464 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -73666,7 +73676,7 @@ + spin_unlock_bh(&local->sta_lock); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/hostapd_ioctl.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/hostapd_ioctl.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,344 @@ +/* + * Host AP (software wireless LAN access point) user space daemon for @@ -74013,7 +74023,7 @@ + +#endif /* HOSTAPD_IOCTL_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/Kconfig 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,81 @@ +config MAC80211 + tristate "Generic IEEE 802.11 Networking Stack (dscape)" @@ -74097,7 +74107,7 @@ + Say Y here to print out verbose powersave + mode debug messages. --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/wpa.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/wpa.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,31 @@ +/* + * Copyright 2002-2004, Instant802 Networks, Inc. @@ -74131,7 +74141,7 @@ + +#endif /* WPA_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/wme.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/wme.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,39 @@ +/* + * IEEE 802.11 driver (80211.o) - QoS datatypes @@ -74173,7 +74183,7 @@ + +#endif --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/debugfs_key.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/debugfs_key.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,34 @@ +#ifndef __MAC80211_DEBUGFS_KEY_H +#define __MAC80211_DEBUGFS_KEY_H @@ -74210,7 +74220,7 @@ + +#endif /* __MAC80211_DEBUGFS_KEY_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_common.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_common.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,98 @@ +/* + * IEEE 802.11 driver (80211.o) -- hostapd interface @@ -74311,7 +74321,7 @@ + +#endif /* IEEE80211_COMMON_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/wep.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/wep.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,328 @@ +/* + * Software WEP encryption implementation @@ -74642,7 +74652,7 @@ + return NULL; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,5095 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -79740,7 +79750,7 @@ +MODULE_DESCRIPTION("IEEE 802.11 subsystem"); +MODULE_LICENSE("GPL"); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_led.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_led.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,91 @@ +/* + * Copyright 2006, Johannes Berg @@ -79834,7 +79844,7 @@ +} +EXPORT_SYMBOL(__ieee80211_get_rx_led_name); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,72 @@ +/* + * mac80211 configuration hooks for cfg80211 @@ -79909,7 +79919,7 @@ + .del_virtual_intf = ieee80211_del_iface, +}; --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/debugfs_key.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/debugfs_key.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,253 @@ +/* + * Copyright 2003-2005 Devicescape Software, Inc. @@ -80165,7 +80175,7 @@ + key->debugfs.stalink = NULL; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/debugfs_sta.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/debugfs_sta.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,247 @@ +/* + * Copyright 2003-2005 Devicescape Software, Inc. @@ -80415,7 +80425,7 @@ + sta->debugfs.dir = NULL; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_rate.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_rate.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,140 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -80558,7 +80568,7 @@ + kref_put(&ref->kref, rate_control_release); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/wpa.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/wpa.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,846 @@ +/* + * Copyright 2002-2004, Instant802 Networks, Inc. @@ -81407,7 +81417,7 @@ +} + --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_rate.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_rate.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,144 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -81554,7 +81564,7 @@ + +#endif /* IEEE80211_RATE_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/tkip.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/tkip.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,36 @@ +/* + * Copyright 2002-2004, Instant802 Networks, Inc. @@ -81593,7 +81603,7 @@ + +#endif /* TKIP_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_sta.c 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_sta.c 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,3217 @@ +/* + * BSS client mode implementation @@ -84813,7 +84823,7 @@ + return 0; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/ieee80211_cfg.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,9 @@ +/* + * mac80211 configuration hooks for cfg80211 @@ -84825,7 +84835,7 @@ + +#endif /* __IEEE80211_CFG_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.20.noarch/net/mac80211/debugfs.h 2007-05-01 22:37:23.000000000 -0400 ++++ linux-2.6.20.noarch/net/mac80211/debugfs.h 2007-05-02 10:32:14.000000000 -0400 @@ -0,0 +1,16 @@ +#ifndef __MAC80211_DEBUGFS_H +#define __MAC80211_DEBUGFS_H @@ -84843,8 +84853,8 @@ +#endif + +#endif /* __MAC80211_DEBUGFS_H */ ---- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig 2007-05-01 22:37:18.000000000 -0400 -+++ linux-2.6.20.noarch/net/ieee80211/Kconfig 2007-05-01 22:37:23.000000000 -0400 +--- linux-2.6.20.noarch/net/ieee80211/Kconfig.orig 2007-05-02 10:32:00.000000000 -0400 ++++ linux-2.6.20.noarch/net/ieee80211/Kconfig 2007-05-02 10:32:14.000000000 -0400 @@ -56,7 +56,8 @@ config IEEE80211_CRYPT_CCMP config IEEE80211_CRYPT_TKIP From fedora-cvs-commits at redhat.com Wed May 2 14:46:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 10:46:00 -0400 Subject: rpms/libtirpc/devel libtirpc-0.1.7-bindresvport_ports.patch, NONE, 1.1 libtirpc-0.1.7-xdr_bufferoverlow.patch, NONE, 1.1 libtirpc.spec, 1.10, 1.11 Message-ID: <200705021446.l42Ek0rk001211@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/libtirpc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1093 Modified Files: libtirpc.spec Added Files: libtirpc-0.1.7-bindresvport_ports.patch libtirpc-0.1.7-xdr_bufferoverlow.patch Log Message: - Fixed potential buffer overflow in xdr_strings - Added a optimization to bindresvport that allows more ports to be tried. libtirpc-0.1.7-bindresvport_ports.patch: bindresvport.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) --- NEW FILE libtirpc-0.1.7-bindresvport_ports.patch --- commit c254b435007ebd4ed471737198975d5ccf4e7949 Author: Steve Dickson Date: Thu Apr 26 17:20:21 2007 -0400 Added a optimization to bindresvport that allows more ports to be tried. Signed-off-by: Steve Dickson diff --git a/src/bindresvport.c b/src/bindresvport.c index b197efa..bc75d29 100644 --- a/src/bindresvport.c +++ b/src/bindresvport.c @@ -62,6 +62,7 @@ bindresvport(sd, sin) #ifdef __linux__ #define STARTPORT 600 +#define LOWPORT 512 #define ENDPORT (IPPORT_RESERVED - 1) #define NPORTS (ENDPORT - STARTPORT + 1) @@ -76,10 +77,13 @@ bindresvport_sa(sd, sa) #ifdef INET6 struct sockaddr_in6 *sin6; #endif - u_int16_t port; u_int16_t *portp; + static u_int16_t port; + static short startport = STARTPORT; socklen_t salen; - int i; + int nports = ENDPORT - startport + 1; + int endport = ENDPORT; + int i; if (sa == NULL) { salen = sizeof(myaddr); @@ -119,13 +123,22 @@ bindresvport_sa(sd, sa) } res = -1; errno = EADDRINUSE; - for (i = 0; i < NPORTS && res < 0 && errno == EADDRINUSE; i++) { + again: + for (i = 0; i < nports; ++i) { *portp = htons(port++); - if (port > ENDPORT) { - port = STARTPORT; - } + if (port > endport) + port = startport; res = bind(sd, sa, salen); + if (res >= 0 || errno != EADDRINUSE) + break; } + if (i == nports && startport != LOWPORT) { + startport = LOWPORT; + endport = STARTPORT - 1; + nports = STARTPORT - LOWPORT; + port = LOWPORT + port % (STARTPORT - LOWPORT); + goto again; + } return (res); } #else libtirpc-0.1.7-xdr_bufferoverlow.patch: xdr.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) --- NEW FILE libtirpc-0.1.7-xdr_bufferoverlow.patch --- commit 30431c6d846eab1bc6b7a3a91a7894f3acf2680f Author: Steve Dickson Date: Thu Apr 26 14:42:16 2007 -0400 Check for buffer overflow in xdr_string. Signed-off-by: Steve Dickson diff --git a/src/xdr.c b/src/xdr.c index 764c30f..292723b 100644 --- a/src/xdr.c +++ b/src/xdr.c @@ -669,6 +669,8 @@ xdr_string(xdrs, cpp, maxsize) } /* FALLTHROUGH */ case XDR_ENCODE: + if (sp == NULL) + return FALSE; size = strlen(sp); break; case XDR_DECODE: @@ -681,6 +683,13 @@ xdr_string(xdrs, cpp, maxsize) return (FALSE); } nodesize = size + 1; + if (nodesize == 0) { + /* This means an overflow. It a bug in the caller which + * provided a too large maxsize but nevertheless catch it + * here. + */ + return FALSE; + } /* * now deal with the actual bytes @@ -688,9 +697,6 @@ xdr_string(xdrs, cpp, maxsize) switch (xdrs->x_op) { case XDR_DECODE: - if (nodesize == 0) { - return (TRUE); - } if (sp == NULL) *cpp = sp = mem_alloc(nodesize); if (sp == NULL) { Index: libtirpc.spec =================================================================== RCS file: /cvs/dist/rpms/libtirpc/devel/libtirpc.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libtirpc.spec 26 Mar 2007 17:15:09 -0000 1.10 +++ libtirpc.spec 2 May 2007 14:45:58 -0000 1.11 @@ -1,6 +1,6 @@ Name: libtirpc Version: 0.1.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Transport Independent RPC Library Group: System Environment/Libraries License: GPL @@ -35,6 +35,8 @@ Patch3: libtirpc-0.1.7-svcauthnone.patch Patch4: libtirpc-0.1.7-ppc64.patch Patch5: libtirpc-0.1.7-svcauthdestroy.patch +Patch6: libtirpc-0.1.7-xdr_bufferoverlow.patch +Patch7: libtirpc-0.1.7-bindresvport_ports.patch Patch100: libtirpc-0.1.7-compile.patch @@ -50,6 +52,8 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 %patch100 -p1 @@ -129,6 +133,11 @@ %{_includedir}/tirpc/un-namespace.h %changelog +* Thu Apr 26 2007 0.1.7-6 +- Fixed potential buffer overflow in xdr_strings +- Added a optimization to bindresvport that allows more + ports to be tried. + * Mon Mar 26 2007 Steve Dickson 0.1.7-5 - Fixed Unowned Directory RPM problem (bz 233873) From fedora-cvs-commits at redhat.com Wed May 2 14:47:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 10:47:27 -0400 Subject: rpms/bind/devel .cvsignore, 1.25, 1.26 bind.spec, 1.177, 1.178 sources, 1.32, 1.33 Message-ID: <200705021447.l42ElRjx002273@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1975 Modified Files: .cvsignore bind.spec sources Log Message: updated to 9.4.1 which contains fix to CVE-2007-2241 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bind/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 6 Mar 2007 15:32:16 -0000 1.25 +++ .cvsignore 2 May 2007 14:47:24 -0000 1.26 @@ -1,3 +1,3 @@ -bind-9.4.0.tar.gz -libbind-man.tar.gz bind-chroot.tar.gz +libbind-man.tar.gz +bind-9.4.1.tar.gz Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- bind.spec 27 Apr 2007 13:59:11 -0000 1.177 +++ bind.spec 2 May 2007 14:47:24 -0000 1.178 @@ -16,8 +16,8 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server. Name: bind License: BSD-like -Version: 9.4.0 -Release: 8%{?dist} +Version: 9.4.1 +Release: 1%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -808,6 +808,9 @@ %changelog +* Wed May 02 2007 Adam Tkac 31:9.4.1-1.fc7 +- updated to 9.4.1 which contains fix to CVE-2007-2241 + * Fri Apr 27 2007 Adam Tkac 31:9.4.0-8.fc7 - improved "zone freeze patch" - if multiple zone with same name exists no zone is freezed Index: sources =================================================================== RCS file: /cvs/dist/rpms/bind/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 6 Mar 2007 15:32:16 -0000 1.32 +++ sources 2 May 2007 14:47:24 -0000 1.33 @@ -1,3 +1,3 @@ -e85347f03f0d841b596422d5252a0869 bind-9.4.0.tar.gz -13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz 3567c35a24cb83a8a69443a399bbb6c8 bind-chroot.tar.gz +13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz +09b54d35036cb0423b2e618f21766285 bind-9.4.1.tar.gz From fedora-cvs-commits at redhat.com Wed May 2 15:28:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 11:28:52 -0400 Subject: rpms/perl/devel perl.spec,1.114,1.115 Message-ID: <200705021528.l42FSqr7032025@cvs.devel.redhat.com> Author: rnorwood Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31986 Modified Files: perl.spec Log Message: Move libperl.so into perl-libs. Remove some tabs. Index: perl.spec =================================================================== RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- perl.spec 25 Apr 2007 21:04:23 -0000 1.114 +++ perl.spec 2 May 2007 15:28:50 -0000 1.115 @@ -19,8 +19,8 @@ %endif Name: perl -Version: 5.8.8 -Release: 16.4%{?dist} +Version: %{perl_version} +Release: 16.5%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -229,7 +229,7 @@ Epoch: 0 Version: 1.76_02 Requires: perl = %{perl_epoch}:%{perl_version}-%{release} -Provides: cpan = %{version} +Provides: cpan = %{version} %description CPAN Query, download and build perl modules from CPAN sites. @@ -252,7 +252,7 @@ Version: 6.30 Requires: perl-devel Requires: perl = %{perl_epoch}:%{perl_version}-%{release} -Requires: perl(Test::Harness) +Requires: perl(Test::Harness) %description ExtUtils-MakeMaker Create a module Makefile. @@ -546,6 +546,10 @@ # libs %exclude %{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/libperl.so +%exclude %{_libdir}/perl5/5.8.5/%{perl_archname}/CORE +%exclude %{_libdir}/perl5/5.8.6/%{perl_archname}/CORE +%exclude %{_libdir}/perl5/5.8.7/%{perl_archname}/CORE + # devel %exclude %{_bindir}/enc2xs @@ -712,10 +716,11 @@ %{_mandir}/man3/Test::Tutorial* %changelog -* Wed Mar 28 2007 Robin Norwood - 4:5.8.8-16.2 +* Wed Mar 28 2007 Robin Norwood - 4:5.8.8-16.5 - Includes patch from Ralf Corsepius to split out some more perl modules. - Further split out development related perl modules. - Remove Requires: perl-devel from perl +- Move libperl.so -> perl-libs * Fri Mar 9 2007 Robin Norwood - 4:5.8.8-15 - Incorporate fixes from spot and others on fedora-perl-devel From fedora-cvs-commits at redhat.com Wed May 2 15:38:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 11:38:58 -0400 Subject: rpms/kernel-xen-2.6/devel linux-2.6-disable-netback-checksum.patch, NONE, 1.1.2.1 kernel-xen.spec, 1.20.2.4, 1.20.2.5 Message-ID: <200705021538.l42Fcww5001927@cvs.devel.redhat.com> Author: ehabkost Update of /cvs/dist/rpms/kernel-xen-2.6/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5192 Modified Files: Tag: private-ehabkost-xen-3_0_5-rc4-branch kernel-xen.spec Added Files: Tag: private-ehabkost-xen-3_0_5-rc4-branch linux-2.6-disable-netback-checksum.patch Log Message: Adding patch to disable checksum on netback Patch from Herbert Xu, to work around problems with DHCP and partial checksums on guests. linux-2.6-disable-netback-checksum.patch: interface.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE linux-2.6-disable-netback-checksum.patch --- From: Herbert Xu Subject: Re: Final resolution for the checksum problems Daniel P. Berrange wrote: > >> > Alternatively we could just make netback default tx checksums to off >> > which should have a similar effect as disabling it on virbr0. >> >> This seems like a simpler path than introducing new infrastructure for >> scripts to run every time the interface is brought up/down. And then >> it's even easier to remove the "trigger" when we get the functionality >> in the kernel > > I agree - this would be even simpler. Here is a patch which does just that. Cheers, -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- --- a/drivers/xen/netback/interface.c 2007-04-28 11:57:31.000000000 +1000 +++ b/drivers/xen/netback/interface.c 2007-05-02 19:58:16.000000000 +1000 @@ -161,7 +161,6 @@ dev->open = net_open; dev->stop = net_close; dev->change_mtu = netbk_change_mtu; - dev->features = NETIF_F_IP_CSUM; SET_ETHTOOL_OPS(dev, &network_ethtool_ops); Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v retrieving revision 1.20.2.4 retrieving revision 1.20.2.5 diff -u -r1.20.2.4 -r1.20.2.5 --- kernel-xen.spec 1 May 2007 17:23:43 -0000 1.20.2.4 +++ kernel-xen.spec 2 May 2007 15:38:56 -0000 1.20.2.5 @@ -429,6 +429,7 @@ Patch1662: linux-2.6-treat_partial_as_unnecessary.patch Patch1663: linux-2.6-kill_skbuff_hack.patch Patch1664: linux-2.6-csum-missing-line.patch +Patch1665: linux-2.6-disable-netback-checksum.patch Patch1681: linux-2.6-xfs-umount-fix.patch Patch1682: linux-2.6-xfs_attr2.patch @@ -978,6 +979,7 @@ %patch1662 -p1 %patch1663 -p1 %patch1664 -p1 +%patch1665 -p1 # Fix XFS umount bug. %patch1681 -p1 @@ -2012,6 +2014,8 @@ * Tue May 01 2007 Eduardo Habkost - Updated Xen Hypervisor to 3.0.5-rc4, hg cset 1668299c0ea4 - Added smp and vgetcpu fixes (bug #238015) +- Added patch from Heberter Xu, disabling checksum on netback, + to work around problems with DHCP and partial checksums on guests * Fri Apr 27 2007 Eduardo Habkost - Updated Xen Hypervisor to 3.0.5-rc3, hg cset 14934 From fedora-cvs-commits at redhat.com Wed May 2 15:49:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 11:49:52 -0400 Subject: rpms/spamassassin/devel .cvsignore, 1.37, 1.38 sources, 1.36, 1.37 spamassassin.spec, 1.94, 1.95 Message-ID: <200705021549.l42Fnqx1002257@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2229 Modified Files: .cvsignore sources spamassassin.spec Log Message: 3.2.0 final Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 23 Apr 2007 21:04:19 -0000 1.37 +++ .cvsignore 2 May 2007 15:49:50 -0000 1.38 @@ -1 +1 @@ -Mail-SpamAssassin-3.2.0-rc3.tar.bz2 +Mail-SpamAssassin-3.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 23 Apr 2007 21:04:19 -0000 1.36 +++ sources 2 May 2007 15:49:50 -0000 1.37 @@ -1 +1 @@ -23299659a018a1e316ce450c28ac2e29 Mail-SpamAssassin-3.2.0-rc3.tar.bz2 +6840e3be132e2c3cbf66298b0227e880 Mail-SpamAssassin-3.2.0.tar.bz2 Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- spamassassin.spec 23 Apr 2007 21:04:19 -0000 1.94 +++ spamassassin.spec 2 May 2007 15:49:50 -0000 1.95 @@ -11,17 +11,14 @@ %define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} -# temporary pre-release number -%define pre rc3 - Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.2.0 -Release: 0.5.%{pre}%{?dist} +Release: 1%{?dist} License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ -Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{pre}.tar.bz2 +Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2 Source2: redhat_local.cf Source3: spamassassin-default.rc Source4: spamassassin-spamc.rc @@ -192,6 +189,9 @@ exit 0 %changelog +* Wed May 02 2007 Warren Togami 3.2.0-1 +- 3.2.0 + * Mon Apr 13 2007 Warren Togami 3.2.0-0.5.rc3 - 3.2.0 rc3 From fedora-cvs-commits at redhat.com Wed May 2 16:12:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 12:12:53 -0400 Subject: rpms/kudzu/FC-6 kudzu.spec,1.164,1.165 Message-ID: <200705021612.l42GCrEw003706@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv3692 Modified Files: kudzu.spec Log Message: test Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/FC-6/kudzu.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- kudzu.spec 30 Nov 2006 05:43:24 -0000 1.164 +++ kudzu.spec 2 May 2007 16:12:51 -0000 1.165 @@ -14,6 +14,7 @@ BuildPrereq: pciutils-devel >= 2.2.3-4, python-devel python gettext BuildRoot: %{_tmppath}/%{name}-root + %description Kudzu is a hardware probing tool run at system boot time to determine what hardware has been added or removed from the system. From fedora-cvs-commits at redhat.com Wed May 2 17:54:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 13:54:17 -0400 Subject: rpms/kernel/FC-6 linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch, NONE, 1.1 linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch, NONE, 1.1 linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch, NONE, 1.1 linux-2.6-20.8f-x86_64_always_flush_all_pages.patch, NONE, 1.1 linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch, NONE, 1.1 linux-2.6-20.8n-net_vlan_allow_with_bridge.patch, NONE, 1.1 linux-2.6-20.8n-ppp_fix_skb_under_panic.patch, NONE, 1.1 linux-2.6-page_is_ram.patch, NONE, 1.1 patch-2.6.20.10-11.bz2.sign, NONE, 1.1 patch-2.6.20.9-10.bz2.sign, NONE, 1.1 .cvsignore, 1.561, 1.562 kernel-2.6.spec, 1.2948, 1.2949 sources, 1.525, 1.526 upstream, 1.445, 1.446 linux-2.6.20.10-unoffical.patch, 1.1, NONE Message-ID: <200705021754.l42HsHDr006917@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv6893 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch linux-2.6-20.8f-x86_64_always_flush_all_pages.patch linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch linux-2.6-20.8n-net_vlan_allow_with_bridge.patch linux-2.6-20.8n-ppp_fix_skb_under_panic.patch linux-2.6-page_is_ram.patch patch-2.6.20.10-11.bz2.sign patch-2.6.20.9-10.bz2.sign Removed Files: linux-2.6.20.10-unoffical.patch Log Message: * Tue May 05 2007 Chuck Ebbert 1.2949 - 2.6.20.10 (official) - 2.6.20.11 - Additional fixes (1830 - 1837) linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch: i386/kernel/nmi.c | 9 +++++---- x86_64/kernel/nmi.c | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) --- NEW FILE linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1714f9bfc92d6ee67e84127332a1fae27772acfe Commit: 1714f9bfc92d6ee67e84127332a1fae27772acfe Parent: 08269c6d38e003adb12f55c6d795daa89bdc1bae Author: Andi Kleen AuthorDate: Mon Apr 16 10:30:27 2007 +0200 Committer: Andi Kleen CommitDate: Mon Apr 16 10:30:27 2007 +0200 [PATCH] x86: Fix potential overflow in perfctr reservation While reviewing this code again I found a potential overflow of the bitmap. The p4 oprofile can theoretically set bits beyond the reservation bitmap for specific configurations. Avoid that by sizing the bitmaps properly. Signed-off-by: Andi Kleen --- arch/i386/kernel/nmi.c | 9 +++++---- arch/x86_64/kernel/nmi.c | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index a98ba88..9f1e8c1 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c @@ -41,16 +41,17 @@ int nmi_watchdog_enabled; * different subsystems this reservation system just tries to coordinate * things a little */ -static DEFINE_PER_CPU(unsigned long, perfctr_nmi_owner); -static DEFINE_PER_CPU(unsigned long, evntsel_nmi_owner[3]); - -static cpumask_t backtrace_mask = CPU_MASK_NONE; /* this number is calculated from Intel's MSR_P4_CRU_ESCR5 register and it's * offset from MSR_P4_BSU_ESCR0. It will be the max for all platforms (for now) */ #define NMI_MAX_COUNTER_BITS 66 +#define NMI_MAX_COUNTER_LONGS BITS_TO_LONGS(NMI_MAX_COUNTER_BITS) +static DEFINE_PER_CPU(unsigned long, perfctr_nmi_owner[NMI_MAX_COUNTER_LONGS]); +static DEFINE_PER_CPU(unsigned long, evntsel_nmi_owner[NMI_MAX_COUNTER_LONGS]); + +static cpumask_t backtrace_mask = CPU_MASK_NONE; /* nmi_active: * >0: the lapic NMI watchdog is active, but can be disabled * <0: the lapic NMI watchdog has not been set up, and cannot diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index a90996c..dfab9f1 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi.c @@ -39,15 +39,17 @@ int panic_on_unrecovered_nmi; * different subsystems this reservation system just tries to coordinate * things a little */ -static DEFINE_PER_CPU(unsigned, perfctr_nmi_owner); -static DEFINE_PER_CPU(unsigned, evntsel_nmi_owner[2]); - -static cpumask_t backtrace_mask = CPU_MASK_NONE; /* this number is calculated from Intel's MSR_P4_CRU_ESCR5 register and it's * offset from MSR_P4_BSU_ESCR0. It will be the max for all platforms (for now) */ #define NMI_MAX_COUNTER_BITS 66 +#define NMI_MAX_COUNTER_LONGS BITS_TO_LONGS(NMI_MAX_COUNTER_BITS) + +static DEFINE_PER_CPU(unsigned, perfctr_nmi_owner[NMI_MAX_COUNTER_LONGS]); +static DEFINE_PER_CPU(unsigned, evntsel_nmi_owner[NMI_MAX_COUNTER_LONGS]); + +static cpumask_t backtrace_mask = CPU_MASK_NONE; /* nmi_active: * >0: the lapic NMI watchdog is active, but can be disabled linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch: capiutil.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch --- Minimal fix for CAPI buffer overflow. Original patch by Karsten Keil Modified by Chuck Ebbert to unconditionally disable CAPI debug messages. Signed-off-by: Chuck Ebbert --- linux-2.6.16.21-0.23.org/drivers/isdn/capi/capiutil.c +++ linux-2.6.16.21-0.23/drivers/isdn/capi/capiutil.c @@ -647,7 +647,7 @@ char *capi_cmd2str(u8 cmd, u8 subcmd) return mnames[command_2_index(cmd, subcmd)]; } - +#if 0 /*-------------------------------------------------------*/ /*-------------------------------------------------------*/ @@ -849,6 +849,18 @@ char *capi_cmsg2str(_cmsg * cmsg) protocol_message_2_pars(cmsg, 1); return buf; } +#else + +char *capi_message2str(u8 * msg) +{ + return "capi_message2str not implemented"; +} + +char *capi_cmsg2str(_cmsg * cmsg) +{ + return "capi_cmsg2str not implemented"; +} +#endif EXPORT_SYMBOL(capi_cmsg2message); EXPORT_SYMBOL(capi_message2cmsg); linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch: oom_kill.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=650a7c974f1b91de9732c0f720e792837f8abfd6 Commit: 650a7c974f1b91de9732c0f720e792837f8abfd6 Parent: c445a31cd7f469d77acc37538ab43a99530968b8 Author: David Rientjes AuthorDate: Mon Apr 23 21:36:13 2007 -0700 Committer: Linus Torvalds CommitDate: Tue Apr 24 08:11:49 2007 -0700 oom: kill all threads that share mm with killed task oom_kill_task() calls __oom_kill_task() to OOM kill a selected task. When finding other threads that share an mm with that task, we need to kill those individual threads and not the same one. (Bug introduced by f2a2a7108aa0039ba7a5fe7a0d2ecef2219a7584) Acked-by: William Irwin Acked-by: Christoph Lameter Cc: Nick Piggin Cc: Andrew Morton Cc: Andi Kleen Signed-off-by: David Rientjes Signed-off-by: Linus Torvalds --- mm/oom_kill.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 2f39169..af981b6 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -333,7 +333,7 @@ static int oom_kill_task(struct task_struct *p) */ do_each_thread(g, q) { if (q->mm == mm && q->tgid != p->tgid) - force_sig(SIGKILL, p); + force_sig(SIGKILL, q); } while_each_thread(g, q); return 0; linux-2.6-20.8f-x86_64_always_flush_all_pages.patch: pageattr.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-20.8f-x86_64_always_flush_all_pages.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=90767bd13febfdf8a5f5077e2bb975f79d6b919c Commit: 90767bd13febfdf8a5f5077e2bb975f79d6b919c Parent: 9ce883becb83190061369940de9c415595836c9b Author: Andi Kleen AuthorDate: Tue Apr 24 13:05:37 2007 +0200 Committer: Andi Kleen CommitDate: Tue Apr 24 13:05:37 2007 +0200 [PATCH] x86-64: Always flush all pages in change_page_attr change_page_attr on x86-64 only flushed the TLB for pages that got reverted. That's not correct: it has to be flushed in all cases. This bug was added in some earlier changes. Just flush all pages for now. This could be done more efficiently, but for this late in the release this seem to be the best fix. Pointed out by Jan Beulich Signed-off-by: Andi Kleen --- arch/x86_64/mm/pageattr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86_64/mm/pageattr.c b/arch/x86_64/mm/pageattr.c index 65c5eaa..081409a 100644 --- a/arch/x86_64/mm/pageattr.c +++ b/arch/x86_64/mm/pageattr.c @@ -81,8 +81,8 @@ static void flush_kernel_map(void *arg) void *adr = page_address(pg); if (cpu_has_clflush) cache_flush_page(adr); - __flush_tlb_one(adr); } + __flush_tlb_all(); } static inline void flush_map(struct list_head *l) linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch: xfrm_user.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=661697f728d75302e1f661a58db2fcba71d5cbc9 Commit: 661697f728d75302e1f661a58db2fcba71d5cbc9 Parent: 279e172a580d415b83eba4f9fbbc77b08e546553 Author: Joy Latten AuthorDate: Fri Apr 13 16:14:35 2007 -0700 Committer: David S. Miller CommitDate: Fri Apr 13 16:14:35 2007 -0700 [IPSEC] XFRM_USER: kernel panic when large security contexts in ACQUIRE When sending a security context of 50+ characters in an ACQUIRE message, following kernel panic occurred. kernel BUG in xfrm_send_acquire at net/xfrm/xfrm_user.c:1781! cpu 0x3: Vector: 700 (Program Check) at [c0000000421bb2e0] pc: c00000000033b074: .xfrm_send_acquire+0x240/0x2c8 lr: c00000000033b014: .xfrm_send_acquire+0x1e0/0x2c8 sp: c0000000421bb560 msr: 8000000000029032 current = 0xc00000000fce8f00 paca = 0xc000000000464b00 pid = 2303, comm = ping kernel BUG in xfrm_send_acquire at net/xfrm/xfrm_user.c:1781! enter ? for help 3:mon> t [c0000000421bb650] c00000000033538c .km_query+0x6c/0xec [c0000000421bb6f0] c000000000337374 .xfrm_state_find+0x7f4/0xb88 [c0000000421bb7f0] c000000000332350 .xfrm_tmpl_resolve+0xc4/0x21c [c0000000421bb8d0] c0000000003326e8 .xfrm_lookup+0x1a0/0x5b0 [c0000000421bba00] c0000000002e6ea0 .ip_route_output_flow+0x88/0xb4 [c0000000421bbaa0] c0000000003106d8 .ip4_datagram_connect+0x218/0x374 [c0000000421bbbd0] c00000000031bc00 .inet_dgram_connect+0xac/0xd4 [c0000000421bbc60] c0000000002b11ac .sys_connect+0xd8/0x120 [c0000000421bbd90] c0000000002d38d0 .compat_sys_socketcall+0xdc/0x214 [c0000000421bbe30] c00000000000869c syscall_exit+0x0/0x40 --- Exception: c00 (System Call) at 0000000007f0ca9c SP (fc0ef8f0) is in userspace We are using size of security context from xfrm_policy to determine how much space to alloc skb and then putting security context from xfrm_state into skb. Should have been using size of security context from xfrm_state to alloc skb. Following fix does that Signed-off-by: Joy Latten Acked-by: James Morris Signed-off-by: David S. Miller --- net/xfrm/xfrm_user.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index e81e2fb..816e369 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -272,9 +272,8 @@ static int attach_encap_tmpl(struct xfrm_encap_tmpl **encapp, struct rtattr *u_a } -static inline int xfrm_user_sec_ctx_size(struct xfrm_policy *xp) +static inline int xfrm_user_sec_ctx_size(struct xfrm_sec_ctx *xfrm_ctx) { - struct xfrm_sec_ctx *xfrm_ctx = xp->security; int len = 0; if (xfrm_ctx) { @@ -2170,7 +2169,7 @@ static int xfrm_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *xt, len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr); len += NLMSG_SPACE(sizeof(struct xfrm_user_acquire)); - len += RTA_SPACE(xfrm_user_sec_ctx_size(xp)); + len += RTA_SPACE(xfrm_user_sec_ctx_size(x->security)); #ifdef CONFIG_XFRM_SUB_POLICY len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type)); #endif @@ -2280,7 +2279,7 @@ static int xfrm_exp_policy_notify(struct xfrm_policy *xp, int dir, struct km_eve len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr); len += NLMSG_SPACE(sizeof(struct xfrm_user_polexpire)); - len += RTA_SPACE(xfrm_user_sec_ctx_size(xp)); + len += RTA_SPACE(xfrm_user_sec_ctx_size(xp->security)); #ifdef CONFIG_XFRM_SUB_POLICY len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type)); #endif linux-2.6-20.8n-net_vlan_allow_with_bridge.patch: vlan_dev.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE linux-2.6-20.8n-net_vlan_allow_with_bridge.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=279e172a580d415b83eba4f9fbbc77b08e546553 Commit: 279e172a580d415b83eba4f9fbbc77b08e546553 Parent: 09fe3ef46c5a2cc65d173df9518013e208eb3ba3 Author: Jerome Borsboom AuthorDate: Fri Apr 13 16:12:47 2007 -0700 Committer: David S. Miller CommitDate: Fri Apr 13 16:12:47 2007 -0700 [VLAN]: Allow VLAN interface on top of bridge interface When a VLAN interface is created on top of a bridge interface and netfilter is enabled to see the bridged packets, the packets can be corrupted when passing through the netfilter code. This is caused by the VLAN driver not setting the 'protocol' and 'nh' members of the sk_buff structure. In general, this is no problem as the VLAN interface is mostly connected to a physical ethernet interface which does not use the 'protocol' and 'nh' members. For a bridge interface, however, these members do matter. Signed-off-by: Jerome Borsboom Signed-off-by: David S. Miller --- net/8021q/vlan_dev.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 2fc8fe2..b6e0eea 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -380,6 +380,9 @@ int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, } else { vhdr->h_vlan_encapsulated_proto = htons(len); } + + skb->protocol = htons(ETH_P_8021Q); + skb->nh.raw = skb->data; } /* Before delegating work to the lower layer, enter our MAC-address */ linux-2.6-20.8n-ppp_fix_skb_under_panic.patch: ppp_async.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-20.8n-ppp_fix_skb_under_panic.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7c5050e3e49f6d89af0d63111611693d9625d1f5 Commit: 7c5050e3e49f6d89af0d63111611693d9625d1f5 Parent: 895e1fc7226e6732bc77138955b6c7dfa279f57a Author: Paul Mackerras AuthorDate: Thu Apr 19 13:05:52 2007 -0700 Committer: David S. Miller CommitDate: Thu Apr 19 13:05:52 2007 -0700 [PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet() From: Paul Mackerras This fixes: Subject: kernel BUG at net/core/skbuff.c in linux-2.6.21-rc6 process_input_packet() treats the case where the first byte is 0xff (PPP_ALLSTATIONS) but the second byte is 0x03 (PPP_UI) as indicating a packet with a PPP protocol number of 0xff. Arguably that's wrong since PPP protocol 0xff is reserved, and the RFC does envision the possibility of receiving frames where the control field has values other than 0x03. Signed-off-by: David S. Miller --- drivers/net/ppp_async.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c index 933e2f3..caabbc4 100644 --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c @@ -802,9 +802,9 @@ process_input_packet(struct asyncppp *ap) /* check for address/control and protocol compression */ p = skb->data; - if (p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) { + if (p[0] == PPP_ALLSTATIONS) { /* chop off address/control */ - if (skb->len < 3) + if (p[1] != PPP_UI || skb->len < 3) goto err; p = skb_pull(skb, 2); } linux-2.6-page_is_ram.patch: e820.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-page_is_ram.patch --- Make e820map non-initdata. Otherwise execshild is broken. --- linux-2.6.20.x86_64/arch/x86_64/kernel/e820.c.orig 2007-04-26 14:38:12.000000000 -0400 +++ linux-2.6.20.x86_64/arch/x86_64/kernel/e820.c 2007-04-26 14:38:24.000000000 -0400 @@ -25,7 +25,7 @@ #include #include -struct e820map e820 __initdata; +struct e820map e820; /* * PFN of last memory page. --- NEW FILE patch-2.6.20.10-11.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBGN9+qyGugalF9Dw4RAp6mAJ9GTQyYpln+s5442QpXRtoQMwztsACgh2HN +ja7W7F60EvN6prII08nHoQ= =fyPC -----END PGP SIGNATURE----- --- NEW FILE patch-2.6.20.9-10.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBGMnJ8yGugalF9Dw4RAswuAJ0Xv/NuAjc397yS9xyXF9J93q+2TgCgjRnj WRRoVHZln0Vi0xCvWnC4d08= =VVLI -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/.cvsignore,v retrieving revision 1.561 retrieving revision 1.562 diff -u -r1.561 -r1.562 --- .cvsignore 26 Apr 2007 15:04:15 -0000 1.561 +++ .cvsignore 2 May 2007 17:54:15 -0000 1.562 @@ -13,3 +13,5 @@ patch-2.6.20.6-7.bz2 patch-2.6.20.7-8.bz2 patch-2.6.20.8-9.bz2 +patch-2.6.20.9-10.bz2 +patch-2.6.20.10-11.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2948 retrieving revision 1.2949 diff -u -r1.2948 -r1.2949 --- kernel-2.6.spec 27 Apr 2007 22:42:03 -0000 1.2948 +++ kernel-2.6.spec 2 May 2007 17:54:15 -0000 1.2949 @@ -379,7 +379,8 @@ Patch7: patch-2.6.20.6-7.bz2 Patch8: patch-2.6.20.7-8.bz2 Patch9: patch-2.6.20.8-9.bz2 -Patch10: linux-2.6.20.10-unoffical.patch +Patch10: patch-2.6.20.9-10.bz2 +Patch11: patch-2.6.20.10-11.bz2 # Patches 10 through 99 are for things that are going upstream really soon. # needed to get utrace patch to apply cleanly @@ -541,8 +542,18 @@ Patch1827: linux-2.6-21-rc6-sched_align_runqueue.patch Patch1828: linux-2.6-i386_pci-add_debugging.patch +# post 2.6.20.11 +Patch1830: linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch +Patch1831: linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch +Patch1832: linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch +Patch1833: linux-2.6-20.8f-x86_64_always_flush_all_pages.patch +Patch1834: linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch +Patch1835: linux-2.6-20.8n-net_vlan_allow_with_bridge.patch +Patch1836: linux-2.6-20.8n-ppp_fix_skb_under_panic.patch +Patch1837: linux-2.6-page_is_ram.patch + # SELinux/audit patches. -Patch1850: linux-2.6-selinux-mprotect-checks.patch +Patch1890: linux-2.6-selinux-mprotect-checks.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-oss-warning.patch @@ -1027,6 +1038,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -1278,8 +1290,18 @@ %patch1827 -p1 %patch1828 -p1 +# post 2.6.20.11 +%patch1830 -p1 +%patch1831 -p1 +%patch1832 -p1 +%patch1833 -p1 +%patch1834 -p1 +%patch1835 -p1 +%patch1836 -p1 +%patch1837 -p1 + # Fix the SELinux mprotect checks on executable mappings -%patch1850 -p1 +%patch1890 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -2294,6 +2316,11 @@ %endif %changelog +* Tue May 05 2007 Chuck Ebbert 1.2949 +- 2.6.20.10 (official) +- 2.6.20.11 +- Additional fixes (1830 - 1837) + * Fri Apr 27 2007 Chuck Ebbert 1.2948 - 2.6.20.10 (from mailing list) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/sources,v retrieving revision 1.525 retrieving revision 1.526 diff -u -r1.525 -r1.526 --- sources 26 Apr 2007 15:04:16 -0000 1.525 +++ sources 2 May 2007 17:54:15 -0000 1.526 @@ -9,3 +9,5 @@ 557549a69f3ec7b615d252f302ad5099 patch-2.6.20.6-7.bz2 2d67b7c603a3cb081da1db6048bd7316 patch-2.6.20.7-8.bz2 931bd27010da400fc4902bef049904b9 patch-2.6.20.8-9.bz2 +26877e8750d036d6ea81a9bef6c685c6 patch-2.6.20.9-10.bz2 +71d6e53cf0accd8f09aa27ac9dd7f25d patch-2.6.20.10-11.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/upstream,v retrieving revision 1.445 retrieving revision 1.446 diff -u -r1.445 -r1.446 --- upstream 26 Apr 2007 15:04:16 -0000 1.445 +++ upstream 2 May 2007 17:54:15 -0000 1.446 @@ -8,3 +8,5 @@ patch-2.6.20.6-7.bz2 patch-2.6.20.7-8.bz2 patch-2.6.20.8-9.bz2 +patch-2.6.20.9-10.bz2 +patch-2.6.20.10-11.bz2 --- linux-2.6.20.10-unoffical.patch DELETED --- From fedora-cvs-commits at redhat.com Wed May 2 17:54:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 2 May 2007 13:54:42 -0400 Subject: rpms/kernel/FC-5 linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch, NONE, 1.1 linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch, NONE, 1.1 linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch, NONE, 1.1 linux-2.6-20.8f-x86_64_always_flush_all_pages.patch, NONE, 1.1 linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch, NONE, 1.1 linux-2.6-20.8n-net_vlan_allow_with_bridge.patch, NONE, 1.1 linux-2.6-20.8n-ppp_fix_skb_under_panic.patch, NONE, 1.1 linux-2.6-page_is_ram.patch, NONE, 1.1 patch-2.6.20.10-11.bz2.sign, NONE, 1.1 patch-2.6.20.9-10.bz2.sign, NONE, 1.1 .cvsignore, 1.442, 1.443 kernel-2.6.spec, 1.2316, 1.2317 sources, 1.382, 1.383 upstream, 1.345, 1.346 linux-2.6.20.10-unoffical.patch, 1.1, NONE Message-ID: <200705021754.l42HsgJi007009@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv6979 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch linux-2.6-20.8f-x86_64_always_flush_all_pages.patch linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch linux-2.6-20.8n-net_vlan_allow_with_bridge.patch linux-2.6-20.8n-ppp_fix_skb_under_panic.patch linux-2.6-page_is_ram.patch patch-2.6.20.10-11.bz2.sign patch-2.6.20.9-10.bz2.sign Removed Files: linux-2.6.20.10-unoffical.patch Log Message: * Tue May 05 2007 Chuck Ebbert 1.2317 - 2.6.20.10 (official) - 2.6.20.11 - Additional fixes (1830 - 1837) linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch: i386/kernel/nmi.c | 9 +++++---- x86_64/kernel/nmi.c | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) --- NEW FILE linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1714f9bfc92d6ee67e84127332a1fae27772acfe Commit: 1714f9bfc92d6ee67e84127332a1fae27772acfe Parent: 08269c6d38e003adb12f55c6d795daa89bdc1bae Author: Andi Kleen AuthorDate: Mon Apr 16 10:30:27 2007 +0200 Committer: Andi Kleen CommitDate: Mon Apr 16 10:30:27 2007 +0200 [PATCH] x86: Fix potential overflow in perfctr reservation While reviewing this code again I found a potential overflow of the bitmap. The p4 oprofile can theoretically set bits beyond the reservation bitmap for specific configurations. Avoid that by sizing the bitmaps properly. Signed-off-by: Andi Kleen --- arch/i386/kernel/nmi.c | 9 +++++---- arch/x86_64/kernel/nmi.c | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index a98ba88..9f1e8c1 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c @@ -41,16 +41,17 @@ int nmi_watchdog_enabled; * different subsystems this reservation system just tries to coordinate * things a little */ -static DEFINE_PER_CPU(unsigned long, perfctr_nmi_owner); -static DEFINE_PER_CPU(unsigned long, evntsel_nmi_owner[3]); - -static cpumask_t backtrace_mask = CPU_MASK_NONE; /* this number is calculated from Intel's MSR_P4_CRU_ESCR5 register and it's * offset from MSR_P4_BSU_ESCR0. It will be the max for all platforms (for now) */ #define NMI_MAX_COUNTER_BITS 66 +#define NMI_MAX_COUNTER_LONGS BITS_TO_LONGS(NMI_MAX_COUNTER_BITS) +static DEFINE_PER_CPU(unsigned long, perfctr_nmi_owner[NMI_MAX_COUNTER_LONGS]); +static DEFINE_PER_CPU(unsigned long, evntsel_nmi_owner[NMI_MAX_COUNTER_LONGS]); + +static cpumask_t backtrace_mask = CPU_MASK_NONE; /* nmi_active: * >0: the lapic NMI watchdog is active, but can be disabled * <0: the lapic NMI watchdog has not been set up, and cannot diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index a90996c..dfab9f1 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi.c @@ -39,15 +39,17 @@ int panic_on_unrecovered_nmi; * different subsystems this reservation system just tries to coordinate * things a little */ -static DEFINE_PER_CPU(unsigned, perfctr_nmi_owner); -static DEFINE_PER_CPU(unsigned, evntsel_nmi_owner[2]); - -static cpumask_t backtrace_mask = CPU_MASK_NONE; /* this number is calculated from Intel's MSR_P4_CRU_ESCR5 register and it's * offset from MSR_P4_BSU_ESCR0. It will be the max for all platforms (for now) */ #define NMI_MAX_COUNTER_BITS 66 +#define NMI_MAX_COUNTER_LONGS BITS_TO_LONGS(NMI_MAX_COUNTER_BITS) + +static DEFINE_PER_CPU(unsigned, perfctr_nmi_owner[NMI_MAX_COUNTER_LONGS]); +static DEFINE_PER_CPU(unsigned, evntsel_nmi_owner[NMI_MAX_COUNTER_LONGS]); + +static cpumask_t backtrace_mask = CPU_MASK_NONE; /* nmi_active: * >0: the lapic NMI watchdog is active, but can be disabled linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch: capiutil.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch --- Minimal fix for CAPI buffer overflow. Original patch by Karsten Keil Modified by Chuck Ebbert to unconditionally disable CAPI debug messages. Signed-off-by: Chuck Ebbert --- linux-2.6.16.21-0.23.org/drivers/isdn/capi/capiutil.c +++ linux-2.6.16.21-0.23/drivers/isdn/capi/capiutil.c @@ -647,7 +647,7 @@ char *capi_cmd2str(u8 cmd, u8 subcmd) return mnames[command_2_index(cmd, subcmd)]; } - +#if 0 /*-------------------------------------------------------*/ /*-------------------------------------------------------*/ @@ -849,6 +849,18 @@ char *capi_cmsg2str(_cmsg * cmsg) protocol_message_2_pars(cmsg, 1); return buf; } +#else + +char *capi_message2str(u8 * msg) +{ + return "capi_message2str not implemented"; +} + +char *capi_cmsg2str(_cmsg * cmsg) +{ + return "capi_cmsg2str not implemented"; +} +#endif EXPORT_SYMBOL(capi_cmsg2message); EXPORT_SYMBOL(capi_message2cmsg); linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch: oom_kill.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=650a7c974f1b91de9732c0f720e792837f8abfd6 Commit: 650a7c974f1b91de9732c0f720e792837f8abfd6 Parent: c445a31cd7f469d77acc37538ab43a99530968b8 Author: David Rientjes AuthorDate: Mon Apr 23 21:36:13 2007 -0700 Committer: Linus Torvalds CommitDate: Tue Apr 24 08:11:49 2007 -0700 oom: kill all threads that share mm with killed task oom_kill_task() calls __oom_kill_task() to OOM kill a selected task. When finding other threads that share an mm with that task, we need to kill those individual threads and not the same one. (Bug introduced by f2a2a7108aa0039ba7a5fe7a0d2ecef2219a7584) Acked-by: William Irwin Acked-by: Christoph Lameter Cc: Nick Piggin Cc: Andrew Morton Cc: Andi Kleen Signed-off-by: David Rientjes Signed-off-by: Linus Torvalds --- mm/oom_kill.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 2f39169..af981b6 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -333,7 +333,7 @@ static int oom_kill_task(struct task_struct *p) */ do_each_thread(g, q) { if (q->mm == mm && q->tgid != p->tgid) - force_sig(SIGKILL, p); + force_sig(SIGKILL, q); } while_each_thread(g, q); return 0; linux-2.6-20.8f-x86_64_always_flush_all_pages.patch: pageattr.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-20.8f-x86_64_always_flush_all_pages.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=90767bd13febfdf8a5f5077e2bb975f79d6b919c Commit: 90767bd13febfdf8a5f5077e2bb975f79d6b919c Parent: 9ce883becb83190061369940de9c415595836c9b Author: Andi Kleen AuthorDate: Tue Apr 24 13:05:37 2007 +0200 Committer: Andi Kleen CommitDate: Tue Apr 24 13:05:37 2007 +0200 [PATCH] x86-64: Always flush all pages in change_page_attr change_page_attr on x86-64 only flushed the TLB for pages that got reverted. That's not correct: it has to be flushed in all cases. This bug was added in some earlier changes. Just flush all pages for now. This could be done more efficiently, but for this late in the release this seem to be the best fix. Pointed out by Jan Beulich Signed-off-by: Andi Kleen --- arch/x86_64/mm/pageattr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86_64/mm/pageattr.c b/arch/x86_64/mm/pageattr.c index 65c5eaa..081409a 100644 --- a/arch/x86_64/mm/pageattr.c +++ b/arch/x86_64/mm/pageattr.c @@ -81,8 +81,8 @@ static void flush_kernel_map(void *arg) void *adr = page_address(pg); if (cpu_has_clflush) cache_flush_page(adr); - __flush_tlb_one(adr); } + __flush_tlb_all(); } static inline void flush_map(struct list_head *l) linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch: xfrm_user.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=661697f728d75302e1f661a58db2fcba71d5cbc9 Commit: 661697f728d75302e1f661a58db2fcba71d5cbc9 Parent: 279e172a580d415b83eba4f9fbbc77b08e546553 Author: Joy Latten AuthorDate: Fri Apr 13 16:14:35 2007 -0700 Committer: David S. Miller CommitDate: Fri Apr 13 16:14:35 2007 -0700 [IPSEC] XFRM_USER: kernel panic when large security contexts in ACQUIRE When sending a security context of 50+ characters in an ACQUIRE message, following kernel panic occurred. kernel BUG in xfrm_send_acquire at net/xfrm/xfrm_user.c:1781! cpu 0x3: Vector: 700 (Program Check) at [c0000000421bb2e0] pc: c00000000033b074: .xfrm_send_acquire+0x240/0x2c8 lr: c00000000033b014: .xfrm_send_acquire+0x1e0/0x2c8 sp: c0000000421bb560 msr: 8000000000029032 current = 0xc00000000fce8f00 paca = 0xc000000000464b00 pid = 2303, comm = ping kernel BUG in xfrm_send_acquire at net/xfrm/xfrm_user.c:1781! enter ? for help 3:mon> t [c0000000421bb650] c00000000033538c .km_query+0x6c/0xec [c0000000421bb6f0] c000000000337374 .xfrm_state_find+0x7f4/0xb88 [c0000000421bb7f0] c000000000332350 .xfrm_tmpl_resolve+0xc4/0x21c [c0000000421bb8d0] c0000000003326e8 .xfrm_lookup+0x1a0/0x5b0 [c0000000421bba00] c0000000002e6ea0 .ip_route_output_flow+0x88/0xb4 [c0000000421bbaa0] c0000000003106d8 .ip4_datagram_connect+0x218/0x374 [c0000000421bbbd0] c00000000031bc00 .inet_dgram_connect+0xac/0xd4 [c0000000421bbc60] c0000000002b11ac .sys_connect+0xd8/0x120 [c0000000421bbd90] c0000000002d38d0 .compat_sys_socketcall+0xdc/0x214 [c0000000421bbe30] c00000000000869c syscall_exit+0x0/0x40 --- Exception: c00 (System Call) at 0000000007f0ca9c SP (fc0ef8f0) is in userspace We are using size of security context from xfrm_policy to determine how much space to alloc skb and then putting security context from xfrm_state into skb. Should have been using size of security context from xfrm_state to alloc skb. Following fix does that Signed-off-by: Joy Latten Acked-by: James Morris Signed-off-by: David S. Miller --- net/xfrm/xfrm_user.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index e81e2fb..816e369 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -272,9 +272,8 @@ static int attach_encap_tmpl(struct xfrm_encap_tmpl **encapp, struct rtattr *u_a } -static inline int xfrm_user_sec_ctx_size(struct xfrm_policy *xp) +static inline int xfrm_user_sec_ctx_size(struct xfrm_sec_ctx *xfrm_ctx) { - struct xfrm_sec_ctx *xfrm_ctx = xp->security; int len = 0; if (xfrm_ctx) { @@ -2170,7 +2169,7 @@ static int xfrm_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *xt, len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr); len += NLMSG_SPACE(sizeof(struct xfrm_user_acquire)); - len += RTA_SPACE(xfrm_user_sec_ctx_size(xp)); + len += RTA_SPACE(xfrm_user_sec_ctx_size(x->security)); #ifdef CONFIG_XFRM_SUB_POLICY len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type)); #endif @@ -2280,7 +2279,7 @@ static int xfrm_exp_policy_notify(struct xfrm_policy *xp, int dir, struct km_eve len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr); len += NLMSG_SPACE(sizeof(struct xfrm_user_polexpire)); - len += RTA_SPACE(xfrm_user_sec_ctx_size(xp)); + len += RTA_SPACE(xfrm_user_sec_ctx_size(xp->security)); #ifdef CONFIG_XFRM_SUB_POLICY len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type)); #endif linux-2.6-20.8n-net_vlan_allow_with_bridge.patch: vlan_dev.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE linux-2.6-20.8n-net_vlan_allow_with_bridge.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=279e172a580d415b83eba4f9fbbc77b08e546553 Commit: 279e172a580d415b83eba4f9fbbc77b08e546553 Parent: 09fe3ef46c5a2cc65d173df9518013e208eb3ba3 Author: Jerome Borsboom AuthorDate: Fri Apr 13 16:12:47 2007 -0700 Committer: David S. Miller CommitDate: Fri Apr 13 16:12:47 2007 -0700 [VLAN]: Allow VLAN interface on top of bridge interface When a VLAN interface is created on top of a bridge interface and netfilter is enabled to see the bridged packets, the packets can be corrupted when passing through the netfilter code. This is caused by the VLAN driver not setting the 'protocol' and 'nh' members of the sk_buff structure. In general, this is no problem as the VLAN interface is mostly connected to a physical ethernet interface which does not use the 'protocol' and 'nh' members. For a bridge interface, however, these members do matter. Signed-off-by: Jerome Borsboom Signed-off-by: David S. Miller --- net/8021q/vlan_dev.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 2fc8fe2..b6e0eea 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -380,6 +380,9 @@ int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, } else { vhdr->h_vlan_encapsulated_proto = htons(len); } + + skb->protocol = htons(ETH_P_8021Q); + skb->nh.raw = skb->data; } /* Before delegating work to the lower layer, enter our MAC-address */ linux-2.6-20.8n-ppp_fix_skb_under_panic.patch: ppp_async.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-20.8n-ppp_fix_skb_under_panic.patch --- Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7c5050e3e49f6d89af0d63111611693d9625d1f5 Commit: 7c5050e3e49f6d89af0d63111611693d9625d1f5 Parent: 895e1fc7226e6732bc77138955b6c7dfa279f57a Author: Paul Mackerras AuthorDate: Thu Apr 19 13:05:52 2007 -0700 Committer: David S. Miller CommitDate: Thu Apr 19 13:05:52 2007 -0700 [PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet() From: Paul Mackerras This fixes: Subject: kernel BUG at net/core/skbuff.c in linux-2.6.21-rc6 process_input_packet() treats the case where the first byte is 0xff (PPP_ALLSTATIONS) but the second byte is 0x03 (PPP_UI) as indicating a packet with a PPP protocol number of 0xff. Arguably that's wrong since PPP protocol 0xff is reserved, and the RFC does envision the possibility of receiving frames where the control field has values other than 0x03. Signed-off-by: David S. Miller --- drivers/net/ppp_async.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c index 933e2f3..caabbc4 100644 --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c @@ -802,9 +802,9 @@ process_input_packet(struct asyncppp *ap) /* check for address/control and protocol compression */ p = skb->data; - if (p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) { + if (p[0] == PPP_ALLSTATIONS) { /* chop off address/control */ - if (skb->len < 3) + if (p[1] != PPP_UI || skb->len < 3) goto err; p = skb_pull(skb, 2); } linux-2.6-page_is_ram.patch: e820.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-page_is_ram.patch --- Make e820map non-initdata. Otherwise execshild is broken. --- linux-2.6.20.x86_64/arch/x86_64/kernel/e820.c.orig 2007-04-26 14:38:12.000000000 -0400 +++ linux-2.6.20.x86_64/arch/x86_64/kernel/e820.c 2007-04-26 14:38:24.000000000 -0400 @@ -25,7 +25,7 @@ #include #include -struct e820map e820 __initdata; +struct e820map e820; /* * PFN of last memory page. --- NEW FILE patch-2.6.20.10-11.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBGN9+qyGugalF9Dw4RAp6mAJ9GTQyYpln+s5442QpXRtoQMwztsACgh2HN +ja7W7F60EvN6prII08nHoQ= =fyPC -----END PGP SIGNATURE----- --- NEW FILE patch-2.6.20.9-10.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBGMnJ8yGugalF9Dw4RAswuAJ0Xv/NuAjc397yS9xyXF9J93q+2TgCgjRnj WRRoVHZln0Vi0xCvWnC4d08= =VVLI -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v retrieving revision 1.442 retrieving revision 1.443 diff -u -r1.442 -r1.443 --- .cvsignore 26 Apr 2007 15:04:06 -0000 1.442 +++ .cvsignore 2 May 2007 17:54:40 -0000 1.443 @@ -13,3 +13,5 @@ patch-2.6.20.6-7.bz2 patch-2.6.20.7-8.bz2 patch-2.6.20.8-9.bz2 +patch-2.6.20.9-10.bz2 +patch-2.6.20.10-11.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2316 retrieving revision 1.2317 diff -u -r1.2316 -r1.2317 --- kernel-2.6.spec 27 Apr 2007 22:41:56 -0000 1.2316 +++ kernel-2.6.spec 2 May 2007 17:54:40 -0000 1.2317 @@ -319,7 +319,8 @@ Patch7: patch-2.6.20.6-7.bz2 Patch8: patch-2.6.20.7-8.bz2 Patch9: patch-2.6.20.8-9.bz2 -Patch10: linux-2.6.20.10-unoffical.patch +Patch10: patch-2.6.20.9-10.bz2 +Patch11: patch-2.6.20.10-11.bz2 # Patches 10 through 99 are for things that are going upstream really soon. @@ -466,8 +467,18 @@ Patch1809: linux-2.6-21-rc6-readahead.patch Patch1810: linux-2.6-i386_pci-add_debugging.patch +# post 2.6.20.11 +Patch1830: linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch +Patch1831: linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch +Patch1832: linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch +Patch1833: linux-2.6-20.8f-x86_64_always_flush_all_pages.patch +Patch1834: linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch +Patch1835: linux-2.6-20.8n-net_vlan_allow_with_bridge.patch +Patch1836: linux-2.6-20.8n-ppp_fix_skb_under_panic.patch +Patch1837: linux-2.6-page_is_ram.patch + # SELinux/audit patches. -Patch1850: linux-2.6-selinux-mprotect-checks.patch +Patch1890: linux-2.6-selinux-mprotect-checks.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-oss-warning.patch @@ -884,6 +895,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -1105,8 +1117,18 @@ %patch1809 -p1 %patch1810 -p1 +# post 2.6.20.11 +%patch1830 -p1 +%patch1831 -p1 +%patch1832 -p1 +%patch1833 -p1 +%patch1834 -p1 +%patch1835 -p1 +%patch1836 -p1 +%patch1837 -p1 + # Fix the SELinux mprotect checks on executable mappings -%patch1850 -p1 +%patch1890 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1894,6 +1916,11 @@ %endif %changelog +* Tue May 05 2007 Chuck Ebbert 1.2317 +- 2.6.20.10 (official) +- 2.6.20.11 +- Additional fixes (1830 - 1837) + * Fri Apr 27 2007 Chuck Ebbert 1.2316 - 2.6.20.10 (from mailing list) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- sources 26 Apr 2007 15:04:07 -0000 1.382 +++ sources 2 May 2007 17:54:40 -0000 1.383 @@ -9,3 +9,5 @@ 557549a69f3ec7b615d252f302ad5099 patch-2.6.20.6-7.bz2 2d67b7c603a3cb081da1db6048bd7316 patch-2.6.20.7-8.bz2 931bd27010da400fc4902bef049904b9 patch-2.6.20.8-9.bz2 +26877e8750d036d6ea81a9bef6c685c6 patch-2.6.20.9-10.bz2 +71d6e53cf0accd8f09aa27ac9dd7f25d patch-2.6.20.10-11.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v retrieving revision 1.345 retrieving revision 1.346 diff -u -r1.345 -r1.346 --- upstream 26 Apr 2007 15:04:07 -0000 1.345 +++ upstream 2 May 2007 17:54:40 -0000 1.346 @@ -8,3 +8,5 @@ patch-2.6.20.6-7.bz2 patch-2.6.20.7-8.bz2 patch-2.6.20.8-9.bz2 +patch-2.6.20.9-10.bz2 +patch-2.6.20.10-11.bz2 --- linux-2.6.20.10-unoffical.patch DELETED --- From fedora-cvs-commits at redhat.com Thu May 3 09:02:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:02:45 -0400 Subject: rpms/vim/FC-6 7.0.202,NONE,1.1 Message-ID: <200705030902.l4392jsr015398@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15385 Added Files: 7.0.202 Log Message: Patchlevel 202 --- NEW FILE 7.0.202 --- To: vim-dev at vim.org Subject: patch 7.0.202 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.202 Problem: Problems on Tandem systems while compiling and at runtime. Solution: Recognize root uid is 65535. Check select() return value for it not being supported. Avoid wrong function prototypes. Mention use of -lfloss. (Matthew Woehlke) Files: src/Makefile, src/ex_cmds.c, src/fileio.c, src/main.c, src/osdef1.h.in, src/osdef2.h.in, src/os_unix.c, src/pty.c, src/vim.h *** ../vim-7.0.201/src/Makefile Tue Feb 20 04:46:41 2007 --- src/Makefile Tue Feb 27 10:24:05 2007 *************** *** 201,206 **** --- 201,207 ---- #SunOS 4.1.x +X11 -GUI 5.1b (J) Bram Moolenaar #SunOS 4.1.3_U1 (sun4c) gcc +X11 +GUI Athena 5.0w (J) Darren Hiebert #SUPER-UX 6.2 (NEC SX-4) cc +X11R6 Motif,Athena4.6b (P) Lennart Schultz + #Tandem/NSK (c) Matthew Woehlke #Unisys 6035 cc +X11 Motif 5.3 (8) Glauber Ribeiro #ESIX V4.2 cc +X11 6.0 (a) Reinhard Wobst #Mac OS X 10.[23] gcc Carbon 6.2 (x) Bram Moolenaar *************** *** 251,256 **** --- 252,258 ---- # (a) See line with EXTRA_LIBS below. # (b) When using gcc with the Solaris linker, make sure you don't use GNU # strip, otherwise the binary may not run: "Cannot find ELF". + # (c) Add -lfloss to EXTRA_LIBS, see below. # (x) When you get warnings for precompiled header files, run # "sudo fixPrecomps". Also see CONF_OPT_DARWIN below. # }}} *************** *** 793,798 **** --- 796,804 ---- ### (a) ESIX V4.2 (Reinhard Wobst) #EXTRA_LIBS = -lnsl -lsocket -lgen -lXIM -lXmu -lXext + + ### (c) Tandem/NSK (Matthew Woehlke) + #EXTRA_LIBS = -lfloss ### If you want to use ncurses library instead of the automatically found one ### after changing this, you need to do "make reconfig". *** ../vim-7.0.201/src/ex_cmds.c Tue Feb 13 03:49:01 2007 --- src/ex_cmds.c Tue Feb 20 05:20:55 2007 *************** *** 1772,1778 **** */ st_old.st_dev = st_old.st_ino = 0; st_old.st_mode = 0600; ! if (mch_stat((char *)fname, &st_old) == 0 && getuid() && !(st_old.st_uid == getuid() ? (st_old.st_mode & 0200) : (st_old.st_gid == getgid() --- 1772,1779 ---- */ st_old.st_dev = st_old.st_ino = 0; st_old.st_mode = 0600; ! if (mch_stat((char *)fname, &st_old) == 0 ! && getuid() != ROOT_UID && !(st_old.st_uid == getuid() ? (st_old.st_mode & 0200) : (st_old.st_gid == getgid() *** ../vim-7.0.201/src/fileio.c Tue Jan 16 21:31:38 2007 --- src/fileio.c Wed Feb 21 06:04:39 2007 *************** *** 1122,1128 **** if (!skip_read) { #if SIZEOF_INT > 2 ! # ifdef __TANDEM size = SSIZE_MAX; /* use max I/O size, 52K */ # else size = 0x10000L; /* use buffer >= 64K */ --- 1122,1128 ---- if (!skip_read) { #if SIZEOF_INT > 2 ! # if defined(SSIZE_MAX) && (SSIZE_MAX < 0x10000L) size = SSIZE_MAX; /* use max I/O size, 52K */ # else size = 0x10000L; /* use buffer >= 64K */ *** ../vim-7.0.201/src/main.c Tue Nov 7 22:41:37 2006 --- src/main.c Tue Feb 20 05:22:33 2007 *************** *** 3280,3286 **** # ifdef FEAT_GUI (gui.in_use # ifdef UNIX ! && getuid() != 0 # endif ) || # endif --- 3280,3286 ---- # ifdef FEAT_GUI (gui.in_use # ifdef UNIX ! && getuid() != ROOT_UID # endif ) || # endif *** ../vim-7.0.201/src/osdef1.h.in Sun Jun 13 21:14:18 2004 --- src/osdef1.h.in Tue Feb 20 05:13:23 2007 *************** *** 98,104 **** --- 98,106 ---- #ifndef USE_SYSTEM extern int fork __ARGS((void)); + # ifndef __TANDEM extern int execvp __ARGS((const char *, const char **)); + # endif extern int wait __ARGS((int *)); /* will this break things ...? */ extern int waitpid __ARGS((pid_t, int *, int)); #endif *************** *** 123,132 **** extern int kill __ARGS((int, int)); extern int access __ARGS((char *, int)); extern int fsync __ARGS((int)); extern int fchown __ARGS((int, int, int)); ! #if defined(HAVE_GETCWD) && !defined(sun) extern char *getcwd __ARGS((char *, int)); #else extern char *getwd __ARGS((char *)); --- 125,136 ---- extern int kill __ARGS((int, int)); + #ifndef __TANDEM extern int access __ARGS((char *, int)); + #endif extern int fsync __ARGS((int)); extern int fchown __ARGS((int, int, int)); ! #if defined(HAVE_GETCWD) && !defined(sun) && !defined(__TANDEM) extern char *getcwd __ARGS((char *, int)); #else extern char *getwd __ARGS((char *)); *** ../vim-7.0.201/src/osdef2.h.in Sun Jun 13 17:19:40 2004 --- src/osdef2.h.in Tue Feb 20 05:14:50 2007 *************** *** 11,23 **** --- 11,29 ---- extern int setenv __ARGS((char *, char *, int)); extern int putenv __ARGS((const char *)); + #ifndef __TANDEM extern int gethostname __ARGS((char *, int)); + #endif extern void perror __ARGS((char *)); + #ifndef __TANDEM extern int sleep __ARGS((int)); + #endif extern int usleep __ARGS((unsigned int)); extern unsigned int alarm __ARGS((unsigned int)); + #ifndef __TANDEM extern int chdir __ARGS((char *)); + #endif extern int fchdir __ARGS((int)); #ifndef stat /* could be redefined to stat64() */ extern int stat __ARGS((const char *, struct stat *)); *************** *** 28,35 **** --- 34,43 ---- extern int fstat __ARGS((int, struct stat *)); extern int open __ARGS((const char *, int, ...)); extern int close __ARGS((int)); + #ifndef __TANDEM extern int read __ARGS((int, char *, size_t)); extern int write __ARGS((int, char *, size_t)); + #endif extern int pipe __ARGS((int *)); extern off_t lseek __ARGS((int, off_t, int)); extern void sync __ARGS((void)); *** ../vim-7.0.201/src/os_unix.c Tue Jan 9 15:15:36 2007 --- src/os_unix.c Tue Feb 20 05:17:23 2007 *************** *** 25,31 **** * Don't use it for the Mac, it causes a warning for precompiled headers. * TODO: use a configure check for precompiled headers? */ ! #ifndef __APPLE__ # define select select_declared_wrong #endif --- 25,31 ---- * Don't use it for the Mac, it causes a warning for precompiled headers. * TODO: use a configure check for precompiled headers? */ ! #if !defined(__APPLE__) && !defined(__TANDEM) # define select select_declared_wrong #endif *************** *** 48,56 **** /* * Use this prototype for select, some include files have a wrong prototype */ ! #undef select ! #ifdef __BEOS__ ! # define select beos_select #endif #if defined(HAVE_SELECT) --- 48,58 ---- /* * Use this prototype for select, some include files have a wrong prototype */ ! #ifndef __TANDEM ! # undef select ! # ifdef __BEOS__ ! # define select beos_select ! # endif #endif #if defined(HAVE_SELECT) *************** *** 4770,4775 **** --- 4772,4785 ---- # else ret = select(maxfd + 1, &rfds, NULL, &efds, tvp); # endif + # ifdef __TANDEM + if (ret == -1 && errno == ENOTSUP) + { + FD_ZERO(&rfds); + FD_ZERO(&efds); + ret = 0; + } + #endif # ifdef FEAT_MZSCHEME if (ret == 0 && mzquantum_used) /* loop if MzThreads must be scheduled and timeout occured */ *** ../vim-7.0.201/src/pty.c Wed Nov 1 18:12:46 2006 --- src/pty.c Tue Feb 20 05:21:22 2007 *************** *** 330,336 **** if ((f = open("/dev/ptc", O_RDWR | O_NOCTTY | O_EXTRA)) < 0) return -1; strncpy(TtyName, ttyname(f), sizeof(TtyName)); ! if (geteuid() && mch_access(TtyName, R_OK | W_OK)) { close(f); return -1; --- 330,336 ---- if ((f = open("/dev/ptc", O_RDWR | O_NOCTTY | O_EXTRA)) < 0) return -1; strncpy(TtyName, ttyname(f), sizeof(TtyName)); ! if (geteuid() != ROOT_UID && mch_access(TtyName, R_OK | W_OK)) { close(f); return -1; *************** *** 394,400 **** q[0] = *l; q[1] = *d; #ifndef MACOS ! if (geteuid() && mch_access(TtyName, R_OK | W_OK)) { close(f); continue; --- 394,400 ---- q[0] = *l; q[1] = *d; #ifndef MACOS ! if (geteuid() != ROOT_UID && mch_access(TtyName, R_OK | W_OK)) { close(f); continue; *** ../vim-7.0.201/src/vim.h Tue Jan 16 21:31:38 2007 --- src/vim.h Tue Feb 20 05:23:47 2007 *************** *** 50,55 **** --- 50,64 ---- # endif #endif + /* user ID of root is usually zero, but not for everybody */ + #ifdef __TANDEM + # define _TANDEM_SOURCE + # include + # define ROOT_UID 65535 + #else + # define ROOT_UID 0 + #endif + #ifdef __EMX__ /* hand-edited config.h for OS/2 with EMX */ # include "os_os2_cfg.h" #endif *** ../vim-7.0.201/src/version.c Tue Feb 20 04:46:32 2007 --- src/version.c Tue Feb 27 16:44:14 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 202, /**/ -- hundred-and-one symptoms of being an internet addict: 214. Your MCI "Circle of Friends" are all Hayes-compatible. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:02:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:02:48 -0400 Subject: rpms/vim/FC-6 7.0.203,NONE,1.1 Message-ID: <200705030902.l4392m16015419@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15406 Added Files: 7.0.203 Log Message: Patchlevel 203 --- NEW FILE 7.0.203 --- To: vim-dev at vim.org Subject: patch 7.0.203 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.203 Problem: 0x80 characters in a register are not handled correctly for the "@" command. Solution: Escape CSI and 0x80 characters. (Yukihiro Nakadaira) Files: src/ops.c *** ../vim-7.0.202/src/ops.c Tue Nov 7 18:43:10 2006 --- src/ops.c Tue Feb 27 17:24:02 2007 *************** *** 96,102 **** #endif static int stuff_yank __ARGS((int, char_u *)); static void put_reedit_in_typebuf __ARGS((int silent)); ! static int put_in_typebuf __ARGS((char_u *s, int colon, int silent)); static void stuffescaped __ARGS((char_u *arg, int literally)); #ifdef FEAT_MBYTE static void mb_adjust_opend __ARGS((oparg_T *oap)); --- 96,103 ---- #endif static int stuff_yank __ARGS((int, char_u *)); static void put_reedit_in_typebuf __ARGS((int silent)); ! static int put_in_typebuf __ARGS((char_u *s, int esc, int colon, ! int silent)); static void stuffescaped __ARGS((char_u *arg, int literally)); #ifdef FEAT_MBYTE static void mb_adjust_opend __ARGS((oparg_T *oap)); *************** *** 1174,1182 **** /* When in Visual mode "'<,'>" will be prepended to the command. * Remove it when it's already there. */ if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) ! retval = put_in_typebuf(p + 5, TRUE, silent); else ! retval = put_in_typebuf(p, TRUE, silent); } vim_free(p); } --- 1175,1183 ---- /* When in Visual mode "'<,'>" will be prepended to the command. * Remove it when it's already there. */ if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) ! retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); else ! retval = put_in_typebuf(p, TRUE, TRUE, silent); } vim_free(p); } *************** *** 1187,1193 **** p = get_expr_line(); if (p == NULL) return FAIL; ! retval = put_in_typebuf(p, colon, silent); vim_free(p); } #endif --- 1188,1194 ---- p = get_expr_line(); if (p == NULL) return FAIL; ! retval = put_in_typebuf(p, TRUE, colon, silent); vim_free(p); } #endif *************** *** 1199,1205 **** EMSG(_(e_noinstext)); return FAIL; } ! retval = put_in_typebuf(p, colon, silent); vim_free(p); } else --- 1200,1206 ---- EMSG(_(e_noinstext)); return FAIL; } ! retval = put_in_typebuf(p, FALSE, colon, silent); vim_free(p); } else *************** *** 1217,1222 **** --- 1218,1225 ---- put_reedit_in_typebuf(silent); for (i = y_current->y_size; --i >= 0; ) { + char_u *escaped; + /* insert NL between lines and after last line if type is MLINE */ if (y_current->y_type == MLINE || i < y_current->y_size - 1 || addcr) *************** *** 1224,1231 **** if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) return FAIL; } ! if (ins_typebuf(y_current->y_array[i], remap, 0, TRUE, silent) ! == FAIL) return FAIL; if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) == FAIL) --- 1227,1238 ---- if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) return FAIL; } ! escaped = vim_strsave_escape_csi(y_current->y_array[i]); ! if (escaped == NULL) ! return FAIL; ! retval = ins_typebuf(escaped, remap, 0, TRUE, silent); ! vim_free(escaped); ! if (retval == FAIL) return FAIL; if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) == FAIL) *************** *** 1265,1272 **** } static int ! put_in_typebuf(s, colon, silent) char_u *s; int colon; /* add ':' before the line */ int silent; { --- 1272,1280 ---- } static int ! put_in_typebuf(s, esc, colon, silent) char_u *s; + int esc; /* Escape CSI characters */ int colon; /* add ':' before the line */ int silent; { *************** *** 1276,1282 **** if (colon) retval = ins_typebuf((char_u *)"\n", REMAP_YES, 0, TRUE, silent); if (retval == OK) ! retval = ins_typebuf(s, REMAP_YES, 0, TRUE, silent); if (colon && retval == OK) retval = ins_typebuf((char_u *)":", REMAP_YES, 0, TRUE, silent); return retval; --- 1284,1303 ---- if (colon) retval = ins_typebuf((char_u *)"\n", REMAP_YES, 0, TRUE, silent); if (retval == OK) ! { ! char_u *p; ! ! if (esc) ! p = vim_strsave_escape_csi(s); ! else ! p = s; ! if (p == NULL) ! retval = FAIL; ! else ! retval = ins_typebuf(p, REMAP_YES, 0, TRUE, silent); ! if (esc) ! vim_free(p); ! } if (colon && retval == OK) retval = ins_typebuf((char_u *)":", REMAP_YES, 0, TRUE, silent); return retval; *** ../vim-7.0.202/src/version.c Tue Feb 27 16:51:07 2007 --- src/version.c Tue Feb 27 17:22:13 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 203, /**/ -- hundred-and-one symptoms of being an internet addict: 215. Your mouse-clicking forearm rivals Popeye's. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:02:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:02:51 -0400 Subject: rpms/vim/FC-6 7.0.204,NONE,1.1 Message-ID: <200705030902.l4392pCP015441@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15426 Added Files: 7.0.204 Log Message: Patchlevel 204 --- NEW FILE 7.0.204 --- To: vim-dev at vim.org Subject: patch 7.0.204 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.204 Problem: Cscope: Parsing matches for listing isn't done properly. Solution: Check for line number being found. (Yu Zhao) Files: src/if_cscope.c *** ../vim-7.0.203/src/if_cscope.c Tue Jan 16 15:17:43 2007 --- src/if_cscope.c Tue Feb 27 17:56:49 2007 *************** *** 1932,1945 **** if ((fname = strtok(NULL, (const char *)"\t")) == NULL) continue; if ((lno = strtok(NULL, (const char *)"\t")) == NULL) ! { ! /* if NULL, then no "extra", although in cscope's case, there ! * should always be "extra". ! */ ! extra = NULL; ! } ! ! extra = lno + strlen(lno) + 1; lno[strlen(lno)-2] = '\0'; /* ignore ;" at the end */ --- 1932,1939 ---- if ((fname = strtok(NULL, (const char *)"\t")) == NULL) continue; if ((lno = strtok(NULL, (const char *)"\t")) == NULL) ! continue; ! extra = strtok(NULL, (const char *)"\t"); lno[strlen(lno)-2] = '\0'; /* ignore ;" at the end */ *** ../vim-7.0.203/src/version.c Tue Feb 27 17:25:28 2007 --- src/version.c Tue Feb 27 18:03:48 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 204, /**/ -- I noticed my daughter's Disney-net password on a sticky note: "MickeyMinnieGoofyPluto". I asked her why it was so long. "Because they say it has to have at least four characters." /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:02:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:02:55 -0400 Subject: rpms/vim/FC-6 7.0.205,NONE,1.1 Message-ID: <200705030902.l4392tl8015461@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15448 Added Files: 7.0.205 Log Message: Patchlevel 205 --- NEW FILE 7.0.205 --- To: vim-dev at vim.org Subject: patch 7.0.205 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.205 (after 7.0.203) Problem: Can't compile. Solution: Always include the vim_strsave_escape_csi function. Files: src/getchar.c *** ../vim-7.0.204/src/getchar.c Tue Dec 5 21:45:20 2006 --- src/getchar.c Tue Feb 27 23:04:38 2007 *************** *** 4401,4407 **** } #endif - #if defined(FEAT_EVAL) || defined(PROTO) /* * Copy "p" to allocated memory, escaping K_SPECIAL and CSI so that the result * can be put in the typeahead buffer. --- 4405,4410 ---- *************** *** 4440,4446 **** } return res; } - #endif /* * Write map commands for the current mappings to an .exrc file. --- 4443,4448 ---- *** ../vim-7.0.204/src/version.c Tue Feb 27 18:11:55 2007 --- src/version.c Tue Feb 27 23:05:15 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 205, /**/ -- hundred-and-one symptoms of being an internet addict: 218. Your spouse hands you a gift wrapped magnet with your PC's name on it and you accuse him or her of genocide. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:02:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:02:58 -0400 Subject: rpms/vim/FC-6 7.0.206,NONE,1.1 Message-ID: <200705030902.l4392wgE015481@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15468 Added Files: 7.0.206 Log Message: Patchlevel 206 --- NEW FILE 7.0.206 --- To: vim-dev at vim.org Subject: patch 7.0.206 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.206 (after 7.0.058) Problem: Some characters of the "gb18030" encoding are not handled properly. Solution: Do not use "cp936" as an alias for "gb18030" encoding. Instead initialize 'encoding' to "cp936". Files: src/mbyte.c, src/option.c *** ../vim-7.0.205/src/mbyte.c Tue Dec 5 22:09:02 2006 --- src/mbyte.c Tue Feb 27 16:27:44 2007 *************** *** 364,370 **** {"949", IDX_CP949}, {"936", IDX_CP936}, {"gbk", IDX_CP936}, - {"gb18030", IDX_CP936}, /* only 99% the same */ {"950", IDX_CP950}, {"eucjp", IDX_EUC_JP}, {"unix-jis", IDX_EUC_JP}, --- 364,369 ---- *** ../vim-7.0.205/src/option.c Tue Oct 17 18:36:03 2006 --- src/option.c Thu Mar 1 21:02:06 2007 *************** *** 3290,3295 **** --- 3290,3303 ---- * If not, go back to the default "latin1". */ save_enc = p_enc; p_enc = p; + if (STRCMP(p_enc, "gb18030") == 0) + { + /* We don't support "gb18030", but "cp936" is a good substitute + * for practical purposes, thus use that. It's not an alias to + * still support conversion between gb18030 and utf-8. */ + p_enc = vim_strsave((char_u *)"cp936"); + vim_free(p); + } if (mb_init() == NULL) { opt_idx = findoption((char_u *)"encoding"); *** ../vim-7.0.205/src/version.c Tue Feb 27 23:06:44 2007 --- src/version.c Fri Mar 2 19:58:04 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 206, /**/ -- You can tune a file system, but you can't tuna fish -- man tunefs /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:01 -0400 Subject: rpms/vim/FC-6 7.0.207,NONE,1.1 Message-ID: <200705030903.l43931Kc015501@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15488 Added Files: 7.0.207 Log Message: Patchlevel 207 --- NEW FILE 7.0.207 --- To: vim-dev at vim.org Subject: patch 7.0.207 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.207 Problem: After patch 2.0.203 CSI and K_SPECIAL characters are escaped when recorded and then again when the register is executed. Solution: Remove escaping before putting the recorded characters in a register. (Yukihiro Nakadaira) Files: src/getchar.c, src/ops.c, src/proto/getchar.pro *** ../vim-7.0.206/src/getchar.c Tue Feb 27 23:06:44 2007 --- src/getchar.c Sun Mar 4 21:19:50 2007 *************** *** 4438,4443 **** --- 4442,4476 ---- *d = NUL; } return res; + } + + /* + * Remove escaping from CSI and K_SPECIAL characters. Reverse of + * vim_strsave_escape_csi(). Works in-place. + */ + void + vim_unescape_csi(p) + char_u *p; + { + char_u *s = p, *d = p; + + while (*s != NUL) + { + if (s[0] == K_SPECIAL && s[1] == KS_SPECIAL && s[2] == KE_FILLER) + { + *d++ = K_SPECIAL; + s += 3; + } + else if ((s[0] == K_SPECIAL || s[0] == CSI) + && s[1] == KS_EXTRA && s[2] == (int)KE_CSI) + { + *d++ = CSI; + s += 3; + } + else + *d++ = *s++; + } + *d = NUL; } /* *** ../vim-7.0.206/src/ops.c Tue Feb 27 17:25:28 2007 --- src/ops.c Sun Mar 4 21:23:47 2007 *************** *** 1042,1047 **** --- 1042,1050 ---- retval = FAIL; else { + /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ + vim_unescape_csi(p); + /* * We don't want to change the default register here, so save and * restore the current register name. *** ../vim-7.0.206/src/proto/getchar.pro Sun Apr 30 20:38:15 2006 --- src/proto/getchar.pro Sun Mar 4 21:19:41 2007 *************** *** 56,61 **** --- 56,62 ---- extern int ExpandMappings __ARGS((regmatch_T *regmatch, int *num_file, char_u ***file)); extern int check_abbr __ARGS((int c, char_u *ptr, int col, int mincol)); extern char_u *vim_strsave_escape_csi __ARGS((char_u *p)); + extern void vim_unescape_csi __ARGS((char_u *p)); extern int makemap __ARGS((FILE *fd, buf_T *buf)); extern int put_escstr __ARGS((FILE *fd, char_u *strstart, int what)); extern void check_map_keycodes __ARGS((void)); *** ../vim-7.0.206/src/version.c Fri Mar 2 20:00:06 2007 --- src/version.c Sun Mar 4 21:24:26 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 207, /**/ -- hundred-and-one symptoms of being an internet addict: 251. You've never seen your closest friends who usually live WAY too far away. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:05 -0400 Subject: rpms/vim/FC-6 7.0.208,NONE,1.1 Message-ID: <200705030903.l43935MT015521@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15508 Added Files: 7.0.208 Log Message: Patchlevel 208 --- NEW FILE 7.0.208 --- To: vim-dev at vim.org Subject: patch 7.0.208 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.208 (after 7.0.171 and 7.0.180) Problem: VMS: changes to path handling cause more trouble than they solve. Solution: Revert changes. Files: src/buffer.c, src/memline.c, src/os_unix.c *** ../vim-7.0.207/src/buffer.c Tue Nov 28 17:44:51 2006 --- src/buffer.c Mon Mar 5 21:34:41 2007 *************** *** 4145,4157 **** /* * Force expanding the path always for Unix, because symbolic links may * mess up the full path name, even though it starts with a '/'. - * Also expand always for VMS, it may have alternate paths that need to be - * resolved. * Also expand when there is ".." in the file name, try to remove it, * because "c:/src/../README" is equal to "c:/README". * For MS-Windows also expand names like "longna~1" to "longname". */ ! #if defined(UNIX) || defined(VMS) return FullName_save(fname, TRUE); #else if (!vim_isAbsName(fname) || strstr((char *)fname, "..") != NULL --- 4145,4155 ---- /* * Force expanding the path always for Unix, because symbolic links may * mess up the full path name, even though it starts with a '/'. * Also expand when there is ".." in the file name, try to remove it, * because "c:/src/../README" is equal to "c:/README". * For MS-Windows also expand names like "longna~1" to "longname". */ ! #ifdef UNIX return FullName_save(fname, TRUE); #else if (!vim_isAbsName(fname) || strstr((char *)fname, "..") != NULL *** ../vim-7.0.207/src/memline.c Tue Feb 13 04:03:05 2007 --- src/memline.c Mon Mar 5 21:34:41 2007 *************** *** 3592,3600 **** #else (buf->b_p_sn || buf->b_shortname), #endif ! #if defined(VMS) || defined(RISCOS) ! /* Avoid problems if fname has special chars, eg . ! * For VMS always use full path for swapfile. */ ffname, #else # ifdef HAVE_READLINK --- 3592,3599 ---- #else (buf->b_p_sn || buf->b_shortname), #endif ! #ifdef RISCOS ! /* Avoid problems if fname has special chars, eg */ ffname, #else # ifdef HAVE_READLINK *** ../vim-7.0.207/src/os_unix.c Tue Feb 27 16:51:07 2007 --- src/os_unix.c Mon Mar 5 21:40:31 2007 *************** *** 2214,2262 **** int len; int force; /* also expand when already absolute path */ { - #ifdef VMS - /* - * VMS does this in a completely different way. - * - * By default a file found in a complex path is written to the first - * directory in the path and not to the original directory. This - * behaviour should be avoided for the existing files and we need to find - * the exact path of the edited file. - */ - { - char_u *fixed_fname = vms_fixfilename(fname); - int fd = mch_open((char *)fixed_fname, O_RDONLY | O_EXTRA, 0); - - if (fd > 0) - { - char nbuf[MAXNAMLEN]; - - /* File exists, use getname() to get the real name. */ - if (getname(fd, nbuf)) - vim_strncpy(fixed_fname, (char_u *)nbuf, (size_t)(len - 1)); - close(fd); - } - - if (STRLEN(fixed_fname) >= len) - return FAIL; - - STRCPY(buf, fixed_fname); - } - - #else /* not VMS */ - int l; ! # ifdef OS2 int only_drive; /* file name is only a drive letter */ ! # endif ! # ifdef HAVE_FCHDIR int fd = -1; static int dont_fchdir = FALSE; /* TRUE when fchdir() doesn't work */ ! # endif char_u olddir[MAXPATHL]; char_u *p; int retval = OK; /* expand it if forced or not an absolute path */ if (force || !mch_isFullName(fname)) { --- 2214,2235 ---- int len; int force; /* also expand when already absolute path */ { int l; ! #ifdef OS2 int only_drive; /* file name is only a drive letter */ ! #endif ! #ifdef HAVE_FCHDIR int fd = -1; static int dont_fchdir = FALSE; /* TRUE when fchdir() doesn't work */ ! #endif char_u olddir[MAXPATHL]; char_u *p; int retval = OK; + #ifdef VMS + fname = vms_fixfilename(fname); + #endif + /* expand it if forced or not an absolute path */ if (force || !mch_isFullName(fname)) { *************** *** 2265,2280 **** * and then do the getwd() (and get back to where we were). * This will get the correct path name with "../" things. */ ! # ifdef OS2 only_drive = 0; if (((p = vim_strrchr(fname, '/')) != NULL) || ((p = vim_strrchr(fname, '\\')) != NULL) || (((p = vim_strchr(fname, ':')) != NULL) && ++only_drive)) ! # else if ((p = vim_strrchr(fname, '/')) != NULL) ! # endif { ! # ifdef HAVE_FCHDIR /* * Use fchdir() if possible, it's said to be faster and more * reliable. But on SunOS 4 it might not work. Check this by --- 2238,2253 ---- * and then do the getwd() (and get back to where we were). * This will get the correct path name with "../" things. */ ! #ifdef OS2 only_drive = 0; if (((p = vim_strrchr(fname, '/')) != NULL) || ((p = vim_strrchr(fname, '\\')) != NULL) || (((p = vim_strchr(fname, ':')) != NULL) && ++only_drive)) ! #else if ((p = vim_strrchr(fname, '/')) != NULL) ! #endif { ! #ifdef HAVE_FCHDIR /* * Use fchdir() if possible, it's said to be faster and more * reliable. But on SunOS 4 it might not work. Check this by *************** *** 2290,2303 **** dont_fchdir = TRUE; /* don't try again */ } } ! # endif /* Only change directory when we are sure we can return to where * we are now. After doing "su" chdir(".") might not work. */ if ( ! # ifdef HAVE_FCHDIR fd < 0 && ! # endif (mch_dirname(olddir, MAXPATHL) == FAIL || mch_chdir((char *)olddir) != 0)) { --- 2263,2276 ---- dont_fchdir = TRUE; /* don't try again */ } } ! #endif /* Only change directory when we are sure we can return to where * we are now. After doing "su" chdir(".") might not work. */ if ( ! #ifdef HAVE_FCHDIR fd < 0 && ! #endif (mch_dirname(olddir, MAXPATHL) == FAIL || mch_chdir((char *)olddir) != 0)) { *************** *** 2306,2312 **** } else { ! # ifdef OS2 /* * compensate for case where ':' from "D:" was the only * path separator detected in the file name; the _next_ --- 2279,2285 ---- } else { ! #ifdef OS2 /* * compensate for case where ':' from "D:" was the only * path separator detected in the file name; the _next_ *************** *** 2314,2320 **** */ if (only_drive) p++; ! # endif /* The directory is copied into buf[], to be able to remove * the file name without changing it (could be a string in * read-only memory) */ --- 2287,2293 ---- */ if (only_drive) p++; ! #endif /* The directory is copied into buf[], to be able to remove * the file name without changing it (could be a string in * read-only memory) */ *************** *** 2329,2342 **** fname = p + 1; *buf = NUL; } ! # ifdef OS2 if (only_drive) { p--; if (retval != FAIL) fname--; } ! # endif } } if (mch_dirname(buf, len) == FAIL) --- 2302,2315 ---- fname = p + 1; *buf = NUL; } ! #ifdef OS2 if (only_drive) { p--; if (retval != FAIL) fname--; } ! #endif } } if (mch_dirname(buf, len) == FAIL) *************** *** 2346,2359 **** } if (p != NULL) { ! # ifdef HAVE_FCHDIR if (fd >= 0) { l = fchdir(fd); close(fd); } else ! # endif l = mch_chdir((char *)olddir); if (l != 0) EMSG(_(e_prev_dir)); --- 2319,2332 ---- } if (p != NULL) { ! #ifdef HAVE_FCHDIR if (fd >= 0) { l = fchdir(fd); close(fd); } else ! #endif l = mch_chdir((char *)olddir); if (l != 0) EMSG(_(e_prev_dir)); *************** *** 2362,2373 **** --- 2335,2348 ---- l = STRLEN(buf); if (l >= len) retval = FAIL; + #ifndef VMS else { if (l > 0 && buf[l - 1] != '/' && *fname != NUL && STRCMP(fname, ".") != 0) STRCAT(buf, "/"); } + #endif } /* Catch file names which are too long. */ *************** *** 2377,2384 **** /* Do not append ".", "/dir/." is equal to "/dir". */ if (STRCMP(fname, ".") != 0) STRCAT(buf, fname); - - #endif /* VMS */ return OK; } --- 2352,2357 ---- *** ../vim-7.0.207/src/version.c Sun Mar 4 21:25:44 2007 --- src/version.c Tue Mar 6 20:22:52 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 208, /**/ -- hundred-and-one symptoms of being an internet addict: 262. Your computer has it's own phone line - but your daughter doesn't. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:08 -0400 Subject: rpms/vim/FC-6 7.0.209,NONE,1.1 Message-ID: <200705030903.l43938wK015541@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15528 Added Files: 7.0.209 Log Message: Patchlevel 209 --- NEW FILE 7.0.209 --- To: vim-dev at vim.org Subject: patch 7.0.209 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.209 Problem: When replacing a line through Python the cursor may end up beyond the end of the line. Solution: Check the cursor column after replacing the line. Files: src/if_python.c *** ../vim-7.0.208/src/if_python.c Tue Oct 3 15:02:11 2006 --- src/if_python.c Tue Mar 6 23:00:53 2007 *************** *** 2410,2415 **** --- 2410,2417 ---- curwin->w_cursor.lnum = lo; check_cursor(); } + else + check_cursor_col(); changed_cline_bef_curs(); } invalidate_botline(); *************** *** 2486,2491 **** --- 2488,2497 ---- changed_bytes((linenr_T)n, 0); curbuf = savebuf; + + /* Check that the cursor is not beyond the end of the line now. */ + if (buf == curwin->w_buffer) + check_cursor_col(); if (PyErr_Occurred() || VimErrorCheck()) return FAIL; *** ../vim-7.0.208/src/version.c Tue Mar 6 20:27:03 2007 --- src/version.c Thu Mar 8 10:16:23 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 209, /**/ -- In his lifetime van Gogh painted 486 oil paintings. Oddly enough, 8975 of them are to be found in the United States. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:11 -0400 Subject: rpms/vim/FC-6 7.0.210,NONE,1.1 Message-ID: <200705030903.l4393BMm015561@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15548 Added Files: 7.0.210 Log Message: Patchlevel 210 --- NEW FILE 7.0.210 --- # KH: Modified for the runtime-update patch To: vim-dev at vim.org Subject: patch 7.0.210 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.210 Problem: ":cbuffer" and ":lbuffer" always fail when the buffer is modified. (Gary Johnson) Solution: Support adding a !. (Yegappan Lakshmanan) Files: runtime/doc/quickfix.txt, src/ex_cmds.h --- vim70/runtime/doc/quickfix.txt.210 2007-03-30 11:03:58.000000000 +0200 +++ runtime/doc/quickfix.txt 2007-03-30 11:07:04.000000000 +0200 @@ -178,15 +178,16 @@ current window is used instead of the quickfix list. *:cb* *:cbuffer* *E681* -:cb[uffer] [bufnr] Read the error list from the current buffer. +:cb[uffer][!] [bufnr] Read the error list from the current buffer. When [bufnr] is given it must be the number of a loaded buffer. That buffer will then be used instead of the current buffer. A range can be specified for the lines to be used. Otherwise all lines in the buffer are used. + See |:cc| for [!]. *:lb* *:lbuffer* -:lb[uffer] [bufnr] Same as ":cbuffer", except the location list for the +:lb[uffer][!] [bufnr] Same as ":cbuffer", except the location list for the current window is used instead of the quickfix list. *:cgetb* *:cgetbuffer* --- 178,193 ---- current window is used instead of the quickfix list. *:cb* *:cbuffer* *E681* ! :cb[uffer][!] [bufnr] Read the error list from the current buffer. When [bufnr] is given it must be the number of a loaded buffer. That buffer will then be used instead of the current buffer. A range can be specified for the lines to be used. Otherwise all lines in the buffer are used. + See |:cc| for [!]. *:lb* *:lbuffer* ! :lb[uffer][!] [bufnr] Same as ":cbuffer", except the location list for the current window is used instead of the quickfix list. *:cgetb* *:cgetbuffer* *** ../vim-7.0.209/src/ex_cmds.h Thu Jun 22 21:15:46 2006 --- src/ex_cmds.h Wed Mar 7 21:53:27 2007 *************** *** 198,204 **** EX(CMD_catch, "catch", ex_catch, EXTRA|SBOXOK|CMDWIN), EX(CMD_cbuffer, "cbuffer", ex_cbuffer, ! RANGE|NOTADR|WORD1|TRLBAR), EX(CMD_cc, "cc", ex_cc, RANGE|NOTADR|COUNT|TRLBAR|BANG), EX(CMD_cclose, "cclose", ex_cclose, --- 198,204 ---- EX(CMD_catch, "catch", ex_catch, EXTRA|SBOXOK|CMDWIN), EX(CMD_cbuffer, "cbuffer", ex_cbuffer, ! BANG|RANGE|NOTADR|WORD1|TRLBAR), EX(CMD_cc, "cc", ex_cc, RANGE|NOTADR|COUNT|TRLBAR|BANG), EX(CMD_cclose, "cclose", ex_cclose, *************** *** 498,504 **** EX(CMD_later, "later", ex_later, TRLBAR|EXTRA|NOSPC|CMDWIN), EX(CMD_lbuffer, "lbuffer", ex_cbuffer, ! RANGE|NOTADR|WORD1|TRLBAR), EX(CMD_lcd, "lcd", ex_cd, BANG|FILE1|TRLBAR|CMDWIN), EX(CMD_lchdir, "lchdir", ex_cd, --- 498,504 ---- EX(CMD_later, "later", ex_later, TRLBAR|EXTRA|NOSPC|CMDWIN), EX(CMD_lbuffer, "lbuffer", ex_cbuffer, ! BANG|RANGE|NOTADR|WORD1|TRLBAR), EX(CMD_lcd, "lcd", ex_cd, BANG|FILE1|TRLBAR|CMDWIN), EX(CMD_lchdir, "lchdir", ex_cd, *** ../vim-7.0.209/src/version.c Thu Mar 8 10:25:03 2007 --- src/version.c Thu Mar 8 11:04:35 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 210, /**/ -- press CTRL-ALT-DEL for more information /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:15 -0400 Subject: rpms/vim/FC-6 7.0.211,NONE,1.1 Message-ID: <200705030903.l4393F5O015587@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15568 Added Files: 7.0.211 Log Message: Patchlevel 211 --- NEW FILE 7.0.211 --- To: vim-dev at vim.org Subject: patch 7.0.211 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.211 Problem: With ":set cindent noai bs=0" using CTRL-U in Insert mode will delete auto-indent. After ":set ai" it doesn't. Solution: Also check 'cindent' being set. (Ryan Lortie) Files: src/edit.c *** ../vim-7.0.210/src/edit.c Tue Feb 20 03:52:04 2007 --- src/edit.c Thu Mar 8 13:10:42 2007 *************** *** 8250,8256 **** #endif mincol = 0; /* keep indent */ ! if (mode == BACKSPACE_LINE && curbuf->b_p_ai #ifdef FEAT_RIGHTLEFT && !revins_on #endif --- 8250,8261 ---- #endif mincol = 0; /* keep indent */ ! if (mode == BACKSPACE_LINE ! && (curbuf->b_p_ai ! #ifdef FEAT_CINDENT ! || cindent_on() ! #endif ! ) #ifdef FEAT_RIGHTLEFT && !revins_on #endif *** ../vim-7.0.210/src/version.c Thu Mar 8 11:05:32 2007 --- src/version.c Thu Mar 8 13:14:13 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 211, /**/ -- Microsoft: "Windows NT 4.0 now has the same user-interface as Windows 95" Windows 95: "Press CTRL-ALT-DEL to reboot" Windows NT 4.0: "Press CTRL-ALT-DEL to login" /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:18 -0400 Subject: rpms/vim/FC-6 7.0.212,NONE,1.1 Message-ID: <200705030903.l4393I9C015607@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15594 Added Files: 7.0.212 Log Message: Patchlevel 212 --- NEW FILE 7.0.212 --- To: vim-dev at vim.org Subject: patch 7.0.212 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.212 Problem: The GUI can't be terminated with SIGTERM. (Mark Logan) Solution: Use the signal protection in the GUI as in the console, allow signals when waiting for 100 msec or longer. Files: src/ui.c *** ../vim-7.0.211/src/ui.c Tue Aug 29 17:28:56 2006 --- src/ui.c Thu Mar 8 13:24:17 2007 *************** *** 166,175 **** } #endif ! /* When doing a blocking wait there is no need for CTRL-C to interrupt ! * something, don't let it set got_int when it was mapped. */ ! if (mapped_ctrl_c && (wtime == -1 || wtime > 100L)) ! ctrl_c_interrupts = FALSE; #ifdef FEAT_GUI if (gui.in_use) --- 166,182 ---- } #endif ! /* If we are going to wait for some time or block... */ ! if (wtime == -1 || wtime > 100L) ! { ! /* ... allow signals to kill us. */ ! (void)vim_handle_signal(SIGNAL_UNBLOCK); ! ! /* ... there is no need for CTRL-C to interrupt something, don't let ! * it set got_int when it was mapped. */ ! if (mapped_ctrl_c) ! ctrl_c_interrupts = FALSE; ! } #ifdef FEAT_GUI if (gui.in_use) *************** *** 183,198 **** else # endif { - if (wtime == -1 || wtime > 100L) - /* allow signals to kill us */ - (void)vim_handle_signal(SIGNAL_UNBLOCK); retval = mch_inchar(buf, maxlen, wtime, tb_change_cnt); - if (wtime == -1 || wtime > 100L) - /* block SIGHUP et al. */ - (void)vim_handle_signal(SIGNAL_BLOCK); } #endif ctrl_c_interrupts = TRUE; #ifdef NO_CONSOLE_INPUT --- 190,203 ---- else # endif { retval = mch_inchar(buf, maxlen, wtime, tb_change_cnt); } #endif + if (wtime == -1 || wtime > 100L) + /* block SIGHUP et al. */ + (void)vim_handle_signal(SIGNAL_BLOCK); + ctrl_c_interrupts = TRUE; #ifdef NO_CONSOLE_INPUT *** ../vim-7.0.211/src/version.c Thu Mar 8 13:15:08 2007 --- src/version.c Thu Mar 8 13:37:06 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 212, /**/ -- This is an airconditioned room, do not open Windows. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:22 -0400 Subject: rpms/vim/FC-6 7.0.213,NONE,1.1 Message-ID: <200705030903.l4393Mev015627@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15614 Added Files: 7.0.213 Log Message: Patchlevel 213 --- NEW FILE 7.0.213 --- To: vim-dev at vim.org Subject: patch 7.0.213 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.213 Problem: When 'spellfile' has two regions that use the same sound folding using "z=" will cause memory to be freed twice. (Mark Woodward) Solution: Clear the hashtable properly so that the items are only freed once. Files: src/spell.c *** ../vim-7.0.212/src/spell.c Thu Sep 14 10:48:00 2006 --- src/spell.c Thu Mar 8 14:54:46 2007 *************** *** 13094,13100 **** --- 13094,13103 ---- vim_free(HI2SFT(hi)); --todo; } + + /* Clear the hashtable, it may also be used by another region. */ hash_clear(&slang->sl_sounddone); + hash_init(&slang->sl_sounddone); } } } *** ../vim-7.0.212/src/version.c Thu Mar 8 13:41:25 2007 --- src/version.c Thu Mar 8 14:53:40 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 213, /**/ -- The software said it requires Windows 95 or better, so I installed Linux. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:25 -0400 Subject: rpms/vim/FC-6 7.0.214,NONE,1.1 Message-ID: <200705030903.l4393PBw015647@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15634 Added Files: 7.0.214 Log Message: Patchlevel 214 --- NEW FILE 7.0.214 --- # KH: Modified for runtime update To: vim-dev at vim.org Subject: patch 7.0.214 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.214 Problem: When using in a user command it's not possible to have an argument end in '\ '. Solution: Change the handling of backslashes. (Yakov Lerner) Files: runtime/doc/map.txt, src/ex_docmd.c --- vim70/runtime/doc/map.txt.214 2006-09-08 23:26:31.000000000 +0200 +++ runtime/doc/map.txt 2007-03-30 11:54:36.000000000 +0200 @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.0. Last change: 2006 Sep 05 +*map.txt* For Vim version 7.0. Last change: 2007 Mar 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1312,6 +1312,22 @@ arguments at spaces and Tabs, quotes each argument individually, and the sequence is replaced by the comma-separated list of quoted arguments. See the Mycmd example below. If no arguments are given is removed. + To embed whitespace into an argument of , prepend a backslash. + replaces every pair of backslashes (\\) with one backslash. A + backslash followed by a character other than white space or a backslash + remains unmodified. Overview: + + command ~ + XX ab 'ab' + XX a\b 'a\b' + XX a\ b 'a b' + XX a\ b 'a ', 'b' + XX a\\b 'a\b' + XX a\\ b 'a\', 'b' + XX a\\\b 'a\\b' + XX a\\\ b 'a\ b' + XX a\\\\b 'a\\b' + XX a\\\\ b 'a\\', 'b' Examples > *** ../vim-7.0.213/src/ex_docmd.c Tue Nov 28 21:41:19 2006 --- src/ex_docmd.c Thu Mar 8 17:49:11 2007 *************** *** 5551,5556 **** --- 5551,5559 ---- mch_memmove(cmd, cmd + 1, (gap->ga_len - i) * sizeof(ucmd_T)); } + /* + * split and quote args for + */ static char_u * uc_split_args(arg, lenp) char_u *arg; *************** *** 5567,5573 **** while (*p) { ! if (p[0] == '\\' && vim_iswhite(p[1])) { len += 1; p += 2; --- 5570,5581 ---- while (*p) { ! if (p[0] == '\\' && p[1] == '\\') ! { ! len += 2; ! p += 2; ! } ! else if (p[0] == '\\' && vim_iswhite(p[1])) { len += 1; p += 2; *************** *** 5603,5609 **** *q++ = '"'; while (*p) { ! if (p[0] == '\\' && vim_iswhite(p[1])) { *q++ = p[1]; p += 2; --- 5611,5623 ---- *q++ = '"'; while (*p) { ! if (p[0] == '\\' && p[1] == '\\') ! { ! *q++ = '\\'; ! *q++ = '\\'; ! p += 2; ! } ! else if (p[0] == '\\' && vim_iswhite(p[1])) { *q++ = p[1]; p += 2; *************** *** 5735,5741 **** } break; ! case 2: /* Quote and split */ /* This is hard, so only do it once, and cache the result */ if (*split_buf == NULL) *split_buf = uc_split_args(eap->arg, split_len); --- 5749,5755 ---- } break; ! case 2: /* Quote and split () */ /* This is hard, so only do it once, and cache the result */ if (*split_buf == NULL) *split_buf = uc_split_args(eap->arg, split_len); *** ../vim-7.0.213/src/version.c Thu Mar 8 14:54:52 2007 --- src/version.c Thu Mar 8 18:11:47 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 214, /**/ -- Microsoft's definition of a boolean: TRUE, FALSE, MAYBE "Embrace and extend"...? /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:28 -0400 Subject: rpms/vim/FC-6 7.0.215,NONE,1.1 Message-ID: <200705030903.l4393SEG015667@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15654 Added Files: 7.0.215 Log Message: Patchlevel 215 --- NEW FILE 7.0.215 --- To: vim-dev at vim.org Subject: patch 7.0.215 (extra) Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.215 (extra) Problem: Mac: Scrollbar size isn't set. Context menu has disabled useless Help entry. Call to MoreMasterPointers() is ignored. Solution: Call SetControlViewSize() in gui_mch_set_scrollbar_thumb(). Use kCMHelpItemRemoveHelp for ContextualMenuSelect(). Remove call to MoreMasterPointers(). (Nicolas Weber) Files: src/gui_mac.c *** ../vim-7.0.214/src/gui_mac.c Tue Oct 17 12:53:31 2006 --- src/gui_mac.c Thu Mar 8 16:44:31 2007 *************** *** 2800,2808 **** # endif #endif - /* Why did I put that in? (Dany) */ - MoreMasterPointers (0x40 * 3); /* we love handles */ - #if 0 InitCursor(); --- 2800,2805 ---- *************** *** 4966,4971 **** --- 4963,4969 ---- SetControl32BitMaximum (sb->id, max); SetControl32BitMinimum (sb->id, 0); SetControl32BitValue (sb->id, val); + SetControlViewSize (sb->id, size); #ifdef DEBUG_MAC_SB printf("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max); #endif *************** *** 5727,5733 **** /* TODO: Get the text selection from Vim */ /* Call to Handle Popup */ ! status = ContextualMenuSelect(CntxMenu, where, false, kCMHelpItemNoHelp, HelpName, NULL, &CntxType, &CntxMenuID, &CntxMenuItem); if (status == noErr) --- 5725,5731 ---- /* TODO: Get the text selection from Vim */ /* Call to Handle Popup */ ! status = ContextualMenuSelect(CntxMenu, where, false, kCMHelpItemRemoveHelp, HelpName, NULL, &CntxType, &CntxMenuID, &CntxMenuItem); if (status == noErr) *** ../vim-7.0.214/src/version.c Thu Mar 8 18:16:54 2007 --- src/version.c Thu Mar 8 20:38:17 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 215, /**/ -- When danger reared its ugly head, He bravely turned his tail and fled Yes, Brave Sir Robin turned about And gallantly he chickened out Bravely taking to his feet He beat a very brave retreat Bravest of the brave Sir Robin Petrified of being dead Soiled his pants then brave Sir Robin Turned away and fled. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:32 -0400 Subject: rpms/vim/FC-6 7.0.216,NONE,1.1 Message-ID: <200705030903.l4393Wi5015687@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15674 Added Files: 7.0.216 Log Message: Patchlevel 216 --- NEW FILE 7.0.216 --- To: vim-dev at vim.org Subject: patch 7.0.216 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.216 Problem: ":tab wincmd ]" does not open a tab page. (Tony Mechelynck) Solution: Copy the cmdmod.tab value to postponed_split_tab and use it. Files: src/globals.h, src/ex_docmd.c, src/if_cscope.c, src/window.c *** ../vim-7.0.215/src/globals.h Wed Feb 7 03:42:37 2007 --- src/globals.h Sun Mar 11 15:27:12 2007 *************** *** 1030,1035 **** --- 1030,1036 ---- #ifdef FEAT_WINDOWS EXTERN int postponed_split INIT(= 0); /* for CTRL-W CTRL-] command */ EXTERN int postponed_split_flags INIT(= 0); /* args for win_split() */ + EXTERN int postponed_split_tab INIT(= 0); /* cmdmod.tab */ # ifdef FEAT_QUICKFIX EXTERN int g_do_tagpreview INIT(= 0); /* for tag preview commands: height of preview window */ *** ../vim-7.0.215/src/ex_docmd.c Thu Mar 8 18:16:54 2007 --- src/ex_docmd.c Sun Mar 11 15:29:06 2007 *************** *** 7980,7987 **** --- 7980,7989 ---- { /* Pass flags on for ":vertical wincmd ]". */ postponed_split_flags = cmdmod.split; + postponed_split_tab = cmdmod.tab; do_window(*eap->arg, eap->addr_count > 0 ? eap->line2 : 0L, xchar); postponed_split_flags = 0; + postponed_split_tab = 0; } } #endif *************** *** 9189,9196 **** --- 9191,9200 ---- { postponed_split = -1; postponed_split_flags = cmdmod.split; + postponed_split_tab = cmdmod.tab; ex_tag_cmd(eap, cmdnames[eap->cmdidx].cmd_name + 1); postponed_split_flags = 0; + postponed_split_tab = 0; } #endif *** ../vim-7.0.215/src/if_cscope.c Tue Feb 27 18:11:55 2007 --- src/if_cscope.c Sun Mar 11 15:29:57 2007 *************** *** 128,133 **** --- 128,134 ---- } postponed_split = -1; postponed_split_flags = cmdmod.split; + postponed_split_tab = cmdmod.tab; } #endif *************** *** 135,140 **** --- 136,142 ---- #ifdef FEAT_WINDOWS postponed_split_flags = 0; + postponed_split_tab = 0; #endif } *** ../vim-7.0.215/src/window.c Tue Feb 20 00:17:01 2007 --- src/window.c Sun Mar 11 15:31:57 2007 *************** *** 3290,3300 **** int may_open_tabpage() { ! int n = cmdmod.tab; ! if (cmdmod.tab != 0) { cmdmod.tab = 0; /* reset it to avoid doing it twice */ return win_new_tabpage(n); } return FAIL; --- 3290,3301 ---- int may_open_tabpage() { ! int n = (cmdmod.tab == 0) ? postponed_split_tab : cmdmod.tab; ! if (n != 0) { cmdmod.tab = 0; /* reset it to avoid doing it twice */ + postponed_split_tab = 0; return win_new_tabpage(n); } return FAIL; *** ../vim-7.0.215/src/version.c Thu Mar 8 20:39:02 2007 --- src/version.c Sun Mar 11 15:50:04 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 216, /**/ -- You were lucky to have a LAKE! There were a hundred and sixty of us living in a small shoebox in the middle of the road. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:35 -0400 Subject: rpms/vim/FC-6 7.0.217,NONE,1.1 Message-ID: <200705030903.l4393Z16015707@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15694 Added Files: 7.0.217 Log Message: Patchlevel 217 --- NEW FILE 7.0.217 --- To: vim-dev at vim.org Subject: patch 7.0.217 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.217 Problem: This hangs when pressing "n": ":%s/\n/,\r/gc". (Ori Avtalion) Solution: Set "skip_match" to advance to the next line. Files: src/ex_cmds.c *** ../vim-7.0.216/src/ex_cmds.c Tue Feb 27 16:51:07 2007 --- src/ex_cmds.c Thu Mar 15 21:31:35 2007 *************** *** 4677,4687 **** /* For a multi-line match, put matchcol at the NUL at * the end of the line and set nmatch to one, so that * we continue looking for a match on the next line. ! * Avoids that ":s/\nB\@=//gc" get stuck. */ if (nmatch > 1) { matchcol = (colnr_T)STRLEN(sub_firstline); ! nmatch = 1; } goto skip; } --- 4677,4688 ---- /* For a multi-line match, put matchcol at the NUL at * the end of the line and set nmatch to one, so that * we continue looking for a match on the next line. ! * Avoids that ":%s/\nB\@=//gc" and ":%s/\n/,\r/gc" ! * get stuck when pressing 'n'. */ if (nmatch > 1) { matchcol = (colnr_T)STRLEN(sub_firstline); ! skip_match = TRUE; } goto skip; } *** ../vim-7.0.216/src/version.c Sun Mar 11 15:53:27 2007 --- src/version.c Thu Mar 15 21:36:34 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 217, /**/ -- A mathematician is a device for turning coffee into theorems. Paul Erdos A computer programmer is a device for turning coffee into bugs. Bram Moolenaar /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:38 -0400 Subject: rpms/vim/FC-6 7.0.218,NONE,1.1 Message-ID: <200705030903.l4393cQP015727@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15714 Added Files: 7.0.218 Log Message: Patchlevel 218 --- NEW FILE 7.0.218 --- To: vim-dev at vim.org Subject: patch 7.0.218 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.218 Problem: "%B" in 'statusline' always shows zero in Insert mode. (DervishD) Solution: Remove the exception for Insert mode, check the column for being valid instead. Files: src/buffer.c *** ../vim-7.0.217/src/buffer.c Tue Mar 6 20:27:03 2007 --- src/buffer.c Thu Mar 15 22:50:54 2007 *************** *** 3710,3716 **** case STL_BYTEVAL_X: base = 'X'; case STL_BYTEVAL: ! if (((State & INSERT) && wp == curwin) || empty_line) num = 0; else { --- 3710,3716 ---- case STL_BYTEVAL_X: base = 'X'; case STL_BYTEVAL: ! if (wp->w_cursor.col > STRLEN(linecont)) num = 0; else { *** ../vim-7.0.217/src/version.c Thu Mar 15 21:38:30 2007 --- src/version.c Thu Mar 15 22:54:05 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 218, /**/ -- Vim is like Emacs without all the typing. (John "Johann" Spetz) /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:42 -0400 Subject: rpms/vim/FC-6 7.0.219,NONE,1.1 Message-ID: <200705030903.l4393gVx015751@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15734 Added Files: 7.0.219 Log Message: Patchlevel 219 --- NEW FILE 7.0.219 --- To: vim-dev at vim.org Subject: patch 7.0.219 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.219 Problem: When using the 'editexisting.vim' script and a file is being edited in another tab page the window is split. The "+123" argument is not used. Solution: Make the tab page with the file the current tab page. Set v:swapcommand when starting up to the first "+123" or "-c" command line argument. Files: runtime/macros/editexisting.vim, src/main.c *** ../vim-7.0.218/runtime/macros/editexisting.vim Sun Apr 30 20:33:40 2006 --- runtime/macros/editexisting.vim Sat Mar 17 22:21:30 2007 *************** *** 1,6 **** " Vim Plugin: Edit the file with an existing Vim if possible " Maintainer: Bram Moolenaar ! " Last Change: 2006 Apr 30 " This is a plugin, drop it in your (Unix) ~/.vim/plugin or (Win32) " $VIM/vimfiles/plugin directory. Or make a symbolic link, so that you --- 1,6 ---- " Vim Plugin: Edit the file with an existing Vim if possible " Maintainer: Bram Moolenaar ! " Last Change: 2007 Mar 17 " This is a plugin, drop it in your (Unix) ~/.vim/plugin or (Win32) " $VIM/vimfiles/plugin directory. Or make a symbolic link, so that you *************** *** 85,93 **** " Function used on the server to make the file visible and possibly execute a " command. func! EditExisting(fname, command) ! let n = bufwinnr(a:fname) ! if n > 0 ! exe n . "wincmd w" else exe "split " . escape(a:fname, ' #%"|') endif --- 85,107 ---- " Function used on the server to make the file visible and possibly execute a " command. func! EditExisting(fname, command) ! " Get the window number of the file in the current tab page. ! let winnr = bufwinnr(a:fname) ! if winnr <= 0 ! " Not found, look in other tab pages. ! let bufnr = bufnr(a:fname) ! for i in range(tabpagenr('$')) ! if index(tabpagebuflist(i + 1), bufnr) >= 0 ! " Make this tab page the current one and find the window number. ! exe 'tabnext ' . (i + 1) ! let winnr = bufwinnr(a:fname) ! break; ! endif ! endfor ! endif ! ! if winnr > 0 ! exe winnr . "wincmd w" else exe "split " . escape(a:fname, ' #%"|') endif *** ../vim-7.0.218/src/main.c Tue Feb 27 16:51:07 2007 --- src/main.c Sun Mar 18 21:51:48 2007 *************** *** 798,803 **** --- 798,808 ---- create_windows(¶ms); TIME_MSG("opening buffers"); + #ifdef FEAT_EVAL + /* clear v:swapcommand */ + set_vim_var_string(VV_SWAPCOMMAND, NULL, -1); + #endif + /* Ex starts at last line of the file */ if (exmode_active) curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; *************** *** 2202,2207 **** --- 2207,2227 ---- argv_idx = 1; } } + + #ifdef FEAT_EVAL + /* If there is a "+123" or "-c" command, set v:swapcommand to the first + * one. */ + if (parmp->n_commands > 0) + { + p = alloc((unsigned)STRLEN(parmp->commands[0]) + 3); + if (p != NULL) + { + sprintf((char *)p, ":%s\r", parmp->commands[0]); + set_vim_var_string(VV_SWAPCOMMAND, p, -1); + vim_free(p); + } + } + #endif } /* *** ../vim-7.0.218/src/version.c Thu Mar 15 22:54:51 2007 --- src/version.c Sun Mar 18 21:49:11 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 219, /**/ -- FATHER: You only killed the bride's father - that's all - LAUNCELOT: Oh dear, I didn't really mean to... FATHER: Didn't mean to? You put your sword right through his head! LAUNCELOT: Gosh - Is he all right? "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:45 -0400 Subject: rpms/vim/FC-6 7.0.220,NONE,1.1 Message-ID: <200705030903.l4393jND015775@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15758 Added Files: 7.0.220 Log Message: Patchlevel 220 --- NEW FILE 7.0.220 --- To: vim-dev at vim.org Subject: patch 7.0.220 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.220 Problem: Crash when using winnr('#') in a new tab page. (Andy Wokula) Solution: Check for not finding the window. Files: src/eval.c *** ../vim-7.0.219/src/eval.c Tue Feb 20 03:18:20 2007 --- src/eval.c Sun Mar 25 17:43:53 2007 *************** *** 15769,15775 **** --- 15769,15783 ---- if (nr > 0) for (wp = (tp == curtab) ? firstwin : tp->tp_firstwin; wp != twin; wp = wp->w_next) + { + if (wp == NULL) + { + /* didn't find it in this tabpage */ + nr = 0; + break; + } ++nr; + } return nr; } #endif *** ../vim-7.0.219/src/version.c Sun Mar 18 21:52:09 2007 --- src/version.c Sun Mar 25 17:48:20 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 220, /**/ -- Men may not be seen publicly in any kind of strapless gown. [real standing law in Florida, United States of America] /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:48 -0400 Subject: rpms/vim/FC-6 7.0.221,NONE,1.1 Message-ID: <200705030903.l4393mPH015795@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15782 Added Files: 7.0.221 Log Message: Patchlevel 221 --- NEW FILE 7.0.221 --- #KH: Modified for runtime patch To: vim-dev at vim.org Subject: patch 7.0.221 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.221 Problem: finddir() uses 'path' by default, where "." means relative to the current file. But it works relative to the current directory. (Tye Zdrojewski) Solution: Add the current buffer name to find_file_in_path_option() for the relative file name. Files: runtime/doc/eval.txt, src/eval.c *** ../vim-7.0.220/src/eval.c Sun Mar 25 17:50:22 2007 --- src/eval.c Sun Mar 25 17:43:53 2007 *************** *** 9195,9201 **** vim_free(fresult); fresult = find_file_in_path_option(first ? fname : NULL, first ? (int)STRLEN(fname) : 0, ! 0, first, path, dir, NULL, dir ? (char_u *)"" : curbuf->b_p_sua); first = FALSE; --- 9195,9201 ---- vim_free(fresult); fresult = find_file_in_path_option(first ? fname : NULL, first ? (int)STRLEN(fname) : 0, ! 0, first, path, dir, curbuf->b_ffname, dir ? (char_u *)"" : curbuf->b_p_sua); first = FALSE; *** ../vim-7.0.220/src/version.c Sun Mar 25 17:50:22 2007 --- src/version.c Tue Mar 27 10:16:35 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 221, /**/ -- Beer & pretzels can't be served at the same time in any bar or restaurant. [real standing law in North Dakota, United States of America] /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:52 -0400 Subject: rpms/vim/FC-6 7.0.222,NONE,1.1 Message-ID: <200705030903.l4393qfO015819@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15802 Added Files: 7.0.222 Log Message: Patchlevel 222 --- NEW FILE 7.0.222 --- To: vim-dev at vim.org Subject: patch 7.0.222 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.222 Problem: Perl indenting using 'cindent' works almost right. Solution: Recognize '#' to start a comment. (Alex Manoussakis) Added '#' flag in 'cinoptions'. Files: runtime/doc/indent.txt, src/misc1.c *** ../vim-7.0.221/runtime/doc/indent.txt Sun May 7 17:00:59 2006 --- runtime/doc/indent.txt Sat Mar 17 16:27:57 2007 *************** *** 1,4 **** ! *indent.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar --- 1,4 ---- ! *indent.txt* For Vim version 7.0. Last change: 2007 Mar 17 VIM REFERENCE MANUAL by Bram Moolenaar *************** *** 434,443 **** limits the time needed to search for the start of a comment. (default 30 lines). The defaults, spelled out in full, are: cinoptions=>s,e0,n0,f0,{0,}0,^0,:s,=s,l0,b0,gs,hs,ps,ts,is,+s,c3,C0, ! /0,(2s,us,U0,w0,W0,m0,j0,)20,*30 Vim puts a line in column 1 if: - It starts with '#' (preprocessor directives), if 'cinkeys' contains '#'. --- 434,448 ---- limits the time needed to search for the start of a comment. (default 30 lines). + #N When N is non-zero recognize shell/Perl comments, starting with + '#'. Default N is zero: don't recognizes '#' comments. Note + that lines starting with # will still be seen as preprocessor + lines. + The defaults, spelled out in full, are: cinoptions=>s,e0,n0,f0,{0,}0,^0,:s,=s,l0,b0,gs,hs,ps,ts,is,+s,c3,C0, ! /0,(2s,us,U0,w0,W0,m0,j0,)20,*30,#0 Vim puts a line in column 1 if: - It starts with '#' (preprocessor directives), if 'cinkeys' contains '#'. *** ../vim-7.0.221/src/misc1.c Tue Oct 24 21:15:09 2006 --- src/misc1.c Sat Mar 17 16:36:00 2007 *************** *** 4796,4803 **** --- 4796,4806 ---- static int find_last_paren __ARGS((char_u *l, int start, int end)); static int find_match __ARGS((int lookfor, linenr_T ourscope, int ind_maxparen, int ind_maxcomment)); + static int ind_hash_comment = 0; /* # starts a comment */ + /* * Skip over white space and C comments within the line. + * Also skip over Perl/shell comments if desired. */ static char_u * cin_skipcomment(s) *************** *** 4805,4811 **** --- 4808,4824 ---- { while (*s) { + char_u *prev_s = s; + s = skipwhite(s); + + /* Perl/shell # comment comment continues until eol. Require a space + * before # to avoid recognizing $#array. */ + if (ind_hash_comment != 0 && s != prev_s && *s == '#') + { + s += STRLEN(s); + break; + } if (*s != '/') break; ++s; *************** *** 6133,6139 **** if (l[1] == '-') n = -n; /* When adding an entry here, also update the default 'cinoptions' in ! * change.txt, and add explanation for it! */ switch (*l) { case '>': ind_level = n; break; --- 6146,6152 ---- if (l[1] == '-') n = -n; /* When adding an entry here, also update the default 'cinoptions' in ! * doc/indent.txt, and add explanation for it! */ switch (*l) { case '>': ind_level = n; break; *************** *** 6166,6171 **** --- 6179,6185 ---- case 'h': ind_scopedecl_code = n; break; case 'j': ind_java = n; break; case 'l': ind_keep_case_label = n; break; + case '#': ind_hash_comment = n; break; } } *** ../vim-7.0.221/src/version.c Tue Mar 27 10:20:59 2007 --- src/version.c Tue Mar 27 10:56:50 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 222, /**/ -- My Go , this amn keyboar oesn't have a . /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:55 -0400 Subject: rpms/vim/FC-6 7.0.223,NONE,1.1 Message-ID: <200705030903.l4393tRS015843@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15826 Added Files: 7.0.223 Log Message: Patchlevel 223 --- NEW FILE 7.0.223 --- To: vim-dev at vim.org Subject: patch 7.0.223 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.223 Problem: Unprintable characters in completion text mess up the popup menu. (Gombault Damien) Solution: Use strtrans() to make the text printable. Files: src/charset.c, src/popupmnu.c *** ../vim-7.0.222/src/charset.c Tue Apr 18 00:04:40 2006 --- src/charset.c Sat Mar 24 21:10:37 2007 *************** *** 317,323 **** } } ! #if defined(FEAT_EVAL) || defined(FEAT_TITLE) || defined(PROTO) /* * Translate a string into allocated memory, replacing special chars with * printable chars. Returns NULL when out of memory. --- 317,324 ---- } } ! #if defined(FEAT_EVAL) || defined(FEAT_TITLE) || defined(FEAT_INS_EXPAND) \ ! || defined(PROTO) /* * Translate a string into allocated memory, replacing special chars with * printable chars. Returns NULL when out of memory. *** ../vim-7.0.222/src/popupmnu.c Tue Aug 22 21:51:18 2006 --- src/popupmnu.c Sat Mar 24 21:07:39 2007 *************** *** 280,287 **** w = ptr2cells(p); if (*p == NUL || *p == TAB || totwidth + w > pum_width) { ! /* Display the text that fits or comes before a Tab. */ ! screen_puts_len(s, (int)(p - s), row, col, attr); col += width; if (*p != TAB) --- 280,299 ---- w = ptr2cells(p); if (*p == NUL || *p == TAB || totwidth + w > pum_width) { ! /* Display the text that fits or comes before a Tab. ! * First convert it to printable characters. */ ! char_u *st; ! int saved = *p; ! ! *p = NUL; ! st = transstr(s); ! *p = saved; ! if (st != NULL) ! { ! screen_puts_len(st, (int)STRLEN(st), row, col, ! attr); ! vim_free(st); ! } col += width; if (*p != TAB) *** ../vim-7.0.222/src/version.c Tue Mar 27 11:00:43 2007 --- src/version.c Tue Mar 27 12:42:15 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 223, /**/ -- Violators can be fined, arrested or jailed for making ugly faces at a dog. [real standing law in Oklahoma, United States of America] /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:03:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:03:58 -0400 Subject: rpms/vim/FC-6 7.0.224,NONE,1.1 Message-ID: <200705030903.l4393weR015863@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15850 Added Files: 7.0.224 Log Message: Patchlevel 224 --- NEW FILE 7.0.224 --- To: vim-dev at vim.org Subject: patch 7.0.224 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.224 Problem: When expanding "##" spaces are escaped twice. (Pavol Juhas) Solution: Don't escape the spaces that separate arguments. Files: src/eval.c, src/ex_docmd.c, src/proto/ex_docmd.pro *** ../vim-7.0.223/src/eval.c Tue Mar 27 10:20:59 2007 --- src/eval.c Tue Mar 27 16:47:56 2007 *************** *** 8924,8930 **** if (*s == '%' || *s == '#' || *s == '<') { ++emsg_off; ! rettv->vval.v_string = eval_vars(s, &len, NULL, &errormsg, s); --emsg_off; } else --- 8924,8930 ---- if (*s == '%' || *s == '#' || *s == '<') { ++emsg_off; ! rettv->vval.v_string = eval_vars(s, s, &len, NULL, &errormsg, NULL); --emsg_off; } else *** ../vim-7.0.223/src/ex_docmd.c Sun Mar 11 15:53:27 2007 --- src/ex_docmd.c Tue Mar 27 16:49:06 2007 *************** *** 4176,4181 **** --- 4177,4183 ---- int srclen; char_u *p; int n; + int escaped; #ifdef FEAT_QUICKFIX /* Skip a regexp pattern for ":vimgrep[add] pat file..." */ *************** *** 4216,4222 **** /* * Try to find a match at this position. */ ! repl = eval_vars(p, &srclen, &(eap->do_ecmd_lnum), errormsgp, eap->arg); if (*errormsgp != NULL) /* error detected */ return FAIL; if (repl == NULL) /* no match found */ --- 4218,4225 ---- /* * Try to find a match at this position. */ ! repl = eval_vars(p, eap->arg, &srclen, &(eap->do_ecmd_lnum), ! errormsgp, &escaped); if (*errormsgp != NULL) /* error detected */ return FAIL; if (repl == NULL) /* no match found */ *************** *** 4235,4245 **** vim_free(l); } ! /* Need to escape white space et al. with a backslash. Don't do this ! * for shell commands (may have to use quotes instead). Don't do this ! * for non-unix systems when there is a single argument (spaces don't ! * separate arguments then). */ if (!eap->usefilter && eap->cmdidx != CMD_bang && eap->cmdidx != CMD_make && eap->cmdidx != CMD_lmake --- 4238,4252 ---- vim_free(l); } ! /* Need to escape white space et al. with a backslash. ! * Don't do this for: ! * - replacement that already has been escaped: "##" ! * - shell commands (may have to use quotes instead). ! * - non-unix systems when there is a single argument (spaces don't ! * separate arguments then). ! */ if (!eap->usefilter + && !escaped && eap->cmdidx != CMD_bang && eap->cmdidx != CMD_make && eap->cmdidx != CMD_lmake *************** *** 9280,9291 **** * number of characters to skip. */ char_u * ! eval_vars(src, usedlen, lnump, errormsg, srcstart) char_u *src; /* pointer into commandline */ int *usedlen; /* characters after src that are used */ linenr_T *lnump; /* line number for :e command, or NULL */ char_u **errormsg; /* pointer to error message */ ! char_u *srcstart; /* beginning of valid memory for src */ { int i; char_u *s; --- 9289,9302 ---- * number of characters to skip. */ char_u * ! eval_vars(src, srcstart, usedlen, lnump, errormsg, escaped) char_u *src; /* pointer into commandline */ + char_u *srcstart; /* beginning of valid memory for src */ int *usedlen; /* characters after src that are used */ linenr_T *lnump; /* line number for :e command, or NULL */ char_u **errormsg; /* pointer to error message */ ! int *escaped; /* return value has escaped white space (can ! * be NULL) */ { int i; char_u *s; *************** *** 9332,9337 **** --- 9343,9350 ---- #endif *errormsg = NULL; + if (escaped != NULL) + *escaped = FALSE; /* * Check if there is something to do. *************** *** 9407,9412 **** --- 9420,9427 ---- result = arg_all(); resultbuf = result; *usedlen = 2; + if (escaped != NULL) + *escaped = TRUE; #ifdef FEAT_MODIFY_FNAME skip_mod = TRUE; #endif *************** *** 9627,9633 **** else { /* replace "" with the sourced file name, and do ":" stuff */ ! repl = eval_vars(p, &srclen, NULL, &errormsg, result); if (errormsg != NULL) { if (*errormsg) --- 9642,9648 ---- else { /* replace "" with the sourced file name, and do ":" stuff */ ! repl = eval_vars(p, result, &srclen, NULL, &errormsg, NULL); if (errormsg != NULL) { if (*errormsg) *** ../vim-7.0.223/src/proto/ex_docmd.pro Fri Mar 24 23:02:09 2006 --- src/proto/ex_docmd.pro Tue Mar 27 16:50:04 2007 *************** *** 44,50 **** extern FILE *open_exfile __ARGS((char_u *fname, int forceit, char *mode)); extern void update_topline_cursor __ARGS((void)); extern void exec_normal_cmd __ARGS((char_u *cmd, int remap, int silent)); ! extern char_u *eval_vars __ARGS((char_u *src, int *usedlen, linenr_T *lnump, char_u **errormsg, char_u *srcstart)); extern char_u *expand_sfile __ARGS((char_u *arg)); extern int put_eol __ARGS((FILE *fd)); extern int put_line __ARGS((FILE *fd, char *s)); --- 44,50 ---- extern FILE *open_exfile __ARGS((char_u *fname, int forceit, char *mode)); extern void update_topline_cursor __ARGS((void)); extern void exec_normal_cmd __ARGS((char_u *cmd, int remap, int silent)); ! extern char_u *eval_vars __ARGS((char_u *src, char_u *srcstart, int *usedlen, linenr_T *lnump, char_u **errormsg, int *escaped)); extern char_u *expand_sfile __ARGS((char_u *arg)); extern int put_eol __ARGS((FILE *fd)); extern int put_line __ARGS((FILE *fd, char *s)); *** ../vim-7.0.223/src/version.c Tue Mar 27 12:43:30 2007 --- src/version.c Tue Mar 27 16:55:21 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 224, /**/ -- "Software is like sex... it's better when it's free." -- Linus Torvalds, initiator of the free Linux OS Makes me wonder what FSF stands for...? /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:02 -0400 Subject: rpms/vim/FC-6 7.0.225,NONE,1.1 Message-ID: <200705030904.l43942tc015883@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15870 Added Files: 7.0.225 Log Message: Patchlevel 225 --- NEW FILE 7.0.225 --- To: vim-dev at vim.org Subject: patch 7.0.225 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.225 Problem: When using setline() in an InsertEnter autocommand and doing "A" the cursor ends up on the last byte in the line. (Yukihiro Nakadaira) Solution: Only adjust the column when using setline() for the cursor line. Move it back to the head byte if necessary. Files: src/eval.c, src/misc2.c *** ../vim-7.0.224/src/eval.c Tue Mar 27 16:57:54 2007 --- src/eval.c Thu Apr 26 10:52:09 2007 *************** *** 14397,14403 **** if (u_savesub(lnum) == OK && ml_replace(lnum, line, TRUE) == OK) { changed_bytes(lnum, 0); ! check_cursor_col(); rettv->vval.v_number = 0; /* OK */ } } --- 14411,14418 ---- if (u_savesub(lnum) == OK && ml_replace(lnum, line, TRUE) == OK) { changed_bytes(lnum, 0); ! if (lnum == curwin->w_cursor.lnum) ! check_cursor_col(); rettv->vval.v_number = 0; /* OK */ } } *** ../vim-7.0.224/src/misc2.c Tue Feb 20 03:18:20 2007 --- src/misc2.c Tue Mar 27 21:59:56 2007 *************** *** 516,522 **** --- 516,529 ---- || virtual_active()) curwin->w_cursor.col = len; else + { curwin->w_cursor.col = len - 1; + #ifdef FEAT_MBYTE + /* prevent cursor from moving on the trail byte */ + if (has_mbyte) + mb_adjust_cursor(); + #endif + } } #ifdef FEAT_VIRTUALEDIT *** ../vim-7.0.224/src/version.c Tue Mar 27 16:57:54 2007 --- src/version.c Thu Apr 26 10:53:33 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 225, /**/ -- hundred-and-one symptoms of being an internet addict: 14. You start introducing yourself as "Jim at I-I-Net dot net dot au" /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:05 -0400 Subject: rpms/vim/FC-6 7.0.226,NONE,1.1 Message-ID: <200705030904.l43945vK015903@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15890 Added Files: 7.0.226 Log Message: Patchlevel 226 --- NEW FILE 7.0.226 --- To: vim-dev at vim.org Subject: patch 7.0.226 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.226 Problem: Display flickering when updating signs through the netbeans interface. (Xavier de Gaye) Solution: Remove the redraw_later(CLEAR) call. Files: src/netbeans.c *** ../vim-7.0.225/src/netbeans.c Tue Nov 14 18:29:00 2006 --- src/netbeans.c Sat Apr 21 18:14:00 2007 *************** *** 2143,2150 **** coloncmd(":sign jump %d buffer=%d", serNum, buf->bufp->b_fnum); } - /* XXX only redraw what changed. */ - redraw_later(CLEAR); #endif /* =====================================================================*/ } --- 2143,2148 ---- *** ../vim-7.0.225/src/version.c Thu Apr 26 10:55:46 2007 --- src/version.c Thu Apr 26 11:00:01 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 226, /**/ -- hundred-and-one symptoms of being an internet addict: 15. Your heart races faster and beats irregularly each time you see a new WWW site address in print or on TV, even though you've never had heart problems before. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:08 -0400 Subject: rpms/vim/FC-6 7.0.227,NONE,1.1 Message-ID: <200705030904.l43948F3015923@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15910 Added Files: 7.0.227 Log Message: Patchlevel 227 --- NEW FILE 7.0.227 --- To: vim-dev at vim.org Subject: patch 7.0.227 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.227 Problem: Crash when closing a window in the GUI. (Charles Campbell) Solution: Don't call out_flush() from win_free(). Files: src/window.c *** ../vim-7.0.226/src/window.c Sun Mar 11 15:53:27 2007 --- src/window.c Wed Apr 18 22:31:52 2007 *************** *** 2084,2089 **** --- 2084,2096 ---- } #endif + #ifdef FEAT_GUI + /* Avoid trouble with scrollbars that are going to be deleted in + * win_free(). */ + if (gui.in_use) + out_flush(); + #endif + /* * Close the link to the buffer. */ *************** *** 4174,4180 **** #ifdef FEAT_GUI if (gui.in_use) { - out_flush(); gui_mch_destroy_scrollbar(&wp->w_scrollbars[SBAR_LEFT]); gui_mch_destroy_scrollbar(&wp->w_scrollbars[SBAR_RIGHT]); } --- 4181,4186 ---- *** ../vim-7.0.226/src/version.c Thu Apr 26 11:01:16 2007 --- src/version.c Thu Apr 26 16:09:30 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 227, /**/ -- hundred-and-one symptoms of being an internet addict: 16. You step out of your room and realize that your parents have moved and you don't have a clue when it happened. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:12 -0400 Subject: rpms/vim/FC-6 7.0.228,NONE,1.1 Message-ID: <200705030904.l4394CbK015944@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15930 Added Files: 7.0.228 Log Message: Patchlevel 228 --- NEW FILE 7.0.228 --- To: vim-dev at vim.org Subject: patch 7.0.228 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.228 Problem: Cygwin: problem with symlink to DOS style path. Solution: Invoke cygwin_conv_to_posix_path(). (Luca Masini) Files: src/os_unix.c *** ../vim-7.0.227/src/os_unix.c Tue Mar 6 20:27:03 2007 --- src/os_unix.c Mon Apr 23 22:27:16 2007 *************** *** 55,60 **** --- 55,66 ---- # endif #endif + #ifdef __CYGWIN__ + # ifndef WIN32 + # include /* for cygwin_conv_to_posix_path() */ + # endif + #endif + #if defined(HAVE_SELECT) extern int select __ARGS((int, fd_set *, fd_set *, fd_set *, struct timeval *)); #endif *************** *** 2228,2233 **** --- 2258,2270 ---- #ifdef VMS fname = vms_fixfilename(fname); + #endif + + #ifdef __CYGWIN__ + /* + * This helps for when "/etc/hosts" is a symlink to "c:/something/hosts". + */ + cygwin_conv_to_posix_path(fname, fname); #endif /* expand it if forced or not an absolute path */ *** ../vim-7.0.227/src/version.c Thu Apr 26 16:11:47 2007 --- src/version.c Thu Apr 26 16:27:29 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 228, /**/ -- hundred-and-one symptoms of being an internet addict: 19. All of your friends have an @ in their names. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:15 -0400 Subject: rpms/vim/FC-6 7.0.229,NONE,1.1 Message-ID: <200705030904.l4394F3k015965@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15951 Added Files: 7.0.229 Log Message: Patchlevel 229 --- NEW FILE 7.0.229 --- To: vim-dev at vim.org Subject: patch 7.0.229 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.229 Problem: When 'pastetoggle' starts with Esc then pressing Esc in Insert mode will not time out. (Jeffery Small) Solution: Use KL_PART_KEY instead of KL_PART_MAP, so that 'ttimeout' applies to the 'pastetoggle' key. Files: src/getchar.c *** ../vim-7.0.228/src/getchar.c Sun Mar 4 21:25:44 2007 --- src/getchar.c Thu Apr 19 22:13:37 2007 *************** *** 2183,2189 **** } /* Need more chars for partly match. */ if (mlen == typebuf.tb_len) ! keylen = KL_PART_MAP; else if (max_mlen < mlen) /* no match, may have to check for termcode at * next character */ --- 2187,2193 ---- } /* Need more chars for partly match. */ if (mlen == typebuf.tb_len) ! keylen = KL_PART_KEY; else if (max_mlen < mlen) /* no match, may have to check for termcode at * next character */ *** ../vim-7.0.228/src/version.c Thu Apr 26 16:28:43 2007 --- src/version.c Thu Apr 26 16:48:59 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 229, /**/ -- hundred-and-one symptoms of being an internet addict: 20. When looking at a pageful of someone else's links, you notice all of them are already highlighted in purple. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:18 -0400 Subject: rpms/vim/FC-6 7.0.230,NONE,1.1 Message-ID: <200705030904.l4394I3E015985@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15972 Added Files: 7.0.230 Log Message: Patchlevel 230 --- NEW FILE 7.0.230 --- # KH: patched for runtimeupdate To: vim-dev at vim.org Subject: patch 7.0.230 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.230 Problem: After using ":lcd" a script doesn't know how to restore the current directory. Solution: Add the haslocaldir() function. (Bob Hiestand) Files: runtime/doc/usr_41.txt, runtime/doc/eval.txt, src/eval.c *** ../vim-7.0.229/runtime/doc/usr_41.txt Sun May 7 17:02:39 2006 --- runtime/doc/usr_41.txt Thu Apr 26 17:06:48 2007 *************** *** 1,4 **** ! *usr_41.txt* For Vim version 7.0. Last change: 2006 Aug 16 VIM USER MANUAL - by Bram Moolenaar --- 1,4 ---- ! *usr_41.txt* For Vim version 7.0. Last change: 2007 Apr 26 VIM USER MANUAL - by Bram Moolenaar *************** *** 703,708 **** --- 703,709 ---- isdirectory() check if a directory exists getfsize() get the size of a file getcwd() get the current working directory + haslocaldir() check if current window used |:lcd| tempname() get the name of a temporary file mkdir() create a new directory delete() delete a file *** ../vim-7.0.229/runtime/doc/eval.txt Tue Mar 27 10:20:58 2007 --- runtime/doc/eval.txt Tue Apr 24 21:50:49 2007 *************** *** 1,4 **** ! *eval.txt* For Vim version 7.0. Last change: 2006 Nov 01 VIM REFERENCE MANUAL by Bram Moolenaar --- 1,4 ---- ! *eval.txt* For Vim version 7.0. Last change: 2007 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar *************** *** 1623,1628 **** --- 1633,1639 ---- globpath( {path}, {expr}) String do glob({expr}) for all dirs in {path} has( {feature}) Number TRUE if feature {feature} supported has_key( {dict}, {key}) Number TRUE if {dict} has entry {key} + haslocaldir() Number TRUE if current window executed |:lcd| hasmapto( {what} [, {mode} [, {abbr}]]) Number TRUE if mapping to {what} exists histadd( {history},{item}) String add an item to a history *************** *** 3016,3021 **** --- 3041,3049 ---- The result is a Number, which is 1 if |Dictionary| {dict} has an entry with key {key}. Zero otherwise. + haslocaldir() *haslocaldir()* + The result is a Number, which is 1 when the current + window has set a local path via |:lcd|, and 0 otherwise. hasmapto({what} [, {mode} [, {abbr}]]) *hasmapto()* The result is a Number, which is 1 if there is a mapping that *** ../vim-7.0.229/src/eval.c Thu Apr 26 10:55:46 2007 --- src/eval.c Thu Apr 26 10:52:09 2007 *************** *** 541,546 **** --- 541,547 ---- static void f_globpath __ARGS((typval_T *argvars, typval_T *rettv)); static void f_has __ARGS((typval_T *argvars, typval_T *rettv)); static void f_has_key __ARGS((typval_T *argvars, typval_T *rettv)); + static void f_haslocaldir __ARGS((typval_T *argvars, typval_T *rettv)); static void f_hasmapto __ARGS((typval_T *argvars, typval_T *rettv)); static void f_histadd __ARGS((typval_T *argvars, typval_T *rettv)); static void f_histdel __ARGS((typval_T *argvars, typval_T *rettv)); *************** *** 7110,7115 **** --- 7111,7117 ---- {"globpath", 2, 2, f_globpath}, {"has", 1, 1, f_has}, {"has_key", 2, 2, f_has_key}, + {"haslocaldir", 0, 0, f_haslocaldir}, {"hasmapto", 1, 3, f_hasmapto}, {"highlightID", 1, 1, f_hlID}, /* obsolete */ {"highlight_exists",1, 1, f_hlexists}, /* obsolete */ *************** *** 11131,11136 **** --- 11133,11150 ---- rettv->vval.v_number = dict_find(argvars[0].vval.v_dict, get_tv_string(&argvars[1]), -1) != NULL; + } + + /* + * "haslocaldir()" function + */ + /*ARGSUSED*/ + static void + f_haslocaldir(argvars, rettv) + typval_T *argvars; + typval_T *rettv; + { + rettv->vval.v_number = (curwin->w_localdir != NULL); } /* *** ../vim-7.0.229/src/version.c Thu Apr 26 16:50:05 2007 --- src/version.c Thu Apr 26 17:04:15 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 230, /**/ -- hundred-and-one symptoms of being an internet addict: 22. You've already visited all the links at Yahoo and you're halfway through Lycos. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:22 -0400 Subject: rpms/vim/FC-6 7.0.231,NONE,1.1 Message-ID: <200705030904.l4394M6W016005@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15992 Added Files: 7.0.231 Log Message: Patchlevel 231 --- NEW FILE 7.0.231 --- To: vim-dev at vim.org Subject: patch 7.0.231 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.231 Problem: When recovering from a swap file the page size is likely to be different from the minimum. The block used for the first page then has a buffer of the wrong size, causing a crash when it's reused later. (Zephaniah Hull) Solution: Reallocate the buffer when the page size changes. Also check that the page size is at least the minimum value. Files: src/memline.c *** ../vim-7.0.230/src/memline.c Tue Mar 6 20:27:03 2007 --- src/memline.c Thu Apr 19 16:10:39 2007 *************** *** 1015,1032 **** --- 1015,1053 ---- msg_end(); goto theend; } + /* * If we guessed the wrong page size, we have to recalculate the * highest block number in the file. */ if (mfp->mf_page_size != (unsigned)char_to_long(b0p->b0_page_size)) { + unsigned previous_page_size = mfp->mf_page_size; + mf_new_page_size(mfp, (unsigned)char_to_long(b0p->b0_page_size)); + if (mfp->mf_page_size < previous_page_size) + { + msg_start(); + msg_outtrans_attr(mfp->mf_fname, attr | MSG_HIST); + MSG_PUTS_ATTR(_(" has been damaged (page size is smaller than minimum value).\n"), + attr | MSG_HIST); + msg_end(); + goto theend; + } if ((size = lseek(mfp->mf_fd, (off_t)0L, SEEK_END)) <= 0) mfp->mf_blocknr_max = 0; /* no file or empty file */ else mfp->mf_blocknr_max = (blocknr_T)(size / mfp->mf_page_size); mfp->mf_infile_count = mfp->mf_blocknr_max; + + /* need to reallocate the memory used to store the data */ + p = alloc(mfp->mf_page_size); + if (p == NULL) + goto theend; + mch_memmove(p, hp->bh_data, previous_page_size); + vim_free(hp->bh_data); + hp->bh_data = p; + b0p = (ZERO_BL *)(hp->bh_data); } /* *** ../vim-7.0.230/src/version.c Thu Apr 26 17:08:16 2007 --- src/version.c Thu Apr 26 17:11:38 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 231, /**/ -- hundred-and-one symptoms of being an internet addict: 23. You can't call your mother...she doesn't have a modem. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:25 -0400 Subject: rpms/vim/FC-6 7.0.232,NONE,1.1 Message-ID: <200705030904.l4394P5b016027@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16012 Added Files: 7.0.232 Log Message: Patchlevel 232 --- NEW FILE 7.0.232 --- To: vim-dev at vim.org Subject: patch 7.0.232 (extra) Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.232 (extra) Problem: Mac: doesn't support GUI tab page labels. Solution: Add GUI tab page labels. (Nicolas Weber) Files: src/feature.h, src/gui.c, src/gui.h, src/gui_mac.c, src/proto/gui_mac.pro *** ../vim-7.0.231/src/feature.h Wed Nov 1 18:10:36 2006 --- src/feature.h Thu Mar 15 19:02:15 2007 *************** *** 756,761 **** --- 756,762 ---- #if defined(FEAT_WINDOWS) && defined(FEAT_NORMAL) \ && (defined(FEAT_GUI_GTK) \ || (defined(FEAT_GUI_MOTIF) && defined(HAVE_XM_NOTEBOOK_H)) \ + || defined(FEAT_GUI_MAC) \ || (defined(FEAT_GUI_MSWIN) && (!defined(_MSC_VER) || _MSC_VER > 1020))) # define FEAT_GUI_TABLINE #endif *** ../vim-7.0.231/src/gui.c Tue Oct 10 17:36:50 2006 --- src/gui.c Thu Mar 15 19:02:15 2007 *************** *** 1159,1165 **** #endif # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \ ! || defined(FEAT_GUI_MOTIF)) if (gui_has_tabline()) text_area_y += gui.tabline_height; #endif --- 1159,1165 ---- #endif # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \ ! || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_MAC)) if (gui_has_tabline()) text_area_y += gui.tabline_height; #endif *** ../vim-7.0.231/src/gui.h Thu Apr 27 01:52:33 2006 --- src/gui.h Thu Mar 15 19:02:15 2007 *************** *** 421,427 **** #endif /* FEAT_GUI_GTK */ #if defined(FEAT_GUI_TABLINE) \ ! && (defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF)) int tabline_height; #endif --- 425,432 ---- #endif /* FEAT_GUI_GTK */ #if defined(FEAT_GUI_TABLINE) \ ! && (defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF) \ ! || defined(FEAT_GUI_MAC)) int tabline_height; #endif *** ../vim-7.0.231/src/gui_mac.c Thu Mar 8 20:39:02 2007 --- src/gui_mac.c Fri Mar 16 11:26:05 2007 *************** *** 4,10 **** * GUI/Motif support by Robert Webb * Macintosh port by Dany St-Amant * and Axel Kielhorn ! * Port to MPW by Bernhard Pr?mmer * Initial Carbon port by Ammon Skidmore * * Do ":help uganda" in Vim to read copying and usage conditions. --- 4,10 ---- * GUI/Motif support by Robert Webb * Macintosh port by Dany St-Amant * and Axel Kielhorn ! * Port to MPW by Bernhard Pruemmer * Initial Carbon port by Ammon Skidmore * * Do ":help uganda" in Vim to read copying and usage conditions. *************** *** 260,265 **** --- 260,270 ---- OSErr HandleUnusedParms(const AppleEvent *theAEvent); #endif + #ifdef FEAT_GUI_TABLINE + static void initialise_tabline(void); + static WindowRef drawer = NULL; // TODO: put into gui.h + #endif + /* * ------------------------------------------------------------ * Conversion Utility *************** *** 2357,2362 **** --- 2323,2335 ---- thePart = FindWindow(theEvent->where, &whichWindow); + #ifdef FEAT_GUI_TABLINE + /* prevent that the vim window size changes if it's activated by a + click into the tab pane */ + if (whichWindow == drawer) + return; + #endif + switch (thePart) { case (inDesk): *************** *** 3097,3102 **** --- 3070,3082 ---- #endif */ + #ifdef FEAT_GUI_TABLINE + /* + * Create the tabline + */ + initialise_tabline(); + #endif + /* TODO: Load bitmap if using TOOLBAR */ return OK; } *************** *** 5895,5901 **** theCPB.dirInfo.ioFDirIndex = 0; theCPB.dirInfo.ioNamePtr = file.name; theCPB.dirInfo.ioVRefNum = file.vRefNum; ! /*theCPB.hFileInfo.ioDirID = 0;*/ theCPB.dirInfo.ioDrDirID = file.parID; /* As ioFDirIndex = 0, get the info of ioNamePtr, --- 5875,5881 ---- theCPB.dirInfo.ioFDirIndex = 0; theCPB.dirInfo.ioNamePtr = file.name; theCPB.dirInfo.ioVRefNum = file.vRefNum; ! /*theCPB.hFileInfo.ioDirID = 0;*/ theCPB.dirInfo.ioDrDirID = file.parID; /* As ioFDirIndex = 0, get the info of ioNamePtr, *************** *** 6093,6096 **** --- 6073,6479 ---- return (script != smRoman && script == GetScriptManagerVariable(smSysScript)) ? 1 : 0; } + #endif /* defined(USE_IM_CONTROL) || defined(PROTO) */ + + + + + #if defined(FEAT_GUI_TABLINE) || defined(PROTO) + // drawer implementation + static MenuRef contextMenu = NULL; + enum + { + kTabContextMenuId = 42, + }; + + // the caller has to CFRelease() the returned string + static CFStringRef + getTabLabel(tabpage_T *page) + { + get_tabline_label(page, FALSE); + #ifdef MACOS_CONVERT + return mac_enc_to_cfstring(NameBuff, STRLEN(NameBuff)); + #else + // TODO: check internal encoding? + return CFStringCreateWithCString(kCFAllocatorDefault, (char *)NameBuff, + kCFStringEncodingMacRoman); + #endif + } + + + #define DRAWER_SIZE 150 + #define DRAWER_INSET 16 + + static ControlRef dataBrowser = NULL; + + // when the tabline is hidden, vim doesn't call update_tabline(). When + // the tabline is shown again, show_tabline() is called before upate_tabline(), + // and because of this, the tab labels and vims internal tabs are out of sync + // for a very short time. to prevent inconsistent state, we store the labels + // of the tabs, not pointers to the tabs (which are invalid for a short time). + static CFStringRef *tabLabels = NULL; + static int tabLabelsSize = 0; + + enum + { + kTabsColumn = 'Tabs' + }; + + static int + getTabCount(void) + { + tabpage_T *tp; + int numTabs = 0; + + for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) + ++numTabs; + return numTabs; + } + + // data browser item display callback + static OSStatus + dbItemDataCallback(ControlRef browser, + DataBrowserItemID itemID, + DataBrowserPropertyID property /* column id */, + DataBrowserItemDataRef itemData, + Boolean changeValue) + { + OSStatus status = noErr; + + // assert(property == kTabsColumn); // why is this violated?? + + // changeValue is true if we have a modifieable list and data was changed. + // In our case, it's always false. + // (that is: if (changeValue) updateInternalData(); else return + // internalData(); + if (!changeValue) + { + CFStringRef str; + + assert(itemID - 1 >= 0 && itemID - 1 < tabLabelsSize); + str = tabLabels[itemID - 1]; + status = SetDataBrowserItemDataText(itemData, str); + } + else + status = errDataBrowserPropertyNotSupported; + + return status; + } + + // data browser action callback + static void + dbItemNotificationCallback(ControlRef browser, + DataBrowserItemID item, + DataBrowserItemNotification message) + { + switch (message) + { + case kDataBrowserItemSelected: + send_tabline_event(item); + break; + } + } + + // callbacks needed for contextual menu: + static void + dbGetContextualMenuCallback(ControlRef browser, + MenuRef *menu, + UInt32 *helpType, + CFStringRef *helpItemString, + AEDesc *selection) + { + // on mac os 9: kCMHelpItemNoHelp, but it's not the same + *helpType = kCMHelpItemRemoveHelp; // OS X only ;-) + *helpItemString = NULL; + + *menu = contextMenu; + } + + static void + dbSelectContextualMenuCallback(ControlRef browser, + MenuRef menu, + UInt32 selectionType, + SInt16 menuID, + MenuItemIndex menuItem) + { + if (selectionType == kCMMenuItemSelected) + { + MenuCommand command; + GetMenuItemCommandID(menu, menuItem, &command); + + // get tab that was selected when the context menu appeared + // (there is always one tab selected). TODO: check if the context menu + // isn't opened on an item but on empty space (has to be possible some + // way, the finder does it too ;-) ) + Handle items = NewHandle(0); + if (items != NULL) + { + int numItems; + + GetDataBrowserItems(browser, kDataBrowserNoItem, false, + kDataBrowserItemIsSelected, items); + numItems = GetHandleSize(items) / sizeof(DataBrowserItemID); + if (numItems > 0) + { + int idx; + DataBrowserItemID *itemsPtr; + + HLock(items); + itemsPtr = (DataBrowserItemID *)*items; + idx = itemsPtr[0]; + HUnlock(items); + send_tabline_menu_event(idx, command); + } + DisposeHandle(items); + } + } + } + + // focus callback of the data browser to always leave focus in vim + static OSStatus + dbFocusCallback(EventHandlerCallRef handler, EventRef event, void *data) + { + assert(GetEventClass(event) == kEventClassControl + && GetEventKind(event) == kEventControlSetFocusPart); + + return paramErr; + } + + + // drawer callback to resize data browser to drawer size + static OSStatus + drawerCallback(EventHandlerCallRef handler, EventRef event, void *data) + { + switch (GetEventKind(event)) + { + case kEventWindowBoundsChanged: // move or resize + { + UInt32 attribs; + GetEventParameter(event, kEventParamAttributes, typeUInt32, + NULL, sizeof(attribs), NULL, &attribs); + if (attribs & kWindowBoundsChangeSizeChanged) // resize + { + Rect r; + GetWindowBounds(drawer, kWindowContentRgn, &r); + SetRect(&r, 0, 0, r.right - r.left, r.bottom - r.top); + SetControlBounds(dataBrowser, &r); + SetDataBrowserTableViewNamedColumnWidth(dataBrowser, + kTabsColumn, r.right); + } + } + break; + } + + return eventNotHandledErr; + } + + // Load DataBrowserChangeAttributes() dynamically on tiger (and better). + // This way the code works on 10.2 and 10.3 as well (it doesn't have the + // blue highlights in the list view on these systems, though. Oh well.) + + + #import + + enum { kMyDataBrowserAttributeListViewAlternatingRowColors = (1 << 1) }; + + static OSStatus + myDataBrowserChangeAttributes(ControlRef inDataBrowser, + OptionBits inAttributesToSet, + OptionBits inAttributesToClear) + { + long osVersion; + char *symbolName; + NSSymbol symbol = NULL; + OSStatus (*dataBrowserChangeAttributes)(ControlRef inDataBrowser, + OptionBits inAttributesToSet, OptionBits inAttributesToClear); + + Gestalt(gestaltSystemVersion, &osVersion); + if (osVersion < 0x1040) // only supported for 10.4 (and up) + return noErr; + + // C name mangling... + symbolName = "_DataBrowserChangeAttributes"; + if (!NSIsSymbolNameDefined(symbolName) + || (symbol = NSLookupAndBindSymbol(symbolName)) == NULL) + return noErr; + + dataBrowserChangeAttributes = NSAddressOfSymbol(symbol); + if (dataBrowserChangeAttributes == NULL) + return noErr; // well... + return dataBrowserChangeAttributes(inDataBrowser, + inAttributesToSet, inAttributesToClear); + } + + static void + initialise_tabline(void) + { + Rect drawerRect = { 0, 0, 0, DRAWER_SIZE }; + DataBrowserCallbacks dbCallbacks; + EventTypeSpec focusEvent = {kEventClassControl, kEventControlSetFocusPart}; + EventTypeSpec resizeEvent = {kEventClassWindow, kEventWindowBoundsChanged}; + DataBrowserListViewColumnDesc colDesc; + + // drawers have to have compositing enabled + CreateNewWindow(kDrawerWindowClass, + kWindowStandardHandlerAttribute + | kWindowCompositingAttribute + | kWindowResizableAttribute + | kWindowLiveResizeAttribute, + &drawerRect, &drawer); + + SetThemeWindowBackground(drawer, kThemeBrushDrawerBackground, true); + SetDrawerParent(drawer, gui.VimWindow); + SetDrawerOffsets(drawer, kWindowOffsetUnchanged, DRAWER_INSET); + + + // create list view embedded in drawer + CreateDataBrowserControl(drawer, &drawerRect, kDataBrowserListView, + &dataBrowser); + + dbCallbacks.version = kDataBrowserLatestCallbacks; + InitDataBrowserCallbacks(&dbCallbacks); + dbCallbacks.u.v1.itemDataCallback = + NewDataBrowserItemDataUPP(dbItemDataCallback); + dbCallbacks.u.v1.itemNotificationCallback = + NewDataBrowserItemNotificationUPP(dbItemNotificationCallback); + dbCallbacks.u.v1.getContextualMenuCallback = + NewDataBrowserGetContextualMenuUPP(dbGetContextualMenuCallback); + dbCallbacks.u.v1.selectContextualMenuCallback = + NewDataBrowserSelectContextualMenuUPP(dbSelectContextualMenuCallback); + + SetDataBrowserCallbacks(dataBrowser, &dbCallbacks); + + SetDataBrowserListViewHeaderBtnHeight(dataBrowser, 0); // no header + SetDataBrowserHasScrollBars(dataBrowser, false, true); // only vertical + SetDataBrowserSelectionFlags(dataBrowser, + kDataBrowserSelectOnlyOne | kDataBrowserNeverEmptySelectionSet); + SetDataBrowserTableViewHiliteStyle(dataBrowser, + kDataBrowserTableViewFillHilite); + Boolean b = false; + SetControlData(dataBrowser, kControlEntireControl, + kControlDataBrowserIncludesFrameAndFocusTag, sizeof(b), &b); + + // enable blue background in data browser (this is only in 10.4 and vim + // has to support older osx versions as well, so we have to load this + // function dynamically) + myDataBrowserChangeAttributes(dataBrowser, + kMyDataBrowserAttributeListViewAlternatingRowColors, 0); + + // install callback that keeps focus in vim and away from the data browser + InstallControlEventHandler(dataBrowser, dbFocusCallback, 1, &focusEvent, + NULL, NULL); + + // install callback that keeps data browser at the size of the drawer + InstallWindowEventHandler(drawer, drawerCallback, 1, &resizeEvent, + NULL, NULL); + + // add "tabs" column to data browser + colDesc.propertyDesc.propertyID = kTabsColumn; + colDesc.propertyDesc.propertyType = kDataBrowserTextType; + + // add if items can be selected (?): kDataBrowserListViewSelectionColumn + colDesc.propertyDesc.propertyFlags = kDataBrowserDefaultPropertyFlags; + + colDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc; + colDesc.headerBtnDesc.minimumWidth = 100; + colDesc.headerBtnDesc.maximumWidth = 150; + colDesc.headerBtnDesc.titleOffset = 0; + colDesc.headerBtnDesc.titleString = CFSTR("Tabs"); + colDesc.headerBtnDesc.initialOrder = kDataBrowserOrderIncreasing; + colDesc.headerBtnDesc.btnFontStyle.flags = 0; // use default font + colDesc.headerBtnDesc.btnContentInfo.contentType = kControlContentTextOnly; + + AddDataBrowserListViewColumn(dataBrowser, &colDesc, 0); + + // create tabline popup menu required by vim docs (see :he tabline-menu) + CreateNewMenu(kTabContextMenuId, 0, &contextMenu); + AppendMenuItemTextWithCFString(contextMenu, CFSTR("Close"), 0, + TABLINE_MENU_CLOSE, NULL); + AppendMenuItemTextWithCFString(contextMenu, CFSTR("New Tab"), 0, + TABLINE_MENU_NEW, NULL); + AppendMenuItemTextWithCFString(contextMenu, CFSTR("Open Tab..."), 0, + TABLINE_MENU_OPEN, NULL); + } + + + /* + * Show or hide the tabline. + */ + void + gui_mch_show_tabline(int showit) + { + if (showit == 0) + CloseDrawer(drawer, true); + else + OpenDrawer(drawer, kWindowEdgeRight, true); + } + + /* + * Return TRUE when tabline is displayed. + */ + int + gui_mch_showing_tabline(void) + { + WindowDrawerState state = GetDrawerState(drawer); + + return state == kWindowDrawerOpen || state == kWindowDrawerOpening; + } + + /* + * Update the labels of the tabline. + */ + void + gui_mch_update_tabline(void) + { + tabpage_T *tp; + int numTabs = getTabCount(); + int nr = 1; + int curtabidx = 1; + + // adjust data browser + if (tabLabels != NULL) + { + int i; + + for (i = 0; i < tabLabelsSize; ++i) + CFRelease(tabLabels[i]); + free(tabLabels); + } + tabLabels = (CFStringRef *)malloc(numTabs * sizeof(CFStringRef)); + tabLabelsSize = numTabs; + + for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, ++nr) + { + if (tp == curtab) + curtabidx = nr; + tabLabels[nr-1] = getTabLabel(tp); + } + + RemoveDataBrowserItems(dataBrowser, kDataBrowserNoItem, 0, NULL, + kDataBrowserItemNoProperty); + // data browser uses ids 1, 2, 3, ... numTabs per default, so we + // can pass NULL for the id array + AddDataBrowserItems(dataBrowser, kDataBrowserNoItem, numTabs, NULL, + kDataBrowserItemNoProperty); + + DataBrowserItemID item = curtabidx; + SetDataBrowserSelectedItems(dataBrowser, 1, &item, kDataBrowserItemsAssign); + } + + /* + * Set the current tab to "nr". First tab is 1. + */ + void + gui_mch_set_curtab(nr) + int nr; + { + DataBrowserItemID item = nr; + SetDataBrowserSelectedItems(dataBrowser, 1, &item, kDataBrowserItemsAssign); + + // TODO: call something like this?: (or restore scroll position, or...) + RevealDataBrowserItem(dataBrowser, item, kTabsColumn, + kDataBrowserRevealOnly); + } + + #endif // FEAT_GUI_TABLINE *** ../vim-7.0.231/src/proto/gui_mac.pro Tue Mar 28 23:01:02 2006 --- src/proto/gui_mac.pro Thu Mar 15 20:23:42 2007 *************** *** 84,89 **** --- 84,93 ---- int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield)); char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter)); void gui_mch_set_foreground __ARGS((void)); + void gui_mch_show_tabline __ARGS((int showit)); + int gui_mch_showing_tabline __ARGS((void)); + void gui_mch_update_tabline __ARGS((void)); + void gui_mch_set_curtab __ARGS((int nr)); char_u *C2Pascal_save __ARGS((char_u *Cstring)); char_u *C2Pascal_save_and_remove_backslash __ARGS((char_u *Cstring)); *** ../vim-7.0.231/src/version.c Thu Apr 26 17:23:28 2007 --- src/version.c Thu Apr 26 18:17:42 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 232, /**/ -- hundred-and-one symptoms of being an internet addict: 24. You realize there is not a sound in the house and you have no idea where your children are. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:28 -0400 Subject: rpms/vim/FC-6 7.0.233,NONE,1.1 Message-ID: <200705030904.l4394S5N016047@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16034 Added Files: 7.0.233 Log Message: Patchlevel 233 --- NEW FILE 7.0.233 --- To: vim-dev at vim.org Subject: patch 7.0.233 (extra) Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.233 (extra) Problem: Mac: code formatted badly. Solution: Fix code formatting Files: src/gui_mac.c *** ../vim-7.0.232/src/gui_mac.c Thu Apr 26 18:22:12 2007 --- src/gui_mac.c Fri Mar 16 11:26:05 2007 *************** *** 28,38 **** * */ ! /* TODO (Jussi) ! * * Clipboard does not work (at least some cases) ! * * ATSU font rendering has some problems ! * * Investigate and remove dead code (there is still lots of that) ! */ #include /* included first to avoid CR problems */ #include "vim.h" --- 28,38 ---- * */ ! /* TODO (Jussi) ! * * Clipboard does not work (at least some cases) ! * * ATSU font rendering has some problems ! * * Investigate and remove dead code (there is still lots of that) ! */ #include /* included first to avoid CR problems */ #include "vim.h" *************** *** 504,512 **** /* Get number of files in list */ *error = AECountItems(theList, numFiles); if (*error) ! { ! return(fnames); ! } /* Allocate the pointer list */ fnames = (char_u **) alloc(*numFiles * sizeof(char_u *)); --- 504,510 ---- /* Get number of files in list */ *error = AECountItems(theList, numFiles); if (*error) ! return fnames; /* Allocate the pointer list */ fnames = (char_u **) alloc(*numFiles * sizeof(char_u *)); *************** *** 526,532 **** { /* Caller is able to clean up */ /* TODO: Should be clean up or not? For safety. */ ! return(fnames); } /* Convert the FSSpec to a pathname */ --- 524,530 ---- { /* Caller is able to clean up */ /* TODO: Should be clean up or not? For safety. */ ! return fnames; } /* Convert the FSSpec to a pathname */ *************** *** 589,603 **** error = AEGetParamPtr(theAEvent, keyDirectObject, typeChar, &typeCode, (Ptr) &SearchData, sizeof(WindowSearch), &actualSize); if (error) ! { ! return(error); ! } error = HandleUnusedParms(theAEvent); if (error) ! { ! return(error); ! } for (buf = firstbuf; buf != NULL; buf = buf->b_next) if (buf->b_ml.ml_mfp != NULL --- 587,597 ---- error = AEGetParamPtr(theAEvent, keyDirectObject, typeChar, &typeCode, (Ptr) &SearchData, sizeof(WindowSearch), &actualSize); if (error) ! return error; error = HandleUnusedParms(theAEvent); if (error) ! return error; for (buf = firstbuf; buf != NULL; buf = buf->b_next) if (buf->b_ml.ml_mfp != NULL *************** *** 668,676 **** error = HandleUnusedParms(theAEvent); if (error) ! { ! return(error); ! } /* Send the reply */ /* replyObject.descriptorType = typeNull; --- 662,668 ---- error = HandleUnusedParms(theAEvent); if (error) ! return error; /* Send the reply */ /* replyObject.descriptorType = typeNull; *************** *** 679,687 **** /* AECreateDesc(typeChar, (Ptr)&title[1], title[0], &data) */ error = AECreateList(nil, 0, false, &replyList); if (error) ! { ! return(error); ! } #if 0 error = AECountItems(&replyList, &numFiles); --- 671,677 ---- /* AECreateDesc(typeChar, (Ptr)&title[1], title[0], &data) */ error = AECreateList(nil, 0, false, &replyList); if (error) ! return error; #if 0 error = AECountItems(&replyList, &numFiles); *************** *** 775,783 **** error = AEGetParamPtr(theAEvent, keyDirectObject, typeChar, &typeCode, (Ptr) &GetTextData, sizeof(GetTextData), &actualSize); if (error) ! { ! return(error); ! } for (buf = firstbuf; buf != NULL; buf = buf->b_next) if (buf->b_ml.ml_mfp != NULL) --- 765,771 ---- error = AEGetParamPtr(theAEvent, keyDirectObject, typeChar, &typeCode, (Ptr) &GetTextData, sizeof(GetTextData), &actualSize); if (error) ! return error; for (buf = firstbuf; buf != NULL; buf = buf->b_next) if (buf->b_ml.ml_mfp != NULL) *************** *** 826,837 **** } error = HandleUnusedParms(theAEvent); - if (error) - { - return(error); - } ! return(error); } /* --- 814,821 ---- } error = HandleUnusedParms(theAEvent); ! return error; } /* *************** *** 1017,1025 **** /* the direct object parameter is the list of aliases to files (one or more) */ error = AEGetParamDesc(theAEvent, keyDirectObject, typeAEList, &theList); if (error) ! { ! return(error); ! } error = AEGetParamPtr(theAEvent, keyAEPosition, typeChar, &typeCode, (Ptr) &thePosition, sizeof(SelectionRange), &actualSize); --- 1001,1007 ---- /* the direct object parameter is the list of aliases to files (one or more) */ error = AEGetParamDesc(theAEvent, keyDirectObject, typeAEList, &theList); if (error) ! return error; error = AEGetParamPtr(theAEvent, keyAEPosition, typeChar, &typeCode, (Ptr) &thePosition, sizeof(SelectionRange), &actualSize); *************** *** 1028,1036 **** if (error == errAEDescNotFound) error = noErr; if (error) ! { ! return(error); ! } /* error = AEGetParamDesc(theAEvent, keyAEPosition, typeChar, &thePosition); --- 1010,1016 ---- if (error == errAEDescNotFound) error = noErr; if (error) ! return error; /* error = AEGetParamDesc(theAEvent, keyAEPosition, typeChar, &thePosition); *************** *** 1134,1148 **** /* Fake mouse event to wake from stall */ PostEvent(mouseUp, 0); ! finished: AEDisposeDesc(&theList); /* dispose what we allocated */ error = HandleUnusedParms(theAEvent); ! if (error) ! { ! return(error); ! } ! return(error); } /* --- 1114,1124 ---- /* Fake mouse event to wake from stall */ PostEvent(mouseUp, 0); ! finished: AEDisposeDesc(&theList); /* dispose what we allocated */ error = HandleUnusedParms(theAEvent); ! return error; } /* *************** *** 1158,1169 **** OSErr error = noErr; error = HandleUnusedParms(theAEvent); ! if (error) ! { ! return(error); ! } ! ! return(error); } /* --- 1134,1140 ---- OSErr error = noErr; error = HandleUnusedParms(theAEvent); ! return error; } /* *************** *** 1180,1193 **** error = HandleUnusedParms(theAEvent); if (error) ! { ! return(error); ! } /* Need to fake a :confirm qa */ do_cmdline_cmd((char_u *)"confirm qa"); ! return(error); } /* --- 1151,1162 ---- error = HandleUnusedParms(theAEvent); if (error) ! return error; /* Need to fake a :confirm qa */ do_cmdline_cmd((char_u *)"confirm qa"); ! return error; } /* *************** *** 1203,1214 **** OSErr error = noErr; error = HandleUnusedParms(theAEvent); - if (error) - { - return(error); - } ! return(error); } /* --- 1172,1179 ---- OSErr error = noErr; error = HandleUnusedParms(theAEvent); ! return error; } /* *************** *** 1225,1236 **** OSErr error = noErr; error = HandleUnusedParms(theAEvent); - if (error) - { - return(error); - } ! return(error); } --- 1190,1197 ---- OSErr error = noErr; error = HandleUnusedParms(theAEvent); ! return error; } *************** *** 2517,2523 **** return noErr; ! bail: /* * when we fail give any additional callback handler a chance to perform * it's actions --- 2478,2484 ---- return noErr; ! bail: /* * when we fail give any additional callback handler a chance to perform * it's actions *************** *** 2907,2913 **** #endif static OSErr ! receiveHandler(WindowRef theWindow, void* handlerRefCon, DragRef theDrag) { int x, y; int_u modifiers; --- 2868,2874 ---- #endif static OSErr ! receiveHandler(WindowRef theWindow, void *handlerRefCon, DragRef theDrag) { int x, y; int_u modifiers; *************** *** 4982,4988 **** SetControl32BitMaximum (sb->id, max); SetControl32BitMinimum (sb->id, 0); SetControl32BitValue (sb->id, val); ! SetControlViewSize (sb->id, size); #ifdef DEBUG_MAC_SB printf("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max); #endif --- 4943,4949 ---- SetControl32BitMaximum (sb->id, max); SetControl32BitMinimum (sb->id, 0); SetControl32BitValue (sb->id, val); ! SetControlViewSize (sb->id, size); #ifdef DEBUG_MAC_SB printf("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max); #endif *** ../vim-7.0.232/src/version.c Thu Apr 26 18:22:12 2007 --- src/version.c Thu Apr 26 18:41:08 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 233, /**/ -- hundred-and-one symptoms of being an internet addict: 25. You believe nothing looks sexier than a man in boxer shorts illuminated only by a 17" inch svga monitor. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:32 -0400 Subject: rpms/vim/FC-6 7.0.234,NONE,1.1 Message-ID: <200705030904.l4394W7W016067@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16054 Added Files: 7.0.234 Log Message: Patchlevel 234 --- NEW FILE 7.0.234 --- To: vim-dev at vim.org Subject: patch 7.0.234 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.234 Problem: It's possible to use feedkeys() from a modeline. That is a security issue, can be used for a trojan horse. Solution: Disallow using feedkeys() in the sandbox. Files: src/eval.c *** ../vim-7.0.233/src/eval.c Thu Apr 26 17:08:16 2007 --- src/eval.c Fri Apr 27 21:48:18 2007 *************** *** 9078,9083 **** --- 9078,9089 ---- int typed = FALSE; char_u *keys_esc; + /* This is not allowed in the sandbox. If the commands would still be + * executed in the sandbox it would be OK, but it probably happens later, + * when "sandbox" is no longer set. */ + if (check_secure()) + return; + rettv->vval.v_number = 0; keys = get_tv_string(&argvars[0]); if (*keys != NUL) *** ../vim-7.0.233/src/version.c Thu Apr 26 18:42:17 2007 --- src/version.c Fri Apr 27 22:13:23 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 234, /**/ -- "Making it up? Why should I want to make anything up? Life's bad enough as it is without wanting to invent any more of it." -- Marvin, the Paranoid Android in Douglas Adams' "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:04:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:04:35 -0400 Subject: rpms/vim/FC-6 7.0.235,NONE,1.1 Message-ID: <200705030904.l4394Z05016087@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16074 Added Files: 7.0.235 Log Message: Patchlevel 235 --- NEW FILE 7.0.235 --- To: vim-dev at vim.org Subject: patch 7.0.235 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.235 Problem: It is possible to use writefile() in the sandbox. Solution: Add a few more checks for the sandbox. Files: src/eval.c *** ../vim-7.0.234/src/eval.c Fri Apr 27 22:17:43 2007 --- src/eval.c Sat Apr 28 21:36:02 2007 *************** *** 15598,15603 **** --- 15598,15606 ---- int err = FALSE; FILE *fd; + if (check_restricted() || check_secure()) + return; + if (argvars[1].v_type != VAR_UNKNOWN) { /* *************** *** 16430,16435 **** --- 16433,16441 ---- char_u *s; int ret = 0; int c; + + if (check_restricted() || check_secure()) + return; if (argvars[0].v_type != VAR_LIST) { *** ../vim-7.0.234/src/version.c Fri Apr 27 22:17:43 2007 --- src/version.c Sun Apr 29 13:54:29 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 235, /**/ -- Now it is such a bizarrely improbable coincidence that anything as mind-bogglingly useful as the Babel fish could have evolved purely by chance that some thinkers have chosen to see it as a final and clinching proof of the NON-existence of God. The argument goes something like this: 'I refuse to prove that I exist,' says God, 'for proof denies faith, and without faith I am nothing.' 'But,' says Man, 'the Babel fish is a dead giveaway, isn't it? It could not have evolved by chance. It proves you exist, and so therefore, by your own arguments, you don't. QED.' 'Oh dear,' says God, 'I hadn't thought of that,' and promptly vanishes in a puff of logic. 'Oh, that was easy,' says Man, and for an encore goes on to prove that black is white and gets himself killed on the next pedestrian crossing. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Thu May 3 09:05:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 05:05:20 -0400 Subject: rpms/vim/FC-6 README.patches,1.64,1.65 vim.spec,1.148,1.149 Message-ID: <200705030905.l4395KuB016113@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16099 Modified Files: README.patches vim.spec Log Message: - update to patchlevel 235, fixes modeline issues Index: README.patches =================================================================== RCS file: /cvs/dist/rpms/vim/FC-6/README.patches,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- README.patches 27 Feb 2007 12:29:42 -0000 1.64 +++ README.patches 3 May 2007 09:05:18 -0000 1.65 @@ -232,3 +232,37 @@ 1969 7.0.199 cursor in wrong col when completing+formatting multi-byte 2792 7.0.200 memory leaks when out of memory 2511 7.0.201 error message from ":diffput" may be wrong + 9403 7.0.202 compiler and runtime problems on Tandem systems + 5579 7.0.203 0x80 and CSI need to be escaped when executing a register + 1892 7.0.204 cscope: parsing of lines for listing doesn't work properly + 1573 7.0.205 (after 7.0.203) can't compile tiny version + 2099 7.0.206 (after 7.0.058) can't edit all gb18030 files properly + 3000 7.0.207 (after 7.0.203) 0x80 and CSI escaped too often when recording + 9414 7.0.208 (after 7.0.171 and 7.0.180) VMS: path changes cause trouble + 1706 7.0.209 Python: cursor may end up beyond end of changed line + 3863 7.0.210 ":cbuffer" and ":lbuffer" don't take a ! + 1674 7.0.211 CTRL-U in Insert mode deletes autoindent when 'bs' is zero + 2636 7.0.212 GUI doesn't terminate on SIGTERM + 1463 7.0.213 "z=" crashes when regions in 'spellfile' share soundfolding + 4870 7.0.214 can't get "\ " argument for in a user command + 2807 7.0.215 (extra) Mac: Context menu has disabled useless Help entry + 3460 7.0.216 ":tab wincmd ]" does not open a new tab page + 2007 7.0.217 hang when pressing "n" for ":%s/\n/,\r/gc" + 1479 7.0.218 "%B" in 'statusline' doesn't work in Insert mode + 4108 7.0.219 editexisting.vim doesn't see buffer in other tab page + 1448 7.0.220 crash when using winnr('#') in a new tab page + 3029 7.0.221 finddir() did not work properly for "." in path + 4147 7.0.222 'cindent' works for Perl, except for recognizing comments + 2604 7.0.223 popup menu could not handle unprintable characters + 6467 7.0.224 when expanding "##" spaces are escaped twice + 2203 7.0.225 after setline() cursor may be on wrong byte of mulit-byte char + 1578 7.0.226 display flicker when setting sign through netbeans interface + 1720 7.0.227 crash when closing a window in the GUI + 1779 7.0.228 Cygwin: problem with symlink to DOS style path + 1806 7.0.229 if 'pt' starts with Esc then Insert mode Esc doesn't time out + 4586 7.0.230 a script doesn't know if the current dir is a local dir + 2628 7.0.231 recovery from a swap file may crash + 18671 7.0.232 (extra) Mac: GUI tab labels are not supported + 9738 7.0.233 (extra) Mac: code badly formatted + 1723 7.0.234 feedkeys() may be invoked from a modeline + 2299 7.0.235 writefile() may be invoked from a modeline Index: vim.spec =================================================================== RCS file: /cvs/dist/rpms/vim/FC-6/vim.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- vim.spec 27 Feb 2007 12:29:42 -0000 1.148 +++ vim.spec 3 May 2007 09:05:18 -0000 1.149 @@ -15,7 +15,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim70%{?beta} -%define patchlevel 201 +%define patchlevel 235 Summary: The VIM editor URL: http://www.vim.org/ @@ -254,6 +254,42 @@ Patch199: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.199 Patch200: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.200 Patch201: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.201 +Patch202: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.202 +Patch203: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.203 +Patch204: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.204 +Patch205: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.205 +Patch206: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.206 +Patch207: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.207 +#Patch208: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.208 +Patch209: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.209 +Patch210: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.210 +Patch211: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.211 +Patch212: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.212 +Patch213: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.213 +Patch214: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.214 +#Patch215: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.215 +Patch216: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.216 +Patch217: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.217 +Patch218: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.218 +Patch219: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.219 +Patch220: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.220 +Patch221: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.221 +Patch222: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.222 +Patch223: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.223 +Patch224: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.224 +Patch225: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.225 +Patch226: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.226 +Patch227: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.227 +Patch228: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.228 +Patch229: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.229 +Patch230: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.230 +Patch231: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.231 +# Mac: +#Patch232: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.232 +# Mac: +#Patch233: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.233 +Patch234: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.234 +Patch235: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.235 Patch3000: vim-7.0-syntax.patch #Patch3001: vim-6.2-rh1.patch @@ -273,10 +309,10 @@ Patch3101: vim-selinux2.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Buildrequires: python-devel perl ncurses-devel gettext -Buildrequires: libacl-devel gpm-devel autoconf +BuildRequires: python-devel ncurses-devel gettext +BuildRequires: libacl-devel gpm-devel autoconf %if %{WITH_SELINUX} -Buildrequires: libselinux-devel +BuildRequires: libselinux-devel %endif %if %{desktop_file} Requires: /usr/bin/desktop-file-install @@ -291,7 +327,7 @@ multiple windows, multi-level undo, block highlighting and more. %package common -Summary: The common files needed by any version of the VIM editor. +Summary: The common files needed by any version of the VIM editor Group: Applications/Editors Conflicts: man-pages-fr < 0.9.7-14 Conflicts: man-pages-it < 0.3.0-17 @@ -309,7 +345,7 @@ to install the vim-common package. %package spell -Summary: The dictionaries for spell checking. This package is optional. +Summary: The dictionaries for spell checking. This package is optional Group: Applications/Editors Requires: vim-common = %{epoch}:%{version}-%{release} @@ -318,7 +354,7 @@ many different languages. %package minimal -Summary: A minimal version of the VIM editor. +Summary: A minimal version of the VIM editor Group: Applications/Editors Provides: vi = %{version}-%{release} @@ -333,7 +369,7 @@ package is installed. %package enhanced -Summary: A version of the VIM editor which includes recent enhancements. +Summary: A version of the VIM editor which includes recent enhancements Group: Applications/Editors Requires: vim-common = %{epoch}:%{version}-%{release} Provides: vim = %{version}-%{release} @@ -352,9 +388,10 @@ need to install the vim-common package. %package X11 -Summary: The VIM version of the vi editor for the X Window System. +Summary: The VIM version of the vi editor for the X Window System Group: Applications/Editors -Requires: vim-common = %{epoch}:%{version}-%{release} libattr gtk2 >= 2.6 +Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk2 >= 2.6 +Provides: gvim = %{version}-%{release} BuildRequires: gtk2-devel libSM-devel libXt-devel libXpm-devel %description X11 @@ -620,6 +657,43 @@ %patch199 -p0 %patch200 -p0 %patch201 -p0 +%patch202 -p0 +%patch203 -p0 +%patch204 -p0 +%patch205 -p0 +%patch206 -p0 +%patch207 -p0 +# VMS: +#patch208 -p0 +%patch209 -p0 +%patch210 -p0 +%patch211 -p0 +%patch212 -p0 +%patch213 -p0 +%patch214 -p0 +# MAC: +#patch215 -p0 +%patch216 -p0 +%patch217 -p0 +%patch218 -p0 +%patch219 -p0 +%patch220 -p0 +%patch221 -p0 +%patch222 -p0 +%patch223 -p0 +%patch224 -p0 +%patch225 -p0 +%patch226 -p0 +%patch227 -p0 +%patch228 -p0 +%patch229 -p0 +%patch230 -p0 +%patch231 -p0 +# Mac: +#patch232 -p0 +#patch233 -p0 +%patch234 -p0 +%patch235 -p0 # install spell files %if %{withvimspell} @@ -671,9 +745,9 @@ cp vim gvim make clean -%configure --prefix=/usr --with-features=huge --enable-pythoninterp \ +%configure --prefix=%{_prefix} --with-features=huge --enable-pythoninterp \ --enable-perlinterp --disable-tclinterp --with-x=no \ - --enable-gui=no --exec-prefix=/usr --enable-multibyte \ + --enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte \ --enable-cscope --with-modified-by="" \ --with-tlib=ncurses \ --with-compiledby="" \ @@ -689,7 +763,7 @@ #perl -pi -e "s/help.txt/vi-help.txt/" os_unix.h ex_cmds.c perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/" os_unix.h -%configure --prefix='${DEST}'/usr --with-features=small --with-x=no \ +%configure --prefix=%{_prefix} --with-features=small --with-x=no \ --enable-multibyte \ --disable-netbeans \ --disable-pythoninterp --disable-perlinterp --disable-tclinterp \ @@ -702,60 +776,61 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/bin -mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/after cp -f %{SOURCE11} . +cp runtime/doc/uganda.txt LICENSE cd src make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin -mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/usr/bin/xxd +mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/%{_bindir}/xxd make installmacros DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps -install -m755 gvim $RPM_BUILD_ROOT/usr/bin/gvim -install -m644 %{SOURCE7} \ +install -m755 gvim $RPM_BUILD_ROOT/%{_bindir}/gvim +install -p -m644 %{SOURCE7} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/gvim.png -install -m644 %{SOURCE8} \ +install -p -m644 %{SOURCE8} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/gvim.png -install -m644 %{SOURCE9} \ +install -p -m644 %{SOURCE9} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gvim.png -install -m644 %{SOURCE10} \ +install -p -m644 %{SOURCE10} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/gvim.png -install -m755 enhanced-vim $RPM_BUILD_ROOT/usr/bin/vim +install -m755 enhanced-vim $RPM_BUILD_ROOT/%{_bindir}/vim ( cd $RPM_BUILD_ROOT - mv ./bin/vimtutor ./usr/bin/vimtutor + mv ./bin/vimtutor ./%{_bindir}/vimtutor mv ./bin/vim ./bin/vi rm -f ./bin/rvim ln -sf vi ./bin/ex ln -sf vi ./bin/rvi ln -sf vi ./bin/rview ln -sf vi ./bin/view - ln -sf vim ./usr/bin/ex - ln -sf vim ./usr/bin/rvim - ln -sf vim ./usr/bin/vimdiff + ln -sf vim ./%{_bindir}/ex + ln -sf vim ./%{_bindir}/rvim + ln -sf vim ./%{_bindir}/vimdiff perl -pi -e "s,$RPM_BUILD_ROOT,," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 rm -f .%{_mandir}/man1/rvim.1 ln -sf vim.1.gz .%{_mandir}/man1/vi.1.gz ln -sf vim.1.gz .%{_mandir}/man1/rvi.1.gz ln -sf vim.1.gz .%{_mandir}/man1/rvim.1.gz ln -sf vim.1.gz .%{_mandir}/man1/vimdiff.1.gz - ln -sf gvim ./usr/bin/gview - ln -sf gvim ./usr/bin/gex - ln -sf gvim ./usr/bin/evim - ln -sf gvim ./usr/bin/gvimdiff + ln -sf gvim ./%{_bindir}/gview + ln -sf gvim ./%{_bindir}/gex + ln -sf gvim ./%{_bindir}/evim + ln -sf gvim ./%{_bindir}/gvimdiff ln -sf vim.1.gz .%{_mandir}/man1/gvim.1.gz ln -sf vim.1.gz .%{_mandir}/man1/gvimdiff.1.gz - ln -sf gvim ./usr/bin/vimx + ln -sf gvim ./%{_bindir}/vimx %if "%{desktop_file}" == "1" mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications - desktop-file-install --vendor net \ + desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --add-category "Application;Development;X-Red-Hat-Base" \ %{SOURCE3} %else - mkdir -p ./etc/X11/applnk/Applications - cp %{SOURCE3} ./etc/X11/applnk/Applications/gvim.desktop + mkdir -p ./%{_sysconfdir}/X11/applnk/Applications + cp %{SOURCE3} ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop %endif # ja_JP.ujis is obsolete, ja_JP.eucJP is recommended. ( cd ./%{_datadir}/%{name}/%{vimdir}/lang; \ @@ -795,19 +870,19 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.sh </dev/null 2>&1 || alias vi=vim fi EOF cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.csh < $RPM_BUILD_ROOT/$bi + mv -f $RPM_BUILD_ROOT/$bi $i + done +) %post X11 touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then +if [ -x /%{_bindir}/gtk-update-icon-cache ]; then gtk-update-icon-cache --ignore-theme-index -q %{_datadir}/icons/hicolor fi +update-desktop-database &> /dev/null ||: %postun X11 touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then +if [ -x /%{_bindir}/gtk-update-icon-cache ]; then gtk-update-icon-cache --ignore-theme-index -q %{_datadir}/icons/hicolor fi +update-desktop-database &> /dev/null ||: %clean rm -rf $RPM_BUILD_ROOT @@ -834,7 +922,7 @@ %files common %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/vimrc -%doc README* +%doc README* LICENSE %doc runtime/docs %doc Changelog.rpm %dir %{_datadir}/%{name} @@ -845,7 +933,7 @@ %{_datadir}/%{name}/%{vimdir}/colors %{_datadir}/%{name}/%{vimdir}/compiler %{_datadir}/%{name}/%{vimdir}/doc -#exclude /usr/share/vim/%{vimdir}/doc/vi-help.txt +#exclude /%{_bindir}/vim/%{vimdir}/doc/vi-help.txt %{_datadir}/%{name}/%{vimdir}/*.vim %{_datadir}/%{name}/%{vimdir}/ftplugin %{_datadir}/%{name}/%{vimdir}/indent @@ -857,7 +945,6 @@ %{_datadir}/%{name}/%{vimdir}/plugin %{_datadir}/%{name}/%{vimdir}/print %{_datadir}/%{name}/%{vimdir}/syntax -%{_datadir}/%{name}/%{vimdir}/tools %{_datadir}/%{name}/%{vimdir}/tutor %if ! %{withvimspell} %{_datadir}/%{name}/%{vimdir}/spell @@ -884,7 +971,7 @@ %lang(zh_TW) %{_datadir}/%{name}/%{vimdir}/lang/zh_TW %lang(zh_CN.UTF-8) %{_datadir}/%{name}/%{vimdir}/lang/zh_CN.UTF-8 %lang(zh_TW.UTF-8) %{_datadir}/%{name}/%{vimdir}/lang/zh_TW.UTF-8 -/usr/bin/xxd +/%{_bindir}/xxd %{_mandir}/man1/vim.* %{_mandir}/man1/ex.* %{_mandir}/man1/vi.* @@ -892,13 +979,14 @@ %{_mandir}/man1/rvi.* %{_mandir}/man1/rview.* %{_mandir}/man1/xxd.* -%lang(fr) %{_mandir}/fr* -%lang(it) %{_mandir}/it* -%lang(ru) %{_mandir}/ru* -%lang(pl) %{_mandir}/pl* +%lang(fr) %{_mandir}/fr*/*/* +%lang(it) %{_mandir}/it*/*/* +%lang(ru) %{_mandir}/ru*/*/* +%lang(pl) %{_mandir}/pl*/*/* %if %{withvimspell} %files spell +%defattr(-,root,root) %dir %{_datadir}/%{name}/%{vimdir}/spell %{_datadir}/%{name}/vim70/spell/cleanadd.vim %lang(af) %{_datadir}/%{name}/%{vimdir}/spell/af.* @@ -965,11 +1053,11 @@ %files enhanced %defattr(-,root,root) -/usr/bin/vim -/usr/bin/rvim -/usr/bin/vimdiff -/usr/bin/ex -/usr/bin/vimtutor +%{_bindir}/vim +%{_bindir}/rvim +%{_bindir}/vimdiff +%{_bindir}/ex +%{_bindir}/vimtutor %config(noreplace) %{_sysconfdir}/profile.d/vim.* %{_mandir}/man1/rvim.* %{_mandir}/man1/vimdiff.* @@ -978,21 +1066,45 @@ %files X11 %defattr(-,root,root) %if "%{desktop_file}" == "1" -/usr/share/applications/* +/%{_datadir}/applications/* %else -/etc/X11/applnk/*/gvim.desktop +/%{_sysconfdir}/X11/applnk/*/gvim.desktop %endif -/usr/bin/gvim -/usr/bin/gvimdiff -/usr/bin/gview -/usr/bin/gex -/usr/bin/vimx -/usr/bin/evim +%{_bindir}/gvim +%{_bindir}/gvimdiff +%{_bindir}/gview +%{_bindir}/gex +%{_bindir}/vimx +%{_bindir}/evim %{_mandir}/man1/evim.* %{_mandir}/man1/gvim* %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu May 03 2007 Karsten Hopp 7.0.235-1 +- rebuild for FC-6 + +* Mon Apr 30 2007 Karsten Hopp 7.0.235-1 +- update to patchlevel 235, fixes modeline issues + +* Tue Apr 17 2007 Karsten Hopp 7.0.224-3 +- fix typo in require line (vim-X11 - 2:7.0.224-2.fc7.i386 requires 4) + +* Mon Apr 16 2007 Karsten Hopp 7.0.224-2 +- use more macros +- drop BR perl +- move license to main doc directory +- set vendor to 'fedora' (desktop-file) +- don't own man directories +- preserve timestamps of non-generated files +- run update-desktop-database + +* Thu Apr 05 2007 Karsten Hopp 7.0.224-1 +- vim-X11 provides gvim + +* Fri Mar 30 2007 Karsten Hopp 7.0.224-1 +- patchlevel 224 + * Wed Feb 21 2007 Karsten Hopp 7.0.195-2 - rpmlint fixes (#226526) From fedora-cvs-commits at redhat.com Thu May 3 10:18:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 06:18:03 -0400 Subject: rpms/net-snmp/FC-6 net-snmp-5.3.1-hostname.patch, NONE, 1.1 net-snmp.spec, 1.95, 1.96 Message-ID: <200705031018.l43AI39p016986@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/net-snmp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16971 Modified Files: net-snmp.spec Added Files: net-snmp-5.3.1-hostname.patch Log Message: Properly log hostname in snmptrapd. Resolves: #238587 net-snmp-5.3.1-hostname.patch: apps/snmptrapd_log.c | 150 ++++++++---------------------- include/net-snmp/library/snmp_transport.h | 1 snmplib/snmpUDPDomain.c | 5 + 3 files changed, 49 insertions(+), 107 deletions(-) --- NEW FILE net-snmp-5.3.1-hostname.patch --- --- net-snmp-5.3.1/apps/snmptrapd_log.c.orig 2007-05-02 17:22:34.000000000 +0200 +++ net-snmp-5.3.1/apps/snmptrapd_log.c 2007-05-02 17:41:11.000000000 +0200 @@ -626,6 +626,8 @@ char fmt_cmd = options->cmd; /* what we're formatting */ u_char *temp_buf = NULL; size_t temp_buf_len = 64, temp_out_len = 0; + char *tstr; + unsigned int oflags; if ((temp_buf = calloc(temp_buf_len, 1)) == NULL) { return 0; @@ -643,7 +642,7 @@ * Write a numerical address. */ if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, 1, - inet_ntoa(*agent_inaddr))) { + (u_char *)inet_ntoa(*agent_inaddr))) { if (temp_buf != NULL) { free(temp_buf); } @@ -662,7 +661,7 @@ } if (host != NULL) { if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, 1, - host->h_name)) { + (u_char *)host->h_name)) { if (temp_buf != NULL) { free(temp_buf); } @@ -670,7 +669,7 @@ } } else { if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, 1, - inet_ntoa(*agent_inaddr))) { + (u_char *)inet_ntoa(*agent_inaddr))) { if (temp_buf != NULL) { free(temp_buf); } @@ -684,125 +683,59 @@ * Write the numerical transport information. */ if (transport != NULL && transport->f_fmtaddr != NULL) { - char *tstr = - transport->f_fmtaddr(transport, pdu->transport_data, - pdu->transport_data_length); - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, tstr)) { - if (tstr != NULL) { - free(tstr); - } - if (temp_buf != NULL) { - free(temp_buf); - } + oflags = transport->flags; + transport->flags &= ~NETSNMP_TRANSPORT_FLAG_HOSTNAME; + tstr = transport->f_fmtaddr(transport, pdu->transport_data, + pdu->transport_data_length); + transport->flags = oflags; + + if (!tstr) goto noip; + if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, + 1, (u_char *)tstr)) { + SNMP_FREE(temp_buf); + SNMP_FREE(tstr); return 0; } - if (tstr != NULL) { - free(tstr); - } + SNMP_FREE(tstr); } else { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - "")) { - if (temp_buf != NULL) { - free(temp_buf); - } +noip: + if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, 1, + (const u_char*)"")) { + SNMP_FREE(temp_buf); return 0; } } break; - /* - * Write a host name. - */ case CHR_PDU_NAME: /* - * Right, apparently a name lookup is wanted. This is only reasonable - * for the UDP and TCP transport domains (we don't want to try to be - * too clever here). + * Try to convert the numerical transport information + * into a hostname. Or rather, have the transport-specific + * address formatting routine do this. + * Otherwise falls back to the numeric address format. */ -#ifdef SNMP_TRANSPORT_TCP_DOMAIN - if (transport != NULL && (transport->domain == netsnmpUDPDomain || - transport->domain == - netsnmp_snmpTCPDomain)) { -#else - if (transport != NULL && transport->domain == netsnmpUDPDomain) { -#endif - /* - * This is kind of bletcherous -- it breaks the opacity of - * transport_data but never mind -- the alternative is a lot of - * munging strings from f_fmtaddr. - */ - struct sockaddr_in *addr = - (struct sockaddr_in *) pdu->transport_data; - if (addr != NULL - && pdu->transport_data_length == - sizeof(struct sockaddr_in)) { - if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, - NETSNMP_DS_APP_NUMERIC_IP)) { - host = - gethostbyaddr((char *) &(addr->sin_addr), - sizeof(struct in_addr), AF_INET); - } - if (host != NULL) { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - host->h_name)) { - if (temp_buf != NULL) { - free(temp_buf); - } - return 0; - } - } else { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - inet_ntoa(addr->sin_addr))) { - if (temp_buf != NULL) { - free(temp_buf); - } - return 0; - } - } - } else { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - "")) { - if (temp_buf != NULL) { - free(temp_buf); - } - return 0; - } - } - } else if (transport != NULL && transport->f_fmtaddr != NULL) { - /* - * Some other domain for which we do not know how to do a name - * lookup. Fall back to the formatted transport address. - */ - char *tstr = - transport->f_fmtaddr(transport, pdu->transport_data, - pdu->transport_data_length); - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, tstr)) { - if (tstr != NULL) { - free(tstr); - } - if (temp_buf != NULL) { - free(temp_buf); - } + if (transport != NULL && transport->f_fmtaddr != NULL) { + oflags = transport->flags; + if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, + NETSNMP_DS_APP_NUMERIC_IP)) + transport->flags |= NETSNMP_TRANSPORT_FLAG_HOSTNAME; + tstr = transport->f_fmtaddr(transport, pdu->transport_data, + pdu->transport_data_length); + transport->flags = oflags; + + if (!tstr) goto nohost; + if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, + 1, (u_char *)tstr)) { + SNMP_FREE(temp_buf); + SNMP_FREE(tstr); return 0; } - if (tstr != NULL) { - free(tstr); - } + SNMP_FREE(tstr); } else { - /* - * We are kind of stuck! - */ +nohost: if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, 1, - "")) { - if (temp_buf != NULL) { - free(temp_buf); - } + (const u_char*)"")) { + SNMP_FREE(temp_buf); return 0; } } --- net-snmp-5.3.1/include/net-snmp/library/snmp_transport.h.orig 2005-09-15 15:46:58.000000000 +0200 +++ net-snmp-5.3.1/include/net-snmp/library/snmp_transport.h 2007-05-02 17:21:30.000000000 +0200 @@ -19,6 +19,7 @@ #define NETSNMP_TRANSPORT_FLAG_STREAM 0x01 #define NETSNMP_TRANSPORT_FLAG_LISTEN 0x02 #define NETSNMP_TRANSPORT_FLAG_TUNNELED 0x04 +#define NETSNMP_TRANSPORT_FLAG_HOSTNAME 0x80 /* for fmtaddr hook */ /* The standard SNMP domains. */ --- net-snmp-5.3.1/snmplib/snmpUDPDomain.c.orig 2007-05-02 17:20:00.000000000 +0200 +++ net-snmp-5.3.1/snmplib/snmpUDPDomain.c 2007-05-02 17:20:36.000000000 +0200 @@ -84,6 +84,7 @@ netsnmp_udp_fmtaddr(netsnmp_transport *t, void *data, int len) { netsnmp_udp_addr_pair *addr_pair = NULL; + struct hostent *host; if (data != NULL && len == sizeof(netsnmp_udp_addr_pair)) { addr_pair = (netsnmp_udp_addr_pair *) data; @@ -101,6 +102,10 @@ return strdup("UDP: unknown"); } + if ( t && t->flags & NETSNMP_TRANSPORT_FLAG_HOSTNAME ) { + host = gethostbyaddr((char *)&to->sin_addr, 4, AF_INET); + return (host ? strdup(host->h_name) : NULL); + } sprintf(tmp, "UDP: [%s]:%hu", inet_ntoa(to->sin_addr), ntohs(to->sin_port)); return strdup(tmp); Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/FC-6/net-snmp.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- net-snmp.spec 26 Mar 2007 10:38:29 -0000 1.95 +++ net-snmp.spec 3 May 2007 10:18:00 -0000 1.96 @@ -45,6 +45,7 @@ Patch32: net-snmp-5.3.1-local-addr-v3.patch Patch33: net-snmp-5.3.1-reachable_ms.patch Patch34: net-snmp-5.3.1-perl_bulkwalk.patch +Patch35: net-snmp-5.3.1-hostname.patch Prereq: /sbin/chkconfig Obsoletes: ucd-snmp @@ -155,6 +156,7 @@ %patch32 -p1 -b .local-addr %patch33 -p1 -b .reachable_ms %patch34 -p0 -b .bulkwalk +%patch35 -p1 -b .hostname # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -360,6 +362,9 @@ %{_libdir}/lib*.so.* %changelog +* Thu May 3 2007 Jan Safranek +- fix snmptrapd hostname logging (#238587) + * Mon Mar 26 2007 Radek Vok??l - 5.3.1-14 - fix perl bulkwalk (#232913) From fedora-cvs-commits at redhat.com Thu May 3 10:59:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 06:59:53 -0400 Subject: rpms/net-snmp/devel net-snmp-5.4-hostname.patch, NONE, 1.1 net-snmp.spec, 1.112, 1.113 Message-ID: <200705031059.l43AxrEZ017434@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17418 Modified Files: net-snmp.spec Added Files: net-snmp-5.4-hostname.patch Log Message: fix snmptrapd hostname logging (#238587) net-snmp-5.4-hostname.patch: net-snmp-5.3.1/include/net-snmp/library/snmp_transport.h | 1 net-snmp-5.4/apps/snmptrapd_log.c | 144 ++++----------- net-snmp-5.4/snmplib/snmpUDPDomain.c | 5 3 files changed, 46 insertions(+), 104 deletions(-) --- NEW FILE net-snmp-5.4-hostname.patch --- --- net-snmp-5.4/apps/snmptrapd_log.c.orig 2006-09-15 02:48:43.000000000 +0200 +++ net-snmp-5.4/apps/snmptrapd_log.c 2007-05-03 12:19:58.000000000 +0200 @@ -626,6 +626,8 @@ char fmt_cmd = options->cmd; /* what we're formatting */ u_char *temp_buf = NULL; size_t temp_buf_len = 64, temp_out_len = 0; + char *tstr; + unsigned int oflags; if ((temp_buf = calloc(temp_buf_len, 1)) == NULL) { return 0; @@ -681,125 +683,59 @@ * Write the numerical transport information. */ if (transport != NULL && transport->f_fmtaddr != NULL) { - char *tstr = - transport->f_fmtaddr(transport, pdu->transport_data, - pdu->transport_data_length); - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, (u_char *)tstr)) { - if (tstr != NULL) { - free(tstr); - } - if (temp_buf != NULL) { - free(temp_buf); - } + oflags = transport->flags; + transport->flags &= ~NETSNMP_TRANSPORT_FLAG_HOSTNAME; + tstr = transport->f_fmtaddr(transport, pdu->transport_data, + pdu->transport_data_length); + transport->flags = oflags; + + if (!tstr) goto noip; + if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, + 1, (u_char *)tstr)) { + SNMP_FREE(temp_buf); + SNMP_FREE(tstr); return 0; } - if (tstr != NULL) { - free(tstr); - } + SNMP_FREE(tstr); } else { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - "")) { - if (temp_buf != NULL) { - free(temp_buf); - } +noip: + if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, 1, + (const u_char*)"")) { + SNMP_FREE(temp_buf); return 0; } } break; - /* - * Write a host name. - */ case CHR_PDU_NAME: /* - * Right, apparently a name lookup is wanted. This is only reasonable - * for the UDP and TCP transport domains (we don't want to try to be - * too clever here). + * Try to convert the numerical transport information + * into a hostname. Or rather, have the transport-specific + * address formatting routine do this. + * Otherwise falls back to the numeric address format. */ -#ifdef NETSNMP_TRANSPORT_TCP_DOMAIN - if (transport != NULL && (transport->domain == netsnmpUDPDomain || - transport->domain == - netsnmp_snmpTCPDomain)) { -#else - if (transport != NULL && transport->domain == netsnmpUDPDomain) { -#endif - /* - * This is kind of bletcherous -- it breaks the opacity of - * transport_data but never mind -- the alternative is a lot of - * munging strings from f_fmtaddr. - */ - struct sockaddr_in *addr = - (struct sockaddr_in *) pdu->transport_data; - if (addr != NULL - && pdu->transport_data_length == - sizeof(struct sockaddr_in)) { - if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, - NETSNMP_DS_APP_NUMERIC_IP)) { - host = - gethostbyaddr((char *) &(addr->sin_addr), - sizeof(struct in_addr), AF_INET); - } - if (host != NULL) { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - (u_char *)host->h_name)) { - if (temp_buf != NULL) { - free(temp_buf); - } - return 0; - } - } else { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - (u_char *)inet_ntoa(addr->sin_addr))) { - if (temp_buf != NULL) { - free(temp_buf); - } - return 0; - } - } - } else { - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, - "")) { - if (temp_buf != NULL) { - free(temp_buf); - } - return 0; - } - } - } else if (transport != NULL && transport->f_fmtaddr != NULL) { - /* - * Some other domain for which we do not know how to do a name - * lookup. Fall back to the formatted transport address. - */ - char *tstr = - transport->f_fmtaddr(transport, pdu->transport_data, - pdu->transport_data_length); - if (!snmp_strcat - (&temp_buf, &temp_buf_len, &temp_out_len, 1, (u_char *)tstr)) { - if (tstr != NULL) { - free(tstr); - } - if (temp_buf != NULL) { - free(temp_buf); - } + if (transport != NULL && transport->f_fmtaddr != NULL) { + oflags = transport->flags; + if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, + NETSNMP_DS_APP_NUMERIC_IP)) + transport->flags |= NETSNMP_TRANSPORT_FLAG_HOSTNAME; + tstr = transport->f_fmtaddr(transport, pdu->transport_data, + pdu->transport_data_length); + transport->flags = oflags; + + if (!tstr) goto nohost; + if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, + 1, (u_char *)tstr)) { + SNMP_FREE(temp_buf); + SNMP_FREE(tstr); return 0; } - if (tstr != NULL) { - free(tstr); - } + SNMP_FREE(tstr); } else { - /* - * We are kind of stuck! - */ +nohost: if (!snmp_strcat(&temp_buf, &temp_buf_len, &temp_out_len, 1, - "")) { - if (temp_buf != NULL) { - free(temp_buf); - } + (const u_char*)"")) { + SNMP_FREE(temp_buf); return 0; } } --- net-snmp-5.4/snmplib/snmpUDPDomain.c.orig 2006-09-20 01:42:17.000000000 +0200 +++ net-snmp-5.4/snmplib/snmpUDPDomain.c 2007-05-03 12:17:30.000000000 +0200 @@ -87,6 +87,7 @@ netsnmp_udp_fmtaddr(netsnmp_transport *t, void *data, int len) { netsnmp_udp_addr_pair *addr_pair = NULL; + struct hostent *host; if (data != NULL && len == sizeof(netsnmp_udp_addr_pair)) { addr_pair = (netsnmp_udp_addr_pair *) data; @@ -104,6 +105,10 @@ return strdup("UDP: unknown"); } + if ( t && t->flags & NETSNMP_TRANSPORT_FLAG_HOSTNAME ) { + host = gethostbyaddr((char *)&to->sin_addr, 4, AF_INET); + return (host ? strdup(host->h_name) : NULL); + } sprintf(tmp, "UDP: [%s]:%hu", inet_ntoa(to->sin_addr), ntohs(to->sin_port)); return strdup(tmp); --- net-snmp-5.3.1/include/net-snmp/library/snmp_transport.h.orig 2005-09-15 15:46:58.000000000 +0200 +++ net-snmp-5.3.1/include/net-snmp/library/snmp_transport.h 2007-05-02 17:21:30.000000000 +0200 @@ -19,6 +19,7 @@ #define NETSNMP_TRANSPORT_FLAG_STREAM 0x01 #define NETSNMP_TRANSPORT_FLAG_LISTEN 0x02 #define NETSNMP_TRANSPORT_FLAG_TUNNELED 0x04 +#define NETSNMP_TRANSPORT_FLAG_HOSTNAME 0x80 /* for fmtaddr hook */ /* The standard SNMP domains. */ Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- net-snmp.spec 12 Mar 2007 14:52:17 -0000 1.112 +++ net-snmp.spec 3 May 2007 10:59:51 -0000 1.113 @@ -38,6 +38,7 @@ Patch14: net-snmp-5.4-free.patch Patch15: net-snmp-5.4-strange_libpath.patch Patch16: net-snmp-5.4-snmpassert.patch +Patch17: net-snmp-5.4-hostname.patch Requires(pre): /sbin/chkconfig Requires(post): /sbin/chkconfig @@ -154,6 +155,7 @@ %patch14 -p1 -b .free %patch15 -p1 -b .strange_libpath %patch16 -p1 -b .verboselog +%patch17 -p1 -b .hostname # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -358,6 +360,9 @@ %{_libdir}/lib*.so.* %changelog +* Thu May 3 2007 Jan Safranek +- fix snmptrapd hostname logging (#238587) + * Mon Mar 12 2007 Radek Vok??l - 1:5.4-13 - fix overly verbose log message (#221911) - few minor tweaks for review - still not perfect From fedora-cvs-commits at redhat.com Thu May 3 11:28:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 07:28:03 -0400 Subject: rpms/net-snmp/devel net-snmp-5.4-udp-endpoint.patch, NONE, 1.1 net-snmp.spec, 1.113, 1.114 Message-ID: <200705031128.l43BS3s1017921@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17905 Modified Files: net-snmp.spec Added Files: net-snmp-5.4-udp-endpoint.patch Log Message: fix udpEndpointProcess remote IP address Resolves: #236551 net-snmp-5.4-udp-endpoint.patch: udp_endpoint_linux.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE net-snmp-5.4-udp-endpoint.patch --- Already fixed upstream, should appear in 5.4.1 --- net-snmp-5.4/agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c.orig 2006-09-19 05:26:57.000000000 +0200 +++ net-snmp-5.4/agent/mibgroup/udp-mib/data_access/udp_endpoint_linux.c 2007-05-03 13:21:55.000000000 +0200 @@ -194,7 +194,7 @@ offset, line_info->start)); return PMLP_RC_MEMORY_UNUSED; } - ep->loc_addr_len = offset; + ep->rmt_addr_len = offset; ptr += (offset * 2); ++ptr; /* skip ':' */ Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- net-snmp.spec 3 May 2007 10:59:51 -0000 1.113 +++ net-snmp.spec 3 May 2007 11:28:00 -0000 1.114 @@ -39,6 +39,7 @@ Patch15: net-snmp-5.4-strange_libpath.patch Patch16: net-snmp-5.4-snmpassert.patch Patch17: net-snmp-5.4-hostname.patch +Patch18: net-snmp-5.4-udp-endpoint.patch Requires(pre): /sbin/chkconfig Requires(post): /sbin/chkconfig @@ -156,6 +157,7 @@ %patch15 -p1 -b .strange_libpath %patch16 -p1 -b .verboselog %patch17 -p1 -b .hostname +%patch18 -p1 -b .udp-endpoint # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -362,6 +364,7 @@ %changelog * Thu May 3 2007 Jan Safranek - fix snmptrapd hostname logging (#238587) +- fix udpEndpointProcess remote IP address (#236551) * Mon Mar 12 2007 Radek Vok??l - 1:5.4-13 - fix overly verbose log message (#221911) From fedora-cvs-commits at redhat.com Thu May 3 11:28:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 07:28:11 -0400 Subject: rpms/net-snmp/FC-6 net-snmp.spec,1.96,1.97 Message-ID: <200705031128.l43BSBV3017972@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/net-snmp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17932a Modified Files: net-snmp.spec Log Message: fix udpEndpointProcess remote IP address Resolves: #236551 Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/FC-6/net-snmp.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- net-snmp.spec 3 May 2007 10:18:00 -0000 1.96 +++ net-snmp.spec 3 May 2007 11:28:09 -0000 1.97 @@ -46,6 +46,7 @@ Patch33: net-snmp-5.3.1-reachable_ms.patch Patch34: net-snmp-5.3.1-perl_bulkwalk.patch Patch35: net-snmp-5.3.1-hostname.patch +Patch36: net-snmp-5.3.1-udp-endpoint.patch Prereq: /sbin/chkconfig Obsoletes: ucd-snmp @@ -157,6 +158,7 @@ %patch33 -p1 -b .reachable_ms %patch34 -p0 -b .bulkwalk %patch35 -p1 -b .hostname +%patch36 -p1 -b .udp-endpoint # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -364,6 +366,7 @@ %changelog * Thu May 3 2007 Jan Safranek - fix snmptrapd hostname logging (#238587) +- fix udpEndpointProcess remote IP address (#236551) * Mon Mar 26 2007 Radek Vok??l - 5.3.1-14 - fix perl bulkwalk (#232913) From fedora-cvs-commits at redhat.com Thu May 3 12:27:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 08:27:59 -0400 Subject: rpms/hal-cups-utils/FC-6 .cvsignore, 1.16, 1.17 hal-cups-utils.spec, 1.51, 1.52 sources, 1.16, 1.17 Message-ID: <200705031227.l43CRxEk018923@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hal-cups-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18906 Modified Files: .cvsignore hal-cups-utils.spec sources Log Message: * Thu May 3 2007 Tim Waugh 0.6.9-1 - 0.6.9: - Reverted hal backend printer state management and paper-out detection for the moment. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 26 Apr 2007 12:40:24 -0000 1.16 +++ .cvsignore 3 May 2007 12:27:57 -0000 1.17 @@ -4,3 +4,4 @@ hal-cups-utils-0.6.5.tar.gz hal-cups-utils-0.6.7.tar.gz hal-cups-utils-0.6.8.tar.gz +hal-cups-utils-0.6.9.tar.gz Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/hal-cups-utils.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- hal-cups-utils.spec 26 Apr 2007 12:42:12 -0000 1.51 +++ hal-cups-utils.spec 3 May 2007 12:27:57 -0000 1.52 @@ -1,6 +1,6 @@ Summary: Halified CUPS utilities Name: hal-cups-utils -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} License: GPL Group: Applications/System @@ -59,6 +59,11 @@ %{_initrddir}/cups-config-daemon %changelog +* Thu May 3 2007 Tim Waugh 0.6.9-1 +- 0.6.9: + - Reverted hal backend printer state management and paper-out detection + for the moment. + * Thu Apr 26 2007 Tim Waugh 0.6.8-1 - 0.6.8: - Several hal backend fixes (retry when device not connected, Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 26 Apr 2007 12:40:24 -0000 1.16 +++ sources 3 May 2007 12:27:57 -0000 1.17 @@ -1 +1 @@ -492c3833be5556f23e7ef291b26c7677 hal-cups-utils-0.6.8.tar.gz +41fcab411be1055ea2e519b7b2c8662a hal-cups-utils-0.6.9.tar.gz From fedora-cvs-commits at redhat.com Thu May 3 12:28:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 08:28:51 -0400 Subject: rpms/hal-cups-utils/devel .cvsignore, 1.17, 1.18 hal-cups-utils.spec, 1.54, 1.55 sources, 1.17, 1.18 Message-ID: <200705031228.l43CSpbg019034@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hal-cups-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19013 Modified Files: .cvsignore hal-cups-utils.spec sources Log Message: * Thu May 3 2007 Tim Waugh 0.6.9-1 - 0.6.9: - Reverted hal backend printer state management and paper-out detection for the moment. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 26 Apr 2007 12:39:48 -0000 1.17 +++ .cvsignore 3 May 2007 12:28:49 -0000 1.18 @@ -5,3 +5,4 @@ hal-cups-utils-0.6.6.tar.gz hal-cups-utils-0.6.7.tar.gz hal-cups-utils-0.6.8.tar.gz +hal-cups-utils-0.6.9.tar.gz Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- hal-cups-utils.spec 26 Apr 2007 12:39:48 -0000 1.54 +++ hal-cups-utils.spec 3 May 2007 12:28:49 -0000 1.55 @@ -1,6 +1,6 @@ Summary: Halified CUPS utilities Name: hal-cups-utils -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} License: GPL Group: Applications/System @@ -59,6 +59,11 @@ %{_initrddir}/cups-config-daemon %changelog +* Thu May 3 2007 Tim Waugh 0.6.9-1 +- 0.6.9: + - Reverted hal backend printer state management and paper-out detection + for the moment. + * Thu Apr 26 2007 Tim Waugh 0.6.8-1 - 0.6.8: - Several hal backend fixes (retry when device not connected, Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 26 Apr 2007 12:39:48 -0000 1.17 +++ sources 3 May 2007 12:28:49 -0000 1.18 @@ -1 +1 @@ -492c3833be5556f23e7ef291b26c7677 hal-cups-utils-0.6.8.tar.gz +41fcab411be1055ea2e519b7b2c8662a hal-cups-utils-0.6.9.tar.gz From fedora-cvs-commits at redhat.com Thu May 3 14:25:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 10:25:56 -0400 Subject: rpms/evolution-data-server/devel evolution-data-server-1.10.1-camel-folder-summary-crash.patch, NONE, 1.1 evolution-data-server.spec, 1.161, 1.162 Message-ID: <200705031425.l43EPuY8021751@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21735 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-1.10.1-camel-folder-summary-crash.patch Log Message: * Wed May 02 2007 Matthew Barnes - 1.10.1-4.fc7 - Add patch for GNOME bug #373146 (spam message triggers crash). evolution-data-server-1.10.1-camel-folder-summary-crash.patch: camel-folder-summary.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE evolution-data-server-1.10.1-camel-folder-summary-crash.patch --- --- evolution-data-server-1.10.1/camel/camel-folder-summary.c.camel-folder-summary-crash 2007-05-02 12:46:07.000000000 -0400 +++ evolution-data-server-1.10.1/camel/camel-folder-summary.c 2007-05-02 12:47:34.000000000 -0400 @@ -2952,7 +2952,10 @@ camel_message_info_ptr(const CamelMessageInfo *mi, int id) { if (mi->summary) - return ((CamelFolderSummaryClass *)((CamelObject *)mi->summary)->klass)->info_ptr(mi, id); + if (((CamelFolderSummaryClass *)((CamelObject *)mi->summary)->klass)->info_ptr) + return ((CamelFolderSummaryClass *)((CamelObject *)mi->summary)->klass)->info_ptr(mi, id); + else + return info_ptr(mi, id); else return info_ptr(mi, id); } Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- evolution-data-server.spec 30 Apr 2007 20:58:25 -0000 1.161 +++ evolution-data-server.spec 3 May 2007 14:25:53 -0000 1.162 @@ -26,7 +26,7 @@ Name: evolution-data-server Version: 1.10.1 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -81,6 +81,9 @@ # RH bug #235290 / GNOME bug #424373 Patch24: evolution-data-server-1.10.1-apop-auth-vulnerability.patch +# GNOME bug #373146 +Patch25: evolution-data-server-1.10.1-camel-folder-summary-crash.patch + ### Dependencies ### Requires: GConf2 @@ -175,6 +178,7 @@ %patch22 -p1 -b .isa-support %patch23 -p1 -b .code-cleanup %patch24 -p1 -b .apop-auth-vulnerability +%patch25 -p1 -b .camel-folder-summary-crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -392,6 +396,9 @@ %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Wed May 02 2007 Matthew Barnes - 1.10.1-4.fc7 +- Add patch for GNOME bug #373146 (spam message triggers crash). + * Mon Apr 30 2007 Matthew Barnes - 1.10.1-3.fc7 - Revise patch for RH bug #235290 to not break string freeze. From fedora-cvs-commits at redhat.com Thu May 3 14:27:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 10:27:24 -0400 Subject: rpms/kernel/FC-6/configs config-generic, 1.268, 1.268.14.1 config-s390-generic, 1.22, 1.22.62.1 Message-ID: <200705031427.l43EROcq021972@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv21939/configs Modified Files: Tag: private-linville-netdev-fc6-12-branch config-generic config-s390-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v retrieving revision 1.268 retrieving revision 1.268.14.1 diff -u -r1.268 -r1.268.14.1 --- config-generic 29 Mar 2007 22:19:24 -0000 1.268 +++ config-generic 3 May 2007 14:27:22 -0000 1.268.14.1 @@ -637,7 +637,10 @@ CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_MD5SIG=y +CONFIG_TCP_MD5SIG_DEBUG=y # # Networking options @@ -646,6 +649,7 @@ CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=m @@ -703,6 +707,7 @@ CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -725,6 +730,7 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m @@ -782,6 +788,7 @@ CONFIG_NF_CONNTRACK_IRC=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_IPV4=m @@ -848,6 +855,7 @@ CONFIG_IP6_NF_MATCH_FRAG=m CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m CONFIG_IP6_NF_MATCH_OPTS=m CONFIG_IP6_NF_MATCH_OWNER=m CONFIG_IP6_NF_MATCH_RT=m @@ -884,6 +892,7 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=y CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m @@ -1091,8 +1100,10 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m +CONFIG_B44_PCI=y CONFIG_BNX2=m CONFIG_QLA3XXX=m +CONFIG_ATL1=m # CONFIG_DGRS is not set # CONFIG_EEPRO100 is not set CONFIG_E100=m @@ -1117,6 +1128,7 @@ CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_RHINE_NAPI=y CONFIG_VIA_VELOCITY=m +CONFIG_SC92031=m CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m @@ -1153,9 +1165,12 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m +CONFIG_PASEMI_MAC=m +CONFIG_VIOC=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1_NAPI=y +CONFIG_CHELSIO_T3=m CONFIG_FDDI=y # CONFIG_DEFXX is not set @@ -1183,18 +1198,33 @@ CONFIG_NET_RADIO=y # -# Obsolete Wireless cards support (pre-802.11) +# Wireless LAN # +CONFIG_WLAN_PRE80211=y # CONFIG_STRIP is not set # CONFIG_ARLAN is not set CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m - -# -# Wireless 802.11 Frequency Hopping cards support -# +CONFIG_WLAN_80211=y # CONFIG_PCMCIA_RAYCS is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +CONFIG_MAC80211_DEBUG=y +# CONFIG_MAC80211_VERBOSE_DEBUG is not set +# CONFIG_MAC80211_LOWTX_FRAME_DUMP is not set +CONFIG_TKIP_DEBUG=y +CONFIG_MAC80211_DEBUG_COUNTERS=y +# CONFIG_HOSTAPD_WPA_TESTING is not set +CONFIG_MAC80211_IBSS_DEBUG=y +# CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set + +CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT_COMPAT=y +CONFIG_CFG80211_WEXTNL_COMPAT=y +CONFIG_NL80211=y + # # Wireless 802.11b ISA/PCI cards support # @@ -1212,6 +1242,8 @@ CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_USB_DEBUG=y CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1221,6 +1253,7 @@ CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PRISM54=m +CONFIG_PRISM54_USB=m CONFIG_BCM43XX=m CONFIG_BCM43XX_DEBUG=y @@ -1242,6 +1275,30 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_CS=m +CONFIG_BCM43XX_MAC80211=m +CONFIG_BCM43XX_MAC80211_PCI=y +CONFIG_BCM43XX_MAC80211_PCMCIA=y +CONFIG_BCM43XX_MAC80211_DEBUG=y +CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y +CONFIG_RT2X00=y +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2X00_DEBUGFS=m +CONFIG_RT2X00_DEBUG=y +CONFIG_ADM8211=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_ZD1211RW_MAC80211=m +CONFIG_ZD1211RW_MAC80211_DEBUG=y +CONFIG_RTL818X=y +CONFIG_RTL8187=m +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_DEBUG=y + # # Token Ring devices # @@ -1848,6 +1905,14 @@ CONFIG_MAX_RAW_DEVS=8192 CONFIG_HANGCHECK_TIMER=m +CONFIG_SSB=m +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SILENT=n +CONFIG_SSB_DEBUG=n +CONFIG_SSB_SERIAL=n +CONFIG_SSB_DRIVER_PCICORE=y + # # Multimedia devices # @@ -2233,6 +2298,7 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_CS=m +CONFIG_USB_OHCI_HCD_SSB=y # # USB Device Class drivers @@ -2780,6 +2846,8 @@ # CONFIG_CRC16=m CONFIG_CRC32=m +CONFIG_CRC_ITU_T=m +CONFIG_EEPROM_93CX6=m CONFIG_CRC_CCITT=m CONFIG_ZLIB_INFLATE=y Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-s390-generic,v retrieving revision 1.22 retrieving revision 1.22.62.1 diff -u -r1.22 -r1.22.62.1 --- config-s390-generic 21 Dec 2006 21:45:14 -0000 1.22 +++ config-s390-generic 3 May 2007 14:27:22 -0000 1.22.62.1 @@ -106,6 +106,7 @@ CONFIG_LCS=m CONFIG_CTC=m CONFIG_IUCV=m +CONFIG_AFIUCV=m CONFIG_QETH=m CONFIG_QETH_IPV6=y CONFIG_QETH_VLAN=y From fedora-cvs-commits at redhat.com Thu May 3 14:29:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 10:29:23 -0400 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2948.2.1,1.2948.2.2 Message-ID: <200705031429.l43ETNeI022152@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22137 Modified Files: Tag: private-linville-netdev-fc6-12-branch kernel-2.6.spec Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2948.2.1 retrieving revision 1.2948.2.2 diff -u -r1.2948.2.1 -r1.2948.2.2 --- kernel-2.6.spec 3 May 2007 14:27:19 -0000 1.2948.2.1 +++ kernel-2.6.spec 3 May 2007 14:29:21 -0000 1.2948.2.2 @@ -55,6 +55,7 @@ # by setting the define to ".local" or ".bz123456" # #% define buildid .local +%define buildid .netdev.12 # %define sublevel 20 %define kversion 2.6.%{sublevel} From fedora-cvs-commits at redhat.com Thu May 3 14:40:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 10:40:18 -0400 Subject: rpms/pygobject2/devel pygobject2.spec,1.23,1.24 Message-ID: <200705031440.l43EeIU8022578@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/pygobject2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22543 Modified Files: pygobject2.spec Log Message: * Thu May 03 2007 Matthew Barnes - 2.12.3-4.fc7 - Fix devel subpackage dependency (RH bug #238793). Index: pygobject2.spec =================================================================== RCS file: /cvs/dist/rpms/pygobject2/devel/pygobject2.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- pygobject2.spec 20 Apr 2007 01:39:25 -0000 1.23 +++ pygobject2.spec 3 May 2007 14:40:16 -0000 1.24 @@ -4,7 +4,7 @@ Name: pygobject2 Version: 2.12.3 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: Development/Languages Summary: Python bindings for GObject @@ -35,7 +35,7 @@ %package devel Summary: Development files for building add-on libraries Group: Development/Languages -Requires: pygobject2 = %{version} +Requires: pygobject2 = %{version}-%{release} Requires: pygobject2-doc = %{version}-%{release} Requires: glib2-devel Requires: pkgconfig @@ -97,6 +97,9 @@ %{_datadir}/pygobject/xsl %changelog +* Thu May 03 2007 Matthew Barnes - 2.12.3-4.fc7 +- Fix devel subpackage dependency (RH bug #238793). + * Thu Apr 19 2007 Matthew Barnes - 2.12.3-3.fc7 - Add patch for RH bug #237179 (memory leak). From fedora-cvs-commits at redhat.com Thu May 3 14:47:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 10:47:22 -0400 Subject: rpms/libsemanage/devel libsemanage.spec,1.123,1.124 Message-ID: <200705031447.l43ElMvH022873@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22859 Modified Files: libsemanage.spec Log Message: * Thu May 3 2007 Dan Walsh - 2.0.3-2 - Apply patch to fix dependencies in spec file from Robert Scheck Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- libsemanage.spec 26 Apr 2007 00:05:03 -0000 1.123 +++ libsemanage.spec 3 May 2007 14:47:19 -0000 1.124 @@ -3,12 +3,12 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= %{libselinuxver} swig BuildRequires: libsepol-devel >= %{libsepolver} BuildRequires: python-devel bison flex @@ -32,7 +32,7 @@ %package devel Summary: Header files and libraries used to build policy manipulation tools Group: Development/Libraries -Requires: libsemanage = %{version} +Requires: libsemanage = %{version}-%{release} %description devel The semanage-devel package contains the static libraries and header files @@ -75,6 +75,9 @@ %{_mandir}/man3/* %changelog +* Thu May 3 2007 Dan Walsh - 2.0.3-2 +- Apply patch to fix dependencies in spec file from Robert Scheck + * Wed Apr 25 2007 Dan Walsh - 2.0.3-1 - Upgrade to latest from NSA * Fix to libsemanage man patches so whatis will work better from Dan Walsh From fedora-cvs-commits at redhat.com Thu May 3 15:08:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 11:08:39 -0400 Subject: rpms/kernel/FC-6 kernel-2.6.spec, 1.2948.2.2, 1.2948.2.3 5260-sky2-EC-U-performance-and-jumbo-support.txt, 1.1.4.1, NONE Message-ID: <200705031508.l43F8dCk023642@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv23620 Modified Files: Tag: private-linville-netdev-fc6-12-branch kernel-2.6.spec Removed Files: Tag: private-linville-netdev-fc6-12-branch 5260-sky2-EC-U-performance-and-jumbo-support.txt Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2948.2.2 retrieving revision 1.2948.2.3 diff -u -r1.2948.2.2 -r1.2948.2.3 --- kernel-2.6.spec 3 May 2007 14:29:21 -0000 1.2948.2.2 +++ kernel-2.6.spec 3 May 2007 15:08:36 -0000 1.2948.2.3 @@ -1225,292 +1225,291 @@ Patch30589: 5256-gianfar-needs-crc32-lib-dependency.txt Patch30590: 5257-sky2-disable-support-for-88E8056.txt Patch30591: 5258-sky2-handle-descriptor-errors.txt -Patch30592: 5260-sky2-EC-U-performance-and-jumbo-support.txt -Patch30593: 5261-sky2-no-jumbo-on-Yukon-FE.txt -Patch30594: 5262-sky2-version-1.14.txt -Patch30595: 5263-PPP-Fix-skbuff.c-BUG-due-incorrect-logic-in-process_input_packet.txt -Patch30596: 5267-Revert-e1000-fix-NAPI-performance-on-4-port-adapters.txt -Patch30597: 5283-RPC-Fix-the-TCP-resend-semantics-for-NFSv4.txt -Patch30598: 5285-SUNQE-Fix-MAC-address-assignment.txt -Patch30599: 5286-SUNLANCE-Fix-module-unload.txt -Patch30600: 5287-SUNHME-Fix-module-unload.txt -Patch30601: 5348-TCP-Congestion-control-initialization.txt -Patch30602: 5349-XFRM-beet-fix-pseudo-header-length-value.txt -Patch30603: 5408-netdrvr-depca-handle-platform_device_add-failure.txt -Patch30604: 5409-sis900-Allocate-rx-replacement-buffer-before-rx-operation.txt -Patch30605: 5411-drivers-net-hamradio-baycom_ser_fdx-build-fix.txt -Patch30606: 5412-add-adm8211-wireless-driver.txt -Patch30607: 5413-adm8211-fix-up-build-breaks-from-2.6.19.txt -Patch30608: 5414-adm8211-Use-ieee80211_generic_get_stats.txt -Patch30609: 5415-adm8211-fix-work_struct-build-breakage.txt -Patch30610: 5416-adm8211-fix-set-essid-for-WE-21.txt -Patch30611: 5417-Update-my-email-address-from-jkmaline-cc.hut.fi-to-j-w1.fi.txt -Patch30612: 5418-wireless-add-prism54usb-driver.txt -Patch30613: 5419-prism54usb-fix-build-break-in-islusb_init.c.txt -Patch30614: 5420-softmac-prism54usb-update.txt -Patch30615: 5421-update-prism54usb-sources.txt -Patch30616: 5422-patch-prism54usb-add-set_bssid_filter.txt -Patch30617: 5423-prism54usb-fix-up-build-breaks-from-2.6.19.txt -Patch30618: 5424-prism54usb-fix-up-warnings-from-struct-pt_regs-removal.txt -Patch30619: 5425-prism54usb-squash-some-more-warnings.txt -Patch30620: 5426-prism54usb-fix-work_struct-build-breakage.txt -Patch30621: 5427-prism54usb-add-USB-ID-2001-3704.txt -Patch30622: 5429-prism54usb-add-device.txt -Patch30623: 5430-prism54usb-fix-breakage-from-skb-input_device-removal.txt -Patch30624: 5449-ieee80211-add-missing-global-needed-by-IEEE80211_DEBUG_XXXX.txt -Patch30625: 5452-BNX2-Fix-occasional-NETDEV-WATCHDOG-on-5709.txt -Patch30626: 5496-TCP-FRTO-Incorrectly-clears-TCPCB_EVER_RETRANS-bit.txt -Patch30627: 5497-TCP-FRTO-Separated-response-from-FRTO-detection-algorithm.txt -Patch30628: 5498-TCP-FRTO-Moved-tcp_use_frto-from-tcp.h-to-tcp_input.c.txt -Patch30629: 5499-TCP-FRTO-Comment-cleanup-improvement.txt -Patch30630: 5504-TCP-FRTO-Response-should-reset-also-snd_cwnd_cnt.txt -Patch30631: 5505-TCP-Don-t-enter-to-fast-recovery-while-using-FRTO.txt -Patch30632: 5506-TCP-FRTO-frto_counter-modulo-op-converted-to-two-assignments.txt -Patch30633: 5508-TCP-FRTO-Entry-is-allowed-only-during-New-Reno-like-recovery.txt -Patch30634: 5511-TCP-Prevent-reordering-adjustments-during-FRTO.txt -Patch30635: 5514-TCP-YeAH-TCP-algorithm-implementation.txt -Patch30636: 5515-TCP-Add-RFC3742-Limited-Slow-Start-controlled-by-variable-sysctl_tcp_max_ssthresh.txt -Patch30637: 5516-TCP-struct-sock-argument-renamed-sp-sk.txt -Patch30638: 5517-TCP-Keep-copied_seq-rcv_wup-and-rcv_next-together.txt -Patch30639: 5519-TCP-Correct-reordering-detection-change-no-FRTO-case.txt -Patch30640: 5524-NET-Keep-sk_backlog-near-sk_lock.txt -Patch30641: 5525-PKTGEN-use-pr_debug.txt -Patch30642: 5526-PKTGEN-use-random32.txt -Patch30643: 5527-PKTGEN-don-t-use-__constant_htonl.txt -Patch30644: 5528-PKTGEN-fix-device-name-handling.txt -Patch30645: 5529-NET-Convert-xtime.tv_sec-to-get_seconds.txt -Patch30646: 5532-NETLINK-Mirror-UDP-MSG_TRUNC-semantics.txt -Patch30647: 5534-IPV6-IP6TUNNEL-Split-out-generic-routine-in-ip6ip6_err.txt -Patch30648: 5544-TCP-tcp_cubic-faster-cube-root.txt -Patch30649: 5545-TCP-TCP-Yeah-cleanup.txt -Patch30650: 5546-IPV4-Optimize-inet_getpeer.txt -Patch30651: 5547-UDP6-Restore-sk_filter-optimisation.txt -Patch30652: 5549-NET-802-Use-hton-s-l-where-appropriate.txt -Patch30653: 5550-NET-8021Q-Use-htons-where-appropriate.txt -Patch30654: 5551-NET-ATM-Use-htons-where-appropriate.txt -Patch30655: 5553-NET-CORE-Use-htons-where-appropriate.txt -Patch30656: 5554-NET-ETHERNET-Use-htons-where-appropriate.txt -Patch30657: 5555-NET-IEEE80211-Use-htons-where-appropriate.txt -Patch30658: 5558-NET-SCHED-Use-htons-where-appropriate.txt -Patch30659: 5559-NET-TIPC-Use-htons-where-appropriate.txt -Patch30660: 5561-TCP-DCCP-RANDOM-Remove-unused-exports.txt -Patch30661: 5567-WIRELESS-use-ARRAY_SIZE.txt -Patch30662: 5570-NET-deinline-some-functions.txt -Patch30663: 5572-IPV6-Return-correct-result-for-sticky-options.txt -Patch30664: 5573-IPV6-Ensure-to-truncate-result-and-return-full-length-for-sticky-options.txt -Patch30665: 5575-UDP-Use-__skb_pull-since-we-have-checked-it-won-t-fail-with-pskb_may_pull.txt -Patch30666: 5578-TR-Use-tr_hdr-were-appropriate.txt -Patch30667: 5579-TR-Make-tr_type_trans-set-skb-dev.txt -Patch30668: 5580-HIPPI-FDDI-Make-hippi-fddi-_type_trans-set-skb-dev.txt -Patch30669: 5589-TCP-Do-the-layer-header-setting-in-tcp_collapse-relative-to-skb-data.txt -Patch30670: 5592-LLC-Kill-llc_set_pdu_hdr.txt -Patch30671: 5593-PPPOE-Introduce-pppoe_hdr.txt -Patch30672: 5594-BONDING-Introduce-arp_pkt.txt -Patch30673: 5595-IPV6-Use-skb-nh.ipv6h-instead-of-casting-skb-nh.raw.txt -Patch30674: 5611-NET-network-dev-read_mostly.txt -Patch30675: 5612-NET-make-seq_operations-const.txt -Patch30676: 5613-NET-show-bound-packet-types.txt -Patch30677: 5618-BRIDGE-faster-compare-for-link-local-addresses.txt -Patch30678: 5625-ICMP6-Introduce-icmp6_hdr.txt -Patch30679: 5637-NETFILTER-x_tables-remove-duplicate-of-xt_prefix.txt -Patch30680: 5645-NETFILTER-nf_conntrack-uninline-notifier-registration-functions.txt -Patch30681: 5648-NETFILTER-nfnetlink-remove-unrequired-check-in-nfnetlink_get_subsys.txt -Patch30682: 5650-NETFILTER-nfnetlink-move-EXPORT_SYMBOL-declarations-next-to-the-exported-symbol.txt -Patch30683: 5652-NETFILTER-nf_conntrack-use-jhash2-in-__hash_conntrack.txt -Patch30684: 5653-NETFILTER-nf_conntrack-add-__nf_copy-to-copy-members-in-skb.txt -Patch30685: 5654-NETFILTER-nf_conntrack-add-nf_copy-to-safely-copy-members-in-skb.txt -Patch30686: 5655-NETFILTER-TCP-conntrack-accept-RST-PSH-as-valid.txt -Patch30687: 5656-NETFILTER-TCP-conntrack-factorize-out-the-PUSH-flag.txt -Patch30688: 5670-NET_SCHED-sch_cbq-fix-cbq_undelay_prio-for-non-active-priorites.txt -Patch30689: 5681-IrDA-removing-stir4200-useless-include.txt -Patch30690: 5682-IrDA-irda-lockdep-annotation.txt -Patch30691: 5683-IrDA-SMC-SuperIO-Chip-LPC47N227-not-identified-properly.txt -Patch30692: 5687-SK_BUFF-Adjust-the-zeroing-up-to-tail-in-__alloc_skb-too.txt -Patch30693: 5691-SK_BUFF-Remove-skb_add_mtu-leftovers.txt -Patch30694: 5698-DCCP-48-bit-sequence-number-arithmetic.txt -Patch30695: 5699-DCCP-Make-dccp_delta_seqno-return-signed-numbers.txt -Patch30696: 5700-DCCP-Make-before-relation-unambiguous.txt -Patch30697: 5701-DCCP-Fix-for-follows48.txt -Patch30698: 5702-DCCP-Remove-ambiguity-in-the-way-before48-is-used.txt -Patch30699: 5703-CCID3-Remove-redundant-len-test.txt -Patch30700: 5704-CCID3-Re-order-CCID-3-source-file.txt -Patch30701: 5705-CCID3-Use-MSS-for-larger-initial-windows.txt -Patch30702: 5706-CCID3-Fix-use-of-invalid-loss-intervals.txt -Patch30703: 5707-CCID3-More-verbose-debugging.txt -Patch30704: 5708-CCID3-Remove-race-condition-and-update-t_ipi-when-s-changes.txt -Patch30705: 5709-DCCP-Always-use-debug-toggle-parameters.txt -Patch30706: 5710-DCCP-More-debug-information-for-dccp_wait_for_ccid.txt -Patch30707: 5712-CCID3-More-to-see-in-dccp_probe.txt -Patch30708: 5713-CCID3-Remove-build-warnings-for-64bit.txt -Patch30709: 5714-CCID3-Wrap-computation-of-RFC3390-initial-rate-into-separate-function.txt -Patch30710: 5715-CCID3-Handle-Idle-and-Application-Limited-periods.txt -Patch30711: 5716-DCCP-Provide-function-for-RTT-sampling.txt -Patch30712: 5717-CCID3-Use-function-for-RTT-sampling.txt -Patch30713: 5718-DCCP-Sample-RTT-from-SYN-exchange.txt -Patch30714: 5719-CCID3-Use-initial-RTT-sample-from-SYN-exchange.txt -Patch30715: 5734-TCP-cubic-optimization.txt -Patch30716: 5735-NETEM-report-reorder-percent-correctly.txt -Patch30717: 5737-NETEM-Optimize-tfifo.txt -Patch30718: 5743-NETLINK-Remove-unused-groups-variable.txt -Patch30719: 5749-NETEM-spelling-errors.txt -Patch30720: 5751-NETFILTER-nfnetlink_log-don-t-count-max-a-b-twice.txt -Patch30721: 5753-NETFILTER-nfnetlink_log-micro-optimization-for-inst-NULL-in-nfulnl_recv_config.txt -Patch30722: 5754-NETFILTER-nfnetlink_log-micro-optimization-don-t-modify-destroyed-instance.txt -Patch30723: 5755-NETFILTER-nfnetlink_log-iterator-functions-need-iter_state-only.txt -Patch30724: 5757-NETFILTER-nfnetlink_log-remove-conditional-locking.txt -Patch30725: 5758-NETFILTER-Use-setup_timer.txt -Patch30726: 5759-NETFILTER-nf_conntrack-don-t-use-nfct-in-skb-if-conntrack-is-disabled.txt -Patch30727: 5760-NETFILTER-nf_conntrack-kill-destroy-in-struct-nf_conntrack-for-diet.txt -Patch30728: 5762-NET_SCHED-sch_netem-fix-off-by-one-in-send-time-comparison.txt -Patch30729: 5772-SCTP-Implement-SCTP_FRAGMENT_INTERLEAVE-socket-option.txt -Patch30730: 5773-SCTP-Implement-SCTP_PARTIAL_DELIVERY_POINT-option.txt -Patch30731: 5774-SCTP-Implement-SCTP_ADDR_CONFIRMED-state-for-ADDR_CHNAGE-event.txt -Patch30732: 5775-SCTP-Honor-flags-when-setting-peer-address-parameters.txt -Patch30733: 5776-SCTP-Implement-sac_info-field-in-SCTP_ASSOC_CHANGE-notification.txt -Patch30734: 5777-SCTP-Implement-SCTP_MAX_BURST-socket-option.txt -Patch30735: 5778-NETLINK-introduce-NLA_BINARY-type.txt -Patch30736: 5779-INET-Use-jhash-random-secret-for-ehash.txt -Patch30737: 5781-TCP-cubic-update-for-net-2.6.22.txt -Patch30738: 5784-NET-fib_rules-goto-rule-action.txt -Patch30739: 5785-NET-fib_rules-Mark-rules-detached-from-the-device.txt -Patch30740: 5786-NET-fib_rules-Add-no-operation-action.txt -Patch30741: 5787-IPV4-LVS-Allow-to-send-ICMP-unreachable-responses-when-real-servers-are-removed.txt -Patch30742: 5789-NET-inet_ehash_secret-should-be-__read_mostly-and-set-only-once.txt -Patch30743: 5790-NET-fib_rules-Flush-route-cache-after-rule-modifications.txt -Patch30744: 5791-TCP-tcp_memory_pressure-and-tcp_socket-are__read_mostly-candidates.txt -Patch30745: 5792-IPV4-align-inet_protos-on-SMP.txt -Patch30746: 5793-BLUETOOTH-Introduce-skb-data-accessor-methods-for-hci_-acl-event-sco-_hdr.txt -Patch30747: 5795-NET-fib_rules-delay-route-cache-flush-by-ip_rt_min_delay.txt -Patch30748: 5797-NET-Inline-net_device_stats.txt -Patch30749: 5802-NET-Move-generic-skbuff-stuff-from-XFRM-code-to-generic-code.txt -Patch30750: 5805-IPV6-FIB6RULE-Find-source-address-during-looking-up-route.txt -Patch30751: 5815-bridge-simpler-hash-with-salt.txt -Patch30752: 5817-bridge-add-support-for-user-mode-STP.txt -Patch30753: 5818-bridge-change-when-netlink-events-go-to-STP.txt -Patch30754: 5819-bridge-allow-changing-hardware-address-to-any-valid-address.txt -Patch30755: 5821-NET-loopback-driver-can-use-loopback_dev-integrated-net_device_stats.txt -Patch30756: 5824-DCCP-Fix-bug-in-the-calculation-of-very-low-sending-rates.txt -Patch30757: 5825-DCCP-Debug-statements-for-Elapsed-Time-option.txt -Patch30758: 5828-NETFILTER-ebt_arp-add-gratuitous-arp-filtering.txt -Patch30759: 5831-NETFILTER-nfnetlink_log-remove-fallback-to-group-0.txt -Patch30760: 5832-NETFILTER-ipt_ULOG-add-compat-conversion-functions.txt -Patch30761: 5837-NET_SCHED-Eliminate-qdisc_tree_lock.txt -Patch30762: 5838-NET_SCHED-ingress-switch-back-to-using-ingress_lock.txt -Patch30763: 5839-IPV6-MTU-discovery-check-in-ip6_fragment.txt -Patch30764: 5841-IPV6-SNMP-Netlink-interface.txt -Patch30765: 5842-IPV6-SNMP-Move-some-statistic-bits-to-net-ipv6-proc.c.txt -Patch30766: 5843-IPV4-SNMP-Move-some-statistic-bits-to-net-ipv4-proc.c.txt -Patch30767: 5844-IPV6-SNMP-Export-statistics-via-netlink-without-CONFIG_PROC_FS.txt -Patch30768: 5845-AF_PACKET-Add-option-to-return-orig_dev-to-userspace.txt -Patch30769: 5846-AX25-NETROM-ROSE-Convert-to-use-modern-wait-queue-API.txt -Patch30770: 5847-BRIDGE-Fix-warning-in-net-2.6.22.txt -Patch30771: 5848-NET-skbuff-skb_store_bits-const-is-backwards.txt -Patch30772: 5849-PPPoE-miscellaneous-smaller-cleanups.txt -Patch30773: 5850-PPPOE-race-between-interface-going-down-and-connect.txt -Patch30774: 5851-PPPOE-memory-leak-when-socket-is-release-d-before-PPPIOCGCHAN-has-been-called-on-it.txt -Patch30775: 5852-PPPOE-Fix-device-tear-down-notification.txt -Patch30776: 5853-NET-Get-rid-of-netdev_nit.txt -Patch30777: 5856-TCP-Uninline-tcp_done.txt -Patch30778: 5857-NET-Move-sk_setup_caps-out-of-line.txt -Patch30779: 5858-IrDA-af_irda-irda_recvmsg_stream-cleanup.txt -Patch30780: 5859-IrDA-af_irda-Silence-kernel-message-in-irda_recvmsg_stream.txt -Patch30781: 5860-IrDA-af_irda-irda_accept-cleanup.txt -Patch30782: 5861-IrDA-af_irda-IRDA_ASSERT-cleanups.txt -Patch30783: 5862-IrDA-Adding-carriage-returns-to-mcs7780-debug-statements.txt -Patch30784: 5863-IrDA-Misc-spelling-corrections.txt -Patch30785: 5864-NET-Fix-comments-for-register_netdev.txt -Patch30786: 5866-IPV6-SNMP-Avoid-unaligned-accesses.txt -Patch30787: 5868-IPV6-SNMP-Use-put_unaligned-instead-of-memcpy.txt -Patch30788: 5869-NET-Prevent-much-sadness-in-qdisc_lock_tree.txt -Patch30789: 5878-NET-Warn-about-GSO-checksum-abuse.txt -Patch30790: 5880-TIPC-Enhancements-to-msg_set_bits-routine.txt -Patch30791: 5882-IPV4-Fix-build-without-procfs.txt -Patch30792: 5886-IPV6-SIT-Unify-code-path-to-get-hash-array-index.txt -Patch30793: 5887-IPV4-IPIP-Unify-code-path-to-get-hash-array-index.txt -Patch30794: 5888-IPV4-IP_GRE-Unify-code-path-to-get-hash-array-index.txt -Patch30795: 5889-IPV6-Export-in6addr_any-for-future-use.txt -Patch30796: 5895-BRIDGE-Missing-rtnl.txt -Patch30797: 5896-NetLabel-cleanup-and-document-CIPSO-constants.txt -Patch30798: 5897-NetLabel-convert-a-BUG_ON-in-the-CIPSO-code-to-a-runtime-check.txt -Patch30799: 5898-SELinux-extract-the-NetLabel-SELinux-support-from-the-security-server.txt -Patch30800: 5908-e1000-FIX-be-ready-for-incoming-irq-at-pci_request_irq.txt -Patch30801: 5909-e1000-FIX-firmware-handover-bits.txt -Patch30802: 5910-e1000-FIX-Stop-raw-interrupts-disabled-nag-from-RT.txt -Patch30803: 5913-XFRM-Export-SAD-info.txt -Patch30804: 5919-NET-tun-tap-fixed-hw-address-handling.txt -Patch30805: 5920-NET-ROUND_UP-macro-cleanup-in-drivers-net-ppp_generic.c.txt -Patch30806: 5921-AF_IUCV-Fix-compilation-on-s390-up.txt -Patch30807: 5923-IRDA-irda_device_dongle_init-fix-kzalloc-GFP_KERNEL-in-spinlock.txt -Patch30808: 5924-NET-SPIN_LOCK_UNLOCKED-cleanup-in-drivers-atm-net.txt -Patch30809: 5926-BLUETOOTH-rfcomm_worker-fix-wakeup-race.txt -Patch30810: 5944-SUNGEM-__sparc__-CONFIG_SPARC.txt -Patch30811: 5946-SUNHME-Use-pci_device_to_OF_node.txt -Patch30812: 6001-XFRM-Missing-bits-to-SAD-info.txt -Patch30813: 6054-POWERPC-Partially-revert-a7edd0e676d51145ae634a2acf7a447e319200fa.txt -Patch30814: 6189-PHY-remove-rwsem-use-from-phy-core.txt -Patch30815: 6478-sis900-Allocate-rx-replacement-buffer-before-rx-operation.txt -Patch30816: 6490-chelsio-use-C99-style-initialization.txt -Patch30817: 6492-ehea-dynamic-add-remove-port.txt -Patch30818: 6494-Add-support-for-Seeq-8003-on-Challenge-S-Mezz-board.txt -Patch30819: 6495-make-drivers-net-s2io.c-vlan_strip_flag-static.txt -Patch30820: 6496-drivers-net-qla3xxx.c-make-2-functions-static.txt -Patch30821: 6498-user-of-the-jiffies-rounding-code-e1000.txt -Patch30822: 6499-phy-layer-add-kernel-doc-DocBook.txt -Patch30823: 6500-dmfe-add-support-for-suspend-resume.txt -Patch30824: 6501-dmfe-add-support-for-Wake-on-lan.txt -Patch30825: 6502-sk98lin-handle-pci_enable_device-return-value-in-skge_resume.txt -Patch30826: 6503-network-add-the-missing-phy_device-speed-information-to-phy_mii_ioctl.txt -Patch30827: 6504-e1000-Use-ARRAY_SIZE-macro-when-appropriate.txt -Patch30828: 6505-e1000-Use-kcalloc.txt -Patch30829: 6507-S2IO-Save-Restore-unused-buffer-mappings-in-2-3-buffer-mode.txt -Patch30830: 6508-ixgb-Use-ARRAY_SIZE-macro-when-appropriate.txt -Patch30831: 6509-pcnet32-only-allocate-init_block-dma-consistent.txt -Patch30832: 6510-pcnet32-change-to-use-netdev_priv.txt -Patch30833: 6513-TULIP-Fix-for-64-bit-MIPS.txt -Patch30834: 6514-TULIP-Natsemi-dp83840a-PHY-fix.txt -Patch30835: 6515-Fix-tulip-SytemError-typo.txt -Patch30836: 6516-Rev-tulip-version.txt -Patch30837: 6525-skge-ignore-unused-error-interrupts.txt -Patch30838: 6526-skge-transmit-locking-improvements.txt -Patch30839: 6528-skge-version-1.11.txt -Patch30840: 6530-S2io-Remove-unused-variables.txt -Patch30841: 6531-Netpoll-support-for-Sibyte-MAC.txt -Patch30842: 6538-strlcpy-is-smart-enough.txt -Patch30843: 6539-baycom_ser_fdx-also-allow-i-o-ports-0x1000-and-enhanced-failure-logging.txt -Patch30844: 6541-qla3xxx-Add-ethtool-get_pauseparam-for-improved-bonding-support.txt -Patch30845: 6542-qla3xxx-Adding-support-for-the-Agere-PHY-ET1011C.txt -Patch30846: 6543-qla3xxx-Bumping-driver-version-number-to-v2.03.00-k4.txt -Patch30847: 6544-mv643xx_eth-make-eth_port_uc_addr_-get-set-calls-symmetric.txt -Patch30848: 6546-Patch-replace-with-time_after-in-drivers-net-eexpress.c.txt -Patch30849: 6547-S2io-Change-of-driver-maintainers.txt -Patch30850: 6548-make-drivers-net-qla3xxx.c-PHY_DEVICES-static.txt -Patch30851: 6560-ucc_geth-Fix-interrupt-coalescing-size-and-alignment.txt -Patch30852: 6562-ucc_geth-fixes-for-ucc_geth_memclean.txt -Patch30853: 6563-ucc_geth-version-1.1.txt -Patch30854: 6564-Fix-sparse-errors-in-drivers-net-ibmveth.c.txt -Patch30855: 6565-mii-add-kernel-doc-notation.txt -Patch30856: 6567-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt -Patch30857: 6574-NetXen-Fix-for-vmalloc-issues.txt -Patch30858: 6575-3C509-Remove-unnecessary-include-of-linux-pm_legacy.h.txt -Patch30859: 6578-e100-allow-bad-MAC-address-when-running-with-invalid-eeprom-csum.txt -Patch30860: 6579-e100-Optionally-use-I-O-mode-only-to-access-register-space.txt -Patch30861: 6580-Generic-HDLC-sparse-annotations.txt -Patch30862: 6581-e1000-ROUND_UP-macro-cleanup-in-drivers-net-e1000.txt -Patch30863: 6582-ixgb-ROUND_UP-macro-cleanup-in-drivers-net-ixgb.txt -Patch30864: 6583-add-NAPI-support-to-sb1250-mac.c.txt -Patch30865: 6584-netdrvr-eexpress-minor-corrections.txt -Patch30866: 6585-smc911x-fix-compilation-breakage-wjen-debug-is-on.txt -Patch30867: 6694-NETPOLL-Remove-CONFIG_NETPOLL_RX.txt -Patch30868: 6695-NET-Remove-NETIF_F_INTERNAL_STATS-default-to-internal-stats.txt -Patch30869: 6696-SCTP-Fix-sctp_getsockopt_local_addrs_old-to-use-local-storage.txt -Patch30870: 6698-XFRM-Export-SPD-info.txt -Patch30871: 6699-TCP-Update-references-in-two-old-comments.txt -Patch30872: 6700-IPV6-Fix-slab-corruption-running-ip6sic.txt -Patch30873: 6701-AF_IUCV-IUCV-smp_call_function-deadlock.txt -Patch30874: 6801-L2TP-Add-the-ability-to-autoload-a-pppox-protocol-module.txt -Patch30875: 6803-TCP-Catch-skb-with-S-L-bugs-earlier.txt -Patch30876: 6804-XFRM-Restrict-upper-layer-information-by-bundle.txt -Patch30877: 6809-IPV4-SNMP-Support-InTruncatedPkts.txt +Patch30592: 5261-sky2-no-jumbo-on-Yukon-FE.txt +Patch30593: 5262-sky2-version-1.14.txt +Patch30594: 5263-PPP-Fix-skbuff.c-BUG-due-incorrect-logic-in-process_input_packet.txt +Patch30595: 5267-Revert-e1000-fix-NAPI-performance-on-4-port-adapters.txt +Patch30596: 5283-RPC-Fix-the-TCP-resend-semantics-for-NFSv4.txt +Patch30597: 5285-SUNQE-Fix-MAC-address-assignment.txt +Patch30598: 5286-SUNLANCE-Fix-module-unload.txt +Patch30599: 5287-SUNHME-Fix-module-unload.txt +Patch30600: 5348-TCP-Congestion-control-initialization.txt +Patch30601: 5349-XFRM-beet-fix-pseudo-header-length-value.txt +Patch30602: 5408-netdrvr-depca-handle-platform_device_add-failure.txt +Patch30603: 5409-sis900-Allocate-rx-replacement-buffer-before-rx-operation.txt +Patch30604: 5411-drivers-net-hamradio-baycom_ser_fdx-build-fix.txt +Patch30605: 5412-add-adm8211-wireless-driver.txt +Patch30606: 5413-adm8211-fix-up-build-breaks-from-2.6.19.txt +Patch30607: 5414-adm8211-Use-ieee80211_generic_get_stats.txt +Patch30608: 5415-adm8211-fix-work_struct-build-breakage.txt +Patch30609: 5416-adm8211-fix-set-essid-for-WE-21.txt +Patch30610: 5417-Update-my-email-address-from-jkmaline-cc.hut.fi-to-j-w1.fi.txt +Patch30611: 5418-wireless-add-prism54usb-driver.txt +Patch30612: 5419-prism54usb-fix-build-break-in-islusb_init.c.txt +Patch30613: 5420-softmac-prism54usb-update.txt +Patch30614: 5421-update-prism54usb-sources.txt +Patch30615: 5422-patch-prism54usb-add-set_bssid_filter.txt +Patch30616: 5423-prism54usb-fix-up-build-breaks-from-2.6.19.txt +Patch30617: 5424-prism54usb-fix-up-warnings-from-struct-pt_regs-removal.txt +Patch30618: 5425-prism54usb-squash-some-more-warnings.txt +Patch30619: 5426-prism54usb-fix-work_struct-build-breakage.txt +Patch30620: 5427-prism54usb-add-USB-ID-2001-3704.txt +Patch30621: 5429-prism54usb-add-device.txt +Patch30622: 5430-prism54usb-fix-breakage-from-skb-input_device-removal.txt +Patch30623: 5449-ieee80211-add-missing-global-needed-by-IEEE80211_DEBUG_XXXX.txt +Patch30624: 5452-BNX2-Fix-occasional-NETDEV-WATCHDOG-on-5709.txt +Patch30625: 5496-TCP-FRTO-Incorrectly-clears-TCPCB_EVER_RETRANS-bit.txt +Patch30626: 5497-TCP-FRTO-Separated-response-from-FRTO-detection-algorithm.txt +Patch30627: 5498-TCP-FRTO-Moved-tcp_use_frto-from-tcp.h-to-tcp_input.c.txt +Patch30628: 5499-TCP-FRTO-Comment-cleanup-improvement.txt +Patch30629: 5504-TCP-FRTO-Response-should-reset-also-snd_cwnd_cnt.txt +Patch30630: 5505-TCP-Don-t-enter-to-fast-recovery-while-using-FRTO.txt +Patch30631: 5506-TCP-FRTO-frto_counter-modulo-op-converted-to-two-assignments.txt +Patch30632: 5508-TCP-FRTO-Entry-is-allowed-only-during-New-Reno-like-recovery.txt +Patch30633: 5511-TCP-Prevent-reordering-adjustments-during-FRTO.txt +Patch30634: 5514-TCP-YeAH-TCP-algorithm-implementation.txt +Patch30635: 5515-TCP-Add-RFC3742-Limited-Slow-Start-controlled-by-variable-sysctl_tcp_max_ssthresh.txt +Patch30636: 5516-TCP-struct-sock-argument-renamed-sp-sk.txt +Patch30637: 5517-TCP-Keep-copied_seq-rcv_wup-and-rcv_next-together.txt +Patch30638: 5519-TCP-Correct-reordering-detection-change-no-FRTO-case.txt +Patch30639: 5524-NET-Keep-sk_backlog-near-sk_lock.txt +Patch30640: 5525-PKTGEN-use-pr_debug.txt +Patch30641: 5526-PKTGEN-use-random32.txt +Patch30642: 5527-PKTGEN-don-t-use-__constant_htonl.txt +Patch30643: 5528-PKTGEN-fix-device-name-handling.txt +Patch30644: 5529-NET-Convert-xtime.tv_sec-to-get_seconds.txt +Patch30645: 5532-NETLINK-Mirror-UDP-MSG_TRUNC-semantics.txt +Patch30646: 5534-IPV6-IP6TUNNEL-Split-out-generic-routine-in-ip6ip6_err.txt +Patch30647: 5544-TCP-tcp_cubic-faster-cube-root.txt +Patch30648: 5545-TCP-TCP-Yeah-cleanup.txt +Patch30649: 5546-IPV4-Optimize-inet_getpeer.txt +Patch30650: 5547-UDP6-Restore-sk_filter-optimisation.txt +Patch30651: 5549-NET-802-Use-hton-s-l-where-appropriate.txt +Patch30652: 5550-NET-8021Q-Use-htons-where-appropriate.txt +Patch30653: 5551-NET-ATM-Use-htons-where-appropriate.txt +Patch30654: 5553-NET-CORE-Use-htons-where-appropriate.txt +Patch30655: 5554-NET-ETHERNET-Use-htons-where-appropriate.txt +Patch30656: 5555-NET-IEEE80211-Use-htons-where-appropriate.txt +Patch30657: 5558-NET-SCHED-Use-htons-where-appropriate.txt +Patch30658: 5559-NET-TIPC-Use-htons-where-appropriate.txt +Patch30659: 5561-TCP-DCCP-RANDOM-Remove-unused-exports.txt +Patch30660: 5567-WIRELESS-use-ARRAY_SIZE.txt +Patch30661: 5570-NET-deinline-some-functions.txt +Patch30662: 5572-IPV6-Return-correct-result-for-sticky-options.txt +Patch30663: 5573-IPV6-Ensure-to-truncate-result-and-return-full-length-for-sticky-options.txt +Patch30664: 5575-UDP-Use-__skb_pull-since-we-have-checked-it-won-t-fail-with-pskb_may_pull.txt +Patch30665: 5578-TR-Use-tr_hdr-were-appropriate.txt +Patch30666: 5579-TR-Make-tr_type_trans-set-skb-dev.txt +Patch30667: 5580-HIPPI-FDDI-Make-hippi-fddi-_type_trans-set-skb-dev.txt +Patch30668: 5589-TCP-Do-the-layer-header-setting-in-tcp_collapse-relative-to-skb-data.txt +Patch30669: 5592-LLC-Kill-llc_set_pdu_hdr.txt +Patch30670: 5593-PPPOE-Introduce-pppoe_hdr.txt +Patch30671: 5594-BONDING-Introduce-arp_pkt.txt +Patch30672: 5595-IPV6-Use-skb-nh.ipv6h-instead-of-casting-skb-nh.raw.txt +Patch30673: 5611-NET-network-dev-read_mostly.txt +Patch30674: 5612-NET-make-seq_operations-const.txt +Patch30675: 5613-NET-show-bound-packet-types.txt +Patch30676: 5618-BRIDGE-faster-compare-for-link-local-addresses.txt +Patch30677: 5625-ICMP6-Introduce-icmp6_hdr.txt +Patch30678: 5637-NETFILTER-x_tables-remove-duplicate-of-xt_prefix.txt +Patch30679: 5645-NETFILTER-nf_conntrack-uninline-notifier-registration-functions.txt +Patch30680: 5648-NETFILTER-nfnetlink-remove-unrequired-check-in-nfnetlink_get_subsys.txt +Patch30681: 5650-NETFILTER-nfnetlink-move-EXPORT_SYMBOL-declarations-next-to-the-exported-symbol.txt +Patch30682: 5652-NETFILTER-nf_conntrack-use-jhash2-in-__hash_conntrack.txt +Patch30683: 5653-NETFILTER-nf_conntrack-add-__nf_copy-to-copy-members-in-skb.txt +Patch30684: 5654-NETFILTER-nf_conntrack-add-nf_copy-to-safely-copy-members-in-skb.txt +Patch30685: 5655-NETFILTER-TCP-conntrack-accept-RST-PSH-as-valid.txt +Patch30686: 5656-NETFILTER-TCP-conntrack-factorize-out-the-PUSH-flag.txt +Patch30687: 5670-NET_SCHED-sch_cbq-fix-cbq_undelay_prio-for-non-active-priorites.txt +Patch30688: 5681-IrDA-removing-stir4200-useless-include.txt +Patch30689: 5682-IrDA-irda-lockdep-annotation.txt +Patch30690: 5683-IrDA-SMC-SuperIO-Chip-LPC47N227-not-identified-properly.txt +Patch30691: 5687-SK_BUFF-Adjust-the-zeroing-up-to-tail-in-__alloc_skb-too.txt +Patch30692: 5691-SK_BUFF-Remove-skb_add_mtu-leftovers.txt +Patch30693: 5698-DCCP-48-bit-sequence-number-arithmetic.txt +Patch30694: 5699-DCCP-Make-dccp_delta_seqno-return-signed-numbers.txt +Patch30695: 5700-DCCP-Make-before-relation-unambiguous.txt +Patch30696: 5701-DCCP-Fix-for-follows48.txt +Patch30697: 5702-DCCP-Remove-ambiguity-in-the-way-before48-is-used.txt +Patch30698: 5703-CCID3-Remove-redundant-len-test.txt +Patch30699: 5704-CCID3-Re-order-CCID-3-source-file.txt +Patch30700: 5705-CCID3-Use-MSS-for-larger-initial-windows.txt +Patch30701: 5706-CCID3-Fix-use-of-invalid-loss-intervals.txt +Patch30702: 5707-CCID3-More-verbose-debugging.txt +Patch30703: 5708-CCID3-Remove-race-condition-and-update-t_ipi-when-s-changes.txt +Patch30704: 5709-DCCP-Always-use-debug-toggle-parameters.txt +Patch30705: 5710-DCCP-More-debug-information-for-dccp_wait_for_ccid.txt +Patch30706: 5712-CCID3-More-to-see-in-dccp_probe.txt +Patch30707: 5713-CCID3-Remove-build-warnings-for-64bit.txt +Patch30708: 5714-CCID3-Wrap-computation-of-RFC3390-initial-rate-into-separate-function.txt +Patch30709: 5715-CCID3-Handle-Idle-and-Application-Limited-periods.txt +Patch30710: 5716-DCCP-Provide-function-for-RTT-sampling.txt +Patch30711: 5717-CCID3-Use-function-for-RTT-sampling.txt +Patch30712: 5718-DCCP-Sample-RTT-from-SYN-exchange.txt +Patch30713: 5719-CCID3-Use-initial-RTT-sample-from-SYN-exchange.txt +Patch30714: 5734-TCP-cubic-optimization.txt +Patch30715: 5735-NETEM-report-reorder-percent-correctly.txt +Patch30716: 5737-NETEM-Optimize-tfifo.txt +Patch30717: 5743-NETLINK-Remove-unused-groups-variable.txt +Patch30718: 5749-NETEM-spelling-errors.txt +Patch30719: 5751-NETFILTER-nfnetlink_log-don-t-count-max-a-b-twice.txt +Patch30720: 5753-NETFILTER-nfnetlink_log-micro-optimization-for-inst-NULL-in-nfulnl_recv_config.txt +Patch30721: 5754-NETFILTER-nfnetlink_log-micro-optimization-don-t-modify-destroyed-instance.txt +Patch30722: 5755-NETFILTER-nfnetlink_log-iterator-functions-need-iter_state-only.txt +Patch30723: 5757-NETFILTER-nfnetlink_log-remove-conditional-locking.txt +Patch30724: 5758-NETFILTER-Use-setup_timer.txt +Patch30725: 5759-NETFILTER-nf_conntrack-don-t-use-nfct-in-skb-if-conntrack-is-disabled.txt +Patch30726: 5760-NETFILTER-nf_conntrack-kill-destroy-in-struct-nf_conntrack-for-diet.txt +Patch30727: 5762-NET_SCHED-sch_netem-fix-off-by-one-in-send-time-comparison.txt +Patch30728: 5772-SCTP-Implement-SCTP_FRAGMENT_INTERLEAVE-socket-option.txt +Patch30729: 5773-SCTP-Implement-SCTP_PARTIAL_DELIVERY_POINT-option.txt +Patch30730: 5774-SCTP-Implement-SCTP_ADDR_CONFIRMED-state-for-ADDR_CHNAGE-event.txt +Patch30731: 5775-SCTP-Honor-flags-when-setting-peer-address-parameters.txt +Patch30732: 5776-SCTP-Implement-sac_info-field-in-SCTP_ASSOC_CHANGE-notification.txt +Patch30733: 5777-SCTP-Implement-SCTP_MAX_BURST-socket-option.txt +Patch30734: 5778-NETLINK-introduce-NLA_BINARY-type.txt +Patch30735: 5779-INET-Use-jhash-random-secret-for-ehash.txt +Patch30736: 5781-TCP-cubic-update-for-net-2.6.22.txt +Patch30737: 5784-NET-fib_rules-goto-rule-action.txt +Patch30738: 5785-NET-fib_rules-Mark-rules-detached-from-the-device.txt +Patch30739: 5786-NET-fib_rules-Add-no-operation-action.txt +Patch30740: 5787-IPV4-LVS-Allow-to-send-ICMP-unreachable-responses-when-real-servers-are-removed.txt +Patch30741: 5789-NET-inet_ehash_secret-should-be-__read_mostly-and-set-only-once.txt +Patch30742: 5790-NET-fib_rules-Flush-route-cache-after-rule-modifications.txt +Patch30743: 5791-TCP-tcp_memory_pressure-and-tcp_socket-are__read_mostly-candidates.txt +Patch30744: 5792-IPV4-align-inet_protos-on-SMP.txt +Patch30745: 5793-BLUETOOTH-Introduce-skb-data-accessor-methods-for-hci_-acl-event-sco-_hdr.txt +Patch30746: 5795-NET-fib_rules-delay-route-cache-flush-by-ip_rt_min_delay.txt +Patch30747: 5797-NET-Inline-net_device_stats.txt +Patch30748: 5802-NET-Move-generic-skbuff-stuff-from-XFRM-code-to-generic-code.txt +Patch30749: 5805-IPV6-FIB6RULE-Find-source-address-during-looking-up-route.txt +Patch30750: 5815-bridge-simpler-hash-with-salt.txt +Patch30751: 5817-bridge-add-support-for-user-mode-STP.txt +Patch30752: 5818-bridge-change-when-netlink-events-go-to-STP.txt +Patch30753: 5819-bridge-allow-changing-hardware-address-to-any-valid-address.txt +Patch30754: 5821-NET-loopback-driver-can-use-loopback_dev-integrated-net_device_stats.txt +Patch30755: 5824-DCCP-Fix-bug-in-the-calculation-of-very-low-sending-rates.txt +Patch30756: 5825-DCCP-Debug-statements-for-Elapsed-Time-option.txt +Patch30757: 5828-NETFILTER-ebt_arp-add-gratuitous-arp-filtering.txt +Patch30758: 5831-NETFILTER-nfnetlink_log-remove-fallback-to-group-0.txt +Patch30759: 5832-NETFILTER-ipt_ULOG-add-compat-conversion-functions.txt +Patch30760: 5837-NET_SCHED-Eliminate-qdisc_tree_lock.txt +Patch30761: 5838-NET_SCHED-ingress-switch-back-to-using-ingress_lock.txt +Patch30762: 5839-IPV6-MTU-discovery-check-in-ip6_fragment.txt +Patch30763: 5841-IPV6-SNMP-Netlink-interface.txt +Patch30764: 5842-IPV6-SNMP-Move-some-statistic-bits-to-net-ipv6-proc.c.txt +Patch30765: 5843-IPV4-SNMP-Move-some-statistic-bits-to-net-ipv4-proc.c.txt +Patch30766: 5844-IPV6-SNMP-Export-statistics-via-netlink-without-CONFIG_PROC_FS.txt +Patch30767: 5845-AF_PACKET-Add-option-to-return-orig_dev-to-userspace.txt +Patch30768: 5846-AX25-NETROM-ROSE-Convert-to-use-modern-wait-queue-API.txt +Patch30769: 5847-BRIDGE-Fix-warning-in-net-2.6.22.txt +Patch30770: 5848-NET-skbuff-skb_store_bits-const-is-backwards.txt +Patch30771: 5849-PPPoE-miscellaneous-smaller-cleanups.txt +Patch30772: 5850-PPPOE-race-between-interface-going-down-and-connect.txt +Patch30773: 5851-PPPOE-memory-leak-when-socket-is-release-d-before-PPPIOCGCHAN-has-been-called-on-it.txt +Patch30774: 5852-PPPOE-Fix-device-tear-down-notification.txt +Patch30775: 5853-NET-Get-rid-of-netdev_nit.txt +Patch30776: 5856-TCP-Uninline-tcp_done.txt +Patch30777: 5857-NET-Move-sk_setup_caps-out-of-line.txt +Patch30778: 5858-IrDA-af_irda-irda_recvmsg_stream-cleanup.txt +Patch30779: 5859-IrDA-af_irda-Silence-kernel-message-in-irda_recvmsg_stream.txt +Patch30780: 5860-IrDA-af_irda-irda_accept-cleanup.txt +Patch30781: 5861-IrDA-af_irda-IRDA_ASSERT-cleanups.txt +Patch30782: 5862-IrDA-Adding-carriage-returns-to-mcs7780-debug-statements.txt +Patch30783: 5863-IrDA-Misc-spelling-corrections.txt +Patch30784: 5864-NET-Fix-comments-for-register_netdev.txt +Patch30785: 5866-IPV6-SNMP-Avoid-unaligned-accesses.txt +Patch30786: 5868-IPV6-SNMP-Use-put_unaligned-instead-of-memcpy.txt +Patch30787: 5869-NET-Prevent-much-sadness-in-qdisc_lock_tree.txt +Patch30788: 5878-NET-Warn-about-GSO-checksum-abuse.txt +Patch30789: 5880-TIPC-Enhancements-to-msg_set_bits-routine.txt +Patch30790: 5882-IPV4-Fix-build-without-procfs.txt +Patch30791: 5886-IPV6-SIT-Unify-code-path-to-get-hash-array-index.txt +Patch30792: 5887-IPV4-IPIP-Unify-code-path-to-get-hash-array-index.txt +Patch30793: 5888-IPV4-IP_GRE-Unify-code-path-to-get-hash-array-index.txt +Patch30794: 5889-IPV6-Export-in6addr_any-for-future-use.txt +Patch30795: 5895-BRIDGE-Missing-rtnl.txt +Patch30796: 5896-NetLabel-cleanup-and-document-CIPSO-constants.txt +Patch30797: 5897-NetLabel-convert-a-BUG_ON-in-the-CIPSO-code-to-a-runtime-check.txt +Patch30798: 5898-SELinux-extract-the-NetLabel-SELinux-support-from-the-security-server.txt +Patch30799: 5908-e1000-FIX-be-ready-for-incoming-irq-at-pci_request_irq.txt +Patch30800: 5909-e1000-FIX-firmware-handover-bits.txt +Patch30801: 5910-e1000-FIX-Stop-raw-interrupts-disabled-nag-from-RT.txt +Patch30802: 5913-XFRM-Export-SAD-info.txt +Patch30803: 5919-NET-tun-tap-fixed-hw-address-handling.txt +Patch30804: 5920-NET-ROUND_UP-macro-cleanup-in-drivers-net-ppp_generic.c.txt +Patch30805: 5921-AF_IUCV-Fix-compilation-on-s390-up.txt +Patch30806: 5923-IRDA-irda_device_dongle_init-fix-kzalloc-GFP_KERNEL-in-spinlock.txt +Patch30807: 5924-NET-SPIN_LOCK_UNLOCKED-cleanup-in-drivers-atm-net.txt +Patch30808: 5926-BLUETOOTH-rfcomm_worker-fix-wakeup-race.txt +Patch30809: 5944-SUNGEM-__sparc__-CONFIG_SPARC.txt +Patch30810: 5946-SUNHME-Use-pci_device_to_OF_node.txt +Patch30811: 6001-XFRM-Missing-bits-to-SAD-info.txt +Patch30812: 6054-POWERPC-Partially-revert-a7edd0e676d51145ae634a2acf7a447e319200fa.txt +Patch30813: 6189-PHY-remove-rwsem-use-from-phy-core.txt +Patch30814: 6478-sis900-Allocate-rx-replacement-buffer-before-rx-operation.txt +Patch30815: 6490-chelsio-use-C99-style-initialization.txt +Patch30816: 6492-ehea-dynamic-add-remove-port.txt +Patch30817: 6494-Add-support-for-Seeq-8003-on-Challenge-S-Mezz-board.txt +Patch30818: 6495-make-drivers-net-s2io.c-vlan_strip_flag-static.txt +Patch30819: 6496-drivers-net-qla3xxx.c-make-2-functions-static.txt +Patch30820: 6498-user-of-the-jiffies-rounding-code-e1000.txt +Patch30821: 6499-phy-layer-add-kernel-doc-DocBook.txt +Patch30822: 6500-dmfe-add-support-for-suspend-resume.txt +Patch30823: 6501-dmfe-add-support-for-Wake-on-lan.txt +Patch30824: 6502-sk98lin-handle-pci_enable_device-return-value-in-skge_resume.txt +Patch30825: 6503-network-add-the-missing-phy_device-speed-information-to-phy_mii_ioctl.txt +Patch30826: 6504-e1000-Use-ARRAY_SIZE-macro-when-appropriate.txt +Patch30827: 6505-e1000-Use-kcalloc.txt +Patch30828: 6507-S2IO-Save-Restore-unused-buffer-mappings-in-2-3-buffer-mode.txt +Patch30829: 6508-ixgb-Use-ARRAY_SIZE-macro-when-appropriate.txt +Patch30830: 6509-pcnet32-only-allocate-init_block-dma-consistent.txt +Patch30831: 6510-pcnet32-change-to-use-netdev_priv.txt +Patch30832: 6513-TULIP-Fix-for-64-bit-MIPS.txt +Patch30833: 6514-TULIP-Natsemi-dp83840a-PHY-fix.txt +Patch30834: 6515-Fix-tulip-SytemError-typo.txt +Patch30835: 6516-Rev-tulip-version.txt +Patch30836: 6525-skge-ignore-unused-error-interrupts.txt +Patch30837: 6526-skge-transmit-locking-improvements.txt +Patch30838: 6528-skge-version-1.11.txt +Patch30839: 6530-S2io-Remove-unused-variables.txt +Patch30840: 6531-Netpoll-support-for-Sibyte-MAC.txt +Patch30841: 6538-strlcpy-is-smart-enough.txt +Patch30842: 6539-baycom_ser_fdx-also-allow-i-o-ports-0x1000-and-enhanced-failure-logging.txt +Patch30843: 6541-qla3xxx-Add-ethtool-get_pauseparam-for-improved-bonding-support.txt +Patch30844: 6542-qla3xxx-Adding-support-for-the-Agere-PHY-ET1011C.txt +Patch30845: 6543-qla3xxx-Bumping-driver-version-number-to-v2.03.00-k4.txt +Patch30846: 6544-mv643xx_eth-make-eth_port_uc_addr_-get-set-calls-symmetric.txt +Patch30847: 6546-Patch-replace-with-time_after-in-drivers-net-eexpress.c.txt +Patch30848: 6547-S2io-Change-of-driver-maintainers.txt +Patch30849: 6548-make-drivers-net-qla3xxx.c-PHY_DEVICES-static.txt +Patch30850: 6560-ucc_geth-Fix-interrupt-coalescing-size-and-alignment.txt +Patch30851: 6562-ucc_geth-fixes-for-ucc_geth_memclean.txt +Patch30852: 6563-ucc_geth-version-1.1.txt +Patch30853: 6564-Fix-sparse-errors-in-drivers-net-ibmveth.c.txt +Patch30854: 6565-mii-add-kernel-doc-notation.txt +Patch30855: 6567-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt +Patch30856: 6574-NetXen-Fix-for-vmalloc-issues.txt +Patch30857: 6575-3C509-Remove-unnecessary-include-of-linux-pm_legacy.h.txt +Patch30858: 6578-e100-allow-bad-MAC-address-when-running-with-invalid-eeprom-csum.txt +Patch30859: 6579-e100-Optionally-use-I-O-mode-only-to-access-register-space.txt +Patch30860: 6580-Generic-HDLC-sparse-annotations.txt +Patch30861: 6581-e1000-ROUND_UP-macro-cleanup-in-drivers-net-e1000.txt +Patch30862: 6582-ixgb-ROUND_UP-macro-cleanup-in-drivers-net-ixgb.txt +Patch30863: 6583-add-NAPI-support-to-sb1250-mac.c.txt +Patch30864: 6584-netdrvr-eexpress-minor-corrections.txt +Patch30865: 6585-smc911x-fix-compilation-breakage-wjen-debug-is-on.txt +Patch30866: 6694-NETPOLL-Remove-CONFIG_NETPOLL_RX.txt +Patch30867: 6695-NET-Remove-NETIF_F_INTERNAL_STATS-default-to-internal-stats.txt +Patch30868: 6696-SCTP-Fix-sctp_getsockopt_local_addrs_old-to-use-local-storage.txt +Patch30869: 6698-XFRM-Export-SPD-info.txt +Patch30870: 6699-TCP-Update-references-in-two-old-comments.txt +Patch30871: 6700-IPV6-Fix-slab-corruption-running-ip6sic.txt +Patch30872: 6701-AF_IUCV-IUCV-smp_call_function-deadlock.txt +Patch30873: 6801-L2TP-Add-the-ability-to-autoload-a-pppox-protocol-module.txt +Patch30874: 6803-TCP-Catch-skb-with-S-L-bugs-earlier.txt +Patch30875: 6804-XFRM-Restrict-upper-layer-information-by-bundle.txt +Patch30876: 6809-IPV4-SNMP-Support-InTruncatedPkts.txt Patch40000: mac80211.patch @@ -3441,578 +3440,576 @@ %patch30590 -p1 # sky2: handle descriptor errors %patch30591 -p1 -# sky2: EC-U performance and jumbo support -%patch30592 -p1 # sky2: no jumbo on Yukon FE -%patch30593 -p1 +%patch30592 -p1 # sky2: version 1.14 -%patch30594 -p1 +%patch30593 -p1 # [PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet() -%patch30595 -p1 +%patch30594 -p1 # Revert "e1000: fix NAPI performance on 4-port adapters" -%patch30596 -p1 +%patch30595 -p1 # RPC: Fix the TCP resend semantics for NFSv4 -%patch30597 -p1 +%patch30596 -p1 # [SUNQE]: Fix MAC address assignment. -%patch30598 -p1 +%patch30597 -p1 # [SUNLANCE]: Fix module unload. -%patch30599 -p1 +%patch30598 -p1 # [SUNHME]: Fix module unload. -%patch30600 -p1 +%patch30599 -p1 # [TCP]: Congestion control initialization. -%patch30601 -p1 +%patch30600 -p1 # [XFRM]: beet: fix pseudo header length value -%patch30602 -p1 +%patch30601 -p1 # [netdrvr] depca: handle platform_device_add() failure -%patch30603 -p1 +%patch30602 -p1 # sis900: Allocate rx replacement buffer before rx operation -%patch30604 -p1 +%patch30603 -p1 # drivers/net/hamradio/baycom_ser_fdx build fix -%patch30605 -p1 +%patch30604 -p1 # [PATCH] add adm8211 wireless driver -%patch30606 -p1 +%patch30605 -p1 # [PATCH] adm8211: fix-up build breaks from 2.6.19 -%patch30607 -p1 +%patch30606 -p1 # [PATCH] adm8211: Use ieee80211_generic_get_stats -%patch30608 -p1 +%patch30607 -p1 # [PATCH] adm8211: fix work_struct build breakage -%patch30609 -p1 +%patch30608 -p1 # [PATCH] adm8211: fix set essid for WE-21 -%patch30610 -p1 +%patch30609 -p1 # [PATCH] Update my email address from jkmaline at cc.hut.fi to j at w1.fi -%patch30611 -p1 +%patch30610 -p1 # [PATCH] wireless: add prism54usb driver -%patch30612 -p1 +%patch30611 -p1 # [PATCH] prism54usb: fix build break in islusb_init.c -%patch30613 -p1 +%patch30612 -p1 # [PATCH] softmac: prism54usb update -%patch30614 -p1 +%patch30613 -p1 # [PATCH] update prism54usb sources -%patch30615 -p1 +%patch30614 -p1 # [PATCH] patch prism54usb: add set_bssid_filter -%patch30616 -p1 +%patch30615 -p1 # [PATCH] prism54usb: fix-up build breaks from 2.6.19 -%patch30617 -p1 +%patch30616 -p1 # [PATCH] prism54usb: fix-up warnings from struct pt_regs removal -%patch30618 -p1 +%patch30617 -p1 # [PATCH] prism54usb: squash some more warnings -%patch30619 -p1 +%patch30618 -p1 # [PATCH] prism54usb: fix work_struct build breakage -%patch30620 -p1 +%patch30619 -p1 # [PATCH] prism54usb: add USB ID 2001:3704 -%patch30621 -p1 +%patch30620 -p1 # [PATCH] prism54usb: add device -%patch30622 -p1 +%patch30621 -p1 # [PATCH] prism54usb: fix breakage from skb->input_device removal -%patch30623 -p1 +%patch30622 -p1 # [PATCH] ieee80211: add missing global needed by IEEE80211_DEBUG_XXXX -%patch30624 -p1 +%patch30623 -p1 # [BNX2]: Fix occasional NETDEV WATCHDOG on 5709. -%patch30625 -p1 +%patch30624 -p1 # [TCP] FRTO: Incorrectly clears TCPCB_EVER_RETRANS bit -%patch30626 -p1 +%patch30625 -p1 # [TCP] FRTO: Separated response from FRTO detection algorithm -%patch30627 -p1 +%patch30626 -p1 # [TCP] FRTO: Moved tcp_use_frto from tcp.h to tcp_input.c -%patch30628 -p1 +%patch30627 -p1 # [TCP] FRTO: Comment cleanup & improvement -%patch30629 -p1 +%patch30628 -p1 # [TCP] FRTO: Response should reset also snd_cwnd_cnt -%patch30630 -p1 +%patch30629 -p1 # [TCP]: Don't enter to fast recovery while using FRTO -%patch30631 -p1 +%patch30630 -p1 # [TCP] FRTO: frto_counter modulo-op converted to two assignments -%patch30632 -p1 +%patch30631 -p1 # [TCP] FRTO: Entry is allowed only during (New)Reno like recovery -%patch30633 -p1 +%patch30632 -p1 # [TCP]: Prevent reordering adjustments during FRTO -%patch30634 -p1 +%patch30633 -p1 # [TCP] YeAH-TCP: algorithm implementation -%patch30635 -p1 +%patch30634 -p1 # [TCP]: Add RFC3742 Limited Slow-Start, controlled by variable sysctl_tcp_max_ssthresh. -%patch30636 -p1 +%patch30635 -p1 # [TCP]: struct \*sock argument renamed: sp -> sk -%patch30637 -p1 +%patch30636 -p1 # [TCP]: Keep copied_seq, rcv_wup and rcv_next together. -%patch30638 -p1 +%patch30637 -p1 # [TCP]: Correct reordering detection change (no FRTO case) -%patch30639 -p1 +%patch30638 -p1 # [NET]: Keep sk_backlog near sk_lock -%patch30640 -p1 +%patch30639 -p1 # [PKTGEN]: use pr_debug -%patch30641 -p1 +%patch30640 -p1 # [PKTGEN]: use random32 -%patch30642 -p1 +%patch30641 -p1 # [PKTGEN]: don't use __constant_htonl() -%patch30643 -p1 +%patch30642 -p1 # [PKTGEN]: fix device name handling -%patch30644 -p1 +%patch30643 -p1 # [NET]: Convert xtime.tv_sec to get_seconds() -%patch30645 -p1 +%patch30644 -p1 # [NETLINK]: Mirror UDP MSG_TRUNC semantics. -%patch30646 -p1 +%patch30645 -p1 # [IPV6] IP6TUNNEL: Split out generic routine in ip6ip6_err(). -%patch30647 -p1 +%patch30646 -p1 # [TCP] tcp_cubic: faster cube root -%patch30648 -p1 +%patch30647 -p1 # [TCP] TCP Yeah: cleanup -%patch30649 -p1 +%patch30648 -p1 # [IPV4]: Optimize inet_getpeer() -%patch30650 -p1 +%patch30649 -p1 # [UDP6]: Restore sk_filter optimisation -%patch30651 -p1 +%patch30650 -p1 # [NET] 802: Use hton{s,l}() where appropriate. -%patch30652 -p1 +%patch30651 -p1 # [NET] 8021Q: Use htons() where appropriate. -%patch30653 -p1 +%patch30652 -p1 # [NET] ATM: Use htons() where appropriate. -%patch30654 -p1 +%patch30653 -p1 # [NET] CORE: Use htons() where appropriate. -%patch30655 -p1 +%patch30654 -p1 # [NET] ETHERNET: Use htons() where appropriate. -%patch30656 -p1 +%patch30655 -p1 # [NET] IEEE80211: Use htons() where appropriate. -%patch30657 -p1 +%patch30656 -p1 # [NET] SCHED: Use htons() where appropriate. -%patch30658 -p1 +%patch30657 -p1 # [NET] TIPC: Use htons() where appropriate. -%patch30659 -p1 +%patch30658 -p1 # [TCP/DCCP/RANDOM]: Remove unused exports. -%patch30660 -p1 +%patch30659 -p1 # [WIRELESS]: use ARRAY_SIZE() -%patch30661 -p1 +%patch30660 -p1 # [NET]: deinline some functions -%patch30662 -p1 +%patch30661 -p1 # [IPV6]: Return correct result for sticky options. -%patch30663 -p1 +%patch30662 -p1 # [IPV6]: Ensure to truncate result and return full length for sticky options. -%patch30664 -p1 +%patch30663 -p1 # [UDP]: Use __skb_pull since we have checked it won't fail with pskb_may_pull -%patch30665 -p1 +%patch30664 -p1 # [TR]: Use tr_hdr() were appropriate -%patch30666 -p1 +%patch30665 -p1 # [TR]: Make tr_type_trans set skb->dev -%patch30667 -p1 +%patch30666 -p1 # [HIPPI/FDDI]: Make {hippi,fddi}_type_trans set skb->dev -%patch30668 -p1 +%patch30667 -p1 # [TCP]: Do the layer header setting in tcp_collapse relative to skb->data -%patch30669 -p1 +%patch30668 -p1 # [LLC]: Kill llc_set_pdu_hdr -%patch30670 -p1 +%patch30669 -p1 # [PPPOE]: Introduce pppoe_hdr() -%patch30671 -p1 +%patch30670 -p1 # [BONDING]: Introduce arp_pkt() -%patch30672 -p1 +%patch30671 -p1 # [IPV6]: Use skb->nh.ipv6h instead of casting skb->nh.raw -%patch30673 -p1 +%patch30672 -p1 # [NET]: network dev read_mostly -%patch30674 -p1 +%patch30673 -p1 # [NET]: make seq_operations const -%patch30675 -p1 +%patch30674 -p1 # [NET]: show bound packet types -%patch30676 -p1 +%patch30675 -p1 # [BRIDGE]: faster compare for link local addresses -%patch30677 -p1 +%patch30676 -p1 # [ICMP6]: Introduce icmp6_hdr() -%patch30678 -p1 +%patch30677 -p1 # [NETFILTER]: x_tables: remove duplicate of xt_prefix -%patch30679 -p1 +%patch30678 -p1 # [NETFILTER]: nf_conntrack: uninline notifier registration functions -%patch30680 -p1 +%patch30679 -p1 # [NETFILTER]: nfnetlink: remove unrequired check in nfnetlink_get_subsys -%patch30681 -p1 +%patch30680 -p1 # [NETFILTER]: nfnetlink: move EXPORT_SYMBOL declarations next to the exported symbol -%patch30682 -p1 +%patch30681 -p1 # [NETFILTER]: nf_conntrack: use jhash2 in __hash_conntrack -%patch30683 -p1 +%patch30682 -p1 # [NETFILTER]: nf_conntrack: add __nf_copy() to copy members in skb -%patch30684 -p1 +%patch30683 -p1 # [NETFILTER]: nf_conntrack: add nf_copy() to safely copy members in skb -%patch30685 -p1 +%patch30684 -p1 # [NETFILTER]: TCP conntrack: accept RST|PSH as valid -%patch30686 -p1 +%patch30685 -p1 # [NETFILTER]: TCP conntrack: factorize out the PUSH flag -%patch30687 -p1 +%patch30686 -p1 # [NET_SCHED]: sch_cbq: fix cbq_undelay_prio for non-active priorites -%patch30688 -p1 +%patch30687 -p1 # [IrDA]: removing stir4200 useless include -%patch30689 -p1 +%patch30688 -p1 # [IrDA]: irda lockdep annotation -%patch30690 -p1 +%patch30689 -p1 # [IrDA]: SMC SuperIO Chip LPC47N227 not identified properly -%patch30691 -p1 +%patch30690 -p1 # [SK_BUFF]: Adjust the zeroing up to tail in __alloc_skb too -%patch30692 -p1 +%patch30691 -p1 # [SK_BUFF]: Remove skb_add_mtu() leftovers -%patch30693 -p1 +%patch30692 -p1 # [DCCP]: 48-bit sequence number arithmetic -%patch30694 -p1 +%patch30693 -p1 # [DCCP]: Make dccp_delta_seqno return signed numbers -%patch30695 -p1 +%patch30694 -p1 # [DCCP]: Make `before' relation unambiguous -%patch30696 -p1 +%patch30695 -p1 # [DCCP]: Fix for follows48 -%patch30697 -p1 +%patch30696 -p1 # [DCCP]: Remove ambiguity in the way before48 is used -%patch30698 -p1 +%patch30697 -p1 # [CCID3]: Remove redundant `len' test -%patch30699 -p1 +%patch30698 -p1 # [CCID3]: Re-order CCID 3 source file -%patch30700 -p1 +%patch30699 -p1 # [CCID3]: Use MSS for larger initial windows -%patch30701 -p1 +%patch30700 -p1 # [CCID3]: Fix use of invalid loss intervals -%patch30702 -p1 +%patch30701 -p1 # [CCID3]: More verbose debugging -%patch30703 -p1 +%patch30702 -p1 # [CCID3]: Remove race condition and update t_ipi when `s' changes -%patch30704 -p1 +%patch30703 -p1 # [DCCP]: Always use debug-toggle parameters -%patch30705 -p1 +%patch30704 -p1 # [DCCP]: More debug information for dccp_wait_for_ccid -%patch30706 -p1 +%patch30705 -p1 # [CCID3]: More to see in dccp_probe -%patch30707 -p1 +%patch30706 -p1 # [CCID3]: Remove build warnings for 64bit -%patch30708 -p1 +%patch30707 -p1 # [CCID3]: Wrap computation of RFC3390-initial rate into separate function -%patch30709 -p1 +%patch30708 -p1 # [CCID3]: Handle Idle and Application-Limited periods -%patch30710 -p1 +%patch30709 -p1 # [DCCP]: Provide function for RTT sampling -%patch30711 -p1 +%patch30710 -p1 # [CCID3]: Use function for RTT sampling -%patch30712 -p1 +%patch30711 -p1 # [DCCP]: Sample RTT from SYN exchange -%patch30713 -p1 +%patch30712 -p1 # [CCID3]: Use initial RTT sample from SYN exchange -%patch30714 -p1 +%patch30713 -p1 # [TCP]: cubic optimization -%patch30715 -p1 +%patch30714 -p1 # [NETEM]: report reorder percent correctly. -%patch30716 -p1 +%patch30715 -p1 # [NETEM]: Optimize tfifo -%patch30717 -p1 +%patch30716 -p1 # [NETLINK]: Remove unused groups variable -%patch30718 -p1 +%patch30717 -p1 # [NETEM]: spelling errors -%patch30719 -p1 +%patch30718 -p1 # [NETFILTER]: nfnetlink_log: don't count max(a,b) twice -%patch30720 -p1 +%patch30719 -p1 # [NETFILTER]: nfnetlink_log: micro-optimization for inst==NULL in nfulnl_recv_config() -%patch30721 -p1 +%patch30720 -p1 # [NETFILTER]: nfnetlink_log: micro-optimization: don't modify destroyed instance -%patch30722 -p1 +%patch30721 -p1 # [NETFILTER]: nfnetlink_log: iterator functions need iter_state \* only -%patch30723 -p1 +%patch30722 -p1 # [NETFILTER]: nfnetlink_log: remove conditional locking -%patch30724 -p1 +%patch30723 -p1 # [NETFILTER]: Use setup_timer -%patch30725 -p1 +%patch30724 -p1 # [NETFILTER]: nf_conntrack: don't use nfct in skb if conntrack is disabled -%patch30726 -p1 +%patch30725 -p1 # [NETFILTER]: nf_conntrack: kill destroy() in struct nf_conntrack for diet -%patch30727 -p1 +%patch30726 -p1 # [NET_SCHED]: sch_netem: fix off-by-one in send time comparison -%patch30728 -p1 +%patch30727 -p1 # [SCTP]: Implement SCTP_FRAGMENT_INTERLEAVE socket option -%patch30729 -p1 +%patch30728 -p1 # [SCTP]: Implement SCTP_PARTIAL_DELIVERY_POINT option. -%patch30730 -p1 +%patch30729 -p1 # [SCTP]: Implement SCTP_ADDR_CONFIRMED state for ADDR_CHNAGE event -%patch30731 -p1 +%patch30730 -p1 # [SCTP]: Honor flags when setting peer address parameters -%patch30732 -p1 +%patch30731 -p1 # [SCTP]: Implement sac_info field in SCTP_ASSOC_CHANGE notification. -%patch30733 -p1 +%patch30732 -p1 # [SCTP]: Implement SCTP_MAX_BURST socket option. -%patch30734 -p1 +%patch30733 -p1 # [NETLINK]: introduce NLA_BINARY type -%patch30735 -p1 +%patch30734 -p1 # [INET]: Use jhash + random secret for ehash. -%patch30736 -p1 +%patch30735 -p1 # [TCP]: cubic update for net-2.6.22 -%patch30737 -p1 +%patch30736 -p1 # [NET] fib_rules: goto rule action -%patch30738 -p1 +%patch30737 -p1 # [NET] fib_rules: Mark rules detached from the device -%patch30739 -p1 +%patch30738 -p1 # [NET] fib_rules: Add no-operation action -%patch30740 -p1 +%patch30739 -p1 # [IPV4] LVS: Allow to send ICMP unreachable responses when real-servers are removed -%patch30741 -p1 +%patch30740 -p1 # [NET]: inet_ehash_secret should be __read_mostly and set only once -%patch30742 -p1 +%patch30741 -p1 # [NET] fib_rules: Flush route cache after rule modifications -%patch30743 -p1 +%patch30742 -p1 # [TCP]: tcp_memory_pressure and tcp_socket are__read_mostly candidates -%patch30744 -p1 +%patch30743 -p1 # [IPV4]: align inet_protos[] on SMP -%patch30745 -p1 +%patch30744 -p1 # [BLUETOOTH]: Introduce skb->data accessor methods for hci_{acl,event,sco}_hdr -%patch30746 -p1 +%patch30745 -p1 # [NET] fib_rules: delay route cache flush by ip_rt_min_delay -%patch30747 -p1 +%patch30746 -p1 # [NET]: Inline net_device_stats -%patch30748 -p1 +%patch30747 -p1 # [NET]: Move generic skbuff stuff from XFRM code to generic code -%patch30749 -p1 +%patch30748 -p1 # [IPV6] FIB6RULE: Find source address during looking up route. -%patch30750 -p1 +%patch30749 -p1 # bridge: simpler hash with salt -%patch30751 -p1 +%patch30750 -p1 # bridge: add support for user mode STP -%patch30752 -p1 +%patch30751 -p1 # bridge: change when netlink events go to STP -%patch30753 -p1 +%patch30752 -p1 # bridge: allow changing hardware address to any valid address -%patch30754 -p1 +%patch30753 -p1 # [NET]: loopback driver can use loopback_dev integrated net_device_stats -%patch30755 -p1 +%patch30754 -p1 # [DCCP]: Fix bug in the calculation of very low sending rates -%patch30756 -p1 +%patch30755 -p1 # [DCCP]: Debug statements for Elapsed Time option -%patch30757 -p1 +%patch30756 -p1 # [NETFILTER]: ebt_arp: add gratuitous arp filtering -%patch30758 -p1 +%patch30757 -p1 # [NETFILTER]: nfnetlink_log: remove fallback to group 0 -%patch30759 -p1 +%patch30758 -p1 # [NETFILTER]: ipt_ULOG: add compat conversion functions -%patch30760 -p1 +%patch30759 -p1 # [NET_SCHED]: Eliminate qdisc_tree_lock -%patch30761 -p1 +%patch30760 -p1 # [NET_SCHED]: ingress: switch back to using ingress_lock -%patch30762 -p1 +%patch30761 -p1 # [IPV6]: MTU discovery check in ip6_fragment() -%patch30763 -p1 +%patch30762 -p1 # [IPV6] SNMP: Netlink interface. -%patch30764 -p1 +%patch30763 -p1 # [IPV6] SNMP: Move some statistic bits to net/ipv6/proc.c. -%patch30765 -p1 +%patch30764 -p1 # [IPV4] SNMP: Move some statistic bits to net/ipv4/proc.c. -%patch30766 -p1 +%patch30765 -p1 # [IPV6] SNMP: Export statistics via netlink without CONFIG_PROC_FS. -%patch30767 -p1 +%patch30766 -p1 # [AF_PACKET]: Add option to return orig_dev to userspace. -%patch30768 -p1 +%patch30767 -p1 # [AX25/NETROM/ROSE]: Convert to use modern wait queue API -%patch30769 -p1 +%patch30768 -p1 # [BRIDGE]: Fix warning in net-2.6.22 -%patch30770 -p1 +%patch30769 -p1 # [NET] skbuff: skb_store_bits const is backwards -%patch30771 -p1 +%patch30770 -p1 # [PPPoE]: miscellaneous smaller cleanups -%patch30772 -p1 +%patch30771 -p1 # [PPPOE]: race between interface going down and connect() -%patch30773 -p1 +%patch30772 -p1 # [PPPOE]: memory leak when socket is release()d before PPPIOCGCHAN has been called on it -%patch30774 -p1 +%patch30773 -p1 # [PPPOE]: Fix device tear-down notification. -%patch30775 -p1 +%patch30774 -p1 # [NET]: Get rid of netdev_nit -%patch30776 -p1 +%patch30775 -p1 # [TCP]: Uninline tcp_done(). -%patch30777 -p1 +%patch30776 -p1 # [NET]: Move sk_setup_caps() out of line. -%patch30778 -p1 +%patch30777 -p1 # [IrDA] af_irda: irda_recvmsg_stream cleanup -%patch30779 -p1 +%patch30778 -p1 # [IrDA] af_irda: Silence kernel message in irda_recvmsg_stream -%patch30780 -p1 +%patch30779 -p1 # [IrDA] af_irda: irda_accept cleanup -%patch30781 -p1 +%patch30780 -p1 # [IrDA] af_irda: IRDA_ASSERT cleanups -%patch30782 -p1 +%patch30781 -p1 # [IrDA]: Adding carriage returns to mcs7780 debug statements -%patch30783 -p1 +%patch30782 -p1 # [IrDA]: Misc spelling corrections. -%patch30784 -p1 +%patch30783 -p1 # [NET]: Fix comments for register_netdev(). -%patch30785 -p1 +%patch30784 -p1 # [IPV6] SNMP: Avoid unaligned accesses. -%patch30786 -p1 +%patch30785 -p1 # [IPV6] SNMP: Use put_unaligned() instead of memcpy(). -%patch30787 -p1 +%patch30786 -p1 # [NET]: Prevent much sadness in qdisc_lock_tree(). -%patch30788 -p1 +%patch30787 -p1 # [NET]: Warn about GSO/checksum abuse -%patch30789 -p1 +%patch30788 -p1 # [TIPC]: Enhancements to msg_set_bits() routine -%patch30790 -p1 +%patch30789 -p1 # [IPV4]: Fix build without procfs. -%patch30791 -p1 +%patch30790 -p1 # [IPV6] SIT: Unify code path to get hash array index. -%patch30792 -p1 +%patch30791 -p1 # [IPV4] IPIP: Unify code path to get hash array index. -%patch30793 -p1 +%patch30792 -p1 # [IPV4] IP_GRE: Unify code path to get hash array index. -%patch30794 -p1 +%patch30793 -p1 # [IPV6]: Export in6addr_any for future use. -%patch30795 -p1 +%patch30794 -p1 # [BRIDGE]: Missing rtnl. -%patch30796 -p1 +%patch30795 -p1 # NetLabel: cleanup and document CIPSO constants -%patch30797 -p1 +%patch30796 -p1 # NetLabel: convert a BUG_ON in the CIPSO code to a runtime check -%patch30798 -p1 +%patch30797 -p1 # SELinux: extract the NetLabel SELinux support from the security server -%patch30799 -p1 +%patch30798 -p1 # e1000: FIX: be ready for incoming irq at pci_request_irq -%patch30800 -p1 +%patch30799 -p1 # e1000: FIX: firmware handover bits -%patch30801 -p1 +%patch30800 -p1 # e1000: FIX: Stop raw interrupts disabled nag from RT -%patch30802 -p1 +%patch30801 -p1 # [XFRM]: Export SAD info. -%patch30803 -p1 +%patch30802 -p1 # [NET] tun/tap: fixed hw address handling -%patch30804 -p1 +%patch30803 -p1 # [NET]: ROUND_UP macro cleanup in drivers/net/ppp_generic.c -%patch30805 -p1 +%patch30804 -p1 # [AF_IUCV]: Fix compilation on s390-up -%patch30806 -p1 +%patch30805 -p1 # [IRDA] irda_device_dongle_init: fix kzalloc(GFP_KERNEL) in spinlock -%patch30807 -p1 +%patch30806 -p1 # [NET]: SPIN_LOCK_UNLOCKED cleanup in drivers/atm, net -%patch30808 -p1 +%patch30807 -p1 # [BLUETOOTH] rfcomm_worker(): fix wakeup race -%patch30809 -p1 +%patch30808 -p1 # [SUNGEM]: __sparc__ --> CONFIG_SPARC -%patch30810 -p1 +%patch30809 -p1 # [SUNHME]: Use pci_device_to_OF_node(). -%patch30811 -p1 +%patch30810 -p1 # [XFRM]: Missing bits to SAD info. -%patch30812 -p1 +%patch30811 -p1 # [POWERPC] Partially revert a7edd0e676d51145ae634a2acf7a447e319200fa -%patch30813 -p1 +%patch30812 -p1 # PHY: remove rwsem use from phy core -%patch30814 -p1 +%patch30813 -p1 # sis900: Allocate rx replacement buffer before rx operation -%patch30815 -p1 +%patch30814 -p1 # chelsio: use C99 style initialization -%patch30816 -p1 +%patch30815 -p1 # ehea: dynamic add / remove port -%patch30817 -p1 +%patch30816 -p1 # Add support for Seeq 8003 on Challenge S Mezz board. -%patch30818 -p1 +%patch30817 -p1 # make drivers/net/s2io.c:vlan_strip_flag static -%patch30819 -p1 +%patch30818 -p1 # drivers/net/qla3xxx.c: make 2 functions static -%patch30820 -p1 +%patch30819 -p1 # user of the jiffies rounding code: e1000 -%patch30821 -p1 +%patch30820 -p1 # phy layer: add kernel-doc + DocBook -%patch30822 -p1 +%patch30821 -p1 # dmfe: add support for suspend/resume -%patch30823 -p1 +%patch30822 -p1 # dmfe: add support for Wake on lan -%patch30824 -p1 +%patch30823 -p1 # sk98lin: handle pci_enable_device() return value in skge_resume() -%patch30825 -p1 +%patch30824 -p1 # network: add the missing phy_device speed information to phy_mii_ioctl -%patch30826 -p1 +%patch30825 -p1 # e1000: Use ARRAY_SIZE macro when appropriate -%patch30827 -p1 +%patch30826 -p1 # e1000: Use kcalloc() -%patch30828 -p1 +%patch30827 -p1 # S2IO: Save/Restore unused buffer mappings in 2/3 buffer mode -%patch30829 -p1 +%patch30828 -p1 # ixgb: Use ARRAY_SIZE macro when appropriate. -%patch30830 -p1 +%patch30829 -p1 # pcnet32: only allocate init_block dma consistent -%patch30831 -p1 +%patch30830 -p1 # pcnet32: change to use netdev_priv -%patch30832 -p1 +%patch30831 -p1 # TULIP: Fix for 64-bit MIPS -%patch30833 -p1 +%patch30832 -p1 # TULIP: Natsemi dp83840a PHY fix -%patch30834 -p1 +%patch30833 -p1 # Fix tulip SytemError typo -%patch30835 -p1 +%patch30834 -p1 # Rev tulip version -%patch30836 -p1 +%patch30835 -p1 # skge: ignore unused error interrupts -%patch30837 -p1 +%patch30836 -p1 # skge: transmit locking improvements -%patch30838 -p1 +%patch30837 -p1 # skge: version 1.11 -%patch30839 -p1 +%patch30838 -p1 # S2io: Remove unused variables -%patch30840 -p1 +%patch30839 -p1 # Netpoll support for Sibyte MAC -%patch30841 -p1 +%patch30840 -p1 # strlcpy is smart enough -%patch30842 -p1 +%patch30841 -p1 # baycom_ser_fdx: also allow i/o ports >= 0x1000 and enhanced failure logging -%patch30843 -p1 +%patch30842 -p1 # qla3xxx: Add ethtool get_pauseparam for improved bonding support. -%patch30844 -p1 +%patch30843 -p1 # qla3xxx: Adding support for the Agere PHY (ET1011C) -%patch30845 -p1 +%patch30844 -p1 # qla3xxx: Bumping driver version number to v2.03.00-k4 -%patch30846 -p1 +%patch30845 -p1 # mv643xx_eth: make eth_port_uc_addr_{get,set}() calls symmetric -%patch30847 -p1 +%patch30846 -p1 # Patch:replace with time_after in drivers/net/eexpress.c -%patch30848 -p1 +%patch30847 -p1 # S2io: Change of driver maintainers -%patch30849 -p1 +%patch30848 -p1 # make drivers/net/qla3xxx.c:PHY_DEVICES[] static -%patch30850 -p1 +%patch30849 -p1 # ucc_geth: Fix interrupt coalescing size and alignment -%patch30851 -p1 +%patch30850 -p1 # ucc_geth: fixes for ucc_geth_memclean -%patch30852 -p1 +%patch30851 -p1 # ucc_geth: version 1.1 -%patch30853 -p1 +%patch30852 -p1 # Fix sparse errors in drivers/net/ibmveth.c -%patch30854 -p1 +%patch30853 -p1 # mii: add kernel-doc notation -%patch30855 -p1 +%patch30854 -p1 # [netdrvr e100] experiment with doing RX in a similar manner to eepro100 -%patch30856 -p1 +%patch30855 -p1 # NetXen: Fix for vmalloc issues -%patch30857 -p1 +%patch30856 -p1 # 3C509: Remove unnecessary include of -%patch30858 -p1 +%patch30857 -p1 # e100: allow bad MAC address when running with invalid eeprom csum -%patch30859 -p1 +%patch30858 -p1 # e100: Optionally use I/O mode only to access register space -%patch30860 -p1 +%patch30859 -p1 # Generic HDLC sparse annotations -%patch30861 -p1 +%patch30860 -p1 # e1000: ROUND_UP macro cleanup in drivers/net/e1000 -%patch30862 -p1 +%patch30861 -p1 # ixgb: ROUND_UP macro cleanup in drivers/net/ixgb -%patch30863 -p1 +%patch30862 -p1 # add NAPI support to sb1250-mac.c -%patch30864 -p1 +%patch30863 -p1 # [netdrvr] eexpress: minor corrections -%patch30865 -p1 +%patch30864 -p1 # smc911x: fix compilation breakage wjen debug is on -%patch30866 -p1 +%patch30865 -p1 # [NETPOLL]: Remove CONFIG_NETPOLL_RX -%patch30867 -p1 +%patch30866 -p1 # [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats. -%patch30868 -p1 +%patch30867 -p1 # [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage. -%patch30869 -p1 +%patch30868 -p1 # [XFRM]: Export SPD info -%patch30870 -p1 +%patch30869 -p1 # [TCP]: Update references in two old comments -%patch30871 -p1 +%patch30870 -p1 # [IPV6]: Fix slab corruption running ip6sic -%patch30872 -p1 +%patch30871 -p1 # [AF_IUCV/IUCV]: smp_call_function deadlock -%patch30873 -p1 +%patch30872 -p1 # [L2TP]: Add the ability to autoload a pppox protocol module. -%patch30874 -p1 +%patch30873 -p1 # [TCP]: Catch skb with S+L bugs earlier -%patch30875 -p1 +%patch30874 -p1 # [XFRM]: Restrict upper layer information by bundle. -%patch30876 -p1 +%patch30875 -p1 # [IPV4] SNMP: Support InTruncatedPkts -%patch30877 -p1 +%patch30876 -p1 # Add mac80211 stack and drivers %patch40000 -p1 @@ -5529,7 +5526,6 @@ - gianfar needs crc32 lib dependency - sky2: disable support for 88E8056 - sky2: handle descriptor errors -- sky2: EC-U performance and jumbo support - sky2: no jumbo on Yukon FE - sky2: version 1.14 - [PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet() --- 5260-sky2-EC-U-performance-and-jumbo-support.txt DELETED --- From fedora-cvs-commits at redhat.com Thu May 3 15:14:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 11:14:51 -0400 Subject: rpms/selinux-policy/FC-6 modules-strict.conf, 1.20, 1.21 modules-targeted.conf, 1.44, 1.45 policy-20061106.patch, 1.39, 1.40 selinux-policy.spec, 1.363, 1.364 Message-ID: <200705031514.l43FEpCv023982@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv23960 Modified Files: modules-strict.conf modules-targeted.conf policy-20061106.patch selinux-policy.spec Log Message: * Thu May 3 2007 Dan Walsh 2.4.6-68 - Cleanup handling of audit messages Index: modules-strict.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/modules-strict.conf,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- modules-strict.conf 30 Apr 2007 16:00:49 -0000 1.20 +++ modules-strict.conf 3 May 2007 15:14:49 -0000 1.21 @@ -1333,3 +1333,9 @@ # fail2ban = module +# Layer: services +# Module: aide +# +# Policy for aide +# +aide = base Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/modules-targeted.conf,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- modules-targeted.conf 30 Apr 2007 16:00:49 -0000 1.44 +++ modules-targeted.conf 3 May 2007 15:14:49 -0000 1.45 @@ -1200,3 +1200,9 @@ # fail2ban = module +# Layer: services +# Module: aide +# +# Policy for aide +# +aide = base policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 93 ++++ policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 6 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 57 ++ policy/modules/admin/amtu.te | 56 ++ policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 6 policy/modules/admin/kudzu.te | 14 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 14 policy/modules/admin/netutils.te | 13 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 18 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 43 + policy/modules/admin/rpm.te | 49 -- policy/modules/admin/su.if | 38 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 13 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 58 ++ policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 ++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 38 + policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 policy/modules/apps/mozilla.if | 208 ++++++++- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 20 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 29 + policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 140 ++++++ policy/modules/kernel/corenetwork.te.in | 14 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 ++ policy/modules/kernel/domain.te | 22 + policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 224 +++++++++- policy/modules/kernel/filesystem.if | 62 ++ policy/modules/kernel/filesystem.te | 20 policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 22 - policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 21 policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 3 policy/modules/services/aide.te | 11 policy/modules/services/amavis.if | 19 policy/modules/services/amavis.te | 2 policy/modules/services/apache.fc | 17 policy/modules/services/apache.if | 22 - policy/modules/services/apache.te | 43 + policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 40 + policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 6 policy/modules/services/bluetooth.te | 8 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 11 policy/modules/services/clamav.te | 3 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++-- policy/modules/services/cron.te | 58 ++ policy/modules/services/cups.fc | 3 policy/modules/services/cups.te | 18 policy/modules/services/cvs.te | 2 policy/modules/services/cyrus.te | 5 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 66 ++- policy/modules/services/dbus.te | 4 policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/dovecot.fc | 1 policy/modules/services/dovecot.if | 44 ++ policy/modules/services/dovecot.te | 56 ++ policy/modules/services/fail2ban.fc | 3 policy/modules/services/fail2ban.if | 80 +++ policy/modules/services/fail2ban.te | 74 +++ policy/modules/services/ftp.te | 19 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 57 ++ policy/modules/services/hal.te | 26 + policy/modules/services/inetd.te | 28 + policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 25 + policy/modules/services/kerberos.te | 15 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 57 +- policy/modules/services/lpd.te | 5 policy/modules/services/mailman.if | 20 policy/modules/services/mailman.te | 1 policy/modules/services/mta.fc | 1 policy/modules/services/mta.if | 20 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 34 + policy/modules/services/nscd.if | 20 policy/modules/services/nscd.te | 28 - policy/modules/services/ntp.te | 1 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 5 policy/modules/services/openca.if | 4 policy/modules/services/openca.te | 2 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 ++ policy/modules/services/pcscd.te | 79 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 11 policy/modules/services/portmap.te | 5 policy/modules/services/portslave.te | 1 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 22 - policy/modules/services/postfix.te | 48 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 28 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 2 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 22 - policy/modules/services/rlogin.te | 11 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.if | 3 policy/modules/services/rpc.te | 27 + policy/modules/services/rshd.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.fc | 5 policy/modules/services/samba.if | 62 ++ policy/modules/services/samba.te | 68 ++- policy/modules/services/sasl.te | 13 policy/modules/services/sendmail.if | 22 + policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 17 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 23 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 21 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 14 policy/modules/services/telnet.te | 3 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 +++ policy/modules/services/uucp.te | 44 +- policy/modules/services/uwimap.te | 1 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 190 ++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 180 +++++++- policy/modules/system/authlogin.te | 41 + policy/modules/system/clock.te | 18 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 policy/modules/system/init.if | 64 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 121 +++++ policy/modules/system/iptables.te | 23 - policy/modules/system/libraries.fc | 42 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 11 policy/modules/system/logging.fc | 5 policy/modules/system/logging.if | 61 ++ policy/modules/system/logging.te | 33 + policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 +- policy/modules/system/lvm.te | 81 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 +++ policy/modules/system/modutils.te | 25 - policy/modules/system/mount.te | 27 - policy/modules/system/netlabel.te | 6 policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 15 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 121 +++++ policy/modules/system/selinuxutil.te | 134 ++---- policy/modules/system/sysnetwork.te | 12 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 + policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 policy/modules/system/unconfined.te | 23 + policy/modules/system/userdomain.if | 590 +++++++++++++++++++++++---- policy/modules/system/userdomain.te | 105 ++-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 46 +- 251 files changed, 6183 insertions(+), 695 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.39 -r 1.40 policy-20061106.patch Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- policy-20061106.patch 30 Apr 2007 16:00:49 -0000 1.39 +++ policy-20061106.patch 3 May 2007 15:14:49 -0000 1.40 @@ -1,20 +1,20 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.4.6/config/appconfig-strict/seusers --- nsaserefpolicy/config/appconfig-strict/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-05-03 09:44:16.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u root:root __default__:user_u diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers --- nsaserefpolicy/config/appconfig-strict-mcs/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-05-03 09:44:16.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_contexts serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts --- nsaserefpolicy/config/appconfig-strict-mls/default_contexts 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts 2007-05-03 09:44:16.000000000 -0400 @@ -1,7 +1,7 @@ system_r:sulogin_t:s0 sysadm_r:sysadm_t:s0 -system_r:local_login_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0 @@ -28,14 +28,14 @@ staff_r:staff_su_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.4.6/config/appconfig-strict-mls/seusers --- nsaserefpolicy/config/appconfig-strict-mls/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-05-03 09:44:16.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mls_systemhigh root:root:s0-mls_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.4.6/man/man8/kerberos_selinux.8 --- nsaserefpolicy/man/man8/kerberos_selinux.8 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8 2007-05-03 09:44:16.000000000 -0400 @@ -18,7 +18,7 @@ .br service krb5kdc restart @@ -47,7 +47,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.4.6/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-05-03 09:44:16.000000000 -0400 @@ -619,6 +619,8 @@ send recv @@ -59,7 +59,7 @@ class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.4.6/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/global_tunables 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/global_tunables 2007-05-03 09:44:16.000000000 -0400 @@ -82,6 +82,14 @@ ## @@ -207,7 +207,7 @@ +gen_tunable(allow_console_login,false) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.4.6/policy/mls --- nsaserefpolicy/policy/mls 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/mls 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/mls 2007-05-03 09:44:16.000000000 -0400 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or @@ -281,7 +281,7 @@ mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.4.6/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-05-03 09:44:16.000000000 -0400 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -292,7 +292,7 @@ logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.4.6/policy/modules/admin/amanda.if --- nsaserefpolicy/policy/modules/admin/amanda.if 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-05-03 09:44:16.000000000 -0400 @@ -127,4 +127,21 @@ allow $1 amanda_log_t:file ra_file_perms; ') @@ -317,7 +317,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.4.6/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-05-03 09:44:16.000000000 -0400 @@ -75,6 +75,7 @@ allow amanda_t self:unix_dgram_socket create_socket_perms; allow amanda_t self:tcp_socket create_stream_socket_perms; @@ -337,14 +337,14 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.4.6/policy/modules/admin/amtu.fc --- nsaserefpolicy/policy/modules/admin/amtu.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc 2007-05-03 09:44:16.000000000 -0400 @@ -0,0 +1,3 @@ + +/usr/bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.4.6/policy/modules/admin/amtu.if --- nsaserefpolicy/policy/modules/admin/amtu.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.if 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.if 2007-05-03 09:44:16.000000000 -0400 @@ -0,0 +1,57 @@ +## +## abstract Machine Test Utility @@ -405,7 +405,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.4.6/policy/modules/admin/amtu.te --- nsaserefpolicy/policy/modules/admin/amtu.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.te 2007-05-03 09:44:16.000000000 -0400 @@ -0,0 +1,56 @@ +policy_module(amtu,1.0.23) + @@ -465,7 +465,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/backup.te serefpolicy-2.4.6/policy/modules/admin/backup.te --- nsaserefpolicy/policy/modules/admin/backup.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/backup.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/backup.te 2007-05-03 09:44:16.000000000 -0400 @@ -82,3 +82,8 @@ optional_policy(` nis_use_ypbind(backup_t) @@ -477,7 +477,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.4.6/policy/modules/admin/bootloader.fc --- nsaserefpolicy/policy/modules/admin/bootloader.fc 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-05-03 09:44:16.000000000 -0400 @@ -2,11 +2,6 @@ /etc/lilo\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) /etc/yaboot\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) @@ -492,7 +492,7 @@ /sbin/ybin.* -- gen_context(system_u:object_r:bootloader_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.4.6/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-05-03 09:44:16.000000000 -0400 @@ -93,6 +93,8 @@ fs_manage_dos_files(bootloader_t) @@ -527,7 +527,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.4.6/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te 2007-05-03 09:44:16.000000000 -0400 @@ -8,7 +8,12 @@ type consoletype_t; @@ -583,7 +583,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ddcprobe.te serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te --- nsaserefpolicy/policy/modules/admin/ddcprobe.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te 2007-05-03 09:44:16.000000000 -0400 @@ -53,3 +53,13 @@ #reh why? this does not seem even necessary to function properly @@ -600,7 +600,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.4.6/policy/modules/admin/dmesg.te --- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-29 12:04:49.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/dmesg.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/dmesg.te 2007-05-03 09:44:16.000000000 -0400 @@ -10,6 +10,7 @@ type dmesg_t; type dmesg_exec_t; @@ -622,7 +622,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.4.6/policy/modules/admin/dmidecode.te --- nsaserefpolicy/policy/modules/admin/dmidecode.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/dmidecode.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/dmidecode.te 2007-05-03 09:44:16.000000000 -0400 @@ -38,3 +38,8 @@ term_use_generic_ptys(dmidecode_t) term_use_unallocated_ttys(dmidecode_t) @@ -634,7 +634,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.if serefpolicy-2.4.6/policy/modules/admin/firstboot.if --- nsaserefpolicy/policy/modules/admin/firstboot.if 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if 2007-05-03 09:44:16.000000000 -0400 @@ -96,7 +96,7 @@ [...1912 lines suppressed...] @@ -13,6 +13,9 @@ type clvmd_var_run_t; files_pid_file(clvmd_var_run_t) @@ -11096,7 +11119,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.4.6/policy/modules/system/miscfiles.fc --- nsaserefpolicy/policy/modules/system/miscfiles.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/miscfiles.fc 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/miscfiles.fc 2007-05-03 09:44:17.000000000 -0400 @@ -39,6 +39,7 @@ /usr/share/fonts(/.*)? gen_context(system_u:object_r:fonts_t,s0) /usr/share/ghostscript/fonts(/.*)? gen_context(system_u:object_r:fonts_t,s0) @@ -11113,7 +11136,7 @@ +/var/empty/sshd/etc/localtime -- gen_context(system_u:object_r:locale_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.4.6/policy/modules/system/miscfiles.if --- nsaserefpolicy/policy/modules/system/miscfiles.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/miscfiles.if 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/miscfiles.if 2007-05-03 09:44:17.000000000 -0400 @@ -138,6 +138,44 @@ ######################################## @@ -11206,7 +11229,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.4.6/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/modutils.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/modutils.te 2007-05-03 09:44:17.000000000 -0400 @@ -54,6 +54,8 @@ can_exec(insmod_t, insmod_exec_t) @@ -11276,7 +11299,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.4.6/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/mount.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/mount.te 2007-05-03 09:44:17.000000000 -0400 @@ -9,6 +9,7 @@ type mount_t; type mount_exec_t; @@ -11353,7 +11376,7 @@ # Unconfined mount local policy diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/netlabel.te serefpolicy-2.4.6/policy/modules/system/netlabel.te --- nsaserefpolicy/policy/modules/system/netlabel.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/netlabel.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/netlabel.te 2007-05-03 09:44:17.000000000 -0400 @@ -8,8 +8,7 @@ type netlabel_mgmt_t; @@ -11374,7 +11397,7 @@ seutil_use_newrole_fds(netlabel_mgmt_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/pcmcia.te serefpolicy-2.4.6/policy/modules/system/pcmcia.te --- nsaserefpolicy/policy/modules/system/pcmcia.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/pcmcia.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/pcmcia.te 2007-05-03 09:44:17.000000000 -0400 @@ -150,3 +150,8 @@ # cjp: why is this created all over the place? allow cardmgr_t { var_run_t cardmgr_var_run_t tmp_t }:dir rw_dir_perms; @@ -11386,7 +11409,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-2.4.6/policy/modules/system/raid.te --- nsaserefpolicy/policy/modules/system/raid.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/raid.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/raid.te 2007-05-03 09:44:17.000000000 -0400 @@ -19,7 +19,7 @@ # Local policy # @@ -11431,7 +11454,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.4.6/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.fc 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.fc 2007-05-03 09:44:17.000000000 -0400 @@ -40,7 +40,9 @@ /usr/sbin/setfiles.* -- gen_context(system_u:object_r:setfiles_exec_t,s0) /usr/sbin/setsebool -- gen_context(system_u:object_r:semanage_exec_t,s0) @@ -11444,7 +11467,7 @@ # /var/run diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.4.6/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.if 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.if 2007-05-03 09:44:17.000000000 -0400 @@ -471,6 +471,7 @@ role $2 types run_init_t; allow run_init_t $3:chr_file rw_term_perms; @@ -11600,7 +11623,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.4.6/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.te 2007-05-03 09:44:17.000000000 -0400 @@ -107,6 +107,19 @@ type semanage_exec_t; domain_entry_file(semanage_t, semanage_exec_t) @@ -11856,7 +11879,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.4.6/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/sysnetwork.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/sysnetwork.te 2007-05-03 09:44:17.000000000 -0400 @@ -175,6 +175,8 @@ dbus_connect_system_bus(dhcpc_t) dbus_send_system_bus(dhcpc_t) @@ -11889,14 +11912,14 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.fc serefpolicy-2.4.6/policy/modules/system/tzdata.fc --- nsaserefpolicy/policy/modules/system/tzdata.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.fc 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.fc 2007-05-03 09:44:17.000000000 -0400 @@ -0,0 +1,3 @@ +# tzdata executable will have: + +/usr/sbin/tzdata-update -- gen_context(system_u:object_r:tzdata_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.if serefpolicy-2.4.6/policy/modules/system/tzdata.if --- nsaserefpolicy/policy/modules/system/tzdata.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.if 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.if 2007-05-03 09:44:17.000000000 -0400 @@ -0,0 +1,23 @@ +## policy for tzdata + @@ -11923,7 +11946,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.te serefpolicy-2.4.6/policy/modules/system/tzdata.te --- nsaserefpolicy/policy/modules/system/tzdata.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.te 2007-05-03 09:44:17.000000000 -0400 @@ -0,0 +1,51 @@ +policy_module(tzdata,1.0.0) + @@ -11978,7 +12001,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.4.6/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.fc 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.fc 2007-05-03 09:44:17.000000000 -0400 @@ -7,6 +7,8 @@ ifdef(`targeted_policy',` /usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) @@ -11991,7 +12014,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.4.6/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.if 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.if 2007-05-03 09:44:17.000000000 -0400 @@ -31,6 +31,7 @@ allow $1 self:nscd *; allow $1 self:dbus *; @@ -12027,7 +12050,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.4.6/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.te 2007-05-03 09:44:17.000000000 -0400 @@ -48,6 +48,10 @@ userdom_priveleged_home_dir_manager(unconfined_t) @@ -12092,7 +12115,7 @@ init_dbus_chat_script(unconfined_execmem_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.4.6/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/userdomain.if 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/userdomain.if 2007-05-03 09:44:17.000000000 -0400 @@ -22,9 +22,9 @@ ## # @@ -12954,7 +12977,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.4.6/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/userdomain.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/userdomain.te 2007-05-03 09:44:17.000000000 -0400 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; @@ -13157,7 +13180,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-2.4.6/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.fc 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/xen.fc 2007-05-03 09:44:17.000000000 -0400 @@ -8,6 +8,7 @@ /usr/sbin/xm -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -13168,7 +13191,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.4.6/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-05-03 09:44:17.000000000 -0400 @@ -20,12 +20,15 @@ type xenctl_t; files_type(xenctl_t) @@ -13290,7 +13313,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.4.6/Rules.modular --- nsaserefpolicy/Rules.modular 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/Rules.modular 2007-04-30 08:30:15.000000000 -0400 ++++ serefpolicy-2.4.6/Rules.modular 2007-05-03 09:44:17.000000000 -0400 @@ -219,6 +219,16 @@ ######################################## Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v retrieving revision 1.363 retrieving revision 1.364 diff -u -r1.363 -r1.364 --- selinux-policy.spec 30 Apr 2007 16:00:49 -0000 1.363 +++ selinux-policy.spec 3 May 2007 15:14:49 -0000 1.364 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.4.6 -Release: 64%{?dist} +Release: 68%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -360,6 +360,15 @@ %endif %changelog +* Thu May 3 2007 Dan Walsh 2.4.6-68 +- Cleanup handling of audit messages + +* Mon Apr 30 2007 Dan Walsh 2.4.6-67 +- Allow logging into the console on s390 +Resolves: #237703 +- Additional avc's caused by change in unix_update +Resolves: #236316 + * Mon Apr 30 2007 Dan Walsh 2.4.6-64 - Add fail2ban policy From fedora-cvs-commits at redhat.com Thu May 3 15:44:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 11:44:41 -0400 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch,1.40,1.41 Message-ID: <200705031544.l43FifBW025443@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25422 Modified Files: policy-20061106.patch Log Message: * Thu May 3 2007 Dan Walsh 2.4.6-68 - Cleanup handling of audit messages policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 93 ++++ policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 6 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 57 ++ policy/modules/admin/amtu.te | 56 ++ policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 24 - policy/modules/admin/kudzu.te | 14 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 14 policy/modules/admin/netutils.te | 13 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 18 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 43 + policy/modules/admin/rpm.te | 49 -- policy/modules/admin/su.if | 38 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 13 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 58 ++ policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 ++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 38 + policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 policy/modules/apps/mozilla.if | 208 ++++++++- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 20 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 29 + policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 140 ++++++ policy/modules/kernel/corenetwork.te.in | 14 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 ++ policy/modules/kernel/domain.te | 22 + policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 224 +++++++++- policy/modules/kernel/filesystem.if | 62 ++ policy/modules/kernel/filesystem.te | 20 policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 22 - policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 21 policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 3 policy/modules/services/aide.te | 11 policy/modules/services/amavis.if | 19 policy/modules/services/amavis.te | 2 policy/modules/services/apache.fc | 17 policy/modules/services/apache.if | 22 - policy/modules/services/apache.te | 43 + policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 40 + policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 6 policy/modules/services/bluetooth.te | 8 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 11 policy/modules/services/clamav.te | 3 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++-- policy/modules/services/cron.te | 58 ++ policy/modules/services/cups.fc | 3 policy/modules/services/cups.te | 18 policy/modules/services/cvs.te | 2 policy/modules/services/cyrus.te | 5 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 66 ++- policy/modules/services/dbus.te | 4 policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/dovecot.fc | 1 policy/modules/services/dovecot.if | 44 ++ policy/modules/services/dovecot.te | 56 ++ policy/modules/services/fail2ban.fc | 3 policy/modules/services/fail2ban.if | 80 +++ policy/modules/services/fail2ban.te | 74 +++ policy/modules/services/ftp.te | 19 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 57 ++ policy/modules/services/hal.te | 26 + policy/modules/services/inetd.te | 28 + policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 25 + policy/modules/services/kerberos.te | 15 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 57 +- policy/modules/services/lpd.te | 5 policy/modules/services/mailman.if | 20 policy/modules/services/mailman.te | 1 policy/modules/services/mta.fc | 1 policy/modules/services/mta.if | 20 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 34 + policy/modules/services/nscd.if | 20 policy/modules/services/nscd.te | 28 - policy/modules/services/ntp.te | 1 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 5 policy/modules/services/openca.if | 4 policy/modules/services/openca.te | 2 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 ++ policy/modules/services/pcscd.te | 79 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 11 policy/modules/services/portmap.te | 5 policy/modules/services/portslave.te | 1 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 22 - policy/modules/services/postfix.te | 48 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 28 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 2 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 22 - policy/modules/services/rlogin.te | 11 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.if | 3 policy/modules/services/rpc.te | 27 + policy/modules/services/rshd.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.fc | 5 policy/modules/services/samba.if | 62 ++ policy/modules/services/samba.te | 68 ++- policy/modules/services/sasl.te | 13 policy/modules/services/sendmail.if | 22 + policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 17 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 23 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 21 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 14 policy/modules/services/telnet.te | 3 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 +++ policy/modules/services/uucp.te | 44 +- policy/modules/services/uwimap.te | 1 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 190 ++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 180 +++++++- policy/modules/system/authlogin.te | 41 + policy/modules/system/clock.te | 18 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 policy/modules/system/init.if | 64 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 121 +++++ policy/modules/system/iptables.te | 23 - policy/modules/system/libraries.fc | 42 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 11 policy/modules/system/logging.fc | 5 policy/modules/system/logging.if | 61 ++ policy/modules/system/logging.te | 33 + policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 +- policy/modules/system/lvm.te | 81 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 +++ policy/modules/system/modutils.te | 25 - policy/modules/system/mount.te | 27 - policy/modules/system/netlabel.te | 6 policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 15 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 121 +++++ policy/modules/system/selinuxutil.te | 134 ++---- policy/modules/system/sysnetwork.te | 12 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 + policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 policy/modules/system/unconfined.te | 23 + policy/modules/system/userdomain.if | 590 +++++++++++++++++++++++---- policy/modules/system/userdomain.te | 105 ++-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 46 +- 251 files changed, 6201 insertions(+), 695 deletions(-) Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- policy-20061106.patch 3 May 2007 15:14:49 -0000 1.40 +++ policy-20061106.patch 3 May 2007 15:44:39 -0000 1.41 @@ -634,7 +634,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.if serefpolicy-2.4.6/policy/modules/admin/firstboot.if --- nsaserefpolicy/policy/modules/admin/firstboot.if 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if 2007-05-03 11:43:40.000000000 -0400 @@ -96,7 +96,7 @@ ######################################## @@ -644,7 +644,7 @@ ## ## ## -@@ -104,10 +104,10 @@ +@@ -104,10 +104,28 @@ ## ## # @@ -656,6 +656,24 @@ - allow $1 firstboot_t:fifo_file write; + allow $1 firstboot_t:fifo_file { read write }; ++') ++ ++######################################## ++## ++## Do not audit attemps to read and write to a firstboot unnamed pipe. ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`firstboot_dontaudit_rw_pipes',` ++ gen_require(` ++ type firstboot_t; ++ ') ++ ++ dontaudit $1 firstboot_t:fifo_file { read write }; ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.4.6/policy/modules/admin/kudzu.te --- nsaserefpolicy/policy/modules/admin/kudzu.te 2006-11-29 12:04:49.000000000 -0500 From fedora-cvs-commits at redhat.com Thu May 3 18:12:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 14:12:26 -0400 Subject: rpms/libxml2/devel libxml2.spec,1.43,1.44 Message-ID: <200705031812.l43ICQuk029612@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/libxml2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29586 Modified Files: libxml2.spec Log Message: - Fix Requires: libxml2 = %{version} - Fixes #238786 Daniel Index: libxml2.spec =================================================================== RCS file: /cvs/dist/rpms/libxml2/devel/libxml2.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- libxml2.spec 17 Apr 2007 14:45:30 -0000 1.43 +++ libxml2.spec 3 May 2007 18:12:23 -0000 1.44 @@ -1,7 +1,7 @@ Summary: Library providing XML and HTML support Name: libxml2 Version: 2.6.28 -Release: 1 +Release: 2%{?dist} License: MIT Group: Development/Libraries Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz @@ -26,7 +26,7 @@ %package devel Summary: Libraries, includes, etc. to develop XML and HTML applications Group: Development/Libraries -Requires: libxml2 = %{version} +Requires: libxml2 = %{version}-%{release} Requires: zlib-devel Requires: pkgconfig @@ -45,7 +45,7 @@ %package python Summary: Python bindings for the libxml2 library Group: Development/Libraries -Requires: libxml2 = %{version} +Requires: libxml2 = %{version}-%{release} %description python The libxml2-python package contains a module that permits applications @@ -130,6 +130,10 @@ %doc doc/python.html %changelog +* Thu May 3 2007 Daniel Veillard 2.6.28-2 +- Fix Requires: libxml2 = %{version} +- Fixes #238786 + * Tue Apr 17 2007 Daniel Veillard 2.6.28-1 - upstream release 2.6.28 see http://xmlsoft.org/news.html - many bug fixed upstream From fedora-cvs-commits at redhat.com Thu May 3 18:16:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 14:16:17 -0400 Subject: rpms/libxslt/devel libxslt.spec,1.44,1.45 Message-ID: <200705031816.l43IGHdk029687@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/libxslt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29663 Modified Files: libxslt.spec Log Message: - cleanup the libxml2 version requires - Fix Requires: libxslt = %{version} - Fixes #238788 Daniel Index: libxslt.spec =================================================================== RCS file: /cvs/dist/rpms/libxslt/devel/libxslt.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- libxslt.spec 15 Feb 2007 15:33:38 -0000 1.44 +++ libxslt.spec 3 May 2007 18:16:13 -0000 1.45 @@ -1,14 +1,16 @@ +%define _libxml2_require 2.6.27 + Summary: Library providing the Gnome XSLT engine Name: libxslt Version: 1.1.20 -Release: 1%{?dist} +Release: 3%{?dist} License: MIT Group: Development/Libraries Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://xmlsoft.org/XSLT/ -Requires: libxml2 >= 2.6.27 -BuildRequires: libxml2-devel >= 2.6.27 +Requires: libxml2 >= %{_libxml2_require} +BuildRequires: libxml2-devel >= %{_libxml2_require} BuildRequires: python python-devel BuildRequires: libxml2-python BuildRequires: libgcrypt-devel @@ -19,29 +21,29 @@ %description This C library allows to transform XML files into other XML files (or HTML, text, ...) using the standard XSLT stylesheet transformation -mechanism. To use it you need to have a version of libxml2 >= 2.6.27 +mechanism. To use it you need to have a version of libxml2 >= %{_libxml2_require} installed. The xsltproc command is a command line interface to the XSLT engine %package devel Summary: Libraries, includes, etc. to embed the Gnome XSLT engine Group: Development/Libraries -Requires: libxslt = %{version} -Requires: libxml2-devel >= 2.6.27 +Requires: libxslt = %{version}-%{release} +Requires: libxml2-devel >= %{_libxml2_require} Requires: libgcrypt-devel Requires: pkgconfig %description devel This C library allows to transform XML files into other XML files (or HTML, text, ...) using the standard XSLT stylesheet transformation -mechanism. To use it you need to have a version of libxml2 >= 2.6.27 +mechanism. To use it you need to have a version of libxml2 >= %{_libxml2_require} installed. %package python Summary: Python bindings for the libxslt library Group: Development/Libraries -Requires: libxslt = %{version} -Requires: libxml2 >= 2.6.27 -Requires: libxml2-python >= 2.6.27 +Requires: libxslt = %{version}-%{release} +Requires: libxml2 >= %{_libxml2_require} +Requires: libxml2-python >= %{_libxml2_require} %description python The libxslt-python package contains a module that permits applications @@ -122,6 +124,11 @@ %doc python/tests/*.xsl %changelog +* Thu May 3 2007 Daniel Veillard - 1.1.20-3 +- cleanup the libxml2 version requires +- Fix Requires: libxslt = %{version} +- Fixes #238788 + * Thu Feb 15 2007 Adam Jackson - Add dist tag to Release to fix 6->7 upgrades. From fedora-cvs-commits at redhat.com Thu May 3 19:01:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 15:01:33 -0400 Subject: rpms/selinux-policy/devel modules-mls.conf, 1.26, 1.27 modules-strict.conf, 1.28, 1.29 modules-targeted.conf, 1.58, 1.59 policy-20070501.patch, 1.1, 1.2 selinux-policy.spec, 1.447, 1.448 Message-ID: <200705031901.l43J1XQ5031572@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31548 Modified Files: modules-mls.conf modules-strict.conf modules-targeted.conf policy-20070501.patch selinux-policy.spec Log Message: * Mon Apr 30 2007 Dan Walsh 2.6.2-1 - Update to latest from upstream Index: modules-mls.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-mls.conf,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- modules-mls.conf 20 Mar 2007 20:45:45 -0000 1.26 +++ modules-mls.conf 3 May 2007 19:01:31 -0000 1.27 @@ -1031,6 +1031,13 @@ # pcscd = module +# Layer: service +# Module: openct +# +# Middleware framework for smart card terminals +# +openct = module + # Layer: system # Module: tzdata # Index: modules-strict.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- modules-strict.conf 17 Apr 2007 19:28:14 -0000 1.28 +++ modules-strict.conf 3 May 2007 19:01:31 -0000 1.29 @@ -1389,3 +1389,11 @@ # w3c # w3c = module + +# Layer: service +# Module: openct +# +# Middleware framework for smart card terminals +# +openct = module + Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- modules-targeted.conf 27 Apr 2007 17:23:49 -0000 1.58 +++ modules-targeted.conf 3 May 2007 19:01:31 -0000 1.59 @@ -829,6 +829,13 @@ # pcscd = module +# Layer: service +# Module: openct +# +# Middleware framework for smart card terminals +# +openct = module + # Layer: system # Module: pcmcia # policy-20070501.patch: Changelog | 1 Rules.modular | 12 + policy/flask/access_vectors | 4 policy/global_booleans | 2 policy/global_tunables | 15 - policy/mls | 31 ++- policy/modules/admin/acct.te | 1 policy/modules/admin/alsa.fc | 1 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 53 +++++ policy/modules/admin/amtu.te | 57 +++++ policy/modules/admin/bootloader.te | 3 policy/modules/admin/consoletype.te | 10 policy/modules/admin/dmesg.te | 1 policy/modules/admin/kudzu.te | 6 policy/modules/admin/logrotate.te | 1 policy/modules/admin/logwatch.te | 2 policy/modules/admin/netutils.te | 1 policy/modules/admin/readahead.te | 9 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 46 ++++ policy/modules/admin/rpm.te | 2 policy/modules/admin/su.if | 14 - policy/modules/admin/sudo.if | 9 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 40 +++ policy/modules/admin/vbetool.te | 1 policy/modules/apps/gnome.if | 26 ++ policy/modules/apps/gpg.fc | 2 policy/modules/apps/loadkeys.if | 44 +--- policy/modules/apps/mozilla.if | 1 policy/modules/apps/uml.if | 27 -- policy/modules/kernel/corecommands.fc | 7 policy/modules/kernel/corecommands.if | 20 + policy/modules/kernel/corenetwork.te.in | 14 + policy/modules/kernel/devices.fc | 3 policy/modules/kernel/devices.if | 111 ++++++++++ policy/modules/kernel/devices.te | 6 policy/modules/kernel/domain.if | 18 + policy/modules/kernel/domain.te | 46 ++++ policy/modules/kernel/files.fc | 1 policy/modules/kernel/files.if | 83 +++++++- policy/modules/kernel/filesystem.if | 39 +++ policy/modules/kernel/filesystem.te | 19 + policy/modules/kernel/kernel.if | 23 +- policy/modules/kernel/kernel.te | 3 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/selinux.if | 38 +++ policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 21 +- policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 2 policy/modules/services/aide.te | 2 policy/modules/services/amavis.if | 19 + policy/modules/services/apache.fc | 14 - policy/modules/services/apache.if | 171 +++++++++++++++- policy/modules/services/apache.te | 79 +++++++ policy/modules/services/apcupsd.fc | 9 policy/modules/services/apcupsd.if | 108 ++++++++++ policy/modules/services/apcupsd.te | 92 ++++++++ policy/modules/services/automount.te | 2 policy/modules/services/avahi.te | 8 policy/modules/services/bind.te | 1 policy/modules/services/clamav.te | 1 policy/modules/services/consolekit.te | 33 ++- policy/modules/services/cron.fc | 1 policy/modules/services/cron.if | 33 +-- policy/modules/services/cron.te | 48 +++- policy/modules/services/cups.te | 13 + policy/modules/services/cvs.te | 1 policy/modules/services/cyrus.te | 1 policy/modules/services/dbus.if | 67 ++++++ policy/modules/services/dbus.te | 7 policy/modules/services/dhcp.te | 2 policy/modules/services/djbdns.te | 5 policy/modules/services/dovecot.fc | 2 policy/modules/services/dovecot.if | 40 +++ policy/modules/services/dovecot.te | 59 +++++ policy/modules/services/ftp.te | 5 policy/modules/services/hal.fc | 8 policy/modules/services/hal.if | 77 +++++++ policy/modules/services/hal.te | 151 ++++++++++++++ policy/modules/services/inetd.te | 5 policy/modules/services/kerberos.if | 79 ++----- policy/modules/services/kerberos.te | 34 +++ policy/modules/services/mailman.if | 19 + policy/modules/services/mta.if | 19 + policy/modules/services/mta.te | 2 policy/modules/services/nis.if | 4 policy/modules/services/nis.te | 11 + policy/modules/services/nscd.te | 15 + policy/modules/services/ntp.te | 4 policy/modules/services/oddjob.te | 2 policy/modules/services/openct.fc | 10 policy/modules/services/openct.if | 84 ++++++++ policy/modules/services/openct.te | 57 ++--- policy/modules/services/pcscd.te | 9 policy/modules/services/pegasus.if | 18 + policy/modules/services/pegasus.te | 9 policy/modules/services/postfix.if | 20 + policy/modules/services/postfix.te | 29 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 7 policy/modules/services/pyzor.te | 7 policy/modules/services/radius.te | 4 policy/modules/services/rlogin.te | 1 policy/modules/services/rpc.if | 5 policy/modules/services/rpc.te | 2 policy/modules/services/rpcbind.fc | 6 policy/modules/services/rpcbind.if | 104 ++++++++++ policy/modules/services/rpcbind.te | 83 ++++++++ policy/modules/services/rsync.te | 1 policy/modules/services/rwho.if | 85 ++++++++ policy/modules/services/samba.fc | 3 policy/modules/services/samba.if | 86 ++++++++ policy/modules/services/samba.te | 92 ++++++++ policy/modules/services/sasl.te | 1 policy/modules/services/sendmail.if | 22 ++ policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.te | 17 + policy/modules/services/spamassassin.te | 12 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 22 ++ policy/modules/services/squid.te | 12 + policy/modules/services/ssh.if | 39 +++ policy/modules/services/ssh.te | 9 policy/modules/services/w3c.fc | 2 policy/modules/services/w3c.if | 1 policy/modules/services/w3c.te | 14 + policy/modules/system/application.fc | 1 policy/modules/system/application.if | 104 ++++++++++ policy/modules/system/application.te | 14 + policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 183 +++++++++++++++-- policy/modules/system/authlogin.te | 37 +++ policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 1 policy/modules/system/fusermount.fc | 6 policy/modules/system/fusermount.if | 41 +++ policy/modules/system/fusermount.te | 50 ++++ policy/modules/system/getty.te | 3 policy/modules/system/hostname.te | 14 + policy/modules/system/init.if | 44 ++++ policy/modules/system/init.te | 39 +++ policy/modules/system/ipsec.if | 20 + policy/modules/system/ipsec.te | 1 policy/modules/system/iptables.te | 5 policy/modules/system/libraries.fc | 4 policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 12 + policy/modules/system/logging.if | 141 +++++++++++++ policy/modules/system/logging.te | 23 +- policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 8 policy/modules/system/modutils.te | 2 policy/modules/system/mount.fc | 3 policy/modules/system/mount.if | 37 +++ policy/modules/system/mount.te | 70 ++++++ policy/modules/system/raid.te | 1 policy/modules/system/selinuxutil.fc | 1 policy/modules/system/selinuxutil.if | 6 policy/modules/system/selinuxutil.te | 76 ++++--- policy/modules/system/sysnetwork.te | 5 policy/modules/system/udev.te | 23 ++ policy/modules/system/unconfined.fc | 1 policy/modules/system/unconfined.if | 15 - policy/modules/system/unconfined.te | 28 ++ policy/modules/system/userdomain.if | 329 +++++++++++++++++++------------- policy/modules/system/userdomain.te | 81 +++++-- policy/modules/system/xen.te | 35 +++ policy/support/misc_patterns.spt | 5 policy/support/obj_perm_sets.spt | 12 + 174 files changed, 3965 insertions(+), 567 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 policy-20070501.patch Index: policy-20070501.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070501.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- policy-20070501.patch 1 May 2007 20:53:29 -0000 1.1 +++ policy-20070501.patch 3 May 2007 19:01:31 -0000 1.2 @@ -1,25 +1,15 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-2.6.2/Changelog ---- nsaserefpolicy/Changelog 2007-04-30 22:35:02.000000000 -0400 -+++ serefpolicy-2.6.2/Changelog 2007-04-30 10:52:21.000000000 -0400 -@@ -1,6 +1,3 @@ --- Patch to allow amavis to read spamassassin libraries from Dan Walsh. --- Patch to allow slocate to getattr other filesystems and directories on those -- filesystems from Dan Walsh. - - Fixes for RHEL4 from the CLIP project. - - Replace the old lrrd fc entries with munin ones. - - Move program admin template usage out of userdom_admin_user_template() to -@@ -8,8 +5,6 @@ - parties. - - Fix clockspeed_run_cli() declaration, it was incorrectly defined as a - template instead of an interface. --- Added modules: -- rwho (Nalin Dahyabhai) - - * Tue Apr 17 2007 Chris PeBenito - 20070417 - - Patch for sasl's use of kerberos from Dan Walsh. -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.6.2/policy/flask/access_vectors +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-2.6.3/Changelog +--- nsaserefpolicy/Changelog 2007-05-03 08:50:57.000000000 -0400 ++++ serefpolicy-2.6.3/Changelog 2007-05-02 15:06:12.000000000 -0400 +@@ -1,5 +1,3 @@ +-- Patch to have avahi use the nsswitch interface rather than individual +- permissions from Dan Walsh. + - Patch to dontaudit logrotate searching avahi pid directory from Dan Walsh. + - Patch to allow insmod to mount kvmfs and dontaudit rw unconfined_t pipes + to handle usage from userhelper from Dan Walsh. +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.6.3/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2007-02-26 09:43:33.000000000 -0500 -+++ serefpolicy-2.6.2/policy/flask/access_vectors 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/flask/access_vectors 2007-05-02 15:16:34.000000000 -0400 @@ -598,6 +598,8 @@ shmempwd shmemgrp @@ -38,9 +28,9 @@ } class key -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.6.2/policy/global_booleans +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.6.3/policy/global_booleans --- nsaserefpolicy/policy/global_booleans 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.6.2/policy/global_booleans 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/global_booleans 2007-05-02 15:16:34.000000000 -0400 @@ -4,7 +4,6 @@ # file should be used. # @@ -57,9 +47,9 @@ ## ##

-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.6.2/policy/global_tunables +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.6.3/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-03-26 16:24:14.000000000 -0400 -+++ serefpolicy-2.6.2/policy/global_tunables 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/global_tunables 2007-05-02 15:16:34.000000000 -0400 @@ -102,12 +102,6 @@ ## gen_tunable(use_samba_home_dirs,false) @@ -86,9 +76,9 @@ +## +gen_tunable(allow_console_login,false) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.6.2/policy/mls +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.6.3/policy/mls --- nsaserefpolicy/policy/mls 2007-03-09 13:02:20.000000000 -0500 -+++ serefpolicy-2.6.2/policy/mls 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/mls 2007-05-02 15:16:34.000000000 -0400 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or @@ -160,9 +150,9 @@ ( t2 == unlabeled_t )); mlsconstrain association { polmatch } -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.6.2/policy/modules/admin/acct.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.6.3/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2007-03-26 10:39:08.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/admin/acct.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/admin/acct.te 2007-05-02 15:16:34.000000000 -0400 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -171,25 +161,25 @@ type acct_data_t; logging_log_file(acct_data_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-2.6.2/policy/modules/admin/alsa.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.fc serefpolicy-2.6.3/policy/modules/admin/alsa.fc --- nsaserefpolicy/policy/modules/admin/alsa.fc 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.6.2/policy/modules/admin/alsa.fc 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/admin/alsa.fc 2007-05-02 15:16:34.000000000 -0400 @@ -1,4 +1,5 @@ /etc/alsa/pcm(/.*)? gen_context(system_u:object_r:alsa_etc_rw_t,s0) +/etc/asound(/.*)? gen_context(system_u:object_r:alsa_etc_rw_t,s0) /usr/bin/ainit -- gen_context(system_u:object_r:alsa_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.2/policy/modules/admin/amtu.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.6.3/policy/modules/admin/amtu.fc --- nsaserefpolicy/policy/modules/admin/amtu.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.2/policy/modules/admin/amtu.fc 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/admin/amtu.fc 2007-05-02 15:16:34.000000000 -0400 @@ -0,0 +1,3 @@ + +/usr/bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.6.2/policy/modules/admin/amtu.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.6.3/policy/modules/admin/amtu.if --- nsaserefpolicy/policy/modules/admin/amtu.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.2/policy/modules/admin/amtu.if 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/admin/amtu.if 2007-05-02 15:16:34.000000000 -0400 @@ -0,0 +1,53 @@ +##

+## abstract Machine Test Utility @@ -244,9 +234,9 @@ + role $2 types amtu_t; + allow amtu_t $3:chr_file rw_term_perms; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.6.2/policy/modules/admin/amtu.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.6.3/policy/modules/admin/amtu.te --- nsaserefpolicy/policy/modules/admin/amtu.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.6.2/policy/modules/admin/amtu.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/admin/amtu.te 2007-05-02 15:16:34.000000000 -0400 @@ -0,0 +1,57 @@ +policy_module(amtu,1.0.23) + @@ -305,9 +295,9 @@ + term_dontaudit_search_ptys(amtu_t) +'); + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.6.2/policy/modules/admin/bootloader.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.6.3/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/admin/bootloader.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/admin/bootloader.te 2007-05-02 15:16:34.000000000 -0400 @@ -65,6 +65,8 @@ files_tmp_filetrans(bootloader_t,bootloader_tmp_t,{ dir file lnk_file chr_file blk_file }) # for tune2fs (cjp: ?) @@ -325,9 +315,9 @@ ') optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.6.2/policy/modules/admin/consoletype.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.6.3/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/admin/consoletype.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/admin/consoletype.te 2007-05-02 15:16:34.000000000 -0400 @@ -8,7 +8,12 @@ type consoletype_t; @@ -359,9 +349,9 @@ domain_use_interactive_fds(consoletype_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.6.2/policy/modules/admin/dmesg.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.6.3/policy/modules/admin/dmesg.te --- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.6.2/policy/modules/admin/dmesg.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/admin/dmesg.te 2007-05-02 15:16:34.000000000 -0400 @@ -10,6 +10,7 @@ type dmesg_t; type dmesg_exec_t; @@ -370,9 +360,9 @@ role system_r types dmesg_t; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.6.2/policy/modules/admin/kudzu.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.6.3/policy/modules/admin/kudzu.te --- nsaserefpolicy/policy/modules/admin/kudzu.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/admin/kudzu.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/admin/kudzu.te 2007-05-02 15:16:34.000000000 -0400 @@ -21,8 +21,8 @@ # Local policy # @@ -393,9 +383,9 @@ # kudzu will telinit to make init re-read # the inittab after configuring serial consoles init_telinit(kudzu_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-2.6.2/policy/modules/admin/logrotate.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-2.6.3/policy/modules/admin/logrotate.te --- nsaserefpolicy/policy/modules/admin/logrotate.te 2007-03-26 10:39:08.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/admin/logrotate.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/admin/logrotate.te 2007-05-02 15:16:34.000000000 -0400 @@ -75,6 +75,7 @@ mls_file_read_up(logrotate_t) mls_file_write_down(logrotate_t) @@ -404,9 +394,9 @@ selinux_get_fs_mount(logrotate_t) [...2415 lines suppressed...] -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.2/policy/modules/system/selinuxutil.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.6.3/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/system/selinuxutil.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/system/selinuxutil.te 2007-05-02 15:16:34.000000000 -0400 @@ -1,10 +1,8 @@ policy_module(selinuxutil,1.5.0) @@ -7415,9 +7513,9 @@ ') + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.6.2/policy/modules/system/sysnetwork.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.6.3/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/system/sysnetwork.te 2007-04-30 13:30:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/system/sysnetwork.te 2007-05-02 15:16:34.000000000 -0400 @@ -164,6 +164,10 @@ dbus_connect_system_bus(dhcpc_t) dbus_send_system_bus(dhcpc_t) @@ -7437,9 +7535,9 @@ ') optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.6.2/policy/modules/system/udev.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.6.3/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/system/udev.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/system/udev.te 2007-05-03 14:59:41.000000000 -0400 @@ -83,12 +83,19 @@ kernel_dgram_send(udev_t) kernel_signal(udev_t) @@ -7460,10 +7558,20 @@ domain_read_all_domains_state(udev_t) domain_dontaudit_ptrace_all_domains(udev_t) #pidof triggers these -@@ -194,5 +201,10 @@ +@@ -194,5 +201,21 @@ ') optional_policy(` ++ openct_read_pid_files(udev_t) ++ openct_domtrans(udev_t) ++') ++ ++optional_policy(` ++ pcscd_read_pub_files(udev_t) ++ pcscd_domtrans(udev_t) ++') ++ ++optional_policy(` + xen_append_log(udev_t) +') + @@ -7471,18 +7579,19 @@ xserver_read_xdm_pid(udev_t) ') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.6.2/policy/modules/system/unconfined.fc ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.6.3/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.6.2/policy/modules/system/unconfined.fc 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/system/unconfined.fc 2007-05-02 15:16:34.000000000 -0400 @@ -10,4 +10,5 @@ /usr/bin/valgrind -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) /usr/local/RealPlayer/realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) /usr/lib/ia32el/ia32x_loader -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) +/usr/bin/vmware.* -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.6.2/policy/modules/system/unconfined.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.6.3/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2007-02-19 11:32:53.000000000 -0500 -+++ serefpolicy-2.6.2/policy/modules/system/unconfined.if 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/system/unconfined.if 2007-05-02 15:16:34.000000000 -0400 @@ -18,7 +18,7 @@ ') @@ -7526,9 +7635,9 @@ nscd_unconfined($1) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.6.2/policy/modules/system/unconfined.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.6.3/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/system/unconfined.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/system/unconfined.te 2007-05-03 09:51:08.000000000 -0400 @@ -6,6 +6,15 @@ # Declarations # @@ -7554,7 +7663,18 @@ optional_policy(` ada_domtrans(unconfined_t) ') -@@ -153,6 +164,8 @@ +@@ -63,10 +74,6 @@ + ') + + optional_policy(` +- bootloader_domtrans(unconfined_t) +- ') +- +- optional_policy(` + init_dbus_chat_script(unconfined_t) + + dbus_stub(unconfined_t) +@@ -153,6 +160,8 @@ optional_policy(` rpm_domtrans(unconfined_t) @@ -7563,7 +7683,7 @@ ') optional_policy(` -@@ -192,6 +205,9 @@ +@@ -192,6 +201,9 @@ optional_policy(` xserver_domtrans_xdm_xserver(unconfined_t) ') @@ -7573,7 +7693,7 @@ ') ######################################## -@@ -200,10 +216,18 @@ +@@ -200,10 +212,18 @@ # ifdef(`targeted_policy',` @@ -7592,9 +7712,9 @@ dbus_stub(unconfined_execmem_t) init_dbus_chat_script(unconfined_execmem_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.6.2/policy/modules/system/userdomain.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.6.3/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/system/userdomain.if 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/system/userdomain.if 2007-05-02 15:16:34.000000000 -0400 @@ -114,6 +114,18 @@ # Allow making the stack executable via mprotect. allow $1_t self:process execstack; @@ -8120,9 +8240,9 @@ + dontaudit $1 sysadm_home_dir_t:dir write; + ') +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.6.2/policy/modules/system/userdomain.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.6.3/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/system/userdomain.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/system/userdomain.te 2007-05-02 15:16:34.000000000 -0400 @@ -15,7 +15,6 @@ # Declarations # @@ -8299,9 +8419,9 @@ +tunable_policy(`allow_console_login', ` + term_use_console(userdomain) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.6.2/policy/modules/system/xen.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.6.3/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2007-04-23 09:36:02.000000000 -0400 -+++ serefpolicy-2.6.2/policy/modules/system/xen.te 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/modules/system/xen.te 2007-05-02 15:16:34.000000000 -0400 @@ -25,6 +25,10 @@ domain_type(xend_t) init_daemon_domain(xend_t, xend_exec_t) @@ -8384,9 +8504,9 @@ +fs_read_nfs_files(xend_t) +fs_getattr_all_fs(xend_t) +fs_read_dos_files(xend_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_patterns.spt serefpolicy-2.6.2/policy/support/misc_patterns.spt +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/misc_patterns.spt serefpolicy-2.6.3/policy/support/misc_patterns.spt --- nsaserefpolicy/policy/support/misc_patterns.spt 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.6.2/policy/support/misc_patterns.spt 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/support/misc_patterns.spt 2007-05-02 15:16:34.000000000 -0400 @@ -41,11 +41,6 @@ # # Other process permissions @@ -8399,9 +8519,9 @@ define(`ps_process_pattern',` allow $1 $2:dir { search getattr read }; allow $1 $2:{ file lnk_file } { read getattr }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.6.2/policy/support/obj_perm_sets.spt +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.6.3/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.6.2/policy/support/obj_perm_sets.spt 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/policy/support/obj_perm_sets.spt 2007-05-02 15:16:34.000000000 -0400 @@ -215,7 +215,7 @@ define(`getattr_file_perms',`{ getattr }') define(`setattr_file_perms',`{ setattr }') @@ -8425,9 +8545,9 @@ +define(`all_association', `{ sendto recvfrom setcontext polmatch } ') + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.6.2/Rules.modular +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.6.3/Rules.modular --- nsaserefpolicy/Rules.modular 2007-03-22 14:30:10.000000000 -0400 -+++ serefpolicy-2.6.2/Rules.modular 2007-04-30 11:26:06.000000000 -0400 ++++ serefpolicy-2.6.3/Rules.modular 2007-05-02 15:16:34.000000000 -0400 @@ -167,7 +167,7 @@ # these have to run individually because order matters: $(verbose) $(GREP) '^sid ' $(tmpdir)/all_te_files.conf >> $(tmpdir)/all_post.conf || true Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.447 retrieving revision 1.448 diff -u -r1.447 -r1.448 --- selinux-policy.spec 2 May 2007 02:53:14 -0000 1.447 +++ selinux-policy.spec 3 May 2007 19:01:31 -0000 1.448 @@ -16,7 +16,7 @@ %define CHECKPOLICYVER 2.0.1-2 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.6.2 +Version: 2.6.3 Release: 1%{?dist} License: GPL Group: System Environment/Base From fedora-cvs-commits at redhat.com Thu May 3 21:09:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 17:09:00 -0400 Subject: rpms/kernel/devel/configs config-generic,1.308,1.309 Message-ID: <200705032109.l43L90kA002609@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv2576/configs Modified Files: config-generic Log Message: important wireless updates Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.308 retrieving revision 1.309 diff -u -r1.308 -r1.309 --- config-generic 1 May 2007 16:26:49 -0000 1.308 +++ config-generic 3 May 2007 21:08:58 -0000 1.309 @@ -1224,8 +1224,9 @@ # CONFIG_ZD1211RW_MAC80211_DEBUG is not set CONFIG_RTL818X=y CONFIG_RTL8187=m -CONFIG_IWLWIFI=m +CONFIG_IWLWIFI=y CONFIG_IWLWIFI_DEBUG=y +CONFIG_IWL3945=m CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m From fedora-cvs-commits at redhat.com Thu May 3 21:09:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 3 May 2007 17:09:00 -0400 Subject: rpms/kernel/devel git-iwlwifi.patch, 1.6, 1.7 git-wireless-dev.patch, 1.8, 1.9 kernel-2.6.spec, 1.3125, 1.3126 linux-2.6-warnings-inline.patch, 1.5, 1.6 git-iwlwifi-fixes.patch, 1.5, NONE linux-2.6-zd1211rw-mac80211-queue-limit.patch, 1.1, NONE Message-ID: <200705032109.l43L90Ml002600@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2576 Modified Files: git-iwlwifi.patch git-wireless-dev.patch kernel-2.6.spec linux-2.6-warnings-inline.patch Removed Files: git-iwlwifi-fixes.patch linux-2.6-zd1211rw-mac80211-queue-limit.patch Log Message: important wireless updates git-iwlwifi.patch: Kconfig | 1 Makefile | 1 iwlwifi/Kconfig | 68 iwlwifi/Makefile | 13 iwlwifi/base.c |12282 ++++++++++++++++++++++++++++++++++++++++++++++++++ iwlwifi/iwl-3945-rs.c | 969 +++ iwlwifi/iwl-3945-rs.h | 104 iwlwifi/iwl-3945.c | 10 iwlwifi/iwl-debug.h | 139 iwlwifi/iwlwifi.h | 1162 ++++ iwlwifi/iwlwifi_hw.h | 1978 ++++++++ 11 files changed, 16727 insertions(+) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 git-iwlwifi.patch Index: git-iwlwifi.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/git-iwlwifi.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- git-iwlwifi.patch 1 May 2007 13:05:24 -0000 1.6 +++ git-iwlwifi.patch 3 May 2007 21:08:57 -0000 1.7 @@ -1,19 +1,13 @@ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-05-01 08:59:35.000000000 -0400 -@@ -0,0 +1,12341 @@ ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-05-03 16:58:50.000000000 -0400 +@@ -0,0 +1,12282 @@ +/****************************************************************************** + -+ Copyright(c) 2003 - 2006 Intel Corporation. All rights reserved. ++ Copyright(c) 2003 - 2007 Intel Corporation. All rights reserved. + + Portions of this file are derived from the ipw3945 project, as well + as portions of the ieee80211 subsystem header files. + -+ 802.11 status code portion of this file from ethereal-0.10.6: -+ Copyright 2000, Axis Communications AB -+ Ethereal - Network traffic analyzer -+ By Gerald Combs -+ Copyright 1998 Gerald Combs -+ + 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. @@ -36,49 +30,6 @@ + +******************************************************************************/ + -+/* -+ * Theory of operation: -+ * -+ * The primary NIC mode of operation is configured within the RXON command. -+ * As such, there are two instances of RXON data -- staging_rxon and -+ * active_rxon. The former is used to configure the device, the later to -+ * reflect the actual currently active configuration. -+ * -+ * After configuring staging_rxon, it is activated by calling -+ * ipw_commit_rxon(). The ipw_commit_rxon() will ensure the correct sequence -+ * of commands are invoked on the hardware to result in Tx being possible -+ * (if the channel is appropriate for Tx) -+ * -+ * About the threading and lock model of the driver... -+ * -+ * There are three paths of execution through the driver. -+ * -+ * 1. ioctl based (wireless extensions, netdev, etc.) -+ * 2. interrupt based -+ * 3. scheduled work queue items -+ * -+ * As soon as an interrupt comes in, it schedules a tasklet. That tasklet, -+ * when run, does any HW checks, pulls any data from the read queue, -+ * and schedules other layers to do the actual work. -+ * -+ * NOTE: This driver is a work in progress. It is currently structured -+ * in a way that we can add support for the next wireless adapter -+ * available from Intel. -+ * -+ * Our current focus is as follows: -+ * 1. Get the driver working w/ mac80211 in STA(client) mode. -+ * 2. Clean up the dual-driver code from function redirection to -+ * if/else switches where the code detlas are minimal. -+ * 3. Evaluate the amount of delta between the hardware versions and -+ * possibly split iwlwifi into multiple drivers for each piece of -+ * HW, sharing as much base code as possible (would result in -+ * multiple driver files on disk vs. a single module that works -+ * with multiple hardware types) -+ * 4. Document the uCode regulatory enforcement -+ * 5. Document the rate scaling capabilities of the 3945 -+ * 6. Provide an initial rate scaling algorithm tailored for the -+ * statistic data exposed by the 3945. -+ */ +#include +#include +#include @@ -92,14 +43,11 @@ +#include +#include + -+//#define BIT(x) (1 << (x)) +#include +#include + +#include <../net/mac80211/ieee80211_rate.h> + -+#include -+ +#ifndef ETH_P_80211_RAW +#define ETH_P_80211_RAW (ETH_P_ECONET + 1) +#endif @@ -108,11 +56,21 @@ +#include + +#include "iwlwifi.h" ++#include "iwl-3945-rs.h" ++ ++#if IWL == 3945 ++#define DRV_DESCRIPTION \ ++"Intel(R) PRO/Wireless 3945ABG/BG Network Connection driver for Linux" ++#elif IWL == 4965 ++#define DRV_DESCRIPTION \ ++"Intel(R) Wireless WiFi Link 4965AGN driver for Linux" ++#else ++BUILD_BUG() ++#endif + +#define IWLWIFI_VERSION "0.0.16k" + -+#define DRV_DESCRIPTION "Intel(R) Wireless Link driver for Linux" -+#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" ++#define DRV_COPYRIGHT "Copyright(c) 2003-2007 Intel Corporation" +#define DRV_VERSION IWLWIFI_VERSION + +MODULE_DESCRIPTION(DRV_DESCRIPTION); @@ -121,18 +79,15 @@ +MODULE_LICENSE("GPL"); + +/*MAC80211 move this to mac80211 files */ -+#define IEEE80211_FC(type, stype) cpu_to_le16((type << 2) | (stype << 4)) + +#define IEEE80211_CHAN_W_RADAR_DETECT 0x00000010 + +#define IEEE80211_24GHZ_BAND (1<<0) +#define IEEE80211_52GHZ_BAND (1<<1) + -+#define IEEE80211_OFDM_SHIFT_MASK_A 4 -+ +/*MAC80211 end */ + -+static u32 ipw_debug_level; ++u32 iwl_debug_level; + +static int param_disable_hw_scan = 0; +static int param_debug = 0; @@ -156,7 +111,6 @@ + +static int ipw_queue_tx_hcmd(struct ipw_priv *priv, struct ipw_host_cmd *cmd); + -+static int ipw_rate_scale_rxon_handle(struct ipw_priv *priv, s32 sta_id); +static u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid); +static void ipw_clear_stations_table(struct ipw_priv *priv); + @@ -264,7 +218,7 @@ + const u8 *data = p; + char line[81]; + u32 ofs = 0; -+ if (!(ipw_debug_level & level)) ++ if (!(iwl_debug_level & level)) + return; + + while (len) { @@ -342,7 +296,6 @@ + +/*MAC80211-END*/ + -+#define IPW_RATE_SCALE_MAX_WINDOW 62 +/* + * IO, register, and NIC memory access functions + * @@ -496,7 +449,7 @@ + return __ipw_read_restricted(__LINE__, priv, reg); +} + -+static void inline _ipw_write_restricted(struct ipw_priv *priv, ++static inline void _ipw_write_restricted(struct ipw_priv *priv, + u32 reg, u32 value) +{ + _ipw_write32(priv, reg, value); @@ -552,6 +505,15 @@ + return _ipw_read_restricted_reg(priv, reg); +} + ++#ifdef CONFIG_IWLWIFI_DEBUG ++#define ipw_read_restricted_reg(priv, reg) \ ++ __ipw_read_restricted_reg(__LINE__, priv, reg) ++#else ++#define ipw_read_restricted_reg(priv, reg) \ ++ _ipw_read_restricted_reg(priv, reg) ++#endif ++ ++ +static inline void _ipw_write_restricted_reg(struct ipw_priv *priv, + u32 addr, u32 val) +{ @@ -593,7 +555,7 @@ +#define _ipw_set_bits_mask_restricted_reg(priv, reg, bits, mask) \ + _ipw_write_restricted_reg( \ + priv, reg, ((_ipw_read_restricted_reg(priv, reg) & mask) | bits)) -+static void inline __ipw_set_bits_mask_restricted_reg(u32 line, struct ipw_priv ++static inline void __ipw_set_bits_mask_restricted_reg(u32 line, struct ipw_priv + *priv, u32 reg, + u32 bits, u32 mask) +{ @@ -1414,7 +1376,7 @@ [...2095 lines suppressed...] ++ spin_lock_irqsave(&rs_priv->lq_mngr.lock, flags); + ++ if (time_after(jiffies, rs_priv->lq_mngr.stamp + ++ rs_priv->lq_mngr.flush_time)) { ++ mod_timer(&rs_priv->rate_scale_flush, ++ jiffies + IPW_RATE_SCALE_WIN_FLUSH); ++ rs_priv->lq_mngr.stamp = jiffies; + } + -+ spin_unlock_irqrestore(&priv->lq_mngr.lock, flags); -+ ++ spin_unlock_irqrestore(&rs_priv->lq_mngr.lock, flags); ++ ++ sta_info_put(sta); ++ + IPW_DEBUG_RATE("leave\n"); + + return; @@ -16488,15 +16487,15 @@ + return &mode->rates[0]; +} + -+static u16 ipw_get_adjacent_rate(struct ipw_priv *priv, ++static u16 ipw_get_adjacent_rate(struct ipw_rate_scale_priv *rs_priv, + u8 index, -+ u16 rate_mask) ++ u16 rate_mask, int phymode) +{ + u8 i; + u8 high = IPW_INVALID_RATE; + u8 low = IPW_INVALID_RATE; + -+ if (unlikely(priv->phymode == MODE_IEEE80211A)) { ++ if (unlikely(phymode == MODE_IEEE80211A)) { + for (i = index; i > 0; i--) { + if (rate_mask & (1 << (i - 1))) { + low = i - 1; @@ -16514,10 +16513,10 @@ + return (high << 8) | low; + } + -+ if (likely(priv->lq_mngr.next_lower_rate)) { ++ if (likely(rs_priv->lq_mngr.next_lower_rate)) { + low = index; + while (low != IPW_INVALID_RATE) { -+ low = priv->lq_mngr.next_lower_rate[low]; ++ low = rs_priv->lq_mngr.next_lower_rate[low]; + if (low == IPW_INVALID_RATE) + break; + if (rate_mask & (1 << low)) @@ -16528,10 +16527,10 @@ + } + } + -+ if (likely(priv->lq_mngr.next_higher_rate)) { ++ if (likely(rs_priv->lq_mngr.next_higher_rate)) { + high = index; + while (high != IPW_INVALID_RATE) { -+ high = priv->lq_mngr.next_higher_rate[high]; ++ high = rs_priv->lq_mngr.next_higher_rate[high]; + if (high == IPW_INVALID_RATE) + break; + if (rate_mask & (1 << high)) @@ -16557,7 +16556,7 @@ + u8 high = IPW_INVALID_RATE; + u16 high_low; + int index; -+ struct ipw_rate_scale_priv *scale_priv; ++ struct ipw_rate_scale_priv *rs_priv; + struct ipw_rate_scale_data *window = NULL; + int current_tpt = IPW_INVALID_VALUE; + int low_tpt = IPW_INVALID_VALUE; @@ -16598,26 +16597,25 @@ + rate_mask = sta->supp_rates; + index = min(sta->txrate & 0xffff, IPW_MAX_RATES - 1); + -+ spin_lock_irqsave(&priv->lq_mngr.lock, flags); ++ rs_priv = (void *)sta->rate_ctrl_priv; + -+ scale_priv = (struct ipw_rate_scale_priv*) -+ sta->rate_ctrl_priv; ++ spin_lock_irqsave(&rs_priv->lq_mngr.lock, flags); + -+ if (scale_priv->start_rate != IPW_INVALID_RATE) { -+ index = scale_priv->start_rate; -+ scale_priv->start_rate = IPW_INVALID_RATE; ++ if (rs_priv->start_rate != IPW_INVALID_RATE) { ++ index = rs_priv->start_rate; ++ rs_priv->start_rate = IPW_INVALID_RATE; + } + -+ window = &(scale_priv->win[index]); ++ window = &(rs_priv->win[index]); + + fail_count = window->counter - window->success_counter; + + if (((fail_count <= IPW_RATE_SCALE_MIN_FAILURE_TH) && + (window->success_counter < IPW_RATE_SCALE_MIN_SUCCESS_TH)) -+ || (priv->lq_mngr.expected_tpt == NULL)) { ++ || (rs_priv->lq_mngr.expected_tpt == NULL)) { + + window->average_tpt = IPW_INVALID_VALUE; -+ spin_unlock_irqrestore(&priv->lq_mngr.lock, flags); ++ spin_unlock_irqrestore(&rs_priv->lq_mngr.lock, flags); + + IPW_DEBUG_RATE("Invalid average_tpt on rate %d: " + "counter: %d, success_counter: %d, " @@ -16625,28 +16623,29 @@ + index, + window->counter, + window->success_counter, -+ priv->lq_mngr.expected_tpt ? "not " : ""); ++ rs_priv->lq_mngr.expected_tpt ? "not " : ""); + goto out; + + } + + window->average_tpt = ((window->success_ratio * -+ priv->lq_mngr. ++ rs_priv->lq_mngr. + expected_tpt[index] + 64) / 128); + -+ high_low = ipw_get_adjacent_rate(priv, index, rate_mask); ++ high_low = ipw_get_adjacent_rate(rs_priv, index, rate_mask, ++ local->hw.conf.phymode); + low = high_low & 0xff; + high = (high_low >> 8) & 0xff; + + current_tpt = window->average_tpt; + + if (low != IPW_INVALID_RATE) -+ low_tpt = scale_priv->win[low].average_tpt; ++ low_tpt = rs_priv->win[low].average_tpt; + + if (high != IPW_INVALID_RATE) -+ high_tpt = scale_priv->win[high].average_tpt; ++ high_tpt = rs_priv->win[high].average_tpt; + -+ spin_unlock_irqrestore(&priv->lq_mngr.lock, flags); ++ spin_unlock_irqrestore(&rs_priv->lq_mngr.lock, flags); + + scale_action = 1; + @@ -16725,28 +16724,41 @@ + + +static char* rs_name = "iwlwifi rate-scale"; -+static void ipw_set_rate_scale_handlers(struct ipw_priv *priv) ++extern void ipw_set_rate_scale_handlers(struct rate_control_ops *rs_ops) ++{ ++ rs_ops->module = NULL; ++ rs_ops->name = rs_name; ++ rs_ops->tx_status = rs_tx_status; ++ rs_ops->get_rate = rs_get_rate; ++ rs_ops->rate_init = rs_rate_init; ++ rs_ops->clear = rs_clear; ++ rs_ops->alloc = rs_alloc; ++ rs_ops->free = rs_free; ++ rs_ops->alloc_sta = rs_alloc_sta; ++ rs_ops->free_sta = rs_free_sta; ++} +--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c.orig 2007-05-03 16:59:03.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/iwl-3945.c 2007-05-03 16:58:50.000000000 -0400 +@@ -0,0 +1,10 @@ ++/** ++ * NOTE ++ * ++ * This file is a temporary place holder to get the build system working ++ */ ++ ++void foo(void) +{ -+ priv->rate_control.module = NULL; -+ priv->rate_control.name = rs_name; -+ priv->rate_control.tx_status = &rs_tx_status; -+ priv->rate_control.get_rate = &rs_get_rate; -+ priv->rate_control.rate_init = rs_rate_init; -+ priv->rate_control.clear = rs_clear; -+ priv->rate_control.alloc = rs_alloc; -+ priv->rate_control.free = rs_free; -+ priv->rate_control.alloc_sta = rs_alloc_sta; -+ priv->rate_control.free_sta = rs_free_sta; +} ---- linux-2.6.21.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-05-01 08:59:01.000000000 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/Makefile 2007-05-01 08:59:19.000000000 -0400 ++ +--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/Makefile.orig 2007-05-03 16:58:24.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/Makefile 2007-05-03 16:58:32.000000000 -0400 @@ -4,3 +4,4 @@ obj-$(CONFIG_ADM8211) += adm8211/ obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_ZD1211RW_MAC80211) += zd1211rw/ obj-$(CONFIG_RTL818X) += rtl818x/ +obj-$(CONFIG_IWLWIFI) += iwlwifi/ ---- linux-2.6.21.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-05-01 08:59:01.000000000 -0400 -+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/Kconfig 2007-05-01 08:59:19.000000000 -0400 +--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/Kconfig.orig 2007-05-03 16:58:24.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/Kconfig 2007-05-03 16:58:32.000000000 -0400 @@ -4,3 +4,4 @@ source "drivers/net/wireless/mac80211/ad source "drivers/net/wireless/mac80211/p54/Kconfig" source "drivers/net/wireless/mac80211/zd1211rw/Kconfig" git-wireless-dev.patch: .mailmap | 1 CREDITS | 31 MAINTAINERS | 49 drivers/Kconfig | 2 drivers/Makefile | 1 drivers/misc/Kconfig | 6 drivers/misc/Makefile | 1 drivers/misc/eeprom_93cx6.c | 347 + drivers/net/wireless/Kconfig | 2 drivers/net/wireless/Makefile | 3 drivers/net/wireless/bcm43xx/Kconfig | 1 drivers/net/wireless/mac80211/Kconfig | 6 drivers/net/wireless/mac80211/Makefile | 6 drivers/net/wireless/mac80211/README | 2 drivers/net/wireless/mac80211/adm8211/Kconfig | 25 drivers/net/wireless/mac80211/adm8211/Makefile | 1 drivers/net/wireless/mac80211/adm8211/adm8211.c | 2172 ++++++ drivers/net/wireless/mac80211/adm8211/adm8211.h | 622 + drivers/net/wireless/mac80211/bcm43xx/Kconfig | 101 drivers/net/wireless/mac80211/bcm43xx/Makefile | 18 drivers/net/wireless/mac80211/bcm43xx/bcm43xx.h | 885 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.c | 433 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_debugfs.h | 110 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.c | 1383 ++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_dma.h | 361 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.c | 300 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.c | 1110 +++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_lo.h | 92 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.c | 4029 ++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_main.h | 156 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.c | 163 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pcmcia.h | 22 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.c | 4286 +++++++++++++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_phy.h | 309 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.c | 671 ++ drivers/net/wireless/mac80211/bcm43xx/bcm43xx_pio.h | 170 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.c | 82 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_power.h | 41 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.c | 232 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_sysfs.h | 9 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.c | 376 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_tables.h | 28 drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.c | 603 + drivers/net/wireless/mac80211/bcm43xx/bcm43xx_xmit.h | 250 drivers/net/wireless/mac80211/p54/Kconfig | 10 drivers/net/wireless/mac80211/p54/Makefile | 4 drivers/net/wireless/mac80211/p54/net2280.h | 452 + drivers/net/wireless/mac80211/p54/prism54.h | 77 drivers/net/wireless/mac80211/p54/prism54common.c | 821 ++ drivers/net/wireless/mac80211/p54/prism54common.h | 328 + drivers/net/wireless/mac80211/p54/prism54magic.h | 77 drivers/net/wireless/mac80211/p54/prism54pci.c | 700 ++ drivers/net/wireless/mac80211/p54/prism54pci.h | 106 drivers/net/wireless/mac80211/p54/prism54usb.c | 946 ++ drivers/net/wireless/mac80211/p54/prism54usb.h | 133 drivers/net/wireless/mac80211/rt2x00/Kconfig | 99 drivers/net/wireless/mac80211/rt2x00/Makefile | 14 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c | 1769 +++++ drivers/net/wireless/mac80211/rt2x00/rt2400pci.h | 918 ++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.c | 1951 ++++++ drivers/net/wireless/mac80211/rt2x00/rt2500pci.h | 1185 +++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.c | 1729 +++++ drivers/net/wireless/mac80211/rt2x00/rt2500usb.h | 738 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00.h | 1057 +++ drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c | 353 + drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h | 72 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c | 831 ++ drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h | 128 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c | 426 + drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c | 587 + drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h | 83 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c | 637 + drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h | 120 drivers/net/wireless/mac80211/rt2x00/rt61pci.c | 2332 +++++++ drivers/net/wireless/mac80211/rt2x00/rt61pci.h | 1348 ++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.c | 1966 ++++++ drivers/net/wireless/mac80211/rt2x00/rt73usb.h | 937 ++ drivers/net/wireless/mac80211/rtl818x/Kconfig | 9 drivers/net/wireless/mac80211/rtl818x/Makefile | 2 drivers/net/wireless/mac80211/rtl818x/rtl8187.h | 126 drivers/net/wireless/mac80211/rtl818x/rtl8187_dev.c | 726 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.c | 747 ++ drivers/net/wireless/mac80211/rtl818x/rtl8187_rtl8225.h | 30 drivers/net/wireless/mac80211/rtl818x/rtl818x.h | 180 drivers/net/wireless/mac80211/zd1211rw/Kconfig | 19 drivers/net/wireless/mac80211/zd1211rw/Makefile | 11 drivers/net/wireless/mac80211/zd1211rw/zd_chip.c | 1681 +++++ drivers/net/wireless/mac80211/zd1211rw/zd_chip.h | 910 ++ drivers/net/wireless/mac80211/zd1211rw/zd_def.h | 57 drivers/net/wireless/mac80211/zd1211rw/zd_ieee80211.h | 67 drivers/net/wireless/mac80211/zd1211rw/zd_mac.c | 942 ++ drivers/net/wireless/mac80211/zd1211rw/zd_mac.h | 199 drivers/net/wireless/mac80211/zd1211rw/zd_rf.c | 170 drivers/net/wireless/mac80211/zd1211rw/zd_rf.h | 80 drivers/net/wireless/mac80211/zd1211rw/zd_rf_al2230.c | 436 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_al7230b.c | 491 + drivers/net/wireless/mac80211/zd1211rw/zd_rf_rf2959.c | 279 drivers/net/wireless/mac80211/zd1211rw/zd_usb.c | 1444 ++++ drivers/net/wireless/mac80211/zd1211rw/zd_usb.h | 267 drivers/net/wireless/mac80211/zd1211rw/zd_util.c | 82 drivers/net/wireless/mac80211/zd1211rw/zd_util.h | 29 drivers/net/wireless/zd1211rw/Kconfig | 1 drivers/ssb/Kconfig | 93 drivers/ssb/Makefile | 11 drivers/ssb/driver_chipcommon.c | 402 + drivers/ssb/driver_mipscore.c | 258 drivers/ssb/driver_pcicore.c | 556 + drivers/ssb/main.c | 1047 +++ drivers/ssb/pci.c | 672 ++ drivers/ssb/pcihost_wrapper.c | 104 drivers/ssb/pcmcia.c | 256 drivers/ssb/scan.c | 407 + drivers/ssb/ssb_private.h | 151 drivers/usb/host/Kconfig | 13 drivers/usb/host/ohci-hcd.c | 21 drivers/usb/host/ohci-ssb.c | 254 include/linux/crc-itu-t.h | 27 include/linux/eeprom_93cx6.h | 77 include/linux/ieee80211.h | 403 + include/linux/nl80211.h | 263 include/linux/ssb/ssb.h | 403 + include/linux/ssb/ssb_driver_chipcommon.h | 387 + include/linux/ssb/ssb_driver_extif.h | 163 include/linux/ssb/ssb_driver_mips.h | 47 include/linux/ssb/ssb_driver_pci.h | 108 include/linux/ssb/ssb_regs.h | 294 include/net/cfg80211.h | 114 include/net/iw_handler.h | 8 include/net/mac80211.h | 1060 +++ lib/Kconfig | 8 lib/Makefile | 1 lib/crc-itu-t.c | 64 net/Kconfig | 1 net/Makefile | 4 net/mac80211/Kconfig | 82 net/mac80211/Makefile | 20 net/mac80211/aes_ccm.c | 155 net/mac80211/aes_ccm.h | 26 net/mac80211/debugfs.c | 433 + net/mac80211/debugfs.h | 16 net/mac80211/debugfs_key.c | 252 net/mac80211/debugfs_key.h | 34 net/mac80211/debugfs_netdev.c | 440 + net/mac80211/debugfs_netdev.h | 30 net/mac80211/debugfs_sta.c | 247 net/mac80211/debugfs_sta.h | 12 net/mac80211/hostapd_ioctl.h | 344 + net/mac80211/ieee80211.c | 5106 ++++++++++++++++ net/mac80211/ieee80211_cfg.c | 72 net/mac80211/ieee80211_cfg.h | 9 net/mac80211/ieee80211_common.h | 98 net/mac80211/ieee80211_i.h | 814 ++ net/mac80211/ieee80211_iface.c | 353 + net/mac80211/ieee80211_ioctl.c | 3180 +++++++++ net/mac80211/ieee80211_key.h | 106 net/mac80211/ieee80211_led.c | 91 net/mac80211/ieee80211_led.h | 32 net/mac80211/ieee80211_rate.c | 140 net/mac80211/ieee80211_rate.h | 144 net/mac80211/ieee80211_sta.c | 3217 ++++++++++ net/mac80211/michael.c | 104 net/mac80211/michael.h | 20 net/mac80211/rc80211_simple.c | 432 + net/mac80211/sta_info.c | 470 + net/mac80211/sta_info.h | 169 net/mac80211/tkip.c | 341 + net/mac80211/tkip.h | 36 net/mac80211/wep.c | 328 + net/mac80211/wep.h | 40 net/mac80211/wme.c | 681 ++ net/mac80211/wme.h | 57 net/mac80211/wpa.c | 846 ++ net/mac80211/wpa.h | 31 net/wireless/Kconfig | 17 net/wireless/Makefile | 1 net/wireless/core.c | 143 net/wireless/core.h | 32 net/wireless/nl80211.c | 994 +++ net/wireless/nl80211.h | 24 net/wireless/sysfs.c | 50 181 files changed, 79414 insertions(+), 5 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 git-wireless-dev.patch Index: git-wireless-dev.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/git-wireless-dev.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- git-wireless-dev.patch 1 May 2007 00:44:04 -0000 1.8 +++ git-wireless-dev.patch 3 May 2007 21:08:57 -0000 1.9 @@ -1,9 +1,5 @@ -git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git - -commit 1fd8ffe72853ed41a0d3b489a2d94959aef6af80 - --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/include/net/mac80211.h 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/include/net/mac80211.h 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,1060 @@ +/* + * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface @@ -1065,8 +1061,8 @@ + ((u8*)(x))[3], ((u8*)(x))[4], ((u8*)(x))[5] + +#endif /* MAC80211_H */ ---- linux-2.6.21.noarch/include/net/cfg80211.h.orig 2007-04-30 20:04:37.000000000 -0400 -+++ linux-2.6.21.noarch/include/net/cfg80211.h 2007-04-30 20:04:50.000000000 -0400 +--- linux-2.6.21.noarch/include/net/cfg80211.h.orig 2007-05-03 16:26:02.000000000 -0400 ++++ linux-2.6.21.noarch/include/net/cfg80211.h 2007-05-03 16:26:43.000000000 -0400 @@ -11,6 +11,69 @@ * Copyright 2006 Johannes Berg */ @@ -1200,8 +1196,8 @@ + u32 seq, int flags, u8 cmd); + #endif /* __NET_CFG80211_H */ ---- linux-2.6.21.noarch/include/net/iw_handler.h.orig 2007-04-30 20:04:37.000000000 -0400 -+++ linux-2.6.21.noarch/include/net/iw_handler.h 2007-04-30 20:04:50.000000000 -0400 +--- linux-2.6.21.noarch/include/net/iw_handler.h.orig 2007-05-03 16:26:02.000000000 -0400 ++++ linux-2.6.21.noarch/include/net/iw_handler.h 2007-05-03 16:26:43.000000000 -0400 @@ -431,7 +431,13 @@ struct iw_public_data { * Those may be called only within the kernel. */ @@ -1217,8 +1213,8 @@ /* Send a single event to user space */ extern void wireless_send_event(struct net_device * dev, ---- linux-2.6.21.noarch/include/linux/nl80211.h.orig 2007-04-30 20:04:37.000000000 -0400 -+++ linux-2.6.21.noarch/include/linux/nl80211.h 2007-04-30 20:04:50.000000000 -0400 +--- linux-2.6.21.noarch/include/linux/nl80211.h.orig 2007-05-03 16:26:02.000000000 -0400 ++++ linux-2.6.21.noarch/include/linux/nl80211.h 2007-05-03 16:26:43.000000000 -0400 @@ -7,6 +7,217 @@ */ @@ -1495,7 +1491,7 @@ + #endif /* __LINUX_NL80211_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/include/linux/eeprom_93cx6.h 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/include/linux/eeprom_93cx6.h 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,77 @@ +/* + Copyright (C) 2004 - 2006 rt2x00 SourceForge Project @@ -1575,7 +1571,7 @@ +extern void eeprom_93cx6_multiwrite(struct eeprom_93cx6 *eeprom, + const u8 word, __le16 *data, const u16 words); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/include/linux/ieee80211.h 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/include/linux/ieee80211.h 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,403 @@ +/* + * IEEE 802.11 defines @@ -1981,7 +1977,7 @@ + +#endif /* IEEE80211_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/include/linux/crc-itu-t.h 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/include/linux/crc-itu-t.h 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,27 @@ +/* + * crc-itu-t.h - CRC ITU-T V.41 routine @@ -2011,7 +2007,7 @@ + +#endif /* CRC_ITU_T_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_extif.h 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_extif.h 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,163 @@ +/* + * Hardware-specific External Interface I/O core definitions @@ -2177,7 +2173,7 @@ +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_EXTIFCORE_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/include/linux/ssb/ssb.h 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/include/linux/ssb/ssb.h 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,403 @@ +#ifndef LINUX_SSB_H_ +#define LINUX_SSB_H_ @@ -2583,7 +2579,7 @@ +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_pci.h 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_pci.h 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,108 @@ +#ifndef LINUX_SSB_PCICORE_H_ +#define LINUX_SSB_PCICORE_H_ @@ -2694,7 +2690,7 @@ +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_PCICORE_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/include/linux/ssb/ssb_regs.h 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/include/linux/ssb/ssb_regs.h 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,294 @@ +#ifndef LINUX_SSB_REGS_H_ +#define LINUX_SSB_REGS_H_ @@ -2991,7 +2987,7 @@ +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_REGS_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_mips.h 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_mips.h 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,47 @@ +#ifndef LINUX_SSB_MIPSCORE_H_ +#define LINUX_SSB_MIPSCORE_H_ @@ -3041,7 +3037,7 @@ +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_MIPSCORE_H_ */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,387 @@ +#ifndef LINUX_SSB_CHIPCO_H_ +#define LINUX_SSB_CHIPCO_H_ @@ -3430,8 +3426,8 @@ + +#endif /* __KERNEL__ */ +#endif /* LINUX_SSB_CHIPCO_H_ */ ---- linux-2.6.21.noarch/CREDITS.orig 2007-04-30 20:04:37.000000000 -0400 -+++ linux-2.6.21.noarch/CREDITS 2007-04-30 20:04:50.000000000 -0400 +--- linux-2.6.21.noarch/CREDITS.orig 2007-05-03 16:26:02.000000000 -0400 ++++ linux-2.6.21.noarch/CREDITS 2007-05-03 16:26:43.000000000 -0400 @@ -665,6 +665,11 @@ D: Minor updates to SCSI code for the Co S: (ask for current address) S: USA @@ -3498,8 +3494,8 @@ N: Lars Wirzenius E: liw at iki.fi D: Linux System Administrator's Guide, author, former maintainer ---- linux-2.6.21.noarch/MAINTAINERS.orig 2007-04-30 20:04:37.000000000 -0400 -+++ linux-2.6.21.noarch/MAINTAINERS 2007-04-30 20:04:50.000000000 -0400 +--- linux-2.6.21.noarch/MAINTAINERS.orig 2007-05-03 16:26:02.000000000 -0400 ++++ linux-2.6.21.noarch/MAINTAINERS 2007-05-03 16:26:43.000000000 -0400 @@ -296,6 +296,14 @@ M: corentin.labbe at geomatys.fr L: lm-sensors at lm-sensors.org S: Maintained @@ -3591,15 +3587,15 @@ SONY VAIO CONTROL DEVICE DRIVER P: Mattia Dongili M: malattia at linux.it ---- linux-2.6.21.noarch/drivers/misc/Makefile.orig 2007-04-30 20:04:37.000000000 -0400 -+++ linux-2.6.21.noarch/drivers/misc/Makefile 2007-04-30 20:04:50.000000000 -0400 +--- linux-2.6.21.noarch/drivers/misc/Makefile.orig 2007-05-03 16:26:02.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/misc/Makefile 2007-05-03 16:26:43.000000000 -0400 @@ -12,3 +12,4 @@ obj-$(CONFIG_TIFM_CORE) += tifm_c obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o obj-$(CONFIG_SGI_IOC4) += ioc4.o obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o +obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/drivers/misc/eeprom_93cx6.c 2007-04-30 20:04:50.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/misc/eeprom_93cx6.c 2007-05-03 16:26:43.000000000 -0400 @@ -0,0 +1,347 @@ +/* + Copyright (C) 2004 - 2006 rt2x00 SourceForge Project @@ -3948,8 +3944,8 @@ + eeprom_93cx6_write(eeprom, word + i, le16_to_cpu(data[i])); +} +EXPORT_SYMBOL_GPL(eeprom_93cx6_multiwrite); ---- linux-2.6.21.noarch/drivers/misc/Kconfig.orig 2007-04-30 20:04:37.000000000 -0400 -+++ linux-2.6.21.noarch/drivers/misc/Kconfig 2007-04-30 20:04:50.000000000 -0400 +--- linux-2.6.21.noarch/drivers/misc/Kconfig.orig 2007-05-03 16:26:02.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/misc/Kconfig 2007-05-03 16:26:43.000000000 -0400 @@ -122,4 +122,10 @@ config SONY_LAPTOP Read for more information. @@ -3961,15 +3957,15 @@ + The driver supports both read as well as write commands. + endmenu ---- linux-2.6.21.noarch/drivers/Makefile.orig 2007-04-30 20:04:37.000000000 -0400 -+++ linux-2.6.21.noarch/drivers/Makefile 2007-04-30 20:04:50.000000000 -0400 +--- linux-2.6.21.noarch/drivers/Makefile.orig 2007-05-03 16:26:02.000000000 -0400 ++++ linux-2.6.21.noarch/drivers/Makefile 2007-05-03 16:26:43.000000000 -0400 @@ -82,3 +82,4 @@ obj-$(CONFIG_GENERIC_TIME) += clocksourc obj-$(CONFIG_DMA_ENGINE) += dma/ obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/ +obj-$(CONFIG_SSB) += ssb/ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/drivers/usb/host/ohci-ssb.c 2007-04-30 20:04:50.000000000 -0400 [...2602 lines suppressed...] ++ ++#endif /* _WME_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/debugfs_key.h 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/debugfs_key.h 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,34 @@ +#ifndef __MAC80211_DEBUGFS_KEY_H +#define __MAC80211_DEBUGFS_KEY_H @@ -69232,7 +69583,7 @@ + +#endif /* __MAC80211_DEBUGFS_KEY_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/ieee80211_common.h 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/ieee80211_common.h 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,98 @@ +/* + * IEEE 802.11 driver (80211.o) -- hostapd interface @@ -69333,7 +69684,7 @@ + +#endif /* IEEE80211_COMMON_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/wep.c 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/wep.c 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,328 @@ +/* + * Software WEP encryption implementation @@ -69664,8 +70015,8 @@ + return NULL; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/ieee80211.c 2007-04-30 20:05:14.000000000 -0400 -@@ -0,0 +1,5095 @@ ++++ linux-2.6.21.noarch/net/mac80211/ieee80211.c 2007-05-03 16:28:27.000000000 -0400 +@@ -0,0 +1,5106 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. + * Copyright 2005-2006, Devicescape Software, Inc. @@ -70619,7 +70970,7 @@ + + if (unlikely(!tx->u.tx.mgmt_interface && tx->sdata->ieee802_1x && + !(sta_flags & WLAN_STA_AUTHORIZED))) { -+#ifdef CONFIG_MAC80211_DEBUG ++#ifdef CONFIG_MAC80211_VERBOSE_DEBUG + printk(KERN_DEBUG "%s: dropped frame to " MAC_FMT + " (unauthorized port)\n", tx->dev->name, + MAC_ARG(hdr->addr1)); @@ -71835,6 +72186,16 @@ + return 0; +} + ++enum netif_tx_lock_class { ++ TX_LOCK_NORMAL, ++ TX_LOCK_MASTER, ++}; ++ ++static inline void netif_tx_lock_nested(struct net_device *dev, int subclass) ++{ ++ spin_lock_nested(&dev->_xmit_lock, subclass); ++ dev->xmit_lock_owner = smp_processor_id(); ++} + +static void ieee80211_set_multicast_list(struct net_device *dev) +{ @@ -71842,7 +72203,7 @@ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + unsigned short flags; + -+ netif_tx_lock(local->mdev); ++ netif_tx_lock_nested(local->mdev, TX_LOCK_MASTER); + if (((dev->flags & IFF_ALLMULTI) != 0) ^ (sdata->allmulti != 0)) { + if (sdata->allmulti) { + sdata->allmulti = 0; @@ -74568,6 +74929,7 @@ + sta_info_stop(local); +fail_sta_info: + debugfs_hw_del(local); ++ destroy_workqueue(local->hw.workqueue); +fail_workqueue: + wiphy_unregister(local->hw.wiphy); + return result; @@ -74762,7 +75124,7 @@ +MODULE_DESCRIPTION("IEEE 802.11 subsystem"); +MODULE_LICENSE("GPL"); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/ieee80211_led.c 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/ieee80211_led.c 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,91 @@ +/* + * Copyright 2006, Johannes Berg @@ -74856,7 +75218,7 @@ +} +EXPORT_SYMBOL(__ieee80211_get_rx_led_name); --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.c 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.c 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,72 @@ +/* + * mac80211 configuration hooks for cfg80211 @@ -74931,8 +75293,8 @@ + .del_virtual_intf = ieee80211_del_iface, +}; --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/debugfs_key.c 2007-04-30 20:04:51.000000000 -0400 -@@ -0,0 +1,253 @@ ++++ linux-2.6.21.noarch/net/mac80211/debugfs_key.c 2007-05-03 16:26:44.000000000 -0400 +@@ -0,0 +1,252 @@ +/* + * Copyright 2003-2005 Devicescape Software, Inc. + * Copyright (c) 2006 Jiri Benc @@ -74944,7 +75306,6 @@ + */ + +#include -+#include +#include "ieee80211_i.h" +#include "ieee80211_key.h" +#include "debugfs.h" @@ -75187,7 +75548,7 @@ + key->debugfs.stalink = NULL; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/debugfs_sta.c 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/debugfs_sta.c 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,247 @@ +/* + * Copyright 2003-2005 Devicescape Software, Inc. @@ -75437,7 +75798,7 @@ + sta->debugfs.dir = NULL; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/ieee80211_rate.c 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/ieee80211_rate.c 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,140 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -75580,7 +75941,7 @@ + kref_put(&ref->kref, rate_control_release); +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/wpa.c 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/wpa.c 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,846 @@ +/* + * Copyright 2002-2004, Instant802 Networks, Inc. @@ -76429,7 +76790,7 @@ +} + --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/ieee80211_rate.h 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/ieee80211_rate.h 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,144 @@ +/* + * Copyright 2002-2005, Instant802 Networks, Inc. @@ -76576,7 +76937,7 @@ + +#endif /* IEEE80211_RATE_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/tkip.h 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/tkip.h 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,36 @@ +/* + * Copyright 2002-2004, Instant802 Networks, Inc. @@ -76615,7 +76976,7 @@ + +#endif /* TKIP_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/ieee80211_sta.c 2007-04-30 20:05:14.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/ieee80211_sta.c 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,3217 @@ +/* + * BSS client mode implementation @@ -79835,7 +80196,7 @@ + return 0; +} --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.h 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.h 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,9 @@ +/* + * mac80211 configuration hooks for cfg80211 @@ -79847,7 +80208,7 @@ + +#endif /* __IEEE80211_CFG_H */ --- /dev/null 2007-04-17 21:17:54.747954992 -0400 -+++ linux-2.6.21.noarch/net/mac80211/debugfs.h 2007-04-30 20:04:51.000000000 -0400 ++++ linux-2.6.21.noarch/net/mac80211/debugfs.h 2007-05-03 16:26:44.000000000 -0400 @@ -0,0 +1,16 @@ +#ifndef __MAC80211_DEBUGFS_H +#define __MAC80211_DEBUGFS_H @@ -79865,8 +80226,8 @@ +#endif + +#endif /* __MAC80211_DEBUGFS_H */ ---- linux-2.6.21.noarch/.mailmap.orig 2007-04-30 20:04:37.000000000 -0400 -+++ linux-2.6.21.noarch/.mailmap 2007-04-30 20:04:51.000000000 -0400 +--- linux-2.6.21.noarch/.mailmap.orig 2007-05-03 16:26:17.000000000 -0400 ++++ linux-2.6.21.noarch/.mailmap 2007-05-03 16:26:44.000000000 -0400 @@ -57,6 +57,7 @@ Jean Tourrilhes Jeff Garzik Jens Axboe Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.3125 retrieving revision 1.3126 diff -u -r1.3125 -r1.3126 --- kernel-2.6.spec 1 May 2007 21:53:26 -0000 1.3125 +++ kernel-2.6.spec 3 May 2007 21:08:58 -0000 1.3126 @@ -600,8 +600,6 @@ Patch2300: linux-2.6-wireless.patch Patch2301: git-wireless-dev.patch Patch2302: git-iwlwifi.patch -Patch2303: git-iwlwifi-fixes.patch -Patch2304: linux-2.6-zd1211rw-mac80211-queue-limit.patch # ACPI bits @@ -1347,10 +1345,6 @@ %patch2301 -p1 # ...and the iwlwifi driver from Intel %patch2302 -p1 -# ...plus some fixes not yet in Intel's tree -%patch2303 -p1 -# limite queueing of URBs to zd1211rw-mac80211 driver -%patch2304 -p1 # ACPI patches @@ -2340,6 +2334,13 @@ # - tux. %changelog +* Thu May 03 2007 John W. Linville +- Update git-wireless-dev.patch (fix lockdep spew, zd1211rw-mac80211 fixes) +- Remove linux-2.6-zd1211rw-mac80211-queue-limit.patch (obsolete) +- Update git-iwlwifi.patch (signal level fixes, iwlwifi -> iwl3945 name change) +- Remove git-iwlwifi-fixes.patch (obsolete) +- Remove iwlwifi portions of linux-2.6-warnings-inline.patch (obsolete) + * Tue May 01 2007 Dave Jones - Update sparse to 0.3 and reenable. linux-2.6-warnings-inline.patch: b/arch/i386/oprofile/op_model_p4.c | 2 +- b/arch/powerpc/kernel/prom_init.c | 4 ++-- b/drivers/acpi/tables/tbfadt.c | 4 ++-- b/drivers/isdn/hardware/eicon/divasmain.c | 12 ++++++------ b/drivers/isdn/hardware/eicon/platform.h | 4 ++-- b/drivers/media/common/ir-functions.c | 2 +- b/drivers/media/video/cx88/cx88-core.c | 12 ++++++------ b/drivers/media/video/cx88/cx88.h | 4 ++-- b/drivers/net/sky2.c | 2 +- b/drivers/net/wireless/ipw2200.c | 2 +- b/drivers/scsi/tmscsim.c | 16 ++++++++-------- b/drivers/usb/serial/safe_serial.c | 2 +- b/drivers/video/intelfb/intelfbdrv.c | 2 +- b/fs/ocfs2/namei.c | 4 ++-- b/include/asm-powerpc/spinlock.h | 10 +++++----- b/include/linux/cpuset.h | 4 ++-- b/kernel/mutex.c | 2 +- b/sound/drivers/opl4/opl4_lib.c | 2 +- b/sound/pci/au88x0/au88x0.h | 4 ++-- b/sound/pci/au88x0/au88x0_core.c | 4 ++-- linux-2.6.20.noarch/arch/ia64/kernel/mca.c | 2 +- linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c | 2 +- linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c | 4 ++-- linux-2.6.20.noarch/arch/s390/kernel/traps.c | 4 ++-- linux-2.6.20.noarch/drivers/char/mmtimer.c | 16 ++++++++-------- linux-2.6.20.noarch/drivers/s390/net/ctcmain.c | 2 +- linux-2.6.20.noarch/drivers/serial/ioc3_serial.c | 4 ++-- linux-2.6.20.noarch/drivers/serial/ioc4_serial.c | 4 ++-- linux-2.6.20.noarch/include/asm-powerpc/spinlock.h | 8 ++++---- linux-2.6.20.noarch/net/mac80211/ieee80211.c | 6 +++--- 30 files changed, 75 insertions(+), 75 deletions(-) Index: linux-2.6-warnings-inline.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-warnings-inline.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-warnings-inline.patch 16 Apr 2007 21:28:37 -0000 1.5 +++ linux-2.6-warnings-inline.patch 3 May 2007 21:08:58 -0000 1.6 @@ -488,52 +488,6 @@ { stream_t *dma = &vortex->dma_wt[wtdma]; int temp; ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c~ 2007-04-04 19:31:32.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-04 19:31:51.000000000 -0400 -@@ -543,7 +543,7 @@ static u32 ipw_read_restricted(struct ip - return __ipw_read_restricted(__LINE__, priv, reg); - } - --static void inline _ipw_write_restricted(struct ipw_priv *priv, -+static inline void _ipw_write_restricted(struct ipw_priv *priv, - u32 reg, u32 value) - { - _ipw_write32(priv, reg, value); -@@ -640,7 +640,7 @@ static void ipw_set_bits_restricted_reg( - #define _ipw_set_bits_mask_restricted_reg(priv, reg, bits, mask) \ - _ipw_write_restricted_reg( \ - priv, reg, ((_ipw_read_restricted_reg(priv, reg) & mask) | bits)) --static void inline __ipw_set_bits_mask_restricted_reg(u32 line, struct ipw_priv -+static inline void __ipw_set_bits_mask_restricted_reg(u32 line, struct ipw_priv - *priv, u32 reg, - u32 bits, u32 mask) - { ---- linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c~ 2007-04-04 19:31:53.000000000 -0400 -+++ linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-04-04 19:32:15.000000000 -0400 -@@ -6626,12 +6626,12 @@ struct ipw_status_code { - const char *reason; - }; - --static void inline average_init(struct average *avg) -+static inline void average_init(struct average *avg) - { - memset(avg, 0, sizeof(*avg)); - } - --static void inline average_add(struct average *avg, s16 val) -+static inline void average_add(struct average *avg, s16 val) - { - avg->sum -= avg->entries[avg->pos]; - avg->sum += val; -@@ -6642,7 +6642,7 @@ static void inline average_add(struct av - } - } - --static s16 inline average_value(struct average *avg) -+static inline s16 average_value(struct average *avg) - { - if (!unlikely(avg->init)) { - if (avg->pos) --- linux-2.6.20.noarch/net/mac80211/ieee80211.c~ 2007-04-04 19:32:30.000000000 -0400 +++ linux-2.6.20.noarch/net/mac80211/ieee80211.c 2007-04-04 19:32:51.000000000 -0400 @@ -1045,7 +1045,7 @@ ieee80211_tx_h_ps_buf(struct ieee80211_t --- git-iwlwifi-fixes.patch DELETED --- --- linux-2.6-zd1211rw-mac80211-queue-limit.patch DELETED --- From fedora-cvs-commits at redhat.com Fri May 4 06:36:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 02:36:53 -0400 Subject: rpms/system-config-services/devel .cvsignore, 1.32, 1.33 sources, 1.42, 1.43 system-config-services.spec, 1.43, 1.44 Message-ID: <200705040636.l446arVQ013432@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-services/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13415 Modified Files: .cvsignore sources system-config-services.spec Log Message: pick up updated translations (#223447) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 25 Apr 2007 14:15:54 -0000 1.32 +++ .cvsignore 4 May 2007 06:36:50 -0000 1.33 @@ -1 +1 @@ -system-config-services-0.9.7.tar.bz2 +system-config-services-0.9.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 25 Apr 2007 14:15:54 -0000 1.42 +++ sources 4 May 2007 06:36:50 -0000 1.43 @@ -1 +1 @@ -52db18a9cf62d1d2e77e437c7e807e7e system-config-services-0.9.7.tar.bz2 +339ba85591ec33c32143ff83e90469ca system-config-services-0.9.8.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- system-config-services.spec 25 Apr 2007 14:15:54 -0000 1.43 +++ system-config-services.spec 4 May 2007 06:36:50 -0000 1.44 @@ -1,7 +1,7 @@ # -*- RPM-SPEC -*- Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.9.7 +Version: 0.9.8 Release: 1%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/services # We are upstream, thus the source is only available from within this source @@ -78,6 +78,9 @@ %{_mandir}/*/system-config-services.8* %changelog +* Fri May 04 2007 Nils Philippsen - 0.9.8 +- pick up updated translations (#223447) + * Wed Apr 25 2007 Nils Philippsen - 0.9.7 - pick up updated translations - work around issues with UTF-8 in translatable strings (#232809) From fedora-cvs-commits at redhat.com Fri May 4 06:37:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 02:37:31 -0400 Subject: rpms/system-config-services/devel system-config-services.spec, 1.44, 1.45 Message-ID: <200705040637.l446bVJM013456@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-services/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13442 Modified Files: system-config-services.spec Log Message: Resolves: #223447 Index: system-config-services.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- system-config-services.spec 4 May 2007 06:36:50 -0000 1.44 +++ system-config-services.spec 4 May 2007 06:37:29 -0000 1.45 @@ -515,5 +515,3 @@ * Tue May 15 2001 Tim Powers - Initial build. - - From fedora-cvs-commits at redhat.com Fri May 4 08:51:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 04:51:57 -0400 Subject: rpms/dovecot/FC-5 dovecot-1.0.beta8-CVE-2007-2231.patch, NONE, 1.1 dovecot.spec, 1.54, 1.55 Message-ID: <200705040851.l448pvkb017049@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/dovecot/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17032 Modified Files: dovecot.spec Added Files: dovecot-1.0.beta8-CVE-2007-2231.patch Log Message: * Fri Mar 02 2007 Tomas Janousek - 1.0-0.beta8.4.fc5 - a little master login fix (#224925) - fix for CVE-2007-2231 (#238440) dovecot-1.0.beta8-CVE-2007-2231.patch: mbox-storage.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE dovecot-1.0.beta8-CVE-2007-2231.patch --- --- dovecot-1.0.beta8/src/lib-storage/index/mbox/mbox-storage.c.CVE-2007-2231 2006-05-12 11:10:22.000000000 +0200 +++ dovecot-1.0.beta8/src/lib-storage/index/mbox/mbox-storage.c 2007-05-04 10:43:46.000000000 +0200 @@ -695,6 +695,11 @@ mail_storage_clear_error(_storage); + if (!mbox_is_valid_existing_name(_storage, name)) { + mail_storage_set_error(_storage, "Invalid mailbox name"); + return NULL; + } + if (input != NULL) return mbox_mailbox_open_stream(storage, name, input, flags); @@ -705,11 +710,6 @@ return mbox_open(storage, "INBOX", flags); } - if (!mbox_is_valid_existing_name(_storage, name)) { - mail_storage_set_error(_storage, "Invalid mailbox name"); - return NULL; - } - path = mbox_get_path(istorage, name); if (stat(path, &st) == 0) { if (S_ISDIR(st.st_mode)) { Index: dovecot.spec =================================================================== RCS file: /cvs/dist/rpms/dovecot/FC-5/dovecot.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- dovecot.spec 2 Mar 2007 12:04:55 -0000 1.54 +++ dovecot.spec 4 May 2007 08:51:55 -0000 1.55 @@ -31,6 +31,7 @@ # Patches 500+ from upstream fixes Patch500: dovecot-1.0.beta8-master-login-fix.patch +Patch501: dovecot-1.0.beta8-CVE-2007-2231.patch URL: http://www.dovecot.org/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -79,6 +80,7 @@ %patch106 -p1 -b .mkcert-paths %patch107 -p1 -b .file-cache-bof %patch500 -p1 -b .master-login-fix +%patch501 -p1 -b .CVE-2007-2231 %build rm -f ./configure @@ -221,6 +223,7 @@ %changelog * Fri Mar 02 2007 Tomas Janousek - 1.0-0.beta8.4.fc5 - a little master login fix (#224925) +- fix for CVE-2007-2231 (#238440) * Thu Dec 21 2006 Tomas Janousek - 1.0-0.beta8.3.fc5 - fixed default paths in the example mkcert.sh to match configuration From fedora-cvs-commits at redhat.com Fri May 4 08:52:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 04:52:08 -0400 Subject: rpms/tetex/devel tetex-3.0-badscript.patch, 1.1, 1.2 tetex.spec, 1.109, 1.110 Message-ID: <200705040852.l448q8Ss017109@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/tetex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17042 Modified Files: tetex-3.0-badscript.patch tetex.spec Log Message: - fix dvipdft and xdvizilla scripts (#238761) tetex-3.0-badscript.patch: dviljk/dvihp | 4 +--- dvipdfm/dvipdft | 7 +------ kpathsea/mktexlsr | 5 ++--- kpathsea/mktexmf | 18 ++++++++++-------- tetex/allcm | 7 +------ tetex/fmtutil | 4 +--- tetex/texconfig | 4 +--- tetex/texlinks | 12 +++++------- tetex/updmap | 4 ++-- xdvik/xdvizilla | 2 +- 10 files changed, 25 insertions(+), 42 deletions(-) Index: tetex-3.0-badscript.patch =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex-3.0-badscript.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-3.0-badscript.patch 10 Feb 2005 20:29:52 -0000 1.1 +++ tetex-3.0-badscript.patch 4 May 2007 08:52:06 -0000 1.2 @@ -231,6 +231,18 @@ quoteit() { +@@ -91,11 +91,6 @@ + exit 1 + ' 1 2 3 7 13 15 + +-mkdir "$tmpdir" || { +- echo "$progname: failed to create temp directory." >&2 +- exit 1 +-} +- + # if outBase contains a /, we might need to create a directory + case $outBase in + */*) --- tetex-src-3.0/texk/xdvik/xdvizilla.badscript 2004-02-25 08:08:56.000000000 +0900 +++ tetex-src-3.0/texk/xdvik/xdvizilla 2005-02-07 15:31:32.590139429 +0900 @@ -61,7 +61,7 @@ @@ -238,7 +250,7 @@ ### create a temporary directory only read/writable by user -TMP_DIR=${TMP-/tmp}/$progname.$$ -+TMP_DIR=`mktmp -d ${TMP-/tmp}/$progname.XXXXXX` ++TMP_DIR=`mktemp -d ${TMP-/tmp}/$progname.XXXXXX` (umask 077; mkdir "$TMP_DIR") || do_abort "Could not create directory \`$TMP_DIR'" if [ $# -gt 1 -a "x$1" = "x-no-rm" ]; then Index: tetex.spec =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- tetex.spec 16 Apr 2007 08:41:55 -0000 1.109 +++ tetex.spec 4 May 2007 08:52:06 -0000 1.110 @@ -11,7 +11,7 @@ Summary: The TeX text formatting system. Name: tetex Version: 3.0 -Release: 39%{?dist} +Release: 40%{?dist} License: distributable Group: Applications/Publishing Requires: tmpwatch, dialog, ed @@ -865,6 +865,9 @@ %defattr(-,root,root) %changelog +* Fri May 4 2007 Jindrich Novy 3.0-40 +- fix dvipdft and xdvizilla scripts (#238761) + * Mon Apr 16 2007 Jindrich Novy 3.0-39 - mark map files as configs (#143661) From fedora-cvs-commits at redhat.com Fri May 4 11:44:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 07:44:49 -0400 Subject: rpms/procps/FC-6 procps-3.2.7-ps-plussort.patch, NONE, 1.1 procps-3.2.7-ps-stime.patch, 1.1, 1.2 procps.spec, 1.61, 1.62 Message-ID: <200705041144.l44BinTv020072@cvs.devel.redhat.com> Author: tsmetana Update of /cvs/dist/rpms/procps/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20052 Modified Files: procps-3.2.7-ps-stime.patch procps.spec Added Files: procps-3.2.7-ps-plussort.patch Log Message: fix #208217 ps and + in sort procps-3.2.7-ps-plussort.patch: sortformat.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE procps-3.2.7-ps-plussort.patch --- --- procps-3.2.7/ps/sortformat.c.old 2007-05-04 10:39:58.000000000 +0200 +++ procps-3.2.7/ps/sortformat.c 2007-05-04 10:40:46.000000000 +0200 @@ -325,7 +325,7 @@ if(*spec == '-'){ reverse = 1; spec++; - } + }else if (*spec == '+') spec++; fs = search_format_array(spec); if(fs){ sort_node *thisnode; procps-3.2.7-ps-stime.patch: common.h | 1 + global.c | 20 ++++++++++++++++++-- output.c | 2 -- 3 files changed, 19 insertions(+), 4 deletions(-) Index: procps-3.2.7-ps-stime.patch =================================================================== RCS file: /cvs/dist/rpms/procps/FC-6/procps-3.2.7-ps-stime.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- procps-3.2.7-ps-stime.patch 26 Apr 2007 11:59:06 -0000 1.1 +++ procps-3.2.7-ps-stime.patch 4 May 2007 11:44:47 -0000 1.2 @@ -42,7 +42,7 @@ set_personality(); - + int fd; -+ char *buf[BUFFSIZE]; ++ char buf[BUFFSIZE]; + const char *b; + + /* get boot time from /proc/stat */ Index: procps.spec =================================================================== RCS file: /cvs/dist/rpms/procps/FC-6/procps.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- procps.spec 26 Apr 2007 11:59:06 -0000 1.61 +++ procps.spec 4 May 2007 11:44:47 -0000 1.62 @@ -1,7 +1,7 @@ Summary: System and process monitoring utilities. Name: procps Version: 3.2.7 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/System Source: http://procps.sourceforge.net/procps-%{version}.tar.gz @@ -54,6 +54,8 @@ Patch25: procps-3.2.7-sysctl-tmpname.patch # 222251 - STIME can jitter by one second Patch26: procps-3.2.7-ps-stime.patch +#208217 - command "ps jax --sort=uid,-ppid,+pid" fails +Patch27: procps-3.2.7-ps-plussort.patch BuildRequires: ncurses-devel @@ -105,6 +107,7 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 +%patch27 -p1 cp %SOURCE1 . @@ -142,6 +145,9 @@ %attr(0644,root,root) %{_mandir}/man5/* %changelog +* Fri May 04 2007 Tomas Smetana 3.2.7-10 +- fix #208217 - ps does not accept '+' in sort specifier + * Thu Apr 26 2007 Tomas Smetana 3.2.7-9 - fix #183029 - watch ignores multibyte characters - fix #222251 - STIME column can jitter From fedora-cvs-commits at redhat.com Fri May 4 11:46:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 07:46:08 -0400 Subject: rpms/procps/FC-5 procps-3.2.7-ps-plussort.patch, NONE, 1.1 procps-3.2.7-ps-stime.patch, 1.1, 1.2 procps.spec, 1.52, 1.53 Message-ID: <200705041146.l44Bk84c020114@cvs.devel.redhat.com> Author: tsmetana Update of /cvs/dist/rpms/procps/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20096 Modified Files: procps-3.2.7-ps-stime.patch procps.spec Added Files: procps-3.2.7-ps-plussort.patch Log Message: fix #208217 ps and + in sort procps-3.2.7-ps-plussort.patch: sortformat.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE procps-3.2.7-ps-plussort.patch --- --- procps-3.2.7/ps/sortformat.c.old 2007-05-04 10:39:58.000000000 +0200 +++ procps-3.2.7/ps/sortformat.c 2007-05-04 10:40:46.000000000 +0200 @@ -325,7 +325,7 @@ if(*spec == '-'){ reverse = 1; spec++; - } + }else if (*spec == '+') spec++; fs = search_format_array(spec); if(fs){ sort_node *thisnode; procps-3.2.7-ps-stime.patch: common.h | 1 + global.c | 20 ++++++++++++++++++-- output.c | 2 -- 3 files changed, 19 insertions(+), 4 deletions(-) Index: procps-3.2.7-ps-stime.patch =================================================================== RCS file: /cvs/dist/rpms/procps/FC-5/procps-3.2.7-ps-stime.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- procps-3.2.7-ps-stime.patch 30 Apr 2007 14:07:43 -0000 1.1 +++ procps-3.2.7-ps-stime.patch 4 May 2007 11:46:06 -0000 1.2 @@ -42,7 +42,7 @@ set_personality(); - + int fd; -+ char *buf[BUFFSIZE]; ++ char buf[BUFFSIZE]; + const char *b; + + /* get boot time from /proc/stat */ Index: procps.spec =================================================================== RCS file: /cvs/dist/rpms/procps/FC-5/procps.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- procps.spec 30 Apr 2007 14:12:19 -0000 1.52 +++ procps.spec 4 May 2007 11:46:06 -0000 1.53 @@ -1,7 +1,7 @@ Summary: System and process monitoring utilities. Name: procps Version: 3.2.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System Source: http://procps.sourceforge.net/procps-%{version}.tar.gz @@ -51,6 +51,8 @@ Patch25: procps-3.2.7-sysctl-tmpname.patch # 222251 - STIME can jitter by one second Patch26: procps-3.2.7-ps-stime.patch +#208217 - command "ps jax --sort=uid,-ppid,+pid" fails +Patch27: procps-3.2.7-ps-plussort.patch BuildRequires: ncurses-devel @@ -102,6 +104,7 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 +%patch27 -p1 cp %SOURCE1 . @@ -139,6 +142,9 @@ %attr(0644,root,root) %{_mandir}/man5/* %changelog +* Fri May 04 2007 Tomas Smetana 3.2.7-2 +- fix #208217 - ps does not accept '+' in sort specifier + * Mon Apr 30 2007 Tomas Smetana 3.2.7-1 - new upstream version - remove unused patches From fedora-cvs-commits at redhat.com Fri May 4 13:20:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 09:20:31 -0400 Subject: rpms/policycoreutils/devel .cvsignore, 1.151, 1.152 policycoreutils-rhat.patch, 1.302, 1.303 policycoreutils.spec, 1.410, 1.411 sources, 1.156, 1.157 Message-ID: <200705041320.l44DKVPW021965@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21946 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Tue May 4 2007 Dan Walsh 2.0.16-1 - Updated version of policycoreutils * Merged support for modifying the prefix via semanage from Dan Walsh. - Fixed genhomedircon to find homedirs correctly. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- .cvsignore 1 May 2007 13:44:29 -0000 1.151 +++ .cvsignore 4 May 2007 13:20:28 -0000 1.152 @@ -149,3 +149,4 @@ policycoreutils-2.0.13.tgz policycoreutils-2.0.14.tgz policycoreutils-2.0.15.tgz +policycoreutils-2.0.16.tgz policycoreutils-rhat.patch: Makefile | 2 +- audit2allow/Makefile | 3 ++- restorecon/restorecon.c | 15 +++++++++++---- restorecond/restorecond.c | 12 +++++++----- scripts/genhomedircon | 2 +- semanage/seobject.py | 10 +++++++--- 6 files changed, 29 insertions(+), 15 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- policycoreutils-rhat.patch 1 May 2007 13:44:29 -0000 1.302 +++ policycoreutils-rhat.patch 4 May 2007 13:20:29 -0000 1.303 @@ -114,18 +114,18 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.14/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2007-01-16 15:08:21.000000000 -0500 -+++ policycoreutils-2.0.14/semanage/semanage 2007-05-01 09:31:57.000000000 -0400 -@@ -279,7 +279,7 @@ - - if object == "user": - rlist = roles.split() -- OBJECT.modify(target, rlist, selevel, serange) -+ OBJECT.modify(target, rlist, selevel, serange, prefix) - - if object == "port": - OBJECT.modify(target, proto, serange, setype) +diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.14/scripts/genhomedircon +--- nsapolicycoreutils/scripts/genhomedircon 2007-04-25 11:08:44.000000000 -0400 ++++ policycoreutils-2.0.14/scripts/genhomedircon 2007-05-04 09:14:57.000000000 -0400 +@@ -302,7 +302,7 @@ + + regex = re.sub("\(\/\.\*\)\?", "", regex) + regex = regex + "/*$" +- if re.search(home, regex, 0): ++ if re.search(regex,home, 0): + return 1 + except: + continue diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.14/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2007-04-12 12:43:06.000000000 -0400 +++ policycoreutils-2.0.14/semanage/seobject.py 2007-04-30 08:57:42.000000000 -0400 Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.410 retrieving revision 1.411 diff -u -r1.410 -r1.411 --- policycoreutils.spec 1 May 2007 13:44:29 -0000 1.410 +++ policycoreutils.spec 4 May 2007 13:20:29 -0000 1.411 @@ -5,7 +5,7 @@ %define sepolgenver 1.0.8 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 2.0.15 +Version: 2.0.16 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -192,6 +192,11 @@ fi %changelog +* Tue May 4 2007 Dan Walsh 2.0.16-1 +- Updated version of policycoreutils + * Merged support for modifying the prefix via semanage from Dan Walsh. +- Fixed genhomedircon to find homedirs correctly. + * Tue May 1 2007 Dan Walsh 2.0.15-1 - Updated version of policycoreutils * Merged po file updates from Dan Walsh. Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- sources 1 May 2007 13:44:29 -0000 1.156 +++ sources 4 May 2007 13:20:29 -0000 1.157 @@ -1,2 +1,2 @@ 4d6e57c7fc396efbcf96b7accab4ba30 sepolgen-1.0.8.tgz -98f81c2aa453561e101c1c9a04d1565b policycoreutils-2.0.15.tgz +19c4fbfa60756282d78012fd8695c821 policycoreutils-2.0.16.tgz From fedora-cvs-commits at redhat.com Fri May 4 13:25:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 09:25:43 -0400 Subject: rpms/libselinux/devel .cvsignore, 1.139, 1.140 libselinux.spec, 1.264, 1.265 sources, 1.141, 1.142 Message-ID: <200705041325.l44DPhkx022221@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22205 Modified Files: .cvsignore libselinux.spec sources Log Message: * Fri May 4 2007 Dan Walsh - 2.0.15-1 - Upgrade to upstream * Merged helpful message when selinuxfs mount fails patch from Dax Kelson. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- .cvsignore 24 Apr 2007 14:48:35 -0000 1.139 +++ .cvsignore 4 May 2007 13:25:41 -0000 1.140 @@ -118,3 +118,4 @@ libselinux-2.0.12.tgz libselinux-2.0.13.tgz libselinux-2.0.14.tgz +libselinux-2.0.15.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- libselinux.spec 24 Apr 2007 14:48:35 -0000 1.264 +++ libselinux.spec 4 May 2007 13:25:41 -0000 1.265 @@ -1,7 +1,7 @@ %define libsepolver 2.0.1-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 2.0.14 +Version: 2.0.15 Release: 1%{?dist} License: Public domain (uncopyrighted) Group: System Environment/Libraries @@ -121,6 +121,10 @@ %{_libdir}/python*/site-packages/selinux.py* %changelog +* Fri May 4 2007 Dan Walsh - 2.0.15-1 +- Upgrade to upstream + * Merged helpful message when selinuxfs mount fails patch from Dax Kelson. + * Tue Apr 24 2007 Dan Walsh - 2.0.14-1 - Upgrade to upstream * Merged build fix for avc_internal.c from Joshua Brindle. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- sources 24 Apr 2007 14:48:35 -0000 1.141 +++ sources 4 May 2007 13:25:41 -0000 1.142 @@ -1 +1 @@ -c7bcec2fc9766fd31a2468f08ac186ac libselinux-2.0.14.tgz +5a767ed95d9375ef3374f1f5a3f0ce1c libselinux-2.0.15.tgz From fedora-cvs-commits at redhat.com Fri May 4 13:37:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 09:37:46 -0400 Subject: rpms/kdenetwork/devel kdenetwork.spec,1.95,1.96 lisarc,1.1,1.2 Message-ID: <200705041337.l44Dbknp022471@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdenetwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22454 Modified Files: kdenetwork.spec lisarc Log Message: nmblookup disable as default Index: kdenetwork.spec =================================================================== RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- kdenetwork.spec 12 Apr 2007 13:38:22 -0000 1.95 +++ kdenetwork.spec 4 May 2007 13:37:44 -0000 1.96 @@ -13,7 +13,7 @@ Name: kdenetwork Version: 3.5.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: K Desktop Environment - Network Applications Epoch: 7 @@ -360,6 +360,9 @@ %endif %changelog +* Fri May 04 2007 Than Ngo - 7:3.5.6-4.fc7 +- nmblookup disable as default + * Thu Apr 12 2007 Than Ngo - 7:3.5.6-3.fc7 - cleanup - apply CVS upstream patches Index: lisarc =================================================================== RCS file: /cvs/dist/rpms/kdenetwork/devel/lisarc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lisarc 9 Sep 2004 06:53:37 -0000 1.1 +++ lisarc 4 May 2007 13:37:44 -0000 1.2 @@ -2,7 +2,7 @@ PingNames = AllowedAddresses = 127.0.0.1/255.255.255.0; BroadcastNetwork = 127.0.0.1/255.255.255.0; -SearchUsingNmblookup = 1 +SearchUsingNmblookup = 0 FirstWait = 30 SecondWait = -1 UpdatePeriod = 150 From fedora-cvs-commits at redhat.com Fri May 4 13:43:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 09:43:52 -0400 Subject: rpms/xinetd/FC-5 xinetd.init,1.10,1.11 xinetd.spec,1.29,1.30 Message-ID: <200705041343.l44DhqXO022677@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/xinetd/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv22658 Modified Files: xinetd.init xinetd.spec Log Message: service xinitd status returns correct value Resolves: #232887 Index: xinetd.init =================================================================== RCS file: /cvs/dist/rpms/xinetd/FC-5/xinetd.init,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xinetd.init 9 Sep 2004 14:59:14 -0000 1.10 +++ xinetd.init 4 May 2007 13:43:50 -0000 1.11 @@ -103,6 +103,7 @@ ;; status) status $prog + RETVAL=$? ;; restart) restart Index: xinetd.spec =================================================================== RCS file: /cvs/dist/rpms/xinetd/FC-5/xinetd.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- xinetd.spec 11 Feb 2006 06:12:00 -0000 1.29 +++ xinetd.spec 4 May 2007 13:43:50 -0000 1.30 @@ -124,6 +124,9 @@ %config(noreplace) /etc/sysconfig/xinetd %changelog +* Fri May 4 2007 Jan Safranek +- service xinitd status returns correct value (#232887) + * Fri Feb 10 2006 Jesse Keating - 2:2.3.13-6.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri May 4 13:44:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 09:44:07 -0400 Subject: rpms/xinetd/FC-6 xinetd.init,1.10,1.11 xinetd.spec,1.40,1.41 Message-ID: <200705041344.l44Di758022706@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/xinetd/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22691 Modified Files: xinetd.init xinetd.spec Log Message: service xinitd status returns correct value Resolves: #232887 Index: xinetd.init =================================================================== RCS file: /cvs/dist/rpms/xinetd/FC-6/xinetd.init,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xinetd.init 9 Sep 2004 14:59:14 -0000 1.10 +++ xinetd.init 4 May 2007 13:44:05 -0000 1.11 @@ -103,6 +103,7 @@ ;; status) status $prog + RETVAL=$? ;; restart) restart Index: xinetd.spec =================================================================== RCS file: /cvs/dist/rpms/xinetd/FC-6/xinetd.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- xinetd.spec 1 Oct 2006 20:21:29 -0000 1.40 +++ xinetd.spec 4 May 2007 13:44:05 -0000 1.41 @@ -102,6 +102,9 @@ %{_mandir}/*/* %changelog +* Fri May 4 2007 Jan Safranek +- service xinitd status returns correct value (#232887) + * Sun Oct 01 2006 Jesse Keating - 2:2.3.14-8 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From fedora-cvs-commits at redhat.com Fri May 4 13:44:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 09:44:18 -0400 Subject: rpms/xinetd/devel xinetd.init,1.10,1.11 xinetd.spec,1.43,1.44 Message-ID: <200705041344.l44DiIXn022735@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/xinetd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22720 Modified Files: xinetd.init xinetd.spec Log Message: service xinitd status returns correct value Resolves: #232887 Index: xinetd.init =================================================================== RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.init,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xinetd.init 9 Sep 2004 14:59:14 -0000 1.10 +++ xinetd.init 4 May 2007 13:44:16 -0000 1.11 @@ -103,6 +103,7 @@ ;; status) status $prog + RETVAL=$? ;; restart) restart Index: xinetd.spec =================================================================== RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- xinetd.spec 4 Dec 2006 16:56:23 -0000 1.43 +++ xinetd.spec 4 May 2007 13:44:16 -0000 1.44 @@ -104,6 +104,9 @@ %{_mandir}/*/* %changelog +* Fri May 4 2007 Jan Safranek +- service xinitd status returns correct value (#232887) + * Mon Dec 4 2006 Thomas Woerner - 2:2.3.14-11 - tcp_wrappers has a new devel and libs sub package, therefore changing build requirement for tcp_wrappers to tcp_wrappers-devel From fedora-cvs-commits at redhat.com Fri May 4 14:48:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 10:48:49 -0400 Subject: rpms/kernel-xen-2.6/devel .cvsignore, 1.4.2.1, 1.4.2.2 kernel-xen.spec, 1.20.2.5, 1.20.2.6 sources, 1.4.2.1, 1.4.2.2 xen-version-strings.patch, 1.2.2.1, 1.2.2.2 Message-ID: <200705041448.l44Emnkh024944@cvs.devel.redhat.com> Author: ehabkost Update of /cvs/dist/rpms/kernel-xen-2.6/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24909 Modified Files: Tag: private-ehabkost-xen-3_0_5-rc4-branch .cvsignore kernel-xen.spec sources xen-version-strings.patch Log Message: Updated Xen Hypervisor tarball to 3.1.0-rc7, hg cset 7041b52471c3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/.cvsignore,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- .cvsignore 1 May 2007 15:24:32 -0000 1.4.2.1 +++ .cvsignore 4 May 2007 14:48:47 -0000 1.4.2.2 @@ -5,3 +5,4 @@ patch-2.6.20.3.bz2 xen-3.0.5-rc3-14934.tar.bz2 xen-3.0.5-rc4-1668299c0ea4.tar.bz2 +xen-3.1.0-rc7-7041b52471c3.tar.bz2 Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v retrieving revision 1.20.2.5 retrieving revision 1.20.2.6 diff -u -r1.20.2.5 -r1.20.2.6 --- kernel-xen.spec 2 May 2007 15:38:56 -0000 1.20.2.5 +++ kernel-xen.spec 4 May 2007 14:48:47 -0000 1.20.2.6 @@ -37,8 +37,8 @@ %define make_target bzImage %define kernel_image x86 -%define xen_hv_version 3.0.5-rc4 -%define xen_hv_cset 1668299c0ea4 +%define xen_hv_version 3.1.0-rc7 +%define xen_hv_cset 7041b52471c3 %define xen_flags verbose=y crash_debug=y %define xen_target vmlinuz %define xen_image vmlinuz @@ -2011,6 +2011,9 @@ # - tux. %changelog +* Fri May 04 2007 Eduardo Habkost +- Updated Xen Hypervisor tarball to 3.1.0-rc7, hg cset 7041b52471c3 + * Tue May 01 2007 Eduardo Habkost - Updated Xen Hypervisor to 3.0.5-rc4, hg cset 1668299c0ea4 - Added smp and vgetcpu fixes (bug #238015) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/sources,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- sources 1 May 2007 15:24:32 -0000 1.4.2.1 +++ sources 4 May 2007 14:48:47 -0000 1.4.2.2 @@ -5,3 +5,4 @@ 30764d4152c727b8ec7b709ab5464ec3 patch-2.6.20.3.bz2 f8922a14df26193321284bbf90feacac xen-3.0.5-rc3-14934.tar.bz2 132273f958ac0f5f1b209312a066fb66 xen-3.0.5-rc4-1668299c0ea4.tar.bz2 +b73a966a55f3907020a1a29b4e2df64d xen-3.1.0-rc7-7041b52471c3.tar.bz2 xen-version-strings.patch: Makefile | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Index: xen-version-strings.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/xen-version-strings.patch,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- xen-version-strings.patch 1 May 2007 15:24:32 -0000 1.2.2.1 +++ xen-version-strings.patch 4 May 2007 14:48:47 -0000 1.2.2.2 @@ -5,9 +5,9 @@ @@ -2,7 +2,11 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 3 - export XEN_SUBVERSION = 0 --export XEN_EXTRAVERSION ?= .5-rc4$(XEN_VENDORVERSION) -+export XEN_BASEVERSION ?= .5-rc4$(XEN_VENDORVERSION) + export XEN_SUBVERSION = 1 +-export XEN_EXTRAVERSION ?= .0-rc7$(XEN_VENDORVERSION) ++export XEN_BASEVERSION ?= .0-rc7$(XEN_VENDORVERSION) +export XEN_BUILDER ?= +export XEN_BUILDVERSION ?= +export XEN_EXTRAVERSION ?= $(XEN_BASEVERSION)$(XEN_BUILDVERSION) From fedora-cvs-commits at redhat.com Fri May 4 16:40:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 12:40:27 -0400 Subject: rpms/hplip/devel hplip-faxing-with-low-supplies.patch, NONE, 1.1 hplip.spec, 1.125, 1.126 Message-ID: <200705041640.l44GeRsS028280@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28264 Modified Files: hplip.spec Added Files: hplip-faxing-with-low-supplies.patch Log Message: * Fri May 4 2007 Tim Waugh 1.7.2-9 - When faxing, low ink/paper is not a problem (bug #238664). - Resolves: rhbz#238664 hplip-faxing-with-low-supplies.patch: sendfax.py | 2 +- ui/faxsendjobform.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE hplip-faxing-with-low-supplies.patch --- --- hplip-1.7.2/sendfax.py.faxing-with-low-supplies 2007-02-27 22:30:34.000000000 +0000 +++ hplip-1.7.2/sendfax.py 2007-05-04 17:38:44.000000000 +0100 @@ -654,7 +654,7 @@ log.error("Query device error (%s)." % e.msg) dev.error_state = ERROR_STATE_ERROR - if dev.error_state > ERROR_STATE_MAX_OK: + if dev.error_state > ERROR_STATE_MAX_OK and dev.error_state != ERROR_STATE_LOW_SUPPLIES and dev.error_state != ERROR_STATE_LOW_PAPER: log.error("Device is busy or in an error state (code=%d). Please wait for the device to become idle or clear the error and try again." % dev.error_state) sys.exit(1) --- hplip-1.7.2/ui/faxsendjobform.py.faxing-with-low-supplies 2007-02-28 22:35:18.000000000 +0000 +++ hplip-1.7.2/ui/faxsendjobform.py 2007-05-04 17:38:51.000000000 +0100 @@ -544,7 +544,7 @@ QApplication.restoreOverrideCursor() - if self.dev.error_state > ERROR_STATE_MAX_OK: + if self.dev.error_state > ERROR_STATE_MAX_OK and self.dev.error_state != ERROR_STATE_LOW_SUPPLIES and self.dev.error_state != ERROR_STATE_LOW_PAPER: self.FailureUI(self.__tr("Device is busy or in an error state (code=%1)

Please wait for the device to become idle or clear the error and try again.").arg(self.dev.status_code)) return Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- hplip.spec 17 Apr 2007 08:50:36 -0000 1.125 +++ hplip.spec 4 May 2007 16:40:24 -0000 1.126 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 1.7.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -22,6 +22,7 @@ Patch7: hplip-marker-supply.patch Patch8: hplip-libsane.patch Patch9: hplip-media-empty.patch +Patch10: hplip-faxing-with-low-supplies.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires(post): /sbin/service @@ -108,6 +109,9 @@ # Clear the media-empty-error printer state. %patch9 -p1 -b .media-empty +# When faxing, low ink/paper is not a problem (bug #238664). +%patch10 -p1 -b .faxing-with-low-supplies + autoconf # for patch4 %build @@ -283,6 +287,9 @@ exit 0 %changelog +* Fri May 4 2007 Tim Waugh 1.7.2-9 +- When faxing, low ink/paper is not a problem (bug #238664). + * Tue Apr 17 2007 Tim Waugh 1.7.2-8 - Update desktop database on %%postun as well (bug #236163). From fedora-cvs-commits at redhat.com Fri May 4 16:53:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 12:53:09 -0400 Subject: rpms/perl/devel perl.spec,1.115,1.116 Message-ID: <200705041653.l44Gr9gh028527@cvs.devel.redhat.com> Author: rnorwood Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28510 Modified Files: perl.spec Log Message: bump release to -17 Index: perl.spec =================================================================== RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- perl.spec 2 May 2007 15:28:50 -0000 1.115 +++ perl.spec 4 May 2007 16:53:06 -0000 1.116 @@ -20,7 +20,7 @@ Name: perl Version: %{perl_version} -Release: 16.5%{?dist} +Release: 17%{?dist} Epoch: %{perl_epoch} Summary: The Perl programming language Group: Development/Languages @@ -716,7 +716,7 @@ %{_mandir}/man3/Test::Tutorial* %changelog -* Wed Mar 28 2007 Robin Norwood - 4:5.8.8-16.5 +* Fri May 4 2007 Robin Norwood - 4:5.8.8-17 - Includes patch from Ralf Corsepius to split out some more perl modules. - Further split out development related perl modules. - Remove Requires: perl-devel from perl From fedora-cvs-commits at redhat.com Fri May 4 16:54:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 12:54:32 -0400 Subject: rpms/hplip/FC-6 hplip-faxing-with-low-supplies.patch, NONE, 1.1 hplip.spec, 1.108, 1.109 Message-ID: <200705041654.l44GsWs3028721@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28705 Modified Files: hplip.spec Added Files: hplip-faxing-with-low-supplies.patch Log Message: * Fri May 4 2007 Tim Waugh - When faxing, low ink/paper is not a problem (bug #238664). - Resolves: rhbz#238664 hplip-faxing-with-low-supplies.patch: sendfax.py | 2 +- ui/faxsendjobform.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE hplip-faxing-with-low-supplies.patch --- --- hplip-1.7.2/sendfax.py.faxing-with-low-supplies 2007-02-27 22:30:34.000000000 +0000 +++ hplip-1.7.2/sendfax.py 2007-05-04 17:38:44.000000000 +0100 @@ -654,7 +654,7 @@ log.error("Query device error (%s)." % e.msg) dev.error_state = ERROR_STATE_ERROR - if dev.error_state > ERROR_STATE_MAX_OK: + if dev.error_state > ERROR_STATE_MAX_OK and dev.error_state != ERROR_STATE_LOW_SUPPLIES and dev.error_state != ERROR_STATE_LOW_PAPER: log.error("Device is busy or in an error state (code=%d). Please wait for the device to become idle or clear the error and try again." % dev.error_state) sys.exit(1) --- hplip-1.7.2/ui/faxsendjobform.py.faxing-with-low-supplies 2007-02-28 22:35:18.000000000 +0000 +++ hplip-1.7.2/ui/faxsendjobform.py 2007-05-04 17:38:51.000000000 +0100 @@ -544,7 +544,7 @@ QApplication.restoreOverrideCursor() - if self.dev.error_state > ERROR_STATE_MAX_OK: + if self.dev.error_state > ERROR_STATE_MAX_OK and self.dev.error_state != ERROR_STATE_LOW_SUPPLIES and self.dev.error_state != ERROR_STATE_LOW_PAPER: self.FailureUI(self.__tr("Device is busy or in an error state (code=%1)

Please wait for the device to become idle or clear the error and try again.").arg(self.dev.status_code)) return Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- hplip.spec 16 Apr 2007 09:21:02 -0000 1.108 +++ hplip.spec 4 May 2007 16:54:30 -0000 1.109 @@ -21,6 +21,7 @@ Patch6: hplip-libsane.patch Patch7: hplip-media-empty.patch Patch8: hplip-marker-supply.patch +Patch9: hplip-faxing-with-low-supplies.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -97,6 +98,9 @@ # Use marker-supply-low IPP message. %patch8 -p1 -b .marker-supply +# When faxing, low ink/paper is not a problem (bug #238664). +%patch9 -p1 -b .faxing-with-low-supplies + autoconf # for patch4 %build @@ -199,6 +203,9 @@ exit 0 %changelog +* Fri May 4 2007 Tim Waugh +- When faxing, low ink/paper is not a problem (bug #238664). + * Mon Apr 16 2007 Tim Waugh 1.7.2-3 - Added /sbin/service and /sbin/chkconfig requirements for the scriptlets (bug #236445). From fedora-cvs-commits at redhat.com Sat May 5 03:37:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 4 May 2007 23:37:49 -0400 Subject: rpms/anaconda/devel .cvsignore, 1.410, 1.411 anaconda.spec, 1.541, 1.542 sources, 1.535, 1.536 Message-ID: <200705050337.l453bnJg009418@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9392/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.58-1 on branch devel from anaconda-11.2.0.58-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.410 retrieving revision 1.411 diff -u -r1.410 -r1.411 --- .cvsignore 1 May 2007 00:48:11 -0000 1.410 +++ .cvsignore 5 May 2007 03:37:47 -0000 1.411 @@ -1 +1 @@ -anaconda-11.2.0.57.tar.bz2 +anaconda-11.2.0.58.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.541 retrieving revision 1.542 diff -u -r1.541 -r1.542 --- anaconda.spec 1 May 2007 00:48:11 -0000 1.541 +++ anaconda.spec 5 May 2007 03:37:47 -0000 1.542 @@ -1,7 +1,7 @@ %define livearches %{ix86} x86_64 Name: anaconda -Version: 11.2.0.57 +Version: 11.2.0.58 Release: 1 License: GPL Summary: Graphical system installer @@ -142,6 +142,18 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri May 4 2007 Jeremy Katz - 11.2.0.58-1 +- Set preferred rpm color (pnasrat, #235757) +- Add mk-rescueimage.ia64 (prarit, #236221) +- Be smarter about getting pid of iscsiadm (clumens, #223257) +- Relabel all of /var/log (#236774) +- Fixes for appletouch (#238355) +- Fix homedir labeling (#238277) +- Don't traceback in text mode without disks (#238695) +- Fix vncconnect (clumens, #238827) +- Don't eject too soon in kickstart (clumens, #238711, #239002) +- Fix lvm activation/deactivation (pjones, #224635) + * Mon Apr 30 2007 Jeremy Katz - 11.2.0.57-1 - fix build Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.535 retrieving revision 1.536 diff -u -r1.535 -r1.536 --- sources 1 May 2007 00:48:11 -0000 1.535 +++ sources 5 May 2007 03:37:47 -0000 1.536 @@ -1 +1 @@ -04fe73b39eeb8960eaec59a1ae38c2ca anaconda-11.2.0.57.tar.bz2 +efdf27509aa24a64e413705b5536e125 anaconda-11.2.0.58.tar.bz2 From fedora-cvs-commits at redhat.com Sun May 6 17:43:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 6 May 2007 13:43:14 -0400 Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.182,1.183 Message-ID: <200705061743.l46HhEjx031690@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31676 Modified Files: redhat-artwork.spec Log Message: Fix directory ownership issues Index: redhat-artwork.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- redhat-artwork.spec 27 Apr 2007 15:35:14 -0000 1.182 +++ redhat-artwork.spec 6 May 2007 17:43:11 -0000 1.183 @@ -7,7 +7,7 @@ Summary: Artwork for Red Hat default look-and-feel Name: redhat-artwork Version: 5.0.12 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz Source1: post-install-fixup.sh @@ -429,23 +429,25 @@ %defattr(-,root,root) %doc NEWS ChangeLog README COPYING -%{_datadir}/themes +%{_datadir}/themes/* %{_datadir}/gdm/themes/* -%{_datadir}/icons +%{_datadir}/icons/* %ghost %{_datadir}/icons/Bluecurve/icon-theme.cache -%{_datadir}/pixmaps +%{_datadir}/pixmaps/* %{_datadir}/xmms %{?kde:%{_libdir}/kde3} %{?kde:%{_datadir}/apps/kdm/themes/Bluecurve} -%{_libdir}/gtk-2.0 +%{_libdir}/gtk-2.0/2.10.0/engines/* %{_libdir}/%{qtdir} -%dir %{_sysconfdir}/gtk-2.0 %config %{_sysconfdir}/gtk-2.0/gtkrc %dir %{_datadir}/icons/Fedora %{_datadir}/icons/Fedora/* %ghost %{_datadir}/icons/Fedora/icon-theme.cache %changelog +* Sun May 6 2007 Matthias Clasen 5.0.12-8 +- Fix directory ownership issues + * Fri Apr 27 2007 Matthias Clasen 5.0.12-7 - Drop the Bluecurve inheritance again, instead copy the Openoffice.org icons into the Fedora icon theme From fedora-cvs-commits at redhat.com Mon May 7 08:13:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 7 May 2007 04:13:03 -0400 Subject: rpms/man-pages-fr/FC-6 man-pages-fr.spec,1.28,1.29 Message-ID: <200705070813.l478D3OH009844@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/man-pages-fr/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9829 Modified Files: man-pages-fr.spec Log Message: Update Index: man-pages-fr.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-fr/FC-6/man-pages-fr.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- man-pages-fr.spec 13 Nov 2006 07:42:09 -0000 1.28 +++ man-pages-fr.spec 7 May 2007 08:13:01 -0000 1.29 @@ -1,7 +1,7 @@ Summary: French man pages from the Linux Documentation Project Name: man-pages-fr Version: 2.39 -Release: 6%{?dist} +Release: 7%{?dist} License: Distributable Group: Documentation URL: http://manpagesfr.free.fr/ @@ -90,6 +90,8 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{adduser,chpasswd,faillog,groupadd,groupdel,groupmod,grpck,lastlog,newusers,pwck,pwconv,useradd,userdel,usermod}.8 # vim rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{rview,view,vim,vimdiff,vimtutor}.1 +#xawtv +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/xawtv.1 LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/ @@ -99,10 +101,12 @@ %files %defattr(0644,root,root,0755) %doc changements changements.anciens LISEZ_MOI LISEZ_MOI-mansupfr -##%doc Changements Changements.anciens Lisez_moi %{_mandir}/fr/ %changelog +* Mon May 7 2007 Marcela Maslanova 2.39-7 +- Resolves: #215431 + * Mon Oct 13 2006 Marcela Maslanova 2.39-6 - rebuilt From fedora-cvs-commits at redhat.com Mon May 7 14:47:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 7 May 2007 10:47:01 -0400 Subject: rpms/sysklogd/devel sysklogd-1.4.2rh-startFailed.patch, NONE, 1.1 sysklogd-1.4.2rh-dispatcher.patch, 1.1, 1.2 sysklogd.spec, 1.54, 1.55 Message-ID: <200705071447.l47El15w017529@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/sysklogd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17510 Modified Files: sysklogd-1.4.2rh-dispatcher.patch sysklogd.spec Added Files: sysklogd-1.4.2rh-startFailed.patch Log Message: - fix realtime interface - terminate parent of syslogd daemon on SIGCHLD sysklogd-1.4.2rh-startFailed.patch: syslogd.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) --- NEW FILE sysklogd-1.4.2rh-startFailed.patch --- --- sysklogd-1.4.2rh/syslogd.c.startFailed 2007-05-07 15:49:48.000000000 +0200 +++ sysklogd-1.4.2rh/syslogd.c 2007-05-07 15:53:50.000000000 +0200 @@ -788,6 +788,7 @@ void exit_signal_handler(int sig); #ifndef TESTING void doexit(int sig); +void doExitFail(int sig); #endif void init(); void cfline(char *line, register struct filed *f); @@ -945,7 +946,8 @@ dprintf("Checking pidfile.\n"); if (!check_pid(PidFile)) { - signal (SIGTERM, doexit); + signal(SIGTERM, doexit); + signal(SIGCHLD, doExitFail); if (fork()) { /* * Parent process @@ -962,6 +964,7 @@ exit(1); } signal (SIGTERM, SIG_DFL); + signal (SIGCHLD, SIG_DFL); num_fds = getdtablesize(); for (i= 0; i < num_fds; i++) (void) close(i); @@ -2408,6 +2411,13 @@ { exit (0); } + +void doExitFail(sig) + int sig; +{ + exit (1); +} + #endif /* sysklogd-1.4.2rh-dispatcher.patch: Makefile | 10 +- sysklogd-dispatch.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sysklogd-dispatch.h | 64 +++++++++++++++++ sysklogd.8 | 24 ++++++ syslogd.c | 48 +++++++++++-- 5 files changed, 328 insertions(+), 8 deletions(-) Index: sysklogd-1.4.2rh-dispatcher.patch =================================================================== RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd-1.4.2rh-dispatcher.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sysklogd-1.4.2rh-dispatcher.patch 16 Apr 2007 18:15:26 -0000 1.1 +++ sysklogd-1.4.2rh-dispatcher.patch 7 May 2007 14:46:59 -0000 1.2 @@ -1,5 +1,5 @@ ---- sysklogd-1.4.2rh/sysklogd.8.dispatcher 2007-04-16 19:27:44.000000000 +0200 -+++ sysklogd-1.4.2rh/sysklogd.8 2007-04-16 19:27:44.000000000 +0200 +--- sysklogd-1.4.2rh/sysklogd.8.dispatcher 2007-05-03 12:54:59.000000000 +0200 ++++ sysklogd-1.4.2rh/sysklogd.8 2007-05-03 12:54:59.000000000 +0200 @@ -30,6 +30,9 @@ .RB [ " \-s " .I domainlist @@ -46,7 +46,7 @@ There is probably one important consideration when installing this version of syslogd. This version of syslogd is dependent on proper --- /dev/null 2007-04-11 16:01:52.461576228 +0200 -+++ sysklogd-1.4.2rh/sysklogd-dispatch.h 2007-04-16 19:27:44.000000000 +0200 ++++ sysklogd-1.4.2rh/sysklogd-dispatch.h 2007-05-03 12:54:59.000000000 +0200 @@ -0,0 +1,64 @@ +/* sysklogd-dispatch.h -- + * Copyright 2007 Red Hat Inc., Durham, North Carolina. @@ -113,7 +113,7 @@ + +#endif --- sysklogd-1.4.2rh/Makefile.dispatcher 2007-02-26 10:46:08.000000000 +0100 -+++ sysklogd-1.4.2rh/Makefile 2007-04-16 19:30:48.000000000 +0200 ++++ sysklogd-1.4.2rh/Makefile 2007-05-03 12:54:59.000000000 +0200 @@ -10,6 +10,7 @@ INSTALL = /usr/bin/install BINDIR = $(TOPDIR)/sbin @@ -147,8 +147,8 @@ ## Red Hat specific additions --- /dev/null 2007-04-11 16:01:52.461576228 +0200 -+++ sysklogd-1.4.2rh/sysklogd-dispatch.c 2007-04-16 19:27:44.000000000 +0200 -@@ -0,0 +1,185 @@ ++++ sysklogd-1.4.2rh/sysklogd-dispatch.c 2007-05-03 13:07:51.000000000 +0200 +@@ -0,0 +1,190 @@ +/* sysklogd-dispatch.c -- + * Copyright 2007 Red Hat Inc., Durham, North Carolina. + * All Rights Reserved. @@ -232,8 +232,13 @@ + pid = fork(); + switch(pid) { + case 0: // child -+ dup2(disp_pipe[0], 0); -+ close(disp_pipe[0]); ++ /* in case stdin was closed before sockerpair(), ++ disp_pipe[0] --eq 0. It's usual because syslogd ++ run as daemon. */ ++ if( disp_pipe[0] != 0 ) { ++ dup2(disp_pipe[0], 0); ++ close(disp_pipe[0]); ++ } + close(disp_pipe[1]); + setsid(); + execl(config->dispatcher, config->dispatcher, NULL); @@ -334,8 +339,8 @@ + } else + n_errs = 0; +} ---- sysklogd-1.4.2rh/syslogd.c.dispatcher 2007-04-16 19:27:44.000000000 +0200 -+++ sysklogd-1.4.2rh/syslogd.c 2007-04-16 19:27:44.000000000 +0200 +--- sysklogd-1.4.2rh/syslogd.c.dispatcher 2007-05-03 12:54:59.000000000 +0200 ++++ sysklogd-1.4.2rh/syslogd.c 2007-05-03 12:54:59.000000000 +0200 @@ -507,6 +507,8 @@ #endif #include "version.h" Index: sysklogd.spec =================================================================== RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sysklogd.spec 16 Apr 2007 18:15:26 -0000 1.54 +++ sysklogd.spec 7 May 2007 14:46:59 -0000 1.55 @@ -1,7 +1,7 @@ Summary: System logging and kernel message trapping daemons Name: sysklogd Version: 1.4.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.infodrom.org/projects/sysklogd/ @@ -16,6 +16,7 @@ Patch1: sysklogd-1.4.2rh.timezone.patch Patch2: sysklogd-1.4.2rh-includeFacPri.patch Patch3: sysklogd-1.4.2rh-dispatcher.patch +Patch4: sysklogd-1.4.2rh-startFailed.patch Conflicts: logrotate < 3.5.2 Requires: logrotate Requires: bash >= 2.0 @@ -47,6 +48,7 @@ %patch1 -p1 -b .timezone %patch2 -p1 -b .includeFacPri %patch3 -p1 -b .dispatcher +%patch4 -p1 -b .startFailed %build make %{?_smp_mflags} @@ -118,6 +120,10 @@ %{_includedir}/sysklogd/sysklogd-dispatch.h %changelog +* Thu May 03 2007 Peter Vrabec 1.4.2-6 +- fix realtime interface +- terminate parent of syslogd daemon on SIGCHLD + * Mon Apr 16 2007 Peter Vrabec 1.4.2-5 - sysklogd provides new realtime interface (#236356) From fedora-cvs-commits at redhat.com Mon May 7 14:51:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 7 May 2007 10:51:03 -0400 Subject: rpms/SDL/FC-5 SDL.spec,1.38,1.39 Message-ID: <200705071451.l47Ep3dX017667@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/SDL/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17646 Modified Files: SDL.spec Log Message: [tw] - added missing (build) requires for GL and GLU Index: SDL.spec =================================================================== RCS file: /cvs/dist/rpms/SDL/FC-5/SDL.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- SDL.spec 13 Feb 2006 18:46:15 -0000 1.38 +++ SDL.spec 7 May 2007 14:51:01 -0000 1.39 @@ -1,7 +1,7 @@ Summary: A cross-platform multimedia library. Name: SDL Version: 1.2.9 -Release: 5.2.1 +Release: 6 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz Patch0: SDL-1.1.7-byteorder.patch Patch13: SDL-1.2.7-ppc_modes.patch @@ -17,6 +17,7 @@ BuildRequires: nasm arts-devel audiofile-devel BuildRequires: esound-devel alsa-lib-devel BuildRequires: libXext-devel libX11-devel +BuildRequires: libGL-devel libGLU-devel %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -29,6 +30,8 @@ Requires: SDL = %{version}-%{release} alsa-lib-devel Requires: libX11-devel Requires: libXext-devel +Requires: libGL-devel +Requires: libGLU-devel %description devel Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -102,6 +105,9 @@ %{_mandir}/man3/SDL*.3* %changelog +* Mon May 7 2007 Thomas Woerner 1.2.9-6 +- added missing (build) requires for GL and GLU + * Mon Feb 13 2006 Jesse Keating - 1.2.9-5.2.1 - rebump for build order issues during double-long bump From fedora-cvs-commits at redhat.com Mon May 7 21:27:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 7 May 2007 17:27:45 -0400 Subject: rpms/kernel-xen-2.6/devel kernel-2.6.20-i686-xen.config, 1.1, 1.2 kernel-2.6.20-x86_64-xen.config, 1.2, 1.3 Message-ID: <200705072127.l47LRjIn028645@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/kernel-xen-2.6/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28629 Modified Files: kernel-2.6.20-i686-xen.config kernel-2.6.20-x86_64-xen.config Log Message: Turn off kvm modules for xen kernels (two hypervisors at the same time is bad, mmmkay?). Properly resolves bug #234521, which I mistakenly closed after dropping kvm modules from the kernel cvs module, forgetting that we're doing a separate kernel-xen right now... Index: kernel-2.6.20-i686-xen.config =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-i686-xen.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kernel-2.6.20-i686-xen.config 22 Mar 2007 16:01:16 -0000 1.1 +++ kernel-2.6.20-i686-xen.config 7 May 2007 21:27:43 -0000 1.2 @@ -3230,9 +3230,9 @@ CONFIG_PHYSICAL_START=0x1000000 CONFIG_PROC_VMCORE=y CONFIG_CRYPTO_DEV_GEODE=m -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m +# CONFIG_KVM is not set +# CONFIG_KVM_INTEL is not set +# CONFIG_KVM_AMD is not set CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m CONFIG_XEN_PCIDEV_FRONTEND=y Index: kernel-2.6.20-x86_64-xen.config =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-2.6.20-x86_64-xen.config,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kernel-2.6.20-x86_64-xen.config 22 Mar 2007 17:41:32 -0000 1.2 +++ kernel-2.6.20-x86_64-xen.config 7 May 2007 21:27:43 -0000 1.3 @@ -3150,9 +3150,9 @@ CONFIG_MSI_LAPTOP=m # CONFIG_SMSC37B787_WDT is not set CONFIG_W83697HF_WDT=m -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m +# CONFIG_KVM is not set +# CONFIG_KVM_INTEL is not set +# CONFIG_KVM_AMD is not set CONFIG_MTD_ESB2ROM=m CONFIG_MTD_CK804XROM=m CONFIG_XEN_PCIDEV_FRONTEND=y From fedora-cvs-commits at redhat.com Tue May 8 01:51:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 7 May 2007 21:51:55 -0400 Subject: rpms/g-wrap/devel g-wrap.spec,1.37,1.38 Message-ID: <200705080151.l481pthV000711@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/g-wrap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv696 Modified Files: g-wrap.spec Log Message: re-add .la files (#238263) Index: g-wrap.spec =================================================================== RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- g-wrap.spec 18 Apr 2007 02:04:17 -0000 1.37 +++ g-wrap.spec 8 May 2007 01:51:53 -0000 1.38 @@ -1,7 +1,7 @@ Summary: A tool for creating Scheme interfaces to C libraries Name: g-wrap Version: 1.9.6 -Release: 10 +Release: 11 Group: Development/Libraries License: GPL Requires: guile @@ -76,7 +76,6 @@ rm -f %{buildroot}/%{_libdir}/libffi.* sed -i "s|-lffi||g" %{buildroot}/%{_libdir}/pkgconfig/* sed -i "s| - 1.9.6-11 +- re-add .la files (#238263) + * Thu Jan 18 2007 Bill Nottingham - 1.9.6-10 - remove .la files - fix build with -Werror From fedora-cvs-commits at redhat.com Tue May 8 17:28:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 8 May 2007 13:28:18 -0400 Subject: rpms/kexec-tools/devel kdump.init, 1.14, 1.15 kexec-tools.spec, 1.84, 1.85 Message-ID: <200705081728.l48HSIT1021473@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21458 Modified Files: kdump.init kexec-tools.spec Log Message: Adding ability to dump error message from kexec on service start failure Index: kdump.init =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kdump.init 11 Apr 2007 13:53:39 -0000 1.14 +++ kdump.init 8 May 2007 17:28:16 -0000 1.15 @@ -189,13 +189,14 @@ KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+[MmKkGg]@[0-9]\+[MmGgKk]//'` KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} ${KDUMP_COMMANDLINE_APPEND}" - $KEXEC $KEXEC_ARGS $standard_kexec_args \ + KEXEC_OUTPUT=`$KEXEC $KEXEC_ARGS $standard_kexec_args \ --command-line="$KDUMP_COMMANDLINE" \ - --initrd=$kdump_initrd $kdump_kernel 2>/dev/null + --initrd=$kdump_initrd $kdump_kernel 2>&1` if [ $? == 0 ]; then $LOGGER "kexec: loaded kdump kernel" return 0 else + $LOGGER $KEXEC_OUTPUT $LOGGER "kexec: failed to load kdump kernel" return 1 fi Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- kexec-tools.spec 11 Apr 2007 13:53:39 -0000 1.84 +++ kexec-tools.spec 8 May 2007 17:28:16 -0000 1.85 @@ -251,6 +251,9 @@ %doc kexec-kdump-howto.txt %changelog +* Tue May 08 2007 Neil Horman - 1.101-70%{dist} +- Add kexec output in failure on start + * Wed Apr 11 2007 Neil Horman - 1.101-69%{dist} - Fixed up kdump.init to enforce mode 600 on authorized_keys2 (bz 235986) From fedora-cvs-commits at redhat.com Wed May 9 13:08:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 9 May 2007 09:08:41 -0400 Subject: rpms/cups/FC-6 cups-str2348.patch,NONE,1.1 cups.spec,1.329,1.330 Message-ID: <200705091308.l49D8fS3012709@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv12693 Modified Files: cups.spec Added Files: cups-str2348.patch Log Message: * Wed May 9 2007 Tim Waugh 1:1.2.10-6 - Applied fix for rotated PDFs (bug #236753, STR #2348). - Resolves: rhbz#236753 cups-str2348.patch: PSOutputDev.cxx | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) --- NEW FILE cups-str2348.patch --- --- cups-1.2.10/pdftops/PSOutputDev.cxx.str2348 2007-02-05 20:25:50.000000000 +0000 +++ cups-1.2.10/pdftops/PSOutputDev.cxx 2007-05-09 13:20:13.000000000 +0100 @@ -1159,7 +1159,14 @@ } // Tell CUPS pstops filter not to do its own rotation... - writePSFmt("%%cupsRotation: %d\n", pageRotate); + int cups_rotate = 0; + int width = (int)ceil(mediaBox->x2 - mediaBox->x1); + int height = (int)ceil(mediaBox->y2 - mediaBox->y1); + int imgWidth = (int)ceil(cropBox->x2 - cropBox->x1); + + if (width > height && width > imgWidth) cups_rotate = 90; + + writePSFmt("%%cupsRotation: %d\n", cups_rotate); writePSFmt("%%Producer: xpdf/pdftops %s\n", xpdfVersion); xref->getDocInfo(&info); @@ -2511,17 +2518,19 @@ landscape = gFalse; } else { rotate = (360 - state->getRotate()) % 360; + + fprintf(stderr, "DEBUG: Page rotate=%d, width=%d, height=%d, imgWidth=%d, imgHeight=%d\n", + state->getRotate(), width, height, imgWidth, imgHeight); + if (rotate == 0 || rotate == 180) { - if ((width > height && imgWidth < imgHeight) || - (height > width && imgHeight < imgWidth)) { + if (width > height && width > imgWidth) { rotate += 90; landscape = gTrue; } else { landscape = gFalse; } } else { // rotate == 90 || rotate == 270 - if ((width > height && imgWidth < imgHeight) || - (height > width && imgHeight < imgWidth)) { + if (height > width && height > imgWidth) { rotate = 270 - rotate; landscape = gTrue; } else { @@ -2529,6 +2538,7 @@ } } } + writePSFmt("%%%%PageOrientation: %s\n", landscape ? "Landscape" : "Portrait"); writePS("pdfStartPage\n"); Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- cups.spec 25 Apr 2007 17:12:47 -0000 1.329 +++ cups.spec 9 May 2007 13:08:38 -0000 1.330 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2.10 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -49,6 +49,7 @@ Patch23: cups-str2323.patch Patch24: cups-str2109.patch Patch25: cups-usb-paperout.patch +Patch26: cups-str2348.patch Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ @@ -159,6 +160,7 @@ %patch23 -p1 -b .str2323 %patch24 -p1 -b .str2109 %patch25 -p1 -b .usb-paperout +%patch26 -p1 -b .str2348 %if %lspp %patch100 -p1 -b .lspp @@ -442,6 +444,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Wed May 9 2007 Tim Waugh 1:1.2.10-6 +- Applied fix for rotated PDFs (bug #236753, STR #2348). + * Wed Apr 25 2007 Tim Waugh 1:1.2.10-5 - Until bug #236736 is fixed, work around the kernel usblp driver's quirks so that we can detect paper-out conditions. From fedora-cvs-commits at redhat.com Wed May 9 14:58:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 9 May 2007 10:58:49 -0400 Subject: rpms/freeradius/FC-5 freeradius-1.0.1-CVE-2007-2028.patch, NONE, 1.1 freeradius.spec, 1.29, 1.30 Message-ID: <200705091458.l49EwnYG016247@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/freeradius/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv16230 Modified Files: freeradius.spec Added Files: freeradius-1.0.1-CVE-2007-2028.patch Log Message: [tw] - fixed CVE-2007-2028: EAP-TTLS denial of service Resolves: rhbz#236248 freeradius-1.0.1-CVE-2007-2028.patch: ttls.c | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE freeradius-1.0.1-CVE-2007-2028.patch --- --- freeradius-1.0.1/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c.CVE-2007-2028 2004-04-19 22:21:19.000000000 +0200 +++ freeradius-1.0.1/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c 2007-04-25 13:44:00.000000000 +0200 @@ -255,6 +255,7 @@ DEBUG2(" rlm_eap_ttls: Invalid length attribute %d", attr); pairfree(&first); + pairfree(&vp); return NULL; } memcpy(&vp->lvalue, data, vp->length); @@ -270,6 +271,7 @@ DEBUG2(" rlm_eap_ttls: Invalid length attribute %d", attr); pairfree(&first); + pairfree(&vp); return NULL; } memcpy(&vp->lvalue, data, vp->length); @@ -340,6 +342,7 @@ (vp->length > 16)) { DEBUG2(" TTLS: Tunneled challenge has invalid length"); pairfree(&first); + pairfree(&vp); return NULL; } else { @@ -353,6 +356,7 @@ if (challenge[i] != vp->strvalue[i]) { DEBUG2(" TTLS: Tunneled challenge is incorrect"); pairfree(&first); + pairfree(&vp); return NULL; } } Index: freeradius.spec =================================================================== RCS file: /cvs/dist/rpms/freeradius/FC-5/freeradius.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- freeradius.spec 11 Feb 2006 02:45:54 -0000 1.29 +++ freeradius.spec 9 May 2007 14:58:46 -0000 1.30 @@ -1,7 +1,7 @@ Summary: High-performance and highly configurable free RADIUS server. Name: freeradius Version: 1.0.5 -Release: 1.2 +Release: 2%{dist} License: GPL Group: System Environment/Daemons URL: http://www.freeradius.org/ @@ -19,6 +19,7 @@ Patch8: freeradius-1.0.0-samba3.patch Patch10: freeradius-1.0.4-build.patch Patch11: freeradius-1.0.4-realloc-return.patch +Patch12: freeradius-1.0.1-CVE-2007-2028.patch %description The FreeRADIUS Server Project is a high performance and highly configurable @@ -110,6 +111,7 @@ %patch8 -p1 -b .samba3 %patch10 -p1 -b .build %patch11 -p1 -b .realloc-return +%patch12 -p1 -b .CVE-2007-2028 %build @@ -263,6 +265,10 @@ %changelog +* Wed May 9 2007 Thomas Woerner 1.0.5-2.fc5 +- fixed CVE-2007-2028: EAP-TTLS denial of service + Resolves: rhbz#236248 + * Fri Feb 10 2006 Jesse Keating - 1.0.5-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed May 9 15:01:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 9 May 2007 11:01:13 -0400 Subject: rpms/freeradius/FC-6 freeradius-1.0.1-CVE-2007-2028.patch, NONE, 1.1 freeradius.spec, 1.36, 1.37 Message-ID: <200705091501.l49F1DHH016394@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/freeradius/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16370 Modified Files: freeradius.spec Added Files: freeradius-1.0.1-CVE-2007-2028.patch Log Message: [tw] - fixed CVE-2007-2028: EAP-TTLS denial of service Resolves: rhbz#236248 freeradius-1.0.1-CVE-2007-2028.patch: ttls.c | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE freeradius-1.0.1-CVE-2007-2028.patch --- --- freeradius-1.0.1/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c.CVE-2007-2028 2004-04-19 22:21:19.000000000 +0200 +++ freeradius-1.0.1/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c 2007-04-25 13:44:00.000000000 +0200 @@ -255,6 +255,7 @@ DEBUG2(" rlm_eap_ttls: Invalid length attribute %d", attr); pairfree(&first); + pairfree(&vp); return NULL; } memcpy(&vp->lvalue, data, vp->length); @@ -270,6 +271,7 @@ DEBUG2(" rlm_eap_ttls: Invalid length attribute %d", attr); pairfree(&first); + pairfree(&vp); return NULL; } memcpy(&vp->lvalue, data, vp->length); @@ -340,6 +342,7 @@ (vp->length > 16)) { DEBUG2(" TTLS: Tunneled challenge has invalid length"); pairfree(&first); + pairfree(&vp); return NULL; } else { @@ -353,6 +356,7 @@ if (challenge[i] != vp->strvalue[i]) { DEBUG2(" TTLS: Tunneled challenge is incorrect"); pairfree(&first); + pairfree(&vp); return NULL; } } Index: freeradius.spec =================================================================== RCS file: /cvs/dist/rpms/freeradius/FC-6/freeradius.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- freeradius.spec 21 Nov 2006 16:16:05 -0000 1.36 +++ freeradius.spec 9 May 2007 15:01:06 -0000 1.37 @@ -1,7 +1,7 @@ Summary: High-performance and highly configurable free RADIUS server. Name: freeradius Version: 1.1.3 -Release: 1.1 +Release: 2%{dist} License: GPL Group: System Environment/Daemons URL: http://www.freeradius.org/ @@ -22,6 +22,7 @@ Patch10: freeradius-1.1.3-build.patch Patch11: freeradius-1.1.2-no_sql_inc.patch Patch12: freeradius-1.1.3-ldap.patch +Patch13: freeradius-1.0.1-CVE-2007-2028.patch %description The FreeRADIUS Server Project is a high performance and highly configurable @@ -79,6 +80,7 @@ %patch10 -p1 -b .build %patch11 -p1 -b .no_sql_inc %patch12 -p1 -b .ldap +%patch13 -p1 -b .CVE-2007-2028 %build @@ -282,6 +284,10 @@ %changelog +* Wed May 9 2007 Thomas Woerner 1.1.3-2.fc6 +- fixed CVE-2007-2028: EAP-TTLS denial of service + Resolves: rhbz#236248 + * Tue Nov 21 2006 Thomas Woerner 1.1.3-1.1 - fixed ldap code to not use internals, added LDAP_DEPRECATED compile time flag (#210912) From fedora-cvs-commits at redhat.com Wed May 9 15:02:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 9 May 2007 11:02:36 -0400 Subject: rpms/freeradius/devel freeradius-1.0.1-CVE-2007-2028.patch, NONE, 1.1 freeradius.spec, 1.41, 1.42 Message-ID: <200705091502.l49F2aFb016513@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/freeradius/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16497 Modified Files: freeradius.spec Added Files: freeradius-1.0.1-CVE-2007-2028.patch Log Message: [tw] - fixed CVE-2007-2028: EAP-TTLS denial of service Resolves: rhbz#236248 freeradius-1.0.1-CVE-2007-2028.patch: ttls.c | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE freeradius-1.0.1-CVE-2007-2028.patch --- --- freeradius-1.0.1/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c.CVE-2007-2028 2004-04-19 22:21:19.000000000 +0200 +++ freeradius-1.0.1/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c 2007-04-25 13:44:00.000000000 +0200 @@ -255,6 +255,7 @@ DEBUG2(" rlm_eap_ttls: Invalid length attribute %d", attr); pairfree(&first); + pairfree(&vp); return NULL; } memcpy(&vp->lvalue, data, vp->length); @@ -270,6 +271,7 @@ DEBUG2(" rlm_eap_ttls: Invalid length attribute %d", attr); pairfree(&first); + pairfree(&vp); return NULL; } memcpy(&vp->lvalue, data, vp->length); @@ -340,6 +342,7 @@ (vp->length > 16)) { DEBUG2(" TTLS: Tunneled challenge has invalid length"); pairfree(&first); + pairfree(&vp); return NULL; } else { @@ -353,6 +356,7 @@ if (challenge[i] != vp->strvalue[i]) { DEBUG2(" TTLS: Tunneled challenge is incorrect"); pairfree(&first); + pairfree(&vp); return NULL; } } Index: freeradius.spec =================================================================== RCS file: /cvs/dist/rpms/freeradius/devel/freeradius.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- freeradius.spec 9 Mar 2007 11:37:00 -0000 1.41 +++ freeradius.spec 9 May 2007 15:02:34 -0000 1.42 @@ -1,7 +1,7 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius Version: 1.1.5 -Release: 1 +Release: 2 License: GPL Group: System Environment/Daemons URL: http://www.freeradius.org/ @@ -24,6 +24,7 @@ Patch10: freeradius-1.1.3-build.patch Patch11: freeradius-1.1.2-no_sql_inc.patch Patch12: freeradius-1.1.3-ldap.patch +Patch13: freeradius-1.0.1-CVE-2007-2028.patch %description The FreeRADIUS Server Project is a high performance and highly configurable @@ -80,6 +81,7 @@ %patch10 -p1 -b .build %patch11 -p1 -b .no_sql_inc %patch12 -p1 -b .ldap +%patch13 -p1 -b .CVE-2007-2028 %build @@ -283,6 +285,10 @@ %changelog +* Wed May 9 2007 Thomas Woerner 1.1.5-2 +- fixed CVE-2007-2028: EAP-TTLS denial of service + Resolves: rhbz#236248 + * Fri Mar 9 2007 Thomas Woerner 1.1.5-1 - new version 1.1.5 - no /etc/raddb/otppasswd.sample anymore From fedora-cvs-commits at redhat.com Wed May 9 15:08:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 9 May 2007 11:08:44 -0400 Subject: rpms/php/FC-6 php-5.1.6-CVE-2007-1864.patch, NONE, 1.1 php-5.1.6-ftpcrlf.patch, NONE, 1.1 php-5.1.6-soapredir.patch, NONE, 1.1 php.spec, 1.125, 1.126 Message-ID: <200705091508.l49F8iKb016874@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16854 Modified Files: php.spec Added Files: php-5.1.6-CVE-2007-1864.patch php-5.1.6-ftpcrlf.patch php-5.1.6-soapredir.patch Log Message: * Wed May 9 2007 Joe Orton 5.1.6-3.6.fc6 - add security fixes for CVE-2007-1864, CVE-2007-2509, CVE-2007-2510 (#235016) - add README.FastCGI to -cli subpackage (#236555) php-5.1.6-CVE-2007-1864.patch: xml_to_soap.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE php-5.1.6-CVE-2007-1864.patch --- --- php-5.1.6/ext/xmlrpc/libxmlrpc/xml_to_soap.c.cve1864 +++ php-5.1.6/ext/xmlrpc/libxmlrpc/xml_to_soap.c @@ -75,7 +75,7 @@ } struct array_info { - char kids_type[30]; + char kids_type[128]; unsigned long size; /* ... ? */ }; php-5.1.6-ftpcrlf.patch: ftp.c | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE php-5.1.6-ftpcrlf.patch --- CVE-2007-2509 --- php-5.1.6/ext/ftp/ftp.c.ftpcrlf +++ php-5.1.6/ext/ftp/ftp.c @@ -1103,12 +1103,18 @@ int size; char *data; + if (strpbrk(cmd, "\r\n")) { + return 0; + } /* build the output buffer */ if (args && args[0]) { /* "cmd args\r\n\0" */ if (strlen(cmd) + strlen(args) + 4 > FTP_BUFSIZE) { return 0; } + if (strpbrk(args, "\r\n")) { + return 0; + } size = sprintf(ftp->outbuf, "%s %s\r\n", cmd, args); } else { /* "cmd\r\n\0" */ php-5.1.6-soapredir.patch: php_http.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) --- NEW FILE php-5.1.6-soapredir.patch --- CVE-2007-2510 --- php-5.1.6/ext/soap/php_http.c.soapredir +++ php-5.1.6/ext/soap/php_http.c @@ -891,19 +891,20 @@ efree(http_body); efree(loc); if (new_url->scheme == NULL && new_url->path != NULL) { - new_url->scheme = estrdup(phpurl->scheme); - new_url->host = estrdup(phpurl->host); + new_url->scheme = NULL; + new_url->host = phpurl->host ? estrdup(phpurl->host) : NULL; new_url->port = phpurl->port; if (new_url->path && new_url->path[0] != '/') { - char *t = phpurl->path?phpurl->path:"/"; - char *p = strrchr(t, '/'); - char *s = emalloc((p - t) + strlen(new_url->path) + 2); - - strncpy(s, t, (p - t) + 1); - s[(p - t) + 1] = 0; - strcat(s, new_url->path); - efree(new_url->path); - new_url->path = s; + char *t = phpurl->path; + char *p = t ? strrchr(t, '/') : NULL; + if (p) { + char *s = emalloc((p - t) + strlen(new_url->path) + 2); + strncpy(s, t, (p - t) + 1); + s[(p - t) + 1] = 0; + strcat(s, new_url->path); + efree(new_url->path); + new_url->path = s; + } } } phpurl = new_url; Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/FC-6/php.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- php.spec 5 Apr 2007 13:30:42 -0000 1.125 +++ php.spec 9 May 2007 15:08:42 -0000 1.126 @@ -6,7 +6,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php Version: 5.1.6 -Release: 3.5%{?dist} +Release: 3.6%{?dist} License: The PHP License v3.01 Group: Development/Languages URL: http://www.php.net/ @@ -52,6 +52,9 @@ Patch81: php-5.1.6-CVE-2007-0455.patch Patch82: php-5.1.6-CVE-2007-1001.patch Patch83: php-5.1.6-CVE-2007-1718.patch +Patch84: php-5.1.6-CVE-2007-1864.patch +Patch85: php-5.1.6-soapredir.patch +Patch86: php-5.1.6-ftpcrlf.patch BuildRoot: %{_tmppath}/%{name}-root @@ -341,6 +344,9 @@ %patch81 -p1 -b .cve0455 %patch82 -p1 -b .cve1001 %patch83 -p1 -b .cve1718 +%patch84 -p1 -b .cve1864 +%patch85 -p1 -b .soapredir +%patch86 -p1 -b .ftpcrlf # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -636,6 +642,7 @@ %{_bindir}/php %{_bindir}/php-cgi %{_mandir}/man1/php.1* +%doc sapi/cli/README.FastCGI %files devel %defattr(-,root,root) @@ -664,6 +671,10 @@ %files pdo -f files.pdo %changelog +* Wed May 9 2007 Joe Orton 5.1.6-3.6.fc6 +- add security fixes for CVE-2007-1864, CVE-2007-2509, CVE-2007-2510 (#235016) +- add README.FastCGI to -cli subpackage (#236555) + * Thu Apr 5 2007 Joe Orton 5.1.6-3.5.fc6 - add security fixes for CVE-2007-0455, CVE-2007-1001, CVE-2007-1285, CVE-2007-1583, CVE-2007-1718 (#235364) From fedora-cvs-commits at redhat.com Wed May 9 15:20:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 9 May 2007 11:20:34 -0400 Subject: rpms/php/FC-5 php-5.1.6-CVE-2007-1864.patch, NONE, 1.1 php-5.1.6-ftpcrlf.patch, NONE, 1.1 php-5.1.6-soapredir.patch, NONE, 1.1 php.spec, 1.118, 1.119 Message-ID: <200705091520.l49FKYU0017384@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17364 Modified Files: php.spec Added Files: php-5.1.6-CVE-2007-1864.patch php-5.1.6-ftpcrlf.patch php-5.1.6-soapredir.patch Log Message: * Wed May 9 2007 Joe Orton 5.1.6-1.6 - add security fixes for CVE-2007-1864, CVE-2007-2509, CVE-2007-2510 (#235016) php-5.1.6-CVE-2007-1864.patch: xml_to_soap.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE php-5.1.6-CVE-2007-1864.patch --- --- php-5.1.6/ext/xmlrpc/libxmlrpc/xml_to_soap.c.cve1864 +++ php-5.1.6/ext/xmlrpc/libxmlrpc/xml_to_soap.c @@ -75,7 +75,7 @@ } struct array_info { - char kids_type[30]; + char kids_type[128]; unsigned long size; /* ... ? */ }; php-5.1.6-ftpcrlf.patch: ftp.c | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE php-5.1.6-ftpcrlf.patch --- CVE-2007-2509 --- php-5.1.6/ext/ftp/ftp.c.ftpcrlf +++ php-5.1.6/ext/ftp/ftp.c @@ -1103,12 +1103,18 @@ int size; char *data; + if (strpbrk(cmd, "\r\n")) { + return 0; + } /* build the output buffer */ if (args && args[0]) { /* "cmd args\r\n\0" */ if (strlen(cmd) + strlen(args) + 4 > FTP_BUFSIZE) { return 0; } + if (strpbrk(args, "\r\n")) { + return 0; + } size = sprintf(ftp->outbuf, "%s %s\r\n", cmd, args); } else { /* "cmd\r\n\0" */ php-5.1.6-soapredir.patch: php_http.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) --- NEW FILE php-5.1.6-soapredir.patch --- CVE-2007-2510 --- php-5.1.6/ext/soap/php_http.c.soapredir +++ php-5.1.6/ext/soap/php_http.c @@ -891,19 +891,20 @@ efree(http_body); efree(loc); if (new_url->scheme == NULL && new_url->path != NULL) { - new_url->scheme = estrdup(phpurl->scheme); - new_url->host = estrdup(phpurl->host); + new_url->scheme = NULL; + new_url->host = phpurl->host ? estrdup(phpurl->host) : NULL; new_url->port = phpurl->port; if (new_url->path && new_url->path[0] != '/') { - char *t = phpurl->path?phpurl->path:"/"; - char *p = strrchr(t, '/'); - char *s = emalloc((p - t) + strlen(new_url->path) + 2); - - strncpy(s, t, (p - t) + 1); - s[(p - t) + 1] = 0; - strcat(s, new_url->path); - efree(new_url->path); - new_url->path = s; + char *t = phpurl->path; + char *p = t ? strrchr(t, '/') : NULL; + if (p) { + char *s = emalloc((p - t) + strlen(new_url->path) + 2); + strncpy(s, t, (p - t) + 1); + s[(p - t) + 1] = 0; + strcat(s, new_url->path); + efree(new_url->path); + new_url->path = s; + } } } phpurl = new_url; Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/FC-5/php.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- php.spec 5 Apr 2007 13:38:19 -0000 1.118 +++ php.spec 9 May 2007 15:20:28 -0000 1.119 @@ -5,7 +5,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php Version: 5.1.6 -Release: 1.5 +Release: 1.6 License: The PHP License v3.01 Group: Development/Languages URL: http://www.php.net/ @@ -49,6 +49,9 @@ Patch81: php-5.1.6-CVE-2007-0455.patch Patch82: php-5.1.6-CVE-2007-1001.patch Patch83: php-5.1.6-CVE-2007-1718.patch +Patch84: php-5.1.6-CVE-2007-1864.patch +Patch85: php-5.1.6-soapredir.patch +Patch86: php-5.1.6-ftpcrlf.patch BuildRoot: %{_tmppath}/%{name}-root @@ -313,6 +316,9 @@ %patch81 -p1 -b .cve0455 %patch82 -p1 -b .cve1001 %patch83 -p1 -b .cve1718 +%patch84 -p1 -b .cve1864 +%patch85 -p1 -b .soapredir +%patch86 -p1 -b .ftpcrlf # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -611,6 +617,9 @@ %files pdo -f files.pdo %changelog +* Wed May 9 2007 Joe Orton 5.1.6-1.6 +- add security fixes for CVE-2007-1864, CVE-2007-2509, CVE-2007-2510 (#235016) + * Thu Apr 5 2007 Joe Orton 5.1.6-1.5 - add security fixes for CVE-2007-0455, CVE-2007-1001, CVE-2007-1285, CVE-2007-1583, CVE-2007-1718 (#235364) From fedora-cvs-commits at redhat.com Wed May 9 15:39:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 9 May 2007 11:39:48 -0400 Subject: rpms/php/FC-6 php.spec,1.126,1.127 Message-ID: <200705091539.l49Fdmqq018191@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18175 Modified Files: php.spec Log Message: - fix path to FastCGI README Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/FC-6/php.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- php.spec 9 May 2007 15:08:42 -0000 1.126 +++ php.spec 9 May 2007 15:39:46 -0000 1.127 @@ -642,7 +642,7 @@ %{_bindir}/php %{_bindir}/php-cgi %{_mandir}/man1/php.1* -%doc sapi/cli/README.FastCGI +%doc sapi/cgi/README.FastCGI %files devel %defattr(-,root,root) From fedora-cvs-commits at redhat.com Thu May 10 08:11:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 10 May 2007 04:11:37 -0400 Subject: rpms/firefox/FC-6 firefox-1.5-thread-cleanup.patch, NONE, 1.1 firefox.spec, 1.168, 1.169 Message-ID: <200705100811.l4A8BbJA010119@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/firefox/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10103 Modified Files: firefox.spec Added Files: firefox-1.5-thread-cleanup.patch Log Message: Fixed epiphany crash (rhbz#238770, mozbz#379550) firefox-1.5-thread-cleanup.patch: nsThread.cpp | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) --- NEW FILE firefox-1.5-thread-cleanup.patch --- Index: mozilla/xpcom/threads/nsThread.cpp =================================================================== RCS file: /cvsroot/mozilla/xpcom/threads/nsThread.cpp,v retrieving revision 1.58.4.2 diff -u -r1.58.4.2 nsThread.cpp --- mozilla/xpcom/threads/nsThread.cpp 1 Oct 2005 18:43:00 -0000 1.58.4.2 +++ mozilla/xpcom/threads/nsThread.cpp 7 May 2007 19:10:58 -0000 @@ -470,9 +470,17 @@ nsThread::Shutdown() { if (gMainThread) { - // XXX nspr doesn't seem to be calling the main thread's destructor - // callback, so let's help it out: - nsThread::Exit(NS_STATIC_CAST(nsThread*, gMainThread)); + // In most recent versions of NSPR the main thread's destructor + // callback will get called. + // In older versions of NSPR it will not get called, + // (unless we call PR_Cleanup). + // Because of that we: + // - call the function ourselves + // - set the data pointer to NULL to ensure the function will + // not get called again by NSPR + // The PR_SetThreadPrivate call does both of these. + // See also bugs 379550, 362768. + PR_SetThreadPrivate(kIThreadSelfIndex, NULL); nsrefcnt cnt; NS_RELEASE2(gMainThread, cnt); NS_WARN_IF_FALSE(cnt == 0, "Main thread being held past XPCOM shutdown."); Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/FC-6/firefox.spec,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- firefox.spec 13 Mar 2007 09:52:44 -0000 1.168 +++ firefox.spec 10 May 2007 08:11:32 -0000 1.169 @@ -11,7 +11,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.5.0.10 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -66,6 +66,7 @@ # Other Patch102: firefox-1.5-theme-change.patch Patch103: firefox-1.5-ppc64.patch +Patch104: firefox-1.5-thread-cleanup.patch %if %{official_branding} # Required by Mozilla Corporation @@ -172,6 +173,7 @@ %patch102 -p0 -b .theme-change %patch103 -p1 -b .ppc64 +%patch104 -p1 -b .clean # For branding specific patches. @@ -454,6 +456,9 @@ #--------------------------------------------------------------------- %changelog +* Thu May 10 2007 Martin Stransky 1.5.0.10-6 +- Fixed epiphany crash (rhbz#238770, mozbz#379550) + * Tue Mar 13 2007 Martin Stransky 1.5.0.10-5 - Rebuild to get useragent smaller. (#230333) From fedora-cvs-commits at redhat.com Thu May 10 11:16:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 10 May 2007 07:16:08 -0400 Subject: rpms/hplip/FC-6 hplip-unload-traceback.patch, NONE, 1.1 hplip.spec, 1.109, 1.110 Message-ID: <200705101116.l4ABG8NK013361@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13345 Modified Files: hplip.spec Added Files: hplip-unload-traceback.patch Log Message: * Thu May 10 2007 Tim Waugh 1.7.2-4 - Prevent a traceback when unloading a photo card (bug #238617). - Resolves: rhbz#238617 hplip-unload-traceback.patch: scrollfunc.py | 9 +++++++++ 1 files changed, 9 insertions(+) --- NEW FILE hplip-unload-traceback.patch --- --- hplip-1.7.2/ui/scrollfunc.py.unload-traceback 2007-05-10 12:13:17.000000000 +0100 +++ hplip-1.7.2/ui/scrollfunc.py 2007-05-10 12:13:58.000000000 +0100 @@ -176,5 +176,14 @@ self.addControl(widget, str(title)) + def FailureUI(self, error_text): + log.error(str(error_text).replace("", "").replace("", "").replace("

", "")) + QMessageBox.critical(self, + self.caption(), + error_text, + QMessageBox.Ok, + QMessageBox.NoButton, + QMessageBox.NoButton) + def __tr(self,s,c = None): return qApp.translate("DevMgr4",s,c) Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/FC-6/hplip.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- hplip.spec 4 May 2007 16:54:30 -0000 1.109 +++ hplip.spec 10 May 2007 11:16:06 -0000 1.110 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 1.7.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -22,6 +22,7 @@ Patch7: hplip-media-empty.patch Patch8: hplip-marker-supply.patch Patch9: hplip-faxing-with-low-supplies.patch +Patch10: hplip-unload-traceback.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -101,6 +102,9 @@ # When faxing, low ink/paper is not a problem (bug #238664). %patch9 -p1 -b .faxing-with-low-supplies +# Prevent a traceback when unloading a photo card (bug #238617). +%patch10 -p1 -b .unload-traceback + autoconf # for patch4 %build @@ -203,6 +207,9 @@ exit 0 %changelog +* Thu May 10 2007 Tim Waugh 1.7.2-4 +- Prevent a traceback when unloading a photo card (bug #238617). + * Fri May 4 2007 Tim Waugh - When faxing, low ink/paper is not a problem (bug #238664). From fedora-cvs-commits at redhat.com Thu May 10 13:30:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 10 May 2007 09:30:33 -0400 Subject: rpms/ypbind/FC-6 ypbind.init,1.13,1.14 ypbind.spec,1.35,1.36 Message-ID: <200705101330.l4ADUXLS015388@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/ypbind/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15370 Modified Files: ypbind.init ypbind.spec Log Message: - Fixed typo in init script (bz 233459) - Changed init script to look in /etc/yp.conf for the domain name when not already set. (bz 113386) - Reworked init script to eliminate unreasonable hangs when ypbind cannot bind to nis server. (bz 112770) Index: ypbind.init =================================================================== RCS file: /cvs/dist/rpms/ypbind/FC-6/ypbind.init,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ypbind.init 31 Aug 2006 14:13:13 -0000 1.13 +++ ypbind.init 10 May 2007 13:30:30 -0000 1.14 @@ -22,14 +22,16 @@ # Check for and source configuration file otherwise set defaults [ -f /etc/sysconfig/ypbind ] && . /etc/sysconfig/ypbind -[ -z "$NISTIMEOUT" ] && NISTIMEOUT=20 +# NISTIMEOUT should be a multiple of 15 since +# ypwhich has a hardcoded 15sec timeout +[ -z "$NISTIMEOUT" ] && NISTIMEOUT=45 # Check that networking is configured. -[ ${NETWORKING} = "no" ] && exit 0 +[ "${NETWORKING}" = "no" ] && exit 0 selinux_on() { [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || return - echo $"Turning on allow_ypbind SELinux boolean" + #echo $"Turning on allow_ypbind SELinux boolean" setsebool allow_ypbind=1 } @@ -37,11 +39,11 @@ [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || return allow_ypbind=0 . /etc/selinux/config - if [ -e /etc/selinux/${SELINUXTYPE}/modules1/active/booleans.local ]; then + if [ -e /etc/selinux/${SELINUXTYPE}/modules/active/booleans.local ]; then . /etc/selinux/${SELINUXTYPE}/modules/active/booleans.local fi if [ $allow_ypbind == 0 ]; then - echo $"Turning off allow_ypbind SELinux boolean" + #echo $"Turning off allow_ypbind SELinux boolean" setsebool allow_ypbind=$allow_ypbind fi } @@ -49,63 +51,79 @@ start() { DOMAINNAME=`domainname` if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then - if [ -n "$NISDOMAIN" ]; then - action $"Setting NIS domain name $NISDOMAIN: " domainname $NISDOMAIN - else - exit 1 - fi + echo -n $"Setting NIS domain: " + if [ -n "$NISDOMAIN" ]; then + action $"domain is '$NISDOMAIN' " domainname $NISDOMAIN + else # See if the domain is set in config file + NISDOMAIN=`grep "domain" /etc/yp.conf | grep -v ^# | \ + awk '{print $2}'` + if [ -n "$NISDOMAIN" ]; then + action $"domain is '$NISDOMAIN' " \ + domainname $NISDOMAIN + else + action $"domain not found" /bin/false + logger -t ypbind $"domain not found" + return 1 + fi + fi fi - selinux_on - echo -n $"Binding to the NIS domain: " + echo -n $"Starting NIS service: " + selinux_on daemon ypbind $OTHER_YPBIND_OPTS RETVAL=$? echo if [ $RETVAL -ne 0 ]; then selinux_off + logger -t ypbind "failed to start!" return $RETVAL fi + echo -n $"Binding NIS service: " # the following fixes problems with the init scripts continuing # even when we are really not bound yet to a server, and then things # that need NIS fail. - echo -n $"Listening for an NIS domain server." - for (( times = 1; times < $NISTIMEOUT; times++ )); do - /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind && ypwhich > /dev/null 2>&1 + timeout=$NISTIMEOUT + while [ $timeout -gt 0 ]; do + /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind && \ + /usr/bin/ypwhich > /dev/null 2>&1 RETVAL=$? if [ $RETVAL -eq 0 ]; then break; fi - sleep 1 - echo -n "." + echo -n "..." + # ypwhich has a hardcode 15sec timeout + # so subtract that from NISTIMEOUT to + # to see of we should continue to wait + timeout=`expr $timeout - 15` done if [ $RETVAL -eq 0 ]; then - logger -t ypbind "bound to NIS server `ypwhich 2> /dev/null`" + logger -t ypbind \ + "NIS domain: `domainname`, NIS server: `ypwhich 2> /dev/null`" touch /var/lock/subsys/ypbind + success else + logger -t ypbind \ + "NIS server for domain `domainname` is not responding." + failure selinux_off - killproc ypbind - # if we used brute force (like kill -9) we don't want those around - if [ x$(domainname) != x ] ; then - rm -f /var/yp/binding/$(domainname)* - fi - failure "attempting to contact yp server" + RETVAL=100 fi echo return $RETVAL } stop() { - selinux_off - echo -n $"Shutting down NIS services: " + echo -n $"Shutting down NIS service: " killproc ypbind RETVAL=$? if [ $RETVAL -eq 0 ] ; then - rm -f /var/lock/subsys/ypbind - # if we used brute force (like kill -9) we don't want those around - if [ x$(domainname) != x ] ; then - rm -f /var/yp/binding/$(domainname)* - fi + rm -f /var/lock/subsys/ypbind + # if we used brute force (like kill -9) we don't want those around + if [ x$(domainname) != x ] ; then + rm -f /var/yp/binding/$(domainname)* + fi fi echo + selinux_off return $RETVAL } @@ -119,7 +137,8 @@ # See how we were called. case "$1" in start) - start + start + [ $? -eq 100 ] && stop ;; stop) stop Index: ypbind.spec =================================================================== RCS file: /cvs/dist/rpms/ypbind/FC-6/ypbind.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ypbind.spec 1 Dec 2006 21:03:57 -0000 1.35 +++ ypbind.spec 10 May 2007 13:30:30 -0000 1.36 @@ -1,7 +1,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain. Name: ypbind Version: 1.19 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2 @@ -90,6 +90,13 @@ %doc README NEWS %changelog +* Thu May 10 2007 Steve Dickson - 3:1.19-7 +- Fixed typo in init script (bz 233459) +- Changed init script to look in /etc/yp.conf for the + domain name when not already set. (bz 113386) +- Reworked init script to eliminate unreasonable + hangs when ypbind cannot bind to nis server. (bz 112770) + * Fri Dec 1 2006 Steve Dickson - 3:1.19-6 - Fixed leaking ports (bz 217874) - Log all server bindings (bz 217782) From fedora-cvs-commits at redhat.com Thu May 10 14:28:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 10 May 2007 10:28:16 -0400 Subject: rpms/mkinitrd/devel mkinitrd-6.0.9-mdadm.patch, NONE, 1.1 mkinitrd.spec, 1.199, 1.200 Message-ID: <200705101428.l4AESGR5017026@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16996 Modified Files: mkinitrd.spec Added Files: mkinitrd-6.0.9-mdadm.patch Log Message: - add patch to use mdadm instead of raidautorun mkinitrd-6.0.9-mdadm.patch: mkinitrd | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) --- NEW FILE mkinitrd-6.0.9-mdadm.patch --- --- mkinitrd.orig 2007-04-16 17:55:39.000000000 -0400 +++ mkinitrd 2007-05-09 18:22:18.000000000 -0400 @@ -1273,6 +1273,13 @@ mknod $MNTIMAGE/dev/efirtc c 10 136 fi +if [ -n "$raiddevices" ]; then + inst /sbin/mdadm.static "$MNTIMAGE/bin/mdadm" + if [ -f /etc/mdadm.conf ]; then + cp $verbose /etc/mdadm.conf "$MNTIMAGE/etc/mdadm.conf" + fi +fi + # FIXME -- this can really go poorly with clvm or duplicate vg names. # nash should do lvm probing for us and write its own configs. if [ -n "$vg_list" ]; then @@ -1430,8 +1437,7 @@ if [ -n "$raiddevices" ]; then for dev in $raiddevices; do - cp -a /dev/${dev} $MNTIMAGE/dev - emit "raidautorun /dev/${dev}" + emit "mdadm -As --auto=yes --run /dev/${dev}" done fi Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- mkinitrd.spec 16 Apr 2007 22:19:16 -0000 1.199 +++ mkinitrd.spec 10 May 2007 14:28:14 -0000 1.200 @@ -3,10 +3,11 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd Version: 6.0.9 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source0: mkinitrd-%{version}.tar.bz2 +Patch0: mkinitrd-6.0.9-mdadm.patch ExclusiveOs: Linux Prereq: dev @@ -64,6 +65,7 @@ %prep %setup -q -n mkinitrd-%{version} +%patch0 -p0 -b .mdadm %build make LIB=%{_lib} @@ -111,6 +113,9 @@ %{_libdir}/libbdevid.so.* %changelog +* Thu May 10 2007 Peter Jones - 6.0.9-2 +- Use mdadm not raidautorun so that newer metadata is supported (#213586) + * Mon Apr 16 2007 Peter Jones - 6.0.9-1 - Use scsi_wait_scan.ko with scsi storage modules (#220470) - Fix handling of config files with no 'default' line in grubby From fedora-cvs-commits at redhat.com Thu May 10 15:34:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 10 May 2007 11:34:44 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils.spec,1.119,1.120 nfs.init,1.22,1.23 Message-ID: <200705101534.l4AFYivU019752@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19693 Modified Files: nfs-utils.spec nfs.init Log Message: Eliminate timeout on nfsd shutdowns (bz 222001) Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- nfs-utils.spec 16 Mar 2007 16:10:17 -0000 1.119 +++ nfs-utils.spec 10 May 2007 15:34:42 -0000 1.120 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.10 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 # group all 32bit related archs @@ -301,6 +301,9 @@ %endif %changelog +* Thu May 10 2007 Steve Dickson 1.0.10-9 +- Eliminate timeout on nfsd shutdowns (bz 222001) + * Fri Mar 16 2007 Steve Dickson 1.0.10-8 - Stop mount from wasting reserve ports (bz 230969) Index: nfs.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs.init,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- nfs.init 1 Jul 2006 14:07:04 -0000 1.22 +++ nfs.init 10 May 2007 15:34:42 -0000 1.23 @@ -105,7 +105,7 @@ killproc rpc.mountd echo echo -n $"Shutting down NFS daemon: " - killproc nfsd + killproc nfsd -2 echo if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then echo -n $"Shutting down NFS quotas: " From fedora-cvs-commits at redhat.com Thu May 10 17:28:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 10 May 2007 13:28:10 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils-1.0.10-mountd-memleak.patch, NONE, 1.1 nfs-utils.spec, 1.120, 1.121 Message-ID: <200705101728.l4AHSAPQ023418@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv23394 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.0.10-mountd-memleak.patch Log Message: Eliminate memory leak in mountd (bz 239536) nfs-utils-1.0.10-mountd-memleak.patch: client.c | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE nfs-utils-1.0.10-mountd-memleak.patch --- commit 12749181ceaa0711cc857b7639c0a559d5e65197 Author: Steve Dickson Date: Thu May 10 11:54:59 2007 -0400 Close memory leak in mountd Signed-off-by: Steve Dickson diff --git a/support/export/client.c b/support/export/client.c index 33dfdb0..5ffba63 100644 --- a/support/export/client.c +++ b/support/export/client.c @@ -262,6 +262,10 @@ client_compose(struct in_addr addr) name = add_name(name, clp->m_hostname); } } + + if (he != NULL) + free(he); + return name; } Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- nfs-utils.spec 10 May 2007 15:34:42 -0000 1.120 +++ nfs-utils.spec 10 May 2007 17:28:08 -0000 1.121 @@ -51,6 +51,7 @@ Patch81: nfs-utils-1.0.10-mount-fake.patch Patch82: nfs-utils-1.0.10-mount-mtablock.patch Patch83: nfs-utils-1.0.10-mount-reserved-port.patch +Patch84: nfs-utils-1.0.10-mountd-memleak.patch %if %{enablefscache} @@ -124,6 +125,7 @@ %patch81 -p1 %patch82 -p1 %patch83 -p1 +%patch84 -p1 %if %{enablefscache} %patch90 -p1 %endif @@ -303,6 +305,7 @@ %changelog * Thu May 10 2007 Steve Dickson 1.0.10-9 - Eliminate timeout on nfsd shutdowns (bz 222001) +- Eliminate memory leak in mountd (bz 239536) * Fri Mar 16 2007 Steve Dickson 1.0.10-8 - Stop mount from wasting reserve ports (bz 230969) From fedora-cvs-commits at redhat.com Thu May 10 18:53:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 10 May 2007 14:53:08 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils.spec,1.121,1.122 Message-ID: <200705101853.l4AIr8u9025395@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25372 Modified Files: nfs-utils.spec Log Message: - Make sure statd uses correct uid/gid by chowning the /var/lib/nfs/statd with the rpcuser id. (bz 235216) Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- nfs-utils.spec 10 May 2007 17:28:08 -0000 1.121 +++ nfs-utils.spec 10 May 2007 18:53:06 -0000 1.122 @@ -227,6 +227,14 @@ /sbin/chkconfig --add rpcidmapd /sbin/chkconfig --add rpcgssd /sbin/chkconfig --add rpcsvcgssd +# Make sure statd used the correct uid/gid. +if [ -f /var/lock/subsys/nfslock ]; then + /etc/rc.d/init.d/nfslock stop > /dev/null + chown -R rpcuser:rpcuser /var/lib/nfs/statd + /etc/rc.d/init.d/nfslock start > /dev/null +else + chown -R rpcuser:rpcuser /var/lib/nfs/statd +fi %preun if [ "$1" = "0" ]; then @@ -251,6 +259,7 @@ /etc/rc.d/init.d/rpcidmapd condrestart > /dev/null /etc/rc.d/init.d/rpcgssd condrestart > /dev/null /etc/rc.d/init.d/nfs condrestart > /dev/null + /etc/rc.d/init.d/nfslock condrestart > /dev/null fi %triggerpostun -- nfs-server @@ -306,6 +315,8 @@ * Thu May 10 2007 Steve Dickson 1.0.10-9 - Eliminate timeout on nfsd shutdowns (bz 222001) - Eliminate memory leak in mountd (bz 239536) +- Make sure statd uses correct uid/gid by chowning + the /var/lib/nfs/statd with the rpcuser id. (bz 235216) * Fri Mar 16 2007 Steve Dickson 1.0.10-8 - Stop mount from wasting reserve ports (bz 230969) From fedora-cvs-commits at redhat.com Thu May 10 19:17:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 10 May 2007 15:17:33 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils-1.0.10-nfsd-macargs.patch, NONE, 1.1 nfs-utils.spec, 1.122, 1.123 Message-ID: <200705101917.l4AJHXcg025976@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25955 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.0.10-nfsd-macargs.patch Log Message: Correct some sanity checking in rpc.nfsd. (bz 220887) nfs-utils-1.0.10-nfsd-macargs.patch: nfsd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE nfs-utils-1.0.10-nfsd-macargs.patch --- commit 1c84f1f980ed36e95e0bc410a7955c569bf4b4d2 Author: Steve Dickson Date: Thu May 10 15:04:07 2007 -0400 The wrong bit field is being passed to NFSCTL_TCPISSET() during one of the sanity checks in rpc.nfsd. Signed-off-by: Steve Dickson diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c index d0bbfb3..aaf8d29 100644 --- a/utils/nfsd/nfsd.c +++ b/utils/nfsd/nfsd.c @@ -118,7 +118,8 @@ main(int argc, char **argv) fprintf(stderr, "no version specified\n"); exit(1); } - if (NFSCTL_VERISSET(versbits, 4) && !NFSCTL_TCPISSET(versbits)) { + + if (NFSCTL_VERISSET(versbits, 4) && !NFSCTL_TCPISSET(protobits)) { fprintf(stderr, "version 4 requires the TCP protocol\n"); exit(1); } Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- nfs-utils.spec 10 May 2007 18:53:06 -0000 1.122 +++ nfs-utils.spec 10 May 2007 19:17:31 -0000 1.123 @@ -52,6 +52,7 @@ Patch82: nfs-utils-1.0.10-mount-mtablock.patch Patch83: nfs-utils-1.0.10-mount-reserved-port.patch Patch84: nfs-utils-1.0.10-mountd-memleak.patch +Patch85: nfs-utils-1.0.10-nfsd-macargs.patch %if %{enablefscache} @@ -126,6 +127,7 @@ %patch82 -p1 %patch83 -p1 %patch84 -p1 +%patch85 -p1 %if %{enablefscache} %patch90 -p1 %endif @@ -317,6 +319,7 @@ - Eliminate memory leak in mountd (bz 239536) - Make sure statd uses correct uid/gid by chowning the /var/lib/nfs/statd with the rpcuser id. (bz 235216) +- Correct some sanity checking in rpc.nfsd. (bz 220887) * Fri Mar 16 2007 Steve Dickson 1.0.10-8 - Stop mount from wasting reserve ports (bz 230969) From fedora-cvs-commits at redhat.com Fri May 11 11:16:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 11 May 2007 07:16:57 -0400 Subject: rpms/screen/FC-6 screen.spec,1.35,1.36 Message-ID: <200705111116.l4BBGviq012909@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/screen/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv12891 Modified Files: screen.spec Log Message: Update Index: screen.spec =================================================================== RCS file: /cvs/dist/rpms/screen/FC-6/screen.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- screen.spec 15 Feb 2007 13:06:50 -0000 1.35 +++ screen.spec 11 May 2007 11:16:55 -0000 1.36 @@ -1,7 +1,7 @@ Summary: A screen manager that supports multiple logins on one terminal Name: screen Version: 4.0.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL2 Group: Applications/System URL: http://www.gnu.org/software/screen @@ -53,7 +53,8 @@ Patch8: screen-4.0.2-logname.patch # reassign lockscreen to ^aX so its harder to hit by accident -Patch9: screen-4.0.2-lock-shortcut.patch +#Patch9: screen-4.0.2-lock-shortcut.patch +# removed patch, because ^aX was defined for something else before Patch10: screen-4.0.2-lib64.patch Patch11: screen-4.0.2-maxstr.patch Patch12: screen-4.0.3-ipv6.patch @@ -87,7 +88,7 @@ # # %patch7 -p0 -b .args -%patch9 -p1 -b .lock-shortcut +#%patch9 -p1 -b .lock-shortcut %patch10 -p1 -b .lib64 %patch11 -p1 -b .maxstr %patch12 -p1 -b .ipv6 @@ -184,6 +185,10 @@ %config(noreplace) /etc/pam.d/screen %changelog +* Thu Feb 15 2007 Marcela Maslanova - 4.0.3-3.fc6 +- changed bindings ^aX and ^ax back to upstream version. +- Resolves: rhbz#238122 + * Thu Feb 15 2007 Marcela Maslanova - 4.0.3-2 - rebuilt From fedora-cvs-commits at redhat.com Fri May 11 16:02:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 11 May 2007 12:02:00 -0400 Subject: rpms/squirrelmail/FC-6 squirrelmail-1.4.9a-id_plural.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 squirrelmail-1.4.6-japanese-multibyte-view-text.patch, 1.2, 1.3 squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch, 1.1, 1.2 squirrelmail.spec, 1.48, 1.49 squirrelmail-1.4.7-ja-translate.patch, 1.1, NONE squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch, 1.1, NONE squirrelmail-1.4.8-CVE-2006-6142-mailto.patch, 1.1, NONE squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch, 1.1, NONE Message-ID: <200705111602.l4BG203B018168@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/squirrelmail/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18135 Modified Files: .cvsignore sources squirrelmail-1.4.6-japanese-multibyte-view-text.patch squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch squirrelmail.spec Added Files: squirrelmail-1.4.9a-id_plural.patch Removed Files: squirrelmail-1.4.7-ja-translate.patch squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch squirrelmail-1.4.8-CVE-2006-6142-mailto.patch squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch Log Message: * Fri May 11 2007 Martin Bacovsky - 1.4.10a-1 - upgrade to new upstream 1.4.10a - resolves: #239704: CVE-2007-1262 squirrelmail cross-site scripting flaw - resolves: #218297: CVE-2006-6142 Three XSS issues in SquirrelMail squirrelmail-1.4.9a-id_plural.patch: squirrelmail.po | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE squirrelmail-1.4.9a-id_plural.patch --- --- squirrelmail-1.4.9a/locale_tempdir/locale/id_ID/LC_MESSAGES/squirrelmail.po.id_plural 2007-04-17 19:28:49.000000000 +0200 +++ squirrelmail-1.4.9a/locale_tempdir/locale/id_ID/LC_MESSAGES/squirrelmail.po 2007-04-17 19:30:29.000000000 +0200 @@ -4336,7 +4336,6 @@ msgid "%d Minute" msgid_plural "%d Minutes" msgstr[0] "%d Menit" -msgstr[1] "%d Menit" msgid "XP" msgstr "Windows XP" @@ -4613,7 +4612,6 @@ msgid "Login OK: Inbox contains %s message" msgid_plural "Login OK: Inbox contains %s messages" msgstr[0] "BERHASIL masuk: KOTAK POS berisi %s pesan" -msgstr[1] "BERHASIL masuk: KOTAK POS berisi %s pesan" msgid "Width of popup window:" msgstr "Lebar jendela popup:" Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-6/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 11 Sep 2006 09:29:55 -0000 1.17 +++ .cvsignore 11 May 2007 16:01:58 -0000 1.18 @@ -1,2 +1,4 @@ squirrelmail-1.4.8.tar.bz2 all_locales-1.4.7-20060702.tar.bz2 +squirrelmail-1.4.10a.tar.bz2 +all_locales-1.4.9-20070106.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-6/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 11 Aug 2006 19:25:12 -0000 1.17 +++ sources 11 May 2007 16:01:58 -0000 1.18 @@ -1,2 +1,2 @@ -ba3306e4790bbdb10eaccb00195f5107 squirrelmail-1.4.8.tar.bz2 -4b78f4612ef0a68e5a81a818a113497c all_locales-1.4.7-20060702.tar.bz2 +298aaa1811b3fb40a803a6f57b22be20 squirrelmail-1.4.10a.tar.bz2 +eaa0e8835b8d7d451500aad907c22e24 all_locales-1.4.9-20070106.tar.bz2 squirrelmail-1.4.6-japanese-multibyte-view-text.patch: view_text.php | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) Index: squirrelmail-1.4.6-japanese-multibyte-view-text.patch =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-6/squirrelmail-1.4.6-japanese-multibyte-view-text.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- squirrelmail-1.4.6-japanese-multibyte-view-text.patch 9 Jul 2006 20:50:24 -0000 1.2 +++ squirrelmail-1.4.6-japanese-multibyte-view-text.patch 11 May 2007 16:01:58 -0000 1.3 @@ -5,6 +5,7 @@ if (! empty($charset)) $body = charset_decode($charset,$body,false,true); } else { + $ishtml = FALSE; - translateText($body, $wrap_at, $charset); + if($squirrelmail_language != 'ja_JP'){ + translateText($body, $wrap_at, $charset); squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch: mime.php | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) Index: squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-6/squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch 16 Aug 2006 02:07:24 -0000 1.1 +++ squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch 11 May 2007 16:01:58 -0000 1.2 @@ -1,64 +1,6 @@ diff -ruNp squirrelmail-1.4.6.org/functions/mime.php squirrelmail-1.4.6/functions/mime.php --- squirrelmail-1.4.6.org/functions/mime.php 2006-08-15 13:10:40.000000000 +0900 +++ squirrelmail-1.4.6/functions/mime.php 2006-08-15 15:39:53.000000000 +0900 -@@ -249,6 +249,7 @@ function translateText(&$body, $wrap_at, - - require_once(SM_PATH . 'functions/url_parser.php'); - -+ $charset = strtolower($charset); - $body_ary = explode("\n", $body); - for ($i=0; $i < count($body_ary); $i++) { - $line = $body_ary[$i]; -@@ -312,6 +313,14 @@ function formatBody($imap_stream, $messa - } - - $body = ''; -+ if (!$charset_converted) { -+ if ($charset == 'iso-2022-jp' || $charset == 'shift_jis' || $charset == 'euc-jp' || -+ ($squirrelmail_language == 'ja_JP' && -+ ($charset == 'utf-8' || $charset == '' || $charset == 'us-ascii'))) { -+ $body = $languages['ja_JP']['XTRA_CODE']('decode', $body); -+ $charset_converted = true; -+ } -+ } - $urlmailbox = urlencode($mailbox); - $body_message = getEntity($message, $ent_num); - if (($body_message->header->type0 == 'text') || -@@ -319,12 +328,15 @@ function formatBody($imap_stream, $messa - $body = mime_fetch_body ($imap_stream, $id, $ent_num); - $body = decodeBody($body, $body_message->header->encoding); - -- if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && -- function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { -- if (mb_detect_encoding($body) != 'ASCII') { -- $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body); -- } -+ $charset_converted = false; -+ if (strtolower($body_message->header->getParameter('charset')) == 'iso-2022-jp' && -+ isset($languages[$squirrelmail_language]['XTRA_CODE']) && -+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { -+ if (mb_detect_encoding($body) != 'ASCII') { -+ $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body); -+ } - } -+ - $hookResults = do_hook("message_body", $body); - $body = $hookResults[1]; - -@@ -584,6 +596,13 @@ function decodeBody($body, $encoding) { - * str_replace("\r\n", "\n", $body); call. - */ - $body = quoted_printable_decode($body); -+ -+ if ($squirrelmail_language != 'ja_JP') { -+ while (ereg("=n", $body)) { -+ $body = ereg_replace ("=n", '', $body); -+ } -+ } -+ - } elseif ($encoding == 'base64') { - $body = base64_decode($body); - } @@ -2142,13 +2161,14 @@ function SendDownloadHeaders($type0, $ty $isIE6plus = true; } Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-6/squirrelmail.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- squirrelmail.spec 22 Jan 2007 18:03:04 -0000 1.48 +++ squirrelmail.spec 11 May 2007 16:01:58 -0000 1.49 @@ -5,8 +5,8 @@ Summary: SquirrelMail webmail client Name: squirrelmail -Version: 1.4.8 -Release: 4%{?dist} +Version: 1.4.10a +Release: 1%{?dist} License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -14,17 +14,13 @@ Source1: squirrelmail.conf Source2: squirrelmail-splash-fedora.png Source3: squirrelmail-splash-rhel.png -Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.7-20060702.tar.bz2 +Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.9-20070106.tar.bz2 Source5: config_local.php Patch1: squirrelmail-1.4.6-zenkaku-subject-convert.patch Patch2: squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch Patch3: squirrelmail-1.4.6-japanese-multibyte-view-text.patch Patch4: squirrelmail-1.4.6-japanese-multibyte-view-body.patch -Patch5: squirrelmail-1.4.7-ja-translate.patch -# CVE-2006-6142 -Patch100: squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch -Patch101: squirrelmail-1.4.8-CVE-2006-6142-mailto.patch -Patch102: squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch +Patch6: squirrelmail-1.4.9a-id_plural.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -35,13 +31,11 @@ Provides: squirrelmail-i18n %description -SquirrelMail is a standards-based webmail package written in PHP4. It +SquirrelMail is a basic webmail package written in PHP4. It includes built-in pure PHP support for the IMAP and SMTP protocols, and all pages render in pure HTML 4.0 (with no Javascript) for maximum compatibility across browsers. It has very few requirements and is very -easy to configure and install. SquirrelMail has all the functionality -you would want from an email client, including strong MIME support, -address books, and folder manipulation. +easy to configure and install. %prep %setup -q -n squirrelmail-%{version} @@ -50,15 +44,10 @@ %patch3 -p1 %patch4 -p1 -# CVE-2006-6142 -%patch100 -p0 -%patch101 -p0 -%patch102 -p1 - mkdir locale_tempdir cd locale_tempdir tar xfj %SOURCE4 -%patch5 -p2 +%patch6 -p2 %build rm -f plugins/make_archive.pl @@ -259,6 +248,11 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Fri May 11 2007 Martin Bacovsky - 1.4.10a-1 +- upgrade to new upstream 1.4.10a +- resolves: #239704: CVE-2007-1262 squirrelmail cross-site scripting flaw +- resolves: #218297: CVE-2006-6142 Three XSS issues in SquirrelMail + * Mon Jan 22 2007 Warren Togami 1.4.8-4 - Clean up .orig files (#223648) --- squirrelmail-1.4.7-ja-translate.patch DELETED --- --- squirrelmail-1.4.8-CVE-2006-6142-draft_composesess.patch DELETED --- --- squirrelmail-1.4.8-CVE-2006-6142-mailto.patch DELETED --- --- squirrelmail-1.4.8-CVE-2006-6142-mime.php.patch DELETED --- From fedora-cvs-commits at redhat.com Fri May 11 17:38:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 11 May 2007 13:38:18 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils-1.0.10-mountd-etab.patch, NONE, 1.1 nfs-utils.spec, 1.123, 1.124 Message-ID: <200705111738.l4BHcI4a020272@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20256 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.0.10-mountd-etab.patch Log Message: Have mountd hold open etab file to force inode number to change (bz 236823) nfs-utils-1.0.10-mountd-etab.patch: support/export/xtab.c | 6 ++++++ utils/mountd/auth.c | 29 ++++++++++++++++++++--------- utils/mountd/mountd.c | 7 ++++++- utils/mountd/mountd.h | 2 +- 4 files changed, 33 insertions(+), 11 deletions(-) --- NEW FILE nfs-utils-1.0.10-mountd-etab.patch --- commit ec08843916d07c28045398e5b17e7347a8fa0135 Author: Steve Dickson Date: Fri May 11 12:13:06 2007 -0400 nfs-utils: have mountd hold open etab file to force inode number to change This patch changes mountd to hold the etab file open so that when it's changed by exportfs, the inode number should change. We then change auth_reload to reload the file based on whether st_ino is different from the last time it was checked. It also changes auth_reload to maintain a static counter value and return it instead of a timestamp and fixes up get_exportlist accordingly. Finally, it adds some comments to xtab_write to warn people about editing the etab in place. Signed-off-by: Jeff Layton Signed-off-by: Steve Dickson --- nfs-utils-1.0.10/support/export/xtab.c.orig 2007-05-11 12:07:09.258724000 -0400 +++ nfs-utils-1.0.10/support/export/xtab.c 2007-05-11 12:07:39.720637000 -0400 @@ -80,6 +80,12 @@ xtab_export_read(void) return xtab_read(_PATH_ETAB, 1); } +/* + * mountd now keeps an open fd for the etab at all times to make sure that the + * inode number changes when the xtab_export_write is done. If you change the + * routine below such that the files are edited in place, then you'll need to + * fix the auth_reload logic as well... + */ static int xtab_write(char *xtab, char *xtabtmp, int is_export) { --- nfs-utils-1.0.10/utils/mountd/auth.c.orig 2006-08-07 02:40:50.000000000 -0400 +++ nfs-utils-1.0.10/utils/mountd/auth.c 2007-05-11 12:10:34.081481000 -0400 @@ -14,6 +14,7 @@ #include #include #include +#include #include "misc.h" #include "nfslib.h" #include "exportfs.h" @@ -46,24 +47,34 @@ auth_init(char *exports) xtab_mount_write(); } -int +unsigned int auth_reload() { struct stat stb; - static time_t last_modified = 0; - - if (stat(_PATH_ETAB, &stb) < 0) + static ino_t last_inode; + static int last_fd; + static unsigned int counter; + int fd; + + if ((fd = open(_PATH_ETAB, O_RDONLY)) < 0) { + xlog(L_FATAL, "couldn't open %s", _PATH_ETAB); + } else if (fstat(fd, &stb) < 0) { xlog(L_FATAL, "couldn't stat %s", _PATH_ETAB); - if (stb.st_mtime == last_modified) - return 0; - last_modified = stb.st_mtime; + } else if (stb.st_ino == last_inode) { + close(fd); + return counter; + } else { + close(last_fd); + last_fd = fd; + last_inode = stb.st_ino; + } export_freeall(); memset(&my_client, 0, sizeof(my_client)); - // export_read(export_file); xtab_export_read(); + ++counter; - return 1; + return counter; } static nfs_export * --- nfs-utils-1.0.10/utils/mountd/mountd.c.orig 2006-08-07 02:40:50.000000000 -0400 +++ nfs-utils-1.0.10/utils/mountd/mountd.c 2007-05-11 12:17:03.512115000 -0400 @@ -463,10 +463,15 @@ get_exportlist(void) struct groupnode *g, *ng, *c, **cp; nfs_export *exp; int i; + static unsigned int ecounter; + unsigned int acounter; - if (!auth_reload() && elist) + acounter = auth_reload(); + if (elist && acounter == ecounter) return elist; + ecounter = acounter; + for (e = elist; e != NULL; e = ne) { ne = e->ex_next; for (g = e->ex_groups; g != NULL; g = ng) { --- nfs-utils-1.0.10/utils/mountd/mountd.h.orig 2006-08-07 02:40:50.000000000 -0400 +++ nfs-utils-1.0.10/utils/mountd/mountd.h 2007-05-11 12:18:21.393183000 -0400 @@ -40,7 +40,7 @@ bool_t mount_mnt_3_svc(struct svc_req * void mount_dispatch(struct svc_req *, SVCXPRT *); void auth_init(char *export_file); -int auth_reload(void); +unsigned int auth_reload(void); nfs_export * auth_authenticate(char *what, struct sockaddr_in *sin, char *path); void auth_export(nfs_export *exp); Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- nfs-utils.spec 10 May 2007 19:17:31 -0000 1.123 +++ nfs-utils.spec 11 May 2007 17:38:16 -0000 1.124 @@ -53,6 +53,7 @@ Patch83: nfs-utils-1.0.10-mount-reserved-port.patch Patch84: nfs-utils-1.0.10-mountd-memleak.patch Patch85: nfs-utils-1.0.10-nfsd-macargs.patch +Patch86: nfs-utils-1.0.10-mountd-etab.patch %if %{enablefscache} @@ -128,6 +129,7 @@ %patch83 -p1 %patch84 -p1 %patch85 -p1 +%patch86 -p1 %if %{enablefscache} %patch90 -p1 %endif @@ -320,6 +322,7 @@ - Make sure statd uses correct uid/gid by chowning the /var/lib/nfs/statd with the rpcuser id. (bz 235216) - Correct some sanity checking in rpc.nfsd. (bz 220887) +- Have mountd hold open etab file to force inode number to change (bz 236823) * Fri Mar 16 2007 Steve Dickson 1.0.10-8 - Stop mount from wasting reserve ports (bz 230969) From fedora-cvs-commits at redhat.com Fri May 11 21:51:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 11 May 2007 17:51:36 -0400 Subject: rpms/nfs-utils/FC-6 nfs.sysconfig, NONE, 1.1 nfs-utils.spec, 1.124, 1.125 Message-ID: <200705112151.l4BLpaaF026165@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26149 Modified Files: nfs-utils.spec Added Files: nfs.sysconfig Log Message: Create a /etc/sysconfig/nfs with all the possible variables (bz 234543) --- NEW FILE nfs.sysconfig --- # # Define which protocol versions mountd # will advertise. The values are "no" or "yes" # with yes being the default #MOUNTD_NFS_V1="no" #MOUNTD_NFS_V2="no" #MOUNTD_NFS_V3="no" # # # Path to remote quota server. See rquotad(8) #RQUOTAD="/usr/sbin/rpc.rquotad" # Port rquotad should listen on. #RQUOTAD_PORT="875" # Optinal options passed to rquotad #RPCRQUOTADOPTS="" # # # TCP port rpc.lockd should listen on. #LOCKD_TCPPORT=32803 # UDP port rpc.lockd should listen on. #LOCKD_UDPPORT=32769 # # # Optional arguments passed to rpc.nfsd. See rpc.nfsd(8) #RPCNFSDARGS # Number of nfs server processes to be started. # The default is 8. #RPCNFSDCOUNT=8 # # # Optional arguments passed to rpc.mountd. See rpc.mountd(8) #RPCMOUNTDOPTS="" # Port rpc.mountd should listen on. #MOUNTD_PORT=892 # # # Optional arguments passed to rpc.statd. See rpc.statd(8) #STATDARG="" # Port rpc.statd should listen on. #STATD_PORT=662 # Outgoing port statd should used. The default is port # is random #STATD_OUTGOING_PORT=2020 # Specify callout program #STATD_HA_CALLOUT="/usr/local/bin/foo" # # # Optional arguments passed to rpc.idmapd. See rpc.idmapd(8) #RPCIDMAPDARGS="" # # Set to turn on Secure NFS mounts. #SECURE_NFS="" # Optional arguments passed to rpc.gssd. See rpc.gssd(8) #RPCGSSDARGS="" # Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8) #RPCSVCGSSDARGS="" # Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- nfs-utils.spec 11 May 2007 17:38:16 -0000 1.124 +++ nfs-utils.spec 11 May 2007 21:51:33 -0000 1.125 @@ -24,6 +24,7 @@ Source12: rpcidmapd.init Source13: rpcgssd.init Source14: rpcsvcgssd.init +Source15: nfs.sysconfig Patch50: nfs-utils-1.0.5-statdpath.patch Patch51: nfs-utils-1.0.6-mountd.patch @@ -169,7 +170,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{/sbin,/usr/sbin} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man5,man8} -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d +mkdir -p $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/sysconfig} make DESTDIR=$RPM_BUILD_ROOT install install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/usr/sbin install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs @@ -177,6 +178,7 @@ install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcidmapd install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcgssd install -m 755 %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcsvcgssd +install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/nfs install -m 644 utils/idmapd/idmapd.conf \ $RPM_BUILD_ROOT/etc/idmapd.conf @@ -281,6 +283,7 @@ %config /etc/rc.d/init.d/rpcidmapd %config /etc/rc.d/init.d/rpcgssd %config /etc/rc.d/init.d/rpcsvcgssd +%config /etc/sysconfig/nfs %config(noreplace) /etc/idmapd.conf %dir /var/lib/nfs/v4recovery %dir /var/lib/nfs/rpc_pipefs @@ -323,6 +326,7 @@ the /var/lib/nfs/statd with the rpcuser id. (bz 235216) - Correct some sanity checking in rpc.nfsd. (bz 220887) - Have mountd hold open etab file to force inode number to change (bz 236823) +- Create a /etc/sysconfig/nfs with all the possible variables (bz 234543) * Fri Mar 16 2007 Steve Dickson 1.0.10-8 - Stop mount from wasting reserve ports (bz 230969) From fedora-cvs-commits at redhat.com Sat May 12 12:21:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 12 May 2007 08:21:03 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils.spec,1.125,1.126 Message-ID: <200705121221.l4CCL3FL017245@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17231 Modified Files: nfs-utils.spec Log Message: Fixed typo in spec file Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- nfs-utils.spec 11 May 2007 21:51:33 -0000 1.125 +++ nfs-utils.spec 12 May 2007 12:21:01 -0000 1.126 @@ -326,7 +326,8 @@ the /var/lib/nfs/statd with the rpcuser id. (bz 235216) - Correct some sanity checking in rpc.nfsd. (bz 220887) - Have mountd hold open etab file to force inode number to change (bz 236823) -- Create a /etc/sysconfig/nfs with all the possible variables (bz 234543) +- Create a /etc/sysconfig/nfs with all the possible init script + variables (bz 234543) * Fri Mar 16 2007 Steve Dickson 1.0.10-8 - Stop mount from wasting reserve ports (bz 230969) From fedora-cvs-commits at redhat.com Sat May 12 12:34:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 12 May 2007 08:34:37 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils.spec, 1.126, 1.127 nfs.init, 1.23, 1.24 nfslock.init, 1.14, 1.15 Message-ID: <200705121234.l4CCYbe0017417@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17401 Modified Files: nfs-utils.spec nfs.init nfslock.init Log Message: - Changed nfs initscript to exit with correct value (bz 221874) Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- nfs-utils.spec 12 May 2007 12:21:01 -0000 1.126 +++ nfs-utils.spec 12 May 2007 12:34:34 -0000 1.127 @@ -328,6 +328,7 @@ - Have mountd hold open etab file to force inode number to change (bz 236823) - Create a /etc/sysconfig/nfs with all the possible init script variables (bz 234543) +- Changed nfs initscript to exit with correct value (bz 221874) * Fri Mar 16 2007 Steve Dickson 1.0.10-8 - Stop mount from wasting reserve ports (bz 230969) Index: nfs.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs.init,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- nfs.init 10 May 2007 15:34:42 -0000 1.23 +++ nfs.init 12 May 2007 12:34:34 -0000 1.24 @@ -165,4 +165,4 @@ exit 1 esac -exit 0 +exit $? Index: nfslock.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfslock.init,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- nfslock.init 16 Aug 2006 14:39:56 -0000 1.14 +++ nfslock.init 12 May 2007 12:34:34 -0000 1.15 @@ -144,4 +144,4 @@ exit 1 esac -exit 0 +exit $? From fedora-cvs-commits at redhat.com Mon May 14 10:38:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 14 May 2007 06:38:37 -0400 Subject: rpms/logrotate/devel logrotate-3.7.5-shred.patch, NONE, 1.1 logrotate.spec, 1.61, 1.62 Message-ID: <200705141038.l4EAcbDO031075@cvs.devel.redhat.com> Author: tsmetana Update of /cvs/dist/rpms/logrotate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31056 Modified Files: logrotate.spec Added Files: logrotate-3.7.5-shred.patch Log Message: allow to use shred instead of unlink logrotate-3.7.5-shred.patch: config.c | 26 +++++++++++++++++++++++++- logrotate.8 | 14 ++++++++++++++ logrotate.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------ logrotate.h | 2 ++ 4 files changed, 92 insertions(+), 7 deletions(-) --- NEW FILE logrotate-3.7.5-shred.patch --- --- logrotate-3.7.5/logrotate.h.shred 2007-05-14 09:25:50.000000000 +0200 +++ logrotate-3.7.5/logrotate.h 2007-05-14 10:27:48.000000000 +0200 @@ -16,6 +16,7 @@ #define LOG_FLAG_SHAREDSCRIPTS (1 << 7) #define LOG_FLAG_COPY (1 << 8) #define LOG_FLAG_DATEEXT (1 << 9) +#define LOG_FLAG_SHRED (1 << 10) #define NO_MODE ((mode_t) -1) #define NO_UID ((uid_t) -1) @@ -44,6 +45,7 @@ char *uncompress_prog; char *compress_ext; int flags; + int shred_cycles; /* if !=0, pass -n shred_cycles to GNU shred */ mode_t createMode; /* if any/all of these are -1, we use the */ uid_t createUid; /* attributes from the log file just rotated */ gid_t createGid; --- logrotate-3.7.5/logrotate.c.shred 2007-05-14 09:25:30.000000000 +0200 +++ logrotate-3.7.5/logrotate.c 2007-05-14 10:35:41.000000000 +0200 @@ -53,6 +53,8 @@ char *mailCommand = DEFAULT_MAIL_COMMAND; time_t nowSecs = 0; +static int shred_file(char * filename, logInfo *log); + static int globerr(const char *pathname, int theerr) { message(MESS_ERROR, "error accessing %s: %s\n", pathname, @@ -188,11 +190,54 @@ return fd; } -static int removeLogFile(char *name) +#define SHRED_CALL "shred -u " +#define SHRED_COUNT_FLAG "-n " +#define DIGITS 10 +/* unlink, but try to call shred from GNU fileutils */ +static int shred_file(char * filename, logInfo *log) +{ + int len, ret; + char *cmd; + char count[DIGITS]; /* that's a lot of shredding :) */ + + if (!(log->flags & LOG_FLAG_SHRED)) { + return unlink(filename); + } + + len = strlen(filename) + strlen(SHRED_CALL); + len += strlen(SHRED_COUNT_FLAG) + DIGITS; + cmd = malloc(len); + + if (!cmd) { + message(MESS_ERROR, "malloc error while shredding"); + return unlink(filename); + } + strcpy(cmd, SHRED_CALL); + if (log->shred_cycles != 0) { + strcat(cmd, SHRED_COUNT_FLAG); + snprintf(count, DIGITS - 1, "%d", log->shred_cycles); + strcat(count, " "); + strcat(cmd, count); + } + strcat(cmd, filename); + ret = system(cmd); + free(cmd); + if (ret != 0) { + message(MESS_ERROR, "Failed to shred %s\n, trying unlink", filename); + if (ret != -1) { + message(MESS_NORMAL, "Shred returned %d\n", ret); + } + return unlink(filename); + } else { + return ret; + } +} + +static int removeLogFile(char *name, logInfo *log) { message(MESS_DEBUG, "removing old log %s\n", name); - if (!debug && unlink(name)) { + if (!debug && shred_file(name, log)) { message(MESS_ERROR, "Failed to remove old log %s: %s\n", name, strerror(errno)); return 1; @@ -255,7 +300,7 @@ return 1; } - unlink(name); + shred_file(name, log); return 0; } @@ -697,7 +742,7 @@ mailCommand, logNum, log); if (!hasErrors) - hasErrors = removeLogFile(mailFilename); + hasErrors = removeLogFile(mailFilename, log); } mail_out = i; } @@ -737,7 +782,7 @@ mailLogWrapper(mailFilename, mailCommand, logNum, log); if (!hasErrors) - hasErrors = removeLogFile(mailFilename); + hasErrors = removeLogFile(mailFilename, log); } } } @@ -954,7 +999,7 @@ } if (!hasErrors && rotNames->disposeName) - hasErrors = removeLogFile(rotNames->disposeName); + hasErrors = removeLogFile(rotNames->disposeName, log); #ifdef WITH_SELINUX if (selinux_enabled) { --- logrotate-3.7.5/logrotate.8.shred 2007-05-14 09:26:02.000000000 +0200 +++ logrotate-3.7.5/logrotate.8 2007-05-14 10:42:16.000000000 +0200 @@ -330,6 +330,10 @@ not be executed for the affected log only. .TP +\fBnoshred\fR +Do not use \fBshred\fR when deleting old log files. See also \fBshred\fR. + +.TP \fBnotifempty\fR Do not rotate the log if it is empty (this overrides the \fBifempty\fR option). @@ -403,6 +407,16 @@ actions will not be executed for any logs. This option overrides the \fBnosharedscripts\fR option and implies \fBcreate\fR option. +.TP +\fBshred\fR +Delete log files using \fBshred\fR -u instead of unlink(). This should +ensure that logs are not readable after their scheduled deletion; this is +off by default. See also \fBnoshred\fR. + +.TP +\fBshredcycles\fR \fIcount\fR +Asks GNU \fBshred\fR to overwite log files \fBcount\fR times before +deletion. Without this option, \fBshred\fR's default will be used. .TP \fBstart \fIcount\fR --- logrotate-3.7.5/config.c.shred 2007-05-14 09:26:42.000000000 +0200 +++ logrotate-3.7.5/config.c 2007-05-14 10:32:37.000000000 +0200 @@ -432,6 +432,7 @@ /* uncompress_prog */ NULL, /* compress_ext */ NULL, /* flags */ LOG_FLAG_IFEMPTY, + /* shred_cycles */ 0, /* createMode/Uid/Gid */ NO_MODE, NO_UID, NO_GID, /* compress_options_list/count */ NULL, 0 }; @@ -638,6 +639,14 @@ newlog->flags &= ~LOG_FLAG_DELAYCOMPRESS; *endtag = oldchar, start = endtag; + } else if (!strcmp(start, "shred")) { + newlog->flags |= LOG_FLAG_SHRED; + + *endtag = oldchar, start = endtag; + } else if (!strcmp(start, "noshred")) { + newlog->flags &= ~LOG_FLAG_SHRED; + + *endtag = oldchar, start = endtag; } else if (!strcmp(start, "sharedscripts")) { newlog->flags |= LOG_FLAG_SHAREDSCRIPTS; @@ -833,7 +842,22 @@ *endtag = oldchar, start = endtag; } #endif - } else if (!strcmp(start, "daily")) { + } else if (!strcmp(start, "shredcycles")) { + *endtag = oldchar, start = endtag; + + if (!isolateValue(configFile, lineNum, "shred cycles", + &start, &endtag)) { + oldchar = *endtag, *endtag = '\0'; + + newlog->shred_cycles = strtoul(start, &chptr, 0); + if (*chptr || newlog->shred_cycles < 0) { + message(MESS_ERROR, "%s:%d bad shred cycles '%s'\n", + configFile, lineNum, start); + return 1; + } + *endtag = oldchar, start = endtag; + } + } else if (!strcmp(start, "daily")) { *endtag = oldchar, start = endtag; newlog->criterium = ROT_DAYS; Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- logrotate.spec 31 Mar 2007 10:56:49 -0000 1.61 +++ logrotate.spec 14 May 2007 10:38:35 -0000 1.62 @@ -1,7 +1,7 @@ Summary: Rotates, compresses, removes and mails system log files Name: logrotate Version: 3.7.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Base # The source for this package was pulled from cvs. @@ -13,6 +13,8 @@ # make create-archive Source: logrotate-%{version}.tar.gz Patch1: logrotate-3.7.5-errorHandling.patch +Patch2: logrotate-3.7.5-shred.patch +Requires: coreutils >= 5.92 BuildRequires: libselinux-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,6 +32,7 @@ %prep %setup -q %patch1 -p1 -b .errorHandling +%patch2 -p1 -b .shred %build make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes @@ -59,6 +62,10 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status %changelog +* Mon May 14 2007 Tomas Smetana 3.7.5-4 +- add options to use shred for deleting files -- adapt patch sent by + Peter Eckersley (#239934) + * Sat Mar 31 2007 Peter Vrabec 3.7.5-3 - add error checking before running prerotate and postrotate scripts From fedora-cvs-commits at redhat.com Mon May 14 12:42:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 14 May 2007 08:42:07 -0400 Subject: rpms/logrotate/devel logrotate-3.7.5-cfengine.patch, NONE, 1.1 logrotate.spec, 1.62, 1.63 Message-ID: <200705141242.l4ECg7OD000801@cvs.devel.redhat.com> Author: tsmetana Update of /cvs/dist/rpms/logrotate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv785 Modified Files: logrotate.spec Added Files: logrotate-3.7.5-cfengine.patch Log Message: ignore .cfsaved files logrotate-3.7.5-cfengine.patch: config.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE logrotate-3.7.5-cfengine.patch --- --- logrotate-3.7.5/config.c.cfengine 2007-05-14 14:18:44.000000000 +0200 +++ logrotate-3.7.5/config.c 2007-05-14 14:19:06.000000000 +0200 @@ -31,7 +31,7 @@ #endif static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v", - ".rpmnew", ".swp" + ".rpmnew", ".swp", ".cfsaved" }; static int defTabooCount = sizeof(defTabooExts) / sizeof(char *); Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- logrotate.spec 14 May 2007 10:38:35 -0000 1.62 +++ logrotate.spec 14 May 2007 12:42:05 -0000 1.63 @@ -14,6 +14,7 @@ Source: logrotate-%{version}.tar.gz Patch1: logrotate-3.7.5-errorHandling.patch Patch2: logrotate-3.7.5-shred.patch +Patch3: logrotate-3.7.5-cfengine.patch Requires: coreutils >= 5.92 BuildRequires: libselinux-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +34,7 @@ %setup -q %patch1 -p1 -b .errorHandling %patch2 -p1 -b .shred +%patch3 -p1 -b .cfengine %build make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes @@ -65,6 +67,7 @@ * Mon May 14 2007 Tomas Smetana 3.7.5-4 - add options to use shred for deleting files -- adapt patch sent by Peter Eckersley (#239934) +- ignore .cfsaved files by default (#223476) * Sat Mar 31 2007 Peter Vrabec 3.7.5-3 - add error checking before running prerotate and postrotate scripts From fedora-cvs-commits at redhat.com Mon May 14 12:44:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 14 May 2007 08:44:41 -0400 Subject: rpms/squid/FC-6 .cvsignore, 1.23, 1.24 sources, 1.28, 1.29 squid.spec, 1.82, 1.83 Message-ID: <200705141244.l4ECifnL000862@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/squid/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv845 Modified Files: .cvsignore sources squid.spec Log Message: * Mon May 14 2007 Martin Bacovsky - 7:2.6.STABLE13-1 - update to the latest upsteram Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/squid/FC-6/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 4 Apr 2007 14:37:34 -0000 1.23 +++ .cvsignore 14 May 2007 12:44:39 -0000 1.24 @@ -1 +1 @@ -squid-2.6.STABLE12.tar.bz2 +squid-2.6.STABLE13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/squid/FC-6/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 4 Apr 2007 14:37:34 -0000 1.28 +++ sources 14 May 2007 12:44:39 -0000 1.29 @@ -1 +1 @@ -a830ccc95cb39cdfa5e5b773add0bb0d squid-2.6.STABLE12.tar.bz2 +fdc4ece264b47bab1b112d8f6f842b8b squid-2.6.STABLE13.tar.bz2 Index: squid.spec =================================================================== RCS file: /cvs/dist/rpms/squid/FC-6/squid.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- squid.spec 4 Apr 2007 14:37:34 -0000 1.82 +++ squid.spec 14 May 2007 12:44:39 -0000 1.83 @@ -4,12 +4,12 @@ Summary: The Squid proxy caching server. Name: squid -Version: 2.6.STABLE12 +Version: 2.6.STABLE13 Release: 1%{?dist} Epoch: 7 License: GPL Group: System Environment/Daemons -Source: http://www.squid-cache.org/Squid/Versions/v2/2.5/squid-%{version}.tar.bz2 +Source: http://www.squid-cache.org/Squid/Versions/v2/2.6/squid-%{version}.tar.bz2 Source1: http://www.squid-cache.org/Squid/FAQ/FAQ.sgml Source2: squid.init Source3: squid.logrotate @@ -325,6 +325,9 @@ chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Mon May 14 2007 Martin Bacovsky - 7:2.6.STABLE13-1 +- update to the latest upsteram + * Mon Apr 2 2007 Martin Bacovsky - 7:2.6.STABLE12-1 - update to the latest upsteram From fedora-cvs-commits at redhat.com Mon May 14 12:48:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 14 May 2007 08:48:46 -0400 Subject: rpms/logrotate/FC-6 logrotate-3.7.4-cfengine.patch, NONE, 1.1 logrotate.spec, 1.56, 1.57 Message-ID: <200705141248.l4ECmk8A000957@cvs.devel.redhat.com> Author: tsmetana Update of /cvs/dist/rpms/logrotate/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv941 Modified Files: logrotate.spec Added Files: logrotate-3.7.4-cfengine.patch Log Message: ignore .cfsaved files by default logrotate-3.7.4-cfengine.patch: config.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE logrotate-3.7.4-cfengine.patch --- --- logrotate-3.7.4/config.c.cfengine 2007-05-14 14:02:22.000000000 +0200 +++ logrotate-3.7.4/config.c 2007-05-14 14:05:46.000000000 +0200 @@ -31,7 +31,7 @@ #endif static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v", - ".rpmnew", ".swp" + ".rpmnew", ".swp", ".cfsaved" }; static int defTabooCount = sizeof(defTabooExts) / sizeof(char *); Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/FC-6/logrotate.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- logrotate.spec 8 Feb 2007 14:40:37 -0000 1.56 +++ logrotate.spec 14 May 2007 12:48:44 -0000 1.57 @@ -1,7 +1,7 @@ Summary: Rotates, compresses, removes and mails system log files Name: logrotate Version: 3.7.4 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz @@ -10,6 +10,7 @@ Patch3: logrotate-sizeOption.patch Patch4: logrotate-widecharPath.patch Patch5: logrotate-errorConfiguration.patch +Patch6: logrotate-3.7.4-cfengine.patch BuildRequires: libselinux-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,6 +32,7 @@ %patch3 -p1 -b .sizeOption %patch4 -p1 -b .widecharPath %patch5 -p1 -b .errorConfiguration +%patch6 -p1 -b .cfengine %build make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" WITH_SELINUX=yes @@ -60,6 +62,9 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Mon May 14 2007 Tomas Smetana 3.7.4-13 +- ignore *.cfsaved files by default (#223476) + * Thu Feb 08 2007 Peter Vrabec 3.7.4-12 - fix problem with compress_options_list (#227706) From fedora-cvs-commits at redhat.com Mon May 14 14:33:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 14 May 2007 10:33:39 -0400 Subject: rpms/samba/FC-5 samba-3.0.24-become_root.patch, NONE, 1.1 samba-3.0.24-parse_validation.patch, NONE, 1.1 samba-3.0.24-smbrun.patch, NONE, 1.1 samba.spec, 1.74, 1.75 Message-ID: <200705141433.l4EEXdSI003537@cvs.devel.redhat.com> Author: ssorce Update of /cvs/dist/rpms/samba/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3516 Modified Files: samba.spec Added Files: samba-3.0.24-become_root.patch samba-3.0.24-parse_validation.patch samba-3.0.24-smbrun.patch Log Message: Security release for 3.0.24 samba-3.0.24-become_root.patch: lib/util_sec.c | 22 ---------------------- passdb/lookup_sid.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 34 deletions(-) --- NEW FILE samba-3.0.24-become_root.patch --- diff -u -r source-orig/lib/util_sec.c source/lib/util_sec.c --- source-orig/lib/util_sec.c 2007-02-04 10:59:17.000000000 -0800 +++ source/lib/util_sec.c 2007-04-10 12:10:57.932992000 -0700 @@ -286,28 +286,6 @@ } /**************************************************************************** - Lightweight become root - no group change. -****************************************************************************/ - -void become_root_uid_only(void) -{ - save_re_uid(); - set_effective_uid(0); -} - -/**************************************************************************** - Lightweight unbecome root - no group change. Expects we are root already, - saves errno across call boundary. -****************************************************************************/ - -void unbecome_root_uid_only(void) -{ - int saved_errno = errno; - restore_re_uid_fromroot(); - errno = saved_errno; -} - -/**************************************************************************** save the real and effective gid for later restoration. Used by the getgroups code ****************************************************************************/ diff -u -r source-orig/passdb/lookup_sid.c source/passdb/lookup_sid.c --- source-orig/passdb/lookup_sid.c 2007-02-04 10:59:21.000000000 -0800 +++ source/passdb/lookup_sid.c 2007-04-10 12:11:28.203768000 -0700 @@ -421,10 +421,10 @@ return False; } - become_root_uid_only(); + become_root(); result = pdb_lookup_rids(domain_sid, num_rids, rids, *names, *types); - unbecome_root_uid_only(); + unbecome_root(); return (NT_STATUS_IS_OK(result) || NT_STATUS_EQUAL(result, NT_STATUS_NONE_MAPPED) || @@ -1085,9 +1085,9 @@ goto done; } - become_root_uid_only(); + become_root(); ret = pdb_uid_to_rid(uid, &rid); - unbecome_root_uid_only(); + unbecome_root(); if (ret) { /* This is a mapped user */ @@ -1131,9 +1131,9 @@ goto done; } - become_root_uid_only(); + become_root(); ret = pdb_gid_to_sid(gid, psid); - unbecome_root_uid_only(); + unbecome_root(); if (ret) { /* This is a mapped group */ @@ -1179,9 +1179,9 @@ union unid_t id; BOOL ret; - become_root_uid_only(); + become_root(); ret = pdb_sid_to_id(psid, &id, &type); - unbecome_root_uid_only(); + unbecome_root(); if (ret) { if (type != SID_NAME_USER) { @@ -1259,9 +1259,9 @@ sid_check_is_in_wellknown_domain(psid))) { BOOL ret; - become_root_uid_only(); + become_root(); ret = pdb_getgrsid(&map, *psid); - unbecome_root_uid_only(); + unbecome_root(); if (ret) { *pgid = map.gid; @@ -1273,9 +1273,9 @@ if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) { BOOL ret; - become_root_uid_only(); + become_root(); ret = pdb_sid_to_id(psid, &id, &type); - unbecome_root_uid_only(); + unbecome_root(); if (ret) { if ((type != SID_NAME_DOM_GRP) && samba-3.0.24-parse_validation.patch: include/smb_macros.h | 2 - rpc_parse/parse_dfs.c | 72 ++++++++++++++++++++++++++++++++++++++++------ rpc_parse/parse_lsa.c | 22 ++++++++++---- rpc_parse/parse_prs.c | 2 - rpc_parse/parse_sec.c | 13 +++----- rpc_parse/parse_spoolss.c | 4 ++ 6 files changed, 91 insertions(+), 24 deletions(-) --- NEW FILE samba-3.0.24-parse_validation.patch --- Index: source/rpc_parse/parse_prs.c =================================================================== --- source/rpc_parse/parse_prs.c +++ source/rpc_parse/parse_prs.c @@ -644,7 +644,7 @@ return True; if (UNMARSHALLING(ps)) { - if ( !(*data = PRS_ALLOC_MEM_VOID(ps, data_size)) ) + if ( !(*data = PRS_ALLOC_MEM(ps, char, data_size)) ) return False; } Index: source/rpc_parse/parse_sec.c =================================================================== --- source/rpc_parse/parse_sec.c +++ source/rpc_parse/parse_sec.c @@ -165,13 +165,12 @@ return False; if (UNMARSHALLING(ps)) { - /* - * Even if the num_aces is zero, allocate memory as there's a difference - * between a non-present DACL (allow all access) and a DACL with no ACE's - * (allow no access). - */ - if((psa->ace = PRS_ALLOC_MEM(ps, SEC_ACE, psa->num_aces+1)) == NULL) - return False; + if (psa->num_aces) { + if((psa->ace = PRS_ALLOC_MEM(ps, SEC_ACE, psa->num_aces)) == NULL) + return False; + } else { + psa->ace = NULL; + } } for (i = 0; i < psa->num_aces; i++) { Index: source/rpc_parse/parse_dfs.c =================================================================== --- source/rpc_parse/parse_dfs.c +++ source/rpc_parse/parse_dfs.c @@ -325,7 +325,14 @@ return False; if (UNMARSHALLING(ps)) { - v->stores = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->stores)*v->num_stores); + if (v->num_stores) { + v->stores = PRS_ALLOC_MEM(ps,NETDFS_DFS_STORAGEINFO,v->num_stores); + if (!v->stores) { + return False; + } + } else { + v->stores = NULL; + } } for (i_stores_1=0; i_stores_1num_stores;i_stores_1++) { if (!netdfs_io_dfs_StorageInfo_p("stores", &v->stores[i_stores_1], ps, depth)) @@ -447,7 +455,14 @@ return False; if (UNMARSHALLING(ps)) { - v->stores = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->stores)*v->num_stores); + if (v->num_stores) { + v->stores = PRS_ALLOC_MEM(ps,NETDFS_DFS_STORAGEINFO,v->num_stores); + if (!v->stores) { + return False; + } + } else { + v->stores = NULL; + } } for (i_stores_1=0; i_stores_1num_stores;i_stores_1++) { if (!netdfs_io_dfs_StorageInfo_p("stores", &v->stores[i_stores_1], ps, depth)) @@ -920,7 +936,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO1,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info1_p("s", &v->s[i_s_1], ps, depth)) @@ -986,7 +1009,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO2,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info2_p("s", &v->s[i_s_1], ps, depth)) @@ -1052,7 +1084,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO3,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info3_p("s", &v->s[i_s_1], ps, depth)) @@ -1118,7 +1158,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO4,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info4_p("s", &v->s[i_s_1], ps, depth)) @@ -1184,7 +1232,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO200,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info200_p("s", &v->s[i_s_1], ps, depth)) @@ -1250,7 +1306,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO300,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info300_p("s", &v->s[i_s_1], ps, depth)) Index: source/rpc_parse/parse_lsa.c =================================================================== --- source/rpc_parse/parse_lsa.c +++ source/rpc_parse/parse_lsa.c @@ -1356,12 +1356,17 @@ &trn->num_entries2)) return False; + if (trn->num_entries2 != trn->num_entries) { + /* RPC fault */ + return False; + } + if (UNMARSHALLING(ps)) { - if ((trn->name = PRS_ALLOC_MEM(ps, LSA_TRANS_NAME, trn->num_entries)) == NULL) { + if ((trn->name = PRS_ALLOC_MEM(ps, LSA_TRANS_NAME, trn->num_entries2)) == NULL) { return False; } - if ((trn->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, trn->num_entries)) == NULL) { + if ((trn->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, trn->num_entries2)) == NULL) { return False; } } @@ -1413,12 +1418,17 @@ &trn->num_entries2)) return False; + if (trn->num_entries2 != trn->num_entries) { + /* RPC fault */ + return False; + } + if (UNMARSHALLING(ps)) { - if ((trn->name = PRS_ALLOC_MEM(ps, LSA_TRANS_NAME2, trn->num_entries)) == NULL) { + if ((trn->name = PRS_ALLOC_MEM(ps, LSA_TRANS_NAME2, trn->num_entries2)) == NULL) { return False; } - if ((trn->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, trn->num_entries)) == NULL) { + if ((trn->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, trn->num_entries2)) == NULL) { return False; } } @@ -2759,7 +2759,7 @@ static BOOL lsa_io_privilege_set(const char *desc, PRIVILEGE_SET *out, prs_struct *ps, int depth) { - uint32 i; + uint32 i, dummy; prs_debug(ps, depth, desc, "lsa_io_privilege_set"); depth++; @@ -2767,7 +2767,7 @@ if(!prs_align(ps)) return False; - if(!prs_uint32("count", ps, depth, &out->count)) + if(!prs_uint32("count", ps, depth, &dummy)) return False; if(!prs_uint32("control", ps, depth, &out->control)) return False; Index: source/rpc_parse/parse_spoolss.c =================================================================== --- source/rpc_parse/parse_spoolss.c +++ source/rpc_parse/parse_spoolss.c @@ -230,6 +230,10 @@ if (type->count2 != type->count) DEBUG(4,("What a mess, count was %x now is %x !\n", type->count, type->count2)); + if (type->count2 > MAX_NOTIFY_TYPE_FOR_NOW) { + return False; + } + /* parse the option type data */ for(i=0;icount2;i++) if(!prs_uint16("fields",ps,depth,&type->fields[i])) Index: source/include/smb_macros.h =================================================================== --- source/include/smb_macros.h +++ source/include/smb_macros.h @@ -295,7 +295,6 @@ #if defined(PARANOID_MALLOC_CHECKER) #define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem_((ps),sizeof(type),(count)) -#define PRS_ALLOC_MEM_VOID(ps, size) prs_alloc_mem_((ps),(size),1) /* Get medieval on our ass about malloc.... */ @@ -334,7 +333,6 @@ #else #define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem((ps),sizeof(type),(count)) -#define PRS_ALLOC_MEM_VOID(ps, size) prs_alloc_mem((ps),(size),1) /* Regular malloc code. */ samba-3.0.24-smbrun.patch: source-orig//configure |only source/lib/charcnv.c | 2 source/lib/smbrun.c | 31 ++++++- source/lib/util_str.c | 162 ++++++++++++++++++++++++++++++++++++++++ source/printing/print_generic.c | 2 5 files changed, 191 insertions(+), 6 deletions(-) --- NEW FILE samba-3.0.24-smbrun.patch --- Only in source-orig/: configure diff -u -r source-orig/lib/charcnv.c source/lib/charcnv.c --- source-orig/lib/charcnv.c 2006-04-19 19:29:23.000000000 -0700 +++ source/lib/charcnv.c 2007-05-10 09:59:49.023262000 -0700 @@ -1398,5 +1398,5 @@ /* We're hosed - we don't know how big this is... */ DEBUG(10,("next_mb_char_size: unknown size at string %s\n", s)); conv_silent = False; - return 1; + return (size_t)-1; } diff -u -r source-orig/lib/smbrun.c source/lib/smbrun.c --- source-orig/lib/smbrun.c 2006-04-19 19:29:23.000000000 -0700 +++ source/lib/smbrun.c 2007-05-10 09:57:03.305061000 -0700 @@ -55,7 +55,7 @@ outfd (or discard it if outfd is NULL). ****************************************************************************/ -int smbrun(const char *cmd, int *outfd) +static int smbrun_internal(const char *cmd, int *outfd, BOOL sanitize) { pid_t pid; uid_t uid = current_user.ut.uid; @@ -173,13 +173,36 @@ } #endif - execl("/bin/sh","sh","-c",cmd,NULL); + { + const char *newcmd = sanitize ? escape_shell_string(cmd) : cmd; + if (!newcmd) { + exit(82); + } + execl("/bin/sh","sh","-c",newcmd,NULL); + } /* not reached */ - exit(82); + exit(83); return 1; } +/**************************************************************************** + Use only in known safe shell calls (printing). +****************************************************************************/ + +int smbrun_no_sanitize(const char *cmd, int *outfd) +{ + return smbrun_internal(cmd, outfd, False); +} + +/**************************************************************************** + By default this now sanitizes shell expansion. +****************************************************************************/ + +int smbrun(const char *cmd, int *outfd) +{ + return smbrun_internal(cmd, outfd, True); +} /**************************************************************************** run a command being careful about uid/gid handling and putting the output in @@ -302,7 +325,7 @@ #endif execl("/bin/sh", "sh", "-c", cmd, NULL); - + /* not reached */ exit(82); return 1; diff -u -r source-orig/lib/util_str.c source/lib/util_str.c --- source-orig/lib/util_str.c 2007-02-04 10:59:17.000000000 -0800 +++ source/lib/util_str.c 2007-05-10 09:59:36.718762000 -0700 @@ -2426,3 +2426,165 @@ return True; } + +/******************************************************************* + Add a shell escape character '\' to any character not in a known list + of characters. UNIX charset format. +*******************************************************************/ + +#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabdefghijklmnopqrstuvwxyz_/ \t.," +#define INSIDE_DQUOTE_LIST "$`\n\"\\" + +char *escape_shell_string(const char *src) +{ + size_t srclen = strlen(src); + char *ret = SMB_MALLOC((srclen * 2) + 1); + char *dest = ret; + BOOL in_s_quote = False; + BOOL in_d_quote = False; + BOOL next_escaped = False; + + if (!ret) { + return NULL; + } + + while (*src) { + size_t c_size = next_mb_char_size(src); + + if (c_size == (size_t)-1) { + SAFE_FREE(ret); + return NULL; + } + + if (c_size > 1) { + memcpy(dest, src, c_size); + src += c_size; + dest += c_size; + next_escaped = False; + continue; + } + + /* + * Deal with backslash escaped state. + * This only lasts for one character. + */ + + if (next_escaped) { + *dest++ = *src++; + next_escaped = False; + continue; + } + + /* + * Deal with single quote state. The + * only thing we care about is exiting + * this state. + */ + + if (in_s_quote) { + if (*src == '\'') { + in_s_quote = False; + } + *dest++ = *src++; + continue; + } + + /* + * Deal with double quote state. The most + * complex state. We must cope with \, meaning + * possibly escape next char (depending what it + * is), ", meaning exit this state, and possibly + * add an \ escape to any unprotected character + * (listed in INSIDE_DQUOTE_LIST). + */ + + if (in_d_quote) { + if (*src == '\\') { + /* + * Next character might be escaped. + * We have to peek. Inside double + * quotes only INSIDE_DQUOTE_LIST + * characters are escaped by a \. + */ + + char nextchar; + + c_size = next_mb_char_size(&src[1]); + if (c_size == (size_t)-1) { + SAFE_FREE(ret); + return NULL; + } + if (c_size > 1) { + /* + * Don't escape the next char. + * Just copy the \. + */ + *dest++ = *src++; + continue; + } + + nextchar = src[1]; + + if (nextchar && strchr(INSIDE_DQUOTE_LIST, (int)nextchar)) { + next_escaped = True; + } + *dest++ = *src++; + continue; + } + + if (*src == '\"') { + /* Exit double quote state. */ + in_d_quote = False; + *dest++ = *src++; + continue; + } + + /* + * We know the character isn't \ or ", + * so escape it if it's any of the other + * possible unprotected characters. + */ + + if (strchr(INSIDE_DQUOTE_LIST, (int)*src)) { + *dest++ = '\\'; + } + *dest++ = *src++; + continue; + } + + /* + * From here to the end of the loop we're + * not in the single or double quote state. + */ + + if (*src == '\\') { + /* Next character must be escaped. */ + next_escaped = True; + *dest++ = *src++; + continue; + } + + if (*src == '\'') { + /* Go into single quote state. */ + in_s_quote = True; + *dest++ = *src++; + continue; + } + + if (*src == '\"') { + /* Go into double quote state. */ + in_d_quote = True; + *dest++ = *src++; + continue; + } + + /* Check if we need to escape the character. */ + + if (!strchr(INCLUDE_LIST, (int)*src)) { + *dest++ = '\\'; + } + *dest++ = *src++; + } + *dest++ = '\0'; + return ret; +} diff -u -r source-orig/printing/print_generic.c source/printing/print_generic.c --- source-orig/printing/print_generic.c 2007-02-04 10:59:13.000000000 -0800 +++ source/printing/print_generic.c 2007-05-10 09:57:03.292061000 -0700 @@ -58,7 +58,7 @@ if ( do_sub && snum != -1 ) standard_sub_snum(snum,syscmd,sizeof(syscmd)); - ret = smbrun(syscmd,outfd); + ret = smbrun_no_sanitize(syscmd,outfd); DEBUG(3,("Running the command `%s' gave %d\n",syscmd,ret)); Index: samba.spec =================================================================== RCS file: /cvs/dist/rpms/samba/FC-5/samba.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- samba.spec 5 Apr 2007 20:29:11 -0000 1.74 +++ samba.spec 14 May 2007 14:33:36 -0000 1.75 @@ -3,7 +3,7 @@ Summary: The Samba SMB server. Name: samba Version: 3.0.24 -Release: 4.fc5 +Release: 5.fc5 Epoch: 0 License: GNU GPL Version 2 Group: System Environment/Daemons @@ -51,6 +51,9 @@ Patch119: samba-3.0.24-enable_pam_nss_tests.patch Patch120: samba-3.0.24-nss_wins.patch Patch121: samba-3.0.24-vista_msdfs_errcodes.patch +Patch122: samba-3.0.24-become_root.patch +Patch123: samba-3.0.24-parse_validation.patch +Patch124: samba-3.0.24-smbrun.patch Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}-%{release} Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 cups-libs >= 1:1.2.8-1 @@ -141,6 +144,9 @@ %patch119 -p0 -b .pam_nss_test %patch120 -p0 -b .nss_wins %patch121 -p1 -b .msdfs +%patch122 -p0 -b .become_root +%patch123 -p0 -b .parse_validation +%patch124 -p0 -b .smbrun # crap rm -f examples/VFS/.cvsignore @@ -462,6 +468,12 @@ %{_mandir}/man7/libsmbclient.7* %changelog +* Mon May 14 2007 Simo Sorce 3.0.24-5.fc5 +- Security fixes for + CVE-2007-2444 + CVE-2007-2446 + CVE-2007-2447 + * Thu Apr 5 2007 Simo Sorce 3.0.24-4.fc5 - sync up patches from the rawhide packages From fedora-cvs-commits at redhat.com Mon May 14 14:34:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 14 May 2007 10:34:46 -0400 Subject: rpms/samba/FC-6 samba-3.0.24-become_root.patch, NONE, 1.1 samba-3.0.24-parse_validation.patch, NONE, 1.1 samba-3.0.24-smbrun.patch, NONE, 1.1 samba.spec, 1.76, 1.77 Message-ID: <200705141434.l4EEYk5L003593@cvs.devel.redhat.com> Author: ssorce Update of /cvs/dist/rpms/samba/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv3572 Modified Files: samba.spec Added Files: samba-3.0.24-become_root.patch samba-3.0.24-parse_validation.patch samba-3.0.24-smbrun.patch Log Message: Security release for 3.0.24 samba-3.0.24-become_root.patch: lib/util_sec.c | 22 ---------------------- passdb/lookup_sid.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 34 deletions(-) --- NEW FILE samba-3.0.24-become_root.patch --- diff -u -r source-orig/lib/util_sec.c source/lib/util_sec.c --- source-orig/lib/util_sec.c 2007-02-04 10:59:17.000000000 -0800 +++ source/lib/util_sec.c 2007-04-10 12:10:57.932992000 -0700 @@ -286,28 +286,6 @@ } /**************************************************************************** - Lightweight become root - no group change. -****************************************************************************/ - -void become_root_uid_only(void) -{ - save_re_uid(); - set_effective_uid(0); -} - -/**************************************************************************** - Lightweight unbecome root - no group change. Expects we are root already, - saves errno across call boundary. -****************************************************************************/ - -void unbecome_root_uid_only(void) -{ - int saved_errno = errno; - restore_re_uid_fromroot(); - errno = saved_errno; -} - -/**************************************************************************** save the real and effective gid for later restoration. Used by the getgroups code ****************************************************************************/ diff -u -r source-orig/passdb/lookup_sid.c source/passdb/lookup_sid.c --- source-orig/passdb/lookup_sid.c 2007-02-04 10:59:21.000000000 -0800 +++ source/passdb/lookup_sid.c 2007-04-10 12:11:28.203768000 -0700 @@ -421,10 +421,10 @@ return False; } - become_root_uid_only(); + become_root(); result = pdb_lookup_rids(domain_sid, num_rids, rids, *names, *types); - unbecome_root_uid_only(); + unbecome_root(); return (NT_STATUS_IS_OK(result) || NT_STATUS_EQUAL(result, NT_STATUS_NONE_MAPPED) || @@ -1085,9 +1085,9 @@ goto done; } - become_root_uid_only(); + become_root(); ret = pdb_uid_to_rid(uid, &rid); - unbecome_root_uid_only(); + unbecome_root(); if (ret) { /* This is a mapped user */ @@ -1131,9 +1131,9 @@ goto done; } - become_root_uid_only(); + become_root(); ret = pdb_gid_to_sid(gid, psid); - unbecome_root_uid_only(); + unbecome_root(); if (ret) { /* This is a mapped group */ @@ -1179,9 +1179,9 @@ union unid_t id; BOOL ret; - become_root_uid_only(); + become_root(); ret = pdb_sid_to_id(psid, &id, &type); - unbecome_root_uid_only(); + unbecome_root(); if (ret) { if (type != SID_NAME_USER) { @@ -1259,9 +1259,9 @@ sid_check_is_in_wellknown_domain(psid))) { BOOL ret; - become_root_uid_only(); + become_root(); ret = pdb_getgrsid(&map, *psid); - unbecome_root_uid_only(); + unbecome_root(); if (ret) { *pgid = map.gid; @@ -1273,9 +1273,9 @@ if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) { BOOL ret; - become_root_uid_only(); + become_root(); ret = pdb_sid_to_id(psid, &id, &type); - unbecome_root_uid_only(); + unbecome_root(); if (ret) { if ((type != SID_NAME_DOM_GRP) && samba-3.0.24-parse_validation.patch: include/smb_macros.h | 2 - rpc_parse/parse_dfs.c | 72 ++++++++++++++++++++++++++++++++++++++++------ rpc_parse/parse_lsa.c | 22 ++++++++++---- rpc_parse/parse_prs.c | 2 - rpc_parse/parse_sec.c | 13 +++----- rpc_parse/parse_spoolss.c | 4 ++ 6 files changed, 91 insertions(+), 24 deletions(-) --- NEW FILE samba-3.0.24-parse_validation.patch --- Index: source/rpc_parse/parse_prs.c =================================================================== --- source/rpc_parse/parse_prs.c +++ source/rpc_parse/parse_prs.c @@ -644,7 +644,7 @@ return True; if (UNMARSHALLING(ps)) { - if ( !(*data = PRS_ALLOC_MEM_VOID(ps, data_size)) ) + if ( !(*data = PRS_ALLOC_MEM(ps, char, data_size)) ) return False; } Index: source/rpc_parse/parse_sec.c =================================================================== --- source/rpc_parse/parse_sec.c +++ source/rpc_parse/parse_sec.c @@ -165,13 +165,12 @@ return False; if (UNMARSHALLING(ps)) { - /* - * Even if the num_aces is zero, allocate memory as there's a difference - * between a non-present DACL (allow all access) and a DACL with no ACE's - * (allow no access). - */ - if((psa->ace = PRS_ALLOC_MEM(ps, SEC_ACE, psa->num_aces+1)) == NULL) - return False; + if (psa->num_aces) { + if((psa->ace = PRS_ALLOC_MEM(ps, SEC_ACE, psa->num_aces)) == NULL) + return False; + } else { + psa->ace = NULL; + } } for (i = 0; i < psa->num_aces; i++) { Index: source/rpc_parse/parse_dfs.c =================================================================== --- source/rpc_parse/parse_dfs.c +++ source/rpc_parse/parse_dfs.c @@ -325,7 +325,14 @@ return False; if (UNMARSHALLING(ps)) { - v->stores = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->stores)*v->num_stores); + if (v->num_stores) { + v->stores = PRS_ALLOC_MEM(ps,NETDFS_DFS_STORAGEINFO,v->num_stores); + if (!v->stores) { + return False; + } + } else { + v->stores = NULL; + } } for (i_stores_1=0; i_stores_1num_stores;i_stores_1++) { if (!netdfs_io_dfs_StorageInfo_p("stores", &v->stores[i_stores_1], ps, depth)) @@ -447,7 +455,14 @@ return False; if (UNMARSHALLING(ps)) { - v->stores = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->stores)*v->num_stores); + if (v->num_stores) { + v->stores = PRS_ALLOC_MEM(ps,NETDFS_DFS_STORAGEINFO,v->num_stores); + if (!v->stores) { + return False; + } + } else { + v->stores = NULL; + } } for (i_stores_1=0; i_stores_1num_stores;i_stores_1++) { if (!netdfs_io_dfs_StorageInfo_p("stores", &v->stores[i_stores_1], ps, depth)) @@ -920,7 +936,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO1,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info1_p("s", &v->s[i_s_1], ps, depth)) @@ -986,7 +1009,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO2,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info2_p("s", &v->s[i_s_1], ps, depth)) @@ -1052,7 +1084,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO3,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info3_p("s", &v->s[i_s_1], ps, depth)) @@ -1118,7 +1158,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO4,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info4_p("s", &v->s[i_s_1], ps, depth)) @@ -1184,7 +1232,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO200,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info200_p("s", &v->s[i_s_1], ps, depth)) @@ -1250,7 +1306,14 @@ return False; if (UNMARSHALLING(ps)) { - v->s = (void *)PRS_ALLOC_MEM_VOID(ps,sizeof(*v->s)*v->count); + if (v->count) { + v->s = PRS_ALLOC_MEM(ps,NETDFS_DFS_INFO300,v->count); + if (!v->s) { + return False; + } + } else { + v->s = NULL; + } } for (i_s_1=0; i_s_1count;i_s_1++) { if (!netdfs_io_dfs_Info300_p("s", &v->s[i_s_1], ps, depth)) Index: source/rpc_parse/parse_lsa.c =================================================================== --- source/rpc_parse/parse_lsa.c +++ source/rpc_parse/parse_lsa.c @@ -1356,12 +1356,17 @@ &trn->num_entries2)) return False; + if (trn->num_entries2 != trn->num_entries) { + /* RPC fault */ + return False; + } + if (UNMARSHALLING(ps)) { - if ((trn->name = PRS_ALLOC_MEM(ps, LSA_TRANS_NAME, trn->num_entries)) == NULL) { + if ((trn->name = PRS_ALLOC_MEM(ps, LSA_TRANS_NAME, trn->num_entries2)) == NULL) { return False; } - if ((trn->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, trn->num_entries)) == NULL) { + if ((trn->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, trn->num_entries2)) == NULL) { return False; } } @@ -1413,12 +1418,17 @@ &trn->num_entries2)) return False; + if (trn->num_entries2 != trn->num_entries) { + /* RPC fault */ + return False; + } + if (UNMARSHALLING(ps)) { - if ((trn->name = PRS_ALLOC_MEM(ps, LSA_TRANS_NAME2, trn->num_entries)) == NULL) { + if ((trn->name = PRS_ALLOC_MEM(ps, LSA_TRANS_NAME2, trn->num_entries2)) == NULL) { return False; } - if ((trn->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, trn->num_entries)) == NULL) { + if ((trn->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, trn->num_entries2)) == NULL) { return False; } } @@ -2759,7 +2759,7 @@ static BOOL lsa_io_privilege_set(const char *desc, PRIVILEGE_SET *out, prs_struct *ps, int depth) { - uint32 i; + uint32 i, dummy; prs_debug(ps, depth, desc, "lsa_io_privilege_set"); depth++; @@ -2767,7 +2767,7 @@ if(!prs_align(ps)) return False; - if(!prs_uint32("count", ps, depth, &out->count)) + if(!prs_uint32("count", ps, depth, &dummy)) return False; if(!prs_uint32("control", ps, depth, &out->control)) return False; Index: source/rpc_parse/parse_spoolss.c =================================================================== --- source/rpc_parse/parse_spoolss.c +++ source/rpc_parse/parse_spoolss.c @@ -230,6 +230,10 @@ if (type->count2 != type->count) DEBUG(4,("What a mess, count was %x now is %x !\n", type->count, type->count2)); + if (type->count2 > MAX_NOTIFY_TYPE_FOR_NOW) { + return False; + } + /* parse the option type data */ for(i=0;icount2;i++) if(!prs_uint16("fields",ps,depth,&type->fields[i])) Index: source/include/smb_macros.h =================================================================== --- source/include/smb_macros.h +++ source/include/smb_macros.h @@ -295,7 +295,6 @@ #if defined(PARANOID_MALLOC_CHECKER) #define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem_((ps),sizeof(type),(count)) -#define PRS_ALLOC_MEM_VOID(ps, size) prs_alloc_mem_((ps),(size),1) /* Get medieval on our ass about malloc.... */ @@ -334,7 +333,6 @@ #else #define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem((ps),sizeof(type),(count)) -#define PRS_ALLOC_MEM_VOID(ps, size) prs_alloc_mem((ps),(size),1) /* Regular malloc code. */ samba-3.0.24-smbrun.patch: source-orig//configure |only source/lib/charcnv.c | 2 source/lib/smbrun.c | 31 ++++++- source/lib/util_str.c | 162 ++++++++++++++++++++++++++++++++++++++++ source/printing/print_generic.c | 2 5 files changed, 191 insertions(+), 6 deletions(-) --- NEW FILE samba-3.0.24-smbrun.patch --- Only in source-orig/: configure diff -u -r source-orig/lib/charcnv.c source/lib/charcnv.c --- source-orig/lib/charcnv.c 2006-04-19 19:29:23.000000000 -0700 +++ source/lib/charcnv.c 2007-05-10 09:59:49.023262000 -0700 @@ -1398,5 +1398,5 @@ /* We're hosed - we don't know how big this is... */ DEBUG(10,("next_mb_char_size: unknown size at string %s\n", s)); conv_silent = False; - return 1; + return (size_t)-1; } diff -u -r source-orig/lib/smbrun.c source/lib/smbrun.c --- source-orig/lib/smbrun.c 2006-04-19 19:29:23.000000000 -0700 +++ source/lib/smbrun.c 2007-05-10 09:57:03.305061000 -0700 @@ -55,7 +55,7 @@ outfd (or discard it if outfd is NULL). ****************************************************************************/ -int smbrun(const char *cmd, int *outfd) +static int smbrun_internal(const char *cmd, int *outfd, BOOL sanitize) { pid_t pid; uid_t uid = current_user.ut.uid; @@ -173,13 +173,36 @@ } #endif - execl("/bin/sh","sh","-c",cmd,NULL); + { + const char *newcmd = sanitize ? escape_shell_string(cmd) : cmd; + if (!newcmd) { + exit(82); + } + execl("/bin/sh","sh","-c",newcmd,NULL); + } /* not reached */ - exit(82); + exit(83); return 1; } +/**************************************************************************** + Use only in known safe shell calls (printing). +****************************************************************************/ + +int smbrun_no_sanitize(const char *cmd, int *outfd) +{ + return smbrun_internal(cmd, outfd, False); +} + +/**************************************************************************** + By default this now sanitizes shell expansion. +****************************************************************************/ + +int smbrun(const char *cmd, int *outfd) +{ + return smbrun_internal(cmd, outfd, True); +} /**************************************************************************** run a command being careful about uid/gid handling and putting the output in @@ -302,7 +325,7 @@ #endif execl("/bin/sh", "sh", "-c", cmd, NULL); - + /* not reached */ exit(82); return 1; diff -u -r source-orig/lib/util_str.c source/lib/util_str.c --- source-orig/lib/util_str.c 2007-02-04 10:59:17.000000000 -0800 +++ source/lib/util_str.c 2007-05-10 09:59:36.718762000 -0700 @@ -2426,3 +2426,165 @@ return True; } + +/******************************************************************* + Add a shell escape character '\' to any character not in a known list + of characters. UNIX charset format. +*******************************************************************/ + +#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabdefghijklmnopqrstuvwxyz_/ \t.," +#define INSIDE_DQUOTE_LIST "$`\n\"\\" + +char *escape_shell_string(const char *src) +{ + size_t srclen = strlen(src); + char *ret = SMB_MALLOC((srclen * 2) + 1); + char *dest = ret; + BOOL in_s_quote = False; + BOOL in_d_quote = False; + BOOL next_escaped = False; + + if (!ret) { + return NULL; + } + + while (*src) { + size_t c_size = next_mb_char_size(src); + + if (c_size == (size_t)-1) { + SAFE_FREE(ret); + return NULL; + } + + if (c_size > 1) { + memcpy(dest, src, c_size); + src += c_size; + dest += c_size; + next_escaped = False; + continue; + } + + /* + * Deal with backslash escaped state. + * This only lasts for one character. + */ + + if (next_escaped) { + *dest++ = *src++; + next_escaped = False; + continue; + } + + /* + * Deal with single quote state. The + * only thing we care about is exiting + * this state. + */ + + if (in_s_quote) { + if (*src == '\'') { + in_s_quote = False; + } + *dest++ = *src++; + continue; + } + + /* + * Deal with double quote state. The most + * complex state. We must cope with \, meaning + * possibly escape next char (depending what it + * is), ", meaning exit this state, and possibly + * add an \ escape to any unprotected character + * (listed in INSIDE_DQUOTE_LIST). + */ + + if (in_d_quote) { + if (*src == '\\') { + /* + * Next character might be escaped. + * We have to peek. Inside double + * quotes only INSIDE_DQUOTE_LIST + * characters are escaped by a \. + */ + + char nextchar; + + c_size = next_mb_char_size(&src[1]); + if (c_size == (size_t)-1) { + SAFE_FREE(ret); + return NULL; + } + if (c_size > 1) { + /* + * Don't escape the next char. + * Just copy the \. + */ + *dest++ = *src++; + continue; + } + + nextchar = src[1]; + + if (nextchar && strchr(INSIDE_DQUOTE_LIST, (int)nextchar)) { + next_escaped = True; + } + *dest++ = *src++; + continue; + } + + if (*src == '\"') { + /* Exit double quote state. */ + in_d_quote = False; + *dest++ = *src++; + continue; + } + + /* + * We know the character isn't \ or ", + * so escape it if it's any of the other + * possible unprotected characters. + */ + + if (strchr(INSIDE_DQUOTE_LIST, (int)*src)) { + *dest++ = '\\'; + } + *dest++ = *src++; + continue; + } + + /* + * From here to the end of the loop we're + * not in the single or double quote state. + */ + + if (*src == '\\') { + /* Next character must be escaped. */ + next_escaped = True; + *dest++ = *src++; + continue; + } + + if (*src == '\'') { + /* Go into single quote state. */ + in_s_quote = True; + *dest++ = *src++; + continue; + } + + if (*src == '\"') { + /* Go into double quote state. */ + in_d_quote = True; + *dest++ = *src++; + continue; + } + + /* Check if we need to escape the character. */ + + if (!strchr(INCLUDE_LIST, (int)*src)) { + *dest++ = '\\'; + } + *dest++ = *src++; + } + *dest++ = '\0'; + return ret; +} diff -u -r source-orig/printing/print_generic.c source/printing/print_generic.c --- source-orig/printing/print_generic.c 2007-02-04 10:59:13.000000000 -0800 +++ source/printing/print_generic.c 2007-05-10 09:57:03.292061000 -0700 @@ -58,7 +58,7 @@ if ( do_sub && snum != -1 ) standard_sub_snum(snum,syscmd,sizeof(syscmd)); - ret = smbrun(syscmd,outfd); + ret = smbrun_no_sanitize(syscmd,outfd); DEBUG(3,("Running the command `%s' gave %d\n",syscmd,ret)); Index: samba.spec =================================================================== RCS file: /cvs/dist/rpms/samba/FC-6/samba.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- samba.spec 5 Apr 2007 20:29:50 -0000 1.76 +++ samba.spec 14 May 2007 14:34:44 -0000 1.77 @@ -3,7 +3,7 @@ Summary: The Samba SMB server. Name: samba Version: 3.0.24 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 License: GNU GPL Version 2 Group: System Environment/Daemons @@ -11,7 +11,7 @@ #TAG: change for non-pre #Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}rc3.tar.gz -Source: ftp://us2.samba.org/pub/samba/%{name}-%{version}.tar.gz +Source: http://www.samba.org/samba/ftp/samba/%{name}-%{version}.tar.gz # Red Hat specific replacement-files Source1: samba.log @@ -52,6 +52,9 @@ Patch119: samba-3.0.24-enable_pam_nss_tests.patch Patch120: samba-3.0.24-nss_wins.patch Patch121: samba-3.0.24-vista_msdfs_errcodes.patch +Patch122: samba-3.0.24-become_root.patch +Patch123: samba-3.0.24-parse_validation.patch +Patch124: samba-3.0.24-smbrun.patch Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}-%{release} Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 @@ -142,6 +145,9 @@ %patch119 -p0 -b .pam_nss_test %patch120 -p0 -b .nss_wins %patch121 -p1 -b .msdfs +%patch122 -p0 -b .become_root +%patch123 -p0 -b .parse_validation +%patch124 -p0 -b .smbrun # crap rm -f examples/VFS/.cvsignore @@ -284,6 +290,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1* #rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbget.1* rm -f $RPM_BUILD_ROOT%{_mandir}/man5/smbgetrc.5* +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/vfstest.1* rm -f $RPM_BUILD_ROOT%{_mandir}/man1/testprns.1* rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmount.8* rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8* @@ -302,7 +309,7 @@ %preun if [ $1 = 0 ] ; then /sbin/chkconfig --del smb - rm -rf /var/log/samba/* /var/cache/samba/* + #rm -rf /var/log/samba/* /var/cache/samba/* /sbin/service smb stop >/dev/null 2>&1 fi exit 0 @@ -456,11 +463,17 @@ %{_mandir}/man1/wbinfo.1* %{_mandir}/man8/winbindd.8* %{_mandir}/man8/net.8* -%{_mandir}/man1/vfstest.1* +#%{_mandir}/man1/vfstest.1* %{_mandir}/man7/pam_winbind.7* %{_mandir}/man7/libsmbclient.7* %changelog +* Mon May 14 2007 Simo Sorce 3.0.24-5.fc6 +- Security fixes for + CVE-2007-2444 + CVE-2007-2446 + CVE-2007-2447 + * Thu Apr 5 2007 Simo Sorce 3.0.24-4.fc6 - sync up patches from the rawhide packages From fedora-cvs-commits at redhat.com Mon May 14 19:38:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 14 May 2007 15:38:53 -0400 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.41, 1.42 policy-fusermount.patch, 1.2, 1.3 selinux-policy.spec, 1.364, 1.365 Message-ID: <200705141938.l4EJcriI011068@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11051 Modified Files: policy-20061106.patch policy-fusermount.patch selinux-policy.spec Log Message: * Fri May 4 2007 Dan Walsh 2.4.6-69 - Fix vlc libraries to be textrel_shlib_t policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 93 ++++ policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 6 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 57 ++ policy/modules/admin/amtu.te | 56 ++ policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 24 - policy/modules/admin/kudzu.te | 14 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 14 policy/modules/admin/netutils.te | 13 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 18 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 86 +++ policy/modules/admin/rpm.te | 49 -- policy/modules/admin/su.if | 38 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 13 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 58 ++ policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 ++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 38 + policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 policy/modules/apps/mozilla.if | 208 ++++++++- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 6 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 20 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 29 + policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 140 ++++++ policy/modules/kernel/corenetwork.te.in | 14 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 ++ policy/modules/kernel/domain.te | 22 + policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 224 +++++++++- policy/modules/kernel/filesystem.if | 62 ++ policy/modules/kernel/filesystem.te | 20 policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 22 - policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 21 policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 3 policy/modules/services/aide.te | 11 policy/modules/services/amavis.if | 19 policy/modules/services/amavis.te | 2 policy/modules/services/apache.fc | 17 policy/modules/services/apache.if | 22 - policy/modules/services/apache.te | 43 + policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 40 + policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 6 policy/modules/services/bluetooth.te | 10 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 11 policy/modules/services/clamav.te | 3 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++-- policy/modules/services/cron.te | 58 ++ policy/modules/services/cups.fc | 4 policy/modules/services/cups.te | 19 policy/modules/services/cvs.te | 2 policy/modules/services/cyrus.te | 5 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 66 ++- policy/modules/services/dbus.te | 4 policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/dovecot.fc | 1 policy/modules/services/dovecot.if | 44 ++ policy/modules/services/dovecot.te | 56 ++ policy/modules/services/fail2ban.fc | 3 policy/modules/services/fail2ban.if | 80 +++ policy/modules/services/fail2ban.te | 74 +++ policy/modules/services/ftp.te | 19 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 57 ++ policy/modules/services/hal.te | 26 + policy/modules/services/inetd.te | 28 + policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 25 + policy/modules/services/kerberos.te | 15 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 57 +- policy/modules/services/lpd.te | 5 policy/modules/services/mailman.if | 20 policy/modules/services/mailman.te | 1 policy/modules/services/mta.fc | 1 policy/modules/services/mta.if | 20 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 34 + policy/modules/services/nscd.if | 20 policy/modules/services/nscd.te | 28 - policy/modules/services/ntp.te | 1 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 5 policy/modules/services/openca.if | 4 policy/modules/services/openca.te | 2 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 ++ policy/modules/services/pcscd.te | 79 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 11 policy/modules/services/portmap.te | 5 policy/modules/services/portslave.te | 1 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 22 - policy/modules/services/postfix.te | 48 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 28 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 2 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 22 - policy/modules/services/rlogin.te | 11 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.if | 3 policy/modules/services/rpc.te | 27 + policy/modules/services/rshd.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.fc | 5 policy/modules/services/samba.if | 62 ++ policy/modules/services/samba.te | 68 ++- policy/modules/services/sasl.te | 13 policy/modules/services/sendmail.if | 22 + policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 17 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 24 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 21 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 14 policy/modules/services/telnet.te | 3 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 +++ policy/modules/services/uucp.te | 44 +- policy/modules/services/uwimap.te | 1 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 190 ++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 180 +++++++- policy/modules/system/authlogin.te | 41 + policy/modules/system/clock.te | 18 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 policy/modules/system/init.if | 64 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 121 +++++ policy/modules/system/iptables.te | 23 - policy/modules/system/libraries.fc | 43 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 11 policy/modules/system/logging.fc | 5 policy/modules/system/logging.if | 61 ++ policy/modules/system/logging.te | 33 + policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 +- policy/modules/system/lvm.te | 87 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 +++ policy/modules/system/modutils.te | 26 + policy/modules/system/mount.te | 27 - policy/modules/system/netlabel.te | 6 policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 15 policy/modules/system/selinuxutil.fc | 12 policy/modules/system/selinuxutil.if | 122 +++++ policy/modules/system/selinuxutil.te | 134 ++---- policy/modules/system/sysnetwork.te | 13 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 + policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 policy/modules/system/unconfined.te | 23 + policy/modules/system/userdomain.if | 590 +++++++++++++++++++++++---- policy/modules/system/userdomain.te | 105 ++-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 53 ++ 251 files changed, 6269 insertions(+), 705 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.41 -r 1.42 policy-20061106.patch Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- policy-20061106.patch 3 May 2007 15:44:39 -0000 1.41 +++ policy-20061106.patch 14 May 2007 19:38:51 -0000 1.42 @@ -1,20 +1,20 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.4.6/config/appconfig-strict/seusers --- nsaserefpolicy/config/appconfig-strict/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-05-07 10:09:52.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u root:root __default__:user_u diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers --- nsaserefpolicy/config/appconfig-strict-mcs/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-05-07 10:09:52.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_contexts serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts --- nsaserefpolicy/config/appconfig-strict-mls/default_contexts 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts 2007-05-07 10:09:52.000000000 -0400 @@ -1,7 +1,7 @@ system_r:sulogin_t:s0 sysadm_r:sysadm_t:s0 -system_r:local_login_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0 @@ -28,14 +28,14 @@ staff_r:staff_su_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.4.6/config/appconfig-strict-mls/seusers --- nsaserefpolicy/config/appconfig-strict-mls/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-05-07 10:09:52.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mls_systemhigh root:root:s0-mls_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.4.6/man/man8/kerberos_selinux.8 --- nsaserefpolicy/man/man8/kerberos_selinux.8 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8 2007-05-07 10:09:52.000000000 -0400 @@ -18,7 +18,7 @@ .br service krb5kdc restart @@ -47,7 +47,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.4.6/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-05-07 10:09:52.000000000 -0400 @@ -619,6 +619,8 @@ send recv @@ -59,7 +59,7 @@ class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.4.6/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/global_tunables 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/global_tunables 2007-05-07 10:09:52.000000000 -0400 @@ -82,6 +82,14 @@ ## @@ -207,7 +207,7 @@ +gen_tunable(allow_console_login,false) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.4.6/policy/mls --- nsaserefpolicy/policy/mls 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/mls 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/mls 2007-05-07 10:09:52.000000000 -0400 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or @@ -281,7 +281,7 @@ mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.4.6/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-05-07 10:09:52.000000000 -0400 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -292,7 +292,7 @@ logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.4.6/policy/modules/admin/amanda.if --- nsaserefpolicy/policy/modules/admin/amanda.if 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-05-07 10:09:52.000000000 -0400 @@ -127,4 +127,21 @@ allow $1 amanda_log_t:file ra_file_perms; ') @@ -317,7 +317,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.4.6/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-05-07 10:09:52.000000000 -0400 @@ -75,6 +75,7 @@ allow amanda_t self:unix_dgram_socket create_socket_perms; allow amanda_t self:tcp_socket create_stream_socket_perms; @@ -337,14 +337,14 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.4.6/policy/modules/admin/amtu.fc --- nsaserefpolicy/policy/modules/admin/amtu.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc 2007-05-07 10:09:52.000000000 -0400 @@ -0,0 +1,3 @@ + +/usr/bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.4.6/policy/modules/admin/amtu.if --- nsaserefpolicy/policy/modules/admin/amtu.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.if 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.if 2007-05-07 10:09:52.000000000 -0400 @@ -0,0 +1,57 @@ +##

+## abstract Machine Test Utility @@ -405,7 +405,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.4.6/policy/modules/admin/amtu.te --- nsaserefpolicy/policy/modules/admin/amtu.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.te 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.te 2007-05-07 10:09:52.000000000 -0400 @@ -0,0 +1,56 @@ +policy_module(amtu,1.0.23) + @@ -465,7 +465,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/backup.te serefpolicy-2.4.6/policy/modules/admin/backup.te --- nsaserefpolicy/policy/modules/admin/backup.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/backup.te 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/backup.te 2007-05-07 10:09:52.000000000 -0400 @@ -82,3 +82,8 @@ optional_policy(` nis_use_ypbind(backup_t) @@ -477,7 +477,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.4.6/policy/modules/admin/bootloader.fc --- nsaserefpolicy/policy/modules/admin/bootloader.fc 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-05-07 10:09:52.000000000 -0400 @@ -2,11 +2,6 @@ /etc/lilo\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) /etc/yaboot\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) @@ -492,7 +492,7 @@ /sbin/ybin.* -- gen_context(system_u:object_r:bootloader_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.4.6/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-05-07 10:09:52.000000000 -0400 @@ -93,6 +93,8 @@ fs_manage_dos_files(bootloader_t) @@ -527,7 +527,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.4.6/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te 2007-05-07 10:09:52.000000000 -0400 @@ -8,7 +8,12 @@ type consoletype_t; @@ -583,7 +583,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ddcprobe.te serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te --- nsaserefpolicy/policy/modules/admin/ddcprobe.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te 2007-05-07 10:09:52.000000000 -0400 @@ -53,3 +53,13 @@ #reh why? this does not seem even necessary to function properly @@ -600,7 +600,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.4.6/policy/modules/admin/dmesg.te --- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-29 12:04:49.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/dmesg.te 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/dmesg.te 2007-05-07 10:09:52.000000000 -0400 @@ -10,6 +10,7 @@ type dmesg_t; type dmesg_exec_t; @@ -622,7 +622,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.4.6/policy/modules/admin/dmidecode.te --- nsaserefpolicy/policy/modules/admin/dmidecode.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/dmidecode.te 2007-05-03 09:44:16.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/dmidecode.te 2007-05-07 10:09:52.000000000 -0400 @@ -38,3 +38,8 @@ term_use_generic_ptys(dmidecode_t) term_use_unallocated_ttys(dmidecode_t) @@ -634,7 +634,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.if serefpolicy-2.4.6/policy/modules/admin/firstboot.if --- nsaserefpolicy/policy/modules/admin/firstboot.if 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if 2007-05-03 11:43:40.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if 2007-05-07 10:09:52.000000000 -0400 @@ -96,7 +96,7 @@ [...2305 lines suppressed...] -+++ serefpolicy-2.4.6/policy/modules/system/sysnetwork.te 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/sysnetwork.te 2007-05-07 10:09:52.000000000 -0400 @@ -175,6 +175,8 @@ dbus_connect_system_bus(dhcpc_t) dbus_send_system_bus(dhcpc_t) @@ -11907,7 +12026,15 @@ optional_policy(` networkmanager_dbus_chat(dhcpc_t) ') -@@ -333,6 +335,9 @@ +@@ -280,6 +282,7 @@ + allow ifconfig_t self:netlink_xfrm_socket { create_netlink_socket_perms nlmsg_read }; + allow ifconfig_t self:tcp_socket { create ioctl }; + files_read_etc_files(ifconfig_t); ++files_read_etc_runtime_files(ifconfig_t); + + kernel_use_fds(ifconfig_t) + kernel_read_system_state(ifconfig_t) +@@ -333,6 +336,9 @@ ifdef(`targeted_policy',` term_use_generic_ptys(ifconfig_t) term_use_unallocated_ttys(ifconfig_t) @@ -11917,7 +12044,7 @@ ') optional_policy(` -@@ -353,3 +358,10 @@ +@@ -353,3 +359,10 @@ xen_append_log(ifconfig_t) xen_dontaudit_rw_unix_stream_sockets(ifconfig_t) ') @@ -11930,14 +12057,14 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.fc serefpolicy-2.4.6/policy/modules/system/tzdata.fc --- nsaserefpolicy/policy/modules/system/tzdata.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.fc 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.fc 2007-05-07 10:09:52.000000000 -0400 @@ -0,0 +1,3 @@ +# tzdata executable will have: + +/usr/sbin/tzdata-update -- gen_context(system_u:object_r:tzdata_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.if serefpolicy-2.4.6/policy/modules/system/tzdata.if --- nsaserefpolicy/policy/modules/system/tzdata.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.if 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.if 2007-05-07 10:09:52.000000000 -0400 @@ -0,0 +1,23 @@ +## policy for tzdata + @@ -11964,7 +12091,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.te serefpolicy-2.4.6/policy/modules/system/tzdata.te --- nsaserefpolicy/policy/modules/system/tzdata.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.te 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.te 2007-05-07 10:09:52.000000000 -0400 @@ -0,0 +1,51 @@ +policy_module(tzdata,1.0.0) + @@ -12019,7 +12146,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.4.6/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.fc 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.fc 2007-05-07 10:09:52.000000000 -0400 @@ -7,6 +7,8 @@ ifdef(`targeted_policy',` /usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) @@ -12032,7 +12159,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.4.6/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.if 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.if 2007-05-07 10:09:52.000000000 -0400 @@ -31,6 +31,7 @@ allow $1 self:nscd *; allow $1 self:dbus *; @@ -12068,7 +12195,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.4.6/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.te 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.te 2007-05-07 10:09:52.000000000 -0400 @@ -48,6 +48,10 @@ userdom_priveleged_home_dir_manager(unconfined_t) @@ -12133,7 +12260,7 @@ init_dbus_chat_script(unconfined_execmem_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.4.6/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/userdomain.if 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/userdomain.if 2007-05-11 18:39:58.000000000 -0400 @@ -22,9 +22,9 @@ ## # @@ -12995,7 +13122,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.4.6/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/userdomain.te 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/userdomain.te 2007-05-07 10:09:52.000000000 -0400 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; @@ -13198,7 +13325,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-2.4.6/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.fc 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/xen.fc 2007-05-07 10:09:52.000000000 -0400 @@ -8,6 +8,7 @@ /usr/sbin/xm -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -13209,7 +13336,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.4.6/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-05-14 13:27:21.000000000 -0400 @@ -20,12 +20,15 @@ type xenctl_t; files_type(xenctl_t) @@ -13249,6 +13376,15 @@ # var/lib files for xend allow xend_t xend_var_lib_t:file create_file_perms; allow xend_t xend_var_lib_t:sock_file create_file_perms; +@@ -131,7 +138,7 @@ + + corecmd_exec_sbin(xend_t) + corecmd_exec_bin(xend_t) +-corecmd_exec_shell(xend_t) ++corecmd_exec_ls(xend_t) + + corenet_non_ipsec_sendrecv(xend_t) + corenet_tcp_sendrecv_all_if(xend_t) @@ -143,6 +150,7 @@ corenet_tcp_bind_generic_port(xend_t) corenet_tcp_bind_vnc_port(xend_t) @@ -13280,7 +13416,18 @@ storage_raw_read_removable_device(xend_t) term_getattr_all_user_ptys(xend_t) -@@ -236,6 +250,10 @@ +@@ -196,6 +210,10 @@ + + xen_stream_connect_xenstore(xend_t) + ++lvm_domtrans(xend_t) ++ ++mount_domtrans(xend_t) ++ + netutils_domtrans(xend_t) + + optional_policy(` +@@ -236,6 +254,10 @@ files_read_usr_files(xenconsoled_t) @@ -13291,7 +13438,7 @@ term_create_pty(xenconsoled_t,xen_devpts_t); term_use_generic_ptys(xenconsoled_t) term_use_console(xenconsoled_t) -@@ -283,6 +301,12 @@ +@@ -283,6 +305,12 @@ files_read_usr_files(xenstored_t) @@ -13304,7 +13451,7 @@ term_use_generic_ptys(xenstored_t) term_use_console(xenconsoled_t) -@@ -317,6 +341,11 @@ +@@ -317,6 +345,11 @@ allow xm_t xen_image_t:dir rw_dir_perms; allow xm_t xen_image_t:file r_file_perms; @@ -13316,7 +13463,15 @@ kernel_read_system_state(xm_t) kernel_read_kernel_sysctls(xm_t) -@@ -353,3 +382,12 @@ +@@ -325,6 +358,7 @@ + + corecmd_exec_bin(xm_t) + corecmd_exec_sbin(xm_t) ++corecmd_exec_sbin(xm_t) + + corenet_tcp_sendrecv_generic_if(xm_t) + corenet_tcp_sendrecv_all_nodes(xm_t) +@@ -353,3 +387,12 @@ xen_append_log(xm_t) xen_stream_connect(xm_t) xen_stream_connect_xenstore(xm_t) @@ -13331,7 +13486,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.4.6/Rules.modular --- nsaserefpolicy/Rules.modular 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/Rules.modular 2007-05-03 09:44:17.000000000 -0400 ++++ serefpolicy-2.4.6/Rules.modular 2007-05-07 10:09:52.000000000 -0400 @@ -219,6 +219,16 @@ ######################################## policy-fusermount.patch: modules/kernel/files.fc | 1 modules/kernel/filesystem.te | 6 modules/system/fusermount.fc | 6 modules/system/fusermount.if | 41 +++ modules/system/fusermount.te | 45 +++ modules/system/mount.fc | 3 modules/system/mount.if | 41 +++ modules/system/mount.te | 56 ++++ support/file_patterns.spt | 534 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 730 insertions(+), 3 deletions(-) Index: policy-fusermount.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-fusermount.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- policy-fusermount.patch 30 Mar 2007 14:56:09 -0000 1.2 +++ policy-fusermount.patch 14 May 2007 19:38:51 -0000 1.3 @@ -1,5 +1,5 @@ ---- /dev/null 2007-03-29 21:33:45.314015740 -0400 -+++ serefpolicy-2.4.6/policy/modules/system/fusermount.fc 2007-03-27 13:32:28.000000000 -0400 +--- /dev/null 2007-05-03 14:48:40.015638131 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/fusermount.fc 2007-04-03 09:09:12.000000000 -0400 @@ -0,0 +1,6 @@ +# fusermount executable will have: +# label: system_u:object_r:fusermount_exec_t @@ -7,9 +7,9 @@ +# MCS categories: + +/usr/bin/fusermount -- gen_context(system_u:object_r:fusermount_exec_t,s0) ---- serefpolicy-2.4.6/policy/modules/system/mount.te.fusermount 2007-03-27 13:32:28.000000000 -0400 -+++ serefpolicy-2.4.6/policy/modules/system/mount.te 2007-03-30 08:16:42.000000000 -0400 -@@ -12,6 +12,10 @@ +--- serefpolicy-2.4.6/policy/modules/system/mount.te.fusermount 2007-04-03 09:09:12.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/mount.te 2007-05-04 10:36:21.000000000 -0400 +@@ -12,6 +12,10 @@ init_system_domain(mount_t,mount_exec_t) userdom_executable_file(mount_exec_t) role system_r types mount_t; @@ -20,7 +20,7 @@ type mount_loopback_t; # customizable files_type(mount_loopback_t) -@@ -66,7 +70,6 @@ +@@ -66,7 +70,6 @@ fs_rw_tmpfs_chr_files(mount_t) fs_read_tmpfs_symlinks(mount_t) term_use_all_terms(mount_t) @@ -28,7 +28,7 @@ # required for mount.smbfs corecmd_exec_sbin(mount_t) -@@ -198,3 +201,49 @@ +@@ -198,3 +201,54 @@ ifdef(`targeted_policy',` files_etc_filetrans_etc_runtime(unconfined_mount_t,file) unconfined_domain(unconfined_mount_t) ') @@ -74,13 +74,18 @@ + nscd_socket_use(mount_ntfs_t) +') + ++optional_policy(` ++ hal_write_log(mount_ntfs_t) ++ hal_use_fds(mount_ntfs_t) ++') ++ +ifdef(`targeted_policy',` + term_use_generic_ptys(mount_ntfs_t) +') + --- serefpolicy-2.4.6/policy/modules/system/mount.if.fusermount 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/mount.if 2007-03-27 14:07:27.000000000 -0400 -@@ -147,3 +147,44 @@ ++++ serefpolicy-2.4.6/policy/modules/system/mount.if 2007-04-03 09:09:12.000000000 -0400 +@@ -147,3 +147,44 @@ interface(`mount_domtrans_unconfined',` refpolicywarn(`$0($1) has no effect in strict policy.') ') ') @@ -125,8 +130,8 @@ + + allow $1 mount_ntfs_t:unix_stream_socket { read write }; +') ---- /dev/null 2007-03-29 21:33:45.314015740 -0400 -+++ serefpolicy-2.4.6/policy/modules/system/fusermount.te 2007-03-27 14:52:59.000000000 -0400 +--- /dev/null 2007-05-03 14:48:40.015638131 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/fusermount.te 2007-04-03 09:09:12.000000000 -0400 @@ -0,0 +1,45 @@ +policy_module(fusermount,1.0.0) + @@ -173,8 +178,8 @@ + term_dontaudit_use_console(fusermount_t) +') + ---- /dev/null 2007-03-29 21:33:45.314015740 -0400 -+++ serefpolicy-2.4.6/policy/modules/system/fusermount.if 2007-03-27 13:32:28.000000000 -0400 +--- /dev/null 2007-05-03 14:48:40.015638131 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/fusermount.if 2007-04-03 09:09:12.000000000 -0400 @@ -0,0 +1,41 @@ +## policy for fusermount + @@ -218,16 +223,16 @@ + allow $1 fusermount_t:fd use; +') --- serefpolicy-2.4.6/policy/modules/system/mount.fc.fusermount 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/mount.fc 2007-03-27 13:32:28.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/mount.fc 2007-04-03 09:09:12.000000000 -0400 @@ -1,4 +1,3 @@ /bin/mount.* -- gen_context(system_u:object_r:mount_exec_t,s0) /bin/umount.* -- gen_context(system_u:object_r:mount_exec_t,s0) - -/usr/bin/fusermount -- gen_context(system_u:object_r:mount_exec_t,s0) +/sbin/mount.ntfs-3g -- gen_context(system_u:object_r:mount_ntfs_exec_t,s0) ---- serefpolicy-2.4.6/policy/modules/kernel/filesystem.te.fusermount 2007-03-27 13:32:27.000000000 -0400 -+++ serefpolicy-2.4.6/policy/modules/kernel/filesystem.te 2007-03-27 14:31:45.000000000 -0400 -@@ -60,6 +60,11 @@ +--- serefpolicy-2.4.6/policy/modules/kernel/filesystem.te.fusermount 2007-04-03 09:09:12.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/kernel/filesystem.te 2007-04-03 09:09:13.000000000 -0400 +@@ -60,6 +60,11 @@ type configfs_t; fs_type(configfs_t) genfscon configfs / gen_context(system_u:object_r:configfs_t,s0) @@ -239,7 +244,7 @@ type eventpollfs_t; fs_type(eventpollfs_t) # change to task SID 20060628 -@@ -69,6 +74,7 @@ +@@ -69,6 +74,7 @@ type fusefs_t; fs_type(fusefs_t) allow fusefs_t self:filesystem associate; genfscon fuse / gen_context(system_u:object_r:fusefs_t,s0) @@ -247,9 +252,9 @@ type futexfs_t; fs_type(futexfs_t) ---- serefpolicy-2.4.6/policy/modules/kernel/files.fc.fusermount 2007-03-27 13:32:27.000000000 -0400 -+++ serefpolicy-2.4.6/policy/modules/kernel/files.fc 2007-03-27 14:04:34.000000000 -0400 -@@ -54,6 +54,7 @@ +--- serefpolicy-2.4.6/policy/modules/kernel/files.fc.fusermount 2007-04-03 09:09:12.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/kernel/files.fc 2007-04-03 09:09:13.000000000 -0400 +@@ -54,6 +54,7 @@ ifdef(`distro_suse',` /etc/issue\.net -- gen_context(system_u:object_r:etc_runtime_t,s0) /etc/localtime -l gen_context(system_u:object_r:etc_t,s0) /etc/mtab -- gen_context(system_u:object_r:etc_runtime_t,s0) @@ -257,8 +262,8 @@ /etc/motd -- gen_context(system_u:object_r:etc_runtime_t,s0) /etc/nohotplug -- gen_context(system_u:object_r:etc_runtime_t,s0) /etc/nologin.* -- gen_context(system_u:object_r:etc_runtime_t,s0) ---- /dev/null 2007-03-29 21:33:45.314015740 -0400 -+++ serefpolicy-2.4.6/policy/support/file_patterns.spt 2007-03-27 13:32:28.000000000 -0400 +--- /dev/null 2007-05-03 14:48:40.015638131 -0400 ++++ serefpolicy-2.4.6/policy/support/file_patterns.spt 2007-04-03 09:09:13.000000000 -0400 @@ -0,0 +1,534 @@ +# +# Directory patterns (dir) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v retrieving revision 1.364 retrieving revision 1.365 diff -u -r1.364 -r1.365 --- selinux-policy.spec 3 May 2007 15:14:49 -0000 1.364 +++ selinux-policy.spec 14 May 2007 19:38:51 -0000 1.365 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.4.6 -Release: 68%{?dist} +Release: 69%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -360,6 +360,9 @@ %endif %changelog +* Fri May 4 2007 Dan Walsh 2.4.6-69 +- Fix vlc libraries to be textrel_shlib_t + * Thu May 3 2007 Dan Walsh 2.4.6-68 - Cleanup handling of audit messages From fedora-cvs-commits at redhat.com Mon May 14 19:55:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 14 May 2007 15:55:09 -0400 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch,1.42,1.43 Message-ID: <200705141955.l4EJt9FR011540@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11521 Modified Files: policy-20061106.patch Log Message: * Fri May 4 2007 Dan Walsh 2.4.6-69 - Fix vlc libraries to be textrel_shlib_t policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 93 ++++ policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 6 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 57 ++ policy/modules/admin/amtu.te | 56 ++ policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 24 - policy/modules/admin/kudzu.te | 14 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 14 policy/modules/admin/netutils.te | 13 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 18 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 86 +++ policy/modules/admin/rpm.te | 49 -- policy/modules/admin/su.if | 38 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 13 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 58 ++ policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 ++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 38 + policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 policy/modules/apps/mozilla.if | 208 ++++++++- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 6 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 20 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 29 + policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 140 ++++++ policy/modules/kernel/corenetwork.te.in | 14 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 ++ policy/modules/kernel/domain.te | 22 + policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 224 +++++++++- policy/modules/kernel/filesystem.if | 62 ++ policy/modules/kernel/filesystem.te | 20 policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 22 - policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 21 policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 3 policy/modules/services/aide.te | 11 policy/modules/services/amavis.if | 19 policy/modules/services/amavis.te | 2 policy/modules/services/apache.fc | 17 policy/modules/services/apache.if | 22 - policy/modules/services/apache.te | 43 + policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 40 + policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 6 policy/modules/services/bluetooth.te | 10 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 11 policy/modules/services/clamav.te | 3 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++-- policy/modules/services/cron.te | 58 ++ policy/modules/services/cups.fc | 4 policy/modules/services/cups.te | 19 policy/modules/services/cvs.te | 2 policy/modules/services/cyrus.te | 5 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 66 ++- policy/modules/services/dbus.te | 4 policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/dovecot.fc | 1 policy/modules/services/dovecot.if | 44 ++ policy/modules/services/dovecot.te | 56 ++ policy/modules/services/fail2ban.fc | 3 policy/modules/services/fail2ban.if | 80 +++ policy/modules/services/fail2ban.te | 74 +++ policy/modules/services/ftp.te | 19 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 114 +++++ policy/modules/services/hal.te | 26 + policy/modules/services/inetd.te | 28 + policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 25 + policy/modules/services/kerberos.te | 15 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 57 +- policy/modules/services/lpd.te | 5 policy/modules/services/mailman.if | 20 policy/modules/services/mailman.te | 1 policy/modules/services/mta.fc | 1 policy/modules/services/mta.if | 20 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 34 + policy/modules/services/nscd.if | 20 policy/modules/services/nscd.te | 28 - policy/modules/services/ntp.te | 1 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 5 policy/modules/services/openca.if | 4 policy/modules/services/openca.te | 2 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 ++ policy/modules/services/pcscd.te | 79 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 11 policy/modules/services/portmap.te | 5 policy/modules/services/portslave.te | 1 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 22 - policy/modules/services/postfix.te | 48 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 28 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 2 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 22 - policy/modules/services/rlogin.te | 11 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.if | 3 policy/modules/services/rpc.te | 27 + policy/modules/services/rshd.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.fc | 5 policy/modules/services/samba.if | 62 ++ policy/modules/services/samba.te | 68 ++- policy/modules/services/sasl.te | 13 policy/modules/services/sendmail.if | 22 + policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 17 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 24 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 21 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 14 policy/modules/services/telnet.te | 3 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 +++ policy/modules/services/uucp.te | 44 +- policy/modules/services/uwimap.te | 1 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 190 ++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 180 +++++++- policy/modules/system/authlogin.te | 41 + policy/modules/system/clock.te | 18 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 policy/modules/system/init.if | 64 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 121 +++++ policy/modules/system/iptables.te | 23 - policy/modules/system/libraries.fc | 43 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 11 policy/modules/system/logging.fc | 5 policy/modules/system/logging.if | 61 ++ policy/modules/system/logging.te | 33 + policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 +- policy/modules/system/lvm.te | 87 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 +++ policy/modules/system/modutils.te | 26 + policy/modules/system/mount.te | 27 - policy/modules/system/netlabel.te | 6 policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 15 policy/modules/system/selinuxutil.fc | 12 policy/modules/system/selinuxutil.if | 122 +++++ policy/modules/system/selinuxutil.te | 134 ++---- policy/modules/system/sysnetwork.te | 13 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 + policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 policy/modules/system/unconfined.te | 23 + policy/modules/system/userdomain.if | 590 +++++++++++++++++++++++---- policy/modules/system/userdomain.te | 105 ++-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 53 ++ 251 files changed, 6326 insertions(+), 705 deletions(-) Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- policy-20061106.patch 14 May 2007 19:38:51 -0000 1.42 +++ policy-20061106.patch 14 May 2007 19:55:07 -0000 1.43 @@ -5979,8 +5979,8 @@ +/var/run/haldaemon.pid -- gen_context(system_u:object_r:hald_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.4.6/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/hal.if 2007-05-07 10:09:52.000000000 -0400 -@@ -157,3 +157,60 @@ ++++ serefpolicy-2.4.6/policy/modules/services/hal.if 2007-05-14 15:52:03.000000000 -0400 +@@ -157,3 +157,117 @@ files_search_pids($1) allow $1 hald_var_run_t:file rw_file_perms; ') @@ -6007,7 +6007,64 @@ + +######################################## +## -+## Use file descriptors for hal ++## Do not audit attempts to write the hal ++## log files. ++## ++## ++## ++## Domain to not audit ++## ++## ++# ++interface(`hal_dontaudit_write_log',` ++ gen_require(` ++ type hald_log_t; ++ ') ++ ++ dontaudit $1 hald_log_t:file { append write }; ++') ++ ++######################################## ++## ++## Allow attempts to write the hal ++## log files. ++## ++## ++## ++## Domain to not audit ++## ++## ++# ++interface(`hal_write_log',` ++ gen_require(` ++ type hald_log_t; ++ ') ++ ++ logging_search_logs($1) ++ allow $1 hald_log_t:file rw_file_perms; ++') ++ ++######################################## ++## ++## Allow domain to use file descriptors from hal. ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`hal_use_fds',` ++ gen_require(` ++ type hald_t; ++ ') ++ ++ allow $1 hald_t:fd use; ++') ++ ++######################################## ++## ++## dontaudit use file descriptors for hal +## +## +## From fedora-cvs-commits at redhat.com Tue May 15 07:57:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 03:57:09 -0400 Subject: rpms/eclipse/FC-6 eclipse-launcher-addplatformtotildeeclipse.patch, 1.4, 1.5 eclipse.spec, 1.358, 1.359 Message-ID: <200705150757.l4F7v9IF028244@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28228 Modified Files: eclipse-launcher-addplatformtotildeeclipse.patch eclipse.spec Log Message: * Tue May 15 2007 Ben Konrath 3.2.2-6.fc6 - Another bug fix in launcher-addplatformtotildeeclipse.patch. - Resolves: #239991 eclipse-launcher-addplatformtotildeeclipse.patch: eclipse.c | 2 gtk/eclipseGtk.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) Index: eclipse-launcher-addplatformtotildeeclipse.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-launcher-addplatformtotildeeclipse.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- eclipse-launcher-addplatformtotildeeclipse.patch 1 May 2007 08:58:31 -0000 1.4 +++ eclipse-launcher-addplatformtotildeeclipse.patch 15 May 2007 07:57:07 -0000 1.5 @@ -4,8 +4,8 @@ retrieving revision 1.71 diff -u -r1.71 eclipse.c --- library/eclipse.c 25 Apr 2006 14:31:50 -0000 1.71 -+++ library/eclipse.c 1 May 2007 08:48:33 -0000 -@@ -512,6 +513,8 @@ ++++ library/eclipse.c 14 May 2007 11:14:30 -0000 +@@ -512,6 +512,8 @@ /* Get the command to start the Java VM. */ vmCommandArgs = getVMCommand( argc, argv ); @@ -20,8 +20,8 @@ retrieving revision 1.27 diff -u -r1.27 eclipseGtk.c --- library/gtk/eclipseGtk.c 27 Mar 2006 18:25:42 -0000 1.27 -+++ library/gtk/eclipseGtk.c 1 May 2007 08:48:33 -0000 -@@ -335,3 +335,109 @@ ++++ library/gtk/eclipseGtk.c 14 May 2007 11:14:30 -0000 +@@ -335,3 +335,120 @@ gtk_main_quit(); return FALSE; } @@ -29,44 +29,52 @@ +/* Add the platform to ~/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml */ +void addPlatformToTildeDotEclipse() +{ -+ gchar *platform_xml, *touched; ++ gchar *platform_xml, *touched, *dot_eclipse; + gchar *rcp321_position; + gchar *platform_xml_contents; + GError *error = NULL; + + platform_xml = g_strconcat(g_get_home_dir(), "/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml", NULL); ++ dot_eclipse = g_strconcat(g_get_home_dir(), "/.eclipse", NULL); + touched = g_strconcat(g_get_home_dir(), "/.eclipse/.homedirmodified-fedora", NULL); + + -+ if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS)) ++ if (!g_file_test(dot_eclipse, G_FILE_TEST_EXISTS)) + { -+ /* If platform.xml doesn't exist, Eclipse has yet to be started. ++ /* If .eclipse doesn't exist, Eclipse has yet to be started. + * We don't have worry about doing anything now and in the future + * so add the appropriate file to ~/.eclipse. */ -+ if (g_mkdir(g_strconcat(g_get_home_dir(), "/.eclipse", NULL), 493) < 0) ++ if (g_mkdir(g_strconcat(g_get_home_dir(), "/.eclipse", NULL), 511) < 0) + { + g_print("Error creating ~/.eclipse/."); -+ g_print(g_strconcat(error->message, "\n\0", NULL)); -+ g_free(error); ++ g_free(platform_xml); ++ g_free(dot_eclipse); ++ g_free(touched); ++ return; ++ + } + if (g_file_set_contents(touched, "\0", -1, &error) == FALSE) + { + g_print("Error touching ~/.eclipse/.homedirmodified-fedora."); + g_print(g_strconcat(error->message, "\n\0", NULL)); + g_free(error); ++ g_free(platform_xml); ++ g_free(dot_eclipse); ++ g_free(touched); ++ return; + } -+ g_free(platform_xml); -+ g_free(touched); -+ return; + -+ } else { ++ } ++ else if (g_file_test(platform_xml, G_FILE_TEST_EXISTS)) ++ { + /* platform_xml exists, workaround these two bugs: + * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238107 + * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238109 + * + * remove the unwanted feature if its in platform.xml */ + -+ if (g_file_get_contents(platform_xml, &platform_xml_contents, NULL, &error) == FALSE) { ++ if (g_file_get_contents(platform_xml, &platform_xml_contents, NULL, &error) == FALSE) ++ { + g_print("Error reading platform.xml in ~/.eclipse.\ + You should remove ~/.eclipse before restarting Eclipse:\0"); + g_print(g_strconcat(error->message, "\n\0", NULL)); @@ -91,19 +99,21 @@ + { + g_print("Error writing platform.xml in ~/.eclipse.\ + You should remove ~/.eclipse before restarting Eclipse:\0"); -+ g_print(g_strconcat(error->message, "\n\0", NULL)); ++ g_print(g_strconcat(error->message, "\n\0", NULL)); + g_free(error); + g_free(touched); ++ g_free(dot_eclipse); + g_free(platform_xml); + g_free(platform_xml_contents); + return; -+ } ++ } + -+ g_free(platform_xml_contents); ++ g_free(platform_xml_contents); + } + -+ -+ if (g_file_test(touched, G_FILE_TEST_EXISTS)) { ++ g_free(dot_eclipse); ++ if (g_file_test(touched, G_FILE_TEST_EXISTS)) ++ { + /* touched exists, we don't need to do anything */ + g_free(platform_xml); + g_free(touched); @@ -111,15 +121,16 @@ + } + + /* At this point platform_xml exists and touched does not exist. */ -+ if (g_remove(platform_xml) < 0) ++ if (g_file_test(platform_xml, G_FILE_TEST_EXISTS)) + { ++ if (g_remove(platform_xml) < 0) ++ { + g_print("Error writing platform.xml in ~/.eclipse.\ -+ You should remove ~/.eclipse before restarting Eclipse:\0"); -+ g_print(g_strconcat(error->message, "\n\0", NULL)); -+ g_free(error); -+ g_free(platform_xml); -+ g_free(touched); -+ return; ++ You should remove ~/.eclipse before restarting Eclipse:\0"); ++ g_free(platform_xml); ++ g_free(touched); ++ return; ++ } + } + if (g_file_set_contents(touched, "\0", -1, &error) == FALSE) + { Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v retrieving revision 1.358 retrieving revision 1.359 diff -u -r1.358 -r1.359 --- eclipse.spec 1 May 2007 08:59:47 -0000 1.358 +++ eclipse.spec 15 May 2007 07:57:07 -0000 1.359 @@ -19,7 +19,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 5%{?dist} +Release: 6%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1763,6 +1763,10 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Tue May 15 2007 Ben Konrath 3.2.2-6.fc6 +- Another bug fix in launcher-addplatformtotildeeclipse.patch. +- Resolves: #239991 + * Tue May 01 2007 Ben Konrath 3.2.2-5.fc6 - Bug fix in launcher-addplatformtotildeeclipse.patch. - Resolves: #238107. From fedora-cvs-commits at redhat.com Tue May 15 11:33:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 07:33:00 -0400 Subject: rpms/kdebase/devel FedoraFlyingHigh.kcsrc, NONE, 1.1 kdebase-3.5.6-kdm-alternatebackground.patch, NONE, 1.1 kderc, NONE, 1.1 .cvsignore, 1.55, 1.56 kdebase.spec, 1.246, 1.247 sources, 1.76, 1.77 Message-ID: <200705151133.l4FBX0Za031741@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31720 Modified Files: .cvsignore kdebase.spec sources Added Files: FedoraFlyingHigh.kcsrc kdebase-3.5.6-kdm-alternatebackground.patch kderc Log Message: - enable userlist by default in KDM, bz#239701 - own %%{_datadir}/apps/kdm/faces, bz#239694 - remove unneeded Rq on kdelibs-devel --- NEW FILE FedoraFlyingHigh.kcsrc --- [Color Scheme] Name=Fedora Flying High activeBackground=41,65,114 activeBlend=60,110,180 activeForeground=255,255,255 activeTitleBtnBg=220,220,220 alternateBackground=10,10,10 background=60,110,180 buttonBackground=10,10,10 buttonForeground=255,255,255 contrast=7 foreground=0,0,0 frame=239,239,239 handle=239,239,239 inactiveBackground=157,170,186 inactiveBlend=157,170,186 inactiveForeground=221,221,221 inactiveFrame=239,239,239 inactiveHandle=239,239,239 inactiveTitleBtnBg=220,220,220 linkColor=41,65,114 selectBackground=60,110,180 selectForeground=255,255,255 shadeSortColumn=true visitedLinkColor=82,24,139 windowBackground=10,10,10 windowForeground=255,255,255 kdebase-3.5.6-kdm-alternatebackground.patch: kgapp.cpp | 3 +++ kgreeter.cpp | 6 ++++++ kgreeter.h | 5 +++++ 3 files changed, 14 insertions(+) --- NEW FILE kdebase-3.5.6-kdm-alternatebackground.patch --- diff -ur kdebase-3.5.6/kdm/kfrontend/kgapp.cpp kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgapp.cpp --- kdebase-3.5.6/kdm/kfrontend/kgapp.cpp 2006-05-22 20:13:07.000000000 +0200 +++ kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgapp.cpp 2007-05-11 15:26:03.000000000 +0200 @@ -40,6 +40,7 @@ #include #include #include +#include #include // free(), exit() #include // alarm() @@ -145,6 +146,8 @@ if (!_colorScheme.isEmpty()) { KSimpleConfig config( _colorScheme, true ); config.setGroup( "Color Scheme" ); + flagAlternateBackground = true; + gAlternateBackground = config.readColorEntry( "alternateBackground" ); app.setPalette( app.createApplicationPalette( &config, 7 ) ); } diff -ur kdebase-3.5.6/kdm/kfrontend/kgreeter.cpp kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgreeter.cpp --- kdebase-3.5.6/kdm/kfrontend/kgreeter.cpp 2006-10-01 19:32:15.000000000 +0200 +++ kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgreeter.cpp 2007-05-11 15:26:44.000000000 +0200 @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -63,12 +64,17 @@ #include +bool flagAlternateBackground; +QColor gAlternateBackground; + class UserListView : public KListView { public: UserListView( QWidget *parent = 0, const char *name = 0 ) : KListView( parent, name ) , cachedSizeHint( -1, 0 ) { + if (flagAlternateBackground) + setAlternateBackground( gAlternateBackground ); setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored ); header()->hide(); addColumn( QString::null ); diff -ur kdebase-3.5.6/kdm/kfrontend/kgreeter.h kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgreeter.h --- kdebase-3.5.6/kdm/kfrontend/kgreeter.h 2005-10-10 17:04:31.000000000 +0200 +++ kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgreeter.h 2007-05-11 15:25:28.000000000 +0200 @@ -26,6 +26,8 @@ #ifndef KGREETER_H #define KGREETER_H +#include + #include "kgverify.h" #include "kgdialog.h" @@ -42,6 +44,9 @@ class QPopupMenu; class QListViewItem; +extern bool flagAlternateBackground; +extern QColor gAlternateBackground; + struct SessType { QString name, type; bool hid; --- NEW FILE kderc --- [General] activeFont=Sans,10,-1,5,50,0,0,0,0,0 background=230,230,230 fixed=Monospace,10,-1,5,50,0,0,0,1,0 font=Sans,10,-1,5,50,0,0,0,0,0 foreground=0,0,0 menuFont=Sans,10,-1,5,50,0,0,0,0,0 selectBackground=76,89,166 selectForeground=255,255,255 taskbarFont=Sans,10,-1,5,50,0,0,0,0,0 toolBarFont=Sans,10,-1,5,50,0,0,0,0,0 windowBackground=255,255,255 windowForeground=0,0,0 StandardFont=Sans,10,-1,5,50,0,0,0,0,0 [DirWatch] NFSPollInterval=5000 PollInterval=500 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdebase/devel/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 22 Mar 2007 18:42:13 -0000 1.55 +++ .cvsignore 15 May 2007 11:32:58 -0000 1.56 @@ -29,3 +29,4 @@ kde-redhat-config-3.5-fc5-0.5.tar.bz2 kdebase-3.5.6.tar.bz2 kde-redhat-config-3.5-fc5-0.6.tar.bz2 +kde-redhat-config-3.5-fc5-0.7.tar.bz2 Index: kdebase.spec =================================================================== RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- kdebase.spec 30 Apr 2007 13:08:52 -0000 1.246 +++ kdebase.spec 15 May 2007 11:32:58 -0000 1.247 @@ -17,7 +17,7 @@ Summary: K Desktop Environment - core files Name: kdebase Version: 3.5.6 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 6 Url: http://www.kde.org Group: User Interface/Desktops @@ -27,7 +27,7 @@ Source1: konsole.desktop Source2: KDE.session.gnome Source3: kde.desktop -Source4: kde-redhat-config-3.5-fc5-0.6.tar.bz2 +Source4: kde-redhat-config-3.5-fc5-0.7.tar.bz2 Source5: kde-np Source6: logrotate-kdm Source7: mailsettings.cc @@ -35,6 +35,8 @@ Source9: cr16-app-package_games_kids.png Source10: cr32-app-package_games_kids.png Source11: cr48-app-package_games_kids.png +Source12: kderc +SOurce13: FedoraFlyingHigh.kcsrc Patch0: kdebase-3.5.5-redhat-pam.patch Patch1: kdebase-3.5.6-1-redhat-startkde.patch @@ -59,6 +61,7 @@ Patch25: kdebase-3.5.4-konqueror-shortcut.patch Patch26: kdebase-3.5.5-suspend.patch Patch27: kdebase-3.5.6-consolekit-kdm.patch +Patch28: kdebase-3.5.6-kdm-alternatebackground.patch Provides: %{name} = %{epoch}:%{version}-%{release}.%{_arch} @@ -159,7 +162,6 @@ %package extras Summary: Extras packages from kdebase Requires: %{name} = %{epoch}:%{version}-%{release}.%{_arch} -Requires: kdelibs-devel >= %{version} Group: User Interface/Desktops %description extras @@ -194,6 +196,7 @@ %patch25 -p1 -b .konqueror-shortcut %patch26 -p1 -b .suspend %patch27 -p1 -b .consolekit +%patch28 -p1 -b .kdm-alternatebackground %if %{rhel} rm -rf kdeprint/kdeprintfax @@ -312,26 +315,11 @@ ln -fs ../../X11/xinit/Xsession Xsession popd -cat >>%{buildroot}/etc/kderc < - 7:3.5.6-6.fc7 +- enable userlist by default in KDM, bz#239701 +- own %%{_datadir}/apps/kdm/faces, bz#239694 +- remove unneeded Rq on kdelibs-devel + * Mon Apr 23 2007 Than Ngo - 6:3.5.6-6.fc7 - apply patch KDM to support ConsoleKit, thanks to Kevin Kofler and S.??a??lar Onur, #228111 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdebase/devel/sources,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- sources 22 Mar 2007 18:42:13 -0000 1.76 +++ sources 15 May 2007 11:32:58 -0000 1.77 @@ -1,2 +1,2 @@ a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2 -c5097bf3bf10849a6df9becd50d7cb66 kde-redhat-config-3.5-fc5-0.6.tar.bz2 +d52f08756a8d3e9df478506bd258a4d8 kde-redhat-config-3.5-fc5-0.7.tar.bz2 From fedora-cvs-commits at redhat.com Tue May 15 12:19:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 08:19:05 -0400 Subject: rpms/bind/FC-6 bind-chroot-admin.in, 1.16, 1.17 bind.spec, 1.150, 1.151 Message-ID: <200705151219.l4FCJ5pm032496@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv32481 Modified Files: bind-chroot-admin.in bind.spec Log Message: fixed bind-chroot-admin dynamic DNS handling (#239149) Index: bind-chroot-admin.in =================================================================== RCS file: /cvs/dist/rpms/bind/FC-6/bind-chroot-admin.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- bind-chroot-admin.in 27 Apr 2007 14:03:50 -0000 1.16 +++ bind-chroot-admin.in 15 May 2007 12:19:02 -0000 1.17 @@ -55,11 +55,9 @@ { if [ -x /usr/sbin/selinuxenabled ]; then /usr/sbin/selinuxenabled; - if [ $? -eq 0 ]; then - return 1; - fi; + return $?; fi; - return 0; + return 1; } function check_dirs() @@ -209,6 +207,27 @@ /bin/sed -i -e '/^ROOTDIR=/d' /etc/sysconfig/named; } +function master_zone_writes_enabled() +{ + if selinux_enabled; then + if [ -x /usr/sbin/getsebool ]; then + named_write_master_zones=`/usr/sbin/getsebool named_write_master_zones | cut -d' ' -f3`; + if [ $named_write_master_zones == "on" ]; then + return 0; + else + return 1; + fi; + fi; + fi; + + . /etc/sysconfig/named + if [ "$ENABLE_ZONE_WRITE" = [yY1]* ]; then + return 0; + fi; + + return 1; +} + function sync_files() { rootdir; @@ -248,9 +267,14 @@ };' > /etc/rndc.key; elif /bin/egrep -q '@KEY@' /etc/rndc.key; then /bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ; - fi - chown -h root:named /var/named/* >/dev/null 2>&1; - chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1; + fi + if master_zone_writes_enabled; then + chown -h named:named /var/named/* >/dev/null 2>&1; + chown -h named:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1; + else + chown -h root:named /var/named/* >/dev/null 2>&1; + chown -h root:named ${BIND_CHROOT_PREFIX}/var/named/* >/dev/null 2>&1; + fi chown -h root:named /etc/{named,rndc}.* >/dev/null 2>&1; chown -h root:named ${BIND_CHROOT_PREFIX}/etc/{named,rndc}.* >/dev/null 2>&1; chmod 750 ${pfx}/var/named >/dev/null 2>&1; Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-6/bind.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- bind.spec 27 Apr 2007 14:08:30 -0000 1.150 +++ bind.spec 15 May 2007 12:19:02 -0000 1.151 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.4 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -779,6 +779,9 @@ :; %changelog +* Tue May 15 2007 Adam Tkac 31:9.3.4-5.fc7 +- fixed bind-chroot-admin dynamic DNS handling (#239149) + * Fri Apr 27 2007 Adam Tkac 31:9.3.4-4.fc6 - fixed some issues in bind-chroot-admin script - fixed race-condition in dbus code (#235809) From fedora-cvs-commits at redhat.com Tue May 15 14:09:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 10:09:38 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils.spec, 1.127, 1.128 rpcgssd.init, 1.5, 1.6 rpcidmapd.init, 1.5, 1.6 rpcsvcgssd.init, 1.4, 1.5 Message-ID: <200705151409.l4FE9c6J001963@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv1942 Modified Files: nfs-utils.spec rpcgssd.init rpcidmapd.init rpcsvcgssd.init Log Message: - Added the -o nordirplus mount option (bz 220451) - Disabled the FSCache patch since its no longer supported in FC6 Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- nfs-utils.spec 12 May 2007 12:34:34 -0000 1.127 +++ nfs-utils.spec 15 May 2007 14:09:36 -0000 1.128 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.10 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 # group all 32bit related archs @@ -14,7 +14,7 @@ # Enable the ability to set the 'fsc' mount flag which # will allow NFS to use FS-Cache. -%define enablefscache 1 +%define enablefscache 0 Source0: http://www.kernel.org/pub/linux/utils/nfs/nfs-utils-1.0.10.tar.bz2 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz @@ -55,6 +55,7 @@ Patch84: nfs-utils-1.0.10-mountd-memleak.patch Patch85: nfs-utils-1.0.10-nfsd-macargs.patch Patch86: nfs-utils-1.0.10-mountd-etab.patch +Patch87: nfs-utils-1.0.10-mount-nordirplus.patch %if %{enablefscache} @@ -131,6 +132,7 @@ %patch84 -p1 %patch85 -p1 %patch86 -p1 +%patch87 -p1 %if %{enablefscache} %patch90 -p1 %endif @@ -319,6 +321,11 @@ %endif %changelog +* Tue May 15 2007 Steve Dickson 1.0.10-10 +- Added the -o nordirplus mount option (bz 220451) +- Disabled the FSCache patch since its no longer supported + in FC6 + * Thu May 10 2007 Steve Dickson 1.0.10-9 - Eliminate timeout on nfsd shutdowns (bz 222001) - Eliminate memory leak in mountd (bz 239536) Index: rpcgssd.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/rpcgssd.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rpcgssd.init 11 Jan 2006 21:55:51 -0000 1.5 +++ rpcgssd.init 15 May 2007 14:09:36 -0000 1.6 @@ -31,7 +31,6 @@ # Try to use machine credentials by default -OPTIONS="" RETVAL=0 LOCKFILE=/var/lock/subsys/rpcgssd prog="rpc.gssd" @@ -68,7 +67,7 @@ } # Start daemon. - daemon $prog ${OPTIONS} + daemon $prog ${RPCGSSDARGS} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $LOCKFILE Index: rpcidmapd.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/rpcidmapd.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rpcidmapd.init 11 Jan 2006 21:55:51 -0000 1.5 +++ rpcidmapd.init 15 May 2007 14:09:36 -0000 1.6 @@ -22,7 +22,9 @@ [ ! -x /usr/sbin/rpc.idmapd ] && exit 0 -OPTIONS="" +# Check for and source configuration file otherwise set defaults +[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs + RETVAL=0 LOCKFILE=/var/lock/subsys/rpcidmapd prog="rpc.idmapd" @@ -54,7 +56,7 @@ } # Start daemon. - daemon $prog ${OPTIONS} + daemon $prog ${RPCIDMAPDARGS} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $LOCKFILE Index: rpcsvcgssd.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/rpcsvcgssd.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpcsvcgssd.init 11 Jan 2006 21:55:51 -0000 1.4 +++ rpcsvcgssd.init 15 May 2007 14:09:36 -0000 1.5 @@ -29,7 +29,6 @@ # List of kernel modules to load [ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5" -OPTIONS="" RETVAL=0 LOCKFILE=/var/lock/subsys/rpcsvcgssd prog="rpc.svcgssd" @@ -67,7 +66,7 @@ } # Start daemon. - daemon $prog ${OPTIONS} + daemon $prog ${RPCSVCGSSDARGS} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $LOCKFILE From fedora-cvs-commits at redhat.com Tue May 15 14:46:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 10:46:16 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils-1.0.10-mount-nordirplus.patch, NONE, 1.1 Message-ID: <200705151446.l4FEkGjr003493@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv3475 Added Files: nfs-utils-1.0.10-mount-nordirplus.patch Log Message: added nfs-utils-1.0.10-mount-nordirplus.patch nfs-utils-1.0.10-mount-nordirplus.patch: nfs.man | 5 +++++ nfs_mount.h | 1 + nfsmount.c | 5 +++++ 3 files changed, 11 insertions(+) --- NEW FILE nfs-utils-1.0.10-mount-nordirplus.patch --- --- nfs-utils-1.0.10/utils/mount/nfs_mount.h.orig 2007-05-15 09:54:09.293871000 -0400 +++ nfs-utils-1.0.10/utils/mount/nfs_mount.h 2007-05-15 09:55:02.842057000 -0400 @@ -63,6 +63,7 @@ struct nfs_mount_data { #define NFS_MOUNT_BROKEN_SUID 0x0400 /* 4 */ #define NFS_MOUNT_NOACL 0x0800 /* 4 */ #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ +#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ /* security pseudoflavors */ --- nfs-utils-1.0.10/utils/mount/nfsmount.c.orig 2007-05-15 09:54:09.331833000 -0400 +++ nfs-utils-1.0.10/utils/mount/nfsmount.c 2007-05-15 09:55:02.852057000 -0400 @@ -762,6 +762,10 @@ parse_options(char *old_opts, struct nfs data->flags &= ~NFS_MOUNT_NOACL; if (!val) data->flags |= NFS_MOUNT_NOACL; + } else if (!strcmp(opt, "rdirplus")) { + data->flags &= ~NFS_MOUNT_NORDIRPLUS; + if (!val) + data->flags |= NFS_MOUNT_NORDIRPLUS; #endif } else { bad_option: @@ -947,6 +951,7 @@ nfsmount(const char *spec, const char *n #endif #if NFS_MOUNT_VERSION >= 5 printf("sec = %u ", data.pseudoflavor); + printf("readdirplus = %d ", (data.flags & NFS_MOUNT_NORDIRPLUS) != 0); #endif printf("\n"); #endif --- nfs-utils-1.0.10/utils/mount/nfs.man.orig 2007-05-15 09:54:09.210933000 -0400 +++ nfs-utils-1.0.10/utils/mount/nfs.man 2007-05-15 09:55:02.860057000 -0400 @@ -272,6 +272,11 @@ default UDP protocol. Many NFS servers .I udp Mount the NFS filesystem using the UDP protocol. This is the default. +.TP 1.5i +.I nordirplus +Disables NFSv3 READDIRPLUS RPCs. Use this options when +mounting servers that don't support or have broken +READDIRPLUS implementations. .P All of the non-value options have corresponding nooption forms. For example, nointr means don't allow file operations to be From fedora-cvs-commits at redhat.com Tue May 15 16:52:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 12:52:19 -0400 Subject: rpms/java-1.5.0-gcj/devel java-1.5.0-gcj.spec,1.18,1.19 Message-ID: <200705151652.l4FGqJ8M006233@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.5.0-gcj/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6219 Modified Files: java-1.5.0-gcj.spec Log Message: * Tue May 15 2007 Thomas Fitzsimmons - 1.5.0.0-15 - Require findutils for post and postun. - Resolves: rhbz#240159 Index: java-1.5.0-gcj.spec =================================================================== RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- java-1.5.0-gcj.spec 16 Apr 2007 15:57:43 -0000 1.18 +++ java-1.5.0-gcj.spec 15 May 2007 16:52:17 -0000 1.19 @@ -55,7 +55,7 @@ Name: %{name} Version: %{javaver}.%{buildver} -Release: 14%{?dist} +Release: 15%{?dist} Summary: JPackage runtime compatibility layer for GCJ Group: Development/Languages @@ -97,6 +97,8 @@ Requires(post): %{_bindir}/rebuild-gcj-db # rebuild-gcj-db requires gcj-dbtool Requires(post): %{_bindir}/gcj-dbtool%{gccsuffix} +# rebuild-gcj-db requires findutils +Requires(post): findutils # postun requires alternatives to uninstall tool alternatives Requires(postun): %{_sbindir}/alternatives # postun requires gij to retrieve gcc version @@ -107,6 +109,8 @@ Requires(postun): %{_bindir}/rebuild-gcj-db # rebuild-gcj-db requires gcj-dbtool Requires(postun): %{_bindir}/gcj-dbtool%{gccsuffix} +# rebuild-gcj-db requires findutils +Requires(postun): findutils # standard JPackage base provides Provides: jre-%{javaver}-%{origin} = %{version}-%{release} @@ -712,6 +716,10 @@ %endif %changelog +* Tue May 15 2007 Thomas Fitzsimmons - 1.5.0.0-15 +- Require findutils for post and postun. +- Resolves: rhbz#240159 + * Mon Apr 16 2007 Thomas Fitzsimmons - 1.5.0.0-14 - Import java-gcj-compat 1.0.76. - Related: rhbz#200836 From fedora-cvs-commits at redhat.com Tue May 15 18:33:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 14:33:17 -0400 Subject: rpms/jakarta-commons-modeler/FC-6 jakarta-commons-modeler-IntrospectionUtils.patch, NONE, 1.1 jakarta-commons-modeler.spec, 1.35, 1.36 Message-ID: <200705151833.l4FIXHfw009491@cvs.devel.redhat.com> Author: vivekl Update of /cvs/dist/rpms/jakarta-commons-modeler/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9397 Modified Files: jakarta-commons-modeler.spec Added Files: jakarta-commons-modeler-IntrospectionUtils.patch Log Message: - Transfer from RHEL-5 branch changes to fix memory leak (MODELER-15) and allow building of tomcat5 5.5.23 jakarta-commons-modeler-IntrospectionUtils.patch: IntrospectionUtils.java | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE jakarta-commons-modeler-IntrospectionUtils.patch --- --- ./src/java/org/apache/commons/modeler/util/IntrospectionUtils.java.orig 2007-04-24 14:01:40.000000000 -0400 +++ ./src/java/org/apache/commons/modeler/util/IntrospectionUtils.java 2007-04-24 14:02:38.000000000 -0400 @@ -834,6 +834,10 @@ static Hashtable objectMethods=new Hashtable(); + public static void clear() { + objectMethods.clear(); + } + public static Method[] findMethods( Class c ) { Method methods[]= (Method [])objectMethods.get( c ); if( methods != null ) return methods; Index: jakarta-commons-modeler.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-modeler/FC-6/jakarta-commons-modeler.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- jakarta-commons-modeler.spec 10 Aug 2006 19:40:02 -0000 1.35 +++ jakarta-commons-modeler.spec 15 May 2007 18:33:15 -0000 1.36 @@ -38,7 +38,7 @@ Name: jakarta-%{short_name} Version: 1.1 -Release: 8jpp.1 +Release: 8jpp.2%{?dist} Epoch: 0 Summary: Jakarta Commons Modeler Package License: Apache Software License @@ -47,6 +47,7 @@ #Patch: %{name}.no-licence.build.patch Patch0: %{name}.build.properties.default.patch Patch1: %{name}.build.xml.patch +Patch2: %{name}-IntrospectionUtils.patch Url: http://jakarta.apache.org/commons/%{base_name} BuildRequires: ant BuildRequires: jaxp_parser_impl @@ -99,6 +100,7 @@ #%%patch %patch0 %patch1 +%patch2 # remove all binary libs find . -name "*.jar" -exec rm -f {} \; @@ -165,6 +167,11 @@ %ghost %dir %{_javadocdir}/%{name} %changelog +* Sun Apr 29 2007 Vivek Lakshmanan - 0:1.1-8jpp.2 +- Add patch to fix jira task: MODELER-15 to allow tomcat5 5.5.23 + to build against j-c-modeler +- Resolves: bug 237704 + * Thu Aug 10 2006 Matt Wringe - 0:1.1-8jpp.1 - Merge with upstream version: - Add missing javadoc requires From fedora-cvs-commits at redhat.com Tue May 15 21:32:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 17:32:54 -0400 Subject: rpms/tomcat5/FC-6 tomcat5-5.5.23-WebappClassLoader-commons-modeler.patch, NONE, 1.1 tomcat5-5.5.23-http11-build.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.8, 1.9 tomcat5-5.5-jdtcompiler.patch, 1.1, 1.2 tomcat5-5.5-jk-build.patch, 1.2, 1.3 tomcat5-5.5.conf, 1.3, 1.4 tomcat5-5.5.init, 1.3, 1.4 tomcat5.spec, 1.94, 1.95 tomcat5-5.5-http11-build.patch, 1.2, NONE Message-ID: <200705152132.l4FLWswL014057@cvs.devel.redhat.com> Author: vivekl Update of /cvs/dist/rpms/tomcat5/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13916 Modified Files: .cvsignore sources tomcat5-5.5-jdtcompiler.patch tomcat5-5.5-jk-build.patch tomcat5-5.5.conf tomcat5-5.5.init tomcat5.spec Added Files: tomcat5-5.5.23-WebappClassLoader-commons-modeler.patch tomcat5-5.5.23-http11-build.patch Removed Files: tomcat5-5.5-http11-build.patch Log Message: - Backport tomcat5-5.5.23-0jpp.2 from RHEL-5 branch - Resolves: bug 240208 tomcat5-5.5.23-WebappClassLoader-commons-modeler.patch: WebappClassLoader.java | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE tomcat5-5.5.23-WebappClassLoader-commons-modeler.patch --- --- container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java.orig 2007-04-23 20:08:18.000000000 -0400 +++ container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java 2007-04-23 20:11:07.000000000 -0400 @@ -1641,7 +1641,7 @@ IntrospectionUtils.clear(); // Clear the IntrospectionUtils cache for modeler. - org.apache.commons.modeler.util.IntrospectionUtils.clear(); + //org.apache.commons.modeler.util.IntrospectionUtils.clear(); // Clear the classloader reference in common-logging org.apache.commons.logging.LogFactory.release(this); tomcat5-5.5.23-http11-build.patch: build.xml | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- NEW FILE tomcat5-5.5.23-http11-build.patch --- --- connectors/http11/build.xml.orig 2007-02-26 10:27:04.000000000 -0500 +++ connectors/http11/build.xml 2007-02-26 10:28:11.000000000 -0500 @@ -31,7 +31,7 @@ - + @@ -169,7 +169,10 @@ deprecation="${compile.deprecation}" optimize="${compile.optimize}"> - + + + + Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tomcat5/FC-6/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 5 Jul 2006 22:50:50 -0000 1.10 +++ .cvsignore 15 May 2007 21:32:50 -0000 1.11 @@ -1 +1 @@ -apache-tomcat-5.5.17-src.tar.gz +apache-tomcat-5.5.23-src.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tomcat5/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 5 Jul 2006 22:50:50 -0000 1.8 +++ sources 15 May 2007 21:32:50 -0000 1.9 @@ -1 +1 @@ -afedf090888029b19a1bebc471264105 apache-tomcat-5.5.17-src.tar.gz +362d1d8b15dc09882440dcab8c592dd7 apache-tomcat-5.5.23-src.tar.gz tomcat5-5.5-jdtcompiler.patch: JDTCompiler.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: tomcat5-5.5-jdtcompiler.patch =================================================================== RCS file: /cvs/dist/rpms/tomcat5/FC-6/tomcat5-5.5-jdtcompiler.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tomcat5-5.5-jdtcompiler.patch 23 Feb 2006 00:26:54 -0000 1.1 +++ tomcat5-5.5-jdtcompiler.patch 15 May 2007 21:32:50 -0000 1.2 @@ -1,5 +1,5 @@ ---- apache-tomcat-5.5.12-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java.original 2005-10-21 17:35:31.000000000 -0400 -+++ apache-tomcat-5.5.12-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java 2005-10-21 17:35:43.000000000 -0400 +--- jasper/src/share/org/apache/jasper/compiler/JDTCompiler.java.original 2005-10-21 17:35:31.000000000 -0400 ++++ jasper/src/share/org/apache/jasper/compiler/JDTCompiler.java 2005-10-21 17:35:43.000000000 -0400 @@ -177,7 +177,7 @@ ICompilationUnit compilationUnit = new CompilationUnit(sourceFile, className); tomcat5-5.5-jk-build.patch: build.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) Index: tomcat5-5.5-jk-build.patch =================================================================== RCS file: /cvs/dist/rpms/tomcat5/FC-6/tomcat5-5.5-jk-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomcat5-5.5-jk-build.patch 5 Jul 2006 22:50:50 -0000 1.2 +++ tomcat5-5.5-jk-build.patch 15 May 2007 21:32:50 -0000 1.3 @@ -13,7 +13,15 @@ -+ ++ +@@ -252,6 +252,7 @@ + + + ++ + + + Index: tomcat5-5.5.conf =================================================================== RCS file: /cvs/dist/rpms/tomcat5/FC-6/tomcat5-5.5.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tomcat5-5.5.conf 4 Oct 2006 20:19:04 -0000 1.3 +++ tomcat5-5.5.conf 15 May 2007 21:32:50 -0000 1.4 @@ -4,13 +4,6 @@ # Where your java installation lives JAVA_HOME="/usr/lib/jvm/java" -# You can pass some parameters to java -# here if you wish to -#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3" - -# Use JAVA_OPTS to set java.library.path for libtcnative.so -#JAVA_OPTS="-Djava.library.path=/usr/lib - # Where your tomcat installation lives # That change from previous RPM where TOMCAT_HOME # used to be /var/tomcat. @@ -20,6 +13,19 @@ CATALINA_TMPDIR="@@@TCHOME@@@/temp" JAVA_ENDORSED_DIRS="@@@TCHOME@@@/common/endorsed" +# You can pass some parameters to java +# here if you wish to +#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3" + +# Use JAVA_OPTS to set java.library.path for libtcnative.so +#JAVA_OPTS="-Djava.library.path=/usr/lib + +# Bug 190: +# https://www.jpackage.org/bugzilla/show_bug.cgi?id=190 +# System property catalina.ext.dirs should be set to its default value +# for ExtensionValidator to be functional. +JAVA_OPTS="$JAVA_OPTS -Dcatalina.ext.dirs=$CATALINA_HOME/shared/lib:$CATALINA_HOME/common/lib" + # What user should run tomcat TOMCAT_USER="tomcat" Index: tomcat5-5.5.init =================================================================== RCS file: /cvs/dist/rpms/tomcat5/FC-6/tomcat5-5.5.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tomcat5-5.5.init 4 Oct 2006 20:19:04 -0000 1.3 +++ tomcat5-5.5.init 15 May 2007 21:32:50 -0000 1.4 @@ -1,271 +1,317 @@ -#!/bin/sh +#!/bin/bash # -# Startup script for Tomcat 5.0, the Apache Servlet Engine +# tomcat5 This shell script takes care of starting and stopping Tomcat # # chkconfig: - 80 20 -# description: Tomcat 5.0 is the Apache Servlet Engine RI for Servlet 2.4/JSP 2.0 -# processname: tomcat -# pidfile: /var/run/tomcat5.pid -# config: /etc/tomcat5/tomcat5.conf # -# Gomez Henri -# Keith Irwin -# Nicolas Mailhot +### BEGIN INIT INFO +# Provides: tomcat5 +# Required-Start: $network $syslog +# Required-Stop: $network $syslog +# Default-Start: +# Default-Stop: +# Description: Release implementation for Servlet 2.4 and JSP 2.0 +# Short-Description: start and stop tomcat +### END INIT INFO # -# version 1.02 - Removed initlog support -# version 1.03 - Removed config: -# version 1.04 - tomcat will start before httpd and stop after httpd -# version 1.05 - jdk hardcoded to link /usr/java/jdk and tomcat runs as "nobody" -# version 1.06 - split up into script and config file -# version 1.07 - Rework from Nicolas ideas -# version 1.08 - Fix work dir permission at start time, switch to use tomcat4 -# version 1.09 - Fix pidfile and config tags -# version 1.10 - Fallback to su direct use on systems without Redhat/Mandrake init.d functions -# version 1.11 - Fix webapps dir permissions -# version 1.12 - remove initial start/stop level for chkconfig (- 80 20) -# version 1.13 - remove chown of logs/work/temp/webapps dir, owned by tomcat4 at install time -# version 1.14 - correct the start/stop ugly hack by waiting all the threads stops -# version 1.15 - ensure we're looking for TOMCAT_USER running catalina -# version 1.16 - Add support for CATALINA_PID env var -# version 1.17 - Remove run files only tomcat started correctl -# in start area, check that tomcat is not allready running -# version 1.18 - Fix kill typo (thanks Kaj J. Niemi) -# version 1.19 - Add jar relinking -# version 1.20 - Check there is no stalling tomcat4.pid -# version 1.20tc5 - Changed all instances of tomcat4 to tomcat5 except TOMCAT_USER -# version 1.20tc5rh - Changed TOMCAT_USER from tomcat4 to tomcat +# - originally written by Henri Gomez, Keith Irwin, and Nicolas Mailhot +# - heavily rewritten by Deepak Bhole and Jason Corley # -# Source function library. -if [ -x /etc/rc.d/init.d/functions ]; then -. /etc/rc.d/init.d/functions -fi +# commented out until the RHEL and FC daemon functions converge +# Source the function library +#if [ -r "/etc/rc.d/init.d/functions" ]; then + #. /etc/rc.d/init.d/functions +#fi -NAME=`basename $0` +NAME="$(basename $0)" unset ISBOOT -if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ] -then - NAME=${NAME:3} - ISBOOT=1 +if [ "${NAME:0:1}" = "S" -o "${NAME:0:1}" = "K" ]; then + NAME="${NAME:3}" + ISBOOT="1" fi # For SELinux we need to use 'runuser' not 'su' -if [ -x /sbin/runuser ] -then - SU=runuser +if [ -x "/sbin/runuser" ]; then + SU="/sbin/runuser" else - SU=su + SU="su" fi -# Get Tomcat config - +# Get the tomcat config (use this for environment specific settings) TOMCAT_CFG="/etc/tomcat5/tomcat5.conf" - -[ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}" +if [ -r "$TOMCAT_CFG" ]; then + . ${TOMCAT_CFG} +fi # Get instance specific config file -[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME +if [ -r "/etc/sysconfig/${NAME}" ]; then + . /etc/sysconfig/${NAME} +fi -#define which connector port to use -CONNECTOR_PORT=${CONNECTOR_PORT:-"8080"} +# Define which connector port to use +CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" -# Path to the tomcat launch script (direct don't use wrapper) -TOMCAT_SCRIPT=/usr/bin/dtomcat5 +# Path to the tomcat launch script +TOMCAT_SCRIPT="/usr/bin/dtomcat5" # Path to the script that will refresh jar symlinks on startup -TOMCAT_RELINK_SCRIPT="$CATALINA_HOME/bin/relink" +TOMCAT_RELINK_SCRIPT="${CATALINA_HOME}/bin/relink" -# Tomcat name :) -TOMCAT_PROG=$NAME +# Tomcat program name +TOMCAT_PROG="$NAME" -# if TOMCAT_USER is not set, use tomcat5 like Apache HTTP server -if [ -z "$TOMCAT_USER" ]; then - TOMCAT_USER="tomcat" -fi +# Define the tomcat username +TOMCAT_USER="${TOMCAT_USER:-tomcat}" -# Since the daemon function will sandbox $tomcat -# no environment stuff should be defined here anymore. -# Please use the /etc/tomcat.conf file instead ; it will -# be read by the $tomcat script - -RETVAL=0 - -function findFreePorts { - lower=8000 - randomPort1=0 - randomPort2=0 - randomPort3=0 - for (( i = 0 ; i <= 20; i++ )); do - RANDOM=$(date +%s) - randomPort1=$((RANDOM%2000+lower)) - randomPort2=$((RANDOM%2000+lower)) - randomPort3=$((RANDOM%2000+lower)) - `netstat -apntl|grep $randomPort1` - ret1=$? - `netstat -apntl|grep $randomPort2` - ret2=$? - `netstat -apntl|grep $randomPort3` - ret3=$? - if [ $ret1 -eq 1 ] && [ $ret2 -eq 1 ] && [ $ret3 -eq 1 ]; then - return - fi - done - randomPort1=0 - randomPort2=0 - randomPort3=0 +# Define the tomcat log file +TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat5/catalina.out}" + +RETVAL="0" + +# remove when the RHEL and FC daemon functions converge +# (pulled from /etc/rc.d/init.d/functions) +function checkpid() { + local i + for i in $* ; do + if [ -d "/proc/${i}" ]; then + return 0 + fi + done + return 1 } -# See how we were called. -start() { - echo -n "Starting $TOMCAT_PROG: " +# remove when the RHEL and FC daemon functions converge +# (pulled from /etc/rc.d/init.d/functions) +function echo_failure() { + echo -en "\\033[60G" + echo -n "[ " + echo -n $"FAILED" + echo -n " ]" + echo -ne "\r" + return 1 +} - if [ -f /var/lock/subsys/$NAME ] ; then - if [ -f /var/run/$NAME.pid ]; then - read kpid < /var/run/$NAME.pid - if checkpid $kpid 2>&1; then - echo "process allready running" - return -1 - else - echo "lock file found but no process running for pid $kpid, continuing" - fi - fi - fi - - export CATALINA_PID=/var/run/$NAME.pid - touch $CATALINA_PID - chown $TOMCAT_USER:$TOMCAT_USER $CATALINA_PID - - if [ $CATALINA_HOME != "/usr/share/tomcat5" ]; then - # if CATALINA_HOME does not exist - if [ ! -d "$CATALINA_HOME" ]; then - if [ ! -d "/var/lib/$NAME" ]; then - mkdir -p /var/lib/$NAME - cp -pL -R /var/lib/tomcat5/* /var/lib/$NAME - fi - mkdir -p $CATALINA_HOME - cp -pL -R /usr/share/tomcat5/bin $CATALINA_HOME - ln -fs /var/lib/$NAME/common $CATALINA_HOME/common - mkdir -p $CATALINA_HOME/conf - cp -pL -R /etc/tomcat5/* $CATALINA_HOME/conf/ - mkdir -p /var/log/$NAME - chown $TOMCAT_USER:$TOMCAT_USER /var/log/$NAME - ln -fs /var/log/$NAME $CATALINA_HOME/logs - ln -fs /var/lib/$NAME/server $CATALINA_HOME/server - ln -fs /var/lib/$NAME/shared $CATALINA_HOME/shared - mkdir -p /var/cache/$NAME/temp - ln -fs /var/cache/$NAME/temp $CATALINA_HOME/temp - ln -fs /var/lib/$NAME/webapps $CATALINA_HOME/webapps - mkdir -p /var/cache/$NAME/work - ln -fs /var/cache/$NAME/work $CATALINA_HOME/work - cp -pL -R /var/cache/tomcat5/work/* $CATALINA_HOME/work/ - fi - # modify port number so that multiple instances doesn't - # interfere with each other. - findFreePorts - if [ $randomPort1 -eq 0 ] || [ $randomPort2 -eq 0 ] || [ $randomPort3 -eq 0 ]; then - failure $"${NAME} startup" - echo "Can't find free ports" - return 1; +# remove when the RHEL and FC daemon functions converge +# (pulled from /etc/rc.d/init.d/functions) +function echo_success() { + echo -en "\\033[60G" + echo -n "[ " + echo -n $"OK" + echo -n " ]" + echo -ne "\r" + return 0 +} + +# Look for open ports, as the function name might imply +function findFreePorts() { + local isSet1="false" + local isSet2="false" + local isSet3="false" + local lower="8000" + randomPort1="0" + randomPort2="0" + randomPort3="0" + local -a listeners="( $( + netstat -ntl | \ + awk '/^tcp/ {gsub("(.)*:", "", $4); print $4}' + ) )" + while [ "$isSet1" = "false" ] || \ + [ "$isSet2" = "false" ] || \ + [ "$isSet3" = "false" ]; do + let port="${lower}+${RANDOM:0:4}" + if [ -z `expr " ${listeners[*]} " : ".*\( $port \).*"` ]; then + if [ "$isSet1" = "false" ]; then + export randomPort1="$port" + isSet1="true" + elif [ "$isSet2" = "false" ]; then + export randomPort2="$port" + isSet2="true" + elif [ "$isSet3" = "false" ]; then + export randomPort3="$port" + isSet3="true" fi - cp $CATALINA_HOME/conf/server.xml $CATALINA_HOME/conf/server.xml.orig - sed -e "s/8005/$randomPort1/g" -e "s/8080/$CONNECTOR_PORT/g" -e "s/8009/$randomPort2/g" -e "s/8443/$randomPort3/g" $CATALINA_HOME/conf/server.xml.orig > $CATALINA_HOME/conf/server.xml fi + done +} - options="" - for i in `grep -v "^#" /etc/tomcat5/tomcat5.conf |grep -v "^$"`; do - j=`echo $i| sed 's/\"//g'` - export $j - options="${options} export $j ;" - done - if [ -r /etc/sysconfig/$NAME ]; then - for i in `grep -v "^#" /etc/sysconfig/$NAME |grep -v "^$"`; do - j=`echo $i| sed 's/\"//g'` - export $j - options="${options} export $j ;" - done +function makeHomeDir() { + if [ ! -d "$CATALINA_HOME" ]; then + echo "$CATALINA_HOME does not exist, creating" + if [ ! -d "/var/lib/${NAME}" ]; then + mkdir -p /var/lib/${NAME} + cp -pLR /var/lib/tomcat5/* /var/lib/${NAME} fi + mkdir -p $CATALINA_HOME ${CATALINA_HOME}/conf /var/cache/${NAME}/temp \ + /var/cache/${NAME}/work /var/log/${NAME} + for i in temp work; do + ln -fs /var/cache/${NAME}/${i} ${CATALINA_HOME}/${i} + done + for i in common server shared webapps; do + ln -fs /var/lib/${NAME}/${i} ${CATALINA_HOME}/${i} + done + ln -fs /var/log/${NAME} ${CATALINA_HOME}/logs + cp -pLR /etc/tomcat5/* ${CATALINA_HOME}/conf/ + cp -pLR /usr/share/tomcat5/bin $CATALINA_HOME + cp -pLR /var/cache/tomcat5/work/* ${CATALINA_HOME}/work/ + chown ${TOMCAT_USER}:${TOMCAT_USER} /var/log/${NAME} + fi +} - $TOMCAT_RELINK_SCRIPT +function parseOptions() { + options="" + options="$options $( + awk '!/^#/ && !/^$/ { ORS=" "; print "export ", $0, ";" }' \ + $TOMCAT_CFG + )" + if [ -r "/etc/sysconfig/${NAME}" ]; then + options="$options $( + awk '!/^#/ && !/^$/ { ORS=" "; + print "export ", $0, ";" }' \ + /etc/sysconfig/${NAME} + )" + fi + TOMCAT_SCRIPT="$options $TOMCAT_SCRIPT" +} - TOMCAT_SCRIPT="$options $TOMCAT_SCRIPT" +# See how we were called. +function start() { + echo -n "Starting ${TOMCAT_PROG}: " + if [ -f "/var/lock/subsys/${NAME}" ] ; then + if [ -f "/var/run/${NAME}.pid" ]; then + read kpid < /var/run/${NAME}.pid + if checkpid $kpid 2>&1; then + echo "$NAME process already running" + return -1 + else + echo "lock file found but no process running for" + echo "pid $kpid, continuing" + fi + fi + fi + export CATALINA_PID="/var/run/${NAME}.pid" + touch $CATALINA_PID + chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID + if [ "$CATALINA_HOME" != "/usr/share/tomcat5" ]; then + # Create a tomcat directory if it doesn't exist + makeHomeDir + # If CATALINA_HOME doesn't exist modify port number so that + # multiple instances don't interfere with each other + findFreePorts + sed -i -e "s/8005/${randomPort1}/g" -e "s/8080/${CONNECTOR_PORT}/g" \ + -e "s/8009/${randomPort2}/g" -e "s/8443/${randomPort3}/g" \ + ${CATALINA_HOME}/conf/server.xml + fi + $TOMCAT_RELINK_SCRIPT + $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT start" >> $TOMCAT_LOG 2>&1 + RETVAL="$?" + if [ "$RETVAL" -eq 0 ]; then + echo_success + touch /var/lock/subsys/${NAME} + else + echo_failure + fi + echo + return $RETVAL +} - if [ -x /etc/rc.d/init.d/functions ]; then - daemon --user $TOMCAT_USER "$TOMCAT_SCRIPT" start - else - $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT start" - fi - - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch /var/lock/subsys/$NAME - return $RETVAL +function status() { + RETVAL="1" + if [ -f "/var/run/${NAME}.pid" ]; then + read kpid < /var/run/${NAME}.pid + if checkpid $kpid 2>&1; then + echo "$0 is already running (${kpid})" + RETVAL="0" + else + echo "lock file found but no process running for pid $kpid" + fi + else + pid="$(pgrep -u tomcat java)" + if [ -n "$pid" ]; then + echo "$0 running (${pid}) but no PID file exists" + RETVAL="0" + else + echo "$0 is stopped" + fi + fi + return $RETVAL } -stop() { +function stop() { + local STOP_VERBOSE="false" echo -n "Stopping $TOMCAT_PROG: " - - if [ -f /var/lock/subsys/$NAME ] ; then - if [ -x /etc/rc.d/init.d/functions ]; then - daemon --user $TOMCAT_USER "$TOMCAT_SCRIPT" stop - else - $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT stop" - fi - RETVAL=$? - - if [ $RETVAL = 0 ]; then - count=0; - - if [ -f /var/run/$NAME.pid ]; then - - read kpid < /var/run/$NAME.pid - let kwait=$SHUTDOWN_WAIT - - until [ `ps --pid $kpid | grep -c $kpid` = '0' ] || [ $count -gt $kwait ] - do - echo -n -e "\nwaiting for processes to exit"; - sleep 1 - let count=$count+1; - done - - if [ $count -gt $kwait ]; then - echo -n -e "\nkilling processes which didn't stop after $SHUTDOWN_WAIT seconds" - kill -9 $kpid - fi - - if [ $count -gt 0 ]; then - echo -n -e "\n" + if [ -f "/var/lock/subsys/${NAME}" ]; then + $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT stop" >> $TOMCAT_LOG 2>&1 + RETVAL="$?" + if [ "$RETVAL" -eq "0" ]; then + count="0" + if [ -f "/var/run/${NAME}.pid" ]; then + read kpid < /var/run/${NAME}.pid + until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \ + [ "$count" -gt "$SHUTDOWN_WAIT" ]; do + if [ "$STOP_VERBOSE" = "true" ]; then + echo -n -e "\nwaiting for processes $kpid to exit" + fi + sleep 1 + let count="${count}+1" + done + if [ "$count" -gt "$SHUTDOWN_WAIT" ]; then + if [ "$STOP_VERBOSE" = "true" ]; then + echo -n -e "\nkilling processes which didn't stop" + echo -n -e "after " + echo -n "$SHUTDOWN_WAIT seconds" + fi + kill -9 $kpid + fi + echo_success + if [ "$count" -gt "0" ]; then + echo -n -e "\n" + fi fi + rm -f /var/lock/subsys/$NAME /var/run/$NAME.pid + else + echo_failure fi - - rm -f /var/lock/subsys/$NAME /var/run/$NAME.pid - fi - fi } # See how we were called. case "$1" in - start) + start) + parseOptions start ;; - stop) + stop) + parseOptions stop ;; - restart) + restart) + parseOptions stop - sleep 2 + sleep 2 start ;; - condrestart) - if [ -f /var/run/$NAME.pid ] ; then - stop - start + condrestart) + if [ -f "/var/run/${NAME}.pid" ]; then + parseOptions + stop + start fi ;; - *) - echo "Usage: $TOMCAT_PROG {start|stop|restart|condrestart}" + status) + status + ;; + version) + parseOptions + "${JAVA_HOME}/bin/java" \ + -classpath "${CATALINA_HOME}/server/lib/catalina.jar" \ + org.apache.catalina.util.ServerInfo + ;; + *) + echo "Usage: $TOMCAT_PROG {start|stop|restart|condrestart|status|version}" exit 1 esac exit $RETVAL + Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/FC-6/tomcat5.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- tomcat5.spec 4 Oct 2006 20:19:04 -0000 1.94 +++ tomcat5.spec 15 May 2007 21:32:50 -0000 1.95 @@ -28,6 +28,23 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# XXX: +# Note that 5.5.23-0jpp* is a port of tomcat5-5.5.23-6jpp to the existing +# 5.5.17 spec. This is so that the core tomcat5 codebase can be upgraded +# without requiring additional/newer thirdparty dependencies + +# XXX: +# Note that the files matching the following globs have been removed: +# /var/tmp/tomcat5-0-5.5.23-0jpp*-root/usr/lib/gcj/tomcat5/applet* +# /var/tmp/tomcat5-0-5.5.23-0jpp*-root/usr/lib/gcj/tomcat5/jsp-examples* +# /var/tmp/tomcat5-0-5.5.23-0jpp*-root/usr/lib/gcj/tomcat5/sample* +# /var/tmp/tomcat5-0-5.5.23-0jpp*-root/usr/lib/gcj/tomcat5/servlets-examples* +# /var/tmp/tomcat5-0-5.5.23-0jpp*-root/usr/lib/gcj/tomcat5/servlets-cgi* +# /var/tmp/tomcat5-0-5.5.23-0jpp*-root/usr/lib/gcj/tomcat5/servlets-ssi* + +%define _with_gcj_support 1 + +%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} # If you want only apis to be built, # give rpmbuild option '--with apisonly' @@ -68,8 +85,10 @@ Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API Name: tomcat5 -Version: 5.5.17 -Release: 8jpp.1 +Version: 5.5.23 +# XXX: +# 0jpp.1.0.x.el5 <-> 0jpp.2.el5 <-> 0jpp_4rh (RHAPS) <-> 0jpp_5rh (DevSuite) +Release: 0jpp.2%{?dist} Epoch: 0 License: Apache Software License #Vendor: JPackage Project @@ -94,15 +113,23 @@ Patch9: %{name}-%{majversion}-jspc.sh.patch Patch10: %{name}-%{majversion}-setclasspath.sh.patch Patch12: %{name}-%{majversion}-util-build.patch -Patch13: %{name}-%{majversion}-http11-build.patch +Patch13: %{name}-%{version}-http11-build.patch Patch14: %{name}-%{majversion}-jk-build.patch Patch15: %{name}-%{majversion}-skip-native.patch Patch16: %{name}-%{majversion}-jspc-classpath.patch Patch17: %{name}-%{majversion}-gcj-class-init-workaround.patch #FIXME Disable JSP pre-compilation on ppc64 and x390x Patch18: %{name}-%{majversion}-skip-jsp-precompile.patch +# The following patch reverses a fix for a memory leak: +# https://issues.apache.org/jira/browse/MODELER-15 that forces the use of +# j-c-modeler-2.x +# Dont need this! We are building against 1.1 with a patch for MODELER-15 +#Patch19: %{name}-%{version}-WebappClassLoader-commons-modeler.patch BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root +%if ! %{gcj_support} +BuildArch: noarch +%endif Requires: jpackage-utils >= 0:1.6.0 # xml parsing packages @@ -138,7 +165,8 @@ BuildRequires: jakarta-commons-digester >= 0:1.7 BuildRequires: jakarta-commons-logging >= 0:1.0.4 BuildRequires: jakarta-commons-fileupload >= 0:1.0 -BuildRequires: jakarta-commons-modeler >= 1.1 +# Require modeler with MODELER-15 patch applied +BuildRequires: jakarta-commons-modeler >= 1.1-8jpp.1.0.1 BuildRequires: jakarta-commons-pool >= 0:1.2 BuildRequires: jakarta-commons-launcher >= 0:0.9 BuildRequires: jakarta-commons-el >= 0:1.0 @@ -167,10 +195,12 @@ #BuildRequires: javamail >= 0:1.3.3 BuildRequires: javamail >= 0:1.3.1 # libgcj aot-compiled native libraries +%if %{gcj_support} BuildRequires: java-gcj-compat-devel >= 1.0.43 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 %endif +%endif %description Tomcat is the servlet container that is used in the official Reference @@ -187,7 +217,7 @@ %if %{without_apisonly} %package webapps Group: System Environment/Applications -PreReq: %{name} = %{epoch}:%{version}-%{release} +Requires(pre): %{name} = %{epoch}:%{version}-%{release} Requires: jakarta-taglibs-standard >= 0:1.1.0 Summary: Web applications for Jakarta Tomcat @@ -196,10 +226,16 @@ %package admin-webapps Group: System Environment/Applications -PreReq: %{name} = %{epoch}:%{version}-%{release} +Requires(pre): %{name} = %{epoch}:%{version}-%{release} Requires: struts >= 0:1.1 Summary: The administrative web applications for Jakarta Tomcat +%if %{gcj_support} +Requires(post): java-gcj-compat >= 1.0.31 +Requires(postun): java-gcj-compat >= 1.0.31 +%endif + + %description admin-webapps The administrative web applications (admin and manager) for Jakarta Tomcat %endif @@ -213,9 +249,11 @@ Provides: servlet5 Provides: servlet24 Provides: servletapi5 +%if %{gcj_support} # libgcj aot-compiled native libraries Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +%endif %description servlet-%{servletspec}-api Contains the implementation classes @@ -226,9 +264,6 @@ Summary: Javadoc generated documentation for %{name}-servlet-%{servletspec}-api Obsoletes: servletapi5-javadoc Provides: servletapi5-javadoc -# libgcj aot-compiled native libraries -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 Requires(post): coreutils Requires(postun): coreutils @@ -242,12 +277,14 @@ Requires: servlet24 # We need this to indirectly get rid of legacy jsp included in old # servlet packages (one day we will be able to remove this) -PreReq: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} +Requires(pre): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Summary: Jakarta Tomcat Servlet and JSP implementation classes Provides: jsp +%if %{gcj_support} # libgcj aot-compiled native libraries Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +%endif %description jsp-%{jspspec}-api Contains the implementation classes @@ -256,9 +293,6 @@ %package jsp-%{jspspec}-api-javadoc Group: Development/Documentation Summary: Javadoc generated documentation for %{name}-jsp-%{jspspec}-api -# libgcj aot-compiled native libraries -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 Requires(post): coreutils Requires(postun): coreutils @@ -313,9 +347,11 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release} +%if %{gcj_support} # libgcj aot-compiled native libraries Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +%endif %description common-lib Libraries needed to run the Tomcat Web container (part) @@ -334,8 +370,9 @@ Requires(post): jakarta-commons-fileupload >= 0:1.0-1jpp Requires: jakarta-commons-logging >= 0:1.0.4 Requires(post): jakarta-commons-logging >= 0:1.0.4 -Requires: jakarta-commons-modeler >= 1.1 -Requires(post): jakarta-commons-modeler >= 1.1 +# Require modeler with MODELER-15 patch applied +Requires: jakarta-commons-modeler >= 1.1-8jpp.1.0.1 +Requires(post): jakarta-commons-modeler >= 1.1-8jpp.1.0.1 Requires: jaas Requires(post): jaas Requires: mx4j >= 0:3.0.1 @@ -345,9 +382,11 @@ # Other subpackages must go in first Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release} Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release} +%if %{gcj_support} # libgcj aot-compiled native libraries Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +%endif %description server-lib Libraries needed to run the Tomcat Web container (part) @@ -358,9 +397,11 @@ Summary: Compiler JARs and associated scripts for %{name} Obsoletes: jasper5 Provides: jasper5 +%if %{gcj_support} # libgcj aot-compiled native libraries Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +%endif %description %{jname} Compiler JARs and associated scripts for %{name} @@ -405,16 +446,21 @@ %patch9 -b .p9 %patch10 -b .p10 # omit jdtcompilerpatch for eclipse-ecj >= 3.1 -#%patch11 -b .p11 +# %%patch11 -b .p11 %patch12 -b .p12 %patch13 -b .p13 %patch14 -b .p14 +%if %{gcj_support} #%patch15 -b .p15 %patch16 -b .p16 #%patch17 -b .p17 %ifarch ppc64 s390x %patch18 -b .p18 %endif +%endif +# XXX: +# Dont need this! Building against j-c-modeler 1.1 with MODELER-15 patch +# %%patch19 -b .p19 %if %{without_ecj} rm %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java @@ -568,6 +614,7 @@ export CLASSPATH=$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar # build initial path structure install -d -m 755 $RPM_BUILD_ROOT{%{confdir},%{logdir},%{homedir},%{bindir}} +touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out install -d -m 755 $RPM_BUILD_ROOT{%{serverdir},%{tempdir},%{workdir}} install -d -m 755 $RPM_BUILD_ROOT{%{appdir},%{commondir},%{shareddir}} install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d,logrotate.d} @@ -824,9 +871,16 @@ %endif -# sample.war is a malformed zip file -#aot-compile-rpm --exclude /var/lib/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war -aot-compile-rpm +%if %{gcj_support} +# Remove non-standard jars from the list for aot compilation +aot-compile-rpm \ + --exclude var/lib/%{name}/webapps/tomcat-docs/appdev/sample/sample.war \ + --exclude var/lib/%{name}/webapps/servlets-examples/WEB-INF/classes \ + --exclude var/lib/%{name}/webapps/jsp-examples/WEB-INF/classes \ + --exclude var/lib/%{name}/webapps/jsp-examples/plugin/applet \ + --exclude var/lib/%{name}/server/lib/servlets-cgi.renametojar \ + --exclude var/lib/%{name}/server/lib/servlets-ssi.renametojar +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -850,10 +904,14 @@ build-jar-repository %{commondir}/endorsed jaxp_parser_impl \ xml-commons-apis 2>&1 build-jar-repository %{bindir} mx4j/mx4j 2>&1 +%if %{gcj_support} %{_bindir}/rebuild-gcj-db +%endif +%if %{gcj_support} %postun %{_bindir}/rebuild-gcj-db +%endif %post common-lib # Create automated links - since all needed extensions may not have been @@ -882,10 +940,14 @@ ln -sf %{_javadir}/jdtcore.jar . popd > /dev/null %endif +%if %{gcj_support} %{_bindir}/rebuild-gcj-db +%endif +%if %{gcj_support} %postun common-lib %{_bindir}/rebuild-gcj-db +%endif %post server-lib # Create automated links - since all needed extensions may not have been @@ -910,10 +972,14 @@ ln -sf %{_javadir}/jdtcore.jar . popd > /dev/null %endif +%if %{gcj_support} %{_bindir}/rebuild-gcj-db +%endif +%if %{gcj_support} %postun server-lib %{_bindir}/rebuild-gcj-db +%endif %post webapps # Create automated links - since all needed extensions may not have been @@ -926,10 +992,14 @@ [ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java build-jar-repository %{appdir}/jsp-examples/WEB-INF/lib \ jakarta-taglibs-core jakarta-taglibs-standard 2>&1 +%if %{gcj_support} %{_bindir}/rebuild-gcj-db +%endif +%if %{gcj_support} %postun webapps %{_bindir}/rebuild-gcj-db +%endif %post admin-webapps # Create automated links - since all needed extensions may not have been @@ -944,35 +1014,47 @@ find %{serverdir}/webapps/admin/WEB-INF/lib -name '\[*\]*.jar' \ -not -name 'catalina-admin*' -not -type d | xargs rm -f build-jar-repository %{serverdir}/webapps/admin/WEB-INF/lib struts 2>&1 +%if %{gcj_support} %{_bindir}/rebuild-gcj-db +%endif +%if %{gcj_support} %postun admin-webapps %{_bindir}/rebuild-gcj-db %endif +%endif %post servlet-%{servletspec}-api update-alternatives --install %{_javadir}/servlet.jar servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400 +%if %{gcj_support} %{_bindir}/rebuild-gcj-db +%endif %post servlet-%{servletspec}-api-javadoc rm -f %{_javadocdir}/servletapi # legacy symlink rm -f %{_javadocdir}/%{name}-servlet-%{servletspec}-api ln -s %{name}-servlet-%{servletspec}-api-%{version} \ %{_javadocdir}/%{name}-servlet-%{servletspec}-api +%if %{gcj_support} %{_bindir}/rebuild-gcj-db +%endif %postun servlet-%{servletspec}-api if [ "$1" = "0" ]; then update-alternatives --remove servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar fi +%if %{gcj_support} %{_bindir}/rebuild-gcj-db +%endif %post jsp-%{jspspec}-api update-alternatives --install %{_javadir}/jsp.jar jsp \ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000 +%if %{gcj_support} %{_bindir}/rebuild-gcj-db +%endif %post jsp-%{jspspec}-api-javadoc rm -f %{_javadocdir}/jsp-api # legacy symlink @@ -985,7 +1067,9 @@ update-alternatives --remove jsp \ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar fi +%if %{gcj_support} %{_bindir}/rebuild-gcj-db +%endif %if %{without_apisonly} %preun @@ -1064,6 +1148,7 @@ %attr(775,root,tomcat) %dir %{tempdir} %attr(775,root,tomcat) %dir %{workdir} %attr(755,tomcat,tomcat) %dir %{logdir} +%attr(644,tomcat,tomcat) %{logdir}/catalina.out %attr(775,root,tomcat) %dir %{confdir}/Catalina %attr(775,root,tomcat) %dir %{confdir}/Catalina/localhost %attr(755,root,root) %{_bindir}/* @@ -1092,18 +1177,22 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{commondir}/i18n/* +%if %{gcj_support} %attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap* %attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon* %attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api* #%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli* %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant* +%endif %files common-lib %defattr(644,root,root,755) %dir %{_javadir}/%{name} %{_javadir}/%{name}/naming*.jar %{commondir}/lib/* +%if %{gcj_support} %attr(-,root,root) %{_libdir}/gcj/%{name}/naming-* +%endif %files server-lib %defattr(644,root,root,755) @@ -1118,21 +1207,23 @@ %{_javadir}/%{name}/servlets*.jar %{_javadir}/%{name}/tomcat*.jar %{serverdir}/lib/* +%if %{gcj_support} %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-ant* %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-cluster* %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-optional* %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-storeconfig* %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-%{version}.jar* -%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-cgi* +#%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-cgi* %attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-default* %attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-invoker* -%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-ssi* +#%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-ssi* %attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-webdav* %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-ajp* %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-apr* %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-coyote* %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-http* %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-util* +%endif %files webapps %defattr(644,root,tomcat,775) @@ -1146,13 +1237,15 @@ %{appdir}/tomcat-docs/* %dir %{appdir}/webdav %{appdir}/webdav/* -%attr(-,root,root) %{_libdir}/gcj/%{name}/applet* +#%attr(-,root,root) %{_libdir}/gcj/%{name}/applet* +%if %{gcj_support} %ifnarch ppc64 s390x %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-root* %endif -%attr(-,root,root) %{_libdir}/gcj/%{name}/jsp-examples* -%attr(-,root,root) %{_libdir}/gcj/%{name}/sample* -%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-examples* +#%attr(-,root,root) %{_libdir}/gcj/%{name}/jsp-examples* +#%attr(-,root,root) %{_libdir}/gcj/%{name}/sample* +#%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-examples* +%endif %files admin-webapps %defattr(640,root,tomcat,750) @@ -1166,11 +1259,13 @@ %attr(644,root,root) %{_javadir}/%{name}/catalina-admin*.jar %attr(644,root,root) %{_javadir}/%{name}/catalina-manager*.jar %attr(644,root,root) %{_javadir}/%{name}/catalina-host-manager*.jar +%if %{gcj_support} %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-admin* %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-balancer* %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-host-manager* %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-manager* %attr(-,root,root) %{_libdir}/gcj/%{name}/commons-fileupload* +%endif %files %{jname} %defattr(644,root,root,755) @@ -1178,7 +1273,9 @@ %{_javadir}/%{jname}5-*.jar %attr(755,root,root) %{_bindir}/%{jname}*.sh %attr(755,root,root) %{_bindir}/jspc*.sh +%if %{gcj_support} %attr(-,root,root) %{_libdir}/gcj/%{name}/%{jname}5-* +%endif %files %{jname}-javadoc %defattr(0644,root,root,0755) @@ -1191,7 +1288,9 @@ %doc %{packdname}/build/LICENSE %{_javadir}/%{name}-servlet-%{servletspec}-api*.jar %{_javadir}/servletapi5.jar +%if %{gcj_support} %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-servlet-%{servletspec}-api* +%endif %files servlet-%{servletspec}-api-javadoc %defattr(-,root,root) @@ -1203,7 +1302,9 @@ %doc %{packdname}/build/LICENSE %{_javadir}/%{name}-jsp-%{jspspec}-api*.jar %{_javadir}/jspapi.jar +%if %{gcj_support} %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jsp-%{jspspec}-api* +%endif %files jsp-%{jspspec}-api-javadoc %defattr(-,root,root) @@ -1211,6 +1312,19 @@ %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api %changelog +* Tue May 8 2007 Vivek Lakshmanan - 0:5.5.23-0jpp.2 +- Rebuild +- Add catalina.out to the rpm and set explicit permissions; tomcat ownership +- Resolves: bug 237088 + +* Mon Apr 23 2007 Vivek Lakshmanan - 0:5.5.23-0jpp.1 +- Resolves: bug 237088 +- Merge 0:5.5.17-8jpp.2 with sources/patches from 5.5.23 +- Build against jakarta-commons-modeler 1.1 with MODELER-15 patch + +* Thu Jan 18 2007 Rafael Schloming - 0:5.5.17-8jpp.2 +- Changed PreReq to Requires(pre) + * Wed Oct 4 2006 Fernando Nasser 0:5.5.17-8jpp.1 - Merge with upstream --- tomcat5-5.5-http11-build.patch DELETED --- From fedora-cvs-commits at redhat.com Wed May 16 01:05:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 21:05:06 -0400 Subject: rpms/tomcat5/devel tomcat5-5.5.23-http11-build.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.9, 1.10 tomcat5-5.5-jasper.sh.patch, 1.2, 1.3 tomcat5-5.5-jk-build.patch, 1.2, 1.3 tomcat5-5.5.init, 1.4, 1.5 tomcat5-5.5.relink, 1.5, 1.6 tomcat5-5.5-http11-build.patch, 1.2, NONE Message-ID: <200705160105.l4G156H7017498@cvs.devel.redhat.com> Author: vivekl Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17463 Modified Files: .cvsignore sources tomcat5-5.5-jasper.sh.patch tomcat5-5.5-jk-build.patch tomcat5-5.5.init tomcat5-5.5.relink Added Files: tomcat5-5.5.23-http11-build.patch Removed Files: tomcat5-5.5-http11-build.patch Log Message: - Merge with latest from JPP - Replace references to geronimo JTA with a generic one available in Fedora - Use Fedora compliant build root specification - Enabling juli still kills tomcat5 on startup, disabled - Add patch to force -source to 5.0 when 1.5 support enabled since ecj seems to use 1.4 as default still tomcat5-5.5.23-http11-build.patch: build.xml | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- NEW FILE tomcat5-5.5.23-http11-build.patch --- --- connectors/http11/build.xml.orig 2007-02-26 10:27:04.000000000 -0500 +++ connectors/http11/build.xml 2007-02-26 10:28:11.000000000 -0500 @@ -31,7 +31,7 @@ - + @@ -169,7 +169,10 @@ deprecation="${compile.deprecation}" optimize="${compile.optimize}"> - + + + + Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 19 Feb 2007 18:52:28 -0000 1.11 +++ .cvsignore 16 May 2007 01:05:04 -0000 1.12 @@ -1 +1 @@ -apache-tomcat-5.5.20-src.tar.gz +apache-tomcat-5.5.23-src.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 19 Feb 2007 18:52:28 -0000 1.9 +++ sources 16 May 2007 01:05:04 -0000 1.10 @@ -1 +1 @@ -5775bae8fac16a0e3a2c913c4768bb37 apache-tomcat-5.5.20-src.tar.gz +362d1d8b15dc09882440dcab8c592dd7 apache-tomcat-5.5.23-src.tar.gz tomcat5-5.5-jasper.sh.patch: jasper.sh | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) Index: tomcat5-5.5-jasper.sh.patch =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jasper.sh.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomcat5-5.5-jasper.sh.patch 5 Jul 2006 22:50:50 -0000 1.2 +++ tomcat5-5.5-jasper.sh.patch 16 May 2007 01:05:04 -0000 1.3 @@ -1,6 +1,6 @@ --- jasper/src/bin/jasper.sh.sav 2006-03-23 17:14:58.000000000 +0100 +++ jasper/src/bin/jasper.sh 2006-03-23 17:24:56.000000000 +0100 -@@ -45,34 +45,38 @@ +@@ -45,34 +45,37 @@ . "$JASPER_HOME"/bin/setenv.sh fi @@ -42,15 +42,14 @@ +CLASSPATH=$CLASSPATH:$(build-classpath \ + ant \ + commons-collections \ -+ commons-el \ + commons-daemon \ ++ commons-el \ + commons-logging \ -+ jasper-compiler \ -+ jasper-runtime \ -+ jdtcore.jar \ -+ \ -+ jsp-2.0-api \ -+ servlet-2.4-api \ ++ eclipse-ecj.jar \ ++ jasper5-compiler \ ++ jasper5-runtime \ ++ jsp \ ++ servlet \ + xerces-j2 \ + xml-commons-apis \ +) tomcat5-5.5-jk-build.patch: build.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) Index: tomcat5-5.5-jk-build.patch =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5-jk-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomcat5-5.5-jk-build.patch 5 Jul 2006 22:50:50 -0000 1.2 +++ tomcat5-5.5-jk-build.patch 16 May 2007 01:05:04 -0000 1.3 @@ -13,7 +13,15 @@ -+ ++ +@@ -252,6 +252,7 @@ + + + ++ + + + Index: tomcat5-5.5.init =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.5.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tomcat5-5.5.init 19 Feb 2007 18:52:28 -0000 1.4 +++ tomcat5-5.5.init 16 May 2007 01:05:04 -0000 1.5 @@ -2,17 +2,16 @@ # # tomcat5 This shell script takes care of starting and stopping Tomcat # -### BEGIN INIT INFO # chkconfig: - 80 20 +# +### BEGIN INIT INFO # Provides: tomcat5 # Required-Start: $network $syslog # Required-Stop: $network $syslog -# Default-Start: - -# Default-Stop: - -# description: Tomcat 5.5 is the Servlet Engine RI for Servlet 2.4/JSP 2.0 -# processname: tomcat -# pidfile: /var/run/tomcat5.pid -# config: /etc/tomcat5/tomcat5.conf +# Default-Start: +# Default-Stop: +# Description: Release implementation for Servlet 2.4 and JSP 2.0 +# Short-Description: start and stop tomcat ### END INIT INFO # # - originally written by Henri Gomez, Keith Irwin, and Nicolas Mailhot @@ -144,7 +143,7 @@ cp -pLR /var/lib/tomcat5/* /var/lib/${NAME} fi mkdir -p $CATALINA_HOME ${CATALINA_HOME}/conf /var/cache/${NAME}/temp \ - /var/cache/${NAME}/work /var/log/${NAME} + /var/cache/${NAME}/work /var/log/${NAME} for i in temp work; do ln -fs /var/cache/${NAME}/${i} ${CATALINA_HOME}/${i} done --- tomcat5-5.5-http11-build.patch DELETED --- From fedora-cvs-commits at redhat.com Wed May 16 01:09:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 21:09:27 -0400 Subject: rpms/tomcat5/devel tomcat5.spec,1.96,1.97 Message-ID: <200705160109.l4G19RL1017638@cvs.devel.redhat.com> Author: vivekl Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17569 Modified Files: tomcat5.spec Log Message: - Resolve: bug 240208 - Import and merge 0:5.5.23-9jpp from JPP - Fix formatting of spec - Use eclipse-ecj in place of ecj - Apply GCJ specific patches - Use generic jta for now instead of geronimo-jta-1.0.1B-api - Add tomcat-juli.jar since gcc bug 29869 is fixed Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- tomcat5.spec 14 Mar 2007 21:36:42 -0000 1.96 +++ tomcat5.spec 16 May 2007 01:09:25 -0000 1.97 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2005, JPackage Project +# Copyright (c) 2000-2007, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -28,6 +28,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # %define _with_gcj_support 1 +%define section free + %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} # If you want only apis to be built, @@ -36,8 +38,7 @@ %define without_apisonly %{!?_with_apisonly:1}%{?_with_apisonly:0} # If you don't want direct ecj support to be built in, -# while eclipse-ecj isn't available, -# give rpmbuild option '--without ecj' +# while ecj isn't available, give rpmbuild option '--without ecj' %define without_ecj %{?_without_ecj:1}%{!?_without_ecj:0} %define with_ecj %{!?_without_ecj:1}%{?_without_ecj:0} @@ -46,7 +47,6 @@ %define majversion 5.5 %define servletspec 2.4 %define jspspec 2.0 -%define section devel %define tcuid 91 @@ -68,11 +68,13 @@ Name: tomcat5 Epoch: 0 -Version: 5.5.20 -Release: 5jpp.1%{dist} +Version: 5.5.23 +Release: 9jpp.1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API Group: Networking/Daemons +Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}} +Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} License: Apache Software License URL: http://tomcat.apache.org Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{packdname}.tar.gz @@ -92,7 +94,7 @@ Patch9: %{name}-%{majversion}-jspc.sh.patch Patch10: %{name}-%{majversion}-setclasspath.sh.patch Patch12: %{name}-%{majversion}-util-build.patch -Patch13: %{name}-%{majversion}-http11-build.patch +Patch13: %{name}-%{version}-http11-build.patch Patch14: %{name}-%{majversion}-jk-build.patch Patch16: %{name}-%{majversion}-jspc-classpath.patch #FIXME Disable JSP pre-compilation on ppc64 and x390x @@ -124,7 +126,7 @@ BuildRequires: jakarta-commons-digester >= 0:1.7 BuildRequires: jakarta-commons-logging >= 0:1.0.4 BuildRequires: jakarta-commons-fileupload >= 0:1.0 -BuildRequires: jakarta-commons-modeler >= 1.1 +BuildRequires: jakarta-commons-modeler >= 2.0 BuildRequires: jakarta-commons-pool >= 0:1.2 BuildRequires: jakarta-commons-launcher >= 0:0.9 BuildRequires: jakarta-commons-el >= 0:1.0 @@ -159,9 +161,11 @@ Requires(postun): java-gcj-compat >= 1.0.31 %endif Requires(post): jpackage-utils >= 0:1.6.0 -Requires(post): /bin/rm,/sbin/chkconfig +Requires(post): /bin/rm +Requires(post): /sbin/chkconfig Requires(post): findutils -Requires(preun): /bin/rm,/sbin/chkconfig +Requires(preun): /bin/rm +Requires(post): /sbin/chkconfig Requires(preun): findutils Requires(pre): %{_sbindir}/useradd Requires(pre): %{_sbindir}/groupadd @@ -179,9 +183,6 @@ # And it needs its own API subpackages for running Requires: %{name}-common-lib = %{epoch}:%{version}-%{release} Requires: %{name}-server-lib = %{epoch}:%{version}-%{release} -# And it needs its own API subpackages before being installed -Requires(post): %{name}-common-lib = %{epoch}:%{version}-%{release} -Requires(post): %{name}-server-lib = %{epoch}:%{version}-%{release} %description Tomcat is the servlet container that is used in the official Reference @@ -209,7 +210,7 @@ %if %{gcj_support} Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 +Requires(postun): java-gcj-compat >= 1.0.31 %endif %description webapps @@ -246,8 +247,8 @@ Provides: servlet5 Provides: servlet24 Provides: servletapi5 -Requires(post): chkconfig -requires(postun): chkconfig +Requires(post): /sbin/chkconfig +requires(postun): /sbin/chkconfig %if %{gcj_support} # libgcj aot-compiled native libraries @@ -264,7 +265,8 @@ Summary: Javadoc generated documentation for %{name}-servlet-%{servletspec}-api Obsoletes: servletapi5-javadoc Provides: servletapi5-javadoc -Requires(post): /bin/rm,/bin/ln +Requires(post): /bin/rm +Requires(post): /bin/ln %description servlet-%{servletspec}-api-javadoc Contains the javadoc generated documentation for the implementation classes @@ -281,8 +283,8 @@ Requires(postun): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Summary: Apache Tomcat Servlet and JSP implementation classes Provides: jsp -Requires(post): chkconfig -Requires(postun): chkconfig +Requires(post): /sbin/chkconfig +Requires(postun): /sbin/chkconfig %if %{gcj_support} # libgcj aot-compiled native libraries @@ -297,7 +299,8 @@ %package jsp-%{jspspec}-api-javadoc Group: Development/Documentation Summary: Javadoc generated documentation for %{name}-jsp-%{jspspec}-api -Requires(post): /bin/rm,/bin/ln +Requires(post): /bin/rm +Requires(post): /bin/ln %description jsp-%{jspspec}-api-javadoc Contains the javadoc generated documentation for the implementation classes @@ -309,38 +312,15 @@ Summary: Libraries needed to run the Tomcat Web container (part) Requires: java >= 0:1.4.2 Requires(post): jpackage-utils >= 0:1.6.0 -Requires: ant >= 0:1.6 -Requires(post): ant >= 0:1.6 -Requires: jakarta-commons-collections >= 0:3.1 -Requires(post): jakarta-commons-collections >= 0:3.1 -Requires: jakarta-commons-dbcp >= 0:1.2.1 -Requires(post): jakarta-commons-dbcp >= 0:1.2.1 +Requires: jakarta-commons-collections-tomcat5 >= 0:3.1 +Requires(post): jakarta-commons-collections-tomcat5 >= 0:3.1 +Requires: jakarta-commons-dbcp-tomcat5 >= 0:1.2.1 +Requires(post): jakarta-commons-dbcp-tomcat5 >= 0:1.2.1 Requires: jakarta-commons-el >= 0:1.0 Requires(post): jakarta-commons-el >= 0:1.0 -Requires: jakarta-commons-logging >= 0:1.0.4 -Requires(post): jakarta-commons-logging >= 0:1.0.4 # FIXME commons-pool is not listed in the Tomcat build.properties.default -Requires: jakarta-commons-pool >= 0:1.2 -Requires(post): jakarta-commons-pool >= 0:1.2 -# jaf can be provided by classpathx-jaf -Requires: jaf >= 0:1.0.1 -Requires(post): jaf >= 0:1.0.1 -# javamail can be provided by classpathx-mail -Requires: javamail >= 0:1.3.1 -Requires(post): javamail >= 0:1.3.1 -Requires: jdbc-stdext -Requires(post): jdbc-stdext -Requires: jndi -Requires(post): jndi -#FIXME: Replace once maven2 is available -# replaces non-free jta -#Requires: geronimo-jta-1.0.1B-api -Requires: jta >= 0:1.0.1 -#FIXME: Replace once maven2 is available -#Requires(post): geronimo-jta-1.0.1B-api -Requires(post): jta >= 0:1.0.1 -Requires: mx4j >= 0:3.0.1 -Requires(post): mx4j >= 0:3.0.1 +Requires: jakarta-commons-pool-tomcat5 >= 0:1.2 +Requires(post): jakarta-commons-pool-tomcat5 >= 0:1.2 %if %{with_ecj} Requires: eclipse-ecj >= 0:3.1.1 Requires(post): eclipse-ecj >= 0:3.1.1 @@ -370,24 +350,8 @@ Group: Development/Compilers Summary: Libraries needed to run the Tomcat Web container (part) Requires(post): jpackage-utils >= 0:1.6.0 -Requires: jakarta-commons-beanutils >= 0:1.7.0 -Requires(post): jakarta-commons-beanutils >= 0:1.7.0 -Requires: jakarta-commons-digester >= 0:1.6 -Requires(post): jakarta-commons-digester >= 0:1.6 -Requires: jakarta-commons-el >= 0:1.0 -Requires(post): jakarta-commons-el >= 0:1.0 -Requires: jakarta-commons-fileupload >= 0:1.0-1jpp -Requires(post): jakarta-commons-fileupload >= 0:1.0-1jpp -Requires: jakarta-commons-logging >= 0:1.0.4 -Requires(post): jakarta-commons-logging >= 0:1.0.4 -Requires: jakarta-commons-modeler >= 1.1 -Requires(post): jakarta-commons-modeler >= 1.1 -Requires: jaas -Requires(post): jaas -Requires: mx4j >= 0:3.0.1 -Requires(post): mx4j >= 0:3.0.1 -Requires: regexp >= 0:1.3 -Requires(post): regexp >= 0:1.3 +Requires: jakarta-commons-modeler >= 2.0 +Requires(post): jakarta-commons-modeler >= 2.0 # Other subpackages must go in first Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release} Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release} @@ -395,7 +359,6 @@ Requires(preun): findutils Requires(post): /bin/rm Requires(preun): /bin/rm - %if %{gcj_support} # libgcj aot-compiled native libraries Requires(post): java-gcj-compat >= 1.0.31 @@ -432,7 +395,7 @@ %endif %prep -%{__cat} <> build.properties << EOBP +version=%{version} ant.jar=%{_javadir}/ant.jar ant-launcher.jar=%{_javadir}/ant.jar jtc.home=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/connectors/ @@ -559,8 +523,7 @@ ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" init cp ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar \ ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build/build/common/lib/servlet-api.jar -# ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" build - ant -Djava.home="%{java_home}" build + ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" build popd # build the connectors pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/connectors @@ -599,65 +562,64 @@ %endif %install -%{__rm} -rf ${RPM_BUILD_ROOT} +%{__rm} -rf $RPM_BUILD_ROOT %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir} %if %{without_apisonly} export CLASSPATH="%(build-classpath xalan-j2 xml-commons-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar" # build initial path structure %{__install} -d -m 755 \ - ${RPM_BUILD_ROOT}/{%{confdir},%{logdir},%{homedir},%{bindir}} -touch ${RPM_BUILD_ROOT}/%{logdir}/catalina.out + ${RPM_BUILD_ROOT}{%{confdir},%{logdir},%{homedir},%{bindir}} +touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out %{__install} -d -m 755 ${RPM_BUILD_ROOT}{%{serverdir},%{tempdir},%{workdir}} %{__install} -d -m 755 ${RPM_BUILD_ROOT}{%{appdir},%{commondir},%{shareddir}} -%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/{rc.d,logrotate.d} -%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/{init.d,logrotate.d} %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_bindir} %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}/%{name} %{__install} -m 755 %{SOURCE5} ${RPM_BUILD_ROOT}%{bindir}/relink # SysV init and configuration %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig # Service-specific configuration file -cat > tomcat5 << EOT -# Service-specific configuration file for tomcat5 services +cat > %{name} << EOT +# Service-specific configuration file for %{name} services # This will be sourced by the SysV service script after the global -# configuration file /etc/tomcat5/tomcat5.conf, thus allowing values +# configuration file /etc/%{name}/%{name}.conf, thus allowing values # to be overridden on a per-service way # # NEVER change the init script itself: # To change values for all services make your changes in -# /etc/tomcat5/tomcat5.conf +# /etc/%{name}/%{name}.conf # To change values for a specific service, change it here # To create a new service, create a link from /etc/init.d/ to -# /etc/init.d/tomcat5 (do not copy the init script) and make a copy of the -# /etc/sysconfig/tomcat5 file to /etc/sysconfig/ and change +# /etc/init.d/%{name} (do not copy the init script) and make a copy of the +# /etc/sysconfig/%{name} file to /etc/sysconfig/ and change # the property values so the two services won't conflict # Register the new service in the system as usual (see chkconfig and similars) # EOT -cat %{SOURCE2} >> tomcat5 -install -m 644 tomcat5 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} -%{__rm} tomcat5 +%{__cat} %{SOURCE2} >> %{name} +%{__install} -m 0644 %{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} +%{__rm} %{name} %{__install} %{SOURCE1} \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{name} + ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name} # Global configuration file -install -d -m 755 ${RPM_BUILD_ROOT}/%{confdir} -cat > tomcat5.conf << EOT -# System-wide configuration file for tomcat5 services -# This will be sourced by tomcat5 and any secondary service +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir} +%{__cat} > %{name}.conf << EOT +# System-wide configuration file for %{name} services +# This will be sourced by %{name} and any secondary service # Values will be overridden by service-specific configuration # files in /etc/sysconfig # Use this one to change default values for all services # Change the service specific ones to affect only one service -# (see, for instance, /etc/sysconfig/tomcat5) +# (see, for instance, /etc/sysconfig/%{name}) # EOT -cat %{SOURCE2} >> tomcat5.conf -install -m 644 tomcat5.conf ${RPM_BUILD_ROOT}/%{confdir}/%{name}.conf -rm tomcat5.conf +%{__cat} %{SOURCE2} >> %{name}.conf +%{__install} -m 0644 %{name}.conf ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf +%{__rm} -f %{name}.conf pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build - export usejikes=false + export usejikes="false" export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer" - ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist + ant -Dbuild.compiler="modern" -Djava.home=%{java_home} dist pushd dist %{__mv} bin/* ${RPM_BUILD_ROOT}%{bindir} %{__mv} common/* ${RPM_BUILD_ROOT}%{commondir} @@ -671,26 +633,11 @@ workers.properties.minimal ${RPM_BUILD_ROOT}%{confdir} popd popd -# create reloctomcat5 -- commented out for eventual removal -jasonc -#%{__cat} >> ${RPM_BUILD_ROOT}%{bindir}/reloctomcat5 << EORLTC -#!/bin/sh -# -# backup original config -#%{__cp} %{confdir}/server.xml %{confdir}/server.xml.bak -#echo "relocating http & ajp ports to 81xx" -#%{__sed} -i -e 's|8080|8180|' \ -# -e 's|8081|8181|' \ -# -e 's|8082|8182|' \ -# -e 's|8443|8543|' \ -# -e 's|8009|8109|' \ -# %{confdir}/server.xml -# -#EORLTC # rename catalina.sh into dtomcat5 to let wrapper take precedence %{__install} ${RPM_BUILD_ROOT}%{bindir}/catalina.sh \ ${RPM_BUILD_ROOT}%{_bindir}/d%{name} %{__rm} -f ${RPM_BUILD_ROOT}%{bindir}/catalina.sh.* \ - ${RPM_BUILD_ROOT}/%{bindir}/setclasspath.* + ${RPM_BUILD_ROOT}%{bindir}/setclasspath.* # Remove leftover files %{__rm} -f ${RPM_BUILD_ROOT}%{bindir}/*.orig # install wrapper as tomcat5 @@ -705,7 +652,7 @@ ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} \ ${RPM_BUILD_ROOT}%{_bindir}/d%{name} \ ${RPM_BUILD_ROOT}%{_bindir}/%{name} \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{name} \ + ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name} \ ${RPM_BUILD_ROOT}%{bindir}/relink \ ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}; do %{__sed} -i -e 's|\@\@\@TCCONF\@\@\@|%{confdir}|g' \ @@ -718,6 +665,7 @@ -e "s|\@\@\@TCAPP\@\@\@|%{appdir}|g" \ -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" $i done +# Process server/lib # Remove local JARs (to be replaced with jpp links in post) pushd ${RPM_BUILD_ROOT}%{serverdir}/lib find . -name "*.jar" -not -name "catalina*" \ @@ -737,7 +685,6 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name} %{__ln_s} -f ${j}-%{version}.jar ${j}.jar popd - %{__ln_s} -f %{_javadir}/%{name}/${j}.jar ${j}.jar done # servlets* jars will be installed in a public repository for i in servlets-*.jar; do @@ -747,7 +694,6 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name} %{__ln_s} -f ${j}-%{version}.jar ${j}.jar popd - %{__ln_s} -f %{_javadir}/%{name}/${j}.jar ${j}.jar done # tomcat* jars will be installed in a public repository for i in tomcat-*.jar; do @@ -757,7 +703,6 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name} %{__ln_s} -f ${j}-%{version}.jar ${j}.jar popd - %{__ln_s} -f %{_javadir}/%{name}/${j}.jar ${j}.jar done popd # Process admin webapp server/webapps/admin @@ -814,7 +759,6 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name} %{__ln_s} -f ${j}-%{version}.jar ${j}.jar popd - %{__ln_s} -f %{_javadir}/%{name}/${j}.jar ${j}.jar done popd # Process common/endorsed @@ -825,7 +769,7 @@ %{__rm} -f ${RPM_BUILD_ROOT}%{commondir}/lib/servlet.jar # Perform FHS translation # (final links) -pushd ${RPM_BUILD_ROOT}/%{homedir} +pushd ${RPM_BUILD_ROOT}%{homedir} [ -d bin ] || %{__ln_s} -f %{bindir} bin [ -d common ] || %{__ln_s} -f %{commondir} common [ -d conf ] || %{__ln_s} -f %{confdir} conf @@ -836,9 +780,6 @@ [ -d work ] || %{__ln_s} -f %{workdir} work [ -d temp ] || %{__ln_s} -f %{tempdir} temp popd -cd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} -find ${RPM_BUILD_ROOT}/%{homedir} -maxdepth 1 -type l | \ - %{__sed} -e "s|${RPM_BUILD_ROOT}||g" > homelinks %endif # begin servlet api subpackage install pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi @@ -854,16 +795,16 @@ # javadoc servlet %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version} %{__cp} -pr jsr154/build/docs/api/* \ - ${RPM_BUILD_ROOT}/%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version} + ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version} # ghost symlink %{__ln_s} -f %{name}-servlet-%{servletspec}-api-%{version} \ - ${RPM_BUILD_ROOT}/%{_javadocdir}/%{name}-servlet-%{servletspec}-api + ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api popd # begin jsp api subpackage install pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi %{__install} -m 644 jsr152/dist/lib/jsp-api.jar \ - ${RPM_BUILD_ROOT}/%{_javadir}/%{name}-jsp-%{jspspec}-api-%{version}.jar - pushd ${RPM_BUILD_ROOT}/%{_javadir} + ${RPM_BUILD_ROOT}%{_javadir}/%{name}-jsp-%{jspspec}-api-%{version}.jar + pushd ${RPM_BUILD_ROOT}%{_javadir} %{__ln_s} -f %{name}-jsp-%{jspspec}-api-%{version}.jar \ %{name}-jsp-%{jspspec}-api.jar # For backward compatibility with old JPP packages @@ -871,48 +812,49 @@ jspapi.jar popd # javadoc jsp - %{__install} -d -m 755 ${RPM_BUILD_ROOT}/%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version} + %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version} %{__cp} -pr jsr152/build/docs/api/* \ - ${RPM_BUILD_ROOT}/%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version} + ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version} # ghost symlink %{__ln_s} %{name}-jsp-%{jspspec}-api-%{version} \ - ${RPM_BUILD_ROOT}/%{_javadocdir}/%{name}-jsp-%{jspspec}-api + ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api popd %if %{without_apisonly} # begin jasper subpackage install pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/%{jname} %{__install} -m 755 src/bin/jspc.sh \ - ${RPM_BUILD_ROOT}/%{_bindir}/jspc5.sh + ${RPM_BUILD_ROOT}%{_bindir}/jspc5.sh %{__install} -m 755 src/bin/%{jname}.sh \ - ${RPM_BUILD_ROOT}/%{_bindir}/%{full_jname}.sh + ${RPM_BUILD_ROOT}%{_bindir}/%{full_jname}.sh popd pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/container %{__install} -m 755 catalina/src/bin/setclasspath.sh \ - ${RPM_BUILD_ROOT}/%{_bindir}/%{full_jname}-setclasspath.sh + ${RPM_BUILD_ROOT}%{_bindir}/%{full_jname}-setclasspath.sh popd # javadoc -%{__install} -d -m 755 ${RPM_BUILD_ROOT}/%{_javadocdir}/%{jname}-%{version} +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{jname}-%{version} pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/%{jname} %{__cp} -pr build/javadoc/* \ - ${RPM_BUILD_ROOT}/%{_javadocdir}/%{jname}-%{version} + ${RPM_BUILD_ROOT}%{_javadocdir}/%{jname}-%{version} # ghost symlink - %{__ln_s} %{jname}-%{version} ${RPM_BUILD_ROOT}/%{_javadocdir}/%{jname} + %{__ln_s} %{jname}-%{version} ${RPM_BUILD_ROOT}%{_javadocdir}/%{jname} popd # disable the juli log manager until the classpath # java.util.logging.LogManager is fixed # XXX: Still not fixed - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29869 -rm -f $RPM_BUILD_ROOT%{bindir}/tomcat-juli.jar +# rm -f $RPM_BUILD_ROOT%{bindir}/tomcat-juli.jar %endif %if %{gcj_support} # Remove non-standard jars from the list for aot compilation -aot-compile-rpm --exclude var/lib/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war \ - --exclude var/lib/tomcat5/webapps/servlets-examples/WEB-INF/classes \ - --exclude var/lib/tomcat5/webapps/jsp-examples/WEB-INF/classes \ - --exclude var/lib/tomcat5/webapps/jsp-examples/plugin/applet \ - --exclude var/lib/tomcat5/server/lib/servlets-cgi.renametojar \ - --exclude var/lib/tomcat5/server/lib/servlets-ssi.renametojar +aot-compile-rpm \ + --exclude var/lib/%{name}/webapps/tomcat-docs/appdev/sample/sample.war \ + --exclude var/lib/%{name}/webapps/servlets-examples/WEB-INF/classes \ + --exclude var/lib/%{name}/webapps/jsp-examples/WEB-INF/classes \ + --exclude var/lib/%{name}/webapps/jsp-examples/plugin/applet \ + --exclude var/lib/%{name}/server/lib/servlets-cgi.renametojar \ + --exclude var/lib/%{name}/server/lib/servlets-ssi.renametojar %endif %clean @@ -922,22 +864,35 @@ %post # install tomcat5 (but don't activate) /sbin/chkconfig --add %{name} -# Create automated links - since all needed extensions may not have been -# installed for this jvm output is muted -# Try to set a sensible jvm -unset JAVA_HOME -[ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf -[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && \ - . %{_sysconfdir}/java/java.conf -[ -z "$JAVA_HOME" ] && JAVA_HOME="%{_jvmdir}/java" # Remove old automated symlinks for repository in %{commondir}/endorsed ; do find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f done +for repository in %{commondir}/lib ; do + find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f +done +for repository in %{serverdir}/lib ; do + find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f +done +# Create automated links - since all needed extensions may not have been +# installed for this jvm output is muted build-jar-repository %{commondir}/endorsed jaxp_parser_impl \ xml-commons-apis 2>&1 +build-jar-repository %{commondir}/lib commons-collections-tomcat5 \ + commons-dbcp-tomcat5 commons-el commons-pool-tomcat5 javamail jsp \ + %{name}/naming-factory %{name}/naming-resources servlet \ + %{jname}5-compiler %{jname}5-runtime 2>&1 +%if %{with_ecj} + build-jar-repository %{commondir}/lib ecj 2>&1 +%endif +build-jar-repository %{serverdir}/lib catalina-ant5 commons-modeler \ + %{name}/catalina-ant-jmx %{name}/catalina-cluster %{name}/catalina \ + %{name}/catalina-optional %{name}/catalina-storeconfig \ + %{name}/servlets-default %{name}/servlets-invoker %{name}/servlets-webdav \ + %{name}/tomcat-ajp %{name}/tomcat-apr %{name}/tomcat-coyote \ + %{name}/tomcat-http %{name}/tomcat-jkstatus-ant %{name}/tomcat-util 2>&1 %if %{gcj_support} -%{_bindir}/rebuild-gcj-db + %{_bindir}/rebuild-gcj-db %endif %if %{gcj_support} @@ -945,31 +900,8 @@ %{_bindir}/rebuild-gcj-db %endif -%post common-lib -# Create automated links - since all needed extensions may not have been -# installed for this jvm output is muted -# Try to set a sensible jvm -unset JAVA_HOME -[ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf -[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && \ - . %{_sysconfdir}/java/java.conf -[ -z "$JAVA_HOME" ] && JAVA_HOME="%{_jvmdir}/java" -# Remove old automated symlinks -for repository in %{commondir}/lib ; do - find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f -done -#FIXME: Replace jta with geronimo-jta-1.0.1B-api when maven2 is imported -build-jar-repository %{commondir}/lib ant commons-collections commons-dbcp \ - commons-el commons-logging-api commons-pool jaf javamail jdbc-stdext \ - jndi jsp jta mx4j/mx4j servlet %{jname}5-compiler \ - %{jname}5-runtime 2>&1 -%if %{with_ecj} -pushd %{commondir}/lib >/dev/null - build-jar-repository . jdtcore -popd >/dev/null -%endif - %if %{gcj_support} +%post common-lib %{_bindir}/rebuild-gcj-db %endif @@ -978,29 +910,8 @@ %{_bindir}/rebuild-gcj-db %endif -%post server-lib -# Create automated links - since all needed extensions may not have been -# installed for this jvm output is muted -# Try to set a sensible jvm -unset JAVA_HOME -[ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf -[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && \ - . %{_sysconfdir}/java/java.conf -[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java -# Remove old automated symlinks -for repository in %{serverdir}/lib ; do - find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f -done -build-jar-repository %{serverdir}/lib catalina-ant5 commons-beanutils \ - commons-digester commons-el commons-fileupload commons-logging \ - commons-modeler jaas mx4j/mx4j regexp 2>&1 -%if %{with_ecj} -pushd %{serverdir}/lib >/dev/null - build-jar-repository . jdtcore -popd >/dev/null -%endif - %if %{gcj_support} +%post server-lib %{_bindir}/rebuild-gcj-db %endif @@ -1012,49 +923,36 @@ %post webapps # Create automated links - since all needed extensions may not have been # installed for this jvm output is muted -# Try to set a sensible jvm -unset JAVA_HOME -[ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf -[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && \ - . %{_sysconfdir}/java/java.conf -[ -z "$JAVA_HOME" ] && JAVA_HOME="%{_jvmdir}/java" build-jar-repository %{appdir}/jsp-examples/WEB-INF/lib \ jakarta-taglibs-core jakarta-taglibs-standard 2>&1 - %if %{gcj_support} -%{_bindir}/rebuild-gcj-db + %{_bindir}/rebuild-gcj-db %endif %if %{gcj_support} %postun webapps -%{_bindir}/rebuild-gcj-db + %{_bindir}/rebuild-gcj-db %endif %post admin-webapps -# Create automated links - since all needed extensions may not have been -# installed for this jvm output is muted -# Try to set a sensible jvm -unset JAVA_HOME -[ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf -[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && \ - . %{_sysconfdir}/java/java.conf -[ -z "$JAVA_HOME" ] && JAVA_HOME="%{_jvmdir}/java" # Remove old automated symlinks find %{serverdir}/webapps/admin/WEB-INF/lib -name '\[*\]*.jar' -type d \ | xargs %{__rm} -f +# Create automated links - since all needed extensions may not have been +# installed for this jvm output is muted build-jar-repository %{serverdir}/webapps/admin/WEB-INF/lib \ - struts tomcat5/catalina-admin 2>&1 + struts %{name}/catalina-admin 2>&1 build-jar-repository %{serverdir}/webapps/host-manager/WEB-INF/lib \ - tomcat5/catalina-host-manager 2>&1 + %{name}/catalina-host-manager 2>&1 build-jar-repository %{serverdir}/webapps/manager/WEB-INF/lib \ - commons-fileupload tomcat5/catalina-manager 2>&1 + commons-fileupload %{name}/catalina-manager 2>&1 %if %{gcj_support} -%{_bindir}/rebuild-gcj-db + %{_bindir}/rebuild-gcj-db %endif %if %{gcj_support} %postun admin-webapps -%{_bindir}/rebuild-gcj-db + %{_bindir}/rebuild-gcj-db %endif %endif @@ -1062,7 +960,7 @@ update-alternatives --install %{_javadir}/servlet.jar servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400 %if %{gcj_support} -%{_bindir}/rebuild-gcj-db + %{_bindir}/rebuild-gcj-db %endif %post servlet-%{servletspec}-api-javadoc @@ -1077,7 +975,7 @@ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar fi %if %{gcj_support} -%{_bindir}/rebuild-gcj-db + %{_bindir}/rebuild-gcj-db %endif %post jsp-%{jspspec}-api @@ -1085,7 +983,7 @@ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000 %if %{gcj_support} -%{_bindir}/rebuild-gcj-db + %{_bindir}/rebuild-gcj-db %endif @@ -1101,7 +999,7 @@ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar fi %if %{gcj_support} -%{_bindir}/rebuild-gcj-db + %{_bindir}/rebuild-gcj-db %endif %if %{without_apisonly} @@ -1109,26 +1007,16 @@ # Always clean up workdir and tempdir on upgrade/removal %{__rm} -fr %{workdir}/* %{tempdir}/* if [ $1 = 0 ]; then - [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/rc.d/init.d/%{name} stop - [ -f %{_sysconfdir}/rc.d/init.d/%{name} ] && /sbin/chkconfig --del %{name} + [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/init.d/%{name} stop + [ -f %{_sysconfdir}/init.d/%{name} ] && /sbin/chkconfig --del %{name} # Remove automated symlinks for repository in %{commondir}/endorsed; do find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f done -fi - -%preun server-lib -if [ $1 = 0 ]; then - # Remove automated symlinks - for repository in %{serverdir}/lib ; do + for repository in %{commondir}/lib ; do find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f done -fi - -%preun common-lib -if [ $1 = 0 ]; then - # Remove automated symlinks - for repository in %{commondir}/lib ; do + for repository in %{serverdir}/lib ; do find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f done fi @@ -1155,9 +1043,18 @@ %endif %if %{without_apisonly} -%files -f %{packdname}/homelinks +%files %defattr(644,root,root,755) %doc %{packdname}/build/{LICENSE,RELE*,RUNNING.txt,BENCHMARKS.txt} +# symlinks +%{_datadir}/%{name}/common +%{_datadir}/%{name}/temp +%{_datadir}/%{name}/logs +%{_datadir}/%{name}/conf +%{_datadir}/%{name}/server +%{_datadir}/%{name}/shared +%{_datadir}/%{name}/work +%{_datadir}/%{name}/webapps # Normal directories %dir %{homedir} %dir %{bindir} @@ -1168,9 +1065,10 @@ %dir %{commondir}/lib %dir %{commondir}/endorsed %dir %{commondir}/i18n -%dir %{serverdir}/ +%dir %{serverdir} %dir %{serverdir}/classes %dir %{serverdir}/lib +%{serverdir}/lib/*.renametojar %dir %{shareddir} %dir %{shareddir}/classes %dir %{shareddir}/lib @@ -1184,13 +1082,15 @@ %attr(775,root,tomcat) %dir %{confdir}/Catalina %attr(775,root,tomcat) %dir %{confdir}/Catalina/localhost %attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{bindir}/* -%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{name} +%attr(755,root,root) %{bindir}/relink +%attr(644,root,root) %{bindir}/*.jar +%attr(644,root,root) %{bindir}/*.xml +%attr(755,root,root) %{_sysconfdir}/init.d/%{name} %attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.policy %attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.properties %attr(660,root,tomcat) %config(noreplace) %{confdir}/logging.properties %attr(660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml -%config(noreplace) %{confdir}/tomcat5.conf +%config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/server-minimal.xml %config(noreplace) %{confdir}/server.xml %config(noreplace) %{confdir}/web.xml @@ -1213,7 +1113,6 @@ %defattr(644,root,root,755) %dir %{_javadir}/%{name} %{_javadir}/%{name}/naming*.jar -%{commondir}/lib/* %if %{gcj_support} %attr(-,root,root) %{_libdir}/gcj/%{name}/naming-* %endif @@ -1230,7 +1129,6 @@ %{_javadir}/%{name}/catalina-storeconfig*.jar %{_javadir}/%{name}/servlets*.jar %{_javadir}/%{name}/tomcat*.jar -%{serverdir}/lib/* %if %{gcj_support} %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-ant* %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-cluster* @@ -1329,13 +1227,82 @@ %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api %changelog -* Mon Jan 29 2007 Vivek Lakshmanan 0:5.5.20-5jpp.1.fc7 -- Merge with latest from JPP -- Replace references to geronimo JTA with a generic one available in Fedora -- Use Fedora compliant build root specification -- Enabling juli still kills tomcat5 on startup, disabled -- Add patch to force -source to 5.0 when 1.5 support enabled since - ecj seems to use 1.4 as default still +* Tue May 15 2007 Vivek Lakshmanan 0:5.5.23-9jpp.1 +- Resolve: bug 240208 +- Import and merge 0:5.5.23-9jpp from JPP +- Fix formatting of spec +- Use eclipse-ecj in place of ecj +- Apply GCJ specific patches +- Use generic jta for now instead of geronimo-jta-1.0.1B-api +- Add tomcat-juli.jar since gcc bug 29869 is fixed + +* Fri May 11 2007 Jason Corley 0:5.5.23-9jpp +- rebuild through mock and centos 4 + +* Thu May 10 2007 Ralph Apel 0:5.5.23-8jpp +- Make Vendor, Distribution based on macro +- Rebuild on FC6 with redhat-rpm-config-8.0.45-9.fc6 installed + for newer /usr/lib/rpm/redhat/brp-java-repack-jars + +* Tue Apr 24 2007 Jason Corley 0:5.5.23-7jpp +- bug 253: init script should be in /etc/init.d per LSB (Ralf Hansen) +- bug 257: require /sbin/chkconfig since SuSE has no package chkconfig + (Ralf Hansen) +- bug 261: jasper5.sh tries to use non-existant jars (Vivek Lakshmanan) + +* Tue Apr 10 2007 Jason Corley 0:5.5.23-6jpp +- put javamail back in common/lib +- remove find/homelinks junk and just explicitly list the symlinks + +* Fri Mar 16 2007 Jason Corley 0:5.5.23-5jpp +- replace references to jdtcore with ecj + +* Fri Mar 16 2007 Jason Corley 0:5.5.23-4jpp +- fix circular dep between main package and common-lib +- move scriptlets out of common-lib and server-lib and into main package + +* Mon Mar 5 2007 Jason Corley 0:5.5.23-3jpp +- respin to upload to main repo +- remove some unnecessary build-jar-repository links created in post of + common-lib and server-lib subpackages +- fix chkconfig and lsb comments in init script +- rpmlint cleanups +- replace eclipse-ecj with ecj + +* Mon Mar 5 2007 Jason Corley 0:5.5.23-2jpp +- add a line to build.properties creation with the correct version + (build.properties.default not updated from 5.5.20) + +* Mon Mar 5 2007 Jason Corley 0:5.5.23-1jpp +- update to 5.5.23 + +* Mon Feb 26 2007 Jason Corley 0:5.5.22-1jpp +- update to 5.5.22 +- change commons-modeler requirement to 2.0 + +* Fri Feb 23 2007 Jason Corley 0:5.5.20-6jpp +- update year in copyright text +- use -tomcat5 subpackages for j-c-collections, j-c-dbcp, and j-c-pool so + that JNDI resources work properly +- remove searching for a JVM from %%posts since java is not called +- change symlinks to b-j-r links server/lib to +- add pre requirement on main package for common-lib subpackage + +* Mon Jan 29 2007 Vivek Lakshmanan 0:5.5.20-5jpp +- Rebuild with a 1.4 JDK instead of JDK 5 +- Minor formatting fixes +- Add conditional native compilation support +- Remove aot-compilation and installation of non-standard jars/collections + of java classes as well as corresponding .SOs +- Bug 190: set catalina.ext.dirs system property through JAVA_OPTS + in tomcat5.conf +- Remove echo statements in the install section since rpm install + should be silent +- Add Requires(X) blocks for pre/post/preun/postun scriptlets +- Replace use of PreReq with Requires(pre) + Requires(postun) +- Add documentation for sysconfig/tomcat5.conf and /etc/tomcat5.conf + (courtesy: pcheung at redhat.com) +- Fix maxdepth position in find statement to avoid warning * Sun Jan 14 2007 Jason Corley 0:5.5.20-4jpp - remove jk2 configs as mod_jk2 has been deprecated upstream @@ -1367,9 +1334,6 @@ - remove Vendor and Distribution (should be defined in ~/.rpmmacros) - replace perl -pi -e with sed -i -e -* Wed Oct 4 2006 Fernando Nasser 0:5.5.17-8jpp.1 -- Merge with upstream - * Wed Oct 4 2006 Permaine Cheung 0:5.5.17-8jpp - Fix condrestart in init script and location of init script in the spec file. @@ -1379,50 +1343,12 @@ * Mon Oct 2 2006 Permaine Cheung 0:5.5.17-6jpp - Add the ability to start multiple instances of tomcat on the same machine. -* Wed Aug 30 2006 Deepak Bhole 5.5.17-6jpp.2 -- Rebuilding. - -* Mon Aug 21 2006 Fernando Nasser 0:5.5.17-6jpp.1 -- Merge with upstream - -* Mon Aug 21 2006 Fernando Nasser 0:5.5.17-6jpp -- Rebuild - * Mon Aug 21 2006 Fernando Nasser 0:5.5.17-5jpp From Andrew Overholt : - Silence post common-lib and server-lib. -* Thu Jul 27 2006 Fernando Nasser 0:5.5.17-3jpp_5fc -- Fix regression in relink with patch from Matt Wringe - -* Sat Jul 22 2006 Jakub Jelinek - 0:5.5.17-3jpp_4fc -- Rebuilt - -* Thu Jul 13 2006 Fernando Nasser 0:5.5.17-3jpp_3fc -- Rebuild in full - -* Wed Jul 05 2006 Fernando Nasser 0:5.5.17-3jpp_2fc -- Re-enable ppc64 and s390x -- Disable JSP pre-compilation on ppc64 and x390x (FIXME) -- Bootstrap mode (with apisonly) build - -* Wed Jul 05 2006 Fernando Nasser 0:5.5.17-3jpp_1fc -- Full build -- Do not build on ppc64 and s390x -- Fix servlet-api.jar path -- Add version to catalina .so -From Ralph Apel : -- Re-add patch to add rt.jar -- Add mx4j JMX API and struts to classpath - -* Wed Jul 05 2006 Fernando Nasser 0:5.5.17-3jpp_0fc -- Upgrade -- Use any JTA for now -- Try and remove exclude for sample.war -- Bootstrap build with apisonly - -* Wed Jul 05 2006 Fernando Nasser 0:5.5.17-3jpp_1rh -- Merge with upstream +* Thu Jul 27 2006 Fernando Nasser 0:5.5.17-4jpp +- Fix regression in relink with changes from Matt Wringe * Fri Jun 30 2006 Ralph Apel 0:5.5.17-3jpp - Create option --with apisonly to build just tomcat5-servlet-2.4-api, @@ -1430,12 +1356,6 @@ - Create option --without ecj to build even when eclipse-ecj not available - Drop several unnecessary export CLASSPATH= -* Sat Jun 17 2006 Deepak Bhole - 0:5.5.15-1jpp_7fc -- Re-enable ppc64, s390 and s390x architectures now that eclipse is built there - -* Mon May 15 2006 Fernando Nasser 0:5.5.17-2jpp_1rh -- Merge with upstream for upgrade to 5.5.17 - * Mon May 15 2006 Fernando Nasser 0:5.5.17-2jpp - Requires on post things that are linked to at post Merge changes from downstream: @@ -1464,28 +1384,6 @@ * Fri Mar 24 2006 Ralph Apel 0:5.5.16-1jpp - Upgrade to 5.5.16 -* Mon Mar 6 2006 Jeremy Katz - 0:5.5.15-1jpp_6fc -- stop scriptlet spew - -* Fri Mar 3 2006 Thomas Fitzsimmons - 0:5.5.15-1jpp_5fc -- Require java-gcj-compat for post and postun sections of - servlet-%{servletspec}-api, jsp-%{jspspec}-api-javadoc and - server-lib sub-packages, since these three packages call - %{_bindir}/rebuild-gcj-db in their post and/or postun sections. - -* Wed Mar 1 2006 Rafael Schloming - 0:5.5.15-1jpp_4fc -- Disabled juli logging as a workaround for a number of classpath bugs -- in java.util.logging.* - -* Thu Feb 23 2006 Rafael Schloming - 0:5.5.15-1jpp_3fc -- Added jasper-foo symlinks for jars. - -* Wed Feb 22 2006 Rafael Schloming - 0:5.5.15-1jpp_2fc -- Exclude ppc64 s390 s390x - -* Wed Feb 22 2006 Rafael Schloming - 0:5.5.15-1jpp_1fc -- Updated to 5.5.15 - * Tue Feb 14 2006 Ralph Apel 0:5.5.12-2jpp - Fix jta.jar location From fedora-cvs-commits at redhat.com Wed May 16 01:23:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 21:23:52 -0400 Subject: rpms/tomcat5/devel tomcat5.spec,1.97,1.98 Message-ID: <200705160123.l4G1NqpD018142@cvs.devel.redhat.com> Author: vivekl Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18128 Modified Files: tomcat5.spec Log Message: - Remove vendor and distribution tags Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- tomcat5.spec 16 May 2007 01:09:25 -0000 1.97 +++ tomcat5.spec 16 May 2007 01:23:50 -0000 1.98 @@ -73,8 +73,6 @@ Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API Group: Networking/Daemons -Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}} -Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} License: Apache Software License URL: http://tomcat.apache.org Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{packdname}.tar.gz From fedora-cvs-commits at redhat.com Wed May 16 02:13:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 22:13:21 -0400 Subject: rpms/system-config-language/devel system-config-language.spec, 1.20, 1.21 Message-ID: <200705160213.l4G2DL1Z020275@cvs.devel.redhat.com> Author: lizhang Update of /cvs/dist/rpms/system-config-language/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20209 Modified Files: system-config-language.spec Log Message: update translations(bug216093) and add new languages(bug217125) Index: system-config-language.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-language/devel/system-config-language.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- system-config-language.spec 24 Nov 2006 08:48:34 -0000 1.20 +++ system-config-language.spec 16 May 2007 02:13:19 -0000 1.21 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying the system language Name: system-config-language -Version: 1.1.16 +Version: 1.1.18 Release: 1%{?dist} URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -72,6 +72,10 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-language %changelog +* Wed Jun 16 2007 Lingning Zhang - 1.1.18-1 +- Update translations (#216093) +- Add new languages (#217125) + * Wed Nov 22 2006 Paul Nasrat - 1.1.16-1 - Update translations (#216093) From fedora-cvs-commits at redhat.com Wed May 16 02:14:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 15 May 2007 22:14:58 -0400 Subject: rpms/system-config-language/devel sources,1.13,1.14 Message-ID: <200705160214.l4G2EwuJ020363@cvs.devel.redhat.com> Author: lizhang Update of /cvs/dist/rpms/system-config-language/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20335 Modified Files: sources Log Message: update translations(bug216093) and add new languages(bug217125) Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-language/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 24 Nov 2006 08:48:34 -0000 1.13 +++ sources 16 May 2007 02:14:56 -0000 1.14 @@ -1 +1 @@ -a7c3f42905aa29f63149344f1bf1d53e system-config-language-1.1.16.tar.bz2 +e0fe0669cfdcba0e54beae46145f90f3 system-config-language-1.1.18.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 16 07:45:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 03:45:45 -0400 Subject: rpms/openldap/FC-6 openldap.spec,1.68,1.69 Message-ID: <200705160745.l4G7jjHt030185@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/openldap/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv30170 Modified Files: openldap.spec Log Message: add ldconfig to devel post/postun Resolves: bz#240253 Index: openldap.spec =================================================================== RCS file: /cvs/dist/rpms/openldap/FC-6/openldap.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- openldap.spec 24 Apr 2007 11:27:35 -0000 1.68 +++ openldap.spec 16 May 2007 07:45:43 -0000 1.69 @@ -13,7 +13,7 @@ Summary: The configuration files, libraries, and documentation for OpenLDAP Name: openldap Version: %{version_23} -Release: 2%{?dist} +Release: 3%{?dist} License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz @@ -623,6 +623,12 @@ /sbin/service ldap condrestart > /dev/null 2>&1 || : fi +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + %files %defattr(-,root,root) %doc openldap-%{version_23}/ANNOUNCEMENT @@ -716,6 +722,9 @@ %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog +* Wed May 16 2007 Jan Safranek 2.3.30-3%{?dist} +- add ldconfig to devel post/postun (bz#240253) + * Mon Apr 23 2007 Jan Safranek 2.3.30-2%{?dist} - Finally fix the upgrade logic, so that upgrades from 2.3.30 to newer versions will work. Note that upgrades *to* 2.3.30 will have From fedora-cvs-commits at redhat.com Wed May 16 07:47:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 03:47:50 -0400 Subject: rpms/openldap/FC-5 openldap.spec,1.60,1.61 Message-ID: <200705160747.l4G7loff030259@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/openldap/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv30244 Modified Files: openldap.spec Log Message: add ldconfig to devel post/postun Resolves: bz#240253 Index: openldap.spec =================================================================== RCS file: /cvs/dist/rpms/openldap/FC-5/openldap.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- openldap.spec 25 Apr 2007 08:27:50 -0000 1.60 +++ openldap.spec 16 May 2007 07:47:48 -0000 1.61 @@ -13,7 +13,7 @@ Summary: The configuration files, libraries, and documentation for OpenLDAP Name: openldap Version: %{version_23} -Release: 2%{?dist} +Release: 3%{?dist} License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz @@ -624,6 +624,12 @@ /sbin/service ldap condrestart > /dev/null 2>&1 || : fi +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + %files %defattr(-,root,root) %doc openldap-%{version_23}/ANNOUNCEMENT @@ -717,6 +723,9 @@ %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog +* Wed May 16 2007 Jan Safranek 2.3.30-3%{?dist} +- add ldconfig to devel post/postun (bz#240253) + * Mon Apr 23 2007 Jan Safranek 2.3.30-2%{?dist} - Finally fix the upgrade logic, so that upgrades from 2.3.30 to newer versions will work. Note that upgrades *to* 2.3.30 will have From fedora-cvs-commits at redhat.com Wed May 16 14:12:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 10:12:26 -0400 Subject: rpms/alsa-utils/devel alsa-utils.spec, 1.53, 1.54 alsaunmute.c, 1.13, 1.14 Message-ID: <200705161412.l4GECQXD005875@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5860 Modified Files: alsa-utils.spec alsaunmute.c Log Message: added fix for #235635 (unmute channels on MacBook, thanks to Jussi Eloranta) Index: alsa-utils.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- alsa-utils.spec 2 May 2007 12:49:40 -0000 1.53 +++ alsa-utils.spec 16 May 2007 14:12:24 -0000 1.54 @@ -4,7 +4,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: 1.0.14 -Release: 0.6%{?prever_dot}%{?dist} +Release: 0.7%{?prever_dot}%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -74,6 +74,9 @@ /usr/share/locale/* %changelog +* Wed May 16 2007 Martin Stransky 1.0.14-0.7.rc2 +- added fix for #235635 (unmute channels on MacBook, thanks to Jussi Eloranta) + * Wed May 2 2007 Martin Stransky 1.0.14-0.6.rc2 - added fix for #238442 (unmute Mono channel for w4550, xw4600, xw6600, and xw8600) Index: alsaunmute.c =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/alsaunmute.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- alsaunmute.c 2 May 2007 12:49:40 -0000 1.13 +++ alsaunmute.c 16 May 2007 14:12:24 -0000 1.14 @@ -101,7 +101,11 @@ // Specific config for snd-ens1371 {"IEC958", 0, 0, 0, 0, "snd-ens1371"}, - {"iSpeaker", 75, 1, 0, 0, "snd-hda-intel"} + {"iSpeaker", 75, 1, 0, 0, "snd-hda-intel"}, + + // Specific configuration for MacBook + {"Side", 75, 1, 0, 0, "snd_hda_intel"}, + {"Line In as Output",75, 1, 0, 0, "snd_hda_intel"} }; From fedora-cvs-commits at redhat.com Wed May 16 14:15:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 10:15:45 -0400 Subject: rpms/alsa-utils/FC-6 alsa-utils.spec, 1.49, 1.50 alsaunmute.c, 1.11, 1.12 Message-ID: <200705161415.l4GEFjJh005975@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5960 Modified Files: alsa-utils.spec alsaunmute.c Log Message: added fix for #235635 (unmute channels on MacBook, thanks to Jussi Eloranta) Index: alsa-utils.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/FC-6/alsa-utils.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- alsa-utils.spec 19 Mar 2007 14:08:35 -0000 1.49 +++ alsa-utils.spec 16 May 2007 14:15:43 -0000 1.50 @@ -4,7 +4,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: 1.0.14 -Release: 0.1%{?prever_dot}%{?dist} +Release: 0.2%{?prever_dot}%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -68,6 +68,9 @@ /usr/share/locale/* %changelog +* Wed May 16 2007 Martin Stransky 1.0.14-0.2.rc1 +- added fix for #235635 (unmute channels on MacBook, thanks to Jussi Eloranta) + * Mon Mar 19 2007 Martin Stransky 1.0.14-0.1.rc1 - New upstream - alsa unmute update Index: alsaunmute.c =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/FC-6/alsaunmute.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- alsaunmute.c 19 Mar 2007 14:08:35 -0000 1.11 +++ alsaunmute.c 16 May 2007 14:15:43 -0000 1.12 @@ -96,9 +96,16 @@ // Specific config for snd-intel8x0 (xw8000) {"Master Mono", 75, 1, 0, 0, "snd-intel8x0"}, + // Specific config for snd_hda_intel (xw8600/xw6600/xw4600/xw4450) + {"Master Mono", 75, 1, 0, 0, "snd_hda_intel"}, + // Specific config for snd-ens1371 {"IEC958", 0, 0, 0, 0, "snd-ens1371"}, - {"iSpeaker", 75, 1, 0, 0, "snd-hda-intel"} + {"iSpeaker", 75, 1, 0, 0, "snd-hda-intel"}, + + // Specific configuration for MacBook + {"Side", 75, 1, 0, 0, "snd_hda_intel"}, + {"Line In as Output",75, 1, 0, 0, "snd_hda_intel"} }; @@ -290,7 +297,7 @@ printf("Usage: alsaunmute card_number [-v] [-s volume]\n\n"); printf(" card_number - number of unmuted card\n"); printf(" [-v] - verbose mode\n"); - printf(" [-s volume] - set this volume level instead of the default (75%)\n"); + printf(" [-s volume] - set this volume level instead of the default (75%%)\n"); printf(" the volume is number from 0 to 100\n\n"); exit(0); } From fedora-cvs-commits at redhat.com Wed May 16 16:07:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 12:07:49 -0400 Subject: rpms/acpid/devel acpid.init, 1.2, 1.3 acpid.power.conf, 1.1, 1.2 acpid.spec, 1.19, 1.20 Message-ID: <200705161607.l4GG7ntX008752@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/acpid/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8732 Modified Files: acpid.init acpid.power.conf acpid.spec Log Message: - Fixed power script to work reliably (#215824) - Fixed missing RETVAL setting for service acpid status (#237754) Index: acpid.init =================================================================== RCS file: /cvs/dist/rpms/acpid/devel/acpid.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- acpid.init 9 Sep 2004 02:52:56 -0000 1.2 +++ acpid.init 16 May 2007 16:07:43 -0000 1.3 @@ -72,6 +72,7 @@ ;; status) status acpid + RETVAL=$? ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" Index: acpid.power.conf =================================================================== RCS file: /cvs/dist/rpms/acpid/devel/acpid.power.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- acpid.power.conf 24 Aug 2006 14:16:09 -0000 1.1 +++ acpid.power.conf 16 May 2007 16:07:43 -0000 1.2 @@ -2,4 +2,4 @@ # no gnome-power-manager is running event=button/power.* -action=/bin/ps awwux | /bin/grep gnome-power-manager | /bin/grep -qv grep || /sbin/shutdown -h now +action=/usr/bin/pgrep -f gnome-power-manager > /dev/null || /sbin/shutdown -h now Index: acpid.spec =================================================================== RCS file: /cvs/dist/rpms/acpid/devel/acpid.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- acpid.spec 14 Feb 2007 13:01:46 -0000 1.19 +++ acpid.spec 16 May 2007 16:07:43 -0000 1.20 @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 1.0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Daemons Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz @@ -87,6 +87,10 @@ fi %changelog +* Wed May 16 2007 Phil Knirsch - 1.0.4-8.fc7 +- Fixed power script to work reliably (#215824) +- Fixed missing RETVAL setting for service acpid status (#237754) + * Wed Feb 14 2007 Phil Knirsch - 1.0.4-7.fc7 - Dropped /var/log/acpid ownership as per review (225237) From fedora-cvs-commits at redhat.com Wed May 16 17:03:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 13:03:12 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils.spec, 1.128, 1.129 nfs.init, 1.24, 1.25 nfslock.init, 1.15, 1.16 Message-ID: <200705161703.l4GH3CUT010304@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10275 Modified Files: nfs-utils.spec nfs.init nfslock.init Log Message: Make sure the condrestarts exit with a zero value (240225) Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- nfs-utils.spec 15 May 2007 14:09:36 -0000 1.128 +++ nfs-utils.spec 16 May 2007 17:03:10 -0000 1.129 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.10 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 # group all 32bit related archs @@ -321,6 +321,9 @@ %endif %changelog +* Wed May 16 2007 Steve Dickson 1.0.10-11 +- Make sure the condrestarts exit with a zero value (240225) + * Tue May 15 2007 Steve Dickson 1.0.10-10 - Added the -o nordirplus mount option (bz 220451) - Disabled the FSCache patch since its no longer supported Index: nfs.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs.init,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- nfs.init 12 May 2007 12:34:34 -0000 1.24 +++ nfs.init 16 May 2007 17:03:10 -0000 1.25 @@ -44,6 +44,8 @@ # Remote quota server [ -z "$RQUOTAD" ] && RQUOTAD=`type -path rpc.rquotad` +RETVAL=0 + # See how we were called. case "$1" in start) @@ -65,11 +67,14 @@ [ -n "$RQUOTAD_PORT" ] \ && RPCRQUOTADOPTS="$RPCRQUOTADOPTS -p $RQUOTAD_PORT" daemon rpc.rquotad $RPCRQUOTADOPTS + RETVAL=$? echo fi echo -n $"Starting NFS daemon: " daemon rpc.nfsd $RPCNFSDARGS $RPCNFSDCOUNT + RETVAL=$? echo + [ $RETVAL -ne 0 ] && exit $RETVAL [ -n "$MOUNTD_PORT" ] \ && RPCMOUNTDOPTS="$RPCMOUNTDOPTS -p $MOUNTD_PORT" @@ -91,6 +96,7 @@ echo -n $"Starting NFS mountd: " daemon rpc.mountd $RPCMOUNTDOPTS + RETVAL=$? echo touch /var/lock/subsys/nfs @@ -110,6 +116,7 @@ if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then echo -n $"Shutting down NFS quotas: " killproc rpc.rquotad + RETVAL=$? echo fi # Reset the lockd ports if they were set @@ -121,7 +128,12 @@ fi # Do it the last so that clients can still access the server # when the server is running. - action $"Shutting down NFS services: " /usr/sbin/exportfs -au + cnt=`/usr/sbin/exportfs -v | /usr/bin/wc -l` + if [ $cnt -gt 0 ]; then + action $"Shutting down NFS services: " /usr/sbin/exportfs -au + else + action $"Shutting down NFS services: " /bin/false + fi rm -f /var/lock/subsys/nfs ;; status) @@ -131,6 +143,7 @@ if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then status rpc.rquotad fi + RETVAL=$? ;; restart) $0 stop @@ -165,4 +178,4 @@ exit 1 esac -exit $? +exit $RETVAL Index: nfslock.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfslock.init,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- nfslock.init 12 May 2007 12:34:34 -0000 1.15 +++ nfslock.init 16 May 2007 17:03:10 -0000 1.16 @@ -95,9 +95,9 @@ echo -n $"Stopping NFS statd: " killproc rpc.statd - RETVAL=0 + RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/nfslock + rm -f /var/lock/subsys/nfslock return $RETVAL } @@ -144,4 +144,4 @@ exit 1 esac -exit $? +exit $RETVAL From fedora-cvs-commits at redhat.com Wed May 16 17:14:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 13:14:42 -0400 Subject: rpms/emacs/devel .cvsignore, 1.19, 1.20 emacs.spec, 1.93, 1.94 sources, 1.20, 1.21 Message-ID: <200705161714.l4GHEgon010631@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10616 Modified Files: .cvsignore emacs.spec sources Log Message: prevent mmapped pages during dumping (Ulrich Drepper) bz239344 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 6 Mar 2007 22:08:02 -0000 1.19 +++ .cvsignore 16 May 2007 17:14:40 -0000 1.20 @@ -1,2 +1,2 @@ -emacs-22.0.95.tar.gz -php-mode-1.1.0.tgz +emacs-22.0.99.tar.gz +php-mode-1.2.0.tgz Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- emacs.spec 6 Mar 2007 22:08:02 -0000 1.93 +++ emacs.spec 16 May 2007 17:14:40 -0000 1.94 @@ -1,20 +1,24 @@ # This file is encoded in UTF-8. -*- coding: utf-8 -*- +%define expurgate 0 +%define humorless 0 +%define paranoid 0 + Summary: GNU Emacs text editor Name: emacs -Version: 22.0.95 -Release: 1%{?dist} +Version: 22.0.99 +Release: 2%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.gz Source1: emacs.desktop -Source2: emacs.png +Source2: default.el Source3: dotemacs.el Source4: site-start.el Source5: http://www.python.org/emacs/python-mode/python-mode.el Source6: http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el -Source7: http://download.sourceforge.net/php-mode/php-mode-1.1.0.tgz +Source7: http://download.sourceforge.net/php-mode/php-mode-1.2.0.tgz Source8: php-mode-init.el Source9: ssl.el Source10: python-mode-init.el @@ -24,10 +28,9 @@ Source14: po-mode.el Source15: po-mode-init.el Source16: po-mode-auto-replace-date-71264.patch -Source18: default.el -Source19: wrapper Source20: igrep.el Source21: igrep-init.el +Patch0: emacs-mmap.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel @@ -37,12 +40,6 @@ Requires: emacs-common = %{version}-%{release} Conflicts: gettext < 0.10.40 -# C and build patches - -# Lisp and doc patches - -%define paranoid 1 - %description Emacs is a powerful, customizable, self-documenting, modeless text editor. Emacs contains special code editing features, a scripting @@ -95,113 +92,74 @@ %prep %setup -q +%if %{expurgate} +rm -f etc/sex.6 etc/condom.1 etc/celibacy.1 +%endif + +%if %{humorless} +rm -f etc/COOKIES etc/JOKES etc/future-bug +%endif + +%if %{paranoid} +rm -f lisp/play/tetris.el +%endif + +%patch0 -p1 -z .mmap + # install rest of site-lisp files ( cd site-lisp - cp %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 . + cp %SOURCE2 %SOURCE4 %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 . + tar xfz %SOURCE7 # xemacs compat patch for rpm-spec-mode patch < %SOURCE12 # fix po-auto-replace-revision-date nil patch < %SOURCE16 ) -%if %{paranoid} -# avoid trademark issues -( cd lisp/play - rm -f tetris.el tetris.elc ) -%endif - %build -export CFLAGS="-DMAIL_USE_LOCKF -DSYSTEM_PURESIZE_EXTRA=16777216 $RPM_OPT_FLAGS" -# stack-protector causes crashing on i386 (#174730) -%ifarch %{ix86} -CFLAGS=`echo $CFLAGS | sed -e "s/ -fstack-protector//"` -%endif +# First, build the binary without X support +%configure --without-x +%__make %{?_smp_mflags} -C src emacs +mv src/emacs-%{version}.1 src/emacs-%{version}-nox +# Now, rebuild with full X support %configure --with-pop --with-sound --with-gtk - -%__make bootstrap -%__make %{?_smp_mflags} - -# remove versioned file so that we end up with .1 suffix and only one DOC file -rm src/emacs-%{version}.* - -TOPDIR=${PWD} -%define emacsbatch ${TOPDIR}/src/emacs -batch --no-init-file --no-site-file +%__make %{?_smp_mflags} bootstrap # make sure patched lisp files get byte-compiled -%emacsbatch -f batch-byte-compile site-lisp/*.el - -%__make %{?_smp_mflags} -C lisp updates +src/emacs -batch --no-init-file --no-site-file -f batch-byte-compile site-lisp/*.el %install -rm -rf $RPM_BUILD_ROOT - -# workaround #101818 (vm/break dumper problem) -make install \ - prefix=%{?buildroot:%{buildroot}}%{_prefix} \ - exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \ - bindir=%{?buildroot:%{buildroot}}%{_bindir} \ - sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \ - sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \ - datadir=%{?buildroot:%{buildroot}}%{_datadir} \ - includedir=%{?buildroot:%{buildroot}}%{_includedir} \ - libdir=%{?buildroot:%{buildroot}}%{_libdir} \ - libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \ - localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \ - sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \ - mandir=%{?buildroot:%{buildroot}}%{_mandir} \ - infodir=%{?buildroot:%{buildroot}}%{_infodir} - -# suffix binaries with -x -mv $RPM_BUILD_ROOT%{_bindir}/emacs{,-x} -mv $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}{,-x} - -# rebuild without X support -# remove the versioned binary with X support so that we end up with .1 suffix for emacs-nox too -rm src/emacs-%{version}.* -%configure --without-x -%__make %{?_smp_mflags} - -# install the emacs without X -install -m 0755 src/emacs-%{version}.1 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}-nox -ln $RPM_BUILD_ROOT%{_bindir}/emacs{-%{version},}-nox - -# install wrapper script -install -m 0755 %SOURCE19 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version} -ln -s %{_bindir}/emacs-%{version} $RPM_BUILD_ROOT%{_bindir}/emacs - -# make sure movemail isn't setgid -chmod 755 $RPM_BUILD_ROOT%{emacs_libexecdir}/movemail - -%define site_lisp $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp +rm -rf %{buildroot} +%makeinstall +install -m 0755 src/emacs-%{version}-nox %{buildroot}%{_bindir} +# install site-lisp files +%define site_lisp %{buildroot}%{_datadir}/emacs/site-lisp mkdir -p %{site_lisp} -install -m 0644 %SOURCE4 %{site_lisp}/site-start.el -install -m 0644 %SOURCE18 %{site_lisp} +install -m 0644 site-lisp/*.el{,c} %{site_lisp} -mv $RPM_BUILD_ROOT%{_bindir}/{etags,etags.emacs} -mv $RPM_BUILD_ROOT%{_mandir}/man1/{ctags.1,gctags.1} -mv $RPM_BUILD_ROOT%{_bindir}/{ctags,gctags} +# alternatives will create a symlink to /usr/bin/emacs-22.0.99 +rm %{buildroot}%{_bindir}/emacs -# GNOME / KDE files -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/applications/gnu-emacs.desktop -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +mv %{buildroot}%{_bindir}/{etags,etags.emacs} +mv %{buildroot}%{_mandir}/man1/{ctags.1,gctags.1} +mv %{buildroot}%{_bindir}/{ctags,gctags} -# install site-lisp files -install -m 0644 site-lisp/*.el{,c} %{site_lisp} +# GNOME / KDE files +mkdir -p %{buildroot}%{_datadir}/applications +install -m 0644 %SOURCE1 %{buildroot}%{_datadir}/applications/gnu-emacs.desktop mkdir -p %{site_lisp}/site-start.d install -m 0644 $RPM_SOURCE_DIR/*-init.el %{site_lisp}/site-start.d # default initialization file -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel -install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.emacs +mkdir -p %{buildroot}%{_sysconfdir}/skel +install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs # after everything is installed, remove info dir -rm -f $RPM_BUILD_ROOT%{_infodir}/dir -rm $RPM_BUILD_ROOT%{_localstatedir}/games/emacs/* +rm -f %{buildroot}%{_infodir}/dir +rm %{buildroot}%{_localstatedir}/games/emacs/* # # create file lists @@ -213,9 +171,7 @@ find .%{_datadir}/emacs/%{version}/lisp \ .%{_datadir}/emacs/%{version}/leim \ - .%{_datadir}/emacs/site-lisp \( -type f -name '*.elc' -fprint $TOPDIR/common-lisp-none-elc-files \) -o \( -type d -fprintf $TOPDIR/common-lisp-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el.gz' -fprint $TOPDIR/el-bytecomped-files -o -fprint $TOPDIR/common-not-comped-files \) - -) + .%{_datadir}/emacs/site-lisp \( -type f -name '*.elc' -fprint $TOPDIR/common-lisp-none-elc-files \) -o \( -type d -fprintf $TOPDIR/common-lisp-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el.gz' -fprint $TOPDIR/el-bytecomped-files -o -fprint $TOPDIR/common-not-comped-files \) ) # put the lists together after filtering ./usr to /usr sed -i -e "s|\.%{_prefix}|%{_prefix}|" *-files @@ -227,6 +183,18 @@ %define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman +%post +alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 + +%preun +alternatives --remove emacs %{_bindir}/emacs-%{version} + +%post nox +alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70 + +%preun nox +alternatives --remove emacs %{_bindir}/emacs-%{version}-nox + %post common for f in %{info_files}; do /sbin/install-info %{_infodir}/$f.gz %{_infodir}/dir --section="GNU Emacs" 2> /dev/null || : @@ -244,37 +212,25 @@ %files %defattr(-,root,root) -%{_bindir}/emacs %{_bindir}/emacs-%{version} -%{_bindir}/emacs-x -%{_bindir}/emacs-%{version}-x -%dir %{_libexecdir}/emacs -%dir %{_libexecdir}/emacs/%{version} -%dir %{emacs_libexecdir} %{_datadir}/applications/gnu-emacs.desktop -%{_datadir}/pixmaps/emacs.png %files nox %defattr(-,root,root) -%{_bindir}/emacs -%{_bindir}/emacs-%{version} -%{_bindir}/emacs-nox %{_bindir}/emacs-%{version}-nox -%dir %{_libexecdir}/emacs -%dir %{_libexecdir}/emacs/%{version} -%dir %{emacs_libexecdir} %files -f common-filelist common %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/skel/.emacs %doc etc/NEWS BUGS README -%exclude %{_bindir}/emacs -%exclude %{_bindir}/emacs-* +%exclude %{_bindir}/emacs-%{version} +%exclude %{_bindir}/emacs-%{version}-nox %{_bindir}/* %{_mandir}/*/* %{_infodir}/* %dir %{_datadir}/emacs %dir %{_datadir}/emacs/%{version} +%dir %{emacs_libexecdir} %{_datadir}/emacs/%{version}/etc %{_datadir}/emacs/%{version}/site-lisp %{_libexecdir}/emacs @@ -287,6 +243,15 @@ %dir %{_datadir}/emacs/%{version} %changelog +* Sun May 13 2007 Chip Coldwell - 22.0.99-2 +- prevent mmapped pages during dumping (Ulrich Drepper) +- Resolves: bz239344 + +* Tue Apr 24 2007 Chip Coldwell - 22.0.99-1 +- new (last?) pretest tarball from FSF +- update to php-mode-1.2.0 (Ville Skytt?? #235941) +- use /etc/alternatives instead of wrapper script + * Tue Mar 6 2007 Chip Coldwell - 22.0.95-1 - new pretest tarball from FSF Index: sources =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 6 Mar 2007 22:08:02 -0000 1.20 +++ sources 16 May 2007 17:14:40 -0000 1.21 @@ -1,2 +1,2 @@ -07ae2a749fec6decbdf65ae3673d5546 emacs-22.0.95.tar.gz -aad009f7cff4019aac9a466ec9b55aaf php-mode-1.1.0.tgz +f0f6c5e4163113f5e292e7b03b078aa9 emacs-22.0.99.tar.gz +c4ee5e37db3921d6a9aa6d7c417ccadb php-mode-1.2.0.tgz From fedora-cvs-commits at redhat.com Wed May 16 17:17:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 13:17:32 -0400 Subject: rpms/emacs/devel emacs-mmap.patch,NONE,1.1 Message-ID: <200705161717.l4GHHWtB010729@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10714 Added Files: emacs-mmap.patch Log Message: prevent mmapped pages during dumping (Ulrich Drepper) bz239344 emacs-mmap.patch: Makefile.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE emacs-mmap.patch --- --- emacs-22.0.95/src/Makefile.in-save 2007-05-13 11:53:01.000000000 -0700 +++ emacs-22.0.95/src/Makefile.in 2007-05-13 11:53:55.000000000 -0700 @@ -960,7 +960,7 @@ ln temacs${EXEEXT} emacs${EXEEXT} #else #ifdef HAVE_SHM - LC_ALL=C $(RUN_TEMACS) -nl -batch -l loadup dump + MALLOC_MMAP_MAX_=0 LC_ALL=C $(RUN_TEMACS) -nl -batch -l loadup dump #else /* ! defined (HAVE_SHM) */ LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump #endif /* ! defined (HAVE_SHM) */ From fedora-cvs-commits at redhat.com Wed May 16 18:34:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 14:34:22 -0400 Subject: rpms/emacs/devel emacs.spec,1.94,1.95 Message-ID: <200705161834.l4GIYMvm012630@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12614 Modified Files: emacs.spec Log Message: bump the release, up the paranoia Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- emacs.spec 16 May 2007 17:14:40 -0000 1.94 +++ emacs.spec 16 May 2007 18:34:20 -0000 1.95 @@ -2,12 +2,12 @@ %define expurgate 0 %define humorless 0 -%define paranoid 0 +%define paranoid 1 Summary: GNU Emacs text editor Name: emacs Version: 22.0.99 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors From fedora-cvs-commits at redhat.com Wed May 16 18:50:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 14:50:38 -0400 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2950,1.2951 Message-ID: <200705161850.l4GIocb6013158@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13143 Modified Files: kernel-2.6.spec Log Message: * Wed May 16 2007 Chuck Ebbert 1.2951 - BZ #227533: remove hyphens from kernel versions in RPM provides Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2950 retrieving revision 1.2951 diff -u -r1.2950 -r1.2951 --- kernel-2.6.spec 15 May 2007 21:32:19 -0000 1.2950 +++ kernel-2.6.spec 16 May 2007 18:50:30 -0000 1.2951 @@ -793,7 +793,7 @@ Group: System Environment/Kernel Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}-PAE-debug +Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}PAEdebug Prereq: %{kernel_prereq} Conflicts: %{kernel_dot_org_conflicts} Conflicts: %{package_conflicts} @@ -821,8 +821,8 @@ Summary: Development package for building kernel modules to match the kernel. Group: System Environment/Kernel Provides: kernel-PAE-debug-devel-%{_target_cpu} = %{rpmversion}-%{release} -Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}PAE-debug -Provides: kernel-devel = %{rpmversion}-%{release}PAE-debug +Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}PAEdebug +Provides: kernel-devel = %{rpmversion}-%{release}PAEdebug AutoReqProv: no Prereq: /usr/bin/find %description PAE-debug-devel @@ -860,7 +860,7 @@ Group: System Environment/Kernel Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}-debug +Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}debug Prereq: %{kernel_prereq} Conflicts: %{kernel_dot_org_conflicts} Conflicts: %{package_conflicts} @@ -2320,10 +2320,13 @@ %endif %changelog -* Tue May 15 2007 Eduardo Habkost 1.2949.2.2 +* Wed May 16 2007 Chuck Ebbert 1.2951 +- BZ #227533: remove hyphens from kernel versions in RPM provides + +* Tue May 15 2007 Eduardo Habkost 1.2950 - Xen kernel: added patch to initialize pda properly on smp_prepare_cpus() -* Mon May 14 2007 Eduardo Habkost 1.2949.2.1 +* Mon May 14 2007 Eduardo Habkost - Xen kernel: added patch from Stephen C. Tweedie. Fix crashes and hangs, by making critical_fixup_table correct. Probably fix bugs: #236461, #238432, #234008, #236471, #236474, #238403, #233937, #238852 From fedora-cvs-commits at redhat.com Wed May 16 21:50:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 16 May 2007 17:50:29 -0400 Subject: rpms/kernel/FC-6 linux-2.6-20.12a-v4l-dvb-fix_tuning_for_tdm_1316.patch, NONE, 1.1 linux-2.6-20.12b-input_i8042_fix_aux_port_detection_with_some_chips.patch, NONE, 1.1 linux-2.6-20.12c-fix-blk-bounce-map-kern.patch, NONE, 1.1 linux-2.6-20.12c-snd-fix-widget-list-copy.patch, NONE, 1.1 linux-2.6-20.12c-snd-resume-stac-fix.patch, NONE, 1.1 linux-2.6-20.12c-usb_audio_fix_quickcam_audio.patch, NONE, 1.1 linux-2.6-20.12c-x86_64-off-by-two.patch, NONE, 1.1 linux-2.6-gfs2-update4.patch, NONE, 1.1 kernel-2.6.spec, 1.2951, 1.2952 Message-ID: <200705162150.l4GLoTce017690@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17669 Modified Files: kernel-2.6.spec Added Files: linux-2.6-20.12a-v4l-dvb-fix_tuning_for_tdm_1316.patch linux-2.6-20.12b-input_i8042_fix_aux_port_detection_with_some_chips.patch linux-2.6-20.12c-fix-blk-bounce-map-kern.patch linux-2.6-20.12c-snd-fix-widget-list-copy.patch linux-2.6-20.12c-snd-resume-stac-fix.patch linux-2.6-20.12c-usb_audio_fix_quickcam_audio.patch linux-2.6-20.12c-x86_64-off-by-two.patch linux-2.6-gfs2-update4.patch Log Message: * Wed May 16 2007 Chuck Ebbert 1.2952 - GFS2 update - additional patches v4l tuner patch (bz 234509) ps/2 mouse detection (bz 223606) block bounce fix for some legacy drivers quickcam audio was broken x86_64 GART aperture range checking hda audio STAC codec resume fix hda audio init fix linux-2.6-20.12a-v4l-dvb-fix_tuning_for_tdm_1316.patch: budget-ci.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-20.12a-v4l-dvb-fix_tuning_for_tdm_1316.patch --- # HG changeset patch # User Oliver Endriss # Date Thu May 03 18:16:12 2007 +0200 # Node ID 23004ffaf979a5376ce0a2d154bfa668e412c89c # parent: 44611bd3cc9019f09766a82c3078920ec98e9365 budget-ci: Fix tuning for TDM 1316 (160..200 MHz) From: Oliver Endriss Revert changeset http://linuxtv.org/hg/v4l-dvb?cmd=changeset;node=e7c424bbf9aa;style=gitweb Petri Helin found that this changeset broke tuning: 'Well, after going through the changes that might have had effect on tuning, I found out the one which had caused this problem. I do not know the actual reason behind the change, but the changelog says that it was meant to "Fix TD1316 tuner for DVBC". But at least in my case it seams to have broken the tuner instead.' Signed-off-by: Oliver Endriss Thanks-to: Petri Helin Acked-by: e9hack Acked-by: Thomas Kaiser --- a/drivers/media/dvb/ttpci/budget-ci.c Thu May 03 17:23:44 2007 +0200 +++ b/drivers/media/dvb/ttpci/budget-ci.c Thu May 03 18:16:12 2007 +0200 @@ -910,7 +910,7 @@ static int dvbc_philips_tdm1316l_tuner_s band = 1; } else if (tuner_frequency < 200000000) { cp = 6; - band = 2; + band = 1; } else if (tuner_frequency < 290000000) { cp = 3; band = 2; linux-2.6-20.12b-input_i8042_fix_aux_port_detection_with_some_chips.patch: i8042.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-20.12b-input_i8042_fix_aux_port_detection_with_some_chips.patch --- From: Roland Scheidegger Date: Tue, 8 May 2007 05:31:40 +0000 (-0400) Subject: Input: i8042 - fix AUX port detection with some chips X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdtor%2Finput.git;a=commitdiff_plain;h=d2ada5597d33a9108acb2caf912f85cbc9caab1e Input: i8042 - fix AUX port detection with some chips The i8042 driver fails detection of the AUX port with some chips, because they apparently do not change the I8042_CTR_AUXDIS bit immediately. This is known to affect at least HP500/HP510 notebooks, consequently the built-in touchpad will not work. The patch will simply reread the value until it gets the expected value or a retry limit is hit, without touching other workaround code in the same area. Signed-off-by: Roland Scheidegger Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 7c17377..3888dc3 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -526,6 +526,33 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id) return IRQ_HANDLED; } +/* + * i8042_toggle_aux - enables or disables AUX port on i8042 via command and + * verifies success by readinng CTR. Used when testing for presence of AUX + * port. + */ +static int __devinit i8042_toggle_aux(int on) +{ + unsigned char param; + int i; + + if (i8042_command(¶m, + on ? I8042_CMD_AUX_ENABLE : I8042_CMD_AUX_DISABLE)) + return -1; + + /* some chips need some time to set the I8042_CTR_AUXDIS bit */ + for (i = 0; i < 100; i++) { + udelay(50); + + if (i8042_command(¶m, I8042_CMD_CTL_RCTR)) + return -1; + + if (!(param & I8042_CTR_AUXDIS) == on) + return 0; + } + + return -1; +} /* * i8042_check_aux() applies as much paranoia as it can at detecting @@ -580,16 +607,12 @@ static int __devinit i8042_check_aux(void) * Bit assignment test - filters out PS/2 i8042's in AT mode */ - if (i8042_command(¶m, I8042_CMD_AUX_DISABLE)) - return -1; - if (i8042_command(¶m, I8042_CMD_CTL_RCTR) || (~param & I8042_CTR_AUXDIS)) { + if (i8042_toggle_aux(0)) { printk(KERN_WARNING "Failed to disable AUX port, but continuing anyway... Is this a SiS?\n"); printk(KERN_WARNING "If AUX port is really absent please use the 'i8042.noaux' option.\n"); } - if (i8042_command(¶m, I8042_CMD_AUX_ENABLE)) - return -1; - if (i8042_command(¶m, I8042_CMD_CTL_RCTR) || (param & I8042_CTR_AUXDIS)) + if (i8042_toggle_aux(1)) return -1; /* linux-2.6-20.12c-fix-blk-bounce-map-kern.patch: ll_rw_blk.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-20.12c-fix-blk-bounce-map-kern.patch --- From: Mike Christie Date: Tue, 8 May 2007 17:12:23 +0000 (+0200) Subject: [PATCH] ll_rw_blk: fix missing bounce in blk_rq_map_kern() X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=821de3a27bf33f11ec878562577c586cd5f83c64 [PATCH] ll_rw_blk: fix missing bounce in blk_rq_map_kern() I think we might just need the blk_map_kern users now. For the async execute I added the bounce code already and the block SG_IO has it atleady. I think the blk_map_kern bounce code got dropped because we thought the correct gfp_t would be passed in. But I think all we need is the patch below and all the paths are take care of. The patch is not tested. Patch was made against scsi-misc. The last place that is sending non sg commands may just be md/dm-emc.c but that is is just waiting on alasdair to take some patches that fix that and a bunch of junk in there including adding bounce support. If the patch below is ok though and dm-emc finally gets converted then it will have sg and bonce buffer support. Signed-off-by: Mike Christie Signed-off-by: Jens Axboe --- diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 5873861..d99d402 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -2558,6 +2558,7 @@ int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf, bio->bi_rw |= (1 << BIO_RW); blk_rq_bio_prep(q, rq, bio); + blk_queue_bounce(q, &rq->bio); rq->buffer = rq->data = NULL; return 0; } linux-2.6-20.12c-snd-fix-widget-list-copy.patch: hda_generic.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-20.12c-snd-fix-widget-list-copy.patch --- # HG changeset patch # User Takashi Iwai # Date 1178895377 -7200 # Node ID 91e1706a7cad36ba6d5c08d87ab6b7f49fa7c169 # Parent ea36d5c7a6f416747ed1beb9190159983be8af84 [ALSA] hda-codec - Fix connection list in generic parser Fix the retrival of widget connection list in the generic parser. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela committer: Jaroslav Kysela --- a/sound/pci/hda/hda_generic.c Fri May 11 16:56:17 2007 +0200 +++ b/sound/pci/hda/hda_generic.c Fri May 11 16:56:17 2007 +0200 @@ -133,7 +133,7 @@ static int add_new_node(struct hda_codec return -ENOMEM; } } - memcpy(node->conn_list, conn_list, nconns); + memcpy(node->conn_list, conn_list, nconns * sizeof(hda_nid_t)); node->nconns = nconns; node->wid_caps = get_wcaps(codec, nid); node->type = (node->wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; linux-2.6-20.12c-snd-resume-stac-fix.patch: patch_sigmatel.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-20.12c-snd-resume-stac-fix.patch --- # HG changeset patch # User Takashi Iwai # Date 1178895374 -7200 # Node ID 43304430568e13f4629394576c11df38924fe9ee # Parent bbdd174eca25d86e6fe9c05530a6d41903eca842 [ALSA] hda-codec - Fix resume of STAC92xx codecs Added a missing call to resume mixer controls for STAC92xx codecs. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela committer: Jaroslav Kysela --- a/sound/pci/hda/patch_sigmatel.c Fri May 11 16:56:14 2007 +0200 +++ b/sound/pci/hda/patch_sigmatel.c Fri May 11 16:56:14 2007 +0200 @@ -1766,6 +1766,7 @@ static int stac92xx_resume(struct hda_co stac92xx_init(codec); stac92xx_set_config_regs(codec); + snd_hda_resume_ctls(codec, spec->mixer); for (i = 0; i < spec->num_mixers; i++) snd_hda_resume_ctls(codec, spec->mixers[i]); if (spec->multiout.dig_out_nid) linux-2.6-20.12c-usb_audio_fix_quickcam_audio.patch: usbquirks.h | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+) --- NEW FILE linux-2.6-20.12c-usb_audio_fix_quickcam_audio.patch --- # HG changeset patch # User Daniel Drake # Date 1178895377 -7200 # Node ID cfd5ac79c8e40dc1bc23d7824aabd9244c5bd3b3 # Parent e083643d8428a7463a1e5cb78fabe5137cb0d597 [ALSA] usb-audio: explicitly match Logitech QuickCam Commit 93c8bf45e083b89dffe3a708363c15c1b220c723 modified the USB device matching behaviour to ignore interface class matches if the device class is vendor-specific. This patch adds explicit ID matches for Logitech QuickCam devices, which have a vendor specific device class (but standards-compliant audio interfaces). This fixes a 2.6.20 regression where the audio component of these devices was no longer usable. http://bugs.gentoo.org/show_bug.cgi?id=175715 https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.20/+bug/93822 https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3040 Based on a patch from sergiom Signed-off-by: Daniel Drake Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela committer: Jaroslav Kysela --- a/sound/usb/usbquirks.h Fri May 11 16:56:17 2007 +0200 +++ b/sound/usb/usbquirks.h Fri May 11 16:56:17 2007 +0200 @@ -38,6 +38,29 @@ .idVendor = vend, \ .idProduct = prod, \ .bInterfaceClass = USB_CLASS_VENDOR_SPEC + +/* + * Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface + * class matches do not take effect without an explicit ID match. + */ +{ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | + USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x08f0, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL +}, +{ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | + USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x08f6, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL +}, /* * Yamaha devices linux-2.6-20.12c-x86_64-off-by-two.patch: arch/x86_64/kernel/aperture.c | 2 +- arch/x86_64/kernel/pci-gart.c | 2 +- drivers/char/agp/amd64-agp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-20.12c-x86_64-off-by-two.patch --- # HG changeset patch # User Andrew Hastings # Date 1178913180 25200 # Node ID 651f64005ad8ec6996c7a73dc7ccb217ce9e6de3 # Parent 6b217f03ee2c4527be33aa1934d47557bd68bda8 x86_64: off-by-two error in aperture.c I'm using a custom BIOS to configure the northbridge GART at address 0x80000000, size 2G. Linux complains: "Aperture from northbridge cpu 0 beyond 4GB. Ignoring." I think there's an off-by-two error in arch/x86_64/kernel/aperture.c: AK: use correct types for i386 Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds committer: Linus Torvalds --- a/arch/x86_64/kernel/aperture.c Fri May 11 12:53:00 2007 -0700 +++ b/arch/x86_64/kernel/aperture.c Fri May 11 12:53:00 2007 -0700 @@ -86,7 +86,7 @@ static int __init aperture_valid(u64 ape printk("Aperture too small (%d MB)\n", aper_size>>20); return 0; } - if (aper_base + aper_size >= 0xffffffff) { + if (aper_base + aper_size > 0x100000000UL) { printk("Aperture beyond 4GB. Ignoring.\n"); return 0; } --- a/arch/x86_64/kernel/pci-gart.c Fri May 11 12:53:00 2007 -0700 +++ b/arch/x86_64/kernel/pci-gart.c Fri May 11 12:53:00 2007 -0700 @@ -476,7 +476,7 @@ static __init unsigned read_aperture(str aper_base <<= 25; aper_size = (32 * 1024 * 1024) << aper_order; - if (aper_base + aper_size >= 0xffffffff || !aper_size) + if (aper_base + aper_size > 0x100000000UL || !aper_size) aper_base = 0; *size = aper_size; --- a/drivers/char/agp/amd64-agp.c Fri May 11 12:53:00 2007 -0700 +++ b/drivers/char/agp/amd64-agp.c Fri May 11 12:53:00 2007 -0700 @@ -268,7 +268,7 @@ static int __devinit aperture_valid(u64 printk(KERN_ERR PFX "Aperture too small (%d MB)\n", size>>20); return 0; } - if (aper + size > 0xffffffff) { + if ((u64)aper + size > 0x100000000ULL) { printk(KERN_ERR PFX "Aperture out of bounds\n"); return 0; } linux-2.6-gfs2-update4.patch: b/fs/gfs2/dir.c | 36 +++++- b/fs/gfs2/glock.c | 30 ++++- b/fs/gfs2/glops.c | 3 b/fs/gfs2/incore.h | 3 b/fs/gfs2/main.c | 7 - b/fs/gfs2/mount.c | 240 +++++++++++++++++++++++++++------------------ b/fs/gfs2/ops_address.c | 18 ++- b/fs/gfs2/ops_address.h | 5 b/fs/gfs2/ops_fstype.c | 2 b/fs/gfs2/rgrp.c | 60 ++++++++++- b/include/linux/kallsyms.h | 13 ++ b/kernel/kallsyms.c | 24 +++- fs/gfs2/dir.c | 12 +- fs/gfs2/glock.c | 39 +++---- fs/gfs2/ops_address.c | 29 +++++ 15 files changed, 362 insertions(+), 159 deletions(-) --- NEW FILE linux-2.6-gfs2-update4.patch --- Return-Path: Received: from mail.boston.redhat.com ([unix socket]) by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Thu, 10 May 2007 09:51:02 -0400 X-Sieve: CMU Sieve 2.2 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mail.boston.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id l4ADp1qe026736 for ; Thu, 10 May 2007 09:51:02 -0400 Received: from pobox.surrey.redhat.com (pobox.fab.redhat.com [10.33.63.12]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l4ADp0QD008008 for ; Thu, 10 May 2007 09:51:00 -0400 Received: from [172.31.0.3] (vpn-14-64.rdu.redhat.com [10.11.14.64]) by pobox.surrey.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id l4ADovaP019670 for ; Thu, 10 May 2007 14:50:58 +0100 Subject: GFS2 update patch for FC6 From: Steven Whitehouse To: Chuck Ebbert Content-Type: text/plain Organization: Red Hat (UK) Ltd (Registered in England and Wales, No. 3798903) Registered office: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 ITE Date: Thu, 10 May 2007 14:50:15 +0100 Message-Id: <1178805015.7476.60.camel at quoit> Mime-Version: 1.0 X-Mailer: Evolution 2.8.3 (2.8.3-2.fc6) Content-Transfer-Encoding: 7bit Hi, Please find enclosed an update patch for GFS2 in FC6. You should be able to apply it directly after the existing GFS2 patches, Steve. -------------------------------------------------------------------------------------- From: Robert Peterson Date: Mon, 30 Apr 2007 22:09:48 +0000 (-0700) Subject: Extend print_symbol capability X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=42e380832a6911c8a3173ee0172fbc0e4864d80b Extend print_symbol capability Today's print_symbol function dumps a kernel symbol with printk. This patch extends the functionality of kallsyms.c so that the symbol lookup function may be used without the printk. This is useful for modules that want to dump symbols elsewhere, for example, to debugfs. I intend to use the new function call in the GFS2 file system (which will be a separate patch). [akpm at linux-foundation.org: build fix] [clameter at sgi.com: sprint_symbol should return length of string like sprintf] Signed-off-by: Robert Peterson Cc: Rusty Russell Cc: Roman Zippel Cc: "Randy.Dunlap" Cc: Sam Ravnborg Acked-by: Paulo Marques Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index 1cebcbc..3e3b92d 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h @@ -7,6 +7,8 @@ #define KSYM_NAME_LEN 127 +#define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + KSYM_NAME_LEN + \ + 2*(BITS_PER_LONG*3/10) + MODULE_NAME_LEN + 1) #ifdef CONFIG_KALLSYMS /* Lookup the address for a symbol. Returns 0 if not found. */ @@ -22,7 +24,10 @@ const char *kallsyms_lookup(unsigned long addr, unsigned long *offset, char **modname, char *namebuf); -/* Replace "%s" in format with address, if found */ +/* Look up a kernel symbol and return it in a text buffer. */ +extern int sprint_symbol(char *buffer, unsigned long address); + +/* Look up a kernel symbol and print it to the kernel messages. */ extern void __print_symbol(const char *fmt, unsigned long address); #else /* !CONFIG_KALLSYMS */ @@ -47,6 +52,12 @@ static inline const char *kallsyms_lookup(unsigned long addr, return NULL; } +static inline int sprint_symbol(char *buffer, unsigned long addr) +{ + *buffer = '\0'; + return 0; +} + /* Stupid that this does nothing, but I didn't create this mess. */ #define __print_symbol(fmt, addr) #endif /*CONFIG_KALLSYMS*/ diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index 6f294ff..5a0de84 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c @@ -267,27 +267,33 @@ const char *kallsyms_lookup(unsigned long addr, return NULL; } -/* Replace "%s" in format with address, or returns -errno. */ -void __print_symbol(const char *fmt, unsigned long address) +/* Look up a kernel symbol and return it in a text buffer. */ +int sprint_symbol(char *buffer, unsigned long address) { char *modname; const char *name; unsigned long offset, size; char namebuf[KSYM_NAME_LEN+1]; - char buffer[sizeof("%s+%#lx/%#lx [%s]") + KSYM_NAME_LEN + - 2*(BITS_PER_LONG*3/10) + MODULE_NAME_LEN + 1]; name = kallsyms_lookup(address, &size, &offset, &modname, namebuf); - if (!name) - sprintf(buffer, "0x%lx", address); + return sprintf(buffer, "0x%lx", address); else { if (modname) - sprintf(buffer, "%s+%#lx/%#lx [%s]", name, offset, + return sprintf(buffer, "%s+%#lx/%#lx [%s]", name, offset, size, modname); else - sprintf(buffer, "%s+%#lx/%#lx", name, offset, size); + return sprintf(buffer, "%s+%#lx/%#lx", name, offset, size); } +} + +/* Look up a kernel symbol and print it to the kernel messages. */ +void __print_symbol(const char *fmt, unsigned long address) +{ + char buffer[KSYM_SYMBOL_LEN]; + + sprint_symbol(buffer, address); + printk(fmt, buffer); } @@ -452,3 +458,4 @@ static int __init kallsyms_init(void) __initcall(kallsyms_init); EXPORT_SYMBOL(__print_symbol); +EXPORT_SYMBOL_GPL(sprint_symbol); >From 7a0079d9e3fe8826475a08785f3d348c4b509774 Mon Sep 17 00:00:00 2001 From: Robert Peterson Date: Tue, 17 Apr 2007 11:37:11 -0500 Subject: [PATCH] [GFS2] bz 236008: Kernel gpf doing cat /debugfs/gfs2/xxx (lock dump) This is for Bugzilla Bug 236008: Kernel gpf doing cat /debugfs/gfs2/xxx (lock dump) seen at the "gfs2 summit". This also fixes the bug that caused garbage to be printed by the "initialized at" field. I apologize for the kludge, but that code will all be ripped out anyway when the official sprint_symbol function becomes available in the Linux kernel. I also changed some formatting so that spaces are replaced by proper tabs. Signed-off-by: Robert Peterson Signed-off-by: Steven Whitehouse diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index d2e3094..b075f93 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -1765,15 +1765,20 @@ static void gfs2_print_symbol(struct glock_iter *gi, const char *fmt, { /* when sprint_symbol becomes available in the new kernel, replace this */ /* function with: - char buffer[KSYM_SYMBOL_LEN]; + char buffer[KSYM_SYMBOL_LEN]; - sprint_symbol(buffer, address); - print_dbg(gi, fmt, buffer); + sprint_symbol(buffer, address); + print_dbg(gi, fmt, buffer); */ - if (gi) - print_dbg(gi, fmt, address); - else - print_symbol(fmt, address); + char buffer[256]; + + if (gi) { + memset(buffer, 0, sizeof(buffer)); + sprintf(buffer, "%p", address); + print_dbg(gi, fmt, buffer); + } + else + print_symbol(fmt, address); } /** @@ -1993,14 +1998,19 @@ int __init gfs2_glock_init(void) static int gfs2_glock_iter_next(struct glock_iter *gi) { + read_lock(gl_lock_addr(gi->hash)); while (1) { if (!gi->hb_list) { /* If we don't have a hash bucket yet */ gi->hb_list = &gl_hash_table[gi->hash].hb_list; if (hlist_empty(gi->hb_list)) { + read_unlock(gl_lock_addr(gi->hash)); gi->hash++; + read_lock(gl_lock_addr(gi->hash)); gi->hb_list = NULL; - if (gi->hash >= GFS2_GL_HASH_SIZE) + if (gi->hash >= GFS2_GL_HASH_SIZE) { + read_unlock(gl_lock_addr(gi->hash)); return 1; + } else continue; } @@ -2011,7 +2021,9 @@ static int gfs2_glock_iter_next(struct glock_iter *gi) } } else { if (gi->gl->gl_list.next == NULL) { + read_unlock(gl_lock_addr(gi->hash)); gi->hash++; + read_lock(gl_lock_addr(gi->hash)); gi->hb_list = NULL; continue; } @@ -2021,6 +2033,7 @@ static int gfs2_glock_iter_next(struct glock_iter *gi) if (gi->gl) break; } + read_unlock(gl_lock_addr(gi->hash)); return 0; } -- 1.5.1.2 >From bdd19a22f85a7039e01accd8717eaec4addd9dfd Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Wed, 18 Apr 2007 09:38:42 +0100 Subject: [PATCH] [GFS2] Patch to detect corrupt number of dir entries in leaf and/or inode blocks This patch detects when the number of entries in a leaf block or inode block (in the case of stuffed directories) is corrupt and informs the user. It prevents us from running off the end of the array thats been allocated for the sorting in this case, Signed-off-by: Steven Whitehouse diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 82a1ac7..6c3ed76 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -1262,9 +1262,10 @@ static int gfs2_dir_read_leaf(struct inode *inode, u64 *offset, void *opaque, u64 leaf_no) { struct gfs2_inode *ip = GFS2_I(inode); + struct gfs2_sbd *sdp = GFS2_SB(inode); struct buffer_head *bh; struct gfs2_leaf *lf; - unsigned entries = 0; + unsigned entries = 0, entries2 = 0; unsigned leaves = 0; const struct gfs2_dirent **darr, *dent; struct dirent_gather g; @@ -1290,7 +1291,13 @@ static int gfs2_dir_read_leaf(struct inode *inode, u64 *offset, void *opaque, return 0; error = -ENOMEM; - larr = vmalloc((leaves + entries) * sizeof(void *)); + /* + * The extra 99 entries are not normally used, but are a buffer + * zone in case the number of entries in the leaf is corrupt. + * 99 is the maximum number of entries that can fit in a single + * leaf block. + */ + larr = vmalloc((leaves + entries + 99) * sizeof(void *)); if (!larr) goto out; darr = (const struct gfs2_dirent **)(larr + leaves); @@ -1305,10 +1312,18 @@ static int gfs2_dir_read_leaf(struct inode *inode, u64 *offset, void *opaque, lf = (struct gfs2_leaf *)bh->b_data; lfn = be64_to_cpu(lf->lf_next); if (lf->lf_entries) { + entries2 += be16_to_cpu(lf->lf_entries); dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size, gfs2_dirent_gather, NULL, &g); error = PTR_ERR(dent); - if (IS_ERR(dent)) { + if (IS_ERR(dent)) + goto out_kfree; + if (entries2 != g.offset) { + fs_warn(sdp, "Number of entries corrupt in dir leaf %llu, " + "entries2 (%u) != g.offset (%u)\n", + (u64)bh->b_blocknr, entries2, g.offset); + + error = -EIO; goto out_kfree; } error = 0; @@ -1318,6 +1333,7 @@ static int gfs2_dir_read_leaf(struct inode *inode, u64 *offset, void *opaque, } } while(lfn); + BUG_ON(entries2 != entries); error = do_filldir_main(ip, offset, opaque, filldir, darr, entries, copied); out_kfree: @@ -1401,6 +1417,7 @@ int gfs2_dir_read(struct inode *inode, u64 *offset, void *opaque, filldir_t filldir) { struct gfs2_inode *dip = GFS2_I(inode); + struct gfs2_sbd *sdp = GFS2_SB(inode); struct dirent_gather g; const struct gfs2_dirent **darr, *dent; struct buffer_head *dibh; @@ -1423,8 +1440,8 @@ int gfs2_dir_read(struct inode *inode, u64 *offset, void *opaque, return error; error = -ENOMEM; - darr = kmalloc(dip->i_di.di_entries * sizeof(struct gfs2_dirent *), - GFP_KERNEL); + /* 96 is max number of dirents which can be stuffed into an inode */ + darr = kmalloc(96 * sizeof(struct gfs2_dirent *), GFP_KERNEL); if (darr) { g.pdent = darr; g.offset = 0; @@ -1434,6 +1451,14 @@ int gfs2_dir_read(struct inode *inode, u64 *offset, void *opaque, error = PTR_ERR(dent); goto out; } + if (dip->i_di.di_entries != g.offset) { + fs_warn(sdp, "Number of entries corrupt in dir %llu, " + "ip->i_di.di_entries (%u) != g.offset (%u)\n", + dip->i_num.no_addr, dip->i_di.di_entries, + g.offset); + error = -EIO; + goto out; + } error = do_filldir_main(dip, offset, opaque, filldir, darr, dip->i_di.di_entries, &copied); out: -- 1.5.1.2 >From 5f8820960cf4fb621483d4a37c24939ad831bfe7 Mon Sep 17 00:00:00 2001 From: Robert Peterson Date: Wed, 18 Apr 2007 11:41:11 -0500 Subject: [PATCH] [GFS2] lockdump improvements The patch below consists of the following changes (in code order): 1. I fixed a minor compiler warning regarding the printing of a kernel symbol address. 2. I implemented a suggestion from Dave Teigland that moves the debugfs information for gfs2 into a subdirectory so we can easily expand our use of debugfs in the future. The current code keeps the glock information in: /debug/gfs2/ With the patch, the new code keeps the glock information in: /debug/gfs2//glock That will allow us to create more debugfs files in the future. 3. This fixes a bug whereby a failed mount attempt causes the debugfs file to not be deleted. Failed mount attempts should always clean up after themselves, including deleting the debugfs file and/or directory. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index b075f93..7988715 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -1774,7 +1774,7 @@ static void gfs2_print_symbol(struct glock_iter *gi, const char *fmt, if (gi) { memset(buffer, 0, sizeof(buffer)); - sprintf(buffer, "%p", address); + sprintf(buffer, "0x%08lx", address); print_dbg(gi, fmt, buffer); } else @@ -2146,11 +2146,14 @@ static const struct file_operations gfs2_debug_fops = { int gfs2_create_debugfs_file(struct gfs2_sbd *sdp) { - sdp->debugfs_dentry = debugfs_create_file(sdp->sd_table_name, - S_IFREG | S_IRUGO, - gfs2_root, sdp, - &gfs2_debug_fops); - if (!sdp->debugfs_dentry) + sdp->debugfs_dir = debugfs_create_dir(sdp->sd_table_name, gfs2_root); + if (!sdp->debugfs_dir) + return -ENOMEM; + sdp->debugfs_dentry_glocks = debugfs_create_file("glocks", + S_IFREG | S_IRUGO, + sdp->debugfs_dir, sdp, + &gfs2_debug_fops); + if (!sdp->debugfs_dentry_glocks) return -ENOMEM; return 0; @@ -2158,8 +2161,14 @@ int gfs2_create_debugfs_file(struct gfs2_sbd *sdp) void gfs2_delete_debugfs_file(struct gfs2_sbd *sdp) { - if (sdp && sdp->debugfs_dentry) - debugfs_remove(sdp->debugfs_dentry); + if (sdp && sdp->debugfs_dir) { + if (sdp->debugfs_dentry_glocks) { + debugfs_remove(sdp->debugfs_dentry_glocks); + sdp->debugfs_dentry_glocks = NULL; + } + debugfs_remove(sdp->debugfs_dir); + sdp->debugfs_dir = NULL; + } } int gfs2_register_debugfs(void) @@ -2171,4 +2180,5 @@ int gfs2_register_debugfs(void) void gfs2_unregister_debugfs(void) { debugfs_remove(gfs2_root); + gfs2_root = NULL; } diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index fdf0470..d995441 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -609,7 +609,8 @@ struct gfs2_sbd { unsigned long sd_last_warning; struct vfsmount *sd_gfs2mnt; - struct dentry *debugfs_dentry; /* for debugfs */ + struct dentry *debugfs_dir; /* debugfs directory */ + struct dentry *debugfs_dentry_glocks; /* for debugfs */ }; #endif /* __INCORE_DOT_H__ */ diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index ecb8b18..2c5f8e7 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -756,6 +756,7 @@ fail_lm: fail_sys: gfs2_sys_fs_del(sdp); fail: + gfs2_delete_debugfs_file(sdp); kfree(sdp); sb->s_fs_info = NULL; return error; -- 1.5.1.2 >From 476c006be009d4121e401a9e9f49a3362a7a272f Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 23 Apr 2007 11:55:39 -0400 Subject: [PATCH] [GFS2] use lib/parser for parsing mount options This patch converts the mount option parsing to use the kernels lib/parser stuff like all of the other filesystems. I tested this and it works well. Thank you, Signed-off-by: Josef Bacik Signed-off-by: Steven Whitehouse diff --git a/fs/gfs2/mount.c b/fs/gfs2/mount.c index 32caecd..4864659 100644 --- a/fs/gfs2/mount.c +++ b/fs/gfs2/mount.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "gfs2.h" #include "incore.h" @@ -20,6 +21,52 @@ #include "sys.h" #include "util.h" +enum { + Opt_lockproto, + Opt_locktable, + Opt_hostdata, + Opt_spectator, + Opt_ignore_local_fs, + Opt_localflocks, + Opt_localcaching, + Opt_debug, + Opt_nodebug, + Opt_upgrade, + Opt_num_glockd, + Opt_acl, + Opt_noacl, + Opt_quota_off, + Opt_quota_account, + Opt_quota_on, + Opt_suiddir, + Opt_nosuiddir, + Opt_data_writeback, + Opt_data_ordered, +}; + +static match_table_t tokens = { + {Opt_lockproto, "lockproto=%s"}, + {Opt_locktable, "locktable=%s"}, + {Opt_hostdata, "hostdata=%s"}, + {Opt_spectator, "spectator"}, + {Opt_ignore_local_fs, "ignore_local_fs"}, + {Opt_localflocks, "localflocks"}, + {Opt_localcaching, "localcaching"}, + {Opt_debug, "debug"}, + {Opt_nodebug, "nodebug"}, + {Opt_upgrade, "upgrade"}, + {Opt_num_glockd, "num_glockd=%d"}, + {Opt_acl, "acl"}, + {Opt_noacl, "noacl"}, + {Opt_quota_off, "quota=off"}, + {Opt_quota_account, "quota=account"}, + {Opt_quota_on, "quota=on"}, + {Opt_suiddir, "suiddir"}, + {Opt_nosuiddir, "nosuiddir"}, + {Opt_data_writeback, "data=writeback"}, + {Opt_data_ordered, "data=ordered"} +}; + /** * gfs2_mount_args - Parse mount options * @sdp: @@ -54,146 +101,150 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount) process them */ for (options = data; (o = strsep(&options, ",")); ) { + int token, option; + substring_t tmp[MAX_OPT_ARGS]; + if (!*o) continue; - v = strchr(o, '='); - if (v) - *v++ = 0; + token = match_token(o, tokens, tmp); + switch (token) { + case Opt_lockproto: + v = match_strdup(&tmp[0]); + if (!v) { + fs_info(sdp, "no memory for lockproto\n"); + error = -ENOMEM; + goto out_error; + } - if (!strcmp(o, "lockproto")) { - if (!v) - goto need_value; - if (remount && strcmp(v, args->ar_lockproto)) + if (remount && strcmp(v, args->ar_lockproto)) { + kfree(v); goto cant_remount; + } + strncpy(args->ar_lockproto, v, GFS2_LOCKNAME_LEN); args->ar_lockproto[GFS2_LOCKNAME_LEN - 1] = 0; - } + kfree(v); + break; + case Opt_locktable: + v = match_strdup(&tmp[0]); + if (!v) { + fs_info(sdp, "no memory for locktable\n"); + error = -ENOMEM; + goto out_error; + } - else if (!strcmp(o, "locktable")) { - if (!v) - goto need_value; - if (remount && strcmp(v, args->ar_locktable)) + if (remount && strcmp(v, args->ar_locktable)) { + kfree(v); goto cant_remount; + } + strncpy(args->ar_locktable, v, GFS2_LOCKNAME_LEN); - args->ar_locktable[GFS2_LOCKNAME_LEN - 1] = 0; - } + args->ar_locktable[GFS2_LOCKNAME_LEN - 1] = 0; + kfree(v); + break; + case Opt_hostdata: + v = match_strdup(&tmp[0]); + if (!v) { + fs_info(sdp, "no memory for hostdata\n"); + error = -ENOMEM; + goto out_error; + } - else if (!strcmp(o, "hostdata")) { - if (!v) - goto need_value; - if (remount && strcmp(v, args->ar_hostdata)) + if (remount && strcmp(v, args->ar_hostdata)) { + kfree(v); goto cant_remount; + } + strncpy(args->ar_hostdata, v, GFS2_LOCKNAME_LEN); args->ar_hostdata[GFS2_LOCKNAME_LEN - 1] = 0; - } - - else if (!strcmp(o, "spectator")) { + kfree(v); + break; + case Opt_spectator: if (remount && !args->ar_spectator) goto cant_remount; args->ar_spectator = 1; sdp->sd_vfs->s_flags |= MS_RDONLY; - } - - else if (!strcmp(o, "ignore_local_fs")) { + break; + case Opt_ignore_local_fs: if (remount && !args->ar_ignore_local_fs) goto cant_remount; args->ar_ignore_local_fs = 1; - } - - else if (!strcmp(o, "localflocks")) { + break; + case Opt_localflocks: if (remount && !args->ar_localflocks) goto cant_remount; args->ar_localflocks = 1; - } - - else if (!strcmp(o, "localcaching")) { + break; + case Opt_localcaching: if (remount && !args->ar_localcaching) goto cant_remount; args->ar_localcaching = 1; - } - - else if (!strcmp(o, "debug")) + break; + case Opt_debug: args->ar_debug = 1; - - else if (!strcmp(o, "nodebug")) + break; + case Opt_nodebug: args->ar_debug = 0; - - else if (!strcmp(o, "upgrade")) { + break; + case Opt_upgrade: if (remount && !args->ar_upgrade) goto cant_remount; args->ar_upgrade = 1; - } + break; + case Opt_num_glockd: + if ((error = match_int(&tmp[0], &option))) { + fs_info(sdp, "problem getting num_glockd\n"); + goto out_error; + } - else if (!strcmp(o, "num_glockd")) { - unsigned int x; - if (!v) - goto need_value; - sscanf(v, "%u", &x); - if (remount && x != args->ar_num_glockd) + if (remount && option != args->ar_num_glockd) goto cant_remount; - if (!x || x > GFS2_GLOCKD_MAX) { + if (!option || option > GFS2_GLOCKD_MAX) { fs_info(sdp, "0 < num_glockd <= %u (not %u)\n", - GFS2_GLOCKD_MAX, x); + GFS2_GLOCKD_MAX, option); error = -EINVAL; - break; + goto out_error; } - args->ar_num_glockd = x; - } - - else if (!strcmp(o, "acl")) { + args->ar_num_glockd = option; + break; + case Opt_acl: args->ar_posix_acl = 1; sdp->sd_vfs->s_flags |= MS_POSIXACL; - } - - else if (!strcmp(o, "noacl")) { + break; + case Opt_noacl: args->ar_posix_acl = 0; sdp->sd_vfs->s_flags &= ~MS_POSIXACL; - } - - else if (!strcmp(o, "quota")) { - if (!v) - goto need_value; - if (!strcmp(v, "off")) - args->ar_quota = GFS2_QUOTA_OFF; - else if (!strcmp(v, "account")) - args->ar_quota = GFS2_QUOTA_ACCOUNT; - else if (!strcmp(v, "on")) - args->ar_quota = GFS2_QUOTA_ON; - else { - fs_info(sdp, "invalid value for quota\n"); - error = -EINVAL; - break; - } - } - - else if (!strcmp(o, "suiddir")) + break; + case Opt_quota_off: + args->ar_quota = GFS2_QUOTA_OFF; + break; + case Opt_quota_account: + args->ar_quota = GFS2_QUOTA_ACCOUNT; + break; + case Opt_quota_on: + args->ar_quota = GFS2_QUOTA_ON; + break; + case Opt_suiddir: args->ar_suiddir = 1; - - else if (!strcmp(o, "nosuiddir")) + break; + case Opt_nosuiddir: args->ar_suiddir = 0; - - else if (!strcmp(o, "data")) { - if (!v) - goto need_value; - if (!strcmp(v, "writeback")) - args->ar_data = GFS2_DATA_WRITEBACK; - else if (!strcmp(v, "ordered")) - args->ar_data = GFS2_DATA_ORDERED; - else { - fs_info(sdp, "invalid value for data\n"); - error = -EINVAL; - break; - } - } - - else { + break; + case Opt_data_writeback: + args->ar_data = GFS2_DATA_WRITEBACK; + break; + case Opt_data_ordered: + args->ar_data = GFS2_DATA_ORDERED; + break; + default: fs_info(sdp, "unknown option: %s\n", o); error = -EINVAL; - break; + goto out_error; } } +out_error: if (error) fs_info(sdp, "invalid mount option(s)\n"); @@ -202,10 +253,6 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount) return error; -need_value: - fs_info(sdp, "need value for option %s\n", o); - return -EINVAL; - cant_remount: fs_info(sdp, "can't remount with option %s\n", o); return -EINVAL; -- 1.5.1.2 >From bf126aee6d54fe1e509846abf3b27aba84c6d7ce Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Fri, 20 Apr 2007 09:18:30 +0100 Subject: [PATCH] [GFS2] Patch to fix mmap of stuffed files If a stuffed file is mmaped and a page fault is generated at some offset above the initial page, we need to create a zero page to hang the buffer heads off before we can unstuff the file. This is a fix for bz #236087 Signed-off-by: Steven Whitehouse diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index 90c2879..30c1562 100644 --- a/fs/gfs2/ops_address.c +++ b/fs/gfs2/ops_address.c @@ -197,7 +197,19 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) void *kaddr; int error; - BUG_ON(page->index); + /* + * Due to the order of unstuffing files and ->nopage(), we can be + * asked for a zero page in the case of a stuffed file being extended, + * so we need to supply one here. It doesn't happen often. + */ + if (unlikely(page->index)) { + kaddr = kmap_atomic(page, KM_USER0); + memset(kaddr, 0, PAGE_CACHE_SIZE); + kunmap_atomic(kaddr, KM_USER0); + flush_dcache_page(page); + SetPageUptodate(page); + return 0; + } error = gfs2_meta_inode_buffer(ip, &dibh); if (error) @@ -208,9 +220,8 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) ip->i_di.di_size); memset(kaddr + ip->i_di.di_size, 0, PAGE_CACHE_SIZE - ip->i_di.di_size); kunmap_atomic(kaddr, KM_USER0); - + flush_dcache_page(page); brelse(dibh); - SetPageUptodate(page); return 0; -- 1.5.1.2 >From f391a4ead61e4510ff385815ddaf3c0777fbad1b Mon Sep 17 00:00:00 2001 From: akpm at linux-foundation.org Date: Wed, 25 Apr 2007 21:08:02 -0700 Subject: [PATCH] [GFS2] printk warning fixes alpha: fs/gfs2/dir.c: In function 'gfs2_dir_read_leaf': fs/gfs2/dir.c:1322: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'sector_t' fs/gfs2/dir.c: In function 'gfs2_dir_read': fs/gfs2/dir.c:1455: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type '__u64' Cc: Steven Whitehouse Signed-off-by: Andrew Morton Signed-off-by: Steven Whitehouse diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 6c3ed76..a96fa07 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -1319,9 +1319,11 @@ static int gfs2_dir_read_leaf(struct inode *inode, u64 *offset, void *opaque, if (IS_ERR(dent)) goto out_kfree; if (entries2 != g.offset) { - fs_warn(sdp, "Number of entries corrupt in dir leaf %llu, " - "entries2 (%u) != g.offset (%u)\n", - (u64)bh->b_blocknr, entries2, g.offset); + fs_warn(sdp, "Number of entries corrupt in dir " + "leaf %llu, entries2 (%u) != " + "g.offset (%u)\n", + (unsigned long long)bh->b_blocknr, + entries2, g.offset); error = -EIO; goto out_kfree; @@ -1454,7 +1456,8 @@ int gfs2_dir_read(struct inode *inode, u64 *offset, void *opaque, if (dip->i_di.di_entries != g.offset) { fs_warn(sdp, "Number of entries corrupt in dir %llu, " "ip->i_di.di_entries (%u) != g.offset (%u)\n", - dip->i_num.no_addr, dip->i_di.di_entries, + (unsigned long long)dip->i_num.no_addr, + dip->i_di.di_entries, g.offset); error = -EIO; goto out; -- 1.5.1.2 >From 37fde8ca6c60ea61f5e9d7cb877c25ac60e74167 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Tue, 1 May 2007 09:51:39 +0100 Subject: [PATCH] [GFS2] Uncomment sprintf_symbol calling code Now that the patch from -mm has gone upstream, we can uncomment the code in GFS2 which uses sprintf_symbol. Signed-off-by: Steven Whitehouse Cc: Robert Peterson diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 7988715..1815429 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -1763,22 +1763,10 @@ void gfs2_gl_hash_clear(struct gfs2_sbd *sdp, int wait) static void gfs2_print_symbol(struct glock_iter *gi, const char *fmt, unsigned long address) { -/* when sprint_symbol becomes available in the new kernel, replace this */ -/* function with: char buffer[KSYM_SYMBOL_LEN]; sprint_symbol(buffer, address); print_dbg(gi, fmt, buffer); -*/ - char buffer[256]; - - if (gi) { - memset(buffer, 0, sizeof(buffer)); - sprintf(buffer, "0x%08lx", address); - print_dbg(gi, fmt, buffer); - } - else - print_symbol(fmt, address); } /** -- 1.5.1.2 >From 50953fe9e00ebbeffa032a565ab2f08312d51a87 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Sun, 6 May 2007 14:50:16 -0700 Subject: [PATCH] slab allocators: Remove SLAB_DEBUG_INITIAL flag I have never seen a use of SLAB_DEBUG_INITIAL. It is only supported by SLAB. I think its purpose was to have a callback after an object has been freed to verify that the state is the constructor state again? The callback is performed before each freeing of an object. I would think that it is much easier to check the object state manually before the free. That also places the check near the code object manipulation of the object. Also the SLAB_DEBUG_INITIAL callback is only performed if the kernel was compiled with SLAB debugging on. If there would be code in a constructor handling SLAB_DEBUG_INITIAL then it would have to be conditional on SLAB_DEBUG otherwise it would just be dead code. But there is no such code in the kernel. I think SLUB_DEBUG_INITIAL is too problematic to make real use of, difficult to understand and there are easier ways to accomplish the same effect (i.e. add debug code before kfree). There is a related flag SLAB_CTOR_VERIFY that is frequently checked to be clear in fs inode caches. Remove the pointless checks (they would even be pointless without removeal of SLAB_DEBUG_INITIAL) from the fs constructors. This is the last slab flag that SLUB did not support. Remove the check for unimplemented flags from SLUB. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c index 6e8a598..e2bffae 100644 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c @@ -27,8 +27,7 @@ static void gfs2_init_inode_once(void *foo, struct kmem_cache *cachep, unsigned long flags) { struct gfs2_inode *ip = foo; - if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == - SLAB_CTOR_CONSTRUCTOR) { + if (flags & SLAB_CTOR_CONSTRUCTOR) { inode_init_once(&ip->i_inode); spin_lock_init(&ip->i_spin); init_rwsem(&ip->i_rw_mutex); @@ -39,8 +38,7 @@ static void gfs2_init_inode_once(void *foo, struct kmem_cache *cachep, unsigned static void gfs2_init_glock_once(void *foo, struct kmem_cache *cachep, unsigned long flags) { struct gfs2_glock *gl = foo; - if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == - SLAB_CTOR_CONSTRUCTOR) { + if (flags & SLAB_CTOR_CONSTRUCTOR) { INIT_HLIST_NODE(&gl->gl_list); spin_lock_init(&gl->gl_spin); INIT_LIST_HEAD(&gl->gl_holders); -- 1.5.1.2 >From 14dc6b21317dcfd315f28035a7edb0a749db0e80 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Wed, 2 May 2007 09:44:03 -0500 Subject: [PATCH] [GFS2] flush the glock completely in inode_go_sync Fix for bz #231910 When filemap_fdatawrite() is called on the inode mapping in data=ordered mode, it will add the glock to the log. In inode_go_sync(), if you do the gfs2_log_flush() before this, after the filemap_fdatawrite() call, the glock and its associated data buffers will be on the log again. This means you can demote a lock from exclusive, without having it flushed from the log. The attached patch simply moves the gfs2_log_flush up to after the filemap_fdatawrite() call. Originally, I tried moving the gfs2_log_flush to after gfs2_meta_sync(), but that caused me to trip the following assert. GFS2: fsid=cypher-36:test.0: fatal: assertion "!buffer_busy(bh)" failed GFS2: fsid=cypher-36:test.0: function = gfs2_ail_empty_gl, file = fs/gfs2/glops.c, line = 61 It appears that gfs2_log_flush() puts some of the glocks buffers in the busy state and the filemap_fdatawrite() call is necessary to flush them. This makes me worry slightly that a related problem could happen because of moving the gfs2_log_flush() after the initial filemap_fdatawrite(), but I assume that gfs2_ail_empty_gl() would catch that case as well. Signed-off-by: Benjamin E. Marzinski Signed-off-by: Steven Whitehouse diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index 39c8ae2..23b0f3c 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -156,9 +156,9 @@ static void inode_go_sync(struct gfs2_glock *gl) ip = NULL; if (test_bit(GLF_DIRTY, &gl->gl_flags)) { - gfs2_log_flush(gl->gl_sbd, gl); if (ip) filemap_fdatawrite(ip->i_inode.i_mapping); + gfs2_log_flush(gl->gl_sbd, gl); gfs2_meta_sync(gl); if (ip) { struct address_space *mapping = ip->i_inode.i_mapping; -- 1.5.1.2 >From 043c795fbcf34c625e83b909b6b80e67a0c157c3 Mon Sep 17 00:00:00 2001 From: Robert Peterson Date: Wed, 9 May 2007 09:37:57 -0500 Subject: [PATCH] [GFS2] kernel changes to support new gfs2_grow command This is another revision of my gfs2 kernel patch that allows gfs2_grow to function properly. Steve Whitehouse expressed some concerns about the previous patch and I restructured it based on his comments. The previous patch was doing the statfs_change at file close time, under its own transaction. The current patch does the statfs_change inside the gfs2_commit_write function, which keeps it under the umbrella of the inode transaction. I can't call ri_update to re-read the rindex file during the transaction because the transaction may have outstanding unwritten buffers attached to the rgrps that would be otherwise blown away. So instead, I created a new function, gfs2_ri_total, that will re-read the rindex file just to total the file system space for the sake of the statfs_change. The ri_update will happen later, when gfs2 realizes the version number has changed, as it happened before my patch. Since the statfs_change is happening at write_commit time and there may be multiple writes to the rindex file for one grow operation. So one consequence of this restructuring is that instead of getting one kernel message to indicate the change, you may see several. For example, before when you did a gfs2_grow, you'd get a single message like: GFS2: File system extended by 247876 blocks (968MB) Now you get something like: GFS2: File system extended by 207896 blocks (812MB) GFS2: File system extended by 39980 blocks (156MB) This version has also been successfully run against the hours-long "gfs2_fsck_hellfire" test that does several gfs2_grow and gfs2_fsck while interjecting file system damage. It does this repeatedly under a variety Resource Group conditions. Signed-off-By: Bob Peterson Signed-off-by: Steven Whitehouse diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index 30c1562..846c0ff 100644 --- a/fs/gfs2/ops_address.c +++ b/fs/gfs2/ops_address.c @@ -1,6 +1,6 @@ /* * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. - * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions @@ -450,6 +450,30 @@ out_uninit: } /** + * adjust_fs_space - Adjusts the free space available due to gfs2_grow + * @inode: the rindex inode + */ +static void adjust_fs_space(struct inode *inode) +{ + struct gfs2_sbd *sdp = inode->i_sb->s_fs_info; + struct gfs2_statfs_change_host *m_sc = &sdp->sd_statfs_master; + struct gfs2_statfs_change_host *l_sc = &sdp->sd_statfs_local; + u64 fs_total, new_free; + + /* Total up the file system space, according to the latest rindex. */ + fs_total = gfs2_ri_total(sdp); + + spin_lock(&sdp->sd_statfs_spin); + if (fs_total > (m_sc->sc_total + l_sc->sc_total)) + new_free = fs_total - (m_sc->sc_total + l_sc->sc_total); + else + new_free = 0; + spin_unlock(&sdp->sd_statfs_spin); + fs_warn(sdp, "File system extended by %llu blocks.\n", new_free); + gfs2_statfs_change(sdp, new_free, new_free, 0); +} + +/** * gfs2_commit_write - Commit write to a file * @file: The file to write to * @page: The page containing the data @@ -511,6 +535,9 @@ static int gfs2_commit_write(struct file *file, struct page *page, di->di_size = cpu_to_be64(inode->i_size); } + if (inode == sdp->sd_rindex) + adjust_fs_space(inode); + brelse(dibh); gfs2_trans_end(sdp); if (al->al_requested) { diff --git a/fs/gfs2/ops_address.h b/fs/gfs2/ops_address.h index 35aaee4..56c30da 100644 --- a/fs/gfs2/ops_address.h +++ b/fs/gfs2/ops_address.h @@ -1,6 +1,6 @@ /* * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. - * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions @@ -18,5 +18,8 @@ extern const struct address_space_operations gfs2_file_aops; extern int gfs2_get_block(struct inode *inode, sector_t lblock, struct buffer_head *bh_result, int create); extern int gfs2_releasepage(struct page *page, gfp_t gfp_mask); +extern u64 gfs2_ri_total(struct gfs2_sbd *sdp); +extern void gfs2_statfs_change(struct gfs2_sbd *sdp, s64 total, s64 free, + s64 dinodes); #endif /* __OPS_ADDRESS_DOT_H__ */ diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 1727f50..e857f40 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -1,6 +1,6 @@ /* * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. - * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions @@ -431,6 +431,38 @@ static int compute_bitstructs(struct gfs2_rgrpd *rgd) } /** + * gfs2_ri_total - Total up the file system space, according to the rindex. + * + */ +u64 gfs2_ri_total(struct gfs2_sbd *sdp) +{ + u64 total_data = 0; + struct inode *inode = sdp->sd_rindex; + struct gfs2_inode *ip = GFS2_I(inode); + struct gfs2_rindex_host ri; + char buf[sizeof(struct gfs2_rindex)]; + struct file_ra_state ra_state; + int error, rgrps; + + mutex_lock(&sdp->sd_rindex_mutex); + file_ra_state_init(&ra_state, inode->i_mapping); + for (rgrps = 0;; rgrps++) { + loff_t pos = rgrps * sizeof(struct gfs2_rindex); + + if (pos + sizeof(struct gfs2_rindex) >= ip->i_di.di_size) + break; + error = gfs2_internal_read(ip, &ra_state, buf, &pos, + sizeof(struct gfs2_rindex)); + if (error != sizeof(struct gfs2_rindex)) + break; + gfs2_rindex_in(&ri, buf); + total_data += ri.ri_data; + } + mutex_unlock(&sdp->sd_rindex_mutex); + return total_data; +} + +/** * gfs2_ri_update - Pull in a new resource index from the disk * @gl: The glock covering the rindex inode * @@ -447,7 +479,12 @@ static int gfs2_ri_update(struct gfs2_inode *ip) u64 junk = ip->i_di.di_size; int error; - if (do_div(junk, sizeof(struct gfs2_rindex))) { + /* If someone is holding the rindex file with a glock, they must + be updating it, in which case we may have partial entries. + In this case, we ignore the partials. */ + if (!gfs2_glock_is_held_excl(ip->i_gl) && + !gfs2_glock_is_held_shrd(ip->i_gl) && + do_div(junk, sizeof(struct gfs2_rindex))) { gfs2_consist_inode(ip); return -EIO; } @@ -457,6 +494,9 @@ static int gfs2_ri_update(struct gfs2_inode *ip) file_ra_state_init(&ra_state, inode->i_mapping); for (sdp->sd_rgrps = 0;; sdp->sd_rgrps++) { loff_t pos = sdp->sd_rgrps * sizeof(struct gfs2_rindex); + + if (pos + sizeof(struct gfs2_rindex) >= ip->i_di.di_size) + break; error = gfs2_internal_read(ip, &ra_state, buf, &pos, sizeof(struct gfs2_rindex)); if (!error) @@ -978,18 +1018,25 @@ int gfs2_inplace_reserve_i(struct gfs2_inode *ip, char *file, unsigned int line) { struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode); struct gfs2_alloc *al = &ip->i_alloc; - int error; + int error = 0; if (gfs2_assert_warn(sdp, al->al_requested)) return -EINVAL; - error = gfs2_rindex_hold(sdp, &al->al_ri_gh); + /* We need to hold the rindex unless the inode we're using is + the rindex itself, in which case it's already held. */ + if (ip != GFS2_I(sdp->sd_rindex)) + error = gfs2_rindex_hold(sdp, &al->al_ri_gh); + else if (!sdp->sd_rgrps) /* We may not have the rindex read in, so: */ + error = gfs2_ri_update(ip); + if (error) return error; error = get_local_rgrp(ip); if (error) { - gfs2_glock_dq_uninit(&al->al_ri_gh); + if (ip != GFS2_I(sdp->sd_rindex)) + gfs2_glock_dq_uninit(&al->al_ri_gh); return error; } @@ -1019,7 +1066,8 @@ void gfs2_inplace_release(struct gfs2_inode *ip) al->al_rgd = NULL; gfs2_glock_dq_uninit(&al->al_rgd_gh); - gfs2_glock_dq_uninit(&al->al_ri_gh); + if (ip != GFS2_I(sdp->sd_rindex)) + gfs2_glock_dq_uninit(&al->al_ri_gh); } /** -- 1.5.1.2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2951 retrieving revision 1.2952 diff -u -r1.2951 -r1.2952 --- kernel-2.6.spec 16 May 2007 18:50:30 -0000 1.2951 +++ kernel-2.6.spec 16 May 2007 21:50:26 -0000 1.2952 @@ -496,6 +496,7 @@ Patch1412: linux-2.6-gfs2-locking-exports.patch Patch1413: linux-2.6-gfs2-update2.patch Patch1414: linux-2.6-gfs2-update3.patch +Patch1415: linux-2.6-gfs2-update4.patch # NFS superblock sharing / CacheFS Patch1431: linux-2.6-cachefiles.patch @@ -554,6 +555,15 @@ Patch1836: linux-2.6-20.8n-ppp_fix_skb_under_panic.patch Patch1837: linux-2.6-page_is_ram.patch +# more post .11 +Patch1840: linux-2.6-20.12a-v4l-dvb-fix_tuning_for_tdm_1316.patch +Patch1841: linux-2.6-20.12b-input_i8042_fix_aux_port_detection_with_some_chips.patch +Patch1842: linux-2.6-20.12c-fix-blk-bounce-map-kern.patch +Patch1843: linux-2.6-20.12c-snd-fix-widget-list-copy.patch +Patch1844: linux-2.6-20.12c-snd-resume-stac-fix.patch +Patch1845: linux-2.6-20.12c-usb_audio_fix_quickcam_audio.patch +Patch1846: linux-2.6-20.12c-x86_64-off-by-two.patch + # SELinux/audit patches. Patch1890: linux-2.6-selinux-mprotect-checks.patch @@ -1223,6 +1233,7 @@ # additional gfs2 updates %patch1413 -p1 %patch1414 -p1 +%patch1415 -p1 #nfs sharing / cachefs %patch1431 -p1 @@ -1304,6 +1315,14 @@ %patch1836 -p1 %patch1837 -p1 +%patch1840 -p1 +%patch1841 -p1 +%patch1842 -p1 +%patch1843 -p1 +%patch1844 -p1 +%patch1845 -p1 +%patch1846 -p1 + # Fix the SELinux mprotect checks on executable mappings %patch1890 -p1 @@ -2320,6 +2339,17 @@ %endif %changelog +* Wed May 16 2007 Chuck Ebbert 1.2952 +- GFS2 update +- additional patches + v4l tuner patch (bz 234509) + ps/2 mouse detection (bz 223606) + block bounce fix for some legacy drivers + quickcam audio was broken + x86_64 GART aperture range checking + hda audio STAC codec resume fix + hda audio init fix + * Wed May 16 2007 Chuck Ebbert 1.2951 - BZ #227533: remove hyphens from kernel versions in RPM provides From fedora-cvs-commits at redhat.com Thu May 17 07:46:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 May 2007 03:46:34 -0400 Subject: rpms/xinetd/FC-6 xinetd-2.3.14-ssize_t.patch, NONE, 1.1 xinetd.spec, 1.41, 1.42 Message-ID: <200705170746.l4H7kY8T032209@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/xinetd/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv32193 Modified Files: xinetd.spec Added Files: xinetd-2.3.14-ssize_t.patch Log Message: use ssize_t instead of int Resolves: bz#211776 xinetd-2.3.14-ssize_t.patch: libs/src/sio/impl.h | 4 ++-- libs/src/sio/sio.c | 26 +++++++++++++------------- libs/src/sio/sio.h | 12 +++++++----- libs/src/sio/siosup.c | 16 ++++++++-------- libs/src/sio/sprint.c | 28 ++++++++++++++-------------- xinetd/builtins.c | 28 +++++++++++++++++----------- xinetd/connection.c | 6 ++++-- xinetd/ident.c | 4 ++-- xinetd/redirect.c | 5 +++-- xinetd/service.c | 4 ++-- xinetd/signals.c | 12 ++++++------ xinetd/tcpint.c | 12 ++++++------ xinetd/udpint.c | 12 ++++++------ xinetd/util.c | 5 +++-- 14 files changed, 93 insertions(+), 81 deletions(-) --- NEW FILE xinetd-2.3.14-ssize_t.patch --- --- xinetd-2.3.14/libs/src/sio/impl.h.ssize_t 2006-10-27 12:33:29.000000000 -0400 +++ xinetd-2.3.14/libs/src/sio/impl.h 2006-10-27 12:40:21.000000000 -0400 @@ -142,9 +142,9 @@ * Internal functions that are visible */ int __sio_writef( __sio_od_t *odp, int fd ) ; -int __sio_extend_buffer( __sio_id_t *idp, int fd, int b_left ) ; +ssize_t __sio_extend_buffer( __sio_id_t *idp, int fd, ssize_t b_left ) ; int __sio_init( __sio_descriptor_t *dp, int fd, enum __sio_stream stream_type ); -int __sio_more( __sio_id_t *idp, int fd ) ; +ssize_t __sio_more( __sio_id_t *idp, int fd ) ; sio_status_e __sio_switch( __sio_id_t *idp, int fd ) ; --- xinetd-2.3.14/libs/src/sio/siosup.c.ssize_t 2003-09-06 10:41:59.000000000 -0400 +++ xinetd-2.3.14/libs/src/sio/siosup.c 2006-10-27 12:40:23.000000000 -0400 @@ -599,9 +599,9 @@ * If it does not return SIO_ERR, it sets start, nextb, end * If it returns SIO_ERR, it does not change anything */ -static int __sio_readf( __sio_id_t *idp, int fd ) +static ssize_t __sio_readf( __sio_id_t *idp, int fd ) { - int cc ; + ssize_t cc ; /* * First check for a tied fd and flush the stream if necessary @@ -634,7 +634,7 @@ { if ( __sio_switch( idp, fd ) == FAILURE ) return( SIO_ERR ) ; - cc = -1 ; + cc = (ssize_t)-1 ; } } else @@ -680,7 +680,7 @@ for ( ;; ) { cc = read( fd, idp->buf, (int) idp->buffer_size ) ; - if ( cc == -1 ) + if ( cc == (ssize_t)-1 ) if ( errno == EINTR ) continue ; else @@ -705,9 +705,9 @@ * auxiliary buffer) * Also, if successful, idp->nextb is set to idp->buf, idp->end is modified. */ -int __sio_extend_buffer( __sio_id_t *idp, int fd, int b_left ) +ssize_t __sio_extend_buffer( __sio_id_t *idp, int fd, ssize_t b_left ) { - int b_read ; + ssize_t b_read ; /* * copy to auxiliary buffer @@ -733,10 +733,10 @@ * * Return value: the number of bytes read. */ -int __sio_more( __sio_id_t *idp, int fd ) +ssize_t __sio_more( __sio_id_t *idp, int fd ) { int b_left = &idp->buf[ idp->buffer_size ] - idp->end ; - int cc ; + ssize_t cc ; if ( b_left <= 0 ) return( 0 ) ; --- xinetd-2.3.14/libs/src/sio/sprint.c.ssize_t 2006-10-27 13:14:49.000000000 -0400 +++ xinetd-2.3.14/libs/src/sio/sprint.c 2006-10-27 13:14:51.000000000 -0400 @@ -18,7 +18,7 @@ typedef unsigned long long u_wide_int ; typedef int bool_int ; -static char *conv_10( wide_int num, bool_int is_unsigned, bool_int *is_negative, char *buf_end, int *len ); +static char *conv_10( wide_int num, bool_int is_unsigned, bool_int *is_negative, char *buf_end, size_t *len ); #define S_NULL_LEN 6 static char S_NULL[S_NULL_LEN+1] = "(null)"; @@ -69,7 +69,7 @@ } \ if ( __SIO_MUST_FLUSH( *odp, c ) && fd >= 0 ) \ { \ - int b_in_buffer = sp - odp->start ; \ + ssize_t b_in_buffer = sp - odp->start ; \ \ odp->nextb = sp ; \ if ( __sio_writef( odp, fd ) != b_in_buffer ) \ @@ -122,11 +122,11 @@ * - all floating point arguments are passed as doubles */ /* VARARGS2 */ -int Sprint( int fd, const char *fmt, ...) +ssize_t Sprint( int fd, const char *fmt, ...) { __sio_descriptor_t *dp ; __sio_od_t *odp ; - int cc ; + ssize_t cc ; va_list ap ; if( sio_setup( fd, &dp, __SIO_OUTPUT_STREAM ) == SIO_ERR ) @@ -143,7 +143,7 @@ /* * This is the equivalent of vfprintf for SIO */ -int Sprintv( int fd, const char *fmt, va_list ap) +ssize_t Sprintv( int fd, const char *fmt, va_list ap) { __sio_descriptor_t *dp ; __sio_od_t *odp ; @@ -162,7 +162,7 @@ * in buf). */ static char *conv_fp( char format, double num, boolean_e add_dp, - int precision, bool_int *is_negative, char buf[], int *len ) + size_t precision, bool_int *is_negative, char buf[], size_t *len ) /* always add decimal point if YES */ { char *s = buf ; @@ -220,7 +220,7 @@ if ( format != 'f' ) { char temp[ EXPONENT_LENGTH ] ; /* for exponent conversion */ - int t_len ; + size_t t_len ; bool_int exponent_is_negative ; *s++ = format ; /* either e or E */ @@ -261,7 +261,7 @@ * which is a pointer to the END of the buffer + 1 (i.e. if the buffer * is declared as buf[ 100 ], buf_end should be &buf[ 100 ]) */ -static char *conv_p2( u_wide_int num, int nbits, char format, char *buf_end, int *len ) +static char *conv_p2( u_wide_int num, int nbits, char format, char *buf_end, size_t *len ) { int mask = ( 1 << nbits ) - 1 ; char *p = buf_end ; @@ -292,7 +292,7 @@ * which is a pointer to the END of the buffer + 1 (i.e. if the buffer * is declared as buf[ 100 ], buf_end should be &buf[ 100 ]) */ -static char *conv_10( wide_int num, bool_int is_unsigned, bool_int *is_negative, char *buf_end, int *len ) +static char *conv_10( wide_int num, bool_int is_unsigned, bool_int *is_negative, char *buf_end, size_t *len ) { char *p = buf_end ; u_wide_int magnitude ; @@ -346,19 +346,19 @@ * Do format conversion placing the output in odp. * Note: we do not support %n for security reasons. */ -int __sio_converter( __sio_od_t *odp, int fd, const char *fmt, va_list ap ) +ssize_t __sio_converter( __sio_od_t *odp, int fd, const char *fmt, va_list ap ) { char *sp = NULL; char *bep = NULL; - int cc = 0 ; - int i ; + ssize_t cc = 0 ; + size_t i ; char *s = NULL; char *q = NULL; - int s_len ; + size_t s_len ; int min_width = 0 ; - int precision = 0 ; + size_t precision = 0 ; enum { LEFT, RIGHT } adjust ; char pad_char ; char prefix_char ; --- xinetd-2.3.14/libs/src/sio/sio.c.ssize_t 2006-10-27 12:35:12.000000000 -0400 +++ xinetd-2.3.14/libs/src/sio/sio.c 2006-10-27 13:28:09.000000000 -0400 @@ -28,17 +28,17 @@ /* * Stream write call: arguments same as those of write(2) */ -int Swrite( int fd, const char *addr, unsigned int nbytes ) +ssize_t Swrite( int fd, const char *addr, size_t nbytes ) { __sio_descriptor_t *dp ; __sio_od_t *odp ; - unsigned int b_transferred ; - unsigned int b_avail ; - int total_b_transferred ; - int b_written ; - int b_in_buffer ; + size_t b_transferred ; + size_t b_avail ; + ssize_t total_b_transferred ; + ssize_t b_written ; + ssize_t b_in_buffer ; - if ( nbytes > INT_MAX ) + if ( nbytes > SSIZE_MAX ) return( SIO_ERR ); if( sio_setup( fd, &dp, __SIO_OUTPUT_STREAM ) == SIO_ERR ) return( SIO_ERR ); @@ -62,7 +62,7 @@ b_in_buffer = odp->buf_end - odp->start ; b_written = __sio_writef( odp, fd ) ; if ( b_written != b_in_buffer ) - return( (b_written >= (int)nbytes) ? (int)nbytes : b_written ) ; + return( (b_written >= (ssize_t)nbytes) ? (ssize_t)nbytes : b_written ) ; total_b_transferred = b_transferred ; addr += b_transferred ; @@ -83,7 +83,7 @@ * the buffer is full */ b_written = __sio_writef( odp, fd ) ; - if ( b_written != (int)odp->buffer_size ) + if ( b_written != (ssize_t)odp->buffer_size ) { if ( b_written != SIO_ERR ) { @@ -157,8 +157,8 @@ __sio_id_t *idp ; char *cp ; char *line_start ; - int b_left ; - int extension ; + ssize_t b_left ; + ssize_t extension ; if( sio_setup( fd, &dp, __SIO_INPUT_STREAM ) == SIO_ERR ) return( NULL ); @@ -361,7 +361,7 @@ #ifndef sio_memscan -static char *sio_memscan( const char *from, int how_many, char ch ) +static char *sio_memscan( const char *from, size_t how_many, char ch ) { char *p ; char *last = from + how_many ; @@ -377,7 +377,7 @@ #ifdef NEED_MEMCOPY -void __sio_memcopy( const char *from, char *to, int nbytes ) +void __sio_memcopy( const char *from, char *to, size_t nbytes ) { while ( nbytes-- ) *to++ = *from++ ; --- xinetd-2.3.14/xinetd/udpint.c.ssize_t 2005-10-05 13:20:11.000000000 -0400 +++ xinetd-2.3.14/xinetd/udpint.c 2006-10-27 12:17:10.000000000 -0400 @@ -226,7 +226,7 @@ { char *p ; int left ; - int cc ; + ssize_t cc ; const char *func = "send_data" ; for ( p = buf, left = len ; left > 0 ; left -= cc, p+= cc ) @@ -236,7 +236,7 @@ else cc = sendto( sd, p, left, 0, SA( addr ), sizeof( *addr ) ) ; - if ( cc == -1 ) { + if ( cc == (ssize_t)-1 ) { if ( errno == EINTR ) { cc = 0 ; @@ -264,12 +264,12 @@ for ( ;; ) { - int cc ; + ssize_t cc ; from_len = sizeof( pp->from ) ; cc = recvfrom( INT_REMOTE( ip ), pp->data, pp->size, 0, SA( &pp->from ), &from_len ) ; - if ( cc == -1 ) + if ( cc == (ssize_t)-1 ) { if ( errno != EINTR ) { @@ -306,14 +306,14 @@ static status_e udp_local_to_remote( channel_s *chp ) { char buf[ MAX_DATAGRAM_SIZE ] ; - int cc ; + ssize_t cc ; const char *func = "udp_local_to_remote" ; for ( ;; ) { cc = recv( chp->ch_local_socket, buf, sizeof( buf ), 0 ) ; - if ( cc == -1 ) + if ( cc == (ssize_t)-1 ) { if ( errno != EINTR ) { --- xinetd-2.3.14/xinetd/service.c.ssize_t 2006-10-27 12:17:10.000000000 -0400 +++ xinetd-2.3.14/xinetd/service.c 2006-10-27 12:17:10.000000000 -0400 @@ -610,7 +610,7 @@ /* print the banner regardless of access control */ if ( SC_BANNER(scp) != NULL ) { char tmpbuf[TMPSIZE]; - int retval; + ssize_t retval; int bannerfd = open(SC_BANNER(scp), O_RDONLY); if( bannerfd < 0 ) { @@ -620,7 +620,7 @@ } while( (retval = read(bannerfd, tmpbuf, sizeof(tmpbuf))) ) { - if (retval == -1) + if (retval == (ssize_t)-1) { if (errno == EINTR) continue; --- xinetd-2.3.14/xinetd/signals.c.ssize_t 2003-12-23 10:30:10.000000000 -0500 +++ xinetd-2.3.14/xinetd/signals.c 2006-10-27 12:17:10.000000000 -0400 @@ -402,7 +402,7 @@ */ static void my_handler( int sig ) { - int ret_val; + ssize_t ret_val; int saved_errno = errno; #if NSIG < 256 unsigned char sig_byte; @@ -412,13 +412,13 @@ do { ret_val = write(signals_pending[1], &sig_byte, 1); - } while (ret_val == -1 && errno == EINTR); + } while (ret_val == (ssize_t)-1 && errno == EINTR); #else if (signals_pending[1] < 0) return; do { ret_val = write(signals_pending[1], &sig, sizeof(int)); - } while (ret_val == -1 && errno == EINTR); + } while (ret_val == (ssize_t)-1 && errno == EINTR); #endif errno = saved_errno; } @@ -470,12 +470,12 @@ #endif while( --i >= 0 ) { - int ret_val; + ssize_t ret_val; do { ret_val = read(signals_pending[0], &sig, sizeof(sig)); - } while (ret_val == -1 && errno == EINTR); - if (ret_val != sizeof(sig) ) { + } while (ret_val == (ssize_t)-1 && errno == EINTR); + if (ret_val != (ssize_t)sizeof(sig) ) { msg(LOG_ERR, func, "Error retrieving pending signal: %m"); return; } --- xinetd-2.3.14/xinetd/connection.c.ssize_t 2005-10-05 13:20:11.000000000 -0400 +++ xinetd-2.3.14/xinetd/connection.c 2006-10-27 12:17:10.000000000 -0400 @@ -96,13 +96,15 @@ if ( SVC_SOCKET_TYPE( sp ) == SOCK_DGRAM ) { char t_ch ; + ssize_t val; /* * This trick is done to get the remote address. * select(2) guaranteed that we won't block on the recvfrom */ - if ( recvfrom( SVC_FD( sp ), &t_ch, 1, MSG_PEEK, - &cp->co_remote_address.sa, &sin_len ) == -1 ) + val = recvfrom( SVC_FD( sp ), &t_ch, 1, MSG_PEEK, + &cp->co_remote_address.sa, &sin_len ); + if ( val == (ssize_t)-1 ) { msg( LOG_ERR, func, "service %s, recvfrom: %m", SVC_ID( sp ) ) ; return( FAILED ) ; --- xinetd-2.3.14/xinetd/util.c.ssize_t 2005-10-05 17:45:41.000000000 -0400 +++ xinetd-2.3.14/xinetd/util.c 2006-10-27 12:17:10.000000000 -0400 @@ -198,7 +198,8 @@ */ status_e write_buf( int fd, const char *buf, int len ) { - int cc, i ; + int i ; + ssize_t cc; for ( i = 0 ; len > 0 ; i += cc, len -= cc ) { @@ -234,7 +235,7 @@ void drain( int sd ) { char buf[ 256 ] ; /* This size is arbitrarily chosen */ - int ret ; + ssize_t ret ; int old_val ; /* Put in non-blocking mode so we don't hang. */ --- xinetd-2.3.14/xinetd/redirect.c.ssize_t 2003-08-06 02:12:10.000000000 -0400 +++ xinetd-2.3.14/xinetd/redirect.c 2006-10-27 12:17:10.000000000 -0400 @@ -58,7 +58,8 @@ struct service *sp = SERVER_SERVICE( serp ); struct service_config *scp = SVC_CONF( sp ); int RedirDescrip = SERVER_FD( serp ); - int maxfd, num_read, num_wrote=0, ret=0; + int maxfd; + ssize_t num_read, num_wrote=0, ret=0; unsigned int sin_len = 0; unsigned long bytes_in = 0, bytes_out = 0; int no_to_nagle = 1; @@ -156,7 +157,7 @@ do { num_read = read(RedirDescrip, buff, sizeof(buff)); - if (num_read == -1 && errno == EINTR) + if (num_read == (ssize_t)-1 && errno == EINTR) continue; if (num_read <= 0) goto REDIROUT; --- xinetd-2.3.14/xinetd/tcpint.c.ssize_t 2005-10-05 13:20:11.000000000 -0400 +++ xinetd-2.3.14/xinetd/tcpint.c 2006-10-27 12:17:10.000000000 -0400 @@ -273,7 +273,7 @@ static stream_status_e tcp_local_to_remote( channel_s *chp ) { char buf[ DATAGRAM_SIZE ] ; - int rcc, wcc ; + ssize_t rcc, wcc ; char *p ; int left ; const char *func = "tcp_local_to_remote" ; @@ -283,7 +283,7 @@ rcc = recv( chp->ch_local_socket, buf, sizeof( buf ), 0 ) ; if ( rcc == 0 ) return( S_SERVER_ERR ) ; - else if ( rcc == -1 ) + else if ( rcc == (ssize_t)-1 ) { if ( errno != EINTR ) { @@ -300,7 +300,7 @@ wcc = send( chp->ch_remote_socket, p, left, 0 ) ; if ( wcc == 0 ) return( S_CLIENT_ERR ) ; - else if ( wcc == -1 ) + else if ( wcc == (ssize_t)-1 ) { if ( errno == EINTR ) wcc = 0 ; @@ -326,7 +326,7 @@ static stream_status_e tcp_remote_to_local( channel_s *chp ) { char buf[ DATAGRAM_SIZE ] ; - int rcc, wcc ; + ssize_t rcc, wcc ; int left ; char *p ; const char *func = "tcp_remote_to_local" ; @@ -336,7 +336,7 @@ rcc = recv( chp->ch_remote_socket, buf, sizeof( buf ), 0 ) ; if ( rcc == 0 ) return( S_CLIENT_ERR ) ; - else if ( rcc == -1 ) + else if ( rcc == (ssize_t)-1 ) { if ( errno != EINTR ) { @@ -353,7 +353,7 @@ wcc = send( chp->ch_local_socket, p, left, 0 ) ; if ( wcc == 0 ) { return( S_SERVER_ERR ) ; - } else if ( wcc == -1 ) { + } else if ( wcc == (ssize_t)-1 ) { if ( errno == EINTR ) { rcc = 0 ; } else { --- xinetd-2.3.14/xinetd/builtins.c.ssize_t 2005-10-06 11:38:04.000000000 -0400 +++ xinetd-2.3.14/xinetd/builtins.c 2006-10-27 12:17:10.000000000 -0400 @@ -129,7 +129,7 @@ static void stream_echo( const struct server *serp ) { char buf[ BUFFER_SIZE ] ; - int cc ; + ssize_t cc ; int descriptor = SERVER_FD( serp ) ; struct service *svc = SERVER_SERVICE( serp ) ;; @@ -149,7 +149,7 @@ cc = read( descriptor, buf, sizeof( buf ) ) ; if ( cc == 0 ) break ; - if ( cc == -1 ) { + if ( cc == (ssize_t)-1 ) { if ( errno == EINTR ) continue ; else @@ -167,7 +167,7 @@ { char buf[ DATAGRAM_SIZE ] ; union xsockaddr lsin; - int cc ; + ssize_t cc ; socklen_t sin_len = 0; int descriptor = SERVER_FD( serp ) ; const char *func = "dgram_echo"; @@ -178,15 +178,15 @@ sin_len = sizeof( struct sockaddr_in6 ); cc = recvfrom( descriptor, buf, sizeof( buf ), 0, SA( &lsin ), &sin_len ) ; - if ( cc != -1 ) { - (void) sendto( descriptor, buf, cc, 0, SA( &lsin ), sizeof( lsin ) ) ; + if ( cc != (ssize_t)-1 ) { + (void) sendto( descriptor, buf, (size_t)cc, 0, SA( &lsin ), sizeof( lsin ) ) ; } } static void stream_discard( const struct server *serp ) { char buf[ BUFFER_SIZE ] ; - int cc ; + ssize_t cc ; int descriptor = SERVER_FD( serp ) ; struct service *svc = SERVER_SERVICE( serp ) ;; @@ -204,7 +204,7 @@ for ( ;; ) { cc = read( descriptor, buf, sizeof( buf ) ) ; - if ( (cc == 0) || ((cc == -1) && (errno != EINTR)) ) + if ( (cc == 0) || ((cc == (ssize_t)-1) && (errno != EINTR)) ) break ; } if( SVC_WAITS( svc ) ) /* Service forks, so close it */ @@ -293,14 +293,16 @@ unsigned int buflen = sizeof( time_buf ) ; int descriptor = SERVER_FD( serp ) ; const char *func = "dgram_daytime"; + ssize_t val; if ( SC_IPV4( SVC_CONF( SERVER_SERVICE( serp ) ) ) ) sin_len = sizeof( struct sockaddr_in ); else if ( SC_IPV6( SVC_CONF( SERVER_SERVICE( serp ) ) ) ) sin_len = sizeof( struct sockaddr_in6 ); - if ( recvfrom( descriptor, time_buf, sizeof( time_buf ), 0, - SA( &lsin ), &sin_len ) == -1 ) + val = recvfrom( descriptor, time_buf, sizeof( time_buf ), 0, + SA( &lsin ), &sin_len ); + if ( val == (ssize_t)-1 ) return ; daytime_protocol( time_buf, &buflen ) ; @@ -359,13 +361,15 @@ socklen_t sin_len = 0 ; int fd = SERVER_FD( serp ) ; const char *func = "dgram_daytime"; + ssize_t val; if ( SC_IPV4( SVC_CONF( SERVER_SERVICE( serp ) ) ) ) sin_len = sizeof( struct sockaddr_in ); else if ( SC_IPV6( SVC_CONF( SERVER_SERVICE( serp ) ) ) ) sin_len = sizeof( struct sockaddr_in6 ); - if ( recvfrom( fd, buf, sizeof( buf ), 0, SA( &lsin ), &sin_len ) == -1 ) + val = recvfrom( fd, buf, sizeof( buf ), 0, SA( &lsin ), &sin_len ); + if ( val == (ssize_t)-1 ) return ; time_protocol( time_buf ) ; @@ -465,13 +469,15 @@ int fd = SERVER_FD( serp ) ; unsigned int left = sizeof( buf ) ; const char *func = "dgram_chargen"; + ssize_t val; if ( SC_IPV4( SVC_CONF( SERVER_SERVICE( serp ) ) ) ) sin_len = sizeof( struct sockaddr_in ); else if ( SC_IPV6( SVC_CONF( SERVER_SERVICE( serp ) ) ) ) sin_len = sizeof( struct sockaddr_in6 ); - if ( recvfrom( fd, buf, sizeof( buf ), 0, SA( &lsin ), &sin_len ) == -1 ) + val = recvfrom( fd, buf, sizeof( buf ), 0, SA( &lsin ), &sin_len ); + if ( val == (ssize_t)-1 ) return ; #if BUFFER_SIZE < LINE_LENGTH+2 --- xinetd-2.3.14/xinetd/ident.c.ssize_t 2005-10-05 13:20:11.000000000 -0400 +++ xinetd-2.3.14/xinetd/ident.c 2006-10-27 12:17:10.000000000 -0400 @@ -267,7 +267,7 @@ static char *get_line( int sd, char *buf, unsigned bufsize ) { int size ; - int cc ; + ssize_t cc ; char *p ; char *s ; const char *func = "get_line" ; @@ -275,7 +275,7 @@ for ( p = buf, size = bufsize ; size > 0 ; p += cc, size -= cc ) { cc = read( sd, p, size ) ; - if ( cc == -1 ) { + if ( cc == (ssize_t)-1 ) { if ( errno == EINTR ) { cc = 0 ; --- xinetd-2.3.14/libs/src/sio/sio.h.ssize_t 2003-06-10 09:15:44.000000000 -0400 +++ xinetd-2.3.14/libs/src/sio/sio.h 2006-10-27 15:47:37.000000000 -0400 @@ -12,6 +12,8 @@ #define __SIO_H #include +#include +#include #include /* @@ -56,7 +58,7 @@ * buffer is right below buf and is of the same size. */ char *buf ; - unsigned buffer_size ; + size_t buffer_size ; char *start ; /* start of valid buffer contents */ char *end ; /* end of valid buffer contents + 1 */ @@ -163,15 +165,15 @@ /* * The Write functions */ -int Swrite ( int fd, const char *buf, unsigned int nbytes ); -int Sprint ( int fd, const char *format, ... ) +ssize_t Swrite ( int fd, const char *buf, size_t ); +ssize_t Sprint ( int fd, const char *format, ... ) #ifdef __GNUC__ __attribute__ ((format (printf, 2, 3))); #else ; #endif int Sputchar( int fd, char c ); -int Sprintv ( int fd, const char *format, va_list ap ) +ssize_t Sprintv ( int fd, const char *format, va_list ap ) #ifdef __GNUC__ __attribute__ ((format (printf, 2, 0))); #else @@ -186,7 +188,7 @@ int Sclose ( int fd ) ; int Sbuftype ( int fd, int type ) ; int Smorefds ( int ) ; -int __sio_converter( __sio_od_t *, int , const char *, va_list ); +ssize_t __sio_converter( __sio_od_t *, int , const char *, va_list ); int sio_setup(int fd, __sio_descriptor_t **dp, unsigned int type ); #ifdef __GNUC__ Index: xinetd.spec =================================================================== RCS file: /cvs/dist/rpms/xinetd/FC-6/xinetd.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- xinetd.spec 4 May 2007 13:44:05 -0000 1.41 +++ xinetd.spec 17 May 2007 07:46:30 -0000 1.42 @@ -4,7 +4,7 @@ Summary: A secure replacement for inetd. Name: xinetd Version: 2.3.14 -Release: 8 +Release: 9 License: Distributable (BSD-like) Group: System Environment/Daemons Epoch: 2 @@ -17,6 +17,8 @@ Patch0: xinetd-2.3.11-pie.patch Patch1: xinetd-2.3.12-tcp_rpc.patch Patch2: xinetd-2.3.14-label.patch +Patch3: xinetd-2.3.14-ssize_t.patch + BuildRequires: autoconf, automake BuildRequires: libselinux-devel >= 1.30 Prereq: /sbin/chkconfig /etc/init.d /sbin/service @@ -41,6 +43,7 @@ %patch0 -p0 -b .pie %patch1 -p1 -b .tcp_rpc %patch2 -p1 -b .lspp +%patch3 -p1 -b .size aclocal autoconf @@ -102,8 +105,9 @@ %{_mandir}/*/* %changelog -* Fri May 4 2007 Jan Safranek +* Thu May 17 2007 Jan Safranek - 2:2.3.14-9 - service xinitd status returns correct value (#232887) +- use ssize_t instead of int (#211776) * Sun Oct 01 2006 Jesse Keating - 2:2.3.14-8 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From fedora-cvs-commits at redhat.com Thu May 17 08:17:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 May 2007 04:17:34 -0400 Subject: rpms/xinetd/FC-6 xinetd.spec,1.42,1.43 Message-ID: <200705170817.l4H8HYm8001127@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/xinetd/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv1113 Modified Files: xinetd.spec Log Message: use %dist in release name Index: xinetd.spec =================================================================== RCS file: /cvs/dist/rpms/xinetd/FC-6/xinetd.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- xinetd.spec 17 May 2007 07:46:30 -0000 1.42 +++ xinetd.spec 17 May 2007 08:17:31 -0000 1.43 @@ -4,7 +4,7 @@ Summary: A secure replacement for inetd. Name: xinetd Version: 2.3.14 -Release: 9 +Release: 9%{?dist} License: Distributable (BSD-like) Group: System Environment/Daemons Epoch: 2 From fedora-cvs-commits at redhat.com Thu May 17 17:38:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 May 2007 13:38:56 -0400 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.43, 1.44 selinux-policy.spec, 1.365, 1.366 Message-ID: <200705171738.l4HHcuIo010699@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10682 Modified Files: policy-20061106.patch selinux-policy.spec Log Message: * Mon May 15 2007 Dan Walsh 2.4.6-71 - Allow netlable to read etc and work with init terminals - Change file context to have all of policy at SystemLow Resolves: #239079 policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 94 +++- policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 6 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 57 ++ policy/modules/admin/amtu.te | 56 ++ policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 24 - policy/modules/admin/kudzu.te | 14 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 14 policy/modules/admin/netutils.te | 19 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 18 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 86 +++ policy/modules/admin/rpm.te | 49 -- policy/modules/admin/su.if | 38 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 13 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 58 ++ policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 ++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 38 + policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 39 - policy/modules/apps/mozilla.if | 208 +++++++-- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 6 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 20 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 29 + policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 140 ++++++ policy/modules/kernel/corenetwork.te.in | 14 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 ++ policy/modules/kernel/domain.te | 22 policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 224 +++++++++ policy/modules/kernel/filesystem.if | 62 ++ policy/modules/kernel/filesystem.te | 30 + policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 22 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 21 policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 3 policy/modules/services/aide.te | 11 policy/modules/services/amavis.if | 19 policy/modules/services/amavis.te | 3 policy/modules/services/apache.fc | 17 policy/modules/services/apache.if | 157 ++++++ policy/modules/services/apache.te | 43 + policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 40 + policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 6 policy/modules/services/bluetooth.te | 10 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 11 policy/modules/services/clamav.te | 3 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++- policy/modules/services/cron.te | 58 ++ policy/modules/services/cups.fc | 4 policy/modules/services/cups.te | 19 policy/modules/services/cvs.te | 2 policy/modules/services/cyrus.te | 5 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 66 ++ policy/modules/services/dbus.te | 4 policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/dovecot.fc | 1 policy/modules/services/dovecot.if | 44 + policy/modules/services/dovecot.te | 56 ++ policy/modules/services/fail2ban.fc | 3 policy/modules/services/fail2ban.if | 80 +++ policy/modules/services/fail2ban.te | 74 +++ policy/modules/services/ftp.te | 21 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 114 ++++ policy/modules/services/hal.te | 26 - policy/modules/services/inetd.te | 28 - policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 25 + policy/modules/services/kerberos.te | 15 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 57 +- policy/modules/services/lpd.te | 5 policy/modules/services/mailman.if | 20 policy/modules/services/mailman.te | 1 policy/modules/services/mta.fc | 1 policy/modules/services/mta.if | 20 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 34 + policy/modules/services/nscd.if | 20 policy/modules/services/nscd.te | 28 - policy/modules/services/ntp.te | 1 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 5 policy/modules/services/openca.if | 4 policy/modules/services/openca.te | 2 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 ++ policy/modules/services/pcscd.te | 79 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 11 policy/modules/services/portmap.te | 5 policy/modules/services/portslave.te | 1 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 22 policy/modules/services/postfix.te | 48 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 29 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 2 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 22 policy/modules/services/rlogin.te | 11 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.if | 3 policy/modules/services/rpc.te | 27 - policy/modules/services/rshd.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.fc | 6 policy/modules/services/samba.if | 62 ++ policy/modules/services/samba.te | 68 ++ policy/modules/services/sasl.te | 13 policy/modules/services/sendmail.if | 22 policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 17 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 24 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 21 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 14 policy/modules/services/telnet.te | 3 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 ++ policy/modules/services/uucp.te | 44 + policy/modules/services/uwimap.te | 1 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 190 ++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 180 +++++++ policy/modules/system/authlogin.te | 41 + policy/modules/system/clock.te | 18 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 policy/modules/system/init.if | 64 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 121 +++++ policy/modules/system/iptables.te | 23 policy/modules/system/libraries.fc | 43 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 11 policy/modules/system/logging.fc | 5 policy/modules/system/logging.if | 61 ++ policy/modules/system/logging.te | 33 + policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 + policy/modules/system/lvm.te | 87 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 +++ policy/modules/system/modutils.te | 26 - policy/modules/system/mount.te | 27 - policy/modules/system/netlabel.te | 10 policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 15 policy/modules/system/selinuxutil.fc | 10 policy/modules/system/selinuxutil.if | 122 +++++ policy/modules/system/selinuxutil.te | 134 ++--- policy/modules/system/sysnetwork.te | 13 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 policy/modules/system/unconfined.te | 23 policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 622 +++++++++++++++++++++++---- policy/modules/system/userdomain.te | 105 ++-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 53 ++ policy/support/*Warnings* | 189 ++++++++ policy/support/file_patterns.spt | 534 +++++++++++++++++++++++ policy/support/obj_perm_sets.spt | 144 ++++++ 255 files changed, 7389 insertions(+), 729 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.43 -r 1.44 policy-20061106.patch Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- policy-20061106.patch 14 May 2007 19:55:07 -0000 1.43 +++ policy-20061106.patch 17 May 2007 17:38:54 -0000 1.44 @@ -1,20 +1,20 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.4.6/config/appconfig-strict/seusers --- nsaserefpolicy/config/appconfig-strict/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-05-15 11:51:26.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u root:root __default__:user_u diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers --- nsaserefpolicy/config/appconfig-strict-mcs/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-05-15 11:51:26.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_contexts serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts --- nsaserefpolicy/config/appconfig-strict-mls/default_contexts 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts 2007-05-15 11:51:26.000000000 -0400 @@ -1,7 +1,7 @@ system_r:sulogin_t:s0 sysadm_r:sysadm_t:s0 -system_r:local_login_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0 @@ -28,14 +28,14 @@ staff_r:staff_su_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.4.6/config/appconfig-strict-mls/seusers --- nsaserefpolicy/config/appconfig-strict-mls/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-05-15 11:51:26.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mls_systemhigh root:root:s0-mls_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.4.6/man/man8/kerberos_selinux.8 --- nsaserefpolicy/man/man8/kerberos_selinux.8 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8 2007-05-15 11:51:26.000000000 -0400 @@ -18,7 +18,7 @@ .br service krb5kdc restart @@ -47,7 +47,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.4.6/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-05-15 11:51:26.000000000 -0400 @@ -619,6 +619,8 @@ send recv @@ -59,7 +59,7 @@ class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.4.6/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/global_tunables 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/global_tunables 2007-05-16 14:56:07.000000000 -0400 @@ -82,6 +82,14 @@ ## @@ -119,24 +119,30 @@ ## Allow squid to connect to all ports, not just ## HTTP, FTP, and Gopher ports. ##

-@@ -572,8 +601,16 @@ +@@ -353,7 +382,6 @@ + # Strict policy specific + # + +-ifdef(`strict_policy',` + ## + ##

+ ## Control users use of ping and traceroute +@@ -572,7 +600,13 @@ ##

## gen_tunable(xdm_sysadm_login,false) +-') + - ') - +## +##

+## Allow mount to mount any dir +##

+## +gen_tunable(allow_mounton_anydir,true) -+ + ######################################## # - # Targeted policy specific -@@ -589,6 +626,13 @@ +@@ -589,6 +623,13 @@ ## ##

@@ -150,7 +156,7 @@ ## Allow mount to mount any file ##

## -@@ -596,8 +640,53 @@ +@@ -596,8 +637,53 @@ ## ##

@@ -207,7 +213,7 @@ +gen_tunable(allow_console_login,false) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.4.6/policy/mls --- nsaserefpolicy/policy/mls 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/mls 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/mls 2007-05-15 11:51:26.000000000 -0400 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or @@ -281,7 +287,7 @@ mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.4.6/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-05-15 11:51:26.000000000 -0400 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -292,7 +298,7 @@ logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.4.6/policy/modules/admin/amanda.if --- nsaserefpolicy/policy/modules/admin/amanda.if 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-05-15 11:51:26.000000000 -0400 @@ -127,4 +127,21 @@ allow $1 amanda_log_t:file ra_file_perms; ') @@ -317,7 +323,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.4.6/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-05-15 11:51:26.000000000 -0400 @@ -75,6 +75,7 @@ allow amanda_t self:unix_dgram_socket create_socket_perms; allow amanda_t self:tcp_socket create_stream_socket_perms; @@ -337,14 +343,14 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.4.6/policy/modules/admin/amtu.fc --- nsaserefpolicy/policy/modules/admin/amtu.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc 2007-05-15 11:51:26.000000000 -0400 @@ -0,0 +1,3 @@ + +/usr/bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.4.6/policy/modules/admin/amtu.if --- nsaserefpolicy/policy/modules/admin/amtu.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.if 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.if 2007-05-15 11:51:26.000000000 -0400 @@ -0,0 +1,57 @@ +##

+## abstract Machine Test Utility @@ -405,7 +411,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.4.6/policy/modules/admin/amtu.te --- nsaserefpolicy/policy/modules/admin/amtu.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.te 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.te 2007-05-15 11:51:26.000000000 -0400 @@ -0,0 +1,56 @@ +policy_module(amtu,1.0.23) + @@ -465,7 +471,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/backup.te serefpolicy-2.4.6/policy/modules/admin/backup.te --- nsaserefpolicy/policy/modules/admin/backup.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/backup.te 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/backup.te 2007-05-15 11:51:26.000000000 -0400 @@ -82,3 +82,8 @@ optional_policy(` nis_use_ypbind(backup_t) @@ -477,7 +483,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.4.6/policy/modules/admin/bootloader.fc --- nsaserefpolicy/policy/modules/admin/bootloader.fc 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-05-15 11:51:26.000000000 -0400 @@ -2,11 +2,6 @@ /etc/lilo\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) /etc/yaboot\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) @@ -492,7 +498,7 @@ /sbin/ybin.* -- gen_context(system_u:object_r:bootloader_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.4.6/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-05-15 11:51:26.000000000 -0400 @@ -93,6 +93,8 @@ [...3443 lines suppressed...] +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/*Warnings* serefpolicy-2.4.6/policy/support/*Warnings* +--- nsaserefpolicy/policy/support/*Warnings* 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.4.6/policy/support/*Warnings* 2007-05-16 14:11:13.000000000 -0400 +@@ -0,0 +1,189 @@ ++(1) (initialization/error) An error has occurred while loading /home/devel/dwalsh/.xemacs/init.el: ++ ++Cannot open load file: "uniquify" ++ ++Backtrace follows: ++ ++ signal(file-error ("Cannot open load file" "uniquify")) ++ # bind (path handler filename nosuffix nomessage noerror file) ++ load("uniquify" nil require nil) ++ # (unwind-protect ...) ++ require(uniquify) ++ # (unwind-protect ...) ++ # (unwind-protect ...) ++ # (unwind-protect ...) ++ # (unwind-protect ...) ++ # (unwind-protect ...) ++ # (unwind-protect ...) ++ # (unwind-protect ...) ++ # (unwind-protect ...) ++ load-internal("/home/devel/dwalsh/.xemacs/init.el" t t t undecided) ++ # bind (path handler filename nosuffix nomessage noerror file) ++ load("/home/devel/dwalsh/.xemacs/init.el" t t t) ++ load-user-init-file() ++ #() ++ # (unwind-protect ...) ++ call-with-condition-handler(# #) ++ # (condition-case ... . ((error))) ++ # bind (debug-on-error debug-on-error-from-init-file debug-on-error-should-be-set debug-on-error-initial) ++ load-init-file() ++ # bind (command-line-args-left) ++ command-line() ++ # (condition-case ... . ((t (byte-code " ????" [error-data data nil] 1)))) ++ # bind (error-data) ++ normal-top-level() ++ # (condition-case ... . error) ++ # (catch top-level ...) ++ ++ ++To ensure normal operation, you should investigate the cause of the error ++in your initialization file and remove it. Use the `-debug-init' option ++to XEmacs to enter the debugger when the error occurs and investigate the ++exact problem. ++ ++######################################## ++# ++# New permission sets ++# ++ ++# ++# Directory (dir) ++# ++define(`getattr_dir_perms',`{ getattr }') ++define(`setattr_dir_perms',`{ setattr }') ++define(`search_dir_perms',`{ getattr search }') ++define(`list_dir_perms',`{ getattr search read lock ioctl }') ++define(`add_entry_dir_perms',`{ getattr search lock ioctl write add_name }') ++define(`del_entry_dir_perms',`{ getattr search lock ioctl write remove_name }') ++define(`create_dir_perms',`{ getattr create }') ++define(`delete_dir_perms',`{ getattr rmdir }') ++define(`manage_dir_perms',`{ create getattr setattr read write link unlink rename search add_name remove_name reparent rmdir lock ioctl }') ++define(`relabelfrom_dir_perms',`{ getattr relabelfrom }') ++define(`relabelto_dir_perms',`{ getattr relabelto }') ++define(`relabel_dir_perms',`{ getattr relabelfrom relabelto }') ++ ++# ++# Regular file (file) ++# ++define(`getattr_file_perms',`{ getattr }') ++define(`setattr_file_perms',`{ setattr }') ++define(`read_file_perms',`{ getattr read lock ioctl }') ++define(`mmap_file_perms',`{ getattr read execute ioctl }') ++define(`exec_file_perms',`{ getattr read execute execute_no_trans }') ++define(`append_file_perms',`{ getattr append lock ioctl }') ++define(`write_file_perms',`{ getattr write append lock ioctl }') ++define(`rw_file_perms',`{ getattr read write append ioctl lock }') ++define(`create_file_perms',`{ getattr create }') ++define(`rename_file_perms',`{ getattr rename }') ++define(`delete_file_perms',`{ getattr unlink }') ++define(`manage_file_perms',`{ create getattr setattr read write append rename link unlink ioctl lock }') ++define(`relabelfrom_file_perms',`{ getattr relabelfrom }') ++define(`relabelto_file_perms',`{ getattr relabelto }') ++define(`relabel_file_perms',`{ getattr relabelfrom relabelto }') ++ ++# ++# Symbolic link (lnk_file) ++# ++define(`getattr_lnk_file_perms',`{ getattr }') ++define(`setattr_lnk_file_perms',`{ setattr }') ++define(`read_lnk_file_perms',`{ getattr read }') ++define(`write_lnk_file_perms',`{ getattr write lock ioctl }') ++define(`rw_lnk_file_perms',`{ getattr read write lock ioctl }') ++define(`create_lnk_file_perms',`{ create getattr }') ++define(`rename_lnk_file_perms',`{ getattr rename }') ++define(`delete_lnk_file_perms',`{ getattr unlink }') ++define(`manage_lnk_file_perms',`{ create read getattr setattr unlink rename }') ++define(`relabelfrom_lnk_file_perms',`{ getattr relabelfrom }') ++define(`relabelto_lnk_file_perms',`{ getattr relabelto }') ++define(`relabel_lnk_file_perms',`{ getattr relabelfrom relabelto }') ++ ++# ++# (Un)named Pipes/FIFOs (fifo_file) ++# ++define(`getattr_fifo_file_perms',`{ getattr }') ++define(`setattr_fifo_file_perms',`{ setattr }') ++define(`read_fifo_file_perms',`{ getattr read lock ioctl }') ++define(`append_fifo_file_perms',`{ getattr append lock ioctl }') ++define(`write_fifo_file_perms',`{ getattr write append lock ioctl }') ++define(`rw_fifo_file_perms',`{ getattr read write append ioctl lock }') ++define(`create_fifo_file_perms',`{ getattr create }') ++define(`delete_fifo_file_perms',`{ getattr unlink }') ++define(`manage_fifo_file_perms',`{ create getattr setattr read write append rename link unlink ioctl lock }') ++define(`relabelfrom_fifo_file_perms',`{ getattr relabelfrom }') ++define(`relabelto_fifo_file_perms',`{ getattr relabelto }') ++define(`relabel_fifo_file_perms',`{ getattr relabelfrom relabelto }') ++ ++# ++# (Un)named Sockets (sock_file) ++# ++define(`getattr_sock_file_perms',`{ getattr }') ++define(`setattr_sock_file_perms',`{ setattr }') ++define(`read_sock_file_perms',`{ getattr read }') ++define(`write_sock_file_perms',`{ getattr write append }') ++define(`rw_sock_file_perms',`{ getattr read write append }') ++define(`create_sock_file_perms',`{ getattr create }') ++define(`delete_sock_file_perms',`{ getattr unlink }') ++define(`manage_sock_file_perms',`{ create getattr setattr read write rename link unlink ioctl lock }') ++define(`relabelfrom_sock_file_perms',`{ getattr relabelfrom }') ++define(`relabelto_sock_file_perms',`{ getattr relabelto }') ++define(`relabel_sock_file_perms',`{ getattr relabelfrom relabelto }') ++ ++# ++# Block device nodes (blk_file) ++# ++define(`getattr_blk_file_perms',`{ getattr }') ++define(`setattr_blk_file_perms',`{ setattr }') ++define(`read_blk_file_perms',`{ getattr read lock ioctl }') ++define(`append_blk_file_perms',`{ getattr append lock ioctl }') ++define(`write_blk_file_perms',`{ getattr write append lock ioctl }') ++define(`rw_blk_file_perms',`{ getattr read write append ioctl lock }') ++define(`create_blk_file_perms',`{ getattr create }') ++define(`rename_blk_file_perms',`{ getattr rename }') ++define(`delete_blk_file_perms',`{ getattr unlink }') ++define(`manage_blk_file_perms',`{ create getattr setattr read write append rename link unlink ioctl lock }') ++define(`relabelfrom_blk_file_perms',`{ getattr relabelfrom }') ++define(`relabelto_blk_file_perms',`{ getattr relabelto }') ++define(`relabel_blk_file_perms',`{ getattr relabelfrom relabelto }') ++ ++# ++# Character device nodes (chr_file) ++# ++define(`getattr_chr_file_perms',`{ getattr }') ++define(`setattr_chr_file_perms',`{ setattr }') ++define(`read_chr_file_perms',`{ getattr read lock ioctl }') ++define(`append_chr_file_perms',`{ getattr append lock ioctl }') ++define(`write_chr_file_perms',`{ getattr write append lock ioctl }') ++define(`rw_chr_file_perms',`{ getattr read write append ioctl lock }') ++define(`create_chr_file_perms',`{ getattr create }') ++define(`rename_chr_file_perms',`{ getattr rename }') ++define(`delete_chr_file_perms',`{ getattr unlink }') ++define(`manage_chr_file_perms',`{ create getattr setattr read write append rename link unlink ioctl lock }') ++define(`relabelfrom_chr_file_perms',`{ getattr relabelfrom }') ++define(`relabelto_chr_file_perms',`{ getattr relabelto }') ++define(`relabel_chr_file_perms',`{ getattr relabelfrom relabelto }') ++ ++######################################## ++# ++# Special permission sets ++# ++ ++# ++# Use (read and write) terminals ++# ++define(`rw_term_perms', `{ getattr read write ioctl }') ++ ++# ++# Sockets ++# ++define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') ++define(`server_stream_socket_perms', `{ client_stream_socket_perms listen accept }') ++ ++define(`all_capabilities', `{ chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control } ++') ++ ++define(`all_nscd', `{ getpwd getgrp gethost getstat admin shmempwd shmemgrp shmemhost } ') ++define(`all_dbus', `{ acquire_svc send_msg } ') ++define(`all_passwd', `{ passwd chfn chsh rootok crontab } ') ++define(`all_association', `{ sendto recvfrom setcontext polmatch } ') ++ ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.4.6/Rules.modular --- nsaserefpolicy/Rules.modular 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/Rules.modular 2007-05-07 10:09:52.000000000 -0400 ++++ serefpolicy-2.4.6/Rules.modular 2007-05-15 11:51:27.000000000 -0400 @@ -219,6 +219,16 @@ ######################################## Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v retrieving revision 1.365 retrieving revision 1.366 diff -u -r1.365 -r1.366 --- selinux-policy.spec 14 May 2007 19:38:51 -0000 1.365 +++ selinux-policy.spec 17 May 2007 17:38:54 -0000 1.366 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.4.6 -Release: 69%{?dist} +Release: 71%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -360,6 +360,15 @@ %endif %changelog +* Mon May 15 2007 Dan Walsh 2.4.6-71 +- Allow netlable to read etc and work with init terminals +- Change file context to have all of policy at SystemLow +Resolves: #239079 + +* Mon May 15 2007 Dan Walsh 2.4.6-70 +- Back out Useradd change +Resolves: #239079 + * Fri May 4 2007 Dan Walsh 2.4.6-69 - Fix vlc libraries to be textrel_shlib_t From fedora-cvs-commits at redhat.com Thu May 17 17:44:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 May 2007 13:44:37 -0400 Subject: rpms/policycoreutils/devel policycoreutils-gui.patch, 1.16, 1.17 policycoreutils.spec, 1.411, 1.412 Message-ID: <200705171744.l4HHibu5010892@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10875 Modified Files: policycoreutils-gui.patch policycoreutils.spec Log Message: * Thu May 17 2007 Dan Walsh 2.0.16-2 - Fixes for polgentool templates file policycoreutils-gui.patch: Makefile | 34 booleansPage.py | 224 +++ fcontextPage.py | 207 +++ loginsPage.py | 173 ++ mappingsPage.py | 54 modulesPage.py | 172 ++ polgen.glade | 1168 ++++++++++++++++ polgen.py | 455 ++++++ polgengui.py | 253 +++ portsPage.py | 227 +++ selinux.tbl | 274 +++ semanagePage.py | 115 + statusPage.py | 220 +++ system-config-selinux.glade | 3035 ++++++++++++++++++++++++++++++++++++++++++++ system-config-selinux.py | 169 ++ templates/__init__.py | 18 templates/executable.py | 154 ++ templates/network.py | 44 templates/rw.py | 104 + templates/script.py | 42 templates/semodule.py | 41 templates/tmp.py | 72 + templates/var_lib.py | 137 + templates/var_log.py | 89 + templates/var_run.py | 95 + templates/var_spool.py | 105 + translationsPage.py | 111 + usersPage.py | 166 ++ 28 files changed, 7958 insertions(+) Index: policycoreutils-gui.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-gui.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- policycoreutils-gui.patch 30 Apr 2007 13:00:48 -0000 1.16 +++ policycoreutils-gui.patch 17 May 2007 17:44:34 -0000 1.17 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.14/gui/booleansPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-2.0.16/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/booleansPage.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/booleansPage.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,224 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -226,9 +226,9 @@ + + setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) + commands.getstatusoutput(setsebool) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.14/gui/fcontextPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-2.0.16/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/fcontextPage.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/fcontextPage.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,207 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -437,9 +437,9 @@ + self.store.set_value(iter, SPEC_COL, fspec) + self.store.set_value(iter, FTYPE_COL, ftype) + self.store.set_value(iter, TYPE_COL, "system_u:object_r:%s:%s" % (type, mls)) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.14/gui/loginsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-2.0.16/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/loginsPage.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/loginsPage.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,173 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -614,9 +614,9 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.14/gui/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.16/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/Makefile 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/Makefile 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,34 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -652,9 +652,9 @@ +indent: + +relabel: -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.14/gui/mappingsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-2.0.16/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/mappingsPage.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/mappingsPage.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -710,9 +710,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.14/gui/modulesPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-2.0.16/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/modulesPage.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/modulesPage.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,172 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -886,9 +886,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.14/gui/polgen.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade policycoreutils-2.0.16/gui/polgen.glade --- nsapolicycoreutils/gui/polgen.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/polgen.glade 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/polgen.glade 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,1168 @@ + + @@ -2058,9 +2058,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.14/gui/polgengui.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.16/gui/polgengui.py --- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/polgengui.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/polgengui.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,253 @@ +#!/usr/bin/python +# @@ -2315,9 +2315,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.14/gui/polgen.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.16/gui/polgen.py --- nsapolicycoreutils/gui/polgen.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/polgen.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/polgen.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,455 @@ +#! /usr/bin/python +# Copyright (C) 2007 Red Hat @@ -2774,9 +2774,9 @@ + sys.exit(0) + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.14/gui/portsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-2.0.16/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/portsPage.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/portsPage.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,227 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -3005,9 +3005,9 @@ + self.store.set_value(iter, MLS_COL, mls) + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.14/gui/selinux.tbl +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-2.0.16/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/selinux.tbl 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/selinux.tbl 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,274 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -3283,9 +3283,9 @@ +webadm_manage_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.") +webadm_read_users_files _("HTTPD Service") _("Allow httpd to access nfs file systems.") + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.14/gui/semanagePage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-2.0.16/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/semanagePage.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/semanagePage.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,115 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -3402,9 +3402,9 @@ + self.dialog.hide() + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.14/gui/statusPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-2.0.16/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/statusPage.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/statusPage.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,220 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -3626,9 +3626,9 @@ + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.14/gui/system-config-selinux.glade +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-2.0.16/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/system-config-selinux.glade 2007-04-30 08:58:02.000000000 -0400 ++++ policycoreutils-2.0.16/gui/system-config-selinux.glade 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,3035 @@ + + @@ -6665,9 +6665,9 @@ + + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.14/gui/system-config-selinux.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-2.0.16/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/system-config-selinux.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/system-config-selinux.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,169 @@ +#!/usr/bin/python +# @@ -6838,10 +6838,10 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.14/gui/templates/executable.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.16/gui/templates/executable.py --- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/executable.py 2007-04-30 08:57:42.000000000 -0400 -@@ -0,0 +1,156 @@ ++++ policycoreutils-2.0.16/gui/templates/executable.py 2007-05-17 13:41:49.000000000 -0400 +@@ -0,0 +1,154 @@ +#! /usr/bin/env python +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -6922,8 +6922,6 @@ +# + +# Init script handling -+init_use_fds(TEMPLATETYPE_t) -+init_use_script_ptys(TEMPLATETYPE_t) +domain_use_interactive_fds(TEMPLATETYPE_t) + +## internal communication is often done using fifo and unix sockets. @@ -6998,9 +6996,9 @@ +EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.14/gui/templates/__init__.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.16/gui/templates/__init__.py --- nsapolicycoreutils/gui/templates/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/__init__.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/templates/__init__.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,18 @@ +# +# Copyright (C) 2007 Red Hat, Inc. @@ -7020,13 +7018,13 @@ +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.14/gui/templates/network.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/network.py policycoreutils-2.0.16/gui/templates/network.py --- nsapolicycoreutils/gui/templates/network.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/network.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/templates/network.py 2007-05-17 13:41:29.000000000 -0400 @@ -0,0 +1,44 @@ +te_port_types="""\ +type TEMPLATETYPE_port_t; -+corenet_port(TEMPLATETYPE_port_t) ++corenet_port_type(TEMPLATETYPE_port_t) +""" + +te_network="""\ @@ -7068,9 +7066,9 @@ +allow TEMPLATETYPE_t TEMPLATETYPE_port_t:udp_socket name_bind; +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.14/gui/templates/rw.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/rw.py policycoreutils-2.0.16/gui/templates/rw.py --- nsapolicycoreutils/gui/templates/rw.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/rw.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/templates/rw.py 2007-05-17 13:41:33.000000000 -0400 @@ -0,0 +1,104 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -7097,7 +7095,7 @@ +########################### tmp Template File ############################# +te_types=""" +type TEMPLATETYPE_rw_t; -+file_type(TEMPLATETYPE_rw_t) ++files_type(TEMPLATETYPE_rw_t) +""" + +te_rules=""" @@ -7176,9 +7174,9 @@ +fc_dir=""" +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_rw_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.14/gui/templates/script.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.16/gui/templates/script.py --- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/script.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/templates/script.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,42 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -7222,9 +7220,9 @@ +/usr/sbin/semanage port -a -t TEMPLATETYPE_port_t -p udp PORTNUM +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.14/gui/templates/semodule.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/semodule.py policycoreutils-2.0.16/gui/templates/semodule.py --- nsapolicycoreutils/gui/templates/semodule.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/semodule.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/templates/semodule.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,41 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -7267,9 +7265,9 @@ +semanage ports -a -t TEMPLATETYPE_port_t -p udp PORTNUM +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.14/gui/templates/tmp.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/tmp.py policycoreutils-2.0.16/gui/templates/tmp.py --- nsapolicycoreutils/gui/templates/tmp.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/tmp.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/templates/tmp.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,72 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -7343,9 +7341,9 @@ + dontaudit $1 TEMPLATETYPE_tmp_t:file r_file_perms; +') +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.14/gui/templates/var_lib.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_lib.py policycoreutils-2.0.16/gui/templates/var_lib.py --- nsapolicycoreutils/gui/templates/var_lib.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/var_lib.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/templates/var_lib.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,137 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -7484,9 +7482,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.14/gui/templates/var_log.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_log.py policycoreutils-2.0.16/gui/templates/var_log.py --- nsapolicycoreutils/gui/templates/var_log.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/var_log.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/templates/var_log.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,89 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -7577,9 +7575,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_log_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.14/gui/templates/var_run.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_run.py policycoreutils-2.0.16/gui/templates/var_run.py --- nsapolicycoreutils/gui/templates/var_run.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/var_run.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/templates/var_run.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,95 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -7676,9 +7674,9 @@ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0) +""" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.14/gui/templates/var_spool.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/var_spool.py policycoreutils-2.0.16/gui/templates/var_spool.py --- nsapolicycoreutils/gui/templates/var_spool.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/templates/var_spool.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/templates/var_spool.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,105 @@ +# Copyright (C) 2007 Red Hat +# see file 'COPYING' for use and warranty information @@ -7785,9 +7783,9 @@ +fc_dir="""\ +FILENAME(/.*)? gen_context(system_u:object_r:TEMPLATETYPE_spool_t,s0) +""" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.14/gui/translationsPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-2.0.16/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/translationsPage.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/translationsPage.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,111 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -7900,9 +7898,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.14/gui/usersPage.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-2.0.16/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.14/gui/usersPage.py 2007-04-30 08:57:42.000000000 -0400 ++++ policycoreutils-2.0.16/gui/usersPage.py 2007-05-07 12:59:26.000000000 -0400 @@ -0,0 +1,166 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.411 retrieving revision 1.412 diff -u -r1.411 -r1.412 --- policycoreutils.spec 4 May 2007 13:20:29 -0000 1.411 +++ policycoreutils.spec 17 May 2007 17:44:35 -0000 1.412 @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 2.0.16 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -192,6 +192,9 @@ fi %changelog +* Thu May 17 2007 Dan Walsh 2.0.16-2 +- Fixes for polgentool templates file + * Tue May 4 2007 Dan Walsh 2.0.16-1 - Updated version of policycoreutils * Merged support for modifying the prefix via semanage from Dan Walsh. From fedora-cvs-commits at redhat.com Thu May 17 17:52:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 May 2007 13:52:43 -0400 Subject: rpms/selinux-policy/FC-6 policy-fusermount.patch,1.3,1.4 Message-ID: <200705171752.l4HHqhpn011205@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11188 Modified Files: policy-fusermount.patch Log Message: * Mon May 15 2007 Dan Walsh 2.4.6-71 - Allow netlable to read etc and work with init terminals - Change file context to have all of policy at SystemLow Resolves: #239079 policy-fusermount.patch: kernel/files.fc | 1 kernel/filesystem.te | 6 +++++ system/fusermount.fc | 6 +++++ system/fusermount.if | 41 +++++++++++++++++++++++++++++++++++++ system/fusermount.te | 45 ++++++++++++++++++++++++++++++++++++++++ system/mount.fc | 3 -- system/mount.if | 41 +++++++++++++++++++++++++++++++++++++ system/mount.te | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++- 8 files changed, 196 insertions(+), 3 deletions(-) Index: policy-fusermount.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-fusermount.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- policy-fusermount.patch 14 May 2007 19:38:51 -0000 1.3 +++ policy-fusermount.patch 17 May 2007 17:52:41 -0000 1.4 @@ -262,540 +262,3 @@ /etc/motd -- gen_context(system_u:object_r:etc_runtime_t,s0) /etc/nohotplug -- gen_context(system_u:object_r:etc_runtime_t,s0) /etc/nologin.* -- gen_context(system_u:object_r:etc_runtime_t,s0) ---- /dev/null 2007-05-03 14:48:40.015638131 -0400 -+++ serefpolicy-2.4.6/policy/support/file_patterns.spt 2007-04-03 09:09:13.000000000 -0400 -@@ -0,0 +1,534 @@ -+# -+# Directory patterns (dir) -+# -+# Parameters: -+# 1. domain type -+# 2. container (directory) type -+# 3. directory type -+# -+define(`getattr_dirs_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:dir getattr_dir_perms; -+') -+ -+define(`setattr_dirs_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:dir setattr_dir_perms; -+') -+ -+define(`search_dirs_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:dir search_dir_perms; -+') -+ -+define(`list_dirs_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:dir list_dir_perms; -+') -+ -+define(`add_entry_dirs_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:dir add_entry_dir_perms; -+') -+ -+define(`del_entry_dirs_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:dir del_entry_dir_perms; -+') -+ -+define(`create_dirs_pattern',` -+ allow $1 $2:dir add_entry_dir_perms; -+ allow $1 $3:dir create_dir_perms; -+') -+ -+define(`delete_dirs_pattern',` -+ allow $1 $2:dir del_entry_dir_perms; -+ allow $1 $3:dir delete_dir_perms; -+') -+ -+define(`rename_dirs_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:dir rename_dir_perms; -+') -+ -+define(`manage_dirs_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:dir manage_dir_perms; -+') -+ -+define(`relabelfrom_dirs_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:dir relabelfrom_dir_perms; -+') -+ -+define(`relabelto_dirs_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:dir relabelto_dir_perms; -+') -+ -+define(`relabel_dirs_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:dir relabel_dir_perms; -+') -+ -+# -+# Regular file patterns (file) -+# -+# Parameters: -+# 1. domain type -+# 2. container (directory) type -+# 3. file type -+# -+define(`getattr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file getattr_file_perms; -+') -+ -+define(`setattr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file setattr_file_perms; -+') -+ -+define(`read_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file read_file_perms; -+') -+ -+define(`mmap_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file mmap_file_perms; -+') -+ -+define(`exec_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file exec_file_perms; -+') -+ -+define(`append_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file append_file_perms; -+') -+ -+define(`write_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file write_file_perms; -+') -+ -+define(`rw_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file rw_file_perms; -+') -+ -+define(`create_files_pattern',` -+ allow $1 $2:dir add_entry_dir_perms; -+ allow $1 $3:file create_file_perms; -+') -+ -+define(`delete_files_pattern',` -+ allow $1 $2:dir del_entry_dir_perms; -+ allow $1 $3:file delete_file_perms; -+') -+ -+define(`rename_files_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:file rename_file_perms; -+') -+ -+define(`manage_files_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:file manage_file_perms; -+') -+ -+define(`relabelfrom_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file relabelfrom_file_perms; -+') -+ -+define(`relabelto_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file relabelto_file_perms; -+') -+ -+define(`relabel_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:file relabel_file_perms; -+') -+ -+# -+# Symbolic link patterns (lnk_file) -+# -+# Parameters: -+# 1. domain type -+# 2. container (directory) type -+# 3. file type -+# -+define(`getattr_lnk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:lnk_file getattr_lnk_file_perms; -+') -+ -+define(`setattr_lnk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:lnk_file setattr_lnk_file_perms; -+') -+ -+define(`read_lnk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:lnk_file read_lnk_file_perms; -+') -+ -+define(`append_lnk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:lnk_file append_lnk_file_perms; -+') -+ -+define(`write_lnk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:lnk_file write_lnk_file_perms; -+') -+ -+define(`rw_lnk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:lnk_file rw_lnk_file_perms; -+') -+ -+define(`create_lnk_files_pattern',` -+ allow $1 $2:dir add_entry_dir_perms; -+ allow $1 $3:lnk_file create_lnk_file_perms; -+') -+ -+define(`delete_lnk_files_pattern',` -+ allow $1 $2:dir del_entry_dir_perms; -+ allow $1 $3:lnk_file delete_lnk_file_perms; -+') -+ -+define(`rename_lnk_files_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:lnk_file rename_lnk_file_perms; -+') -+ -+define(`manage_lnk_files_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:lnk_file manage_lnk_file_perms; -+') -+ -+define(`relabelfrom_lnk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:lnk_file relabelfrom_lnk_file_perms; -+') -+ -+define(`relabelto_lnk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:lnk_file relabelto_lnk_file_perms; -+') -+ -+define(`relabel_lnk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:lnk_file relabel_lnk_file_perms; -+') -+ -+# -+# (Un)named Pipes/FIFO patterns (fifo_file) -+# -+# Parameters: -+# 1. domain type -+# 2. container (directory) type -+# 3. file type -+# -+define(`getattr_fifo_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:fifo_file getattr_fifo_file_perms; -+') -+ -+define(`setattr_fifo_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:fifo_file setattr_fifo_file_perms; -+') -+ -+define(`read_fifo_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:fifo_file read_fifo_file_perms; -+') -+ -+define(`append_fifo_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:fifo_file append_fifo_file_perms; -+') -+ -+define(`write_fifo_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:fifo_file write_fifo_file_perms; -+') -+ -+define(`rw_fifo_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:fifo_file rw_fifo_file_perms; -+') -+ -+define(`create_fifo_files_pattern',` -+ allow $1 $2:dir add_entry_dir_perms; -+ allow $1 $3:fifo_file create_fifo_file_perms; -+') -+ -+define(`delete_fifo_files_pattern',` -+ allow $1 $2:dir del_entry_dir_perms; -+ allow $1 $3:fifo_file delete_fifo_file_perms; -+') -+ -+define(`rename_fifo_files_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:fifo_file rename_fifo_file_perms; -+') -+ -+define(`manage_fifo_files_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:fifo_file manage_fifo_file_perms; -+') -+ -+define(`relabelfrom_fifo_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:fifo_file relabelfrom_fifo_file_perms; -+') -+ -+define(`relabelto_fifo_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:fifo_file relabelto_fifo_file_perms; -+') -+ -+define(`relabel_fifo_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:fifo_file relabel_fifo_file_perms; -+') -+ -+# -+# (Un)named sockets patterns (sock_file) -+# -+# Parameters: -+# 1. domain type -+# 2. container (directory) type -+# 3. file type -+# -+define(`getattr_sock_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:sock_file getattr_fifo_file_perms; -+') -+ -+define(`setattr_sock_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:sock_file setattr_fifo_file_perms; -+') -+ -+define(`read_sock_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:sock_file read_fifo_file_perms; -+') -+ -+define(`write_sock_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:sock_file write_fifo_file_perms; -+') -+ -+define(`rw_sock_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:sock_file rw_fifo_file_perms; -+') -+ -+define(`create_sock_files_pattern',` -+ allow $1 $2:dir add_entry_dir_perms; -+ allow $1 $3:sock_file create_fifo_file_perms; -+') -+ -+define(`delete_sock_files_pattern',` -+ allow $1 $2:dir del_entry_dir_perms; -+ allow $1 $3:sock_file delete_fifo_file_perms; -+') -+ -+define(`rename_sock_files_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:sock_file rename_fifo_file_perms; -+') -+ -+define(`manage_sock_files_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:sock_file manage_fifo_file_perms; -+') -+ -+define(`relabelfrom_sock_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:sock_file relabelfrom_sock_file_perms; -+') -+ -+define(`relabelto_sock_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:sock_file relabelto_sock_file_perms; -+') -+ -+define(`relabel_sock_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:sock_file relabel_sock_file_perms; -+') -+ -+# -+# Block device node patterns (blk_file) -+# -+# Parameters: -+# 1. domain type -+# 2. container (directory) type -+# 3. file type -+# -+define(`getattr_blk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:blk_file getattr_blk_file_perms; -+') -+ -+define(`setattr_blk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:blk_file setattr_blk_file_perms; -+') -+ -+define(`read_blk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:blk_file read_blk_file_perms; -+') -+ -+define(`append_blk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:blk_file append_blk_file_perms; -+') -+ -+define(`write_blk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:blk_file write_blk_file_perms; -+') -+ -+define(`rw_blk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:blk_file rw_blk_file_perms; -+') -+ -+define(`create_blk_files_pattern',` -+ allow $1 self:capability mknod; -+ allow $1 $2:dir add_entry_dir_perms; -+ allow $1 $3:blk_file create_blk_file_perms; -+') -+ -+define(`delete_blk_files_pattern',` -+ allow $1 $2:dir del_entry_dir_perms; -+ allow $1 $3:blk_file delete_blk_file_perms; -+') -+ -+define(`rename_blk_files_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:blk_file rename_blk_file_perms; -+') -+ -+define(`manage_blk_files_pattern',` -+ allow $1 self:capability mknod; -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:blk_file manage_blk_file_perms; -+') -+ -+define(`relabelfrom_blk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:blk_file relabelfrom_blk_file_perms; -+') -+ -+define(`relabelto_blk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:blk_file relabelto_blk_file_perms; -+') -+ -+define(`relabel_blk_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:blk_file relabel_blk_file_perms; -+') -+ -+# -+# Character device node patterns (chr_file) -+# -+# Parameters: -+# 1. domain type -+# 2. container (directory) type -+# 3. file type -+# -+define(`getattr_chr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:chr_file getattr_chr_file_perms; -+') -+ -+define(`setattr_chr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:chr_file setattr_chr_file_perms; -+') -+ -+define(`read_chr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:chr_file read_chr_file_perms; -+') -+ -+define(`append_chr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:chr_file append_chr_file_perms; -+') -+ -+define(`write_chr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:chr_file write_chr_file_perms; -+') -+ -+define(`rw_chr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:chr_file rw_chr_file_perms; -+') -+ -+define(`create_chr_files_pattern',` -+ allow $1 self:capability mknod; -+ allow $1 $2:dir add_entry_dir_perms; -+ allow $1 $3:chr_file create_chr_file_perms; -+') -+ -+define(`delete_chr_files_pattern',` -+ allow $1 $2:dir del_entry_dir_perms; -+ allow $1 $3:chr_file delete_chr_file_perms; -+') -+ -+define(`rename_chr_files_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:chr_file rename_chr_file_perms; -+') -+ -+define(`manage_chr_files_pattern',` -+ allow $1 self:capability mknod; -+ allow $1 $2:dir rw_dir_perms; -+ allow $1 $3:chr_file manage_chr_file_perms; -+') -+ -+define(`relabelfrom_chr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:chr_file relabelfrom_chr_file_perms; -+') -+ -+define(`relabelto_chr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:chr_file relabelto_chr_file_perms; -+') -+ -+define(`relabel_chr_files_pattern',` -+ allow $1 $2:dir search_dir_perms; -+ allow $1 $3:chr_file relabel_chr_file_perms; -+') -+ -+# -+# File type_transition patterns -+# -+# pattern(domain,dirtype,newtype,class(es)) -+# -+define(`filetrans_add_pattern',` -+ allow $1 $2:dir ra_dir_perms; -+ type_transition $1 $2:$4 $3; -+') -+ -+define(`filetrans_pattern',` -+ allow $1 $2:dir rw_dir_perms; -+ type_transition $1 $2:$4 $3; -+') From fedora-cvs-commits at redhat.com Thu May 17 18:13:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 May 2007 14:13:32 -0400 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch,1.44,1.45 Message-ID: <200705171813.l4HIDWIJ011893@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11871 Modified Files: policy-20061106.patch Log Message: * Mon May 15 2007 Dan Walsh 2.4.6-71 - Allow netlable to read etc and work with init terminals - Change file context to have all of policy at SystemLow Resolves: #239079 policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 94 +++- policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 6 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 57 ++ policy/modules/admin/amtu.te | 56 ++ policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 24 - policy/modules/admin/kudzu.te | 14 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 14 policy/modules/admin/netutils.te | 19 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 18 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 86 +++ policy/modules/admin/rpm.te | 49 -- policy/modules/admin/su.if | 38 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 13 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 58 ++ policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 ++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 38 + policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 39 - policy/modules/apps/mozilla.if | 208 +++++++-- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 6 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 20 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 29 + policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 140 ++++++ policy/modules/kernel/corenetwork.te.in | 14 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 ++ policy/modules/kernel/domain.te | 22 policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 224 +++++++++ policy/modules/kernel/filesystem.if | 62 ++ policy/modules/kernel/filesystem.te | 30 + policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 22 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 21 policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 3 policy/modules/services/aide.te | 11 policy/modules/services/amavis.if | 19 policy/modules/services/amavis.te | 3 policy/modules/services/apache.fc | 17 policy/modules/services/apache.if | 157 ++++++ policy/modules/services/apache.te | 43 + policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 40 + policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 6 policy/modules/services/bluetooth.te | 10 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 11 policy/modules/services/clamav.te | 3 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++- policy/modules/services/cron.te | 58 ++ policy/modules/services/cups.fc | 4 policy/modules/services/cups.te | 19 policy/modules/services/cvs.te | 2 policy/modules/services/cyrus.te | 5 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 66 ++ policy/modules/services/dbus.te | 4 policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/dovecot.fc | 1 policy/modules/services/dovecot.if | 44 + policy/modules/services/dovecot.te | 56 ++ policy/modules/services/fail2ban.fc | 3 policy/modules/services/fail2ban.if | 80 +++ policy/modules/services/fail2ban.te | 74 +++ policy/modules/services/ftp.te | 21 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 114 ++++ policy/modules/services/hal.te | 26 - policy/modules/services/inetd.te | 28 - policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 25 + policy/modules/services/kerberos.te | 15 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 57 +- policy/modules/services/lpd.te | 5 policy/modules/services/mailman.if | 20 policy/modules/services/mailman.te | 1 policy/modules/services/mta.fc | 1 policy/modules/services/mta.if | 20 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 34 + policy/modules/services/nscd.if | 20 policy/modules/services/nscd.te | 28 - policy/modules/services/ntp.te | 1 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 5 policy/modules/services/openca.if | 4 policy/modules/services/openca.te | 2 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 ++ policy/modules/services/pcscd.te | 79 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 11 policy/modules/services/portmap.te | 5 policy/modules/services/portslave.te | 1 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 22 policy/modules/services/postfix.te | 48 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 29 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 2 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 22 policy/modules/services/rlogin.te | 11 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.if | 3 policy/modules/services/rpc.te | 27 - policy/modules/services/rshd.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.fc | 6 policy/modules/services/samba.if | 62 ++ policy/modules/services/samba.te | 68 ++ policy/modules/services/sasl.te | 13 policy/modules/services/sendmail.if | 22 policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 17 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 24 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 21 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 14 policy/modules/services/telnet.te | 3 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 ++ policy/modules/services/uucp.te | 44 + policy/modules/services/uwimap.te | 1 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 190 ++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 180 +++++++ policy/modules/system/authlogin.te | 41 + policy/modules/system/clock.te | 18 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 policy/modules/system/init.if | 64 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 121 +++++ policy/modules/system/iptables.te | 23 policy/modules/system/libraries.fc | 43 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 11 policy/modules/system/logging.fc | 5 policy/modules/system/logging.if | 61 ++ policy/modules/system/logging.te | 33 + policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 + policy/modules/system/lvm.te | 87 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 +++ policy/modules/system/modutils.te | 26 - policy/modules/system/mount.te | 27 - policy/modules/system/netlabel.te | 10 policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 15 policy/modules/system/selinuxutil.fc | 10 policy/modules/system/selinuxutil.if | 122 +++++ policy/modules/system/selinuxutil.te | 134 ++--- policy/modules/system/sysnetwork.te | 13 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 policy/modules/system/unconfined.te | 23 policy/modules/system/userdomain.if | 622 +++++++++++++++++++++++---- policy/modules/system/userdomain.te | 105 ++-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 53 ++ policy/support/*Warnings* | 189 ++++++++ policy/support/file_patterns.spt | 534 +++++++++++++++++++++++ policy/support/obj_perm_sets.spt | 144 ++++++ 254 files changed, 7389 insertions(+), 722 deletions(-) Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- policy-20061106.patch 17 May 2007 17:38:54 -0000 1.44 +++ policy-20061106.patch 17 May 2007 18:13:30 -0000 1.45 @@ -12558,21 +12558,6 @@ dbus_stub(unconfined_execmem_t) init_dbus_chat_script(unconfined_execmem_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-2.4.6/policy/modules/system/userdomain.fc ---- nsaserefpolicy/policy/modules/system/userdomain.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/userdomain.fc 2007-05-16 16:16:14.000000000 -0400 -@@ -1,11 +1,4 @@ --ifdef(`strict_policy',` - HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh) - HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) - - /tmp/gconfd-USER -d gen_context(system_u:object_r:ROLE_tmp_t,s0) --') -- --ifdef(`targeted_policy',` --HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0) --HOME_DIR/.+ gen_context(system_u:object_r:user_home_t,s0) --') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.4.6/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2006-11-29 12:04:51.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/system/userdomain.if 2007-05-16 14:22:36.000000000 -0400 From fedora-cvs-commits at redhat.com Thu May 17 18:56:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 May 2007 14:56:23 -0400 Subject: rpms/irqbalance/devel irqbalance.init, 1.7, 1.8 irqbalance.spec, 1.42, 1.43 irqbalance.sysconfig, 1.2, 1.3 Message-ID: <200705171856.l4HIuNlC013408@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/irqbalance/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13393 Modified Files: irqbalance.init irqbalance.spec irqbalance.sysconfig Log Message: Resolves: bz237885 Index: irqbalance.init =================================================================== RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.init,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- irqbalance.init 12 Dec 2006 16:43:01 -0000 1.7 +++ irqbalance.init 17 May 2007 18:56:21 -0000 1.8 @@ -14,6 +14,101 @@ # Source function library. . /etc/init.d/functions +#internal functions +set_isolcpu_affinity_mask() { + +#the isolcpu line in the kenrel is of the format: +#[[-cpunum],]+ + local mask + local tmp_mask; + local range + local range_high + local range_low + local space_list + local cpus + local chunk_mask + local temp_mask + + grep isolcpus /proc/cmdline > /dev/null + if [ $? != 0 ] + then + # no isolcpus line + IRQ_AFFINITY_MASK= + return + fi + + # get a space separated list of ranges + space_list=`sed -e's/\(^.*isolcpus=\)\([^ ]* *\)\(.*$\)/\2/' -e's/,/ /g' /proc/cmdline` + + mask=0 + + for range in $space_list + do + # Get the Range + range_low=`echo $range | awk -F- '{print $1}'` + range_high=`echo $range | awk -F- '{print $2}'` + + # + # If the High Range is not included + # its the same as te low range + # + if [ -z "$range_high" ] + then + range_high=$range_low + fi + + cpus=`dc -e"$range_high $range_low - p"` + + tmp_mask=0 + # + # Build the number of 1's we need into the mask + # + for i in `seq 0 1 $cpus` + do + tmp_mask=`dc -e"2 $i ^ $tmp_mask + p"` + done + + # + # And Shift the mask up to where it belongs + # + tmp_mask=`dc -e"2 $range_low ^ $tmp_mask * p"` + + # + # Lastly, or the mask into the result mask with + # an add operation + # + mask=`dc -e"$mask $tmp_mask + p"` + done + + # + # Convert the mask to a hex value + # + mask=`dc -e"10 i 16 o $mask p"` + + # + # Now divide up the mask with commas since Arjan apparently didn't + # feel the need to make this easy. + # + chunk_mask="" + temp_mask=$mask + while [ -n "$temp_mask" ] + do + new_chunk=`echo $temp_mask | cut -b1-8` + temp_mask=`echo $temp_mask | cut -b9-` + chunk_mask="$chunk_mask,$new_chunk" + done + + # now strip the leading comma + chunk_mask=`echo $chunk_mask | sed -e's/,//'` + + # + # Now Assign the mask value to the IRQ_AFFINITY_MASK + # + IRQ_AFFINITY_MASK=$chunk_mask + +} + + # Check that we're a priviledged user [ `id -u` = 0 ] || exit 0 @@ -40,6 +135,15 @@ *) ONESHOT= ;; esac +# +# Check to see if our IRQ_AFFINITY_MASK needs to be computed from +# the isolcpus command line options +# +if [ "$FOLLOW_ISOLCPUS" == "yes" ] +then + set_isolcpu_affinity_mask +fi + RETVAL=0 start() { Index: irqbalance.spec =================================================================== RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- irqbalance.spec 12 Dec 2006 16:43:01 -0000 1.42 +++ irqbalance.spec 17 May 2007 18:56:21 -0000 1.43 @@ -1,7 +1,7 @@ Summary: IRQ balancing daemon. Name: irqbalance Version: 0.55 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 Group: System Environment/Base License: GPL/OSL @@ -70,6 +70,9 @@ %changelog +* Thu May 17 2007 Neil Horman - 0.55-3 +- Adding FOLLOW_ISOLCPUS option (bz 237885) + * Tue Dec 12 2006 Neil Horman - 0.55-2 - Fixing typos in spec file (bz 219301) Index: irqbalance.sysconfig =================================================================== RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.sysconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- irqbalance.sysconfig 15 Nov 2006 15:23:48 -0000 1.2 +++ irqbalance.sysconfig 17 May 2007 18:56:21 -0000 1.3 @@ -16,3 +16,12 @@ # irq's assigned to them on rebalance # #IRQ_AFFINITY_MASK= + +# +# FOLLOW_ISOLCPUS +# Boolean value. When set to yes, any setting of IRQ_AFFINITY_MASK above +# is overridden, and instead computed to be the same mask that is defined +# by the isolcpu kernel command line option. +# +#FOLLOW_ISOLCPUS=no +# From fedora-cvs-commits at redhat.com Fri May 18 00:27:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 May 2007 20:27:49 -0400 Subject: rpms/mdadm/FC-6 mdadm.spec,1.39,1.40 Message-ID: <200705180027.l4I0RnEM021274@cvs.devel.redhat.com> Author: dledford Update of /cvs/dist/rpms/mdadm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21259 Modified Files: mdadm.spec Log Message: Minor tweaks Index: mdadm.spec =================================================================== RCS file: /cvs/dist/rpms/mdadm/FC-6/mdadm.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- mdadm.spec 17 Apr 2007 13:34:43 -0000 1.39 +++ mdadm.spec 18 May 2007 00:27:47 -0000 1.40 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: mdctl,raidtools Requires: /usr/sbin/sendmail -Requires(post): /sbin/chkconfig +Requires(post): /sbin/service, /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service @@ -39,8 +39,8 @@ %patch7 -p1 -b .build %build -make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm -make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" -C mdmpd mdmpd +make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdassemble.static mdassemble mdadm.static mdadm +make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" -C mdmpd mdmpd %install rm -rf $RPM_BUILD_ROOT @@ -89,6 +89,9 @@ %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Thu May 17 2007 Doug Ledford - 2.6.1-3 +- Minor tweaks to spec file + * Tue Apr 17 2007 Doug Ledford - 2.6.1-2 - Integrate changes from Fedora review process From fedora-cvs-commits at redhat.com Fri May 18 00:28:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 17 May 2007 20:28:35 -0400 Subject: rpms/mdadm/FC-6 mdadm.spec,1.40,1.41 Message-ID: <200705180028.l4I0SZM7021338@cvs.devel.redhat.com> Author: dledford Update of /cvs/dist/rpms/mdadm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21324 Modified Files: mdadm.spec Log Message: Bump Index: mdadm.spec =================================================================== RCS file: /cvs/dist/rpms/mdadm/FC-6/mdadm.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- mdadm.spec 18 May 2007 00:27:47 -0000 1.40 +++ mdadm.spec 18 May 2007 00:28:32 -0000 1.41 @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 2.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz Source1: mdmonitor.init Source2: mdmpd-0.4.tgz From fedora-cvs-commits at redhat.com Fri May 18 16:46:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 May 2007 12:46:31 -0400 Subject: rpms/htmlview/FC-6 htmlview, 1.13, 1.14 htmlview.spec, 1.25, 1.26 launchmail, 1.4, 1.5 Message-ID: <200705181646.l4IGkVgx010046@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/htmlview/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10027 Modified Files: htmlview htmlview.spec launchmail Log Message: Copy improvements from F7. - run konqueror in browser mode #239293 - if KDE-only desktop, use fallback apps so konqueror and kmail will launch #239300 and #239293 - minor modernization of htmlview's app lists - improve launchmail's non-GNOME error case Index: htmlview =================================================================== RCS file: /cvs/dist/rpms/htmlview/FC-6/htmlview,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- htmlview 20 Nov 2005 01:56:58 -0000 1.13 +++ htmlview 18 May 2007 16:46:28 -0000 1.14 @@ -7,7 +7,7 @@ # WARNING: Deprecated Script # This script will be replaced in the future when something better is implemented. # -# v3.0.0 +# v4.0.0 # ------ # If DISPLAY is set and gnome-open exists, mimic gnome-open behavior to launch # preferred browser. Due to MIME associations, gnome-open cannot be directly @@ -25,7 +25,7 @@ # # written by Bernhard Rosenkraenzer # changed by Warren Togami -# (c) 2000-2004 Red Hat, Inc. +# (c) 2000-2006 Red Hat, Inc. # # This script is in the public domain. @@ -68,7 +68,7 @@ fi # Special case: konqueror without arguments if [ "$GCONF" = "konqueror" ] && [ -z $1 ]; then - GCONF="konqueror about:konqueror" + GCONF="kfmclient openProfile webbrowsing" fi # Run GUI browser @@ -105,7 +105,7 @@ fi # Read GNOME configuration -if [ -x /usr/bin/gconftool-2 ]; then +if [ -x /usr/bin/gconftool-2 -a -x /usr/bin/gnome-default-applications-properties ]; then # Pull key from gconf, remove %s or "%s", trim leading & trailing spaces GCONF=$(gconftool-2 -g /desktop/gnome/url-handlers/http/command 2>/dev/null | sed -e 's/%s//; s/\"\"//; s/^\ *//; s/\ *$//') @@ -128,8 +128,8 @@ TERMS_GENERIC="/usr/bin/rxvt /usr/bin/xterm /usr/bin/Eterm" TTYBROWSERS="/usr/bin/links /usr/bin/lynx /usr/bin/w3m" X11BROWSERS_KDE="/usr/bin/konqueror /usr/bin/kfmbrowser" -X11BROWSERS_GNOME="/usr/bin/mozilla /usr/bin/epiphany /usr/bin/galeon" -X11BROWSERS_GENERIC="/usr/bin/mozilla /usr/bin/netscape" +X11BROWSERS_GNOME="/usr/bin/seamonkey /usr/bin/firefox /usr/bin/epiphany /usr/bin/galeon" +X11BROWSERS_GENERIC="/usr/bin/seamonkey /usr/bin/firefox /usr/bin/netscape" if [ "x`/sbin/pidof gnome-session`" != "x" ]; then X11BROWSERS="$GCONF $X11BROWSERS_GENERIC $X11BROWSERS_GNOME $X11BROWSERS_KDE" @@ -152,6 +152,10 @@ exit 1 else for i in $X11BROWSERS; do + # HACK! Run konqueror in browser mode + if exists $i && [ "$i" = "/usr/bin/konqueror" ] && [ -z $1 ]; then + exec kfmclient openProfile webbrowsing + fi exists $i && exec $i "$1" done for i in $TERMS; do Index: htmlview.spec =================================================================== RCS file: /cvs/dist/rpms/htmlview/FC-6/htmlview.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- htmlview.spec 1 Nov 2006 19:18:12 -0000 1.25 +++ htmlview.spec 18 May 2007 16:46:28 -0000 1.26 @@ -1,6 +1,6 @@ Name: htmlview -Version: 3.0.0 -Release: 15%{?dist} +Version: 4.0.0 +Release: 3%{?dist} Summary: Tools for launching Preferred Applications License: Public Domain Source0: htmlview @@ -39,9 +39,21 @@ %{_datadir}/applications/redhat-email.desktop %changelog +* Wed May 09 2007 Warren Togami - 4.0.0-3 +- run konqueror in browser mode #239293 + +* Mon May 07 2007 Warren Togami - 4.0.0-2 +- if KDE-only desktop, use fallback apps so konqueror and kmail will launch + #239300 and #239293 + +* Thu Dec 14 2006 Warren Togami - 4.0.0-1 +- minor modernization of htmlview's app lists +- improve launchmail's non-GNOME error case + * Wed Nov 1 2006 Matthias Clasen - 3.0.0-15 - Ensure that launchmail always brings up the mail component of evolution. (#212718) + * Wed Jul 12 2006 Jesse Keating - 3.0.0-14.1 - rebuild Index: launchmail =================================================================== RCS file: /cvs/dist/rpms/htmlview/FC-6/launchmail,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- launchmail 1 Nov 2006 19:18:12 -0000 1.4 +++ launchmail 18 May 2007 16:46:28 -0000 1.5 @@ -4,14 +4,15 @@ # Usage: # launchmail # -# WARNING: Deprecated Script -# This script exists only because GNOME 2.6 gnome-open lacks the ability -# to launch the preferred mail application directly without arguments. -# This script will be replaced for target distribution FC3 when -# something better is implemented upstream. +# v4.0.0 +# ------ +# This script exists because gnome-open cannot launch the preferred mail client +# without a "mailto:" address parameter. This script also attempts to run a mail +# client if GNOME's Preferred Application cannot be determined in cases where +# gconftool-2 is not installed. # # by Warren Togami -# (c) 2000-2004 Red Hat, Inc. +# (c) 2000-2006 Red Hat, Inc. # # This script is in the public domain. @@ -47,12 +48,9 @@ [ -x /usr/bin/gnome-default-applications-properties ] && exec /usr/bin/gnome-default-applications-properties exit 1 fi - - # Special case: mozilla mail - if [ "$GCONF" = "mozilla" ] && [ -z $1 ]; then - GCONF="mozilla -mail" + if [ "$GCONF" = "seamonkey" ] && [ -z $1 ]; then + GCONF="seamonkey -mail" fi - if [ "$GCONF" = "evolution" ]; then GCONF="evolution --component=mail" fi @@ -77,8 +75,8 @@ return $? } -# Read GNOME configuration -if [ -x /usr/bin/gconftool-2 ]; then +# Attempt to run GNOME Preferred Application Mail Client +if [ -x /usr/bin/gconftool-2 -a -x /usr/bin/gnome-default-applications-properties ]; then # Pull key from gconf, remove %s or "%s", trim leading & trailing spaces GCONF=$(gconftool-2 -g /desktop/gnome/url-handlers/mailto/command 2>/dev/null | sed -e 's/%s//; s/\"\"//; s/^\ *//; s/\ *$//') @@ -94,5 +92,34 @@ fi fi -# Fallback to hard coded default FC2 mail client if everything above failed -exec evolution +# Fallback to *any* mail client if all the above failed +# usually because gconf and GNOME are not installed +CLIENTS="thunderbird kmail evolution seamonkey sylpheed balsa" +for client in $CLIENTS; do + if exists "$client"; then + if [ "$client" = "seamonkey" ] && [ -z $1 ]; then + client="seamonkey -mail" + fi + if [ "$client" = "evolution" ]; then + client="evolution --component=mail" + fi + exec "$client" + fi +done + +# No graphical mail clients, try text-mode mail clients +# first find a terminal... +TERMINALS="gnome-terminal konsole urxvt rxvt aterm xterm" +for terminal in $TERMINALS; do + exists "$terminal" && break +done +# find a client... +CLIENTS="mutt cone pine elm gnus" +for client in $CLIENTS; do + if exists "$client"; then + exec $terminal -e $client + fi +done + +error_dialog "ERROR: No mail clients were found." +exit 1 From fedora-cvs-commits at redhat.com Fri May 18 18:00:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 18 May 2007 14:00:44 -0400 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2952,1.2953 Message-ID: <200705181800.l4II0iDI011840@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11819 Modified Files: kernel-2.6.spec Log Message: Add --with xenonly build option Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2952 retrieving revision 1.2953 diff -u -r1.2952 -r1.2953 --- kernel-2.6.spec 16 May 2007 21:50:26 -0000 1.2952 +++ kernel-2.6.spec 18 May 2007 18:00:41 -0000 1.2953 @@ -32,6 +32,8 @@ %define with_baseonly %{?_with_baseonly: 1} %{?!_with_baseonly: 0} # Only build the smp kernel (--with smponly): %define with_smponly %{?_with_smponly: 1} %{?!_with_smponly: 0} +# Only build the xen kernel (--with xenonly): +%define with_xenonly %{?_with_xenonly: 1} %{?!_with_xenonly: 0} # Whether to apply the Xen patches -- leave this enabled. %define includexen 1 @@ -89,6 +91,15 @@ %define with_debug 0 %endif +# if requested, only build xen kernel +%if %{with_xenonly} +%define with_up 0 +%define with_pae 0 +%define with_smp 0 +%define with_kdump 0 +%define with_debug 0 +%endif + # don't build xen or kdump kernels for OLPC %if 0%{?olpc} %define with_xen 0 From fedora-cvs-commits at redhat.com Mon May 21 08:47:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 04:47:13 -0400 Subject: rpms/SDL/FC-5 SDL.spec,1.39,1.40 Message-ID: <200705210847.l4L8lDGi003925@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/SDL/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3909 Modified Files: SDL.spec Log Message: [tw] - added missing libXt-devel (rhbz#240199) Index: SDL.spec =================================================================== RCS file: /cvs/dist/rpms/SDL/FC-5/SDL.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- SDL.spec 7 May 2007 14:51:01 -0000 1.39 +++ SDL.spec 21 May 2007 08:47:09 -0000 1.40 @@ -1,7 +1,7 @@ Summary: A cross-platform multimedia library. Name: SDL Version: 1.2.9 -Release: 6 +Release: 6.1 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz Patch0: SDL-1.1.7-byteorder.patch Patch13: SDL-1.2.7-ppc_modes.patch @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: nasm arts-devel audiofile-devel BuildRequires: esound-devel alsa-lib-devel -BuildRequires: libXext-devel libX11-devel +BuildRequires: libXext-devel libX11-devel libXt-devel BuildRequires: libGL-devel libGLU-devel %description @@ -105,6 +105,9 @@ %{_mandir}/man3/SDL*.3* %changelog +* Mon May 21 2007 Thomas Woerner 1.2.9-6.1 +- added missing libXt-devel (rhbz#240199) + * Mon May 7 2007 Thomas Woerner 1.2.9-6 - added missing (build) requires for GL and GLU From fedora-cvs-commits at redhat.com Mon May 21 15:49:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 11:49:10 -0400 Subject: rpms/samba/FC-6 samba-3.0.24-force_group_fix.patch, NONE, 1.1 samba-3.0.24-nmbd_segv.patch, NONE, 1.1 samba.spec, 1.77, 1.78 Message-ID: <200705211549.l4LFnA7B013107@cvs.devel.redhat.com> Author: ssorce Update of /cvs/dist/rpms/samba/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13062 Modified Files: samba.spec Added Files: samba-3.0.24-force_group_fix.patch samba-3.0.24-nmbd_segv.patch Log Message: Fix an nmbd segfault in some conditions Fix a problem introduced with one of the security patches, forcing groups broke in some configurations samba-3.0.24-force_group_fix.patch: uid.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) --- NEW FILE samba-3.0.24-force_group_fix.patch --- Author: jerry Revision: r22978 Modified: source/smbd/uid.c /branches/SAMBA_3_0_25/source/smbd/uid.c /branches/SAMBA_3_0_26/source/smbd/uid.c Added: Removed: Don't use current_user to prep the security ctx in change_to_user since any SID/uid/gid translation calls will reset the struct when popping the security ctx. This should fix the standalone server configuration issues reported by David Rankin (thanks for the logs). Index: source/smbd/uid.c =================================================================== --- source/smbd/uid.c (revision 22977) +++ source/smbd/uid.c (revision 22978) @@ -156,7 +156,9 @@ char group_c; BOOL must_free_token = False; NT_USER_TOKEN *token = NULL; - + int num_groups = 0; + gid_t *group_list = NULL; + if (!conn) { DEBUG(2,("change_to_user: Connection not open\n")); return(False); @@ -195,14 +197,14 @@ if (conn->force_user) /* security = share sets this too */ { uid = conn->uid; gid = conn->gid; - current_user.ut.groups = conn->groups; - current_user.ut.ngroups = conn->ngroups; + group_list = conn->groups; + num_groups = conn->ngroups; token = conn->nt_user_token; } else if (vuser) { uid = conn->admin_user ? 0 : vuser->uid; gid = vuser->gid; - current_user.ut.ngroups = vuser->n_groups; - current_user.ut.groups = vuser->groups; + num_groups = vuser->n_groups; + group_list = vuser->groups; token = vuser->nt_user_token; } else { DEBUG(2,("change_to_user: Invalid vuid used %d in accessing " @@ -235,8 +237,8 @@ */ int i; - for (i = 0; i < current_user.ut.ngroups; i++) { - if (current_user.ut.groups[i] == conn->gid) { + for (i = 0; i < num_groups; i++) { + if (group_list[i] == conn->gid) { gid = conn->gid; gid_to_sid(&token->user_sids[1], gid); break; @@ -248,6 +250,12 @@ } } + /* Now set current_user since we will immediately also call + set_sec_ctx() */ + + current_user.ut.ngroups = num_groups; + current_user.ut.groups = group_list; + set_sec_ctx(uid, gid, current_user.ut.ngroups, current_user.ut.groups, token); samba-3.0.24-nmbd_segv.patch: nmbd_subnetdb.c | 7 +++++++ 1 files changed, 7 insertions(+) --- NEW FILE samba-3.0.24-nmbd_segv.patch --- Index: branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c =================================================================== --- branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c (revision 22156) +++ branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c (revision 22157) @@ -223,6 +223,13 @@ return False; } + /* We must have at least one subnet. */ + if (subnetlist == NULL) { + DEBUG(0,("create_subnets: unable to create any subnet from " + "given interfaces. nmbd is terminating\n")); + return False; + } + if (lp_we_are_a_wins_server()) { /* Pick the first interface ip address as the WINS server ip. */ struct in_addr *nip = iface_n_ip(0); Index: samba.spec =================================================================== RCS file: /cvs/dist/rpms/samba/FC-6/samba.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- samba.spec 14 May 2007 14:34:44 -0000 1.77 +++ samba.spec 21 May 2007 15:49:07 -0000 1.78 @@ -3,7 +3,7 @@ Summary: The Samba SMB server. Name: samba Version: 3.0.24 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 License: GNU GPL Version 2 Group: System Environment/Daemons @@ -55,6 +55,8 @@ Patch122: samba-3.0.24-become_root.patch Patch123: samba-3.0.24-parse_validation.patch Patch124: samba-3.0.24-smbrun.patch +Patch125: samba-3.0.24-nmbd_segv.patch +Patch126: samba-3.0.24-force_group_fix.patch Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}-%{release} Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 @@ -148,6 +150,8 @@ %patch122 -p0 -b .become_root %patch123 -p0 -b .parse_validation %patch124 -p0 -b .smbrun +%patch125 -p2 -b .nmbd_segv +%patch126 -p0 -b .force_group # crap rm -f examples/VFS/.cvsignore From fedora-cvs-commits at redhat.com Mon May 21 15:49:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 11:49:30 -0400 Subject: rpms/samba/FC-5 samba-3.0.24-force_group_fix.patch, NONE, 1.1 samba-3.0.24-nmbd_segv.patch, NONE, 1.1 samba.spec, 1.75, 1.76 Message-ID: <200705211549.l4LFnU6Q013167@cvs.devel.redhat.com> Author: ssorce Update of /cvs/dist/rpms/samba/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv13130 Modified Files: samba.spec Added Files: samba-3.0.24-force_group_fix.patch samba-3.0.24-nmbd_segv.patch Log Message: Fix an nmbd segfault in some conditions Fix a problem introduced with one of the security patches, forcing groups broke in some configurations samba-3.0.24-force_group_fix.patch: uid.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) --- NEW FILE samba-3.0.24-force_group_fix.patch --- Author: jerry Revision: r22978 Modified: source/smbd/uid.c /branches/SAMBA_3_0_25/source/smbd/uid.c /branches/SAMBA_3_0_26/source/smbd/uid.c Added: Removed: Don't use current_user to prep the security ctx in change_to_user since any SID/uid/gid translation calls will reset the struct when popping the security ctx. This should fix the standalone server configuration issues reported by David Rankin (thanks for the logs). Index: source/smbd/uid.c =================================================================== --- source/smbd/uid.c (revision 22977) +++ source/smbd/uid.c (revision 22978) @@ -156,7 +156,9 @@ char group_c; BOOL must_free_token = False; NT_USER_TOKEN *token = NULL; - + int num_groups = 0; + gid_t *group_list = NULL; + if (!conn) { DEBUG(2,("change_to_user: Connection not open\n")); return(False); @@ -195,14 +197,14 @@ if (conn->force_user) /* security = share sets this too */ { uid = conn->uid; gid = conn->gid; - current_user.ut.groups = conn->groups; - current_user.ut.ngroups = conn->ngroups; + group_list = conn->groups; + num_groups = conn->ngroups; token = conn->nt_user_token; } else if (vuser) { uid = conn->admin_user ? 0 : vuser->uid; gid = vuser->gid; - current_user.ut.ngroups = vuser->n_groups; - current_user.ut.groups = vuser->groups; + num_groups = vuser->n_groups; + group_list = vuser->groups; token = vuser->nt_user_token; } else { DEBUG(2,("change_to_user: Invalid vuid used %d in accessing " @@ -235,8 +237,8 @@ */ int i; - for (i = 0; i < current_user.ut.ngroups; i++) { - if (current_user.ut.groups[i] == conn->gid) { + for (i = 0; i < num_groups; i++) { + if (group_list[i] == conn->gid) { gid = conn->gid; gid_to_sid(&token->user_sids[1], gid); break; @@ -248,6 +250,12 @@ } } + /* Now set current_user since we will immediately also call + set_sec_ctx() */ + + current_user.ut.ngroups = num_groups; + current_user.ut.groups = group_list; + set_sec_ctx(uid, gid, current_user.ut.ngroups, current_user.ut.groups, token); samba-3.0.24-nmbd_segv.patch: nmbd_subnetdb.c | 7 +++++++ 1 files changed, 7 insertions(+) --- NEW FILE samba-3.0.24-nmbd_segv.patch --- Index: branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c =================================================================== --- branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c (revision 22156) +++ branches/SAMBA_3_0/source/nmbd/nmbd_subnetdb.c (revision 22157) @@ -223,6 +223,13 @@ return False; } + /* We must have at least one subnet. */ + if (subnetlist == NULL) { + DEBUG(0,("create_subnets: unable to create any subnet from " + "given interfaces. nmbd is terminating\n")); + return False; + } + if (lp_we_are_a_wins_server()) { /* Pick the first interface ip address as the WINS server ip. */ struct in_addr *nip = iface_n_ip(0); Index: samba.spec =================================================================== RCS file: /cvs/dist/rpms/samba/FC-5/samba.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- samba.spec 14 May 2007 14:33:36 -0000 1.75 +++ samba.spec 21 May 2007 15:49:28 -0000 1.76 @@ -3,7 +3,7 @@ Summary: The Samba SMB server. Name: samba Version: 3.0.24 -Release: 5.fc5 +Release: 6.fc5 Epoch: 0 License: GNU GPL Version 2 Group: System Environment/Daemons @@ -54,6 +54,8 @@ Patch122: samba-3.0.24-become_root.patch Patch123: samba-3.0.24-parse_validation.patch Patch124: samba-3.0.24-smbrun.patch +Patch125: samba-3.0.24-nmbd_segv.patch +Patch126: samba-3.0.24-force_group_fix.patch Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}-%{release} Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 cups-libs >= 1:1.2.8-1 @@ -147,9 +149,9 @@ %patch122 -p0 -b .become_root %patch123 -p0 -b .parse_validation %patch124 -p0 -b .smbrun +%patch125 -p2 -b .nmbd_segv +%patch126 -p0 -b .force_group -# crap -rm -f examples/VFS/.cvsignore mv source/VERSION source/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION cd source From fedora-cvs-commits at redhat.com Mon May 21 15:56:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 11:56:42 -0400 Subject: rpms/openoffice.org/FC-6 workspace.dba22b.patch, NONE, 1.1 openoffice.org.spec, 1.944, 1.945 Message-ID: <200705211556.l4LFugjQ013572@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13554 Modified Files: openoffice.org.spec Added Files: workspace.dba22b.patch Log Message: Resolves: rhbz#240738 workspace.dba22b.patch workspace.dba22b.patch: DExport.cxx | 40 ++++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 22 deletions(-) --- NEW FILE workspace.dba22b.patch --- Index: source/ui/misc/DExport.cxx =================================================================== RCS file: /cvs/dba/dbaccess/source/ui/misc/DExport.cxx,v retrieving revision 1.36 retrieving revision 1.36.10.2 diff -u -r1.36 -r1.36.10.2 --- openoffice.org.orig/dbaccess/source/ui/misc/DExport.cxx 1 Dec 2006 17:31:38 -0000 1.36 +++ openoffice.org/source/ui/misc/DExport.cxx 3 Jan 2007 15:14:43 -0000 1.36.10.2 @@ -413,36 +413,32 @@ else { Reference xNumType(xSupplier->getNumberFormats(),UNO_QUERY); - - try - { - nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::DATETIME,m_aLocale),m_sTextToken); - } - catch(Exception&) + sal_Int16 nFormats[] = { NumberFormat::DATETIME + ,NumberFormat::DATETIME + ,NumberFormat::DATE + ,NumberFormat::TIME + ,NumberFormat::NUMBER + ,NumberFormat::LOGICAL + }; + for (size_t i = 0; i < sizeof(nFormats)/sizeof(nFormats[0]); ++i) { try { - nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::DATE,m_aLocale),m_sTextToken); + nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(nFormats[i],m_aLocale),m_sTextToken); + break; } catch(Exception&) { - try - { - nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::TIME,m_aLocale),m_sTextToken); - } - catch(Exception&) - { - try - { - nNumberFormat = m_xFormatter->detectNumberFormat(xNumType->getStandardFormat(NumberFormat::NUMBER,m_aLocale),m_sTextToken); - } - catch(Exception&) - { - } - } } } - fOutNumber = m_xFormatter->convertStringToNumber(nNumberFormat,m_sTextToken); + try + { + fOutNumber = m_xFormatter->convertStringToNumber(nNumberFormat,m_sTextToken); + } + catch(Exception&) + { + OSL_ENSURE(0,"Could not convert to number!"); + } } try { Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v retrieving revision 1.944 retrieving revision 1.945 diff -u -r1.944 -r1.945 --- openoffice.org.spec 27 Apr 2007 18:51:51 -0000 1.944 +++ openoffice.org.spec 21 May 2007 15:56:40 -0000 1.945 @@ -164,6 +164,7 @@ Patch96: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch Patch97: openoffice.org-cairoupdate.patch Patch98: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch +Patch99: workspace.dba22b.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -1062,6 +1063,7 @@ %patch96 -p1 -b .ooo75167.framework.workspacerestore.patch %patch97 -p1 -b .openoffice.org-cairoupdate.patch %patch98 -p1 -b .ooo76393.sal.dynamicsection.patch +%patch99 -p1 -b .workspace.dba22b.patch tar xzf %{SOURCE1} @@ -2591,6 +2593,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Mon May 21 2007 Caolan McNamara - 1:2.0.4-5.5.23 +- Resolves: rhbz#240738 workspace.dba22b.patch + * Tue Apr 17 2007 Caolan McNamara - 1:2.0.4-5.5.22 - Resolves: rhbz#236773 unbelieveably impress fails on using the file dialog From fedora-cvs-commits at redhat.com Mon May 21 16:11:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 12:11:39 -0400 Subject: rpms/cups/FC-6 cups-str2393.patch,NONE,1.1 cups.spec,1.330,1.331 Message-ID: <200705211611.l4LGBd3O014088@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14016 Modified Files: cups.spec Added Files: cups-str2393.patch Log Message: * Mon May 21 2007 Tim Waugh 1:1.2.10-7 - Fixed _cupsAdminSetServerSettings() sharing/shared handling (bug #238057). - Resolves: rhbz#238057 cups-str2393.patch: adminutil.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) --- NEW FILE cups-str2393.patch --- --- cups-1.2.10/cups/adminutil.c.adminutil 2007-05-21 16:39:00.000000000 +0100 +++ cups-1.2.10/cups/adminutil.c 2007-05-21 16:45:31.000000000 +0100 @@ -1260,14 +1260,21 @@ { if (!wrote_browsing) { + int new_remote_printers = (remote_printers > 0 || + (remote_printers == -1 && + old_remote_printers > 0)); + int new_share_printers = (share_printers > 0 || + (share_printers == -1 && + old_share_printers > 0)); + wrote_browsing = 1; - if (remote_printers > 0 || share_printers > 0) + if (new_remote_printers | new_share_printers) { - if (remote_printers > 0 && share_printers > 0) + if (new_remote_printers && new_share_printers) cupsFilePuts(temp, "# Enable printer sharing and shared printers.\n"); - else if (remote_printers > 0) + else if (new_remote_printers) cupsFilePuts(temp, "# Show shared printers on the local network.\n"); else @@ -1277,14 +1284,14 @@ cupsFilePuts(temp, "Browsing On\n"); cupsFilePuts(temp, "BrowseOrder allow,deny\n"); - if (remote_printers > 0) + if (new_remote_printers) { cupsFilePuts(temp, "# (Change '@LOCAL' to 'ALL' if using " "directed broadcasts from another subnet.)\n"); cupsFilePuts(temp, "BrowseAllow @LOCAL\n"); } - if (share_printers > 0) + if (new_share_printers) cupsFilePuts(temp, "BrowseAddress @LOCAL\n"); } else Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v retrieving revision 1.330 retrieving revision 1.331 diff -u -r1.330 -r1.331 --- cups.spec 9 May 2007 13:08:38 -0000 1.330 +++ cups.spec 21 May 2007 16:11:37 -0000 1.331 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2.10 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -50,6 +50,7 @@ Patch24: cups-str2109.patch Patch25: cups-usb-paperout.patch Patch26: cups-str2348.patch +Patch27: cups-str2393.patch Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ @@ -161,6 +162,7 @@ %patch24 -p1 -b .str2109 %patch25 -p1 -b .usb-paperout %patch26 -p1 -b .str2348 +%patch27 -p1 -b .str2393 %if %lspp %patch100 -p1 -b .lspp @@ -444,6 +446,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Mon May 21 2007 Tim Waugh 1:1.2.10-7 +- Fixed _cupsAdminSetServerSettings() sharing/shared handling (bug #238057). + * Wed May 9 2007 Tim Waugh 1:1.2.10-6 - Applied fix for rotated PDFs (bug #236753, STR #2348). From fedora-cvs-commits at redhat.com Mon May 21 18:15:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 14:15:23 -0400 Subject: rpms/net-tools/devel net-tools-1.60-selinux.patch,1.1,1.2 Message-ID: <200705211815.l4LIFNX3016656@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/net-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16638 Modified Files: net-tools-1.60-selinux.patch Log Message: Print SELinux context for tcp/udp/raw connections also net-tools-1.60-selinux.patch: Makefile | 6 +++++ netstat.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 74 insertions(+), 3 deletions(-) Index: net-tools-1.60-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools-1.60-selinux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-tools-1.60-selinux.patch 17 Jan 2006 10:27:02 -0000 1.1 +++ net-tools-1.60-selinux.patch 21 May 2007 18:15:21 -0000 1.2 @@ -203,3 +203,23 @@ case '?': case 'h': usage(); +--- net-tools-1.60/netstat.c.sel 2007-05-21 14:02:08.000000000 -0400 ++++ net-tools-1.60/netstat.c 2007-05-21 14:03:23.000000000 -0400 +@@ -769,6 +769,9 @@ static void finish_this_one(int uid, uns + } + if (flag_prg) + printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode)); ++ if (flag_selinux) ++ printf("%-" SELINUX_WIDTHs "s",prg_cache_get_con(inode)); ++ + if (flag_opt) + printf("%s", timers); + putchar('\n'); +@@ -2420,6 +2423,7 @@ int main + if (flag_exp > 1) + printf(_(" User Inode ")); + print_progname_banner(); ++ print_selinux_banner(); + if (flag_opt) + printf(_(" Timer")); /* xxx */ + printf("\n"); From fedora-cvs-commits at redhat.com Mon May 21 19:14:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 15:14:35 -0400 Subject: rpms/buildsys-macros/FC-5 buildsys-macros.spec,1.3,1.4 Message-ID: <200705211914.l4LJEZYw018155@cvs.devel.redhat.com> Author: tcallawa Update of /cvs/dist/rpms/buildsys-macros/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18129/FC-5 Modified Files: buildsys-macros.spec Log Message: Add fc helper macros for FC-5, FC-6 Index: buildsys-macros.spec =================================================================== RCS file: /cvs/dist/rpms/buildsys-macros/FC-5/buildsys-macros.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- buildsys-macros.spec 28 Jun 2006 17:35:18 -0000 1.3 +++ buildsys-macros.spec 21 May 2007 19:14:33 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Macros for the Fedora Buildsystem # The value for version should match the version of Fedora Core. Version: 5 -Release: 1.fc%{version} +Release: 2.fc%{version} License: GPL Group: Development/Buildsystem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,6 +21,7 @@ VERSION=%{version} printf %s%b "%" "fedora $VERSION\n" >> $RPM_BUILD_ROOT/etc/rpm/macros.disttag printf %s%b "%" "dist .fc$VERSION\n" >> $RPM_BUILD_ROOT/etc/rpm/macros.disttag +printf %s%b "%" "fc$VERSION 1\n" >> $RPM_BUILD_ROOT/etc/rpm/macros.disttag %clean rm -rf $RPM_BUILD_ROOT @@ -30,6 +31,9 @@ /etc/rpm/macros.disttag %changelog +* Mon May 21 2007 Tom "spot" Callaway -5-2.fc5 +- add fc helper macro + * Thu Jun 8 2006 Dennis Gregorovic - 5-1.fc5 - Update for Fedora Core 5 From fedora-cvs-commits at redhat.com Mon May 21 19:14:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 15:14:35 -0400 Subject: rpms/buildsys-macros/FC-6 buildsys-macros.spec,1.2,1.3 Message-ID: <200705211914.l4LJEZdP018163@cvs.devel.redhat.com> Author: tcallawa Update of /cvs/dist/rpms/buildsys-macros/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18129/FC-6 Modified Files: buildsys-macros.spec Log Message: Add fc helper macros for FC-5, FC-6 Index: buildsys-macros.spec =================================================================== RCS file: /cvs/dist/rpms/buildsys-macros/FC-6/buildsys-macros.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- buildsys-macros.spec 9 Jun 2006 00:48:33 -0000 1.2 +++ buildsys-macros.spec 21 May 2007 19:14:33 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Macros for the Fedora Buildsystem # The value for version should match the version of Fedora Core. Version: 6 -Release: 1.fc%{version} +Release: 2.fc%{version} License: GPL Group: Development/Buildsystem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,6 +21,7 @@ VERSION=%{version} printf %s%b "%" "fedora $VERSION\n" >> $RPM_BUILD_ROOT/etc/rpm/macros.disttag printf %s%b "%" "dist .fc$VERSION\n" >> $RPM_BUILD_ROOT/etc/rpm/macros.disttag +printf %s%b "%" "fc$VERSION 1\n" >> $RPM_BUILD_ROOT/etc/rpm/macros.disttag %clean rm -rf $RPM_BUILD_ROOT @@ -30,6 +31,9 @@ /etc/rpm/macros.disttag %changelog +* Mon May 21 2007 Tom "spot" Callaway - 6-2.fc6 +- Add fc helper macro + * Thu Jun 8 2006 Dennis Gregorovic - 6-1.fc6 - Update for Fedora Core 6 From fedora-cvs-commits at redhat.com Mon May 21 19:17:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 15:17:35 -0400 Subject: rpms/buildsys-macros/FC-5 buildsys-macros.spec,1.4,1.5 Message-ID: <200705211917.l4LJHZhr018265@cvs.devel.redhat.com> Author: tcallawa Update of /cvs/dist/rpms/buildsys-macros/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18250/FC-5 Modified Files: buildsys-macros.spec Log Message: Avoid weird tagging. Index: buildsys-macros.spec =================================================================== RCS file: /cvs/dist/rpms/buildsys-macros/FC-5/buildsys-macros.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- buildsys-macros.spec 21 May 2007 19:14:33 -0000 1.4 +++ buildsys-macros.spec 21 May 2007 19:17:33 -0000 1.5 @@ -2,7 +2,7 @@ Summary: Macros for the Fedora Buildsystem # The value for version should match the version of Fedora Core. Version: 5 -Release: 2.fc%{version} +Release: 3.fc%{version} License: GPL Group: Development/Buildsystem BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,7 @@ /etc/rpm/macros.disttag %changelog -* Mon May 21 2007 Tom "spot" Callaway -5-2.fc5 +* Mon May 21 2007 Tom "spot" Callaway - 5-3.fc5 - add fc helper macro * Thu Jun 8 2006 Dennis Gregorovic - 5-1.fc5 From fedora-cvs-commits at redhat.com Mon May 21 20:02:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 16:02:05 -0400 Subject: rpms/net-tools/devel net-tools.spec,1.85,1.86 Message-ID: <200705212002.l4LK25LN019073@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19059 Modified Files: net-tools.spec Log Message: - fix for SELinux issue by Dan Walsh Index: net-tools.spec =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- net-tools.spec 27 Mar 2007 07:33:10 -0000 1.85 +++ net-tools.spec 21 May 2007 20:02:03 -0000 1.86 @@ -3,7 +3,7 @@ Summary: Basic networking tools Name: net-tools Version: 1.60 -Release: 81%{?dist} +Release: 82%{?dist} License: GPL Group: System Environment/Base URL: http://www.tazenda.demon.co.uk/phil/net-tools/ @@ -261,6 +261,9 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Mon May 21 2007 Radek Vok??l - 1.60-82 +- fix for SELinux issue by Dan Walsh + * Tue Mar 27 2007 Radek Vok??l - 1.60-81 - fix segfault for empty interface (#234045) From fedora-cvs-commits at redhat.com Mon May 21 20:20:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 16:20:18 -0400 Subject: rpms/emacs/devel emacs.spec,1.95,1.96 Message-ID: <200705212020.l4LKKIge019484@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19469 Modified Files: emacs.spec Log Message: * Mon May 21 2007 Chip Coldwell - 22.0.990-1 - new pretest tarball from FSF - removed Ulrich Drepper's patch to prevent mmapped pages during dumping removed BuildRequires: glibc >= 2.5.90-22 (bug traced to glibc Resolves: bz239344) - fix alternatives removal scriptlet (Resolves: bz239745) * Thu May 17 2007 Chip Coldwell - 22.0.99-4 - format of freed blocks changed between glibc 2.5.90-21 and 2.5.90-22 - BuildRequires: glibc >= 2.5.90-22 (Ulrich Drepper) Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- emacs.spec 16 May 2007 18:34:20 -0000 1.95 +++ emacs.spec 21 May 2007 20:20:15 -0000 1.96 @@ -6,8 +6,8 @@ Summary: GNU Emacs text editor Name: emacs -Version: 22.0.99 -Release: 3%{?dist} +Version: 22.0.990 +Release: 1%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -30,7 +30,6 @@ Source16: po-mode-auto-replace-date-71264.patch Source20: igrep.el Source21: igrep-init.el -Patch0: emacs-mmap.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel @@ -104,8 +103,6 @@ rm -f lisp/play/tetris.el %endif -%patch0 -p1 -z .mmap - # install rest of site-lisp files ( cd site-lisp cp %SOURCE2 %SOURCE4 %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 . @@ -184,16 +181,24 @@ %define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman %post -alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 +if [ $1 -ge 1 ] ; then + alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 +fi %preun -alternatives --remove emacs %{_bindir}/emacs-%{version} +if [ $1 -eq 0 ] ; then + alternatives --remove emacs %{_bindir}/emacs-%{version} +fi %post nox -alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70 +if [ $1 -ge 1 ] ; then + alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70 +fi %preun nox -alternatives --remove emacs %{_bindir}/emacs-%{version}-nox +if [ $1 -eq 0 ] ; then + alternatives --remove emacs %{_bindir}/emacs-%{version}-nox +fi %post common for f in %{info_files}; do @@ -243,13 +248,23 @@ %dir %{_datadir}/emacs/%{version} %changelog +* Mon May 21 2007 Chip Coldwell - 22.0.990-1 +- new pretest tarball from FSF +- removed Ulrich Drepper's patch to prevent mmapped pages during dumping + removed BuildRequires: glibc >= 2.5.90-22 + (bug traced to glibc Resolves: bz239344) +- fix alternatives removal scriptlet (Resolves: bz239745) + +* Thu May 17 2007 Chip Coldwell - 22.0.99-4 +- format of freed blocks changed between glibc 2.5.90-21 and 2.5.90-22 +- BuildRequires: glibc >= 2.5.90-22 (Ulrich Drepper) + * Sun May 13 2007 Chip Coldwell - 22.0.99-2 -- prevent mmapped pages during dumping (Ulrich Drepper) -- Resolves: bz239344 +- prevent mmapped pages during dumping (Ulrich Drepper Resolves: bz239344) * Tue Apr 24 2007 Chip Coldwell - 22.0.99-1 - new (last?) pretest tarball from FSF -- update to php-mode-1.2.0 (Ville Skytt?? #235941) +- update to php-mode-1.2.0 (Ville Skytt?? Resolves: bz235941) - use /etc/alternatives instead of wrapper script * Tue Mar 6 2007 Chip Coldwell - 22.0.95-1 From fedora-cvs-commits at redhat.com Mon May 21 23:17:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 21 May 2007 19:17:20 -0400 Subject: rpms/kernel/FC-5 linux-2.6-20.12b-input_i8042_fix_aux_port_detection_with_some_chips.patch, NONE, 1.1 kernel-2.6.spec, 1.2318, 1.2319 Message-ID: <200705212317.l4LNHKh3023963@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv23947 Modified Files: kernel-2.6.spec Added Files: linux-2.6-20.12b-input_i8042_fix_aux_port_detection_with_some_chips.patch Log Message: * Mon May 21 2007 Chuck Ebbert 1.2319 - Fix i8042 mouse port detection for some chipsets linux-2.6-20.12b-input_i8042_fix_aux_port_detection_with_some_chips.patch: i8042.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-20.12b-input_i8042_fix_aux_port_detection_with_some_chips.patch --- From: Roland Scheidegger Date: Tue, 8 May 2007 05:31:40 +0000 (-0400) Subject: Input: i8042 - fix AUX port detection with some chips X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdtor%2Finput.git;a=commitdiff_plain;h=d2ada5597d33a9108acb2caf912f85cbc9caab1e Input: i8042 - fix AUX port detection with some chips The i8042 driver fails detection of the AUX port with some chips, because they apparently do not change the I8042_CTR_AUXDIS bit immediately. This is known to affect at least HP500/HP510 notebooks, consequently the built-in touchpad will not work. The patch will simply reread the value until it gets the expected value or a retry limit is hit, without touching other workaround code in the same area. Signed-off-by: Roland Scheidegger Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 7c17377..3888dc3 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -526,6 +526,33 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id) return IRQ_HANDLED; } +/* + * i8042_toggle_aux - enables or disables AUX port on i8042 via command and + * verifies success by readinng CTR. Used when testing for presence of AUX + * port. + */ +static int __devinit i8042_toggle_aux(int on) +{ + unsigned char param; + int i; + + if (i8042_command(¶m, + on ? I8042_CMD_AUX_ENABLE : I8042_CMD_AUX_DISABLE)) + return -1; + + /* some chips need some time to set the I8042_CTR_AUXDIS bit */ + for (i = 0; i < 100; i++) { + udelay(50); + + if (i8042_command(¶m, I8042_CMD_CTL_RCTR)) + return -1; + + if (!(param & I8042_CTR_AUXDIS) == on) + return 0; + } + + return -1; +} /* * i8042_check_aux() applies as much paranoia as it can at detecting @@ -580,16 +607,12 @@ static int __devinit i8042_check_aux(void) * Bit assignment test - filters out PS/2 i8042's in AT mode */ - if (i8042_command(¶m, I8042_CMD_AUX_DISABLE)) - return -1; - if (i8042_command(¶m, I8042_CMD_CTL_RCTR) || (~param & I8042_CTR_AUXDIS)) { + if (i8042_toggle_aux(0)) { printk(KERN_WARNING "Failed to disable AUX port, but continuing anyway... Is this a SiS?\n"); printk(KERN_WARNING "If AUX port is really absent please use the 'i8042.noaux' option.\n"); } - if (i8042_command(¶m, I8042_CMD_AUX_ENABLE)) - return -1; - if (i8042_command(¶m, I8042_CMD_CTL_RCTR) || (param & I8042_CTR_AUXDIS)) + if (i8042_toggle_aux(1)) return -1; /* Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2318 retrieving revision 1.2319 diff -u -r1.2318 -r1.2319 --- kernel-2.6.spec 21 May 2007 22:12:27 -0000 1.2318 +++ kernel-2.6.spec 21 May 2007 23:17:17 -0000 1.2319 @@ -480,6 +480,8 @@ Patch1836: linux-2.6-20.8n-ppp_fix_skb_under_panic.patch Patch1837: linux-2.6-page_is_ram.patch +Patch1841: linux-2.6-20.12b-input_i8042_fix_aux_port_detection_with_some_chips.patch + # SELinux/audit patches. Patch1890: linux-2.6-selinux-mprotect-checks.patch @@ -1132,6 +1134,8 @@ %patch1836 -p1 %patch1837 -p1 +%patch1841 -p1 + # Fix the SELinux mprotect checks on executable mappings %patch1890 -p1 @@ -1921,6 +1925,9 @@ %endif %changelog +* Mon May 21 2007 Chuck Ebbert 1.2319 +- Fix i8042 mouse port detection for some chipsets + * Mon May 21 2007 Eduardo Habkost 1.2318 - Xen kernel: added patch from Stephen C. Tweedie. Fix crashes and hangs, by making critical_fixup_table correct. Fixes bug #235188 From fedora-cvs-commits at redhat.com Tue May 22 09:44:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 May 2007 05:44:07 -0400 Subject: rpms/openldap/FC-6 ldap.init,1.20,1.21 openldap.spec,1.69,1.70 Message-ID: <200705220944.l4M9i7PL005154@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/openldap/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5139 Modified Files: ldap.init openldap.spec Log Message: do not create script in /tmp on startup Resolves: #188298 Index: ldap.init =================================================================== RCS file: /cvs/dist/rpms/openldap/FC-6/ldap.init,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ldap.init 28 Nov 2006 22:08:59 -0000 1.20 +++ ldap.init 22 May 2007 09:44:05 -0000 1.21 @@ -139,10 +139,6 @@ # Define a couple of local variables which we'll need. Maybe. user=ldap prog=`basename ${slapd}` - # Build a wrapper script to exec slapd with the right arguments, to - # avoid being tripped out by changes or weirdness in how daemon() - # handles quoted arguments. - wrapper=`mktemp ${TMP:-/tmp}/start-slapd.XXXXXX` harg="ldap:///" if grep -q ^TLS /etc/openldap/slapd.conf || test x$SLAPD_LDAPS = xyes ; then harg="$harg ldaps:///" @@ -150,17 +146,9 @@ if test x$SLAPD_LDAPI = xyes ; then harg="$harg ldapi:///" fi - if test -z "$wrapper" ; then - return 1 - fi - cat >> $wrapper <<- EOF - exec ${slapd} -h "$harg" -u ${user} $OPTIONS $SLAPD_OPTIONS - EOF - chmod u+x $wrapper - trap "rm -f $wrapper" EXIT # Start daemons. echo -n $"Starting $prog: " - daemon --check=$prog $wrapper + daemon --check=$prog ${slapd} -h "\"$harg\"" -u ${user} $OPTIONS $SLAPD_OPTIONS RETVAL=$? echo if [ $RETVAL -eq 0 ]; then Index: openldap.spec =================================================================== RCS file: /cvs/dist/rpms/openldap/FC-6/openldap.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- openldap.spec 16 May 2007 07:45:43 -0000 1.69 +++ openldap.spec 22 May 2007 09:44:05 -0000 1.70 @@ -724,6 +724,7 @@ %changelog * Wed May 16 2007 Jan Safranek 2.3.30-3%{?dist} - add ldconfig to devel post/postun (bz#240253) +- do not create script in /tmp on startup (bz#188298) * Mon Apr 23 2007 Jan Safranek 2.3.30-2%{?dist} - Finally fix the upgrade logic, so that upgrades from 2.3.30 to newer From fedora-cvs-commits at redhat.com Tue May 22 09:44:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 May 2007 05:44:50 -0400 Subject: rpms/openoffice.org/FC-6 workspace.cmcfixes34.patch, NONE, 1.1 openoffice.org.spec, 1.945, 1.946 Message-ID: <200705220944.l4M9ioLn005196@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5174 Modified Files: openoffice.org.spec Added Files: workspace.cmcfixes34.patch Log Message: workspace.cmcfixes34.patch workspace.cmcfixes34.patch: source/ui/app/apphdl.cxx | 0 source/ui/dbui/dbmgr.cxx | 0 source/ui/shells/drformsh.cxx | 0 source/ui/uiview/view2.cxx | 0 source/ui/uno/unodispatch.cxx | 0 source/ui/utlui/content.cxx | 0 source/ui/utlui/glbltree.cxx | 0 sw/source/ui/app/apphdl.cxx | 2 +- sw/source/ui/dbui/dbmgr.cxx | 2 +- sw/source/ui/shells/drformsh.cxx | 2 +- sw/source/ui/uiview/view2.cxx | 4 ++-- sw/source/ui/uno/unodispatch.cxx | 2 +- sw/source/ui/utlui/content.cxx | 2 +- sw/source/ui/utlui/glbltree.cxx | 2 +- 14 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE workspace.cmcfixes34.patch --- Index: source/ui/app/apphdl.cxx =================================================================== RCS file: /cvs/sw/sw/source/ui/app/apphdl.cxx,v retrieving revision 1.64 diff -u -r1.64 apphdl.cxx --- openoffice.org.orig/sw/source/ui/app/apphdl.cxx 4 Apr 2007 15:16:15 -0000 1.64 +++ openofficeorg/sw/source/ui/app/apphdl.cxx 22 May 2007 09:11:21 -0000 @@ -369,7 +369,7 @@ SfxStringItem aReferer(SID_REFERER, pView->GetDocShell()->GetTitle()); SfxObjectItem* pItem = (SfxObjectItem*)pView->GetViewFrame()->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_SYNCHRON, - &aURL, &aHidden, &aReferer, &aTargetFrameName, 0); + &aURL, &aHidden, &aReferer, &aTargetFrameName, 0L); SfxShell* pShell = pItem ? pItem->GetShell() : 0; if(pShell) Index: source/ui/dbui/dbmgr.cxx =================================================================== RCS file: /cvs/sw/sw/source/ui/dbui/dbmgr.cxx,v retrieving revision 1.118 diff -u -r1.118 dbmgr.cxx --- openoffice.org.orig/sw/source/ui/dbui/dbmgr.cxx 26 Apr 2007 09:02:02 -0000 1.118 +++ openoffice.org/sw/source/ui/dbui/dbmgr.cxx 22 May 2007 09:11:24 -0000 @@ -3288,7 +3288,7 @@ SfxStringItem aURL( SID_FILE_NAME, sSourceDocURL ); const SfxPoolItem* pReturnValue = rSourceView.GetViewFrame()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, - &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0); + &aURL, &aFilterName, &aHidden, &aReferer, &aTarget, 0L); if(pReturnValue) { SfxViewFrameItem* pVItem = (SfxViewFrameItem*)pReturnValue; Index: source/ui/shells/drformsh.cxx =================================================================== RCS file: /cvs/sw/sw/source/ui/shells/drformsh.cxx,v retrieving revision 1.13 diff -u -r1.13 drformsh.cxx --- openoffice.org.orig/sw/source/ui/shells/drformsh.cxx 16 Sep 2006 23:13:47 -0000 1.13 +++ openoffice.org/sw/source/ui/shells/drformsh.cxx 22 May 2007 09:11:33 -0000 @@ -156,7 +156,7 @@ rView.StopShellTimer(); //issue a new command to insert the link rView.GetViewFrame()->GetDispatcher()->Execute( - SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON, &rHLinkItem, 0); + SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON, &rHLinkItem, 0L); } else { Index: source/ui/uiview/view2.cxx =================================================================== RCS file: /cvs/sw/sw/source/ui/uiview/view2.cxx,v retrieving revision 1.72 diff -u -r1.72 view2.cxx --- openoffice.org.orig/sw/source/ui/uiview/view2.cxx 10 May 2007 16:25:57 -0000 1.72 +++ openoffice.org/sw/source/ui/uiview/view2.cxx 22 May 2007 09:11:36 -0000 @@ -1264,7 +1264,7 @@ { SfxAllEnumItem aEnumItem(SID_OBJECT_ALIGN, nAlias - SID_OBJECT_ALIGN_LEFT); GetViewFrame()->GetDispatcher()->Execute( - SID_OBJECT_ALIGN, SFX_CALLMODE_ASYNCHRON, &aEnumItem, 0); + SID_OBJECT_ALIGN, SFX_CALLMODE_ASYNCHRON, &aEnumItem, 0L); } else if(nAlias) //these slots are either re-mapped to text or object alignment @@ -2277,7 +2277,7 @@ //then show the "Data base only" field dialog SfxBoolItem aOn(FN_INSERT_FIELD_DATA_ONLY, TRUE); pVFrame->GetDispatcher()->Execute(FN_INSERT_FIELD_DATA_ONLY, - SFX_CALLMODE_SYNCHRON, &aOn, 0); + SFX_CALLMODE_SYNCHRON, &aOn, 0L); return; } else Index: source/ui/uno/unodispatch.cxx =================================================================== RCS file: /cvs/sw/sw/source/ui/uno/unodispatch.cxx,v retrieving revision 1.19 diff -u -r1.19 unodispatch.cxx --- openoffice.org.orig/sw/source/ui/uno/unodispatch.cxx 16 Sep 2006 23:29:51 -0000 1.19 +++ openoffice.org/sw/source/ui/uno/unodispatch.cxx 22 May 2007 09:11:37 -0000 @@ -292,7 +292,7 @@ m_pView->GetViewFrame()->GetDispatcher()->Execute( FN_MAILMERGE_WIZARD, SFX_CALLMODE_ASYNCHRON, - &aDBProperties, 0); + &aDBProperties, 0L); // pNewDBMgr->ExecuteFormLetter(rSh, aArgs); } else if(!aURL.Complete.compareToAscii(cURLDocumentDataSource)) Index: source/ui/utlui/content.cxx =================================================================== RCS file: /cvs/sw/sw/source/ui/utlui/content.cxx,v retrieving revision 1.45 diff -u -r1.45 content.cxx --- openoffice.org.orig/sw/source/ui/utlui/content.cxx 26 Apr 2007 09:22:48 -0000 1.45 +++ openoffice.org/sw/source/ui/utlui/content.cxx 22 May 2007 09:11:39 -0000 @@ -2934,7 +2934,7 @@ SwPtrItem aPtrItem( FN_INSERT_MULTI_TOX, (void*)pBase); pActiveShell->GetView().GetViewFrame()-> GetDispatcher()->Execute(FN_INSERT_MULTI_TOX, - SFX_CALLMODE_ASYNCHRON, &aPtrItem, 0); + SFX_CALLMODE_ASYNCHRON, &aPtrItem, 0L); } break; Index: source/ui/utlui/glbltree.cxx =================================================================== RCS file: /cvs/sw/sw/source/ui/utlui/glbltree.cxx,v retrieving revision 1.35 diff -u -r1.35 glbltree.cxx --- openoffice.org.orig/sw/source/ui/utlui/glbltree.cxx 26 Apr 2007 09:23:00 -0000 1.35 +++ openoffice.org/sw/source/ui/utlui/glbltree.cxx 22 May 2007 09:11:39 -0000 @@ -1373,7 +1373,7 @@ SfxStringItem aReferer(SID_REFERER, pActiveShell->GetView().GetDocShell()->GetTitle()); pActiveShell->GetView().GetViewFrame()->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, - &aURL, &aReadOnly, &aReferer, &aTargetFrameName, 0); + &aURL, &aReadOnly, &aReferer, &aTargetFrameName, 0L); } } Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v retrieving revision 1.945 retrieving revision 1.946 diff -u -r1.945 -r1.946 --- openoffice.org.spec 21 May 2007 15:56:40 -0000 1.945 +++ openoffice.org.spec 22 May 2007 09:44:48 -0000 1.946 @@ -165,6 +165,7 @@ Patch97: openoffice.org-cairoupdate.patch Patch98: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch Patch99: workspace.dba22b.patch +Patch100: workspace.cmcfixes34.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -1064,6 +1065,7 @@ %patch97 -p1 -b .openoffice.org-cairoupdate.patch %patch98 -p1 -b .ooo76393.sal.dynamicsection.patch %patch99 -p1 -b .workspace.dba22b.patch +%patch100 -p1 -b .workspace.cmcfixes34.patch tar xzf %{SOURCE1} @@ -2595,6 +2597,8 @@ %changelog * Mon May 21 2007 Caolan McNamara - 1:2.0.4-5.5.23 - Resolves: rhbz#240738 workspace.dba22b.patch +- add workspace.cmcfixes34.patch for int(0) not being promoted to long + NULL in ellipsed methods * Tue Apr 17 2007 Caolan McNamara - 1:2.0.4-5.5.22 - Resolves: rhbz#236773 unbelieveably impress fails on using the file dialog From fedora-cvs-commits at redhat.com Tue May 22 10:18:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 May 2007 06:18:13 -0400 Subject: rpms/openldap/FC-6 ldap.init,1.21,1.22 openldap.spec,1.70,1.71 Message-ID: <200705221018.l4MAIDQV005682@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/openldap/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5666 Modified Files: ldap.init openldap.spec Log Message: start slupd for each replicated database Resolves: #210155 Index: ldap.init =================================================================== RCS file: /cvs/dist/rpms/openldap/FC-6/ldap.init,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ldap.init 22 May 2007 09:44:05 -0000 1.21 +++ ldap.init 22 May 2007 10:18:10 -0000 1.22 @@ -155,7 +155,15 @@ if grep -q "^replogfile" /etc/openldap/slapd.conf; then prog=`basename ${slurpd}` echo -n $"Starting $prog: " - daemon ${slurpd} $OPTIONS $SLURPD_OPTIONS + i=1; + for replogfile in `grep "^replogfile" /etc/openldap/slapd.conf` + do + if [ "$replogfile" != "replogfile" ] + then + daemon ${slurpd} -r $replogfile -n $i + i=$[i+1] + fi + done RETVAL=$? echo fi Index: openldap.spec =================================================================== RCS file: /cvs/dist/rpms/openldap/FC-6/openldap.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- openldap.spec 22 May 2007 09:44:05 -0000 1.70 +++ openldap.spec 22 May 2007 10:18:11 -0000 1.71 @@ -725,6 +725,7 @@ * Wed May 16 2007 Jan Safranek 2.3.30-3%{?dist} - add ldconfig to devel post/postun (bz#240253) - do not create script in /tmp on startup (bz#188298) +- start slupd for each replicated database (bz#210155) * Mon Apr 23 2007 Jan Safranek 2.3.30-2%{?dist} - Finally fix the upgrade logic, so that upgrades from 2.3.30 to newer From fedora-cvs-commits at redhat.com Tue May 22 11:10:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 May 2007 07:10:52 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils.spec, 1.129, 1.130 nfs.sysconfig, 1.1, 1.2 Message-ID: <200705221110.l4MBAq8K006435@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv6420 Modified Files: nfs-utils.spec nfs.sysconfig Log Message: Stopped /etc/sysconfig/nfs from being overwritten on updates (bz 234543 Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- nfs-utils.spec 16 May 2007 17:03:10 -0000 1.129 +++ nfs-utils.spec 22 May 2007 11:10:44 -0000 1.130 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.10 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 # group all 32bit related archs @@ -285,7 +285,7 @@ %config /etc/rc.d/init.d/rpcidmapd %config /etc/rc.d/init.d/rpcgssd %config /etc/rc.d/init.d/rpcsvcgssd -%config /etc/sysconfig/nfs +%config(noreplace) /etc/sysconfig/nfs %config(noreplace) /etc/idmapd.conf %dir /var/lib/nfs/v4recovery %dir /var/lib/nfs/rpc_pipefs @@ -321,6 +321,9 @@ %endif %changelog +* Tue May 22 2007 Steve Dickson 1.0.10-12 +- Stopped /etc/sysconfig/nfs from being overwritten on updates (bz 234543) + * Wed May 16 2007 Steve Dickson 1.0.10-11 - Make sure the condrestarts exit with a zero value (240225) Index: nfs.sysconfig =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nfs.sysconfig 11 May 2007 21:51:33 -0000 1.1 +++ nfs.sysconfig 22 May 2007 11:10:44 -0000 1.2 @@ -49,7 +49,7 @@ #RPCIDMAPDARGS="" # # Set to turn on Secure NFS mounts. -#SECURE_NFS="" +#SECURE_NFS="yes" # Optional arguments passed to rpc.gssd. See rpc.gssd(8) #RPCGSSDARGS="" # Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8) From fedora-cvs-commits at redhat.com Tue May 22 11:18:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 May 2007 07:18:08 -0400 Subject: rpms/nfs-utils/FC-6 nfs.sysconfig,1.2,1.3 Message-ID: <200705221118.l4MBI8O9006659@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv6609 Modified Files: nfs.sysconfig Log Message: Fixed typo in nfs.sysconfig Index: nfs.sysconfig =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs.sysconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nfs.sysconfig 22 May 2007 11:10:44 -0000 1.2 +++ nfs.sysconfig 22 May 2007 11:18:06 -0000 1.3 @@ -10,7 +10,7 @@ # Path to remote quota server. See rquotad(8) #RQUOTAD="/usr/sbin/rpc.rquotad" # Port rquotad should listen on. -#RQUOTAD_PORT="875" +#RQUOTAD_PORT=875 # Optinal options passed to rquotad #RPCRQUOTADOPTS="" # From fedora-cvs-commits at redhat.com Tue May 22 13:25:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 May 2007 09:25:35 -0400 Subject: rpms/net-tools/FC-6 net-tools-1.60-selinux.patch, 1.1, 1.2 net-tools.spec, 1.78, 1.79 Message-ID: <200705221325.l4MDPZoL008520@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-tools/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8504 Modified Files: net-tools-1.60-selinux.patch net-tools.spec Log Message: updated SELinux patch net-tools-1.60-selinux.patch: Makefile | 6 +++++ netstat.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 74 insertions(+), 3 deletions(-) Index: net-tools-1.60-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/net-tools/FC-6/net-tools-1.60-selinux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-tools-1.60-selinux.patch 17 Jan 2006 10:27:02 -0000 1.1 +++ net-tools-1.60-selinux.patch 22 May 2007 13:25:33 -0000 1.2 @@ -203,3 +203,23 @@ case '?': case 'h': usage(); +--- net-tools-1.60/netstat.c.sel 2007-05-21 14:02:08.000000000 -0400 ++++ net-tools-1.60/netstat.c 2007-05-21 14:03:23.000000000 -0400 +@@ -769,6 +769,9 @@ static void finish_this_one(int uid, uns + } + if (flag_prg) + printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode)); ++ if (flag_selinux) ++ printf("%-" SELINUX_WIDTHs "s",prg_cache_get_con(inode)); ++ + if (flag_opt) + printf("%s", timers); + putchar('\n'); +@@ -2420,6 +2423,7 @@ int main + if (flag_exp > 1) + printf(_(" User Inode ")); + print_progname_banner(); ++ print_selinux_banner(); + if (flag_opt) + printf(_(" Timer")); /* xxx */ + printf("\n"); Index: net-tools.spec =================================================================== RCS file: /cvs/dist/rpms/net-tools/FC-6/net-tools.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- net-tools.spec 4 Oct 2006 07:12:51 -0000 1.78 +++ net-tools.spec 22 May 2007 13:25:33 -0000 1.79 @@ -3,7 +3,7 @@ Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 75%{?dist} +Release: 76%{?dist} License: GPL Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 @@ -248,6 +248,9 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Tue May 22 2007 Radek Vok??l - 1.60-76 +- updated SELinux patch by + * Wed Oct 4 2006 Radek Vokal - 1.60-75 - fix nameif crash for 16char long interface names (#209120) From fedora-cvs-commits at redhat.com Tue May 22 14:05:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 May 2007 10:05:19 -0400 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.45, 1.46 selinux-policy.spec, 1.366, 1.367 Message-ID: <200705221405.l4ME5J79009276@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9259 Modified Files: policy-20061106.patch selinux-policy.spec Log Message: * Tue May 22 2007 Dan Walsh 2.4.6-72 - Allow prelink sys_resource, Add transition rule to allow apps to run java in different context policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 94 +++- policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 6 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 57 ++ policy/modules/admin/amtu.te | 56 ++ policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 24 - policy/modules/admin/kudzu.te | 14 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 14 policy/modules/admin/netutils.te | 19 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 20 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 86 +++ policy/modules/admin/rpm.te | 49 -- policy/modules/admin/su.if | 38 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 13 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 58 ++ policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 ++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 70 +++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 39 - policy/modules/apps/mozilla.if | 208 +++++++-- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 6 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 20 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 29 + policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 140 ++++++ policy/modules/kernel/corenetwork.te.in | 14 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 ++ policy/modules/kernel/domain.te | 22 policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 224 +++++++++ policy/modules/kernel/filesystem.if | 62 ++ policy/modules/kernel/filesystem.te | 30 + policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 22 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 21 policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 3 policy/modules/services/aide.te | 11 policy/modules/services/amavis.if | 19 policy/modules/services/amavis.te | 3 policy/modules/services/apache.fc | 17 policy/modules/services/apache.if | 157 ++++++ policy/modules/services/apache.te | 43 + policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 40 + policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 6 policy/modules/services/bluetooth.te | 10 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 11 policy/modules/services/clamav.te | 3 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++- policy/modules/services/cron.te | 58 ++ policy/modules/services/cups.fc | 4 policy/modules/services/cups.te | 19 policy/modules/services/cvs.te | 2 policy/modules/services/cyrus.te | 5 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 66 ++ policy/modules/services/dbus.te | 4 policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/dovecot.fc | 1 policy/modules/services/dovecot.if | 44 + policy/modules/services/dovecot.te | 56 ++ policy/modules/services/fail2ban.fc | 3 policy/modules/services/fail2ban.if | 80 +++ policy/modules/services/fail2ban.te | 74 +++ policy/modules/services/ftp.te | 21 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 114 ++++ policy/modules/services/hal.te | 26 - policy/modules/services/inetd.te | 28 - policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 25 + policy/modules/services/kerberos.te | 15 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 57 +- policy/modules/services/lpd.te | 5 policy/modules/services/mailman.if | 20 policy/modules/services/mailman.te | 1 policy/modules/services/mta.fc | 1 policy/modules/services/mta.if | 20 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 34 + policy/modules/services/nscd.if | 20 policy/modules/services/nscd.te | 28 - policy/modules/services/ntp.te | 1 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 5 policy/modules/services/openca.if | 4 policy/modules/services/openca.te | 2 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 ++ policy/modules/services/pcscd.te | 79 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 11 policy/modules/services/portmap.te | 5 policy/modules/services/portslave.te | 1 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 22 policy/modules/services/postfix.te | 48 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 29 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 2 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 22 policy/modules/services/rlogin.te | 11 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.if | 3 policy/modules/services/rpc.te | 27 - policy/modules/services/rshd.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.fc | 6 policy/modules/services/samba.if | 62 ++ policy/modules/services/samba.te | 68 ++ policy/modules/services/sasl.te | 13 policy/modules/services/sendmail.if | 22 policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 17 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 24 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 21 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 14 policy/modules/services/telnet.te | 3 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 ++ policy/modules/services/uucp.te | 44 + policy/modules/services/uwimap.te | 1 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 190 ++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 180 +++++++ policy/modules/system/authlogin.te | 41 + policy/modules/system/clock.te | 18 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 policy/modules/system/init.if | 64 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 121 +++++ policy/modules/system/iptables.te | 23 policy/modules/system/libraries.fc | 43 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 11 policy/modules/system/logging.fc | 5 policy/modules/system/logging.if | 61 ++ policy/modules/system/logging.te | 33 + policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 + policy/modules/system/lvm.te | 87 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 +++ policy/modules/system/modutils.te | 26 - policy/modules/system/mount.te | 27 - policy/modules/system/netlabel.te | 10 policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 16 policy/modules/system/selinuxutil.fc | 10 policy/modules/system/selinuxutil.if | 122 +++++ policy/modules/system/selinuxutil.te | 134 ++--- policy/modules/system/sysnetwork.te | 13 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 policy/modules/system/unconfined.te | 23 policy/modules/system/userdomain.if | 622 +++++++++++++++++++++++---- policy/modules/system/userdomain.te | 105 ++-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 53 ++ policy/support/*Warnings* | 189 ++++++++ policy/support/file_patterns.spt | 534 +++++++++++++++++++++++ policy/support/obj_perm_sets.spt | 144 ++++++ 254 files changed, 7423 insertions(+), 723 deletions(-) Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- policy-20061106.patch 17 May 2007 18:13:30 -0000 1.45 +++ policy-20061106.patch 22 May 2007 14:05:17 -0000 1.46 @@ -859,8 +859,8 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.4.6/policy/modules/admin/prelink.te --- nsaserefpolicy/policy/modules/admin/prelink.te 2006-11-29 12:04:49.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/prelink.te 2007-05-15 11:51:26.000000000 -0400 -@@ -18,6 +18,9 @@ ++++ serefpolicy-2.4.6/policy/modules/admin/prelink.te 2007-05-21 11:38:21.000000000 -0400 +@@ -18,24 +18,33 @@ type prelink_log_t; logging_log_file(prelink_log_t) @@ -870,7 +870,13 @@ ######################################## # # Local policy -@@ -30,12 +33,18 @@ + # + +-allow prelink_t self:capability { chown dac_override fowner fsetid }; ++allow prelink_t self:capability { chown dac_override fowner fsetid sys_resource }; + allow prelink_t self:process { execheap execmem execstack signal }; + allow prelink_t self:fifo_file rw_file_perms; + allow prelink_t prelink_cache_t:file manage_file_perms; files_etc_filetrans(prelink_t, prelink_cache_t, file) files_var_lib_filetrans(prelink_t, prelink_cache_t, file) @@ -2065,14 +2071,46 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.4.6/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 2006-11-29 12:04:49.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/apps/java.if 2007-05-15 11:51:26.000000000 -0400 -@@ -199,3 +199,41 @@ ++++ serefpolicy-2.4.6/policy/modules/apps/java.if 2007-05-21 10:45:52.000000000 -0400 +@@ -199,3 +199,73 @@ refpolicywarn(`$0($1) has no effect in strict policy.') ') ') + +######################################## +## ++## Execute a java in the specified domain ++## ++## ++##

++## Execute the java command in the specified domain. This allows ++## the specified domain to execute any file ++## on these filesystems in the specified ++## domain. ++##

++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The type of the new process. ++## ++## ++# ++interface(`java_spec_domtrans',` ++ gen_require(` ++ type java_exec_t; ++ ') ++ ++ domain_trans($1,java_exec_t,$2) ++ type_transition $1 java_exec_t:process $2; ++') ++ ++######################################## ++## +## Run java in javaplugin domain. +## +## @@ -11820,7 +11858,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-2.4.6/policy/modules/system/raid.te --- nsaserefpolicy/policy/modules/system/raid.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/raid.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/raid.te 2007-05-21 13:31:02.000000000 -0400 @@ -19,7 +19,7 @@ # Local policy # @@ -11830,7 +11868,7 @@ dontaudit mdadm_t self:capability sys_tty_config; allow mdadm_t self:process { sigchld sigkill sigstop signull signal }; allow mdadm_t self:fifo_file rw_file_perms; -@@ -35,15 +35,19 @@ +@@ -35,15 +35,20 @@ dev_read_sysfs(mdadm_t) # Ignore attempts to read every device file @@ -11847,10 +11885,11 @@ # RAID block device access storage_manage_fixed_disk(mdadm_t) +storage_dev_filetrans_fixed_disk(mdadm_t) ++storage_read_scsi_generic(mdadm_t) term_dontaudit_use_console(mdadm_t) term_dontaudit_list_ptys(mdadm_t) -@@ -87,3 +91,12 @@ +@@ -87,3 +92,12 @@ optional_policy(` udev_read_db(mdadm_t) ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v retrieving revision 1.366 retrieving revision 1.367 diff -u -r1.366 -r1.367 --- selinux-policy.spec 17 May 2007 17:38:54 -0000 1.366 +++ selinux-policy.spec 22 May 2007 14:05:17 -0000 1.367 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.4.6 -Release: 71%{?dist} +Release: 72%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -360,6 +360,9 @@ %endif %changelog +* Tue May 22 2007 Dan Walsh 2.4.6-72 +- Allow prelink sys_resource, Add transition rule to allow apps to run java in different context + * Mon May 15 2007 Dan Walsh 2.4.6-71 - Allow netlable to read etc and work with init terminals - Change file context to have all of policy at SystemLow From fedora-cvs-commits at redhat.com Tue May 22 14:30:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 May 2007 10:30:30 -0400 Subject: rpms/quagga/FC-6 quagga-0.99.7-pic.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 quagga.spec, 1.33, 1.34 sources, 1.14, 1.15 quagga-0.98.5-pie.patch, 1.3, NONE Message-ID: <200705221430.l4MEUU8Y009659@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/quagga/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9633 Modified Files: .cvsignore quagga.spec sources Added Files: quagga-0.99.7-pic.patch Removed Files: quagga-0.98.5-pie.patch Log Message: * Tue May 22 2007 Martin Bacovsky - 0.99.7-1 - upgrade to new upstream 0.99.7 - resolves: #240488: CVE-2007-1995 Quagga bgpd DoS quagga-0.99.7-pic.patch: ltmain.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE quagga-0.99.7-pic.patch --- --- quagga-0.99.7/ltmain.sh.pic 2007-05-22 15:38:03.000000000 +0200 +++ quagga-0.99.7/ltmain.sh 2007-05-22 15:38:55.000000000 +0200 @@ -906,7 +906,7 @@ command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $qsrcfile -fPIC" fi if test ! -d "${xdir}$objdir"; then @@ -986,7 +986,7 @@ if test "$build_old_libs" = yes; then if test "$pic_mode" != yes; then # Don't build PIC code - command="$base_compile $qsrcfile" + command="$base_compile $qsrcfile -fPIC" else command="$base_compile $qsrcfile $pic_flag" fi Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/quagga/FC-6/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 8 May 2006 20:15:47 -0000 1.14 +++ .cvsignore 22 May 2007 14:30:27 -0000 1.15 @@ -1,2 +1 @@ -quagga-0.98.5.tar.gz -quagga-0.98.6.tar.gz +quagga-0.99.7.tar.gz Index: quagga.spec =================================================================== RCS file: /cvs/dist/rpms/quagga/FC-6/quagga.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- quagga.spec 12 Jul 2006 07:57:35 -0000 1.33 +++ quagga.spec 22 May 2007 14:30:27 -0000 1.34 @@ -31,19 +31,19 @@ Summary: Routing daemon Name: quagga -Version: 0.98.6 -Release: 2.1 -Epoch: 0 +Version: 0.99.7 +Release: 1%{?dist} +Epoch: 0 License: GPL -Group: System Environment/Daemons +Group: System Environment/Daemons Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz -Source1: quagga-filter-perl-requires.sh -#Patch0: quagga-0.96.2-lib64.patch -Patch1: quagga-0.96.3-netlink.patch +Source1: quagga-filter-perl-requires.sh +#Patch0: quagga-0.96.2-lib64.patch +Patch1: quagga-0.96.3-netlink.patch Patch2: quagga-0.96.5-nostart.patch Patch4: quagga-0.98.2-gcc4.patch -Patch5: quagga-0.98.5-pam.patch -Patch6: quagga-0.98.5-pie.patch +#Patch5: quagga-0.98.5-pam.patch +Patch6: quagga-0.99.7-pic.patch URL: http://www.quagga.net %if %with_snmp @@ -99,7 +99,7 @@ %patch1 -p1 -b .netlink %patch2 -p1 -b .nostart %patch4 -p1 -b .gcc4 -%patch5 -p1 -b .pam +#%patch5 -p1 -b .pam # This creates a .diff file that we apply after configuring %patch6 -p1 @@ -346,6 +346,10 @@ %endif %changelog +* Tue May 22 2007 Martin Bacovsky - 0.99.7-1 +- upgrade to new upstream 0.99.7 +- resolves: #240488: CVE-2007-1995 Quagga bgpd DoS + * Wed Jul 12 2006 Jesse Keating - 0:0.98.6-2.1 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/quagga/FC-6/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 8 May 2006 20:15:47 -0000 1.14 +++ sources 22 May 2007 14:30:27 -0000 1.15 @@ -1 +1 @@ -b0d4132039953a0214256873b7d23d68 quagga-0.98.6.tar.gz +f448281c50007408ce92c5d8e2107abc quagga-0.99.7.tar.gz --- quagga-0.98.5-pie.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 22 15:13:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 May 2007 11:13:26 -0400 Subject: rpms/ntp/FC-6 ntp-4.2.4p0-bcast.patch, NONE, 1.1 ntp-4.2.4p0-ifupdate.patch, NONE, 1.1 ntp-4.2.4p0-multilisten.patch, NONE, 1.1 ntp-4.2.4p0-retcode.patch, NONE, 1.1 ntp.spec, 1.64, 1.65 ntpd.init, 1.24, 1.25 Message-ID: <200705221513.l4MFDQBc010424@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/ntp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10369 Modified Files: ntp.spec ntpd.init Added Files: ntp-4.2.4p0-bcast.patch ntp-4.2.4p0-ifupdate.patch ntp-4.2.4p0-multilisten.patch ntp-4.2.4p0-retcode.patch Log Message: - fix interface updates with -I or -L option (#240254) - accept multiple -I options - fix broadcast client/server to accept/allow sending broadcasts on 255.255.255.255 (#226958) - fix return codes in init script (#240120) - exit with nonzero code if ntpd -q did not set clock (#240134) - make with _smp_mflags - compile with crypto support on 64bit architectures (#239576) ntp-4.2.4p0-bcast.patch: ntp_io.c | 58 +++++++++++++++++++++++++++++++++++++++++++++------------- ntp_peer.c | 3 ++- 2 files changed, 47 insertions(+), 14 deletions(-) --- NEW FILE ntp-4.2.4p0-bcast.patch --- https://ntp.isc.org/bugs/show_bug.cgi?id=779 https://ntp.isc.org/bugs/show_bug.cgi?id=823 --- ntp-4.2.4p0/ntpd/ntp_peer.c.bcast 2006-12-28 13:03:31.000000000 +0100 +++ ntp-4.2.4p0/ntpd/ntp_peer.c 2007-05-22 14:37:22.000000000 +0200 @@ -696,7 +696,8 @@ * as our (network) source address would be undefined and * crypto will not work without knowing the own transmit address */ - if (interface != NULL && interface->flags & INT_WILDCARD) + if (interface != NULL && interface->flags & INT_WILDCARD && + !(cast_flags & MDF_BCAST)) interface = NULL; return interface; --- ntp-4.2.4p0/ntpd/ntp_io.c.bcast 2007-05-22 14:29:19.000000000 +0200 +++ ntp-4.2.4p0/ntpd/ntp_io.c 2007-05-22 14:29:19.000000000 +0200 @@ -145,6 +145,8 @@ volatile int disable_dynamic_updates; /* when set to != 0 dynamic updates won't happen */ +static int pktinfo_status = 0; /* is IP_PKTINFO on wildipv4 iface enabled? */ + #ifdef REFCLOCK /* * Refclock stuff. We keep a chain of structures with data concerning @@ -1530,6 +1532,18 @@ } } +static void +set_pktinfo(int flag) +{ + if (wildipv4 == NULL) + return; + if (setsockopt(wildipv4->fd, SOL_IP, IP_PKTINFO, &flag, sizeof (flag))) { + if (debug > 1) + printf("setsockopt(IP_PKTINFO) failed: %s\n", strerror(errno)); + } else + pktinfo_status = flag; +} + /* * This is just a wrapper around an internal function so we can * make other changes as necessary later on @@ -1935,6 +1949,7 @@ #else netsyslog(LOG_ERR, "io_setbclient: Broadcast Client disabled by build"); #endif + set_pktinfo(1); } /* @@ -1957,6 +1972,7 @@ continue; lstatus = socket_broadcast_disable(interf, &interf->sin); } + set_pktinfo(0); } /* @@ -2844,11 +2860,9 @@ GETSOCKNAME_SOCKLEN_TYPE fromlen; int buflen; register struct recvbuf *rb; -#ifdef HAVE_TIMESTAMP struct msghdr msghdr; struct iovec iovec; char control[TIMESTAMP_CTLMSGBUF_SIZE]; /* pick up control messages */ -#endif /* * Get a buffer and read the frame. If we @@ -2859,7 +2873,7 @@ rb = get_free_recv_buffer(); - if (rb == NULL || itf->ignore_packets == ISC_TRUE) + if (rb == NULL || (itf->ignore_packets == ISC_TRUE && !(pktinfo_status && itf == wildipv4))) { char buf[RX_BUFF_SIZE]; struct sockaddr_storage from; @@ -2882,13 +2896,6 @@ fromlen = sizeof(struct sockaddr_storage); -#ifndef HAVE_TIMESTAMP - rb->recv_length = recvfrom(fd, - (char *)&rb->recv_space, - sizeof(rb->recv_space), 0, - (struct sockaddr *)&rb->recv_srcadr, - &fromlen); -#else iovec.iov_base = (void *)&rb->recv_space; iovec.iov_len = sizeof(rb->recv_space); msghdr.msg_name = (void *)&rb->recv_srcadr; @@ -2899,7 +2906,6 @@ msghdr.msg_controllen = sizeof(control); msghdr.msg_flags = 0; rb->recv_length = recvmsg(fd, &msghdr, 0); -#endif if (rb->recv_length == 0|| (rb->recv_length == -1 && (errno==EWOULDBLOCK @@ -2919,6 +2925,34 @@ return (rb->recv_length); } + if (pktinfo_status && itf->ignore_packets == ISC_TRUE && itf == wildipv4) { + /* check for broadcast on 255.255.255.255, exception allowed on wildipv4 */ + struct cmsghdr *cmsg; + struct in_pktinfo *pktinfo = NULL; + + if ((cmsg = CMSG_FIRSTHDR(&msghdr))) + do { + if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_PKTINFO) + pktinfo = (struct in_pktinfo *) CMSG_DATA(cmsg); + } while ((cmsg = CMSG_NXTHDR(&msghdr, cmsg))); + if (pktinfo && pktinfo->ipi_addr.s_addr == INADDR_BROADCAST) { +#ifdef DEBUG + if (debug > 3) { + printf("INADDR_BROADCAST\n"); + } +#endif + } else { +#ifdef DEBUG + if (debug > 3) + printf("%s on (%lu) fd=%d from %s\n", "ignore", + free_recvbuffs(), fd, stoa(&rb->recv_srcadr)); +#endif + packets_ignored++; + freerecvbuf(rb); + return (rb->recv_length); + } + } + #ifdef DEBUG if (debug > 2) { if(rb->recv_srcadr.ss_family == AF_INET) @@ -2940,9 +2974,7 @@ */ rb->dstadr = itf; rb->fd = fd; -#ifdef HAVE_TIMESTAMP ts = fetch_timestamp(rb, &msghdr, ts); /* pick up a network time stamp if possible */ -#endif rb->recv_time = ts; rb->receiver = receive; ntp-4.2.4p0-ifupdate.patch: ntp_io.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE ntp-4.2.4p0-ifupdate.patch --- --- ntp-4.2.4p0/ntpd/ntp_io.c.ifupdate 2007-01-30 12:02:37.000000000 +0100 +++ ntp-4.2.4p0/ntpd/ntp_io.c 2007-05-17 16:32:38.000000000 +0200 @@ -1243,7 +1243,9 @@ * with the appropriate socket (our name space is * (ip-address) - NOT (interface name, ip-address)) */ - iface = getinterface(&interface.sin); + iface = find_addr_in_list(&interface.sin); + if (iface && iface->flags & INT_WILDCARD) + iface = NULL; if (iface && refresh_interface(iface)) { ntp-4.2.4p0-multilisten.patch: include/ntpd.h | 2 ++ ntpd/cmd_args.c | 1 - ntpd/ntp_io.c | 38 ++++++++++++++++++++++++++++++++------ ntpd/ntpd.c | 15 +++++---------- 4 files changed, 39 insertions(+), 17 deletions(-) --- NEW FILE ntp-4.2.4p0-multilisten.patch --- --- ntp-4.2.4p0/include/ntpd.h.multilisten 2007-05-17 19:26:58.000000000 +0200 +++ ntp-4.2.4p0/include/ntpd.h 2007-05-17 19:28:09.000000000 +0200 @@ -79,6 +79,8 @@ extern void enable_multicast_if P((struct interface *, struct sockaddr_storage *)); extern void interface_dump P((struct interface *)); +extern void add_specific_interface P((const char *)); +extern void init_specific_interface P((void)); extern void interface_update P((interface_receiver_t, void *)); extern void init_io P((void)); extern void input_handler P((l_fp *)); --- ntp-4.2.4p0/ntpd/ntp_io.c.multilisten 2007-05-17 19:26:58.000000000 +0200 +++ ntp-4.2.4p0/ntpd/ntp_io.c 2007-05-17 19:27:25.000000000 +0200 @@ -66,7 +66,15 @@ #endif /* IPv6 Support */ extern int listen_to_virtual_ips; -extern const char *specific_interface; + +/* interface names to listen on */ +struct specific_interface { + const char *name; + ISC_LINK(struct specific_interface) link; +}; + +ISC_LIST(struct specific_interface) specific_interface_list; + #if defined(SO_TIMESTAMP) && defined(SCM_TIMESTAMP) #if defined(CMSG_FIRSTHDR) @@ -921,11 +929,12 @@ /* * Check if the interface is specified */ - if (specific_interface != NULL) { - if (strcasecmp(isc_if->name, specific_interface) == 0) - return (ISC_TRUE); - else - return (ISC_FALSE); + if (ISC_LIST_HEAD(specific_interface_list)) { + struct specific_interface *iface; + for (iface = ISC_LIST_HEAD(specific_interface_list); iface != NULL; iface = ISC_LIST_NEXT(iface, link)) + if (strcasecmp(isc_if->name, iface->name) == 0) + return (ISC_TRUE); + return (ISC_FALSE); } else { if (listen_to_virtual_ips == 0 && @@ -1037,6 +1046,23 @@ #endif /* !OS_MISSES_SPECIFIC_ROUTE_UPDATES */ } +void +add_specific_interface (const char *if_name) +{ + struct specific_interface *iface; + + iface = (struct specific_interface *)emalloc(sizeof(struct specific_interface)); + iface->name = if_name; + ISC_LINK_INIT(iface, link); + ISC_LIST_APPEND(specific_interface_list, iface, link); +} + +void +init_specific_interface (void) +{ + ISC_LIST_INIT(specific_interface_list); +} + /* * interface_update - externally callable update function */ --- ntp-4.2.4p0/ntpd/cmd_args.c.multilisten 2006-12-28 13:03:26.000000000 +0100 +++ ntp-4.2.4p0/ntpd/cmd_args.c 2007-05-17 19:29:04.000000000 +0200 @@ -22,7 +22,6 @@ * Definitions of things either imported from or exported to outside */ extern char const *progname; -extern const char *specific_interface; extern int default_ai_family; #ifdef HAVE_NETINFO --- ntp-4.2.4p0/ntpd/ntpd.c.multilisten 2007-05-17 19:26:58.000000000 +0200 +++ ntp-4.2.4p0/ntpd/ntpd.c 2007-05-17 19:27:25.000000000 +0200 @@ -156,7 +156,6 @@ #endif int listen_to_virtual_ips = 1; -const char *specific_interface = NULL; /* interface name or IP address to bind to */ /* * No-fork flag. If set, we do not become a background daemon. @@ -539,18 +538,14 @@ if (HAVE_OPT( NOVIRTUALIPS )) listen_to_virtual_ips = 0; + init_specific_interface(); + if (HAVE_OPT( INTERFACE )) { -#if 0 int ifacect = STACKCT_OPT( INTERFACE ); - char** ifaces = STACKLST_OPT( INTERFACE ); + const char** ifaces = STACKLST_OPT( INTERFACE ); - /* malloc space for the array of names */ - while (ifacect-- > 0) { - next_iface = *ifaces++; - } -#else - specific_interface = OPT_ARG( INTERFACE ); -#endif + while (ifacect-- > 0) + add_specific_interface(*ifaces++); } if (HAVE_OPT( NICE )) ntp-4.2.4p0-retcode.patch: ntp_proto.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ntp-4.2.4p0-retcode.patch --- https://ntp.isc.org/bugs/show_bug.cgi?id=759 --- ntp-4.2.4p0/ntpd/ntp_proto.c.retcode 2006-12-28 13:03:32.000000000 +0100 +++ ntp-4.2.4p0/ntpd/ntp_proto.c 2007-05-22 15:20:07.000000000 +0200 @@ -303,7 +303,7 @@ if (peer_ntpdate == 0) { msyslog(LOG_NOTICE, "no reply; clock not set"); - exit (0); + exit (1); } } } Index: ntp.spec =================================================================== RCS file: /cvs/dist/rpms/ntp/FC-6/ntp.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- ntp.spec 7 Mar 2007 18:49:00 -0000 1.64 +++ ntp.spec 22 May 2007 15:13:24 -0000 1.65 @@ -3,7 +3,7 @@ Summary: Synchronizes system time using the Network Time Protocol (NTP). Name: ntp Version: 4.2.4p0 -Release: 1%{?dist} +Release: 2%{?dist} License: distributable Group: System Environment/Daemons Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz @@ -21,13 +21,17 @@ Patch3: ntp-4.2.4-groups.patch Patch4: ntp-4.1.1c-rc3-authkey.patch Patch5: ntp-4.2.4-linkfastmath.patch +Patch6: ntp-4.2.4p0-ifupdate.patch Patch7: ntp-4.2.4-revert452.patch +Patch8: ntp-4.2.4p0-multilisten.patch Patch9: ntp-4.2.4-html2man.patch Patch10: ntp-4.2.4-htmldoc.patch Patch11: ntp-stable-4.2.0a-20050816-keyfile.patch Patch12: ntp-4.2.4-sprintf.patch Patch13: ntp-4.2.4-autoopts.patch Patch14: ntp-4.2.4p0-mlock.patch +Patch18: ntp-4.2.4p0-bcast.patch +Patch19: ntp-4.2.4p0-retcode.patch URL: http://www.ntp.org Requires(pre): shadow-utils @@ -57,13 +61,17 @@ %patch2 -p1 -b .droproot %patch3 -p1 -b .groups %patch4 -p1 -b .authkey +%patch6 -p1 -b .ifupdate %patch7 -p1 -b .revert452 +%patch8 -p1 -b .multilisten %patch9 -p1 -b .html2man %patch10 -p1 -b .htmldoc %patch11 -p1 -b .keyfile %patch12 -p1 -b .sprintf %patch13 -p1 -b .autoopts %patch14 -p1 -b .mlock +%patch18 -p1 -b .bcast +%patch19 -p1 -b .retcode %ifarch ia64 %patch5 -p1 -b .linkfastmath @@ -77,9 +85,10 @@ fi %configure \ --sysconfdir=%{_sysconfdir}/ntp \ + --with-openssl-libdir=%{_libdir} \ --enable-all-clocks --enable-parse-clocks \ --enable-linuxcaps -make +make %{?_smp_mflags} sed -i 's|$ntpq = "ntpq"|$ntpq = "%{_sbindir}/ntpq"|' scripts/ntptrace @@ -175,6 +184,16 @@ %changelog +* Tue May 22 2007 Miroslav Lichvar 4.2.4p0-2.fc6 +- fix interface updates with -I or -L option (#240254) +- accept multiple -I options +- fix broadcast client/server to accept/allow sending + broadcasts on 255.255.255.255 (#226958) +- fix return codes in init script (#240120) +- exit with nonzero code if ntpd -q did not set clock (#240134) +- make with _smp_mflags +- compile with crypto support on 64bit architectures (#239576) + * Wed Mar 07 2007 Miroslav Lichvar 4.2.4p0-1.fc6 - update to 4.2.4p0 - fix init script Index: ntpd.init =================================================================== RCS file: /cvs/dist/rpms/ntp/FC-6/ntpd.init,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ntpd.init 7 Mar 2007 18:49:00 -0000 1.24 +++ ntpd.init 22 May 2007 15:13:24 -0000 1.25 @@ -15,9 +15,6 @@ # Source networking configuration. . /etc/sysconfig/network -# Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 - if [ -f /etc/sysconfig/ntpd ];then . /etc/sysconfig/ntpd fi @@ -92,6 +89,9 @@ } start() { + # Check that networking is up. + [ "$NETWORKING" = "no" ] && exit 1 + readconf; if [ -n "$dostep" ]; then @@ -154,7 +154,7 @@ ;; *) echo $"Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 + RETVAL=3 esac exit $RETVAL From fedora-cvs-commits at redhat.com Tue May 22 15:15:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 22 May 2007 11:15:26 -0400 Subject: rpms/bind/FC-6 bind-9.4.1-ldap-new-api.patch, NONE, 1.1 bind.spec, 1.151, 1.152 Message-ID: <200705221515.l4MFFQ0Z010550@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10517 Modified Files: bind.spec Added Files: bind-9.4.1-ldap-new-api.patch Log Message: - rewrited ldap backend to latest API bind-9.4.1-ldap-new-api.patch: ldapdb.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 133 insertions(+), 9 deletions(-) --- NEW FILE bind-9.4.1-ldap-new-api.patch --- --- bind-9.4.1/contrib/sdb/ldap/ldapdb.c.new-api 2004-08-27 02:10:25.000000000 +0200 +++ bind-9.4.1/contrib/sdb/ldap/ldapdb.c 2007-05-22 16:50:16.000000000 +0200 @@ -58,9 +58,13 @@ static dns_sdbimplementation_t *ldapdb = NULL; struct ldapdb_data { +#if LDAP_API_VERSION >= 3001 + LDAPURLDesc *lud; +#else char *hostport; char *hostname; int portno; +#endif char *base; int defaultttl; char *filterall; @@ -135,7 +139,11 @@ ldapdb_getconn(struct ldapdb_data *data) conndata = threaddata->data; free(conndata->index); if (conndata->data != NULL) +#if LDAP_API_VERSION < 3001 ldap_unbind((LDAP *)conndata->data); +#else + ldap_unbind_ext((LDAP *)conndata->data, NULL, NULL); +#endif threaddata->data = conndata->next; free(conndata); } @@ -172,14 +180,23 @@ ldapdb_getconn(struct ldapdb_data *data) /* threaddata points at the connection list for current thread */ /* look for existing connection to our server */ conndata = ldapdb_find((struct ldapdb_entry *)threaddata->data, - data->hostport, strlen(data->hostport)); +#if LDAP_API_VERSION < 3001 + data->hostport, strlen(data->hostport)); +#else + data->lud->lud_host, strlen(data->lud->lud_host)); +#endif if (conndata == NULL) { /* no connection data structure for this server, create one */ conndata = malloc(sizeof(*conndata)); if (conndata == NULL) return (NULL); +#if LDAP_API_VERSION < 3001 conndata->index = data->hostport; conndata->size = strlen(data->hostport); +#else + conndata->index = data->lud->lud_host; + conndata->size = strlen(data->lud->lud_host); +#endif conndata->data = NULL; ldapdb_insert((struct ldapdb_entry **)&threaddata->data, conndata); @@ -196,9 +213,15 @@ ldapdb_bind(struct ldapdb_data *data, LD #endif if (*ldp != NULL) +#if LDAP_API_VERSION < 3001 ldap_unbind(*ldp); *ldp = ldap_open(data->hostname, data->portno); if (*ldp == NULL) +#else + ldap_unbind_ext (*ldp, NULL, NULL); + int res = ldap_initialize(ldp, ldap_url_desc2str(data->lud)); + if (res != LDAP_SUCCESS) +#endif return; #ifndef LDAPDB_RFC1823API @@ -211,8 +234,17 @@ ldapdb_bind(struct ldapdb_data *data, LD } #endif +#if LDAP_API_VERSION < 3001 if (ldap_simple_bind_s(*ldp, data->bindname, data->bindpw) != LDAP_SUCCESS) { ldap_unbind(*ldp); +#else + struct berval ber; + ber.bv_val = data->bindpw; + ber.bv_len = (data->bindpw == NULL) ? 0 : strlen(data->bindpw); + + if (ldap_sasl_bind_s(*ldp, data->base, LDAP_SASL_SIMPLE, &ber, NULL, NULL, NULL) != LDAP_SUCCESS) { + ldap_unbind_ext(*ldp, NULL, NULL); +#endif *ldp = NULL; } } @@ -224,14 +256,19 @@ ldapdb_search(const char *zone, const ch isc_result_t result = ISC_R_NOTFOUND; LDAP **ldp; LDAPMessage *res, *e; - char *fltr, *a, **vals = NULL, **names = NULL; + char *fltr, *a; +#if LDAP_API_VERSION < 3001 + char **names, **vals; +#else + struct berval **names, **vals; +#endif char type[64]; #ifdef LDAPDB_RFC1823API void *ptr; #else BerElement *ptr; #endif - int i, j, errno, msgid; + int i, j, errno, msgid, ldap_res; ldp = ldapdb_getconn(data); if (ldp == NULL) @@ -256,12 +293,21 @@ ldapdb_search(const char *zone, const ch sprintf(data->filtername, "%s))", name); fltr = data->filterone; } - +#if LDAP_API_VERSION < 3001 msgid = ldap_search(*ldp, data->base, LDAP_SCOPE_SUBTREE, fltr, NULL, 0); +#else + ldap_res = ldap_search_ext(*ldp, data->base, LDAP_SCOPE_SUBTREE, fltr, NULL, 0, + NULL, NULL, NULL, 65535, &msgid); +#endif if (msgid == -1) { ldapdb_bind(data, ldp); if (*ldp != NULL) +#if LDAP_API_VERSION < 3001 msgid = ldap_search(*ldp, data->base, LDAP_SCOPE_SUBTREE, fltr, NULL, 0); +#else + ldap_res = ldap_search_ext(*ldp, data->base, LDAP_SCOPE_SUBTREE, fltr, NULL, 0, + NULL, NULL, NULL, 65535, &msgid); +#endif } if (*ldp == NULL || msgid == -1) { @@ -293,15 +339,27 @@ ldapdb_search(const char *zone, const ch } if (name == NULL) { +#if LDAP_API_VERSION < 3001 names = ldap_get_values(ld, e, "relativeDomainName"); +#else + names = ldap_get_values_len(ld, e, "relativeDomainName"); +#endif if (names == NULL) continue; } - +#if LDAP_API_VERSION < 3001 vals = ldap_get_values(ld, e, "dNSTTL"); +#else + vals = ldap_get_values_len(ld, e, "dNSTTL"); +#endif if (vals != NULL) { +#if LDAP_API_VERSION < 3001 ttl = atoi(vals[0]); ldap_value_free(vals); +#else + ttl = atoi(vals[0]->bv_val); + ldap_value_free_len(vals); +#endif } for (a = ldap_first_attribute(ld, e, &ptr); a != NULL; a = ldap_next_attribute(ld, e, ptr)) { @@ -319,34 +377,60 @@ ldapdb_search(const char *zone, const ch strncpy(type, a, s - a); type[s - a] = '\0'; +#if LDAP_API_VERSION < 3001 vals = ldap_get_values(ld, e, a); +#else + vals = ldap_get_values_len(ld, e, a); +#endif if (vals != NULL) { for (i = 0; vals[i] != NULL; i++) { if (name != NULL) { +#if LDAP_API_VERSION < 3001 result = dns_sdb_putrr(retdata, type, ttl, vals[i]); +#else + result = dns_sdb_putrr(retdata, type, ttl, vals[i]->bv_val); +#endif } else { for (j = 0; names[j] != NULL; j++) { +#if LDAP_API_VERSION < 3001 result = dns_sdb_putnamedrr(retdata, names[j], type, ttl, vals[i]); +#else + result = dns_sdb_putnamedrr(retdata, names[j]->bv_val, type, ttl, vals[i]->bv_val); +#endif if (result != ISC_R_SUCCESS) break; } } -; if (result != ISC_R_SUCCESS) { + if (result != ISC_R_SUCCESS) { +#if LDAP_API_VERSION < 3001 isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, ISC_LOG_ERROR, "LDAP sdb zone '%s': dns_sdb_put... failed for %s", zone, vals[i]); ldap_value_free(vals); +#else + isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, ISC_LOG_ERROR, + "LDAP sdb zone '%s': dns_sdb_put... failed for %s", zone, vals[i]->bv_val); + ldap_value_free_len(vals); +#endif #ifndef LDAPDB_RFC1823API ldap_memfree(a); if (ptr != NULL) ber_free(ptr, 0); #endif if (name == NULL) +#if LDAP_API_VERSION < 3001 ldap_value_free(names); +#else + ldap_value_free_len(names); +#endif ldap_msgfree(res); return (ISC_R_FAILURE); } } +#if LDAP_API_VERSION < 3001 ldap_value_free(vals); +#else + ldap_value_free_len(vals); +#endif } #ifndef LDAPDB_RFC1823API ldap_memfree(a); @@ -357,7 +441,11 @@ ldapdb_search(const char *zone, const ch ber_free(ptr, 0); #endif if (name == NULL) +#if LDAP_API_VERSION < 3001 ldap_value_free(names); +#else + ldap_value_free_len(names); +#endif /* free this result */ ldap_msgfree(res); @@ -460,10 +548,15 @@ parseextensions(char *extensions, struct static void free_data(struct ldapdb_data *data) { +#if LDAP_API_VERSION < 3001 if (data->hostport != NULL) isc_mem_free(ns_g_mctx, data->hostport); if (data->hostname != NULL) isc_mem_free(ns_g_mctx, data->hostname); +#else + if (data->lud != NULL) + ldap_free_urldesc(data->lud); +#endif if (data->filterall != NULL) isc_mem_put(ns_g_mctx, data->filterall, data->filteralllen); if (data->filterone != NULL) @@ -478,7 +571,7 @@ ldapdb_create(const char *zone, int argc { struct ldapdb_data *data; char *s, *filter = NULL, *extensions = NULL; - int defaultttl; + int defaultttl, i; UNUSED(driverdata); @@ -486,7 +579,10 @@ ldapdb_create(const char *zone, int argc /* want to do this only once for all instances */ if ((argc < 2) +#if LDAP_API_VERSION < 3001 + /* Could be ldap[is]:// */ || (argv[0] != strstr( argv[0], "ldap://")) +#endif || ((defaultttl = atoi(argv[1])) < 1)) return (ISC_R_FAILURE); data = isc_mem_get(ns_g_mctx, sizeof(struct ldapdb_data)); @@ -494,14 +590,15 @@ ldapdb_create(const char *zone, int argc return (ISC_R_NOMEMORY); memset(data, 0, sizeof(struct ldapdb_data)); + + data->defaultttl = defaultttl; +#if LDAP_API_VERSION < 3001 data->hostport = isc_mem_strdup(ns_g_mctx, argv[0] + strlen("ldap://")); if (data->hostport == NULL) { free_data(data); return (ISC_R_NOMEMORY); } - data->defaultttl = defaultttl; - s = strchr(data->hostport, '/'); if (s != NULL) { *s++ = '\0'; @@ -544,11 +641,26 @@ ldapdb_create(const char *zone, int argc } } +#else + if (ldap_url_parse (argv[0], &data->lud) != LDAP_URL_SUCCESS) { + free_data (data); + return (ISC_R_FAILURE); + } + + data->base = data->lud->lud_dn; + + for (i = 0; data->lud->lud_exts[i] != NULL; i++) { + extensions = strdup (data->lud->lud_exts[i]); +#endif + /* parse extensions */ if (extensions != NULL) { int err; err = parseextensions(extensions, data); +#if LDAP_API_VERSION >= 3001 + free (extensions); +#endif if (err < 0) { /* err should be -1 or -2 */ free_data(data); @@ -562,6 +674,14 @@ ldapdb_create(const char *zone, int argc return (ISC_R_FAILURE); } } +#if LDAP_API_VERSION >= 3001 + else { + free_data (data); + return (ISC_R_NOMEMORY); + } + } + filter = data->lud->lud_filter; +#else if ((data->base != NULL && unhex(data->base) == NULL) || (filter != NULL && unhex(filter) == NULL) || @@ -572,6 +692,7 @@ ldapdb_create(const char *zone, int argc "LDAP sdb zone '%s': URL: bad hex values", zone); return (ISC_R_FAILURE); } +#endif /* compute filterall and filterone once and for all */ if (filter == NULL) { @@ -602,6 +723,7 @@ ldapdb_create(const char *zone, int argc } data->filtername = data->filterone + strlen(data->filterone); +#if LDAP_API_VERSION < 3001 /* support URLs with literal IPv6 addresses */ data->hostname = isc_mem_strdup(ns_g_mctx, data->hostport + (*data->hostport == '[' ? 1 : 0)); if (data->hostname == NULL) { @@ -620,8 +742,10 @@ ldapdb_create(const char *zone, int argc data->portno = atoi(s); } else data->portno = LDAP_PORT; +#endif *dbdata = data; + return (ISC_R_SUCCESS); } Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-6/bind.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- bind.spec 15 May 2007 12:19:02 -0000 1.151 +++ bind.spec 22 May 2007 15:15:24 -0000 1.152 @@ -75,6 +75,7 @@ Patch32: bind-9.3.2-prctl_set_dumpable.patch Patch52: bind-9.3.3-edns.patch Patch53: bind-9.4.0-dbus-race-condition.patch +Patch54: bind-9.4.1-ldap-new-api.patch # Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2, mktemp Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26 @@ -238,6 +239,7 @@ %patch10 -p1 -b .PIE %if %{SDB} %patch11 -p1 -b .sdbsrc +%patch54 -p1 -b .ldap-api # BUILD 'Simplified Database Backend' (SDB) version of named: named_sdb cp -rfp bin/named bin/named_sdb # SDB ldap @@ -779,8 +781,9 @@ :; %changelog -* Tue May 15 2007 Adam Tkac 31:9.3.4-5.fc7 +* Tue May 22 2007 Adam Tkac 31:9.3.4-5.fc7 - fixed bind-chroot-admin dynamic DNS handling (#239149) +- rewrited ldap backend patch to latest API (#239802) * Fri Apr 27 2007 Adam Tkac 31:9.3.4-4.fc6 - fixed some issues in bind-chroot-admin script From fedora-cvs-commits at redhat.com Wed May 23 13:05:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 23 May 2007 09:05:18 -0400 Subject: rpms/gpm/FC-5 gpm-1.20.1-default-handler.patch, NONE, 1.1 gpm.spec, 1.45, 1.46 Message-ID: <200705231305.l4ND5Irc000688@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv672 Modified Files: gpm.spec Added Files: gpm-1.20.1-default-handler.patch Log Message: * Wed May 23 2007 Tomas Janousek - 1.20.1-84 - applied patch for #240389, fixing default handlers * Thu May 03 2007 Tomas Janousek - 1.20.1-83 - gpm-devel now requires version-release correctly, fixes #238785 gpm-1.20.1-default-handler.patch: liblow.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE gpm-1.20.1-default-handler.patch --- --- gpm-1.20.1/src/lib/liblow.c.orig 2002-12-24 23:57:16.000000000 +0100 +++ gpm-1.20.1/src/lib/liblow.c 2007-05-17 01:48:02.000000000 +0200 @@ -249,7 +249,7 @@ gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM); memcpy(tty,option.consolename,strlen(option.consolename)-1); sprintf(&tty[strlen(option.consolename)-1],"%i",flag); - } else { /* use your current vc */ + } else if (flag==0) { /* use your current vc */ if (isatty(0)) tty = ttyname(0); /* stdin */ if (!tty && isatty(1)) tty = ttyname(1); /* stdout */ if (!tty && isatty(2)) tty = ttyname(2); /* stderr */ @@ -265,7 +265,8 @@ } conn->vc=atoi(&tty[strlen(option.consolename)-1]); - } + } else /* a default handler -- use console */ + tty = strdup(option.consolename); if (gpm_consolefd == -1) if ((gpm_consolefd=open(tty,O_WRONLY)) < 0) { Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-5/gpm.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gpm.spec 2 Apr 2007 14:20:57 -0000 1.45 +++ gpm.spec 23 May 2007 13:05:15 -0000 1.46 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 82%{?dist} +Release: 84%{?dist} License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -22,6 +22,7 @@ Patch22: gpm-1.20.1-close-fds.patch Patch23: gpm-1.20.1-aligned-sleep.patch Patch24: gpm-1.20.1-deadsocket.patch +Patch25: gpm-1.20.1-default-handler.patch Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info Requires: bash >= 2.0 @@ -39,7 +40,7 @@ %package devel -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Summary: A mouse server for the Linux console. Group: System Environment/Daemons @@ -68,6 +69,7 @@ %patch22 -p1 -b .close-fds %patch23 -p1 -b .aligned-sleep %patch24 -p1 -b .deadsocket +%patch25 -p1 -b /default-handler %build rm -f configure @@ -186,6 +188,12 @@ %{_libdir}/libgpm.so %changelog +* Wed May 23 2007 Tomas Janousek - 1.20.1-84 +- applied patch for #240389, fixing default handlers + +* Thu May 03 2007 Tomas Janousek - 1.20.1-83 +- gpm-devel now requires version-release correctly, fixes #238785 + * Mon Apr 02 2007 Tomas Janousek - 1.20.1-82 - updated inputattach.c to 1.24 from cvs, fixes #231635 From fedora-cvs-commits at redhat.com Wed May 23 13:05:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 23 May 2007 09:05:51 -0400 Subject: rpms/gpm/FC-6 gpm-1.20.1-default-handler.patch, NONE, 1.1 gpm.spec, 1.50, 1.51 Message-ID: <200705231305.l4ND5pkH000793@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv755 Modified Files: gpm.spec Added Files: gpm-1.20.1-default-handler.patch Log Message: * Wed May 23 2007 Tomas Janousek - 1.20.1-84 - applied patch for #240389, fixing default handlers * Thu May 03 2007 Tomas Janousek - 1.20.1-83 - gpm-devel now requires version-release correctly, fixes #238785 gpm-1.20.1-default-handler.patch: liblow.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE gpm-1.20.1-default-handler.patch --- --- gpm-1.20.1/src/lib/liblow.c.orig 2002-12-24 23:57:16.000000000 +0100 +++ gpm-1.20.1/src/lib/liblow.c 2007-05-17 01:48:02.000000000 +0200 @@ -249,7 +249,7 @@ gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM); memcpy(tty,option.consolename,strlen(option.consolename)-1); sprintf(&tty[strlen(option.consolename)-1],"%i",flag); - } else { /* use your current vc */ + } else if (flag==0) { /* use your current vc */ if (isatty(0)) tty = ttyname(0); /* stdin */ if (!tty && isatty(1)) tty = ttyname(1); /* stdout */ if (!tty && isatty(2)) tty = ttyname(2); /* stderr */ @@ -265,7 +265,8 @@ } conn->vc=atoi(&tty[strlen(option.consolename)-1]); - } + } else /* a default handler -- use console */ + tty = strdup(option.consolename); if (gpm_consolefd == -1) if ((gpm_consolefd=open(tty,O_WRONLY)) < 0) { Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-6/gpm.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gpm.spec 2 Apr 2007 14:20:00 -0000 1.50 +++ gpm.spec 23 May 2007 13:05:49 -0000 1.51 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 82%{?dist} +Release: 84%{?dist} License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -22,6 +22,7 @@ Patch22: gpm-1.20.1-close-fds.patch Patch23: gpm-1.20.1-aligned-sleep.patch Patch24: gpm-1.20.1-deadsocket.patch +Patch25: gpm-1.20.1-default-handler.patch Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info Requires: bash >= 2.0 @@ -39,7 +40,7 @@ %package devel -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Summary: A mouse server for the Linux console. Group: System Environment/Daemons @@ -68,6 +69,7 @@ %patch22 -p1 -b .close-fds %patch23 -p1 -b .aligned-sleep %patch24 -p1 -b .deadsocket +%patch25 -p1 -b /default-handler %build rm -f configure @@ -186,6 +188,12 @@ %{_libdir}/libgpm.so %changelog +* Wed May 23 2007 Tomas Janousek - 1.20.1-84 +- applied patch for #240389, fixing default handlers + +* Thu May 03 2007 Tomas Janousek - 1.20.1-83 +- gpm-devel now requires version-release correctly, fixes #238785 + * Mon Apr 02 2007 Tomas Janousek - 1.20.1-82 - updated inputattach.c to 1.24 from cvs, fixes #231635 From fedora-cvs-commits at redhat.com Wed May 23 13:19:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 23 May 2007 09:19:00 -0400 Subject: rpms/gpm/FC-5 gpm-1.20.1-default-handler.patch, 1.1, 1.2 gpm.spec, 1.46, 1.47 Message-ID: <200705231319.l4NDJ0wf001059@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv1041 Modified Files: gpm-1.20.1-default-handler.patch gpm.spec Log Message: typo & patch fix gpm-1.20.1-default-handler.patch: liblow.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Index: gpm-1.20.1-default-handler.patch =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-5/gpm-1.20.1-default-handler.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gpm-1.20.1-default-handler.patch 23 May 2007 13:05:15 -0000 1.1 +++ gpm-1.20.1-default-handler.patch 23 May 2007 13:18:57 -0000 1.2 @@ -1,21 +1,21 @@ ---- gpm-1.20.1/src/lib/liblow.c.orig 2002-12-24 23:57:16.000000000 +0100 -+++ gpm-1.20.1/src/lib/liblow.c 2007-05-17 01:48:02.000000000 +0200 -@@ -249,7 +249,7 @@ +--- gpm-1.20.1/src/lib/liblow.c.default-handler 2007-05-23 15:15:01.000000000 +0200 ++++ gpm-1.20.1/src/lib/liblow.c 2007-05-23 15:16:26.000000000 +0200 +@@ -250,7 +250,7 @@ gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM); - memcpy(tty,option.consolename,strlen(option.consolename)-1); - sprintf(&tty[strlen(option.consolename)-1],"%i",flag); + memcpy(tty,consolename,strlen(consolename)-1); + sprintf(&tty[strlen(consolename)-1],"%i",flag); - } else { /* use your current vc */ + } else if (flag==0) { /* use your current vc */ if (isatty(0)) tty = ttyname(0); /* stdin */ if (!tty && isatty(1)) tty = ttyname(1); /* stdout */ if (!tty && isatty(2)) tty = ttyname(2); /* stderr */ -@@ -265,7 +265,8 @@ +@@ -271,7 +271,8 @@ } - - conn->vc=atoi(&tty[strlen(option.consolename)-1]); + #endif + conn->vc=atoi(&tty[strlen(consolename)-1]); - } + } else /* a default handler -- use console */ -+ tty = strdup(option.consolename); ++ tty = strdup(consolename); if (gpm_consolefd == -1) if ((gpm_consolefd=open(tty,O_WRONLY)) < 0) { Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-5/gpm.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gpm.spec 23 May 2007 13:05:15 -0000 1.46 +++ gpm.spec 23 May 2007 13:18:57 -0000 1.47 @@ -69,7 +69,7 @@ %patch22 -p1 -b .close-fds %patch23 -p1 -b .aligned-sleep %patch24 -p1 -b .deadsocket -%patch25 -p1 -b /default-handler +%patch25 -p1 -b .default-handler %build rm -f configure From fedora-cvs-commits at redhat.com Wed May 23 13:19:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 23 May 2007 09:19:23 -0400 Subject: rpms/gpm/FC-6 gpm-1.20.1-default-handler.patch, 1.1, 1.2 gpm.spec, 1.51, 1.52 Message-ID: <200705231319.l4NDJNnu001128@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv1106 Modified Files: gpm-1.20.1-default-handler.patch gpm.spec Log Message: typo & patch fix gpm-1.20.1-default-handler.patch: liblow.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Index: gpm-1.20.1-default-handler.patch =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-6/gpm-1.20.1-default-handler.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gpm-1.20.1-default-handler.patch 23 May 2007 13:05:49 -0000 1.1 +++ gpm-1.20.1-default-handler.patch 23 May 2007 13:19:20 -0000 1.2 @@ -1,21 +1,21 @@ ---- gpm-1.20.1/src/lib/liblow.c.orig 2002-12-24 23:57:16.000000000 +0100 -+++ gpm-1.20.1/src/lib/liblow.c 2007-05-17 01:48:02.000000000 +0200 -@@ -249,7 +249,7 @@ +--- gpm-1.20.1/src/lib/liblow.c.default-handler 2007-05-23 15:15:01.000000000 +0200 ++++ gpm-1.20.1/src/lib/liblow.c 2007-05-23 15:16:26.000000000 +0200 +@@ -250,7 +250,7 @@ gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM); - memcpy(tty,option.consolename,strlen(option.consolename)-1); - sprintf(&tty[strlen(option.consolename)-1],"%i",flag); + memcpy(tty,consolename,strlen(consolename)-1); + sprintf(&tty[strlen(consolename)-1],"%i",flag); - } else { /* use your current vc */ + } else if (flag==0) { /* use your current vc */ if (isatty(0)) tty = ttyname(0); /* stdin */ if (!tty && isatty(1)) tty = ttyname(1); /* stdout */ if (!tty && isatty(2)) tty = ttyname(2); /* stderr */ -@@ -265,7 +265,8 @@ +@@ -271,7 +271,8 @@ } - - conn->vc=atoi(&tty[strlen(option.consolename)-1]); + #endif + conn->vc=atoi(&tty[strlen(consolename)-1]); - } + } else /* a default handler -- use console */ -+ tty = strdup(option.consolename); ++ tty = strdup(consolename); if (gpm_consolefd == -1) if ((gpm_consolefd=open(tty,O_WRONLY)) < 0) { Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-6/gpm.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- gpm.spec 23 May 2007 13:05:49 -0000 1.51 +++ gpm.spec 23 May 2007 13:19:20 -0000 1.52 @@ -69,7 +69,7 @@ %patch22 -p1 -b .close-fds %patch23 -p1 -b .aligned-sleep %patch24 -p1 -b .deadsocket -%patch25 -p1 -b /default-handler +%patch25 -p1 -b .default-handler %build rm -f configure From fedora-cvs-commits at redhat.com Wed May 23 15:08:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 23 May 2007 11:08:53 -0400 Subject: rpms/shadow-utils/FC-6 shadow-4.0.17-findNewUIDOnce.patch, NONE, 1.1 shadow-utils.spec, 1.90, 1.91 Message-ID: <200705231508.l4NF8ruR003014@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/shadow-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv2997 Modified Files: shadow-utils.spec Added Files: shadow-4.0.17-findNewUIDOnce.patch Log Message: - do not run find_new_uid() twice and use getpwuid() to check UID uniqueness (#236871 shadow-4.0.17-findNewUIDOnce.patch: useradd.c | 49 +++++++++++++++++-------------------------------- 1 files changed, 17 insertions(+), 32 deletions(-) --- NEW FILE shadow-4.0.17-findNewUIDOnce.patch --- --- shadow-4.0.17/src/useradd.c.findNewUidOnce 2007-05-16 14:42:55.000000000 +0200 +++ shadow-4.0.17/src/useradd.c 2007-05-16 14:53:24.000000000 +0200 @@ -854,8 +854,9 @@ * find_new_uid - find the next available UID * * find_new_uid() locates the next highest unused UID in the password - * file, or checks the given user ID against the existing ones for - * uniqueness. + * file. + * It doesn't make sense to use find_new_uid(), if UID is specified + * via "-u" option. */ static void find_new_uid (void) { @@ -871,12 +872,7 @@ uid_max = getdef_unum ("UID_MIN", 500) - 1; } - /* - * Start with some UID value if the user didn't provide us with - * one already. - */ - if (!uflg) - user_id = uid_min; + user_id = uid_min; /* * Search the entire password file, either looking for this @@ -890,25 +886,7 @@ setpwent (); while ((pwd = getpwent ())) { #endif - if (strcmp (user_name, pwd->pw_name) == 0) { - fprintf (stderr, _("%s: name %s is not unique\n"), - Prog, user_name); -#ifdef WITH_AUDIT - audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user", - user_name, user_id, 0); -#endif - exit (E_NAME_IN_USE); - } - if (!oflg && uflg && user_id == pwd->pw_uid) { - fprintf (stderr, _("%s: UID %u is not unique\n"), - Prog, (unsigned int) user_id); -#ifdef WITH_AUDIT - audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user", - user_name, user_id, 0); -#endif - exit (E_UID_IN_USE); - } - if (!uflg && pwd->pw_uid >= user_id) { + if (pwd->pw_uid >= user_id) { if (pwd->pw_uid > uid_max) continue; user_id = pwd->pw_uid + 1; @@ -921,7 +899,7 @@ * free UID starting with UID_MIN (it's O(n*n) but can be avoided * by not having users with UID equal to UID_MAX). --marekm */ - if (!uflg && user_id == uid_max + 1) { + if (user_id == uid_max + 1) { for (user_id = uid_min; user_id < uid_max; user_id++) { #ifdef NO_GETPWENT pw_rewind (); @@ -1562,9 +1540,6 @@ struct passwd pwent; struct spwd spent; - if (!oflg) - find_new_uid (); - /* * Fill in the password structure with any new fields, making * copies of strings. @@ -1883,7 +1858,17 @@ /* first, seek for a valid uid to use for this user. * We do this because later we can use the uid we found as * gid too ... --gafton */ - find_new_uid (); + if (!uflg) + find_new_uid (); + else { + if (getpwuid (user_id)) { + fprintf (stderr, _("%s: UID %u is not unique\n"), Prog, (unsigned int) user_id); +#ifdef WITH_AUDIT + audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user", user_name, user_id, 0); +#endif + exit (E_UID_IN_USE); + } + } } /* do we have to add a group for that user? This is why we need to Index: shadow-utils.spec =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/FC-6/shadow-utils.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- shadow-utils.spec 14 Jan 2007 13:22:52 -0000 1.90 +++ shadow-utils.spec 23 May 2007 15:08:51 -0000 1.91 @@ -5,7 +5,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.17 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 @@ -25,6 +25,7 @@ Patch10: shadow-4.0.17-auditLogging.patch Patch11: shadow-4.0.17-overflow.patch Patch12: shadow-4.0.17-appendOption.patch +Patch13: shadow-4.0.17-findNewUIDOnce.patch License: BSD Group: System Environment/Base BuildRequires: autoconf, automake, libtool, gettext-devel @@ -66,6 +67,7 @@ %patch10 -p1 -b .auditLogging %patch11 -p1 -b .overflow %patch12 -p1 -b .appendOption +%patch13 -p1 -b .findNewUID rm po/*.gmo rm po/stamp-po @@ -220,6 +222,10 @@ %{_mandir}/*/man8/faillog.8* %changelog +* Wed May 23 2007 Peter Vrabec 2:4.0.17-13 +- do not run find_new_uid() twice and use getpwuid() to check + UID uniqueness (#236871) + * Sun Jan 14 2007 Peter Vrabec 2:4.0.17-12 - fix append option in usermod (#222540). From fedora-cvs-commits at redhat.com Wed May 23 16:14:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 23 May 2007 12:14:40 -0400 Subject: rpms/setup/devel .cvsignore, 1.43, 1.44 setup.spec, 1.48, 1.49 sources, 1.44, 1.45 Message-ID: <200705231614.l4NGEe8j006227@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/setup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6187 Modified Files: .cvsignore setup.spec sources Log Message: - Fixed tcsh behaviour for non login shells (#191233) - Fixed umask setting for tcsh to behave identical to bash logins (#199817) - Added ipv6-crypt and ipv6-auth for backwards compatibility (#210546) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/setup/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 18 Apr 2007 08:54:46 -0000 1.43 +++ .cvsignore 23 May 2007 16:14:38 -0000 1.44 @@ -1 +1 @@ -setup-2.6.4.tar.bz2 +setup-2.6.5.tar.bz2 Index: setup.spec =================================================================== RCS file: /cvs/dist/rpms/setup/devel/setup.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- setup.spec 18 Apr 2007 08:54:46 -0000 1.48 +++ setup.spec 23 May 2007 16:14:38 -0000 1.49 @@ -1,6 +1,6 @@ Summary: A set of system configuration and setup files. Name: setup -Version: 2.6.4 +Version: 2.6.5 Release: 1%{?dist} License: public domain Group: System Environment/Base @@ -76,6 +76,11 @@ %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab %changelog +* Wed May 23 2007 Phil Knirsch 2.6.5-1 +- Fixed tcsh behaviour for non login shells (#191233) +- Fixed umask setting for tcsh to behave identical to bash logins (#199817) +- Added ipv6-crypt and ipv6-auth for backwards compatibility (#210546) + * Wed Apr 18 2007 Phil Knirsch 2.6.4-1 - Modified the 111/[tcp/udp] entries to work with rpcbind (#236639) Index: sources =================================================================== RCS file: /cvs/dist/rpms/setup/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 18 Apr 2007 08:54:46 -0000 1.44 +++ sources 23 May 2007 16:14:38 -0000 1.45 @@ -1 +1 @@ -c2333e971ec99b8e5af342ace4e664ea setup-2.6.4.tar.bz2 +171e8f06ff5da5a305f7c90d5428a63b setup-2.6.5.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 23 18:36:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 23 May 2007 14:36:41 -0400 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.46, 1.47 selinux-policy.spec, 1.367, 1.368 Message-ID: <200705231836.l4NIafWF011038@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11022 Modified Files: policy-20061106.patch selinux-policy.spec Log Message: * Tue May 22 2007 Dan Walsh 2.4.6-73 - Allow aixexec to use /tmp - Allow amanda to read var_lib files policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 94 +++- policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 11 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 57 ++ policy/modules/admin/amtu.te | 56 ++ policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 24 - policy/modules/admin/kudzu.te | 14 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 14 policy/modules/admin/netutils.te | 19 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 20 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 86 +++ policy/modules/admin/rpm.te | 49 -- policy/modules/admin/su.if | 38 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 13 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 58 ++ policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 ++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 70 +++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 39 - policy/modules/apps/mozilla.if | 208 +++++++-- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 7 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 20 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 29 + policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 140 ++++++ policy/modules/kernel/corenetwork.te.in | 14 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 ++ policy/modules/kernel/domain.te | 22 policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 224 +++++++++ policy/modules/kernel/filesystem.if | 62 ++ policy/modules/kernel/filesystem.te | 30 + policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 22 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 21 policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 3 policy/modules/services/aide.te | 11 policy/modules/services/amavis.if | 19 policy/modules/services/amavis.te | 3 policy/modules/services/apache.fc | 17 policy/modules/services/apache.if | 157 ++++++ policy/modules/services/apache.te | 43 + policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 40 + policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 6 policy/modules/services/bluetooth.te | 10 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 25 - policy/modules/services/clamav.te | 3 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++- policy/modules/services/cron.te | 58 ++ policy/modules/services/cups.fc | 4 policy/modules/services/cups.te | 19 policy/modules/services/cvs.te | 2 policy/modules/services/cyrus.te | 5 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 66 ++ policy/modules/services/dbus.te | 4 policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/dovecot.fc | 1 policy/modules/services/dovecot.if | 44 + policy/modules/services/dovecot.te | 57 ++ policy/modules/services/fail2ban.fc | 3 policy/modules/services/fail2ban.if | 80 +++ policy/modules/services/fail2ban.te | 74 +++ policy/modules/services/ftp.te | 21 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 114 ++++ policy/modules/services/hal.te | 26 - policy/modules/services/inetd.te | 28 - policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 25 + policy/modules/services/kerberos.te | 15 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 57 +- policy/modules/services/lpd.te | 5 policy/modules/services/mailman.if | 20 policy/modules/services/mailman.te | 1 policy/modules/services/mta.fc | 1 policy/modules/services/mta.if | 20 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 34 + policy/modules/services/nscd.if | 20 policy/modules/services/nscd.te | 28 - policy/modules/services/ntp.te | 1 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 5 policy/modules/services/openca.if | 4 policy/modules/services/openca.te | 2 policy/modules/services/openct.te | 2 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 ++ policy/modules/services/pcscd.te | 79 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 11 policy/modules/services/portmap.te | 5 policy/modules/services/portslave.te | 1 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 22 policy/modules/services/postfix.te | 48 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 29 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 2 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 22 policy/modules/services/rlogin.te | 11 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.if | 3 policy/modules/services/rpc.te | 27 - policy/modules/services/rshd.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.fc | 6 policy/modules/services/samba.if | 62 ++ policy/modules/services/samba.te | 68 ++ policy/modules/services/sasl.te | 13 policy/modules/services/sendmail.if | 22 policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 17 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 24 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 21 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 14 policy/modules/services/telnet.te | 3 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 ++ policy/modules/services/uucp.te | 44 + policy/modules/services/uwimap.te | 1 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 191 ++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 180 +++++++ policy/modules/system/authlogin.te | 41 + policy/modules/system/clock.te | 18 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 policy/modules/system/init.if | 64 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 121 +++++ policy/modules/system/iptables.te | 23 policy/modules/system/libraries.fc | 43 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 11 policy/modules/system/logging.fc | 5 policy/modules/system/logging.if | 61 ++ policy/modules/system/logging.te | 33 + policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 + policy/modules/system/lvm.te | 91 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 +++ policy/modules/system/modutils.te | 26 - policy/modules/system/mount.te | 27 - policy/modules/system/netlabel.te | 10 policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 16 policy/modules/system/selinuxutil.fc | 10 policy/modules/system/selinuxutil.if | 124 +++++ policy/modules/system/selinuxutil.te | 134 ++--- policy/modules/system/sysnetwork.te | 13 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 policy/modules/system/unconfined.te | 23 policy/modules/system/userdomain.if | 622 +++++++++++++++++++++++---- policy/modules/system/userdomain.te | 105 ++-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 53 ++ policy/support/*Warnings* | 189 ++++++++ policy/support/file_patterns.spt | 534 +++++++++++++++++++++++ policy/support/obj_perm_sets.spt | 144 ++++++ 255 files changed, 7452 insertions(+), 724 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.46 -r 1.47 policy-20061106.patch Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- policy-20061106.patch 22 May 2007 14:05:17 -0000 1.46 +++ policy-20061106.patch 23 May 2007 18:36:38 -0000 1.47 @@ -1,20 +1,20 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.4.6/config/appconfig-strict/seusers --- nsaserefpolicy/config/appconfig-strict/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-05-22 12:40:26.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u root:root __default__:user_u diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers --- nsaserefpolicy/config/appconfig-strict-mcs/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-05-22 12:40:26.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_contexts serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts --- nsaserefpolicy/config/appconfig-strict-mls/default_contexts 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mls/default_contexts 2007-05-22 12:40:26.000000000 -0400 @@ -1,7 +1,7 @@ system_r:sulogin_t:s0 sysadm_r:sysadm_t:s0 -system_r:local_login_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0 @@ -28,14 +28,14 @@ staff_r:staff_su_t:s0 staff_r:staff_t:s0 user_r:user_t:s0 sysadm_r:sysadm_t:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.4.6/config/appconfig-strict-mls/seusers --- nsaserefpolicy/config/appconfig-strict-mls/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-05-22 12:40:26.000000000 -0400 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mls_systemhigh root:root:s0-mls_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.4.6/man/man8/kerberos_selinux.8 --- nsaserefpolicy/man/man8/kerberos_selinux.8 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/man/man8/kerberos_selinux.8 2007-05-22 12:40:26.000000000 -0400 @@ -18,7 +18,7 @@ .br service krb5kdc restart @@ -47,7 +47,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.4.6/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-05-22 12:40:26.000000000 -0400 @@ -619,6 +619,8 @@ send recv @@ -59,7 +59,7 @@ class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.4.6/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/global_tunables 2007-05-16 14:56:07.000000000 -0400 ++++ serefpolicy-2.4.6/policy/global_tunables 2007-05-22 12:40:26.000000000 -0400 @@ -82,6 +82,14 @@ ## @@ -213,7 +213,7 @@ +gen_tunable(allow_console_login,false) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.4.6/policy/mls --- nsaserefpolicy/policy/mls 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/mls 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/mls 2007-05-22 12:40:26.000000000 -0400 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or @@ -287,7 +287,7 @@ mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.4.6/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-05-22 12:40:26.000000000 -0400 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -298,7 +298,7 @@ logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.4.6/policy/modules/admin/amanda.if --- nsaserefpolicy/policy/modules/admin/amanda.if 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-05-22 12:40:26.000000000 -0400 @@ -127,4 +127,21 @@ allow $1 amanda_log_t:file ra_file_perms; ') @@ -323,7 +323,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.4.6/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-05-23 11:17:26.000000000 -0400 @@ -75,6 +75,7 @@ allow amanda_t self:unix_dgram_socket create_socket_perms; allow amanda_t self:tcp_socket create_stream_socket_perms; @@ -332,7 +332,26 @@ # access to amanda_amandates_t allow amanda_t amanda_amandates_t:file { getattr lock read write }; -@@ -244,3 +245,8 @@ +@@ -84,7 +85,7 @@ + + # access to amandas data structure + allow amanda_t amanda_data_t:dir { read search write }; +-allow amanda_t amanda_data_t:file { read write }; ++allow amanda_t amanda_data_t:file manage_file_perms; + + # access to amanda_dumpdates_t + allow amanda_t amanda_dumpdates_t:file { getattr lock read write }; +@@ -96,6 +97,9 @@ + allow amanda_t amanda_gnutarlists_t:file manage_file_perms; + allow amanda_t amanda_gnutarlists_t:lnk_file manage_file_perms; + ++manage_dirs_pattern(amanda_t,amanda_var_lib_t,amanda_var_lib_t) ++manage_files_pattern(amanda_t,amanda_var_lib_t,amanda_var_lib_t) ++ + allow amanda_t amanda_log_t:file create_file_perms; + allow amanda_t amanda_log_t:dir manage_dir_perms; + logging_log_filetrans(amanda_t,amanda_log_t,{ file dir }) +@@ -244,3 +248,8 @@ optional_policy(` nscd_socket_use(amanda_recover_t) ') @@ -343,14 +362,14 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.fc serefpolicy-2.4.6/policy/modules/admin/amtu.fc --- nsaserefpolicy/policy/modules/admin/amtu.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.fc 2007-05-22 12:40:26.000000000 -0400 @@ -0,0 +1,3 @@ + +/usr/bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.if serefpolicy-2.4.6/policy/modules/admin/amtu.if --- nsaserefpolicy/policy/modules/admin/amtu.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.if 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.if 2007-05-22 12:40:26.000000000 -0400 @@ -0,0 +1,57 @@ +## +## abstract Machine Test Utility @@ -411,7 +430,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amtu.te serefpolicy-2.4.6/policy/modules/admin/amtu.te --- nsaserefpolicy/policy/modules/admin/amtu.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amtu.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/amtu.te 2007-05-22 12:40:26.000000000 -0400 @@ -0,0 +1,56 @@ +policy_module(amtu,1.0.23) + @@ -471,7 +490,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/backup.te serefpolicy-2.4.6/policy/modules/admin/backup.te --- nsaserefpolicy/policy/modules/admin/backup.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/backup.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/backup.te 2007-05-22 12:40:26.000000000 -0400 @@ -82,3 +82,8 @@ optional_policy(` nis_use_ypbind(backup_t) @@ -483,7 +502,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.4.6/policy/modules/admin/bootloader.fc --- nsaserefpolicy/policy/modules/admin/bootloader.fc 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-05-22 12:40:26.000000000 -0400 @@ -2,11 +2,6 @@ /etc/lilo\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) /etc/yaboot\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) @@ -498,7 +517,7 @@ /sbin/ybin.* -- gen_context(system_u:object_r:bootloader_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.4.6/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-05-22 12:40:26.000000000 -0400 @@ -93,6 +93,8 @@ fs_manage_dos_files(bootloader_t) @@ -533,7 +552,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.4.6/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te 2007-05-22 12:40:26.000000000 -0400 @@ -8,7 +8,12 @@ type consoletype_t; @@ -589,7 +608,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ddcprobe.te serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te --- nsaserefpolicy/policy/modules/admin/ddcprobe.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te 2007-05-22 12:40:26.000000000 -0400 @@ -53,3 +53,13 @@ [...2072 lines suppressed...] @@ -8,8 +8,7 @@ type netlabel_mgmt_t; @@ -11846,7 +11913,7 @@ seutil_use_newrole_fds(netlabel_mgmt_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/pcmcia.te serefpolicy-2.4.6/policy/modules/system/pcmcia.te --- nsaserefpolicy/policy/modules/system/pcmcia.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/pcmcia.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/pcmcia.te 2007-05-22 12:40:26.000000000 -0400 @@ -150,3 +150,8 @@ # cjp: why is this created all over the place? allow cardmgr_t { var_run_t cardmgr_var_run_t tmp_t }:dir rw_dir_perms; @@ -11858,7 +11925,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-2.4.6/policy/modules/system/raid.te --- nsaserefpolicy/policy/modules/system/raid.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/raid.te 2007-05-21 13:31:02.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/raid.te 2007-05-22 12:40:26.000000000 -0400 @@ -19,7 +19,7 @@ # Local policy # @@ -11904,7 +11971,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.4.6/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.fc 2007-05-15 14:07:24.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.fc 2007-05-22 12:40:26.000000000 -0400 @@ -6,13 +6,13 @@ /etc/selinux(/.*)? gen_context(system_u:object_r:selinux_config_t,s0) /etc/selinux/([^/]*/)?contexts(/.*)? gen_context(system_u:object_r:default_context_t,s0) @@ -11935,7 +12002,7 @@ # /var/run diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.4.6/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.if 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.if 2007-05-23 10:43:52.000000000 -0400 @@ -471,6 +471,7 @@ role $2 types run_init_t; allow run_init_t $3:chr_file rw_term_perms; @@ -11978,7 +12045,7 @@ files_search_usr($1) corecmd_search_bin($1) -@@ -1121,3 +1122,118 @@ +@@ -1121,3 +1122,120 @@ allow $1 selinux_config_t:dir search_dir_perms; allow $1 semanage_trans_lock_t:file rw_file_perms; ') @@ -12050,6 +12117,8 @@ + + # Running genhomedircon requires this for finding all users + auth_use_nsswitch($1) ++ # Admins are creating pp files in random locations ++ auth_read_all_files_except_shadow($1) + + libs_use_ld_so($1) + libs_use_shared_libs($1) @@ -12099,7 +12168,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.4.6/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/selinuxutil.te 2007-05-22 12:40:26.000000000 -0400 @@ -107,6 +107,19 @@ type semanage_exec_t; domain_entry_file(semanage_t, semanage_exec_t) @@ -12355,7 +12424,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.4.6/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/sysnetwork.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/sysnetwork.te 2007-05-22 12:40:26.000000000 -0400 @@ -175,6 +175,8 @@ dbus_connect_system_bus(dhcpc_t) dbus_send_system_bus(dhcpc_t) @@ -12396,14 +12465,14 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.fc serefpolicy-2.4.6/policy/modules/system/tzdata.fc --- nsaserefpolicy/policy/modules/system/tzdata.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.fc 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.fc 2007-05-22 12:40:26.000000000 -0400 @@ -0,0 +1,3 @@ +# tzdata executable will have: + +/usr/sbin/tzdata-update -- gen_context(system_u:object_r:tzdata_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.if serefpolicy-2.4.6/policy/modules/system/tzdata.if --- nsaserefpolicy/policy/modules/system/tzdata.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.if 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.if 2007-05-22 12:40:26.000000000 -0400 @@ -0,0 +1,23 @@ +## policy for tzdata + @@ -12430,7 +12499,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.te serefpolicy-2.4.6/policy/modules/system/tzdata.te --- nsaserefpolicy/policy/modules/system/tzdata.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.te 2007-05-22 12:40:26.000000000 -0400 @@ -0,0 +1,51 @@ +policy_module(tzdata,1.0.0) + @@ -12485,7 +12554,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.4.6/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.fc 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.fc 2007-05-22 12:40:26.000000000 -0400 @@ -7,6 +7,8 @@ ifdef(`targeted_policy',` /usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) @@ -12498,7 +12567,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.4.6/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.if 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.if 2007-05-22 12:40:26.000000000 -0400 @@ -31,6 +31,7 @@ allow $1 self:nscd *; allow $1 self:dbus *; @@ -12534,7 +12603,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.4.6/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.te 2007-05-15 11:51:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.te 2007-05-22 12:40:26.000000000 -0400 @@ -48,6 +48,10 @@ userdom_priveleged_home_dir_manager(unconfined_t) @@ -12599,7 +12668,7 @@ init_dbus_chat_script(unconfined_execmem_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.4.6/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/userdomain.if 2007-05-16 14:22:36.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/userdomain.if 2007-05-22 12:40:26.000000000 -0400 @@ -22,9 +22,9 @@ ## # @@ -13500,7 +13569,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.4.6/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/userdomain.te 2007-05-15 11:51:27.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/userdomain.te 2007-05-22 12:40:26.000000000 -0400 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; @@ -13703,7 +13772,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-2.4.6/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.fc 2007-05-15 11:51:27.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/xen.fc 2007-05-22 12:40:26.000000000 -0400 @@ -8,6 +8,7 @@ /usr/sbin/xm -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -13714,7 +13783,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.4.6/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-05-15 11:51:27.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-05-22 12:40:26.000000000 -0400 @@ -20,12 +20,15 @@ type xenctl_t; files_type(xenctl_t) @@ -13864,7 +13933,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/file_patterns.spt serefpolicy-2.4.6/policy/support/file_patterns.spt --- nsaserefpolicy/policy/support/file_patterns.spt 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/support/file_patterns.spt 2007-05-16 14:08:46.000000000 -0400 ++++ serefpolicy-2.4.6/policy/support/file_patterns.spt 2007-05-22 12:40:26.000000000 -0400 @@ -0,0 +1,534 @@ +# +# Directory patterns (dir) @@ -14402,7 +14471,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.4.6/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/support/obj_perm_sets.spt 2007-05-16 14:31:37.000000000 -0400 ++++ serefpolicy-2.4.6/policy/support/obj_perm_sets.spt 2007-05-22 12:40:26.000000000 -0400 @@ -224,3 +224,147 @@ # define(`client_stream_socket_perms', `{ create ioctl read getattr write setattr append bind getopt setopt shutdown }') @@ -14553,7 +14622,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/*Warnings* serefpolicy-2.4.6/policy/support/*Warnings* --- nsaserefpolicy/policy/support/*Warnings* 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/support/*Warnings* 2007-05-16 14:11:13.000000000 -0400 ++++ serefpolicy-2.4.6/policy/support/*Warnings* 2007-05-22 12:40:26.000000000 -0400 @@ -0,0 +1,189 @@ +(1) (initialization/error) An error has occurred while loading /home/devel/dwalsh/.xemacs/init.el: + @@ -14746,7 +14815,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.4.6/Rules.modular --- nsaserefpolicy/Rules.modular 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/Rules.modular 2007-05-15 11:51:27.000000000 -0400 ++++ serefpolicy-2.4.6/Rules.modular 2007-05-22 12:40:26.000000000 -0400 @@ -219,6 +219,16 @@ ######################################## Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v retrieving revision 1.367 retrieving revision 1.368 diff -u -r1.367 -r1.368 --- selinux-policy.spec 22 May 2007 14:05:17 -0000 1.367 +++ selinux-policy.spec 23 May 2007 18:36:38 -0000 1.368 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.4.6 -Release: 72%{?dist} +Release: 73%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -360,6 +360,10 @@ %endif %changelog +* Tue May 22 2007 Dan Walsh 2.4.6-73 +- Allow aixexec to use /tmp +- Allow amanda to read var_lib files + * Tue May 22 2007 Dan Walsh 2.4.6-72 - Allow prelink sys_resource, Add transition rule to allow apps to run java in different context From fedora-cvs-commits at redhat.com Wed May 23 21:38:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 23 May 2007 17:38:40 -0400 Subject: rpms/libpng/FC-6 libpng-splt-bug.patch, NONE, 1.1 libpng-trns-bug.patch, NONE, 1.1 libpng.spec, 1.38, 1.39 Message-ID: <200705232138.l4NLce87015489@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/libpng/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15470 Modified Files: libpng.spec Added Files: libpng-splt-bug.patch libpng-trns-bug.patch Log Message: Add patches for CVE-2006-5793, CVE-2007-2445 libpng-splt-bug.patch: pngset.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE libpng-splt-bug.patch --- Fix for CVE-2006-5793 --- potential SIGSEGV due to copying past the end of memory. (This is already applied in libpng 1.2.16 and up.) diff -Naur libpng-1.2.10.orig/pngset.c libpng-1.2.10/pngset.c --- libpng-1.2.10.orig/pngset.c 2006-04-23 14:45:34.000000000 -0400 +++ libpng-1.2.10/pngset.c 2007-05-13 10:04:38.000000000 -0400 @@ -976,10 +976,10 @@ /* TODO: use png_malloc_warn */ png_strcpy(to->name, from->name); to->entries = (png_sPLT_entryp)png_malloc(png_ptr, - from->nentries * png_sizeof(png_sPLT_t)); + from->nentries * png_sizeof(png_sPLT_entry)); /* TODO: use png_malloc_warn */ png_memcpy(to->entries, from->entries, - from->nentries * png_sizeof(png_sPLT_t)); + from->nentries * png_sizeof(png_sPLT_entry)); to->nentries = from->nentries; to->depth = from->depth; } libpng-trns-bug.patch: pngrutil.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE libpng-trns-bug.patch --- Fix for CVE-2007-2445 --- libpng crashes if CRC error is detected in a grayscale tRNS chunk, because png_handle_tRNS leaves inconsistent state which eventually leads to attempting to free() unallocated memory. diff -Naur libpng-1.2.16.orig/pngrutil.c libpng-1.2.16/pngrutil.c --- libpng-1.2.16.orig/pngrutil.c 2007-01-31 08:22:35.000000000 -0500 +++ libpng-1.2.16/pngrutil.c 2007-05-12 17:07:41.000000000 -0400 @@ -1314,7 +1314,10 @@ } if (png_crc_finish(png_ptr, 0)) + { + png_ptr->num_trans = 0; return; + } png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans, &(png_ptr->trans_values)); Index: libpng.spec =================================================================== RCS file: /cvs/dist/rpms/libpng/FC-6/libpng.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- libpng.spec 2 Oct 2006 15:05:30 -0000 1.38 +++ libpng.spec 23 May 2007 21:38:38 -0000 1.39 @@ -1,13 +1,16 @@ Summary: A library of functions for manipulating PNG image format files Name: libpng Version: 1.2.10 -Release: 7 +Release: 9%{?dist} License: OSI certified Group: System Environment/Libraries Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2 Patch0: libpng-1.2.10-multilib.patch Patch1: libpng-1.2.10-pngconf.patch -Buildroot: %{_tmppath}/%{name}-%{version}-root +Patch2: libpng-trns-bug.patch +Patch3: libpng-splt-bug.patch + +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildPrereq: zlib-devel Provides: libpng.so.3 URL: http://www.libpng.org/pub/png/ @@ -43,6 +46,8 @@ %setup -q %patch0 -p1 -b .multilib %patch1 -p1 -b .pngconf +%patch2 -p1 +%patch3 -p1 %build %configure @@ -79,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 23 2007 Tom Lane 2:1.2.10-9 +- Add patch to fix CVE-2006-5793 +Related: #215405 +- Add patch to fix CVE-2007-2445 +Related: #239542 + * Mon Oct 02 2006 Jesse Keating - 2:1.2.10-7 - Require pkgconfig in the -devel subpackage as it gets called by /usr/bin/libpng-config From fedora-cvs-commits at redhat.com Wed May 23 21:47:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 23 May 2007 17:47:11 -0400 Subject: rpms/libpng/FC-5 libpng-splt-bug.patch, NONE, 1.1 libpng-trns-bug.patch, NONE, 1.1 libpng.spec, 1.27, 1.28 Message-ID: <200705232147.l4NLlBlp015674@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/libpng/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv15653 Modified Files: libpng.spec Added Files: libpng-splt-bug.patch libpng-trns-bug.patch Log Message: Add patches for CVE-2006-5793, CVE-2007-2445 libpng-splt-bug.patch: pngset.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE libpng-splt-bug.patch --- Fix for CVE-2006-5793 --- potential SIGSEGV due to copying past the end of memory. (This is already applied in libpng 1.2.16 and up.) diff -Naur libpng-1.2.10.orig/pngset.c libpng-1.2.10/pngset.c --- libpng-1.2.10.orig/pngset.c 2006-04-23 14:45:34.000000000 -0400 +++ libpng-1.2.10/pngset.c 2007-05-13 10:04:38.000000000 -0400 @@ -976,10 +976,10 @@ /* TODO: use png_malloc_warn */ png_strcpy(to->name, from->name); to->entries = (png_sPLT_entryp)png_malloc(png_ptr, - from->nentries * png_sizeof(png_sPLT_t)); + from->nentries * png_sizeof(png_sPLT_entry)); /* TODO: use png_malloc_warn */ png_memcpy(to->entries, from->entries, - from->nentries * png_sizeof(png_sPLT_t)); + from->nentries * png_sizeof(png_sPLT_entry)); to->nentries = from->nentries; to->depth = from->depth; } libpng-trns-bug.patch: pngrutil.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE libpng-trns-bug.patch --- Fix for CVE-2007-2445 --- libpng crashes if CRC error is detected in a grayscale tRNS chunk, because png_handle_tRNS leaves inconsistent state which eventually leads to attempting to free() unallocated memory. diff -Naur libpng-1.2.16.orig/pngrutil.c libpng-1.2.16/pngrutil.c --- libpng-1.2.16.orig/pngrutil.c 2007-01-31 08:22:35.000000000 -0500 +++ libpng-1.2.16/pngrutil.c 2007-05-12 17:07:41.000000000 -0400 @@ -1314,7 +1314,10 @@ } if (png_crc_finish(png_ptr, 0)) + { + png_ptr->num_trans = 0; return; + } png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans, &(png_ptr->trans_values)); Index: libpng.spec =================================================================== RCS file: /cvs/dist/rpms/libpng/FC-5/libpng.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- libpng.spec 11 Feb 2006 04:11:17 -0000 1.27 +++ libpng.spec 23 May 2007 21:47:09 -0000 1.28 @@ -1,12 +1,15 @@ Summary: A library of functions for manipulating PNG image format files. Name: libpng Version: 1.2.8 -Release: 2.2.1 +Release: 3%{?dist} License: OSI certified Group: System Environment/Libraries Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2 Patch0: libpng-rhconf.patch -Buildroot: %{_tmppath}/%{name}-%{version}-root +Patch2: libpng-trns-bug.patch +Patch3: libpng-splt-bug.patch + +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildPrereq: zlib-devel Provides: libpng.so.3 URL: http://www.libpng.org/pub/png/ @@ -27,7 +30,7 @@ %package devel Summary: Development tools for programs to manipulate PNG image format files. Group: Development/Libraries -Requires: libpng = %{epoch}:%{version}, zlib-devel +Requires: libpng = %{epoch}:%{version}-%{release}, zlib-devel, pkgconfig %description devel The libpng-devel package contains the header files and static @@ -43,6 +46,8 @@ ln -s scripts/makefile.linux Makefile %patch0 -p1 -b .rhconf +%patch2 -p1 +%patch3 -p1 %build make ZLIBLIB=%{_libdir} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBPATH=%{_libdir} @@ -75,6 +80,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 23 2007 Tom Lane 2:1.2.8-3 +- Add patch to fix CVE-2006-5793 +Related: #215405 +- Add patch to fix CVE-2007-2445 +Related: #239542 +- Require pkgconfig in the -devel subpackage +Resolves: #217903 + * Fri Feb 10 2006 Jesse Keating - 2:1.2.8-2.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu May 24 06:37:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 24 May 2007 02:37:22 -0400 Subject: rpms/docbook-utils/devel docbook-utils-2ndspaces.patch, NONE, 1.1 docbook-utils.spec, 1.22, 1.23 Message-ID: <200705240637.l4O6bM0t025501@cvs.devel.redhat.com> Author: ovasik Update of /cvs/dist/rpms/docbook-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25463/devel Modified Files: docbook-utils.spec Added Files: docbook-utils-2ndspaces.patch Log Message: patch from upstream - more fixes for handling spaces in directory name docbook-utils-2ndspaces.patch: backends/dvi | 26 +++++++++++++------------- backends/html | 2 +- backends/pdf | 20 ++++++++++---------- backends/ps | 28 ++++++++++++++-------------- backends/rtf | 2 +- backends/tex | 2 +- backends/txt | 2 +- bin/jw.in | 8 ++++---- 8 files changed, 45 insertions(+), 45 deletions(-) --- NEW FILE docbook-utils-2ndspaces.patch --- --- Original/backends/dvi 2003-01-13 18:14:10.000000000 +0100 +++ Changes/backends/dvi 2007-05-21 14:10:42.000000000 +0200 @@ -6,31 +6,31 @@ export TEXINPUTS # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi # Convert from TeX to DVI -jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp +jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" if [ $? -ne 0 ] then - cat ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tex + cat "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tex" exit 2 fi -rm ${SGML_FILE_NAME}.tmp +rm "${SGML_FILE_NAME}.tmp" # If there are unresolved references, re-run jadetex, twice -if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1 +if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1 then - jadetex ${SGML_FILE_NAME}.tex >/dev/null - jadetex ${SGML_FILE_NAME}.tex >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null fi -rm ${SGML_FILE_NAME}.log -rm ${SGML_FILE_NAME}.aux -rm ${SGML_FILE_NAME}.tex -rm ${SGML_FILE_NAME}.out +rm "${SGML_FILE_NAME}.log" +rm "${SGML_FILE_NAME}.aux" +rm "${SGML_FILE_NAME}.tex" +rm "${SGML_FILE_NAME}.out" exit 0 --- Original/backends/html 2000-07-21 20:15:22.000000000 +0200 +++ Changes/backends/html 2007-05-21 14:11:32.000000000 +0200 @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to HTML -$SGML_JADE -t sgml $SGML_ARGUMENTS +$SGML_JADE -t sgml $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi --- Original/backends/pdf 2003-03-17 18:47:11.000000000 +0100 +++ Changes/backends/pdf 2007-05-21 14:13:58.000000000 +0200 @@ -6,26 +6,26 @@ export TEXINPUTS # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi # Convert from TeX to PDF -pdfjadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp +pdfjadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" if [ $? -ne 0 ] then - cat ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tex + cat "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tex" exit 2 fi -rm ${SGML_FILE_NAME}.tmp +rm "${SGML_FILE_NAME}.tmp" # Unconditionally re-run pdfjadetex, twice -pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null -pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null -rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \ - ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out +pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null +pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null +rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \ + "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out" exit 0 --- Original/backends/ps 2003-03-17 18:51:48.000000000 +0100 +++ Changes/backends/ps 2007-05-21 14:16:51.000000000 +0200 @@ -6,30 +6,30 @@ export TEXINPUTS # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi # Convert from TeX to DVI -jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp +jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" if [ $? -ne 0 ] then - cat ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tex + cat "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tex" exit 2 fi -rm ${SGML_FILE_NAME}.tmp +rm "${SGML_FILE_NAME}.tmp" # If there are unresolved references, re-run jadetex, twice -if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1 +if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1 then - jadetex ${SGML_FILE_NAME}.tex >/dev/null - jadetex ${SGML_FILE_NAME}.tex >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null fi -rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \ - ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out +rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \ + "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out" # Convert from DVI to PostScript PAPERSIZE="-t letter" @@ -38,12 +38,12 @@ PAPERSIZE="-t a4" fi -dvips -R -q $PAPERSIZE ${SGML_FILE_NAME}.dvi -o ${SGML_FILE_NAME}.ps +dvips -R -q $PAPERSIZE "${SGML_FILE_NAME}.dvi" -o "${SGML_FILE_NAME}.ps" if [ $? -ne 0 ] then - rm ${SGML_FILE_NAME}.dvi + rm "${SGML_FILE_NAME}.dvi" exit 3 fi -rm ${SGML_FILE_NAME}.dvi +rm "${SGML_FILE_NAME}.dvi" exit 0 --- Original/backends/rtf 2000-07-21 20:15:22.000000000 +0200 +++ Changes/backends/rtf 2007-05-21 14:18:37.000000000 +0200 @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to RTF -$SGML_JADE -t rtf -o ${SGML_FILE_NAME}.rtf $SGML_ARGUMENTS +$SGML_JADE -t rtf -o "${SGML_FILE_NAME}.rtf" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi --- Original/backends/tex 2000-07-21 20:15:22.000000000 +0200 +++ Changes/backends/tex 2007-05-21 14:21:12.000000000 +0200 @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi --- Original/backends/txt 2004-02-11 14:58:03.000000000 +0100 +++ Changes/backends/txt 2007-05-21 14:22:33.000000000 +0200 @@ -23,7 +23,7 @@ trap 'rm -f "$HTML"; exit' 0 1 2 3 7 13 15 # Convert to HTML -$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} >${HTML} +$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} "$SGML_FILE" >${HTML} if [ $? -ne 0 ] then exit 1 fi --- Original/bin/jw.in 2003-04-30 18:21:49.000000000 +0200 +++ Changes/bin/jw.in 2007-05-21 14:28:58.000000000 +0200 @@ -270,14 +270,14 @@ echo -e $SGML_HELP_MESSAGE >&2 exit 1 fi -if [ ! -s $SGML_FILE ] +if [ ! -s "$SGML_FILE" ] then echo "`basename $0`: Cannot open \"$SGML_FILE\"." >&2 exit 3 fi # Separate the file name and the extension (if any) -SGML_FILE_NAME=`basename $SGML_FILE` +SGML_FILE_NAME=`basename "$SGML_FILE"` SGML_FILE_NAME=${SGML_FILE_NAME%.*} # Determine if we are in an XML file @@ -416,7 +416,7 @@ fi # Prepare the parser's arguments -SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL $SGML_FILE" +SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL" # Call the backend echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`" @@ -430,7 +430,7 @@ then sh $SGML_BACKEND else - sh $SGML_BACKEND >$SGML_FILE_NAME.html + sh $SGML_BACKEND >"$SGML_FILE_NAME.html" fi SGML_RETURN=$? cd "$SGML_CURRENT_DIRECTORY" Index: docbook-utils.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-utils/devel/docbook-utils.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- docbook-utils.spec 24 Apr 2007 14:49:26 -0000 1.22 +++ docbook-utils.spec 24 May 2007 06:37:20 -0000 1.23 @@ -1,6 +1,6 @@ Name: docbook-utils Version: 0.6.14 -Release: 7%{?dist} +Release: 8%{?dist} Group: Applications/Text Summary: Shell scripts for managing DocBook documents. @@ -27,6 +27,7 @@ Patch0: docbook-utils-spaces.patch Patch1: docbook-utils-funcsynopsis.patch +Patch2: docbook-utils-2ndspaces.patch %Description This package contains scripts are for easy conversion from DocBook @@ -51,6 +52,7 @@ %setup -q %patch0 -p1 -b .spaces %patch1 -p1 -b .0 +%patch2 -p1 -b .2ndspaces %build ./configure --prefix=%{_prefix} --mandir=%{_mandir} @@ -118,6 +120,11 @@ %{_mandir}/*/docbook2ps.* %changelog +* Mon May 21 2007 Ondrej Vasik 0.6.14-8 +- Added more fixes for handling spaces in directory name +- SGML_FILE variable is factored out of SGML_ARGUMENTS +- (changes taken from upstream) + * Tue Apr 24 2007 Petr Mejzlik 0.6.14-7 - add missing dist tag, bump release From fedora-cvs-commits at redhat.com Thu May 24 06:37:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 24 May 2007 02:37:22 -0400 Subject: rpms/docbook-utils/FC-6 docbook-utils-2ndspaces.patch, NONE, 1.1 docbook-utils.spec, 1.22, 1.23 Message-ID: <200705240637.l4O6bMeW025489@cvs.devel.redhat.com> Author: ovasik Update of /cvs/dist/rpms/docbook-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25463/FC-6 Modified Files: docbook-utils.spec Added Files: docbook-utils-2ndspaces.patch Log Message: patch from upstream - more fixes for handling spaces in directory name docbook-utils-2ndspaces.patch: backends/dvi | 26 +++++++++++++------------- backends/html | 2 +- backends/pdf | 20 ++++++++++---------- backends/ps | 28 ++++++++++++++-------------- backends/rtf | 2 +- backends/tex | 2 +- backends/txt | 2 +- bin/jw.in | 8 ++++---- 8 files changed, 45 insertions(+), 45 deletions(-) --- NEW FILE docbook-utils-2ndspaces.patch --- --- Original/backends/dvi 2003-01-13 18:14:10.000000000 +0100 +++ Changes/backends/dvi 2007-05-21 14:10:42.000000000 +0200 @@ -6,31 +6,31 @@ export TEXINPUTS # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi # Convert from TeX to DVI -jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp +jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" if [ $? -ne 0 ] then - cat ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tex + cat "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tex" exit 2 fi -rm ${SGML_FILE_NAME}.tmp +rm "${SGML_FILE_NAME}.tmp" # If there are unresolved references, re-run jadetex, twice -if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1 +if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1 then - jadetex ${SGML_FILE_NAME}.tex >/dev/null - jadetex ${SGML_FILE_NAME}.tex >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null fi -rm ${SGML_FILE_NAME}.log -rm ${SGML_FILE_NAME}.aux -rm ${SGML_FILE_NAME}.tex -rm ${SGML_FILE_NAME}.out +rm "${SGML_FILE_NAME}.log" +rm "${SGML_FILE_NAME}.aux" +rm "${SGML_FILE_NAME}.tex" +rm "${SGML_FILE_NAME}.out" exit 0 --- Original/backends/html 2000-07-21 20:15:22.000000000 +0200 +++ Changes/backends/html 2007-05-21 14:11:32.000000000 +0200 @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to HTML -$SGML_JADE -t sgml $SGML_ARGUMENTS +$SGML_JADE -t sgml $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi --- Original/backends/pdf 2003-03-17 18:47:11.000000000 +0100 +++ Changes/backends/pdf 2007-05-21 14:13:58.000000000 +0200 @@ -6,26 +6,26 @@ export TEXINPUTS # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi # Convert from TeX to PDF -pdfjadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp +pdfjadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" if [ $? -ne 0 ] then - cat ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tex + cat "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tex" exit 2 fi -rm ${SGML_FILE_NAME}.tmp +rm "${SGML_FILE_NAME}.tmp" # Unconditionally re-run pdfjadetex, twice -pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null -pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null -rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \ - ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out +pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null +pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null +rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \ + "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out" exit 0 --- Original/backends/ps 2003-03-17 18:51:48.000000000 +0100 +++ Changes/backends/ps 2007-05-21 14:16:51.000000000 +0200 @@ -6,30 +6,30 @@ export TEXINPUTS # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi # Convert from TeX to DVI -jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp +jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" if [ $? -ne 0 ] then - cat ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tmp - rm ${SGML_FILE_NAME}.tex + cat "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tmp" + rm "${SGML_FILE_NAME}.tex" exit 2 fi -rm ${SGML_FILE_NAME}.tmp +rm "${SGML_FILE_NAME}.tmp" # If there are unresolved references, re-run jadetex, twice -if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1 +if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1 then - jadetex ${SGML_FILE_NAME}.tex >/dev/null - jadetex ${SGML_FILE_NAME}.tex >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null + jadetex "${SGML_FILE_NAME}.tex" >/dev/null fi -rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \ - ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out +rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \ + "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out" # Convert from DVI to PostScript PAPERSIZE="-t letter" @@ -38,12 +38,12 @@ PAPERSIZE="-t a4" fi -dvips -R -q $PAPERSIZE ${SGML_FILE_NAME}.dvi -o ${SGML_FILE_NAME}.ps +dvips -R -q $PAPERSIZE "${SGML_FILE_NAME}.dvi" -o "${SGML_FILE_NAME}.ps" if [ $? -ne 0 ] then - rm ${SGML_FILE_NAME}.dvi + rm "${SGML_FILE_NAME}.dvi" exit 3 fi -rm ${SGML_FILE_NAME}.dvi +rm "${SGML_FILE_NAME}.dvi" exit 0 --- Original/backends/rtf 2000-07-21 20:15:22.000000000 +0200 +++ Changes/backends/rtf 2007-05-21 14:18:37.000000000 +0200 @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to RTF -$SGML_JADE -t rtf -o ${SGML_FILE_NAME}.rtf $SGML_ARGUMENTS +$SGML_JADE -t rtf -o "${SGML_FILE_NAME}.rtf" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi --- Original/backends/tex 2000-07-21 20:15:22.000000000 +0200 +++ Changes/backends/tex 2007-05-21 14:21:12.000000000 +0200 @@ -3,7 +3,7 @@ # This program is under GPL license. See LICENSE file for details. # Convert to TeX -$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS +$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" if [ $? -ne 0 ] then exit 1 fi --- Original/backends/txt 2004-02-11 14:58:03.000000000 +0100 +++ Changes/backends/txt 2007-05-21 14:22:33.000000000 +0200 @@ -23,7 +23,7 @@ trap 'rm -f "$HTML"; exit' 0 1 2 3 7 13 15 # Convert to HTML -$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} >${HTML} +$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} "$SGML_FILE" >${HTML} if [ $? -ne 0 ] then exit 1 fi --- Original/bin/jw.in 2003-04-30 18:21:49.000000000 +0200 +++ Changes/bin/jw.in 2007-05-21 14:28:58.000000000 +0200 @@ -270,14 +270,14 @@ echo -e $SGML_HELP_MESSAGE >&2 exit 1 fi -if [ ! -s $SGML_FILE ] +if [ ! -s "$SGML_FILE" ] then echo "`basename $0`: Cannot open \"$SGML_FILE\"." >&2 exit 3 fi # Separate the file name and the extension (if any) -SGML_FILE_NAME=`basename $SGML_FILE` +SGML_FILE_NAME=`basename "$SGML_FILE"` SGML_FILE_NAME=${SGML_FILE_NAME%.*} # Determine if we are in an XML file @@ -416,7 +416,7 @@ fi # Prepare the parser's arguments -SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL $SGML_FILE" +SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL" # Call the backend echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`" @@ -430,7 +430,7 @@ then sh $SGML_BACKEND else - sh $SGML_BACKEND >$SGML_FILE_NAME.html + sh $SGML_BACKEND >"$SGML_FILE_NAME.html" fi SGML_RETURN=$? cd "$SGML_CURRENT_DIRECTORY" Index: docbook-utils.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-utils/FC-6/docbook-utils.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- docbook-utils.spec 24 Apr 2007 14:48:15 -0000 1.22 +++ docbook-utils.spec 24 May 2007 06:37:19 -0000 1.23 @@ -1,6 +1,6 @@ Name: docbook-utils Version: 0.6.14 -Release: 6%{?dist} +Release: 8%{?dist} Group: Applications/Text Summary: Shell scripts for managing DocBook documents. @@ -27,6 +27,7 @@ Patch0: docbook-utils-spaces.patch Patch1: docbook-utils-funcsynopsis.patch +Patch2: docbook-utils-2ndspaces.patch %Description This package contains scripts are for easy conversion from DocBook @@ -51,6 +52,7 @@ %setup -q %patch0 -p1 -b .spaces %patch1 -p1 -b .funcsynopsis +%patch2 -p1 -b .2ndspaces %build ./configure --prefix=%{_prefix} --mandir=%{_mandir} @@ -118,6 +120,11 @@ %{_mandir}/*/docbook2ps.* %changelog +* Mon May 21 2007 Ondrej Vasik 0.6.14-8 +- Added more fixes for handling spaces in directory name +- SGML_FILE variable is factored out of SGML_ARGUMENTS +- (changes taken from upstream) + * Tue Apr 24 2007 Petr Mejzlik 0.6.14-6 - Fixed a minor bug in processing of (bug #217649) - add missing dist tag From fedora-cvs-commits at redhat.com Thu May 24 09:50:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 24 May 2007 05:50:26 -0400 Subject: rpms/openldap/FC-6 ldap.init,1.22,1.23 Message-ID: <200705240950.l4O9oQDk029507@cvs.devel.redhat.com> Author: jsafrane Update of /cvs/dist/rpms/openldap/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv29492 Modified Files: ldap.init Log Message: fix the slurpd spawning - return nozero status if any of the slurpd failed Index: ldap.init =================================================================== RCS file: /cvs/dist/rpms/openldap/FC-6/ldap.init,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ldap.init 22 May 2007 10:18:10 -0000 1.22 +++ ldap.init 24 May 2007 09:50:23 -0000 1.23 @@ -161,10 +161,14 @@ if [ "$replogfile" != "replogfile" ] then daemon ${slurpd} -r $replogfile -n $i + # make the return value nozero if any of the slurpd failed + RET=$? + if [ $RET -ne 0 ] ; then + RETVAL=$RET + fi i=$[i+1] fi done - RETVAL=$? echo fi fi From fedora-cvs-commits at redhat.com Thu May 24 11:34:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 24 May 2007 07:34:55 -0400 Subject: rpms/docbook-simple/FC-6 .cvsignore, 1.2, 1.3 docbook-simple.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200705241134.l4OBYtjp030880@cvs.devel.redhat.com> Author: ovasik Update of /cvs/dist/rpms/docbook-simple/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv30867 Modified Files: .cvsignore docbook-simple.spec sources Log Message: rebuilt with latest stable upstream release(1.1) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/docbook-simple/FC-6/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Sep 2004 18:44:35 -0000 1.2 +++ .cvsignore 24 May 2007 11:34:52 -0000 1.3 @@ -1 +1 @@ -docbook-simple-1.0.zip +docbook-simple-1.1.zip Index: docbook-simple.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-simple/FC-6/docbook-simple.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- docbook-simple.spec 12 Jul 2006 05:40:14 -0000 1.4 +++ docbook-simple.spec 24 May 2007 11:34:52 -0000 1.5 @@ -1,11 +1,11 @@ Name: docbook-simple -Version: 1.0 -Release: 2.1.1 +Version: 1.1 +Release: 1 Group: Applications/Text Summary: Simplified DocBook is a small subset of the DocBook XML DTD. License: Distributable URL: http://www.oasis-open.org/docbook/xml/simple/ -Source0: http://www.docbook.org/xml/simple/1.0/docbook-simple-1.0.zip +Source0: http://www.docbook.org/xml/simple/1.1/docbook-simple-1.1.zip Source1: %{name}.README.redhat Source2: %{name}.xml Source3: %{name}.cat @@ -167,6 +167,9 @@ rm -rf /usr/share/xml/docbook/simple %changelog +* Thu May 24 2007 Ondrej Vasik - 1.1-1 +- rebuilt with latest stable upstream release(1.1) + * Wed Jul 12 2006 Jesse Keating - 1.0-2.1.1 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/docbook-simple/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Sep 2004 18:44:35 -0000 1.2 +++ sources 24 May 2007 11:34:52 -0000 1.3 @@ -1 +1 @@ -10cf33eb280595db5a6927a3407ef61a docbook-simple-1.0.zip +f31c63f121033a72869286d4a0416421 docbook-simple-1.1.zip From fedora-cvs-commits at redhat.com Thu May 24 12:02:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 24 May 2007 08:02:59 -0400 Subject: rpms/docbook-simple/FC-6 docbook-simple.README.redhat, 1.1, 1.2 docbook-simple.cat, 1.1, 1.2 docbook-simple.spec, 1.5, 1.6 docbook-simple.xml, 1.1, 1.2 Message-ID: <200705241202.l4OC2xEu031333@cvs.devel.redhat.com> Author: ovasik Update of /cvs/dist/rpms/docbook-simple/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31316 Modified Files: docbook-simple.README.redhat docbook-simple.cat docbook-simple.spec docbook-simple.xml Log Message: few path changes because version upgrade Index: docbook-simple.README.redhat =================================================================== RCS file: /cvs/dist/rpms/docbook-simple/FC-6/docbook-simple.README.redhat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- docbook-simple.README.redhat 24 Sep 2004 18:44:35 -0000 1.1 +++ docbook-simple.README.redhat 24 May 2007 12:02:56 -0000 1.2 @@ -31,8 +31,8 @@ + PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN" + "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd">
...
@@ -49,8 +49,8 @@ + PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" + "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd"> ... @@ -64,8 +64,8 @@ + PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN" + "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd">
...
@@ -105,4 +105,4 @@ -- Mark Johnson , Tue Sep 7 15:51:51 EDT 2004 - + --changes for 1.1 by Ondrej Vasik , Thu May 24 2007 Index: docbook-simple.cat =================================================================== RCS file: /cvs/dist/rpms/docbook-simple/FC-6/docbook-simple.cat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- docbook-simple.cat 24 Sep 2004 18:44:35 -0000 1.1 +++ docbook-simple.cat 24 May 2007 12:02:56 -0000 1.2 @@ -1,11 +1,11 @@ --- BEGIN OASIS TR 9401:1997 catalog for docbook-simple V1.0 -- +-- BEGIN OASIS TR 9401:1997 catalog for docbook-simple V1.1 -- OVERRIDE YES -PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN" "/usr/share/xml/docbook/simple/1.0/sdocbook.dtd" -PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.0//EN" "/usr/share/xml/docbook/simple/1.0/sdocbook-custom.dtd" -PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN" "/usr/share/xml/docbook/simple/1.0/sdocbookref.dtd" -PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML CustomizationV1.0//EN" "/usr/share/xml/docbook/simple/1.0/sdocbookref-custom.dtd" -SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd" "/usr/share/xml/docbook/simple/1.0/sdocbook.dtd" -SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook-custom.dtd" "/usr/share/xml/docbook/simple/1.0/sdocbook-custom.dtd" -SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref.dtd" "/usr/share/xml/docbook/simple/1.0/sdocbookref.dtd" -SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbookref-custom.dtd" "/usr/share/xml/docbook/simple/1.0/sdocbookref-custom.dtd" --- END OASIS TR 9401:1997 catalog for docbook-simple V1.0 -- +PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbook.dtd" +PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbook-custom.dtd" +PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbookref.dtd" +PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML CustomizationV1.1//EN" "/usr/share/xml/docbook/simple/1.1/sdocbookref-custom.dtd" +SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbook.dtd" +SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbook-custom.dtd" +SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbookref.dtd" +SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd" "/usr/share/xml/docbook/simple/1.1/sdocbookref-custom.dtd" +-- END OASIS TR 9401:1997 catalog for docbook-simple V1.1 -- Index: docbook-simple.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-simple/FC-6/docbook-simple.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- docbook-simple.spec 24 May 2007 11:34:52 -0000 1.5 +++ docbook-simple.spec 24 May 2007 12:02:56 -0000 1.6 @@ -1,6 +1,6 @@ Name: docbook-simple Version: 1.1 -Release: 1 +Release: 1.01 Group: Applications/Text Summary: Simplified DocBook is a small subset of the DocBook XML DTD. License: Distributable @@ -90,12 +90,12 @@ "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG /usr/bin/xmlcatalog --noout --add "delegateURI" \ - "http://www.oasis-open.org/docbook/xml/simple/1.0/" \ + "http://www.oasis-open.org/docbook/xml/simple/1.1/" \ "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG # Next line because some resolvers misinterpret uri entries /usr/bin/xmlcatalog --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/xml/simple/1.0/" \ + "http://www.oasis-open.org/docbook/xml/simple/1.1/" \ "file://$PKG_XML_CATALOG" $ROOT_XML_CATALOG fi Index: docbook-simple.xml =================================================================== RCS file: /cvs/dist/rpms/docbook-simple/FC-6/docbook-simple.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- docbook-simple.xml 24 Sep 2004 18:44:35 -0000 1.1 +++ docbook-simple.xml 24 May 2007 12:02:56 -0000 1.2 @@ -1,34 +1,34 @@ - + - + - + - + - + - + - + - + - + From fedora-cvs-commits at redhat.com Thu May 24 14:04:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 24 May 2007 10:04:27 -0400 Subject: rpms/bind/FC-6 bind-9.3.4-ldap-deprecated.patch, NONE, 1.1 bind-chroot-admin.in, 1.17, 1.18 bind.spec, 1.152, 1.153 bind-9.4.1-ldap-new-api.patch, 1.1, NONE Message-ID: <200705241404.l4OE4RPQ000879@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv850 Modified Files: bind-chroot-admin.in bind.spec Added Files: bind-9.3.4-ldap-deprecated.patch Removed Files: bind-9.4.1-ldap-new-api.patch Log Message: - start using deprecated ldap API (lack of documentation of new API => problems) - fixed minor problem in bind-chroot-admin (#241103) bind-9.3.4-ldap-deprecated.patch: Makefile.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bind-9.3.4-ldap-deprecated.patch --- --- bind-9.3.4/bin/named_sdb/Makefile.in.ldap 2007-05-24 14:30:00.000000000 +0200 +++ bind-9.3.4/bin/named_sdb/Makefile.in 2007-05-24 14:30:24.000000000 +0200 @@ -96,7 +96,7 @@ HTMLPAGES = named.html lwresd.html named MANOBJS = ${MANPAGES} ${HTMLPAGES} -EXT_CFLAGS = -fPIE +EXT_CFLAGS = -fPIE -DLDAP_DEPRECATED @BIND9_MAKE_RULES@ Index: bind-chroot-admin.in =================================================================== RCS file: /cvs/dist/rpms/bind/FC-6/bind-chroot-admin.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bind-chroot-admin.in 15 May 2007 12:19:02 -0000 1.17 +++ bind-chroot-admin.in 24 May 2007 14:04:25 -0000 1.18 @@ -221,7 +221,7 @@ fi; . /etc/sysconfig/named - if [ "$ENABLE_ZONE_WRITE" = [yY1]* ]; then + if `echo "$ENABLE_ZONE_WRITE" | grep -q '[yY1].*'`; then return 0; fi; Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-6/bind.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- bind.spec 22 May 2007 15:15:24 -0000 1.152 +++ bind.spec 24 May 2007 14:04:25 -0000 1.153 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.4 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -75,7 +75,7 @@ Patch32: bind-9.3.2-prctl_set_dumpable.patch Patch52: bind-9.3.3-edns.patch Patch53: bind-9.4.0-dbus-race-condition.patch -Patch54: bind-9.4.1-ldap-new-api.patch +Patch54: bind-9.3.4-ldap-deprecated.patch # Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2, mktemp Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26 @@ -239,7 +239,6 @@ %patch10 -p1 -b .PIE %if %{SDB} %patch11 -p1 -b .sdbsrc -%patch54 -p1 -b .ldap-api # BUILD 'Simplified Database Backend' (SDB) version of named: named_sdb cp -rfp bin/named bin/named_sdb # SDB ldap @@ -257,6 +256,7 @@ cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/sdb_tools cp -fp contrib/sdb/pgsql/zonetodb.c bin/sdb_tools %patch12 -p1 -b .sdb +%patch54 -p1 -b .ldap-deprecated %endif %if %{LIBBIND} %patch13 -p1 -b .fix_libbind_includedir @@ -781,6 +781,11 @@ :; %changelog +* Wed May 24 2007 Adam Tkac 31:9.3.4-6.fc7 +- take back ldap-api patch because it doesn't works correctly + and start using deprecated ldap API +- fix minor bug in bind-chroot-admin (#241103) + * Tue May 22 2007 Adam Tkac 31:9.3.4-5.fc7 - fixed bind-chroot-admin dynamic DNS handling (#239149) - rewrited ldap backend patch to latest API (#239802) --- bind-9.4.1-ldap-new-api.patch DELETED --- From fedora-cvs-commits at redhat.com Thu May 24 15:30:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 24 May 2007 11:30:30 -0400 Subject: rpms/docbook-simple/FC-6 docbook-simple.spec, 1.6, 1.7 docbook-simple.xml, 1.2, 1.3 Message-ID: <200705241530.l4OFUUiN002723@cvs.devel.redhat.com> Author: ovasik Update of /cvs/dist/rpms/docbook-simple/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv2707 Modified Files: docbook-simple.spec docbook-simple.xml Log Message: fixed wrong catalog version - added during upgrade to latest upstream Index: docbook-simple.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-simple/FC-6/docbook-simple.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- docbook-simple.spec 24 May 2007 12:02:56 -0000 1.6 +++ docbook-simple.spec 24 May 2007 15:30:28 -0000 1.7 @@ -1,6 +1,6 @@ Name: docbook-simple Version: 1.1 -Release: 1.01 +Release: 1.02%{?dist} Group: Applications/Text Summary: Simplified DocBook is a small subset of the DocBook XML DTD. License: Distributable @@ -167,6 +167,9 @@ rm -rf /usr/share/xml/docbook/simple %changelog +* Thu May 24 2007 Ondrej Vasik - 1.1-1.02 +- fixed added error in docbook-simple.xml(wrong catalog version) + * Thu May 24 2007 Ondrej Vasik - 1.1-1 - rebuilt with latest stable upstream release(1.1) Index: docbook-simple.xml =================================================================== RCS file: /cvs/dist/rpms/docbook-simple/FC-6/docbook-simple.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- docbook-simple.xml 24 May 2007 12:02:56 -0000 1.2 +++ docbook-simple.xml 24 May 2007 15:30:28 -0000 1.3 @@ -1,6 +1,6 @@ - + From fedora-cvs-commits at redhat.com Fri May 25 07:53:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 25 May 2007 03:53:08 -0400 Subject: rpms/nfs-utils/FC-6 nfs-utils-1.0.10-v4-errors.patch, NONE, 1.1 nfs-utils.spec, 1.130, 1.131 Message-ID: <200705250753.l4P7r8aA021987@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21970 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.0.10-v4-errors.patch Log Message: Fix mount.nfs4 to display correct error message (bz 227212) nfs-utils-1.0.10-v4-errors.patch: mount.c | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) --- NEW FILE nfs-utils-1.0.10-v4-errors.patch --- --- nfs-utils-1.0.10/utils/mount/mount.c.orig 2007-05-24 09:23:21.000000000 -0400 +++ nfs-utils-1.0.10/utils/mount/mount.c 2007-05-24 09:24:16.000000000 -0400 @@ -327,22 +327,49 @@ get_value(const char *list, const char * return 0; } -static void mount_error(char *node) +static void mount_error(char *mntpnt, char *node) { switch(errno) { case ENOTDIR: - fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node); + fprintf(stderr, "%s: mount point %s is not a directory\n", + progname, mntpnt); break; case EBUSY: - fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node); + fprintf(stderr, "%s: %s is already mounted or busy\n", + progname, mntpnt); break; case ENOENT: - fprintf(stderr, "%s: mount point %s does not exist\n", progname, node); + if (node) { + fprintf(stderr, "%s: %s failed, reason given by server: %s\n", + progname, node, strerror(errno)); + } else + fprintf(stderr, "%s: mount point %s does not exist\n", + progname, mntpnt); break; default: fprintf(stderr, "%s: %s\n", progname, strerror(errno)); } } +static int chk_mountpoint(char *mount_point) +{ + struct stat sb; + + if (stat(mount_point, &sb) < 0){ + mount_error(mount_point, NULL); + return 1; + } + if (S_ISDIR(sb.st_mode) == 0){ + errno = ENOTDIR; + mount_error(mount_point, NULL); + return 1; + } + if (access(mount_point, X_OK) < 0) { + mount_error(mount_point, NULL); + return 1; + } + + return 0; +} #define NFS_MOUNT_VERS_DEFAULT 3 int main(int argc, char *argv[]) @@ -472,6 +499,9 @@ int main(int argc, char *argv[]) } } + if (chk_mountpoint(mount_point)) + exit(EX_FAIL); + if (nfs_mount_vers == 4) { mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0); @@ -491,7 +521,7 @@ int main(int argc, char *argv[]) flags, mount_opts); if (mnt_err) { - mount_error(mount_point); + mount_error(mount_point, spec); exit(EX_FAIL); } } Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-6/nfs-utils.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- nfs-utils.spec 22 May 2007 11:10:44 -0000 1.130 +++ nfs-utils.spec 25 May 2007 07:53:05 -0000 1.131 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.10 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 # group all 32bit related archs @@ -56,6 +56,7 @@ Patch85: nfs-utils-1.0.10-nfsd-macargs.patch Patch86: nfs-utils-1.0.10-mountd-etab.patch Patch87: nfs-utils-1.0.10-mount-nordirplus.patch +Patch88: nfs-utils-1.0.10-v4-errors.patch %if %{enablefscache} @@ -133,6 +134,7 @@ %patch85 -p1 %patch86 -p1 %patch87 -p1 +%patch88 -p1 %if %{enablefscache} %patch90 -p1 %endif @@ -321,6 +323,9 @@ %endif %changelog +* Thu May 24 2007 Steve Dickson 1.0.10-13 +- Fix mount.nfs4 to display correct error message (bz 227212) + * Tue May 22 2007 Steve Dickson 1.0.10-12 - Stopped /etc/sysconfig/nfs from being overwritten on updates (bz 234543) From fedora-cvs-commits at redhat.com Fri May 25 13:08:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 25 May 2007 09:08:48 -0400 Subject: rpms/irqbalance/FC-5 irqbalance.init, 1.3, 1.4 irqbalance.spec, 1.26, 1.27 irqbalance.sysconfig, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200705251308.l4PD8mZb027386@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/irqbalance/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27368 Modified Files: irqbalance.init irqbalance.spec irqbalance.sysconfig sources Log Message: Updating to latest irqbalance Index: irqbalance.init =================================================================== RCS file: /cvs/dist/rpms/irqbalance/FC-5/irqbalance.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- irqbalance.init 19 Sep 2006 12:08:12 -0000 1.3 +++ irqbalance.init 25 May 2007 13:08:45 -0000 1.4 @@ -14,6 +14,101 @@ # Source function library. . /etc/init.d/functions +#internal functions +set_isolcpu_affinity_mask() { + +#the isolcpu line in the kenrel is of the format: +#[[-cpunum],]+ + local mask + local tmp_mask; + local range + local range_high + local range_low + local space_list + local cpus + local chunk_mask + local temp_mask + + grep isolcpus /proc/cmdline > /dev/null + if [ $? != 0 ] + then + # no isolcpus line + IRQ_AFFINITY_MASK= + return + fi + + # get a space separated list of ranges + space_list=`sed -e's/\(^.*isolcpus=\)\([^ ]* *\)\(.*$\)/\2/' -e's/,/ /g' /proc/cmdline` + + mask=0 + + for range in $space_list + do + # Get the Range + range_low=`echo $range | awk -F- '{print $1}'` + range_high=`echo $range | awk -F- '{print $2}'` + + # + # If the High Range is not included + # its the same as te low range + # + if [ -z "$range_high" ] + then + range_high=$range_low + fi + + cpus=`dc -e"$range_high $range_low - p"` + + tmp_mask=0 + # + # Build the number of 1's we need into the mask + # + for i in `seq 0 1 $cpus` + do + tmp_mask=`dc -e"2 $i ^ $tmp_mask + p"` + done + + # + # And Shift the mask up to where it belongs + # + tmp_mask=`dc -e"2 $range_low ^ $tmp_mask * p"` + + # + # Lastly, or the mask into the result mask with + # an add operation + # + mask=`dc -e"$mask $tmp_mask + p"` + done + + # + # Convert the mask to a hex value + # + mask=`dc -e"10 i 16 o $mask p"` + + # + # Now divide up the mask with commas since Arjan apparently didn't + # feel the need to make this easy. + # + chunk_mask="" + temp_mask=$mask + while [ -n "$temp_mask" ] + do + new_chunk=`echo $temp_mask | cut -b1-8` + temp_mask=`echo $temp_mask | cut -b9-` + chunk_mask="$chunk_mask,$new_chunk" + done + + # now strip the leading comma + chunk_mask=`echo $chunk_mask | sed -e's/,//'` + + # + # Now Assign the mask value to the IRQ_AFFINITY_MASK + # + IRQ_AFFINITY_MASK=$chunk_mask + +} + + # Check that we're a priviledged user [ `id -u` = 0 ] || exit 0 @@ -40,15 +135,37 @@ *) ONESHOT= ;; esac +# +# Check to see if our IRQ_AFFINITY_MASK needs to be computed from +# the isolcpus command line options +# +if [ "$FOLLOW_ISOLCPUS" == "yes" ] +then + set_isolcpu_affinity_mask +fi + RETVAL=0 start() { + if [ -n "$ONESHOT" -a -f /var/lock/irqbalance ]; then + exit 0 + fi echo -n $"Starting $prog: " - daemon irqbalance $ONESHOT + if [ -n "$IRQ_AFFINITY_MASK" ]; + then + export IRQBALANCE_BANNED_CPUS=$IRQ_AFFINITY_MASK + fi + daemon irqbalance $ONESHOT $IRQ_AFFINITY RETVAL=$? echo - [ $RETVAL -eq 0 -a -z "$ONESHOT" ] && touch /var/lock/subsys/irqbalance - return $RETVAL + if [ $RETVAL -eq 0 ]; then + if [ -n "$ONESHOT" ]; then + touch /var/lock/subsys/irqbalance + else + touch /var/lock/irqbalance + fi + fi + return $RETVAL } @@ -86,6 +203,7 @@ *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" exit 1 + ;; esac exit $? Index: irqbalance.spec =================================================================== RCS file: /cvs/dist/rpms/irqbalance/FC-5/irqbalance.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- irqbalance.spec 19 Sep 2006 12:08:12 -0000 1.26 +++ irqbalance.spec 25 May 2007 13:08:45 -0000 1.27 @@ -1,19 +1,21 @@ Summary: IRQ balancing daemon. Name: irqbalance -Version: 1.12 -Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}) -Epoch: 1 +Version: 0.55 +Release: 4%{?dist} +Epoch: 2 Group: System Environment/Base License: GPL/OSL -Source0: irqbalance-0.12.tar.gz +Source0: http://www.irqbalance.org/releases/irqbalance-%{version}.tar.gz Source1: irqbalance.init Source2: irqbalance.sysconfig +Source3: irqbalance.1 Buildroot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig /sbin/service -Patch1: irqbalance-pie.patch -Patch2: irqbalance-norebalance-zeroints.patch + ExclusiveArch: i386 x86_64 ia64 ppc ppc64 Obsoletes: kernel-utils +BuildRequires: glib2-devel pkgconfig imake +Requires: glib2 %description irqbalance is a daemon that evenly distributes IRQ load across @@ -21,8 +23,6 @@ %prep %setup -q -c -a 0 -%patch1 -p1 -%patch2 -p1 %build rm -rf $RPM_BUILD_ROOT @@ -32,17 +32,17 @@ mkdir -p %{buildroot}/etc/rc.d/init.d mkdir -p %{buildroot}/etc/sysconfig -cd irqbalance -make CFLAGS="$RPM_OPT_FLAGS -fpie -pie" +cd irqbalance-%{version} +make %install mkdir -p %{buildroot}/usr/share/man/man{1,8} -cd irqbalance +cd irqbalance-%{version} install irqbalance %{buildroot}/usr/sbin install %{SOURCE1} %{buildroot}/etc/rc.d/init.d/irqbalance install %{SOURCE2} %{buildroot}/etc/sysconfig/irqbalance -install irqbalance.1 %{buildroot}/usr/share/man/man1/ +install %{SOURCE3} %{buildroot}/usr/share/man/man1/ chmod -R a-s %{buildroot} @@ -52,8 +52,8 @@ %files %defattr(-,root,root) /usr/sbin/irqbalance -%attr(0644,root,root) %{_mandir}/*/* /etc/rc.d/init.d/irqbalance +%attr(0644,root,root) %{_mandir}/*/* %attr(0644,root,root) /etc/sysconfig/irqbalance %preun @@ -70,9 +70,55 @@ %changelog -* Tue Sep 19 2006 Neil Horman -- Fix oneshot to not restart on every new runlevel - +* Fri May 25 2007 Neil Horman - 0.55-4 +- Import devel irqbalance to FC-5 + +* Thu May 17 2007 Neil Horman - 0.55-3 +- Adding FOLLOW_ISOLCPUS option (bz 237885) + +* Tue Dec 12 2006 Neil Horman - 0.55-2 +- Fixing typos in spec file (bz 219301) + +* Tue Dec 12 2006 Neil Horman - 0.55-1 +- Updating to version 0.55 + +* Mon Dec 11 2006 Neil Horman - 0.54-1 +- Update irqbalance to new version released at www.irqbalance.org + +* Wed Nov 15 2006 Neil Horman - 1.13-8 +- Add ability to set default affinity mask (bz 211148) + +* Wed Nov 08 2006 Neil Horman - 1.13-7 +- fix up irqbalance to detect multicore (not ht) (bz 211183) + +* Thu Nov 02 2006 Neil Horman - 1.13-6 +- bumping up MAX_INTERRUPTS to support xen kernels +- rediffing patch1 and patch3 to remove fuzz + +* Tue Oct 17 2006 Neil Horman - 1.13-5 +- Making oneshot mean oneshot always (bz 211178) + +* Wed Sep 13 2006 Peter Jones - 1.13-4 +- Fix subsystem locking + +* Fri Aug 18 2006 Jesse Keating - 1.13-2 +- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* + (#203001) +- Remove hack to use cvs checkin ID as release as it doesn't follow + packaging guidelines + +* Tue Aug 01 2006 Neil Horman +- Change license to GPL in version 0.13 + +* Sat Jul 29 2006 Dave Jones +- identify a bunch more classes. + +* Fri Jul 14 2006 Jesse Keating +- rebuild + +* Tue Jul 11 2006 Dave Jones +- Further lazy rebalancing tweaks. + * Sun Feb 26 2006 Dave Jones - Don't rebalance IRQs where no interrupts have occured. Index: irqbalance.sysconfig =================================================================== RCS file: /cvs/dist/rpms/irqbalance/FC-5/irqbalance.sysconfig,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- irqbalance.sysconfig 7 Jan 2005 05:58:43 -0000 1.1 +++ irqbalance.sysconfig 25 May 2007 13:08:45 -0000 1.2 @@ -7,3 +7,21 @@ # load and balance it once; after balancing exit and do not change # it again. ONESHOT= + +# +# IRQ_AFFINITY_MASK +# 64 bit bitmask which allows you to indicate which cpu's should +# be skipped when reblancing irqs. Cpu numbers which have their +# corresponding bits set to zero in this mask will not have any +# irq's assigned to them on rebalance +# +#IRQ_AFFINITY_MASK= + +# +# FOLLOW_ISOLCPUS +# Boolean value. When set to yes, any setting of IRQ_AFFINITY_MASK above +# is overridden, and instead computed to be the same mask that is defined +# by the isolcpu kernel command line option. +# +#FOLLOW_ISOLCPUS=no +# Index: sources =================================================================== RCS file: /cvs/dist/rpms/irqbalance/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 05:58:43 -0000 1.2 +++ sources 25 May 2007 13:08:45 -0000 1.3 @@ -1 +1 @@ -1f225b73a01380955231b77d9be60c7a irqbalance-0.12.tar.gz +9f6b314ff1fdc14173abeb40592d4edf irqbalance-0.55.tar.gz From fedora-cvs-commits at redhat.com Fri May 25 13:09:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 25 May 2007 09:09:52 -0400 Subject: rpms/irqbalance/FC-5 irqbalance-norebalance-zeroints.patch, 1.1, NONE irqbalance-pie.patch, 1.1, NONE Message-ID: <200705251309.l4PD9qXZ027446@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/irqbalance/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27432 Removed Files: irqbalance-norebalance-zeroints.patch irqbalance-pie.patch Log Message: removing old patches --- irqbalance-norebalance-zeroints.patch DELETED --- --- irqbalance-pie.patch DELETED --- From fedora-cvs-commits at redhat.com Fri May 25 13:14:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 25 May 2007 09:14:17 -0400 Subject: rpms/irqbalance/FC-5 irqbalance.1,NONE,1.1 Message-ID: <200705251314.l4PDEHjQ027553@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/irqbalance/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27540 Added Files: irqbalance.1 Log Message: adding new man page --- NEW FILE irqbalance.1 --- .\"Generated by db2man.xsl. Don't modify this, modify the source. .de Sh \" Subsection .br .if t .Sp .ne 5 .PP \fB\\$1\fR .PP .. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. .de Ip \" List item .br .ie \\n(.$>=3 .ne \\$3 .el .ne 3 .IP "\\$1" \\$2 .. .TH "IRQBALANCE" 1 "Dec 2006" "Linux" "irqbalance" .SH NAME irqbalance \- distribute hardware interrupts across processors on a multiprocessor system .SH "SYNOPSIS" .nf \fBirqbalance\fR .fi .SH "DESCRIPTION" .PP The purpose of \fBirqbalance\fR is distribute hardware interrupts across processors on a multiprocessor system in order to increase performance\&. .SH "OPTIONS" .TP .B --oneshot Causes irqbalance to be run once, after which the daemon exits .TP .B --debug Causes irqbalance to run in the foreground and extra debug information to be printed .SH "ENVIRONMENT VARIABLES" .TP .B IRQBALANCE_ONESHOT Same as --oneshot .TP .B IRQBALANCE_DEBUG Same as --debug .TP .B IRQBALANCE_BANNED_CPUS Provides a mask of cpus which irqbalance should ignore and never assign interrupts to From fedora-cvs-commits at redhat.com Fri May 25 14:22:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 25 May 2007 10:22:28 -0400 Subject: rpms/cscope/devel cscope-15.6-findassign.patch, NONE, 1.1 cscope-15.6-ocs.patch, NONE, 1.1 cscope-15.6-sigwinch-linemode.patch, NONE, 1.1 cscope-15.6-xcscope-man.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 cscope.spec, 1.31, 1.32 sources, 1.4, 1.5 Message-ID: <200705251422.l4PEMSO2028544@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/cscope/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28519 Modified Files: .cvsignore cscope.spec sources Added Files: cscope-15.6-findassign.patch cscope-15.6-ocs.patch cscope-15.6-sigwinch-linemode.patch cscope-15.6-xcscope-man.patch Log Message: Resolves: bz 241347 cscope-15.6-findassign.patch: constants.h | 2 - display.c | 1 find.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ global.h | 1 4 files changed, 84 insertions(+), 1 deletion(-) --- NEW FILE cscope-15.6-findassign.patch --- --- cscope-15.6/src/display.c.orig 2006-09-30 04:13:00.000000000 -0400 +++ cscope-15.6/src/display.c 2007-05-25 10:15:14.000000000 -0400 @@ -113,6 +113,7 @@ {"Find this", "file", findfile}, {"Find", "files #including this file", findinclude}, {"Find all", "function definitions", findallfcns}, /* samuel only */ + {"Find all", "symbol assignments", findassign}, }; /* Internal prototypes: */ --- cscope-15.6/src/global.h.orig 2006-09-30 04:13:00.000000000 -0400 +++ cscope-15.6/src/global.h 2007-05-25 10:15:14.000000000 -0400 @@ -327,6 +327,7 @@ char *findfile(char *dummy); char *findinclude(char *pattern); char *findsymbol(char *pattern); +char *findassign(char *pattern); char *findregexp(char *egreppat); char *findstring(char *pattern); char *inviewpath(char *file); --- cscope-15.6/src/find.c.orig 2006-09-30 04:13:00.000000000 -0400 +++ cscope-15.6/src/find.c 2007-05-25 10:15:27.000000000 -0400 @@ -79,6 +79,8 @@ static void findcalledbysub(char *file, BOOL macro); static void findterm(char *pattern); static void putline(FILE *output); +static char *find_symbol_or_assignment(char *pattern, BOOL assign_flag); +static BOOL check_for_assignment(void); static void putpostingref(POSTING *p, char *pat); static void putref(int seemore, char *file, char *func); static void putsource(int seemore, FILE *output); @@ -88,6 +90,77 @@ char * findsymbol(char *pattern) { + return find_symbol_or_assignment(pattern, NO); +} + + /* find the symbol in the cross-reference, and look for assignments */ +char * +findassign(char *pattern) +{ + return find_symbol_or_assignment(pattern, YES); +} + + /* Test reference whether it's an assignment to the symbol found at + * (global variable) 'blockp' */ +static BOOL +check_for_assignment(void) +{ + /* Do the extra work here to determine if this is an + * assignment or not Do this by examining the next character + * or two in blockp */ + char *asgn_char = blockp; + int i = 1; /*skip any leading \n*/ + + while(1) { + if (asgn_char[i] == blockmark) { + /* get the next block when we reach the end of + * the current block */ + asgn_char = read_block(); + i=0; + } + while (isspace((unsigned char) asgn_char[i])) { + /* skip any whitespace or \n */ + i++; + } + /* this next character better be one of the assignment + * characters, ie: =, +=, -=, *=, %=, /=, &=, |=, ^=, + * ~= if not, then its a notmatched case */ + if ((asgn_char[i] != '=') && + (asgn_char[i] != '+') && + (asgn_char[i] != '-') && + (asgn_char[i] != '*') && + (asgn_char[i] != '/') && + (asgn_char[i] != '%') && + (asgn_char[i] != '&') && + (asgn_char[i] != '|') && + (asgn_char[i] != '^') && + (asgn_char[i] != '~')) { + return NO; + } else { + /* if the first found character is = and the + * next found character is also =, then this + * is not an assignment. likewise if the + * first character is not = (i.e. one of the + * +,-,*,etc. chars and the next character is + * not =, then this is not an assignment */ + if ((((asgn_char[i] == '=') + && (asgn_char[i+1] == '='))) + || ((asgn_char[i] != '=') + && (asgn_char[i+1] != '='))) { + return NO; + } + /* if we pass all these filters then this is + * an assignment */ + return YES; + } /* else(operator char?) */ + } /* while(endless) */ +} + + /* The actual routine that does the work for findsymbol() and +* findassign() */ +static char * +find_symbol_or_assignment(char *pattern, BOOL assign_flag) +{ char file[PATHLEN + 1]; /* source file name */ char function[PATLEN + 1]; /* function name */ char macro[PATLEN + 1]; /* macro name */ @@ -249,6 +322,14 @@ if (matchrest()) { s = NULL; matched: + /* if the assignment flag is set then + * we are looking for assignments and + * some extra filtering is needed */ + if(assign_flag == YES + && ! check_for_assignment()) + goto notmatched; + + /* output the file, function or macro, and source line */ if (strcmp(macro, global) && s != macro) { putref(0, file, macro); --- cscope-15.6/src/constants.h.orig 2006-09-30 04:13:00.000000000 -0400 +++ cscope-15.6/src/constants.h 2007-05-25 10:15:14.000000000 -0400 @@ -101,7 +101,7 @@ #define REGEXP 6 #define FILENAME 7 #define INCLUDES 8 -#define FIELDS 9 +#define FIELDS 11 #if (BSD || V9) && !__NetBSD__ && !__FreeBSD__ # define TERMINFO 0 /* no terminfo curses */ cscope-15.6-ocs.patch: ocs | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE cscope-15.6-ocs.patch --- --- cscope-15.6/contrib/ocs.orig1 2006-09-30 04:12:58.000000000 -0400 +++ cscope-15.6/contrib/ocs 2007-05-25 10:04:01.000000000 -0400 @@ -75,7 +75,7 @@ #set the default value for SYSDIR if [ -z "${SYSDIR}" ]; then - SYSDIR=/usr/local/lib/cs + SYSDIR=/var/run/cs echo setting default sysdir fi cscope-15.6-sigwinch-linemode.patch: main.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) --- NEW FILE cscope-15.6-sigwinch-linemode.patch --- --- cscope-15.6/src/main.c.orig 2007-05-25 10:11:02.000000000 -0400 +++ cscope-15.6/src/main.c 2007-05-25 10:12:43.000000000 -0400 @@ -153,12 +153,7 @@ yyout = stdout; /* save the command name for messages */ argv0 = argv[0]; -#if defined(KEY_RESIZE) && !defined(__DJGPP__) - winch_action.sa_sigaction = sigwinch_handler; - sigemptyset(&winch_action.sa_mask); - winch_action.sa_flags = SA_SIGINFO; - sigaction(SIGWINCH,&winch_action,NULL); -#endif + /* set the options */ while (--argc > 0 && (*++argv)[0] == '-') { /* HBB 20030814: add GNU-style --help and --version options */ @@ -400,6 +395,13 @@ } if (linemode == NO) { + +#if defined(KEY_RESIZE) && !defined(__DJGPP__) + winch_action.sa_sigaction = sigwinch_handler; + sigemptyset(&winch_action.sa_mask); + winch_action.sa_flags = SA_SIGINFO; + sigaction(SIGWINCH,&winch_action,NULL); +#endif signal(SIGINT, SIG_IGN); /* ignore interrupts */ signal(SIGPIPE, SIG_IGN);/* | command can cause pipe signal */ cscope-15.6-xcscope-man.patch: Makefile.in | 2 xcscope.1 | 577 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 578 insertions(+), 1 deletion(-) --- NEW FILE cscope-15.6-xcscope-man.patch --- --- /dev/null 2007-05-12 17:40:21.471089444 -0400 +++ cscope-15.6/doc/xcscope.1 2007-05-25 09:45:31.000000000 -0400 @@ -0,0 +1,577 @@ +'\" t +.\" The xcscope.el man page +.\" Origionally written by Darryl Okahata, Apr 2000 +.\" +.\" Converted to a man page July 20, 2004 by Neil Horman +.\" + +.PU +.TH XCSCOPE.EL "1" "April 2000" "Darryl Okahata" +.SH NAME +xcscope.el - xemacs cscope lisp support package +.SH DESCRIPTION +xcscope is a lisp package for use in integrating cscope +functionality into xemacs +.SH INSTALLATION +.P + Installation steps: + +.P + 0. (It is, of course, assumed that cscope is already properly + installed on the current system.) +.P + 1. Ensure that the location of cscope-indexer is located in your path + +.P + 2. Ensure that the location of xcscope.el is in the xemacs module load path + +.P + 3. Edit your ~/.emacs file to add the line: +.P +.BI (require 'xcscope) + +.P +5. If you intend to use xcscope.el often you can optionally edit your +~/.emacs file to add keybindings that reduce the number of keystrokes +required. For example, the following will add "C-f#" keybindings, +which are easier to type than the usual "C-c s" prefixed keybindings. +Note that specifying "global-map" instead of "cscope:map" makes the +keybindings available in all buffers: +.nf + (define-key global-map [(ctrl f3)] 'cscope-set-initial-directory) + (define-key global-map [(ctrl f4)] 'cscope-unset-initial-directory) + (define-key global-map [(ctrl f5)] 'cscope-find-this-symbol) + (define-key global-map [(ctrl f6)] 'cscope-find-global-definition) + (define-key global-map [(ctrl f7)] + cscope-find-global-definition-no-prompting) + (define-key global-map [(ctrl f8)] 'cscope-pop-mark) + (define-key global-map [(ctrl f9)] 'cscope-next-symbol) + (define-key global-map [(ctrl f10)] 'cscope-next-file) + (define-key global-map [(ctrl f11)] 'cscope-prev-symbol) + (define-key global-map [(ctrl f12)] 'cscope-prev-file) + (define-key global-map [(meta f9)] 'cscope-display-buffer) + (define-key global-map [(meta f10)] 'cscope-display-buffer-toggle) +.fi + +.P + 6. Restart (X)Emacs. That's it. + + +.SH USING THIS MODULE + +.SS * Basic usage: + +.P + If all of your C/C++/lex/yacc source files are in the same + directory, you can just start using this module. If your files are + spread out over multiple directories, see "Advanced usage", below. + +.P + Just edit a source file, and use the pull-down or pop-up (button 3) + menus to select one of: + +.nf + Find symbol + Find global definition + Find called functions + Find functions calling a function + Find text string + Find egrep pattern + Find a file + Find files #including a file +.fi + +.P +The cscope database will be automatically created in the same directory +as the source files (assuming that you've never used cscope before), and +a buffer will pop-up displaying the results. You can then use button 2 +(the middle button) on the mouse to edit the selected file, or you can +move the text cursor over a selection and press [Enter]. + +.P +Hopefully, the interface should be fairly intuitive. + +.SS * Locating the cscope databases: + +.P +This module will first use the variable, `cscope-database-regexps', +to search for a suitable database directory. If a database location +cannot be found using this variable then a search is begun at the +variable, `cscope-initial-directory', if set, or the current +directory otherwise. If the directory is not a cscope database +directory then the directory's parent, parent's parent, etc. is +searched until a cscope database directory is found, or the root +directory is reached. If the root directory is reached, the current +directory will be used. + +.P +A cscope database directory is one in which EITHER a cscope database +file (e.g., "cscope.out") OR a cscope file list (e.g., +"cscope.files") exists. If only "cscope.files" exists, the +corresponding "cscope.out" will be automatically created by cscope +when a search is done. By default, the cscope database file is called +"cscope.out", but this can be changed (on a global basis) via the +variable, `cscope-database-file'. There is limited support for cscope +databases that are named differently than that given by +`cscope-database-file', using the variable, `cscope-database-regexps'. + +.P +Note that the variable, `cscope-database-regexps', is generally not +needed, as the normal hierarchical database search is sufficient +for placing and/or locating the cscope databases. However, there +may be cases where it makes sense to place the cscope databases +away from where the source files are kept; in this case, this +variable is used to determine the mapping. One use for this +variable is when you want to share the database file with other +users; in this case, the database may be located in a directory +separate from the source files. + +.P +Setting the variable, `cscope-initial-directory', is useful when a +search is to be expanded by specifying a cscope database directory +that is a parent of the directory that this module would otherwise +use. For example, consider a project that contains the following +cscope database directories: + +.nf + /users/jdoe/sources + /users/jdoe/sources/proj1 + /users/jdoe/sources/proj2 +.fi + +.P +If a search is initiated from a .c file in /users/jdoe/sources/proj1 +then (assuming the variable, `cscope-database-regexps', is not set) +/users/jdoe/sources/proj1 will be used as the cscope data base directory. +Only matches in files in /users/jdoe/sources/proj1 will be found. This +can be remedied by typing "C-c s a" and then "M-del" to remove single +path element in order to use a cscope database directory of +/users/jdoe/sources. Normal searching can be restored by typing "C-c s A". + + + +.SS * Keybindings: + +.P +All keybindings use the "C-c s" prefix, but are usable only while +editing a source file, or in the cscope results buffer: + +.BI "C-c s s Find symbol." +.TP +.BI "C-c s d Find global definition." +.TP +.BI "C-c s g Find global definition (alternate binding)." +.TP +.BI "C-c s G Find global definition without prompting." +.TP +.BI "C-c s c Find functions calling a function." +.TP +.BI "C-c s C Find called functions (list functions called" +.BI " from a function)." +.TP +.BI "C-c s t Find text string." +.TP +.BI "C-c s e Find egrep pattern." +.TP +.BI "C-c s f Find a file." +.TP +.BI "C-c s i Find files #including a file." + +.P +These pertain to navigation through the search results: + +.P +.BI "C-c s b Display *cscope* buffer." +.TP +.BI "C-c s B Auto display *cscope* buffer toggle." +.TP +.BI "C-c s n Next symbol." +.TP +.BI "C-c s N Next file." +.TP +.BI "C-c s p Previous symbol." +.TP +.BI "C-c s P Previous file." +.TP +.BI "C-c s u Pop mark." + +.P +These pertain to setting and unsetting the variable, +`cscope-initial-directory', (location searched for the cscope database +directory): + +.P +.BI "C-c s a Set initial directory." +.TP +.BI "C-c s A Unset initial directory." + +.P +These pertain to cscope database maintenance: +.P +.BI "C-c s L Create list of files to index." +.TP +.BI "C-c s I Create list and index." +.TP +.BI "C-c s E Edit list of files to index." +.TP +.BI "C-c s W Locate this buffer's cscope directory" +.BI " (" +"W" --> "where" +.BI ")." +.TP +.BI "C-c s S Locate this buffer's cscope directory." +.BI " (alternate binding: " +"S" --> "show" +.BI ")." +.TP +.BI "C-c s T Locate this buffer's cscope directory." +.BI " (alternate binding: " +"T" --> "tell" +.BI ")." +.TP +.BI "C-c s D Dired this buffer's directory." + +.P +.SS * Advanced usage: + +.P +If the source files are spread out over multiple directories, +you've got a few choices: + +.P +[ NOTE: you will need to have the script, "cscope-indexer", +properly installed in order for the following to work. ] + +.P +1. If all of the directories exist below a common directory +(without any extraneous, unrelated subdirectories), you can tell +this module to place the cscope database into the top-level, +common directory. This assumes that you do not have any cscope +databases in any of the subdirectories. If you do, you should +delete them; otherwise, they will take precedence over the +top-level database. + +.P +If you do have cscope databases in any subdirectory, the +following instructions may not work right. + +.P +It's pretty easy to tell this module to use a top-level, common +directory: + +.HP +a. Make sure that the menu pick, "Cscope/Index recursively", is +checked (the default value). + +.HP +b. Select the menu pick, "Cscope/Create list and index", and +specify the top-level directory. This will run the script, +"cscope-indexer", in the background, so you can do other +things if indexing takes a long time. A list of files to +index will be created in "cscope.files", and the cscope +database will be created in "cscope.out". + +.HP +Once this has been done, you can then use the menu picks +(described in "Basic usage", above) to search for symbols. + +.HP +Note, however, that, if you add or delete source files, you'll +have to either rebuild the database using the above procedure, +or edit the file, "cscope.files" to add/delete the names of the +source files. To edit this file, you can use the menu pick, +"Cscope/Edit list of files to index". + +.P +2. If most of the files exist below a common directory, but a few +are outside, you can use the menu pick, "Cscope/Create list of +files to index", and specify the top-level directory. Make sure +that "Cscope/Index recursively", is checked before you do so, +though. You can then edit the list of files to index using the +menu pick, "Cscope/Edit list of files to index". Just edit the +list to include any additional source files not already listed. + +.P +Once you've created, edited, and saved the list, you can then +use the menu picks described under "Basic usage", above, to +search for symbols. The first time you search, you will have to +wait a while for cscope to fully index the source files, though. +If you have a lot of source files, you may want to manually run +cscope to build the database: + +.nf + cd top-level-directory # or wherever + rm -f cscope.out # not always necessary + cscope -b +.fi + +.P + 3. If the source files are scattered in many different, unrelated + places, you'll have to manually create cscope.files and put a + list of all pathnames into it. Then build the database using: + +.nf + cd some-directory # wherever cscope.files exists + rm -f cscope.out # not always necessary + cscope -b +.fi + +.P +Next, read the documentation for the variable, +"cscope-database-regexps", and set it appropriately, such that +the above-created cscope database will be referenced when you +edit a related source file. + +.P +Once this has been done, you can then use the menu picks +described under "Basic usage", above, to search for symbols. + +.SS * Interesting configuration variables: + +.P +.B "cscope-truncate-lines" +.P +This is the value of `truncate-lines' to use in cscope +buffers; the default is the current setting of +`truncate-lines'. This variable exists because it can be +easier to read cscope buffers with truncated lines, while +other buffers do not have truncated lines. + +.P +.B "cscope-use-relative-paths" +.P +If non-nil, use relative paths when creating the list of files +to index. The path is relative to the directory in which the +cscope database will be created. If nil, absolute paths will +be used. Absolute paths are good if you plan on moving the +database to some other directory (if you do so, you'll +probably also have to modify `cscope-database-regexps'). +Absolute paths may also be good if you share the database file +with other users (you'll probably want to specify some +automounted network path for this). + +.P +.B "cscope-index-recursively" +.P +If non-nil, index files in the current directory and all +subdirectories. If nil, only files in the current directory +are indexed. This variable is only used when creating the +list of files to index, or when creating the list of files and +the corresponding cscope database. + +.P +.B "cscope-name-line-width" +.P +The width of the combined "function name:line number" field in +the cscope results buffer. If negative, the field is +left-justified. + +.P +.B "cscope-do-not-update-database" +.P +If non-nil, never check and/or update the cscope database when +searching. Beware of setting this to non-nil, as this will +disable automatic database creation, updating, and +maintenance. + +.P +.B "cscope-display-cscope-buffer" +.P +If non-nil, display the *cscope* buffer after each search +(default). This variable can be set in order to reduce the +number of keystrokes required to navigate through the matches. + +.P +.B "cscope-database-regexps" +.P +List to force directory-to-cscope-database mappings. +This is a list of `(REGEXP DBLIST [ DBLIST ... ])', where: + +.P +.B "REGEXP" +is a regular expression matched against the current buffer's +current directory. The current buffer is typically some source file, +and you're probably searching for some symbol in or related to this +file. Basically, this regexp is used to relate the current directory +to a cscope database. You need to start REGEXP with "^" if you want +to match from the beginning of the current directory. + +.P +.B "DBLIST" +is a list that contains one or more of: + +.nf + ( DBDIR ) + ( DBDIR ( OPTIONS ) ) + ( t ) + t +.fi + +.P +Here, +.B DBDIR +is a directory (or a file) that contains a cscope +database. If DBDIR is a directory, then it is expected that the +cscope database, if present, has the filename given by the variable, +`cscope-database-file'; if DBDIR is a file, then DBDIR is the path +name to a cscope database file (which does not have to be the same as +that given by `cscope-database-file'). If only DBDIR is specified, +then that cscope database will be searched without any additional +cscope command-line options. If OPTIONS is given, then OPTIONS is a +list of strings, where each string is a separate cscope command-line +option. + +.P + In the case of "( t )", this specifies that the search is to use the + normal hierarchical database search. This option is used to + explicitly search using the hierarchical database search either before + or after other cscope database directories. + +.P + If "t" is specified (not inside a list), this tells the searching + mechanism to stop searching if a match has been found (at the point + where "t" is encountered). This is useful for those projects that + consist of many subprojects. You can specify the most-used + subprojects first, followed by a "t", and then followed by a master + cscope database directory that covers all subprojects. This will + cause the most-used subprojects to be searched first (hopefully + quickly), and the search will then stop if a match was found. If not, + the search will continue using the master cscope database directory. + +.P + Here, `cscope-database-regexps' is generally not used, as the normal + hierarchical database search is sufficient for placing and/or locating + the cscope databases. However, there may be cases where it makes + sense to place the cscope databases away from where the source files + are kept; in this case, this variable is used to determine the + mapping. + +.P + This module searches for the cscope databases by first using this + variable; if a database location cannot be found using this variable, + then the current directory is searched, then the parent, then the + parent's parent, until a cscope database directory is found, or the + root directory is reached. If the root directory is reached, the + current directory will be used. + +.P +A cscope database directory is one in which EITHER a cscope database +file (e.g., "cscope.out") OR a cscope file list (e.g., +"cscope.files") exists. If only "cscope.files" exists, the +corresponding "cscope.out" will be automatically created by cscope +when a search is done. By default, the cscope database file is called +"cscope.out", but this can be changed (on a global basis) via the +variable, `cscope-database-file'. There is limited support for cscope +databases that are named differently than that given by +`cscope-database-file', using the variable, `cscope-database-regexps'. + +.P +Here is an example of `cscope-database-regexps': + +.nf + (setq cscope-database-regexps + '( + ( "^/users/jdoe/sources/proj1" + ( t ) + ( "/users/jdoe/sources/proj2") + ( "/users/jdoe/sources/proj3/mycscope.out") + ( "/users/jdoe/sources/proj4") + t + ( "/some/master/directory" ("-d" "-I/usr/local/include") ) + ) + ( "^/users/jdoe/sources/gnome/" + ( "/master/gnome/database" ("-d") ) + ) + )) +.fi + +.P +If the current buffer's directory matches the regexp, +"^/users/jdoe/sources/proj1", then the following search will be +done: + +.TP +1. First, the normal hierarchical database search will be used to +locate a cscope database. + +.TP +2. Next, searches will be done using the cscope database +directories, "/users/jdoe/sources/proj2", +"/users/jdoe/sources/proj3/mycscope.out", and +"/users/jdoe/sources/proj4". Note that, instead of the file, +"cscope.out", the file, "mycscope.out", will be used in the +directory "/users/jdoe/sources/proj3". + +.TP +3. If a match was found, searching will stop. + +.TP +4. If a match was not found, searching will be done using +"/some/master/directory", and the command-line options "-d" +and "-I/usr/local/include" will be passed to cscope. + +.TP +If the current buffer's directory matches the regexp, +"^/users/jdoe/sources/gnome", then the following search will be +done: + +.TP +The search will be done only using the directory, +"/master/gnome/database". The "-d" option will be passed to +cscope. + +.TP +If the current buffer's directory does not match any of the above +regexps, then only the normal hierarchical database search will be +done. + +.P +.SS * Other notes: + +.P +1. The script, "cscope-indexer", uses a sed command to determine +what is and is not a C/C++/lex/yacc source file. It's idea of a +source file may not correspond to yours. + +.P +2. This module is called, "xcscope", because someone else has +already written a "cscope.el" (although it's quite old). + +.SH KNOWN BUGS: + +.P +1. Cannot handle whitespace in directory or file names. + +.P +2. By default, colored faces are used to display results. If you happen +to use a black background, part of the results may be invisible +(because the foreground color may be black, too). There are at least +two solutions for this: + +.TP +.BI "2a. Turn off colored faces, by setting `cscope-use-face' to `nil', eg:" +.TP +.BI "(setq cscope-use-face nil)" + +.TP +.BI " 2b. Explicitly set colors for the faces used by cscope. The faces are" + +.nf + cscope-file-face + cscope-function-face + cscope-line-number-face + cscope-line-face + cscope-mouse-face +.fi + +.TP +The face most likely to cause problems (e.g., black-on-black +color) is `cscope-line-face'. + +.P +3. The support for cscope databases different from that specified by +`cscope-database-file' is quirky. If the file does not exist, it +will not be auto-created (unlike files names by +`cscope-database-file'). You can manually force the file to be +created by using touch(1) to create a zero-length file; the +database will be created the next time a search is done. --- cscope-15.6/doc/Makefile.in.orig 2006-09-30 11:14:57.000000000 -0400 +++ cscope-15.6/doc/Makefile.in 2007-05-25 09:46:04.000000000 -0400 @@ -148,7 +148,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -man_MANS = cscope.1 +man_MANS = cscope.1 xcscope.1 EXTRA_DIST = $(man_MANS) all: all-am Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cscope/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Sep 2004 19:46:27 -0000 1.3 +++ .cvsignore 25 May 2007 14:22:26 -0000 1.4 @@ -1,2 +1,3 @@ cscope-15.5.tar.gz cscope-15.5-inverted.patch +cscope-15.6.tar.gz Index: cscope.spec =================================================================== RCS file: /cvs/dist/rpms/cscope/devel/cscope.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- cscope.spec 5 Mar 2007 18:15:00 -0000 1.31 +++ cscope.spec 25 May 2007 14:22:26 -0000 1.32 @@ -1,8 +1,8 @@ Summary: C source code tree search and browse tool Name: cscope -Version: 15.5 -Release: 15.4%{?dist} -Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz +Version: 15.6 +Release: 1%{?dist} +Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.6.tar.gz URL: http://cscope.sourceforge.net License: BSD Group: Development/Tools @@ -13,17 +13,10 @@ %define xemacs_lisp_path %{_datadir}/xemacs/site-packages/lisp %define emacs_lisp_path %{_datadir}/emacs/site-lisp -Patch0:cscope-15.5-ocs.patch -Patch1:cscope-15.5-findassign.patch -Patch2:cscope-15.5-ocs-dash_s_fix.patch -Patch3:cscope-15.5-xcscope-man.patch -Patch4:cscope-15.5-inverted.patch -Patch5:cscope-15.5-resize.patch -Patch6:cscope-15.5-tempsec.patch -Patch7:cscope-15.5-inv-overflow.patch -Patch8:cscope-15.5-ocs-sysdir.patch -Patch9:cscope-15.5-putstring-overflow.patch -Patch10: cscope-15.5-fscanf-overflows.patch +Patch0:cscope-15.6-findassign.patch +Patch1:cscope-15.6-ocs.patch +Patch2:cscope-15.6-xcscope-man.patch +Patch3:cscope-15.6-sigwinch-linemode.patch %description cscope is a mature, ncurses based, C source code tree browsing tool. It @@ -38,13 +31,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 %build %configure @@ -93,6 +79,9 @@ rm -f %{emacs_lisp_path}/xcscope.el %changelog +* Fri Mar 25 2007 Neil Horman -15.6-1.dist +- Rebase to version 15.6 + * Mon Mar 05 2007 Neil Horman -15.5-15.4.dist - Make sigwinch handler only register for curses mode (bz 230862) Index: sources =================================================================== RCS file: /cvs/dist/rpms/cscope/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Sep 2004 19:50:21 -0000 1.4 +++ sources 25 May 2007 14:22:26 -0000 1.5 @@ -1 +1 @@ -beb6032a301bb11524aec74bfb5e4840 cscope-15.5.tar.gz +db87833f90d8267b1fc0c419cfc4d219 cscope-15.6.tar.gz From fedora-cvs-commits at redhat.com Fri May 25 14:25:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 25 May 2007 10:25:23 -0400 Subject: rpms/cscope/devel cscope-15.5-findassign.patch, 1.1, NONE cscope-15.5-fscanf-overflows.patch, 1.2, NONE cscope-15.5-inv-overflow.patch, 1.1, NONE cscope-15.5-inverted.patch, 1.2, NONE cscope-15.5-ocs-dash_s_fix.patch, 1.2, NONE cscope-15.5-ocs-sysdir.patch, 1.1, NONE cscope-15.5-ocs.patch, 1.1, NONE cscope-15.5-putstring-overflow.patch, 1.1, NONE cscope-15.5-resize.patch, 1.5, NONE cscope-15.5-tempsec.patch, 1.2, NONE cscope-15.5-xcscope-man.patch, 1.1, NONE Message-ID: <200705251425.l4PEPNKh028596@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/cscope/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28581 Removed Files: cscope-15.5-findassign.patch cscope-15.5-fscanf-overflows.patch cscope-15.5-inv-overflow.patch cscope-15.5-inverted.patch cscope-15.5-ocs-dash_s_fix.patch cscope-15.5-ocs-sysdir.patch cscope-15.5-ocs.patch cscope-15.5-putstring-overflow.patch cscope-15.5-resize.patch cscope-15.5-tempsec.patch cscope-15.5-xcscope-man.patch Log Message: removing old cscope-15.5 patches --- cscope-15.5-findassign.patch DELETED --- --- cscope-15.5-fscanf-overflows.patch DELETED --- --- cscope-15.5-inv-overflow.patch DELETED --- --- cscope-15.5-inverted.patch DELETED --- --- cscope-15.5-ocs-dash_s_fix.patch DELETED --- --- cscope-15.5-ocs-sysdir.patch DELETED --- --- cscope-15.5-ocs.patch DELETED --- --- cscope-15.5-putstring-overflow.patch DELETED --- --- cscope-15.5-resize.patch DELETED --- --- cscope-15.5-tempsec.patch DELETED --- --- cscope-15.5-xcscope-man.patch DELETED --- From fedora-cvs-commits at redhat.com Fri May 25 15:09:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 25 May 2007 11:09:29 -0400 Subject: rpms/xen/FC-5 xen.spec,1.124,1.125 Message-ID: <200705251509.l4PF9TTn029425@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv29411 Modified Files: xen.spec Log Message: Added missing version info to changelog Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/FC-5/xen.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- xen.spec 3 Apr 2007 13:28:16 -0000 1.124 +++ xen.spec 25 May 2007 15:09:26 -0000 1.125 @@ -327,7 +327,7 @@ %dir %attr(0700,root,root) /var/log/xen %changelog -* Mon Apr 02 2007 Markus Armbruster +* Mon Apr 02 2007 Markus Armbruster - 3.0.3-6.fc5 - fix ethernet bonding in balanced-rr mode * Wed Mar 14 2007 Daniel P. Berrange - 3.0.3-5.fc5 From fedora-cvs-commits at redhat.com Fri May 25 17:50:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 25 May 2007 13:50:14 -0400 Subject: rpms/kexec-tools/devel mkdumprd,1.13,1.14 Message-ID: <200705251750.l4PHoEM0001483@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1467 Modified Files: mkdumprd Log Message: Resolves: bz 223743 Index: mkdumprd =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/mkdumprd,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mkdumprd 15 Mar 2007 17:36:03 -0000 1.13 +++ mkdumprd 25 May 2007 17:50:07 -0000 1.14 @@ -924,19 +924,11 @@ fi if [ -n "$CORE_COLLECTOR" ]; then - if [ "$USING_METHOD" == "ssh" ] || [ "$USING_METHOD" == "raw" ]; then - echo "You may only use alternate core collectors with the NFS and Local Filesystem targets" - rm -rf $MNTIMAGE - rm -rf $IMAGE - exit 1 - fi - if [ -z "$USING_METHOD" ] then echo "Warning! Lack of dump target specification means core_collector option is ignored!" CORE_COLLECTOR="" fi - fi @@ -1479,7 +1471,13 @@ #setup raw case emit "echo Saving to partition $location" - emit "dd if=/proc/vmcore of=$location" + if [ -z "$CORE_COLLECTOR" ] + then + emit "dd if=/proc/vmcore of=$location" + else + CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e's/\(^makedumpfile\)\(.*$\)/\1 -F \2/'` + emit "$CORE_COLLECTOR /proc/vmcore | dd of=$location" + fi emit "if [ \$? == 0 ]" emit "then" emit " reboot -f" @@ -1584,6 +1582,11 @@ else #SSH path #rebuild $location replacing machine name with ip address + if [ -n "$CORE_COLLECTOR" ] + then + CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e's/\(^makedumpfile\)\(.*$\)/\1 -F \2/'` + fi + bin="$bin /usr/bin/ssh /usr/bin/scp" rlocation=`echo $location|sed 's/@.*/@'"$rhost"'/'` #test ssh path and directory creation @@ -1616,10 +1619,20 @@ fi emit "dd if=/dev/mem of=/dev/urandom count=1 bs=512 skip=100" emit "ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mkdir $SAVE_PATH/$lhost-\$DATE" - emit "scp -q -o BatchMode=yes -o StrictHostKeyChecking=no /proc/vmcore $rlocation:$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete" + if [ -z "$CORE_COLLECTOR" ] + then + emit "scp -q -o BatchMode=yes -o StrictHostKeyChecking=no /proc/vmcore $rlocation:$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete" + else + emit "$CORE_COLLECTOR /proc/vmcore | ssh -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation \"cat > $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete\"" + fi emit "if [ \$? == 0 ]" emit "then" - emit " ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mv $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete $SAVE_PATH/$lhost-\$DATE/vmcore" + if [ -z "$CORE_COLLECTOR" ] + then + emit " ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mv $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete $SAVE_PATH/$lhost-\$DATE/vmcore" + else + emit " ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mv $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete $SAVE_PATH/$lhost-\$DATE/vmcore.flat" + fi emit " reboot -f" emit "fi" fi From fedora-cvs-commits at redhat.com Fri May 25 17:54:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 25 May 2007 13:54:06 -0400 Subject: rpms/kexec-tools/devel kexec-tools.spec,1.85,1.86 Message-ID: <200705251754.l4PHs61v001567@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1553 Modified Files: kexec-tools.spec Log Message: Resolves: bz 223743 Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- kexec-tools.spec 8 May 2007 17:28:16 -0000 1.85 +++ kexec-tools.spec 25 May 2007 17:54:04 -0000 1.86 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 69%{?dist} +Release: 71%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -251,6 +251,9 @@ %doc kexec-kdump-howto.txt %changelog +* Fri May 25 2007 Neil Horman - 1.101-71%{dist} +- Add ability to use makedumpfile over ssh (bz 223743) + * Tue May 08 2007 Neil Horman - 1.101-70%{dist} - Add kexec output in failure on start From fedora-cvs-commits at redhat.com Mon May 28 07:05:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 28 May 2007 03:05:47 -0400 Subject: rpms/vsftpd/FC-6 vsftpd-2.0.5-file_stat.patch, NONE, 1.1 vsftpd.spec, 1.53, 1.54 Message-ID: <200705280705.l4S75lFZ016973@cvs.devel.redhat.com> Author: mbarabas Update of /cvs/dist/rpms/vsftpd/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16957 Modified Files: vsftpd.spec Added Files: vsftpd-2.0.5-file_stat.patch Log Message: Add fix using correct stat function vsftpd-2.0.5-file_stat.patch: parseconf.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE vsftpd-2.0.5-file_stat.patch --- --- vsftpd-2.0.5/parseconf.c.old 2006-12-05 12:19:48.000000000 +0100 +++ vsftpd-2.0.5/parseconf.c 2006-12-05 12:19:54.000000000 +0100 @@ -208,7 +208,7 @@ copy_string_settings(); } retval = str_fileread(&config_file_str, p_filename, VSFTP_CONF_FILE_MAX); - (int)str_stat(&config_file_str, &p_statbuf); + (int)vsf_sysutil_stat(p_filename, &p_statbuf); /* Security - die unless the conf file is owned by root */ if (vsf_sysutil_retval_is_error(retval) || vsf_sysutil_statbuf_get_uid(p_statbuf) != VSFTP_ROOT_UID) { Index: vsftpd.spec =================================================================== RCS file: /cvs/dist/rpms/vsftpd/FC-6/vsftpd.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- vsftpd.spec 19 Jan 2007 12:23:14 -0000 1.53 +++ vsftpd.spec 28 May 2007 07:05:45 -0000 1.54 @@ -3,7 +3,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 2.0.5 -Release: 9 +Release: 10 License: GPL Group: System Environment/Daemons URL: http://vsftpd.beasts.org/ @@ -37,6 +37,7 @@ Patch22: vsftpd-2.0.5-man.patch Patch23: vsftpd-2.0.4-filter.patch Patch24: vsftpd-2.0.5-uniq_rename.patch +Patch25: vsftpd-2.0.5-file_stat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if %{tcp_wrappers} @@ -88,6 +89,7 @@ %patch22 -p1 -b .manp %patch23 -p1 -b .filter %patch24 -p1 -b .uniq_rename +%patch25 -p1 -b .file_stat %build %ifarch s390x @@ -146,6 +148,10 @@ /var/ftp %changelog +* Mon May 28 2007 Maros Barabas - 2.0.5-10 +- fix incorrect use str_stat function +- Resolves #206810 + * Fri Jan 19 2007 Maros Barabas - 2.0.5-9 - add lost patch: don't die when no user config file is present - Resolves #166986 From fedora-cvs-commits at redhat.com Mon May 28 07:23:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 28 May 2007 03:23:16 -0400 Subject: rpms/vsftpd/FC-6 vsftpd.spec,1.54,1.55 Message-ID: <200705280723.l4S7NGOQ017374@cvs.devel.redhat.com> Author: mbarabas Update of /cvs/dist/rpms/vsftpd/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17359 Modified Files: vsftpd.spec Log Message: Index: vsftpd.spec =================================================================== RCS file: /cvs/dist/rpms/vsftpd/FC-6/vsftpd.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- vsftpd.spec 28 May 2007 07:05:45 -0000 1.54 +++ vsftpd.spec 28 May 2007 07:23:14 -0000 1.55 @@ -3,7 +3,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 2.0.5 -Release: 10 +Release: 10%{?dist} License: GPL Group: System Environment/Daemons URL: http://vsftpd.beasts.org/ @@ -31,7 +31,7 @@ Patch16: vsfptd-2.0.3-user_config.patch Patch17: vsftpd-2.0.3-pam_hostname.patch Patch18: vsftpd-close-std-fds.patch -Patch19: vsftpd-2.0.5-default_ipv6.patch +patch19: vsftpd-2.0.5-default_ipv6.patch Patch20: vsftpd-2.0.5-add_ipv6_option.patch Patch21: vsftpd-2.0.5-correct_comments.patch Patch22: vsftpd-2.0.5-man.patch From fedora-cvs-commits at redhat.com Mon May 28 13:21:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 28 May 2007 09:21:51 -0400 Subject: rpms/system-config-soundcard/FC-6 system-config-soundcard-2.0.6-dbus.patch, NONE, 1.1 system-config-soundcard-2.0.6-update.patch, NONE, 1.1 system-config-soundcard-2.0.6-usb-hack.patch, NONE, 1.1 system-config-soundcard-no-vendor.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.20, 1.21 system-config-soundcard.spec, 1.51, 1.52 Message-ID: <200705281321.l4SDLpEB023312@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv23295 Modified Files: .cvsignore sources system-config-soundcard.spec Added Files: system-config-soundcard-2.0.6-dbus.patch system-config-soundcard-2.0.6-update.patch system-config-soundcard-2.0.6-usb-hack.patch system-config-soundcard-no-vendor.patch Log Message: update the no-vendor fix (#237709), added a hack for USB devices (#232217), disabled fix for (#227778) system-config-soundcard-2.0.6-dbus.patch: soundcardBackendHal.py | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) --- NEW FILE system-config-soundcard-2.0.6-dbus.patch --- --- system-config-soundcard-2.0.6/src/soundcardBackendHal.py.old 2006-06-30 14:07:38.000000000 +0200 +++ system-config-soundcard-2.0.6/src/soundcardBackendHal.py 2007-01-23 13:13:13.000000000 +0100 @@ -42,12 +42,19 @@ self.doDebug = True - self._dbusBus = dbus.SystemBus() - self.halManagerObj = self._dbusBus.get_object("org.freedesktop.Hal", "/org/freedesktop/Hal/Manager") - self.halManager = dbus.Interface(self.halManagerObj, "org.freedesktop.Hal.Manager") - self.driverList = self.read_driver_list() + try: + self._dbusBus = dbus.SystemBus() + self.halManagerObj = self._dbusBus.get_object("org.freedesktop.Hal", "/org/freedesktop/Hal/Manager") + self.halManager = dbus.Interface(self.halManagerObj, "org.freedesktop.Hal.Manager") + except: + self._dbusBus = [] + self.halManagerObj = [] + self.halManager = [] + self.driverList = [] + print _("Unable to initialize D-BUS/HAL!") + self.cards = {} def destroy(self, args): @@ -160,14 +167,14 @@ #if card.bus() == "macio" and card.driver() != "snd-powermac": def probeCards(self, default_card, default_device, card_list, card_max): - udiList = self.halManager.FindDeviceByCapability("alsa") - for udi in udiList: - self.getDevices(udi) + if self.halManager != []: + udiList = self.halManager.FindDeviceByCapability("alsa") + for udi in udiList: + self.getDevices(udi) - for index in self.cards: - if index < card_max : - card_list[index] = self.cards[index] + for index in self.cards: + if index < card_max : + card_list[index] = self.cards[index] card_list[default_card].default_device = default_device - return card_list system-config-soundcard-2.0.6-update.patch: soundcard.py | 81 ++++++++++++++++++++++++++++++++++++++++++++-------- soundcardBackend.py | 36 ++++++++++++++--------- 2 files changed, 92 insertions(+), 25 deletions(-) --- NEW FILE system-config-soundcard-2.0.6-update.patch --- --- system-config-soundcard-2.0.6/src/soundcard.py.old 2006-12-21 14:17:00.000000000 +0100 +++ system-config-soundcard-2.0.6/src/soundcard.py 2007-04-11 10:51:00.000000000 +0200 @@ -81,10 +81,14 @@ if self.play_sound_card_index != None : self.soundcardBackend.stopTestSound(self.play_sound_card_index) self.play_sound_card_index = None + if self.firstBoot : + self.soundcardBackend.rewriteConfigFiles() gtk.main_quit() def __init__(self, doDebug=None, backend=None): + self.firstBoot = True + self.mainWindow = None self.card_list = None @@ -246,6 +250,25 @@ else: self.soundcardBackend.setVolume() + # we need to shrink/cut every too long line + def wrapLine(self, line, max_len = 30, cut = False): + lines = string.split(line) + + lines_new = [] + ln = 0 + + for l in lines: + ln = ln + len(l) + if ln > max_len: + if not cut: + l = '\n' + l[0:] + ln = len(l) + else: + break + lines_new.append(l) + + return string.join(lines_new) + def create_frame(self, widget, border = 5, label = None, shadow = gtk.SHADOW_NONE): frame = gtk.Frame(label) frame.set_border_width(border) @@ -272,26 +295,43 @@ maker_label2 = gtk.Label("") if card.maker != None: + maker_string = [] + if self.firstBoot: + maker_string = card.maker + else: + maker_string = card.maker + maker_label.set_markup("" "%s" % _("Vendor:")) - maker_label.set_alignment(0.0, 0.5) - maker_label2 = gtk.Label(card.maker) + maker_label.set_alignment(0.0, 0.5) + maker_label2 = gtk.Label(maker_string) maker_label2.set_alignment(0.0, 0.5) elif card.type != None: + type_string = [] + if self.firstBoot: + type_string = card.type + else: + type_string = card.type + maker_label.set_markup("" "%s" % _("Card:")) maker_label.set_alignment(0.0, 0.5) - maker_label2 = gtk.Label(card.type) + maker_label2 = gtk.Label(type_string) maker_label2.set_alignment(0.0, 0.5) + model_string = [] + if self.firstBoot: + model_string = card.model + else: + model_string = card.model + model_label = gtk.Label("") model_label.set_markup("" "%s" % _("Model:")) model_label.set_alignment(0.0, 0.5) - - model_label2 = gtk.Label(card.model) + model_label2 = gtk.Label(model_string) model_label2.set_alignment(0.0, 0.5) module_label = gtk.Label("") @@ -486,8 +526,8 @@ return tmpBox def default_device_menu_handler(self, data): - #print "Default device %d" % data card_index = self.soundcardBackend.getDefaultCard() + #print "Default device %d, card %d" % (data, card_index) self.soundcardBackend.setCardDefaultDevice(card_index, data) def test_device_menu_handler(self, data): @@ -543,7 +583,7 @@ #print self.soundcardBackend.getCardDefaultDevice(data) #print "card %d device %d" % (data, self.soundcardBackend.getDefaultCardDevice(data)) self.create_sub_device_menu_refresh(self.default_device_menu_handler, data, \ - self.soundcardBackend.getCardDefaultDevice(data)) + self.soundcardBackend.getCardDefaultDevice(data)) def create_settings_page_card_list_callback(self, treeview): #print "Zmena" @@ -707,6 +747,9 @@ def create_system_page_modules_reload(self, widget): self.soundcardBackend.reloadModules() + def create_system_page_rewrite_files(self, widget): + self.soundcardBackend.rewriteConfigFiles() + def create_system_page(self): table = gtk.Table(2, 3) @@ -718,8 +761,13 @@ maker_label.set_markup("" "%s" % _("ALSA Driver version:")) + driver_line = self.soundcardBackend.getDriverVersion() + pos = string.find(driver_line,"Driver") + if pos != -1: + driver_line = driver_line[pos:] + maker_label.set_alignment(0.0, 0.5) - maker_label2 = gtk.Label(self.soundcardBackend.getDriverVersion()) + maker_label2 = gtk.Label(driver_line) maker_label2.set_alignment(0.0, 0.5) model_label = gtk.Label("") @@ -764,9 +812,18 @@ detectionBox = gtk.HBox(False, 8) detectionBox.pack_start(reload_button, True, True) detectionBox = self.create_frame(self.create_frame(detectionBox,8),0,_("Drivers"),gtk.SHADOW_ETCHED_IN) - + infoBox.pack_start(detectionBox, False, False) + rewrite_button = gtk.Button(_("Rewrite configuration files")) + rewrite_button.connect("clicked", self.create_system_page_rewrite_files) + + rewriteBox = gtk.HBox(False, 8) + rewriteBox.pack_start(rewrite_button, True, True) + rewriteBox = self.create_frame(self.create_frame(rewriteBox,8),0,_("Configuration files"),gtk.SHADOW_ETCHED_IN) + + infoBox.pack_start(rewriteBox, False, False) + return infoBox def refresh_notebook(self): @@ -778,7 +835,7 @@ def launch(self): - print "Running from first-boot..." + print "Running from first-boot..." self.mainVBox = gtk.VBox() self.internalVBox = gtk.VBox(False, 10) @@ -799,7 +856,9 @@ def stand_alone(self): print "Running from command-line..." - + + self.firstBoot = False + self.mainWindow = gtk.Dialog() self.mainWindow.vbox.set_spacing(5) self.mainWindow.connect("destroy", self.destroy) --- system-config-soundcard-2.0.6/src/soundcardBackend.py.old 2006-07-21 09:37:22.000000000 +0200 +++ system-config-soundcard-2.0.6/src/soundcardBackend.py 2007-04-11 10:40:58.000000000 +0200 @@ -19,9 +19,6 @@ ## TODO ## - surround test (alsa-speaker test) -## - clean-up objects interfaces -## - remove all 2.4 stuff - import string @@ -193,7 +190,9 @@ if kernel_type == '2.6': lines = [] - lines.append("#Generated by system-config-soundcard, do not edit by hand\n") + lines.append("#Generated by system-config-soundcard\n") + lines.append("#If you edit this file, don't run system-config-soundcard,\n") + lines.append("#all changes could be lost.\n") if self.hardware_device: lines.append("#HWCONF\n") lines.append("#DEV %d\n" % device) @@ -254,23 +253,27 @@ tmp = line.split() - if tmp == [] or tmp[0] == [] or tmp[1] == [] or\ - tmp[2] == [] or tmp[0][0] == '#': - modprobe.append(whole_line) + if tmp == [] or tmp[0] == [] or tmp[0][0] == '#'\ + or tmp[1] == [] or tmp[2] == [] : + modprobe.append(whole_line) + continue + + if tmp[0] == "install" or tmp[0] == "remove": + modprobe.append(whole_line) continue if tmp[0] != "alias" and tmp[1][:3] != "snd" and\ tmp[2][:9] != "snd-card-": - modprobe.append(whole_line) - continue + modprobe.append(whole_line) + continue if tmp[0] != "options" and tmp[1][:3] != "snd" and\ tmp[2][:5] != "index" and tmp[2][:11] != "cards_limit": - modprobe.append(whole_line) + modprobe.append(whole_line) continue - - sound_lines.append([position] + tmp) + sound_lines.append([position] + tmp) + modprobe.append("options snd cards_limit=" + `len(cardArray)` + "\n") for card in cardArray: @@ -283,7 +286,7 @@ fd = open('/etc/modprobe.conf', 'w') fd.writelines(modprobe) fd.close() - except: + except: return False return True @@ -545,6 +548,7 @@ def setCardDefaultDevice(self, card_index, device_index): self.cardArray[card_index].default_device = device_index + self.soundConfig.cardDefaultChanged() def getCardDefaultDevice(self, card_index): return self.cardArray[card_index].default_device @@ -587,7 +591,11 @@ def reloadModules(self, *args): self.soundConfig.reloadModules(self.cardArray) - + + def rewriteConfigFiles(self): + self.soundConfig.rewriteModprobe(self.cardArray) + self.soundConfig.writeAlsaConfig(self.cardArray) + # ------------------------------------------------------------------------ # Info routines # ------------------------------------------------------------------------ system-config-soundcard-2.0.6-usb-hack.patch: soundcardBackend.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 2 deletions(-) --- NEW FILE system-config-soundcard-2.0.6-usb-hack.patch --- --- system-config-soundcard-2.0.6/src/soundcardBackend.py.usb 2007-05-28 14:24:36.000000000 +0200 +++ system-config-soundcard-2.0.6/src/soundcardBackend.py 2007-05-28 14:54:20.000000000 +0200 @@ -47,6 +47,9 @@ DETECTION_PROC = "proc" DETECTION_HAL = "hal" +USB_AUDIO_DRIVER = "snd-usb-audio" +USB_AUDIO_POSITION = 7 + ## ## Error message ## @@ -141,7 +144,9 @@ self.card_default_changed = False self.readAlsaConfig() - + + self.usb_cards_hack = True + self.usb_cards_hack_position = USB_AUDIO_POSITION def dump(self): print " ----------- soundConfiguration -----------" @@ -192,7 +197,7 @@ lines.append("#Generated by system-config-soundcard\n") lines.append("#If you edit this file, don't run system-config-soundcard,\n") - lines.append("#all changes could be lost.\n") + lines.append("#all your changes here could be lost.\n") if self.hardware_device: lines.append("#HWCONF\n") lines.append("#DEV %d\n" % device) @@ -228,6 +233,51 @@ if card.active: num = card.index return num + + def readUSBDevicePosition(self, list): + # Checking for "options snd-usb-audio index=X" + for whole_line in list: + + line = string.strip(whole_line) + if line == []: + modprobe.append(whole_line) + continue; + + tmp = line.split() + + if tmp == [] or tmp[0] == [] or tmp[0][0] == '#'\ + or tmp[1] == [] or tmp[2] == [] : + continue + + if tmp[0] != "options": + continue + + if tmp[1] != "snd-usb-audio" and tmp[1] != "snd_usb_audio": + continue; + + if tmp[2][:5] == "index": + option = string.split(string.join(tmp[2:]), '=') + # option[1] has to be the index + self.usb_cards_hack = True + self.usb_cards_hack_position = string.atoi(option[1]) + break; + + + def writeUSBDevicePosition(self, cardArray, modprobe): + if self.usb_cards_hack: + is_there_any_usb = False + for card in cardArray: + if card.active and (card.driver == "snd-usb-audio" or card.driver == "snd_usb_audio"): + is_there_any_usb = True + break; + + if not is_there_any_usb: + modprobe.append("alias snd-card-%d %s\n" % (self.usb_cards_hack_position, USB_AUDIO_DRIVER)) + modprobe.append("options %s index=%d\n" % (USB_AUDIO_DRIVER, self.usb_cards_hack_position)) + + def setUSBDevice(self): + self.usb_cards_hack = True; + self.card_index_changed = True def rewriteModprobe(self, cardArray): @@ -238,6 +288,8 @@ except: return False + self.readUSBDevicePosition(list) + sound_lines = [] modprobe = [] @@ -280,6 +332,8 @@ if card.active: modprobe.append("alias snd-card-%d %s\n" % (card.index, card.driver)) modprobe.append("options %s index=%d\n" % (card.driver, card.index)) + + self.writeUSBDevicePosition(cardArray, modprobe) try: os.rename('/etc/modprobe.conf', '/etc/modprobe.conf.scs') system-config-soundcard-no-vendor.patch: soundcardBackendHal.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+) --- NEW FILE system-config-soundcard-no-vendor.patch --- --- system-config-soundcard-2.0.6/src/soundcardBackendHal.py.novendor 2007-05-28 11:56:32.000000000 +0200 +++ system-config-soundcard-2.0.6/src/soundcardBackendHal.py 2007-05-28 12:15:04.000000000 +0200 @@ -107,6 +107,26 @@ if new_parentUdi == None: break parentUdi = new_parentUdi + + # Vendor has not been found - search the product name at least + vendor = _("Unknown") + parentUdi = udi + device_skipped = False + while parentUdi and len(parentUdi): + obj = self._dbusBus.get_object("org.freedesktop.Hal", parentUdi) + + product = self.getProperty(obj, "info.product") + if product != None and device_skipped : + return vendor, product + + new_parentUdi = self.getProperty(obj, "info.parent") + if new_parentUdi == None: + break + parentUdi = new_parentUdi + device_skipped = True + + # hmm, it's a strange device + return (vendor, vendor) def getBus(self, udi): parentUdi = udi Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/FC-6/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 27 Nov 2006 15:04:51 -0000 1.16 +++ .cvsignore 28 May 2007 13:21:49 -0000 1.17 @@ -11,3 +11,4 @@ system-config-soundcard-2.0.3.tar.bz2 system-config-soundcard-2.0.4.tar.bz2 system-config-soundcard-2.0.5.tar.bz2 +system-config-soundcard-2.0.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/FC-6/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 27 Nov 2006 15:32:56 -0000 1.20 +++ sources 28 May 2007 13:21:49 -0000 1.21 @@ -1 +1,2 @@ 45ecd6bf4c4db3b26b5e1335681bce11 system-config-soundcard-2.0.5.tar.bz2 +5ddc6e10458bd2b4343ad63df70f11b6 system-config-soundcard-2.0.6.tar.bz2 Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/FC-6/system-config-soundcard.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- system-config-soundcard.spec 27 Nov 2006 15:32:56 -0000 1.51 +++ system-config-soundcard.spec 28 May 2007 13:21:49 -0000 1.52 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard -Version: 2.0.5 -Release: 2%{dist} +Version: 2.0.6 +Release: 6%{dist} URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux @@ -9,6 +9,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 +Patch: system-config-soundcard-2.0.6-dbus.patch +Patch1: system-config-soundcard-2.0.6-update.patch +Patch2: system-config-soundcard-no-vendor.patch +Patch3: system-config-soundcard-2.0.6-usb-hack.patch BuildRequires: desktop-file-utils BuildRequires: gettext, intltool ExcludeArch: s390 s390x @@ -16,7 +20,6 @@ Requires: pygtk2 Requires: python2 Requires: usermode >= 1.36 -Requires: sox Requires: rhpl Requires: kudzu Requires: alsa-utils >= 1.0.11 @@ -31,7 +34,11 @@ detects and configures the soundcard(s) on the system. %prep -%setup -q +%setup -q +%patch -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 -b .usb %build make @@ -81,8 +88,35 @@ %ghost /root/scsound.log %changelog -* Mon Nov 27 2006 Martin Stransky 2.0.5-2 -- removed old sources +* Mon May 28 2007 Martin Stransky - 2.0.6-6 +- update the no-vendor fix (#237709) +- added a hack for USB devices (#232217) +- disabled fix for (#227778) + +* Mon May 21 2007 Jeremy Katz - 2.0.6-5 +- fix case of no vendor being able to be found in the hal tree (#237709) + +* Wed Apr 11 2007 Martin Stransky 2.0.6-4 +- fixed #227778 - Firstboot soundcard screen 'too wide' + with long name +- fixed device and initial soundcard configuration +- fixed modprobe.conf parser + +* Wed Mar 28 2007 Jeremy Katz - 2.0.6-3 +- sox doesn't get used anymore; don't require it + +* Tue Jan 23 2007 Martin Stransky 2.0.6-2 +- fixed #223915 - system-config-soundcard does not start + +* Thu Dec 21 2006 Martin Stransky 2.0.6-1 +- translation update + +* Thu Dec 7 2006 Martin Stransky 2.0.5-3 +- removed unused code (#218389) +- hide tabs if only one sound device is detected (#208411) + +* Fri Dec 1 2006 Adam Jackson 2.0.5-2 +- Bump to fix 6 to 7 upgrades. * Mon Nov 27 2006 Martin Stransky 2.0.5-1 - updated translations From fedora-cvs-commits at redhat.com Mon May 28 13:42:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 28 May 2007 09:42:50 -0400 Subject: rpms/mutt/FC-5 mutt-apopmsgid.patch, NONE, 1.1 mutt-gecos.patch, NONE, 1.1 mutt.spec, 1.34, 1.35 Message-ID: <200705281342.l4SDgouf023560@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/mutt/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv23541 Modified Files: mutt.spec Added Files: mutt-apopmsgid.patch mutt-gecos.patch Log Message: - validate msgid in APOP authentication (CVE-2007-1558) - fix overflow in gecos field handling (CVE-2007-2683) mutt-apopmsgid.patch: pop_auth.c | 7 +++++++ rfc822.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ rfc822.h | 1 + 3 files changed, 54 insertions(+) --- NEW FILE mutt-apopmsgid.patch --- # HG changeset patch # User Brendan Cully # Date 1175552458 25200 # Node ID 4adb236ca78d25cd6eb4805da033a0951b62b0dd # Parent e363d7a6904653f2b5acc17f6ea0da526bb63711 Validate msgid in APOP authentication. Closes #2846 diff -r e363d7a69046 -r 4adb236ca78d pop_auth.c --- a/pop_auth.c Tue Apr 03 08:59:11 2007 -0700 +++ b/pop_auth.c Mon Apr 02 15:20:58 2007 -0700 @@ -183,6 +183,13 @@ static pop_auth_res_t pop_auth_apop (POP if (!pop_data->timestamp) return POP_A_UNAVAIL; + if (rfc822_valid_msgid (pop_data->timestamp) < 0) + { + mutt_error _("POP timestamp is invalid!"); + mutt_sleep (2); + return POP_A_UNAVAIL; + } + mutt_message _("Authenticating (APOP)..."); /* Compute the authentication hash to send to the server */ diff -r e363d7a69046 -r 4adb236ca78d rfc822.c --- a/rfc822.c Tue Apr 03 08:59:11 2007 -0700 +++ b/rfc822.c Mon Apr 02 15:20:58 2007 -0700 @@ -792,6 +792,52 @@ ADDRESS *rfc822_append (ADDRESS **a, ADD return tmp; } +/* incomplete. Only used to thwart the APOP MD5 attack (#2846). */ +int rfc822_valid_msgid (const char *msgid) +{ + /* msg-id = "<" addr-spec ">" + * addr-spec = local-part "@" domain + * local-part = word *("." word) + * word = atom / quoted-string + * atom = 1* + * CHAR = ( 0.-127. ) + * specials = "(" / ")" / "<" / ">" / "@" + / "," / ";" / ":" / "\" / <"> + / "." / "[" / "]" + * SPACE = ( 32. ) + * CTLS = ( 0.-31., 127.) + * quoted-string = <"> *(qtext/quoted-pair) <"> + * qtext = , "\" and CR> + * CR = ( 13. ) + * quoted-pair = "\" CHAR + * domain = sub-domain *("." sub-domain) + * sub-domain = domain-ref / domain-literal + * domain-ref = atom + * domain-literal = "[" *(dtext / quoted-pair) "]" + */ + + char* dom; + unsigned int l, i; + + if (!msgid || !*msgid) + return -1; + + l = mutt_strlen (msgid); + if (l < 5) /* */ + return -1; + if (msgid[0] != '<' || msgid[l-1] != '>') + return -1; + if (!(dom = strrchr (msgid, '@'))) + return -1; + + /* TODO: complete parser */ + for (i = 0; i < l; i++) + if ((unsigned char)msgid[i] > 127) + return -1; + + return 0; +} + #ifdef TESTING int safe_free (void **p) /* __SAFE_FREE_CHECKED__ */ { diff -r e363d7a69046 -r 4adb236ca78d rfc822.h --- a/rfc822.h Tue Apr 03 08:59:11 2007 -0700 +++ b/rfc822.h Mon Apr 02 15:20:58 2007 -0700 @@ -52,6 +52,7 @@ void rfc822_write_address_single (char * void rfc822_write_address_single (char *, size_t, ADDRESS *, int); void rfc822_free_address (ADDRESS **addr); void rfc822_cat (char *, size_t, const char *, const char *); +int rfc822_valid_msgid (const char *msgid); extern int RFC822Error; extern const char *RFC822Errors[]; mutt-gecos.patch: muttlib.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE mutt-gecos.patch --- # HG changeset patch # User Brendan Cully # Date 1178561955 25200 # Node ID 47d08903b79b78ce26516de97682b244d3573c47 # Parent f6861b85f22b1656a870aeabad83a1bbd9794af9 Use signed arithmetic in mutt_gecos_name to avoid an overflow. Closes #2885. diff -r f6861b85f22b -r 47d08903b79b muttlib.c --- a/muttlib.c Wed May 02 10:50:07 2007 -0700 +++ b/muttlib.c Mon May 07 11:19:15 2007 -0700 @@ -540,7 +540,7 @@ char *mutt_gecos_name (char *dest, size_ if (dest[idx] == '&') { memmove (&dest[idx + pwnl], &dest[idx + 1], - MAX(destlen - idx - pwnl - 1, 0)); + MAX((ssize_t)(destlen - idx - pwnl - 1), 0)); memcpy (&dest[idx], pw->pw_name, MIN(destlen - idx - 1, pwnl)); dest[idx] = toupper ((unsigned char) dest[idx]); } Index: mutt.spec =================================================================== RCS file: /cvs/dist/rpms/mutt/FC-5/mutt.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- mutt.spec 24 Oct 2006 15:33:31 -0000 1.34 +++ mutt.spec 28 May 2007 13:42:48 -0000 1.35 @@ -2,7 +2,7 @@ Name: mutt %define uversion 0.9 Version: 1.4.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 5 License: GPL Group: Applications/Internet @@ -27,6 +27,8 @@ Patch21: mutt-sasl-log.patch Patch22: mutt-1.4.2.1-imapns.patch Patch23: mutt-safeopen.patch +Patch24: mutt-apopmsgid.patch +Patch25: mutt-gecos.patch Url: http://www.mutt.org/ Requires: smtpdaemon, webclient, mailcap, gettext Obsoletes: urlview @@ -73,6 +75,8 @@ %patch21 -p1 %patch22 -p1 -b .imapns %patch23 -p0 -b .safeopen +%patch24 -p1 -b .apopmsgid +%patch25 -p1 -b .gecos install -m644 %{SOURCE1} mutt_ldap_query @@ -158,6 +162,10 @@ %{_mandir}/man5/muttrc.* %changelog +* Mon May 28 2007 Miroslav Lichvar 5:1.4.2.1-8.fc5 +- validate msgid in APOP authentication (CVE-2007-1558) +- fix overflow in gecos field handling (CVE-2007-2683) + * Tue Oct 24 2006 Miroslav Lichvar 5:1.4.2.1-7.fc5 - fix insecure temp file creation on NFS (#211085, CVE-2006-5297) From fedora-cvs-commits at redhat.com Mon May 28 13:50:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 28 May 2007 09:50:35 -0400 Subject: rpms/mutt/FC-6 mutt-1.4.2.3-sasl2.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 mutt.spec, 1.39, 1.40 sources, 1.11, 1.12 mutt-1.4-sasl2.patch, 1.4, NONE Message-ID: <200705281350.l4SDoZvH023689@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/mutt/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv23667 Modified Files: .cvsignore mutt.spec sources Added Files: mutt-1.4.2.3-sasl2.patch Removed Files: mutt-1.4-sasl2.patch Log Message: - update to 1.4.2.3 (CVE-2007-2683, CVE-2007-1558) mutt-1.4.2.3-sasl2.patch: mutt-1.4.2.2/imap/auth_sasl.c | 14 ++------ mutt-1.4.2.2/mutt_sasl.c | 68 ++++++++++++++---------------------------- mutt-1.4.2.2/pop_auth.c | 11 +----- mutt-1.4.2.3/configure | 18 ++++++----- 4 files changed, 41 insertions(+), 70 deletions(-) --- NEW FILE mutt-1.4.2.3-sasl2.patch --- --- mutt-1.4.2.3/configure.sasl2 2007-05-28 14:53:43.000000000 +0200 +++ mutt-1.4.2.3/configure 2007-05-28 14:58:22.000000000 +0200 @@ -12018,20 +12018,22 @@ then if test "$with_sasl" != "yes" then - CPPFLAGS="$CPPFLAGS -I$with_sasl/include" + CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl" LDFLAGS="$LDFLAGS -L$with_sasl/lib" + else + CPPFLAGS="$CPPFLAGS -I/usr/include/sasl" fi saved_LIBS="$LIBS" -{ echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl" >&5 -echo $ECHO_N "checking for sasl_client_init in -lsasl... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5 +echo $ECHO_N "checking for sasl_client_init in -lsasl2... $ECHO_C" >&6; } if test "${ac_cv_lib_sasl_sasl_client_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsasl $LIBS" +LIBS="-lsasl2 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12091,17 +12093,17 @@ #define HAVE_LIBSASL 1 _ACEOF - LIBS="-lsasl $LIBS" + LIBS="-lsasl2 $LIBS" else - { { echo "$as_me:$LINENO: error: could not find libsasl" >&5 + { { echo "$as_me:$LINENO: error: could not find libsasl2" >&5 echo "$as_me: error: could not find libsasl" >&2;} { (exit 1); exit 1; }; } fi MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o" - MUTTLIBS="$MUTTLIBS -lsasl" + MUTTLIBS="$MUTTLIBS -lsasl2" LIBS="$saved_LIBS" cat >>confdefs.h <<\_ACEOF @@ -12109,7 +12111,7 @@ _ACEOF need_sasl=yes - need_md5=no + need_md5=yes fi fi --- mutt-1.4.2.2/imap/auth_sasl.c.sasl2 2006-07-17 14:26:08.000000000 +0200 +++ mutt-1.4.2.2/imap/auth_sasl.c 2006-07-17 14:26:08.000000000 +0200 @@ -34,7 +34,7 @@ int rc, irc; char buf[HUGE_STRING]; const char* mech; - char* pc = NULL; + const char* pc = NULL; unsigned int len, olen; unsigned char client_start; @@ -63,15 +63,13 @@ if (mutt_bit_isset (idata->capabilities, AUTH_ANON) && (!idata->conn->account.user[0] || !ascii_strncmp (idata->conn->account.user, "anonymous", 9))) - rc = sasl_client_start (saslconn, "AUTH=ANONYMOUS", NULL, NULL, &pc, &olen, - &mech); + rc = sasl_client_start (saslconn, "AUTH=ANONYMOUS", NULL, &pc, &olen, &mech); } if (rc != SASL_OK && rc != SASL_CONTINUE) do { - rc = sasl_client_start (saslconn, method, NULL, &interaction, - &pc, &olen, &mech); + rc = sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech); if (rc == SASL_INTERACT) mutt_sasl_interact (interaction); } @@ -109,7 +107,7 @@ if (irc == IMAP_CMD_RESPOND) { if (sasl_decode64 (idata->cmd.buf+2, strlen (idata->cmd.buf+2), buf, - &len) != SASL_OK) + LONG_STRING,&len) != SASL_OK) { dprint (1, (debugfile, "imap_auth_sasl: error base64-decoding server response.\n")); goto bail; @@ -137,10 +135,6 @@ dprint (1, (debugfile, "imap_auth_sasl: error base64-encoding client response.\n")); goto bail; } - - /* sasl_client_st(art|ep) allocate pc with malloc, expect me to - * free it */ - FREE (&pc); } if (olen || rc == SASL_CONTINUE) --- mutt-1.4.2.2/mutt_sasl.c.sasl2 2002-02-26 11:38:55.000000000 +0100 +++ mutt-1.4.2.2/mutt_sasl.c 2006-07-17 14:26:08.000000000 +0200 @@ -92,10 +92,13 @@ * probably stop exporting mutt_sasl_get_callbacks(). */ int mutt_sasl_client_new (CONNECTION* conn, sasl_conn_t** saslconn) { - sasl_security_properties_t secprops; - sasl_external_properties_t extprops; const char* service; int rc; + struct sockaddr_in local, remote; + char buf[LONG_STRING]; + char localip[LONG_STRING], remoteip[LONG_STRING]; + socklen_t size; + sasl_security_properties_t secprops; if (mutt_sasl_start () != SASL_OK) return -1; @@ -112,9 +115,21 @@ dprint (1, (debugfile, "mutt_sasl_client_new: account type unset\n")); return -1; } - - rc = sasl_client_new (service, conn->account.host, - mutt_sasl_get_callbacks (&conn->account), SASL_SECURITY_LAYER, saslconn); + + size = sizeof (local); + if (getsockname (conn->fd, (struct sockaddr*) &local, &size)) + return -1; + inet_ntop(local.sin_family, &local.sin_addr,buf,LONG_STRING); + sprintf(localip,"%s;%i",buf,local.sin_port); + + size = sizeof(remote); + if (getpeername(conn->fd, (struct sockaddr*) &remote, &size)) + return -1; + inet_ntop(remote.sin_family, &remote.sin_addr,buf,LONG_STRING); + sprintf(remoteip,"%s;%i",buf,local.sin_port); + + rc = sasl_client_new (service, conn->account.host, localip, remoteip, + mutt_sasl_get_callbacks (&conn->account), 0, saslconn); if (rc != SASL_OK) { @@ -123,40 +138,6 @@ return -1; } - /*** set sasl IP properties, necessary for use with krb4 ***/ - /* Do we need to fail if this fails? I would assume having these unset - * would just disable KRB4. Who wrote this code? I'm not sure how this - * interacts with the NSS code either, since that mucks with the fd. */ - { - struct sockaddr_in local, remote; - socklen_t size; - - size = sizeof (local); - if (getsockname (conn->fd, (struct sockaddr*) &local, &size)) - return -1; - - size = sizeof(remote); - if (getpeername(conn->fd, (struct sockaddr*) &remote, &size)) - return -1; - -#ifdef SASL_IP_LOCAL - if (sasl_setprop(*saslconn, SASL_IP_LOCAL, &local) != SASL_OK) - { - dprint (1, (debugfile, - "mutt_sasl_client_new: Error setting local IP address\n")); - return -1; - } -#endif - -#ifdef SASL_IP_REMOTE - if (sasl_setprop(*saslconn, SASL_IP_REMOTE, &remote) != SASL_OK) - { - dprint (1, (debugfile, - "mutt_sasl_client_new: Error setting remote IP address\n")); - return -1; - } -#endif - } /* set security properties. We use NOPLAINTEXT globally, since we can * just fall back to LOGIN in the IMAP case anyway. If that doesn't @@ -181,10 +162,9 @@ #if defined(USE_SSL) && !defined(USE_NSS) if (conn->account.flags & M_ACCT_SSL) { - memset (&extprops, 0, sizeof (extprops)); - extprops.ssf = conn->ssf; - dprint (2, (debugfile, "External SSF: %d\n", extprops.ssf)); - if (sasl_setprop (*saslconn, SASL_SSF_EXTERNAL, &extprops) != SASL_OK) + sasl_ssf_t ssf=conn->ssf; + dprint (2, (debugfile, "External SSF: %d\n", ssf)); + if (sasl_setprop (*saslconn, SASL_SSF_EXTERNAL, &ssf) != SASL_OK) { dprint (1, (debugfile, "mutt_sasl_client_new: Error setting external properties\n")); return -1; @@ -274,7 +254,7 @@ sasldata->saslconn = saslconn; /* get ssf so we know whether we have to (en|de)code read/write */ - sasl_getprop (saslconn, SASL_SSF, (void**) &sasldata->ssf); + sasl_getprop (saslconn, SASL_SSF, (const void**) &sasldata->ssf); dprint (3, (debugfile, "SASL protection strength: %u\n", *sasldata->ssf)); /* Add SASL SSF to transport SSF */ conn->ssf += *sasldata->ssf; --- mutt-1.4.2.2/pop_auth.c.sasl2 2001-08-30 10:11:06.000000000 +0200 +++ mutt-1.4.2.2/pop_auth.c 2006-07-17 14:26:08.000000000 +0200 @@ -41,7 +41,7 @@ char buf[LONG_STRING]; char inbuf[LONG_STRING]; const char* mech; - char* pc = NULL; + const char* pc = NULL; unsigned int len, olen; unsigned char client_start; @@ -56,8 +56,7 @@ FOREVER { - rc = sasl_client_start (saslconn, method, NULL, - &interaction, &pc, &olen, &mech); + rc = sasl_client_start (saslconn, method, &interaction, &pc, &olen, &mech); if (rc != SASL_INTERACT) break; mutt_sasl_interact (interaction); @@ -96,7 +95,7 @@ if (mutt_strncmp (inbuf, "+ ", 2)) goto bail; - if (sasl_decode64 (inbuf, strlen (inbuf), buf, &len) != SASL_OK) + if (sasl_decode64 (inbuf + 2, strlen (inbuf + 2), buf, LONG_STRING, &len) != SASL_OK) { dprint (1, (debugfile, "pop_auth_sasl: error base64-decoding server response.\n")); goto bail; @@ -124,10 +123,6 @@ dprint (1, (debugfile, "pop_auth_sasl: error base64-encoding client response.\n")); goto bail; } - - /* sasl_client_st(art|ep) allocate pc with malloc, expect me to - * free it */ - safe_free ((void *) &pc); } } Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mutt/FC-6/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 17 Jul 2006 15:25:24 -0000 1.11 +++ .cvsignore 28 May 2007 13:50:26 -0000 1.12 @@ -1,2 +1,2 @@ -mutt-1.4.2.2i.tar.gz urlview-0.9.tar.gz +mutt-1.4.2.3.tar.gz Index: mutt.spec =================================================================== RCS file: /cvs/dist/rpms/mutt/FC-6/mutt.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- mutt.spec 6 Dec 2006 17:21:40 -0000 1.39 +++ mutt.spec 28 May 2007 13:50:26 -0000 1.40 @@ -1,12 +1,12 @@ Summary: A text mode mail user agent. Name: mutt %define uversion 0.9 -Version: 1.4.2.2 -Release: 5%{?dist} +Version: 1.4.2.3 +Release: 1%{?dist} Epoch: 5 License: GPL Group: Applications/Internet -Source: ftp://ftp.mutt.org/pub/mutt/mutt-%{version}i.tar.gz +Source: ftp://ftp.mutt.org/pub/mutt/mutt-%{version}.tar.gz Source2: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-%{uversion}.tar.gz Source1: mutt_ldap_query Source3: mutt-colors @@ -14,7 +14,7 @@ Patch1: mutt-default.patch Patch4: mutt-1.4.1-muttrc.patch Patch5: mutt-sasl.patch -Patch8: mutt-1.4-sasl2.patch +Patch8: mutt-1.4.2.3-sasl2.patch Patch10: urlview-0.9-default.patch Patch11: urlview.diff Patch12: urlview-0.9-ncursesw.patch @@ -156,6 +156,9 @@ %{_mandir}/man5/muttrc.* %changelog +* Mon May 28 2007 Miroslav Lichvar 5:1.4.2.3-1.fc6 +- update to 1.4.2.3 (CVE-2007-2683, CVE-2007-1558) + * Wed Dec 06 2006 Miroslav Lichvar 5:1.4.2.2-5 - use correct fcc folder with IMAP (#217469) - don't require smtpdaemon, gettext Index: sources =================================================================== RCS file: /cvs/dist/rpms/mutt/FC-6/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 17 Jul 2006 15:25:24 -0000 1.11 +++ sources 28 May 2007 13:50:26 -0000 1.12 @@ -1,2 +1,2 @@ -51a08429c5bd5c34af3f4268b8cbcda3 mutt-1.4.2.2i.tar.gz 67731f73e69297ffd106b65c8aebb2ab urlview-0.9.tar.gz +dcb94661827dd090fa813e73e122ea0c mutt-1.4.2.3.tar.gz --- mutt-1.4-sasl2.patch DELETED --- From fedora-cvs-commits at redhat.com Mon May 28 20:13:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 28 May 2007 16:13:35 -0400 Subject: rpms/file/FC-6 file-4.21-magic.patch, NONE, 1.1 file-4.21-oracle.patch, NONE, 1.1 file.spec, 1.57, 1.58 file-4.19-hower.patch, 1.1, NONE file-4.19-magic.patch, 1.1, NONE file-4.19-oracle.patch, 1.1, NONE Message-ID: <200705282013.l4SKDZsB028269@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/file/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28251 Modified Files: file.spec Added Files: file-4.21-magic.patch file-4.21-oracle.patch Removed Files: file-4.19-hower.patch file-4.19-magic.patch file-4.19-oracle.patch Log Message: * Mon May 28 2007 Martin Bacovsky - 4.21-1 - upgrade to new upstream 4.21 - resolves: #241034: CVE-2007-2799 file integer overflow file-4.21-magic.patch: magic/Magdir/apple | 17 +++++++++++++++++ magic/Magdir/images | 6 ++++++ magic/Magdir/revision | 5 +++++ magic/magic.mime | 26 +++++++++++++++----------- src/fsmagic.c | 3 ++- 5 files changed, 45 insertions(+), 12 deletions(-) --- NEW FILE file-4.21-magic.patch --- --- file-4.21/magic/Magdir/revision.magic 2007-04-09 18:33:07.000000000 +0200 +++ file-4.21/magic/Magdir/revision 2007-05-28 21:41:15.000000000 +0200 @@ -4,6 +4,11 @@ # From Hendrik Scholz 0 string /1\ :pserver: cvs password text file +# Subversion (SVN) dumps +# Uwe Zeisberger +0 string SVN-fs-dump-format-version: Subversion dumpfile +>28 string >\0 (version: %s) + # Conary changesets # From: Jonathan Smith 0 belong 0xea3f81bb Conary changeset data --- file-4.21/magic/Magdir/apple.magic 2006-03-02 23:10:26.000000000 +0100 +++ file-4.21/magic/Magdir/apple 2007-05-28 21:33:01.000000000 +0200 @@ -10,6 +10,23 @@ 0 belong 0x00051600 AppleSingle encoded Macintosh file 0 belong 0x00051607 AppleDouble encoded Macintosh file +# Apple Emulator 2IMG format +# +0 string 2IMG Apple ][ 2IMG Disk Image +>4 string XGS! \b, XGS +>4 string CTKG \b, Catakig +>4 string ShIm \b, Sheppy's ImageMaker +>4 string WOOF \b, Sweet 16 +>4 string B2TR \b, Bernie ][ the Rescue +>4 string !nfc \b, ASIMOV2 +>4 string x \b, Unknown Format +>0xc byte 00 \b, DOS 3.3 sector order +>>0x10 byte 00 \b, Volume 254 +>>0x10 byte&0x7f x \b, Volume %u +>0xc byte 01 \b, ProDOS sector order +>>0x14 short x \b, %u Blocks +>0xc byte 02 \b, NIB data + # magic for Newton PDA package formats # from Ruda Moura 0 string package0 Newton package, NOS 1.x, --- file-4.21/magic/Magdir/images.magic 2007-05-03 17:11:33.000000000 +0200 +++ file-4.21/magic/Magdir/images 2007-05-28 21:33:01.000000000 +0200 @@ -525,6 +525,12 @@ 0 belong 0x0e031301 Hierarchical Data Format (version 4) data 0 string \211HDF\r\n\032 Hierarchical Data Format (version 5) data +# The boot loaders syslinux and isolinux use a RLE based image format +# called SLL16 to store splash screens. +0 lelong 0x1413f33d Syslinux SLL16 image data, +>4 leshort >0 %hd x +>6 leshort >0 %hd + # From: Tobias Burnus # Xara (for a while: Corel Xara) is a graphic package, see # http://www.xara.com/ for Windows and as GPL application for --- file-4.21/magic/magic.mime.magic 2007-04-03 23:11:32.000000000 +0200 +++ file-4.21/magic/magic.mime 2007-05-28 21:47:26.000000000 +0200 @@ -196,7 +196,7 @@ # modified by Joerg Jenderek # GRR the original test are too common for many DOS files # so test 1 <= kbits nibble <= E -0 beshort &0xffe0 +0 beshort&0xfffe =0xfffa audio/mpeg >2 ubyte&0xF0 >0x0F >>2 ubyte&0xF0 <0xE1 audio/mpeg #MP3 with ID3 tag @@ -402,16 +402,14 @@ # # from Daniel Quinlan # -0 string \14 byte 12 (OS/2 1.x format) #>14 byte 64 (OS/2 2.x format) #>14 byte 40 (Windows 3.x format) @@ -939,6 +937,12 @@ 0 string fLaC audio/x-flac 0 string CWS application/x-shockwave-flash + +# Gnumeric spreadsheet +# This entry is only semi-helpful, as Gnumeric compresses its files, so +# they will ordinarily reported as "compressed", but at least -z helps +39 string = --- file-4.21/src/fsmagic.c.magic 2007-01-12 18:40:53.000000000 +0100 +++ file-4.21/src/fsmagic.c 2007-05-28 21:33:01.000000000 +0200 @@ -92,7 +92,8 @@ if (file_printf(ms, "cannot open `%s' (%s)", fn, strerror(errno)) == -1) return -1; - return 1; + ms->haderr++; + return -1; } if ((ms->flags & MAGIC_MIME) != 0) { file-4.21-oracle.patch: filesystems | 13 +++++++++++++ 1 files changed, 13 insertions(+) --- NEW FILE file-4.21-oracle.patch --- --- file-4.21/magic/Magdir/filesystems.oracle 2007-05-16 02:02:54.000000000 +0200 +++ file-4.21/magic/Magdir/filesystems 2007-05-28 21:55:58.000000000 +0200 @@ -1197,6 +1197,19 @@ >>>2 short 2048 AXP generated) >>>2 short 4096 I64 generated) +# Oracle Clustered Filesystem - Aaron Botsis +8 string OracleCFS Oracle Clustered Filesystem, +>4 long x rev %d +>0 long x \b.%d, +>560 string x label: %.64s, +>136 string x mountpoint: %.128s + +# Oracle ASM tagged volume - Aaron Botsis +32 string ORCLDISK Oracle ASM Volume, +>40 string x Disk Name: %0.12s +32 string ORCLCLRD Oracle ASM Volume (cleared), +>40 string x Disk Name: %0.12s + # Compaq/HP RILOE floppy image # From: Dirk Jagdmann 0 string CPQRFBLO Compaq/HP RILOE floppy image Index: file.spec =================================================================== RCS file: /cvs/dist/rpms/file/FC-6/file.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- file.spec 30 Mar 2007 09:01:38 -0000 1.57 +++ file.spec 28 May 2007 20:13:33 -0000 1.58 @@ -2,26 +2,25 @@ Summary: A utility for determining file types. Name: file -Version: 4.19 -Release: 2%{dist} +Version: 4.21 +Release: 1%{dist} License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz URL: http://www.darwinsys.com/file/ Patch1: file-4.19-debian.patch Patch2: file-selinux.patch -Patch3: file-4.19-magic.patch +Patch3: file-4.21-magic.patch Patch5: file-4.13-fsdump.patch Patch6: file-4.13-quick.patch Patch8: file-4.15-berkeley.patch Patch12: file-4.16-xen.patch -Patch16: file-4.19-oracle.patch +Patch16: file-4.21-oracle.patch Patch17: file-4.17-clamav.patch Patch18: file-4.17-powerpoint.patch Patch20: file-4.17-bash.patch Patch21: file-4.19-ELF.patch Patch22: file-4.19-ooffice.patch -Patch23: file-4.19-hower.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel @@ -49,7 +48,6 @@ %patch20 -p1 -b .bash %patch21 -p1 -b .ELF %patch22 -p1 -b .ooffice -%patch23 -p1 -b .hower iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man @@ -95,6 +93,10 @@ %{_libdir}/libmagic.* %changelog +* Mon May 28 2007 Martin Bacovsky - 4.21-1 +- upgrade to new upstream 4.21 +- resolves: #241034: CVE-2007-2799 file integer overflow + * Fri Mar 30 2007 Martin Bacovsky - 4.19-2 - Resolves: #233164: CVE-2007-1536 file 4.20 fixes a heap overflow in that can result in arbitrary code execution --- file-4.19-hower.patch DELETED --- --- file-4.19-magic.patch DELETED --- --- file-4.19-oracle.patch DELETED --- From fedora-cvs-commits at redhat.com Mon May 28 20:34:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 28 May 2007 16:34:23 -0400 Subject: rpms/file/FC-6 .cvsignore,1.17,1.18 sources,1.17,1.18 Message-ID: <200705282034.l4SKYNXS028513@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/file/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28485 Modified Files: .cvsignore sources Log Message: * Mon May 28 2007 Martin Bacovsky - 4.21-1 - forgot to commit new soucre Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file/FC-6/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 26 Jan 2007 15:22:47 -0000 1.17 +++ .cvsignore 28 May 2007 20:34:21 -0000 1.18 @@ -1 +1 @@ -file-4.19.tar.gz +file-4.21.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/file/FC-6/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 26 Jan 2007 15:22:47 -0000 1.17 +++ sources 28 May 2007 20:34:21 -0000 1.18 @@ -1 +1 @@ -a61ef3aa8339d5987148089afde25f60 file-4.19.tar.gz +9e3503116f4269a1be70220ee2234b0e file-4.21.tar.gz From fedora-cvs-commits at redhat.com Tue May 29 06:53:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 02:53:49 -0400 Subject: rpms/file/FC-5 file-4.17-bash.patch, NONE, 1.1 file-4.17-clamav.patch, NONE, 1.1 file-4.17-powerpoint.patch, NONE, 1.1 file-4.19-ELF.patch, NONE, 1.1 file-4.19-debian.patch, NONE, 1.1 file-4.19-ooffice.patch, NONE, 1.1 file-4.21-magic.patch, NONE, 1.1 file-4.21-oracle.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 file.spec, 1.49, 1.50 sources, 1.16, 1.17 file-4.10-debian.patch, 1.2, NONE file-4.12-core64.patch, 1.1, NONE file-4.17-init-mem.patch, 1.1, NONE file-4.17-magic.patch, 1.1, NONE file-4.17-mp3_flac.patch, 1.1, NONE file-4.17-wctype-header.patch, 1.1, NONE Message-ID: <200705290653.l4T6rnE6005293@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/file/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5268 Modified Files: .cvsignore file.spec sources Added Files: file-4.17-bash.patch file-4.17-clamav.patch file-4.17-powerpoint.patch file-4.19-ELF.patch file-4.19-debian.patch file-4.19-ooffice.patch file-4.21-magic.patch file-4.21-oracle.patch Removed Files: file-4.10-debian.patch file-4.12-core64.patch file-4.17-init-mem.patch file-4.17-magic.patch file-4.17-mp3_flac.patch file-4.17-wctype-header.patch Log Message: * Mon May 28 2007 Martin Bacovsky - 4.21-1 - upgrade to new upstream 4.21 - resolves: #241034: CVE-2007-2799 file integer overflow file-4.17-bash.patch: commands | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE file-4.17-bash.patch --- --- file-4.17/magic/Magdir/commands.bash 2006-03-02 22:50:25.000000000 +0100 +++ file-4.17/magic/Magdir/commands 2006-08-17 16:38:39.000000000 +0200 @@ -28,7 +28,7 @@ 0 string/b #!\ /bin/awk awk script text executable 0 string/b #!\ /usr/bin/awk awk script text executable # update to distinguish from *.vcf files -0 regex BEGIN[[:space:]]*[{] awk script text +#0 regex [^'"]BEGIN[[:space:]]*[{] awk script text # AT&T Bell Labs' Plan 9 shell 0 string/b #!\ /bin/rc Plan 9 rc shell script text executable file-4.17-clamav.patch: fsav | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE file-4.17-clamav.patch --- --- file-4.17/magic/Magdir/fsav.old 2006-03-02 22:50:25.000000000 +0100 +++ file-4.17/magic/Magdir/fsav 2006-05-22 08:50:58.000000000 +0200 @@ -54,7 +54,5 @@ >>>>>>>>37 string x \b%-.1s >>>>>>>>>38 string !: >>>>>>>>>>38 string x \b%-.1s ->>>>512 string \037\213 \b, gzipped ->>>>769 string ustar\0 \b, tared >512 string \037\213 \b, gzipped >769 string ustar\0 \b, tared file-4.17-powerpoint.patch: magic.mime | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) --- NEW FILE file-4.17-powerpoint.patch --- --- file-4.17/magic/magic.mime.ppt 2006-06-26 08:57:42.000000000 +0200 +++ file-4.17/magic/magic.mime 2006-07-10 11:05:19.000000000 +0200 @@ -833,7 +833,7 @@ 0 string PO^Q` application/msword -0 string \320\317\021\340\241\261\032\341 +0 string \320\317\021\340\241\261\032\341 application/msword >546 string bjbj application/msword >546 string jbjb application/msword @@ -844,7 +844,6 @@ 2112 string MSWordDoc application/msword #0 string \320\317\021\340\241\261\032\341 application/powerpoint -0 string \320\317\021\340\241\261\032\341 application/msword 0 string #\ PaCkAgE\ DaTaStReAm application/x-svr4-package file-4.19-ELF.patch: readelf.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) --- NEW FILE file-4.19-ELF.patch --- --- file-4.19/src/readelf.c.ELF 2007-01-09 19:47:26.000000000 +0100 +++ file-4.19/src/readelf.c 2007-01-09 19:50:35.000000000 +0100 @@ -45,7 +45,7 @@ off_t, int *); #endif private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t, - off_t, int *); + off_t, int *, int); private int doshn(struct magic_set *, int, int, int, off_t, int, size_t, int *); private size_t donote(struct magic_set *, unsigned char *, size_t, size_t, int, int, size_t, int *); @@ -785,7 +785,7 @@ */ private int dophn_exec(struct magic_set *ms, int class, int swap, int fd, off_t off, - int num, size_t size, off_t fsize, int *flags) + int num, size_t size, off_t fsize, int *flags, int sh_num) { Elf32_Phdr ph32; Elf64_Phdr ph64; @@ -854,6 +854,19 @@ return -1; align = 4; } + /* If we have a section header table, handle note + sections just in doshn. Handling them also here + means that for executables we print the note content + twice and, more importantly, don't handle + strip -o created debuginfo files correctly. + They have PT_NOTE header, but the actual note + content is not present in the debuginfo file, + only in the original stripped executable or library. + The corresponding .note.* section is SHT_NOBITS + rather than SHT_NOTE, so doshn will not look + at it. */ + if (sh_num) + break; /* * This is a PT_NOTE section; loop through all the notes * in the section. @@ -960,7 +973,8 @@ fd, (off_t)getu32(swap, elfhdr.e_phoff), getu16(swap, elfhdr.e_phnum), (size_t)getu16(swap, elfhdr.e_phentsize), - fsize, &flags) + fsize, &flags, + getu16(swap, elfhdr.e_shnum)) == -1) return -1; } @@ -1001,7 +1015,8 @@ (off_t)elf_getu64(swap, elfhdr.e_phoff), getu16(swap, elfhdr.e_phnum), (size_t)getu16(swap, elfhdr.e_phentsize), - fsize, &flags) == -1) + fsize, &flags, + getu16(swap, elfhdr.e_shnum)) == -1) return -1; } if (doshn(ms, class, swap, fd, file-4.19-debian.patch: magic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE file-4.19-debian.patch --- --- file-4.19/src/magic.c.debian 2007-01-09 17:40:50.000000000 +0100 +++ file-4.19/src/magic.c 2007-01-09 17:42:29.000000000 +0100 @@ -238,7 +238,7 @@ int fd = 0; int rv = -1; unsigned char *buf; - struct stat sb; + struct stat sb, *st = &sb; ssize_t nbytes = 0; /* number of bytes read from a datafile */ int ispipe = 0; @@ -253,7 +253,7 @@ if (file_reset(ms) == -1) goto done; - switch (file_fsmagic(ms, inname, &sb)) { + switch (file_fsmagic(ms, inname, st)) { case -1: /* error */ goto done; case 0: /* nothing found */ file-4.19-ooffice.patch: archive | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE file-4.19-ooffice.patch --- --- file-4.19/magic/Magdir/archive.ooffice 2007-01-25 11:18:43.000000000 +0100 +++ file-4.19/magic/Magdir/archive 2007-01-25 11:19:08.000000000 +0100 @@ -536,8 +536,6 @@ >4 byte 0x0b Zip archive data, at least v1.1 to extract >4 byte 0x14 >>30 ubelong !0x6d696d65 Zip archive data, at least v2.0 to extract ->0x161 string WINZIP Zip archive data, WinZIP self-extracting - # OpenOffice.org / KOffice / StarOffice documents # From: Abel Cheung file-4.21-magic.patch: magic/Magdir/apple | 17 +++++++++++++++++ magic/Magdir/images | 6 ++++++ magic/Magdir/revision | 5 +++++ magic/magic.mime | 26 +++++++++++++++----------- src/fsmagic.c | 3 ++- 5 files changed, 45 insertions(+), 12 deletions(-) --- NEW FILE file-4.21-magic.patch --- --- file-4.21/magic/Magdir/revision.magic 2007-04-09 18:33:07.000000000 +0200 +++ file-4.21/magic/Magdir/revision 2007-05-28 21:41:15.000000000 +0200 @@ -4,6 +4,11 @@ # From Hendrik Scholz 0 string /1\ :pserver: cvs password text file +# Subversion (SVN) dumps +# Uwe Zeisberger +0 string SVN-fs-dump-format-version: Subversion dumpfile +>28 string >\0 (version: %s) + # Conary changesets # From: Jonathan Smith 0 belong 0xea3f81bb Conary changeset data --- file-4.21/magic/Magdir/apple.magic 2006-03-02 23:10:26.000000000 +0100 +++ file-4.21/magic/Magdir/apple 2007-05-28 21:33:01.000000000 +0200 @@ -10,6 +10,23 @@ 0 belong 0x00051600 AppleSingle encoded Macintosh file 0 belong 0x00051607 AppleDouble encoded Macintosh file +# Apple Emulator 2IMG format +# +0 string 2IMG Apple ][ 2IMG Disk Image +>4 string XGS! \b, XGS +>4 string CTKG \b, Catakig +>4 string ShIm \b, Sheppy's ImageMaker +>4 string WOOF \b, Sweet 16 +>4 string B2TR \b, Bernie ][ the Rescue +>4 string !nfc \b, ASIMOV2 +>4 string x \b, Unknown Format +>0xc byte 00 \b, DOS 3.3 sector order +>>0x10 byte 00 \b, Volume 254 +>>0x10 byte&0x7f x \b, Volume %u +>0xc byte 01 \b, ProDOS sector order +>>0x14 short x \b, %u Blocks +>0xc byte 02 \b, NIB data + # magic for Newton PDA package formats # from Ruda Moura 0 string package0 Newton package, NOS 1.x, --- file-4.21/magic/Magdir/images.magic 2007-05-03 17:11:33.000000000 +0200 +++ file-4.21/magic/Magdir/images 2007-05-28 21:33:01.000000000 +0200 @@ -525,6 +525,12 @@ 0 belong 0x0e031301 Hierarchical Data Format (version 4) data 0 string \211HDF\r\n\032 Hierarchical Data Format (version 5) data +# The boot loaders syslinux and isolinux use a RLE based image format +# called SLL16 to store splash screens. +0 lelong 0x1413f33d Syslinux SLL16 image data, +>4 leshort >0 %hd x +>6 leshort >0 %hd + # From: Tobias Burnus # Xara (for a while: Corel Xara) is a graphic package, see # http://www.xara.com/ for Windows and as GPL application for --- file-4.21/magic/magic.mime.magic 2007-04-03 23:11:32.000000000 +0200 +++ file-4.21/magic/magic.mime 2007-05-28 21:47:26.000000000 +0200 @@ -196,7 +196,7 @@ # modified by Joerg Jenderek # GRR the original test are too common for many DOS files # so test 1 <= kbits nibble <= E -0 beshort &0xffe0 +0 beshort&0xfffe =0xfffa audio/mpeg >2 ubyte&0xF0 >0x0F >>2 ubyte&0xF0 <0xE1 audio/mpeg #MP3 with ID3 tag @@ -402,16 +402,14 @@ # # from Daniel Quinlan # -0 string \14 byte 12 (OS/2 1.x format) #>14 byte 64 (OS/2 2.x format) #>14 byte 40 (Windows 3.x format) @@ -939,6 +937,12 @@ 0 string fLaC audio/x-flac 0 string CWS application/x-shockwave-flash + +# Gnumeric spreadsheet +# This entry is only semi-helpful, as Gnumeric compresses its files, so +# they will ordinarily reported as "compressed", but at least -z helps +39 string = --- file-4.21/src/fsmagic.c.magic 2007-01-12 18:40:53.000000000 +0100 +++ file-4.21/src/fsmagic.c 2007-05-28 21:33:01.000000000 +0200 @@ -92,7 +92,8 @@ if (file_printf(ms, "cannot open `%s' (%s)", fn, strerror(errno)) == -1) return -1; - return 1; + ms->haderr++; + return -1; } if ((ms->flags & MAGIC_MIME) != 0) { file-4.21-oracle.patch: filesystems | 13 +++++++++++++ 1 files changed, 13 insertions(+) --- NEW FILE file-4.21-oracle.patch --- --- file-4.21/magic/Magdir/filesystems.oracle 2007-05-16 02:02:54.000000000 +0200 +++ file-4.21/magic/Magdir/filesystems 2007-05-28 21:55:58.000000000 +0200 @@ -1197,6 +1197,19 @@ >>>2 short 2048 AXP generated) >>>2 short 4096 I64 generated) +# Oracle Clustered Filesystem - Aaron Botsis +8 string OracleCFS Oracle Clustered Filesystem, +>4 long x rev %d +>0 long x \b.%d, +>560 string x label: %.64s, +>136 string x mountpoint: %.128s + +# Oracle ASM tagged volume - Aaron Botsis +32 string ORCLDISK Oracle ASM Volume, +>40 string x Disk Name: %0.12s +32 string ORCLCLRD Oracle ASM Volume (cleared), +>40 string x Disk Name: %0.12s + # Compaq/HP RILOE floppy image # From: Dirk Jagdmann 0 string CPQRFBLO Compaq/HP RILOE floppy image Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file/FC-5/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 13 Mar 2006 07:28:43 -0000 1.16 +++ .cvsignore 29 May 2007 06:53:47 -0000 1.17 @@ -1 +1 @@ -file-4.17.tar.gz +file-4.21.tar.gz Index: file.spec =================================================================== RCS file: /cvs/dist/rpms/file/FC-5/file.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- file.spec 23 Mar 2006 09:25:55 -0000 1.49 +++ file.spec 29 May 2007 06:53:47 -0000 1.50 @@ -2,22 +2,25 @@ Summary: A utility for determining file types. Name: file -Version: 4.17 -Release: 2.fc5 +Version: 4.21 +Release: 1%{?dist} License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz URL: http://www.darwinsys.com/file/ -Patch1: file-4.10-debian.patch +Patch1: file-4.19-debian.patch Patch2: file-selinux.patch -Patch3: file-4.17-magic.patch +Patch3: file-4.21-magic.patch Patch5: file-4.13-fsdump.patch Patch6: file-4.13-quick.patch Patch8: file-4.15-berkeley.patch Patch12: file-4.16-xen.patch -Patch13: file-4.17-init-mem.patch -Patch14: file-4.17-wctype-header.patch -Patch15: file-4.17-mp3_flac.patch +Patch16: file-4.21-oracle.patch +Patch17: file-4.17-clamav.patch +Patch18: file-4.17-powerpoint.patch +Patch20: file-4.17-bash.patch +Patch21: file-4.19-ELF.patch +Patch22: file-4.19-ooffice.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel @@ -39,9 +42,12 @@ %patch6 -p1 -b .quick %patch8 -p1 -b .berkeley %patch12 -p1 -b .xen -%patch13 -p1 -b .mem -%patch14 -p1 -b .wctype -%patch15 -p1 -b .mp3 +%patch16 -p1 -b .oracle +%patch17 -p1 -b .clamav +%patch18 -p1 -b .powerpoint +%patch20 -p1 -b .bash +%patch21 -p1 -b .ELF +%patch22 -p1 -b .ooffice iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man @@ -87,6 +93,11 @@ %{_libdir}/libmagic.* %changelog +* Mon May 28 2007 Martin Bacovsky - 4.21-1 +- upgrade to new upstream 4.21 +- resolves: #241034: CVE-2007-2799 file integer overflow + + * Thu Mar 23 2006 Radek Vok??l 4.17-2.fc5 - fc5 update Index: sources =================================================================== RCS file: /cvs/dist/rpms/file/FC-5/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 13 Mar 2006 07:28:43 -0000 1.16 +++ sources 29 May 2007 06:53:47 -0000 1.17 @@ -1 +1 @@ -50919c65e0181423d66bb25d7fe7b0fd file-4.17.tar.gz +9e3503116f4269a1be70220ee2234b0e file-4.21.tar.gz --- file-4.10-debian.patch DELETED --- --- file-4.12-core64.patch DELETED --- --- file-4.17-init-mem.patch DELETED --- --- file-4.17-magic.patch DELETED --- --- file-4.17-mp3_flac.patch DELETED --- --- file-4.17-wctype-header.patch DELETED --- From fedora-cvs-commits at redhat.com Tue May 29 08:50:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 04:50:11 -0400 Subject: rpms/mikmod/FC-5 mikmod.spec, 1.30, 1.31 sources, 1.3, 1.4 mikmod-3.1.6-security.patch, 1.1, NONE mikmod-3.1.6-tar.patch, 1.1, NONE mikmod-3.1.6-varargs.patch, 1.1, NONE mikmod-strip.patch, 1.1, NONE patch-mikmod-3.1.6-a, 1.1, NONE Message-ID: <200705290850.l4T8oBHK008200@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mikmod/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8176 Modified Files: mikmod.spec sources Removed Files: mikmod-3.1.6-security.patch mikmod-3.1.6-tar.patch mikmod-3.1.6-varargs.patch mikmod-strip.patch patch-mikmod-3.1.6-a Log Message: - update to mikmod-3.2.2-beta1 - don't use undefined macros, spec fixes - fix install-info scriptlet usage (#223711), thanks to Ville Skytta Index: mikmod.spec =================================================================== RCS file: /cvs/dist/rpms/mikmod/FC-5/mikmod.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mikmod.spec 9 Nov 2006 16:03:11 -0000 1.30 +++ mikmod.spec 29 May 2007 08:50:08 -0000 1.31 @@ -1,28 +1,21 @@ -# libmikmod rpm specification file %define lversion 3.1.11 -Summary: A MOD music file player. +Summary: A MOD music file player Name: mikmod -Version: 3.1.6 -Release: 37%{?dist} +Version: 3.2.2 +Release: 1%{?dist} License: GPL/LGPL Group: Applications/Multimedia -Prereq: /sbin/ldconfig -Prefix: /usr -Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: ncurses-devel texinfo +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ncurses-devel texinfo URL: http://mikmod.raphnet.net/ -Source0: http://mikmod.raphnet.net/files/mikmod-%{version}.tar.gz +Source0: http://mikmod.raphnet.net/files/mikmod-%{version}-beta1.tar.gz Source1: http://mikmod.raphnet.net/files/libmikmod-%{lversion}.tar.gz Patch0: http://mikmod.raphnet.net/files/libmikmod-3.1.11-a.diff -Patch1: mikmod-strip.patch -Patch2: libmikmod-esd.patch -Patch3: libmikmod-64bit.patch -Patch4: patch-mikmod-3.1.6-a -Patch5: mikmod-3.1.6-varargs.patch -Patch6: libmikmod-strip-lib.patch -Patch7: mikmod-3.1.6-security.patch -Patch8: mikmod-3.1.6-tar.patch +Patch1: libmikmod-esd.patch +Patch2: libmikmod-64bit.patch +Patch3: libmikmod-strip-lib.patch +Patch4: mikmod-3.1.6-multilib.patch %description MikMod is one of the best and most well known MOD music file players @@ -47,55 +40,48 @@ applications for mikmod. %prep -%setup -q -a 1 +%setup -q -a 1 -n %{name}-%{version}-beta1 %patch0 -p0 -%patch1 -p1 -b .strip -%patch2 -p1 -b .esd -%patch3 -p1 -%patch4 -p1 -b .orig -%patch5 -p1 -%patch6 -p1 -b .lib-strip -%patch7 -p1 -b .sec -%patch8 -p1 -b .tar +%patch1 -p1 -b .esd +%patch2 -p1 -b .64bit +%patch3 -p1 -b .lib-strip +%patch4 -p1 -b .multi %build rm -rf $RPM_BUILD_ROOT -cd libmikmod-%{lversion} -cp /usr/share/libtool/config.{sub,guess} . +pushd libmikmod-%{lversion} %configure -make -%makeinstall -cd .. +make install DESTDIR=$RPM_BUILD_ROOT +popd # Trick it into compiling while libmikmod is not installed... -export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{prefix}/lib:$LD_LIBRARY_PATH -perl -pi -e "s,-lmikmod,-I$RPM_BUILD_ROOT%{prefix}/include -L$RPM_BUILD_ROOT%{_libdir} -lmikmod,g" libmikmod-%{lversion}/libmikmod-config +export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:$LD_LIBRARY_PATH +perl -pi -e "s,-lmikmod,-I$RPM_BUILD_ROOT%{_prefix}/include -L$RPM_BUILD_ROOT%{_libdir} -lmikmod,g" libmikmod-%{lversion}/libmikmod-config export LIBMIKMOD_CONFIG=`pwd`/libmikmod-%{lversion}/libmikmod-config -cp /usr/share/libtool/config.{sub,guess} . %configure \ - --with-libmikmod-prefix=$RPM_BUILD_ROOT%{prefix} \ - --with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{prefix}/bin \ + --with-libmikmod-prefix=$RPM_BUILD_ROOT%{_prefix} \ + --with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{_bindir} \ --disable-libmikmodtest -make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags` -I." +make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags`" %install -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_infodir}/dir find $RPM_BUILD_ROOT | grep "\\.la$" | xargs rm -f %clean -rm -fr $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %post devel -/sbin/install-info %{_infodir}/mikmod.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/mikmod.info.gz %{_infodir}/dir || : %postun -p /sbin/ldconfig %postun devel if [ $1 = 0 ] ; then - /sbin/install-info --delete %{_infodir}/mikmod.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/mikmod.info.gz %{_infodir}/dir || : fi %files @@ -104,19 +90,25 @@ %doc libmikmod-%{lversion}/TODO %{_bindir}/mikmod %{_mandir}/man1/mikmod* -%{_libdir}/*.so* +%{_libdir}/*.so.* %files devel %defattr(-, root, root) %{_bindir}/*-config %{_libdir}/*.a -#%{_libdir}/*.la +%{_libdir}/*.so %{_datadir}/aclocal/* +%{_datadir}/mikmod/mikmodrc %{_includedir}/* %{_infodir}/mikmod* %{_mandir}/man1/libmikmod-config* %changelog +* Mon May 28 2007 Jindrich Novy 3.2.2-1 +- update to mikmod-3.2.2-beta1 +- don't use undefined macros, spec fixes +- fix install-info scriptlet usage (#223711), thanks to Ville Skytta + * Wed Nov 9 2006 Martin Stransky 3.1.6-37 - removed obsoletes on tracker (#214112) Index: sources =================================================================== RCS file: /cvs/dist/rpms/mikmod/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Sep 2004 08:32:55 -0000 1.3 +++ sources 29 May 2007 08:50:08 -0000 1.4 @@ -1,2 +1,2 @@ +9a9534a054afe8d28cc784041e6d1519 mikmod-3.2.2-beta1.tar.gz 705106da305e8de191549f1e7393185c libmikmod-3.1.11.tar.gz -71d8142ae3ae27034535913e906b1384 mikmod-3.1.6.tar.gz --- mikmod-3.1.6-security.patch DELETED --- --- mikmod-3.1.6-tar.patch DELETED --- --- mikmod-3.1.6-varargs.patch DELETED --- --- mikmod-strip.patch DELETED --- --- patch-mikmod-3.1.6-a DELETED --- From fedora-cvs-commits at redhat.com Tue May 29 08:55:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 04:55:16 -0400 Subject: rpms/mikmod/FC-5 mikmod-3.1.6-multilib.patch,NONE,1.1 Message-ID: <200705290855.l4T8tGmT008339@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mikmod/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8323 Added Files: mikmod-3.1.6-multilib.patch Log Message: - add multilib patch mikmod-3.1.6-multilib.patch: configure | 2 +- libmikmod-config.in | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) --- NEW FILE mikmod-3.1.6-multilib.patch --- --- mikmod-3.1.6/libmikmod-3.1.11/libmikmod-config.in.old 2004-01-21 18:43:52.000000000 +0100 +++ mikmod-3.1.6/libmikmod-3.1.11/libmikmod-config.in 2006-05-31 17:36:12.000000000 +0200 @@ -5,7 +5,7 @@ exec_prefix_set=no usage="\ -Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--ldadd]" +Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--libs32] [--libs64] [--cflags] [--ldadd]" if test $# -eq 0 ; then echo "${usage}" 1>&2 @@ -49,9 +49,21 @@ echo @LIB_LDADD@ ;; --libs) + if [ -d /usr/lib64 ]; then + libdir=-L${exec_prefix}/lib64 + else + libdir=-L${exec_prefix}/lib + fi + echo $libdir -lmikmod @LIBRARY_LIB@ + ;; + --libs32) libdir=-L${exec_prefix}/lib echo $libdir -lmikmod @LIBRARY_LIB@ ;; + --libs64) + libdir=-L${exec_prefix}/lib64 + echo $libdir -lmikmod @LIBRARY_LIB@ + ;; *) echo "${usage}" 1>&2 exit 1 --- mikmod-3.1.6/libmikmod-3.1.11/configure.old 2004-01-21 18:43:52.000000000 +0100 +++ mikmod-3.1.6/libmikmod-3.1.11/configure 2006-05-31 17:37:10.000000000 +0200 @@ -6390,7 +6390,7 @@ cross_compiling=$ac_cv_prog_cc_cross ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` - ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` + ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs | sed -r 's|-L[^ ]+||g'` esd_major_version=`$ESD_CONFIG $esd_args --version | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` From fedora-cvs-commits at redhat.com Tue May 29 10:38:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 06:38:11 -0400 Subject: rpms/cups/FC-6 cups.spec,1.331,1.332 Message-ID: <200705291038.l4TAcBM7009912@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9897 Modified Files: cups.spec Log Message: * Tue May 29 2007 Tim Waugh 1:1.2.10-8 - Removed paper-out detection (bug #241589). - Resolves: rhbz#241589 Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v retrieving revision 1.331 retrieving revision 1.332 diff -u -r1.331 -r1.332 --- cups.spec 21 May 2007 16:11:37 -0000 1.331 +++ cups.spec 29 May 2007 10:38:09 -0000 1.332 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2.10 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -160,7 +160,6 @@ %patch22 -p1 -b .logrotate %patch23 -p1 -b .str2323 %patch24 -p1 -b .str2109 -%patch25 -p1 -b .usb-paperout %patch26 -p1 -b .str2348 %patch27 -p1 -b .str2393 @@ -446,6 +445,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue May 29 2007 Tim Waugh 1:1.2.10-8 +- Removed paper-out detection (bug #241589). + * Mon May 21 2007 Tim Waugh 1:1.2.10-7 - Fixed _cupsAdminSetServerSettings() sharing/shared handling (bug #238057). From fedora-cvs-commits at redhat.com Tue May 29 11:08:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 07:08:04 -0400 Subject: rpms/mikmod/FC-6 mikmod.spec, 1.32, 1.33 sources, 1.3, 1.4 mikmod-3.1.6-security.patch, 1.1, NONE mikmod-3.1.6-tar.patch, 1.1, NONE mikmod-3.1.6-varargs.patch, 1.1, NONE mikmod-strip.patch, 1.1, NONE patch-mikmod-3.1.6-a, 1.1, NONE Message-ID: <200705291108.l4TB84qT010395@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mikmod/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10378 Modified Files: mikmod.spec sources Removed Files: mikmod-3.1.6-security.patch mikmod-3.1.6-tar.patch mikmod-3.1.6-varargs.patch mikmod-strip.patch patch-mikmod-3.1.6-a Log Message: - update to mikmod-3.2.2-beta1 - don't use undefined macros, spec fixes - fix install-info scriptlet usage (#223711), thanks to Ville Skytta Index: mikmod.spec =================================================================== RCS file: /cvs/dist/rpms/mikmod/FC-6/mikmod.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- mikmod.spec 9 Nov 2006 16:16:15 -0000 1.32 +++ mikmod.spec 29 May 2007 11:08:02 -0000 1.33 @@ -1,29 +1,21 @@ -# libmikmod rpm specification file %define lversion 3.1.11 -Summary: A MOD music file player. +Summary: A MOD music file player Name: mikmod -Version: 3.1.6 -Release: 39%{?dist} +Version: 3.2.2 +Release: 1%{?dist} License: GPL/LGPL Group: Applications/Multimedia -Prereq: /sbin/ldconfig -Prefix: /usr -Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: ncurses-devel texinfo libtool +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ncurses-devel texinfo URL: http://mikmod.raphnet.net/ -Source0: http://mikmod.raphnet.net/files/mikmod-%{version}.tar.gz +Source0: http://mikmod.raphnet.net/files/mikmod-%{version}-beta1.tar.gz Source1: http://mikmod.raphnet.net/files/libmikmod-%{lversion}.tar.gz Patch0: http://mikmod.raphnet.net/files/libmikmod-3.1.11-a.diff -Patch1: mikmod-strip.patch -Patch2: libmikmod-esd.patch -Patch3: libmikmod-64bit.patch -Patch4: patch-mikmod-3.1.6-a -Patch5: mikmod-3.1.6-varargs.patch -Patch6: libmikmod-strip-lib.patch -Patch7: mikmod-3.1.6-security.patch -Patch8: mikmod-3.1.6-tar.patch -Patch9: mikmod-3.1.6-multilib.patch +Patch1: libmikmod-esd.patch +Patch2: libmikmod-64bit.patch +Patch3: libmikmod-strip-lib.patch +Patch4: mikmod-3.1.6-multilib.patch %description MikMod is one of the best and most well known MOD music file players @@ -48,56 +40,48 @@ applications for mikmod. %prep -%setup -q -a 1 +%setup -q -a 1 -n %{name}-%{version}-beta1 %patch0 -p0 -%patch1 -p1 -b .strip -%patch2 -p1 -b .esd -%patch3 -p1 -%patch4 -p1 -b .orig -%patch5 -p1 -%patch6 -p1 -b .lib-strip -%patch7 -p1 -b .sec -%patch8 -p1 -b .tar -%patch9 -p1 -b .multi +%patch1 -p1 -b .esd +%patch2 -p1 -b .64bit +%patch3 -p1 -b .lib-strip +%patch4 -p1 -b .multi %build rm -rf $RPM_BUILD_ROOT -cd libmikmod-%{lversion} -cp /usr/share/libtool/config.{sub,guess} . +pushd libmikmod-%{lversion} %configure -make -%makeinstall -cd .. +make install DESTDIR=$RPM_BUILD_ROOT +popd # Trick it into compiling while libmikmod is not installed... -export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{prefix}/lib:$LD_LIBRARY_PATH -perl -pi -e "s,-lmikmod,-I$RPM_BUILD_ROOT%{prefix}/include -L$RPM_BUILD_ROOT%{_libdir} -lmikmod,g" libmikmod-%{lversion}/libmikmod-config +export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:$LD_LIBRARY_PATH +perl -pi -e "s,-lmikmod,-I$RPM_BUILD_ROOT%{_prefix}/include -L$RPM_BUILD_ROOT%{_libdir} -lmikmod,g" libmikmod-%{lversion}/libmikmod-config export LIBMIKMOD_CONFIG=`pwd`/libmikmod-%{lversion}/libmikmod-config -cp /usr/share/libtool/config.{sub,guess} . %configure \ - --with-libmikmod-prefix=$RPM_BUILD_ROOT%{prefix} \ - --with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{prefix}/bin \ + --with-libmikmod-prefix=$RPM_BUILD_ROOT%{_prefix} \ + --with-libmikmod-exec-prefix=$RPM_BUILD_ROOT%{_bindir} \ --disable-libmikmodtest -make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags` -I." +make CFLAGS="$RPM_OPT_FLAGS `libmikmod-%{lversion}/libmikmod-config --cflags`" %install -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_infodir}/dir find $RPM_BUILD_ROOT | grep "\\.la$" | xargs rm -f %clean -rm -fr $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %post devel -/sbin/install-info %{_infodir}/mikmod.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/mikmod.info.gz %{_infodir}/dir || : %postun -p /sbin/ldconfig %postun devel if [ $1 = 0 ] ; then - /sbin/install-info --delete %{_infodir}/mikmod.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/mikmod.info.gz %{_infodir}/dir || : fi %files @@ -113,13 +97,18 @@ %{_bindir}/*-config %{_libdir}/*.a %{_libdir}/*.so -#%{_libdir}/*.la %{_datadir}/aclocal/* +%{_datadir}/mikmod/mikmodrc %{_includedir}/* %{_infodir}/mikmod* %{_mandir}/man1/libmikmod-config* %changelog +* Tue May 29 2007 Jindrich Novy 3.2.2-1 +- update to mikmod-3.2.2-beta1 +- don't use undefined macros, spec fixes +- fix install-info scriptlet usage (#223711), thanks to Ville Skytta + * Thu Nov 9 2006 Martin Stransky - 3.1.6-39 - removed obsoletes on tracker (#214112) Index: sources =================================================================== RCS file: /cvs/dist/rpms/mikmod/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Sep 2004 08:32:55 -0000 1.3 +++ sources 29 May 2007 11:08:02 -0000 1.4 @@ -1,2 +1,2 @@ +9a9534a054afe8d28cc784041e6d1519 mikmod-3.2.2-beta1.tar.gz 705106da305e8de191549f1e7393185c libmikmod-3.1.11.tar.gz -71d8142ae3ae27034535913e906b1384 mikmod-3.1.6.tar.gz --- mikmod-3.1.6-security.patch DELETED --- --- mikmod-3.1.6-tar.patch DELETED --- --- mikmod-3.1.6-varargs.patch DELETED --- --- mikmod-strip.patch DELETED --- --- patch-mikmod-3.1.6-a DELETED --- From fedora-cvs-commits at redhat.com Tue May 29 12:38:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 08:38:39 -0400 Subject: rpms/gd/FC-5 gd-2.0.33-loop1.patch, NONE, 1.1 gd-2.0.33-loop2.patch, NONE, 1.1 gd-2.0.33-sf.patch, NONE, 1.1 gd.spec, 1.31, 1.32 Message-ID: <200705291238.l4TCcdXL012163@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gd/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv12136 Modified Files: gd.spec Added Files: gd-2.0.33-loop1.patch gd-2.0.33-loop2.patch gd-2.0.33-sf.patch Log Message: - fix cve-2006-2906 gd denial of service - fix another problem with infinite loop gd-2.0.33-loop1.patch: gd_gif_in.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE gd-2.0.33-loop1.patch --- --- gd-2.0.33/gd_gif_in.c.loop 2004-11-01 19:28:56.000000000 +0100 +++ gd-2.0.33/gd_gif_in.c 2007-05-29 14:09:37.000000000 +0200 @@ -254,13 +254,13 @@ if ((buf[0] & 0x1) != 0) *Transparent = buf[3]; - while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP) != 0) + while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP) > 0) ; return FALSE; default: break; } - while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP) != 0) + while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP) > 0) ; return FALSE; gd-2.0.33-loop2.patch: gd_gif_in.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) --- NEW FILE gd-2.0.33-loop2.patch --- --- gd-2.0.33/gd_gif_in.c.loop 2004-11-01 19:28:56.000000000 +0100 +++ gd-2.0.33/gd_gif_in.c 2006-07-10 14:59:42.000000000 +0200 @@ -418,16 +418,17 @@ return firstcode; } else if (code == end_code) { int count; + int max_count = 1024; unsigned char buf[260]; if (*ZeroDataBlockP) return -2; - while ((count = GetDataBlock(fd, buf, ZeroDataBlockP)) > 0) + while ((count = GetDataBlock(fd, buf, ZeroDataBlockP)) > 0 && --max_count >= 0 ) ; - if (count != 0) - return -2; + if (count != 0 || max_count < 0 ) + return -2; } incode = code; gd-2.0.33-sf.patch: gd_gif_in.c | 44 ++++++++++++++++++++++++++++++-------------- 1 files changed, 30 insertions(+), 14 deletions(-) --- NEW FILE gd-2.0.33-sf.patch --- --- gd-2.0.33/gd_gif_in.c.pom 2007-05-29 14:16:33.000000000 +0200 +++ gd-2.0.33/gd_gif_in.c 2007-05-29 14:23:16.000000000 +0200 @@ -42,7 +42,7 @@ #define LOCALCOLORMAP 0x80 #define BitSet(byte, bit) (((byte) & (bit)) == (bit)) -#define ReadOK(file,buffer,len) (gdGetBuf(buffer, len, file) != 0) +#define ReadOK(file,buffer,len) (gdGetBuf(buffer, len, file) > 0) #define LM_to_uint(a,b) (((b)<<8)|(a)) @@ -141,6 +141,8 @@ Background = buf[5]; AspectRatio = buf[6]; #endif + imw = LM_to_uint(buf[0],buf[1]); + imh = LM_to_uint(buf[2],buf[3]); if (BitSet(buf[4], LOCALCOLORMAP)) { /* Global Colormap */ if (ReadColorMap(fd, BitPixel, ColorMap)) { @@ -177,12 +179,16 @@ bitPixel = 1<<((buf[8]&0x07)+1); - imw = LM_to_uint(buf[4],buf[5]); - imh = LM_to_uint(buf[6],buf[7]); - if (!(im = gdImageCreate(imw, imh))) { - return 0; - } - im->interlace = BitSet(buf[8], INTERLACE); + if (!useGlobalColormap) { + if (ReadColorMap(fd, bitPixel, localColorMap)) { + return 0; + } + } + + if (!(im = gdImageCreate(imw, imh))) { + return 0; + } + im->interlace = BitSet(buf[8], INTERLACE); if (! useGlobalColormap) { if (ReadColorMap(fd, bitPixel, localColorMap)) { return 0; @@ -205,6 +211,10 @@ if (!im) { return 0; } + if (!im->colorsTotal) { + gdImageDestroy(im); + return 0; + } /* Check for open colors at the end, so we can reduce colorsTotal and ultimately BitsPerPixel */ @@ -327,7 +337,7 @@ buf[0] = buf[last_byte-2]; buf[1] = buf[last_byte-1]; - if ((count = GetDataBlock(fd, &buf[2], ZeroDataBlockP)) == 0) + if ((count = GetDataBlock(fd, &buf[2], ZeroDataBlockP)) <= 0) done = TRUE; last_byte = 2 + count; @@ -493,6 +503,18 @@ int v; int xpos = 0, ypos = 0, pass = 0; int i; + + /* + ** Initialize the Compression routines + */ + if (! ReadOK(fd,&c,1)) { + return; + } + + if (c > MAX_LWZ_BITS) { + return; + } + /* Stash the color map into the image */ for (i=0; (ired[i] = cmap[CM_RED][i]; @@ -502,12 +524,6 @@ } /* Many (perhaps most) of these colors will remain marked open. */ im->colorsTotal = gdMaxColors; - /* - ** Initialize the Compression routines - */ - if (! ReadOK(fd,&c,1)) { - return; - } if (LWZReadByte(fd, TRUE, c, ZeroDataBlockP) < 0) { return; } Index: gd.spec =================================================================== RCS file: /cvs/dist/rpms/gd/FC-5/gd.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gd.spec 29 Jan 2007 09:18:51 -0000 1.31 +++ gd.spec 29 May 2007 12:38:36 -0000 1.32 @@ -1,7 +1,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.0.33 -Release: 7%{?dist} +Release: 8%{?dist} Group: System Environment/Libraries License: BSD-style URL: http://www.boutell.com/gd/ @@ -10,6 +10,9 @@ Patch1: gd-2.0.33-SetAAPixel.patch Patch2: gd-2.0.33-security.patch Patch3: gd-2.0.33-cve-07-0455.patch +Patch4: gd-2.0.33-loop2.patch +Patch5: gd-2.0.33-loop1.patch +Patch6: gd-2.0.33-sf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel BuildRequires: libjpeg-devel, libpng-devel, zlib-devel @@ -52,6 +55,9 @@ %patch1 -p1 -b .SetAAPixel %patch2 -p1 -b .security %patch3 -p1 -b .cve-07-0455 +%patch4 -p1 -b .loop1 +%patch5 -p1 -b .loop2 +%patch6 -p1 -b .sf %build %configure --disable-rpath @@ -90,6 +96,10 @@ %changelog +* Tue May 29 2007 Ivana Varekova - 2.0.33-8 +- fix cve-2006-2906 gd denial of service +- fix another problem with infinite loop + * Mon Jan 29 2007 Ivana Varekova - 2.0.33-7 - Resolves: #224610 CVE-2007-0455 gd buffer overrun From fedora-cvs-commits at redhat.com Tue May 29 13:11:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 09:11:09 -0400 Subject: rpms/gd/FC-6 gd-2.0.33-loop1.patch, NONE, 1.1 gd-2.0.33-sf.patch, NONE, 1.1 gd.spec, 1.37, 1.38 Message-ID: <200705291311.l4TDB9aL013058@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gd/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13039 Modified Files: gd.spec Added Files: gd-2.0.33-loop1.patch gd-2.0.33-sf.patch Log Message: - fix problem with potential infinite loop - fix problems with possible stack overflow gd-2.0.33-loop1.patch: gd_gif_in.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE gd-2.0.33-loop1.patch --- --- gd-2.0.33/gd_gif_in.c.loop 2004-11-01 19:28:56.000000000 +0100 +++ gd-2.0.33/gd_gif_in.c 2007-05-29 14:09:37.000000000 +0200 @@ -254,13 +254,13 @@ if ((buf[0] & 0x1) != 0) *Transparent = buf[3]; - while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP) != 0) + while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP) > 0) ; return FALSE; default: break; } - while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP) != 0) + while (GetDataBlock(fd, (unsigned char*) buf, ZeroDataBlockP) > 0) ; return FALSE; gd-2.0.33-sf.patch: gd_gif_in.c | 44 ++++++++++++++++++++++++++++++-------------- 1 files changed, 30 insertions(+), 14 deletions(-) --- NEW FILE gd-2.0.33-sf.patch --- --- gd-2.0.33/gd_gif_in.c.pom 2007-05-29 14:16:33.000000000 +0200 +++ gd-2.0.33/gd_gif_in.c 2007-05-29 14:23:16.000000000 +0200 @@ -42,7 +42,7 @@ #define LOCALCOLORMAP 0x80 #define BitSet(byte, bit) (((byte) & (bit)) == (bit)) -#define ReadOK(file,buffer,len) (gdGetBuf(buffer, len, file) != 0) +#define ReadOK(file,buffer,len) (gdGetBuf(buffer, len, file) > 0) #define LM_to_uint(a,b) (((b)<<8)|(a)) @@ -141,6 +141,8 @@ Background = buf[5]; AspectRatio = buf[6]; #endif + imw = LM_to_uint(buf[0],buf[1]); + imh = LM_to_uint(buf[2],buf[3]); if (BitSet(buf[4], LOCALCOLORMAP)) { /* Global Colormap */ if (ReadColorMap(fd, BitPixel, ColorMap)) { @@ -177,12 +179,16 @@ bitPixel = 1<<((buf[8]&0x07)+1); - imw = LM_to_uint(buf[4],buf[5]); - imh = LM_to_uint(buf[6],buf[7]); - if (!(im = gdImageCreate(imw, imh))) { - return 0; - } - im->interlace = BitSet(buf[8], INTERLACE); + if (!useGlobalColormap) { + if (ReadColorMap(fd, bitPixel, localColorMap)) { + return 0; + } + } + + if (!(im = gdImageCreate(imw, imh))) { + return 0; + } + im->interlace = BitSet(buf[8], INTERLACE); if (! useGlobalColormap) { if (ReadColorMap(fd, bitPixel, localColorMap)) { return 0; @@ -205,6 +211,10 @@ if (!im) { return 0; } + if (!im->colorsTotal) { + gdImageDestroy(im); + return 0; + } /* Check for open colors at the end, so we can reduce colorsTotal and ultimately BitsPerPixel */ @@ -327,7 +337,7 @@ buf[0] = buf[last_byte-2]; buf[1] = buf[last_byte-1]; - if ((count = GetDataBlock(fd, &buf[2], ZeroDataBlockP)) == 0) + if ((count = GetDataBlock(fd, &buf[2], ZeroDataBlockP)) <= 0) done = TRUE; last_byte = 2 + count; @@ -493,6 +503,18 @@ int v; int xpos = 0, ypos = 0, pass = 0; int i; + + /* + ** Initialize the Compression routines + */ + if (! ReadOK(fd,&c,1)) { + return; + } + + if (c > MAX_LWZ_BITS) { + return; + } + /* Stash the color map into the image */ for (i=0; (ired[i] = cmap[CM_RED][i]; @@ -502,12 +524,6 @@ } /* Many (perhaps most) of these colors will remain marked open. */ im->colorsTotal = gdMaxColors; - /* - ** Initialize the Compression routines - */ - if (! ReadOK(fd,&c,1)) { - return; - } if (LWZReadByte(fd, TRUE, c, ZeroDataBlockP) < 0) { return; } Index: gd.spec =================================================================== RCS file: /cvs/dist/rpms/gd/FC-6/gd.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gd.spec 29 Jan 2007 09:08:35 -0000 1.37 +++ gd.spec 29 May 2007 13:11:07 -0000 1.38 @@ -1,7 +1,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.0.33 -Release: 10%{?dist} +Release: 11%{?dist} Group: System Environment/Libraries License: BSD-style URL: http://www.boutell.com/gd/ @@ -13,6 +13,8 @@ Patch4: gd-loop.patch Patch5: gd-sparc64.patch Patch6: gd-2.0.33-cve-07-0455.patch +Patch7: gd-2.0.33-loop1.patch +Patch8: gd-2.0.33-sf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig @@ -59,6 +61,8 @@ %patch4 -p1 -b .loop %patch5 -p1 -b .sparc64 %patch6 -p1 -b .cve-07-0455 +%patch7 -p1 -b .loop1 +%patch8 -p1 -b .sf %build %configure --disable-rpath @@ -98,6 +102,10 @@ %changelog +* Tue May 29 2007 Ivana Varekova - 2.0.33-11 +- fix problem with potential infinite loop +- fix problem with possible stack overflow + * Mon Jan 29 2007 Ivana Varekova - 2.0.33-10 - Resolves: #224610 CVE-2007-0455 gd buffer overrun From fedora-cvs-commits at redhat.com Tue May 29 17:13:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 13:13:39 -0400 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch, 1.47, 1.48 selinux-policy.spec, 1.368, 1.369 Message-ID: <200705291713.l4THDdBj018673@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18656 Modified Files: policy-20061106.patch selinux-policy.spec Log Message: * Tue May 29 2007 Dan Walsh 2.4.6-74 - Fixes for nagios, postfix, procmail, saslauthd, arpwatch, avahi, dovecot policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 94 +++- policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 11 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 57 ++ policy/modules/admin/amtu.te | 56 ++ policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 24 - policy/modules/admin/kudzu.te | 14 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 14 policy/modules/admin/netutils.te | 19 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 20 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 86 +++ policy/modules/admin/rpm.te | 49 -- policy/modules/admin/su.if | 38 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 13 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 58 ++ policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 ++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 70 +++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 39 - policy/modules/apps/mozilla.if | 208 +++++++-- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 7 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 20 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 30 + policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 140 ++++++ policy/modules/kernel/corenetwork.te.in | 14 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 ++ policy/modules/kernel/domain.te | 22 policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 224 +++++++++ policy/modules/kernel/filesystem.if | 62 ++ policy/modules/kernel/filesystem.te | 30 + policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 22 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 21 policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 3 policy/modules/services/aide.te | 11 policy/modules/services/amavis.if | 19 policy/modules/services/amavis.te | 3 policy/modules/services/apache.fc | 17 policy/modules/services/apache.if | 157 ++++++ policy/modules/services/apache.te | 43 + policy/modules/services/apm.te | 3 policy/modules/services/arpwatch.te | 5 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 40 + policy/modules/services/avahi.te | 10 policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 6 policy/modules/services/bluetooth.te | 10 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 25 - policy/modules/services/clamav.te | 3 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++- policy/modules/services/cron.te | 58 ++ policy/modules/services/cups.fc | 4 policy/modules/services/cups.te | 19 policy/modules/services/cvs.te | 2 policy/modules/services/cyrus.te | 5 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 66 ++ policy/modules/services/dbus.te | 4 policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/dovecot.fc | 1 policy/modules/services/dovecot.if | 44 + policy/modules/services/dovecot.te | 64 ++ policy/modules/services/fail2ban.fc | 3 policy/modules/services/fail2ban.if | 80 +++ policy/modules/services/fail2ban.te | 74 +++ policy/modules/services/ftp.te | 21 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 114 ++++ policy/modules/services/hal.te | 26 - policy/modules/services/inetd.te | 28 - policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 25 + policy/modules/services/kerberos.te | 15 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 57 +- policy/modules/services/lpd.te | 5 policy/modules/services/mailman.if | 20 policy/modules/services/mailman.te | 1 policy/modules/services/mta.fc | 1 policy/modules/services/mta.if | 20 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/nagios.fc | 3 policy/modules/services/nagios.te | 8 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 7 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 34 + policy/modules/services/nscd.if | 20 policy/modules/services/nscd.te | 28 - policy/modules/services/ntp.te | 1 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 5 policy/modules/services/openca.if | 4 policy/modules/services/openca.te | 2 policy/modules/services/openct.te | 2 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 ++ policy/modules/services/pcscd.te | 79 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 11 policy/modules/services/portmap.te | 5 policy/modules/services/portslave.te | 1 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 29 + policy/modules/services/postfix.te | 56 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 29 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 2 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 22 policy/modules/services/rlogin.te | 11 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.if | 3 policy/modules/services/rpc.te | 27 - policy/modules/services/rshd.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.fc | 6 policy/modules/services/samba.if | 62 ++ policy/modules/services/samba.te | 71 ++- policy/modules/services/sasl.te | 14 policy/modules/services/sendmail.if | 22 policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 17 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 24 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 21 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 14 policy/modules/services/telnet.te | 3 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 ++ policy/modules/services/uucp.te | 44 + policy/modules/services/uwimap.te | 1 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 191 ++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 180 +++++++ policy/modules/system/authlogin.te | 41 + policy/modules/system/clock.te | 18 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.if | 19 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 policy/modules/system/init.if | 64 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 121 +++++ policy/modules/system/iptables.te | 27 - policy/modules/system/libraries.fc | 43 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 11 policy/modules/system/logging.fc | 5 policy/modules/system/logging.if | 61 ++ policy/modules/system/logging.te | 33 + policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 + policy/modules/system/lvm.te | 91 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 +++ policy/modules/system/modutils.te | 26 - policy/modules/system/mount.te | 27 - policy/modules/system/netlabel.te | 10 policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 16 policy/modules/system/selinuxutil.fc | 10 policy/modules/system/selinuxutil.if | 124 +++++ policy/modules/system/selinuxutil.te | 134 ++--- policy/modules/system/sysnetwork.te | 13 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 policy/modules/system/unconfined.te | 23 policy/modules/system/userdomain.if | 622 +++++++++++++++++++++++---- policy/modules/system/userdomain.te | 105 ++-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 52 ++ policy/support/*Warnings* | 189 ++++++++ policy/support/file_patterns.spt | 534 +++++++++++++++++++++++ policy/support/obj_perm_sets.spt | 144 ++++++ 260 files changed, 7501 insertions(+), 754 deletions(-) Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- policy-20061106.patch 23 May 2007 18:36:38 -0000 1.47 +++ policy-20061106.patch 29 May 2007 17:13:36 -0000 1.48 @@ -2912,7 +2912,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.4.6/policy/modules/kernel/corecommands.fc --- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/kernel/corecommands.fc 2007-05-22 12:40:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/kernel/corecommands.fc 2007-05-29 11:39:16.000000000 -0400 @@ -1,4 +1,3 @@ - # @@ -2962,7 +2962,15 @@ /usr/share/hwbrowser/hwbrowser -- gen_context(system_u:object_r:bin_t,s0) /usr/share/pwlib/make/ptlib-config -- gen_context(system_u:object_r:bin_t,s0) /usr/share/pydict/pydict\.py -- gen_context(system_u:object_r:bin_t,s0) -@@ -247,3 +261,16 @@ +@@ -239,6 +253,7 @@ + /var/ftp/bin/ls -- gen_context(system_u:object_r:ls_exec_t,s0) + + /usr/lib/yp/.+ -- gen_context(system_u:object_r:bin_t,s0) ++/usr/lib64/yp/.+ -- gen_context(system_u:object_r:bin_t,s0) + + /var/qmail/bin -d gen_context(system_u:object_r:bin_t,s0) + /var/qmail/bin(/.*)? gen_context(system_u:object_r:bin_t,s0) +@@ -247,3 +262,16 @@ ifdef(`distro_suse',` /var/lib/samba/bin/.+ gen_context(system_u:object_r:bin_t,s0) ') @@ -4856,6 +4864,35 @@ ') optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/arpwatch.te serefpolicy-2.4.6/policy/modules/services/arpwatch.te +--- nsaserefpolicy/policy/modules/services/arpwatch.te 2006-11-29 12:04:49.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/arpwatch.te 2007-05-29 08:59:55.000000000 -0400 +@@ -28,7 +28,6 @@ + allow arpwatch_t self:process signal_perms; + allow arpwatch_t self:unix_dgram_socket create_socket_perms; + allow arpwatch_t self:unix_stream_socket create_stream_socket_perms; +-allow arpwatch_t self:netlink_route_socket r_netlink_socket_perms; + allow arpwatch_t self:tcp_socket { connect create_stream_socket_perms }; + allow arpwatch_t self:udp_socket create_socket_perms; + allow arpwatch_t self:packet_socket create_socket_perms; +@@ -84,8 +83,6 @@ + + miscfiles_read_localization(arpwatch_t) + +-sysnet_read_config(arpwatch_t) +- + userdom_dontaudit_use_unpriv_user_fds(arpwatch_t) + userdom_dontaudit_search_sysadm_home_dirs(arpwatch_t) + +@@ -98,7 +95,7 @@ + ') + + optional_policy(` +- nis_use_ypbind(arpwatch_t) ++ auth_use_nsswitch(arpwatch_t) + ') + + optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.fc serefpolicy-2.4.6/policy/modules/services/automount.fc --- nsaserefpolicy/policy/modules/services/automount.fc 2006-11-29 12:04:49.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/services/automount.fc 2007-05-22 12:40:26.000000000 -0400 @@ -4954,6 +4991,47 @@ + dontaudit $1 avahi_var_run_t:dir search_dir_perms; +') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.4.6/policy/modules/services/avahi.te +--- nsaserefpolicy/policy/modules/services/avahi.te 2006-11-29 12:04:49.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/avahi.te 2007-05-29 08:45:00.000000000 -0400 +@@ -24,7 +24,6 @@ + allow avahi_t self:fifo_file { read write }; + allow avahi_t self:unix_stream_socket { connectto create_stream_socket_perms }; + allow avahi_t self:unix_dgram_socket create_socket_perms; +-allow avahi_t self:netlink_route_socket r_netlink_socket_perms; + allow avahi_t self:tcp_socket create_stream_socket_perms; + allow avahi_t self:udp_socket create_socket_perms; + +@@ -33,6 +32,8 @@ + allow avahi_t avahi_var_run_t:dir { rw_dir_perms setattr }; + files_pid_filetrans(avahi_t,avahi_var_run_t,file) + ++auth_use_nsswitch(avahi_t) ++ + kernel_read_kernel_sysctls(avahi_t) + kernel_list_proc(avahi_t) + kernel_read_proc_symlinks(avahi_t) +@@ -79,9 +80,6 @@ + miscfiles_read_localization(avahi_t) + miscfiles_read_certs(avahi_t) + +-sysnet_read_config(avahi_t) +-sysnet_use_ldap(avahi_t) +- + userdom_dontaudit_use_unpriv_user_fds(avahi_t) + userdom_dontaudit_search_sysadm_home_dirs(avahi_t) + +@@ -99,10 +97,6 @@ + ') + + optional_policy(` +- nis_use_ypbind(avahi_t) +-') +- +-optional_policy(` + seutil_sigchld_newrole(avahi_t) + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.fc serefpolicy-2.4.6/policy/modules/services/bind.fc --- nsaserefpolicy/policy/modules/services/bind.fc 2006-11-29 12:04:49.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/services/bind.fc 2007-05-22 12:40:26.000000000 -0400 @@ -5907,7 +5985,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.4.6/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2006-11-29 12:04:49.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/dovecot.te 2007-05-22 14:43:54.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/services/dovecot.te 2007-05-29 09:07:25.000000000 -0400 @@ -15,6 +15,12 @@ domain_entry_file(dovecot_auth_t,dovecot_auth_exec_t) role system_r types dovecot_auth_t; @@ -5921,15 +5999,15 @@ type dovecot_cert_t; files_type(dovecot_cert_t) -@@ -46,6 +52,7 @@ +@@ -46,7 +52,6 @@ allow dovecot_t self:tcp_socket create_stream_socket_perms; allow dovecot_t self:unix_dgram_socket create_socket_perms; allow dovecot_t self:unix_stream_socket { create_stream_socket_perms connectto }; -+allow dovecot_t self:netlink_route_socket r_netlink_socket_perms; - +- domain_auto_trans(dovecot_t, dovecot_auth_exec_t, dovecot_auth_t) allow dovecot_t dovecot_auth_t:fd use; -@@ -94,6 +101,7 @@ + allow dovecot_auth_t dovecot_t:process sigchld; +@@ -94,6 +99,7 @@ term_dontaudit_use_console(dovecot_t) @@ -5937,16 +6015,39 @@ corecmd_exec_bin(dovecot_t) domain_use_interactive_fds(dovecot_t) -@@ -149,18 +157,22 @@ - udev_read_db(dovecot_t) +@@ -118,7 +124,6 @@ + miscfiles_read_certs(dovecot_t) + miscfiles_read_localization(dovecot_t) + +-sysnet_read_config(dovecot_t) + sysnet_use_ldap(dovecot_auth_t) + + userdom_dontaudit_use_unpriv_user_fds(dovecot_t) +@@ -134,19 +139,19 @@ ') -+optional_policy(` + optional_policy(` +- kerberos_use(dovecot_t) ++ auth_use_nsswitch(dovecot_t) + ') + + optional_policy(` +- nis_use_ypbind(dovecot_t) ++ seutil_sigchld_newrole(dovecot_t) + ') + + optional_policy(` +- seutil_sigchld_newrole(dovecot_t) ++ udev_read_db(dovecot_t) + ') + + optional_policy(` +- udev_read_db(dovecot_t) + squid_dontaudit_search_squid_cache(dovecot_t) -+') -+ + ') + ######################################## - # +@@ -154,13 +159,13 @@ # dovecot auth local policy # @@ -5962,7 +6063,7 @@ allow dovecot_auth_t dovecot_passwd_t:file { getattr read }; -@@ -168,8 +180,10 @@ +@@ -168,8 +173,10 @@ allow dovecot_t dovecot_var_lib_t:dir rw_dir_perms; allow dovecot_t dovecot_var_lib_t:file manage_file_perms; files_search_var_lib(dovecot_t) @@ -5974,7 +6075,7 @@ kernel_read_all_sysctls(dovecot_auth_t) kernel_read_system_state(dovecot_auth_t) -@@ -177,11 +191,13 @@ +@@ -177,11 +184,13 @@ dev_read_urand(dovecot_auth_t) auth_domtrans_chk_passwd(dovecot_auth_t) @@ -5988,7 +6089,15 @@ files_read_usr_symlinks(dovecot_auth_t) files_search_tmp(dovecot_auth_t) files_read_var_lib_files(dovecot_t) -@@ -203,4 +219,39 @@ +@@ -195,12 +204,45 @@ + + seutil_dontaudit_search_config(dovecot_auth_t) + +-sysnet_dns_name_resolve(dovecot_auth_t) +- + optional_policy(` + kerberos_use(dovecot_auth_t) + ') optional_policy(` logging_send_syslog_msg(dovecot_auth_t) @@ -6915,6 +7024,53 @@ + ssh_sigchld(munin_t) + ssh_rw_stream_sockets(munin_t) +') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.fc serefpolicy-2.4.6/policy/modules/services/nagios.fc +--- nsaserefpolicy/policy/modules/services/nagios.fc 2006-11-29 12:04:49.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/nagios.fc 2007-05-29 10:50:25.000000000 -0400 +@@ -5,12 +5,11 @@ + /usr/bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0) + + /usr/lib(64)?/cgi-bin/netsaint/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0) +-/usr/lib(64)?/nagios/cgi/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0) ++/usr/lib(64)?/nagios/cgi-bin/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0) + + /var/log/nagios(/.*)? gen_context(system_u:object_r:nagios_log_t,s0) + /var/log/netsaint(/.*)? gen_context(system_u:object_r:nagios_log_t,s0) + + ifdef(`distro_debian',` + /usr/sbin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0) +-/usr/lib/cgi-bin/nagios/.+ -- gen_context(system_u:object_r:nagios_cgi_exec_t,s0) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nagios.te serefpolicy-2.4.6/policy/modules/services/nagios.te +--- nsaserefpolicy/policy/modules/services/nagios.te 2006-11-29 12:04:51.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/nagios.te 2007-05-29 10:53:31.000000000 -0400 +@@ -75,8 +75,10 @@ + corenet_udp_sendrecv_all_nodes(nagios_t) + corenet_tcp_sendrecv_all_ports(nagios_t) + corenet_udp_sendrecv_all_ports(nagios_t) ++corenet_tcp_connect_all_ports(nagios_t) + + dev_read_sysfs(nagios_t) ++dev_read_urand(nagios_t) + + domain_use_interactive_fds(nagios_t) + # for ps +@@ -120,14 +122,10 @@ + netutils_domtrans_ping(nagios_t) + netutils_signal_ping(nagios_t) + netutils_kill_ping(nagios_t) +- +- # cjp: leaked file descriptors: +- #dontaudit ping_t nagios_etc_t:file read; +- #dontaudit ping_t nagios_log_t:fifo_file read; + ') + + optional_policy(` +- nis_use_ypbind(nagios_t) ++ auth_use_nsswitch(nagios_t) + ') + + optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.4.6/policy/modules/services/networkmanager.fc --- nsaserefpolicy/policy/modules/services/networkmanager.fc 2006-11-29 12:04:51.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/services/networkmanager.fc 2007-05-22 12:40:26.000000000 -0400 @@ -6938,17 +7094,21 @@ unconfined_rw_pipes(NetworkManager_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.4.6/policy/modules/services/nis.fc --- nsaserefpolicy/policy/modules/services/nis.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/nis.fc 2007-05-22 12:40:26.000000000 -0400 -@@ -4,7 +4,8 @@ ++++ serefpolicy-2.4.6/policy/modules/services/nis.fc 2007-05-29 11:37:05.000000000 -0400 +@@ -3,8 +3,11 @@ + /sbin/ypbind -- gen_context(system_u:object_r:ypbind_exec_t,s0) - /usr/sbin/rpc\.yppasswdd -- gen_context(system_u:object_r:yppasswdd_exec_t,s0) +-/usr/sbin/rpc\.yppasswdd -- gen_context(system_u:object_r:yppasswdd_exec_t,s0) -/usr/sbin/rpc\.ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) ++/usr/lib/yp/ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) ++/usr/lib64/yp/ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) ++ ++/usr/sbin/rpc\.yppasswdd -- gen_context(system_u:object_r:yppasswdd_exec_t,s0) +/usr/sbin/rpc\.ypxfrd -- gen_context(system_u:object_r:ypxfr_exec_t,s0) /usr/sbin/ypserv -- gen_context(system_u:object_r:ypserv_exec_t,s0) /var/yp(/.*)? gen_context(system_u:object_r:var_yp_t,s0) -+/usr/lib/yp/ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.4.6/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2006-11-29 12:04:49.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/services/nis.if 2007-05-22 12:40:26.000000000 -0400 @@ -7534,7 +7694,7 @@ /usr/libexec/postfix/bounce -- gen_context(system_u:object_r:postfix_bounce_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.4.6/policy/modules/services/postfix.if --- nsaserefpolicy/policy/modules/services/postfix.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/postfix.if 2007-05-22 12:40:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/services/postfix.if 2007-05-29 08:45:42.000000000 -0400 @@ -48,8 +48,6 @@ can_exec(postfix_$1_t, postfix_$1_exec_t) @@ -7544,15 +7704,30 @@ allow postfix_$1_t postfix_master_t:process sigchld; -@@ -128,6 +126,7 @@ - allow postfix_$1_t postfix_master_t:unix_stream_socket { connectto rw_stream_socket_perms }; - allow postfix_$1_t self:tcp_socket create_socket_perms; - allow postfix_$1_t self:udp_socket create_socket_perms; -+ allow postfix_$1_t self:netlink_route_socket r_netlink_socket_perms; - - domain_auto_trans(postfix_master_t, postfix_$1_exec_t, postfix_$1_t) - allow postfix_master_t postfix_$1_t:fd use; -@@ -484,3 +483,22 @@ +@@ -122,6 +120,10 @@ + ## + # + template(`postfix_server_domain_template',` ++ gen_require(` ++ type postfix_master_t; ++ ') ++ + postfix_domain_template($1) + + allow postfix_$1_t self:capability { setuid setgid dac_override }; +@@ -147,10 +149,8 @@ + corenet_tcp_connect_all_ports(postfix_$1_t) + corenet_sendrecv_all_client_packets(postfix_$1_t) + +- sysnet_read_config(postfix_$1_t) +- + optional_policy(` +- nis_use_ypbind(postfix_$1_t) ++ auth_use_nsswitch(postfix_$1_t) + ') + ') + +@@ -484,3 +484,22 @@ typeattribute $1 postfix_user_domtrans; ') @@ -7577,8 +7752,8 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.4.6/policy/modules/services/postfix.te --- nsaserefpolicy/policy/modules/services/postfix.te 2006-11-29 12:04:49.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/postfix.te 2007-05-22 12:40:26.000000000 -0400 -@@ -171,6 +171,8 @@ ++++ serefpolicy-2.4.6/policy/modules/services/postfix.te 2007-05-29 11:52:01.000000000 -0400 +@@ -171,12 +171,18 @@ mta_rw_aliases(postfix_master_t) mta_read_sendmail_bin(postfix_master_t) @@ -7587,7 +7762,17 @@ ifdef(`targeted_policy',` term_dontaudit_use_unallocated_ttys(postfix_master_t) term_dontaudit_use_generic_ptys(postfix_master_t) -@@ -186,6 +188,10 @@ + ') + + optional_policy(` ++ auth_use_nsswitch(postfix_master_t) ++') ++ ++optional_policy(` + cyrus_stream_connect(postfix_master_t) + ') + +@@ -186,6 +192,10 @@ ') optional_policy(` @@ -7598,7 +7783,7 @@ nis_use_ypbind(postfix_master_t) ') -@@ -222,6 +228,7 @@ +@@ -222,6 +232,7 @@ allow postfix_bounce_t self:capability dac_read_search; allow postfix_bounce_t self:tcp_socket create_socket_perms; @@ -7606,7 +7791,7 @@ allow postfix_bounce_t postfix_public_t:sock_file write; allow postfix_bounce_t postfix_public_t:dir search; -@@ -240,6 +247,7 @@ +@@ -240,6 +251,7 @@ # allow postfix_cleanup_t self:process setrlimit; @@ -7614,7 +7799,7 @@ # connect to master process allow postfix_cleanup_t postfix_master_t:unix_stream_socket connectto; -@@ -265,6 +273,7 @@ +@@ -265,6 +277,7 @@ allow postfix_local_t self:fifo_file rw_file_perms; allow postfix_local_t self:process { setsched setrlimit }; @@ -7622,7 +7807,7 @@ allow postfix_local_t postfix_local_tmp_t:dir create_dir_perms; allow postfix_local_t postfix_local_tmp_t:file create_file_perms; -@@ -298,6 +307,7 @@ +@@ -298,6 +311,7 @@ optional_policy(` # for postalias mailman_manage_data_files(postfix_local_t) @@ -7630,7 +7815,7 @@ ') optional_policy(` -@@ -382,6 +392,10 @@ +@@ -382,6 +396,10 @@ locallogin_dontaudit_use_fds(postfix_map_t) ') @@ -7641,7 +7826,7 @@ # a "run" interface needs to be # added, and have sysadm_t use it # in a optional_policy block. -@@ -394,6 +408,7 @@ +@@ -394,6 +412,7 @@ allow postfix_pickup_t self:tcp_socket create_socket_perms; allow postfix_pickup_t postfix_master_t:unix_stream_socket connectto; @@ -7649,7 +7834,7 @@ allow postfix_pickup_t postfix_private_t:dir search; allow postfix_pickup_t postfix_private_t:sock_file write; -@@ -412,7 +427,7 @@ +@@ -412,7 +431,7 @@ # Postfix pipe local policy # @@ -7658,7 +7843,7 @@ allow postfix_pipe_t postfix_private_t:dir search; allow postfix_pipe_t postfix_private_t:sock_file write; -@@ -423,6 +438,12 @@ +@@ -423,6 +442,12 @@ allow postfix_pipe_t postfix_spool_t:dir search; allow postfix_pipe_t postfix_spool_t:file rw_file_perms; @@ -7671,7 +7856,7 @@ optional_policy(` procmail_domtrans(postfix_pipe_t) ') -@@ -431,6 +452,14 @@ +@@ -431,6 +456,14 @@ mailman_domtrans_queue(postfix_pipe_t) ') @@ -7686,7 +7871,18 @@ ######################################## # # Postfix postdrop local policy -@@ -515,6 +544,7 @@ +@@ -468,6 +501,10 @@ + ') + + optional_policy(` ++ fstools_read_pipes(postfix_postdrop_t) ++') ++ ++optional_policy(` + ppp_use_fds(postfix_postqueue_t) + ppp_sigchld(postfix_postqueue_t) + ') +@@ -515,6 +552,7 @@ # allow postfix_qmgr_t postfix_master_t:unix_stream_socket connectto; @@ -7694,7 +7890,7 @@ allow postfix_qmgr_t postfix_private_t:dir search; allow postfix_qmgr_t postfix_private_t:sock_file rw_file_perms; -@@ -574,9 +604,14 @@ +@@ -574,9 +612,14 @@ allow postfix_smtp_t postfix_master_t:unix_stream_socket connectto; allow postfix_smtp_t { postfix_private_t postfix_public_t }:dir search; allow postfix_smtp_t { postfix_private_t postfix_public_t }:sock_file write; @@ -7709,7 +7905,7 @@ ######################################## # # Postfix smtpd local policy -@@ -594,9 +629,19 @@ +@@ -594,9 +637,19 @@ corecmd_exec_bin(postfix_smtpd_t) @@ -7729,7 +7925,7 @@ optional_policy(` postgrey_stream_connect(postfix_smtpd_t) -@@ -605,3 +650,4 @@ +@@ -605,3 +658,4 @@ optional_policy(` sasl_connect(postfix_smtpd_t) ') @@ -8388,7 +8584,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.4.6/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/samba.te 2007-05-22 12:40:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/services/samba.te 2007-05-29 08:53:18.000000000 -0400 @@ -10,6 +10,13 @@ type nmbd_exec_t; init_daemon_domain(nmbd_t,nmbd_exec_t) @@ -8552,7 +8748,17 @@ dontaudit winbind_t self:capability sys_tty_config; allow winbind_t self:process signal_perms; allow winbind_t self:fifo_file { read write }; -@@ -677,10 +700,12 @@ +@@ -623,6 +646,9 @@ + allow winbind_t self:tcp_socket create_stream_socket_perms; + allow winbind_t self:udp_socket create_socket_perms; + ++allow winbind_t nmbd_t:process { signal signull }; ++allow winbind_t nmbd_var_run_t:file read_file_perms; ++ + allow winbind_t samba_etc_t:dir r_dir_perms; + allow winbind_t samba_etc_t:lnk_file { getattr read }; + allow winbind_t samba_etc_t:file r_file_perms; +@@ -677,10 +703,12 @@ term_dontaudit_use_console(winbind_t) auth_domtrans_chk_passwd(winbind_t) @@ -8565,7 +8771,7 @@ init_use_fds(winbind_t) init_use_script_ptys(winbind_t) -@@ -743,6 +768,8 @@ +@@ -743,6 +771,8 @@ domain_use_interactive_fds(winbind_helper_t) @@ -8574,7 +8780,7 @@ libs_use_ld_so(winbind_helper_t) libs_use_shared_libs(winbind_helper_t) -@@ -763,3 +790,24 @@ +@@ -763,3 +793,24 @@ squid_read_log(winbind_helper_t) squid_append_log(winbind_helper_t) ') @@ -8601,7 +8807,7 @@ +unconfined_domain(samba_unconfined_script_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-2.4.6/policy/modules/services/sasl.te --- nsaserefpolicy/policy/modules/services/sasl.te 2006-11-29 12:04:49.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/sasl.te 2007-05-22 12:40:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/services/sasl.te 2007-05-29 10:37:39.000000000 -0400 @@ -10,6 +10,9 @@ type saslauthd_exec_t; init_daemon_domain(saslauthd_t,saslauthd_exec_t) @@ -8635,7 +8841,15 @@ auth_use_nsswitch(saslauthd_t) domain_use_interactive_fds(saslauthd_t) -@@ -92,6 +101,10 @@ +@@ -68,6 +77,7 @@ + libs_use_shared_libs(saslauthd_t) + + logging_send_syslog_msg(saslauthd_t) ++logging_send_audit_msg(saslauthd_t) + + miscfiles_read_localization(saslauthd_t) + miscfiles_read_certs(saslauthd_t) +@@ -92,6 +102,10 @@ ') optional_policy(` @@ -10203,6 +10417,32 @@ /sbin/parted -- gen_context(system_u:object_r:fsadm_exec_t,s0) /sbin/partprobe -- gen_context(system_u:object_r:fsadm_exec_t,s0) /sbin/partx -- gen_context(system_u:object_r:fsadm_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.4.6/policy/modules/system/fstools.if +--- nsaserefpolicy/policy/modules/system/fstools.if 2006-11-29 12:04:51.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/fstools.if 2007-05-29 11:52:28.000000000 -0400 +@@ -129,3 +129,22 @@ + + allow $1 swapfile_t:file getattr; + ') ++ ++######################################## ++## ++## Read fstools unnamed pipes. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`fstools_read_pipes',` ++ gen_require(` ++ type fsdaemon_t; ++ ') ++ ++ allow $1 fsdaemon_t:fifo_file read_fifo_file_perms; ++') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.4.6/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2006-11-29 12:04:51.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/system/fstools.te 2007-05-22 12:40:26.000000000 -0400 @@ -10846,7 +11086,7 @@ +dev_read_urand(racoon_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.4.6/policy/modules/system/iptables.te --- nsaserefpolicy/policy/modules/system/iptables.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/iptables.te 2007-05-22 12:40:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/iptables.te 2007-05-29 12:04:33.000000000 -0400 @@ -52,11 +52,12 @@ mls_file_read_up(iptables_t) @@ -10861,7 +11101,7 @@ init_use_fds(iptables_t) init_use_script_ptys(iptables_t) -@@ -78,14 +79,19 @@ +@@ -78,14 +79,23 @@ userdom_use_all_users_fds(iptables_t) ifdef(`targeted_policy', ` @@ -10875,6 +11115,10 @@ + +optional_policy(` + nscd_socket_use(iptables_t) ++') ++ ++optional_policy(` ++ fail2ban_append_log(iptables_t) ') optional_policy(` @@ -10884,7 +11128,7 @@ ') optional_policy(` -@@ -104,3 +110,12 @@ +@@ -104,3 +114,12 @@ optional_policy(` udev_read_db(iptables_t) ') @@ -11142,7 +11386,7 @@ ifndef(`distro_gentoo',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.4.6/policy/modules/system/logging.if --- nsaserefpolicy/policy/modules/system/logging.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/logging.if 2007-05-22 12:40:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/logging.if 2007-05-29 10:37:15.000000000 -0400 @@ -454,6 +454,7 @@ files_search_var($1) @@ -13783,7 +14027,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.4.6/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-05-22 12:40:26.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-05-29 13:00:17.000000000 -0400 @@ -20,12 +20,15 @@ type xenctl_t; files_type(xenctl_t) @@ -13823,16 +14067,15 @@ # var/lib files for xend allow xend_t xend_var_lib_t:file create_file_perms; allow xend_t xend_var_lib_t:sock_file create_file_perms; -@@ -131,7 +138,7 @@ +@@ -131,6 +138,7 @@ corecmd_exec_sbin(xend_t) corecmd_exec_bin(xend_t) --corecmd_exec_shell(xend_t) +corecmd_exec_ls(xend_t) + corecmd_exec_shell(xend_t) corenet_non_ipsec_sendrecv(xend_t) - corenet_tcp_sendrecv_all_if(xend_t) -@@ -143,6 +150,7 @@ +@@ -143,6 +151,7 @@ corenet_tcp_bind_generic_port(xend_t) corenet_tcp_bind_vnc_port(xend_t) corenet_tcp_connect_xserver_port(xend_t) @@ -13840,7 +14083,7 @@ corenet_sendrecv_xserver_client_packets(xend_t) corenet_sendrecv_xen_server_packets(xend_t) corenet_sendrecv_soundd_server_packets(xend_t) -@@ -152,6 +160,7 @@ +@@ -152,6 +161,7 @@ dev_manage_xen(xend_t) dev_filetrans_xen(xend_t) dev_rw_sysfs(xend_t) @@ -13848,7 +14091,7 @@ domain_read_all_domains_state(xend_t) domain_dontaudit_read_all_domains_state(xend_t) -@@ -163,8 +172,13 @@ +@@ -163,8 +173,13 @@ files_manage_etc_runtime_files(xend_t) files_etc_filetrans_etc_runtime(xend_t,file) files_read_usr_files(xend_t) @@ -13863,7 +14106,7 @@ storage_raw_read_removable_device(xend_t) term_getattr_all_user_ptys(xend_t) -@@ -196,6 +210,10 @@ +@@ -196,6 +211,10 @@ xen_stream_connect_xenstore(xend_t) @@ -13874,7 +14117,7 @@ netutils_domtrans(xend_t) optional_policy(` -@@ -236,6 +254,10 @@ +@@ -236,6 +255,10 @@ files_read_usr_files(xenconsoled_t) @@ -13885,7 +14128,7 @@ term_create_pty(xenconsoled_t,xen_devpts_t); term_use_generic_ptys(xenconsoled_t) term_use_console(xenconsoled_t) -@@ -283,6 +305,12 @@ +@@ -283,6 +306,12 @@ files_read_usr_files(xenstored_t) @@ -13898,7 +14141,7 @@ term_use_generic_ptys(xenstored_t) term_use_console(xenconsoled_t) -@@ -317,6 +345,11 @@ +@@ -317,6 +346,11 @@ allow xm_t xen_image_t:dir rw_dir_perms; allow xm_t xen_image_t:file r_file_perms; @@ -13910,7 +14153,7 @@ kernel_read_system_state(xm_t) kernel_read_kernel_sysctls(xm_t) -@@ -325,6 +358,7 @@ +@@ -325,6 +359,7 @@ corecmd_exec_bin(xm_t) corecmd_exec_sbin(xm_t) @@ -13918,7 +14161,7 @@ corenet_tcp_sendrecv_generic_if(xm_t) corenet_tcp_sendrecv_all_nodes(xm_t) -@@ -353,3 +387,12 @@ +@@ -353,3 +388,12 @@ xen_append_log(xm_t) xen_stream_connect(xm_t) xen_stream_connect_xenstore(xm_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v retrieving revision 1.368 retrieving revision 1.369 diff -u -r1.368 -r1.369 --- selinux-policy.spec 23 May 2007 18:36:38 -0000 1.368 +++ selinux-policy.spec 29 May 2007 17:13:36 -0000 1.369 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.4.6 -Release: 73%{?dist} +Release: 74%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -360,6 +360,10 @@ %endif %changelog +* Tue May 29 2007 Dan Walsh 2.4.6-74 +- Fixes for nagios, postfix, procmail, saslauthd, arpwatch, avahi, dovecot + + * Tue May 22 2007 Dan Walsh 2.4.6-73 - Allow aixexec to use /tmp - Allow amanda to read var_lib files From fedora-cvs-commits at redhat.com Tue May 29 17:30:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 13:30:14 -0400 Subject: rpms/selinux-policy/FC-6 policy-20061106.patch,1.48,1.49 Message-ID: <200705291730.l4THUESU018948@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18931 Modified Files: policy-20061106.patch Log Message: * Tue May 29 2007 Dan Walsh 2.4.6-74 - Fixes for nagios, postfix, procmail, saslauthd, arpwatch, avahi, dovecot policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/default_contexts | 6 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/kerberos_selinux.8 | 2 policy/flask/access_vectors | 2 policy/global_tunables | 94 +++- policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 11 policy/modules/admin/amtu.fc | 3 policy/modules/admin/amtu.if | 57 ++ policy/modules/admin/amtu.te | 56 ++ policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 24 - policy/modules/admin/kudzu.te | 14 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 14 policy/modules/admin/netutils.te | 19 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 20 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 86 +++ policy/modules/admin/rpm.te | 49 -- policy/modules/admin/su.if | 38 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 13 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.if | 2 policy/modules/admin/usermanage.te | 58 ++ policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 107 ++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/games.fc | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 ++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 70 +++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 39 - policy/modules/apps/mozilla.if | 208 +++++++-- policy/modules/apps/mplayer.if | 84 +++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 7 policy/modules/apps/thunderbird.if | 81 +++ policy/modules/apps/userhelper.if | 20 policy/modules/apps/webalizer.te | 6 policy/modules/apps/wine.fc | 1 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 30 + policy/modules/kernel/corecommands.if | 77 +++ policy/modules/kernel/corenetwork.if.in | 140 ++++++ policy/modules/kernel/corenetwork.te.in | 14 policy/modules/kernel/devices.fc | 8 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 ++ policy/modules/kernel/domain.te | 22 policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 224 +++++++++ policy/modules/kernel/filesystem.if | 62 ++ policy/modules/kernel/filesystem.te | 30 + policy/modules/kernel/kernel.if | 84 +++ policy/modules/kernel/kernel.te | 22 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 3 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 21 policy/modules/kernel/terminal.te | 1 policy/modules/services/aide.fc | 3 policy/modules/services/aide.te | 11 policy/modules/services/amavis.if | 19 policy/modules/services/amavis.te | 3 policy/modules/services/apache.fc | 17 policy/modules/services/apache.if | 157 ++++++ policy/modules/services/apache.te | 43 + policy/modules/services/apm.te | 3 policy/modules/services/arpwatch.te | 5 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 40 + policy/modules/services/avahi.te | 10 policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 6 policy/modules/services/bluetooth.te | 10 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 25 - policy/modules/services/clamav.te | 3 policy/modules/services/courier.te | 1 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++- policy/modules/services/cron.te | 58 ++ policy/modules/services/cups.fc | 4 policy/modules/services/cups.te | 19 policy/modules/services/cvs.te | 2 policy/modules/services/cyrus.te | 5 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 66 ++ policy/modules/services/dbus.te | 4 policy/modules/services/dcc.te | 9 policy/modules/services/dhcp.te | 2 policy/modules/services/dovecot.fc | 1 policy/modules/services/dovecot.if | 44 + policy/modules/services/dovecot.te | 64 ++ policy/modules/services/fail2ban.fc | 3 policy/modules/services/fail2ban.if | 80 +++ policy/modules/services/fail2ban.te | 74 +++ policy/modules/services/ftp.te | 21 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 114 ++++ policy/modules/services/hal.te | 26 - policy/modules/services/inetd.te | 28 - policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 25 + policy/modules/services/kerberos.te | 15 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 57 +- policy/modules/services/lpd.te | 5 policy/modules/services/mailman.if | 20 policy/modules/services/mailman.te | 1 policy/modules/services/mta.fc | 1 policy/modules/services/mta.if | 20 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/nagios.fc | 3 policy/modules/services/nagios.te | 8 policy/modules/services/networkmanager.fc | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 7 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 34 + policy/modules/services/nscd.if | 20 policy/modules/services/nscd.te | 28 - policy/modules/services/ntp.te | 1 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 5 policy/modules/services/openca.if | 4 policy/modules/services/openca.te | 2 policy/modules/services/openct.te | 2 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 ++ policy/modules/services/pcscd.te | 79 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 11 policy/modules/services/portmap.te | 5 policy/modules/services/portslave.te | 1 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 25 - policy/modules/services/postfix.te | 56 ++ policy/modules/services/ppp.te | 2 policy/modules/services/procmail.te | 29 + policy/modules/services/pyzor.if | 18 policy/modules/services/pyzor.te | 13 policy/modules/services/radius.te | 2 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 22 policy/modules/services/rlogin.te | 11 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.if | 3 policy/modules/services/rpc.te | 27 - policy/modules/services/rshd.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.fc | 6 policy/modules/services/samba.if | 62 ++ policy/modules/services/samba.te | 71 ++- policy/modules/services/sasl.te | 14 policy/modules/services/sendmail.if | 22 policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 17 policy/modules/services/spamassassin.fc | 2 policy/modules/services/spamassassin.if | 42 + policy/modules/services/spamassassin.te | 24 - policy/modules/services/squid.fc | 2 policy/modules/services/squid.if | 21 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 83 +++ policy/modules/services/ssh.te | 14 policy/modules/services/telnet.te | 3 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 ++ policy/modules/services/uucp.te | 44 + policy/modules/services/uwimap.te | 1 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 191 ++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.fc | 1 policy/modules/system/authlogin.if | 180 +++++++ policy/modules/system/authlogin.te | 41 + policy/modules/system/clock.te | 18 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.if | 19 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 policy/modules/system/init.if | 64 ++ policy/modules/system/init.te | 51 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 99 ++++ policy/modules/system/ipsec.te | 121 +++++ policy/modules/system/iptables.te | 27 - policy/modules/system/libraries.fc | 43 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 11 policy/modules/system/logging.fc | 5 policy/modules/system/logging.if | 61 ++ policy/modules/system/logging.te | 33 + policy/modules/system/lvm.fc | 2 policy/modules/system/lvm.if | 44 + policy/modules/system/lvm.te | 91 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 +++ policy/modules/system/modutils.te | 26 - policy/modules/system/mount.te | 27 - policy/modules/system/netlabel.te | 10 policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 16 policy/modules/system/selinuxutil.fc | 10 policy/modules/system/selinuxutil.if | 124 +++++ policy/modules/system/selinuxutil.te | 134 ++--- policy/modules/system/sysnetwork.te | 13 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 policy/modules/system/unconfined.te | 23 policy/modules/system/userdomain.if | 622 +++++++++++++++++++++++---- policy/modules/system/userdomain.te | 105 ++-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 52 ++ policy/support/*Warnings* | 189 ++++++++ policy/support/file_patterns.spt | 534 +++++++++++++++++++++++ policy/support/obj_perm_sets.spt | 144 ++++++ 260 files changed, 7497 insertions(+), 754 deletions(-) Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- policy-20061106.patch 29 May 2007 17:13:36 -0000 1.48 +++ policy-20061106.patch 29 May 2007 17:30:09 -0000 1.49 @@ -7694,7 +7694,7 @@ /usr/libexec/postfix/bounce -- gen_context(system_u:object_r:postfix_bounce_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.if serefpolicy-2.4.6/policy/modules/services/postfix.if --- nsaserefpolicy/policy/modules/services/postfix.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/postfix.if 2007-05-29 08:45:42.000000000 -0400 ++++ serefpolicy-2.4.6/policy/modules/services/postfix.if 2007-05-29 13:29:43.000000000 -0400 @@ -48,8 +48,6 @@ can_exec(postfix_$1_t, postfix_$1_exec_t) @@ -7704,18 +7704,7 @@ allow postfix_$1_t postfix_master_t:process sigchld; -@@ -122,6 +120,10 @@ - ## - # - template(`postfix_server_domain_template',` -+ gen_require(` -+ type postfix_master_t; -+ ') -+ - postfix_domain_template($1) - - allow postfix_$1_t self:capability { setuid setgid dac_override }; -@@ -147,10 +149,8 @@ +@@ -147,10 +145,8 @@ corenet_tcp_connect_all_ports(postfix_$1_t) corenet_sendrecv_all_client_packets(postfix_$1_t) @@ -7727,7 +7716,7 @@ ') ') -@@ -484,3 +484,22 @@ +@@ -484,3 +480,22 @@ typeattribute $1 postfix_user_domtrans; ') From fedora-cvs-commits at redhat.com Tue May 29 18:27:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 14:27:01 -0400 Subject: rpms/cups/FC-6 cups-usb-paperout.patch, 1.1, 1.2 cups.spec, 1.332, 1.333 Message-ID: <200705291827.l4TIR1tQ020427@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20398 Modified Files: cups-usb-paperout.patch cups.spec Log Message: * Tue May 29 2007 Tim Waugh 1:1.2.10-9 - Better paper-out detection patch (bug #241589). - Resolves: rhbz#241589 cups-usb-paperout.patch: runloop.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- usb-unix.c | 16 ++++++++++++ 2 files changed, 82 insertions(+), 10 deletions(-) Index: cups-usb-paperout.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups-usb-paperout.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-usb-paperout.patch 25 Apr 2007 17:12:47 -0000 1.1 +++ cups-usb-paperout.patch 29 May 2007 18:26:58 -0000 1.2 @@ -1,5 +1,5 @@ --- cups-1.2.10/backend/runloop.c.usb-paperout 2006-12-06 20:10:16.000000000 +0000 -+++ cups-1.2.10/backend/runloop.c 2007-04-25 18:00:59.000000000 +0100 ++++ cups-1.2.10/backend/runloop.c 2007-05-29 19:21:32.000000000 +0100 @@ -40,6 +40,14 @@ #endif /* __hpux */ @@ -25,7 +25,52 @@ fprintf(stderr, "DEBUG: backendRunLoop(print_fd=%d, device_fd=%d, use_bc=%d)\n", -@@ -227,6 +238,9 @@ +@@ -110,12 +121,9 @@ + FD_ZERO(&input); + if (!print_bytes) + FD_SET(print_fd, &input); +- if (use_bc) +- FD_SET(device_fd, &input); + + FD_ZERO(&output); +- if (print_bytes || !use_bc) +- FD_SET(device_fd, &output); ++ FD_SET(device_fd, &output); + + if (use_bc) + { +@@ -141,14 +149,24 @@ + * Check if we have back-channel data ready... + */ + +- if (FD_ISSET(device_fd, &input)) ++ if (use_bc && FD_ISSET(device_fd, &output)) /* finished writing */ + { +- if ((bc_bytes = read(device_fd, bc_buffer, sizeof(bc_buffer))) > 0) ++ struct timeval nowait; ++ fd_set readback; ++ FD_ZERO (&readback); ++ nowait.tv_sec = 0; ++ nowait.tv_usec = 0; ++ FD_SET(device_fd, &readback); ++ if (select (device_fd + 1, &readback, NULL, NULL, &nowait) && ++ FD_ISSET(device_fd, &readback)) + { +- fprintf(stderr, +- "DEBUG: Received " CUPS_LLFMT " bytes of back-channel data!\n", +- CUPS_LLCAST bc_bytes); +- cupsBackChannelWrite(bc_buffer, bc_bytes, 1.0); ++ if ((bc_bytes = read(device_fd, bc_buffer, sizeof(bc_buffer))) > 0) ++ { ++ fprintf(stderr, ++ "DEBUG: Received " CUPS_LLFMT " bytes of back-channel data!\n", ++ CUPS_LLCAST bc_bytes); ++ cupsBackChannelWrite(bc_buffer, bc_bytes, 1.0); ++ } + } + } + +@@ -227,6 +245,9 @@ } else { @@ -35,7 +80,7 @@ if (paperout) { fputs("STATE: -media-empty-error\n", stderr); -@@ -247,7 +261,42 @@ +@@ -247,7 +268,42 @@ total_bytes += bytes; } } @@ -78,8 +123,8 @@ /* * Return with success... ---- cups-1.2.10/backend/usb-unix.c.usb-paperout 2007-04-25 17:50:06.000000000 +0100 -+++ cups-1.2.10/backend/usb-unix.c 2007-04-25 17:50:06.000000000 +0100 +--- cups-1.2.10/backend/usb-unix.c.usb-paperout 2007-05-29 19:10:08.000000000 +0100 ++++ cups-1.2.10/backend/usb-unix.c 2007-05-29 19:10:08.000000000 +0100 @@ -39,6 +39,11 @@ #include "ieee1284.c" #include Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- cups.spec 29 May 2007 10:38:09 -0000 1.332 +++ cups.spec 29 May 2007 18:26:58 -0000 1.333 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2.10 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -160,6 +160,7 @@ %patch22 -p1 -b .logrotate %patch23 -p1 -b .str2323 %patch24 -p1 -b .str2109 +%patch25 -p1 -b .usb-paperout %patch26 -p1 -b .str2348 %patch27 -p1 -b .str2393 @@ -445,6 +446,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue May 29 2007 Tim Waugh 1:1.2.10-9 +- Better paper-out detection patch (bug #241589). + * Tue May 29 2007 Tim Waugh 1:1.2.10-8 - Removed paper-out detection (bug #241589). From fedora-cvs-commits at redhat.com Tue May 29 19:59:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 15:59:33 -0400 Subject: rpms/freetype/devel freetype-2.3.4-ttf-overflow.patch, NONE, 1.1 freetype.spec, 1.54, 1.55 Message-ID: <200705291959.l4TJxXsA024420@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/freetype/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24403 Modified Files: freetype.spec Added Files: freetype-2.3.4-ttf-overflow.patch Log Message: * Tue May 29 2007 Behdad Esfahbod 2.3.4-3 - Add freetype-2.3.4-ttf-overflow.patch (#240577) freetype-2.3.4-ttf-overflow.patch: ttgload.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- NEW FILE freetype-2.3.4-ttf-overflow.patch --- --- freetype-2.3.4/src/truetype/ttgload.c~ 2007/04/09 08:40:11 1.177 +++ freetype-2.3.4/src/truetype/ttgload.c 2007/04/27 17:16:50 1.178 @@ -271,7 +271,11 @@ n_points = 0; if ( n_contours > 0 ) + { n_points = cont[-1] + 1; + if ( n_points < 0 ) + goto Invalid_Outline; + } /* note that we will add four phantom points later */ error = FT_GLYPHLOADER_CHECK_POINTS( gloader, n_points + 4, 0 ); @@ -682,7 +686,7 @@ FT_GlyphLoader gloader = loader->gloader; FT_Error error = TT_Err_Ok; FT_Outline* outline; - FT_UInt n_points; + FT_Int n_points; outline = &gloader->current.outline; @@ -709,7 +713,7 @@ /* Deltas apply to the unscaled data. */ FT_Vector* deltas; FT_Memory memory = loader->face->memory; - FT_UInt i; + FT_Int i; error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face), Index: freetype.spec =================================================================== RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- freetype.spec 12 Apr 2007 17:19:23 -0000 1.54 +++ freetype.spec 29 May 2007 19:59:30 -0000 1.55 @@ -8,7 +8,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.3.4 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD/GPL dual license Group: System Environment/Libraries URL: http://www.freetype.org @@ -31,6 +31,7 @@ Patch89: freetype-2.2.1-memcpy-fix.patch # Upstream patches +Patch90: freetype-2.3.4-ttf-overflow.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -92,6 +93,8 @@ %patch88 -p1 -b .multilib %patch89 -p1 -b .memcpy +%patch90 -p1 -b .ttf-overflow + %build %configure --disable-static @@ -205,6 +208,9 @@ %{_libdir}/pkgconfig/ %changelog +* Tue May 29 2007 Behdad Esfahbod 2.3.4-3 +- Add freetype-2.3.4-ttf-overflow.patch (#240577) + * Thu Apr 12 2007 Behdad Esfahbod 2.3.4-2 - Add alpha to 64-bit archs (#236166) From fedora-cvs-commits at redhat.com Tue May 29 20:24:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 29 May 2007 16:24:11 -0400 Subject: rpms/freetype/FC-6 freetype-2.3.4-ttf-overflow.patch, NONE, 1.1 freetype.spec, 1.51, 1.52 Message-ID: <200705292024.l4TKOBwc025718@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/freetype/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25701 Modified Files: freetype.spec Added Files: freetype-2.3.4-ttf-overflow.patch Log Message: * Tue May 29 2007 Behdad Esfahbod 2.2.1-17.fc6 - Add freetype-2.3.4-ttf-overflow.patch (#240577) freetype-2.3.4-ttf-overflow.patch: ttgload.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- NEW FILE freetype-2.3.4-ttf-overflow.patch --- --- freetype-2.3.4/src/truetype/ttgload.c~ 2007/04/09 08:40:11 1.177 +++ freetype-2.3.4/src/truetype/ttgload.c 2007/04/27 17:16:50 1.178 @@ -271,7 +271,11 @@ n_points = 0; if ( n_contours > 0 ) + { n_points = cont[-1] + 1; + if ( n_points < 0 ) + goto Invalid_Outline; + } /* note that we will add four phantom points later */ error = FT_GLYPHLOADER_CHECK_POINTS( gloader, n_points + 4, 0 ); @@ -682,7 +686,7 @@ FT_GlyphLoader gloader = loader->gloader; FT_Error error = TT_Err_Ok; FT_Outline* outline; - FT_UInt n_points; + FT_Int n_points; outline = &gloader->current.outline; @@ -709,7 +713,7 @@ /* Deltas apply to the unscaled data. */ FT_Vector* deltas; FT_Memory memory = loader->face->memory; - FT_UInt i; + FT_Int i; error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face), Index: freetype.spec =================================================================== RCS file: /cvs/dist/rpms/freetype/FC-6/freetype.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- freetype.spec 4 Dec 2006 17:54:04 -0000 1.51 +++ freetype.spec 29 May 2007 20:24:09 -0000 1.52 @@ -7,7 +7,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.2.1 -Release: 16%{?dist} +Release: 17%{?dist} License: BSD/GPL dual license Group: System Environment/Libraries URL: http://www.freetype.org @@ -34,6 +34,7 @@ Patch102: freetype-2.2.1-zero-item-size.patch Patch103: freetype-2.2.1-fix-get-orientation.patch Patch104: freetype-2.2.1-ttcmap.patch +Patch105: freetype-2.3.4-ttf-overflow.patch Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -96,6 +97,7 @@ %patch102 -p1 -b .zero-item-size %patch103 -p0 -b .fix-get-orientation %patch104 -p1 -b .ttcmap +%patch105 -p1 -b .ttf-overflow %build # Work around code generation problem with strict-aliasing @@ -218,6 +220,9 @@ %{_libdir}/pkgconfig/ %changelog +* Tue May 29 2007 Behdad Esfahbod 2.2.1-17.fc6 +- Add freetype-2.3.4-ttf-overflow.patch (#240577) + * Mon Dec 04 2006 Behdad Esfahbod 2.2.1-16 - Backport binary-search fixes from HEAD - Add freetype-2.2.1-ttcmap.patch From fedora-cvs-commits at redhat.com Wed May 30 09:26:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 05:26:53 -0400 Subject: rpms/pam/FC-6 pam-0.99.6.2-namespace-dirnames.patch, NONE, 1.1 pam-0.99.6.2-namespace-docfix.patch, NONE, 1.1 pam-0.99.6.2-namespace-unknown-user.patch, NONE, 1.1 pam-0.99.6.2-selinux-audit-context.patch, NONE, 1.1 pam-0.99.6.2-unix-update-helper.patch, NONE, 1.1 pam-0.99.7.1-console-decrement.patch, NONE, 1.1 pam.spec, 1.137, 1.138 Message-ID: <200705300926.l4U9QrTD007452@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7419a Modified Files: pam.spec Added Files: pam-0.99.6.2-namespace-dirnames.patch pam-0.99.6.2-namespace-docfix.patch pam-0.99.6.2-namespace-unknown-user.patch pam-0.99.6.2-selinux-audit-context.patch pam-0.99.6.2-unix-update-helper.patch pam-0.99.7.1-console-decrement.patch Log Message: - sync with LSPP pam-0.99.6.2-namespace-dirnames.patch: pam_namespace.c | 138 +++++++++++++++++++++++++++++++++++--------------------- pam_namespace.h | 2 2 files changed, 90 insertions(+), 50 deletions(-) --- NEW FILE pam-0.99.6.2-namespace-dirnames.patch --- --- Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.h.dirnames 2007-02-26 23:31:26.000000000 +0100 +++ Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.h 2007-02-27 00:40:04.000000000 +0100 @@ -89,6 +89,8 @@ #define PAMNS_IGN_INST_PARENT_MODE 0x00008000 /* Ignore instance parent mode */ #define PAMNS_NO_UNMOUNT_ON_CLOSE 0x00010000 /* no unmount at session close */ +#define NAMESPACE_MAX_DIR_LEN 80 + /* * Polyinstantiation method options, based on user, security context * or both --- Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.c.dirnames 2007-02-26 23:31:26.000000000 +0100 +++ Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.c 2007-02-27 00:39:51.000000000 +0100 @@ -436,6 +436,36 @@ return 0; } +/* + * md5hash generates a hash of the passed in instance directory name. + */ +static char *md5hash(const char *instname, struct instance_data *idata) +{ + int i; + char *md5inst = NULL; + char *to; + unsigned char inst_digest[MD5_DIGEST_LENGTH]; + + /* + * Create MD5 hashes for instance pathname. + */ + + MD5((const unsigned char *)instname, strlen(instname), inst_digest); + + if ((md5inst = malloc(MD5_DIGEST_LENGTH * 2 + 1)) == NULL) { + pam_syslog(idata->pamh, LOG_ERR, "Unable to allocate buffer"); + return NULL; + } + + to = md5inst; + for (i = 0; i < MD5_DIGEST_LENGTH; i++) { + snprintf(to, 3, "%02x", (unsigned int)inst_digest[i]); + to += 2; + } + + return md5inst; +} + #ifdef WITH_SELINUX static int form_context(const struct polydir_s *polyptr, security_context_t *i_context, security_context_t *origcon, @@ -547,12 +577,21 @@ #endif { int rc; + char *hash = NULL; +#ifdef WITH_SELINUX + security_context_t rawcon = NULL; +#endif -# ifdef WITH_SELINUX - rc = form_context(polyptr, i_context, origcon, idata); + *i_name = NULL; +#ifdef WITH_SELINUX + *i_context = NULL; + *origcon = NULL; + if ((rc=form_context(polyptr, i_context, origcon, idata)) != PAM_SUCCESS) { + return rc; + } #endif - rc = PAM_SUCCESS; + rc = PAM_SESSION_ERR; /* * Set the name of the polyinstantiated instance dir based on the * polyinstantiation method. @@ -561,16 +600,20 @@ case USER: if (asprintf(i_name, "%s", idata->user) < 0) { *i_name = NULL; - rc = PAM_SESSION_ERR; - } + goto fail; + } break; #ifdef WITH_SELINUX case LEVEL: case CONTEXT: - if (asprintf(i_name, "%s_%s", *i_context, idata->user) < 0) { + if (selinux_trans_to_raw_context(*i_context, &rawcon) < 0) { + pam_syslog(idata->pamh, LOG_ERR, "Error translating directory context"); + goto fail; + } + if (asprintf(i_name, "%s_%s", rawcon, idata->user) < 0) { *i_name = NULL; - rc = PAM_SESSION_ERR; + goto fail; } break; @@ -579,12 +622,48 @@ default: if (idata->flags & PAMNS_DEBUG) pam_syslog(idata->pamh, LOG_ERR, "Unknown method"); - rc = PAM_SESSION_ERR; + goto fail; } - if ((idata->flags & PAMNS_DEBUG) && rc == PAM_SUCCESS) + if (idata->flags & PAMNS_DEBUG) pam_syslog(idata->pamh, LOG_DEBUG, "poly_name %s", *i_name); + if ((idata->flags & PAMNS_GEN_HASH) || strlen(*i_name) > NAMESPACE_MAX_DIR_LEN) { + hash = md5hash(*i_name, idata); + if (hash == NULL) { + goto fail; + } + if (idata->flags & PAMNS_GEN_HASH) { + free(*i_name); + *i_name = hash; + hash = NULL; + } else { + char *newname; + if (asprintf(&newname, "%.*s_%s", NAMESPACE_MAX_DIR_LEN-1-strlen(hash), + *i_name, hash) < 0) { + goto fail; + } + free(*i_name); + *i_name = newname; + } + } + rc = PAM_SUCCESS; + +fail: + free(hash); +#ifdef WITH_SELINUX + freecon(rawcon); +#endif + if (rc != PAM_SUCCESS) { +#ifdef WITH_SELINUX + freecon(*i_context); + *i_context = NULL; + freecon(*origcon); + *origcon = NULL; +#endif + free(*i_name); + *i_name = NULL; + } return rc; } @@ -832,39 +911,6 @@ /* - * md5hash generates a hash of the passed in instance directory name. - */ -static int md5hash(char **instname, struct instance_data *idata) -{ - int i; - char *md5inst = NULL; - char *to; - unsigned char inst_digest[MD5_DIGEST_LENGTH]; - - /* - * Create MD5 hashes for instance pathname. - */ - - MD5((unsigned char *)*instname, strlen(*instname), inst_digest); - - if ((md5inst = malloc(MD5_DIGEST_LENGTH * 2 + 1)) == NULL) { - pam_syslog(idata->pamh, LOG_ERR, "Unable to allocate buffer"); - return PAM_SESSION_ERR; - } - - to = md5inst; - for (i = 0; i < MD5_DIGEST_LENGTH; i++) { - snprintf(to, 3, "%02x", (unsigned int)inst_digest[i]); - to += 3; - } - - free(*instname); - *instname = md5inst; - - return PAM_SUCCESS; -} - -/* * This function performs the namespace setup for a particular directory * that is being polyinstantiated. It creates an MD5 hash of instance * directory, calls create_dirs to create it with appropriate @@ -914,14 +960,6 @@ #endif } - if (idata->flags & PAMNS_GEN_HASH) { - retval = md5hash(&instname, idata); - if (retval < 0) { - pam_syslog(idata->pamh, LOG_ERR, "Error generating md5 hash"); - goto error_out; - } - } - if (asprintf(&inst_dir, "%s%s", polyptr->instance_prefix, instname) < 0) goto error_out; pam-0.99.6.2-namespace-docfix.patch: namespace.conf.5.xml | 9 +++++++++ 1 files changed, 9 insertions(+) --- NEW FILE pam-0.99.6.2-namespace-docfix.patch --- --- Linux-PAM-0.99.6.2/modules/pam_namespace/namespace.conf.5.xml.docfix 2007-04-03 17:51:29.000000000 +0200 +++ Linux-PAM-0.99.6.2/modules/pam_namespace/namespace.conf.5.xml 2007-04-23 19:04:10.000000000 +0200 @@ -86,6 +86,15 @@ for all users. + + In case of context or level polyinstantiation the SELinux context + which is used for polyinstantiation is the context used for executing + a new process as obtained by getexeccon. This context must be set + by the calling application or pam_selinux.so + module. If this context is not set the polyinstatiation will be + based just on user name. + + pam-0.99.6.2-namespace-unknown-user.patch: pam_namespace.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) --- NEW FILE pam-0.99.6.2-namespace-unknown-user.patch --- --- Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.c.unknown-user 2007-03-30 13:32:48.000000000 +0200 +++ Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.c 2007-03-30 14:35:28.000000000 +0200 @@ -302,11 +302,14 @@ *tptr = '\0'; pwd = getpwnam(ustr); - *uidptr = pwd->pw_uid; - if (i < count - 1) { - ustr = tptr + 1; + if (pwd == NULL) { + pam_syslog(idata->pamh, LOG_ERR, "Unknown user %s in configuration", ustr); + poly.num_uids--; + } else { + *uidptr = pwd->pw_uid; uidptr++; } + ustr = tptr + 1; } } pam-0.99.6.2-selinux-audit-context.patch: pam_selinux.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) --- NEW FILE pam-0.99.6.2-selinux-audit-context.patch --- --- Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c.audit-context 2007-04-03 17:51:29.000000000 +0200 +++ Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c 2007-04-03 18:15:06.000000000 +0200 @@ -88,33 +88,36 @@ security_context_t selected_raw=NULL; rc = -1; if (audit_fd < 0) { - pam_syslog(pamh, LOG_ERR, _("Error connecting to audit system.\n")); + if (errno == EINVAL || errno == EPROTONOSUPPORT || + errno == EAFNOSUPPORT) + return 0; /* No audit support in kernel */ + pam_syslog(pamh, LOG_ERR, _("Error connecting to audit system.")); return rc; } if (selinux_trans_to_raw_context(default_context, &default_raw) < 0) { - pam_syslog(pamh, LOG_ERR, _("Error translating default context.\n")); - goto out; + pam_syslog(pamh, LOG_ERR, _("Error translating default context.")); + default_raw = NULL; } if (selinux_trans_to_raw_context(selected_context, &selected_raw) < 0) { - pam_syslog(pamh, LOG_ERR, _("Error translating selected context.\n")); - goto out; + pam_syslog(pamh, LOG_ERR, _("Error translating selected context.")); + selected_raw = NULL; } if (asprintf(&msg, "pam: default-context=%s selected-context=%s", - default_context ? default_raw : "?", - selected_context ? selected_raw : "?") < 0) { - pam_syslog(pamh, LOG_ERR, ("Error allocating memory.\n")); + default_raw ? default_raw : (default_context ? default_context : "?"), + selected_raw ? selected_raw : (selected_context ? selected_context : "?")) < 0) { + pam_syslog(pamh, LOG_ERR, ("Error allocating memory.")); goto out; } if (audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE, msg, NULL, NULL, NULL, success) <= 0) { - pam_syslog(pamh, LOG_ERR, _("Error sending audit message.\n")); + pam_syslog(pamh, LOG_ERR, _("Error sending audit message.")); goto out; } rc = 0; out: free(msg); freecon(default_raw); - free(selected_raw); + freecon(selected_raw); close(audit_fd); #else pam_syslog(pamh, LOG_NOTICE, "pam: default-context=%s selected-context=%s success %d", default_context, selected_context, success); @@ -298,14 +301,17 @@ if (mls_enabled && !mls_range_allowed(pamh, puser_context, newcon, debug)) { pam_syslog(pamh, LOG_NOTICE, "Security context %s is not allowed for %s", puser_context, newcon); + send_audit_message(pamh, 0, puser_context, newcon); + free(newcon); goto fail_range; } return newcon; } - else + else { + send_audit_message(pamh, 0, puser_context, context_str(new_context)); send_text(pamh,_("Not a valid security context"),debug); - + } context_free(new_context); /* next time around allocates another */ } else @@ -318,6 +324,7 @@ free(type); _pam_drop(responses); context_free (new_context); + send_audit_message(pamh, 0, puser_context, NULL); fail_range: return NULL; } @@ -509,7 +516,6 @@ if (select_context && has_tty) { user_context = config_context(pamh, default_user_context, debug); if (user_context == NULL) { - send_audit_message(pamh, 0, default_user_context, default_user_context); freecon(default_user_context); pam_syslog(pamh, LOG_ERR, _("Unable to get valid context for %s"), username); pam-0.99.6.2-unix-update-helper.patch: Makefile.am | 23 +- pam_unix_acct.c | 20 - pam_unix_passwd.c | 612 ++++++++---------------------------------------------- passupdate.c | 560 +++++++++++++++++++++++++++++++++++++++++++++++++ passverify.c | 308 +++++++++++++++++++++++++++ passverify.h | 60 +++++ unix_chkpwd.c | 434 +------------------------------------- unix_update.c | 262 +++++++++++++++++++++++ 8 files changed, 1324 insertions(+), 955 deletions(-) --- NEW FILE pam-0.99.6.2-unix-update-helper.patch --- --- /dev/null 2007-04-23 11:28:29.926590627 +0200 +++ Linux-PAM-0.99.6.2/modules/pam_unix/passupdate.c 2007-04-23 22:11:49.000000000 +0200 @@ -0,0 +1,560 @@ +/* + * Main coding by Elliot Lee , Red Hat Software. + * Copyright (C) 1996. + * Copyright (c) Jan R?korajski, 1999. + * Copyright (c) Red Hat, Inc., 2007 + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, and the entire permission notice in its entirety, + * including the disclaimer of warranties. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * ALTERNATIVELY, this product may be distributed under the terms of + * the GNU Public License, in which case the provisions of the GPL are + * required INSTEAD OF the above restrictions. (This clause is + * necessary due to a potential bad interaction between the GPL and + * the restrictions contained in a BSD-style copyright.) + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* this will be included from module and update helper */ + +#if defined(USE_LCKPWDF) && !defined(HAVE_LCKPWDF) +# include "./lckpwdf.-c" +#endif + +/* passwd/salt conversion macros */ + +#define ascii_to_bin(c) ((c)>='a'?(c-59):(c)>='A'?((c)-53):(c)-'.') +#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.') + +#define PW_TMPFILE "/etc/npasswd" +#define SH_TMPFILE "/etc/nshadow" +#define OPW_TMPFILE "/etc/security/nopasswd" +#define OLD_PASSWORDS_FILE "/etc/security/opasswd" + +/* + * i64c - convert an integer to a radix 64 character + */ +static int i64c(int i) +{ + if (i < 0) + return ('.'); + else if (i > 63) + return ('z'); + if (i == 0) + return ('.'); + if (i == 1) + return ('/'); + if (i >= 2 && i <= 11) + return ('0' - 2 + i); + if (i >= 12 && i <= 37) + return ('A' - 12 + i); + if (i >= 38 && i <= 63) + return ('a' - 38 + i); + return ('\0'); +} + +static char *crypt_md5_wrapper(const char *pass_new) +{ + /* + * Code lifted from Marek Michalkiewicz's shadow suite. (CG) + * removed use of static variables (AGM) + */ + + struct timeval tv; + MD5_CTX ctx; + unsigned char result[16]; + char *cp = (char *) result; + unsigned char tmp[16]; + int i; + char *x = NULL; + + GoodMD5Init(&ctx); + gettimeofday(&tv, (struct timezone *) 0); + GoodMD5Update(&ctx, (void *) &tv, sizeof tv); + i = getpid(); + GoodMD5Update(&ctx, (void *) &i, sizeof i); + i = clock(); + GoodMD5Update(&ctx, (void *) &i, sizeof i); + GoodMD5Update(&ctx, result, sizeof result); + GoodMD5Final(tmp, &ctx); + strcpy(cp, "$1$"); /* magic for the MD5 */ + cp += strlen(cp); + for (i = 0; i < 8; i++) + *cp++ = i64c(tmp[i] & 077); + *cp = '\0'; + + /* no longer need cleartext */ + x = Goodcrypt_md5(pass_new, (const char *) result); + + return x; +} + +#ifdef USE_LCKPWDF +static int lock_pwdf(void) +{ + int i; + int retval; + +#ifndef HELPER_COMPILE + if (selinux_confined()) { + return PAM_SUCCESS; + } +#endif + /* These values for the number of attempts and the sleep time + are, of course, completely arbitrary. + My reading of the PAM docs is that, once pam_chauthtok() has been + called with PAM_UPDATE_AUTHTOK, we are obliged to take any + reasonable steps to make sure the token is updated; so retrying + for 1/10 sec. isn't overdoing it. */ + i=0; + while((retval = lckpwdf()) != 0 && i < 100) { + usleep(1000); + i++; + } + if(retval != 0) { + return PAM_AUTHTOK_LOCK_BUSY; + } + return PAM_SUCCESS; +} + +static void unlock_pwdf(void) +{ +#ifndef HELPER_COMPILE + if (selinux_confined()) { + return; + } +#endif + ulckpwdf(); +} +#endif + +static int +save_old_password(const char *forwho, const char *oldpass, + int howmany) +{ + static char buf[16384]; + static char nbuf[16384]; + char *s_luser, *s_uid, *s_npas, *s_pas, *pass; + int npas; + FILE *pwfile, *opwfile; + int err = 0; + int oldmask; + int found = 0; + struct passwd *pwd = NULL; + struct stat st; + + if (howmany < 0) { + return PAM_SUCCESS; + } + + if (oldpass == NULL) { + return PAM_SUCCESS; + } + + oldmask = umask(077); + +#ifdef WITH_SELINUX + if (SELINUX_ENABLED) { + security_context_t passwd_context=NULL; + if (getfilecon("/etc/passwd",&passwd_context)<0) { + return PAM_AUTHTOK_ERR; + }; + if (getfscreatecon(&prev_context)<0) { + freecon(passwd_context); + return PAM_AUTHTOK_ERR; + } + if (setfscreatecon(passwd_context)) { + freecon(passwd_context); + freecon(prev_context); + return PAM_AUTHTOK_ERR; + } + freecon(passwd_context); + } +#endif + pwfile = fopen(OPW_TMPFILE, "w"); + umask(oldmask); [...2169 lines suppressed...] + pwd = getpwnam(name); /* Get password file entry... */ + endpwent(); + if (pwd != NULL) { + if (_unix_shadowed(pwd)) { + /* + * ...and shadow password file entry for this user, + * if shadowing is enabled + */ + setspent(); + spwdent = getspnam(name); + endspent(); + if (spwdent != NULL) + salt = x_strdup(spwdent->sp_pwdp); + else + pwd = NULL; + } else { + if (strcmp(pwd->pw_passwd, "*NP*") == 0) { /* NIS+ */ + uid_t save_uid; + + save_uid = geteuid(); + seteuid(pwd->pw_uid); + spwdent = getspnam(name); + seteuid(save_uid); + + salt = x_strdup(spwdent->sp_pwdp); + } else { + salt = x_strdup(pwd->pw_passwd); + } + } + } + if (pwd == NULL || salt == NULL) { + _log_err(LOG_ALERT, "check pass; user unknown"); + p = NULL; + return PAM_USER_UNKNOWN; + } + + salt_len = strlen(salt); + if (salt_len == 0) { + return (nullok == 0) ? PAM_AUTH_ERR : PAM_SUCCESS; + } + if (p == NULL || strlen(p) == 0) { + _pam_overwrite(salt); + _pam_drop(salt); + return PAM_AUTHTOK_ERR; + } + + /* the moment of truth -- do we agree with the password? */ + retval = PAM_AUTH_ERR; + if (!strncmp(salt, "$1$", 3)) { + pp = Goodcrypt_md5(p, salt); + if (pp && strcmp(pp, salt) == 0) { + retval = PAM_SUCCESS; + } else { + _pam_overwrite(pp); + _pam_drop(pp); + pp = Brokencrypt_md5(p, salt); + if (pp && strcmp(pp, salt) == 0) + retval = PAM_SUCCESS; + } + } else if (*salt == '$') { + /* + * Ok, we don't know the crypt algorithm, but maybe + * libcrypt nows about it? We should try it. + */ + pp = x_strdup (crypt(p, salt)); + if (pp && strcmp(pp, salt) == 0) { + retval = PAM_SUCCESS; + } + } else if (*salt == '*' || *salt == '!' || salt_len < 13) { + retval = PAM_AUTH_ERR; + } else { + pp = bigcrypt(p, salt); + /* + * Note, we are comparing the bigcrypt of the password with + * the contents of the password field. If the latter was + * encrypted with regular crypt (and not bigcrypt) it will + * have been truncated for storage relative to the output + * of bigcrypt here. As such we need to compare only the + * stored string with the subset of bigcrypt's result. + * Bug 521314. + */ + if (pp && salt_len == 13 && strlen(pp) > salt_len) { + _pam_overwrite(pp+salt_len); + } + + if (pp && strcmp(pp, salt) == 0) { + retval = PAM_SUCCESS; + } + } + p = NULL; /* no longer needed here */ + + /* clean up */ + _pam_overwrite(pp); + _pam_drop(pp); + + return retval; +} + +char * +getuidname(uid_t uid) +{ + struct passwd *pw; + static char username[256]; + + pw = getpwuid(uid); + if (pw == NULL) + return NULL; + + strncpy(username, pw->pw_name, sizeof(username)); + username[sizeof(username) - 1] = '\0'; + + return username; +} +/* + * Copyright (c) Andrew G. Morgan, 1996. All rights reserved + * Copyright (c) Red Hat, Inc. 2007. All rights reserved + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, and the entire permission notice in its entirety, + * including the disclaimer of warranties. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * ALTERNATIVELY, this product may be distributed under the terms of + * the GNU Public License, in which case the provisions of the GPL are + * required INSTEAD OF the above restrictions. (This clause is + * necessary due to a potential bad interaction between the GPL and + * the restrictions contained in a BSD-style copyright.) + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ --- Linux-PAM-0.99.6.2/modules/pam_unix/Makefile.am.update-helper 2006-06-16 07:49:11.000000000 +0200 +++ Linux-PAM-0.99.6.2/modules/pam_unix/Makefile.am 2007-04-23 22:11:50.000000000 +0200 @@ -15,9 +15,8 @@ secureconfdir = $(SCONFIGDIR) AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" - -AM_LDFLAGS = -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@ + -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \ + -DUPDATE_HELPER=\"$(sbindir)/unix_update\" if HAVE_LIBSELINUX AM_CFLAGS += -D"WITH_SELINUX" @@ -27,16 +26,17 @@ endif pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \ - @LIBCRACK@ @LIBNSL@ + @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam \ + @LIBCRYPT@ @LIBSELINUX@ if HAVE_VERSIONING pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif securelib_LTLIBRARIES = pam_unix.la -noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h +noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h passverify.h -sbin_PROGRAMS = unix_chkpwd +sbin_PROGRAMS = unix_chkpwd unix_update noinst_PROGRAMS = bigcrypt @@ -46,7 +46,14 @@ bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c bigcrypt_CFLAGS = $(AM_CFLAGS) +bigcrypt_LDFLAGS = @LIBCRYPT@ -unix_chkpwd_SOURCES = unix_chkpwd.c md5_good.c md5_broken.c bigcrypt.c +unix_chkpwd_SOURCES = unix_chkpwd.c passverify.c md5_good.c md5_broken.c bigcrypt.c unix_chkpwd_CFLAGS = $(AM_CFLAGS) @PIE_CFLAGS@ -unix_chkpwd_LDFLAGS = @PIE_LDFLAGS@ +unix_chkpwd_LDFLAGS = @PIE_LDFLAGS@ -L$(top_builddir)/libpam -lpam \ + @LIBCRYPT@ @LIBSELINUX@ + +unix_update_SOURCES = unix_update.c passverify.c md5_good.c md5_broken.c bigcrypt.c +unix_update_CFLAGS = $(AM_CFLAGS) @PIE_CFLAGS@ +unix_update_LDFLAGS = @PIE_LDFLAGS@ -L$(top_builddir)/libpam -lpam \ + @LIBCRYPT@ @LIBSELINUX@ pam-0.99.7.1-console-decrement.patch: pam_console.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) --- NEW FILE pam-0.99.7.1-console-decrement.patch --- --- Linux-PAM-0.99.7.1/modules/pam_console/pam_console.c.decrement 2006-05-10 11:32:40.000000000 +0200 +++ Linux-PAM-0.99.7.1/modules/pam_console/pam_console.c 2007-03-23 11:14:53.000000000 +0100 @@ -19,7 +19,7 @@ * * /var/run/console/ is used for reference counting * and to make console authentication easy -- if it exists, then - * has console access. + * is logged on console. * * A system startup script should remove /var/run/console/console.lock * and everything in /var/run/console/ @@ -560,7 +560,7 @@ */ int fd; int count = 0; - int err; + int err = PAM_SUCCESS; int delete_consolelock = 0; const char *username = NULL, *user_prompt; char *lockfile = NULL; @@ -605,7 +605,8 @@ _pam_log(pamh, LOG_ERR, FALSE, "\"impossible\" fstat error on %s", consolelock); close(fd); - err = PAM_SESSION_ERR; goto return_error; + err = PAM_SESSION_ERR; + goto decrement; } consoleuser = _do_malloc(st.st_size+1); if (st.st_size) { @@ -614,7 +615,7 @@ "\"impossible\" read error on %s", consolelock); err = PAM_SESSION_ERR; close(fd); - goto return_error; + goto decrement; } consoleuser[st.st_size] = '\0'; } @@ -627,23 +628,19 @@ */ console_run_handlers(pamh, FALSE, username, tty); } - } else { - /* didn't open file */ - err = PAM_SESSION_ERR; - goto return_error; } } +decrement: count = use_count(pamh, lockfile, -1, 1); if (count < 1 && delete_consolelock) { if (unlink(consolelock)) { _pam_log(pamh, LOG_ERR, FALSE, "\"impossible\" unlink error on %s", consolelock); - err = PAM_SESSION_ERR; goto return_error; + err = PAM_SESSION_ERR; } } - err = PAM_SUCCESS; return_error: if (lockfile) free(lockfile); if (consoleuser) free (consoleuser); Index: pam.spec =================================================================== RCS file: /cvs/dist/rpms/pam/FC-6/pam.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- pam.spec 22 Feb 2007 16:48:54 -0000 1.137 +++ pam.spec 30 May 2007 09:26:51 -0000 1.138 @@ -11,7 +11,7 @@ Summary: A security tool which provides authentication for applications Name: pam Version: 0.99.6.2 -Release: 3.16%{?dist} +Release: 3.22%{?dist} License: GPL or BSD Group: System Environment/Base Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 @@ -44,6 +44,12 @@ Patch94: pam-0.99.6.2-ja-no-shortcut.patch Patch95: pam-0.99.6.2-selinux-use-current-range.patch Patch96: pam-0.99.6.2-namespace-unmnt-override.patch +Patch97: pam-0.99.6.2-namespace-dirnames.patch +Patch98: pam-0.99.7.1-console-decrement.patch +Patch99: pam-0.99.6.2-namespace-unknown-user.patch +Patch100: pam-0.99.6.2-selinux-audit-context.patch +Patch101: pam-0.99.6.2-namespace-docfix.patch +Patch102: pam-0.99.6.2-unix-update-helper.patch BuildRoot: %{_tmppath}/%{name}-root Requires: cracklib, cracklib-dicts >= 2.8 @@ -115,6 +121,12 @@ %patch94 -p1 -b .no-shortcut %patch95 -p1 -b .range %patch96 -p1 -b .unmnt-override +%patch97 -p1 -b .dirnames +%patch98 -p1 -b .decrement +%patch99 -p1 -b .unknown-user +%patch100 -p1 -b .audit-context +%patch101 -p1 -b .docfix +%patch102 -p1 -b .update-helper autoreconf @@ -314,6 +326,7 @@ %{_sbindir}/pam_tally2 %attr(4755,root,root) %{_sbindir}/pam_timestamp_check %attr(4755,root,root) %{_sbindir}/unix_chkpwd +%attr(0700,root,root) %{_sbindir}/unix_update %if %{_lib} != lib %dir /lib/security %endif @@ -401,6 +414,26 @@ %doc doc/adg/*.txt doc/adg/html %changelog +* Thu Apr 26 2007 Tomas Mraz 0.99.6.2-3.22 +- make unix_update helper executable only by root as it isn't + useful for regular user anyway + +* Mon Apr 23 2007 Tomas Mraz 0.99.6.2-3.21 +- pam_namespace: better document behavior on failure (#237249) +- pam_unix: split out passwd change to a new helper binary (#236316) + +* Tue Apr 03 2007 Tomas Mraz 0.99.6.2-3.19 +- pam_selinux: improve context change auditing (#234781) + +* Fri Mar 30 2007 Tomas Mraz 0.99.6.2-3.18 +- pam_console: always decrement use count (#233581) +- pam_namespace: fix parsing config file with unknown users (#234513) + +* Mon Feb 26 2007 Tomas Mraz 0.99.6.2-3.17 +- pam_namespace: unmount poly dir for override users (#229689) +- pam_namespace: use raw context for poly dir name (#227345) +- pam_namespace: truncate long poly dir name (append hash) (#230120) + * Thu Feb 22 2007 Tomas Mraz 0.99.6.2-3.16 - pam_selinux in some cases did not set the context (#229039) From fedora-cvs-commits at redhat.com Wed May 30 12:26:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 08:26:49 -0400 Subject: rpms/system-config-bind/FC-6 system-config-bind-4.0.2-check-child.patch, NONE, 1.1 system-config-bind.spec, 1.61, 1.62 Message-ID: <200705301226.l4UCQn1I009897@cvs.devel.redhat.com> Author: odvorace Update of /cvs/dist/rpms/system-config-bind/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9880 Modified Files: system-config-bind.spec Added Files: system-config-bind-4.0.2-check-child.patch Log Message: Fix for bug #236047 system-config-bind-4.0.2-check-child.patch: GUI.py | 16 ++++++++++++++++ 1 files changed, 16 insertions(+) --- NEW FILE system-config-bind-4.0.2-check-child.patch --- --- system-config-bind-4.0.2/GUI.py.old 2007-01-23 16:18:40.000000000 +0100 +++ system-config-bind-4.0.2/GUI.py 2007-01-23 16:23:14.000000000 +0100 @@ -155,6 +155,14 @@ return True def show_manual(self, dialog, event=None): + if (hasattr(self,'manual_pid')) and self.manual_pid != 0: + # process already exist -> check it + try: + os.waitpid(self.manual_pid, os.WNOHANG) + self.manual_pid = 0 + except: + self.manual_pid = 0 + if (not hasattr(self,'manual_pid')) or (os.access('/proc/'+str(self.manual_pid), os.F_OK)==0): try: self.manual_pid=os.fork() @@ -183,6 +191,14 @@ return def show_arm(self, dialog, event=None): + if (hasattr(self,'arm_pid')) and self.arm_pid != 0: + # process already exist -> check it + try: + os.waitpid(self.arm_pid, os.WNOHANG) + self.arm_pid = 0 + except: + self.arm_pid = 0 + if (not hasattr(self,'arm_pid')) or (os.access('/proc/'+str(self.arm_pid), os.F_OK)==0): try: self.arm_pid=os.fork() Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-6/system-config-bind.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- system-config-bind.spec 21 Nov 2006 15:17:11 -0000 1.61 +++ system-config-bind.spec 30 May 2007 12:26:45 -0000 1.62 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind @@ -10,6 +10,7 @@ Patch1: system-config-bind-4.0.1-i18n-2.patch Patch2: system-config-bind-4.0.1-version.patch Patch3: system-config-bind-4.0.2-version-2.patch +Patch4: system-config-bind-4.0.2-check-child.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch BuildRequires: python, gettext, make, intltool @@ -35,6 +36,7 @@ %patch1 -p1 -b .i18n %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build rm -rf $RPM_BUILD_ROOT @@ -99,6 +101,9 @@ fi %changelog +* Wed May 30 2007 Ondrej Dvoracek - 4.0.1-6 +- added check for child processes (#236047) + * Tue Nov 21 2006 Martin Stransky - 4.0.1-5 - added a second patch for issue #216584 From fedora-cvs-commits at redhat.com Wed May 30 20:40:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 16:40:49 -0400 Subject: rpms/firefox/FC-6 firefox.spec,1.169,1.170 sources,1.36,1.37 Message-ID: <200705302040.l4UKenas019213@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19197 Modified Files: firefox.spec sources Log Message: * Wed May 30 2007 Christopher Aillon 1.5.0.12-1 - Update to 1.5.0.12 Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/FC-6/firefox.spec,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- firefox.spec 10 May 2007 08:11:32 -0000 1.169 +++ firefox.spec 30 May 2007 20:40:46 -0000 1.170 @@ -10,8 +10,8 @@ Summary: Mozilla Firefox Web browser. Name: firefox -Version: 1.5.0.10 -Release: 6%{?dist} +Version: 1.5.0.12 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -21,7 +21,7 @@ %define tarball firefox-1.5rc3-source.tar.bz2 %endif Source0: %{tarball} -Source2: firefox-langpacks-%{version}-20070219.tar.bz2 +Source2: firefox-langpacks-%{version}-20070529.tar.bz2 Source10: firefox-mozconfig Source11: firefox-mozconfig-branded Source12: firefox-redhat-default-bookmarks.html @@ -456,6 +456,9 @@ #--------------------------------------------------------------------- %changelog +* Wed May 30 2007 Christopher Aillon 1.5.0.12-1 +- Update to 1.5.0.12 + * Thu May 10 2007 Martin Stransky 1.5.0.10-6 - Fixed epiphany crash (rhbz#238770, mozbz#379550) Index: sources =================================================================== RCS file: /cvs/dist/rpms/firefox/FC-6/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 23 Feb 2007 22:13:11 -0000 1.36 +++ sources 30 May 2007 20:40:46 -0000 1.37 @@ -1,2 +1,2 @@ -1c9b689ee29262cd013196cf342e6dc1 firefox-1.5.0.10-source.tar.bz2 -7714a51a5d6f4f7f4b62b49141f7c05d firefox-langpacks-1.5.0.10-20070219.tar.bz2 +dd5add97bd75287817c820ef856a30ed firefox-1.5.0.12-source.tar.bz2 +04b6e4b4a38f50a3546a483d876e2fa1 firefox-langpacks-1.5.0.12-20070529.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 30 20:42:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 16:42:12 -0400 Subject: rpms/firefox/FC-5 firefox.spec,1.128,1.129 sources,1.33,1.34 Message-ID: <200705302042.l4UKgCpL019301@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv19285 Modified Files: firefox.spec sources Log Message: * Wed May 30 2007 Christopher Aillon 1.5.0.12-1 - Update to 1.5.0.12 Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/FC-5/firefox.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- firefox.spec 23 Feb 2007 22:05:23 -0000 1.128 +++ firefox.spec 30 May 2007 20:42:10 -0000 1.129 @@ -8,7 +8,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox -Version: 1.5.0.10 +Version: 1.5.0.12 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL @@ -19,7 +19,7 @@ %define tarball firefox-1.5rc3-source.tar.bz2 %endif Source0: %{tarball} -Source2: firefox-langpacks-%{version}-20070219.tar.bz2 +Source2: firefox-langpacks-%{version}-20070529.tar.bz2 Source10: firefox-mozconfig Source11: firefox-mozconfig-branded Source12: firefox-redhat-default-bookmarks.html @@ -278,6 +278,9 @@ #--------------------------------------------------------------------- %changelog +* Wed May 30 2007 Christopher Aillon 1.5.0.12-1 +- Update to 1.5.0.12 + * Thu Feb 22 2007 Martin Stransky - 1.5.0.10-1 - Update to 1.5.0.10 Index: sources =================================================================== RCS file: /cvs/dist/rpms/firefox/FC-5/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 23 Feb 2007 22:05:23 -0000 1.33 +++ sources 30 May 2007 20:42:10 -0000 1.34 @@ -1,2 +1,2 @@ -1c9b689ee29262cd013196cf342e6dc1 firefox-1.5.0.10-source.tar.bz2 -7714a51a5d6f4f7f4b62b49141f7c05d firefox-langpacks-1.5.0.10-20070219.tar.bz2 +dd5add97bd75287817c820ef856a30ed firefox-1.5.0.12-source.tar.bz2 +04b6e4b4a38f50a3546a483d876e2fa1 firefox-langpacks-1.5.0.12-20070529.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 30 21:15:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 17:15:54 -0400 Subject: rpms/thunderbird/FC-6 sources,1.21,1.22 thunderbird.spec,1.94,1.95 Message-ID: <200705302115.l4ULFsLj020332@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20317 Modified Files: sources thunderbird.spec Log Message: * Wed May 30 2007 Christopher Aillon 1.5.0.12-1 - Update to 1.5.0.12 Index: sources =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-6/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 1 Mar 2007 21:51:42 -0000 1.21 +++ sources 30 May 2007 21:15:52 -0000 1.22 @@ -1,2 +1,2 @@ -65087f8a7adb0773ae7198ec21cc2975 thunderbird-1.5.0.10-source.tar.bz2 -0ac9a4a17d12422858c07fe553ee9ac2 thunderbird-langpacks-1.5.0.10-20070301.tar.bz2 +4634ec6e0e1014602010763473fed89a thunderbird-1.5.0.12-source.tar.bz2 +8e5c2a12327b1538b596b2a523479215 thunderbird-langpacks-1.5.0.12-20070530.tar.bz2 Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-6/thunderbird.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- thunderbird.spec 1 Mar 2007 21:51:42 -0000 1.94 +++ thunderbird.spec 30 May 2007 21:15:52 -0000 1.95 @@ -7,7 +7,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 1.5.0.10 +Version: 1.5.0.12 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -18,7 +18,7 @@ %define tarball thunderbird-1.5rc1-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20070301.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20070530.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -277,6 +277,9 @@ #=============================================================================== %changelog +* Wed May 30 2007 Christopher Aillon 1.5.0.12-1 +- Update to 1.5.0.12 + * Thu Mar 1 2007 Martin Stransky 1.5.0.10-1 - Update to 1.5.0.10 From fedora-cvs-commits at redhat.com Wed May 30 21:16:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 17:16:50 -0400 Subject: rpms/thunderbird/FC-5 sources,1.20,1.21 thunderbird.spec,1.76,1.77 Message-ID: <200705302116.l4ULGoYc020419@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20403 Modified Files: sources thunderbird.spec Log Message: * Wed May 30 2007 Christopher Aillon 1.5.0.12-1 - Update to 1.5.0.12 Index: sources =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-5/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 1 Mar 2007 16:01:06 -0000 1.20 +++ sources 30 May 2007 21:16:48 -0000 1.21 @@ -1,2 +1,2 @@ -65087f8a7adb0773ae7198ec21cc2975 thunderbird-1.5.0.10-source.tar.bz2 -0ac9a4a17d12422858c07fe553ee9ac2 thunderbird-langpacks-1.5.0.10-20070301.tar.bz2 +4634ec6e0e1014602010763473fed89a thunderbird-1.5.0.12-source.tar.bz2 +8e5c2a12327b1538b596b2a523479215 thunderbird-langpacks-1.5.0.12-20070530.tar.bz2 Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-5/thunderbird.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- thunderbird.spec 1 Mar 2007 16:01:06 -0000 1.76 +++ thunderbird.spec 30 May 2007 21:16:48 -0000 1.77 @@ -7,7 +7,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 1.5.0.10 +Version: 1.5.0.12 Release: 1%{?dist} Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ @@ -19,7 +19,7 @@ %define tarball thunderbird-1.5rc1-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20070301.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20070530.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -268,6 +268,9 @@ #=============================================================================== %changelog +* Wed May 30 2007 Christopher Aillon 1.5.0.12-1 +- Update to 1.5.0.12 + * Tue Mar 1 2007 Martin Stransky 1.5.0.10-1 - Update to 1.5.0.10 From fedora-cvs-commits at redhat.com Wed May 30 21:20:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 17:20:06 -0400 Subject: rpms/seamonkey/FC-5 seamonkey.spec,1.21,1.22 sources,1.8,1.9 Message-ID: <200705302120.l4ULK6cC020510@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/seamonkey/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20491 Modified Files: seamonkey.spec sources Log Message: * Wed May 30 2007 Christopher Aillon 1.0.9-1 - Update to 1.0.9 Index: seamonkey.spec =================================================================== RCS file: /cvs/dist/rpms/seamonkey/FC-5/seamonkey.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- seamonkey.spec 23 Feb 2007 23:29:34 -0000 1.21 +++ seamonkey.spec 30 May 2007 21:19:59 -0000 1.22 @@ -14,8 +14,8 @@ Name: seamonkey Summary: Web browser and mail reader -Version: 1.0.8 -Release: 0.5.1%{?dist} +Version: 1.0.9 +Release: 1%{?dist} License: MPL/NPL/GPL/LGPL Source0: seamonkey-%{version}.source.tar.bz2 Source1: mozilla.sh.in @@ -793,6 +793,9 @@ %{mozdir}/xpt_link %changelog +* Wed May 30 2007 Christopher Aillon 1.0.9-1 +- Update to 1.0.9 + * Thu Feb 15 2007 Martin Stransky 1.0.8-0.5.1 - Update to 1.0.8 Index: sources =================================================================== RCS file: /cvs/dist/rpms/seamonkey/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 23 Feb 2007 23:29:34 -0000 1.8 +++ sources 30 May 2007 21:19:59 -0000 1.9 @@ -1 +1 @@ -05eacbcbaa8d7140706e99c604b1d966 seamonkey-1.0.8.source.tar.bz2 +a1724c29bd1789cf39dbc9694505b661 seamonkey-1.0.9.source.tar.bz2 From fedora-cvs-commits at redhat.com Wed May 30 23:14:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 19:14:18 -0400 Subject: rpms/fribidi/FC-6 .cvsignore, 1.3, 1.4 fribidi-0.10.7-multiarchdevel.patch, 1.2, 1.3 fribidi.spec, 1.15, 1.16 sources, 1.3, 1.4 Message-ID: <200705302314.l4UNEI8b022179@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/fribidi/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22162 Modified Files: .cvsignore fribidi-0.10.7-multiarchdevel.patch fribidi.spec sources Log Message: * Wed May 30 2007 Behdad Esfahbod 0.10.8-1 - latest version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fribidi/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Mar 2006 13:48:06 -0000 1.3 +++ .cvsignore 30 May 2007 23:14:15 -0000 1.4 @@ -1,2 +1 @@ -fribidi-0.10.4.tar.bz2 -fribidi-0.10.7.tar.gz +fribidi-0.10.8.tar.gz fribidi-0.10.7-multiarchdevel.patch: Makefile.am | 2 configure.in | 1 fribidi-0.10.7/fribidi-config | 79 +++++++++++++++++++++++++++++++++++++ fribidi-0.10.7/fribidi_config-32.h | 6 ++ fribidi-0.10.7/fribidi_config-64.h | 6 ++ fribidi_config.h.in | 12 ++++- 6 files changed, 102 insertions(+), 4 deletions(-) Index: fribidi-0.10.7-multiarchdevel.patch =================================================================== RCS file: /cvs/dist/rpms/fribidi/FC-6/fribidi-0.10.7-multiarchdevel.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fribidi-0.10.7-multiarchdevel.patch 23 May 2006 07:37:22 -0000 1.2 +++ fribidi-0.10.7-multiarchdevel.patch 30 May 2007 23:14:15 -0000 1.3 @@ -20,7 +20,7 @@ +++ fribidi-0.10.7/fribidi_config-64.h 2006-05-02 10:48:14.000000000 +0100 @@ -0,0 +1,6 @@ +#ifndef FRIBIDI_CONFIG_SIXFOUR_H -+#define FRIBIDI_CONFIG-SIXFOUR_H ++#define FRIBIDI_CONFIG_SIXFOUR_H +#define FRIBIDI_SIZEOF_SHORT 2 +#define FRIBIDI_SIZEOF_INT 4 +#define FRIBIDI_SIZEOF_LONG 8 Index: fribidi.spec =================================================================== RCS file: /cvs/dist/rpms/fribidi/FC-6/fribidi.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fribidi.spec 12 Jul 2006 05:52:04 -0000 1.15 +++ fribidi.spec 30 May 2007 23:14:15 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi -Version: 0.10.7 -Release: 5.1 +Version: 0.10.8 +Release: 1 URL: http://fribidi.org Source0: %{name}-%{version}.tar.gz Patch0: fribidi-0.10.7-multiarchdevel.patch @@ -64,6 +64,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed May 30 2007 Behdad Esfahbod 0.10.8-1 +- latest version + * Wed Jul 12 2006 Jesse Keating - 0.10.7-5.1 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/fribidi/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Mar 2006 13:48:06 -0000 1.3 +++ sources 30 May 2007 23:14:15 -0000 1.4 @@ -1 +1 @@ -0f602ed32869dbc551dc6bc83d8a3d28 fribidi-0.10.7.tar.gz +fe6a1e370353e330bbe043bb1697d04e fribidi-0.10.8.tar.gz From fedora-cvs-commits at redhat.com Wed May 30 23:34:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 19:34:05 -0400 Subject: rpms/devhelp/FC-6 devhelp.spec,1.54,1.55 Message-ID: <200705302334.l4UNY52Q022467@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/devhelp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22453 Modified Files: devhelp.spec Log Message: * Wed May 30 2007 Christopher Aillon - 0.12.6-11 - Rebuild against newer gecko Index: devhelp.spec =================================================================== RCS file: /cvs/dist/rpms/devhelp/FC-6/devhelp.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- devhelp.spec 26 Feb 2007 18:47:55 -0000 1.54 +++ devhelp.spec 30 May 2007 23:34:02 -0000 1.55 @@ -1,9 +1,9 @@ -%define gecko_ver 1.8.0.10 +%define gecko_ver 1.8.0.12 Summary: API document browser Name: devhelp Version: 0.12 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: Development/Tools Url: http://ftp.gnome.org/pub/gnome/sources/devhelp/ @@ -131,6 +131,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed May 30 2007 Christopher Aillon - 0.12.6-11 +- Rebuild against newer gecko + * Mon Feb 26 2007 Martin Stransky - 0.12.6-10 - Rebuild against newer gecko From fedora-cvs-commits at redhat.com Wed May 30 23:35:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 19:35:22 -0400 Subject: rpms/devhelp/FC-5 devhelp.spec,1.44,1.45 Message-ID: <200705302335.l4UNZMIx022537@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/devhelp/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv22522 Modified Files: devhelp.spec Log Message: * Wed May 30 2007 Christopher Aillon - 0.11-7 - Rebuild against newer gecko Index: devhelp.spec =================================================================== RCS file: /cvs/dist/rpms/devhelp/FC-5/devhelp.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- devhelp.spec 26 Feb 2007 08:53:19 -0000 1.44 +++ devhelp.spec 30 May 2007 23:35:20 -0000 1.45 @@ -1,9 +1,9 @@ -%define seaver 1.0.8 +%define seaver 1.0.9 Summary: API document browser Name: devhelp Version: 0.11 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Url: http://ftp.gnome.org/pub/gnome/sources/devhelp/ @@ -100,6 +100,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed May 30 2007 Christopher Aillon - 0.11-7 +- Rebuild against newer gecko + * Fri Feb 16 2007 Martin Stransky - 0.11-6 - Rebuild against seamonkey From fedora-cvs-commits at redhat.com Wed May 30 23:36:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 19:36:57 -0400 Subject: rpms/yelp/FC-6 yelp.spec,1.87,1.88 Message-ID: <200705302336.l4UNavRK022668@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/yelp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22653 Modified Files: yelp.spec Log Message: * Wed May 30 2007 Christopher Aillon - 2.16.0-13 - Rebuild against newer gecko Index: yelp.spec =================================================================== RCS file: /cvs/dist/rpms/yelp/FC-6/yelp.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- yelp.spec 26 Feb 2007 19:21:01 -0000 1.87 +++ yelp.spec 30 May 2007 23:36:55 -0000 1.88 @@ -1,6 +1,6 @@ %define pango_version 1.0.99 %define gtk2_version 2.6.0 -%define gecko_version 1.8.0.10 +%define gecko_version 1.8.0.12 %define gnome_vfs2_version 2.0.0 %define libgnomeui_version 2.0.2 %define libbonobo_version 2.0.0 @@ -14,7 +14,7 @@ Summary: A system documentation reader from the Gnome project Name: yelp Version: 2.16.0 -Release: 12%{?dist} +Release: 13%{?dist} Source: %{name}-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=319096 Patch1: yelp-2.15.5-fedora-docs.patch @@ -129,6 +129,9 @@ %{_datadir}/yelp %changelog +* Wed May 30 2007 Christopher Aillon - 2.16.0-13 +- Rebuild against newer gecko + * Mon Feb 26 2007 Martin Stransky - 2.16.0-12 - Rebuild against newer gecko From fedora-cvs-commits at redhat.com Wed May 30 23:37:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 19:37:54 -0400 Subject: rpms/yelp/FC-5 yelp.spec,1.63,1.64 Message-ID: <200705302337.l4UNbsm7022738@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/yelp/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv22723 Modified Files: yelp.spec Log Message: * Wed May 30 2007 Christopher Aillon - 2.14.3-5 - Rebuild against newer gecko Index: yelp.spec =================================================================== RCS file: /cvs/dist/rpms/yelp/FC-5/yelp.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- yelp.spec 26 Feb 2007 12:26:22 -0000 1.63 +++ yelp.spec 30 May 2007 23:37:52 -0000 1.64 @@ -1,6 +1,6 @@ %define pango_version 1.0.99 %define gtk2_version 2.6.0 -%define seamonkey_version 1.0.8 +%define seamonkey_version 1.0.9 %define gnome_vfs2_version 2.0.0 %define libgnomeui_version 2.0.2 %define libbonobo_version 2.0.0 @@ -13,7 +13,7 @@ Summary: A system documentation reader from the Gnome project. Name: yelp Version: 2.14.3 -Release: 4%{?dist} +Release: 5%{?dist} Source: %{name}-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=319096 Patch1: yelp-2.12.1-fedora-docs.patch @@ -123,6 +123,9 @@ %{_datadir}/yelp %changelog +* Wed May 30 2007 Christopher Aillon - 2.14.3-5 +- Rebuild against newer gecko + * Fri Feb 16 2007 Martin Stransky - 2.14.3-4 - Rebuild against seamonkey From fedora-cvs-commits at redhat.com Wed May 30 23:39:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 19:39:45 -0400 Subject: rpms/epiphany/FC-6 epiphany.spec,1.135,1.136 Message-ID: <200705302339.l4UNdjw0022824@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/epiphany/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22810 Modified Files: epiphany.spec Log Message: * Wed May 30 2007 Christopher Aillon - 2.16.3-5 - Rebuild against newer gecko Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/FC-6/epiphany.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- epiphany.spec 16 Mar 2007 15:31:30 -0000 1.135 +++ epiphany.spec 30 May 2007 23:39:39 -0000 1.136 @@ -1,4 +1,4 @@ -%define gecko_ver 1.8.0.10 +%define gecko_ver 1.8.0.12 %define desktop_file_utils_version 0.9 %define glib2_devel_ver 2.10.1 %define gtk2_devel_ver 2.10.0 @@ -9,7 +9,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.16.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -172,6 +172,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Wed May 30 2007 Christopher Aillon - 2.16.3-5 +- Rebuild against newer gecko + * Fri Mar 16 2007 - Bastien Nocera - 2.16.3-4 - Have ephy pick up on the 64-bit plugins (#204547) From fedora-cvs-commits at redhat.com Wed May 30 23:40:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 19:40:54 -0400 Subject: rpms/epiphany/FC-5 epiphany.spec,1.108,1.109 Message-ID: <200705302340.l4UNes28022898@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/epiphany/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv22884 Modified Files: epiphany.spec Log Message: * Wed May 30 2007 Christopher Aillon - 2.14.3-5 - Rebuild against newer gecko Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/FC-5/epiphany.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- epiphany.spec 26 Feb 2007 12:25:22 -0000 1.108 +++ epiphany.spec 30 May 2007 23:40:46 -0000 1.109 @@ -1,4 +1,4 @@ -%define seaver 1.0.8 +%define seaver 1.0.9 %define desktop_file_utils_version 0.9 %define seamonkey_devel_ver 1.0.8 %define glib2_devel_ver 2.8.0 @@ -10,7 +10,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.14.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -142,6 +142,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Wed May 30 2007 Christopher Aillon - 2.14.3-5 +- Rebuild against newer gecko + * Fri Feb 16 2007 Martin Stransky - 2.14.3-4 - Rebuild against seamonkey From fedora-cvs-commits at redhat.com Thu May 31 01:29:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 21:29:13 -0400 Subject: rpms/epiphany/FC-5 epiphany.spec,1.109,1.110 Message-ID: <200705310129.l4V1TDhW024654@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/epiphany/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv24640 Modified Files: epiphany.spec Log Message: * Wed May 30 2007 Christopher Aillon - 2.14.3-6 - Rebuild Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/FC-5/epiphany.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- epiphany.spec 30 May 2007 23:40:46 -0000 1.109 +++ epiphany.spec 31 May 2007 01:29:11 -0000 1.110 @@ -1,6 +1,5 @@ %define seaver 1.0.9 %define desktop_file_utils_version 0.9 -%define seamonkey_devel_ver 1.0.8 %define glib2_devel_ver 2.8.0 %define gtk2_devel_ver 2.8.3 %define libbonoboui_devel_ver 2.1.1 @@ -10,7 +9,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany Version: 2.14.3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ @@ -24,8 +23,7 @@ Requires: iso-codes >= 0.45 BuildRequires: glib2-devel >= %{glib2_devel_ver} BuildRequires: gtk2-devel >= %{gtk2_devel_ver} -BuildRequires: seamonkey-devel >= %{seamonkey_devel_ver} -BuildRequires: seamonkey +BuildRequires: seamonkey-devel >= %{seaaver} BuildRequires: scrollkeeper >= %{scrollkeeper_ver} BuildRequires: libxml2-devel, libxml2-python, libxslt-devel BuildRequires: libgnomeui-devel, libglade2-devel @@ -51,7 +49,7 @@ Summary: The files needed for developing extensions for the epiphany web browser. Group: Development/Libraries Requires: epiphany = %{version} -Requires: seamonkey-devel >= %{seamonkey_devel_ver} +Requires: seamonkey-devel >= %{seaver} Requires: glib2-devel >= %{glib2_devel_ver} Requires: gtk2-devel >= %{gtk2_devel_ver} Requires: scrollkeeper >= %{scrollkeeper_ver} @@ -142,6 +140,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Wed May 30 2007 Christopher Aillon - 2.14.3-6 +- Rebuild + * Wed May 30 2007 Christopher Aillon - 2.14.3-5 - Rebuild against newer gecko From fedora-cvs-commits at redhat.com Thu May 31 01:53:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 21:53:46 -0400 Subject: rpms/libexif/FC-6 libexif.spec,1.25,1.26 sources,1.4,1.5 Message-ID: <200705310153.l4V1rk8u025306@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libexif/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25291 Modified Files: libexif.spec sources Log Message: 0.6.15 Index: libexif.spec =================================================================== RCS file: /cvs/dist/rpms/libexif/FC-6/libexif.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libexif.spec 27 Jul 2006 01:11:06 -0000 1.25 +++ libexif.spec 31 May 2007 01:53:43 -0000 1.26 @@ -1,12 +1,13 @@ Summary: Library for extracting extra information from image files Name: libexif -Version: 0.6.13 -Release: 2 +Version: 0.6.15 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPL URL: http://libexif.sourceforge.net/ -Source0: http://umn.dl.sourceforge.net/sourceforge/libexif/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Source0: libexif-%{version}.tar.bz2 +Source1: libexif-docs.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen %description @@ -17,31 +18,30 @@ %package devel Summary: Files needed for libexif application development Group: Development/Libraries -Requires: libexif = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel -The libexif-devel package contains the static libraries and header files +The libexif-devel package contains the libraries and header files for writing programs that use libexif. %prep %setup -q +# to avoid multilib conflicts, we toss in pre-generated docs +# and neuter make all in the docs dir +tar xzf %{SOURCE1} %build -%configure --disable-static +%configure --disable-static --disable-docs make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libexif/internals.html -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libexif/ABOUT-NLS -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libexif/README.apidocs -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libexif/ChangeLog -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libexif/AUTHORS -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libexif/COPYING -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libexif/README -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libexif/NEWS + +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libexif +cp -R doc/doxygen-output/libexif-api.html . %find_lang libexif-12 @@ -54,17 +54,28 @@ %files -f libexif-12.lang %defattr(-,root,root,-) -%doc ChangeLog AUTHORS COPYING README NEWS +%doc ChangeLog COPYING README NEWS %{_libdir}/libexif.so.* %files devel %defattr(-,root,root,-) +%doc libexif-api.html %{_includedir}/libexif %{_libdir}/*.so %{_libdir}/pkgconfig/libexif.pc -%{_datadir}/doc/libexif/api.html %changelog +* Wed May 30 2007 Matthias Clasen - 0.6.15-1 +- Update to 0.6.15 +- Drop obsolete patch + +* Thu May 24 2007 Matthias Clasen - 0.6.13-4 +- Add patch for CVE-2007-2645. + +* Sun Feb 4 2007 Matthias Clasen - 0.6.13-3 +- Package review cleanups +- Avoid multilib conflicts by using pregenerated docs + * Wed Jul 26 2006 Matthias Clasen - 0.6.13-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/libexif/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 May 2006 02:10:57 -0000 1.4 +++ sources 31 May 2007 01:53:43 -0000 1.5 @@ -1 +1,2 @@ -1b1e2b495c5aa20c08725f30545a110b libexif-0.6.13.tar.bz2 +58871e364c454d107eee001456cc8f24 libexif-0.6.15.tar.bz2 +916f61beb4afa88f05130b10e7640333 libexif-docs.tar.gz From fedora-cvs-commits at redhat.com Thu May 31 01:57:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 21:57:20 -0400 Subject: rpms/libexif/FC-6 .cvsignore,1.4,1.5 Message-ID: <200705310157.l4V1vKYI025435@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libexif/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25420 Modified Files: .cvsignore Log Message: upload sources Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libexif/FC-6/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 May 2006 02:10:57 -0000 1.4 +++ .cvsignore 31 May 2007 01:57:14 -0000 1.5 @@ -1 +1,2 @@ -libexif-0.6.13.tar.bz2 +libexif-0.6.15.tar.bz2 +libexif-docs.tar.gz From fedora-cvs-commits at redhat.com Thu May 31 02:33:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 22:33:37 -0400 Subject: rpms/gtk2/FC-6 gtk+-2.10.12-search.patch, NONE, 1.1 .cvsignore, 1.61, 1.62 gtk2.spec, 1.203, 1.204 sources, 1.68, 1.69 Message-ID: <200705310233.l4V2Xbjb026245@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26229 Modified Files: .cvsignore gtk2.spec sources Added Files: gtk+-2.10.12-search.patch Log Message: 2.10.12 gtk+-2.10.12-search.patch: Makefile.am | 10 gtkfilechooserdefault.c | 1519 ++++++++++++++++++++++++++++++++++++----------- gtkfilechooserprivate.h | 35 - gtkquery.c | 142 ++++ gtkquery.h | 74 ++ gtksearchengine.c | 199 ++++++ gtksearchengine.h | 91 ++ gtksearchenginebeagle.c | 420 ++++++++++++ gtksearchenginebeagle.h | 59 + gtksearchenginesimple.c | 374 +++++++++++ gtksearchenginesimple.h | 59 + gtksearchenginetracker.c | 362 +++++++++++ gtksearchenginetracker.h | 59 + 13 files changed, 3053 insertions(+), 350 deletions(-) --- NEW FILE gtk+-2.10.12-search.patch --- --- /dev/null 2007-05-19 19:05:57.724948798 -0400 +++ gtk+-2.10.12/gtk/gtksearchenginetracker.h 2007-05-19 19:51:53.000000000 -0400 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2005 Mr Jamie McCracken + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * + * Author: Jamie McCracken (jamiemcc at gnome.org) + * + * Based on nautilus-search-engine-tracker.h + */ + +#ifndef __GTK_SEARCH_ENGINE_TRACKER_H__ +#define __GTK_SEARCH_ENGINE_TRACKER_H__ + +#include "gtksearchengine.h" + +G_BEGIN_DECLS + +#define GTK_TYPE_SEARCH_ENGINE_TRACKER (_gtk_search_engine_tracker_get_type ()) +#define GTK_SEARCH_ENGINE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE_TRACKER, GtkSearchEngineTracker)) +#define GTK_SEARCH_ENGINE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE_TRACKER, GtkSearchEngineTrackerClass)) +#define GTK_IS_SEARCH_ENGINE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE_TRACKER)) +#define GTK_IS_SEARCH_ENGINE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE_TRACKER)) +#define GTK_SEARCH_ENGINE_TRACKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE_TRACKER, GtkSearchEngineTrackerClass)) + +typedef struct _GtkSearchEngineTracker GtkSearchEngineTracker; +typedef struct _GtkSearchEngineTrackerClass GtkSearchEngineTrackerClass; +typedef struct _GtkSearchEngineTrackerPrivate GtkSearchEngineTrackerPrivate; + +struct _GtkSearchEngineTracker +{ + GtkSearchEngine parent; + + GtkSearchEngineTrackerPrivate *priv; +}; + +struct _GtkSearchEngineTrackerClass +{ + GtkSearchEngineClass parent_class; +}; + +GType _gtk_search_engine_tracker_get_type (void); + +GtkSearchEngine* _gtk_search_engine_tracker_new (void); + +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_TRACKER_H__ */ --- /dev/null 2007-05-19 19:05:57.724948798 -0400 +++ gtk+-2.10.12/gtk/gtksearchengine.h 2007-05-19 19:51:53.000000000 -0400 @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2005 Novell, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * + * Author: Anders Carlsson + * + * Based on nautilus-search-engine.h + */ + +#ifndef __GTK_SEARCH_ENGINE_H__ +#define __GTK_SEARCH_ENGINE_H__ + +#include +#include "gtkquery.h" + +G_BEGIN_DECLS + +#define GTK_TYPE_SEARCH_ENGINE (_gtk_search_engine_get_type ()) +#define GTK_SEARCH_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngine)) +#define GTK_SEARCH_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngineClass)) +#define GTK_IS_SEARCH_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE)) +#define GTK_IS_SEARCH_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE)) +#define GTK_SEARCH_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngineClass)) + +typedef struct _GtkSearchEngine GtkSearchEngine; +typedef struct _GtkSearchEngineClass GtkSearchEngineClass; +typedef struct _GtkSearchEnginePrivate GtkSearchEnginePrivate; + +struct _GtkSearchEngine +{ + GObject parent; + + GtkSearchEnginePrivate *priv; +}; + +struct _GtkSearchEngineClass +{ + GObjectClass parent_class; + + /* VTable */ + void (*set_query) (GtkSearchEngine *engine, + GtkQuery *query); + void (*start) (GtkSearchEngine *engine); + void (*stop) (GtkSearchEngine *engine); + gboolean (*is_indexed) (GtkSearchEngine *engine); + + /* Signals */ + void (*hits_added) (GtkSearchEngine *engine, + GList *hits); + void (*hits_subtracted) (GtkSearchEngine *engine, + GList *hits); + void (*finished) (GtkSearchEngine *engine); + void (*error) (GtkSearchEngine *engine, + const gchar *error_message); +}; + +GType _gtk_search_engine_get_type (void); +gboolean _gtk_search_engine_enabled (void); + +GtkSearchEngine* _gtk_search_engine_new (void); + +void _gtk_search_engine_set_query (GtkSearchEngine *engine, + GtkQuery *query); +void _gtk_search_engine_start (GtkSearchEngine *engine); +void _gtk_search_engine_stop (GtkSearchEngine *engine); +gboolean _gtk_search_engine_is_indexed (GtkSearchEngine *engine); + +void _gtk_search_engine_hits_added (GtkSearchEngine *engine, + GList *hits); +void _gtk_search_engine_hits_subtracted (GtkSearchEngine *engine, + GList *hits); +void _gtk_search_engine_finished (GtkSearchEngine *engine); +void _gtk_search_engine_error (GtkSearchEngine *engine, + const gchar *error_message); + +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_H__ */ --- /dev/null 2007-05-19 19:05:57.724948798 -0400 +++ gtk+-2.10.12/gtk/gtksearchenginebeagle.h 2007-05-19 19:51:53.000000000 -0400 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2005 Novell, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * + * Author: Anders Carlsson + * + * Based on nautilus-search-engine-beagle.h + */ + +#ifndef __GTK_SEARCH_ENGINE_BEAGLE_H__ +#define __GTK_SEARCH_ENGINE_BEAGLE_H__ + +#include "gtksearchengine.h" + +G_BEGIN_DECLS + +#define GTK_TYPE_SEARCH_ENGINE_BEAGLE (_gtk_search_engine_beagle_get_type ()) +#define GTK_SEARCH_ENGINE_BEAGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE_BEAGLE, GtkSearchEngineBeagle)) +#define GTK_SEARCH_ENGINE_BEAGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE_BEAGLE, GtkSearchEngineBeagleClass)) +#define GTK_IS_SEARCH_ENGINE_BEAGLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE_BEAGLE)) +#define GTK_IS_SEARCH_ENGINE_BEAGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE_BEAGLE)) +#define GTK_SEARCH_ENGINE_BEAGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE_BEAGLE, GtkSearchEngineBeagleClass)) + +typedef struct _GtkSearchEngineBeagle GtkSearchEngineBeagle; +typedef struct _GtkSearchEngineBeagleClass GtkSearchEngineBeagleClass; +typedef struct _GtkSearchEngineBeaglePrivate GtkSearchEngineBeaglePrivate; + [...4037 lines suppressed...] + * Based on nautilus-query.c + */ + +#include +#include + +#include "gtkquery.h" + +struct _GtkQueryPrivate +{ + gchar *text; + gchar *location_uri; + GList *mime_types; +}; + +G_DEFINE_TYPE (GtkQuery, _gtk_query, G_TYPE_OBJECT); + +static void +finalize (GObject *object) +{ + GtkQuery *query; + + query = GTK_QUERY (object); + + g_free (query->priv->text); + + G_OBJECT_CLASS (_gtk_query_parent_class)->finalize (object); +} + +static void +_gtk_query_class_init (GtkQueryClass *class) +{ + GObjectClass *gobject_class; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = finalize; + + g_type_class_add_private (gobject_class, sizeof (GtkQueryPrivate)); +} + +static void +_gtk_query_init (GtkQuery *query) +{ + query->priv = G_TYPE_INSTANCE_GET_PRIVATE (query, GTK_TYPE_QUERY, GtkQueryPrivate); +} + +GtkQuery * +_gtk_query_new (void) +{ + return g_object_new (GTK_TYPE_QUERY, NULL); +} + + +gchar * +_gtk_query_get_text (GtkQuery *query) +{ + return g_strdup (query->priv->text); +} + +void +_gtk_query_set_text (GtkQuery *query, + const gchar *text) +{ + g_free (query->priv->text); + query->priv->text = g_strdup (text); +} + +gchar * +_gtk_query_get_location (GtkQuery *query) +{ + return g_strdup (query->priv->location_uri); +} + +void +_gtk_query_set_location (GtkQuery *query, + const gchar *uri) +{ + g_free (query->priv->location_uri); + query->priv->location_uri = g_strdup (uri); +} + +GList * +_gtk_query_get_mime_types (GtkQuery *query) +{ + GList *list, *l; + gchar *mime_type; + + list = NULL; + for (l = query->priv->mime_types; l; l = l->next) + { + mime_type = (gchar*)l->data; + list = g_list_prepend (list, g_strdup (mime_type)); + } + + return list; +} + +void +_gtk_query_set_mime_types (GtkQuery *query, + GList *mime_types) +{ + GList *l; + gchar *mime_type; + + g_list_foreach (query->priv->mime_types, (GFunc)g_free, NULL); + g_list_free (query->priv->mime_types); + query->priv->mime_types = NULL; + + for (l = mime_types; l; l = l->next) + { + mime_type = (gchar*)l->data; + query->priv->mime_types = g_list_prepend (query->priv->mime_types, g_strdup (mime_type)); + } +} + +void +_gtk_query_add_mime_type (GtkQuery *query, + const gchar *mime_type) +{ + query->priv->mime_types = g_list_prepend (query->priv->mime_types, + g_strdup (mime_type)); +} + --- /dev/null 2007-05-19 19:05:57.724948798 -0400 +++ gtk+-2.10.12/gtk/gtkquery.h 2007-05-19 19:51:53.000000000 -0400 @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2005 Novell, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * + * Author: Anders Carlsson + * + * Based on nautilus-query.h + */ + +#ifndef __GTK_QUERY_H__ +#define __GTK_QUERY_H__ + +#include + +G_BEGIN_DECLS + +#define GTK_TYPE_QUERY (_gtk_query_get_type ()) +#define GTK_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_QUERY, GtkQuery)) +#define GTK_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_QUERY, GtkQueryClass)) +#define GTK_IS_QUERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_QUERY)) +#define GTK_IS_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_QUERY)) +#define GTK_QUERY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_QUERY, GtkQueryClass)) + +typedef struct _GtkQuery GtkQuery; +typedef struct _GtkQueryClass GtkQueryClass; +typedef struct _GtkQueryPrivate GtkQueryPrivate; + +struct _GtkQuery +{ + GObject parent; + + GtkQueryPrivate *priv; +}; + +struct _GtkQueryClass +{ + GObjectClass parent_class; +}; + +GType _gtk_query_get_type (void); +gboolean _gtk_query_enabled (void); + +GtkQuery* _gtk_query_new (void); + +gchar* _gtk_query_get_text (GtkQuery *query); +void _gtk_query_set_text (GtkQuery *query, + const gchar *text); + +gchar* _gtk_query_get_location (GtkQuery *query); +void _gtk_query_set_location (GtkQuery *query, + const gchar *uri); + +GList* _gtk_query_get_mime_types (GtkQuery *query); +void _gtk_query_set_mime_types (GtkQuery *query, + GList *mime_types); +void _gtk_query_add_mime_type (GtkQuery *query, + const gchar *mime_type); + +G_END_DECLS + +#endif /* __GTK_QUERY_H__ */ Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2/FC-6/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 23 Sep 2006 21:07:14 -0000 1.61 +++ .cvsignore 31 May 2007 02:33:35 -0000 1.62 @@ -1,46 +1 @@ -gtk+-2.4.9.tar.bz2 -update-scripts.tar.gz -gtk+-2.4.10.tar.bz2 -gtk+-2.4.13.tar.bz2 -gtk+-2.4.14.tar.bz2 -gtk+-2.6.0.tar.bz2 -gtk+-2.6.1.tar.bz2 -gtk+-2.6.2.tar.bz2 -gtk+-2.6.3.tar.bz2 -gtk+-2.6.4.tar.bz2 -gtk+-2.6.5.tar.bz2 -gtk+-2.6.6.tar.gz -gtk+-2.6.7.tar.bz2 -gtk+-2.7.0.tar.bz2 -gtk+-2.7.1.tar.bz2 -gtk+-2.7.2.tar.bz2 -gtk+-2.7.3.tar.bz2 -gtk+-2.7.4.tar.bz2 -gtk+-2.7.5.tar.bz2 -gtk+-2.8.0.tar.bz2 -gtk+-2.8.3.tar.bz2 -gtk+-2.8.4.tar.bz2 -gtk+-2.8.5.tar.bz2 -gtk+-2.8.6.tar.bz2 -gtk+-2.8.7.tar.bz2 -gtk+-2.8.8.tar.bz2 -gtk+-2.8.9.tar.bz2 -gtk+-2.8.10.tar.bz2 -gtk+-2.8.11.tar.bz2 -gtk+-2.8.12.tar.bz2 -gtk+-2.8.13.tar.bz2 -gtk+-2.8.14.tar.bz2 -gtk+-2.8.15.tar.bz2 -gtk+-2.8.15.tar.bz2 -gtk+-2.8.16.tar.bz2 -gtk+-2.8.17.tar.bz2 -gtk+-2.9.0.tar.bz2 -gtk+-2.9.1.tar.bz2 -gtk+-2.9.2.tar.bz2 -gtk+-2.9.3.tar.bz2 -gtk+-2.9.4.tar.bz2 -gtk+-2.10.0.tar.bz2 -gtk+-2.10.1.tar.bz2 -gtk+-2.10.2.tar.bz2 -gtk+-2.10.3.tar.bz2 -gtk+-2.10.4.tar.bz2 +gtk+-2.10.12.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/FC-6/gtk2.spec,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- gtk2.spec 3 Apr 2007 17:16:17 -0000 1.203 +++ gtk2.spec 31 May 2007 02:33:35 -0000 1.204 @@ -10,13 +10,13 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.10.8 +%define base_version 2.10.12 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 3%{?dist} +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 @@ -27,17 +27,13 @@ # Fedora patch Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch # Filechooser search -Patch2: gtk+-2.10.8-search.patch +Patch2: gtk+-2.10.12-search.patch # use fam for recent-files Patch3: gtk+-2.10.3-fam.patch - # backport from HEAD Patch7: gtk+-2.10.7-cursor-blink.patch - # fixed in upstream cvs Patch10: gtk+-2.10.4-im-reset.patch -Patch11: gtk+-2.10.8-recent-menu-crash.patch -Patch12: raw-printers.patch BuildPrereq: atk-devel >= %{atk_version} BuildPrereq: pango-devel >= %{pango_version} @@ -122,12 +118,8 @@ %patch1 -p1 -b .set-invisible-char-to-bullet %patch2 -p1 -b .search %patch3 -p1 -b .fam - %patch7 -p1 -b .cursor-blink - %patch10 -p1 -b .im-reset -%patch11 -p1 -b .recent-menu-crash -%patch12 -p1 -b .raw-printers for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -301,6 +293,9 @@ %doc tmpdocs/examples %changelog +* Wed May 30 2007 Matthias Clasen - 2.10.12-1 +- Update to 2.10.12 + * Tue Apr 3 2007 Matthias Clasen - 2.10.8-3 - Apply a patch to make raw printers work (#219806) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/FC-6/sources,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- sources 17 Jan 2007 14:14:07 -0000 1.68 +++ sources 31 May 2007 02:33:35 -0000 1.69 @@ -1,2 +1 @@ -25e73f5bdf6a1272799d0536a869f645 update-scripts.tar.gz -46bfef60f02c39acdcdba2ac46825db4 gtk+-2.10.8.tar.bz2 +cf969c62134c662ff07e64613ed6c11f gtk+-2.10.12.tar.bz2 From fedora-cvs-commits at redhat.com Thu May 31 03:45:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 30 May 2007 23:45:17 -0400 Subject: rpms/gtk2/FC-6 sources,1.69,1.70 Message-ID: <200705310345.l4V3jHSo027556@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv27542 Modified Files: sources Log Message: readd forgotten sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/FC-6/sources,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- sources 31 May 2007 02:33:35 -0000 1.69 +++ sources 31 May 2007 03:45:14 -0000 1.70 @@ -1 +1,2 @@ cf969c62134c662ff07e64613ed6c11f gtk+-2.10.12.tar.bz2 +25e73f5bdf6a1272799d0536a869f645 update-scripts.tar.gz From fedora-cvs-commits at redhat.com Thu May 31 06:07:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 02:07:50 -0400 Subject: rpms/autofs/FC-6 autofs-5.0.1-rc3-map-update-source-only.patch, NONE, 1.1 autofs.spec, 1.179, 1.180 Message-ID: <200705310607.l4V67olA032329@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv32307 Modified Files: autofs.spec Added Files: autofs-5.0.1-rc3-map-update-source-only.patch Log Message: * Thu May 31 2007 Ian Kent - 5.0.1-0.rc3.30 - fix wildcard map handling and improve nsswitch source map re-reading. autofs-5.0.1-rc3-map-update-source-only.patch: daemon/direct.c | 4 - daemon/indirect.c | 4 - daemon/lookup.c | 93 +++++++++++++++------------ daemon/state.c | 2 include/automount.h | 9 +- include/master.h | 3 lib/cache.c | 15 ++-- lib/master.c | 123 ++++++++++++++++++++++++++++-------- lib/master_parse.y | 2 modules/lookup_file.c | 155 ++++++++++++++++++---------------------------- modules/lookup_hesiod.c | 2 modules/lookup_hosts.c | 4 - modules/lookup_ldap.c | 100 +++++++++++++++-------------- modules/lookup_nisplus.c | 95 +++++++++++++++------------- modules/lookup_program.c | 2 modules/lookup_userhome.c | 2 modules/lookup_yp.c | 79 ++++++++++++----------- modules/parse_sun.c | 2 18 files changed, 382 insertions(+), 314 deletions(-) --- NEW FILE autofs-5.0.1-rc3-map-update-source-only.patch --- --- autofs-5.0.1/include/automount.h.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/include/automount.h 2007-05-31 13:48:14.000000000 +0800 @@ -141,6 +141,7 @@ struct mapent { pthread_mutex_t multi_mutex; struct list_head multi_list; struct mapent_cache *mc; + struct map_source *source; /* Need to know owner if we're a multi-mount */ struct mapent *multi; /* Parent nesting point within multi-mount */ @@ -175,10 +176,10 @@ struct mapent *cache_lookup(struct mapen struct mapent *cache_lookup_distinct(struct mapent_cache *mc, const char *key); struct mapent *cache_lookup_offset(const char *prefix, const char *offset, int start, struct list_head *head); struct mapent *cache_partial_match(struct mapent_cache *mc, const char *prefix); -int cache_add(struct mapent_cache *mc, const char *key, const char *mapent, time_t age); +int cache_add(struct mapent_cache *mc, struct map_source *ms, const char *key, const char *mapent, time_t age); int cache_add_offset(struct mapent_cache *mc, const char *mkey, const char *key, const char *mapent, time_t age); int cache_set_parents(struct mapent *mm); -int cache_update(struct mapent_cache *mc, const char *key, const char *mapent, time_t age); +int cache_update(struct mapent_cache *mc, struct map_source *ms, const char *key, const char *mapent, time_t age); int cache_delete(struct mapent_cache *mc, const char *key); void cache_multi_lock(struct mapent *me); void cache_multi_unlock(struct mapent *me); @@ -221,11 +222,11 @@ int rmdir_path(struct autofs_point *ap, #define PARSE_MAX_BUF KEY_MAX_LEN + MAPENT_MAX_LEN + 2 int lookup_nss_read_master(struct master *master, time_t age); -int lookup_nss_read_map(struct autofs_point *ap, time_t age); +int lookup_nss_read_map(struct autofs_point *ap, struct map_source *source, time_t age); int lookup_enumerate(struct autofs_point *ap, int (*fn)(struct autofs_point *,struct mapent *, int), time_t now); int lookup_ghost(struct autofs_point *ap); -int lookup_nss_mount(struct autofs_point *ap, const char *name, int name_len); +int lookup_nss_mount(struct autofs_point *ap, struct map_source *source, const char *name, int name_len); void lookup_close_lookup(struct autofs_point *ap); int lookup_prune_cache(struct autofs_point *ap, time_t age); struct mapent *lookup_source_valid_mapent(struct autofs_point *ap, const char *key, unsigned int type); --- autofs-5.0.1/include/master.h.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/include/master.h 2007-05-31 13:48:14.000000000 +0800 @@ -85,7 +85,8 @@ void master_free_map_source(struct map_s struct map_source * master_find_source_instance(struct map_source *, const char *, const char *, int, const char **); struct map_source * -master_add_source_instance(struct map_source *, const char *, const char *, time_t); +master_add_source_instance(struct map_source *, const char *, const char *, time_t, int, const char **); +void send_map_update_request(struct autofs_point *); void master_source_writelock(struct master_mapent *); void master_source_readlock(struct master_mapent *); void master_source_unlock(struct master_mapent *); --- autofs-5.0.1/modules/parse_sun.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/modules/parse_sun.c 2007-05-31 13:48:14.000000000 +0800 @@ -1141,7 +1141,7 @@ int parse_mount(struct autofs_point *ap, * Not in the cache, perhaps it's a program map * or one that doesn't support enumeration */ - ret = cache_add(mc, name, mapent, time(NULL)); + ret = cache_add(mc, source, name, mapent, time(NULL)); if (ret == CHE_FAIL) { cache_unlock(mc); free(options); --- autofs-5.0.1/modules/lookup_nisplus.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/modules/lookup_nisplus.c 2007-05-31 13:48:14.000000000 +0800 @@ -234,7 +234,7 @@ int lookup_read_map(struct autofs_point mapent = ENTRY_VAL(this, 1); cache_writelock(mc); - cache_update(mc, s_key, mapent, age); + cache_update(mc, source, s_key, mapent, age); cache_unlock(mc); free(s_key); @@ -296,7 +296,7 @@ static int lookup_one(struct autofs_poin this = NIS_RES_OBJECT(result); mapent = ENTRY_VAL(this, 1); cache_writelock(mc); - ret = cache_update(mc, key, mapent, age); + ret = cache_update(mc, source, key, mapent, age); cache_unlock(mc); nis_freeresult(result); @@ -348,7 +348,7 @@ static int lookup_wild(struct autofs_poi this = NIS_RES_OBJECT(result); mapent = ENTRY_VAL(this, 1); cache_writelock(mc); - ret = cache_update(mc, "*", mapent, age); + ret = cache_update(mc, source, "*", mapent, age); cache_unlock(mc); nis_freeresult(result); @@ -366,7 +366,6 @@ static int check_map_indirect(struct aut struct mapent *me, *exists; time_t now = time(NULL); time_t t_last_read; - int need_map = 0; int ret = 0; source = ap->entry->current; @@ -375,12 +374,6 @@ static int check_map_indirect(struct aut mc = source->mc; - cache_readlock(mc); - exists = cache_lookup_distinct(mc, key); - if (exists && exists->mc != mc) - exists = NULL; - cache_unlock(mc); - master_source_current_wait(ap->entry); ap->entry->current = source; @@ -396,51 +389,62 @@ static int check_map_indirect(struct aut return NSS_STATUS_UNAVAIL; } - cache_readlock(mc); + pthread_cleanup_push(cache_lock_cleanup, mc); + cache_writelock(mc); + t_last_read = ap->exp_runfreq + 1; me = cache_lookup_first(mc); - t_last_read = me ? now - me->age : ap->exp_runfreq + 1; - cache_unlock(mc); - - if (t_last_read > ap->exp_runfreq) - if ((ret & CHE_UPDATED) || - (exists && (ret & CHE_MISSING))) - need_map = 1; + while (me) { + if (me->source == source) { + t_last_read = now - me->age; + break; + } + me = cache_lookup_next(mc, me); + } + exists = cache_lookup_distinct(mc, key); + /* Not found in the map but found in the cache */ + if (exists && exists->source == source && ret & CHE_MISSING) { + if (exists->mapent) { + free(exists->mapent); + exists->mapent = NULL; + source->stale = 1; + exists->status = 0; + } + } + pthread_cleanup_pop(1); + + if (t_last_read > ap->exp_runfreq && ret & CHE_UPDATED) + source->stale = 1; if (ret == CHE_MISSING) { int wild = CHE_MISSING; + struct mapent *we; master_source_current_wait(ap->entry); ap->entry->current = source; wild = lookup_wild(ap, ctxt); - if (wild == CHE_UPDATED || CHE_OK) - return NSS_STATUS_SUCCESS; - + /* + * Check for map change and update as needed for + * following cache lookup. + */ pthread_cleanup_push(cache_lock_cleanup, mc); cache_writelock(mc); - if (wild == CHE_MISSING) - cache_delete(mc, "*"); - - if (cache_delete(mc, key) && wild & (CHE_MISSING | CHE_FAIL)) - rmdir_path(ap, key, ap->dev); + we = cache_lookup_distinct(mc, "*"); + if (we) { + /* Wildcard entry existed and is now gone */ + if (we->source == source && wild & CHE_MISSING) { + cache_delete(mc, "*"); + source->stale = 1; + } + } else { + /* Wildcard not in map but now is */ + if (wild & (CHE_OK || CHE_UPDATED)) + source->stale = 1; + } pthread_cleanup_pop(1); - } - - /* Have parent update its map */ - if (ap->ghost && need_map) { - int status; - source->stale = 1; - - status = pthread_mutex_lock(&ap->state_mutex); - if (status) - fatal(status); - - nextstate(ap->state_pipe[1], ST_READMAP); - - status = pthread_mutex_unlock(&ap->state_mutex); - if (status) - fatal(status); + if (wild & (CHE_UPDATED || CHE_OK)) + return NSS_STATUS_SUCCESS; } if (ret == CHE_MISSING) @@ -514,7 +518,10 @@ int lookup_mount(struct autofs_point *ap cache_readlock(mc); me = cache_lookup(mc, key); - if (me && me->mapent && *me->mapent) { + /* Stale mapent => check for wildcard */ + if (me && !me->mapent) + me = cache_lookup_distinct(mc, "*"); + if (me && (me->source == source || *me->key == '/')) { mapent_len = strlen(me->mapent); mapent = alloca(mapent_len + 1); strcpy(mapent, me->mapent); @@ -535,7 +542,7 @@ int lookup_mount(struct autofs_point *ap cache_writelock(mc); me = cache_lookup_distinct(mc, key); if (!me) - rv = cache_update(mc, key, NULL, now); + rv = cache_update(mc, source, key, NULL, now); if (rv != CHE_FAIL) { me = cache_lookup_distinct(mc, key); me->status = time(NULL) + NEGATIVE_TIMEOUT; --- autofs-5.0.1/modules/lookup_file.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/modules/lookup_file.c 2007-05-31 13:48:14.000000000 +0800 @@ -551,45 +551,20 @@ static int check_self_include(const char return 0; } -static struct autofs_point * +static struct map_source * prepare_plus_include(struct autofs_point *ap, time_t age, char *key, unsigned int inc) { - struct master *master; - struct master_mapent *entry; struct map_source *current; struct map_source *source; - struct autofs_point *iap; char *type, *map, *fmt; const char *argv[2]; - int ret, argc; - unsigned int timeout = ap->exp_timeout; - unsigned int logopt = ap->logopt; - unsigned int ghost = ap->ghost; + int argc; char *buf, *tmp; current = ap->entry->current; ap->entry->current = NULL; master_source_current_signal(ap->entry); - master = ap->entry->master; - - entry = master_new_mapent(master, ap->path, ap->entry->age); - if (!entry) { - error(ap->logopt, MODPREFIX "malloc failed for entry"); - return NULL; - } - - ret = master_add_autofs_point(entry, timeout, logopt, ghost, 0); - if (!ret) { - master_free_mapent(entry); - error(ap->logopt, - MODPREFIX "failed to add autofs_point to entry"); - return NULL; - } - iap = entry->ap; - iap->kpipefd = ap->kpipefd; - set_mnt_logging(iap); - /* * TODO: * Initially just consider the passed in key to be a simple map @@ -602,7 +577,6 @@ prepare_plus_include(struct autofs_point /* skip plus */ buf = strdup(key + 1); if (!buf) { - master_free_mapent(entry); error(ap->logopt, MODPREFIX "failed to strdup key"); return NULL; } @@ -633,21 +607,23 @@ prepare_plus_include(struct autofs_point argv[0] = map; argv[1] = NULL; - source = master_add_map_source(entry, type, fmt, age, argc, argv); + source = master_find_source_instance(current, type, fmt, argc, argv); if (!source) { - master_free_mapent(entry); - free(buf); - error(ap->logopt, "failed to creat map_source"); - return NULL; + source = master_add_source_instance(current, type, fmt, age, argc, argv); + if (!source) { + free(buf); + error(ap->logopt, "failed to add included map instance"); + return NULL; + } } - source->mc = current->mc; + source->depth = current->depth + 1; if (inc) source->recurse = 1; free(buf); - return iap; + return source; } int lookup_read_map(struct autofs_point *ap, time_t age, void *context) @@ -719,7 +695,7 @@ int lookup_read_map(struct autofs_point * included map. */ if (*key == '+') { - struct autofs_point *iap; + struct map_source *inc_source; unsigned int inc; int status; @@ -730,21 +706,18 @@ int lookup_read_map(struct autofs_point master_source_current_wait(ap->entry); ap->entry->current = source; - iap = prepare_plus_include(ap, age, key, inc); - if (!iap) { + inc_source = prepare_plus_include(ap, age, key, inc); + if (!inc_source) { debug(ap->logopt, "failed to select included map %s", key); continue; } /* Gim'ee some o' that 16k stack baby !! */ - status = lookup_nss_read_map(iap, age); + status = lookup_nss_read_map(ap, inc_source, age); if (!status) warn(ap->logopt, "failed to read included map %s", key); - - master_free_mapent_sources(iap->entry, 0); - master_free_mapent(iap->entry); } else { char *s_key; @@ -753,7 +726,7 @@ int lookup_read_map(struct autofs_point continue; cache_writelock(mc); - cache_update(mc, s_key, mapent, age); + cache_update(mc, source, s_key, mapent, age); cache_unlock(mc); free(s_key); @@ -819,7 +792,7 @@ static int lookup_one(struct autofs_poin * included map. */ if (*mkey == '+') { - struct autofs_point *iap; + struct map_source *inc_source; unsigned int inc; int status; @@ -831,8 +804,8 @@ static int lookup_one(struct autofs_poin master_source_current_wait(ap->entry); ap->entry->current = source; - iap = prepare_plus_include(ap, age, mkey, inc); - if (!iap) { + inc_source = prepare_plus_include(ap, age, mkey, inc); + if (!inc_source) { debug(ap->logopt, MODPREFIX "failed to select included map %s", @@ -841,11 +814,7 @@ static int lookup_one(struct autofs_poin } /* Gim'ee some o' that 16k stack baby !! */ - status = lookup_nss_mount(iap, key, key_len); - - master_free_mapent_sources(iap->entry, 0); - master_free_mapent(iap->entry); - + status = lookup_nss_mount(ap, inc_source, key, key_len); if (status) { fclose(f); return CHE_COMPLETED; @@ -872,7 +841,7 @@ static int lookup_one(struct autofs_poin free(s_key); cache_writelock(mc); - ret = cache_update(mc, key, mapent, age); + ret = cache_update(mc, source, key, mapent, age); cache_unlock(mc); fclose(f); @@ -932,7 +901,7 @@ static int lookup_wild(struct autofs_poi continue; cache_writelock(mc); - ret = cache_update(mc, "*", mapent, age); + ret = cache_update(mc, source, "*", mapent, age); cache_unlock(mc); fclose(f); @@ -956,7 +925,6 @@ static int check_map_indirect(struct aut struct map_source *source; struct mapent_cache *mc; struct mapent *exists; - int need_map = 0; int ret = CHE_OK; source = ap->entry->current; @@ -965,12 +933,6 @@ static int check_map_indirect(struct aut mc = source->mc; - cache_readlock(mc); - exists = cache_lookup_distinct(mc, key); - if (exists && exists->mc != mc) - exists = NULL; - cache_unlock(mc); - master_source_current_wait(ap->entry); ap->entry->current = source; @@ -981,49 +943,53 @@ static int check_map_indirect(struct aut if (ret == CHE_FAIL) return NSS_STATUS_NOTFOUND; - if ((ret & CHE_UPDATED) || - (exists && (ret & CHE_MISSING))) - need_map = 1; + if (ret & CHE_UPDATED) + source->stale = 1; + + pthread_cleanup_push(cache_lock_cleanup, mc); + cache_writelock(mc); + exists = cache_lookup_distinct(mc, key); + /* Not found in the map but found in the cache */ + if (exists && exists->source == source && ret & CHE_MISSING) { + if (exists->mapent) { + free(exists->mapent); + exists->mapent = NULL; + exists->status = 0; + source->stale = 1; + } + } + pthread_cleanup_pop(1); if (ret == CHE_MISSING) { + struct mapent *we; int wild = CHE_MISSING; master_source_current_wait(ap->entry); ap->entry->current = source; wild = lookup_wild(ap, ctxt); - if (wild == CHE_COMPLETED || CHE_UPDATED || CHE_OK) - return NSS_STATUS_SUCCESS; -/* - if (wild == CHE_FAIL) - return NSS_STATUS_NOTFOUND; -*/ + /* + * Check for map change and update as needed for + * following cache lookup. + */ pthread_cleanup_push(cache_lock_cleanup, mc); cache_writelock(mc); - if (wild == CHE_MISSING) - cache_delete(mc, "*"); - - if (cache_delete(mc, key) && wild & (CHE_MISSING | CHE_FAIL)) - rmdir_path(ap, key, ap->dev); + we = cache_lookup_distinct(mc, "*"); + if (we) { + /* Wildcard entry existed and is now gone */ + if (we->source == source && (wild & CHE_MISSING)) { + cache_delete(mc, "*"); + source->stale = 1; + } + } else { + /* Wildcard not in map but now is */ + if (wild & (CHE_OK || CHE_UPDATED)) + source->stale = 1; + } pthread_cleanup_pop(1); - } - /* Have parent update its map ? */ - /* TODO: update specific map */ - if (ap->ghost && need_map) { - int status; - - source->stale = 1; - - status = pthread_mutex_lock(&ap->state_mutex); - if (status) - fatal(status); - - nextstate(ap->state_pipe[1], ST_READMAP); - - status = pthread_mutex_unlock(&ap->state_mutex); - if (status) - fatal(status); + if (wild & (CHE_OK || CHE_UPDATED)) + return NSS_STATUS_SUCCESS; } if (ret == CHE_MISSING) @@ -1113,7 +1079,10 @@ int lookup_mount(struct autofs_point *ap cache_readlock(mc); me = cache_lookup(mc, key); - if (me && me->mapent && *me->mapent) { + /* Stale mapent => check for wildcard */ + if (me && !me->mapent) + me = cache_lookup_distinct(mc, "*"); + if (me && (me->source == source || *me->key == '/')) { pthread_cleanup_push(cache_lock_cleanup, mc); mapent_len = strlen(me->mapent); mapent = alloca(mapent_len + 1); @@ -1136,7 +1105,7 @@ int lookup_mount(struct autofs_point *ap cache_writelock(mc); me = cache_lookup_distinct(mc, key); if (!me) - rv = cache_update(mc, key, NULL, now); + rv = cache_update(mc, source, key, NULL, now); if (rv != CHE_FAIL) { me = cache_lookup_distinct(mc, key); me->status = now + NEGATIVE_TIMEOUT; --- autofs-5.0.1/modules/lookup_program.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/modules/lookup_program.c 2007-05-31 13:48:14.000000000 +0800 @@ -339,7 +339,7 @@ int lookup_mount(struct autofs_point *ap } cache_writelock(mc); - ret = cache_update(mc, name, mapent, time(NULL)); + ret = cache_update(mc, source, name, mapent, time(NULL)); cache_unlock(mc); if (ret == CHE_FAIL) return NSS_STATUS_UNAVAIL; --- autofs-5.0.1/modules/lookup_userhome.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/modules/lookup_userhome.c 2007-05-31 13:48:14.000000000 +0800 @@ -78,7 +78,7 @@ int lookup_mount(struct autofs_point *ap } cache_writelock(mc); - ret = cache_update(mc, name, NULL, time(NULL)); + ret = cache_update(mc, source, name, NULL, time(NULL)); cache_unlock(mc); if (ret == CHE_FAIL) { --- autofs-5.0.1/modules/lookup_hosts.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/modules/lookup_hosts.c 2007-05-31 13:48:14.000000000 +0800 @@ -97,7 +97,7 @@ int lookup_read_map(struct autofs_point while ((host = gethostent()) != NULL) { pthread_cleanup_push(cache_lock_cleanup, mc); cache_writelock(mc); - cache_update(mc, host->h_name, NULL, age); + cache_update(mc, source, host->h_name, NULL, age); cache_unlock(mc); pthread_cleanup_pop(0); } @@ -250,7 +250,7 @@ done: debug(ap->logopt, MODPREFIX "%s -> %s", name, mapent); cache_writelock(mc); - cache_update(mc, name, mapent, now); + cache_update(mc, source, name, mapent, now); cache_unlock(mc); debug(LOGOPT_ANY, "source wait"); --- autofs-5.0.1/modules/lookup_hesiod.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/modules/lookup_hesiod.c 2007-05-31 13:48:14.000000000 +0800 @@ -154,7 +154,7 @@ int lookup_mount(struct autofs_point *ap } cache_writelock(mc); - rv = cache_update(mc, name, best_record, time(NULL)); + rv = cache_update(mc, source, name, best_record, time(NULL)); cache_unlock(mc); if (rv == CHE_FAIL) return NSS_STATUS_UNAVAIL; --- autofs-5.0.1/modules/lookup_ldap.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/modules/lookup_ldap.c 2007-05-31 13:48:14.000000000 +0800 @@ -1251,7 +1251,7 @@ static int read_one_map(struct autofs_po goto next; cache_writelock(mc); - cache_update(mc, s_key, mapent, age); + cache_update(mc, source, s_key, mapent, age); cache_unlock(mc); free(s_key); @@ -1313,6 +1313,7 @@ static int lookup_one(struct autofs_poin char *attrs[3]; int scope = LDAP_SCOPE_SUBTREE; LDAP *ldap; + struct mapent *we; unsigned int wild = 0; int ret = CHE_MISSING; @@ -1466,7 +1467,7 @@ static int lookup_one(struct autofs_poin goto next; wild = 1; cache_writelock(mc); - cache_update(mc, "*", mapent, age); + cache_update(mc, source, "*", mapent, age); cache_unlock(mc); goto next; } @@ -1476,7 +1477,7 @@ static int lookup_one(struct autofs_poin goto next; cache_writelock(mc); - ret = cache_update(mc, s_key, mapent, age); + ret = cache_update(mc, source, s_key, mapent, age); cache_unlock(mc); free(s_key); @@ -1493,10 +1494,34 @@ next: ldap_msgfree(result); unbind_ldap_connection(ldap, ctxt); + /* Failed to find wild entry, update cache if needed */ + pthread_cleanup_push(cache_lock_cleanup, mc); cache_writelock(mc); - if (!wild && cache_lookup(mc, "*")) - cache_delete(mc, "*"); - cache_unlock(mc); + we = cache_lookup_distinct(mc, "*"); + if (we) { + /* Wildcard entry existed and is now gone */ + if (we->source == source && !wild) { + cache_delete(mc, "*"); + source->stale = 1; + } + } else { + /* Wildcard not in map but now is */ + if (wild) + source->stale = 1; + } + /* Not found in the map but found in the cache */ + if (ret == CHE_MISSING) { + struct mapent *exists = cache_lookup_distinct(mc, qKey); + if (exists && exists->source == source) { + if (exists->mapent) { + free(exists->mapent); + exists->mapent = NULL; + source->stale = 1; + exists->status = 0; + } + } + } + pthread_cleanup_pop(1); return ret; } @@ -1507,10 +1532,10 @@ static int check_map_indirect(struct aut { struct map_source *source; struct mapent_cache *mc; - struct mapent *me, *exists; + struct mapent *me; time_t now = time(NULL); time_t t_last_read; - int ret, cur_state, need_map = 0; + int ret, cur_state; source = ap->entry->current; ap->entry->current = NULL; @@ -1518,12 +1543,6 @@ static int check_map_indirect(struct aut mc = source->mc; - cache_readlock(mc); - exists = cache_lookup_distinct(mc, key); - if (exists && exists->mc != mc) - exists = NULL; - cache_unlock(mc); - master_source_current_wait(ap->entry); ap->entry->current = source; @@ -1535,44 +1554,28 @@ static int check_map_indirect(struct aut } pthread_setcancelstate(cur_state, NULL); + /* + * Check for map change and update as needed for + * following cache lookup. + */ cache_readlock(mc); + t_last_read = ap->exp_runfreq + 1; me = cache_lookup_first(mc); - t_last_read = me ? now - me->age : ap->exp_runfreq + 1; - cache_unlock(mc); - - if (t_last_read > ap->exp_runfreq) { - if ((ret & CHE_UPDATED) || - (exists && (ret & CHE_MISSING))) - need_map = 1; - } - - if (ret == CHE_MISSING && exists) { - pthread_cleanup_push(cache_lock_cleanup, mc); - cache_writelock(mc); - if (cache_delete(mc, key)) - rmdir_path(ap, key, ap->dev); - pthread_cleanup_pop(1); + while (me) { + if (me->source == source) { + t_last_read = now - me->age; + break; + } + me = cache_lookup_next(mc, me); } + cache_unlock(mc); - /* Have parent update its map */ - if (ap->ghost && need_map) { - int status; - + if (t_last_read > ap->exp_runfreq && ret & CHE_UPDATED) source->stale = 1; - status = pthread_mutex_lock(&ap->state_mutex); - if (status) - fatal(status); - - nextstate(ap->state_pipe[1], ST_READMAP); - - status = pthread_mutex_unlock(&ap->state_mutex); - if (status) - fatal(status); - } - cache_readlock(mc); - if (ret == CHE_MISSING && !cache_lookup(mc, "*")) { + me = cache_lookup_distinct(mc, "*"); + if (ret == CHE_MISSING && (!me || me->source != source)) { cache_unlock(mc); return NSS_STATUS_NOTFOUND; } @@ -1648,7 +1651,10 @@ int lookup_mount(struct autofs_point *ap cache_readlock(mc); me = cache_lookup(mc, key); - if (me && me->mapent && *me->mapent) { + /* Stale mapent => check for wildcard */ + if (me && !me->mapent) + me = cache_lookup_distinct(mc, "*"); + if (me && (me->source == source || *me->key == '/')) { mapent_len = strlen(me->mapent); mapent = alloca(mapent_len + 1); strcpy(mapent, me->mapent); @@ -1670,7 +1676,7 @@ int lookup_mount(struct autofs_point *ap cache_writelock(mc); me = cache_lookup_distinct(mc, key); if (!me) - rv = cache_update(mc, key, NULL, now); + rv = cache_update(mc, source, key, NULL, now); if (rv != CHE_FAIL) { me = cache_lookup_distinct(mc, key); me->status = now + NEGATIVE_TIMEOUT; --- autofs-5.0.1/modules/lookup_yp.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/modules/lookup_yp.c 2007-05-31 13:48:14.000000000 +0800 @@ -272,7 +272,7 @@ int yp_all_callback(int status, char *yp *(mapent + vallen) = '\0'; cache_writelock(mc); - ret = cache_update(mc, key, mapent, age); + ret = cache_update(mc, source, key, mapent, age); cache_unlock(mc); free(key); @@ -389,7 +389,7 @@ static int lookup_one(struct autofs_poin } cache_writelock(mc); - ret = cache_update(mc, key, mapent, age); + ret = cache_update(mc, source, key, mapent, age); cache_unlock(mc); free(mapent); @@ -441,7 +441,7 @@ static int lookup_wild(struct autofs_poi } cache_writelock(mc); - ret = cache_update(mc, "*", mapent, age); + ret = cache_update(mc, source, "*", mapent, age); cache_unlock(mc); free(mapent); @@ -456,7 +456,6 @@ static int check_map_indirect(struct aut struct mapent_cache *mc; struct mapent *exists; unsigned int map_order; - int need_map = 0; int ret = 0; source = ap->entry->current; @@ -465,12 +464,6 @@ static int check_map_indirect(struct aut mc = source->mc; - cache_readlock(mc); - exists = cache_lookup_distinct(mc, key); - if (exists && exists->mc != mc) - exists = NULL; - cache_unlock(mc); - master_source_current_wait(ap->entry); ap->entry->current = source; @@ -490,44 +483,53 @@ static int check_map_indirect(struct aut map_order = get_map_order(ctxt->domainname, ctxt->mapname); if (map_order > ctxt->order) { ctxt->order = map_order; - need_map = 1; + source->stale = 1; + } + + pthread_cleanup_push(cache_lock_cleanup, mc); + cache_writelock(mc); + exists = cache_lookup_distinct(mc, key); + /* Not found in the map but found in the cache */ + if (exists && exists->source == source && ret & CHE_MISSING) { + if (exists->mapent) { + free(exists->mapent); + exists->mapent = NULL; + source->stale = 1; + exists->status = 0; + } } + pthread_cleanup_pop(1); if (ret == CHE_MISSING) { + struct mapent *we; int wild = CHE_MISSING; master_source_current_wait(ap->entry); ap->entry->current = source; wild = lookup_wild(ap, ctxt); - if (wild == CHE_UPDATED || CHE_OK) - return NSS_STATUS_SUCCESS; - + /* + * Check for map change and update as needed for + * following cache lookup. + */ pthread_cleanup_push(cache_lock_cleanup, mc); cache_writelock(mc); - if (wild == CHE_MISSING) - cache_delete(mc, "*"); - - if (cache_delete(mc, key) && wild & (CHE_MISSING | CHE_FAIL)) - rmdir_path(ap, key, ap->dev); + we = cache_lookup_distinct(mc, "*"); + if (we) { + /* Wildcard entry existed and is now gone */ + if (we->source == source && (wild & CHE_MISSING)) { + cache_delete(mc, "*"); + source->stale = 1; + } + } else { + /* Wildcard not in map but now is */ + if (wild & (CHE_OK || CHE_UPDATED)) + source->stale = 1; + } pthread_cleanup_pop(1); - } - - /* Have parent update its map if needed */ - if (ap->ghost && need_map) { - int status; - source->stale = 1; - - status = pthread_mutex_lock(&ap->state_mutex); - if (status) - fatal(status); - - nextstate(ap->state_pipe[1], ST_READMAP); - - status = pthread_mutex_unlock(&ap->state_mutex); - if (status) - fatal(status); + if (wild & (CHE_OK || CHE_UPDATED)) + return NSS_STATUS_SUCCESS; } if (ret == CHE_MISSING) @@ -602,7 +604,10 @@ int lookup_mount(struct autofs_point *ap cache_readlock(mc); me = cache_lookup(mc, key); - if (me && me->mapent && *me->mapent) { + /* Stale mapent => check for wildcard */ + if (me && !me->mapent) + me = cache_lookup_distinct(mc, "*"); + if (me && (me->source == source || *me->key == '/')) { mapent_len = strlen(me->mapent); mapent = alloca(mapent_len + 1); strcpy(mapent, me->mapent); @@ -623,7 +628,7 @@ int lookup_mount(struct autofs_point *ap cache_writelock(mc); me = cache_lookup_distinct(mc, key); if (!me) - rv = cache_update(mc, key, NULL, now); + rv = cache_update(mc, source, key, NULL, now); if (rv != CHE_FAIL) { me = cache_lookup_distinct(mc, key); me->status = now + NEGATIVE_TIMEOUT; --- autofs-5.0.1/daemon/direct.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/daemon/direct.c 2007-05-31 13:48:14.000000000 +0800 @@ -526,7 +526,7 @@ int mount_autofs_direct(struct autofs_po return -1; /* TODO: check map type */ - if (lookup_nss_read_map(ap, now)) + if (lookup_nss_read_map(ap, NULL, now)) lookup_prune_cache(ap, now); else { error(ap->logopt, "failed to read direct map"); @@ -1413,7 +1413,7 @@ static void *do_mount_direct(void *arg) } cont: - status = lookup_nss_mount(ap, mt->name, strlen(mt->name)); + status = lookup_nss_mount(ap, NULL, mt->name, strlen(mt->name)); /* * Direct mounts are always a single mount. If it fails there's * nothing to undo so just complain --- autofs-5.0.1/daemon/indirect.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/daemon/indirect.c 2007-05-31 13:48:14.000000000 +0800 @@ -261,7 +261,7 @@ int mount_autofs_indirect(struct autofs_ return -1; /* TODO: read map, determine map type is OK */ - if (lookup_nss_read_map(ap, now)) + if (lookup_nss_read_map(ap, NULL, now)) lookup_prune_cache(ap, now); else { error(ap->logopt, "failed to read map for %s", ap->path); @@ -884,7 +884,7 @@ static void *do_mount_indirect(void *arg free(tsv); } cont: - status = lookup_nss_mount(ap, mt->name, mt->len); + status = lookup_nss_mount(ap, NULL, mt->name, mt->len); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &state); if (status) { send_ready(ap->ioctlfd, mt->wait_queue_token); --- autofs-5.0.1/daemon/state.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/daemon/state.c 2007-05-31 13:48:14.000000000 +0800 @@ -378,7 +378,7 @@ static void *do_readmap(void *arg) pthread_cleanup_push(do_readmap_cleanup, ra); - status = lookup_nss_read_map(ap, now); + status = lookup_nss_read_map(ap, NULL, now); if (!status) pthread_exit(NULL); --- autofs-5.0.1/daemon/lookup.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/daemon/lookup.c 2007-05-31 13:48:14.000000000 +0800 @@ -261,11 +261,16 @@ static int do_read_map(struct autofs_poi if (!ap->ghost && ap->type != LKP_DIRECT) return NSS_STATUS_SUCCESS; + if (!map->stale) + return NSS_STATUS_SUCCESS; + master_source_current_wait(ap->entry); ap->entry->current = map; status = lookup->lookup_read_map(ap, age, lookup->context); + map->stale = 0; + /* * For maps that don't support enumeration return success * and do whatever we must to have autofs function with an @@ -302,7 +307,9 @@ static int read_file_source_instance(str instance = master_find_source_instance(map, type, format, 0, NULL); if (!instance) { - instance = master_add_source_instance(map, type, format, age); + int argc = map->argc; + const char **argv = map->argv; + instance = master_add_source_instance(map, type, format, age, argc, argv); if (!instance) return NSS_STATUS_UNAVAIL; instance->recurse = map->recurse; @@ -321,7 +328,9 @@ static int read_source_instance(struct a instance = master_find_source_instance(map, type, format, 0, NULL); if (!instance) { - instance = master_add_source_instance(map, type, format, age); + int argc = map->argc; + const char **argv = map->argv; + instance = master_add_source_instance(map, type, format, age, argc, argv); if (!instance) return NSS_STATUS_UNAVAIL; instance->recurse = map->recurse; @@ -343,7 +352,6 @@ static enum nsswitch_status read_map_sou struct autofs_point *ap, struct map_source *map, time_t age) { enum nsswitch_status result; - struct map_source *instance; struct map_source tmap; char *path; @@ -363,15 +371,6 @@ static enum nsswitch_status read_map_sou return NSS_STATUS_NOTFOUND; } - instance = master_find_source_instance(map, - "file", map->format, map->argc, map->argv); - if (!instance) - instance = master_find_source_instance(map, - "program", map->format, map->argc, map->argv); - - if (instance) - return read_file_source_instance(ap, map, age); - this->source[4] = '\0'; tmap.type = this->source; tmap.format = map->format; @@ -412,10 +411,12 @@ static enum nsswitch_status read_map_sou result = read_file_source_instance(ap, &tmap, age); pthread_cleanup_pop(1); + map->instance = tmap.instance; + return result; } -int lookup_nss_read_map(struct autofs_point *ap, time_t age) +int lookup_nss_read_map(struct autofs_point *ap, struct map_source *source, time_t age) { struct master_mapent *entry = ap->entry; struct list_head nsslist; @@ -432,7 +433,10 @@ int lookup_nss_read_map(struct autofs_po */ pthread_cleanup_push(master_source_lock_cleanup, entry); master_source_readlock(entry); - map = entry->maps; + if (source) + map = source; + else + map = entry->maps; while (map) { /* Is map source up to date or no longer valid */ if (!map->stale || entry->age > map->age) { @@ -647,7 +651,9 @@ static int lookup_name_file_source_insta instance = master_find_source_instance(map, type, format, 0, NULL); if (!instance) { - instance = master_add_source_instance(map, type, format, age); + int argc = map->argc; + const char **argv = map->argv; + instance = master_add_source_instance(map, type, format, age, argc, argv); if (!instance) return NSS_STATUS_NOTFOUND; instance->recurse = map->recurse; @@ -667,7 +673,9 @@ static int lookup_name_source_instance(s instance = master_find_source_instance(map, type, format, 0, NULL); if (!instance) { - instance = master_add_source_instance(map, type, format, age); + int argc = map->argc; + const char **argv = map->argv; + instance = master_add_source_instance(map, type, format, age, argc, argv); if (!instance) return NSS_STATUS_NOTFOUND; instance->recurse = map->recurse; @@ -682,7 +690,6 @@ static enum nsswitch_status lookup_map_n const char *name, int name_len) { enum nsswitch_status result; - struct map_source *instance; struct map_source tmap; char *path; @@ -702,13 +709,6 @@ static enum nsswitch_status lookup_map_n return NSS_STATUS_NOTFOUND; } - instance = master_find_source_instance(map, "file", map->format, 0, NULL); - if (!instance) - instance = master_find_source_instance(map, "program", map->format, 0, NULL); - - if (instance) - return lookup_name_file_source_instance(ap, map, name, name_len); - this->source[4] = '\0'; tmap.type = this->source; tmap.format = map->format; @@ -746,13 +746,15 @@ static enum nsswitch_status lookup_map_n result = lookup_name_file_source_instance(ap, &tmap, name, name_len); + map->instance = tmap.instance; + /* path is freed in free_argv */ free_argv(tmap.argc, tmap.argv); return result; } -int lookup_nss_mount(struct autofs_point *ap, const char *name, int name_len) +int lookup_nss_mount(struct autofs_point *ap, struct map_source *source, const char *name, int name_len) { struct master_mapent *entry = ap->entry; struct list_head nsslist; @@ -769,7 +771,10 @@ int lookup_nss_mount(struct autofs_point */ pthread_cleanup_push(master_source_lock_cleanup, entry); master_source_readlock(entry); - map = entry->maps; + if (source) + map = source; + else + map = entry->maps; while (map) { /* * Only consider map sources that have been read since @@ -850,11 +855,28 @@ int lookup_nss_mount(struct autofs_point map = map->next; } + send_map_update_request(ap); pthread_cleanup_pop(1); return !result; } +static void lookup_close_lookup_instances(struct map_source *map) +{ + struct map_source *instance; + + instance = map->instance; + while (instance) { + lookup_close_lookup_instances(instance); + instance = instance->next; + } + + if (map->lookup) { + close_lookup(map->lookup); + map->lookup = NULL; + } +} + void lookup_close_lookup(struct autofs_point *ap) { struct map_source *map; @@ -864,21 +886,7 @@ void lookup_close_lookup(struct autofs_p return; while (map) { - struct map_source *instance; - - instance = map->instance; - while (instance) { - if (instance->lookup) { - close_lookup(instance->lookup); - instance->lookup = NULL; - } - instance = instance->next; - } - - if (map->lookup) { - close_lookup(map->lookup); - map->lookup = NULL; - } + lookup_close_lookup_instances(map); map = map->next; } return; @@ -919,6 +927,7 @@ int lookup_prune_cache(struct autofs_poi map = entry->maps; while (map) { + /* Is the map stale */ if (!map->stale) { map = map->next; continue; @@ -950,7 +959,7 @@ int lookup_prune_cache(struct autofs_poi if (is_mounted(_PATH_MOUNTED, path, MNTS_REAL)) { debug(ap->logopt, - "prune posponed, %s is mounted", path); + "prune check posponed, %s mounted", path); free(key); free(path); continue; --- autofs-5.0.1/lib/master.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/lib/master.c 2007-05-31 13:48:14.000000000 +0800 @@ -292,10 +292,8 @@ struct map_source *master_find_map_sourc return source; } -void master_free_map_source(struct map_source *source, unsigned int free_cache) +static void __master_free_map_source(struct map_source *source, unsigned int free_cache) { - int status; - if (source->type) free(source->type); if (source->format) @@ -318,20 +316,12 @@ void master_free_map_source(struct map_s if (source->instance) { struct map_source *instance, *next; - status = pthread_mutex_lock(&instance_mutex); - if (status) - fatal(status); - instance = source->instance; while (instance) { next = instance->next; - master_free_map_source(instance, 0); + __master_free_map_source(instance, 0); instance = next; } - - status = pthread_mutex_unlock(&instance_mutex); - if (status) - fatal(status); } free(source); @@ -339,6 +329,21 @@ void master_free_map_source(struct map_s return; } +void master_free_map_source(struct map_source *source, unsigned int free_cache) +{ + int status; + + status = pthread_mutex_lock(&instance_mutex); + if (status) + fatal(status); + + __master_free_map_source(source, free_cache); + + status = pthread_mutex_unlock(&instance_mutex); + if (status) + fatal(status); +} + struct map_source *master_find_source_instance(struct map_source *source, const char *type, const char *format, int argc, const char **argv) { struct map_source *map; @@ -378,19 +383,15 @@ next: } struct map_source * -master_add_source_instance(struct map_source *source, const char *type, const char *format, time_t age) +master_add_source_instance(struct map_source *source, const char *type, const char *format, time_t age, int argc, const char **argv) { struct map_source *instance; struct map_source *new; char *ntype, *nformat; - const char **tmpargv, *name; + const char **tmpargv; int status; - if (!type) - return NULL; - - instance = master_find_source_instance(source, - type, format, source->argc, source->argv); + instance = master_find_source_instance(source, type, format, argc, argv); if (instance) return instance; @@ -399,12 +400,14 @@ master_add_source_instance(struct map_so return NULL; memset(new, 0, sizeof(struct map_source)); - ntype = strdup(type); - if (!ntype) { - master_free_map_source(new, 0); - return NULL; + if (type) { + ntype = strdup(type); + if (!ntype) { + master_free_map_source(new, 0); + return NULL; + } + new->type = ntype; } - new->type = ntype; if (format) { nformat = strdup(format); @@ -418,17 +421,16 @@ master_add_source_instance(struct map_so new->age = age; new->master_line = 0; new->mc = source->mc; + new->stale = 1; - tmpargv = copy_argv(source->argc, source->argv); + tmpargv = copy_argv(argc, argv); if (!tmpargv) { master_free_map_source(new, 0); return NULL; } - new->argc = source->argc; + new->argc = argc; new->argv = tmpargv; - name = new->argv[0]; - status = pthread_mutex_lock(&instance_mutex); if (status) fatal(status); @@ -451,6 +453,71 @@ master_add_source_instance(struct map_so return new; } +static void check_stale_instances(struct map_source *source) +{ + struct map_source *map; + + if (!source) + return; + + map = source->instance; + while (map) { + if (map->stale) { + source->stale = 1; + break; + } + check_stale_instances(map->instance); + map = map->next; + } + + return; +} + +void send_map_update_request(struct autofs_point *ap) +{ + struct map_source *map; + int status, need_update = 0; + + if (!ap->ghost) + return; + + status = pthread_mutex_lock(&instance_mutex); + if (status) + fatal(status); + + map = ap->entry->maps; + while (map) { + check_stale_instances(map); + map = map->next; + } + + map = ap->entry->maps; + while (map) { + if (map->stale) { + need_update = 1; + break; + } + map = map->next; + } + + status = pthread_mutex_unlock(&instance_mutex); + if (status) + fatal(status); + + if (!need_update) + return; + + status = pthread_mutex_lock(&ap->state_mutex); + if (status) + fatal(status); + nextstate(ap->state_pipe[1], ST_READMAP); + status = pthread_mutex_unlock(&ap->state_mutex); + if (status) + fatal(status); + + return; +} + void master_source_writelock(struct master_mapent *entry) { int status; --- autofs-5.0.1/lib/master_parse.y.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/lib/master_parse.y 2007-05-31 13:48:14.000000000 +0800 @@ -533,7 +533,7 @@ int master_parse_entry(const char *buffe /* Add null map entries to the null map cache */ if (type && !strcmp(type, "null")) { cache_writelock(nc); - cache_update(nc, path, NULL, lineno); + cache_update(nc, NULL, path, NULL, lineno); cache_unlock(nc); local_free_vars(); return 1; --- autofs-5.0.1/lib/cache.c.map-update-source-only 2007-05-31 13:47:59.000000000 +0800 +++ autofs-5.0.1/lib/cache.c 2007-05-31 13:48:14.000000000 +0800 @@ -509,7 +509,7 @@ struct mapent *cache_partial_match(struc } /* cache must be write locked by caller */ -int cache_add(struct mapent_cache *mc, const char *key, const char *mapent, time_t age) +int cache_add(struct mapent_cache *mc, struct map_source *ms, const char *key, const char *mapent, time_t age) { struct mapent *me, *existing = NULL; char *pkey, *pent; @@ -541,6 +541,7 @@ int cache_add(struct mapent_cache *mc, c me->age = age; me->status = 0; me->mc = mc; + me->source = ms; INIT_LIST_HEAD(&me->ino_index); INIT_LIST_HEAD(&me->multi_list); me->multi = NULL; @@ -618,7 +619,7 @@ int cache_add_offset(struct mapent_cache if (me && me != owner) return CHE_DUPLICATE; - ret = cache_add(mc, key, mapent, age); + ret = cache_add(mc, owner->source, key, mapent, age); if (ret == CHE_FAIL) { warn(LOGOPT_ANY, "failed to add key %s to cache", key); return CHE_FAIL; @@ -686,7 +687,7 @@ int cache_set_parents(struct mapent *mm) } /* cache must be write locked by caller */ -int cache_update(struct mapent_cache *mc, const char *key, const char *mapent, time_t age) +int cache_update(struct mapent_cache *mc, struct map_source *ms, const char *key, const char *mapent, time_t age) { struct mapent *me = NULL; char *pent; @@ -694,7 +695,7 @@ int cache_update(struct mapent_cache *mc me = cache_lookup(mc, key); if (!me || (*me->key == '*' && *key != '*')) { - ret = cache_add(mc, key, mapent, age); + ret = cache_add(mc, ms, key, mapent, age); if (!ret) { debug(LOGOPT_NONE, "failed for %s", key); return CHE_FAIL; @@ -705,9 +706,11 @@ int cache_update(struct mapent_cache *mc if (me->age == age) return CHE_OK; - if (!mapent) + if (!mapent) { + if (me->mapent) + free(me->mapent); me->mapent = NULL; - else if (!me->mapent || strcmp(me->mapent, mapent) != 0) { + } else if (!me->mapent || strcmp(me->mapent, mapent) != 0) { pent = malloc(strlen(mapent) + 1); if (pent == NULL) return CHE_FAIL; Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- autofs.spec 17 Apr 2007 13:04:10 -0000 1.179 +++ autofs.spec 31 May 2007 06:07:48 -0000 1.180 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs %define version 5.0.1 -%define release 0.rc3.29 +%define release 0.rc3.30 Version: %{version} Release: %{release} Epoch: 1 @@ -34,6 +34,7 @@ Patch21: autofs-5.0.1-localfs-label-check.patch Patch22: autofs-5.0.1-disable-exports-check.patch Patch23: autofs-5.0.1-cmd-global-options-fix.patch +Patch24: autofs-5.0.1-rc3-map-update-source-only.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel Conflicts: kernel < 2.6.17 @@ -99,6 +100,7 @@ %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -155,6 +157,9 @@ %{_libdir}/autofs/* %changelog +* Thu May 31 2007 Ian Kent - 5.0.1-0.rc3.30 +- fix wildcard map handling and improve nsswitch source map re-reading. + * Tue Apr 17 2007 Ian Kent - 5.0.1-0.rc3.29 - upstream fix for filesystem is local check. - disable exports access control check (bz 203277). From fedora-cvs-commits at redhat.com Thu May 31 08:11:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 04:11:39 -0400 Subject: rpms/elinks/FC-6 elinks-0.11.1-loadpo.patch, NONE, 1.1 elinks.spec, 1.39, 1.40 Message-ID: <200705310811.l4V8Bdlg002386@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/elinks/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv2369 Modified Files: elinks.spec Added Files: elinks-0.11.1-loadpo.patch Log Message: * Thu May 31 2007 Karel Zak 0.11.1-5.2 - fix #235411: CVE-2007-2027 elinks tries to load .po files from a non-absolute path elinks-0.11.1-loadpo.patch: loadmsgcat.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE elinks-0.11.1-loadpo.patch --- --- elinks-0.11.1/src/intl/gettext/loadmsgcat.c.kzak 2007-05-31 09:05:02.000000000 +0200 +++ elinks-0.11.1/src/intl/gettext/loadmsgcat.c 2007-05-31 09:04:55.000000000 +0200 @@ -212,6 +212,11 @@ unsigned char *slash = strrchr(program.path, '/'); size_t dirnamelen = (slash ? slash - program.path + 1 : 0); + /* Check if elinks is being run from the source tree. */ + if (dirnamelen < 4 + || strncmp(program.path + dirnamelen - 4, "src", 3)) + return NULL; + if ((dirnamelen && !add_bytes_to_string(str, program.path, dirnamelen)) || !add_to_string(str, "../po/") || !add_bytes_to_string(str, Index: elinks.spec =================================================================== RCS file: /cvs/dist/rpms/elinks/FC-6/elinks.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- elinks.spec 21 Nov 2006 00:38:42 -0000 1.39 +++ elinks.spec 31 May 2007 08:11:37 -0000 1.40 @@ -2,7 +2,7 @@ Name: elinks Summary: A text-mode Web browser. Version: 0.11.1 -Release: 5.1 +Release: 5.2 Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2 Group: Applications/Internet URL: http://elinks.or.cz/ @@ -31,6 +31,7 @@ Patch6: elinks-0.11.0-union.patch Patch7: elinks-0.11.1-negotiate.patch Patch8: elinks-0.11.1-badproxy.patch +Patch9: elinks-0.11.1-loadpo.patch %description Links is a text-based Web browser. Links does not display any images, @@ -58,6 +59,8 @@ %patch7 -p1 -b .negotiate # Fix #210103 - elinks crashes when given bad HTTP_PROXY %patch8 -p1 -b .badproxy +# Fix #235411: CVE-2007-2027 elinks tries to load .po files from a non-absolute path +%patch9 -p1 -b .loadpo %build #aclocal @@ -93,6 +96,9 @@ %{_mandir}/man5/* %changelog +* Thu May 31 2007 Karel Zak 0.11.1-5.2 +- fix #235411: CVE-2007-2027 elinks tries to load .po files from a non-absolute path + * Tue Nov 21 2006 Karel Zak 0.11.1-5.1 - fix #215734: CVE-2006-5925 elinks smb protocol arbitrary file access From fedora-cvs-commits at redhat.com Thu May 31 08:37:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 04:37:27 -0400 Subject: rpms/lha/FC-5 lha-114i-CVE-2006-433x.patch, NONE, 1.1 lha.spec, 1.17, 1.18 Message-ID: <200705310837.l4V8bRVB002699@cvs.devel.redhat.com> Author: tsmetana Update of /cvs/dist/rpms/lha/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv2682 Modified Files: lha.spec Added Files: lha-114i-CVE-2006-433x.patch Log Message: Resolves #220596 lha-114i-CVE-2006-433x.patch: huf.c | 12 ++++++------ lha_macro.h | 2 ++ maketbl.c | 28 ++++++++++++++++++++++------ 3 files changed, 30 insertions(+), 12 deletions(-) --- NEW FILE lha-114i-CVE-2006-433x.patch --- diff -urp lha-114i.orig/src/huf.c lha-114i/src/huf.c --- lha-114i.orig/src/huf.c 2006-12-22 12:45:52.000000000 +0100 +++ lha-114i/src/huf.c 2006-12-22 12:54:37.000000000 +0100 @@ -332,7 +332,7 @@ read_pt_len(nn, nbit, i_special) } else { i = 0; - while (i < n) { + while (i < MIN(n, NPT)) { c = bitbuf >> (16 - 3); if (c == 7) { unsigned short mask = 1 << (16 - 4); @@ -345,7 +345,7 @@ read_pt_len(nn, nbit, i_special) pt_len[i++] = c; if (i == i_special) { c = getbits(2); - while (--c >= 0) + while (--c >= 0 && i < NPT) pt_len[i++] = 0; } } @@ -370,7 +370,7 @@ read_c_len( /* void */ ) c_table[i] = c; } else { i = 0; - while (i < n) { + while (i < MIN(n,NC)) { c = pt_table[bitbuf >> (16 - 8)]; if (c >= NT) { unsigned short mask = 1 << (16 - 9); @@ -380,7 +380,7 @@ read_c_len( /* void */ ) else c = left[c]; mask >>= 1; - } while (c >= NT); + } while (c >= NT && (mask || c != left[c])); /* CVE-2006-4338 */ } fillbuf(pt_len[c]); if (c <= 2) { @@ -427,7 +427,7 @@ decode_c_st1( /*void*/ ) else j = left[j]; mask >>= 1; - } while (j >= NC); + } while (j >= NC && (mask || j != left[j])); /* CVE-2006-4338 */ fillbuf(c_len[j] - 12); } return j; @@ -451,7 +451,7 @@ decode_p_st1( /* void */ ) else j = left[j]; mask >>= 1; - } while (j >= np); + } while (j >= np && (mask || j != left[j])); /* CVE-2006-4338 */ fillbuf(pt_len[j] - 8); } if (j != 0) diff -urp lha-114i.orig/src/lha_macro.h lha-114i/src/lha_macro.h --- lha-114i.orig/src/lha_macro.h 2006-12-22 12:45:52.000000000 +0100 +++ lha-114i/src/lha_macro.h 2006-12-22 12:51:37.000000000 +0100 @@ -324,6 +324,8 @@ typedef short node; /* Individual macro define */ /* ------------------------------------------------------------------------ */ +#define MIN(a,b) ((a) <= (b) ? (a) : (b)) + /* from crcio.c */ #define CRCPOLY 0xA001 /* CRC-16 */ #define UPDATE_CRC(c) crc = crctable[(crc ^ (c)) & 0xFF] ^ (crc >> CHAR_BIT) diff -urp lha-114i.orig/src/maketbl.c lha-114i/src/maketbl.c --- lha-114i.orig/src/maketbl.c 2006-12-22 12:45:52.000000000 +0100 +++ lha-114i/src/maketbl.c 2006-12-22 12:51:01.000000000 +0100 @@ -32,8 +32,15 @@ make_table(nchar, bitlen, tablebits, tab } /* count */ - for (i = 0; i < nchar; i++) - count[bitlen[i]]++; + for (i = 0; i < nchar; i++) { + if (bitlen[i] > 16) { + /* CVE-2006-4335 */ + error("Bad table (case a)"); + exit(1); + } + else + count[bitlen[i]]++; + } /* calculate first code */ total = 0; @@ -41,8 +48,10 @@ make_table(nchar, bitlen, tablebits, tab start[i] = total; total += weight[i] * count[i]; } - if ((total & 0xffff) != 0) - error("make_table()", "Bad table (5)\n"); + if ((total & 0xffff) != 0 || tablebits > 16) { /* 16 for weight below */ + error("make_table(): Bad table (case b)"); + exit(1); + } /* shift data for make table. */ m = 16 - tablebits; @@ -53,7 +62,7 @@ make_table(nchar, bitlen, tablebits, tab /* initialize */ j = start[tablebits + 1] >> m; - k = 1 << tablebits; + k = MIN(1 << tablebits, 4096); if (j != 0) for (i = j; i < k; i++) table[i] = 0; @@ -66,12 +75,19 @@ make_table(nchar, bitlen, tablebits, tab l = start[k] + weight[k]; if (k <= tablebits) { /* code in table */ + l = MIN(l, 4096); for (i = start[k]; i < l; i++) table[i] = j; } else { /* code not in table */ - p = &table[(i = start[k]) >> m]; + i = start[k]; + if ((i >> m) > 4096) { + /* CVE-2006-4337 */ + error("Bad table (case c)"); + exit(1); + } + p = &table[i >> m]; i <<= tablebits; n = k - tablebits; /* make tree (n length) */ Index: lha.spec =================================================================== RCS file: /cvs/dist/rpms/lha/FC-5/lha.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- lha.spec 11 Feb 2006 03:51:48 -0000 1.17 +++ lha.spec 31 May 2007 08:37:25 -0000 1.18 @@ -1,7 +1,7 @@ Summary: An archiving and compression utility for LHarc format archives. Name: lha Version: 1.14i -Release: 19.2.1 +Release: 20 License: freeware Group: Applications/Archiving Source: http://www2m.biglobe.ne.jp/~dolphin/lha/prog/lha-114i.tar.gz @@ -10,6 +10,7 @@ Patch2: lha-114i-sec.patch Patch3: lha-dir_length_bounds_check.patch Patch4: lha-114i-sec2.patch +Patch5: lha-114i-CVE-2006-433x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description @@ -29,6 +30,7 @@ %patch2 -p1 -b .sec %patch3 -p1 -b .sec %patch4 -p1 -b .sec +%patch5 -p1 -b .cve %build make @@ -49,6 +51,9 @@ %{_bindir}/lha %changelog +* Thu May 31 2007 Tomas Smetana - 1.14i-20 +- fix #220596 CVE-2006-4335/7/8 multiple vulnerabilities in lha + * Fri Feb 10 2006 Jesse Keating - 1.14i-19.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu May 31 09:33:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 05:33:37 -0400 Subject: rpms/logrotate/FC-5 logrotate-3.7.3-logfn.patch, NONE, 1.1 logrotate.spec, 1.44, 1.45 Message-ID: <200705310933.l4V9XbMC003460@cvs.devel.redhat.com> Author: tsmetana Update of /cvs/dist/rpms/logrotate/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3444 Modified Files: logrotate.spec Added Files: logrotate-3.7.3-logfn.patch Log Message: Related: #241766 logrotate-3.7.3-logfn.patch: logrotate.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE logrotate-3.7.3-logfn.patch --- --- logrotate-3.7.3/logrotate.c.logfn 2007-05-31 11:26:37.000000000 +0200 +++ logrotate-3.7.3/logrotate.c 2007-05-31 11:26:54.000000000 +0200 @@ -148,7 +148,7 @@ } if (!fork()) { - execl("/bin/sh", "sh", "-c", script, NULL); + execl("/bin/sh", "sh", "-c", script, script, logfn, NULL); exit(1); } Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/FC-5/logrotate.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- logrotate.spec 11 Feb 2006 04:25:09 -0000 1.44 +++ logrotate.spec 31 May 2007 09:33:35 -0000 1.45 @@ -5,10 +5,11 @@ Summary: Rotates, compresses, removes and mails system log files. Name: logrotate Version: 3.7.3 -Release: 2.2.1 +Release: 3 License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz +Patch1: logrotate-3.7.3-logfn.patch BuildRoot: %{_tmppath}/%{name}-%{version}.root %description @@ -24,6 +25,7 @@ %prep %setup +%patch1 -p1 -b .logfn %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \ @@ -56,6 +58,9 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Thu May 31 2007 Tomas Smetana 3.7.3-3 +- fix ignoring pre/postrotate arguments (related #241766) + * Fri Feb 10 2006 Jesse Keating - 3.7.3-2.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu May 31 09:34:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 05:34:55 -0400 Subject: rpms/logrotate/FC-6 logrotate-3.7.4-logfn.patch, NONE, 1.1 logrotate.spec, 1.57, 1.58 Message-ID: <200705310934.l4V9YtMJ003505@cvs.devel.redhat.com> Author: tsmetana Update of /cvs/dist/rpms/logrotate/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv3489 Modified Files: logrotate.spec Added Files: logrotate-3.7.4-logfn.patch Log Message: Related: #241766 logrotate-3.7.4-logfn.patch: logrotate.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE logrotate-3.7.4-logfn.patch --- --- logrotate-3.7.4/logrotate.c.logfn 2007-05-31 11:16:52.000000000 +0200 +++ logrotate-3.7.4/logrotate.c 2007-05-31 11:17:10.000000000 +0200 @@ -149,7 +149,7 @@ } if (!fork()) { - execl("/bin/sh", "sh", "-c", script, NULL); + execl("/bin/sh", "sh", "-c", script, script, logfn, NULL); exit(1); } Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/FC-6/logrotate.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- logrotate.spec 14 May 2007 12:48:44 -0000 1.57 +++ logrotate.spec 31 May 2007 09:34:53 -0000 1.58 @@ -1,7 +1,7 @@ Summary: Rotates, compresses, removes and mails system log files Name: logrotate Version: 3.7.4 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz @@ -11,6 +11,7 @@ Patch4: logrotate-widecharPath.patch Patch5: logrotate-errorConfiguration.patch Patch6: logrotate-3.7.4-cfengine.patch +Patch7: logrotate-3.7.4-logfn.patch BuildRequires: libselinux-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,6 +34,7 @@ %patch4 -p1 -b .widecharPath %patch5 -p1 -b .errorConfiguration %patch6 -p1 -b .cfengine +%patch7 -p1 -b .logfn %build make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" WITH_SELINUX=yes @@ -62,6 +64,9 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Thu May 31 2007 Tomas Smetana 3.7.4-14 +- fix ignoring pre/postrotate script arguments (related #241766) + * Mon May 14 2007 Tomas Smetana 3.7.4-13 - ignore *.cfsaved files by default (#223476) From fedora-cvs-commits at redhat.com Thu May 31 09:39:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 05:39:00 -0400 Subject: rpms/logrotate/FC-5 logrotate.spec,1.45,1.46 Message-ID: <200705310939.l4V9d0MV003611@cvs.devel.redhat.com> Author: tsmetana Update of /cvs/dist/rpms/logrotate/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3591 Modified Files: logrotate.spec Log Message: Added %%{?dist} to spec file Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/FC-5/logrotate.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- logrotate.spec 31 May 2007 09:33:35 -0000 1.45 +++ logrotate.spec 31 May 2007 09:38:57 -0000 1.46 @@ -5,7 +5,7 @@ Summary: Rotates, compresses, removes and mails system log files. Name: logrotate Version: 3.7.3 -Release: 3 +Release: 3%{?dist} License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz From fedora-cvs-commits at redhat.com Thu May 31 17:38:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 13:38:41 -0400 Subject: rpms/kernel/FC-6/configs config-generic, 1.268, 1.268.20.1 config-s390-generic, 1.22, 1.22.68.1 Message-ID: <200705311738.l4VHcfCm012749@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv12715/configs Modified Files: Tag: private-linville-netdev-fc6-14-branch config-generic config-s390-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v retrieving revision 1.268 retrieving revision 1.268.20.1 diff -u -r1.268 -r1.268.20.1 --- config-generic 29 Mar 2007 22:19:24 -0000 1.268 +++ config-generic 31 May 2007 17:38:39 -0000 1.268.20.1 @@ -637,7 +637,10 @@ CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_MD5SIG=y +CONFIG_TCP_MD5SIG_DEBUG=y # # Networking options @@ -646,6 +649,7 @@ CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=m @@ -703,6 +707,7 @@ CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -725,6 +730,7 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m @@ -782,6 +788,7 @@ CONFIG_NF_CONNTRACK_IRC=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_IPV4=m @@ -848,6 +855,7 @@ CONFIG_IP6_NF_MATCH_FRAG=m CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m CONFIG_IP6_NF_MATCH_OPTS=m CONFIG_IP6_NF_MATCH_OWNER=m CONFIG_IP6_NF_MATCH_RT=m @@ -884,6 +892,7 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=y CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m @@ -1045,13 +1054,14 @@ # CONFIG_NET_ETHERNET=y CONFIG_PHYLIB=m -CONFIG_BROADCOM_PHY=m CONFIG_MARVELL_PHY=m CONFIG_DAVICOM_PHY=m CONFIG_QSEMI_PHY=m CONFIG_LXT_PHY=m CONFIG_CICADA_PHY=m CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m CONFIG_FIXED_PHY=m CONFIG_FIXED_MII_10_FDX=y CONFIG_FIXED_MII_100_FDX=y @@ -1091,8 +1101,10 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m +CONFIG_B44_PCI=y CONFIG_BNX2=m CONFIG_QLA3XXX=m +CONFIG_ATL1=m # CONFIG_DGRS is not set # CONFIG_EEPRO100 is not set CONFIG_E100=m @@ -1117,6 +1129,7 @@ CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_RHINE_NAPI=y CONFIG_VIA_VELOCITY=m +CONFIG_SC92031=m CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m @@ -1153,9 +1166,12 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m +CONFIG_PASEMI_MAC=m +CONFIG_VIOC=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T1_NAPI=y +CONFIG_CHELSIO_T3=m CONFIG_FDDI=y # CONFIG_DEFXX is not set @@ -1183,18 +1199,33 @@ CONFIG_NET_RADIO=y # -# Obsolete Wireless cards support (pre-802.11) +# Wireless LAN # +CONFIG_WLAN_PRE80211=y # CONFIG_STRIP is not set # CONFIG_ARLAN is not set CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m - -# -# Wireless 802.11 Frequency Hopping cards support -# +CONFIG_WLAN_80211=y # CONFIG_PCMCIA_RAYCS is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +CONFIG_MAC80211_DEBUG=y +# CONFIG_MAC80211_VERBOSE_DEBUG is not set +# CONFIG_MAC80211_LOWTX_FRAME_DUMP is not set +CONFIG_TKIP_DEBUG=y +CONFIG_MAC80211_DEBUG_COUNTERS=y +# CONFIG_HOSTAPD_WPA_TESTING is not set +CONFIG_MAC80211_IBSS_DEBUG=y +# CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set + +CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT_COMPAT=y +CONFIG_CFG80211_WEXTNL_COMPAT=y +CONFIG_NL80211=y + # # Wireless 802.11b ISA/PCI cards support # @@ -1212,6 +1243,8 @@ CONFIG_USB_ZD1201=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_USB_DEBUG=y CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1221,6 +1254,7 @@ CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PRISM54=m +CONFIG_PRISM54_USB=m CONFIG_BCM43XX=m CONFIG_BCM43XX_DEBUG=y @@ -1242,6 +1276,33 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_CS=m +CONFIG_BCM43XX_MAC80211=m +CONFIG_BCM43XX_MAC80211_PCI=y +CONFIG_BCM43XX_MAC80211_PCMCIA=y +CONFIG_BCM43XX_MAC80211_DEBUG=y +CONFIG_BCM43XX_MAC80211_DMA_AND_PIO_MODE=y +CONFIG_RT2X00=y +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2X00_DEBUGFS=m +CONFIG_RT2X00_DEBUG=y +CONFIG_ADM8211=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_ZD1211RW_MAC80211=m +CONFIG_ZD1211RW_MAC80211_DEBUG=y +CONFIG_RTL818X=y +CONFIG_RTL8187=m +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_DEBUG=y + +CONFIG_RFKILL=m +CONFIG_RFKILL_INPUT=m + # # Token Ring devices # @@ -1307,6 +1368,7 @@ CONFIG_MCP2120_DONGLE=m CONFIG_OLD_BELKIN_DONGLE=m CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m CONFIG_ALI_FIR=m CONFIG_MCS_FIR=m @@ -1350,6 +1412,10 @@ CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIBPA10X=m +CONFIG_AF_RXRPC=m +CONFIG_AF_RXRPC_DEBUG=y +CONFIG_RXKAD=y + # # ISDN subsystem # @@ -1848,6 +1914,14 @@ CONFIG_MAX_RAW_DEVS=8192 CONFIG_HANGCHECK_TIMER=m +CONFIG_SSB=m +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SILENT=n +CONFIG_SSB_DEBUG=n +CONFIG_SSB_SERIAL=n +CONFIG_SSB_DRIVER_PCICORE=y + # # Multimedia devices # @@ -2233,6 +2307,7 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_CS=m +CONFIG_USB_OHCI_HCD_SSB=y # # USB Device Class drivers @@ -2780,6 +2855,8 @@ # CONFIG_CRC16=m CONFIG_CRC32=m +CONFIG_CRC_ITU_T=m +CONFIG_EEPROM_93CX6=m CONFIG_CRC_CCITT=m CONFIG_ZLIB_INFLATE=y Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-s390-generic,v retrieving revision 1.22 retrieving revision 1.22.68.1 diff -u -r1.22 -r1.22.68.1 --- config-s390-generic 21 Dec 2006 21:45:14 -0000 1.22 +++ config-s390-generic 31 May 2007 17:38:39 -0000 1.22.68.1 @@ -106,6 +106,7 @@ CONFIG_LCS=m CONFIG_CTC=m CONFIG_IUCV=m +CONFIG_AFIUCV=m CONFIG_QETH=m CONFIG_QETH_IPV6=y CONFIG_QETH_VLAN=y From fedora-cvs-commits at redhat.com Thu May 31 18:43:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 14:43:44 -0400 Subject: rpms/kernel/FC-6 kernel-2.6.spec, 1.2952.2.1, 1.2952.2.2 9022-remove-broken-URLs-from-net-drivers-output.txt, 1.1.2.1, NONE Message-ID: <200705311843.l4VIhiot014195@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14179 Modified Files: Tag: private-linville-netdev-fc6-14-branch kernel-2.6.spec Removed Files: Tag: private-linville-netdev-fc6-14-branch 9022-remove-broken-URLs-from-net-drivers-output.txt Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2952.2.1 retrieving revision 1.2952.2.2 diff -u -r1.2952.2.1 -r1.2952.2.2 --- kernel-2.6.spec 31 May 2007 17:38:36 -0000 1.2952.2.1 +++ kernel-2.6.spec 31 May 2007 18:43:41 -0000 1.2952.2.2 @@ -1592,130 +1592,129 @@ Patch30933: 8949-Bluetooth-HID-HIDP-don-t-initialize-force-feedback.txt Patch30934: 8991-Fix-deprecated-typoes.txt Patch30935: 9015-Fix-occurrences-of-the-the.txt -Patch30936: 9022-remove-broken-URLs-from-net-drivers-output.txt -Patch30937: 9026-include-files-convert-include-subdirectory-to-UTF-8.txt -Patch30938: 9229-knfsd-rename-sk_defer_lock-to-sk_lock.txt -Patch30939: 9232-sunrpc-fix-error-path-in-module_init.txt -Patch30940: 9234-knfsd-rpc-fix-server-side-wrapping-of-krb5i-replies.txt -Patch30941: 9235-knfsd-fix-resource-leak-resulting-in-module-refcount-leak-for-rpcsec_gss_krb5.ko.txt -Patch30942: 9236-knfsd-rpcgss-RPC_GSS_PROC_-DESTROY-request-will-get-a-bad-rpc.txt -Patch30943: 9304-skge-default-WOL-should-be-magic-only-rev2.txt -Patch30944: 9305-Fix-hang-on-IBM-Token-Ring-PCMCIA-card-ejection.txt -Patch30945: 9306-atl1-add-netconsole-support.txt -Patch30946: 9368-S390-Kconfig-unwanted-menus-for-s390.txt -Patch30947: 9371-S390-Kconfig-no-wireless-on-s390.txt -Patch30948: 9425-NET-link_watch-Move-link-watch-list-into-net_device.txt -Patch30949: 9428-NET_SCHED-teql_enqueue-can-check-limits-before-skb-enqueue.txt -Patch30950: 9431-SCTP-Prevent-OOPS-if-hmac-modules-didn-t-load.txt -Patch30951: 9432-SCTP-Correctly-copy-addresses-in-sctp_copy_laddrs.txt -Patch30952: 9433-SCTP-Do-not-include-ABORT-chunk-header-in-the-notification.txt -Patch30953: 9434-IPV6-Send-ICMPv6-error-on-scope-violations.txt -Patch30954: 9436-IPV6-ROUTE-Assign-rt6i_idev-for-ip6_-prohibit-blk_hole-_entry.txt -Patch30955: 9437-IrDA-KingSun-DonShine-USB-IrDA-dongle-support.txt -Patch30956: 9439-NET-Fix-dev-qdisc-race-for-NETDEV_TX_LOCKED-case.txt -Patch30957: 9440-NET_SCHED-Rationalise-return-value-of-qdisc_restart.txt -Patch30958: 9441-NET_SCHED-Reread-dev-qdisc-for-NETDEV_TX_OK.txt -Patch30959: 9442-NET_SCHED-Avoid-requeue-warning-on-dev_deactivate.txt -Patch30960: 9445-NETFILTER-nf_conntrack-Removes-duplicated-declarations.txt -Patch30961: 9448-NETFILTER-nf_nat-Clears-helper-private-area-when-NATing.txt -Patch30962: 9451-NETFILTER-xt_conntrack-add-compat-support.txt -Patch30963: 9705-libertas-remove-WPA_SUPPLICANT-structure.txt -Patch30964: 9706-libertas-use-net-ieee80211.h-for-MAX_WPA_IE_LEN.txt -Patch30965: 9707-libertas-fix-size-of-SSID-comparison-in-stop_adhoc-check.txt -Patch30966: 9708-libertas-remove-8021xauthalgs-private-ioctl.txt -Patch30967: 9709-libertas-remove-setauthalg-private-ioctl.txt -Patch30968: 9710-libertas-remove-incorrect-vi-modelines.txt -Patch30969: 9711-libertas-remove-custom-encryption-mode-stuff.txt -Patch30970: 9712-libertas-remove-setwpaie-private-ioctl.txt -Patch30971: 9713-libertas-remove-WLAN_802_11_AUTHENTICATION_MODE.txt -Patch30972: 9714-libertas-remove-WLAN_802_11_WEP_STATUS-enum.txt -Patch30973: 9715-libertas-remove-WLAN_802_11_NETWORK_INFRASTRUCTURE-enum.txt -Patch30974: 9716-libertas-Get-rid-of-version.h.txt -Patch30975: 9717-libertas-Purge-non-mesh-ioctls.txt -Patch30976: 9718-libertas-remove-SUPPORT_BOOT_COMMAND.txt -Patch30977: 9719-libertas-Clean-up-debug-defines.txt -Patch30978: 9720-libertas-make-debugfs.c-sparse-clean.txt -Patch30979: 9721-libertas-fix-missing-unlock-in-TX-error-path.txt -Patch30980: 9722-libertas-sparse-fixes.txt -Patch30981: 9723-libertas-64-bit-cleanups.txt -Patch30982: 9734-S2IO-getringparam-ethtool-option.txt -Patch30983: 9735-S2IO-statistics-for-memory-allocation-failuers.txt -Patch30984: 9736-S2IO-Statistics-for-link-up-down-and-memory-allocated-freed.txt -Patch30985: 9741-Use-menuconfig-objects-II-netdev-pcmcia.txt -Patch30986: 9742-Use-menuconfig-objects-II-netdev-wan.txt -Patch30987: 9747-sky2-88e8071-support-not-ready.txt -Patch30988: 9749-Add-support-for-the-Davicom-DM9161A-PHY.txt -Patch30989: 9847-IPSEC-Check-validity-of-direction-in-xfrm_policy_byid.txt -Patch30990: 9848-IPSEC-Don-t-warn-if-high-order-hash-resize-fails.txt -Patch30991: 9850-NET_SCHED-prio-qdisc-boundary-condition.txt -Patch30992: 9888-SUNRPC-remove-dead-variable-rpciod_running.txt -Patch30993: 9892-SUNRPC-Fix-sparse-warnings.txt -Patch30994: 9910-pasemi_mac-Fix-register-defines.txt -Patch30995: 9911-pasemi_mac-Interrupt-ack-fixes.txt -Patch30996: 9912-pasemi_mac-Terminate-PCI-ID-list.txt -Patch30997: 9914-smc911x-fix-compilation-breakage.txt -Patch30998: 10056-Fix-incorrect-prototype-for-ipxrtr_route_packet.txt -Patch30999: 10062-IPV4-Correct-rp_filter-help-text.txt -Patch31000: 10065-sky2-keep-track-of-receive-alloc-failures.txt -Patch31001: 10066-sky2-MIB-counter-overflow-handling.txt -Patch31002: 10067-sky2-remove-dual-port-workaround.txt -Patch31003: 10068-sky2-memory-barriers-change.txt -Patch31004: 10070-ibm_emac-fix-section-mismatch-warnings.txt -Patch31005: 10071-ibm_emac-improved-PHY-support.txt -Patch31006: 10072-ibm_emac-fix-link-speed-detection-change.txt -Patch31007: 10073-gianfar-Add-I-O-barriers-when-touching-buffer-descriptor-ownership.txt -Patch31008: 10074-spidernet-node-aware-skbuff-allocation.txt -Patch31009: 10076-ixgb-don-t-print-error-if-pci_enable_msi-fails-cleanup-minor-leak.txt -Patch31010: 10128-TCP-FRTO-Prevent-state-inconsistency-in-corner-cases.txt -Patch31011: 10131-NETFILTER-nf_conntrack_ipv4-fix-incorrect-ifdef-config-name.txt -Patch31012: 10132-IPV4-icmp-fix-crash-with-sysctl_icmp_errors_use_inbound_ifaddr.txt -Patch31013: 10213-declance-Remove-a-dangling-spin_unlock_irq-thingy.txt -Patch31014: 10256-RTNETLINK-Allow-changing-of-subsets-of-netdevice-flags-in-rtnl_setlink.txt -Patch31015: 10401-fix-compiler-warning-in-fixed.c.txt -Patch31016: 10402-remove-unnecessary-dependency-on-VIA-velocity-config.txt -Patch31017: 10404-spidernet-skb-used-after-netif_receive_skb.txt -Patch31018: 10405-chelsio-parenthesis-fix.txt -Patch31019: 10406-forcedeth-fix-cpu-irq-mask.txt -Patch31020: 10410-DCCP-Use-menuconfig-objects.txt -Patch31021: 10411-IPVS-Use-menuconfig-objects.txt -Patch31022: 10412-SCTP-Use-menuconfig-objects.txt -Patch31023: 10413-TIPC-Use-menuconfig-objects.txt -Patch31024: 10414-ARCNET-Use-menuconfig-objects.txt -Patch31025: 10415-TR-Use-menuconfig-objects.txt -Patch31026: 10420-NETFILTER-nf_conntrack_ftp-fix-newline-sequence-number-update.txt -Patch31027: 10421-NETFILTER-nf_conntrack_ftp-fix-newline-sequence-number-calculation.txt -Patch31028: 10422-NETFILTER-nf_conntrack_h323-fix-ASN.1-types.txt -Patch31029: 10423-NETFILTER-nf_conntrack_h323-fix-get_h225_addr-for-IPv6-address-access.txt -Patch31030: 10424-NETFILTER-nf_conntrack_h323-remove-unnecessary-process-of-Information-signal.txt -Patch31031: 10425-NETFILTER-nf_conntrack_h323-add-missing-T.120-address-in-OLCA.txt -Patch31032: 10426-NETFILTER-nf_nat_h323-call-set_h225_addr-instead-of-set_h225_addr_hook.txt -Patch31033: 10427-NET-wrong-timeout-value-in-sk_wait_data-v2.txt -Patch31034: 10434-CASSINI-Check-pci_set_mwi-return-value.txt -Patch31035: 10438-CASSINI-Fix-printk-message-typo.txt -Patch31036: 10457-phylib-add-the-ICPlus-IP175C-PHY-driver.txt -Patch31037: 10459-gianfar-add-support-for-SGMII.txt -Patch31038: 10461-8139cp-Convert-to-generic-boolean.txt -Patch31039: 10463-spidernet-move-a-block-of-code-around.txt -Patch31040: 10469-spidernet-service-TX-later.txt -Patch31041: 10470-spidernet-increase-the-NAPI-weight.txt -Patch31042: 10516-wireless-add-prism54usb-driver.txt -Patch31043: 10517-prism54usb-fix-build-break-in-islusb_init.c.txt -Patch31044: 10518-softmac-prism54usb-update.txt -Patch31045: 10519-update-prism54usb-sources.txt -Patch31046: 10520-patch-prism54usb-add-set_bssid_filter.txt -Patch31047: 10521-prism54usb-fix-up-build-breaks-from-2.6.19.txt -Patch31048: 10522-prism54usb-fix-up-warnings-from-struct-pt_regs-removal.txt -Patch31049: 10523-prism54usb-squash-some-more-warnings.txt -Patch31050: 10524-prism54usb-fix-work_struct-build-breakage.txt -Patch31051: 10525-prism54usb-add-USB-ID-2001-3704.txt -Patch31052: 10527-prism54usb-add-device.txt -Patch31053: 10528-prism54usb-fix-breakage-from-skb-input_device-removal.txt -Patch31054: 10529-prism54usb-fix-for-wireless-Kconfig-changes.txt -Patch31055: 10553-ieee80211-fix-incomplete-error-message.txt -Patch31056: 10555-hostap-Allocate-enough-tailroom-for-TKIP.txt -Patch31057: 10561-softmac-use-list_for_each_entry.txt -Patch31058: 10562-hostap-Suppress-broadcast-if-no-stations-are-associated.txt -Patch31059: 10563-hostap-Use-list_for_each_entry.txt +Patch30936: 9026-include-files-convert-include-subdirectory-to-UTF-8.txt +Patch30937: 9229-knfsd-rename-sk_defer_lock-to-sk_lock.txt +Patch30938: 9232-sunrpc-fix-error-path-in-module_init.txt +Patch30939: 9234-knfsd-rpc-fix-server-side-wrapping-of-krb5i-replies.txt +Patch30940: 9235-knfsd-fix-resource-leak-resulting-in-module-refcount-leak-for-rpcsec_gss_krb5.ko.txt +Patch30941: 9236-knfsd-rpcgss-RPC_GSS_PROC_-DESTROY-request-will-get-a-bad-rpc.txt +Patch30942: 9304-skge-default-WOL-should-be-magic-only-rev2.txt +Patch30943: 9305-Fix-hang-on-IBM-Token-Ring-PCMCIA-card-ejection.txt +Patch30944: 9306-atl1-add-netconsole-support.txt +Patch30945: 9368-S390-Kconfig-unwanted-menus-for-s390.txt +Patch30946: 9371-S390-Kconfig-no-wireless-on-s390.txt +Patch30947: 9425-NET-link_watch-Move-link-watch-list-into-net_device.txt +Patch30948: 9428-NET_SCHED-teql_enqueue-can-check-limits-before-skb-enqueue.txt +Patch30949: 9431-SCTP-Prevent-OOPS-if-hmac-modules-didn-t-load.txt +Patch30950: 9432-SCTP-Correctly-copy-addresses-in-sctp_copy_laddrs.txt +Patch30951: 9433-SCTP-Do-not-include-ABORT-chunk-header-in-the-notification.txt +Patch30952: 9434-IPV6-Send-ICMPv6-error-on-scope-violations.txt +Patch30953: 9436-IPV6-ROUTE-Assign-rt6i_idev-for-ip6_-prohibit-blk_hole-_entry.txt +Patch30954: 9437-IrDA-KingSun-DonShine-USB-IrDA-dongle-support.txt +Patch30955: 9439-NET-Fix-dev-qdisc-race-for-NETDEV_TX_LOCKED-case.txt +Patch30956: 9440-NET_SCHED-Rationalise-return-value-of-qdisc_restart.txt +Patch30957: 9441-NET_SCHED-Reread-dev-qdisc-for-NETDEV_TX_OK.txt +Patch30958: 9442-NET_SCHED-Avoid-requeue-warning-on-dev_deactivate.txt +Patch30959: 9445-NETFILTER-nf_conntrack-Removes-duplicated-declarations.txt +Patch30960: 9448-NETFILTER-nf_nat-Clears-helper-private-area-when-NATing.txt +Patch30961: 9451-NETFILTER-xt_conntrack-add-compat-support.txt +Patch30962: 9705-libertas-remove-WPA_SUPPLICANT-structure.txt +Patch30963: 9706-libertas-use-net-ieee80211.h-for-MAX_WPA_IE_LEN.txt +Patch30964: 9707-libertas-fix-size-of-SSID-comparison-in-stop_adhoc-check.txt +Patch30965: 9708-libertas-remove-8021xauthalgs-private-ioctl.txt +Patch30966: 9709-libertas-remove-setauthalg-private-ioctl.txt +Patch30967: 9710-libertas-remove-incorrect-vi-modelines.txt +Patch30968: 9711-libertas-remove-custom-encryption-mode-stuff.txt +Patch30969: 9712-libertas-remove-setwpaie-private-ioctl.txt +Patch30970: 9713-libertas-remove-WLAN_802_11_AUTHENTICATION_MODE.txt +Patch30971: 9714-libertas-remove-WLAN_802_11_WEP_STATUS-enum.txt +Patch30972: 9715-libertas-remove-WLAN_802_11_NETWORK_INFRASTRUCTURE-enum.txt +Patch30973: 9716-libertas-Get-rid-of-version.h.txt +Patch30974: 9717-libertas-Purge-non-mesh-ioctls.txt +Patch30975: 9718-libertas-remove-SUPPORT_BOOT_COMMAND.txt +Patch30976: 9719-libertas-Clean-up-debug-defines.txt +Patch30977: 9720-libertas-make-debugfs.c-sparse-clean.txt +Patch30978: 9721-libertas-fix-missing-unlock-in-TX-error-path.txt +Patch30979: 9722-libertas-sparse-fixes.txt +Patch30980: 9723-libertas-64-bit-cleanups.txt +Patch30981: 9734-S2IO-getringparam-ethtool-option.txt +Patch30982: 9735-S2IO-statistics-for-memory-allocation-failuers.txt +Patch30983: 9736-S2IO-Statistics-for-link-up-down-and-memory-allocated-freed.txt +Patch30984: 9741-Use-menuconfig-objects-II-netdev-pcmcia.txt +Patch30985: 9742-Use-menuconfig-objects-II-netdev-wan.txt +Patch30986: 9747-sky2-88e8071-support-not-ready.txt +Patch30987: 9749-Add-support-for-the-Davicom-DM9161A-PHY.txt +Patch30988: 9847-IPSEC-Check-validity-of-direction-in-xfrm_policy_byid.txt +Patch30989: 9848-IPSEC-Don-t-warn-if-high-order-hash-resize-fails.txt +Patch30990: 9850-NET_SCHED-prio-qdisc-boundary-condition.txt +Patch30991: 9888-SUNRPC-remove-dead-variable-rpciod_running.txt +Patch30992: 9892-SUNRPC-Fix-sparse-warnings.txt +Patch30993: 9910-pasemi_mac-Fix-register-defines.txt +Patch30994: 9911-pasemi_mac-Interrupt-ack-fixes.txt +Patch30995: 9912-pasemi_mac-Terminate-PCI-ID-list.txt +Patch30996: 9914-smc911x-fix-compilation-breakage.txt +Patch30997: 10056-Fix-incorrect-prototype-for-ipxrtr_route_packet.txt +Patch30998: 10062-IPV4-Correct-rp_filter-help-text.txt +Patch30999: 10065-sky2-keep-track-of-receive-alloc-failures.txt +Patch31000: 10066-sky2-MIB-counter-overflow-handling.txt +Patch31001: 10067-sky2-remove-dual-port-workaround.txt +Patch31002: 10068-sky2-memory-barriers-change.txt +Patch31003: 10070-ibm_emac-fix-section-mismatch-warnings.txt +Patch31004: 10071-ibm_emac-improved-PHY-support.txt +Patch31005: 10072-ibm_emac-fix-link-speed-detection-change.txt +Patch31006: 10073-gianfar-Add-I-O-barriers-when-touching-buffer-descriptor-ownership.txt +Patch31007: 10074-spidernet-node-aware-skbuff-allocation.txt +Patch31008: 10076-ixgb-don-t-print-error-if-pci_enable_msi-fails-cleanup-minor-leak.txt +Patch31009: 10128-TCP-FRTO-Prevent-state-inconsistency-in-corner-cases.txt +Patch31010: 10131-NETFILTER-nf_conntrack_ipv4-fix-incorrect-ifdef-config-name.txt +Patch31011: 10132-IPV4-icmp-fix-crash-with-sysctl_icmp_errors_use_inbound_ifaddr.txt +Patch31012: 10213-declance-Remove-a-dangling-spin_unlock_irq-thingy.txt +Patch31013: 10256-RTNETLINK-Allow-changing-of-subsets-of-netdevice-flags-in-rtnl_setlink.txt +Patch31014: 10401-fix-compiler-warning-in-fixed.c.txt +Patch31015: 10402-remove-unnecessary-dependency-on-VIA-velocity-config.txt +Patch31016: 10404-spidernet-skb-used-after-netif_receive_skb.txt +Patch31017: 10405-chelsio-parenthesis-fix.txt +Patch31018: 10406-forcedeth-fix-cpu-irq-mask.txt +Patch31019: 10410-DCCP-Use-menuconfig-objects.txt +Patch31020: 10411-IPVS-Use-menuconfig-objects.txt +Patch31021: 10412-SCTP-Use-menuconfig-objects.txt +Patch31022: 10413-TIPC-Use-menuconfig-objects.txt +Patch31023: 10414-ARCNET-Use-menuconfig-objects.txt +Patch31024: 10415-TR-Use-menuconfig-objects.txt +Patch31025: 10420-NETFILTER-nf_conntrack_ftp-fix-newline-sequence-number-update.txt +Patch31026: 10421-NETFILTER-nf_conntrack_ftp-fix-newline-sequence-number-calculation.txt +Patch31027: 10422-NETFILTER-nf_conntrack_h323-fix-ASN.1-types.txt +Patch31028: 10423-NETFILTER-nf_conntrack_h323-fix-get_h225_addr-for-IPv6-address-access.txt +Patch31029: 10424-NETFILTER-nf_conntrack_h323-remove-unnecessary-process-of-Information-signal.txt +Patch31030: 10425-NETFILTER-nf_conntrack_h323-add-missing-T.120-address-in-OLCA.txt +Patch31031: 10426-NETFILTER-nf_nat_h323-call-set_h225_addr-instead-of-set_h225_addr_hook.txt +Patch31032: 10427-NET-wrong-timeout-value-in-sk_wait_data-v2.txt +Patch31033: 10434-CASSINI-Check-pci_set_mwi-return-value.txt +Patch31034: 10438-CASSINI-Fix-printk-message-typo.txt +Patch31035: 10457-phylib-add-the-ICPlus-IP175C-PHY-driver.txt +Patch31036: 10459-gianfar-add-support-for-SGMII.txt +Patch31037: 10461-8139cp-Convert-to-generic-boolean.txt +Patch31038: 10463-spidernet-move-a-block-of-code-around.txt +Patch31039: 10469-spidernet-service-TX-later.txt +Patch31040: 10470-spidernet-increase-the-NAPI-weight.txt +Patch31041: 10516-wireless-add-prism54usb-driver.txt +Patch31042: 10517-prism54usb-fix-build-break-in-islusb_init.c.txt +Patch31043: 10518-softmac-prism54usb-update.txt +Patch31044: 10519-update-prism54usb-sources.txt +Patch31045: 10520-patch-prism54usb-add-set_bssid_filter.txt +Patch31046: 10521-prism54usb-fix-up-build-breaks-from-2.6.19.txt +Patch31047: 10522-prism54usb-fix-up-warnings-from-struct-pt_regs-removal.txt +Patch31048: 10523-prism54usb-squash-some-more-warnings.txt +Patch31049: 10524-prism54usb-fix-work_struct-build-breakage.txt +Patch31050: 10525-prism54usb-add-USB-ID-2001-3704.txt +Patch31051: 10527-prism54usb-add-device.txt +Patch31052: 10528-prism54usb-fix-breakage-from-skb-input_device-removal.txt +Patch31053: 10529-prism54usb-fix-for-wireless-Kconfig-changes.txt +Patch31054: 10553-ieee80211-fix-incomplete-error-message.txt +Patch31055: 10555-hostap-Allocate-enough-tailroom-for-TKIP.txt +Patch31056: 10561-softmac-use-list_for_each_entry.txt +Patch31057: 10562-hostap-Suppress-broadcast-if-no-stations-are-associated.txt +Patch31058: 10563-hostap-Use-list_for_each_entry.txt Patch40000: mac80211.patch @@ -4356,254 +4355,252 @@ %patch30934 -p1 # Fix occurrences of "the the " %patch30935 -p1 -# remove broken URLs from net drivers' output -%patch30936 -p1 # include files: convert "include" subdirectory to UTF-8 -%patch30937 -p1 +%patch30936 -p1 # knfsd: rename sk_defer_lock to sk_lock -%patch30938 -p1 +%patch30937 -p1 # sunrpc: fix error path in module_init -%patch30939 -p1 +%patch30938 -p1 # knfsd: rpc: fix server-side wrapping of krb5i replies -%patch30940 -p1 +%patch30939 -p1 # knfsd: fix resource leak resulting in module refcount leak for rpcsec_gss_krb5.ko -%patch30941 -p1 +%patch30940 -p1 # knfsd: rpcgss: RPC_GSS_PROC_ DESTROY request will get a bad rpc -%patch30942 -p1 +%patch30941 -p1 # skge: default WOL should be magic only (rev2) -%patch30943 -p1 +%patch30942 -p1 # Fix hang on IBM Token Ring PCMCIA card ejection -%patch30944 -p1 +%patch30943 -p1 # atl1: add netconsole support -%patch30945 -p1 +%patch30944 -p1 # [S390] Kconfig: unwanted menus for s390. -%patch30946 -p1 +%patch30945 -p1 # [S390] Kconfig: no wireless on s390. -%patch30947 -p1 +%patch30946 -p1 # [NET] link_watch: Move link watch list into net_device -%patch30948 -p1 +%patch30947 -p1 # [NET_SCHED]: teql_enqueue can check limits before skb enqueue -%patch30949 -p1 +%patch30948 -p1 # [SCTP]: Prevent OOPS if hmac modules didn't load -%patch30950 -p1 +%patch30949 -p1 # [SCTP]: Correctly copy addresses in sctp_copy_laddrs -%patch30951 -p1 +%patch30950 -p1 # [SCTP]: Do not include ABORT chunk header in the notification. -%patch30952 -p1 +%patch30951 -p1 # [IPV6]: Send ICMPv6 error on scope violations. -%patch30953 -p1 +%patch30952 -p1 # [IPV6] ROUTE: Assign rt6i_idev for ip6_{prohibit,blk_hole}_entry. -%patch30954 -p1 +%patch30953 -p1 # [IrDA]: KingSun/DonShine USB IrDA dongle support. -%patch30955 -p1 +%patch30954 -p1 # [NET]: Fix dev->qdisc race for NETDEV_TX_LOCKED case -%patch30956 -p1 +%patch30955 -p1 # [NET_SCHED]: Rationalise return value of qdisc_restart -%patch30957 -p1 +%patch30956 -p1 # [NET_SCHED]: Reread dev->qdisc for NETDEV_TX_OK -%patch30958 -p1 +%patch30957 -p1 # [NET_SCHED]: Avoid requeue warning on dev_deactivate -%patch30959 -p1 +%patch30958 -p1 # [NETFILTER]: nf_conntrack: Removes duplicated declarations -%patch30960 -p1 +%patch30959 -p1 # [NETFILTER]: nf_nat: Clears helper private area when NATing -%patch30961 -p1 +%patch30960 -p1 # [NETFILTER]: xt_conntrack: add compat support -%patch30962 -p1 +%patch30961 -p1 # [PATCH] libertas: remove WPA_SUPPLICANT structure -%patch30963 -p1 +%patch30962 -p1 # [PATCH] libertas: use for MAX_WPA_IE_LEN -%patch30964 -p1 +%patch30963 -p1 # [PATCH] libertas: fix size of SSID comparison in stop_adhoc check -%patch30965 -p1 +%patch30964 -p1 # [PATCH] libertas: remove 8021xauthalgs private ioctl -%patch30966 -p1 +%patch30965 -p1 # [PATCH] libertas: remove setauthalg private ioctl -%patch30967 -p1 +%patch30966 -p1 # [PATCH] libertas: remove incorrect vi modelines -%patch30968 -p1 +%patch30967 -p1 # [PATCH] libertas: remove custom encryption mode stuff -%patch30969 -p1 +%patch30968 -p1 # [PATCH] libertas: remove setwpaie private ioctl -%patch30970 -p1 +%patch30969 -p1 # [PATCH] libertas: remove WLAN_802_11_AUTHENTICATION_MODE -%patch30971 -p1 +%patch30970 -p1 # [PATCH] libertas: remove WLAN_802_11_WEP_STATUS enum -%patch30972 -p1 +%patch30971 -p1 # [PATCH] libertas: remove WLAN_802_11_NETWORK_INFRASTRUCTURE enum -%patch30973 -p1 +%patch30972 -p1 # [PATCH] libertas: Get rid of version.h -%patch30974 -p1 +%patch30973 -p1 # [PATCH] libertas: Purge non-mesh ioctls -%patch30975 -p1 +%patch30974 -p1 # [PATCH] libertas: remove SUPPORT_BOOT_COMMAND -%patch30976 -p1 +%patch30975 -p1 # [PATCH] libertas: Clean up debug defines -%patch30977 -p1 +%patch30976 -p1 # [PATCH] libertas: make debugfs.c sparse-clean -%patch30978 -p1 +%patch30977 -p1 # [PATCH] libertas: fix missing unlock in TX error path -%patch30979 -p1 +%patch30978 -p1 # [PATCH] libertas: sparse fixes -%patch30980 -p1 +%patch30979 -p1 # [PATCH] libertas: 64-bit cleanups -%patch30981 -p1 +%patch30980 -p1 # S2IO: getringparam ethtool option -%patch30982 -p1 +%patch30981 -p1 # S2IO: statistics for memory allocation failuers -%patch30983 -p1 +%patch30982 -p1 # S2IO: Statistics for link up/down and memory allocated/freed -%patch30984 -p1 +%patch30983 -p1 # Use menuconfig objects II - netdev/pcmcia -%patch30985 -p1 +%patch30984 -p1 # Use menuconfig objects II - netdev/wan -%patch30986 -p1 +%patch30985 -p1 # sky2: 88e8071 support not ready -%patch30987 -p1 +%patch30986 -p1 # Add support for the Davicom DM9161A PHY -%patch30988 -p1 +%patch30987 -p1 # [IPSEC]: Check validity of direction in xfrm_policy_byid -%patch30989 -p1 +%patch30988 -p1 # [IPSEC]: Don't warn if high-order hash resize fails -%patch30990 -p1 +%patch30989 -p1 # [NET_SCHED]: prio qdisc boundary condition -%patch30991 -p1 +%patch30990 -p1 # SUNRPC: remove dead variable 'rpciod_running' -%patch30992 -p1 +%patch30991 -p1 # SUNRPC: Fix sparse warnings -%patch30993 -p1 +%patch30992 -p1 # pasemi_mac: Fix register defines -%patch30994 -p1 +%patch30993 -p1 # pasemi_mac: Interrupt ack fixes -%patch30995 -p1 +%patch30994 -p1 # pasemi_mac: Terminate PCI ID list -%patch30996 -p1 +%patch30995 -p1 # smc911x: fix compilation breakage -%patch30997 -p1 +%patch30996 -p1 # Fix incorrect prototype for ipxrtr_route_packet() -%patch30998 -p1 +%patch30997 -p1 # [IPV4]: Correct rp_filter help text. -%patch30999 -p1 +%patch30998 -p1 # sky2: keep track of receive alloc failures -%patch31000 -p1 +%patch30999 -p1 # sky2: MIB counter overflow handling -%patch31001 -p1 +%patch31000 -p1 # sky2: remove dual port workaround -%patch31002 -p1 +%patch31001 -p1 # sky2: memory barriers change -%patch31003 -p1 +%patch31002 -p1 # ibm_emac: fix section mismatch warnings -%patch31004 -p1 +%patch31003 -p1 # ibm_emac: improved PHY support -%patch31005 -p1 +%patch31004 -p1 # ibm_emac: fix link speed detection change -%patch31006 -p1 +%patch31005 -p1 # gianfar: Add I/O barriers when touching buffer descriptor ownership. -%patch31007 -p1 +%patch31006 -p1 # spidernet: node-aware skbuff allocation -%patch31008 -p1 +%patch31007 -p1 # ixgb: don't print error if pci_enable_msi() fails, cleanup minor leak -%patch31009 -p1 +%patch31008 -p1 # [TCP] FRTO: Prevent state inconsistency in corner cases -%patch31010 -p1 +%patch31009 -p1 # [NETFILTER]: nf_conntrack_ipv4: fix incorrect #ifdef config name -%patch31011 -p1 +%patch31010 -p1 # [IPV4]: icmp: fix crash with sysctl_icmp_errors_use_inbound_ifaddr -%patch31012 -p1 +%patch31011 -p1 # declance: Remove a dangling spin_unlock_irq() thingy -%patch31013 -p1 +%patch31012 -p1 # [RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink -%patch31014 -p1 +%patch31013 -p1 # fix compiler warning in fixed.c -%patch31015 -p1 +%patch31014 -p1 # remove unnecessary dependency on VIA velocity config -%patch31016 -p1 +%patch31015 -p1 # spidernet: skb used after netif_receive_skb -%patch31017 -p1 +%patch31016 -p1 # chelsio parenthesis fix -%patch31018 -p1 +%patch31017 -p1 # forcedeth: fix cpu irq mask -%patch31019 -p1 +%patch31018 -p1 # [DCCP]: Use menuconfig objects. -%patch31020 -p1 +%patch31019 -p1 # [IPVS]: Use menuconfig objects. -%patch31021 -p1 +%patch31020 -p1 # [SCTP]: Use menuconfig objects. -%patch31022 -p1 +%patch31021 -p1 # [TIPC]: Use menuconfig objects. -%patch31023 -p1 +%patch31022 -p1 # [ARCNET]: Use menuconfig objects. -%patch31024 -p1 +%patch31023 -p1 # [TR]: Use menuconfig objects. -%patch31025 -p1 +%patch31024 -p1 # [NETFILTER]: nf_conntrack_ftp: fix newline sequence number update -%patch31026 -p1 +%patch31025 -p1 # [NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation -%patch31027 -p1 +%patch31026 -p1 # [NETFILTER]: nf_conntrack_h323: fix ASN.1 types -%patch31028 -p1 +%patch31027 -p1 # [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access -%patch31029 -p1 +%patch31028 -p1 # [NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal -%patch31030 -p1 +%patch31029 -p1 # [NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA -%patch31031 -p1 +%patch31030 -p1 # [NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook -%patch31032 -p1 +%patch31031 -p1 # [NET]: "wrong timeout value" in sk_wait_data() v2 -%patch31033 -p1 +%patch31032 -p1 # [CASSINI]: Check pci_set_mwi() return value. -%patch31034 -p1 +%patch31033 -p1 # [CASSINI]: Fix printk message typo. -%patch31035 -p1 +%patch31034 -p1 # phylib: add the ICPlus IP175C PHY driver -%patch31036 -p1 +%patch31035 -p1 # gianfar: add support for SGMII -%patch31037 -p1 +%patch31036 -p1 # 8139cp: Convert to generic boolean -%patch31038 -p1 +%patch31037 -p1 # spidernet: move a block of code around -%patch31039 -p1 +%patch31038 -p1 # spidernet: service TX later. -%patch31040 -p1 +%patch31039 -p1 # spidernet: increase the NAPI weight -%patch31041 -p1 +%patch31040 -p1 # [PATCH] wireless: add prism54usb driver -%patch31042 -p1 +%patch31041 -p1 # [PATCH] prism54usb: fix build break in islusb_init.c -%patch31043 -p1 +%patch31042 -p1 # [PATCH] softmac: prism54usb update -%patch31044 -p1 +%patch31043 -p1 # [PATCH] update prism54usb sources -%patch31045 -p1 +%patch31044 -p1 # [PATCH] patch prism54usb: add set_bssid_filter -%patch31046 -p1 +%patch31045 -p1 # [PATCH] prism54usb: fix-up build breaks from 2.6.19 -%patch31047 -p1 +%patch31046 -p1 # [PATCH] prism54usb: fix-up warnings from struct pt_regs removal -%patch31048 -p1 +%patch31047 -p1 # [PATCH] prism54usb: squash some more warnings -%patch31049 -p1 +%patch31048 -p1 # [PATCH] prism54usb: fix work_struct build breakage -%patch31050 -p1 +%patch31049 -p1 # [PATCH] prism54usb: add USB ID 2001:3704 -%patch31051 -p1 +%patch31050 -p1 # [PATCH] prism54usb: add device -%patch31052 -p1 +%patch31051 -p1 # [PATCH] prism54usb: fix breakage from skb->input_device removal -%patch31053 -p1 +%patch31052 -p1 # prism54usb: fix for wireless Kconfig changes -%patch31054 -p1 +%patch31053 -p1 # [PATCH] ieee80211: fix incomplete error message -%patch31055 -p1 +%patch31054 -p1 # [PATCH] hostap: Allocate enough tailroom for TKIP -%patch31056 -p1 +%patch31055 -p1 # [PATCH] softmac: use list_for_each_entry -%patch31057 -p1 +%patch31056 -p1 # [PATCH] hostap: Suppress broadcast if no stations are associated -%patch31058 -p1 +%patch31057 -p1 # [PATCH] hostap: Use list_for_each_entry -%patch31059 -p1 +%patch31058 -p1 # Update mac80211 stack and add drivers %patch40000 -p1 @@ -6464,7 +6461,6 @@ - Bluetooth HID: HIDP - don't initialize force feedback - Fix "deprecated" typoes. - Fix occurrences of "the the " -- remove broken URLs from net drivers' output - include files: convert "include" subdirectory to UTF-8 - knfsd: rename sk_defer_lock to sk_lock - sunrpc: fix error path in module_init --- 9022-remove-broken-URLs-from-net-drivers-output.txt DELETED --- From fedora-cvs-commits at redhat.com Thu May 31 19:20:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 15:20:02 -0400 Subject: rpms/kexec-tools/FC-6 kdump.sysconfig.i386, NONE, 1.1 kdump.sysconfig.ia64, NONE, 1.1 kdump.sysconfig.ppc64, NONE, 1.1 kdump.sysconfig.x86_64, NONE, 1.1 kexec-1.101-retry-locate-hole.patch, NONE, 1.1 kexec-tools-1.101-bzimage-options.patch, NONE, 1.1 kexec-tools-1.101-elf-core-type.patch, NONE, 1.1 kexec-tools-1.101-elf-format.patch, NONE, 1.1 kexec-tools-1.101-ia64-EFI.patch, NONE, 1.1 kexec-tools-1.101-ia64-dash-l-fix.patch, NONE, 1.1 kexec-tools-1.101-ia64-icache-align.patch, NONE, 1.1 kexec-tools-1.101-ia64-kdump.patch, NONE, 1.1 kexec-tools-1.101-ia64-load-offset.patch, NONE, 1.1 kexec-tools-1.101-ia64-noio-eat.patch, NONE, 1.1 kexec-tools-1.101-ia64-noio.patch, NONE, 1.1 kexec-tools-1.101-ia64-phdr-malloc.patch, NONE, 1.1 kexec-tools-1.101-ia64-tools.patch, NONE, 1.1 kexec-tools-1.101-ifdown.patch, NONE, 1.1 kexec-tools-1.101-ppc-boots-ppc64.patch, NONE, 1.1 kexec-tools-1.101-ppc64-64k-pages.patch, NONE, 1.1 kexec-tools-1.101-ppc64-align-dtstruct.patch, NONE, 1.1 kexec-tools-1.101-ppc64-bootargs-align! .patch, NONE, 1.1 kexec-tools-1.101-ppc64-memory_regions.patch, NONE, 1.1 kexec-tools-1.101-ppc64_rmo_top.patch, NONE, 1.1 kexec-tools-1.101-reloc-update.patch, NONE, 1.1 kexec-tools-1.101-relocatable-bzimage.patch, NONE, 1.1 kexec-tools-1.101-x86_64-exactmap.patch, NONE, 1.1 pofiles.tar.gz, NONE, 1.1 kdump.conf, 1.3, 1.4 kdump.init, 1.12, 1.13 kdump.sysconfig, 1.4, 1.5 kexec-tools-1.101-Makefile.patch, 1.3, 1.4 kexec-tools-1.101-ppc64-usage.patch, 1.1, 1.2 kexec-tools.spec, 1.66, 1.67 mkdumprd, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200705311920.l4VJK2Da015176@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15134 Modified Files: kdump.conf kdump.init kdump.sysconfig kexec-tools-1.101-Makefile.patch kexec-tools-1.101-ppc64-usage.patch kexec-tools.spec mkdumprd sources Added Files: kdump.sysconfig.i386 kdump.sysconfig.ia64 kdump.sysconfig.ppc64 kdump.sysconfig.x86_64 kexec-1.101-retry-locate-hole.patch kexec-tools-1.101-bzimage-options.patch kexec-tools-1.101-elf-core-type.patch kexec-tools-1.101-elf-format.patch kexec-tools-1.101-ia64-EFI.patch kexec-tools-1.101-ia64-dash-l-fix.patch kexec-tools-1.101-ia64-icache-align.patch kexec-tools-1.101-ia64-kdump.patch kexec-tools-1.101-ia64-load-offset.patch kexec-tools-1.101-ia64-noio-eat.patch kexec-tools-1.101-ia64-noio.patch kexec-tools-1.101-ia64-phdr-malloc.patch kexec-tools-1.101-ia64-tools.patch kexec-tools-1.101-ifdown.patch kexec-tools-1.101-ppc-boots-ppc64.patch kexec-tools-1.101-ppc64-64k-pages.patch kexec-tools-1.101-ppc64-align-dtstruct.patch kexec-tools-1.101-ppc64-bootargs-align.patch kexec-tools-1.101-ppc64-memory_regions.patch kexec-tools-1.101-ppc64_rmo_top.patch kexec-tools-1.101-reloc-update.patch kexec-tools-1.101-relocatable-bzimage.patch kexec-tools-1.101-x86_64-exactmap.patch pofiles.tar.gz Log Message: Resolves: bz 238768 --- NEW FILE kdump.sysconfig.i386 --- # Kernel Version string for the -kdump kernel, such as 2.6.13-1544.FC5kdump # If no version is specified, then the init script will try to find a # kdump kernel with the same version number as the running kernel. KDUMP_KERNELVER="" # The kdump commandline is the command line that needs to be passed off to # the kdump kernel. This will likely match the contents of the grub kernel # line. For example: # KDUMP_COMMANDLINE="ro root=LABEL=/" # If a command line is not specified, the default will be taken from # /proc/cmdline KDUMP_COMMANDLINE="" # This variable lets us append arguments to the current kdump commandline # As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1" # Any additional kexec arguments required. In most situations, this should # be left empty # # Example: # KEXEC_ARGS="--elf32-core-headers" KEXEC_ARGS=" --args-linux" #Where to find the boot image KDUMP_BOOTDIR="/boot" #What is the image type used for kdump KDUMP_IMG="vmlinuz" #What is the images extension. Relocatable kernels don't have one KDUMP_IMG_EXT="" --- NEW FILE kdump.sysconfig.ia64 --- # Kernel Version string for the -kdump kernel, such as 2.6.13-1544.FC5kdump # If no version is specified, then the init script will try to find a # kdump kernel with the same version number as the running kernel. KDUMP_KERNELVER="" # The kdump commandline is the command line that needs to be passed off to # the kdump kernel. This will likely match the contents of the grub kernel # line. For example: # KDUMP_COMMANDLINE="ro root=LABEL=/" # If a command line is not specified, the default will be taken from # /proc/cmdline KDUMP_COMMANDLINE="" # This variable lets us append arguments to the current kdump commandline # As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1" # Any additional kexec arguments required. In most situations, this should # be left empty # # Example: # KEXEC_ARGS="--elf32-core-headers" KEXEC_ARGS="" #Where to find the boot image KDUMP_BOOTDIR="/boot/efi/efi/redhat" #What is the image type used for kdump KDUMP_IMG="vmlinuz" #What is the images extension. Relocatable kernels don't have one KDUMP_IMG_EXT="" --- NEW FILE kdump.sysconfig.ppc64 --- # Kernel Version string for the -kdump kernel, such as 2.6.13-1544.FC5kdump # If no version is specified, then the init script will try to find a # kdump kernel with the same version number as the running kernel. KDUMP_KERNELVER="" # The kdump commandline is the command line that needs to be passed off to # the kdump kernel. This will likely match the contents of the grub kernel # line. For example: # KDUMP_COMMANDLINE="ro root=LABEL=/" # If a command line is not specified, the default will be taken from # /proc/cmdline KDUMP_COMMANDLINE="" # This variable lets us append arguments to the current kdump commandline # As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 noirqdistrib" # Any additional kexec arguments required. In most situations, this should # be left empty # # Example: # KEXEC_ARGS="--elf32-core-headers" KEXEC_ARGS="" #Where to find the boot image KDUMP_BOOTDIR="/boot" #What is the image type used for kdump KDUMP_IMG="vmlinux" #What is the images extension. Relocatable kernels don't have one KDUMP_IMG_EXT="kdump" --- NEW FILE kdump.sysconfig.x86_64 --- # Kernel Version string for the -kdump kernel, such as 2.6.13-1544.FC5kdump # If no version is specified, then the init script will try to find a # kdump kernel with the same version number as the running kernel. KDUMP_KERNELVER="" # The kdump commandline is the command line that needs to be passed off to # the kdump kernel. This will likely match the contents of the grub kernel # line. For example: # KDUMP_COMMANDLINE="ro root=LABEL=/" # If a command line is not specified, the default will be taken from # /proc/cmdline KDUMP_COMMANDLINE="" # This variable lets us append arguments to the current kdump commandline # As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1" # Any additional kexec arguments required. In most situations, this should # be left empty # # Example: # KEXEC_ARGS="--elf32-core-headers" KEXEC_ARGS=" --args-linux" #Where to find the boot image KDUMP_BOOTDIR="/boot" #What is the image type used for kdump KDUMP_IMG="vmlinuz" #What is the images extension. Relocatable kernels don't have one KDUMP_IMG_EXT="" kexec-1.101-retry-locate-hole.patch: arch/i386/crashdump-x86.c | 10 ++++++++-- kexec.c | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) --- NEW FILE kexec-1.101-retry-locate-hole.patch --- --- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c.orig1 2007-05-30 14:21:01.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c 2007-05-30 14:21:57.000000000 -0400 @@ -663,6 +663,7 @@ int nr_ranges, align = 1024; long int nr_cpus = 0; struct memory_range *mem_range, *memmap_p; + int i; if (get_crash_memory_ranges(&mem_range, &nr_ranges) < 0) return -1; @@ -720,8 +721,13 @@ * elf core header segment to 16K to avoid being placed in such gaps. * This is a makeshift solution until it is fixed in kernel. */ - elfcorehdr = add_buffer(info, tmp, sz, 16*1024, align, min_base, - max_addr, -1); + for (i=0;inr_segments; i++) { + if (((base <= (unsigned long)info->segment[i].mem) && + (base+memsz > (unsigned long)info->segment[i].mem)) || + ((base > (unsigned long)info->segment[i].mem) && + (base <= ((unsigned long)info->segment[i].mem + info->segment[i].memsz)))) { + /* + *we have an overlap, bump down buf_max + */ + buf_max = (unsigned long)info->segment[i].mem; + goto retry; + } + } add_segment(info, buf, bufsz, base, memsz); return base; kexec-tools-1.101-bzimage-options.patch: kexec-bzImage.c | 11 +++++++++++ 1 files changed, 11 insertions(+) --- NEW FILE kexec-tools-1.101-bzimage-options.patch --- --- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-04 13:58:06.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-04 14:14:07.000000000 -0500 @@ -234,6 +234,9 @@ int bzImage_load(int argc, char **argv, #define OPT_APPEND (OPT_ARCH_MAX+0) #define OPT_RAMDISK (OPT_ARCH_MAX+1) #define OPT_REAL_MODE (OPT_ARCH_MAX+2) +#define OPT_ARGS_ELF (OPT_ARCH_MAX+3) +#define OPT_ARGS_LINUX (OPT_ARCH_MAX+4) +#define OPT_ARGS_NONE (OPT_ARCH_MAX+5) static const struct option options[] = { KEXEC_ARCH_OPTIONS { "debug", 0, 0, OPT_DEBUG }, @@ -242,6 +245,9 @@ int bzImage_load(int argc, char **argv, { "initrd", 1, 0, OPT_RAMDISK }, { "ramdisk", 1, 0, OPT_RAMDISK }, { "real-mode", 0, 0, OPT_REAL_MODE }, + { "args-elf", 0, NULL, OPT_ARGS_ELF }, + { "args-linux", 0, NULL, OPT_ARGS_LINUX }, + { "args-none", 0, NULL, OPT_ARGS_NONE }, { 0, 0, 0, 0 }, }; static const char short_options[] = KEXEC_ARCH_OPT_STR "d"; @@ -276,6 +282,11 @@ int bzImage_load(int argc, char **argv, case OPT_REAL_MODE: real_mode_entry = 1; break; + case OPT_ARGS_ELF: + case OPT_ARGS_LINUX: + case OPT_ARGS_NONE: + /* we can ignore these options */ + break; } } command_line_len = 0; kexec-tools-1.101-elf-core-type.patch: kexec-x86.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE kexec-tools-1.101-elf-core-type.patch --- --- kexec-tools-1.101/kexec/arch/i386/kexec-x86.c.orig 2006-11-15 16:28:04.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/kexec-x86.c 2006-11-15 16:28:13.000000000 -0500 @@ -145,7 +145,7 @@ .serial_baud = 0, .console_vga = 0, .console_serial = 0, - .core_header_type = CORE_TYPE_ELF64, + .core_header_type = CORE_TYPE_ELF32, }; int arch_process_options(int argc, char **argv) kexec-tools-1.101-elf-format.patch: i386/kexec-elf-x86.c | 2 +- x86_64/kexec-elf-x86_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE kexec-tools-1.101-elf-format.patch --- --- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c.fix 2006-08-29 20:07:34.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c 2006-08-29 20:08:03.000000000 -0400 @@ -120,7 +120,7 @@ int elf_x86_64_load(int argc, char **arg /* * Parse the command line arguments */ - arg_style = ARG_STYLE_ELF; + arg_style = ARG_STYLE_LINUX; command_line = 0; modified_cmdline = 0; modified_cmdline_len = 0; --- kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c.fix 2006-08-29 20:07:14.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c 2006-08-29 20:07:24.000000000 -0400 @@ -121,7 +121,7 @@ int elf_x86_load(int argc, char **argv, /* * Parse the command line arguments */ - arg_style = ARG_STYLE_ELF; + arg_style = ARG_STYLE_LINUX; command_line = 0; modified_cmdline = 0; modified_cmdline_len = 0; kexec-tools-1.101-ia64-EFI.patch: kexec/arch/ia64/kexec-elf-ia64.c | 10 +++++ kexec/arch/ia64/kexec-ia64.c | 40 ++++++++++++++++++++++ purgatory/arch/ia64/entry.S | 3 + purgatory/arch/ia64/purgatory-ia64.c | 62 ++++++++++++++++++----------------- 4 files changed, 83 insertions(+), 32 deletions(-) --- NEW FILE kexec-tools-1.101-ia64-EFI.patch --- --- kexec-tools-1.101/purgatory/arch/ia64/entry.S.orig1 2006-10-12 14:25:54.000000000 -0400 +++ kexec-tools-1.101/purgatory/arch/ia64/entry.S 2006-10-12 14:48:04.000000000 -0400 @@ -46,6 +46,8 @@ br.call.sptk.many b0=ia64_env_setup movl r10=__kernel_entry;; ld8 r14=[r10];; + movl r10=__boot_param_base;; + ld8 r28=[r10];; mov b6=r14;; mov ar.lc=r0 mov ar.ec=r0 @@ -61,6 +63,7 @@ DECLARE_DATA8(__command_line_len) DECLARE_DATA8(__efi_memmap_base) DECLARE_DATA8(__efi_memmap_size) +DECLARE_DATA8(__boot_param_base) DECLARE_DATA8(__loaded_segments) DECLARE_DATA8(__loaded_segments_num) --- kexec-tools-1.101/purgatory/arch/ia64/purgatory-ia64.c.orig1 2006-10-12 14:25:54.000000000 -0400 +++ kexec-tools-1.101/purgatory/arch/ia64/purgatory-ia64.c 2006-10-12 14:48:04.000000000 -0400 @@ -123,11 +123,12 @@ uint64_t command_line_len; uint64_t efi_memmap_base; uint64_t efi_memmap_size; + uint64_t boot_param_base; struct loaded_segment *loaded_segments; unsigned long loaded_segments_num; }; -void +void setup_arch(void) { reset_vga(); @@ -138,11 +139,11 @@ return addr - PAGE_OFFSET; } -void -patch_efi_memmap(struct kexec_boot_params *params, +void +patch_efi_memmap(struct kexec_boot_params *params, struct ia64_boot_param *boot_param) { - void *dest = (void *)params->efi_memmap_base; + void *dest = (void *)params->efi_memmap_base; void *src = (void *)boot_param->efi_memmap; unsigned long len = boot_param->efi_memmap_size; unsigned long memdesc_size = boot_param->efi_memdesc_size; @@ -150,15 +151,15 @@ efi_memory_desc_t *md1, *md2; void *p1, *p2, *src_end = src + len; int i; - for (p1 = src, p2 = dest; p1 < src_end; + for (p1 = src, p2 = dest; p1 < src_end; p1 += memdesc_size, p2 += memdesc_size) { unsigned long mstart, mend; md1 = p1; md2 = p2; - if (md1->num_pages == 0) + if (md1->num_pages == 0) continue; mstart = md1->phys_addr; - mend = md1->phys_addr + (md1->num_pages + mend = md1->phys_addr + (md1->num_pages << EFI_PAGE_SHIFT); switch (md1->type) { case EFI_LOADER_DATA: @@ -168,7 +169,7 @@ default: *md2 = *md1; } - // segments are already sorted and aligned to 4K + // segments are already sorted and aligned to 4K orig_type = md2->type; for (i = 0; i < params->loaded_segments_num; i++) { struct loaded_segment *seg; @@ -177,50 +178,50 @@ unsigned long start_pages, mid_pages, end_pages; if (seg->end > mend) { p1 += memdesc_size; - for(; p1 < src_end; + for(; p1 < src_end; p1 += memdesc_size) { md1 = p1; /* TODO check contig and attribute here */ - mend = md1->phys_addr + mend = md1->phys_addr + (md1->num_pages << EFI_PAGE_SHIFT); if (seg->end < mend) break; } } - start_pages = (seg->start - mstart) + start_pages = (seg->start - mstart) >> EFI_PAGE_SHIFT; mid_pages = (seg->end - seg->start) >> EFI_PAGE_SHIFT; - end_pages = (mend - seg->end) + end_pages = (mend - seg->end) >> EFI_PAGE_SHIFT; if (start_pages) { md2->num_pages = start_pages; - p2 += memdesc_size; + p2 += memdesc_size; md2 = p2; *md2 = *md1; } md2->phys_addr = seg->start; md2->num_pages = mid_pages; - md2->type = seg->reserved ? + md2->type = seg->reserved ? EFI_UNUSABLE_MEMORY:EFI_LOADER_DATA; if (end_pages) { - p2 += memdesc_size; + p2 += memdesc_size; md2 = p2; *md2 = *md1; md2->phys_addr = seg->end; md2->num_pages = end_pages; md2->type = orig_type; mstart = seg->end; - } else + } else break; } } } - + boot_param->efi_memmap_size = p2 - dest; } -void +void flush_icache_range(char *start, unsigned long len) { unsigned long i; @@ -233,7 +234,7 @@ extern char __dummy_efi_function[], __dummy_efi_function_end[]; -void +void ia64_env_setup(struct ia64_boot_param *boot_param, struct kexec_boot_params *params) { @@ -243,13 +244,15 @@ unsigned long *set_virtual_address_map; char *command_line = (char *)params->command_line; uint64_t command_line_len = params->command_line_len; - + struct ia64_boot_param *new_boot_param = + (struct ia64_boot_param *) params->boot_param_base; + memcpy(new_boot_param, boot_param, 4096); // patch efi_runtime->set_virtual_address_map to a // dummy function len = __dummy_efi_function_end - __dummy_efi_function; - memcpy(command_line + command_line_len, + memcpy(command_line + command_line_len, __dummy_efi_function, len); - systab = (efi_system_table_t *)boot_param->efi_systab; + systab = (efi_system_table_t *)new_boot_param->efi_systab; runtime = (efi_runtime_services_t *)PA(systab->runtime); set_virtual_address_map = (unsigned long *)PA(runtime->set_virtual_address_map); @@ -257,15 +260,14 @@ (unsigned long)(command_line + command_line_len); flush_icache_range(command_line + command_line_len, len); - patch_efi_memmap(params, boot_param); - - boot_param->efi_memmap = params->efi_memmap_base; + patch_efi_memmap(params, new_boot_param); - boot_param->command_line = params->command_line; - boot_param->console_info.orig_x = 0; - boot_param->console_info.orig_y = 0; - boot_param->initrd_start = params->ramdisk_base; - boot_param->initrd_size = params->ramdisk_size; + new_boot_param->efi_memmap = params->efi_memmap_base; + new_boot_param->command_line = params->command_line; + new_boot_param->console_info.orig_x = 0; + new_boot_param->console_info.orig_y = 0; + new_boot_param->initrd_start = params->ramdisk_base; + new_boot_param->initrd_size = params->ramdisk_size; } /* This function can be used to execute after the SHA256 verification. */ --- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c.orig1 2006-10-12 14:25:54.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c 2006-10-12 14:47:57.000000000 -0400 @@ -36,6 +36,38 @@ static struct memory_range memory_range[MAX_MEMORY_RANGES]; +/* Reserve range for EFI memmap and Boot parameter */ +static int split_range(int range, unsigned long start, unsigned long end) +{ + unsigned long ram_end = memory_range[range - 1].end; + unsigned int type = memory_range[range - 1].type; + int i; + //align end and start to page size of EFI + start = start & ~((1UL<<12) - 1); + end = (end + (1UL<<12) - 1)& ~((1UL<<12) - 1); + for (i = 0; i < range; i++) + if(memory_range[i].start <= start && memory_range[i].end >=end) + break; + if (i >= range) + return range; + range = i; + if (memory_range[range].start < start) { + memory_range[range].end = start; + range++; + } + memory_range[range].start = start; + memory_range[range].end = end; + memory_range[range].type = RANGE_RESERVED; + range++; + if (end < ram_end) { + memory_range[range].start = end; + memory_range[range].end = ram_end; + memory_range[range].type = type; + range++; + } + return range; +} + /* Return a sorted list of available memory ranges. */ int get_memory_ranges(struct memory_range **range, int *ranges, unsigned long kexec_flags) @@ -85,6 +117,12 @@ mem_max = end; } continue; + } else if (memcmp(str, "Boot parameter\n", 14) == 0) { + memory_ranges = split_range(memory_ranges, start, end); + continue; + } else if (memcmp(str, "EFI Memory Map\n", 14) == 0) { + memory_ranges = split_range(memory_ranges, start, end); + continue; } else continue; /* @@ -125,7 +163,7 @@ { static const struct option options[] = { KEXEC_ARCH_OPTIONS - { 0, 0, NULL, 0 }, + { 0, 0, NULL, 0 }, }; static const char short_options[] = KEXEC_ARCH_OPT_STR; int opt; --- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig1 2006-10-12 14:25:54.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2006-10-12 14:48:04.000000000 -0400 @@ -115,9 +115,10 @@ unsigned long entry, max_addr, gp_value; unsigned long command_line_base, ramdisk_base; unsigned long efi_memmap_base, efi_memmap_size; + unsigned long boot_param_base; int result; int opt; - char *efi_memmap_buf; + char *efi_memmap_buf, *boot_param; #define OPT_APPEND (OPT_ARCH_MAX+0) #define OPT_RAMDISK (OPT_ARCH_MAX+1) static const struct option options[] = { @@ -191,6 +192,13 @@ &command_line) < 0) return -1; + // reverve 4k for ia64_boot_param + boot_param = xmalloc(4096); + boot_param_base = add_buffer(info, boot_param, 4096, 4096, 4096, 0, + max_addr, -1); + elf_rel_set_symbol(&info->rhdr, "__boot_param_base", + &boot_param_base, sizeof(long)); + // reserve 8k for efi_memmap efi_memmap_size = 1UL<<14; efi_memmap_buf = xmalloc(efi_memmap_size); kexec-tools-1.101-ia64-dash-l-fix.patch: kexec-elf-ia64.c | 15 +++++++++++---- kexec-ia64.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- kexec-ia64.h | 4 ++++ 3 files changed, 57 insertions(+), 6 deletions(-) --- NEW FILE kexec-tools-1.101-ia64-dash-l-fix.patch --- --- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.h.orig 2006-12-01 14:36:39.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.h 2006-12-01 14:49:13.000000000 -0500 @@ -7,6 +7,10 @@ int elf_ia64_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info); void elf_ia64_usage(void); +int update_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr); +void move_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr, + unsigned long addr); + #define MAX_MEMORY_RANGES 1024 #define EFI_PAGE_SIZE (1UL<<12) #define ELF_PAGE_SIZE (1UL<<16) --- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c.orig 2006-12-01 14:36:39.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c 2006-12-01 14:55:16.000000000 -0500 @@ -28,14 +28,16 @@ #include #include #include +#include #include #include "../../kexec.h" #include "../../kexec-syscall.h" +#include "elf.h" #include "kexec-ia64.h" #include static struct memory_range memory_range[MAX_MEMORY_RANGES]; - +static int memory_ranges; /* Reserve range for EFI memmap and Boot parameter */ static int split_range(int range, unsigned long start, unsigned long end) { @@ -73,7 +75,6 @@ unsigned long kexec_flags) { const char iomem[]= "/proc/iomem"; - int memory_ranges = 0; char line[MAX_LINE]; FILE *fp; fp = fopen(iomem, "r"); @@ -209,6 +210,45 @@ return 0; } +int update_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr) +{ + int i; + struct mem_phdr *phdr; + unsigned long start_addr = ULONG_MAX, end_addr = 0; + unsigned long align = 1UL<<26; // 64M + for(i = 0; i < ehdr->e_phnum; i++) { + phdr = &ehdr->e_phdr[i]; + if (phdr->p_type == PT_LOAD) { + if (phdr->p_paddr < start_addr) + start_addr = phdr->p_paddr; + if ((phdr->p_paddr + phdr->p_memsz) > end_addr) + end_addr = phdr->p_paddr + phdr->p_memsz; + } + + } + + for (i = 0; i < memory_ranges + && memory_range[i].start <= start_addr; i++) { + if (memory_range[i].type == RANGE_RAM && + memory_range[i].end > end_addr) + return; + } + + for (i = 0; i < memory_ranges; i++) { + if (memory_range[i].type == RANGE_RAM) { + unsigned long start = + (memory_range[i].start + align - 1)&~(align - 1); + unsigned long end = memory_range[i].end; + if (end > start && + (end - start) > (end_addr - start_addr)) { + move_loaded_segments(info, ehdr, start); + return 0; + } + } + } + return 1; +} + void arch_update_purgatory(struct kexec_info *info) { } --- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig 2006-12-01 14:36:39.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2006-12-01 14:59:29.000000000 -0500 @@ -84,7 +84,8 @@ /* Move the crash kerenl physical offset to reserved region */ -static void move_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr) +void move_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr, + unsigned long addr) { int i; long offset; @@ -92,7 +93,7 @@ for(i = 0; i < ehdr->e_phnum; i++) { phdr = &ehdr->e_phdr[i]; if (phdr->p_type == PT_LOAD) { - offset = mem_min - phdr->p_paddr; + offset = addr - phdr->p_paddr; break; } } @@ -174,8 +175,14 @@ fprintf(stderr, "Failed to find crash kernel region in /proc/iomem\n"); return -1; } - move_loaded_segments(info, &ehdr); - } + move_loaded_segments(info, &ehdr, mem_min); + } else { + if (update_loaded_segments(info, &ehdr)) { + fprintf(stderr, "Failed to place kernel\n"); + return -1; + } + } + entry = ehdr.e_entry; max_addr = elf_max_addr(&ehdr); kexec-tools-1.101-ia64-icache-align.patch: purgatory-ia64.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE kexec-tools-1.101-ia64-icache-align.patch --- --- kexec-tools-1.101/purgatory/arch/ia64/purgatory-ia64.c.orig 2006-10-20 13:45:49.000000000 -0400 +++ kexec-tools-1.101/purgatory/arch/ia64/purgatory-ia64.c 2006-10-20 13:46:56.000000000 -0400 @@ -224,7 +224,9 @@ void flush_icache_range(char *start, unsigned long len) { - unsigned long i; + unsigned long i,addr; + addr = (unsigned long)start & ~31UL; + len += (unsigned long)start - addr; for (i = 0;i < len; i += 32) asm volatile("fc.i %0"::"r"(start + i):"memory"); asm volatile (";;sync.i;;":::"memory"); kexec-tools-1.101-ia64-kdump.patch: kexec/arch/ia64/Makefile | 2 kexec/arch/ia64/crashdump-ia64.c | 351 +++++++++++++++++++++++++++++++++++ kexec/arch/ia64/crashdump-ia64.h | 13 + kexec/arch/ia64/kexec-elf-ia64.c | 80 +++++++ kexec/arch/ia64/kexec-elf-rel-ia64.c | 37 +++ kexec/arch/ia64/kexec-ia64.h | 4 kexec/kexec-sha256.h | 2 kexec/kexec.c | 3 purgatory/arch/ia64/Makefile | 2 purgatory/arch/ia64/console-ia64.c | 44 ++++ purgatory/arch/ia64/entry.S | 54 +---- purgatory/arch/ia64/io.h | 94 +++++++++ purgatory/arch/ia64/purgatory-ia64.c | 188 +++++++++++++++++- purgatory/arch/ia64/purgatory-ia64.h | 3 purgatory/arch/ia64/vga.c | 143 ++++++++++++++ 15 files changed, 955 insertions(+), 65 deletions(-) --- NEW FILE kexec-tools-1.101-ia64-kdump.patch --- diff -puN /dev/null kexec/arch/ia64/crashdump-ia64.c --- /dev/null 2006-07-13 05:14:41.629277080 +0530 +++ kexec-tools-1.101-kdump-maneesh/kexec/arch/ia64/crashdump-ia64.c 2006-07-13 14:42:05.000000000 +0530 @@ -0,0 +1,351 @@ +/* + * kexec: crashdum support + * Copyright (C) 2005-2006 Zou Nan hai Intel Corp + * + * 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 (version 2 of the License). + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include +#include +#include +#include +#include +#include +#include "../../kexec.h" +#include "../../kexec-elf.h" +#include "../../kexec-syscall.h" +#include "kexec-ia64.h" +#include "crashdump-ia64.h" + +int memory_ranges = 0; +#define LOAD_OFFSET (0xa000000000000000UL + 0x100000000UL - (1UL<<26)) +#define MAX_LINE 160 +/* Stores a sorted list of RAM memory ranges for which to create elf headers. + * A separate program header is created for backup region */ +static struct memory_range crash_memory_range[CRASH_MAX_MEMORY_RANGES]; +/* Memory region reserved for storing panic kernel and other data. */ +static struct memory_range crash_reserved_mem; +unsigned long elfcorehdr; +static unsigned long kernel_code_start; +struct loaded_segment { + unsigned long start; + unsigned long end; + unsigned long reserved; +}; + +#define MAX_LOAD_SEGMENTS 128 +struct loaded_segment loaded_segments[MAX_LOAD_SEGMENTS]; + +unsigned long loaded_segments_num, loaded_segments_base; +static int seg_comp(const void *a, const void *b) +{ + const struct loaded_segment *x = a, *y = b; + /* avoid overflow */ + if (x->start > y->start) return 1; + if (x->start < y->start) return -1; + return 0; +} + +/* purgatory code need this info to patch the EFI memmap + */ +static void add_loaded_segments_info(struct kexec_info *info, + struct mem_ehdr *ehdr, unsigned long max_addr) +{ + int i; + for(i = 0; i < ehdr->e_phnum; i++) { + unsigned long start, end; + struct mem_phdr *phdr; + phdr = &ehdr->e_phdr[i]; + if (phdr->p_type != PT_LOAD) + continue; + start = phdr->p_paddr; + end = phdr->p_paddr + phdr->p_memsz; + + loaded_segments[loaded_segments_num].start = + start&~(ELF_PAGE_SIZE-1); + loaded_segments[loaded_segments_num].end = + (end + ELF_PAGE_SIZE - 1)&~(ELF_PAGE_SIZE - 1); + loaded_segments[loaded_segments_num].reserved = 0; + loaded_segments_num++; + } +} + +static int get_crash_notes_section_addr(unsigned long *addr, int cpu) +{ + char crash_notes[128]; + char line[MAX_LINE]; + FILE *fp; + sprintf(crash_notes, "/sys/devices/system/cpu/cpu%d/crash_notes", cpu); + fp = fopen(crash_notes, "r"); + if (!fp) { + fprintf(stderr, "Cannot open %s: %s\n", + crash_notes, strerror(errno)); + fprintf(stderr, "Try mounting sysfs\n"); + return -1; + } + if (fscanf(fp, "%lx", addr) != 1) { + *addr = 0; + return -1; + } + return 0; +} + +/* Removes crash reserve region from list of memory chunks for whom elf program + * headers have to be created. Assuming crash reserve region to be a single + * continuous area fully contained inside one of the memory chunks */ +static int exclude_crash_reserve_region(int *nr_ranges) +{ + int i, j, tidx = -1; + unsigned long cstart, cend; + struct memory_range temp_region; + + /* Crash reserved region. */ + cstart = crash_reserved_mem.start; + cend = crash_reserved_mem.end; + + for (i = 0; i < (*nr_ranges); i++) { + unsigned long mstart, mend; + mstart = crash_memory_range[i].start; + mend = crash_memory_range[i].end; + if (cstart < mend && cend > mstart) { + if (cstart != mstart && cend != mend) { + /* Split memory region */ + crash_memory_range[i].end = cstart - 1; + temp_region.start = cend + 1; + temp_region.end = mend; + temp_region.type = RANGE_RAM; + tidx = i+1; + } else if (cstart != mstart) + crash_memory_range[i].end = cstart - 1; + else + crash_memory_range[i].start = cend + 1; + } + } + /* Insert split memory region, if any. */ + if (tidx >= 0) { + if (*nr_ranges == CRASH_MAX_MEMORY_RANGES) { + /* No space to insert another element. */ + fprintf(stderr, "Error: Number of crash memory ranges" + " excedeed the max limit\n"); + return -1; + } + for (j = (*nr_ranges - 1); j >= tidx; j--) + crash_memory_range[j+1] = crash_memory_range[j]; + crash_memory_range[tidx].start = temp_region.start; + crash_memory_range[tidx].end = temp_region.end; + crash_memory_range[tidx].type = temp_region.type; + (*nr_ranges)++; + } + return 0; +} + +static int prepare_crash_memory_elf64_headers(struct kexec_info *info, + void *buf, unsigned long size) +{ + Elf64_Ehdr *elf; + Elf64_Phdr *phdr; + int i; + long int nr_cpus = 0; + char *bufp = buf; + unsigned long notes_addr, notes_offset; + + /* Setup ELF Header*/ + elf = (Elf64_Ehdr *) bufp; + bufp += sizeof(Elf64_Ehdr); + memcpy(elf->e_ident, ELFMAG, SELFMAG); + elf->e_ident[EI_CLASS] = ELFCLASS64; + elf->e_ident[EI_DATA] = ELFDATA2LSB; + elf->e_ident[EI_VERSION]= EV_CURRENT; + elf->e_ident[EI_OSABI] = ELFOSABI_NONE; + memset(elf->e_ident+EI_PAD, 0, EI_NIDENT-EI_PAD); + elf->e_type = ET_CORE; + elf->e_machine = EM_IA_64; + elf->e_version = EV_CURRENT; + elf->e_entry = 0; + elf->e_phoff = sizeof(Elf64_Ehdr); + elf->e_shoff = 0; + elf->e_flags = 0; + elf->e_ehsize = sizeof(Elf64_Ehdr); + elf->e_phentsize= sizeof(Elf64_Phdr); + elf->e_phnum = 0; + elf->e_shentsize= 0; + elf->e_shnum = 0; + elf->e_shstrndx = 0; + + /* PT_NOTE program headers. One per cpu*/ + nr_cpus = sysconf(_SC_NPROCESSORS_CONF); + if (nr_cpus < 0) { + return -1; + } + + /* Need to find a better way to determine per cpu notes section size. */ +#define MAX_NOTE_BYTES 1024 + + for (i = 0; i < nr_cpus; i++) { + if (get_crash_notes_section_addr (¬es_addr, i) < 0) + break; + notes_offset = notes_addr; + phdr = (Elf64_Phdr *) bufp; + bufp += sizeof(Elf64_Phdr); + phdr->p_type = PT_NOTE; + phdr->p_flags = 0; + phdr->p_offset = notes_offset; + phdr->p_vaddr = phdr->p_paddr = notes_offset; + phdr->p_filesz = phdr->p_memsz = MAX_NOTE_BYTES; + /* Do we need any alignment of segments? */ + phdr->p_align = 0; + + /* Increment number of program headers. */ + (elf->e_phnum)++; + } + + for (i = 0; i < memory_ranges; i++) { + unsigned long mstart, mend; + mstart = crash_memory_range[i].start; + mend = crash_memory_range[i].end; + if (!mstart && !mend) + break; + phdr = (Elf64_Phdr *) bufp; + bufp += sizeof(Elf64_Phdr); + phdr->p_type = PT_LOAD; + phdr->p_flags = PF_R|PF_W|PF_X; + phdr->p_offset = mstart; + /*add region 5 mapping for kernel*/ + if (kernel_code_start >= mstart && kernel_code_start < mend) { + phdr->p_vaddr = mstart + LOAD_OFFSET; + phdr->p_paddr = mstart; + phdr->p_filesz = phdr->p_memsz = mend - mstart + 1; + phdr->p_align = 0; + (elf->e_phnum)++; + + phdr = (Elf64_Phdr *) bufp; + bufp += sizeof(Elf64_Phdr); + phdr->p_type = PT_LOAD; + phdr->p_flags = PF_R|PF_W|PF_X; + phdr->p_offset = mstart; + } + phdr->p_vaddr = mstart + PAGE_OFFSET; + phdr->p_paddr = mstart; + phdr->p_filesz = phdr->p_memsz = mend - mstart + 1; + phdr->p_align = 0; + (elf->e_phnum)++; + } + return 0; +} + +static int get_crash_memory_ranges(struct memory_range **range, int *ranges) +{ + const char iomem[]= "/proc/iomem"; + char line[MAX_LINE]; + FILE *fp; + unsigned long start, end; + + fp = fopen(iomem, "r"); + if (!fp) { + fprintf(stderr, "Cannot open %s: %s\n", + iomem, strerror(errno)); + return -1; + } + while(fgets(line, sizeof(line), fp) != 0) { + char *str; + int type, consumed, count; + if (memory_ranges >= CRASH_MAX_MEMORY_RANGES) + break; + count = sscanf(line, "%lx-%lx : %n", + &start, &end, &consumed); + str = line + consumed; + if (count != 2) + continue; + + if (memcmp(str, "System RAM\n", 11) == 0) { + type = RANGE_RAM; + } else if (memcmp(str, "Crash kernel\n", 13) == 0) { + /* Reserved memory region. New kernel can + * use this region to boot into. */ + crash_reserved_mem.start = start; + crash_reserved_mem.end = end; + crash_reserved_mem.type = RANGE_RAM; + continue; + } + else if (memcmp(str, "Kernel code\n", 12) == 0) { + kernel_code_start = start; + continue; + }else + continue; + crash_memory_range[memory_ranges].start = start; + crash_memory_range[memory_ranges].end = end; + crash_memory_range[memory_ranges].type = type; + memory_ranges++; + } + fclose(fp); + if (exclude_crash_reserve_region(&memory_ranges) < 0) + return -1; + *ranges = memory_ranges; + return 0; +} + +static void +cmdline_add_elfcorehdr(char **cmdline, unsigned long addr) +{ + char *str = *cmdline; + char buf[64]; + size_t len; + sprintf(buf, " elfcorehdr=%ldK", addr/1024); + len = strlen(str) + strlen(buf) + 1; + str = xmalloc(len); + sprintf(str, "%s%s", *cmdline, buf); + *cmdline = str; +} + +int load_crashdump_segments(struct kexec_info *info, struct mem_ehdr *ehdr, + unsigned long max_addr, unsigned long min_base, + char **cmdline) +{ + //struct memory_range *mem_range, *memmap_p; + struct memory_range *mem_range; + int nr_ranges; + size_t size; + void *tmp; + if (info->kexec_flags & KEXEC_ON_CRASH ) { + if (get_crash_memory_ranges(&mem_range, &nr_ranges) == 0) { + size = sizeof(Elf64_Ehdr) + + (nr_ranges + 1) * sizeof(Elf64_Phdr); + size = (size + EFI_PAGE_SIZE - 1) & ~(EFI_PAGE_SIZE - 1); + tmp = xmalloc(size); + memset(tmp, 0, size); + if (prepare_crash_memory_elf64_headers(info, tmp, size) < 0) + return -1; + elfcorehdr = add_buffer(info, tmp, size, size, EFI_PAGE_SIZE, min_base, + max_addr, -1); + loaded_segments[loaded_segments_num].start = elfcorehdr; + loaded_segments[loaded_segments_num].end = elfcorehdr + size; + loaded_segments[loaded_segments_num].reserved = 1; + loaded_segments_num++; + cmdline_add_elfcorehdr(cmdline, elfcorehdr); + } + } + add_loaded_segments_info(info, ehdr, max_addr); + size = sizeof(struct loaded_segment) * loaded_segments_num; + qsort(loaded_segments, loaded_segments_num, + sizeof(struct loaded_segment), seg_comp); + loaded_segments_base = add_buffer(info, loaded_segments, + size, size, 16, 0, max_addr, -1); + + elf_rel_set_symbol(&info->rhdr, "__loaded_segments", + &loaded_segments_base, sizeof(long)); + elf_rel_set_symbol(&info->rhdr, "__loaded_segments_num", + &loaded_segments_num, sizeof(long)); + return 0; +} + + diff -puN /dev/null kexec/arch/ia64/crashdump-ia64.h --- /dev/null 2006-07-13 05:14:41.629277080 +0530 +++ kexec-tools-1.101-kdump-maneesh/kexec/arch/ia64/crashdump-ia64.h 2006-07-13 14:42:05.000000000 +0530 @@ -0,0 +1,13 @@ +#ifndef CRASHDUMP_IA64_H +#define CRASHDUMP_IA64_H + +#define PAGE_OFFSET 0xe000000000000000UL +#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) +extern int load_crashdump_segments(struct kexec_info *info, + struct mem_ehdr *ehdr, unsigned long max_addr, + unsigned long min_base, char **cmdline); + +#define CRASH_MAX_MEMMAP_NR (KEXEC_MAX_SEGMENTS + 1) +#define CRASH_MAX_MEMORY_RANGES (MAX_MEMORY_RANGES + 2) + +#endif diff -puN kexec/arch/ia64/kexec-elf-ia64.c~kdump-ia64 kexec/arch/ia64/kexec-elf-ia64.c --- kexec-tools-1.101-kdump/kexec/arch/ia64/kexec-elf-ia64.c~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/kexec/arch/ia64/kexec-elf-ia64.c 2006-07-13 14:42:05.000000000 +0530 @@ -40,7 +40,9 @@ #include #include #include "../../kexec.h" +#include "../../kexec-syscall.h" #include "../../kexec-elf.h" +#include "crashdump-ia64.h" #include static const int probe_debug = 0; @@ -80,6 +82,28 @@ void elf_ia64_usage(void) " --initrd=FILE Use FILE as the kernel's initial ramdisk.\n"); } +/* Move the crash kerenl physical offset to reserved region + */ +static void move_loaded_segments(struct kexec_info *info, struct mem_ehdr *ehdr) +{ + int i; + long offset; + struct mem_phdr *phdr; + for(i = 0; i < ehdr->e_phnum; i++) { + phdr = &ehdr->e_phdr[i]; + if (phdr->p_type == PT_LOAD) { + offset = mem_min - phdr->p_paddr; + break; + } + } + ehdr->e_entry += offset; + for(i = 0; i < ehdr->e_phnum; i++) { + phdr = &ehdr->e_phdr[i]; + if (phdr->p_type == PT_LOAD) + phdr->p_paddr += offset; + } +} + int elf_ia64_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info) { @@ -89,9 +113,11 @@ int elf_ia64_load(int argc, char **argv, off_t ramdisk_size = 0; unsigned long command_line_len; unsigned long entry, max_addr, gp_value; - unsigned command_line_base, ramdisk_base; + unsigned long command_line_base, ramdisk_base; + unsigned long efi_memmap_base, efi_memmap_size; int result; int opt; + char *efi_memmap_buf; #define OPT_APPEND (OPT_ARCH_MAX+0) #define OPT_RAMDISK (OPT_ARCH_MAX+1) static const struct option options[] = { @@ -135,6 +161,15 @@ int elf_ia64_load(int argc, char **argv, free_elf_info(&ehdr); return result; } + + if (info->kexec_flags & KEXEC_ON_CRASH ) { + if ((mem_min == 0x00) && (mem_max = ULONG_MAX)) { + fprintf(stderr, "Failed to find crash kernel region in /proc/iomem\n"); + return -1; + } + move_loaded_segments(info, &ehdr); + } + entry = ehdr.e_entry; max_addr = elf_max_addr(&ehdr); @@ -149,17 +184,48 @@ int elf_ia64_load(int argc, char **argv, /* Load the setup code */ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, - 0x80000, ULONG_MAX, 1); + 0x0, ULONG_MAX, -1); - if (command_line_len) { + + if (load_crashdump_segments(info, &ehdr, max_addr, 0, + &command_line) < 0) + return -1; + + // reserve 8k for efi_memmap + efi_memmap_size = 1UL<<14; + efi_memmap_buf = xmalloc(efi_memmap_size); + efi_memmap_base = add_buffer(info, efi_memmap_buf, + efi_memmap_size, efi_memmap_size, 4096, 0, + max_addr, -1); + + elf_rel_set_symbol(&info->rhdr, "__efi_memmap_base", + &efi_memmap_base, sizeof(long)); + + elf_rel_set_symbol(&info->rhdr, "__efi_memmap_size", + &efi_memmap_size, sizeof(long)); + if (command_line) { + command_line_len = strlen(command_line) + 1; + } + if (command_line_len || (info->kexec_flags & KEXEC_ON_CRASH )) { char *cmdline = xmalloc(command_line_len); strcpy(cmdline, command_line); + + if (info->kexec_flags & KEXEC_ON_CRASH) { + char buf[128]; + sprintf(buf," max_addr=%lluM min_addr=%lluM", + mem_max>>20, mem_min>>20); + command_line_len = strlen(cmdline) + strlen(buf) + 1; + cmdline = xrealloc(cmdline, command_line_len); + strcat(cmdline, buf); + } + command_line_len = (command_line_len + 15)&(~15); + command_line_base = add_buffer(info, cmdline, + command_line_len, command_line_len, + getpagesize(), 0UL, + max_addr, -1); elf_rel_set_symbol(&info->rhdr, "__command_line_len", &command_line_len, sizeof(long)); - command_line_base = add_buffer(info, cmdline, - command_line_len, command_line_len, - 16, 0, max_addr, 1); elf_rel_set_symbol(&info->rhdr, "__command_line", &command_line_base, sizeof(long)); } @@ -168,7 +234,7 @@ int elf_ia64_load(int argc, char **argv, ramdisk_buf = slurp_file(ramdisk, &ramdisk_size); ramdisk_base = add_buffer(info, ramdisk_buf, ramdisk_size, ramdisk_size, - getpagesize(), 0, max_addr, 1); + getpagesize(), 0, max_addr, -1); elf_rel_set_symbol(&info->rhdr, "__ramdisk_base", &ramdisk_base, sizeof(long)); elf_rel_set_symbol(&info->rhdr, "__ramdisk_size", diff -puN kexec/arch/ia64/kexec-elf-rel-ia64.c~kdump-ia64 kexec/arch/ia64/kexec-elf-rel-ia64.c --- kexec-tools-1.101-kdump/kexec/arch/ia64/kexec-elf-rel-ia64.c~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/kexec/arch/ia64/kexec-elf-rel-ia64.c 2006-07-13 14:42:05.000000000 +0530 @@ -1,3 +1,26 @@ +/* + * Copyright (C) 2005-2006 Zou Nan hai (nanhai.zou at intel.com) + * + * 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 (version 2 of the License). + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* pugatory relocation code + * Most of the code in this file is + * based on arch/ia64/kernel/module.c in Linux kernel + */ + + /* Most of the code in this file is * based on arch/ia64/kernel/module.c in Linux kernel */ @@ -43,6 +66,15 @@ ia64_patch (uint64_t insn_addr, uint64_t b[1] = (b1 & ~m1) | (v1 & m1); } +static void +put_unaligned64(unsigned long val, unsigned char *location) +{ + unsigned char *src = (unsigned char *)&val; + int i; + for (i = 0; i < sizeof(long); i++) + *location++ = *src++; +} + static inline uint64_t bundle (const uint64_t insn) { @@ -102,6 +134,11 @@ void machine_apply_elf_rel(struct mem_eh | ((value & 0x0fffffUL) << 13) /* bit 0 -> 13 */)); } break; + case R_IA64_PCREL64LSB: { + value = value - address; + put_unaligned64(value, location); + } break; + case R_IA64_GPREL22: case R_IA64_LTOFF22X: if (value - gp_value + MAX_LTOFF/2 >= MAX_LTOFF) die("value out of gp relative range"); diff -puN kexec/arch/ia64/kexec-ia64.h~kdump-ia64 kexec/arch/ia64/kexec-ia64.h --- kexec-tools-1.101-kdump/kexec/arch/ia64/kexec-ia64.h~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/kexec/arch/ia64/kexec-ia64.h 2006-07-13 14:42:05.000000000 +0530 @@ -7,5 +7,7 @@ int elf_ia64_probe(const char *buf, off_ int elf_ia64_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info); void elf_ia64_usage(void); - +#define MAX_MEMORY_RANGES 1024 +#define EFI_PAGE_SIZE (1UL<<12) +#define ELF_PAGE_SIZE (1UL<<16) #endif /* KEXEC_IA64_H */ diff -puN kexec/arch/ia64/Makefile~kdump-ia64 kexec/arch/ia64/Makefile --- kexec-tools-1.101-kdump/kexec/arch/ia64/Makefile~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/kexec/arch/ia64/Makefile 2006-07-13 14:42:05.000000000 +0530 @@ -4,3 +4,5 @@ KEXEC_C_SRCS+= kexec/arch/ia64/kexec-ia64.c KEXEC_C_SRCS+= kexec/arch/ia64/kexec-elf-ia64.c KEXEC_C_SRCS+= kexec/arch/ia64/kexec-elf-rel-ia64.c +KEXEC_C_SRCS+= kexec/arch/ia64/crashdump-ia64.c + diff -puN kexec/kexec.c~kdump-ia64 kexec/kexec.c --- kexec-tools-1.101-kdump/kexec/kexec.c~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/kexec/kexec.c 2006-07-13 14:42:05.000000000 +0530 @@ -96,6 +96,9 @@ int valid_memory_range(unsigned long sst continue; mstart = memory_range[i].start; mend = memory_range[i].end; + if (i < memory_ranges - 1 && mend == memory_range[i+1].start) + mend = memory_range[i+1].end; + /* Check to see if we are fully contained */ if ((mstart <= sstart) && (mend >= send)) { return 1; diff -puN kexec/kexec-sha256.h~kdump-ia64 kexec/kexec-sha256.h --- kexec-tools-1.101-kdump/kexec/kexec-sha256.h~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/kexec/kexec-sha256.h 2006-07-13 14:42:05.000000000 +0530 @@ -6,6 +6,6 @@ struct sha256_region { unsigned long len; }; -#define SHA256_REGIONS 8 +#define SHA256_REGIONS 16 #endif /* KEXEC_SHA256_H */ diff -puN purgatory/arch/ia64/console-ia64.c~kdump-ia64 purgatory/arch/ia64/console-ia64.c --- kexec-tools-1.101-kdump/purgatory/arch/ia64/console-ia64.c~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/purgatory/arch/ia64/console-ia64.c 2006-07-13 14:42:05.000000000 +0530 @@ -1,5 +1,47 @@ #include +#include "io.h" + +#define VGABASE UNCACHED(0xb8000) + +/* code based on i386 console code + * TODO add serial support + */ +#define MAX_YPOS 25 +#define MAX_XPOS 80 + +unsigned long current_ypos = 1, current_xpos = 0; + +static void putchar_vga(int ch) +{ + int i, k, j; + + if (current_ypos >= MAX_YPOS) { + /* scroll 1 line up */ + for (k = 1, j = 0; k < MAX_YPOS; k++, j++) { + for (i = 0; i < MAX_XPOS; i++) { + writew(readw(VGABASE + 2*(MAX_XPOS*k + i)), + VGABASE + 2*(MAX_XPOS*j + i)); + } + } + for (i = 0; i < MAX_XPOS; i++) + writew(0x720, VGABASE + 2*(MAX_XPOS*j + i)); + current_ypos = MAX_YPOS-1; + } + if (ch == '\n') { + current_xpos = 0; + current_ypos++; + } else if (ch != '\r') { + writew(((0x7 << 8) | (unsigned short) ch), + VGABASE + 2*(MAX_XPOS*current_ypos + + current_xpos++)); + if (current_xpos >= MAX_XPOS) { + current_xpos = 0; + current_ypos++; + } + } +} + void putchar(int ch) { - /* Nothing for now */ + putchar_vga(ch); } diff -puN purgatory/arch/ia64/entry.S~kdump-ia64 purgatory/arch/ia64/entry.S --- kexec-tools-1.101-kdump/purgatory/arch/ia64/entry.S~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/purgatory/arch/ia64/entry.S 2006-07-13 14:42:05.000000000 +0530 @@ -1,7 +1,7 @@ /* * purgatory: setup code * - * Copyright (C) 2005 Zou Nan hai (nanhai.zou at intel.com) + * Copyright (C) 2005-2006 Zou Nan hai (nanhai.zou at intel.com) * * 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 @@ -16,6 +16,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define DECLARE_DATA8(name) \ +.global name; \ +.size name, 8; \ +name: data8 0x0 .global __dummy_efi_function .align 32 @@ -35,18 +39,10 @@ purgatory_start: ld8 gp=[r2];; br.call.sptk.many b0=purgatory ;; - alloc r2 = ar.pfs, 0, 0, 5, 0 + alloc r2 = ar.pfs, 0, 0, 2, 0 ;; mov out0=r28 - - movl r2=__command_line;; - ld8 out1=[r2];; - movl r2=__command_line_len;; - ld8 out2=[r2];; - movl r2=__ramdisk_base;; - ld8 out3=[r2];; - movl r2=__ramdisk_size;; - ld8 out4=[r2];; + movl out1=__ramdisk_base;; br.call.sptk.many b0=ia64_env_setup movl r10=__kernel_entry;; ld8 r14=[r10];; @@ -58,28 +54,14 @@ purgatory_start: br.call.sptk.many b0=b6 .endp purgatory_start -.align 32 -.global __kernel_entry -.size __kernel_entry, 8 -__kernel_entry: - data8 0x0 -.global __command_line -.size __command_line, 8 -__command_line: - data8 0x0 -.global __command_line_len -.size __command_line_len, 8 -__command_line_len: - data8 0x0 -.global __ramdisk_base -.size __ramdisk_base, 8 -__ramdisk_base: - data8 0x0 -.global __ramdisk_size -.size __ramdisk_size, 8 -__ramdisk_size: - data8 0x0 -.global __gp_value -.size __gp_value, 8 -__gp_value: - data8 0x0 +DECLARE_DATA8(__kernel_entry) +DECLARE_DATA8(__ramdisk_base) +DECLARE_DATA8(__ramdisk_size) +DECLARE_DATA8(__command_line) +DECLARE_DATA8(__command_line_len) +DECLARE_DATA8(__efi_memmap_base) +DECLARE_DATA8(__efi_memmap_size) +DECLARE_DATA8(__loaded_segments) +DECLARE_DATA8(__loaded_segments_num) + +DECLARE_DATA8(__gp_value) diff -puN /dev/null purgatory/arch/ia64/io.h --- /dev/null 2006-07-13 05:14:41.629277080 +0530 +++ kexec-tools-1.101-kdump-maneesh/purgatory/arch/ia64/io.h 2006-07-13 14:42:05.000000000 +0530 @@ -0,0 +1,94 @@ +#ifndef IO_H +#define IO_H +#define UNCACHED(x) (void *)((x)|(1UL<<63)) +#define MF() asm volatile ("mf.a" ::: "memory") +#define IO_SPACE_ENCODING(p) ((((p) >> 2) << 12) | (p & 0xfff)) + +static inline void *io_addr (unsigned long port) +{ + unsigned long offset; + unsigned long io_base; + asm volatile ("mov %0=ar.k0":"=r"(io_base)); + offset = IO_SPACE_ENCODING(port); + return UNCACHED(io_base | offset); +} + +static inline unsigned int inb (unsigned long port) +{ + volatile unsigned char *addr = io_addr(port); + unsigned char ret; + ret = *addr; + MF(); + return ret; +} + +static inline unsigned int inw (unsigned long port) +{ + volatile unsigned short *addr = io_addr(port); + unsigned short ret; + + ret = *addr; + MF(); + return ret; +} + +static inline unsigned int ia64_inl (unsigned long port) +{ + volatile unsigned int *addr = __ia64_mk_io_addr(port); + unsigned int ret; + ret = *addr; + MF(); + return ret; +} + +static inline void outb (unsigned char val, unsigned long port) +{ + volatile unsigned char *addr = io_addr(port); + + *addr = val; + MF(); +} + +static inline void outw (unsigned short val, unsigned long port) +{ + volatile unsigned short *addr = io_addr(port); + + *addr = val; + MF(); +} + +static inline void outl (unsigned int val, unsigned long port) +{ + volatile unsigned int *addr = io_addr(port); + + *addr = val; + MF(); +} + + +static inline unsigned char readb(const volatile void *addr) +{ + return *(volatile unsigned char *) addr; +} +static inline unsigned short readw(const volatile void *addr) +{ + return *(volatile unsigned short *) addr; +} +static inline unsigned int readl(const volatile void *addr) +{ + return *(volatile unsigned int *) addr; +} + +static inline void writeb(unsigned char b, volatile void *addr) +{ + *(volatile unsigned char *) addr = b; +} +static inline void writew(unsigned short b, volatile void *addr) +{ + *(volatile unsigned short *) addr = b; +} +static inline void writel(unsigned int b, volatile void *addr) +{ + *(volatile unsigned int *) addr = b; +} +#endif diff -puN purgatory/arch/ia64/Makefile~kdump-ia64 purgatory/arch/ia64/Makefile --- kexec-tools-1.101-kdump/purgatory/arch/ia64/Makefile~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/purgatory/arch/ia64/Makefile 2006-07-13 14:42:05.000000000 +0530 @@ -5,5 +5,5 @@ PCFLAGS += -ffixed-r28 PURGATORY_S_SRCS+= purgatory/arch/ia64/entry.S PURGATORY_C_SRCS+= purgatory/arch/ia64/purgatory-ia64.c PURGATORY_C_SRCS+= purgatory/arch/ia64/console-ia64.c -PURGATORY_C_SRCS+= +PURGATORY_C_SRCS+= purgatory/arch/ia64/vga.c diff -puN purgatory/arch/ia64/purgatory-ia64.c~kdump-ia64 purgatory/arch/ia64/purgatory-ia64.c --- kexec-tools-1.101-kdump/purgatory/arch/ia64/purgatory-ia64.c~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/purgatory/arch/ia64/purgatory-ia64.c 2006-07-13 14:42:05.000000000 +0530 @@ -1,9 +1,47 @@ +/* + * purgatory: setup code + * + * Copyright (C) 2005-2006 Zou Nan hai (nanhai.zou at intel.com) + * + * 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 (version 2 of the License). + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include #include #include #include "purgatory-ia64.h" -#define PAGE_OFFSET 0xe000000000000000 +#define PAGE_OFFSET 0xe000000000000000UL + +#define EFI_PAGE_SHIFT 12 +#define EFI_PAGE_SIZE (1UL<efi_memmap_base; + void *src = (void *)boot_param->efi_memmap; + unsigned long len = boot_param->efi_memmap_size; + unsigned long memdesc_size = boot_param->efi_memdesc_size; + uint64_t orig_type; + efi_memory_desc_t *md1, *md2; + void *p1, *p2, *src_end = src + len; + int i; + for (p1 = src, p2 = dest; p1 < src_end; + p1 += memdesc_size, p2 += memdesc_size) { + unsigned long mstart, mend; + md1 = p1; + md2 = p2; + if (md1->num_pages == 0) + continue; + mstart = md1->phys_addr; + mend = md1->phys_addr + (md1->num_pages + << EFI_PAGE_SHIFT); + switch (md1->type) { + case EFI_LOADER_DATA: + *md2 = *md1; + md2->type = EFI_CONVENTIONAL_MEMORY; + break; + default: + *md2 = *md1; + } + // segments are already sorted and aligned to 4K + orig_type = md2->type; + for (i = 0; i < params->loaded_segments_num; i++) { + struct loaded_segment *seg; + seg = ¶ms->loaded_segments[i]; + if (seg->start >= mstart && seg->start < mend) { + unsigned long start_pages, mid_pages, end_pages; + if (seg->end > mend) { + p1 += memdesc_size; + for(; p1 < src_end; + p1 += memdesc_size) { + md1 = p1; + /* TODO check contig and attribute here */ + mend = md1->phys_addr + + (md1->num_pages << EFI_PAGE_SHIFT); + if (seg->end < mend) + break; + } + } + start_pages = (seg->start - mstart) + >> EFI_PAGE_SHIFT; + mid_pages = (seg->end - seg->start) + >> EFI_PAGE_SHIFT; + end_pages = (mend - seg->end) + >> EFI_PAGE_SHIFT; + if (start_pages) { + md2->num_pages = start_pages; + p2 += memdesc_size; + md2 = p2; + *md2 = *md1; + } + md2->phys_addr = seg->start; + md2->num_pages = mid_pages; + md2->type = seg->reserved ? + EFI_UNUSABLE_MEMORY:EFI_LOADER_DATA; + if (end_pages) { + p2 += memdesc_size; + md2 = p2; + *md2 = *md1; + md2->phys_addr = seg->end; + md2->num_pages = end_pages; + md2->type = orig_type; + mstart = seg->end; + } else + break; + } + } + } + + boot_param->efi_memmap_size = p2 - dest; +} + +void +flush_icache_range(char *start, unsigned long len) { unsigned long i; for (i = 0;i < len; i += 32) - asm volatile("fc.i %0"::"r"(start+i):"memory"); + asm volatile("fc.i %0"::"r"(start + i):"memory"); asm volatile (";;sync.i;;":::"memory"); asm volatile ("srlz.i":::"memory"); } extern char __dummy_efi_function[], __dummy_efi_function_end[]; -void ia64_env_setup(struct ia64_boot_param *boot_param, - uint64_t command_line, uint64_t command_line_len, - uint64_t ramdisk_base, uint64_t ramdisk_size) + +void +ia64_env_setup(struct ia64_boot_param *boot_param, + struct kexec_boot_params *params) { unsigned long len; efi_system_table_t *systab; efi_runtime_services_t *runtime; unsigned long *set_virtual_address_map; + char *command_line = (char *)params->command_line; + uint64_t command_line_len = params->command_line_len; // patch efi_runtime->set_virtual_address_map to a // dummy function len = __dummy_efi_function_end - __dummy_efi_function; - memcpy((char *)command_line + command_line_len, __dummy_efi_function, - len); + memcpy(command_line + command_line_len, + __dummy_efi_function, len); systab = (efi_system_table_t *)boot_param->efi_systab; runtime = (efi_runtime_services_t *)PA(systab->runtime); set_virtual_address_map = (unsigned long *)PA(runtime->set_virtual_address_map); - *(set_virtual_address_map)= - (unsigned long)((char *)command_line + command_line_len); - flush_icache_range((char *)command_line+command_line_len, len); + *(set_virtual_address_map) = + (unsigned long)(command_line + command_line_len); + flush_icache_range(command_line + command_line_len, len); + + patch_efi_memmap(params, boot_param); + + boot_param->efi_memmap = params->efi_memmap_base; - boot_param->command_line = command_line; + boot_param->command_line = params->command_line; boot_param->console_info.orig_x = 0; boot_param->console_info.orig_y = 0; - boot_param->initrd_start = ramdisk_base; - boot_param->initrd_size = ramdisk_size; + boot_param->initrd_start = params->ramdisk_base; + boot_param->initrd_size = params->ramdisk_size; } /* This function can be used to execute after the SHA256 verification. */ diff -puN purgatory/arch/ia64/purgatory-ia64.h~kdump-ia64 purgatory/arch/ia64/purgatory-ia64.h --- kexec-tools-1.101-kdump/purgatory/arch/ia64/purgatory-ia64.h~kdump-ia64 2006-07-13 14:42:05.000000000 +0530 +++ kexec-tools-1.101-kdump-maneesh/purgatory/arch/ia64/purgatory-ia64.h 2006-07-13 14:42:05.000000000 +0530 @@ -1,6 +1,5 @@ #ifndef PURGATORY_IA64_H #define PURGATORY_IA64_H -/* nothing yet */ - +void reset_vga(void); #endif /* PURGATORY_IA64_H */ diff -puN /dev/null purgatory/arch/ia64/vga.c --- /dev/null 2006-07-13 05:14:41.629277080 +0530 +++ kexec-tools-1.101-kdump-maneesh/purgatory/arch/ia64/vga.c 2006-07-13 14:42:05.000000000 +0530 @@ -0,0 +1,143 @@ +#include "io.h" +void reset_vga(void) +{ + /* Hello */ + inb(0x3da); + outb(0, 0x3c0); + + /* Sequencer registers */ + outw(0x0300, 0x3c4); + outw(0x0001, 0x3c4); + outw(0x0302, 0x3c4); + outw(0x0003, 0x3c4); + outw(0x0204, 0x3c4); + + /* Ensure CRTC regs 0-7 are unlocked by clearing bit 7 of CRTC[17] */ + outw(0x0e11, 0x3d4); + /* CRTC registers */ + outw(0x5f00, 0x3d4); + outw(0x4f01, 0x3d4); + outw(0x5002, 0x3d4); + outw(0x8203, 0x3d4); + outw(0x5504, 0x3d4); + outw(0x8105, 0x3d4); + outw(0xbf06, 0x3d4); + outw(0x1f07, 0x3d4); + outw(0x0008, 0x3d4); + outw(0x4f09, 0x3d4); + outw(0x200a, 0x3d4); + outw(0x0e0b, 0x3d4); + outw(0x000c, 0x3d4); + outw(0x000d, 0x3d4); + outw(0x010e, 0x3d4); + outw(0xe00f, 0x3d4); + outw(0x9c10, 0x3d4); + outw(0x8e11, 0x3d4); + outw(0x8f12, 0x3d4); + outw(0x2813, 0x3d4); + outw(0x1f14, 0x3d4); + outw(0x9615, 0x3d4); + outw(0xb916, 0x3d4); + outw(0xa317, 0x3d4); + outw(0xff18, 0x3d4); + + /* Graphic registers */ + outw(0x0000, 0x3ce); + outw(0x0001, 0x3ce); + outw(0x0002, 0x3ce); + outw(0x0003, 0x3ce); + outw(0x0004, 0x3ce); + outw(0x1005, 0x3ce); + outw(0x0e06, 0x3ce); + outw(0x0007, 0x3ce); + outw(0xff08, 0x3ce); + + /* Attribute registers */ + inb(0x3da); + outb(0x00, 0x3c0); + outb(0x00, 0x3c0); + + inb(0x3da); + outb(0x01, 0x3c0); + outb(0x01, 0x3c0); + + inb(0x3da); + outb(0x02, 0x3c0); + outb(0x02, 0x3c0); + + inb(0x3da); + outb(0x03, 0x3c0); + outb(0x03, 0x3c0); + + inb(0x3da); + outb(0x04, 0x3c0); + outb(0x04, 0x3c0); + + inb(0x3da); + outb(0x05, 0x3c0); + outb(0x05, 0x3c0); + + inb(0x3da); + outb(0x06, 0x3c0); + outb(0x14, 0x3c0); + + inb(0x3da); + outb(0x07, 0x3c0); + outb(0x07, 0x3c0); + + inb(0x3da); + outb(0x08, 0x3c0); + outb(0x38, 0x3c0); + + inb(0x3da); + outb(0x09, 0x3c0); + outb(0x39, 0x3c0); + + inb(0x3da); + outb(0x0a, 0x3c0); + outb(0x3a, 0x3c0); + + inb(0x3da); + outb(0x0b, 0x3c0); + outb(0x3b, 0x3c0); + + inb(0x3da); + outb(0x0c, 0x3c0); + outb(0x3c, 0x3c0); + + inb(0x3da); + outb(0x0d, 0x3c0); + outb(0x3d, 0x3c0); + + inb(0x3da); + outb(0x0e, 0x3c0); + outb(0x3e, 0x3c0); + + inb(0x3da); + outb(0x0f, 0x3c0); + outb(0x3f, 0x3c0); + + inb(0x3da); + outb(0x10, 0x3c0); + outb(0x0c, 0x3c0); + + inb(0x3da); + outb(0x11, 0x3c0); + outb(0x00, 0x3c0); + + inb(0x3da); + outb(0x12, 0x3c0); + outb(0x0f, 0x3c0); + + inb(0x3da); + outb(0x13, 0x3c0); + outb(0x08, 0x3c0); + + inb(0x3da); + outb(0x14, 0x3c0); + outb(0x00, 0x3c0); + + /* Goodbye */ + inb(0x3da); + outb(0x20, 0x3c0); +} _ kexec-tools-1.101-ia64-load-offset.patch: crashdump-ia64.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE kexec-tools-1.101-ia64-load-offset.patch --- --- kexec-tools-1.101/kexec/arch/ia64/crashdump-ia64.c.orig 2006-12-01 14:16:07.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/crashdump-ia64.c 2006-12-01 14:18:34.000000000 -0500 @@ -28,7 +28,7 @@ #include "crashdump-ia64.h" int memory_ranges = 0; -#define LOAD_OFFSET (0xa000000000000000UL + 0x100000000UL - (1UL<<26)) +#define LOAD_OFFSET (0xa000000000000000UL + 0x100000000UL - kernel_code_start) #define MAX_LINE 160 /* Stores a sorted list of RAM memory ranges for which to create elf headers. * A separate program header is created for backup region */ kexec-tools-1.101-ia64-noio-eat.patch: kexec-elf-ia64.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE kexec-tools-1.101-ia64-noio-eat.patch --- --- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig 2006-12-01 14:30:59.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2006-12-01 14:31:04.000000000 -0500 @@ -128,7 +128,7 @@ {"command-line", 1, 0, OPT_APPEND}, {"append", 1, 0, OPT_APPEND}, {"initrd", 1, 0, OPT_RAMDISK}, - {"noio", 1, 0, OPT_NOIO}, + {"noio", 0, 0, OPT_NOIO}, {0, 0, 0, 0}, }; kexec-tools-1.101-ia64-noio.patch: kexec/arch/ia64/kexec-elf-ia64.c | 10 +++++ purgatory/arch/ia64/entry.S | 1 purgatory/arch/ia64/include/arch/io.h | 25 ------------- purgatory/arch/ia64/io.h | 64 ++++++++++++++++++++-------------- 4 files changed, 50 insertions(+), 50 deletions(-) --- NEW FILE kexec-tools-1.101-ia64-noio.patch --- On Thu, Sep 21, 2006 at 01:06:08PM +0800, Zou Nan hai wrote: > SN platform support PIO in a different way to generic IA64 platform. It > does not support most of the legacy I/O ports. > > Give an --noio option to kexec-tools to disable I/O in purgatory code. > > This patch also removed an unused io.h in kexec-tools. > > Signed-off-by: Zou Nan hai I have merged the following into kexec-tools-test. -- Horms H: http://www.vergenet.net/~horms/ W: http://www.valinux.co.jp/en/ From: Zou Nan hai Date: 21 Sep 2006 13:06:08 +0800 Subject: kexec-tools: --noio option to disable I/O in purgatory code. SN platform support PIO in a different way to generic IA64 platform. It does not support most of the legacy I/O ports. Give an --noio option to kexec-tools to disable I/O in purgatory code. This patch also removed an unused io.h in kexec-tools. Signed-off-by: Zou Nan hai Edited to consistently use tabs instead of spaces for intentation, remove one instance of trailing whitespace, and fix indentation of noio line in options[]. Signed-off-by: Simon Horman diff -Nraup kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c kexec-tools-1.101-fix/kexec/arch/ia64/kexec-elf-ia64.c --- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2006-09-20 15:30:40.000000000 +0800 +++ kexec-tools-1.101-fix/kexec/arch/ia64/kexec-elf-ia64.c 2006-09-21 15:12:20.000000000 +0800 @@ -116,16 +116,19 @@ int elf_ia64_load(int argc, char **argv, unsigned long command_line_base, ramdisk_base; unsigned long efi_memmap_base, efi_memmap_size; unsigned long boot_param_base; + unsigned long noio=0; int result; int opt; char *efi_memmap_buf, *boot_param; #define OPT_APPEND (OPT_ARCH_MAX+0) #define OPT_RAMDISK (OPT_ARCH_MAX+1) +#define OPT_NOIO (OPT_ARCH_MAX+2) static const struct option options[] = { KEXEC_ARCH_OPTIONS {"command-line", 1, 0, OPT_APPEND}, {"append", 1, 0, OPT_APPEND}, {"initrd", 1, 0, OPT_RAMDISK}, + {"noio", 1, 0, OPT_NOIO}, {0, 0, 0, 0}, }; @@ -148,6 +151,9 @@ int elf_ia64_load(int argc, char **argv, case OPT_RAMDISK: ramdisk = optarg; break; + case OPT_NOIO: /* disable PIO and MMIO in purgatory code*/ + noio = 1; + break; } } command_line_len = 0; @@ -196,6 +202,10 @@ int elf_ia64_load(int argc, char **argv, boot_param = xmalloc(4096); boot_param_base = add_buffer(info, boot_param, 4096, 4096, 4096, 0, max_addr, -1); + + elf_rel_set_symbol(&info->rhdr, "__noio", + &noio, sizeof(long)); + elf_rel_set_symbol(&info->rhdr, "__boot_param_base", &boot_param_base, sizeof(long)); diff -Nraup kexec-tools-1.101/purgatory/arch/ia64/entry.S kexec-tools-1.101-fix/purgatory/arch/ia64/entry.S --- kexec-tools-1.101/purgatory/arch/ia64/entry.S 2006-09-20 15:30:40.000000000 +0800 +++ kexec-tools-1.101-fix/purgatory/arch/ia64/entry.S 2006-09-21 15:11:36.000000000 +0800 @@ -68,3 +68,4 @@ DECLARE_DATA8(__loaded_segments) DECLARE_DATA8(__loaded_segments_num) DECLARE_DATA8(__gp_value) +DECLARE_DATA8(__noio) diff -Nraup kexec-tools-1.101/purgatory/arch/ia64/include/arch/io.h kexec-tools-1.101-fix/purgatory/arch/ia64/include/arch/io.h --- kexec-tools-1.101/purgatory/arch/ia64/include/arch/io.h 2006-09-20 15:29:29.000000000 +0800 +++ kexec-tools-1.101-fix/purgatory/arch/ia64/include/arch/io.h 1970-01-01 08:00:00.000000000 +0800 @@ -1,25 +0,0 @@ -#ifndef ARCH_IO_H -#define ARCH_IO_H - -#include -/* Helper functions for directly doing I/O */ - -extern inline uint8_t inb(void *port) -{ - volatile unsigned char *addr = (unsigned char *)port; - uint8_t result; - - result = *addr; - asm volatile ("mf.a"::: "memory"); - return result; -} - -extern inline void outb (uint8_t value, void *port) -{ - volatile unsigned char *addr = (unsigned char *)port; - - *addr = value; - asm volatile ("mf.a"::: "memory"); -} - -#endif /* ARCH_IO_H */ diff -Nraup kexec-tools-1.101/purgatory/arch/ia64/io.h kexec-tools-1.101-fix/purgatory/arch/ia64/io.h --- kexec-tools-1.101/purgatory/arch/ia64/io.h 2006-09-20 15:29:29.000000000 +0800 +++ kexec-tools-1.101-fix/purgatory/arch/ia64/io.h 2006-09-21 15:11:19.000000000 +0800 @@ -3,7 +3,7 @@ #define UNCACHED(x) (void *)((x)|(1UL<<63)) #define MF() asm volatile ("mf.a" ::: "memory") #define IO_SPACE_ENCODING(p) ((((p) >> 2) << 12) | (p & 0xfff)) - +extern long __noio; static inline void *io_addr (unsigned long port) { unsigned long offset; @@ -16,28 +16,34 @@ static inline void *io_addr (unsigned lo static inline unsigned int inb (unsigned long port) { volatile unsigned char *addr = io_addr(port); - unsigned char ret; - ret = *addr; - MF(); + unsigned char ret = 0; + if (!__noio) { + ret = *addr; + MF(); + } return ret; } static inline unsigned int inw (unsigned long port) { volatile unsigned short *addr = io_addr(port); - unsigned short ret; + unsigned short ret = 0; - ret = *addr; - MF(); + if (!__noio) { + ret = *addr; + MF(); + } return ret; } -static inline unsigned int ia64_inl (unsigned long port) +static inline unsigned int inl (unsigned long port) { - volatile unsigned int *addr = __ia64_mk_io_addr(port); - unsigned int ret; - ret = *addr; - MF(); + volatile unsigned int *addr = io_addr(port); + unsigned int ret ; + if (!__noio) { + ret = *addr; + MF(); + } return ret; } @@ -45,50 +51,58 @@ static inline void outb (unsigned char v { volatile unsigned char *addr = io_addr(port); - *addr = val; - MF(); + if (!__noio) { + *addr = val; + MF(); + } } static inline void outw (unsigned short val, unsigned long port) { volatile unsigned short *addr = io_addr(port); - *addr = val; - MF(); + if (!__noio) { + *addr = val; + MF(); + } } static inline void outl (unsigned int val, unsigned long port) { volatile unsigned int *addr = io_addr(port); - *addr = val; - MF(); + if (!__noio) { + *addr = val; + MF(); + } } - static inline unsigned char readb(const volatile void *addr) { - return *(volatile unsigned char *) addr; + return __noio ? 0 :*(volatile unsigned char *) addr; } static inline unsigned short readw(const volatile void *addr) { - return *(volatile unsigned short *) addr; + return __noio ? 0 :*(volatile unsigned short *) addr; } static inline unsigned int readl(const volatile void *addr) { - return *(volatile unsigned int *) addr; + return __noio ? 0 :*(volatile unsigned int *) addr; } static inline void writeb(unsigned char b, volatile void *addr) { - *(volatile unsigned char *) addr = b; + if (!__noio) + *(volatile unsigned char *) addr = b; } static inline void writew(unsigned short b, volatile void *addr) { - *(volatile unsigned short *) addr = b; + if (!__noio) + *(volatile unsigned short *) addr = b; } static inline void writel(unsigned int b, volatile void *addr) { - *(volatile unsigned int *) addr = b; + if (!__noio) + *(volatile unsigned int *) addr = b; } #endif kexec-tools-1.101-ia64-phdr-malloc.patch: crashdump-ia64.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- NEW FILE kexec-tools-1.101-ia64-phdr-malloc.patch --- --- kexec-tools-1.101/kexec/arch/ia64/crashdump-ia64.c.orig 2006-11-14 13:38:45.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/crashdump-ia64.c 2006-11-14 14:52:34.000000000 -0500 @@ -316,10 +316,14 @@ int nr_ranges; size_t size; void *tmp; + long int nr_cpus; + if ((nr_cpus = sysconf(_SC_NPROCESSORS_CONF)) < 0) + return -1; if (info->kexec_flags & KEXEC_ON_CRASH ) { if (get_crash_memory_ranges(&mem_range, &nr_ranges) == 0) { - size = sizeof(Elf64_Ehdr) + - (nr_ranges + 1) * sizeof(Elf64_Phdr); + size = (sizeof(Elf64_Ehdr) + + ((nr_cpus +1) * sizeof(Elf64_Phdr)) + + ((nr_ranges + 1) * sizeof(Elf64_Phdr))); size = (size + EFI_PAGE_SIZE - 1) & ~(EFI_PAGE_SIZE - 1); tmp = xmalloc(size); memset(tmp, 0, size); kexec-tools-1.101-ia64-tools.patch: Makefile | 1 kdump/kdump.8 | 39 ++++++++++++ kexec/Makefile | 4 + kexec/arch/ia64/kexec-elf-ia64.c | 60 ++++++++++++++++--- kexec/arch/ia64/kexec-elf-rel-ia64.c | 96 ++++++++++++++++++++++++++++-- kexec/arch/ia64/kexec-ia64.c | 107 ++++++++++++++++++++++++---------- kexec/arch/ia64/kexec-ia64.h | 2 kexec/kexec.8 | 46 ++++++++++++-- purgatory/arch/ia64/Makefile | 4 - purgatory/arch/ia64/entry.S | 85 +++++++++++++++++++++++++++ purgatory/arch/ia64/include/arch/io.h | 25 +++++++ purgatory/arch/ia64/purgatory-ia64.c | 106 +++++++++++++++++++++++++++++++++ 12 files changed, 521 insertions(+), 54 deletions(-) --- NEW FILE kexec-tools-1.101-ia64-tools.patch --- --- kexec-tools-1.101/Makefile.orig 2006-10-20 13:38:53.000000000 -0400 +++ kexec-tools-1.101/Makefile 2006-10-20 13:39:08.000000000 -0400 @@ -43,6 +43,7 @@ PKGINCLUDEIR=$(INCLUDEDIR)/$(PACKAGE) MAN_PAGES:= kexec/kexec.8 +MAN_PAGES+= kdump/kdump.8 BINARIES_i386:= $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) --- /dev/null 2006-10-19 09:27:39.770809345 -0400 +++ kexec-tools-1.101/kdump/kdump.8 2006-10-20 13:39:08.000000000 -0400 @@ -0,0 +1,39 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH KDUMP 8 "Jul 27, 2005" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +kdump \- This is just a placeholder until real man page has been written +.SH SYNOPSIS +.B kdump +.RI [ options ] " start_address" ... +.SH DESCRIPTION +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkdump\fP does not have a man page yet. +.SH OPTIONS +.\"These programs follow the usual GNU command line syntax, with long +.\"options starting with two dashes (`-'). +.\"A summary of options is included below. +.\"For a complete description, see the Info files. +.SH SEE ALSO +.SH AUTHOR +kdump was written by Eric Biederman. +.PP +This manual page was written by Khalid Aziz , +for the Debian project (but may be used by others). --- kexec-tools-1.101/purgatory/arch/ia64/Makefile.orig 2004-12-20 17:44:22.000000000 -0500 +++ kexec-tools-1.101/purgatory/arch/ia64/Makefile 2006-10-20 13:39:08.000000000 -0400 @@ -1,8 +1,8 @@ # # Purgatory ia64 # - -PURGATORY_S_SRCS+= +PCFLAGS += -ffixed-r28 +PURGATORY_S_SRCS+= purgatory/arch/ia64/entry.S PURGATORY_C_SRCS+= purgatory/arch/ia64/purgatory-ia64.c PURGATORY_C_SRCS+= purgatory/arch/ia64/console-ia64.c PURGATORY_C_SRCS+= --- /dev/null 2006-10-19 09:27:39.770809345 -0400 +++ kexec-tools-1.101/purgatory/arch/ia64/include/arch/io.h 2006-10-20 13:39:08.000000000 -0400 @@ -0,0 +1,25 @@ +#ifndef ARCH_IO_H +#define ARCH_IO_H + +#include +/* Helper functions for directly doing I/O */ + +extern inline uint8_t inb(void *port) +{ + volatile unsigned char *addr = (unsigned char *)port; + uint8_t result; + + result = *addr; + asm volatile ("mf.a"::: "memory"); + return result; +} + +extern inline void outb (uint8_t value, void *port) +{ + volatile unsigned char *addr = (unsigned char *)port; + + *addr = value; + asm volatile ("mf.a"::: "memory"); +} + +#endif /* ARCH_IO_H */ --- /dev/null 2006-10-19 09:27:39.770809345 -0400 +++ kexec-tools-1.101/purgatory/arch/ia64/entry.S 2006-10-20 13:39:08.000000000 -0400 @@ -0,0 +1,85 @@ +/* + * purgatory: setup code + * + * Copyright (C) 2005 Zou Nan hai (nanhai.zou at intel.com) + * + * 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 (version 2 of the License). + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +.global __dummy_efi_function +.align 32 +.proc __dummy_efi_function +__dummy_efi_function: + mov r8=r0;; + br.ret.sptk.many rp;; +.global __dummy_efi_function_end +__dummy_efi_function_end: +.endp __dummy_efi_function + +.global purgatory_start +.align 32 +.proc purgatory_start +purgatory_start: + movl r2=__gp_value;; + ld8 gp=[r2];; + br.call.sptk.many b0=purgatory + ;; + alloc r2 = ar.pfs, 0, 0, 5, 0 + ;; + mov out0=r28 + + movl r2=__command_line;; + ld8 out1=[r2];; + movl r2=__command_line_len;; + ld8 out2=[r2];; + movl r2=__ramdisk_base;; + ld8 out3=[r2];; + movl r2=__ramdisk_size;; + ld8 out4=[r2];; + br.call.sptk.many b0=ia64_env_setup + movl r10=__kernel_entry;; + ld8 r14=[r10];; + mov b6=r14;; + mov ar.lc=r0 + mov ar.ec=r0 + cover;; + invala;; + br.call.sptk.many b0=b6 +.endp purgatory_start + +.align 32 +.global __kernel_entry +.size __kernel_entry, 8 +__kernel_entry: + data8 0x0 +.global __command_line +.size __command_line, 8 +__command_line: + data8 0x0 +.global __command_line_len +.size __command_line_len, 8 +__command_line_len: + data8 0x0 +.global __ramdisk_base +.size __ramdisk_base, 8 +__ramdisk_base: + data8 0x0 +.global __ramdisk_size +.size __ramdisk_size, 8 +__ramdisk_size: + data8 0x0 +.global __gp_value +.size __gp_value, 8 +__gp_value: + data8 0x0 --- kexec-tools-1.101/purgatory/arch/ia64/purgatory-ia64.c.orig 2006-10-20 13:38:53.000000000 -0400 +++ kexec-tools-1.101/purgatory/arch/ia64/purgatory-ia64.c 2006-10-20 13:39:08.000000000 -0400 @@ -1,10 +1,116 @@ #include +#include +#include #include "purgatory-ia64.h" +#define PAGE_OFFSET 0xe000000000000000 + +typedef struct { + uint64_t signature; + uint32_t revision; + uint32_t headersize; + uint32_t crc32; + uint32_t reserved; +} efi_table_hdr_t; + +typedef struct { + efi_table_hdr_t hdr; + unsigned long get_time; + unsigned long set_time; + unsigned long get_wakeup_time; + unsigned long set_wakeup_time; + unsigned long set_virtual_address_map; + unsigned long convert_pointer; + unsigned long get_variable; + unsigned long get_next_variable; + unsigned long set_variable; + unsigned long get_next_high_mono_count; + unsigned long reset_system; +} efi_runtime_services_t; + +typedef struct { + efi_table_hdr_t hdr; + unsigned long fw_vendor; /* physical addr of CHAR16 vendor string + */ + uint32_t fw_revision; + unsigned long con_in_handle; + unsigned long con_in; + unsigned long con_out_handle; + unsigned long con_out; + unsigned long stderr_handle; + unsigned long stderr; + unsigned long runtime; + unsigned long boottime; + unsigned long nr_tables; + unsigned long tables; +} efi_system_table_t; + +struct ia64_boot_param { + uint64_t command_line; /* physical address of command line arguments */ + uint64_t efi_systab; /* physical address of EFI system table */ + uint64_t efi_memmap; /* physical address of EFI memory map */ + uint64_t efi_memmap_size; /* size of EFI memory map */ + uint64_t efi_memdesc_size; /* size of an EFI memory map descriptor */ + uint32_t efi_memdesc_version; /* memory descriptor version */ + struct { + uint16_t num_cols; /* number of columns on console output device */ + uint16_t num_rows; /* number of rows on console output device */ + uint16_t orig_x; /* cursor's x position */ + uint16_t orig_y; /* cursor's y position */ + } console_info; + uint64_t fpswa; /* physical address of the fpswa interface */ + uint64_t initrd_start; + uint64_t initrd_size; +}; + void setup_arch(void) { /* Nothing for now */ } +inline unsigned long PA(unsigned long addr) +{ + return addr - PAGE_OFFSET; +} + +void flush_icache_range(char *start, unsigned long len) +{ + unsigned long i; + for (i = 0;i < len; i += 32) + asm volatile("fc.i %0"::"r"(start+i):"memory"); + asm volatile (";;sync.i;;":::"memory"); + asm volatile ("srlz.i":::"memory"); +} + +extern char __dummy_efi_function[], __dummy_efi_function_end[]; + +void ia64_env_setup(struct ia64_boot_param *boot_param, + uint64_t command_line, uint64_t command_line_len, + uint64_t ramdisk_base, uint64_t ramdisk_size) +{ + unsigned long len; + efi_system_table_t *systab; + efi_runtime_services_t *runtime; + unsigned long *set_virtual_address_map; + + // patch efi_runtime->set_virtual_address_map to a + // dummy function + len = __dummy_efi_function_end - __dummy_efi_function; + memcpy((char *)command_line + command_line_len, __dummy_efi_function, + len); + systab = (efi_system_table_t *)boot_param->efi_systab; + runtime = (efi_runtime_services_t *)PA(systab->runtime); + set_virtual_address_map = + (unsigned long *)PA(runtime->set_virtual_address_map); + *(set_virtual_address_map)= + (unsigned long)((char *)command_line + command_line_len); + flush_icache_range((char *)command_line+command_line_len, len); + + boot_param->command_line = command_line; + boot_param->console_info.orig_x = 0; + boot_param->console_info.orig_y = 0; + boot_param->initrd_start = ramdisk_base; + boot_param->initrd_size = ramdisk_size; +} /* This function can be used to execute after the SHA256 verification. */ void post_verification_setup_arch(void) --- kexec-tools-1.101/kexec/Makefile.orig 2006-10-20 13:38:53.000000000 -0400 +++ kexec-tools-1.101/kexec/Makefile 2006-10-20 13:39:08.000000000 -0400 @@ -28,6 +28,7 @@ KEXEC_OBJS:= $(KEXEC_C_OBJS) $(KEXEC_S_OBJS) KEXEC_DEPS:= $(KEXEC_C_DEPS) $(KEXEC_S_DEPS) KEXEC:= $(SBINDIR)/kexec +KEXEC_MANPAGE:= $(MANDIR)/man8/kexec.8 include $(KEXEC_DEPS) @@ -51,6 +52,9 @@ mkdir -p $(@D) $(CC) $(KCFLAGS) -o $@ $(KEXEC_OBJS) $(UTIL_LIB) $(LIBS) +$(KEXEC_MANPAGE): kexec/kexec.8 + $(MKDIR) -p $(MANDIR)/man8 + cp kexec/kexec.8 $(KEXEC_MANPAGE) echo:: @echo "KEXEC_C_SRCS $(KEXEC_C_SRCS)" @echo "KEXEC_C_DEPS $(KEXEC_C_DEPS)" --- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.h.orig 2004-12-19 18:52:38.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.h 2006-10-20 13:39:08.000000000 -0400 @@ -1,6 +1,8 @@ #ifndef KEXEC_IA64_H #define KEXEC_IA64_H +#define MAX_MEMORY_RANGES 1024 + int elf_ia64_probe(const char *buf, off_t len); int elf_ia64_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info); --- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-rel-ia64.c.orig 2004-12-20 17:43:23.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-rel-ia64.c 2006-10-20 13:39:08.000000000 -0400 @@ -1,8 +1,14 @@ +/* Most of the code in this file is + * based on arch/ia64/kernel/module.c in Linux kernel + */ + #include #include #include "../../kexec.h" #include "../../kexec-elf.h" +#define MAX_LTOFF ((uint64_t) (1 << 22)) + int machine_verify_elf_rel(struct mem_ehdr *ehdr) { if (ehdr->ei_data != ELFDATA2LSB) { @@ -17,12 +23,40 @@ return 1; } +static void +ia64_patch (uint64_t insn_addr, uint64_t mask, uint64_t val) +{ + uint64_t m0, m1, v0, v1, b0, b1, *b = (uint64_t *) (insn_addr & -16); +# define insn_mask ((1UL << 41) - 1) + unsigned long shift; + + b0 = b[0]; b1 = b[1]; + shift = 5 + 41 * (insn_addr % 16); /* 5 bits of template, then 3 x 41-bit instructions */ + if (shift >= 64) { + m1 = mask << (shift - 64); + v1 = val << (shift - 64); + } else { + m0 = mask << shift; m1 = mask >> (64 - shift); + v0 = val << shift; v1 = val >> (64 - shift); + b[0] = (b0 & ~m0) | (v0 & m0); + } + b[1] = (b1 & ~m1) | (v1 & m1); +} + +static inline uint64_t +bundle (const uint64_t insn) +{ + return insn & ~0xfUL; +} + void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, void *location, unsigned long address, unsigned long value) { + uint64_t gp_value = ehdr->rel_addr + 0x200000; switch(r_type) { case R_IA64_NONE: break; + case R_IA64_SEGREL64LSB: case R_IA64_DIR64LSB: *((uint64_t *)location) = value; break; @@ -31,15 +65,67 @@ if (value != *((uint32_t *)location)) goto overflow; break; - case R_IA64_PCREL21B: + case R_IA64_IMM64: + ia64_patch((uint64_t)location, 0x01fffefe000UL, + /* bit 63 -> 36 */ + (((value & 0x8000000000000000UL) >> 27) + /* bit 21 -> 21 */ + | ((value & 0x0000000000200000UL) << 0) + /* bit 16 -> 22 */ + | ((value & 0x00000000001f0000UL) << 6) + /* bit 7 -> 27 */ + | ((value & 0x000000000000ff80UL) << 20) + /* bit 0 -> 13 */ + | ((value & 0x000000000000007fUL) << 13))); + ia64_patch((uint64_t)location - 1, 0x1ffffffffffUL, value>>22); + break; + case R_IA64_IMM22: + if (value + (1 << 21) >= (1 << 22)) + die("value out of IMM22 range\n"); + ia64_patch((uint64_t)location, 0x01fffcfe000UL, + /* bit 21 -> 36 */ + (((value & 0x200000UL) << 15) + /* bit 16 -> 22 */ + | ((value & 0x1f0000UL) << 6) + /* bit 7 -> 27 */ + | ((value & 0x00ff80UL) << 20) + /* bit 0 -> 13 */ + | ((value & 0x00007fUL) << 13) )); + break; + case R_IA64_PCREL21B: { + uint64_t delta = ((int64_t)value - (int64_t)address)/16; + if (delta + (1 << 20) >= (1 << 21)) + die("value out of IMM21B range\n"); + value = ((int64_t)(value - bundle(address)))/16; + ia64_patch((uint64_t)location, 0x11ffffe000UL, + (((value & 0x100000UL) << 16) /* bit 20 -> 36 */ + | ((value & 0x0fffffUL) << 13) /* bit 0 -> 13 */)); + } + break; + case R_IA64_LTOFF22X: + if (value - gp_value + MAX_LTOFF/2 >= MAX_LTOFF) + die("value out of gp relative range"); + value -= gp_value; + ia64_patch((uint64_t)location, 0x01fffcfe000UL, + (((value & 0x200000UL) << 15) /* bit 21 -> 36 */ + |((value & 0x1f0000UL) << 6) /* bit 16 -> 22 */ + |((value & 0x00ff80UL) << 20) /* bit 7 -> 27 */ + |((value & 0x00007fUL) << 13) /* bit 0 -> 13 */)); + break; + case R_IA64_LDXMOV: + if (value - gp_value + MAX_LTOFF/2 >= MAX_LTOFF) + die("value out of gp relative range"); + ia64_patch((uint64_t)location, 0x1fff80fe000UL, 0x10000000000UL); + break; case R_IA64_LTOFF22: - case R_IA64_SEGREL64LSB: + default: - die("Unknown rela relocation: %lu\n", r_type); + die("Unknown rela relocation: 0x%lx 0x%lx\n", + r_type, address); break; } return; - overflow: +overflow: die("overflow in relocation type %lu val %Lx\n", - r_type, value); + r_type, value); } --- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig 2004-12-21 15:01:37.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2006-10-20 13:39:08.000000000 -0400 @@ -6,6 +6,7 @@ * Copyright (C) 2004 Silicon Graphics, Inc. * Jesse Barnes * Copyright (C) 2004 Khalid Aziz Hewlett Packard Co + * Copyright (C) 2005 Zou Nan hai Intel Corp * * 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 @@ -34,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -74,23 +76,29 @@ { printf( " --command-line=STRING Set the kernel command line to STRING.\n" - " --append=STRING Set the kernel command line to STRING.\n"); + " --append=STRING Set the kernel command line to STRING.\n" + " --initrd=FILE Use FILE as the kernel's initial ramdisk.\n"); } int elf_ia64_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info) { struct mem_ehdr ehdr; - const char *command_line; - int command_line_len; - unsigned long entry, max_addr; + const char *command_line, *ramdisk=0; + char *ramdisk_buf = NULL; + off_t ramdisk_size = 0; + unsigned long command_line_len; + unsigned long entry, max_addr, gp_value; + unsigned command_line_base, ramdisk_base; int result; int opt; #define OPT_APPEND (OPT_ARCH_MAX+0) +#define OPT_RAMDISK (OPT_ARCH_MAX+1) static const struct option options[] = { KEXEC_ARCH_OPTIONS {"command-line", 1, 0, OPT_APPEND}, {"append", 1, 0, OPT_APPEND}, + {"initrd", 1, 0, OPT_RAMDISK}, {0, 0, 0, 0}, }; @@ -110,11 +118,14 @@ case OPT_APPEND: command_line = optarg; break; + case OPT_RAMDISK: + ramdisk = optarg; + break; } } command_line_len = 0; if (command_line) { - command_line_len = strlen(command_line) + 1; + command_line_len = strlen(command_line) + 16; } /* Parse the Elf file */ @@ -129,13 +140,46 @@ /* Load the Elf data */ result = elf_exec_load(&ehdr, info); - free_elf_info(&ehdr); if (result < 0) { fprintf(stderr, "ELF load failed\n"); + free_elf_info(&ehdr); return result; } + + + /* Load the setup code */ + elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, + 0x80000, ULONG_MAX, 1); + + if (command_line_len) { + char *cmdline = xmalloc(command_line_len); + strcpy(cmdline, command_line); + command_line_len = (command_line_len + 15)&(~15); + elf_rel_set_symbol(&info->rhdr, "__command_line_len", + &command_line_len, sizeof(long)); + command_line_base = add_buffer(info, cmdline, + command_line_len, command_line_len, + 16, 0, max_addr, 1); + elf_rel_set_symbol(&info->rhdr, "__command_line", + &command_line_base, sizeof(long)); + } - /* For now we don't have arguments to pass :( */ - info->entry = (void *)entry; + if (ramdisk) { + ramdisk_buf = slurp_file(ramdisk, &ramdisk_size); + ramdisk_base = add_buffer(info, ramdisk_buf, ramdisk_size, + ramdisk_size, + getpagesize(), 0, max_addr, 1); + elf_rel_set_symbol(&info->rhdr, "__ramdisk_base", + &ramdisk_base, sizeof(long)); + elf_rel_set_symbol(&info->rhdr, "__ramdisk_size", + &ramdisk_size, sizeof(long)); + } + + gp_value = info->rhdr.rel_addr + 0x200000; + elf_rel_set_symbol(&info->rhdr, "__gp_value", &gp_value, + sizeof(gp_value)); + + elf_rel_set_symbol(&info->rhdr, "__kernel_entry", &entry, sizeof(entry)); + free_elf_info(&ehdr); return 0; } --- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c.orig 2006-10-20 13:38:53.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c 2006-10-20 13:39:08.000000000 -0400 @@ -27,42 +27,87 @@ #include #include #include +#include #include #include "../../kexec.h" #include "../../kexec-syscall.h" #include "kexec-ia64.h" #include -#define MAX_MEMORY_RANGES 64 static struct memory_range memory_range[MAX_MEMORY_RANGES]; /* Return a sorted list of available memory ranges. */ int get_memory_ranges(struct memory_range **range, int *ranges, unsigned long kexec_flags) { - int memory_ranges; - /* - * /proc/iomem on ia64 does not show where all memory is. If - * that is fixed up, we can make use of that to validate - * the memory range kernel will be loade din. Until then..... - * -- Khalid Aziz - */ - - /* Note that the ia64 architecture mandates all systems will - * have at least 64MB at 0-64M. The SGI altix does not follow - * that restriction, but a reasonable guess is better than nothing - * at all. - * -- Eric Biederman - */ - fprintf(stderr, "Warning assuming memory at 0-64MB is present\n"); - memory_ranges = 0; - memory_range[memory_ranges].start = 0x00010000; - memory_range[memory_ranges].end = 0x10000000; - memory_range[memory_ranges].type = RANGE_RAM; - memory_ranges++; - *range = memory_range; - *ranges = memory_ranges; - return 0; + const char iomem[]= "/proc/iomem"; + int memory_ranges = 0; + char line[MAX_LINE]; + FILE *fp; + fp = fopen(iomem, "r"); + if (!fp) { + fprintf(stderr, "Cannot open %s: %s\n", + iomem, strerror(errno)); + return -1; + } + + while(fgets(line, sizeof(line), fp) != 0) { + unsigned long start, end; + char *str; + int type; + int consumed; + int count; + if (memory_ranges >= MAX_MEMORY_RANGES) + break; + count = sscanf(line, "%lx-%lx : %n", + &start, &end, &consumed); + if (count != 2) + continue; + str = line + consumed; + end = end + 1; + if (memcmp(str, "System RAM\n", 11) == 0) { + type = RANGE_RAM; + } + else if (memcmp(str, "reserved\n", 9) == 0) { + type = RANGE_RESERVED; + } + else if (memcmp(str, "Crash kernel\n", 13) == 0) { + /* Redefine the memory region boundaries if kernel + * exports the limits and if it is panic kernel. + * Override user values only if kernel exported + * values are subset of user defined values. + */ + + if (kexec_flags & KEXEC_ON_CRASH) { + if (start > mem_min) + mem_min = start; + if (end < mem_max) + mem_max = end; + } + continue; + } else + continue; + /* + * Check if this memory range can be coalesced with + * the previous range + */ + if ((memory_ranges > 0) && + (start == memory_range[memory_ranges-1].end) && + (type == memory_range[memory_ranges-1].type)) { + memory_range[memory_ranges-1].end = end; + } + else { + memory_range[memory_ranges].start = start; + memory_range[memory_ranges].end = end; + memory_range[memory_ranges].type = type; + memory_ranges++; + } + } + fclose(fp); + *range = memory_range; + *ranges = memory_ranges; + + return 0; } /* Supported file types and callbacks */ @@ -76,9 +121,6 @@ { } -static struct { -} arch_options = { -}; int arch_process_options(int argc, char **argv) { static const struct option options[] = { @@ -88,6 +130,12 @@ static const char short_options[] = KEXEC_ARCH_OPT_STR; int opt; + /* execute from monarch processor */ + cpu_set_t affinity; + CPU_ZERO(&affinity); + CPU_SET(0, &affinity); + sched_setaffinity(0, sizeof(affinity), &affinity); + opterr = 0; /* Don't complain about unrecognized options here */ while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) { switch(opt) { @@ -113,10 +161,7 @@ } if (strcmp(utsname.machine, "ia64") == 0) { - /* For compatibility with older patches - * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_IA64 here. - */ - info->kexec_flags |= KEXEC_ARCH_DEFAULT; + info->kexec_flags |= KEXEC_ARCH_IA_64; } else { fprintf(stderr, "Unsupported machine type: %s\n", --- kexec-tools-1.101/kexec/kexec.8.orig 2004-12-19 17:27:31.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec.8 2006-10-20 13:39:08.000000000 -0400 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH KEXEC-TOOLS 8 "October 13, 2004" +.TH KEXEC 8 "October 13, 2004" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -16,30 +16,60 @@ .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME -kexec-tools \- Tool to load a kernel for warm reboot and initiate a warm reboot +kexec \- Tool to load a kernel for warm reboot and initiate a warm reboot .SH SYNOPSIS -.B kexec-tools +.B kexec .RI [ options ] " files" ... .SH DESCRIPTION .PP .\" TeX users may be more comfortable with the \fB\fP and .\" \fI\fP escape sequences to invode bold face and italics, .\" respectively. -\fBkexec-tools\fP does not have a man page yet. Please use "kexec -h" for help. +\fBkexec\fP allows one to load another kernel from the currently running +Linux kernel. Normally one would load a kernel, and possibly an initial +ramdisk, into the currently running kernel using kexec and then initiate +a warm reboot by executing kexec again with appropriate option. .SH OPTIONS These programs follow the usual GNU command line syntax, with long options starting with two dashes (`-'). A summary of options is included below. -For a complete description, see the Info files. .TP .B \-h, \-\-help Show summary of options. .TP .B \-v, \-\-version Show version of program. -.SH SEE ALSO +.TP +.B \-f, \-\-force +Force an immediate kexec without calling shutdown. +.TP +.B \-x, \-\-no-ifdown +Don't bring down network interfaces. (if used, must be last option specified) +.TP +.B \-l, \-\-load +Load the new kernel into the current kernel. +.TP +.B \-p, \-\-load-panic +Load the new kernel for use on panic. +.TP +.B \-u, \-\-unload +Unload the current kexec target kernel. +.TP +.B \-e, \-\-exec +Execute a currently loaded kernel. +.TP +.B \-t, \-\-type=TYPE +Specify the new kernel is of this type. +.TP +.B \-\-mem\-min= +Specify the lowest memory addres to load code into. +.TP +.B \-\-mem\-max= +Specify the highest memory addres to load code into. +.TP +There may be additional options supported on individual architectures. Use --help option to see those options. .SH AUTHOR -kexec-tools was written by Eric Biederman. +kexec was written by Eric Biederman. .PP -This manual page was written by Khalid Aziz , +This manual page was written by Khalid Aziz , for the Debian project (but may be used by others). kexec-tools-1.101-ifdown.patch: kexec.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+) --- NEW FILE kexec-tools-1.101-ifdown.patch --- --- kexec-tools-1.101/kexec/kexec.c.orig1 2006-10-13 14:01:39.000000000 -0400 +++ kexec-tools-1.101/kexec/kexec.c 2006-10-13 14:10:28.000000000 -0400 @@ -698,6 +698,19 @@ void usage(void) printf("\n"); } +static int kexec_loaded(void) +{ + int ret; + FILE *fp; + + fp = fopen("/sys/kernel/kexec_loaded", "r"); + if (fp == NULL) + return -1; + fscanf(fp, "%d", &ret); + fclose(fp); + return ret; +} + int main(int argc, char *argv[]) { int do_load = 1; @@ -801,6 +814,10 @@ int main(int argc, char *argv[]) if (do_load && (result == 0)) { result = my_load(type, fileind, argc, argv, kexec_flags); } + /* Don't shutdown unless there is something to reboot to! */ + if ((result == 0) && (do_shutdown || do_exec) && !kexec_loaded()) { + die("Nothing has been loaded!\n"); + } if ((result == 0) && do_shutdown) { result = my_shutdown(); } kexec-tools-1.101-ppc-boots-ppc64.patch: kexec/arch/ppc64/crashdump-ppc64.h | 4 +-- kexec/arch/ppc64/kexec-elf-ppc64.c | 26 +++++++++++----------- kexec/arch/ppc64/kexec-elf-rel-ppc64.c | 4 +-- kexec/arch/ppc64/kexec-ppc64.c | 38 ++++++++++++++++----------------- kexec/arch/ppc64/kexec-ppc64.h | 2 - kexec/kexec-sha256.h | 4 +-- purgatory/Makefile | 4 +-- purgatory/arch/ppc64/Makefile | 2 + purgatory/purgatory.c | 2 + 9 files changed, 45 insertions(+), 41 deletions(-) --- NEW FILE kexec-tools-1.101-ppc-boots-ppc64.patch --- --- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-rel-ppc64.c.orig 2007-04-10 15:33:46.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-rel-ppc64.c 2007-04-10 15:34:06.000000000 -0400 @@ -101,10 +101,10 @@ break; case R_PPC64_ADDR16_HIGHEST: - *(uint16_t *)location = ((value>>48) & 0xffff); + *(uint16_t *)location = (((uint64_t)value>>48) & 0xffff); break; case R_PPC64_ADDR16_HIGHER: - *(uint16_t *)location = ((value>>32) & 0xffff); + *(uint16_t *)location = (((uint64_t)value>>32) & 0xffff); break; default: --- kexec-tools-1.101/kexec/arch/ppc64/crashdump-ppc64.h.orig 2007-04-10 15:34:59.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/ppc64/crashdump-ppc64.h 2007-04-10 15:35:16.000000000 -0400 @@ -25,7 +25,7 @@ #define _ALIGN_UP(addr,size) (((addr)+((size)-1))&(~((size)-1))) #define _ALIGN_DOWN(addr,size) ((addr)&(~((size)-1))) -extern unsigned long long crash_base; -extern unsigned long long crash_size; +extern uint64_t crash_base; +extern uint64_t crash_size; #endif /* CRASHDUMP_PPC64_H */ --- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig 2007-04-10 15:33:47.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c 2007-04-10 15:34:06.000000000 -0400 @@ -42,7 +42,7 @@ #define BOOTLOADER "kexec" #define BOOTLOADER_VERSION VERSION -unsigned long initrd_base, initrd_size; +uint64_t initrd_base, initrd_size; int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, char *); @@ -76,19 +76,19 @@ char *cmdline, *modified_cmdline; const char *ramdisk, *devicetreeblob; int cmdline_len, modified_cmdline_len; - unsigned long long max_addr, hole_addr; + uint64_t max_addr, hole_addr; unsigned char *seg_buf = NULL; off_t seg_size = 0; struct mem_phdr *phdr; size_t size; - unsigned long long *rsvmap_ptr; + uint64_t *rsvmap_ptr; struct bootblock *bb_ptr; unsigned int nr_segments, i; int result, opt; - unsigned long my_kernel, my_dt_offset; + uint64_t my_kernel, my_dt_offset; unsigned int my_panic_kernel; - unsigned long my_stack, my_backup_start; - unsigned long toc_addr; + uint64_t my_stack, my_backup_start; + uint64_t toc_addr; #define OPT_APPEND (OPT_ARCH_MAX+0) #define OPT_RAMDISK (OPT_ARCH_MAX+1) @@ -226,10 +226,10 @@ } seg_buf = (unsigned char *)slurp_file(ramdisk, &seg_size); add_buffer(info, seg_buf, seg_size, seg_size, 0, 0, max_addr, 1); - hole_addr = (unsigned long long) + hole_addr = (uint64_t) info->segment[info->nr_segments-1].mem; initrd_base = hole_addr; - initrd_size = (unsigned long long) + initrd_size = (uint64_t) info->segment[info->nr_segments-1].memsz; } /* ramdisk */ @@ -259,25 +259,25 @@ */ bb_ptr = (struct bootblock *)( (unsigned char *)info->segment[(info->nr_segments)-1].buf); - rsvmap_ptr = (unsigned long long *)( + rsvmap_ptr = (uint64_t *)( (unsigned char *)info->segment[(info->nr_segments)-1].buf + bb_ptr->off_mem_rsvmap); while (*rsvmap_ptr || *(rsvmap_ptr+1)) rsvmap_ptr += 2; rsvmap_ptr -= 2; - *rsvmap_ptr = (unsigned long long)( + *rsvmap_ptr = (uint64_t)( info->segment[(info->nr_segments)-1].mem); rsvmap_ptr++; - *rsvmap_ptr = (unsigned long long)bb_ptr->totalsize; + *rsvmap_ptr = (uint64_t)bb_ptr->totalsize; nr_segments = info->nr_segments; /* Set kernel */ - my_kernel = (unsigned long )info->segment[0].mem; + my_kernel = (uint64_t)info->segment[0].mem; elf_rel_set_symbol(&info->rhdr, "kernel", &my_kernel, sizeof(my_kernel)); /* Set dt_offset */ - my_dt_offset = (unsigned long )info->segment[nr_segments-1].mem; + my_dt_offset = (uint64_t)info->segment[nr_segments-1].mem; elf_rel_set_symbol(&info->rhdr, "dt_offset", &my_dt_offset, sizeof(my_dt_offset)); --- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.h.orig 2007-04-10 15:33:46.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.h 2007-04-10 15:34:06.000000000 -0400 @@ -15,7 +15,7 @@ void elf_ppc64_usage(void); void reserve(unsigned long long where, unsigned long long length); -extern unsigned long initrd_base, initrd_size; +extern uint64_t initrd_base, initrd_size; /* boot block version 2 as defined by the linux kernel */ struct bootblock { unsigned magic, --- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c.orig 2007-04-10 15:33:46.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c 2007-04-10 15:34:06.000000000 -0400 @@ -35,12 +35,12 @@ #include static struct exclude_range exclude_range[MAX_MEMORY_RANGES]; -static unsigned long long rmo_top; +static uint64_t rmo_top; static struct memory_range memory_range[MAX_MEMORY_RANGES]; static struct memory_range base_memory_range[MAX_MEMORY_RANGES]; -unsigned long long memory_max = 0; +uint64_t memory_max = 0; static int nr_memory_ranges, nr_exclude_ranges; -unsigned long long crash_base, crash_size; +uint64_t crash_base, crash_size; static int sort_base_ranges(); @@ -90,10 +90,10 @@ if (local_memory_ranges >= MAX_MEMORY_RANGES) break; base_memory_range[local_memory_ranges].start = - ((unsigned long long *)buf)[0]; + ((uint64_t *)buf)[0]; base_memory_range[local_memory_ranges].end = base_memory_range[local_memory_ranges].start + - ((unsigned long long *)buf)[1]; + ((uint64_t *)buf)[1]; base_memory_range[local_memory_ranges].type = RANGE_RAM; local_memory_ranges++; #ifdef DEBUG @@ -120,7 +120,7 @@ static int sort_base_ranges() { int i, j; - unsigned long long tstart, tend; + uint64_t tstart, tend; for (i = 0; i < nr_memory_ranges - 1; i++) { for (j = 0; j < nr_memory_ranges - i - 1; j++) { @@ -141,7 +141,7 @@ static int sort_ranges() { int i, j; - unsigned long long tstart, tend; + uint64_t tstart, tend; for (i = 0; i < nr_exclude_ranges - 1; i++) { for (j = 0; j < nr_exclude_ranges - i - 1; j++) { if (exclude_range[j].start > exclude_range[j+1].start) { @@ -162,12 +162,12 @@ */ static int get_devtree_details(unsigned long kexec_flags) { - unsigned long long rmo_base; - unsigned long long tce_base; + uint64_t rmo_base; + uint64_t tce_base; unsigned int tce_size; unsigned int rtas_base, rtas_size; - unsigned long long htab_base, htab_size; - unsigned long long kernel_end; + uint64_t htab_base, htab_size; + uint64_t kernel_end; char buf[MAXBYTES-1]; char device_tree[256] = "/proc/device-tree/"; char fname[256]; @@ -203,7 +203,7 @@ closedir(dir); return -1; } - if (fread(&kernel_end, sizeof(unsigned long), 1, file) != 1) { + if (fread(&kernel_end, sizeof(uint64_t), 1, file) != 1) { perror(fname); fclose(file); closedir(cdir); @@ -228,7 +228,7 @@ closedir(dir); return -1; } - if (fread(&crash_base, sizeof(unsigned long), 1, + if (fread(&crash_base, sizeof(uint64_t), 1, file) != 1) { perror(fname); fclose(file); @@ -248,7 +248,7 @@ closedir(dir); return -1; } - if (fread(&crash_size, sizeof(unsigned long), 1, + if (fread(&crash_size, sizeof(uint64_t), 1, file) != 1) { perror(fname); fclose(file); @@ -281,7 +281,7 @@ closedir(dir); return -1; } - if (fread(&htab_base, sizeof(unsigned long), 1, file) != 1) { + if (fread(&htab_base, sizeof(uint64_t), 1, file) != 1) { perror(fname); fclose(file); closedir(cdir); @@ -298,7 +298,7 @@ closedir(dir); return -1; } - if (fread(&htab_size, sizeof(unsigned long), 1, file) != 1) { + if (fread(&htab_size, sizeof(uint64_t), 1, file) != 1) { perror(fname); fclose(file); closedir(cdir); @@ -367,8 +367,8 @@ closedir(dir); return -1; } - rmo_base = ((unsigned long long *)buf)[0]; - rmo_top = rmo_base + ((unsigned long long *)buf)[1]; + rmo_base = ((uint64_t *)buf)[0]; + rmo_top = rmo_base + ((uint64_t *)buf)[1]; if (rmo_top > 0x07C00000UL) rmo_top = 0x07C00000UL; @@ -389,7 +389,7 @@ closedir(dir); return -1; } - if (fread(&tce_base, sizeof(unsigned long), 1, file) != 1) { + if (fread(&tce_base, sizeof(uint64_t), 1, file) != 1) { perror(fname); fclose(file); closedir(cdir); --- kexec-tools-1.101/kexec/kexec-sha256.h.orig 2007-04-10 15:33:46.000000000 -0400 +++ kexec-tools-1.101/kexec/kexec-sha256.h 2007-04-10 15:34:06.000000000 -0400 @@ -2,8 +2,8 @@ #define KEXEC_SHA256_H struct sha256_region { - const void *start; - unsigned long len; + uint64_t start; + uint64_t len; }; #define SHA256_REGIONS 16 --- kexec-tools-1.101/purgatory/Makefile.orig 2007-04-10 15:33:46.000000000 -0400 +++ kexec-tools-1.101/purgatory/Makefile 2007-04-10 15:34:06.000000000 -0400 @@ -57,9 +57,9 @@ $(MKDIR) -p $(@D) $(CC) $(PCFLAGS) -o $@ -c $< -$(PURGATORY): $(PURGATORY_OBJS) $(UTIL_LIB) +$(PURGATORY): $(PURGATORY_OBJS) $(MKDIR) -p $(@D) - $(LD) $(LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) + $(LD) $(LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) echo:: @echo "PURGATORY_C_SRCS $(PURGATORY_C_SRCS)" --- kexec-tools-1.101/purgatory/arch/ppc64/Makefile.orig 2007-04-10 15:33:46.000000000 -0400 +++ kexec-tools-1.101/purgatory/arch/ppc64/Makefile 2007-04-10 15:34:06.000000000 -0400 @@ -6,3 +6,5 @@ PURGATORY_C_SRCS += purgatory/arch/ppc64/purgatory-ppc64.c PURGATORY_C_SRCS += purgatory/arch/ppc64/console-ppc64.c PURGATORY_C_SRCS += purgatory/arch/ppc64/crashdump_backup.c + +PCFLAGS += -m64 -mcall-aixdesc --- kexec-tools-1.101/purgatory/purgatory.c.orig 2007-04-10 15:33:46.000000000 -0400 +++ kexec-tools-1.101/purgatory/purgatory.c 2007-04-10 15:34:06.000000000 -0400 @@ -46,3 +46,5 @@ verify_sha256_digest(); post_verification_setup_arch(); } + +#include "../util_lib/sha256.c" kexec-tools-1.101-ppc64-64k-pages.patch: kexec/arch/ppc64/crashdump-ppc64.c | 13 +++++++------ kexec/arch/ppc64/crashdump-ppc64.h | 14 +++++--------- purgatory/arch/ppc64/crashdump_backup.c | 8 +++----- 3 files changed, 15 insertions(+), 20 deletions(-) --- NEW FILE kexec-tools-1.101-ppc64-64k-pages.patch --- Signed-off-by: Sachin Sant --- diff -Naurp kexec-tools-rh/kexec/arch/ppc64/crashdump-ppc64.c kexec-tools-rh-fix/kexec/arch/ppc64/crashdump-ppc64.c --- kexec-tools-rh/kexec/arch/ppc64/crashdump-ppc64.c 2006-09-08 07:29:52.000000000 +0530 +++ kexec-tools-rh-fix/kexec/arch/ppc64/crashdump-ppc64.c 2006-09-08 07:32:19.000000000 +0530 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -85,8 +86,8 @@ static int get_crash_memory_ranges(struc unsigned long long start, end, cstart, cend; /* create a separate program header for the backup region */ - crash_memory_range[0].start = 0x0000000000000000; - crash_memory_range[0].end = 0x0000000000008000; + crash_memory_range[0].start = BACKUP_START; + crash_memory_range[0].end = BACKUP_END; crash_memory_range[0].type = RANGE_RAM; memory_ranges++; @@ -125,8 +126,8 @@ static int get_crash_memory_ranges(struc break; start = ((unsigned long long *)buf)[0]; end = start + ((unsigned long long *)buf)[1]; - if (start == 0 && end >= 0x8000) - start = 0x8000; + if (start == 0 && end >= BACKUP_END) + start = BACKUP_END; match = 0; sort_regions(&exclude_rgns); @@ -420,8 +421,8 @@ void add_usable_mem_rgns(unsigned long l unsigned long long end = base + size; unsigned long long ustart, uend; - base = _ALIGN_DOWN(base, PAGE_SIZE); - end = _ALIGN_UP(end, PAGE_SIZE); + base = _ALIGN_DOWN(base, getpagesize()); + end = _ALIGN_UP(end, getpagesize()); for (i=0; i < usablemem_rgns.size; i++) { ustart = usablemem_rgns.ranges[i].start; diff -Naurp kexec-tools-rh/kexec/arch/ppc64/crashdump-ppc64.h kexec-tools-rh-fix/kexec/arch/ppc64/crashdump-ppc64.h --- kexec-tools-rh/kexec/arch/ppc64/crashdump-ppc64.h 2006-09-08 07:29:52.000000000 +0530 +++ kexec-tools-rh-fix/kexec/arch/ppc64/crashdump-ppc64.h 2006-09-08 07:33:38.000000000 +0530 @@ -6,28 +6,24 @@ int load_crashdump_segments(struct kexec void add_usable_mem_rgns(unsigned long long base, unsigned long long size); void add_exclude_rgns(unsigned long long base, unsigned long long size); -#define PAGE_OFFSET 0xC000000000000000 +#define PAGE_OFFSET 0xC000000000000000 #define KERNELBASE PAGE_OFFSET #define VMALLOCBASE 0xD000000000000000 #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) - -#define MAXMEM (-KERNELBASE-VMALLOCBASE) +#define MAXMEM (-KERNELBASE-VMALLOCBASE) #define CRASH_MAX_MEMORY_RANGES (MAX_MEMORY_RANGES + 6) #define COMMAND_LINE_SIZE 512 /* from kernel */ -/* Backup Region, First 32K of System RAM. */ +/* Backup Region, First 64K of System RAM. */ #define BACKUP_START 0x0000 -#define BACKUP_END 0x8000 +#define BACKUP_END 0x10000 #define BACKUP_SIZE (BACKUP_END - BACKUP_START + 1) -#define KDUMP_BACKUP_LIMIT 0x8000 +#define KDUMP_BACKUP_LIMIT BACKUP_END #define _ALIGN_UP(addr,size) (((addr)+((size)-1))&(~((size)-1))) #define _ALIGN_DOWN(addr,size) ((addr)&(~((size)-1))) -#ifndef PAGE_SIZE -#define PAGE_SIZE 4096 -#endif extern unsigned long long crash_base; extern unsigned long long crash_size; diff -Naurp kexec-tools-rh/purgatory/arch/ppc64/crashdump_backup.c kexec-tools-rh-fix/purgatory/arch/ppc64/crashdump_backup.c --- kexec-tools-rh/purgatory/arch/ppc64/crashdump_backup.c 2006-09-08 07:29:52.000000000 +0530 +++ kexec-tools-rh-fix/purgatory/arch/ppc64/crashdump_backup.c 2006-09-08 08:42:27.000000000 +0530 @@ -21,9 +21,7 @@ #include #include - -#define BACKUP_REGION_SOURCE 0x0 -#define BACKUP_REGION_SIZE 32*1024 +#include "../../../kexec/arch/ppc64/crashdump-ppc64.h" extern unsigned long backup_start; @@ -32,10 +30,10 @@ void crashdump_backup_memory(void) { void *dest, *src; - src = (void *)BACKUP_REGION_SOURCE; + src = (void *)BACKUP_START; if (backup_start) { dest = (void *)(backup_start); - memcpy(dest, src, BACKUP_REGION_SIZE); + memcpy(dest, src, BACKUP_SIZE); } } kexec-tools-1.101-ppc64-align-dtstruct.patch: fs2dt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE kexec-tools-1.101-ppc64-align-dtstruct.patch --- --- kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c~ 2006-04-27 15:01:55.000000000 +0900 +++ kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c 2006-05-08 14:15:50.571330714 +0900 @@ -61,7 +61,8 @@ struct stat statbuf[1]; char pathname[MAXPATH], *pathstart; char propnames[NAMESPACE]; -dvt dtstruct[TREEWORDS], *dt; +dvt dtstruct[TREEWORDS] __attribute((aligned(8))); +dvt *dt; unsigned long long mem_rsrv[2*MEMRESERVE]; static int initrd_found = 0; kexec-tools-1.101-ppc64-bootargs-align.patch: fs2dt.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE kexec-tools-1.101-ppc64-bootargs-align.patch --- --- kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c.org 2006-04-26 13:12:55.515946645 +0900 +++ kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c 2006-04-26 13:50:00.665270758 +0900 @@ -275,6 +275,8 @@ strcat(local_cmdline, " "); cmd_len = strlen(local_cmdline); cmd_len = cmd_len + 1; + if ((cmd_len >= 8) && ((unsigned long)dt & 0x4)) + dt++; memcpy(dt,local_cmdline,cmd_len); len = cmd_len; *dt_len = cmd_len; kexec-tools-1.101-ppc64-memory_regions.patch: crashdump-ppc64.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE kexec-tools-1.101-ppc64-memory_regions.patch --- --- kexec-tools-1.101/kexec/arch/ppc64/crashdump-ppc64.c.orig 2007-03-21 13:08:54.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/ppc64/crashdump-ppc64.c 2007-03-21 13:14:06.000000000 -0400 @@ -143,10 +143,10 @@ if (start < cstart && end > cend) { match = 1; crash_memory_range[memory_ranges].start = start; - crash_memory_range[memory_ranges].end = cstart - 1; + crash_memory_range[memory_ranges].end = cstart; crash_memory_range[memory_ranges].type = RANGE_RAM; memory_ranges++; - crash_memory_range[memory_ranges].start = cend + 1; + crash_memory_range[memory_ranges].start = cend; crash_memory_range[memory_ranges].end = end; crash_memory_range[memory_ranges].type = RANGE_RAM; memory_ranges++; @@ -154,18 +154,18 @@ } else if (start < cstart) { match = 1; crash_memory_range[memory_ranges].start = start; - crash_memory_range[memory_ranges].end = cstart - 1; + crash_memory_range[memory_ranges].end = cstart; crash_memory_range[memory_ranges].type = RANGE_RAM; memory_ranges++; - end = cstart - 1; + end = cstart; continue; } else if (end > cend){ match = 1; - crash_memory_range[memory_ranges].start = cend + 1; + crash_memory_range[memory_ranges].start = cend; crash_memory_range[memory_ranges].end = end; crash_memory_range[memory_ranges].type = RANGE_RAM; memory_ranges++; - start = cend + 1; + start = cend; continue; } } kexec-tools-1.101-ppc64_rmo_top.patch: kexec-ppc64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE kexec-tools-1.101-ppc64_rmo_top.patch --- --- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c.orig 2007-04-10 10:53:44.000000000 -0400 +++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c 2007-04-10 10:53:58.000000000 -0400 @@ -369,8 +369,8 @@ } rmo_base = ((unsigned long long *)buf)[0]; rmo_top = rmo_base + ((unsigned long long *)buf)[1]; - if (rmo_top > 0x30000000UL) - rmo_top = 0x30000000UL; + if (rmo_top > 0x07C00000UL) + rmo_top = 0x07C00000UL; fclose(file); closedir(cdir); kexec-tools-1.101-reloc-update.patch: kexec/Makefile | 1 kexec/arch/i386/kexec-elf-x86.c | 6 kexec/arch/i386/kexec-multiboot-x86.c | 5 kexec/arch/ia64/kexec-elf-ia64.c | 6 kexec/arch/ppc/kexec-elf-ppc.c | 4 kexec/arch/ppc64/kexec-elf-ppc64.c | 6 kexec/arch/x86_64/crashdump-x86_64.c | 190 ++++++++++++++++++++++++++--- kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 2 kexec/arch/x86_64/kexec-elf-x86_64.c | 6 kexec/arch/x86_64/kexec-x86_64.c | 4 kexec/crashdump.h | 2 kexec/kexec-elf-core.c | 29 ++++ kexec/kexec-elf-exec.c | 9 - kexec/kexec-elf-rel.c | 9 - kexec/kexec-elf.c | 27 ++-- kexec/kexec-elf.h | 17 +- kexec/kexec.c | 44 ++++++ kexec/kexec.h | 4 purgatory/arch/i386/entry32-16-debug.S | 20 +-- purgatory/arch/i386/include/arch/debug.h | 2 purgatory/arch/i386/linux-entry16.S | 44 +++--- purgatory/arch/x86_64/include/arch/debug.h | 2 22 files changed, 344 insertions(+), 95 deletions(-) --- NEW FILE kexec-tools-1.101-reloc-update.patch --- --- kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h.orig 2004-12-20 18:05:40.000000000 -0500 +++ kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h 2007-01-05 13:32:24.000000000 -0500 @@ -311,7 +311,7 @@ TTYS0_TX_AL -#define DEBUG(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') +#define DEBUG_CHAR(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX32(x) TTYS0_TX_HEX32(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') --- kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S.orig 2004-12-20 05:48:45.000000000 -0500 +++ kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S 2007-01-05 13:32:24.000000000 -0500 @@ -127,10 +127,10 @@ TTYS0_TX_AL -#define DEBUG(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') +#define DEBUG_CHAR(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX32(x) TTYS0_TX_HEX32(x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #else -#define DEBUG(x) +#define DEBUG_CHAR(x) #define DEBUG_TX_HEX32(x) #endif @@ -142,15 +142,15 @@ entry16: .code32 -DEBUG('a') +DEBUG_CHAR('a') /* Setup the classic BIOS interrupt table at 0x0 */ lidt idtptr -DEBUG('b') +DEBUG_CHAR('b') /* Provide us with 16bit segments that we can use */ lgdt gdt -DEBUG('c') +DEBUG_CHAR('c') /* Note we don't disable the a20 line, (this shouldn't be required) * The code to do it is in kexec_test and it is a real pain. * I will worry about that when I need it. @@ -164,26 +164,26 @@ DEBUG('c') movl %eax, %fs movl %eax, %gs -DEBUG('d') +DEBUG_CHAR('d') /* switch to 16bit mode */ ljmp $0x08, $1f - entry16 1: .code16 -DEBUG('e') +DEBUG_CHAR('e') /* Disable Paging and protected mode */ /* clear the PG & PE bits of CR0 */ movl %cr0,%eax andl $~((1 << 31)|(1<<0)),%eax movl %eax,%cr0 -DEBUG('f') +DEBUG_CHAR('f') /* make intersegment jmp to flush the processor pipeline * and reload %cs:%eip (to clear upper 16 bits of %eip). */ ljmp *(realptr - entry16) 3: -DEBUG('g') +DEBUG_CHAR('g') /* we are in real mode now * set up the real mode segment registers : %ds, $ss, %es */ @@ -191,7 +191,7 @@ DEBUG('g') movw %cs, %ax movw %ax, %ds -DEBUG('h') +DEBUG_CHAR('h') /* Load the registers */ movl eax - entry16, %eax movl ebx - entry16, %ebx @@ -386,10 +386,10 @@ gdt_end: TTYS0_TX_AL -#define DEBUG(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') +#define DEBUG_CHAR(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX32(x) TTYS0_TX_HEX32(x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #else -#define DEBUG(x) +#define DEBUG_CHAR(x) #define DEBUG_TX_HEX32(x) #endif @@ -403,7 +403,7 @@ setup16_debug_start: _reloc = . .balign 16 .code32 -DEBUG('a') +DEBUG_CHAR('a') /* Compute where I am running at */ call 1f 1: popl %ebx @@ -412,13 +412,13 @@ DEBUG('a') /* Remember where I am running at */ movl %ebx, location - _reloc(%ebx) -DEBUG('b') +DEBUG_CHAR('b') /* Fixup my real mode segment */ movl %ebx, %eax shrl $4, %eax movw %ax, 2 + realptr - _reloc(%ebx) -DEBUG('c') +DEBUG_CHAR('c') /* Fixup the gdt */ movl %ebx, %eax shll $16, %eax @@ -440,7 +440,7 @@ DEBUG('c') -DEBUG('d') +DEBUG_CHAR('d') /* Setup the classic BIOS interrupt table at 0x0 */ lidt idtptr - _reloc(%ebx) @@ -465,20 +465,20 @@ DEBUG('d') ljmp $0x08, $2f - _reloc 2: .code16 -DEBUG('e') +DEBUG_CHAR('e') /* Disable Paging and protected mode */ /* clear the PG & PE bits of CR0 */ movl %cr0,%eax andl $~((1 << 31)|(1<<0)),%eax movl %eax,%cr0 -DEBUG('f') +DEBUG_CHAR('f') /* make intersegment jmp to flush the processor pipeline * and reload %cs:%eip (to clear upper 16 bits of %eip). */ ljmp *(realptr - _reloc) 3: -DEBUG('g') +DEBUG_CHAR('g') /* we are in real mode now * set up the real mode segment registers : %ds, $ss, %es */ @@ -486,7 +486,7 @@ DEBUG('g') movw %cs, %ax movw %ax, %ds -DEBUG('h') +DEBUG_CHAR('h') /* Load the registers */ movl eax - _reloc, %eax movl ebx - _reloc, %ebx @@ -600,7 +600,7 @@ debug_gdt_end: setup16_debug_kernel_pre_protected: .code16 - DEBUG('i') + DEBUG_CHAR('i') cli # no interrupts allowed ! movb $0x80, %al # disable NMI for bootup # sequence @@ -611,7 +611,7 @@ setup16_debug_first_code32: .byte 0xbf /* movl $0x12345678, %edi */ location: .long 0x12345678 - DEBUG('j') + DEBUG_CHAR('j') .byte 0xb8 /* movl $0x10000, %eax */ setup16_debug_old_code32: .long 0x10000 --- kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S.orig 2004-12-20 18:11:43.000000000 -0500 +++ kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S 2007-01-05 13:32:24.000000000 -0500 @@ -55,15 +55,15 @@ entry16_debug: orl %ecx, 0x14 + gdt -DEBUG('a') +DEBUG_CHAR('a') /* Setup the classic BIOS interrupt table at 0x0 */ lidt idtptr -DEBUG('b') +DEBUG_CHAR('b') /* Provide us with 16bit segments that we can use */ lgdt gdt -DEBUG('c') +DEBUG_CHAR('c') /* Note we don't disable the a20 line, (this shouldn't be required) * The code to do it is in kexec_test and it is a real pain. * I will worry about that when I need it. @@ -77,26 +77,26 @@ DEBUG('c') movl %eax, %fs movl %eax, %gs -DEBUG('d') +DEBUG_CHAR('d') /* switch to 16bit mode */ ljmp $0x08, $1f - entry16_debug 1: .code16 -DEBUG('e') +DEBUG_CHAR('e') /* Disable Paging and protected mode */ /* clear the PG & PE bits of CR0 */ movl %cr0,%eax andl $~((1 << 31)|(1<<0)),%eax movl %eax,%cr0 -DEBUG('f') +DEBUG_CHAR('f') /* make intersegment jmp to flush the processor pipeline * and reload %cs:%eip (to clear upper 16 bits of %eip). */ ljmp *(realptr - entry16_debug) 3: -DEBUG('g') +DEBUG_CHAR('g') /* we are in real mode now * set up the real mode segment registers : %ds, $ss, %es */ @@ -104,7 +104,7 @@ DEBUG('g') movw %cs, %ax movw %ax, %ds -DEBUG('h') +DEBUG_CHAR('h') /* Load the registers */ movl eax - entry16_debug, %eax movl ebx - entry16_debug, %ebx @@ -176,7 +176,7 @@ gdt_end: .text entry16_debug_pre32: .code16 -DEBUG('i') +DEBUG_CHAR('i') cli # no interrupts allowed ! movb $0x80, %al # disable NMI for bootup # sequence @@ -186,7 +186,7 @@ DEBUG('i') entry16_debug_first32: .code32 -DEBUG('j') +DEBUG_CHAR('j') .byte 0xb8 /* movl $0x10000, %eax */ entry16_debug_old_first32: .long 0x100000 --- kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h.orig 2004-12-20 18:03:17.000000000 -0500 +++ kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h 2007-01-05 13:32:24.000000000 -0500 @@ -311,6 +311,6 @@ TTYS0_TX_AL -#define DEBUG(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') +#define DEBUG_CHAR(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX32(x) TTYS0_TX_HEX32(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') --- kexec-tools-1.101/kexec/Makefile.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/Makefile 2007-01-05 13:32:24.000000000 -0500 @@ -13,6 +13,7 @@ KEXEC_C_SRCS:= kexec/kexec.c KEXEC_C_SRCS+= kexec/ifdown.c KEXEC_C_SRCS+= kexec/kexec-elf.c KEXEC_C_SRCS+= kexec/kexec-elf-exec.c +KEXEC_C_SRCS+= kexec/kexec-elf-core.c KEXEC_C_SRCS+= kexec/kexec-elf-rel.c KEXEC_C_SRCS+= kexec/kexec-elf-boot.c KEXEC_C_SRCS+= kexec/crashdump.c --- kexec-tools-1.101/kexec/kexec-elf-rel.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec-elf-rel.c 2007-01-05 13:32:24.000000000 -0500 @@ -135,10 +135,11 @@ static struct mem_rela elf_rela(struct m return rela; } -int build_elf_rel_info(const char *buf, off_t len, struct mem_ehdr *ehdr) +int build_elf_rel_info(const char *buf, off_t len, struct mem_ehdr *ehdr, + uint32_t flags) { int result; - result = build_elf_info(buf, len, ehdr); + result = build_elf_info(buf, len, ehdr, flags); if (result < 0) { return result; } @@ -412,12 +413,12 @@ int elf_rel_load(struct mem_ehdr *ehdr, void elf_rel_build_load(struct kexec_info *info, struct mem_ehdr *ehdr, const char *buf, off_t len, unsigned long min, unsigned long max, - int end) + int end, uint32_t flags) { int result; /* Parse the Elf file */ - result = build_elf_rel_info((char *)purgatory, purgatory_size, ehdr); + result = build_elf_rel_info(buf, len, ehdr, flags); if (result < 0) { die("ELF rel parse failed\n"); } --- kexec-tools-1.101/kexec/kexec-elf.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec-elf.c 2007-01-05 13:32:24.000000000 -0500 @@ -368,7 +368,8 @@ static int build_mem_elf64_phdr(const ch return 0; } -static int build_mem_phdrs(const char *buf, off_t len, struct mem_ehdr *ehdr) +static int build_mem_phdrs(const char *buf, off_t len, struct mem_ehdr *ehdr, + uint32_t flags) { size_t phdr_size, mem_phdr_size; int i; @@ -418,9 +419,11 @@ static int build_mem_phdrs(const char *b /* Check the program headers to be certain * they are safe to use. + * Skip the check if ELF_SKIP_FILESZ_CHECK is set. */ phdr = &ehdr->e_phdr[i]; - if ((phdr->p_offset + phdr->p_filesz) > len) { + if (!(flags & ELF_SKIP_FILESZ_CHECK) + && (phdr->p_offset + phdr->p_filesz) > len) { /* The segment does not fit in the buffer */ if (probe_debug) { fprintf(stderr, "ELF segment not in file\n"); @@ -580,7 +583,8 @@ static int build_mem_elf64_shdr(const ch return 0; } -static int build_mem_shdrs(const char *buf, off_t len, struct mem_ehdr *ehdr) +static int build_mem_shdrs(const char *buf, off_t len, struct mem_ehdr *ehdr, + uint32_t flags) { size_t shdr_size, mem_shdr_size; int i; @@ -628,11 +632,12 @@ static int build_mem_shdrs(const char *b } /* Check the section headers to be certain * they are safe to use. + * Skip the check if ELF_SKIP_FILESZ_CHECK is set. */ shdr = &ehdr->e_shdr[i]; - if ((shdr->sh_type != SHT_NOBITS) && - ((shdr->sh_offset + shdr->sh_size) > len)) - { + if (!(flags & ELF_SKIP_FILESZ_CHECK) + && (shdr->sh_type != SHT_NOBITS) + && (shdr->sh_offset + shdr->sh_size) > len) { /* The section does not fit in the buffer */ if (probe_debug) { fprintf(stderr, "ELF section %d not in file\n", @@ -710,7 +715,8 @@ static int build_mem_notes(const char *b note_size += (hdr.n_descsz + 3) & ~3; if ((hdr.n_namesz != 0) && (name[hdr.n_namesz -1] != '\0')) { - die("Note name is not null termiated"); + fprintf(stderr, "Note name is not null termiated\n"); + return -1; } ehdr->e_note[i].n_type = hdr.n_type; ehdr->e_note[i].n_name = (char *)name; @@ -729,7 +735,8 @@ void free_elf_info(struct mem_ehdr *ehdr memset(ehdr, 0, sizeof(*ehdr)); } -int build_elf_info(const char *buf, off_t len, struct mem_ehdr *ehdr) +int build_elf_info(const char *buf, off_t len, struct mem_ehdr *ehdr, + uint32_t flags) { int result; result = build_mem_ehdr(buf, len, ehdr); @@ -737,14 +744,14 @@ int build_elf_info(const char *buf, off_ return result; } if ((ehdr->e_phoff > 0) && (ehdr->e_phnum > 0)) { - result = build_mem_phdrs(buf, len, ehdr); + result = build_mem_phdrs(buf, len, ehdr, flags); if (result < 0) { free_elf_info(ehdr); return result; } } if ((ehdr->e_shoff > 0) && (ehdr->e_shnum > 0)) { - result = build_mem_shdrs(buf, len, ehdr); + result = build_mem_shdrs(buf, len, ehdr, flags); if (result < 0) { free_elf_info(ehdr); return result; --- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2007-01-05 13:32:24.000000000 -0500 @@ -56,7 +56,7 @@ int elf_ia64_probe(const char *buf, off_ { struct mem_ehdr ehdr; int result; - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { if (probe_debug) { fprintf(stderr, "Not an ELF executable\n"); @@ -163,7 +163,7 @@ int elf_ia64_load(int argc, char **argv, } /* Parse the Elf file */ - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { fprintf(stderr, "ELF parse failed\n"); free_elf_info(&ehdr); @@ -198,7 +198,7 @@ int elf_ia64_load(int argc, char **argv, /* Load the setup code */ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, - 0x0, ULONG_MAX, -1); + 0x0, ULONG_MAX, -1, 0); if (load_crashdump_segments(info, &ehdr, max_addr, 0, --- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c 2007-01-05 13:32:24.000000000 -0500 @@ -24,8 +24,10 @@ #include #include #include +#include #include #include +#include #include #include "../../kexec.h" #include "../../kexec-elf.h" @@ -40,6 +42,137 @@ extern struct arch_options_t arch_option /* Forward Declaration. */ static int exclude_crash_reserve_region(int *nr_ranges); +#define KERN_VADDR_ALIGN 0x200000 /* 2MB */ + +/* Read kernel physical load addr from /proc/iomem (Kernel Code) and + * store in kexec_info */ +static int get_kernel_paddr(struct kexec_info *info) +{ + const char iomem[]= "/proc/iomem"; + char line[MAX_LINE]; + FILE *fp; + unsigned long long start, end; + + fp = fopen(iomem, "r"); + if (!fp) { + fprintf(stderr, "Cannot open %s: %s\n", iomem, strerror(errno)); + return -1; + } + while(fgets(line, sizeof(line), fp) != 0) { + char *str; + int consumed, count; + count = sscanf(line, "%Lx-%Lx : %n", + &start, &end, &consumed); + if (count != 2) + continue; + str = line + consumed; +#ifdef DEBUG + printf("%016Lx-%016Lx : %s", + start, end, str); +#endif + if (memcmp(str, "Kernel code\n", 12) == 0) { + info->kern_paddr_start = start; + +#ifdef DEBUG + printf("kernel load physical addr start = 0x%016Lx\n", + start); +#endif + fclose(fp); + return 0; + } + } + fprintf(stderr, "Cannot determine kernel physical load addr\n"); + fclose(fp); + return -1; +} + +/* Hardcoding kernel virtual address and size. While writting + * this patch vanilla kernel is compiled for addr 2MB. Anybody + * using kernel older than that which was compiled for 1MB + * physical addr, use older version of kexec-tools. This function + * is there just for backward compatibility reasons and we should + * get rid of it at some point of time. + */ + +static int hardcode_kernel_vaddr_size(struct kexec_info *info) +{ + fprintf(stderr, "Warning: Hardcoding kernel virtual addr and size\n"); + info->kern_vaddr_start = __START_KERNEL_map + 0x200000; + info->kern_size = KERNEL_TEXT_SIZE - 0x200000; + fprintf(stderr, "Warning: virtual addr = 0x%lx size = 0x%lx\n", + info->kern_vaddr_start, info->kern_size); + return 0; +} + +/* Retrieve info regarding virtual address kernel has been compiled for and + * size of the kernel from /proc/kcore. Current /proc/kcore parsing from + * from kexec-tools fails because of malformed elf notes. A kernel patch has + * been submitted. For the folks using older kernels, this function + * hard codes the values to remain backward compatible. Once things stablize + * we should get rid of backward compatible code. */ + +static int get_kernel_vaddr_and_size(struct kexec_info *info) +{ + int result; + const char kcore[] = "/proc/kcore"; + char *buf; + struct mem_ehdr ehdr; + struct mem_phdr *phdr, *end_phdr; + int align; + unsigned long size; + uint32_t elf_flags = 0; + + align = getpagesize(); + size = KCORE_ELF_HEADERS_SIZE; + buf = slurp_file_len(kcore, size); + if (!buf) { + fprintf(stderr, "Cannot read %s: %s\n", kcore, strerror(errno)); + return -1; + } + + /* Don't perform checks to make sure stated phdrs and shdrs are + * actually present in the core file. It is not practical + * to read the GB size file into a user space buffer, Given the + * fact that we don't use any info from that. + */ + elf_flags |= ELF_SKIP_FILESZ_CHECK; + result = build_elf_core_info(buf, size, &ehdr, elf_flags); + if (result < 0) { + fprintf(stderr, "ELF core (kcore) parse failed\n"); + hardcode_kernel_vaddr_size(info); + return 0; + } + + /* Traverse through the Elf headers and find the region where + * kernel is mapped. */ + end_phdr = &ehdr.e_phdr[ehdr.e_phnum]; + for(phdr = ehdr.e_phdr; phdr != end_phdr; phdr++) { + if (phdr->p_type == PT_LOAD) { + unsigned long saddr = phdr->p_vaddr; + unsigned long eaddr = phdr->p_vaddr + phdr->p_memsz; + unsigned long size; + + /* Look for kernel text mapping header. */ + if ((saddr >= __START_KERNEL_map) && + (eaddr <= __START_KERNEL_map + KERNEL_TEXT_SIZE)) { + saddr = (saddr) & (~(KERN_VADDR_ALIGN - 1)); + info->kern_vaddr_start = saddr; + size = eaddr - saddr; + /* Align size to page size boundary. */ + size = (size + align - 1) & (~(align - 1)); + info->kern_size = size; +#ifdef DEBUG + printf("kernel vaddr = 0x%lx size = 0x%lx\n", + saddr, size); +#endif + return 0; + } + } + } + fprintf(stderr, "Can't find kernel text map area from kcore\n"); + return -1; +} + /* Stores a sorted list of RAM memory ranges for which to create elf headers. * A separate program header is created for backup region */ static struct memory_range crash_memory_range[CRASH_MAX_MEMORY_RANGES]; @@ -245,7 +378,7 @@ static int add_memmap(struct memory_rang memmap_p[j+1] = memmap_p[j]; memmap_p[tidx].start = addr; memmap_p[tidx].end = addr + size - 1; -#if 0 +#ifdef DEBUG printf("Memmap after adding segment\n"); for (i = 0; i < CRASH_MAX_MEMMAP_NR; i++) { mstart = memmap_p[i].start; @@ -330,7 +463,7 @@ static int delete_memmap(struct memory_r memmap_p[j-1] = memmap_p[j]; memmap_p[j-1].start = memmap_p[j-1].end = 0; } -#if 0 +#ifdef DEBUG printf("Memmap after deleting segment\n"); for (i = 0; i < CRASH_MAX_MEMMAP_NR; i++) { mstart = memmap_p[i].start; @@ -404,7 +537,7 @@ static int cmdline_add_memmap(char *cmdl die("Command line overflow\n"); strcat(cmdline, str_mmap); } -#if 0 +#ifdef DEBUG printf("Command line after adding memmap\n"); printf("%s\n", cmdline); #endif @@ -432,7 +565,7 @@ static int cmdline_add_elfcorehdr(char * if (cmdlen > (COMMAND_LINE_SIZE - 1)) die("Command line overflow\n"); strcat(cmdline, str); -#if 0 +#ifdef DEBUG printf("Command line after adding elfcorehdr\n"); printf("%s\n", cmdline); #endif @@ -465,7 +598,7 @@ static int cmdline_add_memmap_acpi(char die("Command line overflow\n"); strcat(cmdline, str_mmap); -#if 0 +#ifdef DEBUG printf("Command line after adding acpi memmap\n"); printf("%s\n", cmdline); #endif @@ -536,6 +669,27 @@ static int prepare_crash_memory_elf64_he (elf->e_phnum)++; } + /* Setup an PT_LOAD type program header for the region where + * Kernel is mapped. + */ + phdr = (Elf64_Phdr *) bufp; + bufp += sizeof(Elf64_Phdr); + phdr->p_type = PT_LOAD; + phdr->p_flags = PF_R|PF_W|PF_X; + phdr->p_offset = phdr->p_paddr = info->kern_paddr_start; + phdr->p_vaddr = info->kern_vaddr_start; + phdr->p_filesz = phdr->p_memsz = info->kern_size; + phdr->p_align = 0; + (elf->e_phnum)++; +#ifdef DEBUG + printf("Kernel text Elf header: p_type = %d, p_offset = 0x%lx " + "p_paddr = 0x%lx p_vaddr = 0x%lx " + "p_filesz = 0x%lx p_memsz = 0x%lx\n", + phdr->p_type, phdr->p_offset, phdr->p_paddr, + phdr->p_vaddr, phdr->p_filesz, phdr->p_memsz); +#endif + + /* Setup PT_LOAD type program header for every system RAM chunk. * A seprate program header for Backup Region*/ for (i = 0; i < CRASH_MAX_MEMORY_RANGES; i++) { @@ -555,21 +709,13 @@ static int prepare_crash_memory_elf64_he else phdr->p_offset = mstart; - /* Handle linearly mapped region.*/ + /* We already prepared the header for kernel text. Map + * rest of the memory segments to kernel linearly mapped + * memory region. + */ - /* Filling the vaddr conditionally as we have two linearly - * mapped regions here. One is __START_KERNEL_map 0 to 40 MB - * other one is PAGE_OFFSET */ - - if ((mend <= (MAXMEM - 1)) && mstart < KERNEL_TEXT_SIZE) - phdr->p_vaddr = mstart + __START_KERNEL_map; - else { - if (mend <= (MAXMEM - 1)) - phdr->p_vaddr = mstart + PAGE_OFFSET; - else - phdr->p_vaddr = -1ULL; - } phdr->p_paddr = mstart; + phdr->p_vaddr = mstart + PAGE_OFFSET; phdr->p_filesz = phdr->p_memsz = mend - mstart + 1; /* Do we need any alignment of segments? */ phdr->p_align = 0; @@ -593,6 +739,12 @@ int load_crashdump_segments(struct kexec long int nr_cpus = 0; struct memory_range *mem_range, *memmap_p; + if (get_kernel_paddr(info)) + return -1; + + if (get_kernel_vaddr_and_size(info)) + return -1; + if (get_crash_memory_ranges(&mem_range, &nr_ranges) < 0) return -1; @@ -638,7 +790,7 @@ int load_crashdump_segments(struct kexec * This is a makeshift solution until it is fixed in kernel. */ elfcorehdr = add_buffer(info, tmp, sz, 16*1024, align, min_base, - max_addr, 1); + max_addr, -1); if (delete_memmap(memmap_p, elfcorehdr, sz) < 0) return -1; cmdline_add_memmap(mod_cmdline, memmap_p); --- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c.orig 2004-12-21 12:51:24.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 2007-01-05 13:32:24.000000000 -0500 @@ -60,7 +60,7 @@ static const char *reloc_name(unsigned l void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, void *location, unsigned long address, unsigned long value) { -#if 0 +#ifdef DEBUG fprintf(stderr, "%s\n", reloc_name(r_type)); #endif switch(r_type) { --- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c 2007-01-05 13:32:24.000000000 -0500 @@ -47,7 +47,7 @@ int elf_x86_64_probe(const char *buf, of struct mem_ehdr ehdr; int result; - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { if (probe_debug) { fprintf(stderr, "Not an ELF executable\n"); @@ -177,7 +177,7 @@ int elf_x86_64_load(int argc, char **arg } /* Load the ELF executable */ - elf_exec_build_load(info, &ehdr, buf, len); + elf_exec_build_load(info, &ehdr, buf, len, 0); entry = ehdr.e_entry; max_addr = elf_max_addr(&ehdr); @@ -186,7 +186,7 @@ int elf_x86_64_load(int argc, char **arg if (arg_style != ARG_STYLE_NONE) { /* Load the setup code */ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, - 0, ULONG_MAX, 1); + 0, ULONG_MAX, 1, 0); } if (arg_style == ARG_STYLE_NONE) { info->entry = (void *)entry; --- kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c 2007-01-05 13:32:24.000000000 -0500 @@ -64,7 +64,7 @@ int get_memory_ranges(struct memory_rang continue; str = line + consumed; end = end + 1; -#if 0 +#ifdef DEBUG printf("%016Lx-%016Lx : %s", start, end, str); #endif @@ -104,7 +104,7 @@ int get_memory_ranges(struct memory_rang memory_range[memory_ranges].start = start; memory_range[memory_ranges].end = end; memory_range[memory_ranges].type = type; -#if 0 +#ifdef DEBUG printf("%016Lx-%016Lx : %x\n", start, end, type); #endif --- kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c 2007-01-05 13:32:24.000000000 -0500 @@ -47,7 +47,7 @@ int elf_x86_probe(const char *buf, off_t struct mem_ehdr ehdr; int result; - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { if (probe_debug) { fprintf(stderr, "Not an ELF executable\n"); @@ -177,7 +177,7 @@ int elf_x86_load(int argc, char **argv, } /* Load the ELF executable */ - elf_exec_build_load(info, &ehdr, buf, len); + elf_exec_build_load(info, &ehdr, buf, len, 0); entry = ehdr.e_entry; max_addr = elf_max_addr(&ehdr); @@ -186,7 +186,7 @@ int elf_x86_load(int argc, char **argv, if (arg_style != ARG_STYLE_NONE) { /* Load the setup code */ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, - 0, ULONG_MAX, 1); + 0, ULONG_MAX, 1, 0); } if (arg_style == ARG_STYLE_NONE) { info->entry = (void *)entry; --- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c 2007-01-05 13:32:24.000000000 -0500 @@ -209,10 +209,11 @@ int multiboot_x86_load(int argc, char ** /* Load the ELF executable */ - elf_exec_build_load(info, &ehdr, buf, len); + elf_exec_build_load(info, &ehdr, buf, len, 0); /* Load the setup code */ - elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, 0, ULONG_MAX, 1); + elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, 0, + ULONG_MAX, 1, 0); /* The first segment will contain the multiboot headers: * ============= --- kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c.orig 2005-01-20 14:10:56.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c 2007-01-05 13:32:24.000000000 -0500 @@ -72,7 +72,7 @@ int elf_ppc_probe(const char *buf, off_t struct mem_ehdr ehdr; int result; - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { goto out; } @@ -180,7 +180,7 @@ int elf_ppc_load(int argc, char **argv, } /* Parse the Elf file */ - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { free_elf_info(&ehdr); return result; --- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c 2007-01-05 13:32:24.000000000 -0500 @@ -52,7 +52,7 @@ int elf_ppc64_probe(const char *buf, off { struct mem_ehdr ehdr; int result; - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { goto out; } @@ -163,7 +163,7 @@ int elf_ppc64_load(int argc, char **argv } /* Parse the Elf file */ - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { free_elf_info(&ehdr); return result; @@ -213,7 +213,7 @@ int elf_ppc64_load(int argc, char **argv memcpy(seg_buf, purgatory, purgatory_size); seg_size = purgatory_size; elf_rel_build_load(info, &info->rhdr, (const char *)purgatory, - purgatory_size, 0, max_addr, 1); + purgatory_size, 0, max_addr, 1, 0); /* Add a ram-disk to the current image * Note: Add the ramdisk after elf_rel_build_load --- /dev/null 2006-12-27 08:05:56.458406418 -0500 +++ kexec-tools-1.101/kexec/kexec-elf-core.c 2007-01-05 13:32:24.000000000 -0500 @@ -0,0 +1,29 @@ +#include +#include +#include +#include +#include "elf.h" +#include "kexec-elf.h" + + +int build_elf_core_info(const char *buf, off_t len, struct mem_ehdr *ehdr, + uint32_t flags) +{ + int result; + result = build_elf_info(buf, len, ehdr, flags); + if (result < 0) { + return result; + } + if ((ehdr->e_type != ET_CORE)) { + /* not an ELF Core */ + fprintf(stderr, "Not ELF type ET_CORE\n"); + return -1; + } + if (!ehdr->e_phdr) { + /* No program header */ + fprintf(stderr, "No ELF program header\n"); + return -1; + } + + return 0; +} --- kexec-tools-1.101/kexec/kexec-elf.h.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec-elf.h 2007-01-05 13:32:24.000000000 -0500 @@ -82,22 +82,29 @@ typedef struct uint32_t n_type; /* Type of the note. */ } ElfNN_Nhdr; +/* Misc flags */ +#define ELF_SKIP_FILESZ_CHECK 0x00000001 extern void free_elf_info(struct mem_ehdr *ehdr); -extern int build_elf_info(const char *buf, off_t len, struct mem_ehdr *ehdr); -extern int build_elf_exec_info(const char *buf, off_t len, struct mem_ehdr *ehdr); -extern int build_elf_rel_info(const char *buf, off_t len, struct mem_ehdr *ehdr); +extern int build_elf_info(const char *buf, off_t len, struct mem_ehdr *ehdr, + uint32_t flags); +extern int build_elf_exec_info(const char *buf, off_t len, + struct mem_ehdr *ehdr, uint32_t flags); +extern int build_elf_rel_info(const char *buf, off_t len, struct mem_ehdr *ehdr, + uint32_t flags); +extern int build_elf_core_info(const char *buf, off_t len, + struct mem_ehdr *ehdr, uint32_t flags); extern int elf_exec_load(struct mem_ehdr *ehdr, struct kexec_info *info); extern int elf_rel_load(struct mem_ehdr *ehdr, struct kexec_info *info, unsigned long min, unsigned long max, int end); extern void elf_exec_build_load(struct kexec_info *info, struct mem_ehdr *ehdr, - const char *buf, off_t len); + const char *buf, off_t len, uint32_t flags); extern void elf_rel_build_load(struct kexec_info *info, struct mem_ehdr *ehdr, const char *buf, off_t len, unsigned long min, unsigned long max, - int end); + int end, uint32_t flags); extern int elf_rel_find_symbol(struct mem_ehdr *ehdr, const char *name, struct mem_sym *ret_sym); --- kexec-tools-1.101/kexec/kexec-elf-exec.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec-elf-exec.c 2007-01-05 13:32:24.000000000 -0500 @@ -11,11 +11,12 @@ static const int probe_debug = 0; -int build_elf_exec_info(const char *buf, off_t len, struct mem_ehdr *ehdr) +int build_elf_exec_info(const char *buf, off_t len, struct mem_ehdr *ehdr, + uint32_t flags) { struct mem_phdr *phdr, *end_phdr; int result; - result = build_elf_info(buf, len, ehdr); + result = build_elf_info(buf, len, ehdr, flags); if (result < 0) { return result; } @@ -136,11 +137,11 @@ int elf_exec_load(struct mem_ehdr *ehdr, } void elf_exec_build_load(struct kexec_info *info, struct mem_ehdr *ehdr, - const char *buf, off_t len) + const char *buf, off_t len, uint32_t flags) { int result; /* Parse the Elf file */ - result = build_elf_exec_info(buf, len, ehdr); + result = build_elf_exec_info(buf, len, ehdr, flags); if (result < 0) { die("ELF exec parse failed\n"); } --- kexec-tools-1.101/kexec/crashdump.h.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/crashdump.h 2007-01-05 13:32:24.000000000 -0500 @@ -5,5 +5,7 @@ extern int get_crash_notes_per_cpu(int c /* Need to find a better way to determine per cpu notes section size. */ #define MAX_NOTE_BYTES 1024 +/* Expecting ELF headers to fit in 4K. Increase it if you need more. */ +#define KCORE_ELF_HEADERS_SIZE 4096 #endif /* CRASHDUMP_H */ --- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 13:32:24.000000000 -0500 @@ -116,6 +116,9 @@ struct kexec_info { struct mem_ehdr rhdr; unsigned long backup_start; unsigned long kexec_flags; + unsigned long kern_vaddr_start; + unsigned long kern_paddr_start; + unsigned long kern_size; }; void usage(void); @@ -177,6 +180,7 @@ extern void die(char *fmt, ...); extern void *xmalloc(size_t size); extern void *xrealloc(void *ptr, size_t size); extern char *slurp_file(const char *filename, off_t *r_size); +extern char *slurp_file_len(const char *filename, off_t size); extern char *slurp_decompress_file(const char *filename, off_t *r_size); extern void add_segment(struct kexec_info *info, const void *buf, size_t bufsz, unsigned long base, size_t memsz); --- kexec-tools-1.101/kexec/kexec.c.orig 2007-01-05 13:32:05.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec.c 2007-01-05 13:32:24.000000000 -0500 @@ -391,6 +391,50 @@ char *slurp_file(const char *filename, o return buf; } +/* This functions reads either specified number of bytes from the file or + lesser if EOF is met. */ + +char *slurp_file_len(const char *filename, off_t size) +{ + int fd; + char *buf; + off_t progress; + ssize_t result; + + if (!filename) + return 0; + fd = open(filename, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "Cannot open %s: %s\n", filename, + strerror(errno)); + return 0; + } + buf = xmalloc(size); + progress = 0; + while(progress < size) { + result = read(fd, buf + progress, size - progress); + if (result < 0) { + if ((errno == EINTR) || (errno == EAGAIN)) + continue; + fprintf(stderr, "read on %s of %ld bytes failed: %s\n", + filename, (size - progress)+ 0UL, + strerror(errno)); + free(buf); + return 0; + } + if (result == 0) + /* EOF */ + break; + progress += result; + } + result = close(fd); + if (result < 0) { + die("Close of %s failed: %s\n", + filename, strerror(errno)); + } + return buf; +} + #if HAVE_ZLIB_H char *slurp_decompress_file(const char *filename, off_t *r_size) { kexec-tools-1.101-relocatable-bzimage.patch: include/x86/x86-linux.h | 10 ++- kexec/arch/i386/crashdump-x86.c | 7 +- kexec/arch/i386/kexec-bzImage.c | 102 +++++++++++++++++++++++++++++++++++--- kexec/arch/i386/x86-linux-setup.c | 3 + kexec/kexec.h | 7 ++ 5 files changed, 119 insertions(+), 10 deletions(-) --- NEW FILE kexec-tools-1.101-relocatable-bzimage.patch --- --- kexec-tools-1.101/include/x86/x86-linux.h.orig 2007-01-05 13:28:08.000000000 -0500 +++ kexec-tools-1.101/include/x86/x86-linux.h 2007-01-05 13:24:49.000000000 -0500 @@ -141,7 +141,10 @@ struct x86_linux_param_header { uint32_t high_filesz; /* 0x254 */ uint8_t reserved15[0x2d0 - 0x258]; /* 0x258 */ #else - uint8_t reserved15[0x2d0 - 0x230]; /* 0x230 */ + /* 2.04+ */ + uint32_t kernel_alignment; /* 0x230 */ + uint8_t relocatable_kernel; /* 0x234 */ + uint8_t reserved15[0x2d0 - 0x235]; /* 0x230 */ #endif struct e820entry e820_map[E820MAX]; /* 0x2d0 */ /* 0x550 */ @@ -201,12 +204,15 @@ struct x86_linux_header { uint32_t high_filesz; /* 0x254 */ uint32_t tail[32*1024 - 0x258]; /* 0x258 */ #else - uint8_t tail[32*1024 - 0x230]; /* 0x230 */ + uint32_t kernel_alignment; /* 0x230 */ + uint8_t relocatable_kernel; /* 0x234 */ + uint8_t tail[32*1024 - 0x235]; /* 0x230 */ #endif } PACKED; #endif /* ASSEMBLY */ #define DEFAULT_INITRD_ADDR_MAX 0x37FFFFFF +#define DEFAULT_BZIMAGE_ADDR_MAX 0x37FFFFFF #endif /* X86_LINUX_H */ --- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c.orig 2007-01-05 13:28:08.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c 2007-01-05 13:27:53.000000000 -0500 @@ -680,7 +680,9 @@ int load_crashdump_segments(struct kexec tmp = xmalloc(sz); memset(tmp, 0, sz); info->backup_start = add_buffer(info, tmp, sz, sz, align, - 0, max_addr, 1); + 0, max_addr, -1); + dfprintf(stdout, "Created backup segment at 0x%lx\n", + info->backup_start); if (delete_memmap(memmap_p, info->backup_start, sz) < 0) return -1; @@ -719,7 +721,8 @@ int load_crashdump_segments(struct kexec * This is a makeshift solution until it is fixed in kernel. */ elfcorehdr = add_buffer(info, tmp, sz, 16*1024, align, min_base, - max_addr, 1); + max_addr, -1); + dfprintf(stdout, "Created elf header segment at 0x%lx\n", elfcorehdr); if (delete_memmap(memmap_p, elfcorehdr, sz) < 0) return -1; cmdline_add_memmap(mod_cmdline, memmap_p); --- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c.orig 2007-01-05 13:28:08.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c 2007-01-05 13:24:49.000000000 -0500 @@ -59,6 +59,7 @@ void setup_linux_bootloader_parameters( initrd_addr_max = DEFAULT_INITRD_ADDR_MAX; if (real_mode->protocol_version >= 0x0203) { initrd_addr_max = real_mode->initrd_addr_max; + dfprintf(stdout, "initrd_addr_max is 0x%lx\n", initrd_addr_max); } /* Load the initrd if we have one */ @@ -66,6 +67,8 @@ void setup_linux_bootloader_parameters( initrd_base = add_buffer(info, initrd_buf, initrd_size, initrd_size, 4096, INITRD_BASE, initrd_addr_max, -1); + dfprintf(stdout, "Loaded initrd at 0x%lx size 0x%lx\n", + initrd_base, initrd_size); } else { initrd_base = 0; initrd_size = 0; --- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-05 13:28:08.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-05 13:27:53.000000000 -0500 @@ -34,8 +34,10 @@ #include #include "../../kexec.h" #include "../../kexec-elf.h" +#include "../../kexec-syscall.h" #include "kexec-x86.h" #include "x86-linux-setup.h" +#include "crashdump-x86.h" #include static const int probe_debug = 0; @@ -109,6 +111,9 @@ int do_bzImage_load(struct kexec_info *i unsigned long setup_base, setup_size; struct entry32_regs regs32; struct entry16_regs regs16; + unsigned int relocatable_kernel = 0; + unsigned long kernel32_load_addr; + char *modified_cmdline; /* * Find out about the file I am about to load. @@ -121,6 +126,7 @@ int do_bzImage_load(struct kexec_info *i if (setup_sects == 0) { setup_sects = 4; } + kern16_size = (setup_sects +1) *512; kernel_version = ((unsigned char *)&setup_header) + 512 + setup_header.kver_addr; if (kernel_len < kern16_size) { @@ -128,25 +134,88 @@ int do_bzImage_load(struct kexec_info *i return -1; } + if (setup_header.protocol_version >= 0x0205) { + relocatable_kernel = setup_header.relocatable_kernel; + dfprintf(stdout, "bzImage is relocatable\n"); + } + + /* Can't use bzImage for crash dump purposes with real mode entry */ + if((info->kexec_flags & KEXEC_ON_CRASH) && real_mode_entry) { + fprintf(stderr, "Can't use bzImage for crash dump purposes" + " with real mode entry\n"); + return -1; + } + + if((info->kexec_flags & KEXEC_ON_CRASH) && !relocatable_kernel) { + fprintf(stderr, "BzImage is not relocatable. Can't be used" + " as capture kernel.\n"); + return -1; + } + + /* Need to append some command line parameters internally in case of + * taking crash dumps. + */ + if (info->kexec_flags & KEXEC_ON_CRASH) { + modified_cmdline = xmalloc(COMMAND_LINE_SIZE); + memset((void *)modified_cmdline, 0, COMMAND_LINE_SIZE); + if (command_line) { + strncpy(modified_cmdline, command_line, + COMMAND_LINE_SIZE); + modified_cmdline[COMMAND_LINE_SIZE - 1] = '\0'; + } + + /* If panic kernel is being loaded, additional segments need + * to be created. load_crashdump_segments will take care of + * loading the segments as high in memory as possible, hence + * in turn as away as possible from kernel to avoid being + * stomped by the kernel. + */ + if (load_crashdump_segments(info, modified_cmdline, -1, 0) < 0) + return -1; + + /* Use new command line buffer */ + command_line = modified_cmdline; + command_line_len = strlen(command_line) +1; + } + /* Load the trampoline. This must load at a higher address * the the argument/parameter segment or the kernel will stomp * it's gdt. */ - elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, - 0x3000, 640*1024, -1); + + if (!real_mode_entry && relocatable_kernel) + elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, + 0x3000, -1, -1, 0); + else + elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, + 0x3000, 640*1024, -1, 0); + dfprintf(stdout, "Loaded purgatory at addr 0x%lx\n", + info->rhdr.rel_addr); /* The argument/parameter segment */ setup_size = kern16_size + command_line_len; real_mode = xmalloc(setup_size); memcpy(real_mode, kernel, kern16_size); - if (real_mode->protocol_version >= 0x0200) { + + if (info->kexec_flags & KEXEC_ON_CRASH) { + /* If using bzImage for capture kernel, then we will not be + * executing real mode code. setup segment can be loaded + * anywhere as we will be just reading command line. + */ + setup_base = add_buffer(info, real_mode, setup_size, setup_size, + 16, 0x3000, -1, 1); + } + else if (real_mode->protocol_version >= 0x0200) { /* Careful setup_base must be greater than 8K */ setup_base = add_buffer(info, real_mode, setup_size, setup_size, - 16, 0x3000, 640*1024, -1); + 16, 0x3000, 640*1024, 1); } else { add_segment(info, real_mode, setup_size, SETUP_BASE, setup_size); setup_base = SETUP_BASE; } + dfprintf(stdout, "Loaded real-mode code and command line at 0x%lx\n", + setup_base); + /* Verify purgatory loads higher than the parameters */ if (info->rhdr.rel_addr < setup_base) { die("Could not put setup code above the kernel parameters\n"); @@ -154,9 +223,30 @@ int do_bzImage_load(struct kexec_info *i /* The main kernel segment */ size = kernel_len - kern16_size; - add_segment(info, kernel + kern16_size, size, KERN32_BASE, size); + if (real_mode->protocol_version >=0x0205 && relocatable_kernel) { + /* Relocatable bzImage */ + unsigned long kern_align = real_mode->kernel_alignment; + unsigned long kernel32_max_addr = DEFAULT_BZIMAGE_ADDR_MAX; + + if (real_mode->protocol_version >= 0x0203) { + if (kernel32_max_addr > real_mode->initrd_addr_max) + kernel32_max_addr = real_mode->initrd_addr_max; + } + + kernel32_load_addr = add_buffer(info, kernel + kern16_size, + size, size, kern_align, + 0x100000, kernel32_max_addr, + 1); + } + else { + kernel32_load_addr = KERN32_BASE; + add_segment(info, kernel + kern16_size, size, + kernel32_load_addr, size); + } + dfprintf(stdout, "Loaded 32bit kernel at 0x%lx\n", kernel32_load_addr); + /* Tell the kernel what is going on */ setup_linux_bootloader_parameters(info, real_mode, setup_base, kern16_size, command_line, command_line_len, @@ -177,7 +267,7 @@ int do_bzImage_load(struct kexec_info *i regs32.edi = 0; /* unused */ regs32.esp = elf_rel_get_addr(&info->rhdr, "stack_end"); /* stack, unused */ regs32.ebp = 0; /* unused */ - regs32.eip = KERN32_BASE; /* kernel entry point */ + regs32.eip = kernel32_load_addr; /* kernel entry point */ /* * Initialize the 16bit start information. --- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 13:28:08.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 13:24:43.000000000 -0500 @@ -197,4 +197,11 @@ int arch_compat_trampoline(struct kexec_ void arch_update_purgatory(struct kexec_info *info); #define MAX_LINE 160 + +#ifdef DEBUG +#define dfprintf(args...) do {fprintf(args);} while(0) +#else +#define dfprintf(args...) do { } while(0) +#endif + #endif /* KEXEC_H */ kexec-tools-1.101-x86_64-exactmap.patch: crashdump-x86_64.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE kexec-tools-1.101-x86_64-exactmap.patch --- --- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c.orig 2006-11-14 12:15:45.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c 2006-11-14 12:16:04.000000000 -0500 @@ -113,6 +113,8 @@ * initializing acpi tables in second kernel. */ type = RANGE_ACPI; + } else if(memcmp(str,"ACPI Non-volatile Storage\n",26) == 0 ) { + type = RANGE_ACPI_NVS; } else { continue; } @@ -645,7 +647,8 @@ /* Inform second kernel about the presence of ACPI tables. */ for (i = 0; i < CRASH_MAX_MEMORY_RANGES; i++) { unsigned long start, end; - if (mem_range[i].type != RANGE_ACPI) + if ( !( mem_range[i].type == RANGE_ACPI + || mem_range[i].type == RANGE_ACPI_NVS) ) continue; start = mem_range[i].start; end = mem_range[i].end; --- NEW FILE pofiles.tar.gz --- ? y?/??3?????????+???N????????????????_)?7+???????????????_)??6?3?????????+???????>?M????Z?&????????????J??4.??????&????????????+???V??_#?????????R?/H???????F????????????,???? ????????????3?? ??????????i?????oF????????????,=y}???????&?3?????????+???B????F??????????????????#?????????R??|^@?q?3?????????R?o^??_??3?????????+???">????? ???????????i??a??H????????????;???es3???~?~?r??Q???????U????{;'???P?j??%?x???????3?__YA???F??\???c*?Q??P%Db?????R??;???? ????????????????????x????????????_)???\?~3?$???ZV???L?????????J???????????\?i$????????WJ?????g$????????WJ?}????[Fn??V???(??[v?????????????C?7??q????g$????????WJ?e?F??\?????e??H????????????[???~3?$???n?? ??????????????7??q??_??3?????????+???>????????????????_)??????5?g"????????WJ??;?_????????????J????}]???Z?3?????????+???E?????? ???????????a???????D????????????s y??6?????????+???x???&?3?????????+????x????????????????_P???q??P?????????????z??_???F????????????o?????? ???????????E??g7x????????????_)?7??\?a(????????WJ??r?????????????????^????????????????_)?7-???? ????????????E??? ???????????????! x?u?\?k$????????WJ! ????x?????????????????? ? ? ? ????P? Index: kdump.conf =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/kdump.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kdump.conf 30 Aug 2006 20:34:16 -0000 1.3 +++ kdump.conf 31 May 2007 19:20:00 -0000 1.4 @@ -2,31 +2,68 @@ # # This file contains a series of commands to perform (in order) when a # kernel crash has happened and the kdump kernel has been loaded -# -# The commands are chained together to allow redundancy in case the -# primary choice is not available at crash time +# +# Currently only one dump target and path may be configured at once +# if the configured dump target fails, the default action will be preformed +# the default action may be configured with the default directive below # # Basics commands supported are: -# raw - will dd /proc/vmcore into -# - will mount fs and copy /proc/vmcore to -# /var/crash/%DATE/ , supports DNS -# - will scp /proc/vmcore to -# :/var/crash/%DATE/, supports DNS -# - will mount -t /mnt and copy /proc/vmcore to -# /mnt/var/crash/%DATE/ -# ifc - instead of bringing up the interface that is normally associated -# with the next hop of the ip address you plan to use with scp or nfs -# activate this interface instead. This is sometimes needed in the event -# that the kdump kernel assigns your interface a different name, given -# that it only loads the driver needed for the specific interface you are -# going to use -# default reboot - if all of the above fail, then reboot the system -# and accept the /proc/vmcore is lost, else -# comment out 'default' to fall through and fix -# the system (if the disk is available) +# raw - Will dd /proc/vmcore into . +# +# net - Will mount fs and copy /proc/vmcore to +# /var/crash/%HOST-%DATE/, supports DNS. +# +# net - Will scp /proc/vmcore to +# :/var/crash/%HOST-%DATE/, supports DNS +# NOTE: make sure user has necessary write +# permissions on server +# +# - Will mount -t /mnt and copy +# /proc/vmcore to /mnt/var/crash/%DATE/. +# NOTE: can be a device node, label or uuid. +# +# path - Append path to the filesystem device which you are +# dumping to. Ignored for raw device dumps. +# If unset, will default to /var/crash. +# +# core_collector makedumpfile +# This directive allows you to use the dump filtering +# program makedumpfile to retrieve your core, which on +# some arches can drastically reduce core file size. +# See /sbin/makedumpfile --help for a list of options. +# Note that the -i and -g options are not needed here, +# as the initrd will automatically be populated with +# a config file appropriate for the running kernel. +# +# link_delay +# Some network cards take a long time to initialize, and +# some spanning tree enabled networks do not transmit +# user traffic for long periods after a link state +# changes. This optional parameter defines a wait +# period after a link is activated in which the +# initramfs will wait before attempting to transmit +# user data. +# default +# Action to preform instead of mounting root fs and +# running init process +# reboot: If the default action is reboot simply reboot +# the system and loose the core that you are +# trying to retrieve. +# shell: If the default action is shell, then drop to +# an msh session inside the initramfs from +# where you can try to record the core manually. +# Exiting this shell reboots the system. +# NOTE: If no default action is specified, the initramfs +# will mount the root file system and run init. #raw /dev/sda5 #ext3 /dev/sda3 -#my.server.com:/export/tmp -#user at my.server.com -#default reboot +#ext3 LABEL=/boot +#ext3 UUID=03138356-5e61-4ab3-b58e-27507ac41937 +#net my.server.com:/export/tmp +#net user at my.server.com +#path /var/crash +#core_collector makedumpfile -c +#link_delay 60 +#default shell + Index: kdump.init =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/kdump.init,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kdump.init 23 Jan 2007 20:16:11 -0000 1.12 +++ kdump.init 31 May 2007 19:20:00 -0000 1.13 @@ -9,7 +9,7 @@ # # Copyright 2005 Red Hat, Inc. # -# chkconfig: 2345 20 80 +# chkconfig: - 20 80 # # Author: Jeff Moyer @@ -28,7 +28,9 @@ KEXEC_ARGS="" KDUMP_CONFIG_FILE="/etc/kdump.conf" -standard_kexec_args="-p --args-linux" +LOGGER="/usr/bin/logger -p info -t kdump" + +standard_kexec_args="-p" if [ -f /etc/sysconfig/kdump ]; then . /etc/sysconfig/kdump @@ -39,7 +41,13 @@ coredir="/var/crash/`date +"%Y-%m-%d-%H:%M"`" mkdir -p $coredir - cp /proc/vmcore $coredir/vmcore + cp /proc/vmcore $coredir/vmcore-incomplete + if [ $? == 0 ]; then + mv $coredir/vmcore-incomplete $coredir/vmcore + $LOGGER "saved a vmcore to $coredir" + else + $LOGGER "failed to save a vmcore to $coredir" + fi } function check_config() @@ -48,24 +56,29 @@ local running_kernel=`uname -r` kdump_kver=`echo $running_kernel | sed 's/smp//g'` - kdump_kver="${kdump_kver}kdump" else kdump_kver=$KDUMP_KERNELVER fi - kdump_kernel="${BOOTDIR}/vmlinux-${kdump_kver}" - kdump_initrd="${BOOTDIR}/initrd-${kdump_kver}.img" + kdump_kernel="${KDUMP_BOOTDIR}/${KDUMP_IMG}-${kdump_kver}${KDUMP_IMG_EXT}" + kdump_initrd="${KDUMP_BOOTDIR}/initrd-${kdump_kver}kdump.img" if [ ! -f $kdump_kernel ]; then echo -n "No kdump kernel image found."; warning; echo echo "Tried to locate ${kdump_kernel}" - exit 0 + return 0 fi if [ ! -f $kdump_initrd ]; then echo -n "No kdump initial ramdisk found."; warning; echo - echo "Tried to locate ${kdump_initrd}" - return 1 + echo "Rebuilding $kdump_initrd" + /sbin/mkdumprd -d -f $kdump_initrd $kdump_kver + if [ $? != 0 ]; then + echo "Failed to run mkdumprd" + $LOGGER "mkdumprd: failed to make kdump initrd" + exit 1 + fi + return 0 fi #check to see if config file has been modified after @@ -82,17 +95,52 @@ echo "Detected $KDUMP_CONFIG_FILE or $kdump_kernel change" echo "Rebuilding $kdump_initrd" /sbin/mkdumprd -d -f $kdump_initrd $kdump_kver + if [ $? != 0 ]; then + echo "Failed to run mkdumprd" + $LOGGER "mkdumprd: failed to make kdump initrd" + return 1 + fi fi - #hack until we stop making initrd for kdump during rpm install - #allow initrd 120 seconds to be created before considering it new - module_time=`stat -c "%Y" /lib/modules/${kdump_kver}` - let module_time=module_time+120 - if [ ! "$image_time" -gt "$module_time" ]; then - echo "Detected initial rpm install" - echo "Rebuilding $kdump_initrd" - /sbin/mkdumprd -d -f $kdump_initrd $kdump_kver +} + +# This function check iomem and determines if we have more than +# 4GB of ram available. Returns 1 if we do, 0 if we dont +function need_64bit_headers() +{ + + MEMSZ=`sed -e's/\(^[0-9]\+.*\)/0x\1/' -e's/\(-\)\(.*\)/ 0x\2/' /proc/iomem | \ + awk 'BEGIN { + totalmem=0; + segmentmem=0; + } + /.*RAM.*/ { + start = strtonum($1); + end = strtonum($2); + segmentmem=end-start; + totalmem=totalmem+(segmentmem/1024); + if (end >= 4194304) { + totalmem=totalmem+4194304; + } + } + END { + printf "%d", (totalmem+1); + }'` + + #The AWK script above computes the total number of KB + #in the RAM areas of /proc/iomem + #Note also that we set totalmem to 4GB in the event that + #any physical address is larger than 4GB. This lets us + #default to 64 bit ELF headers for PAE kernels, which + #need then to access those higher addresses. + + #This comparison tells us if the above amount is more than + #4GB (4096 KB). I do the funny math to avoid overflow + if [ $MEMSZ -ge 4194304 ] + then + return 1 fi + return 0 } # Load the kdump kerel specified in /etc/sysconfig/kdump @@ -100,54 +148,223 @@ # as the currently running kernel. function load_kdump() { - if [ -z "$KDUMP_COMMANDLINE" ]; then + + if [ -z "$KDUMP_COMMANDLINE" ] + then KDUMP_COMMANDLINE=`cat /proc/cmdline` - KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+M@[0-9]\+M//g'` - KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} irqpoll" fi - $KEXEC $KEXEC_ARGS $standard_kexec_args \ - --command-line="$KDUMP_COMMANDLINE" \ - --initrd=$kdump_initrd $kdump_kernel + MEM_RESERVED=`echo $KDUMP_COMMANDLINE | grep "crashkernel=[0-9]\+[MmKkGg]@[0-9]\+[MmGgKk]"` + if [ -z "$MEM_RESERVED" ] + then + $LOGGER "No crashkernel parameter specified for running kernel" + return 1 + fi + ARCH=`uname -m` + if [ "$ARCH" == "i686" -o "$ARCH" == "i386" ] + then + + need_64bit_headers + if [ $? == 1 ] + then + FOUND_ELF_ARGS=`echo $KEXEC_ARGS | grep elf32-core-headers` + if [ -n "$FOUND_ELF_ARGS" ] + then + echo -n "Warning: elf32-core-headers overrides correct elf64 setting" + warning + echo + else + KEXEC_ARGS="$KEXEC_ARGS --elf64-core-headers" + fi + else + FOUND_ELF_ARGS=`echo $KEXEC_ARGS | grep elf64-core-headers` + if [ -z "$FOUND_ELF_ARGS" ] + then + KEXEC_ARGS="$KEXEC_ARGS --elf32-core-headers" + fi + fi + fi + + KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+[MmKkGg]@[0-9]\+[MmGgKk]//'` + KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} ${KDUMP_COMMANDLINE_APPEND}" + + KEXEC_OUTPUT=`$KEXEC $KEXEC_ARGS $standard_kexec_args \ + --command-line="$KDUMP_COMMANDLINE" \ + --initrd=$kdump_initrd $kdump_kernel 2>&1` if [ $? == 0 ]; then - touch /var/run/kdump.status + $LOGGER "kexec: loaded kdump kernel" + return 0 + else + $LOGGER $KEXEC_OUTPUT + $LOGGER "kexec: failed to load kdump kernel" + return 1 fi +} +function propagate_ssh_key() +{ + #Check if selinux is on... must flip to permissive mode + #for the moment to create key, then flip back... + se_enforce=`/usr/sbin/sestatus | grep -c "^Current mode.*enforcing"` + if [ "$se_enforce" -ge 1 ]; then + /usr/sbin/setenforce 0 2>&1 > /dev/null + fi + + #Use dedicated key for kdump + if [ ! -d /root/.ssh ]; then + mkdir /root/.ssh + chmod 700 /root/.ssh + fi + if [ ! -e /root/.ssh/config ]; then + echo "IdentityFile ~/.ssh/kdump_id_rsa" >> /root/.ssh/config + elif [ `grep -c kdump_id_rsa /root/.ssh/config` -eq 0 ]; then + echo "IdentityFile ~/.ssh/kdump_id_rsa" >> /root/.ssh/config + fi + local KEYFILE=/root/.ssh/kdump_id_rsa.pub + local errmsg="Failed to propagate ssh key" + + #make sure they've configured kdump.conf for ssh dumps + local SSH_TARGET=`awk '/^\ *net.*@.*$/ {print $0}' $KDUMP_CONFIG_FILE` + if [ -z "$SSH_TARGET" ]; then + echo "No ssh config specified in $KDUMP_CONFIG_FILE. Can't propagate" + $LOGGER "$errmsg, no ssh config specified in $KDUMP_CONFIG_FILE" + exit 1 + fi + + #Check to see if we already created key, if not, create it. + if [ -f $KEYFILE ]; then + echo "Using existing keys..." + else + echo -n "Generating new ssh keys... " + /usr/bin/ssh-keygen -t rsa -f /root/.ssh/kdump_id_rsa -N "" 2>&1 > /dev/null + echo "done." + fi + + #If necessary, flip selinux back to enforcing + if [ "$se_enforce" -ge 1 ]; then + /usr/sbin/setenforce 1 2>&1 > /dev/null + fi + + #now find the target ssh user and server to contact. + SSH_USER=`echo $SSH_TARGET | cut -d\ -f2 | cut -d@ -f1` + SSH_SERVER=`echo $SSH_TARGET | sed -e's/\(.*@\)\(.*$\)/\2/'` + + #now send the found key to the found server + cat $KEYFILE | ssh -x $SSH_USER@$SSH_SERVER "mkdir -p ~$SSH_USER/.ssh; chmod 700 ~$SSH_USER/.ssh; cat >> ~$SSH_USER/.ssh/authorized_keys2; chmod 600 ~$SSH_USER/.ssh/authorized_keys2" + RET=$? + if [ $RET == 0 ]; then + echo $KEYFILE has been added to ~$SSH_USER/.ssh/authorized_keys2 on $SSH_SERVER + $LOGGER "propagated ssh key (ssh server: $SSH_SERVER)" + return 0 + else + echo $KEYFILE failed in transfer to $SSH_SERVER + $LOGGER "$errmsg, unable to transfer $KEYFILE to $SSH_SERVER" + exit 1 + fi + +} + +function status() +{ + if [ ! -e /sys/kernel/kexec_crash_loaded ] + then + return 2 + fi + rc=`cat /sys/kernel/kexec_crash_loaded` + if [ $rc == 1 ]; then + return 0 + else + return 1 + fi +} + +function start() +{ + #TODO check raw partition for core dump image + status + rc=$? + if [ $rc == 2 ]; then + echo -n "Kdump is not supported on this kernel"; failure; echo + return 1; + else + if [ $rc == 0 ]; then + echo -n "Kdump already running"; success; echo + return 0 + fi + fi + check_config + if [ $? != 0 ]; then + echo -n "Starting kdump:"; failure; echo + $LOGGER "failed to start up, config file incorrect" + return 1 + fi + load_kdump + if [ $? != 0 ]; then + echo -n "Starting kdump:"; failure; echo + $LOGGER "failed to start up" + return 1 + fi + + echo -n "Starting kdump:"; success; echo + $LOGGER "started up" +} + +function stop() +{ + $KEXEC -p -u 2>/dev/null + if [ $? == 0 ]; then + $LOGGER "kexec: unloaded kdump kernel" + echo -n "Stopping kdump:"; success; echo + $LOGGER "stopped" + else + $LOGGER "kexec: failed to unload kdump kernel" + echo -n "Stopping kdump:"; failure; echo + $LOGGER "failed to stop" + fi } case "$1" in start) if [ -s /proc/vmcore ]; then - save_core - reboot - else - #TODO check raw partition for core dump image - check_config - load_kdump + save_core + reboot + else + start fi ;; stop) - $KEXEC -p -u - rm -f /var/run/kdump.status + stop ;; status) - if [ -a /var/run/kdump.status ]; then + EXIT_CODE=0 + status + case "$?" in + 0) echo "Kdump is operational" - else + ;; + 1) echo "Kdump is not operational" - fi + EXIT_CODE=1 + ;; + 2) + echo "Kdump is unsupported on this kernel" + EXIT_CODE=1 + ;; + esac + exit $EXIT_CODE ;; restart) - $KEXEC -p -u - rm -f /var/run/kdump.status - check_config - load_kdump + stop + start ;; condrestart) ;; + propagate) + propagate_ssh_key + ;; *) - echo $"Usage: $0 {start|stop|status|restart}" + echo $"Usage: $0 {start|stop|status|restart|propagate}" exit 1 esac Index: kdump.sysconfig =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/kdump.sysconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kdump.sysconfig 5 Jul 2006 14:57:41 -0000 1.4 +++ kdump.sysconfig 31 May 2007 19:20:00 -0000 1.5 @@ -11,6 +11,10 @@ # /proc/cmdline KDUMP_COMMANDLINE="" +# This variable lets us append arguments to the current kdump commandline +# As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline +KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1" + # Any additional kexec arguments required. In most situations, this should # be left empty # kexec-tools-1.101-Makefile.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: kexec-tools-1.101-Makefile.patch =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/kexec-tools-1.101-Makefile.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kexec-tools-1.101-Makefile.patch 5 Jul 2006 19:54:50 -0000 1.3 +++ kexec-tools-1.101-Makefile.patch 31 May 2007 19:20:00 -0000 1.4 @@ -1,8 +1,8 @@ ---- kexec-tools-1.101/Makefile.orig 2006-07-05 15:42:41.000000000 -0400 -+++ kexec-tools-1.101/Makefile 2006-07-05 15:43:09.000000000 -0400 -@@ -44,7 +44,7 @@ PKGINCLUDEIR=$(INCLUDEDIR)/$(PACKAGE) - +--- kexec-tools-1.101/Makefile.orig 2006-10-20 13:42:52.000000000 -0400 ++++ kexec-tools-1.101/Makefile 2006-10-20 13:43:22.000000000 -0400 +@@ -45,7 +45,7 @@ MAN_PAGES:= kexec/kexec.8 + MAN_PAGES+= kdump/kdump.8 BINARIES_i386:= $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump -BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test +BINARIES_x86_64:= $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump kexec-tools-1.101-ppc64-usage.patch: kexec-ppc64.c | 4 ++++ 1 files changed, 4 insertions(+) Index: kexec-tools-1.101-ppc64-usage.patch =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/kexec-tools-1.101-ppc64-usage.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kexec-tools-1.101-ppc64-usage.patch 22 Aug 2006 14:18:04 -0000 1.1 +++ kexec-tools-1.101-ppc64-usage.patch 31 May 2007 19:20:00 -0000 1.2 @@ -1,8 +1,6 @@ -Index: kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c -=================================================================== ---- kexec-tools-1.101.orig/kexec/arch/ppc64/kexec-ppc64.c -+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c -@@ -552,6 +552,10 @@ int file_types = sizeof(file_type) / siz +--- kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c.orig 2006-10-20 11:10:39.000000000 -0400 ++++ kexec-tools-1.101/kexec/arch/ppc64/kexec-ppc64.c 2006-10-20 11:11:22.000000000 -0400 +@@ -577,6 +577,10 @@ void arch_usage(void) { Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/kexec-tools.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- kexec-tools.spec 23 Jan 2007 20:16:31 -0000 1.66 +++ kexec-tools.spec 31 May 2007 19:20:00 -0000 1.67 @@ -1,36 +1,59 @@ Name: kexec-tools Version: 1.101 -Release: 55%{?dist} +Release: 56%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. Source0: %{name}-%{version}.tar.gz Source1: kdump.init Source2: kdump.sysconfig -Source3: mkdumprd -Source4: kdump.conf -Source5: kcp.c -Source6: Makefile.kcp -Source7: makedumpfile.tar.gz -Source8: kexec-kdump-howto.txt +Source3: kdump.sysconfig.x86_64 +Source4: kdump.sysconfig.i386 +Source5: kdump.sysconfig.ppc64 +Source6: kdump.sysconfig.ia64 +Source7: mkdumprd +Source8: kdump.conf +Source9: makedumpfile-1.1.1.tar.gz +Source10: kexec-kdump-howto.txt +Source11: firstboot_kdump.py +Source12: mkdumprd.8 +Source13: pofiles.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(pre): coreutils chkconfig sed busybox ethtool +Requires(pre): coreutils chkconfig sed +Requires: busybox >= 1.2.0 BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel pkgconfig +BuildRequires: elfutils-libelf-devel elfutils-devel-static gettext +%ifarch %{ix86} x86_64 ppc64 ia64 ppc +Obsoletes: diskdumputils netdump +%endif # # Patches 0 through 100 are meant for x86 kexec-tools enablement # Patch1: kexec-tools-1.101-kdump.patch +Patch2: kexec-tools-1.101-elf-core-type.patch +Patch3: kexec-tools-1.101-bzimage-options.patch +Patch4: kexec-tools-1.101-relocatable-bzimage.patch # # Patches 101 through 200 are meant for x86_64 kexec-tools enablement # Patch101: kexec-tools-1.101-disable-kdump-x8664.patch +Patch102: kexec-tools-1.101-x86_64-exactmap.patch # # Patches 201 through 300 are meant for ia64 kexec-tools enablement # Patch201: kexec-tools-1.101-ia64-fixup.patch +Patch202: kexec-tools-1.101-ia64-tools.patch +Patch203: kexec-tools-1.101-ia64-kdump.patch +Patch204: kexec-tools-1.101-ia64-EFI.patch +Patch205: kexec-tools-1.101-ia64-icache-align.patch +Patch206: kexec-tools-1.101-ia64-noio.patch +Patch207: kexec-tools-1.101-ia64-phdr-malloc.patch +Patch208: kexec-tools-1.101-ia64-load-offset.patch +Patch209: kexec-tools-1.101-ia64-noio-eat.patch +Patch210: kexec-tools-1.101-ia64-dash-l-fix.patch # # Patches 301 through 400 are meant for ppc64 kexec-tools enablement @@ -39,6 +62,12 @@ Patch302: kexec-tools-1.101-ppc64-usage.patch Patch303: kexec-tools-1.101-ppc64-cliargs.patch Patch304: kexec-tools-1.101-ppc64-platform-fix.patch +Patch305: kexec-tools-1.101-ppc64-64k-pages.patch +Patch306: kexec-tools-1.101-ppc64-memory_regions.patch +Patch307: kexec-tools-1.101-ppc64_rmo_top.patch +Patch308: kexec-tools-1.101-ppc-boots-ppc64.patch +Patch309: kexec-tools-1.101-ppc64-align-dtstruct.patch +Patch310: kexec-tools-1.101-ppc64-bootargs-align.patch # # Patches 401 through 500 are meant for s390 kexec-tools enablement @@ -54,12 +83,12 @@ # Patches 601 onward are generic patches # Patch601: kexec-tools-1.101-Makefile.patch -Patch602: kexec-tools-1.101-Makefile-kcp.patch -Patch603: kexec-tools-1.101-et-dyn.patch -Patch604: kexec-tools-1.101-add-makedumpfile1.patch -Patch605: kexec-tools-1.101-add-makedumpfile2.patch -Patch606: kexec-tools-1.101-makedumpfile-archbuild.patch -Patch607: kexec-tools-1.101-page_h.patch +Patch602: kexec-tools-1.101-et-dyn.patch +Patch603: kexec-tools-1.101-page_h.patch +Patch604: kexec-tools-1.101-elf-format.patch +Patch605: kexec-tools-1.101-ifdown.patch +Patch606: kexec-tools-1.101-reloc-update.patch +Patch607: kexec-1.101-retry-locate-hole.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -72,29 +101,52 @@ %setup -q -n %{name}-%{version} rm -f ../kexec-tools-1.101.spec %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %patch101 -p1 +%patch102 -p1 %patch201 -p1 +%patch202 -p1 +%patch203 -p1 +%patch204 -p1 +%patch205 -p1 +%patch206 -p1 +%patch207 -p1 +%patch208 -p1 +%patch209 -p1 +%patch210 -p1 %patch301 -p1 %patch302 -p1 %patch303 -p1 %patch304 -p1 +%patch305 -p1 +%patch306 -p1 +%patch307 -p1 +%patch308 -p1 +%patch309 -p1 +%patch310 -p1 %patch401 -p1 %patch501 -p1 %patch601 -p1 %patch602 -p1 -%patch603 -p1 mkdir -p -m755 kcp -cp %{SOURCE5} kcp/kcp.c -cp %{SOURCE6} kcp/Makefile -mkdir makedumpfile -tar -C makedumpfile -z -x -v -f %{SOURCE7} +tar -z -x -v -f %{SOURCE9} + +%patch603 -p1 %patch604 -p1 %patch605 -p1 %patch606 -p1 %patch607 -p1 +tar -z -x -v -f %{SOURCE13} + +%ifarch ppc +%define archdef ARCH=ppc64 +%endif + %build %configure \ %ifarch ppc64 @@ -103,34 +155,62 @@ %endif --sbindir=/sbin rm -f kexec-tools.spec.in -cp %{SOURCE8} . -make -%ifarch %{ix86} x86_64 +cp %{SOURCE10} . +make %{?archdef} +%ifarch %{ix86} x86_64 ia64 ppc64 ppc make -C makedumpfile %endif +make -C po %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install %{?archdef} DESTDIR=$RPM_BUILD_ROOT +make -C po install DESTDIR=$RPM_BUILD_ROOT mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mkdir -p -m755 $RPM_BUILD_ROOT%{_localstatedir}/crash mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/man8/ +mkdir -p -m755 $RPM_BUILD_ROOT%{_docdir} +mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/kdump install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/kdump -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump -install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/sbin/mkdumprd -install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf +if [ -f $RPM_SOURCE_DIR/kdump.sysconfig.%{_target_cpu} ]; then + install -m 644 $RPM_SOURCE_DIR/kdump.sysconfig.%{_target_cpu} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump +else + install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump +fi +install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/sbin/mkdumprd +install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8 -%ifarch %{ix86} x86_64 +install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/kdump/firstboot_kdump.py +install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/mkdumprd.8 +%ifarch %{ix86} x86_64 ia64 ppc64 ppc install -m 755 makedumpfile/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile +install -m 755 makedumpfile/makedumpfile-R.pl $RPM_BUILD_ROOT/sbin/makedumpfile-reasm %endif +CHOMP_SIZE=`echo $RPM_BUILD_ROOT | wc -c` +find $RPM_BUILD_ROOT -name '*.mo' | cut -b $CHOMP_SIZE- >> %{name}.lang %clean rm -rf $RPM_BUILD_ROOT + %post touch /etc/kdump.conf /sbin/chkconfig --add kdump +#This portion of the script is temporary. Its only here +#to fix up broken boxes that require special settings +#in /etc/sysconfig/kdump. It will be removed when +#These systems are fixed. + +#This is for HP zx1 machines +#They require machvec=dig on the kernel command line +if [ -d /proc/bus/mckinley ] +then + sed -e's/\(^KDUMP_COMMANDLINE_APPEND.*\)\("$\)/\1 machvec=dig"/' \ + /etc/sysconfig/kdump > /etc/sysconfig/kdump.new + mv /etc/sysconfig/kdump.new /etc/sysconfig/kdump +fi + %postun @@ -145,23 +225,38 @@ fi exit 0 -%files +%triggerin -- firstboot +if [ ! -e %{_datadir}/firstboot/modules/firstboot_kdump.py ] +then + ln -s %{_datadir}/kdump/firstboot_kdump.py %{_datadir}/firstboot/modules/firstboot_kdump.py +fi + + +%triggerun -- firstboot +rm -f %{_datadir}/firstboot/modules/firstboot_kdump.py + +%files -f %{name}.lang %defattr(-,root,root,-) /sbin/* +%{_datadir}/kdump %config(noreplace,missingok) %{_sysconfdir}/sysconfig/kdump %config(noreplace,missingok) %{_sysconfdir}/kdump.conf %config %{_sysconfdir}/rc.d/init.d/kdump %dir %{_localstatedir}/crash %ifarch %{ix86} x86_64 -%{_libdir}/kexec-tools/kexec_test +%{_libdir}/kexec-tools %endif -%{_mandir}/man8/kexec.8* +%{_mandir}/man8/* %doc News %doc COPYING %doc TODO %doc kexec-kdump-howto.txt %changelog +* Thu May 31 2007 Neil Horman - 1.101-56%{dist} +- Update kexec to latest devel branch (-69.fc7) since we have reolc. kernel +- Fix kexec failure when kexec locates an out-of-range hole (bz 238768) + * Tue Jan 23 2007 Neil Horman - 1.101-55%{dist} - Fix up init script to not constantly reboot (bz 224034) Index: mkdumprd =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/mkdumprd,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mkdumprd 28 Sep 2006 16:16:04 -0000 1.10 +++ mkdumprd 31 May 2007 19:20:00 -0000 1.11 @@ -25,6 +25,8 @@ # Guillaume Cottenceau # Peter Jones # Neil Horman +cmdname=`basename $0` + umask 0022 export MALLOC_PERTURB_=204 @@ -43,8 +45,6 @@ MPATHS="" -[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd - CONFMODS="$MODULES" MODULES="" @@ -66,7 +66,8 @@ vg_list="" net_list="" -USING_METHOD="raw" +USING_METHOD="" +SAVE_PATH=/var/crash vecho() { @@ -95,14 +96,14 @@ cmd=error fi - $cmd "usage: `basename $0` [--version] [--help] [-v] [-d] [-f] [--preload ]" + $cmd "usage: $cmdname [--version] [--help] [-v] [-d] [-f] [--preload ]" $cmd " [--force-ide-probe] [--force-scsi-probe | --omit-scsi-modules]" $cmd " [--image-version] [--force-scsi-probe | --omit-raid-modules]" $cmd " [--with=] [--force-lvm-probe | --omit-lvm-modules]" $cmd " [--builtin=] [--omit-dmraid]" $cmd " [--fstab=] [--nocompress] " $cmd "" - $cmd " (ex: `basename $0` /boot/initrd-2.2.5-15.img 2.2.5-15)" + $cmd " (ex: $cmdname /boot/initrd-2.2.5-15.img 2.2.5-15)" if [ "$1" == "-n" ]; then exit 0 @@ -233,31 +234,6 @@ fi } -finddmmods() { - line=$(/sbin/dmsetup table "$1" 2>/dev/null) - [ -z "$line" ] && return 1 - type=$(echo "$line" | awk '{ print $3 }') - [ -z "$type" ] && return 1 - case "$type" in - mirror) - findmodule -dm-mirror - ;; - emc) - findmodule -dm-emc - findmodule -dm-round-robin - ;; - multipath) - findmodule -dm-multipath - findmodule -dm-round-robin - ;; - crypt) - findmodule -dm-crypt - ;; - zero) - findmodule -dm-zero - ;; - esac -} inst() { if [ "$#" != "2" ];then @@ -320,7 +296,23 @@ continue ;; *) handleddevices="$handleddevices $device" ;; esac - modalias=$(cat /sys/class/net/$device/device/modalias) + + case "$device" in + bond*) + modalias=bonding + ;; + eth*.*) + modalias=8021q + ;; + *) + if [ -f /sys/class/net/$device/device/modalias ] + then + modalias=$(cat /sys/class/net/$device/device/modalias) + else + modalias=$(ethtool -i $device | awk '/^driver:/ { print $2 }') + fi + ;; + esac for driver in $(modprobe --set-version $kernel --show-depends $modalias 2>/dev/null| awk '{ print gensub(".*/","","g",$2) }') ; do findmodule ${driver%%.ko} done @@ -367,6 +359,9 @@ handlelvordev() { local vg=`lvs --noheadings -o vg_name $1 2>/dev/null` + if [ -z "$vg" ]; then + vg=`lvs --noheadings -o vg_name $(echo $1 | sed -e 's#^/dev/mapper/\([^-]*\)-\(.*\)$#/dev/\1/\2#') 2>/dev/null` + fi if [ -n "$vg" ]; then vg=`echo $vg` # strip whitespace case " $vg_list " in @@ -387,29 +382,61 @@ handlenetdev() { local dev=$1 cp /etc/sysconfig/network-scripts/ifcfg-$dev $MNTIMAGE/etc + BOOTPROTO="" + VLAN="" + MASTER="" + SLAVE="" . $MNTIMAGE/etc/ifcfg-$dev findnetdriver $dev - if [ "$MASTER" == "yes" ] - then - #put code here to handle subdevs for a bond - echo "BUS_ID=\"Bonding\"" >> $MNTIMAGE/etc/ifcfg-$dev - elif [ "$VLAN" == "yes" ] - then - #put code to handle vlan devices - echo "BUS+Id=\"Vlan\"" >> $MNTIMAGE/etc/ifcfg-$dev - else - BUS_ID=`/sbin/ethtool -i $dev | grep bus-info` - echo "BUS_ID=\"$BUS_ID\"" >> $MNTIMAGE/etc/ifcfg-$dev - fi if [ "$BOOTPROTO" == "dhcp" ] then echo iface $dev inet dhcp >> $MNTIMAGE/etc/network/interfaces else - echo iface $dev inet static address $IPADDR netmask $NETMASK >> $MNTIMAGE/etc/network/interfaces + echo iface $dev inet static >> $MNTIMAGE/etc/network/interfaces + if [ -n "$IPADDR" ] + then + echo " " address $IPADDR >> $MNTIMAGE/etc/network/interfaces + fi + if [ -n "$NETMASK" ] + then + echo " " netmask $NETMASK >> $MNTIMAGE/etc/network/interfaces + fi + if [ -z "$GATEWAY" ] + then + GATEWAY=`/sbin/ip route show | awk '/^default/ {print $3}'` + fi + echo " " gateway $GATEWAY >> $MNTIMAGE/etc/network/interfaces fi + + #This lets us recursively handle stacked devices + case "$dev" in + bond*) + #This is a bond, pick up its slaves + for j in `cat /sys/class/net/$dev/bonding/slaves` + do + handlenetdev $j + done + echo "BUS_ID=\"Bonding\"" >> $MNTIMAGE/etc/ifcfg-$dev + ;; + *) + + if [ "$VLAN" == "yes" ] + then + #put code to handle vlan devices + echo "BUS_ID=\"Vlan\"" >> $MNTIMAGE/etc/ifcfg-$dev + #now make sure we pick up the driver to support the + #underlying interface + BASE_IFC=`echo $dev | cut -d"." -f1` + handlenetdev $BASE_IFC + else + BUS_ID=`ls -l /sys/class/net/$dev/device | sed -e's/\(.*\/\)\(.*$\)/\2/'` + echo "BUS_ID=\"$BUS_ID\"" >> $MNTIMAGE/etc/ifcfg-$dev + fi + ;; + esac } while [ $# -gt 0 ]; do @@ -453,7 +480,7 @@ ;; --version) - echo "mkinitrd: version $VERSION" + echo "$cmdname: version $VERSION" exit 0 ;; @@ -574,7 +601,7 @@ fi if [ $UID != 0 ]; then - error "mkinitrd must be run as root." + error "$cmdname must be run as root." exit 1 fi @@ -759,8 +786,6 @@ findmodule $n done -finddmmods - vecho "Using modules:$MODULES" MNTIMAGE=`mktemp -d ${TMPDIR}/initrd.XXXXXX` @@ -789,7 +814,7 @@ if [ -n "$UUID" ]; then UUID="--uuid $UUID" fi - emit dm create "$1" $UUID $(/sbin/dmsetup table "$1") + emit "echo \"$(/sbin/dmsetup table $1)\" | /sbin/dmsetup.static create \"$1\" $UUID" } emitdms() @@ -805,7 +830,7 @@ emitdm "$NAME" ;; part) - emit dm partadd "$NAME" + emit /sbin/kpartx.static -pp -a \"/dev/mapper/$NAME\" ;; esac done @@ -833,7 +858,7 @@ #find ethernet device used to route to remote host, ie eth0 netdev=`/sbin/ip route get to $rhost 2>&1` - [ $? != 0 ] && echo "Bad kdump location: $location" && continue + [ $? != 0 ] && echo "Bad kdump location: $location" && exit 1 #the field in the ip output changes if we go to another subnet OFF_SUBNET=`echo $netdev | grep via` if [ -n "$OFF_SUBNET" ] @@ -855,12 +880,10 @@ ;; raw) USING_METHOD="raw" - ;; - ifc) - KDUMP_IFC=$location - if [ -n "$network" ]; then - network=`echo $network | sed -e's/\(^.* \)\('$netdev'\)\( .*$\)/\1 '$KDUMP_IFC' \3/'` + if (echo $location | egrep -q "^(LABEL|UUID)="); then + location=$(findfs $location) fi + handlelvordev $location ;; core_collector) if [ -x /sbin/makedumpfile ]; then @@ -873,8 +896,27 @@ exit 1 fi ;; + path) + SAVE_PATH=$location + ;; + link_delay) + LINK_DELAY=$location + ;; + default) + DEFAULT_ACTION=$location + ;; *) - USING_METHOD="local_fs" + IS_COMMENT=`echo $type | grep ^#.*$` + if [ -n "$IS_COMMENT" -o -z "$location" ] + then + #don't process comments or blank line + continue + fi + USING_METHOD="filesystem" + if (echo $location | egrep -q "^(LABEL|UUID)="); then + location=$(findfs $location) + fi + handlelvordev $location ;; esac @@ -887,7 +929,14 @@ rm -rf $MNTIMAGE rm -rf $IMAGE exit 1 - fi + fi + + if [ -z "$USING_METHOD" ] + then + echo "Warning! Lack of dump target specification means core_collector option is ignored!" + CORE_COLLECTOR="" + fi + fi @@ -899,6 +948,7 @@ mkdir -p $MNTIMAGE/dev mkdir -p $MNTIMAGE/proc mkdir -p $MNTIMAGE/sys +mkdir -p $MNTIMAGE/tmp mkdir -p $MNTIMAGE/sysroot mkdir -p $MNTIMAGE/modules mkdir -p $MNTIMAGE/usr/share/udhcpc @@ -913,7 +963,15 @@ #if we are using makedumpfile here, then generate the config file if [ -n "$CORE_COLLECTOR" ]; then RUN_KERN_VER=`uname -r` - /sbin/makedumpfile -g $MNTIMAGE/etc/makedumpfile.config -x /usr/lib/debug/lib/modules/$RUN_KERN_VER/vmlinux /boot/System.map-$RUN_KERN_VER + if [ ! -f /usr/lib/debug/lib/modules/$RUN_KERN_VER/vmlinux ] + then + echo "kernel-debuginfo-$RUN_KERN_VER is not installed. You need this to use makedumpfile!" + echo "please install it and restart the kdump service" + rm -rf $MNTIMAGE + rm -rf $IMAGE + exit 1 + fi + /sbin/makedumpfile -g $MNTIMAGE/etc/makedumpfile.config -x /usr/lib/debug/lib/modules/$RUN_KERN_VER/vmlinux > /dev/null if [ $? != 0 ]; then echo "could not generate makedumpfile configuration. aborting" rm -rf $MNTIMAGE @@ -985,7 +1043,41 @@ #NETWORKING SCRIPT DIRECTORIES cat >> $MNTIMAGE/etc/network/if-pre-up.d/pre-up-script << EOF #!/bin/msh -ifconfig \$IFACE up +PATH=\$PATH:/scriptfns +. /etc/ifcfg-\$IFACE + +LINK_DELAY=$LINK_DELAY +if [ "\$BUS_ID" != "Vlan" ] +then + ifconfig \$IFACE up + if [ -n "\$LINK_DELAY" ] + then + echo "\$IFACE Link Up. Waiting \$LINK_DELAY Seconds" + sleep \$LINK_DELAY + echo "Continuing" + fi +fi + +if [ "\$BUS_ID" == "Bonding" ] +then + #this is a bond find and bring up the slaves + echo searching for slaves + find_activate_slaves \$IFACE +elif [ "\$BUS_ID" == "Vlan" ] +then + #bring up the base interface first + BASE_DEV=\`echo \$IFACE | cut -d"." -f1\` + VLAN_ID=\`echo \$IFACE | cut -d"." -f2\` + ifconfig \$BASE_DEV up + if [ -n "\$LINK_DELAY" ] + then + echo "\$IFACE Link Up. Waiting \$LINK_DELAY Seconds" + sleep \$LINK_DELAY + echo "Continuing" + fi + vconfig add \$BASE_DEV \$VLAN_ID + ifconfig \$IFACE up +fi exit 0 EOF @@ -996,6 +1088,7 @@ cat >> $MNTIMAGE/etc/network/if-up.d/up-script << EOF #!/bin/msh +PATH=\$PATH:/scriptfns if [ "\$METHOD" != "dhcp" ] then . /etc/ifcfg-\$IFACE @@ -1017,56 +1110,69 @@ SCRIPTDIR=$MNTIMAGE/scriptfns mkdir -p $SCRIPTDIR -cat >> $SCRIPTDIR/rename_interfaces << EOF +cat >> $SCRIPTDIR/map_interface << EOF #!/bin/msh -TMPCNT=0 +if [ -e /tmp/tmpcnt ] +then + TMPCNT=\`cat /tmp/tmpcnt\` +else + TMPCNT=0 +fi #erase previously recorded map -rm -f /etc/iface_map -for i in \`ls /etc/ifcfg-*\` +RENAMED="" +REAL_DEV="" +NETDEV=\$1 +. /etc/ifcfg-\$NETDEV +for j in \`ifconfig -a | awk '/.*Link encap.*/ {print \$1}'\` do - RENAMED="" - REAL_DEV="" - NETDEV=\`echo \$i | cut -d"-" -f2\` - for j in \`ifconfig -a | awk '/.*Link encap.*/ {print \$1}'\` - do - . /etc/ifcfg-\$NETDEV - case "\$BUS_ID" in - Bonding) - #do something for bonding - ;; - Vlan) - #do something for vlan - ;; - *) - INFO=\`ethtool -i \$j | grep bus-info\` - if [ "\$INFO" == "\$BUS_ID" -a -z "\$REAL_DEV" ] - then - REAL_DEV=\$j - RENAMED="yes" - fi - ;; - esac - done + case "\$BUS_ID" in + Bonding) + REAL_DEV=bond0 + RENAMED="yes" + ;; + Vlan) + BASE_DEV=\`echo \$NETDEV | cut -d"." -f1\` + VLAN_ID=\`echo \$NETDEV | cut -d"." -f2\` + REAL_BASE=\`grep "^\$BASE_DEV " /etc/iface_map | cut -d" " -f2\` + #Note we add the \ to our vlan values to escape the . for sed-ability + #Note we also convert . to _ to avoid problems with busybox ifup + REAL_DEV=\$REAL_BASE\\\\.\$VLAN_ID + NETDEV=\$BASE_DEV\\\\.\$VLAN_ID + RENAMED="yes" + ;; + *) + INFO=\`ls -l /sys/class/net/\$j/device 2>/dev/null | sed -e's/\\(.*\\/\\)\\(.*$\\)/\\2/'\` + if [ "\$INFO" == "\$BUS_ID" -a -z "\$REAL_DEV" ] + then + REAL_DEV=\$j + RENAMED="yes" + fi + ;; + esac +done - if [ -z "\$RENAMED" ] - then - echo "Could not find a mapping for device \$NETDEV" - exit 1 - fi +if [ -z "\$RENAMED" ] +then + echo "Could not find a mapping for device \$NETDEV" + exit 1 +fi - #build the interface rename map - echo \$NETDEV \$REAL_DEV tmp\$TMPCNT>> /etc/iface_map - TMPCNT=\`echo \$TMPCNT 1 + p | dc\` - echo mapping \$NETDEV to \$REAL_DEV -done +#build the interface rename map +echo \$NETDEV \$REAL_DEV tmp\$TMPCNT >> /etc/iface_map +TMPCNT=\`echo \$TMPCNT 1 + p | dc\` +echo \$TMPCNT > /tmp/tmpcnt +echo mapping \$NETDEV to \$REAL_DEV +EOF +cat >> $SCRIPTDIR/rename_interfaces << EOF +#!/bin/msh MAP_COUNT=\`wc -l /etc/iface_map | cut -d" " -f7 \` #now do all the renaming - first to temp space for j in \`seq 1 1 \$MAP_COUNT\` do - CURRENT=\`awk '{if (RN == ARGV[j]) print \$1}' /etc/iface_map\` - NEW=\`awk '{if (RN == ARGV[j]) print \$2}' /etc/iface_map\` - INTERIM=\`awk '{if (RN == ARGV[j]) print \$3}' /etc/iface_map\` + CURRENT=\`awk -v MATCH=\$j '{if (NR == MATCH) print \$1}' /etc/iface_map\` + NEW=\`awk -v MATCH=\$j '{if (NR == MATCH) print \$2}' /etc/iface_map\` + INTERIM=\`awk -v MATCH=\$j '{if (NR == MATCH) print \$3}' /etc/iface_map\` mv /etc/ifcfg-\$CURRENT /etc/ifcfg-\$INTERIM for i in /etc/ifcfg-\$INTERIM /etc/iface_to_activate /etc/network/interfaces do @@ -1079,9 +1185,9 @@ for j in \`seq 1 1 \$MAP_COUNT\` do - CURRENT=\`awk '{if (RN == ARGV[j]) print \$1}' /etc/iface_map\` - NEW=\`awk '{if (RN == ARGV[j]) print \$2}' /etc/iface_map\` - INTERIM=\`awk '{if (RN == ARGV[j]) print \$3}' /etc/iface_map\` + CURRENT=\`awk -v MATCH=\$j '{if (NR == MATCH) print \$1}' /etc/iface_map\` + NEW=\`awk -v MATCH=\$j '{if (NR == MATCH) print \$2}' /etc/iface_map\` + INTERIM=\`awk -v MATCH=\$j '{if (NR == MATCH) print \$3}' /etc/iface_map\` mv /etc/ifcfg-\$INTERIM /etc/ifcfg-\$NEW for i in /etc/ifcfg-\$NEW /etc/iface_to_activate /etc/network/interfaces do @@ -1094,6 +1200,23 @@ exit 0 EOF +cat >> $SCRIPTDIR/find_activate_slaves << EOF +#!/bin/msh +BOND_MASTER=\$1 + +for j in \`ifconfig -a | awk '/.*Link encap.*/ {print \$1}'\` +do + MASTER="" + . /etc/ifcfg-\$j + if [ "\$MASTER" == "\$BOND_MASTER" ] + then + #this is a slave of the rising interface + echo enslaving \$j to \$BOND_MASTER + echo +\$j > /sys/class/net/\$BOND_MASTER/bonding/slaves + fi +done +EOF + #DONT ADD STUFF to SCRIPTDIR PAST HERE for i in `ls $SCRIPTDIR/*` do @@ -1156,10 +1279,13 @@ #!/bin/msh export PATH=$PATH:/scriptfns mount -t proc /proc /proc -setquiet echo Mounting proc filesystem echo Mounting sysfs filesystem mount -t sysfs /sys /sys +echo 1 > /proc/sys/vm/dirty_background_ratio +echo 5 > /proc/sys/vm/dirty_ratio +echo 10 > /proc/sys/vm/dirty_writeback_centisecs +echo 50 > /proc/sys/vm/dirty_expire_centisecs echo Creating /dev mount -o mode=0755 -t tmpfs /dev /dev mkdir /dev/pts @@ -1232,17 +1358,23 @@ emit "for i in \`ls /sys/block\`; do" emit " MAJOR_NUM=\`cat /sys/block/\$i/dev | cut -d":" -f1\`" emit " MINOR_NUM=\`cat /sys/block/\$i/dev | cut -d":" -f2\`" +emit " MINOR_RANGE=\`cat /sys/block/\$i/range | cut -d":" -f2\`" emit " echo Creating block device \$i" emit " mknod /dev/\$i b \$MAJOR_NUM \$MINOR_NUM" -emit " MINOR_END=\`echo \$MINOR_NUM 10 + p | dc\`" -emit " MINOR_START=\`echo \$MINOR_NUM 1 + p | dc\`" -emit " for j in \`seq \$MINOR_START 1 \$MINOR_END\`" -emit " do" -emit " if [ ! -e /dev/\$i\$j ]" -emit " then" -emit " mknod /dev/\$i\$j b \$MAJOR_NUM \$j" -emit " fi" -emit " done" +emit " if [ \"\$MINOR_RANGE\" -gt 1 ]" +emit " then" +emit " MINOR_END=\`echo \$MINOR_NUM \$MINOR_RANGE + p | dc\`" +emit " MINOR_START=\`echo \$MINOR_NUM 1 + p | dc\`" +emit " PART_NUM=1" +emit " for j in \`seq \$MINOR_START 1 \$MINOR_END\`" +emit " do" +emit " if [ ! -e /dev/\$i\$PART_NUM ]" +emit " then" +emit " mknod /dev/\$i\$PART_NUM b \$MAJOR_NUM \$j" +emit " fi" +emit " PART_NUM=\`expr \$PART_NUM + 1\`" +emit " done" +emit " fi" emit "done" if [ -n "$vg_list" ]; then @@ -1286,7 +1418,7 @@ emit " DM_NUM=\`echo \$DM_NUM 1 + p | dc\`" emit " if [ -z \"\$noresume\" ]" emit " then" - emit " /sbin/dmsetup resume /dev/mapper/\$VGRP-\$i" + emit " /sbin/dmsetup.static resume /dev/mapper/\$VGRP-\$i" emit " fi" emit " fi" emit "done" @@ -1298,15 +1430,31 @@ echo "$KDUMP_CONFIG_FILE: $2" exit 1 } - emit "DATE=\`date +%Y-%M-%d-%T\`" if [ -n "$KDUMP_CONFIG_FILE" ]; then memtotal=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'` #timezone info for date which outputs YYYY-MM-DD-hh:mm cp /etc/localtime $MNTIMAGE/etc/localtime - bin="/sbin/dmsetup /usr/bin/scp /usr/bin/ssh /sbin/ethtool /sbin/mdadm" + cp /etc/sysconfig/clock $MNTIMAGE/etc + emit ". /etc/clock" + emit " if [ \"\$UTC\" == "true" ]" + emit " then" + emit " TIME_FORMAT=-u" + emit " else" + emit " TIME_FORMAT=-l" + emit "fi" + emit "hwclock --hctosys \$TIME_FORMAT" + emit "DATE=\`date +%Y-%m-%d-%T\`" + + bin="/sbin/dmsetup.static /sbin/kpartx.static" + + if [ -n "$CORE_COLLECTOR" ]; then + bin="$bin /sbin/makedumpfile" + fi + #ssh, scp require libraries that aren't found with ldd - lib=/lib && [ -d "/lib64" ] && lib=/lib64 + ARCH=`uname -m` + lib=/lib && [ -d "/lib64" -a "$ARCH" != "ppc64" ] && lib=/lib64 k_extras="/$lib/libnss_compat.so.2 /$lib/libnss_files.so.2" #traverse the config file and setup each dump location @@ -1322,26 +1470,50 @@ #test raw partition kdump_chk "dd if=$location count=1 of=/dev/null > /dev/null 2>&1" \ "Bad raw partition $location" - #TODO check for available size is greater than $memtotal + #check for available size is greater than $memtotal + available_size=$(fdisk -s $location) + if [ $available_size -lt $memtotal ]; then + echo "Warning: There is not space enough to save a vmcore." + echo " The size of $location should be much greater than $memtotal bytes." + fi #setup raw case emit "echo Saving to partition $location" emit "dd if=/proc/vmcore of=$location" - emit "cond reboot -h -f" + emit "if [ \$? == 0 ]" + emit "then" + emit " reboot -f" + emit "fi" ;; net) - if [ -n "$CORE_COLLECTOR" ]; then - bin="$bin /sbin/makedumpfile" - fi - #build an /etc/passwd for scp to work properly grep "^root" /etc/passwd > $MNTIMAGE/etc/passwd # bring up the network + emit "for i in \`ls /etc/ifcfg-*\`" + emit "do" + emit " NETDEV=\`echo \$i | cut -d\"-\" -f2\`" + emit " map_interface \$NETDEV" + emit "done" emit "rename_interfaces" emit "IFACE=\`cat /etc/iface_to_activate\`" emit "ifup \$IFACE" + #lets make sure we're up + emit "IFADDR=\`ifconfig \$IFACE | awk '/inet addr/ {print \$2}' | cut -d\":\" -f 2\`" + emit "if [ -z \"\$IFADDR\" ]" + emit "then" + emit " echo \"\$IFACE failed to come up\"" + if [ "$DEFAULT_ACTION" == "shell" ] + then + emit " echo \"Dropping to shell. exit to reboot\"" + emit " /bin/msh" + emit " reboot -f" + elif [ "$DEFAULT_ACTION" == "reboot" ] + then + emit " reboot -f" + fi + emit "fi" #grab remote host and xlate into numbers rhost=`echo $location | sed 's/.*@//' | cut -d':' -f1` need_dns=`echo $rhost|grep [a-zA-Z]` @@ -1349,9 +1521,17 @@ #find the local ip being used as a route to remote ip netdev=`/sbin/ip route get to $rhost 2>&1` - [ $? != 0 ] && echo "Bad kdump location: $location" && continue - lhost=`echo $netdev|awk '{print $5;}'|head -n 1` - + [ $? != 0 ] && echo "Bad kdump location: $location" && exit 1 + OFF_SUBNET=`echo $netdev | grep via` + if [ -n "$OFF_SUBNET" ] + then + # we are going to a different subnet + lhost=`echo $netdev|awk '{print $7}'|head -n 1` + else + # we are on the same subnet + lhost=`echo $netdev|awk '{print $5}'|head -n 1` + fi + emit "echo Saving to remote location $location" if [ -z "`echo $location|grep @`" ]; then #NFS path @@ -1360,12 +1540,19 @@ tmnt=`mktemp -dq` kdump_chk "mount -t nfs -o nolock $rlocation $tmnt" \ "Bad NFS mount $location" - mkdir -p $tmnt/var/crash - tdir=`mktemp -dqp $tmnt/var/crash` - - rc=$? && rm -rf $tdir && umount $tmnt && rm -rf $tmnt + mkdir -p $tmnt/$SAVE_PATH + tdir=`mktemp -dqp $tmnt/$SAVE_PATH` + available_size=$(df $tdir | tail -1 | tr -s ' ' ':' | cut -d: -f4) + + rc=$? && rm -rf $tdir + umount $tmnt + if [ $? != 0 ]; then + echo "Cannot unmount the temporary directory" + exit 1 + fi + rm -rf $tmnt if [ $rc != "0" ]; then - echo "Cannot create directory in $location: var/crash" + echo "Cannot create directory in $location: $SAVE_PATH" exit 1 fi @@ -1373,31 +1560,51 @@ CORE_COLLECTOR="cp" fi - #TODO check for available size is greater than $memtotal + #check for available size is greater than $memtotal + if [ $available_size -lt $memtotal ]; then + echo "Warning: There is not space enough to save a vmcore." + echo " The size of $location should be much greater than $memtotal bytes." + fi #setup nfs case mkdir -p $MNTIMAGE/mnt emit "mount -t nfs -o nolock $rlocation /mnt" - emit "mkdir -p /mnt/var/crash/$lhost-\$DATE" - emit "$CORE_COLLECTOR /proc/vmcore /mnt/var/crash/$lhost-\$DATE/vmcore" emit "if [ \$? == 0 ]" emit "then" - emit " reboot -f" + emit " mkdir -p /mnt/$SAVE_PATH/$lhost-\$DATE" + emit " $CORE_COLLECTOR /proc/vmcore /mnt/$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete" + emit " if [ \$? == 0 ]" + emit " then" + emit " mv /mnt/$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete /mnt/$SAVE_PATH/$lhost-\$DATE/vmcore" + emit " umount /mnt" + emit " reboot -f" + emit " fi" + emit " umount /mnt" emit "fi" - emit "umount /mnt" else #SSH path #rebuild $location replacing machine name with ip address + bin="$bin /usr/bin/ssh /usr/bin/scp" rlocation=`echo $location|sed 's/@.*/@'"$rhost"'/'` #test ssh path and directory creation s_opts="-o BatchMode=yes -o StrictHostKeyChecking=no" - kdump_chk "ssh -q $s_opts $rlocation mkdir -p /var/crash/ /dev/null | tr -s '\011' ' ' | @@ -1485,7 +1713,13 @@ emit "ROOTDEV=\`cat /proc/cmdline | grep root=\`" emit "if [ -n \"\$ROOTDEV\" ]" emit "then" -emit " ROOTDEV=\`cat /proc/cmdline | cut -d\" \" -f2 | sed -e's/root=//'\`" +emit " ROOTDEV=\`cat /proc/cmdline | sed 's/^.*root=//' | cut -d\" \" -f1\`" +emit " IS_LABEL=\`echo \$ROOTDEV | grep LABEL\`" +emit " IS_UUID=\`echo \$ROOTDEV | grep UUID\`" +emit " if [ -n \"\$IS_LABEL\" -o -n \"\$IS_UUID\" ] " +emit " then" +emit " ROOTDEV=\`findfs \$ROOTDEV\`" +emit " fi" emit "else" emit " #we need to get the root major/minor from real-root-dev" emit " ROOT_DEV_NR=\`cat /proc/sys/kernel/real-root-dev\`" Index: sources =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Aug 2006 19:25:03 -0000 1.3 +++ sources 31 May 2007 19:20:00 -0000 1.4 @@ -1,2 +1,2 @@ b4f7ffcc294d41a6a4c40d6e44b7734d kexec-tools-1.101.tar.gz -aa738475824ee3d25e5030fc506366bd makedumpfile.tar.gz +41c919e362e7fb0e0fbe2b6d9be0de91 makedumpfile-1.1.1.tar.gz From fedora-cvs-commits at redhat.com Thu May 31 19:26:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 15:26:36 -0400 Subject: rpms/kernel/FC-6 10516-wireless-add-prism54usb-driver.txt, 1.1.2.1, 1.1.2.2 Message-ID: <200705311926.l4VJQaNq015434@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15420 Modified Files: Tag: private-linville-netdev-fc6-14-branch 10516-wireless-add-prism54usb-driver.txt Log Message: Index: 10516-wireless-add-prism54usb-driver.txt =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/Attic/10516-wireless-add-prism54usb-driver.txt,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- 10516-wireless-add-prism54usb-driver.txt 31 May 2007 17:38:31 -0000 1.1.2.1 +++ 10516-wireless-add-prism54usb-driver.txt 31 May 2007 19:26:34 -0000 1.1.2.2 @@ -357,9 +357,9 @@ + +// struct timer_list stats_update; + struct net_device_stats statistics; -+#ifdef CONFIG_NET_WIRELESS ++#ifdef CONFIG_WLAN_80211 + struct iw_statistics iwstatistics; -+#endif /* CONFIG_NET_WIRELESS */ ++#endif /* CONFIG_WLAN_80211 */ + + /* device-specific state machine and callbacks + We handle three types of devices : @@ -2316,7 +2316,7 @@ + +#define SUPPORTED_WIRELESS_EXT 16 + -+#ifdef CONFIG_NET_WIRELESS ++#ifdef CONFIG_WLAN_80211 + +#ifndef MADWIFI + @@ -2902,7 +2902,7 @@ + +#endif /* MADWIFI */ + -+#endif /* CONFIG_NET_WIRELESS */ ++#endif /* CONFIG_WLAN_80211 */ diff --git a/drivers/net/wireless/prism54usb/islsm_ioctl.h b/drivers/net/wireless/prism54usb/islsm_ioctl.h new file mode 100644 index 0000000..4963f33 From fedora-cvs-commits at redhat.com Thu May 31 19:48:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 15:48:48 -0400 Subject: rpms/kexec-tools/FC-6 firstboot_kdump.py, NONE, 1.1 mkdumprd.8, NONE, 1.1 mkdumprd, 1.11, 1.12 Message-ID: <200705311948.l4VJmmdD016205@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16192 Modified Files: mkdumprd Added Files: firstboot_kdump.py mkdumprd.8 Log Message: Resolves: bz 238768 --- NEW FILE firstboot_kdump.py --- # # firstboot_kdump.py - kdump configuration page for firstboot # Copyright 2006 Red Hat, Inc. # Author: Jarod Wilson # Contributors: # Neil Horman # Dave Lehman # # # 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., 675 Mass Ave, Cambridge, MA 02139, USA. import sys sys.path.append('/usr/share/system-config-kdump/') from gtk import * import string import os import os.path import time import gtk import gobject import functions import commands import rhpl.executil as executil from firstboot import start_process from rhpl.translate import _, N_ from rhpl import translate translate.textdomain("firstboot") class childWindow: # runPriority determines the order in which this module runs in firstboot runPriority = 70 moduleName = _("Kdump") windowName = moduleName needsReboot = False # possible bootloaders we'll need to adjust # bootloader : (config file, kdump offset) bootloaders = { "grub" : ("/boot/grub/grub.conf", 16), "yaboot" : ("/boot/etc/yaboot.conf", 32), "elilo" : ("/boot/efi/EFI/redhat/elilo.conf", 256) } bootloader = None offset = 0 # list of architectures without kdump support unsupportedArches = [ "ppc", "s390", "s390x", "i386", "i586" ] # list of platforms that have a separate kernel-kdump kernelKdumpArches = [ "ppc64" ] kernelKdumpInstalled = False # toggle sensitivity of kdump config bits def showHide(self, status): self.totalMem.set_sensitive(status) self.kdumpMem.set_sensitive(status) self.systemUsableMem.set_sensitive(status) self.labelTotal.set_sensitive(status) self.labelKdump.set_sensitive(status) self.labelSys.set_sensitive(status) self.kdumpEnabled = status def on_enableKdumpCheck_toggled(self, *args): showHideStatus = self.enableKdumpCheck.get_active() self.showHide(showHideStatus) def updateAvail(self, widget, spin): self.remMem = self.availMem - spin.get_value_as_int() self.systemUsableMem.set_text("%s" % self.remMem) def getBootloader(self): for (name, (conf, offset)) in self.bootloaders.items(): if os.access(conf, os.W_OK): self.bootloader = name return self.bootloader def launch(self, doDebug = None): self.doDebug = doDebug if doDebug: print "initializing kdump module" # What kernel are we running? self.runningKernel = os.popen("/bin/uname -r").read().strip() # What arch are we running on? self.arch = os.popen("/bin/uname -m").read().strip() # Check for a xen kernel, kdump doesn't work w/xen just yet... self.xenKernel = self.runningKernel.find("xen") # Fedora or RHEL? releaseFile = '/etc/redhat-release' self.distro = 'rhel' lines = open(releaseFile).readlines() for line in lines: if line.find("Fedora") != -1: self.distro = 'fedora' kernelKdumpArchesFC = [ "i686", "x86_64" ] self.kernelKdumpArches.extend(kernelKdumpArchesFC) break # If we need kernel-kdump, check to see if its already installed if self.arch in self.kernelKdumpArches: self.kernelKdump = "/boot/vmlinux-%skdump" % self.runningKernel if os.access(self.kernelKdump, os.R_OK): self.kernelKdumpInstalled = True # Ascertain how much memory is in the system memInfo = open("/proc/meminfo").readlines() self.availMem = 0 for line in memInfo: if line.startswith("MemTotal:"): self.availMem = int(line.split()[1]) / 1024 break # Fix up memory calculations if kdump is already on cmdLine = open("/proc/cmdline").read() self.kdumpMem = 0 self.kdumpOffset = 0 self.origCrashKernel = "" chkConfigStatus=commands.getoutput('/sbin/chkconfig --list kdump') if chkConfigStatus.find("on") > -1: self.kdumpEnabled = True self.kdumpMemInitial = 0 if cmdLine.find("crashkernel") > -1: crashString = filter(lambda t: t.startswith("crashkernel="), cmdLine.split())[0].split("=")[1] if self.doDebug: print "crashString is %s" % crashString (self.kdumpMem, self.kdumpOffset) = [int(m[:-1]) for m in crashString.split("@")] self.availMem += self.kdumpMem self.origCrashKernel = "%dM@%dM" % (self.kdumpMem, self.kdumpOffset) self.kdumpMemInitial = self.kdumpMem else: self.kdumpEnabled = False self.kdumpMemInitial = 0 self.initialState = self.kdumpEnabled # Do some sanity-checking and try to present only sane options. # # Defaults lowerBound = 128 minUsable = 256 step = 64 self.enoughMem = True if self.arch == 'ia64': # ia64 usually needs at *least* 256M, page-aligned... :( lowerBound = 256 minUsable = 512 step = 256 elif self.arch == 'ppc64': # ppc64 often fails w/128M lately, and we want at least 1G # of RAM for normal use, due to 64k page size... :\ lowerBound = 256 minUsable = 1024 upperBound = (self.availMem - minUsable) - (self.availMem % step) if upperBound < lowerBound: self.enoughMem = False # Set spinner to lowerBound unless already set on kernel command line if self.kdumpMem == 0: self.kdumpMem = lowerBound else: # round down to a multiple of step value self.kdumpMem = self.kdumpMem - (self.kdumpMem % step) # kdump enable/disable checkbox self.enableKdumpCheck = gtk.CheckButton("Enable kdump?") self.enableKdumpCheck.set_alignment(xalign=0, yalign=0) # detected total amount of system memory self.totalMem = gtk.Label(_("%s" % self.availMem)) self.labelTotal = gtk.Label(_("_Total System Memory (MB):")) self.labelTotal.set_use_underline(True) self.labelTotal.set_mnemonic_widget(self.totalMem) self.labelTotal.set_alignment(0.0, 0.5) self.labelTotal.set_width_chars(32) # how much ram to reserve for kdump self.memSpin = gtk.Adjustment(self.kdumpMem, lowerBound, upperBound, step, step, 64) self.kdumpMem = gtk.SpinButton(self.memSpin, 0, 0) self.kdumpMem.set_update_policy(gtk.UPDATE_IF_VALID) self.kdumpMem.set_numeric(True) self.memSpin.connect("value_changed", self.updateAvail, self.kdumpMem) self.labelKdump = gtk.Label(_("_Kdump Memory (MB):")) self.labelKdump.set_use_underline(True) self.labelKdump.set_mnemonic_widget(self.kdumpMem) self.labelKdump.set_alignment(0.0, 0.5) # remaining usable system memory self.resMem = eval(string.strip(self.kdumpMem.get_text())) self.remMem = self.availMem - self.resMem self.systemUsableMem = gtk.Label(_("%s" % self.remMem)) self.labelSys = gtk.Label(_("_Usable System Memory (MB):")) self.labelSys.set_use_underline(True) self.labelSys.set_mnemonic_widget(self.systemUsableMem) self.labelSys.set_alignment(0.0, 0.5) self.vbox = gtk.VBox() self.vbox.set_size_request(400, 200) title_pix = functions.imageFromFile("workstation.png") internalVBox = gtk.VBox() internalVBox.set_border_width(10) internalVBox.set_spacing(10) label = gtk.Label(_("Kdump is a kernel crash dumping mechanism. In the event of a " "system crash, kdump will capture information from your system " "that can be invaluable in determining the cause of the crash. " "Note that kdump does require reserving a portion of system " "memory that will be unavailable for other uses.")) label.set_line_wrap(True) label.set_alignment(0.0, 0.5) label.set_size_request(500, -1) internalVBox.pack_start(label, False, True) table = gtk.Table(2, 4) table.attach(self.enableKdumpCheck, 0, 2, 0, 1, gtk.FILL, gtk.FILL, 5, 5) table.attach(self.labelTotal, 0, 1, 1, 2, gtk.FILL) table.attach(self.totalMem, 1, 2, 1, 2, gtk.SHRINK, gtk.FILL, 5, 5) table.attach(self.labelKdump, 0, 1, 2, 3, gtk.FILL) table.attach(self.kdumpMem, 1, 2, 2, 3, gtk.SHRINK, gtk.FILL, 5, 5) table.attach(self.labelSys, 0, 1, 3, 4, gtk.FILL) table.attach(self.systemUsableMem, 1, 2, 3, 4, gtk.SHRINK, gtk.FILL, 5, 5) # disable until user clicks check box, if not already enabled if self.initialState is False: self.showHide(False) else: self.enableKdumpCheck.set_active(True) internalVBox.pack_start(table, True, 15) # toggle sensitivity of Mem items self.enableKdumpCheck.connect("toggled", self.on_enableKdumpCheck_toggled) self.vbox.pack_start(internalVBox, False, 15) return self.vbox, title_pix, self.moduleName def grabFocus(self): self.enableKdumpCheck.grab_focus() def apply(self, *args): if self.kdumpEnabled: totalSysMem = self.totalMem.get_text() totalSysMem = eval(string.strip(totalSysMem)) reservedMem = self.kdumpMem.get_value_as_int() remainingMem = totalSysMem - reservedMem else: reservedMem = self.kdumpMemInitial if self.doDebug: print "Running kernel %s on %s architecture" % (self.runningKernel, self.arch) if self.enableKdumpCheck.get_active(): print "System Mem: %s MB Kdump Mem: %s MB Avail Mem: %s MB" % (totalSysMem, reservedMem, remainingMem) else: print "Kdump will be disabled" # If the user simply doesn't have enough memory for kdump to be viable/supportable, tell 'em if self.enoughMem is False and self.kdumpEnabled: self.showErrorMessage(_("Sorry, your system does not have enough memory for kdump to be viable!")) self.enableKdumpCheck.set_active(False) self.showHide(False) return 0 # Alert user that we're not going to turn on kdump if they're running a xen kernel elif self.xenKernel != -1 and self.kdumpEnabled: self.showErrorMessage(_("Sorry, Xen kernels do not support kdump at this time!")) self.enableKdumpCheck.set_active(False) self.showHide(False) return 0 # If there's no kdump support on this arch, let the user know and don't configure elif self.arch in self.unsupportedArches: self.showErrorMessage(_("Sorry, the %s architecture does not support kdump at this time!" % self.arch)) self.enableKdumpCheck.set_active(False) self.showHide(False) return 0 # If running on an arch w/a separate kernel-kdump (i.e., non-relocatable kernel), check to # see that its installed, otherwise, alert the user they need to install it, and give them # the chance to abort configuration. if self.arch in self.kernelKdumpArches and self.kernelKdumpInstalled is False: kernelKdumpNote = "\n\nNote that the %s architecture does not feature a relocatable kernel at this time, and thus requires a separate kernel-kdump package to be installed for kdump to function. This can be installed via 'yum install kernel-kdump' at your convenience.\n\n" % self.arch else: kernelKdumpNote = "" # Don't alert if nothing has changed if self.initialState != self.kdumpEnabled or reservedMem != self.kdumpMemInitial: dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_YES_NO, _("Changing Kdump settings requires rebooting the " "system to reallocate memory accordingly. %sWould you " "like to continue with this change and reboot the " "system after firstboot is complete?" % kernelKdumpNote)) dlg.set_position(gtk.WIN_POS_CENTER) dlg.show_all() rc = dlg.run() dlg.destroy() if rc == gtk.RESPONSE_NO: self.needsReboot = False return None else: self.needsReboot = True # Find bootloader if it exists, and update accordingly if self.getBootloader() == None: self.showErrorMessage(_("Error! No bootloader config file found, aborting configuration!")) self.enableKdumpCheck.set_active(False) self.showHide(False) return 0 else: self.offset = self.bootloaders[self.bootloader][1] # Are we adding or removing the crashkernel param? if self.kdumpEnabled: grubbyCmd = "/sbin/grubby --%s --update-kernel=/boot/vmlinuz-%s --args=crashkernel=%iM@%iM" \ % (self.bootloader, self.runningKernel, reservedMem, self.offset) chkconfigStatus = "on" else: grubbyCmd = "/sbin/grubby --%s --update-kernel=/boot/vmlinuz-%s --remove-args=crashkernel=%s" \ % (self.bootloader, self.runningKernel, self.origCrashKernel) chkconfigStatus = "off" if self.doDebug: print "Using %s bootloader with %iM offset" % (self.bootloader, self.offset) print "Grubby command would be:\n %s" % grubbyCmd else: os.system(grubbyCmd) os.system("/sbin/chkconfig kdump %s" % chkconfigStatus) if self.bootloader == 'yaboot': os.system('/sbin/ybin') else: self.needsReboot = False return 0 def showErrorMessage(self, text): dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, text) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_modal(True) rc = dlg.run() dlg.destroy() return None --- NEW FILE mkdumprd.8 --- .TH MKDUMRD 8 "Fri Feb 9 2007" .SH NAME mkdumprd \- creates initial ramdisk images for kdump crash recovery .SH SYNOPSIS \fBmkdumprd\fR [--version] [-v] [-f] [--preload=\fImodule\fR] [--omit-scsi-modules] [--omit-raid-modules] [--omit-lvm-modules] [--with=\fImodule\fR] [--image-version] [--fstab=\fIfstab\fR] [--nocompress] [--builtin=\fImodule\fR] [--nopivot] \fIimage\fR \fIkernel-version\fR .SH DESCRIPTION \fBmkdumprd\fR creates an initial ram file system for use in conjunction with the booting of a kernel within the kdump framework for crash recovery. \fBmkdumprds\fR purpose is to create an initial ram filesystem capable of copying the crashed systems vmcore image to a location specified in \fI/etc/kdump.conf Any module options specified in \fI/etc/modprobe.conf\fR are passed to the modules as they are loaded by the initial ramdisk. \fBmkdumprd\fR interrogates the running system to understand what modules need to be loaded in the initramfs (based on configuration retrieved from \fI/etc/kdump.conf)\fR \fBmkdumprd\fR was origionally derived from the \fBmkinitrd\fR utility (hence the simmilarity in option sets), however mkdumprds purpose and mission is significantly different than that of \fBmkinitrd\fR. As such, while most of the options still exist, and may work, they are largely vestigual at this point. \fBmkdumprd\fR was not intended for casual use outside of the service initialization script for the kdump utility, and should not be run manually. If you require a custom kdump initramfs image, it is suggested that you use the kdump service infrastrucutre to create one, and then manually unpack, modify and repack the image. .SH OPTIONS .TP \fB-\-builtin=\fR\fImodule\fR Act as if \fImodule\fR is built into the kernel being used. \fBmkdumprd\fR will not look for this module, and will not emit an error if it does not exist. This option may be used multiple times. .TP \fB-f\fR Allows \fBmkdumprd\fR to overwrite an existing image file. .TP \fB-\-fstab=\fR\fIfstab\fR Use \fIfstab\fR to automatically determine what type of filesystem the root device is on. Normally, \fB/etc/fstab\fR is used. .TP \fB-\-image-version The kernel version number is appended to the initrd image path before the image is created. .TP \fB-\-nocompress Normally the created initrd image is compressed with \fBgzip\fR. If this option is specified, the compression is skipped. .TP \fB-\-nopivot Do not use the \fBpivot_root\fR system call as part of the initrd. This lets \fBmkdumprd\fR build proper images for Linux 2.2 kernels at the expense of some features. In particular, some filesystems (such as ext3) will not work properly and filesystem options will not be used to mount root. This option is not recommended, and will be removed in future versions. .TP \fB-\-omit-lvm-modules Do not load any lvm modules, even if /etc/fstab expects them. .TP \fB-\-omit-raid-modules Do not load any raid modules, even if /etc/fstab and /etc/raidtab expect them. .TP \fB-\-omit-scsi-modules Do not load any scsi modules, including 'scsi_mod' and 'sd_mod' modules, even if they are present. .TP \fB-\-preload=\fR\fImodule\fR Load the module \fImodule\fR in the initial ramdisk image. The module gets loaded before any SCSI modules which are specified in \fI/etc/modprobe.conf\fR. This option may be used as many times as necessary. .TP \fB-v\fR Prints out verbose information while creating the image (normally the \fBmkdumprd\fR runs silently). .TP \fB-\-version\fR Prints the version of \fBmkdumprd\fR that's being used and then exits. .TP \fB-\-with=\fR\fImodule\fR Load the modules \fImodule\fR in the initial ramdisk image. The module gets loaded after any SCSI modules which are specified in \fI/etc/modprobe.conf\fR. This option may be used as many times as necessary. .SH FILES .PD 0 .TP 20 \fI/etc/modprobe.conf\fR Specifies modules to be loaded and module options to be used. .PD .SH "SEE ALSO" .BR fstab (5), .BR insmod (1) .BR mkinitrd (8) Index: mkdumprd =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/mkdumprd,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mkdumprd 31 May 2007 19:20:00 -0000 1.11 +++ mkdumprd 31 May 2007 19:48:45 -0000 1.12 @@ -924,19 +924,11 @@ fi if [ -n "$CORE_COLLECTOR" ]; then - if [ "$USING_METHOD" == "ssh" ] || [ "$USING_METHOD" == "raw" ]; then - echo "You may only use alternate core collectors with the NFS and Local Filesystem targets" - rm -rf $MNTIMAGE - rm -rf $IMAGE - exit 1 - fi - if [ -z "$USING_METHOD" ] then echo "Warning! Lack of dump target specification means core_collector option is ignored!" CORE_COLLECTOR="" fi - fi @@ -1479,7 +1471,13 @@ #setup raw case emit "echo Saving to partition $location" - emit "dd if=/proc/vmcore of=$location" + if [ -z "$CORE_COLLECTOR" ] + then + emit "dd if=/proc/vmcore of=$location" + else + CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e's/\(^makedumpfile\)\(.*$\)/\1 -F \2/'` + emit "$CORE_COLLECTOR /proc/vmcore | dd of=$location" + fi emit "if [ \$? == 0 ]" emit "then" emit " reboot -f" @@ -1584,6 +1582,11 @@ else #SSH path #rebuild $location replacing machine name with ip address + if [ -n "$CORE_COLLECTOR" ] + then + CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e's/\(^makedumpfile\)\(.*$\)/\1 -F \2/'` + fi + bin="$bin /usr/bin/ssh /usr/bin/scp" rlocation=`echo $location|sed 's/@.*/@'"$rhost"'/'` #test ssh path and directory creation @@ -1616,10 +1619,20 @@ fi emit "dd if=/dev/mem of=/dev/urandom count=1 bs=512 skip=100" emit "ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mkdir $SAVE_PATH/$lhost-\$DATE" - emit "scp -q -o BatchMode=yes -o StrictHostKeyChecking=no /proc/vmcore $rlocation:$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete" + if [ -z "$CORE_COLLECTOR" ] + then + emit "scp -q -o BatchMode=yes -o StrictHostKeyChecking=no /proc/vmcore $rlocation:$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete" + else + emit "$CORE_COLLECTOR /proc/vmcore | ssh -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation \"cat > $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete\"" + fi emit "if [ \$? == 0 ]" emit "then" - emit " ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mv $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete $SAVE_PATH/$lhost-\$DATE/vmcore" + if [ -z "$CORE_COLLECTOR" ] + then + emit " ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mv $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete $SAVE_PATH/$lhost-\$DATE/vmcore" + else + emit " ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mv $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete $SAVE_PATH/$lhost-\$DATE/vmcore.flat" + fi emit " reboot -f" emit "fi" fi From fedora-cvs-commits at redhat.com Thu May 31 20:30:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 16:30:23 -0400 Subject: rpms/kernel/FC-6 kernel-2.6.spec, 1.2952.2.2, 1.2952.2.3 9734-S2IO-getringparam-ethtool-option.txt, 1.1.2.1, NONE 9735-S2IO-statistics-for-memory-allocation-failuers.txt, 1.1.2.1, NONE 9736-S2IO-Statistics-for-link-up-down-and-memory-allocated-freed.txt, 1.1.2.1, NONE Message-ID: <200705312030.l4VKUNOC016945@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16929 Modified Files: Tag: private-linville-netdev-fc6-14-branch kernel-2.6.spec Removed Files: Tag: private-linville-netdev-fc6-14-branch 9734-S2IO-getringparam-ethtool-option.txt 9735-S2IO-statistics-for-memory-allocation-failuers.txt 9736-S2IO-Statistics-for-link-up-down-and-memory-allocated-freed.txt Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2952.2.2 retrieving revision 1.2952.2.3 diff -u -r1.2952.2.2 -r1.2952.2.3 --- kernel-2.6.spec 31 May 2007 18:43:41 -0000 1.2952.2.2 +++ kernel-2.6.spec 31 May 2007 20:30:19 -0000 1.2952.2.3 @@ -1637,84 +1637,81 @@ Patch30978: 9721-libertas-fix-missing-unlock-in-TX-error-path.txt Patch30979: 9722-libertas-sparse-fixes.txt Patch30980: 9723-libertas-64-bit-cleanups.txt -Patch30981: 9734-S2IO-getringparam-ethtool-option.txt -Patch30982: 9735-S2IO-statistics-for-memory-allocation-failuers.txt -Patch30983: 9736-S2IO-Statistics-for-link-up-down-and-memory-allocated-freed.txt -Patch30984: 9741-Use-menuconfig-objects-II-netdev-pcmcia.txt -Patch30985: 9742-Use-menuconfig-objects-II-netdev-wan.txt -Patch30986: 9747-sky2-88e8071-support-not-ready.txt -Patch30987: 9749-Add-support-for-the-Davicom-DM9161A-PHY.txt -Patch30988: 9847-IPSEC-Check-validity-of-direction-in-xfrm_policy_byid.txt -Patch30989: 9848-IPSEC-Don-t-warn-if-high-order-hash-resize-fails.txt -Patch30990: 9850-NET_SCHED-prio-qdisc-boundary-condition.txt -Patch30991: 9888-SUNRPC-remove-dead-variable-rpciod_running.txt -Patch30992: 9892-SUNRPC-Fix-sparse-warnings.txt -Patch30993: 9910-pasemi_mac-Fix-register-defines.txt -Patch30994: 9911-pasemi_mac-Interrupt-ack-fixes.txt -Patch30995: 9912-pasemi_mac-Terminate-PCI-ID-list.txt -Patch30996: 9914-smc911x-fix-compilation-breakage.txt -Patch30997: 10056-Fix-incorrect-prototype-for-ipxrtr_route_packet.txt -Patch30998: 10062-IPV4-Correct-rp_filter-help-text.txt -Patch30999: 10065-sky2-keep-track-of-receive-alloc-failures.txt -Patch31000: 10066-sky2-MIB-counter-overflow-handling.txt -Patch31001: 10067-sky2-remove-dual-port-workaround.txt -Patch31002: 10068-sky2-memory-barriers-change.txt -Patch31003: 10070-ibm_emac-fix-section-mismatch-warnings.txt -Patch31004: 10071-ibm_emac-improved-PHY-support.txt -Patch31005: 10072-ibm_emac-fix-link-speed-detection-change.txt -Patch31006: 10073-gianfar-Add-I-O-barriers-when-touching-buffer-descriptor-ownership.txt -Patch31007: 10074-spidernet-node-aware-skbuff-allocation.txt -Patch31008: 10076-ixgb-don-t-print-error-if-pci_enable_msi-fails-cleanup-minor-leak.txt -Patch31009: 10128-TCP-FRTO-Prevent-state-inconsistency-in-corner-cases.txt -Patch31010: 10131-NETFILTER-nf_conntrack_ipv4-fix-incorrect-ifdef-config-name.txt -Patch31011: 10132-IPV4-icmp-fix-crash-with-sysctl_icmp_errors_use_inbound_ifaddr.txt -Patch31012: 10213-declance-Remove-a-dangling-spin_unlock_irq-thingy.txt -Patch31013: 10256-RTNETLINK-Allow-changing-of-subsets-of-netdevice-flags-in-rtnl_setlink.txt -Patch31014: 10401-fix-compiler-warning-in-fixed.c.txt -Patch31015: 10402-remove-unnecessary-dependency-on-VIA-velocity-config.txt -Patch31016: 10404-spidernet-skb-used-after-netif_receive_skb.txt -Patch31017: 10405-chelsio-parenthesis-fix.txt -Patch31018: 10406-forcedeth-fix-cpu-irq-mask.txt -Patch31019: 10410-DCCP-Use-menuconfig-objects.txt -Patch31020: 10411-IPVS-Use-menuconfig-objects.txt -Patch31021: 10412-SCTP-Use-menuconfig-objects.txt -Patch31022: 10413-TIPC-Use-menuconfig-objects.txt -Patch31023: 10414-ARCNET-Use-menuconfig-objects.txt -Patch31024: 10415-TR-Use-menuconfig-objects.txt -Patch31025: 10420-NETFILTER-nf_conntrack_ftp-fix-newline-sequence-number-update.txt -Patch31026: 10421-NETFILTER-nf_conntrack_ftp-fix-newline-sequence-number-calculation.txt -Patch31027: 10422-NETFILTER-nf_conntrack_h323-fix-ASN.1-types.txt -Patch31028: 10423-NETFILTER-nf_conntrack_h323-fix-get_h225_addr-for-IPv6-address-access.txt -Patch31029: 10424-NETFILTER-nf_conntrack_h323-remove-unnecessary-process-of-Information-signal.txt -Patch31030: 10425-NETFILTER-nf_conntrack_h323-add-missing-T.120-address-in-OLCA.txt -Patch31031: 10426-NETFILTER-nf_nat_h323-call-set_h225_addr-instead-of-set_h225_addr_hook.txt -Patch31032: 10427-NET-wrong-timeout-value-in-sk_wait_data-v2.txt -Patch31033: 10434-CASSINI-Check-pci_set_mwi-return-value.txt -Patch31034: 10438-CASSINI-Fix-printk-message-typo.txt -Patch31035: 10457-phylib-add-the-ICPlus-IP175C-PHY-driver.txt -Patch31036: 10459-gianfar-add-support-for-SGMII.txt -Patch31037: 10461-8139cp-Convert-to-generic-boolean.txt -Patch31038: 10463-spidernet-move-a-block-of-code-around.txt -Patch31039: 10469-spidernet-service-TX-later.txt -Patch31040: 10470-spidernet-increase-the-NAPI-weight.txt -Patch31041: 10516-wireless-add-prism54usb-driver.txt -Patch31042: 10517-prism54usb-fix-build-break-in-islusb_init.c.txt -Patch31043: 10518-softmac-prism54usb-update.txt -Patch31044: 10519-update-prism54usb-sources.txt -Patch31045: 10520-patch-prism54usb-add-set_bssid_filter.txt -Patch31046: 10521-prism54usb-fix-up-build-breaks-from-2.6.19.txt -Patch31047: 10522-prism54usb-fix-up-warnings-from-struct-pt_regs-removal.txt -Patch31048: 10523-prism54usb-squash-some-more-warnings.txt -Patch31049: 10524-prism54usb-fix-work_struct-build-breakage.txt -Patch31050: 10525-prism54usb-add-USB-ID-2001-3704.txt -Patch31051: 10527-prism54usb-add-device.txt -Patch31052: 10528-prism54usb-fix-breakage-from-skb-input_device-removal.txt -Patch31053: 10529-prism54usb-fix-for-wireless-Kconfig-changes.txt -Patch31054: 10553-ieee80211-fix-incomplete-error-message.txt -Patch31055: 10555-hostap-Allocate-enough-tailroom-for-TKIP.txt -Patch31056: 10561-softmac-use-list_for_each_entry.txt -Patch31057: 10562-hostap-Suppress-broadcast-if-no-stations-are-associated.txt -Patch31058: 10563-hostap-Use-list_for_each_entry.txt +Patch30981: 9741-Use-menuconfig-objects-II-netdev-pcmcia.txt +Patch30982: 9742-Use-menuconfig-objects-II-netdev-wan.txt +Patch30983: 9747-sky2-88e8071-support-not-ready.txt +Patch30984: 9749-Add-support-for-the-Davicom-DM9161A-PHY.txt +Patch30985: 9847-IPSEC-Check-validity-of-direction-in-xfrm_policy_byid.txt +Patch30986: 9848-IPSEC-Don-t-warn-if-high-order-hash-resize-fails.txt +Patch30987: 9850-NET_SCHED-prio-qdisc-boundary-condition.txt +Patch30988: 9888-SUNRPC-remove-dead-variable-rpciod_running.txt +Patch30989: 9892-SUNRPC-Fix-sparse-warnings.txt +Patch30990: 9910-pasemi_mac-Fix-register-defines.txt +Patch30991: 9911-pasemi_mac-Interrupt-ack-fixes.txt +Patch30992: 9912-pasemi_mac-Terminate-PCI-ID-list.txt +Patch30993: 9914-smc911x-fix-compilation-breakage.txt +Patch30994: 10056-Fix-incorrect-prototype-for-ipxrtr_route_packet.txt +Patch30995: 10062-IPV4-Correct-rp_filter-help-text.txt +Patch30996: 10065-sky2-keep-track-of-receive-alloc-failures.txt +Patch30997: 10066-sky2-MIB-counter-overflow-handling.txt +Patch30998: 10067-sky2-remove-dual-port-workaround.txt +Patch30999: 10068-sky2-memory-barriers-change.txt +Patch31000: 10070-ibm_emac-fix-section-mismatch-warnings.txt +Patch31001: 10071-ibm_emac-improved-PHY-support.txt +Patch31002: 10072-ibm_emac-fix-link-speed-detection-change.txt +Patch31003: 10073-gianfar-Add-I-O-barriers-when-touching-buffer-descriptor-ownership.txt +Patch31004: 10074-spidernet-node-aware-skbuff-allocation.txt +Patch31005: 10076-ixgb-don-t-print-error-if-pci_enable_msi-fails-cleanup-minor-leak.txt +Patch31006: 10128-TCP-FRTO-Prevent-state-inconsistency-in-corner-cases.txt +Patch31007: 10131-NETFILTER-nf_conntrack_ipv4-fix-incorrect-ifdef-config-name.txt +Patch31008: 10132-IPV4-icmp-fix-crash-with-sysctl_icmp_errors_use_inbound_ifaddr.txt +Patch31009: 10213-declance-Remove-a-dangling-spin_unlock_irq-thingy.txt +Patch31010: 10256-RTNETLINK-Allow-changing-of-subsets-of-netdevice-flags-in-rtnl_setlink.txt +Patch31011: 10401-fix-compiler-warning-in-fixed.c.txt +Patch31012: 10402-remove-unnecessary-dependency-on-VIA-velocity-config.txt +Patch31013: 10404-spidernet-skb-used-after-netif_receive_skb.txt +Patch31014: 10405-chelsio-parenthesis-fix.txt +Patch31015: 10406-forcedeth-fix-cpu-irq-mask.txt +Patch31016: 10410-DCCP-Use-menuconfig-objects.txt +Patch31017: 10411-IPVS-Use-menuconfig-objects.txt +Patch31018: 10412-SCTP-Use-menuconfig-objects.txt +Patch31019: 10413-TIPC-Use-menuconfig-objects.txt +Patch31020: 10414-ARCNET-Use-menuconfig-objects.txt +Patch31021: 10415-TR-Use-menuconfig-objects.txt +Patch31022: 10420-NETFILTER-nf_conntrack_ftp-fix-newline-sequence-number-update.txt +Patch31023: 10421-NETFILTER-nf_conntrack_ftp-fix-newline-sequence-number-calculation.txt +Patch31024: 10422-NETFILTER-nf_conntrack_h323-fix-ASN.1-types.txt +Patch31025: 10423-NETFILTER-nf_conntrack_h323-fix-get_h225_addr-for-IPv6-address-access.txt +Patch31026: 10424-NETFILTER-nf_conntrack_h323-remove-unnecessary-process-of-Information-signal.txt +Patch31027: 10425-NETFILTER-nf_conntrack_h323-add-missing-T.120-address-in-OLCA.txt +Patch31028: 10426-NETFILTER-nf_nat_h323-call-set_h225_addr-instead-of-set_h225_addr_hook.txt +Patch31029: 10427-NET-wrong-timeout-value-in-sk_wait_data-v2.txt +Patch31030: 10434-CASSINI-Check-pci_set_mwi-return-value.txt +Patch31031: 10438-CASSINI-Fix-printk-message-typo.txt +Patch31032: 10457-phylib-add-the-ICPlus-IP175C-PHY-driver.txt +Patch31033: 10459-gianfar-add-support-for-SGMII.txt +Patch31034: 10461-8139cp-Convert-to-generic-boolean.txt +Patch31035: 10463-spidernet-move-a-block-of-code-around.txt +Patch31036: 10469-spidernet-service-TX-later.txt +Patch31037: 10470-spidernet-increase-the-NAPI-weight.txt +Patch31038: 10516-wireless-add-prism54usb-driver.txt +Patch31039: 10517-prism54usb-fix-build-break-in-islusb_init.c.txt +Patch31040: 10518-softmac-prism54usb-update.txt +Patch31041: 10519-update-prism54usb-sources.txt +Patch31042: 10520-patch-prism54usb-add-set_bssid_filter.txt +Patch31043: 10521-prism54usb-fix-up-build-breaks-from-2.6.19.txt +Patch31044: 10522-prism54usb-fix-up-warnings-from-struct-pt_regs-removal.txt +Patch31045: 10523-prism54usb-squash-some-more-warnings.txt +Patch31046: 10524-prism54usb-fix-work_struct-build-breakage.txt +Patch31047: 10525-prism54usb-add-USB-ID-2001-3704.txt +Patch31048: 10527-prism54usb-add-device.txt +Patch31049: 10528-prism54usb-fix-breakage-from-skb-input_device-removal.txt +Patch31050: 10529-prism54usb-fix-for-wireless-Kconfig-changes.txt +Patch31051: 10553-ieee80211-fix-incomplete-error-message.txt +Patch31052: 10555-hostap-Allocate-enough-tailroom-for-TKIP.txt +Patch31053: 10561-softmac-use-list_for_each_entry.txt +Patch31054: 10562-hostap-Suppress-broadcast-if-no-stations-are-associated.txt +Patch31055: 10563-hostap-Use-list_for_each_entry.txt Patch40000: mac80211.patch @@ -4445,162 +4442,156 @@ %patch30979 -p1 # [PATCH] libertas: 64-bit cleanups %patch30980 -p1 -# S2IO: getringparam ethtool option -%patch30981 -p1 -# S2IO: statistics for memory allocation failuers -%patch30982 -p1 -# S2IO: Statistics for link up/down and memory allocated/freed -%patch30983 -p1 # Use menuconfig objects II - netdev/pcmcia -%patch30984 -p1 +%patch30981 -p1 # Use menuconfig objects II - netdev/wan -%patch30985 -p1 +%patch30982 -p1 # sky2: 88e8071 support not ready -%patch30986 -p1 +%patch30983 -p1 # Add support for the Davicom DM9161A PHY -%patch30987 -p1 +%patch30984 -p1 # [IPSEC]: Check validity of direction in xfrm_policy_byid -%patch30988 -p1 +%patch30985 -p1 # [IPSEC]: Don't warn if high-order hash resize fails -%patch30989 -p1 +%patch30986 -p1 # [NET_SCHED]: prio qdisc boundary condition -%patch30990 -p1 +%patch30987 -p1 # SUNRPC: remove dead variable 'rpciod_running' -%patch30991 -p1 +%patch30988 -p1 # SUNRPC: Fix sparse warnings -%patch30992 -p1 +%patch30989 -p1 # pasemi_mac: Fix register defines -%patch30993 -p1 +%patch30990 -p1 # pasemi_mac: Interrupt ack fixes -%patch30994 -p1 +%patch30991 -p1 # pasemi_mac: Terminate PCI ID list -%patch30995 -p1 +%patch30992 -p1 # smc911x: fix compilation breakage -%patch30996 -p1 +%patch30993 -p1 # Fix incorrect prototype for ipxrtr_route_packet() -%patch30997 -p1 +%patch30994 -p1 # [IPV4]: Correct rp_filter help text. -%patch30998 -p1 +%patch30995 -p1 # sky2: keep track of receive alloc failures -%patch30999 -p1 +%patch30996 -p1 # sky2: MIB counter overflow handling -%patch31000 -p1 +%patch30997 -p1 # sky2: remove dual port workaround -%patch31001 -p1 +%patch30998 -p1 # sky2: memory barriers change -%patch31002 -p1 +%patch30999 -p1 # ibm_emac: fix section mismatch warnings -%patch31003 -p1 +%patch31000 -p1 # ibm_emac: improved PHY support -%patch31004 -p1 +%patch31001 -p1 # ibm_emac: fix link speed detection change -%patch31005 -p1 +%patch31002 -p1 # gianfar: Add I/O barriers when touching buffer descriptor ownership. -%patch31006 -p1 +%patch31003 -p1 # spidernet: node-aware skbuff allocation -%patch31007 -p1 +%patch31004 -p1 # ixgb: don't print error if pci_enable_msi() fails, cleanup minor leak -%patch31008 -p1 +%patch31005 -p1 # [TCP] FRTO: Prevent state inconsistency in corner cases -%patch31009 -p1 +%patch31006 -p1 # [NETFILTER]: nf_conntrack_ipv4: fix incorrect #ifdef config name -%patch31010 -p1 +%patch31007 -p1 # [IPV4]: icmp: fix crash with sysctl_icmp_errors_use_inbound_ifaddr -%patch31011 -p1 +%patch31008 -p1 # declance: Remove a dangling spin_unlock_irq() thingy -%patch31012 -p1 +%patch31009 -p1 # [RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink -%patch31013 -p1 +%patch31010 -p1 # fix compiler warning in fixed.c -%patch31014 -p1 +%patch31011 -p1 # remove unnecessary dependency on VIA velocity config -%patch31015 -p1 +%patch31012 -p1 # spidernet: skb used after netif_receive_skb -%patch31016 -p1 +%patch31013 -p1 # chelsio parenthesis fix -%patch31017 -p1 +%patch31014 -p1 # forcedeth: fix cpu irq mask -%patch31018 -p1 +%patch31015 -p1 # [DCCP]: Use menuconfig objects. -%patch31019 -p1 +%patch31016 -p1 # [IPVS]: Use menuconfig objects. -%patch31020 -p1 +%patch31017 -p1 # [SCTP]: Use menuconfig objects. -%patch31021 -p1 +%patch31018 -p1 # [TIPC]: Use menuconfig objects. -%patch31022 -p1 +%patch31019 -p1 # [ARCNET]: Use menuconfig objects. -%patch31023 -p1 +%patch31020 -p1 # [TR]: Use menuconfig objects. -%patch31024 -p1 +%patch31021 -p1 # [NETFILTER]: nf_conntrack_ftp: fix newline sequence number update -%patch31025 -p1 +%patch31022 -p1 # [NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation -%patch31026 -p1 +%patch31023 -p1 # [NETFILTER]: nf_conntrack_h323: fix ASN.1 types -%patch31027 -p1 +%patch31024 -p1 # [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access -%patch31028 -p1 +%patch31025 -p1 # [NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal -%patch31029 -p1 +%patch31026 -p1 # [NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA -%patch31030 -p1 +%patch31027 -p1 # [NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook -%patch31031 -p1 +%patch31028 -p1 # [NET]: "wrong timeout value" in sk_wait_data() v2 -%patch31032 -p1 +%patch31029 -p1 # [CASSINI]: Check pci_set_mwi() return value. -%patch31033 -p1 +%patch31030 -p1 # [CASSINI]: Fix printk message typo. -%patch31034 -p1 +%patch31031 -p1 # phylib: add the ICPlus IP175C PHY driver -%patch31035 -p1 +%patch31032 -p1 # gianfar: add support for SGMII -%patch31036 -p1 +%patch31033 -p1 # 8139cp: Convert to generic boolean -%patch31037 -p1 +%patch31034 -p1 # spidernet: move a block of code around -%patch31038 -p1 +%patch31035 -p1 # spidernet: service TX later. -%patch31039 -p1 +%patch31036 -p1 # spidernet: increase the NAPI weight -%patch31040 -p1 +%patch31037 -p1 # [PATCH] wireless: add prism54usb driver -%patch31041 -p1 +%patch31038 -p1 # [PATCH] prism54usb: fix build break in islusb_init.c -%patch31042 -p1 +%patch31039 -p1 # [PATCH] softmac: prism54usb update -%patch31043 -p1 +%patch31040 -p1 # [PATCH] update prism54usb sources -%patch31044 -p1 +%patch31041 -p1 # [PATCH] patch prism54usb: add set_bssid_filter -%patch31045 -p1 +%patch31042 -p1 # [PATCH] prism54usb: fix-up build breaks from 2.6.19 -%patch31046 -p1 +%patch31043 -p1 # [PATCH] prism54usb: fix-up warnings from struct pt_regs removal -%patch31047 -p1 +%patch31044 -p1 # [PATCH] prism54usb: squash some more warnings -%patch31048 -p1 +%patch31045 -p1 # [PATCH] prism54usb: fix work_struct build breakage -%patch31049 -p1 +%patch31046 -p1 # [PATCH] prism54usb: add USB ID 2001:3704 -%patch31050 -p1 +%patch31047 -p1 # [PATCH] prism54usb: add device -%patch31051 -p1 +%patch31048 -p1 # [PATCH] prism54usb: fix breakage from skb->input_device removal -%patch31052 -p1 +%patch31049 -p1 # prism54usb: fix for wireless Kconfig changes -%patch31053 -p1 +%patch31050 -p1 # [PATCH] ieee80211: fix incomplete error message -%patch31054 -p1 +%patch31051 -p1 # [PATCH] hostap: Allocate enough tailroom for TKIP -%patch31055 -p1 +%patch31052 -p1 # [PATCH] softmac: use list_for_each_entry -%patch31056 -p1 +%patch31053 -p1 # [PATCH] hostap: Suppress broadcast if no stations are associated -%patch31057 -p1 +%patch31054 -p1 # [PATCH] hostap: Use list_for_each_entry -%patch31058 -p1 +%patch31055 -p1 # Update mac80211 stack and add drivers %patch40000 -p1 @@ -6506,9 +6497,6 @@ - [PATCH] libertas: fix missing unlock in TX error path - [PATCH] libertas: sparse fixes - [PATCH] libertas: 64-bit cleanups -- S2IO: getringparam ethtool option -- S2IO: statistics for memory allocation failuers -- S2IO: Statistics for link up/down and memory allocated/freed - Use menuconfig objects II - netdev/pcmcia - Use menuconfig objects II - netdev/wan - sky2: 88e8071 support not ready --- 9734-S2IO-getringparam-ethtool-option.txt DELETED --- --- 9735-S2IO-statistics-for-memory-allocation-failuers.txt DELETED --- --- 9736-S2IO-Statistics-for-link-up-down-and-memory-allocated-freed.txt DELETED --- From fedora-cvs-commits at redhat.com Thu May 31 23:24:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 31 May 2007 19:24:54 -0400 Subject: rpms/coolkey/devel coolkey.spec, 1.19, 1.20 coolkey-1.1.0-rhel4-1.patch, 1.1, NONE Message-ID: <200705312324.l4VNOsZc020602@cvs.devel.redhat.com> Author: rrelyea Update of /cvs/dist/rpms/coolkey/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20587 Modified Files: coolkey.spec Removed Files: coolkey-1.1.0-rhel4-1.patch Log Message: Remove rhel4 patch. include needed requires. Index: coolkey.spec =================================================================== RCS file: /cvs/dist/rpms/coolkey/devel/coolkey.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- coolkey.spec 13 Mar 2007 20:36:09 -0000 1.19 +++ coolkey.spec 31 May 2007 23:24:52 -0000 1.20 @@ -22,12 +22,11 @@ Name: coolkey Version: 1.1.0 -Release: 1%{dist} +Release: 2%{dist} Summary: CoolKey PKCS #11 module License: LGPL URL: http://directory.fedora.redhat.com/wiki/CoolKey Source: coolkey-%{version}.tar.gz -Patch1: coolkey-%{version}-rhel4-1.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pcsc-lite-devel @@ -35,6 +34,7 @@ BuildRequires: mozilla-nss-devel #Requires: nss-tools Requires: pcsc-lite +Requires: pcsc-lite-libs Requires: ifd-egate Requires: ccid Provides: CoolKey Openkey @@ -56,8 +56,6 @@ %prep %setup -q -%patch1 -p1 -b .fix1 - %build autoconf %configure --with-debug --disable-dependency-tracking --enable-pk11install @@ -104,6 +102,9 @@ %changelog +* Thu May 31 2007 Bob Relyea - 1.1.0-2 +- Back out RHEL-4 version of spec from CVS, add pcsc-lite-lib requires. + * Tue Feb 20 2007 Bob Relyea - 1.1.0-1 - Pick up lates release. --- coolkey-1.1.0-rhel4-1.patch DELETED ---