IPFire-SCM March 2013

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0b028257bbd5d9d5c79efaf120f6b0db4b3f264e
by git＠ipfire.org 03 Mar '13

03 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 0b028257bbd5d9d5c79efaf120f6b0db4b3f264e (commit) via 307df174402188d9ced69318ab0e8ec84dd17db5 (commit) from cc18dd91675383ee82573683df049f21c48b26e3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0b028257bbd5d9d5c79efaf120f6b0db4b3f264e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Mar 3 11:41:49 2013 +0100 nginx: fix rootfile. commit 307df174402188d9ced69318ab0e8ec84dd17db5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Mar 3 11:39:48 2013 +0100 avahi: remove /etc/init.d/avahi from rootfile. You should never include a initskript in /etc/init.d/ because this destroy the /etc/init.d symlink at package installation. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/avahi | 3 ++- config/rootfiles/packages/nginx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi index af1d3d9..dc2c56d 100644 --- a/config/rootfiles/packages/avahi +++ b/config/rootfiles/packages/avahi @@ -160,4 +160,5 @@ usr/share/avahi/service-types #usr/share/man/man8/avahi-daemon.8 #usr/share/man/man8/avahi-dnsconfd.8 #usr/share/man/man8/avahi-dnsconfd.action.8 -etc/init.d/avahi +#usr/var/run +etc/rc.d/init.d/avahi diff --git a/config/rootfiles/packages/nginx b/config/rootfiles/packages/nginx index ce98205..5ecb241 100644 --- a/config/rootfiles/packages/nginx +++ b/config/rootfiles/packages/nginx @@ -14,6 +14,7 @@ etc/nginx/scgi_params.default etc/nginx/uwsgi_params etc/nginx/uwsgi_params.default etc/nginx/win-utf +etc/rc.d/init.d/nginx usr/sbin/nginx usr/share/nginx usr/share/nginx/html hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc18dd91675383ee82573683df049f21c48b26e3
by git＠ipfire.org 02 Mar '13

02 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via cc18dd91675383ee82573683df049f21c48b26e3 (commit) from 725254ef1f42bf0b008af12fb57c66164da8329a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cc18dd91675383ee82573683df049f21c48b26e3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Mar 2 22:24:23 2013 +0100 compat-drivers: replace compat-wireless by compat-driver 3.8-1-u. ----------------------------------------------------------------------- Summary of changes: .../common/{compat-wireless => compat-drivers} | 0 config/rootfiles/core/67/filelists/compat-drivers | 1 + .../core/67/filelists/i586/compat-drivers-modules | 146 +++++++++++++++++++++ .../67/filelists/i586/compat-drivers-modules-pae | 146 +++++++++++++++++++++ .../filelists/i586/compat-drivers-modules-pae-xen | 137 +++++++++++++++++++ lfs/{compat-wireless => compat-drivers} | 15 +-- make.sh | 12 +- ...ireless-3.6.8-remove_3.1_cpufreq_backport.patch | 48 ------- 8 files changed, 442 insertions(+), 63 deletions(-) rename config/rootfiles/common/{compat-wireless => compat-drivers} (100%) create mode 120000 config/rootfiles/core/67/filelists/compat-drivers create mode 100644 config/rootfiles/core/67/filelists/i586/compat-drivers-modules create mode 100644 config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae create mode 100644 config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae-xen rename lfs/{compat-wireless => compat-drivers} (91%) delete mode 100644 src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch Difference in files: diff --git a/config/rootfiles/common/compat-drivers b/config/rootfiles/common/compat-drivers new file mode 100644 index 0000000..5a562d2 --- /dev/null +++ b/config/rootfiles/common/compat-drivers @@ -0,0 +1,2 @@ +lib/udev/rules.d/50-compat_firmware.rules +lib/udev/compat_firmware.sh diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless deleted file mode 100644 index 5a562d2..0000000 --- a/config/rootfiles/common/compat-wireless +++ /dev/null @@ -1,2 +0,0 @@ -lib/udev/rules.d/50-compat_firmware.rules -lib/udev/compat_firmware.sh diff --git a/config/rootfiles/core/67/filelists/compat-drivers b/config/rootfiles/core/67/filelists/compat-drivers new file mode 120000 index 0000000..0d2a611 --- /dev/null +++ b/config/rootfiles/core/67/filelists/compat-drivers @@ -0,0 +1 @@ +../../../common/compat-drivers \ No newline at end of file diff --git a/config/rootfiles/core/67/filelists/i586/compat-drivers-modules b/config/rootfiles/core/67/filelists/i586/compat-drivers-modules new file mode 100644 index 0000000..967056c --- /dev/null +++ b/config/rootfiles/core/67/filelists/i586/compat-drivers-modules @@ -0,0 +1,146 @@ +lib/modules/KVER-ipfire/kernel/compat/compat.ko +lib/modules/KVER-ipfire/kernel/compat/sch_codel.ko +lib/modules/KVER-ipfire/kernel/compat/sch_fq_codel.ko +lib/modules/KVER-ipfire/kernel/drivers/bcma/bcma.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/ath3k.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bcm203x.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bfusb.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bpa10x.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btsdio.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btuart_cs.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btusb.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btwilink.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/hci_uart.ko +lib/modules/KVER-ipfire/kernel/drivers/bluetooth/hci_vhci.ko +lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/drm.ko +lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/drm_kms_helper.ko +lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/i915/i915.ko +lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/radeon/radeon.ko +lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/ttm/ttm.ko +lib/modules/KVER-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/atheros/alx/alx.ko +lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko +lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko +lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/atheros/atlx/atl1.ko +lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/atheros/atlx/atl2.ko +lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/broadcom/b44.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/asix.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/catc.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_eem.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_ether.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_ncm.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_subset.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/cx82310_eth.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/dm9601.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/gl620a.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/hso.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/int51x1.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/kalmia.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/kaweth.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/lg-vl600.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/mcs7830.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/net1080.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/pegasus.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/plusb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/rndis_host.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/rtl8150.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/sierra_net.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/smsc75xx.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/smsc95xx.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/usbnet.ko +lib/modules/KVER-ipfire/kernel/drivers/net/usb/zaurus.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/adm8211.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ar5523/ar5523.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_core.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_sdio.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_usb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/wil6210/wil6210.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/b43/b43.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlegacy/iwlegacy.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlwifi/dvm/iwldvm.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlwifi.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex_pcie.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex_usb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/p54/p54common.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8723ae/rtl8723ae.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ti/wl1251/wl1251.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ti/wl12xx/wl12xx.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ti/wl18xx/wl18xx.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ti/wlcore/wlcore.ko +lib/modules/KVER-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko +lib/modules/KVER-ipfire/kernel/drivers/ssb/ssb.ko +lib/modules/KVER-ipfire/kernel/net/bluetooth/bluetooth.ko +lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep/bnep.ko +lib/modules/KVER-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko +lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp/hidp.ko +lib/modules/KVER-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko +lib/modules/KVER-ipfire/kernel/net/mac80211/mac80211.ko +lib/modules/KVER-ipfire/kernel/net/rfkill/rfkill-regulator.ko +lib/modules/KVER-ipfire/kernel/net/wireless/cfg80211.ko +lib/modules/KVER-ipfire/kernel/net/wireless/lib80211.ko +lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko +lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko +lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko diff --git a/config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae b/config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae new file mode 100644 index 0000000..ca544a2 --- /dev/null +++ b/config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae @@ -0,0 +1,146 @@ +lib/modules/KVER-ipfire-pae/kernel/compat/compat.ko +lib/modules/KVER-ipfire-pae/kernel/compat/sch_codel.ko +lib/modules/KVER-ipfire-pae/kernel/compat/sch_fq_codel.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bcma/bcma.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/ath3k.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bcm203x.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bfusb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bluecard_cs.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bpa10x.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bt3c_cs.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btmrvl.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btmrvl_sdio.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btsdio.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btuart_cs.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btusb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btwilink.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/dtl1_cs.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/hci_uart.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/hci_vhci.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/drm.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/drm_kms_helper.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/i915/i915.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/radeon/radeon.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/ttm/ttm.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/atheros/alx/alx.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/atheros/atlx/atl1.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/atheros/atlx/atl2.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/broadcom/b44.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/asix.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/catc.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_eem.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_ether.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_ncm.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_subset.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cx82310_eth.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/dm9601.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/gl620a.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/hso.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/int51x1.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/kalmia.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/kaweth.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/lg-vl600.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/mcs7830.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/net1080.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/pegasus.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/plusb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/rndis_host.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/rtl8150.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/sierra_net.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/smsc75xx.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/smsc95xx.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/usbnet.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/zaurus.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/adm8211.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/at76c50x-usb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ar5523/ar5523.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_core.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_sdio.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_usb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/wil6210/wil6210.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/b43/b43.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/b43legacy/b43legacy.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/libipw.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwlegacy.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/dvm/iwldvm.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwlwifi.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_cs.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_sdio.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/usb8xxx.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mac80211_hwsim.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex_pcie.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex_usb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/p54/p54common.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/p54/p54pci.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/p54/p54usb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rndis_wlan.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt61pci.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt73usb.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8723ae/rtl8723ae.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ti/wl1251/wl1251.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ti/wl12xx/wl12xx.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ti/wl18xx/wl18xx.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ti/wlcore/wlcore.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko +lib/modules/KVER-ipfire-pae/kernel/drivers/ssb/ssb.ko +lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/bluetooth.ko +lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/bnep/bnep.ko +lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/cmtp/cmtp.ko +lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/hidp/hidp.ko +lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/rfcomm/rfcomm.ko +lib/modules/KVER-ipfire-pae/kernel/net/mac80211/mac80211.ko +lib/modules/KVER-ipfire-pae/kernel/net/rfkill/rfkill-regulator.ko +lib/modules/KVER-ipfire-pae/kernel/net/wireless/cfg80211.ko +lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211.ko +lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211_crypt_ccmp.ko +lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211_crypt_tkip.ko +lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211_crypt_wep.ko diff --git a/config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae-xen b/config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae-xen new file mode 100644 index 0000000..a93b06e --- /dev/null +++ b/config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae-xen @@ -0,0 +1,137 @@ +lib/modules/2.6.32.60-ipfire-xen/kernel/compat/compat.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/compat/sch_codel.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/compat/sch_fq_codel.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bcma/bcma.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/btusb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/gpu/drm/drm.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/gpu/drm/drm_kms_helper.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/gpu/drm/i915/i915.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/gpu/drm/radeon/radeon.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/gpu/drm/ttm/ttm.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/atheros/alx/alx.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/atheros/atlx/atl1.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/atheros/atlx/atl2.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/broadcom/b44.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/asix.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/catc.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/dm9601.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/gl620a.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/hso.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/int51x1.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/kaweth.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/net1080.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/pegasus.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/plusb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/usbnet.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/zaurus.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ar5523/ar5523.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_core.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_sdio.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_usb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/wil6210/wil6210.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwlegacy.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/dvm/iwldvm.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlwifi.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex_pcie.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex_usb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8723ae/rtl8723ae.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ti/wl1251/wl1251.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ti/wl12xx/wl12xx.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ti/wl18xx/wl18xx.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ti/wlcore/wlcore.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/ssb/ssb.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/bluetooth/bluetooth.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/mac80211/mac80211.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/wireless/cfg80211.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/wireless/lib80211.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko +lib/modules/2.6.32.60-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko diff --git a/lfs/compat-drivers b/lfs/compat-drivers new file mode 100644 index 0000000..282a493 --- /dev/null +++ b/lfs/compat-drivers @@ -0,0 +1,123 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# 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 3 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, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VERSUFIX=ipfire$(KCFG) + +VER = 3.8-1-u + +ifeq "$(KCFG)" "-xen" + KVER = 2.6.32.60 +endif + +THISAPP = compat-drivers-$(VER) +DL_FILE = compat-drivers-$(VER).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) asix-4.4.0.tar.xz + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) +asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz + +$(DL_FILE)_MD5 = 557e3099c642455ec272d9ddf46de484 +asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) + + # kfifo has no license info and taints kernel + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch + + # Codel patches + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_codel-avoid-a-nul-rec_inv_sqrt.patch + + # Build ath5k only if target has pci + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch + + # Copy USB-Net drivers from Kernel... + mkdir $(DIR_APP)/drivers/net/usb/new + cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new + cp /usr/src/linux/drivers/net/usb/{*.c,*.h,Makefile} $(DIR_APP)/drivers/net/usb + cp $(DIR_APP)/drivers/net/usb/new/*.c $(DIR_APP)/drivers/net/usb + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch + + # Build Updated asix usb-lan driver + cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix-4.4.0.tar.xz + + # Add libartas uAP driver + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-libertas_uap.patch + + # uAP will not build with xen-kernel (2.6) +ifneq "$(KCFG)" "-xen" + cd $(DIR_APP) && echo export CONFIG_LIBERTAS_UAP=m >> config.mk +endif + + # Erase some modules that are obsolete or moved to other path + rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/bluetooth + rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/wl12* + + cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \ + KLIB_BUILD=/lib/modules/$(KVER)-$(VERSUFIX)/build \ + KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules + + # Install firmware udev files... + cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /lib/udev/rules.d/ + cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/ + + -rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/compat-wireless b/lfs/compat-wireless deleted file mode 100644 index 9ce6f07..0000000 --- a/lfs/compat-wireless +++ /dev/null @@ -1,126 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # -# # -# 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 3 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, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX=ipfire$(KCFG) - -VER = 3.6.8-1-snp - -ifeq "$(KCFG)" "-xen" - KVER = 2.6.32.60 -endif - -THISAPP = compat-wireless-$(VER) -DL_FILE = compat-wireless-$(VER).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) asix-4.4.0.tar.xz - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz - -$(DL_FILE)_MD5 = 4120bc9841d6a1b5b92af34103f16a06 -asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE) - - # kfifo has no license info and taints kernel - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch - - # Codel patches - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_codel-avoid-a-nul-rec_inv_sqrt.patch - - # compat-3.1 include a bogus cpufreq_backort - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch - - # Build ath5k only if target has pci - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch - - # Copy USB-Net drivers from Kernel... - mkdir $(DIR_APP)/drivers/net/usb/new - cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new - cp /usr/src/linux/drivers/net/usb/{*.c,*.h,Makefile} $(DIR_APP)/drivers/net/usb - cp $(DIR_APP)/drivers/net/usb/new/*.c $(DIR_APP)/drivers/net/usb - - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch - - # Build Updated asix usb-lan driver - cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix-4.4.0.tar.xz - - # Add libartas uAP driver - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-libertas_uap.patch - - # uAP will not build with xen-kernel (2.6) -ifneq "$(KCFG)" "-xen" - cd $(DIR_APP) && echo export CONFIG_LIBERTAS_UAP=m >> config.mk -endif - - # Erase some modules that are obsolete or moved to other path - rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/bluetooth - rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/wl12* - - cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \ - KLIB_BUILD=/lib/modules/$(KVER)-$(VERSUFIX)/build \ - KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules - - # Install firmware udev files... - cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /lib/udev/rules.d/ - cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/ - - -rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index fda2bb7..fbd377e 100755 --- a/make.sh +++ b/make.sh @@ -384,7 +384,7 @@ buildipfire() { ipfiremake v4l-dvb KCFG="-xen" ipfiremake mISDN KCFG="-xen" ipfiremake cryptodev KCFG="-xen" - ipfiremake compat-wireless KCFG="-xen" + ipfiremake compat-drivers KCFG="-xen" ipfiremake r8169 KCFG="-xen" ipfiremake r8168 KCFG="-xen" ipfiremake r8101 KCFG="-xen" @@ -398,7 +398,7 @@ buildipfire() { ipfiremake v4l-dvb KCFG="-pae" ipfiremake mISDN KCFG="-pae" ipfiremake cryptodev KCFG="-pae" - ipfiremake compat-wireless KCFG="-pae" + ipfiremake compat-drivers KCFG="-pae" ipfiremake r8169 KCFG="-pae" ipfiremake r8168 KCFG="-pae" ipfiremake r8101 KCFG="-pae" @@ -411,7 +411,7 @@ buildipfire() { ipfiremake v4l-dvb KCFG="" ipfiremake mISDN KCFG="" ipfiremake cryptodev KCFG="" - ipfiremake compat-wireless KCFG="" + ipfiremake compat-drivers KCFG="" ipfiremake r8169 KCFG="" ipfiremake r8168 KCFG="" ipfiremake r8101 KCFG="" @@ -424,21 +424,21 @@ buildipfire() { ipfiremake v4l-dvb KCFG="-rpi" ipfiremake mISDN KCFG="-rpi" NOPCI=1 ipfiremake cryptodev KCFG="-rpi" - ipfiremake compat-wireless KCFG="-rpi" + ipfiremake compat-drivers KCFG="-rpi" # arm-omap (Panda Board) kernel build ipfiremake linux KCFG="-omap" ipfiremake v4l-dvb KCFG="-omap" ipfiremake mISDN KCFG="-omap" NOPCI=1 ipfiremake cryptodev KCFG="-omap" - ipfiremake compat-wireless KCFG="-omap" + ipfiremake compat-drivers KCFG="-omap" # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build ipfiremake linux KCFG="-kirkwood" ipfiremake v4l-dvb KCFG="-kirkwood" ipfiremake mISDN KCFG="-kirkwood" ipfiremake cryptodev KCFG="-kirkwood" - ipfiremake compat-wireless KCFG="-kirkwood" + ipfiremake compat-drivers KCFG="-kirkwood" ipfiremake r8169 KCFG="-kirkwood" ipfiremake r8168 KCFG="-kirkwood" ipfiremake r8101 KCFG="-kirkwood" diff --git a/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch b/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch deleted file mode 100644 index 602c153..0000000 --- a/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur compat-wireless-3.6.8-1-snp.org/compat/compat-3.1.c compat-wireless-3.6.8-1-snp/compat/compat-3.1.c ---- compat-wireless-3.6.8-1-snp.org/compat/compat-3.1.c 2012-11-29 06:03:45.000000000 +0100 -+++ compat-wireless-3.6.8-1-snp/compat/compat-3.1.c 2013-01-18 16:50:08.799491784 +0100 -@@ -9,30 +9,6 @@ - */ - - #include <linux/idr.h> --#include <linux/cpufreq.h> -- --/* This backports: -- * commit 3d73710880afa3d61cf57b5d4eb192e812eb7e4f -- * Author: Jesse Barnes <jbarnes(a)virtuousgeek.org> -- * Date: Tue Jun 28 10:59:12 2011 -0700 -- * -- * cpufreq: expose a cpufreq_quick_get_max routine -- */ -- --unsigned int compat_cpufreq_quick_get_max(unsigned int cpu) --{ -- struct cpufreq_policy *policy = cpufreq_cpu_get(cpu); -- unsigned int ret_freq = 0; -- -- if (policy) { -- ret_freq = policy->max; -- cpufreq_cpu_put(policy); -- } -- -- return ret_freq; --} --EXPORT_SYMBOL(compat_cpufreq_quick_get_max); -- - - static DEFINE_SPINLOCK(compat_simple_ida_lock); - -diff -Naur compat-wireless-3.6.8-1-snp.org/include/linux/compat-3.1.h compat-wireless-3.6.8-1-snp/include/linux/compat-3.1.h ---- compat-wireless-3.6.8-1-snp.org/include/linux/compat-3.1.h 2012-10-24 15:22:50.000000000 +0200 -+++ compat-wireless-3.6.8-1-snp/include/linux/compat-3.1.h 2013-01-18 16:52:04.106154741 +0100 -@@ -111,10 +111,6 @@ - - void ida_simple_remove(struct ida *ida, unsigned int id); - --/* mask cpufreq_quick_get_max as RHEL6 backports this */ --#define cpufreq_quick_get_max(a) compat_cpufreq_quick_get_max(a) -- --unsigned int cpufreq_quick_get_max(unsigned int cpu); - #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) */ - - #endif /* LINUX_3_1_COMPAT_H */ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 55d9b88b0ce51e95ddb83c01877b25d1a91f1f97
by git＠ipfire.org 02 Mar '13

02 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 55d9b88b0ce51e95ddb83c01877b25d1a91f1f97 (commit) via 9eee25f28cdf5538f47f5d123e54ec5b76586bba (commit) from be1c6800e8546d20fbbbd959895dcb8b4970550a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 55d9b88b0ce51e95ddb83c01877b25d1a91f1f97 Merge: be1c680 9eee25f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 2 17:12:33 2013 +0100 Merge remote-tracking branch 'stevee/file-update' commit 9eee25f28cdf5538f47f5d123e54ec5b76586bba Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 2 17:08:33 2013 +0100 file: Update to 5.12. This is a Minor release to the latest stable version. Fixes #10279. ----------------------------------------------------------------------- Summary of changes: file/file.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/file/file.nm b/file/file.nm index a0bd7ef..c9f1f67 100644 --- a/file/file.nm +++ b/file/file.nm @@ -4,7 +4,7 @@ ############################################################################### name = file -version = 5.11 +version = 5.12 release = 1 groups = System/Tools hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. be1c6800e8546d20fbbbd959895dcb8b4970550a
by git＠ipfire.org 02 Mar '13

02 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via be1c6800e8546d20fbbbd959895dcb8b4970550a (commit) from e183e081bf5bf8a26eaa931dd5b5a82ad6af76af (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit be1c6800e8546d20fbbbd959895dcb8b4970550a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 2 16:51:54 2013 +0100 gtk3: The devel package requires some dependencies. The gtk3 devel packages also requires the following dependencies: * at-spi2-atk-devel * atk-devel * glib2-devel ----------------------------------------------------------------------- Summary of changes: gtk3/gtk3.nm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) Difference in files: diff --git a/gtk3/gtk3.nm b/gtk3/gtk3.nm index d746080..7839dde 100644 --- a/gtk3/gtk3.nm +++ b/gtk3/gtk3.nm @@ -7,7 +7,7 @@ name = gtk3 version = %{ver_major}.%{ver_minor} ver_major = 3.7 ver_minor = 6 -release = 1 +release = 2 groups = System/Libraries url = http://www.gtk.org @@ -67,6 +67,12 @@ packages package %{name}-devel template DEVEL + requires + at-spi2-atk-devel + atk-devel + glib2-devel + end + files += \ %{datadir}/gir*/ end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e183e081bf5bf8a26eaa931dd5b5a82ad6af76af
by git＠ipfire.org 02 Mar '13

02 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via e183e081bf5bf8a26eaa931dd5b5a82ad6af76af (commit) from 60a0a38a4d2542ac3eec61ee845a8569a6484b9d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e183e081bf5bf8a26eaa931dd5b5a82ad6af76af Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 2 12:06:34 2013 +0100 gnutls: Update to 3.1.9. Bugfix release #10325. ----------------------------------------------------------------------- Summary of changes: gnutls/gnutls.nm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index c2df49e..f4c2b69 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -6,7 +6,7 @@ name = gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.1 -ver_min = 8 +ver_min = 9 release = 1 groups = System/Libraries @@ -48,6 +48,7 @@ build --disable-openssl-compatibility \ --with-libgcrypt + # Test suite does not work when srp is disabled. #test # export LD_LIBRARY_PATH=$(pwd)/lib/.libs # make check hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 725254ef1f42bf0b008af12fb57c66164da8329a
by git＠ipfire.org 01 Mar '13

01 Mar '13

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 60a0a38a4d2542ac3eec61ee845a8569a6484b9d
by git＠ipfire.org 01 Mar '13

01 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 60a0a38a4d2542ac3eec61ee845a8569a6484b9d (commit) via 743cf5062b6f5595f137e3294d2093cde4d7e205 (commit) via 7d443d46570007d68b73546a04b686641c7dc040 (commit) via 95ac70bb944c241b7665cb123295c8334d9fdc6d (commit) from 27107f1f1130f66417293a426fb1693843f626a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 60a0a38a4d2542ac3eec61ee845a8569a6484b9d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 1 13:38:26 2013 +0100 python-qtermwidget: Remove package. commit 743cf5062b6f5595f137e3294d2093cde4d7e205 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 1 13:37:57 2013 +0100 pyQt: Remove package. commit 7d443d46570007d68b73546a04b686641c7dc040 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 1 13:37:42 2013 +0100 qtermwidget: Remove package. commit 95ac70bb944c241b7665cb123295c8334d9fdc6d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 1 13:37:15 2013 +0100 Qt: Remove package. This is not needed anymore because we are moving with our installer to GTK. ----------------------------------------------------------------------- Summary of changes: pyQt/patches/add_gettext_support.patch0 | 89 ------------ pyQt/pyQt.nm | 73 ---------- python-qtermwidget/patches/addStartShell.patch | 12 -- python-qtermwidget/python-qtermwidget.nm | 48 ------- qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch | 12 -- .../qt-4.8.1-fix-no-xshape-broken-build.patch | 51 ------- qt/patches/qt-4.8.1-webkit-no_Werror.patch | 12 -- .../qt-everywhere-opensource-src-4.6.2-cups.patch | 84 ------------ ...source-src-4.6.3-glib_eventloop_nullcheck.patch | 69 ---------- ...e-opensource-src-4.7.0-beta2-mysql_config.patch | 19 --- ...erywhere-opensource-src-4.7.1-QTBUG-14467.patch | 27 ---- ...ensource-src-4.7.4-tds_no_strict_aliasing.patch | 12 -- ...erywhere-opensource-src-4.8.0-QTBUG-14724.patch | 11 -- ...erywhere-opensource-src-4.8.0-QTBUG-21900.patch | 101 -------------- ...erywhere-opensource-src-4.8.0-QTBUG-22037.patch | 41 ------ ...verywhere-opensource-src-4.8.0-beta1-s390.patch | 31 ----- ...t-everywhere-opensource-src-4.8.0-gcc-4.7.patch | 27 ---- ...t-everywhere-opensource-src-4.8.0-ld-gold.patch | 22 --- .../qt-everywhere-opensource-src-4.8.0-qvfb.patch | 12 -- ...ere-opensource-src-4.8.0-rc1-moc-boost148.patch | 11 -- ...erywhere-opensource-src-4.8.0-s390-atomic.patch | 20 --- ...everywhere-opensource-src-4.8.0-timestamp.patch | 75 ----------- ...opensource-src-4.8.0-tp-multilib-optflags.patch | 36 ----- ...-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch | 12 -- ...erywhere-opensource-src-4.8.1-QTBUG-24718.patch | 14 -- ...rywhere-opensource-src-4.8.1-icu_no_debug.patch | 23 ---- ...e-opensource-src-4.8.1-linguist_qmake-qt4.patch | 24 ---- ...source-src-4.8.1-qdbusconnection_no_debug.patch | 14 -- ...opensource-src-4.8.1-qt3support_debuginfo.patch | 10 -- ...verywhere-opensource-src-4.8.1-qtgahandle.patch | 53 -------- .../qt-everywhere-opensource-src-4.8.1-type.patch | 26 ---- ...ensource-src-4.5.0-fix-qatomic-inline-asm.patch | 50 ------- ...-opensource-src-4.5.1-enable_ft_lcdfilter.patch | 12 -- qt/qt.nm | 150 --------------------- qtermwidget/patches/shared.patch | 46 ------- qtermwidget/qtermwidget.nm | 63 --------- 36 files changed, 1392 deletions(-) delete mode 100644 pyQt/patches/add_gettext_support.patch0 delete mode 100644 pyQt/pyQt.nm delete mode 100644 python-qtermwidget/patches/addStartShell.patch delete mode 100644 python-qtermwidget/python-qtermwidget.nm delete mode 100644 qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch delete mode 100644 qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch delete mode 100644 qt/patches/qt-4.8.1-webkit-no_Werror.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch delete mode 100644 qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch delete mode 100644 qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch delete mode 100644 qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch delete mode 100644 qt/qt.nm delete mode 100644 qtermwidget/patches/shared.patch delete mode 100644 qtermwidget/qtermwidget.nm Difference in files: diff --git a/pyQt/patches/add_gettext_support.patch0 b/pyQt/patches/add_gettext_support.patch0 deleted file mode 100644 index 4e81312..0000000 --- a/pyQt/patches/add_gettext_support.patch0 +++ /dev/null @@ -1,89 +0,0 @@ -Index: pyuic/uic/driver.py -=================================================================== ---- pyuic/uic/driver.py.orig -+++ pyuic/uic/driver.py -@@ -2,7 +2,19 @@ import sys - import logging - - from PyQt4.uic import compileUi, loadUi -+from PyQt4.uic.Compiler import qtproxies - -+original_i18n_string = qtproxies.i18n_string -+class i18n_string(qtproxies.i18n_string): -+ def __init__(self, string, disambig=None): -+ original_i18n_string.__init__(self, string, disambig) -+ def __str__(self): -+ return "i18n(%s)" % (qtproxies.as_string(self.string, encode=False),) -+ -+_gettext_header = """import gettext -+__trans = gettext.translation('%s', fallback=True) -+i18n = __trans.ugettext -+""" - - class Driver(object): - """ This encapsulates access to the pyuic functionality so that it can be -@@ -16,6 +28,8 @@ class Driver(object): - name of the .ui file. - """ - -+ self.gettext_header = '' -+ - if opts.debug: - logger = logging.getLogger(self.LOGGER_NAME) - handler = logging.StreamHandler() -@@ -23,6 +37,10 @@ class Driver(object): - logger.addHandler(handler) - logger.setLevel(logging.DEBUG) - -+ if not opts.gettext_domain == '': -+ qtproxies.i18n_string = i18n_string -+ self.gettext_header = _gettext_header % opts.gettext_domain -+ - self._opts = opts - self._ui_file = ui_file - -@@ -60,7 +78,7 @@ class Driver(object): - pyfile = open(self._opts.output, 'wt', encoding='utf8') - - compileUi(self._ui_file, pyfile, self._opts.execute, self._opts.indent, -- self._opts.pyqt3_wrapper, self._opts.from_imports) -+ self._opts.pyqt3_wrapper, self._opts.from_imports, self.gettext_header) - - def on_IOError(self, e): - """ Handle an IOError exception. """ -Index: pyuic/uic/__init__.py -=================================================================== ---- pyuic/uic/__init__.py.orig -+++ pyuic/uic/__init__.py -@@ -98,7 +98,7 @@ def compileUiDir(dir, recurse=False, map - compile_ui(dir, ui) - - --def compileUi(uifile, pyfile, execute=False, indent=4, pyqt3_wrapper=False, from_imports=False): -+def compileUi(uifile, pyfile, execute=False, indent=4, pyqt3_wrapper=False, from_imports=False, additional_text=''): - """compileUi(uifile, pyfile, execute=False, indent=4, pyqt3_wrapper=False, from_imports=False) - - Creates a Python module from a Qt Designer .ui file. -@@ -127,6 +127,9 @@ def compileUi(uifile, pyfile, execute=Fa - - pyfile.write(_header % (uifname, ctime(), PYQT_VERSION_STR)) - -+ if not additional_text == '': -+ pyfile.write(additional_text) -+ - winfo = compiler.UICompiler().compileUi(uifile, pyfile, from_imports) - - if pyqt3_wrapper: -Index: pyuic/uic/pyuic.py -=================================================================== ---- pyuic/uic/pyuic.py.orig -+++ pyuic/uic/pyuic.py -@@ -26,6 +26,8 @@ parser.add_option("-x", "--execute", des - help="generate extra code to test and display the class") - parser.add_option("-d", "--debug", dest="debug", action="store_true", - default=False, help="show debug output") -+parser.add_option("-g", "--use-gettext", dest="gettext_domain", action="store", type="str", -+ default='', help="use gettext for following domain") - parser.add_option("-i", "--indent", dest="indent", action="store", type="int", - default=4, metavar="N", - help="set indent width to N spaces, tab if N is 0 (default: 4)") diff --git a/pyQt/pyQt.nm b/pyQt/pyQt.nm deleted file mode 100644 index 884c6f5..0000000 --- a/pyQt/pyQt.nm +++ /dev/null @@ -1,73 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = pyQt -version = 4.9.1 -release = 1 - -groups = Development/Languages -url = http://www.riverbankcomputing.com/software/pyqt/ -license = GPLv3 or GPLv2 with exceptions -summary = Python bindings for Qt4. - -description - Python bindings for Qt4 -end - -source_dl = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/ -sources = PyQt-x11-gpl-%{version}.tar.gz - -build - requires - gcc-c++ - libX11-devel - libXext-devel - python-devel - qt-devel>=4.8.1 - sip-devel>=4.13.1 - end - - DIR_APP = %{DIR_SRC}/PyQt-x11-gpl-%{version} - - build - python configure.py \ - --assume-shared \ - --confirm-license \ - --verbose - - make %{PARALLELISMFLAGS} - end - - make_install_targets += \ - INSTALL_ROOT=%{BUILDROOT} - - install_cmds - # Remove python3 port - rm -rfv %{BUILDROOT}/usr/lib/python*/site-packages/PyQt4/uic/port_v3 - end -end - -packages - package %{name} - requires - sip - end - end - - package %{name}-devel - template DEVEL - - files - %{bindir} - %{libdir}/python*/site-packages/PyQt4/pyqtconfig* - %{libdir}/python*/site-packages/PyQt4/uic/pyuic.py* - %{datadir}/sip - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/python-qtermwidget/patches/addStartShell.patch b/python-qtermwidget/patches/addStartShell.patch deleted file mode 100644 index 7ff30c4..0000000 --- a/python-qtermwidget/patches/addStartShell.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: qtermwidget/qtermwidget.sip -=================================================================== ---- qtermwidget.orig/qtermwidget.sip -+++ qtermwidget/qtermwidget.sip -@@ -19,6 +19,7 @@ public: - ScrollBarLeft=1, - ScrollBarRight=2 - }; -+ void startShellProgram(); - void setTerminalFont(QFont &font); - void setShellProgram(QString &progname); - void setArgs(QStringList &args); diff --git a/python-qtermwidget/python-qtermwidget.nm b/python-qtermwidget/python-qtermwidget.nm deleted file mode 100644 index 421036e..0000000 --- a/python-qtermwidget/python-qtermwidget.nm +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = python-qtermwidget -version = 0.1.2 -release = 3 - -groups = Development/Languages -url = http://code.google.com/p/pyqt4-extrawidgets/downloads/list -license = GPLv2+ -summary = PyQt4 Bindings for QTermWidget. - -description - PyQt4 Bindings for QTermWidget. -end - -source_dl = http://pyqt4-extrawidgets.googlecode.com/files/ -sources = qtermwidget-%{version}.tar.gz - -build - requires - gcc-c++ - libX11-devel - libXext-devel - pyQt-devel>=4.9.1 - python-devel - qt-devel>=4.8.1 - qtermwidget-devel - sip-devel - end - - DIR_APP = %{DIR_SRC}/qtermwidget - - build - python config.py - make - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch b/qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch deleted file mode 100644 index 31f3b9f..0000000 --- a/qt/patches/qt-4.8.0-CVE-2011-3922-bz#772125.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qt-4/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c.bz#772125 2012-01-09 10:16:08.000000000 +0100 -+++ qt-4/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c 2012-01-09 10:16:47.000000000 +0100 -@@ -359,7 +359,8 @@ - if (kinzi >= 0 && i > base && (cc & Mymr_CF_AFTER_KINZI)) { - reordered[len] = Mymr_C_NGA; - reordered[len+1] = Mymr_C_VIRAMA; -- properties[len-1] = AboveForm; -+ if (len > 0) -+ properties[len-1] = AboveForm; - properties[len] = AboveForm; - len += 2; - kinzi = -1; diff --git a/qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch b/qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch deleted file mode 100644 index c4a4453..0000000 --- a/qt/patches/qt-4.8.1-fix-no-xshape-broken-build.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nur a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp ---- a/src/gui/kernel/qdnd_x11.cpp 2012-03-14 15:01:16.000000000 +0100 -+++ b/src/gui/kernel/qdnd_x11.cpp 2012-05-20 17:19:38.992247206 +0200 -@@ -1422,6 +1422,7 @@ - global_accepted_action = Qt::IgnoreAction; - } - -+#ifndef QT_NO_SHAPE - static - bool windowInteractsWithPosition(const QPoint & pos, Window w, int shapeType) - { -@@ -1436,6 +1437,7 @@ - } - return interacts; - } -+#endif - - static - Window findRealWindow(const QPoint & pos, Window w, int md) -@@ -1462,6 +1464,8 @@ - XGetWindowProperty(X11->display, w, ATOM(XdndAware), 0, 0, False, - AnyPropertyType, &type, &f,&n,&a,&data); - if (data) XFree(data); -+ -+#ifndef QT_NO_SHAPE - if (type) { - // When ShapeInput and ShapeBounding are not set they return a single rectangle with the geometry of the window, this is why we - // need an && here so that in the case one is set and the other is not we still get the correct result. -@@ -1469,6 +1473,9 @@ - if (windowContainsMouse) - return w; - } -+#else -+ return w; -+#endif - } - - Window r, p; -@@ -1488,10 +1495,12 @@ - // innermost window. - } - -+#ifndef QT_NO_SHAPE - // No children! - if (!windowContainsMouse) - return 0; - else -+#endif - return w; - } - } diff --git a/qt/patches/qt-4.8.1-webkit-no_Werror.patch b/qt/patches/qt-4.8.1-webkit-no_Werror.patch deleted file mode 100644 index ef5d55d..0000000 --- a/qt/patches/qt-4.8.1-webkit-no_Werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri ---- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-03-14 15:01:29.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri 2012-03-28 17:12:33.391294004 +0200 -@@ -102,8 +102,6 @@ CONFIG -= warn_on - - # Treat warnings as errors on x86/Linux/GCC - linux-g++* { -- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -- - greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { - if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { - # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). diff --git a/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch b/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch deleted file mode 100644 index e0305e1..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp ---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100 -@@ -569,6 +569,32 @@ - void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups) - { - options.duplex->setEnabled(cups && cups->ppdOption("Duplex")); -+ -+ if (cups) { -+ const ppd_option_t* duplex = cups->ppdOption("Duplex"); -+ if (duplex) { -+ // copy default ppd duplex to qt dialog -+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) -+ options.duplexShort->setChecked(true); -+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) -+ options.duplexLong->setChecked(true); -+ else -+ options.noDuplex->setChecked(true); -+ } -+ -+ if (cups->currentPPD()) { -+ // set default color -+ if (cups->currentPPD()->color_device) -+ options.color->setChecked(true); -+ else -+ options.grayscale->setChecked(true); -+ } -+ -+ // set collation -+ const ppd_option_t *collate = cups->ppdOption("Collate"); -+ if (collate) -+ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0); -+ } - } - #endif - -diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp ---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100 -@@ -627,6 +627,44 @@ - && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) { - setOutputFormat(QPrinter::PdfFormat); - } -+ -+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) -+ // fill in defaults from ppd file -+ QCUPSSupport cups; -+ -+ int printernum = -1; -+ for (int i = 0; i < cups.availablePrintersCount(); i++) { -+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name) -+ printernum = i; -+ } -+ if (printernum >= 0) { -+ cups.setCurrentPrinter(printernum); -+ -+ const ppd_option_t* duplex = cups.ppdOption("Duplex"); -+ if (duplex) { -+ // copy default ppd duplex to qt dialog -+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) -+ setDuplex(DuplexShortSide); -+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) -+ setDuplex(DuplexLongSide); -+ else -+ setDuplex(DuplexNone); -+ } -+ -+ if (cups.currentPPD()) { -+ // set default color -+ if (cups.currentPPD()->color_device) -+ setColorMode(Color); -+ else -+ setColorMode(GrayScale); -+ } -+ -+ // set collation -+ const ppd_option_t *collate = cups.ppdOption("Collate"); -+ if (collate) -+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0); -+ } -+#endif - } - - /*! diff --git a/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch b/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch deleted file mode 100644 index d4e5924..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck/src/gui/kernel/qguieventdispatcher_glib.cpp ---- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-06-02 04:03:15.000000000 +0200 -+++ qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-12-08 22:22:38.000000000 +0100 -@@ -76,7 +76,7 @@ - GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s); - return (XEventsQueued(X11->display, QueuedAfterFlush) - || (!(source->flags & QEventLoop::ExcludeUserInputEvents) -- && !source->d->queuedUserInputEvents.isEmpty())); -+ && source->d && !source->d->queuedUserInputEvents.isEmpty())); - } - - static gboolean x11EventSourceCheck(GSource *s) -@@ -84,7 +84,7 @@ - GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s); - return (XEventsQueued(X11->display, QueuedAfterFlush) - || (!(source->flags & QEventLoop::ExcludeUserInputEvents) -- && !source->d->queuedUserInputEvents.isEmpty())); -+ && source->d && !source->d->queuedUserInputEvents.isEmpty())); - } - - static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointer user_data) -@@ -95,7 +95,7 @@ - do { - XEvent event; - if (!(source->flags & QEventLoop::ExcludeUserInputEvents) -- && !source->d->queuedUserInputEvents.isEmpty()) { -+ && source->d && !source->d->queuedUserInputEvents.isEmpty()) { - // process a pending user input event - event = source->d->queuedUserInputEvents.takeFirst(); - } else if (XEventsQueued(X11->display, QueuedAlready)) { -@@ -112,7 +112,8 @@ - case XKeyRelease: - case EnterNotify: - case LeaveNotify: -- source->d->queuedUserInputEvents.append(event); -+ if (source->d) -+ source->d->queuedUserInputEvents.append(event); - continue; - - case ClientMessage: -@@ -127,7 +128,8 @@ - break; - } - } -- source->d->queuedUserInputEvents.append(event); -+ if (source->d) -+ source->d->queuedUserInputEvents.append(event); - continue; - - default: -@@ -140,7 +142,7 @@ - } - - // send through event filter -- if (source->q->filterEvent(&event)) -+ if (source->q && source->q->filterEvent(&event)) - continue; - - if (qApp->x11ProcessEvent(&event) == 1) -@@ -152,7 +154,8 @@ - - out: - -- source->d->runTimersOnceWithNormalPriority(); -+ if (source->d) -+ source->d->runTimersOnceWithNormalPriority(); - - if (callback) - callback(user_data); diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch b/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch deleted file mode 100644 index 47c066b..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config qt-everywhere-opensource-src-4.7.0-beta2/configure ---- qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config 2010-06-29 20:53:10.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.0-beta2/configure 2010-07-08 08:30:32.148864934 -0500 -@@ -4849,8 +4849,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do - [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config` - if [ -x "$CFG_MYSQL_CONFIG" ]; then - QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null` -+ $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \ -+ QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -+ if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then -+ QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r" -+ QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient" -+ else - QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null` - QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null` -+ fi - QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null` - QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1` - fi diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch b/qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch deleted file mode 100644 index 1283f50..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.1-QTBUG-14467.patch +++ /dev/null @@ -1,27 +0,0 @@ - -Fails to create debug build of Qt projects on mingw -http://bugzilla.redhat.com/653674 -http://bugreports.qt.nokia.com/browse/QTBUG-14467 - ---- qt-everywhere-opensource-src-4.7.1/mkspecs/features/qt_functions.prf.orig 2010-11-16 03:12:17.000000000 +0500 -+++ qt-everywhere-opensource-src-4.7.1/mkspecs/features/qt_functions.prf 2010-11-16 03:12:50.000000000 +0500 -@@ -62,7 +62,7 @@ defineTest(qtAddLibrary) { - } - isEmpty(LINKAGE) { - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { -- win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d -+ win32:LINKAGE = -l$${LIB_NAME}d$${QT_LIBINFIX} - mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug - } - isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} ---- qt-everywhere-opensource-src-4.7.1/mkspecs/features/win32/windows.prf.orig 2010-11-16 03:11:34.000000000 +0500 -+++ qt-everywhere-opensource-src-4.7.1/mkspecs/features/win32/windows.prf 2010-11-16 03:11:51.000000000 +0500 -@@ -6,7 +6,7 @@ contains(TEMPLATE, ".*app"){ - - qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { - isEqual(entryLib, -lqtmain): { -- CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d -+ CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}d$${QT_LIBINFIX} - else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX} - } else { - QMAKE_LIBS += $${entryLib} diff --git a/qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch b/qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch deleted file mode 100644 index b675929..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri ---- qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing 2011-09-12 01:49:28.000000000 -0500 -+++ qt-everywhere-opensource-src-4.7.4/src/sql/drivers/tds/qsql_tds.pri 2011-11-03 13:04:34.271086323 -0500 -@@ -1,6 +1,8 @@ - HEADERS += $$PWD/qsql_tds.h - SOURCES += $$PWD/qsql_tds.cpp - -+*-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing -+ - unix|win32-g++*: { - LIBS *= $$QT_LFLAGS_TDS - !contains(LIBS, .*sybdb.*):LIBS += -lsybdb diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch deleted file mode 100644 index 3672ca7..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp.QTBUG-14724 qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp ---- qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp.QTBUG-14724 2011-10-03 22:44:31.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.0/src/gui/painting/qpdf.cpp 2011-10-17 10:55:49.713265396 -0500 -@@ -1686,6 +1686,7 @@ bool QPdfBaseEnginePrivate::openPrintDev - cupsTempFile = ret.second; - outDevice = new QFile(); - static_cast<QFile *>(outDevice)->open(ret.first, QIODevice::WriteOnly); -+ fd = ret.first; - #endif - #ifndef QT_NO_LPR - } else { diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch deleted file mode 100644 index 29fc82e..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch +++ /dev/null @@ -1,101 +0,0 @@ -From a91e9dd202640598d8dec091c67ec94536390e7f Mon Sep 17 00:00:00 2001 -From: "Owen W. Taylor" <otaylor(a)fishsoup.net> -Date: Mon, 17 Oct 2011 17:27:43 -0400 -Subject: [PATCH] Fix logic for figuring out what ConfigureNotify positions - can be trusted - -When reading ahead in the queue for ConfigureNotify events, it's necessary -to look for intermediate ReparentNotify events as well, since they will -determine whether the position in the event can be trusted or not. ---- - src/gui/kernel/qapplication_x11.cpp | 47 ++++++++++++++++++++++++++++++---- - 1 files changed, 41 insertions(+), 6 deletions(-) - -diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp -index 408e9ac..3a1d3eb 100644 ---- a/src/gui/kernel/qapplication_x11.cpp -+++ b/src/gui/kernel/qapplication_x11.cpp -@@ -816,6 +816,27 @@ static Bool qt_sync_request_scanner(Display*, XEvent *event, XPointer arg) - #endif - #endif // QT_NO_XSYNC - -+struct qt_configure_event_data -+{ -+ WId window; -+ WId parent; -+}; -+ -+static Bool qt_configure_event_scanner(Display*, XEvent *event, XPointer arg) -+{ -+ qt_configure_event_data *data = -+ reinterpret_cast<qt_configure_event_data*>(arg); -+ if (event->type == ConfigureNotify && -+ event->xconfigure.window == data->window) { -+ return true; -+ } else if (event->type == ReparentNotify && -+ event->xreparent.window == data->window) { -+ data->parent = event->xreparent.parent; -+ } -+ -+ return false; -+} -+ - static void qt_x11_create_intern_atoms() - { - const char *names[QX11Data::NAtoms]; -@@ -5273,8 +5294,11 @@ bool QETWidget::translateConfigEvent(const XEvent *event) - if (d->extra->compress_events) { - // ConfigureNotify compression for faster opaque resizing - XEvent otherEvent; -- while (XCheckTypedWindowEvent(X11->display, internalWinId(), ConfigureNotify, -- &otherEvent)) { -+ qt_configure_event_data configureData; -+ configureData.window = internalWinId(); -+ configureData.parent = d->topData()->parentWinId; -+ while (XCheckIfEvent(X11->display, &otherEvent, -+ &qt_configure_event_scanner, (XPointer)&configureData)) { - if (qt_x11EventFilter(&otherEvent)) - continue; - -@@ -5287,13 +5311,19 @@ bool QETWidget::translateConfigEvent(const XEvent *event) - newSize.setWidth(otherEvent.xconfigure.width); - newSize.setHeight(otherEvent.xconfigure.height); - -+ trust = isVisible() -+ && (configureData.parent == XNone || -+ configureData.parent == QX11Info::appRootWindow()); -+ - if (otherEvent.xconfigure.send_event || trust) { - newCPos.rx() = otherEvent.xconfigure.x + - otherEvent.xconfigure.border_width; - newCPos.ry() = otherEvent.xconfigure.y + - otherEvent.xconfigure.border_width; - isCPos = true; -- } -+ } else { -+ isCPos = false; -+ } - } - #ifndef QT_NO_XSYNC - qt_sync_request_event_data sync_event; -@@ -5306,9 +5336,14 @@ bool QETWidget::translateConfigEvent(const XEvent *event) - } - - if (!isCPos) { -- // we didn't get an updated position of the toplevel. -- // either we haven't moved or there is a bug in the window manager. -- // anyway, let's query the position to be certain. -+ // If the last configure event didn't have a trustable position, -+ // it's necessary to query, see ICCCM 4.24: -+ // -+ // Any real ConfigureNotify event on a top-level window implies -+ // that the window’s position on the root may have changed, even -+ // though the event reports that the window’s position in its -+ // parent is unchanged because the window may have been reparented. -+ - int x, y; - Window child; - XTranslateCoordinates(X11->display, internalWinId(), --- -1.7.6.4 - diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch deleted file mode 100644 index 4279ce2..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h.QTBUG-22037 qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h ---- qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h.QTBUG-22037 2011-10-03 22:44:32.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h 2011-10-15 14:25:52.238694974 -0500 -@@ -769,26 +769,18 @@ Q_OUTOFLINE_TEMPLATE void QList<T>::clea - template <typename T> - Q_OUTOFLINE_TEMPLATE int QList<T>::removeAll(const T &_t) - { -- int index = indexOf(_t); -- if (index == -1) -- return 0; -- -+ detachShared(); - const T t = _t; -- detach(); -- -- Node *i = reinterpret_cast<Node *>(p.at(index)); -- Node *e = reinterpret_cast<Node *>(p.end()); -- Node *n = i; -- node_destruct(i); -- while (++i != e) { -- if (i->t() == t) -- node_destruct(i); -- else -- *n++ = *i; -- } -- -- int removedCount = e - n; -- d->end -= removedCount; -+ int removedCount=0, i=0; -+ Node *n; -+ while (i < p.size()) -+ if ((n = reinterpret_cast<Node *>(p.at(i)))->t() == t) { -+ node_destruct(n); -+ p.remove(i); -+ ++removedCount; -+ } else { -+ ++i; -+ } - return removedCount; - } - diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch deleted file mode 100644 index 5f0bbf8..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-beta1-s390.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2011-07-28 11:12:48.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2011-07-28 11:13:56.000000000 +0200 -@@ -189,6 +189,18 @@ - #define WTF_CPU_SPARC 1 - #endif - -+/* CPU(S390X) - S390 64-bit */ -+#if defined(__s390x__) -+#define WTF_CPU_S390X 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+ -+/* CPU(S390) - S390 32-bit */ -+#if defined(__s390__) -+#define WTF_CPU_S390 1 -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+ - /* CPU(X86) - i386 / x86 32-bit */ - #if defined(__i386__) \ - || defined(i386) \ -@@ -873,7 +885,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) -+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) - #define WTF_USE_JSVALUE32 1 diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch deleted file mode 100644 index 62c436e..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me 2012-01-24 11:24:14.729942043 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-01-24 14:28:39.848109534 +0100 -@@ -57,9 +57,7 @@ namespace JSC { - - class JSGlobalObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- -- struct JSGlobalObjectData : public JSVariableObjectData { -+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { - // We use an explicit destructor function pointer instead of a - // virtual destructor because we want to avoid adding a vtable - // pointer to this struct. Adding a vtable pointer would force the -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me 2012-01-24 11:40:07.167856677 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-01-24 14:28:34.640306629 +0100 -@@ -32,8 +32,7 @@ namespace JSC{ - - class JSStaticScopeObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- struct JSStaticScopeObjectData : public JSVariableObjectData { -+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { - JSStaticScopeObjectData() - : JSVariableObjectData(&symbolTable, &registerStore + 1) - { diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch deleted file mode 100644 index 0e3897e..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-ld-gold.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me 2012-01-24 13:05:50.460890750 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri 2012-01-24 13:19:08.836799974 +0100 -@@ -3,12 +3,12 @@ - contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 - contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 - --linux-g++ { --isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -- message(Using gold linker) -- QMAKE_LFLAGS+=-fuse-ld=gold --} --} -+#linux-g++ { -+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { -+# message(Using gold linker) -+# QMAKE_LFLAGS+=-fuse-ld=gold -+#} -+#} - - # We use this flag on production branches - # See https://bugs.webkit.org/show_bug.cgi?id=60824 diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch deleted file mode 100644 index 2fffb8a..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-qvfb.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro.qvfb qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro ---- qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro.qvfb 2011-12-27 21:02:19.765512041 -0600 -+++ qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro 2011-12-27 21:02:39.271268187 -0600 -@@ -38,8 +38,6 @@ SOURCES = qvfb.cpp \ - - !embedded { - DEFINES += QT_NO_QWS_SIGNALHANDLER -- HEADERS += ../../src/gui/embedded/qlock_p.h -- SOURCES += ../../src/gui/embedded/qlock.cpp - } - - include(../shared/deviceskin/deviceskin.pri) diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch deleted file mode 100644 index f0ce656..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-rc1-moc-boost148.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/moc/main.cpp 2011-10-04 05:44:32.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-moc-boost148/src/tools/moc/main.cpp 2011-12-04 00:11:25.000000000 +0100 -@@ -187,6 +187,7 @@ - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // rh#756395 - QByteArray filename; - QByteArray output; - FILE *in = 0; diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch deleted file mode 100644 index 6fedcc8..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h.s390-atomic qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h ---- qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h.s390-atomic 2011-12-18 16:15:20.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h 2011-12-18 16:17:34.000000000 +0100 -@@ -400,6 +400,16 @@ Q_INLINE_TEMPLATE T* QBasicAtomicPointer - - - template <typename T> -+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd) -+{ -+#ifndef __s390x__ -+ return (T *)__CS_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "ar", "", "bcr 15,0\n"); -+#else -+ return (T *)__CSG_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "agr", "", "bcr 15,0\n"); -+#endif -+} -+ -+template <typename T> - Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd) - { - return fetchAndAddOrdered(valueToAdd); diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch deleted file mode 100644 index 2307353..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-timestamp.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/uic3/embed.cpp 2012-02-20 15:17:27.343005746 +0100 -@@ -152,8 +152,12 @@ void Ui3Reader::embed(const char *projec - for ( it = images.begin(); it != images.end(); ++it ) - out << "** " << *it << "\n"; - out << "**\n"; -+#ifdef TIMESTAMP - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; - out << "** by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n"; -+#else -+ out << "** Created by: " << QT_VERSION_STR << "\n"; -+#endif - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost!\n"; - out << "****************************************************************************/\n"; -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/uic3/uic.cpp 2012-02-20 15:20:13.584706037 +0100 -@@ -146,8 +146,12 @@ void Uic::writeCopyrightHeader(DomUI *ui - out << "/********************************************************************************\n"; - out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; - out << "**\n"; -+#ifdef TIMESTAMP - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; - out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#else -+ out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#endif - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; - out << "********************************************************************************/\n\n"; -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp.uic_multilib 2011-12-08 06:06:03.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/uic/uic.cpp 2012-02-20 15:13:44.175462520 +0100 -@@ -139,8 +139,12 @@ void Uic::writeCopyrightHeader(DomUI *ui - out << "/********************************************************************************\n"; - out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; - out << "**\n"; -+#ifdef TIMESTAMP - out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; - out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#else -+ out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+#endif - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; - out << "********************************************************************************/\n\n"; -diff -up qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp.me qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp ---- qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp.me 2012-02-20 13:22:38.572628193 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/tools/moc/moc.cpp 2012-02-20 14:46:09.981860726 +0100 -@@ -767,8 +767,10 @@ void Moc::parse() - void Moc::generate(FILE *out) - { - -+#ifdef TIMESTAMP - QDateTime dt = QDateTime::currentDateTime(); - QByteArray dstr = dt.toString().toLatin1(); -+#endif - QByteArray fn = filename; - int i = filename.length()-1; - while (i>0 && filename[i-1] != '/' && filename[i-1] != '\\') -@@ -777,8 +779,12 @@ void Moc::generate(FILE *out) - fn = filename.mid(i); - fprintf(out, "/****************************************************************************\n" - "** Meta object code from reading C++ file '%s'\n**\n" , (const char*)fn); -+#ifdef TIMESTAMP - fprintf(out, "** Created: %s\n" - "** by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , dstr.data(), mocOutputRevision, QT_VERSION_STR); -+#else -+ fprintf(out, "** Created by: The Qt Meta Object Compiler version %d (Qt %s)\n**\n" , mocOutputRevision, QT_VERSION_STR); -+#endif - fprintf(out, "** WARNING! All changes made in this file will be lost!\n" - "*****************************************************************************/\n\n"); - diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch deleted file mode 100644 index 5c8b5a1..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf ---- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf 2011-05-25 13:39:38.789054074 +0200 -@@ -12,6 +12,8 @@ QMAKE_INCREMENTAL_STYLE = sublib - QMAKE_CFLAGS = -m32 - QMAKE_LFLAGS = -m32 - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/linux.conf) - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) -diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf ---- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf 2011-05-25 13:39:47.460747770 +0200 -@@ -15,6 +15,8 @@ QMAKE_INCREMENTAL_STYLE = sublib - QMAKE_CFLAGS = -m64 - QMAKE_LFLAGS = -m64 - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/linux.conf) - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) -diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf ---- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib 2011-05-23 12:26:21.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf 2011-05-25 13:39:26.630088814 +0200 -@@ -9,6 +9,8 @@ CONFIG += qt warn_on release increment - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/linux.conf) - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch b/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch deleted file mode 100644 index 947f758..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp ---- qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash 2011-05-23 12:26:21.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp 2011-05-25 13:24:33.137315194 +0200 -@@ -3215,7 +3215,7 @@ int QTreeViewPrivate::itemHeight(int ite - return defaultItemHeight; - if (viewItems.isEmpty()) - return 0; -- const QModelIndex &index = viewItems.at(item).index; -+ QModelIndex index = viewItems.at(item).index; - if (!index.isValid()) - return 0; - int height = viewItems.at(item).height; diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch deleted file mode 100644 index 003a0a6..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp.QTBUG-24718 qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp ---- qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp.QTBUG-24718 2012-03-14 15:01:14.000000000 +0100 -+++ qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp 2012-04-03 10:53:12.973058622 +0200 -@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPo - int pos = *cursorPos; - int itm; - const HB_CharAttributes *attributes = eng->attributes(); -+ if (!attributes) { -+ *cursorPos = 0; -+ return x.toReal(); -+ } - while (pos < line.from + line.length && !attributes[pos].charStop) - pos++; - if (pos == line.from + (int)line.length) { diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch deleted file mode 100644 index ddf3184..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp.icu_no_spam qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp ---- qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp.icu_no_spam 2012-03-14 09:01:17.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.1/src/corelib/tools/qlocale_icu.cpp 2012-04-17 07:30:01.652251482 -0500 -@@ -83,7 +83,9 @@ bool qt_initIcu(const QString &localeStr - // resolve libicui18n - QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); - if (!lib.load()) { -+#ifndef QT_NO_DEBUG - qWarning() << "Unable to load library icui18n" << lib.errorString(); -+#endif - status = ErrorLoading; - return false; - } -@@ -112,7 +114,9 @@ bool qt_initIcu(const QString &localeStr - // resolve libicuuc - QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); - if (!ucLib.load()) { -+#ifndef QT_NO_DEBUG - qWarning() << "Unable to load library icuuc" << ucLib.errorString(); -+#endif - status = ErrorLoading; - return false; - } diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch deleted file mode 100644 index 91faeda..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp.qmake-qt4 qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp ---- qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp.qmake-qt4 2012-03-14 09:01:12.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.1/tools/linguist/lrelease/main.cpp 2012-05-11 08:58:12.902149676 -0500 -@@ -316,7 +316,7 @@ int main(int argc, char **argv) - #ifdef QT_BOOTSTRAPPED - option.initProperties(binDir + QLatin1String("/qmake")); - #else -- option.initProperties(app.applicationDirPath() + QLatin1String("/qmake")); -+ option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4")); - #endif - ProFileParser parser(0, &parseHandler); - ProFileEvaluator visitor(&option, &parser, &evalHandler); -diff -up qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp.qmake-qt4 qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp ---- qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp.qmake-qt4 2012-03-14 09:01:12.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.1/tools/linguist/lupdate/main.cpp 2012-05-11 09:02:47.393718054 -0500 -@@ -765,7 +765,7 @@ int main(int argc, char **argv) - - parseHandler.verbose = evalHandler.verbose = !!(options & Verbose); - ProFileOption option; -- option.initProperties(app.applicationDirPath() + QLatin1String("/qmake")); -+ option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4")); - option.setCommandLineArguments(QStringList() << QLatin1String("CONFIG+=lupdate_run")); - ProFileParser parser(0, &parseHandler); - diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch deleted file mode 100644 index 8d60dab..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-qdbusconnection_no_debug.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusconnection_nodebug qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp ---- qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp.qdbusconnection_nodebug 2012-04-17 07:18:51.536629078 -0500 -+++ qt-everywhere-opensource-src-4.8.1/src/dbus/qdbusconnection.cpp 2012-04-17 07:18:56.910561895 -0500 -@@ -1109,8 +1109,10 @@ public: - // make sure this connection is running on the main thread - QCoreApplication *instance = QCoreApplication::instance(); - if (!instance) { -+#ifndef QT_NO_DEBUG - qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.", - type == SessionBus ? "session" : type == SystemBus ? "system" : "generic"); -+#endif - } else { - QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread()); - } diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch deleted file mode 100644 index 7458314..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro.debuginfo qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro ---- qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro.debuginfo 2012-03-14 09:01:17.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro 2012-05-11 11:55:37.780070386 -0500 -@@ -34,6 +34,3 @@ MOCDIR = .moc - - *-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing - --CONFIG -= separate_debug_info --CONFIG += no_debug_info -- diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch deleted file mode 100644 index 64ffef3..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-qtgahandle.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp.me qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp ---- qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp.me 2012-03-30 21:54:59.921331145 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.cpp 2012-03-30 21:58:14.516042067 +0200 -@@ -41,6 +41,7 @@ - - #include "qtgafile.h" - -+#include <QtCore/QBuffer> - #include <QtCore/QIODevice> - #include <QtCore/QDebug> - #include <QtCore/QDateTime> -@@ -264,3 +265,16 @@ QImage QTgaFile::readImage() - // TODO: add processing of TGA extension information - ie TGA 2.0 files - return im; - } -+/** -+ * Checks if device contains a valid tga image, *without* changing device -+ * position. -+ */ -+bool QTgaFile::canRead(QIODevice *device) -+{ -+ QByteArray header = device->peek(HeaderSize); -+ if (header.size() < HeaderSize) -+ return false; -+ QBuffer buffer(&header); -+ QTgaFile tga(&buffer); -+ return tga.isValid(); -+} -diff -up qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h.me qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h ---- qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h.me 2012-03-30 21:58:39.670023189 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgafile.h 2012-03-30 21:59:06.202317384 +0200 -@@ -93,6 +93,8 @@ public: - inline QSize size() const; - inline Compression compression() const; - -+ static bool canRead(QIODevice *device); -+ - private: - static inline quint16 littleEndianInt(const unsigned char *d); - -diff -up qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp.me qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp ---- qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp.me 2012-03-30 21:59:17.373303356 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/plugins/imageformats/tga/qtgahandler.cpp 2012-03-30 22:00:13.817226439 +0200 -@@ -77,8 +77,7 @@ bool QTgaHandler::canRead(QIODevice *dev - qWarning("QTgaHandler::canRead() called with no device"); - return false; - } -- QTgaFile tga(device); -- return tga.isValid(); -+ return QTgaFile::canRead(device); - } - - bool QTgaHandler::read(QImage *image) diff --git a/qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch b/qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch deleted file mode 100644 index 99aafbe..0000000 --- a/qt/patches/qt-everywhere-opensource-src-4.8.1-type.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp.me qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp ---- qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp.me 2012-05-16 14:45:30.542709580 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.cpp 2012-05-16 14:49:02.266017265 +0200 -@@ -61,8 +61,8 @@ const char *QElfParser::parseSectionHead - + sizeof(qelfaddr_t); // sh_addr - sh->offset = read<qelfoff_t>(data); - data += sizeof(qelfoff_t); // sh_offset -- sh->size = read<qelfword_t>(data); -- data += sizeof(qelfword_t); // sh_size -+ sh->size = read<qelfoff_t>(data); -+ data += sizeof(qelfoff_t); // sh_size - return data; - } - -diff -up qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h.me qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h ---- qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h.me 2012-05-16 14:45:41.006724793 +0200 -+++ qt-everywhere-opensource-src-4.8.1/src/corelib/plugin/qelfparser_p.h 2012-05-16 14:47:49.017910811 +0200 -@@ -80,7 +80,7 @@ public: - qelfword_t name; - qelfword_t type; - qelfoff_t offset; -- qelfword_t size; -+ qelfoff_t size; - }; - - int m_endian; diff --git a/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch b/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch deleted file mode 100644 index e5ab4ba..0000000 --- a/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h ---- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h 2009-02-25 22:09:21.000000000 +0100 -+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h 2009-04-01 17:54:21.000000000 +0200 -@@ -115,8 +115,8 @@ - asm volatile("lock\n" - "incl %0\n" - "setne %1" -- : "=m" (_q_value), "=qm" (ret) -- : "m" (_q_value) -+ : "+m" (_q_value), "=qm" (ret) -+ : - : "memory"); - return ret != 0; - } -@@ -127,8 +127,8 @@ - asm volatile("lock\n" - "decl %0\n" - "setne %1" -- : "=m" (_q_value), "=qm" (ret) -- : "m" (_q_value) -+ : "+m" (_q_value), "=qm" (ret) -+ : - : "memory"); - return ret != 0; - } -diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h ---- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h 2009-02-25 22:09:21.000000000 +0100 -+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h 2009-04-01 17:54:32.000000000 +0200 -@@ -116,8 +116,8 @@ - asm volatile("lock\n" - "incl %0\n" - "setne %1" -- : "=m" (_q_value), "=qm" (ret) -- : "m" (_q_value) -+ : "+m" (_q_value), "=qm" (ret) -+ : - : "memory"); - return ret != 0; - } -@@ -128,8 +128,8 @@ - asm volatile("lock\n" - "decl %0\n" - "setne %1" -- : "=m" (_q_value), "=qm" (ret) -- : "m" (_q_value) -+ : "+m" (_q_value), "=qm" (ret) -+ : - : "memory"); - return ret != 0; - } diff --git a/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch b/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch deleted file mode 100644 index 4ab3ea4..0000000 --- a/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp ---- qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter 2009-04-21 18:57:41.000000000 -0500 -+++ qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp 2009-04-24 11:17:49.562695405 -0500 -@@ -72,7 +72,7 @@ - #include FT_CONFIG_OPTIONS_H - #endif - --#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING) -+#if defined(FT_LCD_FILTER_H) - #define QT_USE_FREETYPE_LCDFILTER - #endif - diff --git a/qt/qt.nm b/qt/qt.nm deleted file mode 100644 index 8d3f241..0000000 --- a/qt/qt.nm +++ /dev/null @@ -1,150 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = qt -version = 4.8.1 -release = 1 - -groups = System/Libraries -url = http://qt-project.org/ -license = LGPLv2 with exceptions or GPLv3 with exceptions -summary = Qt toolkit. - -description - Qt is a software toolkit for developing applications. -end - -source_dl = http://releases.qt-project.org/qt4/source/ -sources = %{name}-everywhere-opensource-src-%{version}.tar.gz - -build - requires - /usr/bin/perl - fontconfig-devel - freetype-devel - gcc-c++ - libjpeg-devel - libmng-devel - libpng-devel - libtiff-devel - libX11-devel - libXext-devel - libXfixes-devel - libXrandr-devel - libXrender-devel - libXi-devel - openssl-devel - pcre-devel - pkg-config - xorg-x11-proto-devel - zlib-devel - end - - DIR_APP = %{DIR_SRC}/%{name}-everywhere-opensource-src-%{version} - - configure_options = -v \ - -prefix /usr \ - -libdir %{libdir} \ - -datadir %{datadir}/qt4 \ - -headerdir %{includedir} \ - -plugindir %{libdir}/qt4/plugins \ - -translationdir %{datadir}/qt4/translations \ - -confirm-license \ - -fontconfig \ - -largefile \ - -opensource \ - -reduce-relocations \ - -release \ - -shared \ - -no-audio-backend \ - -no-dbus \ - -no-gtkstyle \ - -no-cups \ - -no-javascript-jit \ - -no-multimedia \ - -no-nas-sound \ - -no-nis \ - -no-opengl \ - -no-openvg \ - -no-qt3support \ - -no-pch \ - -no-phonon \ - -no-phonon-backend \ - -no-rpath \ - -no-script \ - -no-scripttools \ - -no-separate-debug-info \ - -no-sm \ - -no-sql-db2 \ - -no-sql-ibase \ - -no-sql-mysql \ - -no-sql-oci \ - -no-sql-odbc \ - -no-sql-psql \ - -no-sql-sqlite \ - -no-sql-sqlite2 \ - -no-sql-sqlite_symbian \ - -no-sql-tds \ - -no-stl \ - -no-svg \ - -no-webkit \ - -no-xinerama \ - -no-xshape \ - -no-xsync \ - -no-xvideo \ - -no-mmx \ - -no-sse \ - -no-sse2 \ - -no-sse3 \ - -no-ssse3 \ - -no-sse4.1 \ - -no-sse4.2 \ - -no-3dnow \ - -system-libjpeg \ - -system-libmng \ - -system-libpng \ - -system-libtiff \ - -system-zlib \ - -openssl-linked \ - -nomake demos \ - -nomake docs \ - -nomake examples - - prepare_cmds - sed -e "s/-O2/%{CFLAGS}/g" -i mkspecs/*/qmake.conf - - # Disable the strip command to get a useful debuginfo package. - sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|" mkspecs/common/linux.conf - end - - install - make install INSTALL_ROOT=%{BUILDROOT} - end -end - -packages - package %{name} - - package %{name}-libs - template LIBS - - files += %{libdir}/qt4/plugins - files += %{datadir}/qt4/phrasebooks - files += %{datadir}/qt4/translations - end - - package %{name}-devel - template DEVEL - - files += %{libdir}/*.prl - files += %{libdir}/qt4/q3porting.xml - files += %{libdir}/qt4/*.prl - files += %{datadir}/qt4/mkspecs - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/qtermwidget/patches/shared.patch b/qtermwidget/patches/shared.patch deleted file mode 100644 index cdef77d..0000000 --- a/qtermwidget/patches/shared.patch +++ /dev/null @@ -1,46 +0,0 @@ -Index: qtermwidget/lib/lib.pro -=================================================================== ---- qtermwidget.orig/lib/lib.pro -+++ qtermwidget/lib/lib.pro -@@ -4,7 +4,7 @@ DESTDIR = .. - - TARGET = qtermwidget - --CONFIG += qt debug_and_release warn_on build_all staticlib #dll -+CONFIG += qt debug_and_release warn_on build_all #dll - - QT += core gui - -@@ -42,7 +42,3 @@ SOURCES = TerminalCharacterDecoder.cpp - Session.cpp ShellCommand.cpp \ - qtermwidget.cpp - -- -- -- -- -\ Dosya sonunda yenisatır yok. -Index: qtermwidget/src/src.pro -=================================================================== ---- qtermwidget.orig/src/src.pro -+++ qtermwidget/src/src.pro -@@ -10,11 +10,11 @@ MOC_DIR = ../.moc - CONFIG(debug, debug|release) { - OBJECTS_DIR = ../.objs_d - TARGET = consoleq_d -- LIBS += -L.. ../libqtermwidget_d.a -+ LIBS += -L.. ../libqtermwidget_d.so - } else { - OBJECTS_DIR = ../.objs - TARGET = consoleq -- LIBS += -L.. ../libqtermwidget.a -+ LIBS += -L.. ../libqtermwidget.so - } - - SOURCES = main.cpp -@@ -24,4 +24,3 @@ INCLUDEPATH = ../lib - #LIBS += -L.. -lqtermwidget - - -- -\ Dosya sonunda yenisatır yok. diff --git a/qtermwidget/qtermwidget.nm b/qtermwidget/qtermwidget.nm deleted file mode 100644 index fd95ab5..0000000 --- a/qtermwidget/qtermwidget.nm +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = qtermwidget -version = 0.1 -release = 3 - -groups = /Tools -url = http://qtermwidget.sourceforge.net/ -license = GPLv2 -summary = A QT4 terminal emulation widget. - -description - QTermWidget is an opensource project based on KDE4 Konsole - application. The main goal of this project is to provide - unicode-enabled, embeddable QT4 widget for using as a built-in - console (or terminal emulation widget). -end - -source_dl = http://sourceforge.net/projects/%{name}/files/sources/%{version}/ - -build - requires - gcc-c++ - python-devel - qt-devel - end - - DIR_APP = %{DIR_SRC}/%{name} - - # XXX Why do we have to set this flag here ? - export QMAKESPEC=linux-g++ - - build - qmake - make #%{PARALLELISMFLAGS} - end - - install - # Install headers - mkdir -pv %{BUILDROOT}/usr/include/%{name} - cp -vf lib/*.h %{BUILDROOT}/usr/include/%{name} - - # Only install the library - mkdir -pv %{BUILDROOT}%{libdir} - cp -vf libqtermwidget.so.0 %{BUILDROOT}%{libdir} - ln -svf libqtermwidget.so.0 %{BUILDROOT}%{libdir}/libqtermwidget.so - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 27107f1f1130f66417293a426fb1693843f626a2
by git＠ipfire.org 01 Mar '13

01 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 27107f1f1130f66417293a426fb1693843f626a2 (commit) via 437d855524daccc0c2f7ae381a08ca4781667229 (commit) via bf5c2a8db987f9d52d373bc179b40f7d6143ccfc (commit) via 47a497b4ae12e4b761431ba040087ac4c1b2e759 (commit) via 7e104c8271e10b6fb2684321102a24806a2599d6 (commit) via 1914e110831f4ac41785f42516c59c67243f2693 (commit) via f0153b299b152df6720041ed8932af2302a7b21e (commit) via b7291cb81b5281d9c0cd18064d4ba9a37c7b564a (commit) via f1ac435ca9ab1c79ce1ff5ccbff919baf80ef141 (commit) via 0215b4b41f790c2c1a186440c94277fba6fe67a5 (commit) via 93ffa628da41c923c66ced9944a7e5ec27d58cd7 (commit) via 4244c79ed4a54dbbdf7e264b0e5937026bdff33c (commit) via bc299c55514340e28b3871829255a29f27a0bd9a (commit) via 74fedfcf23d2be0b4623cb400220996ab4c7ef79 (commit) via b2a701846fa22bfae83419e0500be0df690a0a3e (commit) via de0ddf3e269a4e05bd20b4ed23beb5d5bb5c7d84 (commit) via 3eb2a3e31028a3f2ff390fd17a9c26ffc4de9c9f (commit) via 5017af2db843784465dd491245825b79c0e24710 (commit) via 0a3b97b3b52241eca617f281a3ca7d3d217508c3 (commit) via 29ea991e1c752c04fad7f374328d4d13987c1f19 (commit) via 2822877645601ab2a4328defc8dac6fb7f388d3d (commit) via b23349df41aff9ed7ed2c5ce555cbb495499ed6d (commit) via fca127fc4f3922fdf06581e500a9cbf7914136bb (commit) from 9e50ef89c84cb2dfa1f41d9a9150875a772c4d08 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 27107f1f1130f66417293a426fb1693843f626a2 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 22:00:36 2013 +0100 python3-cairo: New package. commit 437d855524daccc0c2f7ae381a08ca4781667229 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 21:59:10 2013 +0100 json-glib: New package. commit bf5c2a8db987f9d52d373bc179b40f7d6143ccfc Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 21:57:45 2013 +0100 gnoe-themes-standard: New package. commit 47a497b4ae12e4b761431ba040087ac4c1b2e759 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 21:05:33 2013 +0100 gtk2: New package. commit 7e104c8271e10b6fb2684321102a24806a2599d6 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 21:04:03 2013 +0100 python-parted: Update to 3.9. This is a major update to the latest stable version. Enable build for python3. commit 1914e110831f4ac41785f42516c59c67243f2693 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 21:03:27 2013 +0100 pygobject3: New package. commit f0153b299b152df6720041ed8932af2302a7b21e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 21:02:11 2013 +0100 python-dbus: Update to 1.1.1. This is a major update to the latest stable release. Enable build for python3. commit b7291cb81b5281d9c0cd18064d4ba9a37c7b564a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 21:01:47 2013 +0100 mutter: New package. commit f1ac435ca9ab1c79ce1ff5ccbff919baf80ef141 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 21:01:05 2013 +0100 zenity: New package. commit 0215b4b41f790c2c1a186440c94277fba6fe67a5 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 21:00:36 2013 +0100 libtimezonemap: New package. commit 93ffa628da41c923c66ced9944a7e5ec27d58cd7 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 21:00:05 2013 +0100 libXinerama: New package. commit 4244c79ed4a54dbbdf7e264b0e5937026bdff33c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 20:59:43 2013 +0100 libXcursor: New package. commit bc299c55514340e28b3871829255a29f27a0bd9a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 20:59:08 2013 +0100 gsettings-desktop-schemas: New package. commit 74fedfcf23d2be0b4623cb400220996ab4c7ef79 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 20:58:38 2013 +0100 iso-codes: New package. commit b2a701846fa22bfae83419e0500be0df690a0a3e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 20:56:46 2013 +0100 cogl: New package. commit de0ddf3e269a4e05bd20b4ed23beb5d5bb5c7d84 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Feb 19 20:56:23 2013 +0100 clutter: New package. commit 3eb2a3e31028a3f2ff390fd17a9c26ffc4de9c9f Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Feb 18 18:25:37 2013 +0100 libatasmart: Update to 0.19. Major update to the latest stable version. commit 5017af2db843784465dd491245825b79c0e24710 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Feb 18 18:24:22 2013 +0100 libsoup: Update to 2.41.5. This is a major update to the latest stable version. Also enable support for introspection. commit 0a3b97b3b52241eca617f281a3ca7d3d217508c3 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Feb 18 18:22:56 2013 +0100 librsvg: Enable loader for pixbuf. commit 29ea991e1c752c04fad7f374328d4d13987c1f19 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 3 20:15:24 2013 +0100 gtk3: New package. commit 2822877645601ab2a4328defc8dac6fb7f388d3d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 3 20:14:34 2013 +0100 at-spi2-atk: New package. This package provides the atk-bridge which is required to build gtk3. commit b23349df41aff9ed7ed2c5ce555cbb495499ed6d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 3 20:13:54 2013 +0100 at-spi2-core: New package. This is a build dependency of at-spi2-atk and gtk3. commit fca127fc4f3922fdf06581e500a9cbf7914136bb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 3 20:13:01 2013 +0100 atk: New package. This is a build dependency of at-spi2 and gtk3. ----------------------------------------------------------------------- Summary of changes: at-spi2-atk/at-spi2-atk.nm | 60 +++++++++++ pango/pango.nm => at-spi2-core/at-spi2-core.nm | 48 ++++----- pango/pango.nm => atk/atk.nm | 45 ++++---- clutter/clutter.nm | 68 ++++++++++++ clutter/patches/clutter-1.13.4-xi23.patch | 65 ++++++++++++ clutter/patches/oob-device-fix.patch | 33 ++++++ cogl/cogl.nm | 80 +++++++++++++++ gnome-themes-standard/gnome-themes-standard.nm | 87 ++++++++++++++++ gnome-themes-standard/settings.ini | 7 ++ .../gsettings-desktop-schemas.nm | 56 ++++++++++ gtk2/gtk2.nm | 88 ++++++++++++++++ gtk3/gtk3.nm | 77 ++++++++++++++ librsvg2/librsvg2.nm => iso-codes/iso-codes.nm | 35 ++----- pango/pango.nm => json-glib/json-glib.nm | 28 ++--- libXcursor/index.theme | 2 + libXext/libXext.nm => libXcursor/libXcursor.nm | 23 +++-- libXext/libXext.nm => libXinerama/libXinerama.nm | 11 +- libatasmart/libatasmart.nm | 4 +- librsvg2/librsvg2.nm | 19 +++- libsoup/libsoup.nm | 22 ++-- .../libhtp.nm => libtimezonemap/libtimezonemap.nm | 32 +++--- mutter/mutter.nm | 107 +++++++++++++++++++ pygobject3/pygobject3.nm | 114 +++++++++++++++++++++ python-dbus/python-dbus.nm | 48 ++++++++- python-parted/python-parted.nm | 30 +++++- python3-cairo/python3-cairo.nm | 68 ++++++++++++ zenity/zenity.nm | 54 ++++++++++ 27 files changed, 1171 insertions(+), 140 deletions(-) create mode 100644 at-spi2-atk/at-spi2-atk.nm copy pango/pango.nm => at-spi2-core/at-spi2-core.nm (51%) copy pango/pango.nm => atk/atk.nm (54%) create mode 100644 clutter/clutter.nm create mode 100644 clutter/patches/clutter-1.13.4-xi23.patch create mode 100644 clutter/patches/oob-device-fix.patch create mode 100644 cogl/cogl.nm create mode 100644 gnome-themes-standard/gnome-themes-standard.nm create mode 100644 gnome-themes-standard/settings.ini create mode 100644 gsettings-desktop-schemas/gsettings-desktop-schemas.nm create mode 100644 gtk2/gtk2.nm create mode 100644 gtk3/gtk3.nm copy librsvg2/librsvg2.nm => iso-codes/iso-codes.nm (50%) copy pango/pango.nm => json-glib/json-glib.nm (62%) create mode 100644 libXcursor/index.theme copy libXext/libXext.nm => libXcursor/libXcursor.nm (55%) copy libXext/libXext.nm => libXinerama/libXinerama.nm (83%) copy libhtp/libhtp.nm => libtimezonemap/libtimezonemap.nm (57%) create mode 100644 mutter/mutter.nm create mode 100644 pygobject3/pygobject3.nm create mode 100644 python3-cairo/python3-cairo.nm create mode 100644 zenity/zenity.nm Difference in files: diff --git a/at-spi2-atk/at-spi2-atk.nm b/at-spi2-atk/at-spi2-atk.nm new file mode 100644 index 0000000..69fa4ad --- /dev/null +++ b/at-spi2-atk/at-spi2-atk.nm @@ -0,0 +1,60 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = at-spi2-atk +version = %{ver_major}.%{ver_minor} +ver_major = 2.7 +ver_minor = 3 +release = 1 + +groups = System/Libraries +url = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus +license = LGPLv2+ +summary = A GTK+ module that bridges ATK to D-Bus at-spi. + +description + The ATK library provides a set of interfaces for adding accessibility + support to applications and graphical user interface toolkits. +end + +source_dl = http://download.gnome.org/sources/%{name}/%{ver_major}/ +sources = %{thisapp}.tar.xz + +build + requires + at-spi2-core-devel + atk-devel + dbus-devel + dbus-glib-devel + glib2-devel + intltool + libxml2-devel + end + + configure_options += \ + --disable-gtk-doc-html \ + --disable-static + + install_cmds + # Remove unneedet files. + rm -rvf %{BUILDROOT}%{libdir}/gnome-settings* + rm -rvf %{BUILDROOT}%{libdir}/gtk-2* + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + + files += \ + %{datadir}/gir*/ + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/at-spi2-core/at-spi2-core.nm b/at-spi2-core/at-spi2-core.nm new file mode 100644 index 0000000..43007e7 --- /dev/null +++ b/at-spi2-core/at-spi2-core.nm @@ -0,0 +1,63 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = at-spi2-core +version = %{ver_major}.%{ver_minor} +ver_major = 2.7 +ver_minor = 4.1 +release = 1 + +groups = System/Libraries +url = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus +license = LGPLv2+ +summary = Protocol definitions and daemon for D-Bus at-spi. + +description + The ATK library provides a set of interfaces for adding accessibility + support to applications and graphical user interface toolkits. +end + +source_dl = http://download.gnome.org/sources/%{name}/%{ver_major}/ +sources = %{thisapp}.tar.xz + +build + requires + dbus-devel + intltool + glib2-devel + gobject-introspection-devel + libXtst-devel + libXext-devel + libXi-devel + end + + configure_options += \ + --disable-gtk-doc-html \ + --disable-static + + install_cmds + # Remove unneeded files for xdg. + rm -rvf %{BUILDROOT}%{sysconfdir}/xdg + end +end + +packages + package %{name} + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + + files += \ + %{datadir}/gir*/ + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/atk/atk.nm b/atk/atk.nm new file mode 100644 index 0000000..25679a3 --- /dev/null +++ b/atk/atk.nm @@ -0,0 +1,56 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = atk +version = %{ver_major}.%{ver_minor} +ver_major = 2.7 +ver_minor = 4 +release = 1 + +groups = System/Libraries +url = http://www.gnome.org +license = LGPLv2+ +summary = Interfaces for accessibility support. + +description + The ATK library provides a set of interfaces for adding accessibility + support to applications and graphical user interface toolkits. +end + +source_dl = http://download.gnome.org/sources/%{name}/%{ver_major}/ +sources = %{thisapp}.tar.xz + +build + requires + glib2-devel >= 2.31.2 + gobject-introspection-devel + end + + configure_options += \ + --enable-introspection=yes \ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --disable-static + + test + make check + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + + files += \ + %{datadir}/gir*/ + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/clutter/clutter.nm b/clutter/clutter.nm new file mode 100644 index 0000000..b6d7f77 --- /dev/null +++ b/clutter/clutter.nm @@ -0,0 +1,68 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = clutter +version = %{ver_maj}.%{ver_min} +ver_maj = 1.13 +ver_min = 4 +release = 1 + +groups = Development/Libraries +url = http://www.clutter-project.org/ +license = LGPLv2+ +summary = Open Source software library for creating rich graphical user \ + interfaces. + +description + Clutter is an open source software library for creating fast, + visually rich graphical user interfaces. The most obvious example + of potential usage is in media center type applications. + We hope however it can be used for a lot more. +end + +source_dl = http://download.gnome.org/sources/clutter/%{ver_maj}/ +sources = %{thisapp}.tar.xz + +build + requires + atk-devel + cairo-gobject-devel + gdk-pixbuf2-devel + glib2-devel + gobject-introspection-devel >= 0.9.6 + cogl-devel + gtk3-devel + json-glib-devel + libXcomposite-devel + libXdamage-devel + libXi-devel + libGL-devel + pango-devel + end + + configure_options += \ + --enable-xinput + + make_build_targets += V=1 +end + +packages + package %{name} + requires + libGL + end + end + + package %{name}-devel + template DEVEL + + files += \ + %{datadir}/gir*/ + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/clutter/patches/clutter-1.13.4-xi23.patch b/clutter/patches/clutter-1.13.4-xi23.patch new file mode 100644 index 0000000..b11c80c --- /dev/null +++ b/clutter/patches/clutter-1.13.4-xi23.patch @@ -0,0 +1,65 @@ +From b58a1d66816c19eda079a1bd7cecd1ad03644e69 Mon Sep 17 00:00:00 2001 +From: "Jasper St. Pierre" <jstpierre(a)mecheye.net> +Date: Wed, 23 Jan 2013 17:09:59 -0500 +Subject: [PATCH] x11: Always request XI2.2 + +The X server should fill in the minor version that it supports in the +case where it only supports the older version. We should not get a +BadRequest or fail the version check if we pass something higher. + +https://bugzilla.gnome.org/show_bug.cgi?id=692466 +--- + clutter/x11/clutter-backend-x11.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c +index 2d8f4ba..26f9581 100644 +--- a/clutter/x11/clutter-backend-x11.c ++++ b/clutter/x11/clutter-backend-x11.c +@@ -239,12 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11) + { + #ifdef HAVE_XINPUT_2 + int major = 2; +- +-#ifdef HAVE_XINPUT_2_2 + int minor = 2; +-#else +- int minor = 0; +-#endif /* HAVE_XINPUT_2_2 */ + + if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest) + { +-- +1.8.1.2 + +From 3e1450ba17fce90a8034cc525c67a87ff3cdd53d Mon Sep 17 00:00:00 2001 +From: "Jasper St. Pierre" <jstpierre(a)mecheye.net> +Date: Wed, 23 Jan 2013 14:49:26 -0500 +Subject: [PATCH] clutter-backend: Request XI2.3 + +Since XIQueryVersion, the bad API that it is, chooses the first client +version that it gets, we need to ensure that we pass XIQueryVersion the +new XI2.3 version, knowing fully well that Clutter won't be confused +by the new features. + +https://bugzilla.gnome.org/show_bug.cgi?id=692466 +--- + clutter/x11/clutter-backend-x11.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c +index 26f9581..1015f4c 100644 +--- a/clutter/x11/clutter-backend-x11.c ++++ b/clutter/x11/clutter-backend-x11.c +@@ -239,7 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11) + { + #ifdef HAVE_XINPUT_2 + int major = 2; +- int minor = 2; ++ int minor = 3; + + if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest) + { +-- +1.8.1.2 + diff --git a/clutter/patches/oob-device-fix.patch b/clutter/patches/oob-device-fix.patch new file mode 100644 index 0000000..cc59282 --- /dev/null +++ b/clutter/patches/oob-device-fix.patch @@ -0,0 +1,33 @@ +From d5604be9e5a148ced73dee2ede49b38f97119baf Mon Sep 17 00:00:00 2001 +From: Yanko Kaneti <yaneti(a)declera.com> +Date: Mon, 28 Jan 2013 15:49:51 +0200 +Subject: [PATCH] xi2: Fix access beyond array boundaries + +--- + clutter/x11/clutter-device-manager-xi2.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c +index 616dee7..bd9473e 100644 +--- a/clutter/x11/clutter-device-manager-xi2.c ++++ b/clutter/x11/clutter-device-manager-xi2.c +@@ -94,13 +94,13 @@ translate_valuator_class (Display *xdisplay, + atoms_initialized = TRUE; + } + +- for (i = CLUTTER_INPUT_AXIS_IGNORE; +- i < CLUTTER_INPUT_AXIS_LAST; ++ for (i = 0; ++ i < N_AXIS_ATOMS; + i += 1) + { + if (clutter_input_axis_atoms[i] == class->label) + { +- axis = i; ++ axis = i + 1; + break; + } + } +-- +1.8.1 + diff --git a/cogl/cogl.nm b/cogl/cogl.nm new file mode 100644 index 0000000..3a0f3de --- /dev/null +++ b/cogl/cogl.nm @@ -0,0 +1,80 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = cogl +version = %{ver_maj}.%{ver_min} +ver_maj = 1.13 +ver_min = 2 +release = 1 + +groups = Development/Libraries +url = http://www.clutter-project.org/ +license = LGPLv2+ +summary = A library for using 3D graphics hardware to draw pretty pictures + +description + Cogl is a small open source library for using 3D graphics hardware to draw + pretty pictures. The API departs from the flat state machine style of + OpenGL and is designed to make it easy to write orthogonal components that + can render without stepping on each others toes. + + As well aiming for a nice API, we think having a single library as opposed + to an API specification like OpenGL has a few advantages too; like being + able to paper over the inconsistencies/bugs of different OpenGL + implementations in a centralized place, not to mention the myriad of OpenGL + extensions. It also means we are in a better position to provide utility + APIs that help software developers since they only need to be implemented + once and there is no risk of inconsistency between implementations. + + Having other backends, besides OpenGL, such as drm, Gallium or D3D are + options we are interested in for the future. +end + +source_dl = http://download.gnome.org/sources/cogl/%{ver_maj}/ +sources = %{thisapp}.tar.xz + +build + requires + cairo-devel + gdk-pixbuf2-devel + glib2-devel + gobject-introspection-devel + libXcomposite-devel + libXdamage-devel + libXext-devel + libXfixes-devel + libGL-devel + pango-devel + end + + configure_options += \ + --enable-cairo \ + --enable-gdk-pixbuf \ + --enable-cogl-pango \ + --enable-glx \ + --enable-introspection=yes \ + --disable-gtk-doc + + make_build_targets += V=1 + + install_cmds + rm -vf %{BUILDROOT}%{datadir}/cogl/examples-data/crate.jpg + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + + files += \ + %{datadir}/gir*/ + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/gnome-themes-standard/gnome-themes-standard.nm b/gnome-themes-standard/gnome-themes-standard.nm new file mode 100644 index 0000000..cbb9f5f --- /dev/null +++ b/gnome-themes-standard/gnome-themes-standard.nm @@ -0,0 +1,87 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = gnome-themes-standard +version = 3.7.6 +release = 1 + +groups = +url = http://git.gnome.org/browse/gnome-themes-standard +license = LGPLv2+ +summary = Standard themes for GNOME applications. + +description + The gnome-themes-standard package contains the standard theme for the GNOME + desktop, which provides default appearance for cursors, desktop background, + window borders and GTK+ applications. +end + +source_dl = http://download.gnome.org/sources/%{name}/3.7/ +sources = %{thisapp}.tar.xz + +build + requires + /usr/bin/gtk-update-icon-cache + gtk3-devel >= 3.0.2 + librsvg2-devel + intltool + end + + configure_options += \ + --disable-static \ + --disable-gtk2-engine + + install_cmds + mkdir -pv %{BUILDROOT}%{sysconfdir}/gtk-3.0 + + install -m 0664 %{DIR_SOURCE}/settings.ini \ + %{BUILDROOT}%{sysconfdir}/gtk-3.0/ + end +end + +packages + package %{name} + requires + adwaita-cursor-theme = %{thisver} + adwaita-gtk3-theme = %{thisver} + end + end + + package adwaita-cursor-theme + arch = noarch + + summary = Adwaita cursor theme. + description + The adwaita-cursor-theme package contains a modern set of cursors originally + designed for the GNOME desktop. + end + + files + %{datadir}/icons/Adwaita + end + end + + package adwaita-gtk3-theme + summary = Adwaita gtk3 theme. + description + The adwaita-gtk3-theme package contains a gtk3 theme for presenting widgets + with a GNOME look and feel. + end + + files + %{libdir}/gtk-3.0/ + %{datadir}/themes/Adwaita/gtk-3.0 + %{sysconfdir}/gtk-3.0/settings.ini + end + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/gnome-themes-standard/settings.ini b/gnome-themes-standard/settings.ini new file mode 100644 index 0000000..aa23544 --- /dev/null +++ b/gnome-themes-standard/settings.ini @@ -0,0 +1,7 @@ +[Settings] +gtk-theme-name = Adwaita +gtk-icon-theme-name = gnome +gtk-cursor-theme-name = Adwaita +gtk-button-images = 0 +gtk-menu-images = 0 +gtk-auto-mnemonics = 0 diff --git a/gsettings-desktop-schemas/gsettings-desktop-schemas.nm b/gsettings-desktop-schemas/gsettings-desktop-schemas.nm new file mode 100644 index 0000000..ca34a80 --- /dev/null +++ b/gsettings-desktop-schemas/gsettings-desktop-schemas.nm @@ -0,0 +1,56 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = gsettings-desktop-schemas +version = %{ver_maj}.%{ver_min} +ver_maj = 3.7 +ver_min = 5 +release = 1 + +groups = System/Libraries +url = http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas +license = LGPLv2+ +summary = A collection of GSettings schemas + +description + gsettings-desktop-schemas contains a collection of GSettings schemas for + settings shared by various components of a desktop. +end + +source_dl = http://download.gnome.org/sources/%{name}/%{ver_maj}/ +sources = %{thisapp}.tar.xz + +build + requires + glib2 >= 2.31.0 + gobject-introspection-devel + intltool + end + + configure_options += \ + --disable-schemas-compile \ + --enable-introspection=yes + + make_build_targets += V=1 +end + +packages + package %{name} + script posttransin + glib-compile-schemas %{datadir}/glib-2.0/schemas &> /dev/null || : + end + + script postun + glib-compile-schemas %{datadir}/glib-2.0/schemas &> /dev/null || : + end + end + + package %{name}-devel + template DEVEL + + files += \ + %{datadir}/gir*/ + end +end diff --git a/gtk2/gtk2.nm b/gtk2/gtk2.nm new file mode 100644 index 0000000..b394d33 --- /dev/null +++ b/gtk2/gtk2.nm @@ -0,0 +1,88 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = gtk2 +version = %{ver_major}.%{ver_minor} +ver_major = 2.24 +ver_minor = 15 +release = 1 + +groups = System/Libraries +url = http://www.gtk.org +license = LGPLv2+ +summary = The GIMP Toolkit, a library for creating GUIs for X. + +description + GTK+ is a multi-platform toolkit for creating graphical user + interfaces. +end + +thisapp = gtk+-%{version} + +source_dl = http://download.gnome.org/sources/gtk+/%{ver_major}/ +sources = %{thisapp}.tar.xz + +build + requires + atk-devel + cairo-gobject-devel + gdk-pixbuf2-devel >= 2.26 + glib2-devel >= 2.35.3 + gobject-introspection-devel >= 1.32.0 + pango-devel >= 1.32.4 + libXcursor-devel + libXcomposite-devel + libXdamage-devel + libXfixes-devel + libXi-devel + libXrandr-devel + libXrender-devel + libpng-devel + end + + configure_options += \ + --enable-x11-backend \ + --enable-introspection=yes \ + --disable-gtk-doc-html + + install_cmds + # Remove unneeded files. + rm -rvf %{BUILDROOT}%{datadir}/gtk-3.0/demo + rm -rvf %{BUILDROOT}%{bindir}/*demo* + end +end + +packages + package %{name} + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + + requires + atk-devel + cairo-devel + gdk-pixbuf2-devel + glib2-devel + libpng-devel + libX11-devel + libXcursor-devel + libXcomposite-devel + libXfixes-devel + libXext-devel + libXi-devel + end + + files += \ + %{datadir}/gir*/ + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/gtk3/gtk3.nm b/gtk3/gtk3.nm new file mode 100644 index 0000000..d746080 --- /dev/null +++ b/gtk3/gtk3.nm @@ -0,0 +1,77 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = gtk3 +version = %{ver_major}.%{ver_minor} +ver_major = 3.7 +ver_minor = 6 +release = 1 + +groups = System/Libraries +url = http://www.gtk.org +license = LGPLv2+ +summary = The GIMP Toolkit, a library for creating GUIs for X. + +description + GTK+ is a multi-platform toolkit for creating graphical user + interfaces. +end + +thisapp = gtk+-%{version} + +source_dl = http://download.gnome.org/sources/gtk+/%{ver_major}/ +sources = %{thisapp}.tar.xz + +build + requires + atk-devel + at-spi2-atk-devel + cairo-gobject-devel + gdk-pixbuf2-devel >= 2.26 + glib2-devel >= 2.35.3 + gobject-introspection-devel >= 1.32.0 + pango-devel >= 1.32.4 + libXi-devel + libXrandr-devel + libXrender-devel + libXfixes-devel + libXdamage-devel + end + + configure_options += \ + --enable-x11-backend \ + --enable-introspection=yes \ + --disable-gtk2-dependency \ + --disable-wayland-backend \ + --disable-gtk-doc-html \ + --disable-colord \ + --disable-cups \ + --disable-papi + + install_cmds + # Remove unneeded files. + rm -rvf %{BUILDROOT}%{datadir}/gtk-3.0/demo + rm -rvf %{BUILDROOT}%{bindir}/*demo* + end +end + +packages + package %{name} + + package %{name}-libs + template LIBS + end + + package %{name}-devel + template DEVEL + + files += \ + %{datadir}/gir*/ + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/iso-codes/iso-codes.nm b/iso-codes/iso-codes.nm new file mode 100644 index 0000000..4710fde --- /dev/null +++ b/iso-codes/iso-codes.nm @@ -0,0 +1,37 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = iso-codes +version = 3.40 +release = 1 +arch = noarch + +groups = System/Base +url = http://alioth.debian.org/projects/pkg-isocodes/ +license = LGPLv2+ +summary = ISO code lists and translations. + +description + This package provides the ISO 639 Language code list, the ISO 4217 + Currency code list, the ISO 3166 Territory code list, and ISO 3166-2 + sub-territory lists, and all their translations in gettext format. +end + +source_dl = http://pkg-isocodes.alioth.debian.org/downloads/ +sources = %{thisapp}.tar.xz + +build + requires + gettext + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end +end diff --git a/json-glib/json-glib.nm b/json-glib/json-glib.nm new file mode 100644 index 0000000..76e105c --- /dev/null +++ b/json-glib/json-glib.nm @@ -0,0 +1,47 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = json-glib +version = %{ver_major}.%{ver_minor} +ver_major = 0.15 +ver_minor = 2 +release = 1 + +groups = System/Libraries +url = http://live.gnome.org/JsonGlib +license = LGPLv2+ +summary = Library for JavaScript Object Notation format. + +description + %{name} is a library providing serialization and deserialization support + for the JavaScript Object Notation (JSON) format. +end + +source_dl = http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{ver_major}/ +sources = %{thisapp}.tar.xz + +build + requires + glib2-devel + gobject-introspection-devel + pkg-config + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + + requires + glib2-devel + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/libXcursor/index.theme b/libXcursor/index.theme new file mode 100644 index 0000000..cda0b19 --- /dev/null +++ b/libXcursor/index.theme @@ -0,0 +1,2 @@ +[Icon Theme] +Inherits=Adwaita diff --git a/libXcursor/libXcursor.nm b/libXcursor/libXcursor.nm new file mode 100644 index 0000000..7c46086 --- /dev/null +++ b/libXcursor/libXcursor.nm @@ -0,0 +1,55 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = libXcursor +version = 1.1.13 +release = 1 + +maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> +groups = X/Libraries +url = http://www.x.org/ +license = MIT +summary = Cursor management library. + +description + This is a simple library designed to help locate and load cursors. + Cursors can be loaded from files or memory. A library of common cursors + exists which map to the standard X cursor names.Cursors can exist in + several sizes and the library automatically picks the best size. +end + +source_dl = ftp://ftp.x.org/pub/individual/lib/ + +build + requires + libX11-devel + libXfixes-devel + libXrender-devel >= 0.8.2 + xorg-x11-proto-devel + xorg-x11-util-macros + end + + configure_options += \ + --disable-static + + install_cmds + # Install index.theme. + mkdir -pv %{BUILDROOT}%{datadir}/icons/default + install -m 644 -p %{DIR_SOURCE}/index.theme \ + %{BUILDROOT}%{datadir}/icons/default/index.theme + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/libXinerama/libXinerama.nm b/libXinerama/libXinerama.nm new file mode 100644 index 0000000..c1afbbc --- /dev/null +++ b/libXinerama/libXinerama.nm @@ -0,0 +1,43 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = libXinerama +version = 1.1.2 +release = 1 + +maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> +groups = X/Libraries +url = http://www.x.org/ +license = MIT +summary = X.Org X11 libXinerama runtime library + +description + X.Org X11 libXinerama runtime library +end + +source_dl = ftp://ftp.x.org/pub/individual/lib/ + +build + requires + libX11-devel + libXext-devel + xorg-x11-proto-devel + end + + configure_options += \ + --disable-static +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/libatasmart/libatasmart.nm b/libatasmart/libatasmart.nm index f9a8dea..b0ebb5c 100644 --- a/libatasmart/libatasmart.nm +++ b/libatasmart/libatasmart.nm @@ -4,7 +4,7 @@ ############################################################################### name = libatasmart -version = 0.18 +version = 0.19 release = 1 groups = System/Statistics @@ -18,7 +18,7 @@ description end source_dl = http://0pointer.de/public/ -sources = %{thisapp}.tar.gz +sources = %{thisapp}.tar.xz build requires diff --git a/librsvg2/librsvg2.nm b/librsvg2/librsvg2.nm index 42d4129..0baa31c 100644 --- a/librsvg2/librsvg2.nm +++ b/librsvg2/librsvg2.nm @@ -6,7 +6,7 @@ name = librsvg2 version = 2.34.1 major_ver = 2.34 -release = 1 +release = 2 groups = System/Libraries url = @@ -32,13 +32,28 @@ build pango-devel end + export GDK_PIXBUF_QUERYLOADERS=%{bindir}/gdk-pixbuf-query-loaders + configure_options += \ --disable-static \ - --disable-gtk-theme + --disable-gtk-theme \ + enable_pixbuf_loader=yes end packages package %{name} + script postin + gdk-pixbuf-query-loaders --update-cache || : + end + + script postun + gdk-pixbuf-query-loaders --update-cache || : + end + + script postup + gdk-pixbuf-query-loaders --update-cache || : + end + end package %{name}-devel template DEVEL diff --git a/libsoup/libsoup.nm b/libsoup/libsoup.nm index 868ced3..c21ce96 100644 --- a/libsoup/libsoup.nm +++ b/libsoup/libsoup.nm @@ -4,7 +4,9 @@ ############################################################################### name = libsoup -version = 2.33.6 +version = %{ver_major}.%{ver_minor} +ver_major = 2.41 +ver_minor = 5 release = 1 groups = System/Libraries @@ -13,36 +15,44 @@ license = GPL summary = HTTP client/server library for GNOME. description - libsoup is an HTTP client/server library for GNOME. It uses GObjects \ - and the glib main loop, to integrate well with GNOME applications, \ + libsoup is an HTTP client/server library for GNOME. It uses GObjects + and the glib main loop, to integrate well with GNOME applications, and also has a synchronous API, for use in threaded applications. end -source_dl = +source_dl = http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{ver_major}/ +sources = %{thisapp}.tar.xz build requires - glib2-devel + glib2-devel >= 2.35.0 gnutls-devel + gobject-introspection-devel + intltool libgcrypt-devel libxml2-devel openssl-devel pkg-config + sqlite-devel zlib-devel end configure_options += \ + --enable-introspection=yes \ + --disable-tls-check \ --without-gnome end packages package %{name} - end package %{name}-devel template DEVEL requires = libxml2-devel + + files += \ + %{datadir}/gir*/ end package %{name}-debuginfo diff --git a/libtimezonemap/libtimezonemap.nm b/libtimezonemap/libtimezonemap.nm new file mode 100644 index 0000000..d34df8b --- /dev/null +++ b/libtimezonemap/libtimezonemap.nm @@ -0,0 +1,46 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = libtimezonemap +version = 0.3.2 +release = 1 + +groups = System/Libraries +url = https://launchpad.net/libtimezonemap +license = GPL +summary = GTK+3 timezone map widget. + +description + GTK+3 timezone map widget. +end + +source_dl = https://launchpad.net/ubuntu/+archive/primary/+files/ +sources = %{name}_%{version}.tar.gz + +build + requires + gtk3-devel + gobject-introspection-devel >= 1.35.4 + json-glib-devel + pkg-config + end + + DIR_APP = %{DIR_SRC}/timezonemap + + configure_options += \ + --enable-introspection=yes +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/mutter/mutter.nm b/mutter/mutter.nm new file mode 100644 index 0000000..085cab1 --- /dev/null +++ b/mutter/mutter.nm @@ -0,0 +1,107 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = mutter +version = %{ver_maj}.%{ver_min} +ver_maj = 3.7 +ver_min = 5 +release = 1 + +groups = UI/Desktops +url = http://www.clutter-project.org/ +license = GPLv2+ +summary = Window and compositing manager based on Clutter + +description + Mutter is a window and compositing manager that displays and manages + your desktop via OpenGL. Mutter combines a sophisticated display engine + using the Clutter toolkit with solid window-management logic inherited + from the Metacity window manager. + + While Mutter can be used stand-alone, it is primarily intended to be + used as the display core of a larger system such as gnome-shell or + Moblin. For this reason, Mutter is very extensible via plugins, which + are used both to add fancy visual effects and to rework the window + management behaviors to meet the needs of the environment. +end + +source_dl = http://download.gnome.org/sources/%{name}/%{ver_maj}/ +sources = %{thisapp}.tar.xz + +build + requires + clutter-devel + gobject-introspection-devel >= 0.9.6 + gsettings-desktop-schemas-devel + gtk3-devel >= 3.3.3 + intltool + libSM-devel + libX11-devel + libXcomposite-devel + libXcursor-devel + libXdamage-devel + libXext-devel + libXinerama-devel + libXrandr-devel + pango-devel + paxctl + zenity + end + + configure_options += \ + --enable-compile-warnings=maximum \ + --disable-static + + configure_cmds + SHOULD_HAVE_DEFINED="HAVE_SM HAVE_SHAPE HAVE_RANDR" + + for I in $SHOULD_HAVE_DEFINED; do + if ! grep -q "define $I" config.h; then + echo "$I was not defined in config.h" + grep "$I" config.h + exit 1 + else + echo "$I was defined as it should have been" + grep "$I" config.h + fi + done + end + + make_build_targets += V=1 + + install_cmds + # mutter requires to mmap some memory writable + # and executable at the same time. For that we + # disable the PAX_MPROTECT feature. + paxctl -m %{BUILDROOT}%{bindir}/mutter + end +end + +packages + package %{name} + requires + zenity + end + + script posttransin + glib-compile-schemas %{datadir}/glib-2.0/schemas &> /dev/null || : + end + + script postun + glib-compile-schemas %{datadir}/glib-2.0/schemas &> /dev/null || : + end + end + + package %{name}-devel + template DEVEL + + files += \ + %{datadir}/gir*/ + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/pygobject3/pygobject3.nm b/pygobject3/pygobject3.nm new file mode 100644 index 0000000..60e72d0 --- /dev/null +++ b/pygobject3/pygobject3.nm @@ -0,0 +1,114 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = pygobject3 +version = %{ver_major}.%{ver_minor} +ver_major = 3.7 +ver_minor = 4 +release = 1 + +groups = Development/Tools +url = http://www.pygtk.org/ +license = LGPLv2+ +summary = Python 2 bindings for GObject. + +description + The %{name} package provides a convenient wrapper for the GObject library + for use in Python programs. +end + +thisapp = pygobject-%{version} + +source_dl = http://ftp.gnome.org/pub/GNOME/sources/pygobject/%{ver_major}/ +sources = %{thisapp}.tar.xz + +build + requires + cairo-gobject-devel >= 1.12.12 + chrpath + glib2-devel >= 2.34.2 + gobject-introspection-devel >= 1.34.2 + pkg-config + python-cairo-devel + python3-cairo-devel + python-devel + python3-devel + end + + DIR_APP3 = %{DIR_APP}-python3 + + prepare_cmds + cp -av %{DIR_APP} %{DIR_APP3} + + pushd %{DIR_APP3} + find -name '*.py' | xargs sed -i '1s|^#!python|#!%{python3}|' + popd + + find -name '*.py' | xargs sed -i '1s|^#!python|#!%{python}|' + end + + build + pushd %{DIR_APP3} + export PYTHON=%{python3} + ./configure %{configure_options} + make %{PARALLELISMFLAGS} + popd + + export PYTHON=%{python} + ./configure %{configure_options} + make %{PARALELLISMFLAGS} + end + + install + pushd %{DIR_APP3} + export PYTHON=%{python3} + make install DESTDIR=%{BUILDROOT} + chrpath --delete %{BUILDROOT}%{python3_sitearch}/gi/{*.so,*/*.so} + popd + + export PYTHON=%{python} + make install DESTDIR=%{BUILDROOT} + chrpath --delete %{BUILDROOT}%{python_sitearch}/gi/{*.so,*/*.so} + end +end + +packages + package python-gobject3 + requires + gobject-introspection >= 1.34.2 + python-cairo + end + end + + package python3-gobject3 + template PYTHON3 + + requires + gobject-introspection >= 1.34.2 + python3-cairo + end + end + + package %{name}-devel + template DEVEL + + provides + python-gobject3-devel + python3-gobject3-devel + end + + requires + glib2-devel + gobject-introspection-devel >= 1.34.2 + end + + files += \ + %{libdir}/*python3*.so.* + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/python-dbus/python-dbus.nm b/python-dbus/python-dbus.nm index 660870d..c5e31fc 100644 --- a/python-dbus/python-dbus.nm +++ b/python-dbus/python-dbus.nm @@ -4,9 +4,8 @@ ############################################################################### name = python-dbus -version = 0.82.4 -release = 2 -thisapp = dbus-python-%{version} +version = 1.1.1 +release = 1 groups = System/Libraries url = http://www.freedesktop.org/software/dbus/ @@ -17,7 +16,9 @@ description D-Bus python bindings for use with python programs. end -source_dl = +thisapp = dbus-python-%{version} + +source_dl = http://dbus.freedesktop.org/releases/dbus-python/ build requires @@ -25,15 +26,54 @@ build dbus-glib-devel pkg-config python-devel + python3-devel end configure_options += \ --mandir=/usr/share/man + + DIR_APP3 = %{DIR_APP}-python3 + + prepare_cmds + cp -av %{DIR_APP} %{DIR_APP3} + + pushd %{DIR_APP3} + find -name '*.py' | xargs sed -i '1s|^#!python|#!%{python3}|' + popd + + find -name '*.py' | xargs sed -i '1s|^#!python|#!%{python}|' + end + + build + pushd %{DIR_APP3} + export PYTHON=%{python3} + ./configure %{configure_options} + make %{PARALLELISMFLAGS} + popd + + export PYTHON=%{python} + ./configure %{configure_options} + make %{PARALELLISMFLAGS} + end + + install + pushd %{DIR_APP3} + export PYTHON=%{python3} + make install DESTDIR=%{BUILDROOT} + popd + + export PYTHON=%{python} + make install DESTDIR=%{BUILDROOT} + end end packages package %{name} + package python3-dbus + template PYTHON3 + end + package %{name}-devel template DEVEL end diff --git a/python-parted/python-parted.nm b/python-parted/python-parted.nm index 24f9cbf..ccc6055 100644 --- a/python-parted/python-parted.nm +++ b/python-parted/python-parted.nm @@ -4,7 +4,7 @@ ############################################################################### name = python-parted -version = 3.0 +version = 3.9 release = 1 thisapp = pyparted-%{version} @@ -18,14 +18,34 @@ description partition tables. end -source_dl = +py3parted_version = 0.1 + +source_dl = \ + https://fedorahosted.org/releases/p/y/pyparted/ \ + https://github.com/cinnarch/py3parted/archive/ + +# Also download source tarball for py3parted. +sources += v%{py3parted_version}.tar.gz build requires - parted-devel + parted-devel >= 3.1 pkg-config python-decorator python-devel + python3-devel + end + + DIR_APP3 = %{DIR_SRC}/py3parted-%{py3parted_version} + + build_cmds + # Build py3parted. + cd %{DIR_APP3} && python3 setup.py build + end + + install_cmds + # Install py3parted. + cd %{DIR_APP3} && python3 setup.py install --root=%{BUILDROOT} end end @@ -37,6 +57,10 @@ packages end end + package python3-parted + template PYTHON3 + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/python3-cairo/python3-cairo.nm b/python3-cairo/python3-cairo.nm new file mode 100644 index 0000000..c8f04b1 --- /dev/null +++ b/python3-cairo/python3-cairo.nm @@ -0,0 +1,68 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = python3-cairo +version = 1.10.0 +release = 1 + +groups = Development/Tools +url = http://cairographics.org/pycairo +license = MPLv1.1 or LGPLv2 +summary = Python3 bindings for the cairo library. + +description + Python3 bindings for the cairo library. +end + +thisapp = pycairo-%{version} + +source_dl = http://cairographics.org/releases/ +sources = %{thisapp}.tar.bz2 + +build + requires + cairo-devel + pkg-config + python3-devel + end + + build + export PYTHON=python3 + %{python3} ./waf \ + --prefix=%{prefix} \ + --libdir=%{libdir} \ + configure + + %{python3} ./waf build -v + end + + install + # remove executable bits from examples + find ./examples/ -type f -print0 | xargs -0 chmod -x + + DESTDIR=%{BUILDROOT} %{python3} ./waf install + + # add executable bit to the .so libraries so we strip the debug info + find %{BUILDROOT} -name '*.so' | xargs chmod +x + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + + # The development headers need the cairo headers. + requires + cairo-devel + python3-devel + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/zenity/zenity.nm b/zenity/zenity.nm new file mode 100644 index 0000000..4ce567b --- /dev/null +++ b/zenity/zenity.nm @@ -0,0 +1,54 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = zenity +version = %{ver_maj}.%{ver_min} +ver_maj = 3.7 +ver_min = 2 +release = 1 + +groups = Applications/System +url = http://directory.fsf.org/zenity.html +license = LGPLv2+ +summary = Display dialog boxes from shell scripts + +description + Zenity lets you display Gtk+ dialog boxes from the command line and through + shell scripts. It is similar to gdialog, but is intended to be saner. It comes + from the same family as dialog, Xdialog, and cdialog. +end + +source_dl = http://download.gnome.org/sources/%{name}/%{ver_maj}/ +sources = %{thisapp}.tar.xz + +build + requires + gettext + gtk3-devel + intltool + which + end + + configure_options += \ + --disable-scrollkeeper \ + --disable-webkitgtk \ + ITSTOOL=true + + install_cmds + # we don't want a perl dependency just for this + rm -vf %{BUILDROOT}%{bindir}/gdialog + + # Remove help documents. + rm -rvf %{BUILDROOT}%{datadir}/help + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9e50ef89c84cb2dfa1f41d9a9150875a772c4d08
by git＠ipfire.org 01 Mar '13

01 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 9e50ef89c84cb2dfa1f41d9a9150875a772c4d08 (commit) via 4fa42d3f4a0faba8459d3c49b43ce895fc6d8a2a (commit) from 751cddcabf3da5fd0449fdd31cea3e2abc75323c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9e50ef89c84cb2dfa1f41d9a9150875a772c4d08 Merge: 4fa42d3 751cddc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 1 13:21:18 2013 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 4fa42d3f4a0faba8459d3c49b43ce895fc6d8a2a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 1 13:15:24 2013 +0100 python-urlgrabber: Import latest fixes from upstream. Basically this adds a patch against HEAD. ----------------------------------------------------------------------- Summary of changes: python-urlgrabber/patches/urlgrabber-HEAD.patch | 1756 ++++++++++++++++++++++- python-urlgrabber/python-urlgrabber.nm | 7 +- 2 files changed, 1705 insertions(+), 58 deletions(-) Difference in files: diff --git a/python-urlgrabber/patches/urlgrabber-HEAD.patch b/python-urlgrabber/patches/urlgrabber-HEAD.patch index 6627a1f..aaf9cbc 100644 --- a/python-urlgrabber/patches/urlgrabber-HEAD.patch +++ b/python-urlgrabber/patches/urlgrabber-HEAD.patch @@ -1,3 +1,16 @@ +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..1ffe416 +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,7 @@ ++*.py[co] ++MANIFEST ++dist ++build ++*.kdev* ++*.kateproject ++ipython.log* diff --git a/scripts/urlgrabber b/scripts/urlgrabber index 518e512..09cd896 100644 --- a/scripts/urlgrabber @@ -58,6 +71,104 @@ index 518e512..09cd896 100644 def help_doc(self): print __doc__ +diff --git a/scripts/urlgrabber-ext-down b/scripts/urlgrabber-ext-down +new file mode 100755 +index 0000000..3dafb12 +--- /dev/null ++++ b/scripts/urlgrabber-ext-down +@@ -0,0 +1,75 @@ ++#! /usr/bin/python ++# A very simple external downloader ++# Copyright 2011-2012 Zdenek Pavlas ++ ++# 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.1 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, ++# Boston, MA 02111-1307 USA ++ ++import time, os, errno, sys ++from urlgrabber.grabber import \ ++ _readlines, URLGrabberOptions, _loads, \ ++ PyCurlFileObject, URLGrabError ++ ++def write(fmt, *arg): ++ try: os.write(1, fmt % arg) ++ except OSError, e: ++ if e.args[0] != errno.EPIPE: raise ++ sys.exit(1) ++ ++class ProxyProgress: ++ def start(self, *d1, **d2): ++ self.next_update = 0 ++ def update(self, _amount_read): ++ t = time.time() ++ if t < self.next_update: return ++ self.next_update = t + 0.31 ++ write('%d %d\n', self._id, _amount_read) ++ ++def main(): ++ import signal ++ signal.signal(signal.SIGINT, lambda n, f: sys.exit(1)) ++ cnt = 0 ++ while True: ++ lines = _readlines(0) ++ if not lines: break ++ for line in lines: ++ cnt += 1 ++ opts = URLGrabberOptions() ++ opts._id = cnt ++ for k in line.split(' '): ++ k, v = k.split('=', 1) ++ setattr(opts, k, _loads(v)) ++ if opts.progress_obj: ++ opts.progress_obj = ProxyProgress() ++ opts.progress_obj._id = cnt ++ ++ dlsz = dltm = 0 ++ try: ++ fo = PyCurlFileObject(opts.url, opts.filename, opts) ++ fo._do_grab() ++ fo.fo.close() ++ size = fo._amount_read ++ if fo._tm_last: ++ dlsz = fo._tm_last[0] - fo._tm_first[0] ++ dltm = fo._tm_last[1] - fo._tm_first[1] ++ ug_err = 'OK' ++ except URLGrabError, e: ++ size = 0 ++ ug_err = '%d %s' % e.args ++ write('%d %d %d %.3f %s\n', opts._id, size, dlsz, dltm, ug_err) ++ ++if __name__ == '__main__': ++ main() +diff --git a/setup.py b/setup.py +index d0b87b8..bfa4a18 100644 +--- a/setup.py ++++ b/setup.py +@@ -15,8 +15,10 @@ url = _urlgrabber.__url__ + packages = ['urlgrabber'] + package_dir = {'urlgrabber':'urlgrabber'} + scripts = ['scripts/urlgrabber'] +-data_files = [('share/doc/' + name + '-' + version, +- ['README','LICENSE', 'TODO', 'ChangeLog'])] ++data_files = [ ++ ('share/doc/' + name + '-' + version, ['README','LICENSE', 'TODO', 'ChangeLog']), ++ ('libexec', ['scripts/urlgrabber-ext-down']), ++] + options = { 'clean' : { 'all' : 1 } } + classifiers = [ + 'Development Status :: 4 - Beta', diff --git a/test/base_test_code.py b/test/base_test_code.py index 50c6348..5fb43f9 100644 --- a/test/base_test_code.py @@ -125,10 +236,38 @@ index 3e5f3b7..8eeaeda 100644 return (fb,lb) diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py -index e090e90..b2770c5 100644 +index e090e90..6ce9861 100644 --- a/urlgrabber/grabber.py +++ b/urlgrabber/grabber.py -@@ -68,14 +68,14 @@ GENERAL ARGUMENTS (kwargs) +@@ -49,11 +49,26 @@ GENERAL ARGUMENTS (kwargs) + progress_obj = None + + a class instance that supports the following methods: +- po.start(filename, url, basename, length, text) ++ po.start(filename, url, basename, size, now, text) + # length will be None if unknown + po.update(read) # read == bytes read so far + po.end() + ++ multi_progress_obj = None ++ ++ a class instance that supports the following methods: ++ mo.start(total_files, total_size) ++ mo.newMeter() => meter ++ mo.removeMeter(meter) ++ mo.end() ++ ++ The 'meter' object is similar to progress_obj, but multiple ++ instances may be created and updated at the same time. ++ ++ When downloading multiple files in parallel and multi_progress_obj ++ is None progress_obj is used in compatibility mode: finished files ++ are shown but there's no in-progress display. ++ + text = None + + specifies alternative text to be passed to the progress meter +@@ -68,14 +83,14 @@ GENERAL ARGUMENTS (kwargs) (which can be set on default_grabber.throttle) is used. See BANDWIDTH THROTTLING for more information. @@ -150,7 +289,22 @@ index e090e90..b2770c5 100644 bandwidth = 0 -@@ -198,6 +198,12 @@ GENERAL ARGUMENTS (kwargs) +@@ -143,8 +158,12 @@ GENERAL ARGUMENTS (kwargs) + note that proxy authentication information may be provided using + normal URL constructs: + proxies={ 'http' : 'http://user:host@foo:3128' } +- Lastly, if proxies is None, the default environment settings will +- be used. ++ ++ libproxy = False ++ ++ Use the libproxy module (if installed) to find proxies. ++ The libproxy code is only used if the proxies dictionary ++ does not provide any proxies. + + prefix = None + +@@ -198,6 +217,12 @@ GENERAL ARGUMENTS (kwargs) control, you should probably subclass URLParser and pass it in via the 'urlparser' option. @@ -163,19 +317,108 @@ index e090e90..b2770c5 100644 ssl_ca_cert = None this option can be used if M2Crypto is available and will be -@@ -248,6 +254,11 @@ GENERAL ARGUMENTS (kwargs) +@@ -211,43 +236,75 @@ GENERAL ARGUMENTS (kwargs) + No-op when using the curl backend (default) + + +- self.ssl_verify_peer = True ++ ssl_verify_peer = True + + Check the server's certificate to make sure it is valid with what our CA validates + +- self.ssl_verify_host = True ++ ssl_verify_host = True + + Check the server's hostname to make sure it matches the certificate DN + +- self.ssl_key = None ++ ssl_key = None + + Path to the key the client should use to connect/authenticate with + +- self.ssl_key_type = 'PEM' ++ ssl_key_type = 'PEM' + + PEM or DER - format of key + +- self.ssl_cert = None ++ ssl_cert = None + + Path to the ssl certificate the client should use to to authenticate with + +- self.ssl_cert_type = 'PEM' ++ ssl_cert_type = 'PEM' + + PEM or DER - format of certificate + +- self.ssl_key_pass = None ++ ssl_key_pass = None + + password to access the ssl_key + +- self.size = None ++ size = None + + size (in bytes) or Maximum size of the thing being downloaded. + This is mostly to keep us from exploding with an endless datastream + +- self.max_header_size = 2097152 ++ max_header_size = 2097152 Maximum size (in bytes) of the headers. -+ self.ip_resolve = 'whatever' ++ ip_resolve = 'whatever' + + What type of name to IP resolving to use, default is to do both IPV4 and + IPV6. + ++ async = (key, limit) ++ ++ When this option is set, the urlgrab() is not processed immediately ++ but queued. parallel_wait() then processes grabs in parallel, limiting ++ the numer of connections in each 'key' group to at most 'limit'. ++ ++ max_connections ++ ++ The global connection limit. ++ ++ timedhosts ++ ++ The filename of the host download statistics. If defined, urlgrabber ++ will update the stats at the end of every download. At the end of ++ parallel_wait(), the updated stats are saved. If synchronous grabs ++ are used, you should call th_save(). ++ ++ default_speed, half_life ++ ++ These options only affect the async mirror selection code. ++ The default_speed option sets the speed estimate for mirrors ++ we have never downloaded from, and defaults to 1 MBps. ++ ++ The speed estimate also drifts exponentially from the speed ++ actually measured to the default speed, with default ++ period of 30 days. ++ RETRY RELATED ARGUMENTS -@@ -420,6 +431,7 @@ import time +@@ -328,6 +385,15 @@ RETRY RELATED ARGUMENTS + but it cannot (without severe trickiness) prevent the exception + from being raised. + ++ failfunc = None ++ ++ The callback that gets called when urlgrab request fails. ++ If defined, urlgrab() calls it instead of raising URLGrabError. ++ Callback syntax is identical to failure_callback. ++ ++ Contrary to failure_callback, it's called only once. It's primary ++ purpose is to use urlgrab() without a try/except block. ++ + interrupt_callback = None + + This callback is called if KeyboardInterrupt is received at any +@@ -420,6 +486,7 @@ import time import string import urllib import urllib2 @@ -183,7 +426,26 @@ index e090e90..b2770c5 100644 import mimetools import thread import types -@@ -439,6 +451,12 @@ try: +@@ -428,9 +495,17 @@ import pycurl + from ftplib import parse150 + from StringIO import StringIO + from httplib import HTTPException +-import socket ++import socket, select, fcntl + from byterange import range_tuple_normalize, range_tuple_to_header, RangeError + ++try: ++ import xattr ++ if not hasattr(xattr, 'set'): ++ xattr = None # This is a "newer" API. ++except ImportError: ++ xattr = None ++ ++ + ######################################################################## + # MODULE INITIALIZATION + ######################################################################## +@@ -439,6 +514,12 @@ try: except: __version__ = '???' @@ -196,7 +458,26 @@ index e090e90..b2770c5 100644 ######################################################################## # functions for debugging output. These functions are here because they # are also part of the module initialization. -@@ -527,6 +545,22 @@ def _(st): +@@ -504,6 +585,7 @@ def _init_default_logger(logspec=None): + else: handler = logging.FileHandler(filename) + handler.setFormatter(formatter) + DBOBJ = logging.getLogger('urlgrabber') ++ DBOBJ.propagate = False + DBOBJ.addHandler(handler) + DBOBJ.setLevel(level) + except (KeyError, ImportError, ValueError): +@@ -512,8 +594,8 @@ def _init_default_logger(logspec=None): + + def _log_package_state(): + if not DEBUG: return +- DEBUG.info('urlgrabber version = %s' % __version__) +- DEBUG.info('trans function "_" = %s' % _) ++ DEBUG.debug('urlgrabber version = %s' % __version__) ++ DEBUG.debug('trans function "_" = %s' % _) + + _init_default_logger() + _log_package_state() +@@ -527,6 +609,29 @@ def _(st): # END MODULE INITIALIZATION ######################################################################## @@ -213,13 +494,20 @@ index e090e90..b2770c5 100644 + obj = obj.encode('utf-8', errors) + return obj + ++def exception2msg(e): ++ try: ++ return str(e) ++ except UnicodeEncodeError: ++ # always use byte strings ++ return unicode(e).encode('utf8') ++ +######################################################################## +# END UTILITY FUNCTIONS +######################################################################## class URLGrabError(IOError): -@@ -662,6 +696,7 @@ class URLParser: +@@ -662,6 +767,7 @@ class URLParser: opts.quote = 0 --> do not quote it opts.quote = None --> guess """ @@ -227,15 +515,71 @@ index e090e90..b2770c5 100644 quote = opts.quote if opts.prefix: -@@ -800,6 +835,7 @@ class URLGrabberOptions: +@@ -768,6 +874,41 @@ class URLGrabberOptions: + else: # throttle is a float + return self.bandwidth * self.throttle + ++ def find_proxy(self, url, scheme): ++ """Find the proxy to use for this URL. ++ Use the proxies dictionary first, then libproxy. ++ """ ++ self.proxy = None ++ if scheme not in ('ftp', 'http', 'https'): ++ return ++ ++ if self.proxies: ++ proxy = self.proxies.get(scheme) ++ if proxy is None: ++ if scheme == 'http': ++ proxy = self.proxies.get('https') ++ elif scheme == 'https': ++ proxy = self.proxies.get('http') ++ if proxy == '_none_': ++ proxy = '' ++ self.proxy = proxy ++ return ++ ++ if self.libproxy: ++ global _libproxy_cache ++ if _libproxy_cache is None: ++ try: ++ import libproxy ++ _libproxy_cache = libproxy.ProxyFactory() ++ except: ++ _libproxy_cache = False ++ if _libproxy_cache: ++ for proxy in _libproxy_cache.getProxies(url): ++ if proxy.startswith('http://'): ++ if DEBUG: DEBUG.info('using proxy "%s" for url %s' % (proxy, url)) ++ self.proxy = proxy ++ break ++ + def derive(self, **kwargs): + """Create a derived URLGrabberOptions instance. + This method creates a new instance and overrides the +@@ -791,30 +932,37 @@ class URLGrabberOptions: + provided here. + """ + self.progress_obj = None ++ self.multi_progress_obj = None + self.throttle = 1.0 + self.bandwidth = 0 + self.retry = None + self.retrycodes = [-1,2,4,5,6,7] + self.checkfunc = None ++ self.failfunc = _do_raise + self.copy_local = 0 self.close_connection = 0 self.range = None self.user_agent = 'urlgrabber/%s' % __version__ + self.ip_resolve = None self.keepalive = 1 self.proxies = None ++ self.libproxy = False ++ self.proxy = None self.reget = None -@@ -808,13 +844,15 @@ class URLGrabberOptions: + self.failure_callback = None + self.interrupt_callback = None self.prefix = None self.opener = None self.cache_openers = True @@ -252,17 +596,109 @@ index e090e90..b2770c5 100644 self.ssl_ca_cert = None # sets SSL_CAINFO - path to certdb self.ssl_context = None # no-op in pycurl self.ssl_verify_peer = True # check peer's cert for authenticityb -@@ -846,7 +884,7 @@ class URLGrabberOptions: +@@ -827,6 +975,12 @@ class URLGrabberOptions: + self.size = None # if we know how big the thing we're getting is going + # to be. this is ultimately a MAXIMUM size for the file + self.max_header_size = 2097152 #2mb seems reasonable for maximum header size ++ self.async = None # blocking by default ++ self.mirror_group = None ++ self.max_connections = 5 ++ self.timedhosts = None ++ self.half_life = 30*24*60*60 # 30 days ++ self.default_speed = 1e6 # 1 MBit + + def __repr__(self): + return self.format() +@@ -846,7 +1000,18 @@ class URLGrabberOptions: s = s + indent + '}' return s -class URLGrabber: ++def _do_raise(obj): ++ raise obj.exception ++ ++def _run_callback(cb, obj): ++ if not cb: ++ return ++ if callable(cb): ++ return cb(obj) ++ cb, arg, karg = cb ++ return cb(obj, *arg, **karg) ++ +class URLGrabber(object): """Provides easy opening of URLs with a variety of options. All options are specified as kwargs. Options may be specified when -@@ -931,6 +969,9 @@ class URLGrabber: +@@ -872,7 +1037,6 @@ class URLGrabber: + # beware of infinite loops :) + tries = tries + 1 + exception = None +- retrycode = None + callback = None + if DEBUG: DEBUG.info('attempt %i/%s: %s', + tries, opts.retry, args[0]) +@@ -883,54 +1047,62 @@ class URLGrabber: + except URLGrabError, e: + exception = e + callback = opts.failure_callback +- retrycode = e.errno + except KeyboardInterrupt, e: + exception = e + callback = opts.interrupt_callback ++ if not callback: ++ raise + + if DEBUG: DEBUG.info('exception: %s', exception) + if callback: + if DEBUG: DEBUG.info('calling callback: %s', callback) +- cb_func, cb_args, cb_kwargs = self._make_callback(callback) + obj = CallbackObject(exception=exception, url=args[0], + tries=tries, retry=opts.retry) +- cb_func(obj, *cb_args, **cb_kwargs) ++ _run_callback(callback, obj) + + if (opts.retry is None) or (tries == opts.retry): + if DEBUG: DEBUG.info('retries exceeded, re-raising') + raise + ++ retrycode = getattr(exception, 'errno', None) + if (retrycode is not None) and (retrycode not in opts.retrycodes): + if DEBUG: DEBUG.info('retrycode (%i) not in list %s, re-raising', + retrycode, opts.retrycodes) + raise + +- def urlopen(self, url, **kwargs): ++ def urlopen(self, url, opts=None, **kwargs): + """open the url and return a file object + If a progress object or throttle value specified when this + object was created, then a special file object will be + returned that supports them. The file object can be treated + like any other file object. + """ +- opts = self.opts.derive(**kwargs) ++ url = _to_utf8(url) ++ opts = (opts or self.opts).derive(**kwargs) + if DEBUG: DEBUG.debug('combined options: %s' % repr(opts)) + (url,parts) = opts.urlparser.parse(url, opts) ++ opts.find_proxy(url, parts[0]) + def retryfunc(opts, url): + return PyCurlFileObject(url, filename=None, opts=opts) + return self._retry(opts, retryfunc, url) + +- def urlgrab(self, url, filename=None, **kwargs): ++ def urlgrab(self, url, filename=None, opts=None, **kwargs): + """grab the file at <url> and make a local copy at <filename> + If filename is none, the basename of the url is used. + urlgrab returns the filename of the local file, which may be + different from the passed-in filename if copy_local == 0. + """ +- opts = self.opts.derive(**kwargs) ++ url = _to_utf8(url) ++ opts = (opts or self.opts).derive(**kwargs) + if DEBUG: DEBUG.debug('combined options: %s' % repr(opts)) + (url,parts) = opts.urlparser.parse(url, opts) (scheme, host, path, parm, query, frag) = parts ++ opts.find_proxy(url, scheme) if filename is None: filename = os.path.basename( urllib.unquote(path) ) + if not filename: @@ -271,7 +707,97 @@ index e090e90..b2770c5 100644 if scheme == 'file' and not opts.copy_local: # just return the name of the local file - don't make a # copy currently -@@ -1030,7 +1071,7 @@ class URLGrabber: +@@ -950,41 +1122,51 @@ class URLGrabber: + + elif not opts.range: + if not opts.checkfunc is None: +- cb_func, cb_args, cb_kwargs = \ +- self._make_callback(opts.checkfunc) +- obj = CallbackObject() +- obj.filename = path +- obj.url = url +- apply(cb_func, (obj, )+cb_args, cb_kwargs) ++ obj = CallbackObject(filename=path, url=url) ++ _run_callback(opts.checkfunc, obj) + return path + ++ if opts.async: ++ opts.url = url ++ opts.filename = filename ++ opts.size = int(opts.size or 0) ++ _async_queue.append(opts) ++ return filename ++ + def retryfunc(opts, url, filename): + fo = PyCurlFileObject(url, filename, opts) + try: + fo._do_grab() ++ if fo._tm_last: ++ dlsz = fo._tm_last[0] - fo._tm_first[0] ++ dltm = fo._tm_last[1] - fo._tm_first[1] ++ _TH.update(url, dlsz, dltm, None) + if not opts.checkfunc is None: +- cb_func, cb_args, cb_kwargs = \ +- self._make_callback(opts.checkfunc) +- obj = CallbackObject() +- obj.filename = filename +- obj.url = url +- apply(cb_func, (obj, )+cb_args, cb_kwargs) ++ obj = CallbackObject(filename=filename, url=url) ++ _run_callback(opts.checkfunc, obj) + finally: + fo.close() + return filename + +- return self._retry(opts, retryfunc, url, filename) ++ try: ++ return self._retry(opts, retryfunc, url, filename) ++ except URLGrabError, e: ++ _TH.update(url, 0, 0, e) ++ opts.exception = e ++ return _run_callback(opts.failfunc, opts) + +- def urlread(self, url, limit=None, **kwargs): ++ def urlread(self, url, limit=None, opts=None, **kwargs): + """read the url into a string, up to 'limit' bytes + If the limit is exceeded, an exception will be thrown. Note + that urlread is NOT intended to be used as a way of saying + "I want the first N bytes" but rather 'read the whole file + into memory, but don't use too much' + """ +- opts = self.opts.derive(**kwargs) ++ url = _to_utf8(url) ++ opts = (opts or self.opts).derive(**kwargs) + if DEBUG: DEBUG.debug('combined options: %s' % repr(opts)) + (url,parts) = opts.urlparser.parse(url, opts) ++ opts.find_proxy(url, parts[0]) + if limit is not None: + limit = limit + 1 + +@@ -1000,12 +1182,8 @@ class URLGrabber: + else: s = fo.read(limit) + + if not opts.checkfunc is None: +- cb_func, cb_args, cb_kwargs = \ +- self._make_callback(opts.checkfunc) +- obj = CallbackObject() +- obj.data = s +- obj.url = url +- apply(cb_func, (obj, )+cb_args, cb_kwargs) ++ obj = CallbackObject(data=s, url=url) ++ _run_callback(opts.checkfunc, obj) + finally: + fo.close() + return s +@@ -1020,6 +1198,7 @@ class URLGrabber: + return s + + def _make_callback(self, callback_obj): ++ # not used, left for compatibility + if callable(callback_obj): + return callback_obj, (), {} + else: +@@ -1030,7 +1209,7 @@ class URLGrabber: default_grabber = URLGrabber() @@ -280,24 +806,47 @@ index e090e90..b2770c5 100644 def __init__(self, url, filename, opts): self.fo = None self._hdr_dump = '' -@@ -1052,9 +1093,15 @@ class PyCurlFileObject(): +@@ -1052,10 +1231,13 @@ class PyCurlFileObject(): self._reget_length = 0 self._prog_running = False self._error = (None, None) - self.size = None + self.size = 0 + self._hdr_ended = False ++ self._tm_first = None ++ self._tm_last = None self._do_open() +- + -+ def geturl(self): -+ """ Provide the geturl() method, used to be got from -+ urllib.addinfourl, via. urllib.URLopener.* """ -+ return self.url - def __getattr__(self, name): """This effectively allows us to wrap at the instance level. -@@ -1085,9 +1132,14 @@ class PyCurlFileObject(): + Any attribute not found in _this_ object will be searched for +@@ -1067,6 +1249,12 @@ class PyCurlFileObject(): + + def _retrieve(self, buf): + try: ++ tm = self._amount_read + len(buf), time.time() ++ if self._tm_first is None: ++ self._tm_first = tm ++ else: ++ self._tm_last = tm ++ + if not self._prog_running: + if self.opts.progress_obj: + size = self.size + self._reget_length +@@ -1079,15 +1267,24 @@ class PyCurlFileObject(): + self.opts.progress_obj.update(self._amount_read) + + self._amount_read += len(buf) +- self.fo.write(buf) ++ try: ++ self.fo.write(buf) ++ except IOError, e: ++ self._cb_error = URLGrabError(16, exception2msg(e)) ++ return -1 + return len(buf) + except KeyboardInterrupt: return -1 def _hdr_retrieve(self, buf): @@ -313,7 +862,7 @@ index e090e90..b2770c5 100644 try: self._hdr_dump += buf # we have to get the size before we do the progress obj start -@@ -1104,7 +1156,17 @@ class PyCurlFileObject(): +@@ -1104,7 +1301,17 @@ class PyCurlFileObject(): s = parse150(buf) if s: self.size = int(s) @@ -327,12 +876,12 @@ index e090e90..b2770c5 100644 + + if len(self._hdr_dump) != 0 and buf == '\r\n': + self._hdr_ended = True -+ if DEBUG: DEBUG.info('header ended:') ++ if DEBUG: DEBUG.debug('header ended:') + return len(buf) except KeyboardInterrupt: return pycurl.READFUNC_ABORT -@@ -1113,8 +1175,10 @@ class PyCurlFileObject(): +@@ -1113,8 +1320,10 @@ class PyCurlFileObject(): if self._parsed_hdr: return self._parsed_hdr statusend = self._hdr_dump.find('\n') @@ -343,13 +892,24 @@ index e090e90..b2770c5 100644 self._parsed_hdr = mimetools.Message(hdrfp) return self._parsed_hdr -@@ -1136,11 +1200,21 @@ class PyCurlFileObject(): +@@ -1127,6 +1336,9 @@ class PyCurlFileObject(): + if not opts: + opts = self.opts + ++ # keepalives ++ if not opts.keepalive: ++ self.curl_obj.setopt(pycurl.FORBID_REUSE, 1) + + # defaults we're always going to set + self.curl_obj.setopt(pycurl.NOPROGRESS, False) +@@ -1136,11 +1348,21 @@ class PyCurlFileObject(): self.curl_obj.setopt(pycurl.PROGRESSFUNCTION, self._progress_update) self.curl_obj.setopt(pycurl.FAILONERROR, True) self.curl_obj.setopt(pycurl.OPT_FILETIME, True) + self.curl_obj.setopt(pycurl.FOLLOWLOCATION, True) - if DEBUG: +- if DEBUG: ++ if DEBUG and DEBUG.level <= 10: self.curl_obj.setopt(pycurl.VERBOSE, True) if opts.user_agent: self.curl_obj.setopt(pycurl.USERAGENT, opts.user_agent) @@ -365,7 +925,7 @@ index e090e90..b2770c5 100644 # maybe to be options later self.curl_obj.setopt(pycurl.FOLLOWLOCATION, True) -@@ -1148,9 +1222,11 @@ class PyCurlFileObject(): +@@ -1148,9 +1370,11 @@ class PyCurlFileObject(): # timeouts timeout = 300 @@ -375,16 +935,57 @@ index e090e90..b2770c5 100644 + if hasattr(opts, 'timeout'): + timeout = int(opts.timeout or 0) + self.curl_obj.setopt(pycurl.CONNECTTIMEOUT, timeout) -+ self.curl_obj.setopt(pycurl.LOW_SPEED_LIMIT, 1) ++ self.curl_obj.setopt(pycurl.LOW_SPEED_LIMIT, 1000) + self.curl_obj.setopt(pycurl.LOW_SPEED_TIME, timeout) # ssl options if self.scheme == 'https': -@@ -1203,12 +1279,19 @@ class PyCurlFileObject(): - if proxy == '_none_': proxy = "" - self.curl_obj.setopt(pycurl.PROXY, proxy) +@@ -1158,13 +1382,16 @@ class PyCurlFileObject(): + self.curl_obj.setopt(pycurl.CAPATH, opts.ssl_ca_cert) + self.curl_obj.setopt(pycurl.CAINFO, opts.ssl_ca_cert) + self.curl_obj.setopt(pycurl.SSL_VERIFYPEER, opts.ssl_verify_peer) +- self.curl_obj.setopt(pycurl.SSL_VERIFYHOST, opts.ssl_verify_host) ++ if opts.ssl_verify_host: # 1 is meaningless to curl ++ self.curl_obj.setopt(pycurl.SSL_VERIFYHOST, 2) + if opts.ssl_key: + self.curl_obj.setopt(pycurl.SSLKEY, opts.ssl_key) + if opts.ssl_key_type: + self.curl_obj.setopt(pycurl.SSLKEYTYPE, opts.ssl_key_type) + if opts.ssl_cert: + self.curl_obj.setopt(pycurl.SSLCERT, opts.ssl_cert) ++ # if we have a client side cert - turn off reuse b/c nss is odd ++ self.curl_obj.setopt(pycurl.FORBID_REUSE, 1) + if opts.ssl_cert_type: + self.curl_obj.setopt(pycurl.SSLCERTTYPE, opts.ssl_cert_type) + if opts.ssl_key_pass: +@@ -1187,28 +1414,26 @@ class PyCurlFileObject(): + if hasattr(opts, 'raw_throttle') and opts.raw_throttle(): + self.curl_obj.setopt(pycurl.MAX_RECV_SPEED_LARGE, int(opts.raw_throttle())) +- # proxy settings +- if opts.proxies: +- for (scheme, proxy) in opts.proxies.items(): +- if self.scheme in ('ftp'): # only set the ftp proxy for ftp items +- if scheme not in ('ftp'): +- continue +- else: +- if proxy == '_none_': proxy = "" +- self.curl_obj.setopt(pycurl.PROXY, proxy) +- elif self.scheme in ('http', 'https'): +- if scheme not in ('http', 'https'): +- continue +- else: +- if proxy == '_none_': proxy = "" +- self.curl_obj.setopt(pycurl.PROXY, proxy) +- - # FIXME username/password/auth settings ++ # proxy ++ if opts.proxy is not None: ++ self.curl_obj.setopt(pycurl.PROXY, opts.proxy) ++ self.curl_obj.setopt(pycurl.PROXYAUTH, ++ # All but Kerberos. BZ 769254 ++ pycurl.HTTPAUTH_ANY - pycurl.HTTPAUTH_GSSNEGOTIATE) ++ + if opts.username and opts.password: + if self.scheme in ('http', 'https'): + self.curl_obj.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_ANY) @@ -402,7 +1003,7 @@ index e090e90..b2770c5 100644 # our url self.curl_obj.setopt(pycurl.URL, self.url) -@@ -1228,12 +1311,14 @@ class PyCurlFileObject(): +@@ -1228,39 +1453,36 @@ class PyCurlFileObject(): code = self.http_code errcode = e.args[0] @@ -411,16 +1012,19 @@ index e090e90..b2770c5 100644 if self._error[0]: errcode = self._error[0] - if errcode == 23 and code >= 200 and code < 299: +- if errcode == 23 and code >= 200 and code < 299: - err = URLGrabError(15, _('User (or something) called abort %s: %s') % (self.url, e)) - err.url = self.url -+ err = URLGrabError(15, _('User (or something) called abort %s: %s') % (errurl, e)) -+ err.url = errurl - +- ++ if errcode == 23 and 200 <= code <= 299: # this is probably wrong but ultimately this is what happens # we have a legit http code and a pycurl 'writer failed' code -@@ -1244,23 +1329,23 @@ class PyCurlFileObject(): - raise KeyboardInterrupt + # which almost always means something aborted it from outside + # since we cannot know what it is -I'm banking on it being + # a ctrl-c. XXXX - if there's a way of going back two raises to + # figure out what aborted the pycurl process FIXME +- raise KeyboardInterrupt ++ raise getattr(self, '_cb_error', KeyboardInterrupt) elif errcode == 28: - err = URLGrabError(12, _('Timeout on %s: %s') % (self.url, e)) @@ -445,12 +1049,10 @@ index e090e90..b2770c5 100644 elif errcode == 42: - err = URLGrabError(15, _('User (or something) called abort %s: %s') % (self.url, e)) - err.url = self.url -+ err = URLGrabError(15, _('User (or something) called abort %s: %s') % (errurl, e)) -+ err.url = errurl # this is probably wrong but ultimately this is what happens # we have a legit http code and a pycurl 'writer failed' code # which almost always means something aborted it from outside -@@ -1272,33 +1357,93 @@ class PyCurlFileObject(): +@@ -1272,33 +1494,94 @@ class PyCurlFileObject(): elif errcode == 58: msg = _("problem with the local client certificate") err = URLGrabError(14, msg) @@ -477,8 +1079,9 @@ index e090e90..b2770c5 100644 + err.url = errurl raise err - elif str(e.args[1]) == '' and self.http_code != 0: # fake it until you make it +- elif str(e.args[1]) == '' and self.http_code != 0: # fake it until you make it - msg = 'HTTP Error %s : %s ' % (self.http_code, self.url) ++ elif str(e.args[1]) == '' and code and not 200 <= code <= 299: + if self.scheme in ['http', 'https']: + if self.http_code in responses: + resp = responses[self.http_code] @@ -519,6 +1122,7 @@ index e090e90..b2770c5 100644 + 42 : _("Aborted by callback"), + 47 : _("Too many redirects"), + 51 : _("Peer certificate failed verification"), ++ 52 : _("Got nothing: SSL certificate expired?"), + 53 : _("SSL engine not found"), + 54 : _("SSL engine set failed"), + 55 : _("Network error send()"), @@ -545,13 +1149,13 @@ index e090e90..b2770c5 100644 + else: + if self._error[1]: + msg = self._error[1] -+ err = URLGRabError(14, msg) ++ err = URLGrabError(14, msg) + err.url = urllib.unquote(self.url) + raise err def _do_open(self): self.curl_obj = _curl_cache -@@ -1333,7 +1478,11 @@ class PyCurlFileObject(): +@@ -1333,7 +1616,11 @@ class PyCurlFileObject(): if self.opts.range: rt = self.opts.range @@ -564,13 +1168,15 @@ index e090e90..b2770c5 100644 if rt: header = range_tuple_to_header(rt) -@@ -1434,9 +1583,13 @@ class PyCurlFileObject(): +@@ -1434,21 +1721,46 @@ class PyCurlFileObject(): #fh, self._temp_name = mkstemp() #self.fo = open(self._temp_name, 'wb') - - self._do_perform() - +- +- + try: + self._do_perform() + except URLGrabError, e: @@ -578,10 +1184,19 @@ index e090e90..b2770c5 100644 + self.fo.close() + raise e + - - if _was_filename: -@@ -1446,9 +1599,23 @@ class PyCurlFileObject(): + # close it up + self.fo.flush() + self.fo.close() ++ ++ # Set the URL where we got it from: ++ if xattr is not None: ++ # See: http://www.freedesktop.org/wiki/CommonExtendedAttributes ++ try: ++ xattr.set(self.filename, 'user.xdg.origin.url', self.url) ++ except: ++ pass # URL too long. = IOError ... ignore everything. ++ # set the time mod_time = self.curl_obj.getinfo(pycurl.INFO_FILETIME) if mod_time != -1: @@ -607,7 +1222,14 @@ index e090e90..b2770c5 100644 else: #self.fo = open(self._temp_name, 'r') self.fo.seek(0) -@@ -1532,11 +1699,14 @@ class PyCurlFileObject(): +@@ -1526,17 +1838,20 @@ class PyCurlFileObject(): + if self._prog_running: + downloaded += self._reget_length + self.opts.progress_obj.update(downloaded) +- except KeyboardInterrupt: ++ except (KeyboardInterrupt, IOError): + return -1 + def _over_max_size(self, cur, max_size=None): if not max_size: @@ -626,7 +1248,7 @@ index e090e90..b2770c5 100644 msg = _("Downloaded more than max size for %s: %s > %s") \ % (self.url, cur, max_size) -@@ -1544,13 +1714,6 @@ class PyCurlFileObject(): +@@ -1544,13 +1859,6 @@ class PyCurlFileObject(): return True return False @@ -640,7 +1262,7 @@ index e090e90..b2770c5 100644 def read(self, amt=None): self._fill_buffer(amt) if amt is None: -@@ -1582,9 +1745,21 @@ class PyCurlFileObject(): +@@ -1582,9 +1890,21 @@ class PyCurlFileObject(): self.opts.progress_obj.end(self._amount_read) self.fo.close() @@ -658,25 +1280,568 @@ index e090e90..b2770c5 100644 + _curl_cache.close() + _curl_cache = pycurl.Curl() + -+ ++_libproxy_cache = None + ##################################################################### # DEPRECATED FUNCTIONS +@@ -1621,6 +1941,478 @@ def retrygrab(url, filename=None, copy_local=0, close_connection=0, + + + ##################################################################### ++# Serializer + parser: A replacement of the rather bulky Json code. ++# ++# - handles basic python literals, lists and tuples. ++# - serialized strings never contain ' ' or '\n' ++# ++##################################################################### ++ ++_quoter_map = {} ++for c in '%[(,)] \n': ++ _quoter_map[c] = '%%%02x' % ord(c) ++del c ++ ++def _dumps(v): ++ if v is None: return 'None' ++ if v is True: return 'True' ++ if v is False: return 'False' ++ if type(v) in (int, long, float): ++ return str(v) ++ if type(v) == unicode: ++ v = v.encode('UTF8') ++ if type(v) == str: ++ def quoter(c): return _quoter_map.get(c, c) ++ return "'%s'" % ''.join(map(quoter, v)) ++ if type(v) == tuple: ++ return "(%s)" % ','.join(map(_dumps, v)) ++ if type(v) == list: ++ return "[%s]" % ','.join(map(_dumps, v)) ++ raise TypeError, 'Can\'t serialize %s' % v ++ ++def _loads(s): ++ def decode(v): ++ if v == 'None': return None ++ if v == 'True': return True ++ if v == 'False': return False ++ try: return int(v) ++ except ValueError: pass ++ try: return float(v) ++ except ValueError: pass ++ if len(v) >= 2 and v[0] == v[-1] == "'": ++ ret = []; i = 1 ++ while True: ++ j = v.find('%', i) ++ ret.append(v[i:j]) # skips the final "'" ++ if j == -1: break ++ ret.append(chr(int(v[j + 1:j + 3], 16))) ++ i = j + 3 ++ v = ''.join(ret) ++ return v ++ stk = None ++ l = [] ++ i = j = 0 ++ while True: ++ if j == len(s) or s[j] in ',)]': ++ if j > i: ++ l.append(decode(s[i:j])) ++ if j == len(s): break ++ if s[j] in ')]': ++ if s[j] == ')': ++ l = tuple(l) ++ stk[0].append(l) ++ l, stk = stk ++ i = j = j + 1 ++ elif s[j] in '[(': ++ stk = l, stk ++ l = [] ++ i = j = j + 1 ++ else: ++ j += 1 # safe because '[(,)]' are quoted ++ if stk: raise ValueError ++ if len(l) == 1: l = l[0] ++ return l ++ ++ ++##################################################################### ++# External downloader process ++##################################################################### ++ ++def _readlines(fd): ++ buf = os.read(fd, 4096) ++ if not buf: return None ++ # whole lines only, no buffering ++ while buf[-1] != '\n': ++ buf += os.read(fd, 4096) ++ return buf[:-1].split('\n') ++ ++import subprocess ++ ++class _ExternalDownloader: ++ def __init__(self): ++ self.popen = subprocess.Popen( ++ '/usr/libexec/urlgrabber-ext-down', ++ stdin = subprocess.PIPE, ++ stdout = subprocess.PIPE, ++ ) ++ self.stdin = self.popen.stdin.fileno() ++ self.stdout = self.popen.stdout.fileno() ++ self.running = {} ++ self.cnt = 0 ++ ++ # list of options we pass to downloader ++ _options = ( ++ 'url', 'filename', ++ 'timeout', 'close_connection', 'keepalive', ++ 'throttle', 'bandwidth', 'range', 'reget', ++ 'user_agent', 'http_headers', 'ftp_headers', ++ 'proxy', 'prefix', 'username', 'password', ++ 'ssl_ca_cert', ++ 'ssl_cert', 'ssl_cert_type', ++ 'ssl_key', 'ssl_key_type', ++ 'ssl_key_pass', ++ 'ssl_verify_peer', 'ssl_verify_host', ++ 'size', 'max_header_size', 'ip_resolve', ++ ) ++ ++ def start(self, opts): ++ arg = [] ++ for k in self._options: ++ v = getattr(opts, k) ++ if v is None: continue ++ arg.append('%s=%s' % (k, _dumps(v))) ++ if opts.progress_obj and opts.multi_progress_obj: ++ arg.append('progress_obj=True') ++ arg = ' '.join(arg) ++ if DEBUG: DEBUG.info('attempt %i/%s: %s', opts.tries, opts.retry, opts.url) ++ ++ self.cnt += 1 ++ self.running[self.cnt] = opts ++ os.write(self.stdin, arg +'\n') ++ ++ def perform(self): ++ ret = [] ++ lines = _readlines(self.stdout) ++ if not lines: ++ if DEBUG: DEBUG.info('downloader died') ++ raise KeyboardInterrupt ++ for line in lines: ++ # parse downloader output ++ line = line.split(' ', 5) ++ _id, size = map(int, line[:2]) ++ if len(line) == 2: ++ self.running[_id]._progress.update(size) ++ continue ++ # job done ++ opts = self.running.pop(_id) ++ if line[4] == 'OK': ++ ug_err = None ++ if DEBUG: DEBUG.info('success') ++ else: ++ ug_err = URLGrabError(int(line[4]), line[5]) ++ if DEBUG: DEBUG.info('failure: %s', ug_err) ++ _TH.update(opts.url, int(line[2]), float(line[3]), ug_err, opts.async[0]) ++ ret.append((opts, size, ug_err)) ++ return ret ++ ++ def abort(self): ++ self.popen.stdin.close() ++ self.popen.stdout.close() ++ self.popen.wait() ++ ++class _ExternalDownloaderPool: ++ def __init__(self): ++ self.epoll = select.epoll() ++ self.running = {} ++ self.cache = {} ++ ++ def start(self, opts): ++ host = urlparse.urlsplit(opts.url).netloc ++ dl = self.cache.pop(host, None) ++ if not dl: ++ dl = _ExternalDownloader() ++ fl = fcntl.fcntl(dl.stdin, fcntl.F_GETFD) ++ fcntl.fcntl(dl.stdin, fcntl.F_SETFD, fl | fcntl.FD_CLOEXEC) ++ self.epoll.register(dl.stdout, select.EPOLLIN) ++ self.running[dl.stdout] = dl ++ dl.start(opts) ++ ++ def perform(self): ++ ret = [] ++ for fd, event in self.epoll.poll(): ++ if event & select.EPOLLHUP: ++ if DEBUG: DEBUG.info('downloader died') ++ raise KeyboardInterrupt ++ assert event & select.EPOLLIN ++ done = self.running[fd].perform() ++ if not done: continue ++ assert len(done) == 1 ++ ret.extend(done) ++ ++ # dl finished, move it to the cache ++ host = urlparse.urlsplit(done[0][0].url).netloc ++ if host in self.cache: self.cache[host].abort() ++ self.epoll.unregister(fd) ++ self.cache[host] = self.running.pop(fd) ++ return ret ++ ++ def abort(self): ++ for dl in self.running.values(): ++ self.epoll.unregister(dl.stdout) ++ dl.abort() ++ for dl in self.cache.values(): ++ dl.abort() ++ ++ ++##################################################################### ++# High level async API ++##################################################################### ++ ++_async_queue = [] ++ ++def parallel_wait(meter=None): ++ '''Process queued requests in parallel. ++ ''' ++ ++ # calculate total sizes ++ meters = {} ++ for opts in _async_queue: ++ if opts.progress_obj and opts.multi_progress_obj: ++ count, total = meters.get(opts.multi_progress_obj) or (0, 0) ++ meters[opts.multi_progress_obj] = count + 1, total + opts.size ++ ++ # start multi-file meters ++ for meter in meters: ++ count, total = meters[meter] ++ meter.start(count, total) ++ ++ dl = _ExternalDownloaderPool() ++ host_con = {} # current host connection counts ++ ++ def start(opts, tries): ++ opts.tries = tries ++ try: ++ dl.start(opts) ++ except OSError, e: ++ # can't spawn downloader, give up immediately ++ opts.exception = URLGrabError(5, exception2msg(e)) ++ _run_callback(opts.failfunc, opts) ++ return ++ ++ key, limit = opts.async ++ host_con[key] = host_con.get(key, 0) + 1 ++ if opts.progress_obj: ++ if opts.multi_progress_obj: ++ opts._progress = opts.multi_progress_obj.newMeter() ++ opts._progress.start(text=opts.text) ++ else: ++ opts._progress = time.time() # no updates ++ ++ def perform(): ++ for opts, size, ug_err in dl.perform(): ++ key, limit = opts.async ++ host_con[key] -= 1 ++ ++ if ug_err is None: ++ if opts.checkfunc: ++ try: _run_callback(opts.checkfunc, opts) ++ except URLGrabError, ug_err: pass ++ ++ if opts.progress_obj: ++ if opts.multi_progress_obj: ++ if ug_err: ++ opts._progress.failure(None) ++ else: ++ opts.multi_progress_obj.re.total += size - opts.size # correct totals ++ opts._progress.end(size) ++ opts.multi_progress_obj.removeMeter(opts._progress) ++ else: ++ opts.progress_obj.start(text=opts.text, now=opts._progress) ++ opts.progress_obj.update(size) ++ opts.progress_obj.end(size) ++ del opts._progress ++ ++ if ug_err is None: ++ continue ++ ++ retry = opts.retry or 0 ++ if opts.failure_callback: ++ opts.exception = ug_err ++ try: _run_callback(opts.failure_callback, opts) ++ except URLGrabError, ug_err: ++ retry = 0 # no retries ++ if opts.tries < retry and ug_err.errno in opts.retrycodes: ++ start(opts, opts.tries + 1) # simple retry ++ continue ++ ++ if opts.mirror_group: ++ mg, errors, failed, removed = opts.mirror_group ++ errors.append((opts.url, exception2msg(ug_err))) ++ failed[key] = failed.get(key, 0) + 1 ++ opts.mirror = key ++ opts.exception = ug_err ++ action = mg.default_action or {} ++ if mg.failure_callback: ++ opts.tries = len(errors) ++ action = dict(action) # update only the copy ++ action.update(_run_callback(mg.failure_callback, opts)) ++ if not action.get('fail', 0): ++ # mask this mirror and retry ++ if action.get('remove', 1): ++ removed.add(key) ++ _async_queue.append(opts) ++ continue ++ # fail=1 from callback ++ ug_err.errors = errors ++ ++ # urlgrab failed ++ opts.exception = ug_err ++ _run_callback(opts.failfunc, opts) ++ ++ try: ++ idx = 0 ++ while True: ++ if idx >= len(_async_queue): ++ # the queue is empty ++ if not dl.running: break ++ # pending dl may extend it ++ perform() ++ continue ++ ++ # handle next request ++ opts = _async_queue[idx] ++ idx += 1 ++ ++ # check global limit ++ while len(dl.running) >= default_grabber.opts.max_connections: ++ perform() ++ if DEBUG: ++ DEBUG.info('max_connections: %d/%d', len(dl.running), default_grabber.opts.max_connections) ++ ++ if opts.mirror_group: ++ mg, errors, failed, removed = opts.mirror_group ++ ++ # find the best mirror ++ best = None ++ best_speed = None ++ for mirror in mg.mirrors: ++ key = mirror['mirror'] ++ if key in removed: continue ++ ++ # estimate mirror speed ++ speed, fail = _TH.estimate(key) ++ speed /= 1 + host_con.get(key, 0) ++ ++ # order by: least failures, private flag, best speed ++ # ignore 'private' flag if there were failures ++ private = not fail and mirror.get('kwargs', {}).get('private', False) ++ speed = -failed.get(key, 0), private, speed ++ if best is None or speed > best_speed: ++ best = mirror ++ best_speed = speed ++ ++ if best is None: ++ opts.exception = URLGrabError(256, _('No more mirrors to try.')) ++ opts.exception.errors = errors ++ _run_callback(opts.failfunc, opts) ++ continue ++ ++ # update the grabber object, apply mirror kwargs ++ grabber = best.get('grabber') or mg.grabber ++ opts.delegate = grabber.opts.derive(**best.get('kwargs', {})) ++ ++ # update the current mirror and limit ++ key = best['mirror'] ++ limit = best.get('kwargs', {}).get('max_connections', 2) ++ opts.async = key, limit ++ ++ # update URL and proxy ++ url = mg._join_url(key, opts.relative_url) ++ url, parts = opts.urlparser.parse(url, opts) ++ opts.find_proxy(url, parts[0]) ++ opts.url = url ++ ++ # check host limit, then start ++ key, limit = opts.async ++ while host_con.get(key, 0) >= limit: ++ perform() ++ if DEBUG: ++ DEBUG.info('max_connections(%s): %d/%d', key, host_con.get(key, 0), limit) ++ ++ start(opts, 1) ++ except IOError, e: ++ if e.errno != 4: raise ++ raise KeyboardInterrupt ++ ++ finally: ++ dl.abort() ++ for meter in meters: ++ meter.end() ++ del _async_queue[:] ++ _TH.save() ++ ++ ++##################################################################### ++# Host bandwidth estimation ++##################################################################### ++ ++class _TH: ++ hosts = {} ++ dirty = None ++ ++ @staticmethod ++ def load(): ++ filename = default_grabber.opts.timedhosts ++ if filename and _TH.dirty is None: ++ try: ++ for line in open(filename): ++ host, speed, fail, ts = line.rsplit(' ', 3) ++ _TH.hosts[host] = int(speed), int(fail), int(ts) ++ except IOError: pass ++ _TH.dirty = False ++ ++ @staticmethod ++ def save(): ++ filename = default_grabber.opts.timedhosts ++ if filename and _TH.dirty is True: ++ tmp = '%s.%d' % (filename, os.getpid()) ++ try: ++ f = open(tmp, 'w') ++ for host in _TH.hosts: ++ f.write(host + ' %d %d %d\n' % _TH.hosts[host]) ++ f.close() ++ os.rename(tmp, filename) ++ except IOError: pass ++ _TH.dirty = False ++ ++ @staticmethod ++ def update(url, dl_size, dl_time, ug_err, baseurl=None): ++ # Use hostname from URL. If it's a file:// URL, use baseurl. ++ # If no baseurl, do not update timedhosts. ++ host = urlparse.urlsplit(url).netloc.split('@')[-1] or baseurl ++ if not host: return ++ ++ _TH.load() ++ speed, fail, ts = _TH.hosts.get(host) or (0, 0, 0) ++ now = time.time() ++ ++ if ug_err is None: ++ # defer first update if the file was small. BZ 851178. ++ if not ts and dl_size < 1e6: return ++ ++ # k1: the older, the less useful ++ # k2: <500ms readings are less reliable ++ # speeds vary, use 10:1 smoothing ++ k1 = 2**((ts - now) / default_grabber.opts.half_life) ++ k2 = min(dl_time / .500, 1.0) / 10 ++ if k2 > 0: ++ speed = (k1 * speed + k2 * dl_size / dl_time) / (k1 + k2) ++ fail = 0 ++ elif getattr(ug_err, 'code', None) == 404: ++ fail = 0 # alive, at least ++ else: ++ fail += 1 # seems dead ++ ++ _TH.hosts[host] = speed, fail, now ++ _TH.dirty = True ++ ++ @staticmethod ++ def estimate(baseurl): ++ _TH.load() ++ ++ # Use just the hostname, unless it's a file:// baseurl. ++ host = urlparse.urlsplit(baseurl).netloc.split('@')[-1] or baseurl ++ ++ default_speed = default_grabber.opts.default_speed ++ try: speed, fail, ts = _TH.hosts[host] ++ except KeyError: return default_speed, 0 ++ ++ speed *= 2**-fail ++ k = 2**((ts - time.time()) / default_grabber.opts.half_life) ++ speed = k * speed + (1 - k) * default_speed ++ return speed, fail ++ ++##################################################################### + # TESTING + def _main_test(): + try: url, filename = sys.argv[1:3] diff --git a/urlgrabber/mirror.py b/urlgrabber/mirror.py -index dad410b..8731aed 100644 +index dad410b..7975f1b 100644 --- a/urlgrabber/mirror.py +++ b/urlgrabber/mirror.py -@@ -90,7 +90,7 @@ CUSTOMIZATION +@@ -76,6 +76,9 @@ CUSTOMIZATION + 'grabber' is omitted, the default grabber will be used. If + kwargs are omitted, then (duh) they will not be used. + ++ kwarg 'max_connections' limits the number of concurrent ++ connections to this mirror. ++ + 3) Pass keyword arguments when instantiating the mirror group. + See, for example, the failure_callback argument. + +@@ -87,10 +90,14 @@ CUSTOMIZATION + """ + + ++import sys import random import thread # needed for locking to make this threadsafe -from grabber import URLGrabError, CallbackObject, DEBUG +from grabber import URLGrabError, CallbackObject, DEBUG, _to_utf8 ++from grabber import _run_callback, _do_raise ++from grabber import exception2msg ++from grabber import _TH def _(st): return st -@@ -263,7 +263,8 @@ class MirrorGroup: +@@ -126,7 +133,9 @@ class MirrorGroup: + files) + + * if the local list is ever exhausted, a URLGrabError will be +- raised (errno=256, no more mirrors) ++ raised (errno=256, No more mirrors). The 'errors' attribute ++ holds a list of (full_url, errmsg) tuples. This contains ++ all URLs tried and the corresponding error messages. + + OPTIONS + +@@ -153,7 +162,8 @@ class MirrorGroup: + + The 'fail' option will cause immediate failure by re-raising + the exception and no further attempts to get the current +- download. ++ download. As in the "No more mirrors" case, the 'errors' ++ attribute is set in the exception object. + + This dict can be set at instantiation time, + mg = MirrorGroup(grabber, mirrors, default_action={'fail':1}) +@@ -184,6 +194,7 @@ class MirrorGroup: + + obj.exception = < exception that was raised > + obj.mirror = < the mirror that was tried > ++ obj.tries = < the number of mirror tries so far > + obj.relative_url = < url relative to the mirror > + obj.url = < full url that failed > + # .url is just the combination of .mirror +@@ -251,6 +262,17 @@ class MirrorGroup: + self.default_action = None + self._process_kwargs(kwargs) + ++ # use the same algorithm as parallel downloader to initially sort ++ # the mirror list (sort by speed, but prefer live private mirrors) ++ def estimate(m): ++ speed, fail = _TH.estimate(m['mirror']) ++ private = not fail and m.get('kwargs', {}).get('private', False) ++ return private, speed ++ ++ # update the initial order. since sorting is stable, the relative ++ # order of unknown (not used yet) hosts is retained. ++ self.mirrors.sort(key=estimate, reverse=True) ++ + # if these values are found in **kwargs passed to one of the urlXXX + # methods, they will be stripped before getting passed on to the + # grabber +@@ -263,7 +285,8 @@ class MirrorGroup: def _parse_mirrors(self, mirrors): parsed_mirrors = [] for m in mirrors: @@ -686,11 +1851,410 @@ index dad410b..8731aed 100644 parsed_mirrors.append(m) return parsed_mirrors +@@ -280,7 +303,9 @@ class MirrorGroup: + # return a random mirror so that multiple mirrors get used + # even without failures. + if not gr.mirrors: +- raise URLGrabError(256, _('No more mirrors to try.')) ++ e = URLGrabError(256, _('No more mirrors to try.')) ++ e.errors = gr.errors ++ raise e + return gr.mirrors[gr._next] + + def _failure(self, gr, cb_obj): +@@ -307,7 +332,9 @@ class MirrorGroup: + a.update(action) + action = a + self.increment_mirror(gr, action) +- if action and action.get('fail', 0): raise ++ if action and action.get('fail', 0): ++ sys.exc_info()[1].errors = gr.errors ++ raise + + def increment_mirror(self, gr, action={}): + """Tell the mirror object increment the mirror index +@@ -377,35 +404,50 @@ class MirrorGroup: + gr.url = url + gr.kw = dict(kw) + self._load_gr(gr) ++ gr.errors = [] + + for k in self.options: + try: del kw[k] + except KeyError: pass + ++ tries = 0 + while 1: ++ tries += 1 + mirrorchoice = self._get_mirror(gr) + fullurl = self._join_url(mirrorchoice['mirror'], gr.url) +- kwargs = dict(mirrorchoice.get('kwargs', {})) +- kwargs.update(kw) + grabber = mirrorchoice.get('grabber') or self.grabber ++ # apply mirrorchoice kwargs on top of grabber.opts ++ opts = grabber.opts.derive(**mirrorchoice.get('kwargs', {})) + func_ref = getattr(grabber, func) + if DEBUG: DEBUG.info('MIRROR: trying %s -> %s', url, fullurl) + try: +- return func_ref( *(fullurl,), **kwargs ) ++ return func_ref( *(fullurl,), opts=opts, **kw ) + except URLGrabError, e: + if DEBUG: DEBUG.info('MIRROR: failed') ++ gr.errors.append((fullurl, exception2msg(e))) + obj = CallbackObject() + obj.exception = e + obj.mirror = mirrorchoice['mirror'] + obj.relative_url = gr.url + obj.url = fullurl ++ obj.tries = tries + self._failure(gr, obj) + + def urlgrab(self, url, filename=None, **kwargs): + kw = dict(kwargs) + kw['filename'] = filename ++ if kw.get('async'): ++ # enable mirror failovers in async path ++ kw['mirror_group'] = self, [], {}, set() ++ kw['relative_url'] = url ++ else: ++ kw.pop('failfunc', None) + func = 'urlgrab' +- return self._mirror_try(func, url, kw) ++ try: ++ return self._mirror_try(func, url, kw) ++ except URLGrabError, e: ++ obj = CallbackObject(url=url, filename=filename, exception=e, **kwargs) ++ return _run_callback(kwargs.get('failfunc', _do_raise), obj) + + def urlopen(self, url, **kwargs): + kw = dict(kwargs) diff --git a/urlgrabber/progress.py b/urlgrabber/progress.py -index dd07c6a..45eb248 100644 +index dd07c6a..077fd99 100644 --- a/urlgrabber/progress.py +++ b/urlgrabber/progress.py -@@ -658,6 +658,8 @@ def format_time(seconds, use_hours=0): +@@ -133,8 +133,8 @@ class BaseMeter: + # for a real gui, you probably want to override and put a call + # to your mainloop iteration function here + if now is None: now = time.time() +- if (now >= self.last_update_time + self.update_period) or \ +- not self.last_update_time: ++ if (not self.last_update_time or ++ (now >= self.last_update_time + self.update_period)): + self.re.update(amount_read, now) + self.last_amount_read = amount_read + self.last_update_time = now +@@ -211,6 +211,21 @@ def text_meter_total_size(size, downloaded=0): + # 4. + ( 5, total: 32) + # + ++def _term_add_bar(tl, bar_max_length, pc): ++ blen = bar_max_length ++ bar = '='*int(blen * pc) ++ if (blen * pc) - int(blen * pc) >= 0.5: ++ bar += '-' ++ return tl.add(' [%-*.*s]' % (blen, blen, bar)) ++ ++def _term_add_end(tl, osize, size): ++ if osize is not None: ++ if size > osize: # Is ??? better? Really need something to say < vs >. ++ return tl.add(' !!! '), True ++ elif size != osize: ++ return tl.add(' ... '), True ++ return tl.add(' ' * 5), False ++ + class TextMeter(BaseMeter): + def __init__(self, fo=sys.stderr): + BaseMeter.__init__(self) +@@ -218,7 +233,6 @@ class TextMeter(BaseMeter): + + def _do_update(self, amount_read, now=None): + etime = self.re.elapsed_time() +- fetime = format_time(etime) + fread = format_number(amount_read) + #self.size = None + if self.text is not None: +@@ -234,16 +248,20 @@ class TextMeter(BaseMeter): + + # Include text + ui_rate in minimal + tl = TerminalLine(8, 8+1+8) ++ if tl._llen > 80: ++ use_hours = True # For big screens, make it more readable. ++ else: ++ use_hours = False + ui_size = tl.add(' | %5sB' % fread) + if self.size is None: +- ui_time = tl.add(' %9s' % fetime) ++ ui_time = tl.add(' %9s' % format_time(etime, use_hours)) + ui_end = tl.add(' ' * 5) + ui_rate = tl.add(' %5sB/s' % ave_dl) + out = '%-*.*s%s%s%s%s\r' % (tl.rest(), tl.rest(), text, + ui_rate, ui_size, ui_time, ui_end) + else: + rtime = self.re.remaining_time() +- frtime = format_time(rtime) ++ frtime = format_time(rtime, use_hours) + frac = self.re.fraction_read() + + ui_time = tl.add(' %9s' % frtime) +@@ -259,13 +277,10 @@ class TextMeter(BaseMeter): + ui_rate = tl.add(' %5sB/s' % ave_dl) + # Make text grow a bit before we start growing the bar too + blen = 4 + tl.rest_split(8 + 8 + 4) +- bar = '='*int(blen * frac) +- if (blen * frac) - int(blen * frac) >= 0.5: +- bar += '-' +- ui_bar = tl.add(' [%-*.*s]' % (blen, blen, bar)) +- out = '%-*.*s%s%s%s%s%s%s%s\r' % (tl.rest(), tl.rest(), text, +- ui_sofar_pc, ui_pc, ui_bar, +- ui_rate, ui_size, ui_time, ui_end) ++ ui_bar = _term_add_bar(tl, blen, frac) ++ out = '\r%-*.*s%s%s%s%s%s%s%s\r' % (tl.rest(), tl.rest(), text, ++ ui_sofar_pc, ui_pc, ui_bar, ++ ui_rate,ui_size,ui_time, ui_end) + + self.fo.write(out) + self.fo.flush() +@@ -274,7 +289,6 @@ class TextMeter(BaseMeter): + global _text_meter_total_size + global _text_meter_sofar_size + +- total_time = format_time(self.re.elapsed_time()) + total_size = format_number(amount_read) + if self.text is not None: + text = self.text +@@ -282,14 +296,13 @@ class TextMeter(BaseMeter): + text = self.basename + + tl = TerminalLine(8) +- ui_size = tl.add(' | %5sB' % total_size) +- ui_time = tl.add(' %9s' % total_time) +- not_done = self.size is not None and amount_read != self.size +- if not_done: +- ui_end = tl.add(' ... ') ++ if tl._llen > 80: ++ use_hours = True # For big screens, make it more readable. + else: +- ui_end = tl.add(' ' * 5) +- ++ use_hours = False ++ ui_size = tl.add(' | %5sB' % total_size) ++ ui_time = tl.add(' %9s' % format_time(self.re.elapsed_time(),use_hours)) ++ ui_end, not_done = _term_add_end(tl, self.size, amount_read) + out = '\r%-*.*s%s%s%s\n' % (tl.rest(), tl.rest(), text, + ui_size, ui_time, ui_end) + self.fo.write(out) +@@ -331,12 +344,21 @@ class MultiFileHelper(BaseMeter): + def message(self, message): + self.master.message_meter(self, message) + ++class _FakeLock: ++ def acquire(self): ++ pass ++ def release(self): ++ pass ++ + class MultiFileMeter: + helperclass = MultiFileHelper +- def __init__(self): ++ def __init__(self, threaded=True): + self.meters = [] + self.in_progress_meters = [] +- self._lock = thread.allocate_lock() ++ if threaded: ++ self._lock = thread.allocate_lock() ++ else: ++ self._lock = _FakeLock() + self.update_period = 0.3 # seconds + + self.numfiles = None +@@ -369,6 +391,7 @@ class MultiFileMeter: + + def end(self, now=None): + if now is None: now = time.time() ++ self.re.update(self._amount_read(), now) + self._do_end(now) + + def _do_end(self, now): +@@ -407,8 +430,8 @@ class MultiFileMeter: + def update_meter(self, meter, now): + if not meter in self.meters: + raise ValueError('attempt to use orphaned meter') +- if (now >= self.last_update_time + self.update_period) or \ +- not self.last_update_time: ++ if (not self.last_update_time or ++ (now >= self.last_update_time + self.update_period)): + self.re.update(self._amount_read(), now) + self.last_update_time = now + self._do_update_meter(meter, now) +@@ -466,34 +489,87 @@ class MultiFileMeter: + + + class TextMultiFileMeter(MultiFileMeter): +- def __init__(self, fo=sys.stderr): ++ def __init__(self, fo=sys.stderr, threaded=True): + self.fo = fo +- MultiFileMeter.__init__(self) ++ MultiFileMeter.__init__(self, threaded) ++ self.index_time = self.index = 0 + + # files: ###/### ###% data: ######/###### ###% time: ##:##:##/##:##:## ++# New output, like TextMeter output... ++# update: No size (minimal: 17 chars) ++# ----------------------------------- ++# (<#file>/<#tot files>): <text> <rate> | <current size> <elapsed> ++# 8-48 1 8 3 6 1 7-9 5 ++# ++# update: Size, All files ++# ----------------------- ++# (<#file>/<#tot files>): <text> <pc> <bar> <rate> | <size> <eta time> ETA ++# 8-22 1 3-4 1 6-12 1 8 3 6 1 7-9 1 3 1 ++# end ++# --- ++# <text> | <file size> <file elapsed time> ++# 8-56 3 6 1 9 5 + def _do_update_meter(self, meter, now): + self._lock.acquire() + try: +- format = "files: %3i/%-3i %3i%% data: %6.6s/%-6.6s %3i%% " \ +- "time: %8.8s/%8.8s" + df = self.finished_files + tf = self.numfiles or 1 +- pf = 100 * float(df)/tf + 0.49 ++ # Don't use "percent of files complete" ... ++ # pf = 100 * float(df)/tf + 0.49 + dd = self.re.last_amount_read +- td = self.total_size ++ td = self.re.total + pd = 100 * (self.re.fraction_read() or 0) + 0.49 + dt = self.re.elapsed_time() + rt = self.re.remaining_time() +- if rt is None: tt = None +- else: tt = dt + rt + +- fdd = format_number(dd) + 'B' +- ftd = format_number(td) + 'B' +- fdt = format_time(dt, 1) +- ftt = format_time(tt, 1) +- +- out = '%-79.79s' % (format % (df, tf, pf, fdd, ftd, pd, fdt, ftt)) +- self.fo.write('\r' + out) ++ frac = self.re.fraction_read() or 0 ++ pf = 100 * frac ++ ave_dl = format_number(self.re.average_rate()) ++ ++ # cycle through active meters ++ if now > self.index_time: ++ self.index_time = now + 1.0 ++ self.index += 1 ++ if self.index >= len(self.meters): ++ self.index = 0 ++ meter = self.meters[self.index] ++ text = meter.text or meter.basename ++ if tf > 1: ++ text = '(%u/%u): %s' % (df+1+self.index, tf, text) ++ ++ # Include text + ui_rate in minimal ++ tl = TerminalLine(8, 8+1+8) ++ if tl._llen > 80: ++ use_hours = True # For big screens, make it more readable. ++ time_len = 9 ++ else: ++ use_hours = False ++ time_len = 7 ++ ++ ui_size = tl.add(' | %5sB' % format_number(dd)) ++ ++ if not self.re.total: ++ ui_time = tl.add(' %*s' % (time_len,format_time(dt, use_hours))) ++ ui_end = tl.add(' ' * 5) ++ ui_rate = tl.add(' %5sB/s' % ave_dl) ++ out = '\r%-*.*s%s%s%s%s\r' % (tl.rest(), tl.rest(), text, ++ ui_rate, ui_size, ui_time, ui_end) ++ else: ++ ui_time = tl.add(' %*s' % (time_len,format_time(rt, use_hours))) ++ ui_end = tl.add(' ETA ') ++ ++ ui_sofar_pc = tl.add(' %i%%' % pf, ++ full_len=len(" (100%)")) ++ ui_rate = tl.add(' %5sB/s' % ave_dl) ++ ++ # Make text grow a bit before we start growing the bar too ++ blen = 4 + tl.rest_split(8 + 8 + 4) ++ ui_bar = _term_add_bar(tl, blen, frac) ++ out = '\r%-*.*s%s%s%s%s%s%s\r' % (tl.rest(), tl.rest(), text, ++ ui_sofar_pc, ui_bar, ++ ui_rate, ui_size, ui_time, ++ ui_end) ++ self.fo.write(out) + self.fo.flush() + finally: + self._lock.release() +@@ -502,24 +578,40 @@ class TextMultiFileMeter(MultiFileMeter): + self._lock.acquire() + try: + format = "%-30.30s %6.6s %8.8s %9.9s" +- fn = meter.basename ++ fn = meter.text or meter.basename + size = meter.last_amount_read + fsize = format_number(size) + 'B' + et = meter.re.elapsed_time() +- fet = format_time(et, 1) +- frate = format_number(size / et) + 'B/s' +- +- out = '%-79.79s' % (format % (fn, fsize, fet, frate)) +- self.fo.write('\r' + out + '\n') ++ frate = format_number(et and size / et) + 'B/s' ++ df = self.finished_files ++ tf = self.numfiles or 1 ++ ++ total_size = format_number(size) ++ text = meter.text or meter.basename ++ if tf > 1: ++ text = '(%u/%u): %s' % (df, tf, text) ++ ++ tl = TerminalLine(8) ++ if tl._llen > 80: ++ use_hours = True # For big screens, make it more readable. ++ time_len = 9 ++ else: ++ use_hours = False ++ time_len = 7 ++ ui_size = tl.add(' | %5sB' % total_size) ++ ui_time = tl.add(' %*s' % (time_len, format_time(et, use_hours))) ++ ui_end, not_done = _term_add_end(tl, meter.size, size) ++ out = '\r%-*.*s%s%s%s\n' % (tl.rest(), tl.rest(), text, ++ ui_size, ui_time, ui_end) ++ self.fo.write(out) + finally: + self._lock.release() +- self._do_update_meter(meter, now) + + def _do_failure_meter(self, meter, message, now): + self._lock.acquire() + try: + format = "%-30.30s %6.6s %s" +- fn = meter.basename ++ fn = meter.text or meter.basename + if type(message) in (type(''), type(u'')): + message = message.splitlines() + if not message: message = [''] +@@ -536,15 +628,6 @@ class TextMultiFileMeter(MultiFileMeter): + pass + finally: + self._lock.release() +- +- def _do_end(self, now): +- self._do_update_meter(None, now) +- self._lock.acquire() +- try: +- self.fo.write('\n') +- self.fo.flush() +- finally: +- self._lock.release() + + ###################################################################### + # support classes and functions +@@ -658,6 +741,8 @@ def format_time(seconds, use_hours=0): if seconds is None or seconds < 0: if use_hours: return '--:--:--' else: return '--:--' @@ -699,3 +2263,81 @@ index dd07c6a..45eb248 100644 else: seconds = int(seconds) minutes = seconds / 60 +@@ -722,9 +807,77 @@ def _tst(fn, cur, tot, beg, size, *args): + time.sleep(delay) + tm.end(size) + ++def _mtst(datas, *args): ++ print '-' * 79 ++ tm = TextMultiFileMeter(threaded=False) ++ ++ dl_sizes = {} ++ ++ num = 0 ++ total_size = 0 ++ dl_total_size = 0 ++ for data in datas: ++ dl_size = None ++ if len(data) == 2: ++ fn, size = data ++ dl_size = size ++ if len(data) == 3: ++ fn, size, dl_size = data ++ nm = tm.newMeter() ++ nm.start(fn, "http://www.example.com/path/to/fn/" + fn, fn, size, ++ text=fn) ++ num += 1 ++ assert dl_size is not None ++ dl_total_size += dl_size ++ dl_sizes[nm] = dl_size ++ if size is None or total_size is None: ++ total_size = None ++ else: ++ total_size += size ++ tm.start(num, total_size) ++ ++ num = 0 ++ off = 0 ++ for (inc, delay) in args: ++ off += 1 ++ while num < ((dl_total_size * off) / len(args)): ++ num += inc ++ for nm in tm.meters[:]: ++ if dl_sizes[nm] <= num: ++ nm.end(dl_sizes[nm]) ++ tm.removeMeter(nm) ++ else: ++ nm.update(num) ++ time.sleep(delay) ++ assert not tm.meters ++ + if __name__ == "__main__": + # (1/2): subversion-1.4.4-7.x86_64.rpm 2.4 MB / 85 kB/s 00:28 + # (2/2): mercurial-0.9.5-6.fc8.x86_64.rpm 924 kB / 106 kB/s 00:08 ++ if len(sys.argv) >= 2 and sys.argv[1] == 'multi': ++ _mtst((("sm-1.0.0-1.fc8.i386.rpm", 1000), ++ ("s-1.0.1-1.fc8.i386.rpm", 5000), ++ ("m-1.0.1-2.fc8.i386.rpm", 10000)), ++ (100, 0.33), (500, 0.25), (1000, 0.1)) ++ ++ _mtst((("sm-1.0.0-1.fc8.i386.rpm", 1000), ++ ("s-1.0.1-1.fc8.i386.rpm", 5000), ++ ("m-1.0.1-2.fc8.i386.rpm", None, 10000)), ++ (100, 0.33), (500, 0.25), (1000, 0.1)) ++ ++ _mtst((("sm-1.0.0-1.fc8.i386.rpm", 1000), ++ ("s-1.0.1-1.fc8.i386.rpm", 2500000), ++ ("m-1.0.1-2.fc8.i386.rpm", 10000)), ++ (10, 0.2), (50, 0.1), (1000, 0.1)) ++ ++ _mtst((("sm-1.0.0-1.fc8.i386.rpm", 1000), ++ ("s-1.0.1-1.fc8.i386.rpm", None, 2500000), ++ ("m-1.0.1-2.fc8.i386.rpm", None, 10000)), ++ (10, 0.2), (50, 0.1), (1000, 0.1)) ++ # (10, 0.2), (100, 0.1), (100, 0.1), (100, 0.25)) ++ # (10, 0.2), (100, 0.1), (100, 0.1), (100, 0.25)) ++ sys.exit(0) ++ + if len(sys.argv) >= 2 and sys.argv[1] == 'total': + text_meter_total_size(1000 + 10000 + 10000 + 1000000 + 1000000 + + 1000000 + 10000 + 10000 + 10000 + 1000000) diff --git a/python-urlgrabber/python-urlgrabber.nm b/python-urlgrabber/python-urlgrabber.nm index a7cbc76..1fe1083 100644 --- a/python-urlgrabber/python-urlgrabber.nm +++ b/python-urlgrabber/python-urlgrabber.nm @@ -5,7 +5,7 @@ name = python-urlgrabber version = 3.9.1 -release = 3 +release = 4 arch = noarch thisapp = urlgrabber-%{version} @@ -28,6 +28,11 @@ build python-pycurl end + prepare_cmds + # Move everything from /usr/libexec to /usr/lib/urlgrabber. + find . -type f | xargs sed -i "s@libexec@lib/urlgrabber@g" + end + build = # Nothing to do install hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 751cddcabf3da5fd0449fdd31cea3e2abc75323c
by git＠ipfire.org 01 Mar '13

01 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 751cddcabf3da5fd0449fdd31cea3e2abc75323c (commit) via 883c26f392b30e37beec4c48c23848b0b5c3f596 (commit) from 0116e433f15e250c3db04c0b82917699c59c7f43 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 751cddcabf3da5fd0449fdd31cea3e2abc75323c Merge: 883c26f 0116e43 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 1 12:21:01 2013 +0000 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 883c26f392b30e37beec4c48c23848b0b5c3f596 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 1 12:19:32 2013 +0000 python-pycurl: Import fixes from upstream. Also fix the library requirement, which makes sure that a recent enough version of libcurl is available. ----------------------------------------------------------------------- Summary of changes: ...eep-copies-of-string-options-since-this-i.patch | 200 +++++++++++++++++++++ ...-sourceforge.net-tracker-func-detail-aid-.patch | 61 +++++++ ...unt-bug-and-provides-better-organization-.patch | 160 +++++++++++++++++ .../0004-Test-for-reset-fixes-refcount-bug.patch | 94 ++++++++++ ...-Updating-ChangeLog-with-relevant-changes.patch | 32 ++++ ...tup.py-do-not-use-curl-config-static-libs.patch | 34 ++++ ...als.py-add-a-test-for-ref-counting-of-res.patch | 28 +++ .../python-pycurl-fix-do_curl_reset-refcount.patch | 24 --- .../patches/python-pycurl-no-static-libs.patch0 | 12 -- python-pycurl/python-pycurl.nm | 19 +- 10 files changed, 619 insertions(+), 45 deletions(-) create mode 100644 python-pycurl/patches/0001-No-longer-keep-copies-of-string-options-since-this-i.patch create mode 100644 python-pycurl/patches/0002-Fixes-https-sourceforge.net-tracker-func-detail-aid-.patch create mode 100644 python-pycurl/patches/0003-Fixes-refcount-bug-and-provides-better-organization-.patch create mode 100644 python-pycurl/patches/0004-Test-for-reset-fixes-refcount-bug.patch create mode 100644 python-pycurl/patches/0005-Updating-ChangeLog-with-relevant-changes.patch create mode 100644 python-pycurl/patches/0101-setup.py-do-not-use-curl-config-static-libs.patch create mode 100644 python-pycurl/patches/0102-test_internals.py-add-a-test-for-ref-counting-of-res.patch delete mode 100644 python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch delete mode 100644 python-pycurl/patches/python-pycurl-no-static-libs.patch0 Difference in files: diff --git a/python-pycurl/patches/0001-No-longer-keep-copies-of-string-options-since-this-i.patch b/python-pycurl/patches/0001-No-longer-keep-copies-of-string-options-since-this-i.patch new file mode 100644 index 0000000..bfbe215 --- /dev/null +++ b/python-pycurl/patches/0001-No-longer-keep-copies-of-string-options-since-this-i.patch @@ -0,0 +1,200 @@ +From 05433632fb1ccdabc1d29d78f32bc35de0a8638b Mon Sep 17 00:00:00 2001 +From: kjetilja <kjetilja> +Date: Mon, 29 Sep 2008 10:56:57 +0000 +Subject: [PATCH 1/5] No longer keep copies of string options since this is managed by libcurl + +Signed-off-by: Kamil Dudka <kdudka(a)redhat.com> +--- + ChangeLog | 12 +++++++++- + src/pycurl.c | 60 +-------------------------------------------------------- + 2 files changed, 12 insertions(+), 60 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 0fb7f8c..618654d 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,7 +1,15 @@ +-Version 7.19.0 [requires libcurl-7.19.0 or better] ++Version 7.19.1 [requires libcurl-7.19.0 or better] + -------------- + +- * Added CURLFILE, ADDRESS_SCOPE and ISSUERCERT options, ++ * No longer keep string options copies in the ++ Curl Python objects, since string options are ++ now managed by libcurl. ++ ++ ++Version 7.19.0 ++-------------- ++ ++ * Added CURLFILE, ADDRESS_SCOPE and ISSUERCERT options, + as well as the APPCONNECT_TIME info. + + * Added PRIMARY_IP info (patch by +diff --git a/src/pycurl.c b/src/pycurl.c +index a17a23b..6de1514 100644 +--- a/src/pycurl.c ++++ b/src/pycurl.c +@@ -1,4 +1,4 @@ +-/* $Id: pycurl.c,v 1.147 2008/09/09 17:40:34 kjetilja Exp $ */ ++/* $Id: pycurl.c,v 1.148 2008/09/29 10:56:57 kjetilja Exp $ */ + + /* PycURL -- cURL Python module + * +@@ -97,12 +97,6 @@ static void pycurl_ssl_cleanup(void); + /* Calculate the number of OBJECTPOINT options we need to store */ + #define OPTIONS_SIZE ((int)CURLOPT_LASTENTRY % 10000) + #define MOPTIONS_SIZE ((int)CURLMOPT_LASTENTRY % 10000) +-static int OPT_INDEX(int o) +-{ +- assert(o >= CURLOPTTYPE_OBJECTPOINT); +- assert(o < CURLOPTTYPE_OBJECTPOINT + OPTIONS_SIZE); +- return o - CURLOPTTYPE_OBJECTPOINT; +-} + + /* Type objects */ + static PyObject *ErrorObject = NULL; +@@ -161,7 +155,6 @@ typedef struct { + PyObject *writedata_fp; + PyObject *writeheader_fp; + /* misc */ +- void *options[OPTIONS_SIZE]; /* for OBJECTPOINT options */ + char error[CURL_ERROR_SIZE+1]; + } CurlObject; + +@@ -741,7 +734,6 @@ util_curl_new(void) + self->writeheader_fp = NULL; + + /* Zero string pointer memory buffer used by setopt */ +- memset(self->options, 0, sizeof(self->options)); + memset(self->error, 0, sizeof(self->error)); + + return self; +@@ -804,7 +796,6 @@ do_curl_new(PyObject *dummy) + free(s); + goto error; + } +- self->options[ OPT_INDEX(CURLOPT_USERAGENT) ] = s; s = NULL; + + /* Success - return new object */ + return self; +@@ -872,7 +863,6 @@ static void + util_curl_close(CurlObject *self) + { + CURL *handle; +- int i; + + /* Zero handle and thread-state to disallow any operations to be run + * from now on */ +@@ -916,16 +906,6 @@ util_curl_close(CurlObject *self) + SFREE(self->postquote); + SFREE(self->prequote); + #undef SFREE +- +- /* Last, free the options. This must be done after the curl handle +- * is closed since libcurl assumes that some options are valid when +- * invoking curl_easy_cleanup(). */ +- for (i = 0; i < OPTIONS_SIZE; i++) { +- if (self->options[i] != NULL) { +- free(self->options[i]); +- self->options[i] = NULL; +- } +- } + } + + +@@ -1424,8 +1404,6 @@ verbose_error: + static PyObject* + do_curl_reset(CurlObject *self) + { +- unsigned int i; +- + curl_easy_reset(self->handle); + + /* Decref callbacks and file handles */ +@@ -1443,15 +1421,6 @@ do_curl_reset(CurlObject *self) + SFREE(self->postquote); + SFREE(self->prequote); + #undef SFREE +- +- /* Last, free the options */ +- for (i = 0; i < OPTIONS_SIZE; i++) { +- if (self->options[i] != NULL) { +- free(self->options[i]); +- self->options[i] = NULL; +- } +- } +- + return Py_None; + } + +@@ -1461,7 +1430,6 @@ static PyObject * + util_curl_unsetopt(CurlObject *self, int option) + { + int res; +- int opt_index = -1; + + #define SETOPT2(o,x) \ + if ((res = curl_easy_setopt(self->handle, (o), (x))) != CURLE_OK) goto error +@@ -1502,7 +1470,6 @@ util_curl_unsetopt(CurlObject *self, int option) + case CURLOPT_SSL_CIPHER_LIST: + case CURLOPT_USERPWD: + SETOPT((char *) 0); +- opt_index = OPT_INDEX(option); + break; + + /* info: we explicitly list unsupported options here */ +@@ -1512,11 +1479,6 @@ util_curl_unsetopt(CurlObject *self, int option) + return NULL; + } + +- if (opt_index >= 0 && self->options[opt_index] != NULL) { +- free(self->options[opt_index]); +- self->options[opt_index] = NULL; +- } +- + Py_INCREF(Py_None); + return Py_None; + +@@ -1587,8 +1549,6 @@ do_curl_setopt(CurlObject *self, PyObject *args) + if (PyString_Check(obj)) { + char *str = NULL; + Py_ssize_t len = -1; +- char *buf; +- int opt_index; + + /* Check that the option specified a string as well as the input */ + switch (option) { +@@ -1651,28 +1611,12 @@ do_curl_setopt(CurlObject *self, PyObject *args) + } + /* Allocate memory to hold the string */ + assert(str != NULL); +- if (len <= 0) +- buf = strdup(str); +- else { +- buf = (char *) malloc(len); +- if (buf) memcpy(buf, str, len); +- } +- if (buf == NULL) +- return PyErr_NoMemory(); + /* Call setopt */ +- res = curl_easy_setopt(self->handle, (CURLoption)option, buf); ++ res = curl_easy_setopt(self->handle, (CURLoption)option, str); + /* Check for errors */ + if (res != CURLE_OK) { +- free(buf); + CURLERROR_RETVAL(); + } +- /* Save allocated option buffer */ +- opt_index = OPT_INDEX(option); +- if (self->options[opt_index] != NULL) { +- free(self->options[opt_index]); +- self->options[opt_index] = NULL; +- } +- self->options[opt_index] = buf; + Py_INCREF(Py_None); + return Py_None; + } +-- +1.7.1 + diff --git a/python-pycurl/patches/0002-Fixes-https-sourceforge.net-tracker-func-detail-aid-.patch b/python-pycurl/patches/0002-Fixes-https-sourceforge.net-tracker-func-detail-aid-.patch new file mode 100644 index 0000000..522087c --- /dev/null +++ b/python-pycurl/patches/0002-Fixes-https-sourceforge.net-tracker-func-detail-aid-.patch @@ -0,0 +1,61 @@ +From 009e170d2838346461ff0b31b0afa44f3d6278f3 Mon Sep 17 00:00:00 2001 +From: zanee <zanee> +Date: Fri, 23 Apr 2010 16:06:41 +0000 +Subject: [PATCH 2/5] Fixes https://sourceforge.net/tracker/?func=detail&aid=2812016&group_id=28236&ati… with applied patch from sourceforge user dbprice1. + +Signed-off-by: Kamil Dudka <kdudka(a)redhat.com> +--- + setup.py | 23 ++++++++++++++++++----- + 1 files changed, 18 insertions(+), 5 deletions(-) + +diff --git a/setup.py b/setup.py +index 0ffd9d2..76b9d58 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,7 +1,7 @@ + #! /usr/bin/env python + # -*- coding: iso-8859-1 -*- + # vi:ts=4:et +-# $Id: setup.py,v 1.150 2008/09/09 17:40:34 kjetilja Exp $ ++# $Id: setup.py,v 1.151 2010/04/23 16:06:41 zanee Exp $ + + """Setup script for the PycURL module distribution.""" + +@@ -9,7 +9,7 @@ PACKAGE = "pycurl" + PY_PACKAGE = "curl" + VERSION = "7.19.0" + +-import glob, os, re, sys, string ++import glob, os, re, sys, string, subprocess + import distutils + from distutils.core import setup + from distutils.extension import Extension +@@ -96,9 +96,22 @@ else: + include_dirs.append(e[2:]) + else: + extra_compile_args.append(e) +- libs = split_quoted( +- os.popen("'%s' --libs" % CURL_CONFIG).read()+\ +- os.popen("'%s' --static-libs" % CURL_CONFIG).read()) ++ ++ # Run curl-config --libs and --static-libs. Some platforms may not ++ # support one or the other of these curl-config options, so gracefully ++ # tolerate failure of either, but not both. ++ optbuf = "" ++ for option in ["--libs", "--static-libs"]: ++ p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True, ++ stdout=subprocess.PIPE) ++ (stdout, stderr) = p.communicate() ++ if p.wait() == 0: ++ optbuf += stdout ++ if optbuf == "": ++ raise Exception, ("Neither of curl-config --libs or --static-libs" + ++ "produced output") ++ libs = split_quoted(optbuf) ++ + for e in libs: + if e[:2] == "-l": + libraries.append(e[2:]) +-- +1.7.1 + diff --git a/python-pycurl/patches/0003-Fixes-refcount-bug-and-provides-better-organization-.patch b/python-pycurl/patches/0003-Fixes-refcount-bug-and-provides-better-organization-.patch new file mode 100644 index 0000000..80c600e --- /dev/null +++ b/python-pycurl/patches/0003-Fixes-refcount-bug-and-provides-better-organization-.patch @@ -0,0 +1,160 @@ +From 4a377e2d60fb903e91a370595a6ea22cb7ee0e0e Mon Sep 17 00:00:00 2001 +From: zanee <zanee> +Date: Wed, 28 Apr 2010 16:02:41 +0000 +Subject: [PATCH 3/5 v2] Fixes refcount bug and provides better organization of PyCurl object. Submitted by dbprice1. + +https://sourceforge.net/tracker/?func=detail&aid=2893665&group_id=28236&atid=392777 + +Signed-off-by: Kamil Dudka <kdudka(a)redhat.com> +--- + src/pycurl.c | 88 +++++++++++++++++++++++++++++++++++++-------------------- + 1 files changed, 57 insertions(+), 31 deletions(-) + +diff --git a/src/pycurl.c b/src/pycurl.c +index 6de1514..32c7ca5 100644 +--- a/src/pycurl.c ++++ b/src/pycurl.c +@@ -1,4 +1,4 @@ +-/* $Id: pycurl.c,v 1.148 2008/09/29 10:56:57 kjetilja Exp $ */ ++/* $Id: pycurl.c,v 1.149 2010/04/28 16:02:41 zanee Exp $ */ + + /* PycURL -- cURL Python module + * +@@ -739,64 +739,80 @@ util_curl_new(void) + return self; + } + +- +-/* constructor - this is a module-level function returning a new instance */ +-static CurlObject * +-do_curl_new(PyObject *dummy) ++/* initializer - used to intialize curl easy handles for use with pycurl */ ++static int ++util_curl_init(CurlObject *self) + { +- CurlObject *self = NULL; + int res; + char *s = NULL; + +- UNUSED(dummy); +- +- /* Allocate python curl object */ +- self = util_curl_new(); +- if (self == NULL) +- return NULL; +- +- /* Initialize curl handle */ +- self->handle = curl_easy_init(); +- if (self->handle == NULL) +- goto error; +- + /* Set curl error buffer and zero it */ + res = curl_easy_setopt(self->handle, CURLOPT_ERRORBUFFER, self->error); +- if (res != CURLE_OK) +- goto error; ++ if (res != CURLE_OK) { ++ return (-1); ++ } + memset(self->error, 0, sizeof(self->error)); + + /* Set backreference */ + res = curl_easy_setopt(self->handle, CURLOPT_PRIVATE, (char *) self); +- if (res != CURLE_OK) +- goto error; ++ if (res != CURLE_OK) { ++ return (-1); ++ } + + /* Enable NOPROGRESS by default, i.e. no progress output */ + res = curl_easy_setopt(self->handle, CURLOPT_NOPROGRESS, (long)1); +- if (res != CURLE_OK) +- goto error; ++ if (res != CURLE_OK) { ++ return (-1); ++ } + + /* Disable VERBOSE by default, i.e. no verbose output */ + res = curl_easy_setopt(self->handle, CURLOPT_VERBOSE, (long)0); +- if (res != CURLE_OK) +- goto error; ++ if (res != CURLE_OK) { ++ return (-1); ++ } + + /* Set FTP_ACCOUNT to NULL by default */ + res = curl_easy_setopt(self->handle, CURLOPT_FTP_ACCOUNT, NULL); +- if (res != CURLE_OK) +- goto error; ++ if (res != CURLE_OK) { ++ return (-1); ++ } + + /* Set default USERAGENT */ + s = (char *) malloc(7 + strlen(LIBCURL_VERSION) + 1); +- if (s == NULL) +- goto error; ++ if (s == NULL) { ++ return (-1); ++ } + strcpy(s, "PycURL/"); strcpy(s+7, LIBCURL_VERSION); + res = curl_easy_setopt(self->handle, CURLOPT_USERAGENT, (char *) s); + if (res != CURLE_OK) { + free(s); +- goto error; ++ return (-1); + } ++ return (0); ++} ++ ++/* constructor - this is a module-level function returning a new instance */ ++static CurlObject * ++do_curl_new(PyObject *dummy) ++{ ++ CurlObject *self = NULL; ++ int res; ++ ++ UNUSED(dummy); ++ ++ /* Allocate python curl object */ ++ self = util_curl_new(); ++ if (self == NULL) ++ return NULL; ++ ++ /* Initialize curl handle */ ++ self->handle = curl_easy_init(); ++ if (self->handle == NULL) ++ goto error; + ++ res = util_curl_init(self); ++ if (res < 0) ++ goto error; + /* Success - return new object */ + return self; + +@@ -1404,6 +1420,8 @@ verbose_error: + static PyObject* + do_curl_reset(CurlObject *self) + { ++ int res; ++ + curl_easy_reset(self->handle); + + /* Decref callbacks and file handles */ +@@ -1421,6 +1439,14 @@ do_curl_reset(CurlObject *self) + SFREE(self->postquote); + SFREE(self->prequote); + #undef SFREE ++ res = util_curl_init(self); ++ if (res < 0) { ++ Py_DECREF(self); /* this also closes self->handle */ ++ PyErr_SetString(ErrorObject, "resetting curl failed"); ++ return NULL; ++ } ++ ++ Py_INCREF(Py_None); + return Py_None; + } + +-- +1.7.1 + diff --git a/python-pycurl/patches/0004-Test-for-reset-fixes-refcount-bug.patch b/python-pycurl/patches/0004-Test-for-reset-fixes-refcount-bug.patch new file mode 100644 index 0000000..6144842 --- /dev/null +++ b/python-pycurl/patches/0004-Test-for-reset-fixes-refcount-bug.patch @@ -0,0 +1,94 @@ +From 206c15ea32e05ae98827d00626a101e33a7bec70 Mon Sep 17 00:00:00 2001 +From: zanee <zanee> +Date: Wed, 28 Apr 2010 16:03:40 +0000 +Subject: [PATCH 4/5] Test for reset fixes refcount bug + +Signed-off-by: Kamil Dudka <kdudka(a)redhat.com> +--- + tests/test_reset.py | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 74 insertions(+), 0 deletions(-) + create mode 100644 tests/test_reset.py + +diff --git a/tests/test_reset.py b/tests/test_reset.py +new file mode 100644 +index 0000000..c350d17 +--- /dev/null ++++ b/tests/test_reset.py +@@ -0,0 +1,74 @@ ++#!/usr/bin/python ++ ++import sys ++import pycurl ++ ++saw_error = 1 ++ ++def main(): ++ global saw_error ++ ++ pycurl.global_init(pycurl.GLOBAL_DEFAULT) ++ ++ outf = file("/dev/null", "rb+") ++ cm = pycurl.CurlMulti() ++ ++ # Set multi handle's options ++ cm.setopt(pycurl.M_PIPELINING, 1) ++ ++ eh = pycurl.Curl() ++ ++ for x in range(1, 20): ++ ++ eh.setopt(pycurl.WRITEDATA, outf) ++ eh.setopt(pycurl.URL, sys.argv[1]) ++ cm.add_handle(eh) ++ ++ while 1: ++ ret, active_handles = cm.perform() ++ if ret != pycurl.E_CALL_MULTI_PERFORM: ++ break ++ ++ while active_handles: ++ ret = cm.select(1.0) ++ if ret == -1: ++ continue ++ while 1: ++ ret, active_handles = cm.perform() ++ if ret != pycurl.E_CALL_MULTI_PERFORM: ++ break ++ ++ count, good, bad = cm.info_read() ++ ++ for h, en, em in bad: ++ print "Transfer to %s failed with %d, %s\n" % \ ++ (h.getinfo(pycurl.EFFECTIVE_URL), en, em) ++ raise RuntimeError ++ ++ for h in good: ++ httpcode = h.getinfo(pycurl.RESPONSE_CODE) ++ if httpcode != 200: ++ print "Transfer to %s failed with code %d\n" %\ ++ (h.getinfo(pycurl.EFFECTIVE_URL), httpcode) ++ raise RuntimeError ++ ++ else: ++ print "Recd %d bytes from %s" % \ ++ (h.getinfo(pycurl.SIZE_DOWNLOAD), ++ h.getinfo(pycurl.EFFECTIVE_URL)) ++ ++ cm.remove_handle(eh) ++ eh.reset() ++ ++ eh.close() ++ cm.close() ++ outf.close() ++ ++ pycurl.global_cleanup() ++ ++ ++if __name__ == '__main__': ++ if len(sys.argv) != 2: ++ print "Usage: %s <url>" % sys.argv[0] ++ sys.exit(2) ++ main() +-- +1.7.1 + diff --git a/python-pycurl/patches/0005-Updating-ChangeLog-with-relevant-changes.patch b/python-pycurl/patches/0005-Updating-ChangeLog-with-relevant-changes.patch new file mode 100644 index 0000000..dd8d803 --- /dev/null +++ b/python-pycurl/patches/0005-Updating-ChangeLog-with-relevant-changes.patch @@ -0,0 +1,32 @@ +From d075bfb8a5207f933a5a704becd7f64e8521dc28 Mon Sep 17 00:00:00 2001 +From: zanee <zanee> +Date: Tue, 4 May 2010 18:47:08 +0000 +Subject: [PATCH 5/5] Updating ChangeLog with relevant changes + +Signed-off-by: Kamil Dudka <kdudka(a)redhat.com> +--- + ChangeLog | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 618654d..885c8b0 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,14 @@ ++Version 7.19.2 ++-------------- ++ ++ * Cleaned up website ++ ++ * Fix pycurl.reset() (patch by <johansen at sun.com>). ++ ++ * Fix install routine in setup.py where ++ certain platforms (Solaris, Mac OSX, etc) ++ would search for a static copy of libcurl (dbp) ++ + Version 7.19.1 [requires libcurl-7.19.0 or better] + -------------- + +-- +1.7.1 + diff --git a/python-pycurl/patches/0101-setup.py-do-not-use-curl-config-static-libs.patch b/python-pycurl/patches/0101-setup.py-do-not-use-curl-config-static-libs.patch new file mode 100644 index 0000000..ce8c2df --- /dev/null +++ b/python-pycurl/patches/0101-setup.py-do-not-use-curl-config-static-libs.patch @@ -0,0 +1,34 @@ +From 0796c0530648ae0e741a20a78d1fcf315783c178 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka(a)redhat.com> +Date: Mon, 25 Feb 2013 19:48:22 +0100 +Subject: [PATCH 1/2] setup.py: do not use curl-config --static-libs + +--- + setup.py | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 76b9d58..86a2951 100644 +--- a/setup.py ++++ b/setup.py +@@ -101,15 +101,14 @@ else: + # support one or the other of these curl-config options, so gracefully + # tolerate failure of either, but not both. + optbuf = "" +- for option in ["--libs", "--static-libs"]: ++ for option in ["--libs"]: + p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True, + stdout=subprocess.PIPE) + (stdout, stderr) = p.communicate() + if p.wait() == 0: + optbuf += stdout + if optbuf == "": +- raise Exception, ("Neither of curl-config --libs or --static-libs" + +- "produced output") ++ raise Exception, ("curl-config --libs did not produce output") + libs = split_quoted(optbuf) + + for e in libs: +-- +1.7.1 + diff --git a/python-pycurl/patches/0102-test_internals.py-add-a-test-for-ref-counting-of-res.patch b/python-pycurl/patches/0102-test_internals.py-add-a-test-for-ref-counting-of-res.patch new file mode 100644 index 0000000..7d3d534 --- /dev/null +++ b/python-pycurl/patches/0102-test_internals.py-add-a-test-for-ref-counting-of-res.patch @@ -0,0 +1,28 @@ +From 0bd83ea6c820db26f98936e6e017d39fb214cbd0 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka(a)redhat.com> +Date: Mon, 25 Feb 2013 19:50:18 +0100 +Subject: [PATCH 2/2] test_internals.py: add a test for ref-counting of reset() + +--- + tests/test_internals.py | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/tests/test_internals.py b/tests/test_internals.py +index afcc53d..d026952 100644 +--- a/tests/test_internals.py ++++ b/tests/test_internals.py +@@ -245,6 +245,11 @@ if 1 and gc: + if opts.verbose >= 1: + print "Tracked objects:", len(gc.get_objects()) + ++if 1: ++ # Ensure that the refcounting error in "reset" is fixed: ++ for i in xrange(100000): ++ c = Curl() ++ c.reset() + + # /*********************************************************************** + # // done +-- +1.7.1 + diff --git a/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch b/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch deleted file mode 100644 index 7e20b15..0000000 --- a/python-pycurl/patches/python-pycurl-fix-do_curl_reset-refcount.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/pycurl.c -+++ a/src/pycurl.c -@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self) - } - } - -+ Py_INCREF(Py_None); - return Py_None; - } - ---- a/tests/test_internals.py -+++ a/tests/test_internals.py -@@ -245,6 +245,11 @@ if 1 and gc: - if opts.verbose >= 1: - print "Tracked objects:", len(gc.get_objects()) - -+if 1: -+ # Ensure that the refcounting error in "reset" is fixed: -+ for i in xrange(100000): -+ c = Curl() -+ c.reset() - - # /*********************************************************************** - # // done diff --git a/python-pycurl/patches/python-pycurl-no-static-libs.patch0 b/python-pycurl/patches/python-pycurl-no-static-libs.patch0 deleted file mode 100644 index c1410dc..0000000 --- a/python-pycurl/patches/python-pycurl-no-static-libs.patch0 +++ /dev/null @@ -1,12 +0,0 @@ ---- setup.py~ 2008-04-22 17:00:45.000000000 +0300 -+++ setup.py 2008-07-03 21:53:36.000000000 +0300 -@@ -97,8 +97,7 @@ - else: - extra_compile_args.append(e) - libs = split_quoted( -- os.popen("'%s' --libs" % CURL_CONFIG).read()+\ -- os.popen("'%s' --static-libs" % CURL_CONFIG).read()) -+ os.popen("'%s' --libs" % CURL_CONFIG).read()) - for e in libs: - if e[:2] == "-l": - libraries.append(e[2:]) diff --git a/python-pycurl/python-pycurl.nm b/python-pycurl/python-pycurl.nm index 9d62652..3c0f536 100644 --- a/python-pycurl/python-pycurl.nm +++ b/python-pycurl/python-pycurl.nm @@ -5,7 +5,7 @@ name = python-pycurl version = 7.19.0 -release = 4 +release = 5 thisapp = pycurl-%{version} groups = Development/Languages @@ -13,14 +13,6 @@ url = http://pycurl.sourceforge.net/ license = LGPLv2+ or MIT summary = A Python interface to libcurl. -# During its initialization, PycURL checks that the actual libcurl version -# is not lower than the one used when PycURL was built. -# Yes, that should be handled by library versioning (which would then get -# automatically reflected). -# For now, we have to reflect that dependency. -LIBCURL_VERSION = $(shell curl-config --version | awk '{ print $NF }') -PKG_DEPS += libcurl>=%{LIBCURL_VERSION} - description PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the @@ -56,6 +48,15 @@ end packages package %{name} + # During its initialization, PycURL checks that the actual libcurl version + # is not lower than the one used when PycURL was built. + # Yes, that should be handled by library versioning (which would then get + # automatically reflected). + # For now, we have to reflect that dependency. + requires + libcurl >= %(curl-config --version | awk '{ print $NF }') + end + end package %{name}-debuginfo template DEBUGINFO hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2013