diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-05-28 11:29:47 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2015-05-28 11:29:47 -0300 |
| commit | fcb2d26cfa3b265200b5ae9e949d787a56bd4f14 (patch) | |
| tree | 60bf5147d7608e6217b37e6807c386b3a43a2b36 | |
| parent | 19fe7e7da672746eea0c2cae0307cea5e54fb23e (diff) | |
| parent | b0bb663657922f0154dd8d60a6d5455f9a2bfe3c (diff) | |
| download | abslibre-fcb2d26cfa3b265200b5ae9e949d787a56bd4f14.tar.gz abslibre-fcb2d26cfa3b265200b5ae9e949d787a56bd4f14.tar.bz2 abslibre-fcb2d26cfa3b265200b5ae9e949d787a56bd4f14.zip | |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
430 files changed, 7534 insertions, 8447 deletions
diff --git a/kernels/linux-libre-grsec-knock/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch b/kernels/linux-libre-grsec-knock/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch deleted file mode 100644 index 4e801b3cc..000000000 --- a/kernels/linux-libre-grsec-knock/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b27b2ff4bd6f0327ee550baa0397ccf0a559821f Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Wed, 1 Apr 2015 13:40:48 +0200 -Subject: [PATCH] drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - -We stopped handling them in - -commit aaecdf611a05cac26a94713bad25297e60225c29 -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Tue Nov 4 15:52:22 2014 +0100 - - drm/i915: Stop gathering error states for CS error interrupts - -but just clearing is apparently not enough: A sufficiently dead gpu -left behind by firmware (*cough* coreboot *cough*) can keep the gpu in -an endless loop of such interrupts, eventually leading to the nmi -firing. And definitely to what looks like a machine hang. - -Since we don't even enable these interrupts on gen5+ let's do the same -on earlier platforms. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=93171 -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_irq.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 14ecb4d13a1a..6d494432b19f 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev) - ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - I915_WRITE16(IMR, dev_priv->irq_mask); - - I915_WRITE16(IER, - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT); - POSTING_READ16(IER); - -@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev) - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - - enable_mask = - I915_ASLE_INTERRUPT | - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT; - - if (I915_HAS_HOTPLUG(dev)) { --- -2.1.4 - diff --git a/libre/linux-libre-grsec/4.0-rc7-37af2c8aae-loongson-community.patch b/kernels/linux-libre-grsec-knock/4.0.2-ae91f13af5-loongson-community.patch index 5fb2ec0b7..affcd29d8 100644 --- a/libre/linux-libre-grsec/4.0-rc7-37af2c8aae-loongson-community.patch +++ b/kernels/linux-libre-grsec-knock/4.0.2-ae91f13af5-loongson-community.patch @@ -2150,19 +2150,20 @@ index 0000000..b296220 + gdium_usb_host_fixup); +#endif diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S -index 32a7c82..3a89502 100644 +index e7567c8..498e42d 100644 --- a/arch/mips/power/hibernate.S +++ b/arch/mips/power/hibernate.S -@@ -43,7 +43,9 @@ LEAF(swsusp_arch_resume) - bne t1, t3, 1b - PTR_L t0, PBE_NEXT(t0) - bnez t0, 0b +@@ -30,8 +30,10 @@ LEAF(swsusp_arch_suspend) + END(swsusp_arch_suspend) + + LEAF(swsusp_arch_resume) +#if !defined(CONFIG_MACH_LOONGSON) || !defined(CONFIG_CPU_LOONGSON2) /* Commit 771004298d broke Loongson2. */ - jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */ + /* Avoid TLB mismatch during and after kernel resume */ + jal local_flush_tlb_all +#endif - PTR_LA t0, saved_regs - PTR_L ra, PT_R31(t0) - PTR_L sp, PT_R29(t0) + PTR_L t0, restore_pblist + 0: + PTR_L t1, PBE_ADDRESS(t0) /* source */ diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c index fc897ba..ac60f6b 100644 --- a/drivers/cpufreq/loongson2_cpufreq.c @@ -2451,10 +2452,10 @@ index 0000000..67cc095 +MODULE_LICENSE("GPL"); + diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 9c47867..a3e1258 100644 +index 7fe5590..3087a7f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1021,6 +1021,9 @@ +@@ -1025,6 +1025,9 @@ #define USB_VENDOR_ID_ZYTRONIC 0x14c8 #define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005 diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD index c2346e5ef..7672cab65 100644 --- a/kernels/linux-libre-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-grsec-knock/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-grsec-knock # Build kernel with -grsec-knock localname _pkgbasever=4.0-gnu -_pkgver=4.0.1-gnu +_pkgver=4.0.4-gnu _grsecver=3.1 -_timestamp=201505042053 +_timestamp=201505222222 _knockpatchver=3.18_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -34,8 +34,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign" - "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" - "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" + "https://repo.parabola.nu/other/grsecurity-libre/test/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" + "https://repo.parabola.nu/other/grsecurity-libre/test/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" "http://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver}.diff" "tcp_stealth_${_knockpatchver}.diff.sig::http://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver%_1}.diff_1.sig" # the main kernel config files @@ -44,31 +44,29 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch - '4.0-rc7-37af2c8aae-loongson-community.patch') + '4.0.2-ae91f13af5-loongson-community.patch') sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' - 'b99335ed7c60ba2701d81923de4e3e9efbbfa3ad0782e7d94cd48b92adb1fbd6' + 'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61' 'SKIP' - '9944bf62201fa0ad86bc9d4a5e0368d64967b626933261868b2402547abd039b' + '880b46fd8ac5690587aa0a8db8445956bbab62d12b72c28b78a5dfe05d3ef5b7' 'SKIP' '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' 'SKIP' - '16760abed3851e97991b09efab107ae27b99668a8a6994ae7d9e9b8fe418c953' - '2e50c28b0dcb8c90780be6bfb5e117403fefb10ecc97a7fae7c90fefdf95c574' - 'de68ea79d9339c4d7ef6706dc573badf4c134c1c730df1a628da2dc88e1bb3a8' + 'df033a9eb5729f61169e3aca092709cf928f820b05fea3efde14d372e2fa607f' + 'fbf48421ebfb46f09457fe601255a7dd3631f24bba28945dcabc5a8772ab3872' + 'ee7da446efd8533761aa4e2e07f8bcdb0e196f06bd067f72f29557caa33cb30b' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5' - '8a070d193bc54db696b38ac844cfbfd62724f483ad74c9a288ccab462c32f80e') + 'ac7232b38f5a25a79a23c25c8cd5ed4579ca5402466d3370dd093626998092b3') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - 'DE9452CE46F42094907F108B44D1C0F82525FE49' # Bradley Spengler + 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva 'F949CFBD140A6DD071E90B8CDC24396B6D451038' # Julian Kirsch ) @@ -90,8 +88,8 @@ prepare() { patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}" fi - # add grsecurity patches - patch -Np1 -i "${srcdir}/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" + # add grsecurity patches (without nonfree bnx2 firmware patching) + patch -Np1 -i "${srcdir}/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" rm localversion-grsec # add knock patch @@ -109,13 +107,9 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # drm/i915: Stop gathering error states for CS error interrupts - # https://bugzilla.kernel.org/show_bug.cgi?id=93171 - patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch" - # Adding loongson-community patch if [ "${CARCH}" == "mips64el" ]; then - patch -p1 -i ${srcdir}/4.0-rc7-37af2c8aae-loongson-community.patch + patch -p1 -i ${srcdir}/4.0.2-ae91f13af5-loongson-community.patch fi cat "${srcdir}/config.${CARCH}" > ./.config diff --git a/kernels/linux-libre-grsec-knock/config.i686 b/kernels/linux-libre-grsec-knock/config.i686 index ed73cfead..928e102aa 100644 --- a/kernels/linux-libre-grsec-knock/config.i686 +++ b/kernels/linux-libre-grsec-knock/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.1-gnu-201505031602-1-grsec-knock Kernel Configuration +# Linux/x86 4.0.4-gnu-201505182014-1-grsec-knock Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -151,8 +151,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -838,7 +838,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_TCP_STEALTH=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y @@ -3191,6 +3191,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3647,7 +3648,7 @@ CONFIG_POWER_RESET_GPIO=y # CONFIG_POWER_RESET_RESTART is not set # CONFIG_POWER_RESET_SYSCON is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3805,6 +3806,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set @@ -4314,6 +4316,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4825,8 +4828,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -5037,7 +5042,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -6234,6 +6341,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7308,7 +7416,7 @@ CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/kernels/linux-libre-grsec-knock/config.mips64el b/kernels/linux-libre-grsec-knock/config.mips64el index 67209e95d..36c7de4a6 100644 --- a/kernels/linux-libre-grsec-knock/config.mips64el +++ b/kernels/linux-libre-grsec-knock/config.mips64el @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/mips 4.0.1-gnu-201505042053-1-grsec-knock Kernel Configuration +# Linux/mips 4.0.4-gnu-201505182014-1-grsec-knock Kernel Configuration # CONFIG_MIPS=y @@ -271,8 +271,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -626,7 +626,7 @@ CONFIG_TCP_CONG_ILLINOIS=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_TCP_STEALTH=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y @@ -2812,6 +2812,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m # CONFIG_INPUT_E3X0_BUTTON is not set CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -3185,7 +3186,7 @@ CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3325,6 +3326,7 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -3779,6 +3781,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4232,6 +4235,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4396,7 +4400,87 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_RT5631 is not set +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5381,6 +5465,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set @@ -6366,7 +6451,7 @@ CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/kernels/linux-libre-grsec-knock/config.x86_64 b/kernels/linux-libre-grsec-knock/config.x86_64 index 1348c9663..481089625 100644 --- a/kernels/linux-libre-grsec-knock/config.x86_64 +++ b/kernels/linux-libre-grsec-knock/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.1-gnu-201505031602-1-grsec-knock Kernel Configuration +# Linux/x86 4.0.4-gnu-201505182014-1-grsec-knock Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -159,8 +159,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -822,7 +822,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_TCP_STEALTH=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y @@ -3080,6 +3080,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3497,7 +3498,7 @@ CONFIG_CHARGER_BQ24735=m CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3654,6 +3655,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -4143,6 +4145,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4633,8 +4636,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4804,7 +4809,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5931,6 +6038,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7002,7 +7110,7 @@ CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/kernels/linux-libre-knock/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch b/kernels/linux-libre-knock/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch deleted file mode 100644 index 4e801b3cc..000000000 --- a/kernels/linux-libre-knock/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b27b2ff4bd6f0327ee550baa0397ccf0a559821f Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Wed, 1 Apr 2015 13:40:48 +0200 -Subject: [PATCH] drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - -We stopped handling them in - -commit aaecdf611a05cac26a94713bad25297e60225c29 -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Tue Nov 4 15:52:22 2014 +0100 - - drm/i915: Stop gathering error states for CS error interrupts - -but just clearing is apparently not enough: A sufficiently dead gpu -left behind by firmware (*cough* coreboot *cough*) can keep the gpu in -an endless loop of such interrupts, eventually leading to the nmi -firing. And definitely to what looks like a machine hang. - -Since we don't even enable these interrupts on gen5+ let's do the same -on earlier platforms. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=93171 -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_irq.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 14ecb4d13a1a..6d494432b19f 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev) - ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - I915_WRITE16(IMR, dev_priv->irq_mask); - - I915_WRITE16(IER, - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT); - POSTING_READ16(IER); - -@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev) - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - - enable_mask = - I915_ASLE_INTERRUPT | - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT; - - if (I915_HAS_HOTPLUG(dev)) { --- -2.1.4 - diff --git a/libre/linux-libre/4.0-rc7-37af2c8aae-loongson-community.patch b/kernels/linux-libre-knock/4.0.2-ae91f13af5-loongson-community.patch index 36edc2945..c550ff3da 100644 --- a/libre/linux-libre/4.0-rc7-37af2c8aae-loongson-community.patch +++ b/kernels/linux-libre-knock/4.0.2-ae91f13af5-loongson-community.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 54430f9..09d9a42 100644 +index 0649a60..d43fa5e 100644 --- a/Makefile +++ b/Makefile @@ -297,8 +297,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ @@ -2174,19 +2174,20 @@ index 0000000..b296220 + gdium_usb_host_fixup); +#endif diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S -index 32a7c82..3a89502 100644 +index e7567c8..498e42d 100644 --- a/arch/mips/power/hibernate.S +++ b/arch/mips/power/hibernate.S -@@ -43,7 +43,9 @@ LEAF(swsusp_arch_resume) - bne t1, t3, 1b - PTR_L t0, PBE_NEXT(t0) - bnez t0, 0b +@@ -30,8 +30,10 @@ LEAF(swsusp_arch_suspend) + END(swsusp_arch_suspend) + + LEAF(swsusp_arch_resume) +#if !defined(CONFIG_MACH_LOONGSON) || !defined(CONFIG_CPU_LOONGSON2) /* Commit 771004298d broke Loongson2. */ - jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */ + /* Avoid TLB mismatch during and after kernel resume */ + jal local_flush_tlb_all +#endif - PTR_LA t0, saved_regs - PTR_L ra, PT_R31(t0) - PTR_L sp, PT_R29(t0) + PTR_L t0, restore_pblist + 0: + PTR_L t1, PBE_ADDRESS(t0) /* source */ diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c index fc897ba..ac60f6b 100644 --- a/drivers/cpufreq/loongson2_cpufreq.c @@ -2475,10 +2476,10 @@ index 0000000..67cc095 +MODULE_LICENSE("GPL"); + diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 9c47867..a3e1258 100644 +index 7fe5590..3087a7f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1021,6 +1021,9 @@ +@@ -1025,6 +1025,9 @@ #define USB_VENDOR_ID_ZYTRONIC 0x14c8 #define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005 diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index b84a13d3c..0700e2f8f 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-knock # Build stock knock kernel _pkgbasever=4.0-gnu -_pkgver=4.0.1-gnu +_pkgver=4.0.4-gnu _knockpatchver=3.18_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -19,7 +19,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="https://gnunet.org/knock" license=('GPL2') @@ -36,26 +36,26 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} + 'md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch' 'change-default-console-loglevel.patch' - '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ - '4.0-rc7-37af2c8aae-loongson-community.patch') + '4.0.2-ae91f13af5-loongson-community.patch') sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' - 'b99335ed7c60ba2701d81923de4e3e9efbbfa3ad0782e7d94cd48b92adb1fbd6' + 'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61' 'SKIP' '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' 'SKIP' - 'd4035e8b269a1e9dea1d021cf5687a439879728841e996f386c32bab4963b72e' - 'ef365b2fb9ba8a48f40bf28f7851a1045cd4b7130761c05ac6608737c5afe292' - '367fb3cb977346b500a643afd094e9eab8dd8890ba2b6fc011509538b531418c' + 'ba2fa02ea43d4fe9b78e7824d3d9752b5ba84d7ca539b871626c3583ad1cdfc2' + 'e56bd8db7d7bd0ccf46518e364f51fe57e0d9cb848a3daab145f2b7380a7fe9b' + 'cff141410c90ec34ce6e3f352f57d302db4304ea87564a1fbe888db97f28fbea' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' + 'bc83293e64653d60793708a0e277741f57c018f5ea3551a8aff3a220df917ceb' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5' - '6fd223e0e11421f87ff4c913b61636ecbbecf249f431ba87a1288463b847f26c') + '13e141279af2bc17decfc041e015710daac9a6cd1c9b4e871a76cb8f916b9e22') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva 'F949CFBD140A6DD071E90B8CDC24396B6D451038' # Julian Kirsch @@ -89,18 +89,17 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # https://bugzilla.kernel.org/show_bug.cgi?id=98501 + patch -Np1 -i "${srcdir}/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # drm/i915: Stop gathering error states for CS error interrupts - # https://bugzilla.kernel.org/show_bug.cgi?id=93171 - patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch" - # Adding loongson-community patch if [ "${CARCH}" == "mips64el" ]; then - patch -p1 -i ${srcdir}/4.0-rc7-37af2c8aae-loongson-community.patch + patch -p1 -i ${srcdir}/4.0.2-ae91f13af5-loongson-community.patch fi cat "${srcdir}/config.${CARCH}" > ./.config diff --git a/kernels/linux-libre-knock/config.i686 b/kernels/linux-libre-knock/config.i686 index d1c45adc9..25e0f885e 100644 --- a/kernels/linux-libre-knock/config.i686 +++ b/kernels/linux-libre-knock/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.0-gnu-1-knock Kernel Configuration +# Linux/x86 4.0.4-gnu-1-knock Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -151,8 +151,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -851,7 +851,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_TCP_STEALTH=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y @@ -3203,6 +3203,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3661,7 +3662,7 @@ CONFIG_POWER_RESET_GPIO=y # CONFIG_POWER_RESET_RESTART is not set # CONFIG_POWER_RESET_SYSCON is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3819,6 +3820,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set @@ -4328,6 +4330,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4839,8 +4842,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -5051,7 +5056,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -6248,6 +6355,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7149,7 +7257,7 @@ CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/kernels/linux-libre-knock/config.mips64el b/kernels/linux-libre-knock/config.mips64el index b4f836de9..88f0cca5c 100644 --- a/kernels/linux-libre-knock/config.mips64el +++ b/kernels/linux-libre-knock/config.mips64el @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/mips 4.0.0-gnu-1-knock Kernel Configuration +# Linux/mips 4.0.4-gnu-1-knock Kernel Configuration # CONFIG_MIPS=y @@ -273,8 +273,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -629,7 +629,7 @@ CONFIG_TCP_CONG_ILLINOIS=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_TCP_STEALTH=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y @@ -2814,6 +2814,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m # CONFIG_INPUT_E3X0_BUTTON is not set CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -3189,7 +3190,7 @@ CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3329,6 +3330,7 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -3783,6 +3785,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4236,6 +4239,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4400,7 +4404,87 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_RT5631 is not set +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5385,6 +5469,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set @@ -6200,7 +6285,7 @@ CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/kernels/linux-libre-knock/config.x86_64 b/kernels/linux-libre-knock/config.x86_64 index c225cbfaa..90c9bc3bd 100644 --- a/kernels/linux-libre-knock/config.x86_64 +++ b/kernels/linux-libre-knock/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.0-gnu-1-knock Kernel Configuration +# Linux/x86 4.0.4-gnu-1-knock Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -159,8 +159,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -839,7 +839,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_TCP_STEALTH=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y @@ -3101,6 +3101,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3525,7 +3526,7 @@ CONFIG_CHARGER_BQ24735=m CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3682,6 +3683,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -4172,6 +4174,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4665,6 +4668,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4834,7 +4838,108 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5987,6 +6092,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -6884,7 +6990,7 @@ CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/kernels/linux-libre-knock/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch b/kernels/linux-libre-knock/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch new file mode 100644 index 000000000..9f09102dc --- /dev/null +++ b/kernels/linux-libre-knock/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch @@ -0,0 +1,50 @@ +From a81157768a00e8cf8a7b43b5ea5cac931262374f Mon Sep 17 00:00:00 2001 +From: Eric Work <work.eric@gmail.com> +Date: Mon, 18 May 2015 23:26:23 -0700 +Subject: [PATCH] md/raid0: fix restore to sector variable in + raid0_make_request + +The variable "sector" in "raid0_make_request()" was improperly updated +by a call to "sector_div()" which modifies its first argument in place. +Commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd restored this variable +after the call for later re-use. Unfortunetly the restore was done after +the referenced variable "bio" was advanced. This lead to the original +value and the restored value being different. Here we move this line to +the proper place. + +One observed side effect of this bug was discarding a file though +unlinking would cause an unrelated file's contents to be discarded. + +Signed-off-by: NeilBrown <neilb@suse.de> +Fixes: 47d68979cc96 ("md/raid0: fix bug with chunksize not a power of 2.") +Cc: stable@vger.kernel.org (any that received above backport) +URL: https://bugzilla.kernel.org/show_bug.cgi?id=98501 +--- + drivers/md/raid0.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c +index 6a68ef5..efb654e 100644 +--- a/drivers/md/raid0.c ++++ b/drivers/md/raid0.c +@@ -524,6 +524,9 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) + ? (sector & (chunk_sects-1)) + : sector_div(sector, chunk_sects)); + ++ /* Restore due to sector_div */ ++ sector = bio->bi_iter.bi_sector; ++ + if (sectors < bio_sectors(bio)) { + split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set); + bio_chain(split, bio); +@@ -531,7 +534,6 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) + split = bio; + } + +- sector = bio->bi_iter.bi_sector; + zone = find_zone(mddev->private, §or); + tmp_dev = map_sector(mddev, zone, sector, §or); + split->bi_bdev = tmp_dev->bdev; +-- +2.4.1 + diff --git a/kernels/linux-libre-lts-grsec-knock/PKGBUILD b/kernels/linux-libre-lts-grsec-knock/PKGBUILD index 532ae5978..8b587b9b7 100644 --- a/kernels/linux-libre-lts-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-lts-grsec-knock/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-lts-grsec-knock # Build kernel with lts-grsec-knock localname _pkgbasever=3.14-gnu -_pkgver=3.14.40-gnu +_pkgver=3.14.43-gnu _grsecver=3.1 -_timestamp=201505042052 +_timestamp=201505222221 _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -34,8 +34,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign" - "https://grsecurity.net/stable/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" - "https://grsecurity.net/stable/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" + "https://repo.parabola.nu/other/grsecurity-libre/stable/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" + "https://repo.parabola.nu/other/grsecurity-libre/stable/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" "http://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver}.diff" "tcp_stealth_${_knockpatchver}.diff.sig::http://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver%_1}.diff_1.sig" # the main kernel config files @@ -48,20 +48,21 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' '0006-genksyms-fix-typeof-handling.patch' + 'gcc5_buildfixes.diff' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch '3.14.26-8475f027b4-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - 'ce132b3c3e72019cea2ab9bf5cb11871531ee60f06157e9ed8edf2115fa07693' + '1c8d7336a4176e3a96de49688cb268cc5e7a44063d32a2597a339094f3f7cc16' 'SKIP' - 'bae8bf071ca130e4366fa5cb2f5c0d5170030f8d070dade9ede420a3f6e3be47' + '84ee19168f6d70495ad427051ee8b901d5971affcbff9a9056ccd16cbd115d20' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' - '42d076a21fde98f17f26d07f66b2739a03c869bdf13d06f45815358579927f4a' - '101b135fc9e76b638cd755c293eb0a6d4fad46f27af11e0f8fe5e69671544ac9' - '6b38e89f69076203532635eff73741179219ff92e0f9c3359fe73c48d265ee93' + 'f8f419c5163ba0121a1321049352a5efdf1e872656fcf1d0df03e90e226e5e18' + '1a492d913eca774e5885059ddf712a888e10fb2fff4013c117dd744f08438a9e' + '2ea3b6d526adedc0eb39be030c9f4e2efa37bff67e495044527d3b978f5784c0' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' @@ -71,10 +72,11 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' + '470d6d019d288dce02b4a9758a34ea71d41715663a19a164749212a470a131e7' '4637b23fc0cb21520c9da612cd39c38a52bd00c80778e39110fc2e72118f9c10') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - 'DE9452CE46F42094907F108B44D1C0F82525FE49' # Bradley Spengler + 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva 'F949CFBD140A6DD071E90B8CDC24396B6D451038' # Julian Kirsch ) @@ -96,8 +98,8 @@ prepare() { patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}" fi - # add grsecurity patches - patch -Np1 -i "${srcdir}/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" + # add grsecurity patches (without nonfree bnx2 firmware patching) + patch -Np1 -i "${srcdir}/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" rm localversion-grsec # add knock patch @@ -107,6 +109,12 @@ prepare() { install -m644 -t drivers/video/logo \ "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm} + # buildfixes for gcc5 + # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/scsi/qla2xxx/qla_nx2.c?id=9493c2422cae272d6f1f567cbb424195defe4176 + # https://lkml.org/lkml/2014/11/9/27 + # https://lkml.org/lkml/2014/12/14/55 + patch -p1 -i "${srcdir}/gcc5_buildfixes.diff" + # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git diff --git a/kernels/linux-libre-lts-grsec-knock/config.i686 b/kernels/linux-libre-lts-grsec-knock/config.i686 index 728526083..520527123 100644 --- a/kernels/linux-libre-lts-grsec-knock/config.i686 +++ b/kernels/linux-libre-lts-grsec-knock/config.i686 @@ -1857,7 +1857,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5616,21 +5616,21 @@ CONFIG_FB_OLPC_DCON=m CONFIG_FB_OLPC_DCON_1=y CONFIG_FB_OLPC_DCON_1_5=y # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5640,8 +5640,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/kernels/linux-libre-lts-grsec-knock/config.mips64el b/kernels/linux-libre-lts-grsec-knock/config.mips64el index c240319cb..9f9d324c7 100644 --- a/kernels/linux-libre-lts-grsec-knock/config.mips64el +++ b/kernels/linux-libre-lts-grsec-knock/config.mips64el @@ -1602,7 +1602,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5049,21 +5049,21 @@ CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5073,8 +5073,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/kernels/linux-libre-lts-grsec-knock/config.x86_64 b/kernels/linux-libre-lts-grsec-knock/config.x86_64 index 65e9ad41f..1e665bfd6 100644 --- a/kernels/linux-libre-lts-grsec-knock/config.x86_64 +++ b/kernels/linux-libre-lts-grsec-knock/config.x86_64 @@ -1814,7 +1814,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5367,21 +5367,21 @@ CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5391,8 +5391,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/kernels/linux-libre-lts-grsec-knock/gcc5_buildfixes.diff b/kernels/linux-libre-lts-grsec-knock/gcc5_buildfixes.diff new file mode 100644 index 000000000..f29d60674 --- /dev/null +++ b/kernels/linux-libre-lts-grsec-knock/gcc5_buildfixes.diff @@ -0,0 +1,115 @@ +From 9493c2422cae272d6f1f567cbb424195defe4176 Mon Sep 17 00:00:00 2001 +From: Chen Gang <gang.chen.5i5j@gmail.com> +Date: Sat, 1 Nov 2014 19:46:12 +0800 +Subject: qla2xxx: remove redundant declaration in 'qla_gbl.h' + +Remove 2 redundant extern inline functions: qla8044_set_qsnt_ready() and +qla8044_need_reset_handler(). At present, within upstream next kernel +source code, they are only used within "drivers/scsi/qla2xxx/qla_nx2.c". + +The related error and warnings (with allmodconfig under tile): + + CC [M] drivers/scsi/qla2xxx/qla_nx2.o + drivers/scsi/qla2xxx/qla_nx2.c:1633:1: error: static declaration of 'qla8044_need_reset_handler' follows non-static declaration + qla8044_need_reset_handler(struct scsi_qla_host *vha) + ^ + In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, + from drivers/scsi/qla2xxx/qla_nx2.c:11: + drivers/scsi/qla2xxx/qla_gbl.h:756:20: note: previous declaration of 'qla8044_need_reset_handler' was here + extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); + ^ + drivers/scsi/qla2xxx/qla_gbl.h:756:20: warning: inline function 'qla8044_need_reset_handler' declared but never defined + make[3]: *** [drivers/scsi/qla2xxx/qla_nx2.o] Error 1 + make[2]: *** [drivers/scsi/qla2xxx] Error 2 + make[1]: *** [drivers/scsi] Error 2 + make: *** [drivers] Error 2 + + CC [M] drivers/scsi/qla2xxx/qla_tmpl.o + In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, + from drivers/scsi/qla2xxx/qla_tmpl.c:7: + drivers/scsi/qla2xxx/qla_gbl.h:755:20: warning: inline function 'qla8044_set_qsnt_ready' declared but never defined + extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); + ^ + +Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> +Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> +Signed-off-by: Christoph Hellwig <hch@lst.de> + +diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h +index b1865a7..7686bfe 100644 +--- a/drivers/scsi/qla2xxx/qla_gbl.h ++++ b/drivers/scsi/qla2xxx/qla_gbl.h +@@ -752,8 +752,6 @@ extern void qla8044_set_idc_dontreset(struct scsi_qla_host *ha); + extern int qla8044_rd_direct(struct scsi_qla_host *vha, const uint32_t crb_reg); + extern void qla8044_wr_direct(struct scsi_qla_host *vha, + const uint32_t crb_reg, const uint32_t value); +-extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); +-extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); + extern int qla8044_device_state_handler(struct scsi_qla_host *vha); + extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha); + extern void qla8044_clear_drv_active(struct qla_hw_data *); +diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c +index 24a8528..ed4d6b6 100644 +--- a/drivers/scsi/qla2xxx/qla_nx2.c ++++ b/drivers/scsi/qla2xxx/qla_nx2.c +@@ -238,7 +238,7 @@ qla8044_rmw_crb_reg(struct scsi_qla_host *vha, + return; + } + +-inline void ++static inline void + qla8044_set_qsnt_ready(struct scsi_qla_host *vha) + { + uint32_t qsnt_state; +-- +cgit v0.10.2 + +diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h +index e2b3985..c245ea3 100644 +--- a/lib/mpi/mpi-inline.h ++++ b/lib/mpi/mpi-inline.h +@@ -30,7 +30,7 @@ + #define G10_MPI_INLINE_H + + #ifndef G10_MPI_INLINE_DECL +-#define G10_MPI_INLINE_DECL extern inline ++#define G10_MPI_INLINE_DECL static inline + #endif + + G10_MPI_INLINE_DECL mpi_limb_t +diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h +index 60cf765..91ef8ac 100644 +--- a/lib/mpi/mpi-internal.h ++++ b/lib/mpi/mpi-internal.h +@@ -168,20 +168,24 @@ void mpi_rshift_limbs(MPI a, unsigned int count); + int mpi_lshift_limbs(MPI a, unsigned int count); + + /*-- mpihelp-add.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-sub.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-cmp.c --*/ + int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size); +-- +1.9.3 + diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index 4520d0bb2..ab6ed0d63 100644 --- a/kernels/linux-libre-lts-grsec/PKGBUILD +++ b/kernels/linux-libre-lts-grsec/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-lts-grsec # Build kernel with lts-grsec localname _pkgbasever=3.14-gnu -_pkgver=3.14.40-gnu +_pkgver=3.14.43-gnu _grsecver=3.1 -_timestamp=201505042052 +_timestamp=201505222221 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,8 +33,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign" - "https://grsecurity.net/stable/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" - "https://grsecurity.net/stable/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" + "https://repo.parabola.nu/other/grsecurity-libre/stable/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" + "https://repo.parabola.nu/other/grsecurity-libre/stable/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" # the main kernel config files 'config.i686' 'config.x86_64' 'config.mips64el' # standard config files for mkinitcpio ramdisk @@ -45,18 +45,19 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' '0006-genksyms-fix-typeof-handling.patch' + 'gcc5_buildfixes.diff' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch '3.14.26-8475f027b4-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - 'ce132b3c3e72019cea2ab9bf5cb11871531ee60f06157e9ed8edf2115fa07693' + '1c8d7336a4176e3a96de49688cb268cc5e7a44063d32a2597a339094f3f7cc16' 'SKIP' - 'bae8bf071ca130e4366fa5cb2f5c0d5170030f8d070dade9ede420a3f6e3be47' + '84ee19168f6d70495ad427051ee8b901d5971affcbff9a9056ccd16cbd115d20' 'SKIP' - 'd8d02e727bd240e15cbd61227a128babda150cfb1d2329d4206ff99071817884' - '2efe40d528f669e9d82f43ea77727d666dafb2529faa2e9df3eb05657dc4ae9f' - '67bb5beb5414b9e9c3c03d800bb0fa2dd95225529ea8c89955619a46c4272e10' + '3758c3c26491cbbea0a096724a8f54ac246188b1c8e86a3dbe91ac1d23708d3e' + '07447a3299fcd730a17ca5f1ef6e18983e4843b167e65eca0ab479adf64d60c2' + 'c7863a24550dd068b86b50f74a3a2503289419503d460e526164ea6c246bd443' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' @@ -66,10 +67,11 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' + '470d6d019d288dce02b4a9758a34ea71d41715663a19a164749212a470a131e7' '4637b23fc0cb21520c9da612cd39c38a52bd00c80778e39110fc2e72118f9c10') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - 'DE9452CE46F42094907F108B44D1C0F82525FE49' # Bradley Spengler + 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva ) _kernelname=${pkgbase#linux-libre} @@ -90,14 +92,20 @@ prepare() { patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}" fi - # add grsecurity patches - patch -Np1 -i "${srcdir}/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" + # add grsecurity patches (without nonfree bnx2 firmware patching) + patch -Np1 -i "${srcdir}/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" rm localversion-grsec # add freedo as boot logo install -m644 -t drivers/video/logo \ "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm} + # buildfixes for gcc5 + # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/scsi/qla2xxx/qla_nx2.c?id=9493c2422cae272d6f1f567cbb424195defe4176 + # https://lkml.org/lkml/2014/11/9/27 + # https://lkml.org/lkml/2014/12/14/55 + patch -p1 -i "${srcdir}/gcc5_buildfixes.diff" + # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git diff --git a/kernels/linux-libre-lts-grsec/config.i686 b/kernels/linux-libre-lts-grsec/config.i686 index a351562a1..42f80defb 100644 --- a/kernels/linux-libre-lts-grsec/config.i686 +++ b/kernels/linux-libre-lts-grsec/config.i686 @@ -1856,7 +1856,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5615,21 +5615,21 @@ CONFIG_FB_OLPC_DCON=m CONFIG_FB_OLPC_DCON_1=y CONFIG_FB_OLPC_DCON_1_5=y # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5639,8 +5639,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/kernels/linux-libre-lts-grsec/config.mips64el b/kernels/linux-libre-lts-grsec/config.mips64el index 131a21a7d..6e024df2e 100644 --- a/kernels/linux-libre-lts-grsec/config.mips64el +++ b/kernels/linux-libre-lts-grsec/config.mips64el @@ -1601,7 +1601,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5048,21 +5048,21 @@ CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5072,8 +5072,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/kernels/linux-libre-lts-grsec/config.x86_64 b/kernels/linux-libre-lts-grsec/config.x86_64 index 2e0ecaba2..0d7be6238 100644 --- a/kernels/linux-libre-lts-grsec/config.x86_64 +++ b/kernels/linux-libre-lts-grsec/config.x86_64 @@ -1813,7 +1813,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5366,21 +5366,21 @@ CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5390,8 +5390,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/kernels/linux-libre-lts-grsec/gcc5_buildfixes.diff b/kernels/linux-libre-lts-grsec/gcc5_buildfixes.diff new file mode 100644 index 000000000..f29d60674 --- /dev/null +++ b/kernels/linux-libre-lts-grsec/gcc5_buildfixes.diff @@ -0,0 +1,115 @@ +From 9493c2422cae272d6f1f567cbb424195defe4176 Mon Sep 17 00:00:00 2001 +From: Chen Gang <gang.chen.5i5j@gmail.com> +Date: Sat, 1 Nov 2014 19:46:12 +0800 +Subject: qla2xxx: remove redundant declaration in 'qla_gbl.h' + +Remove 2 redundant extern inline functions: qla8044_set_qsnt_ready() and +qla8044_need_reset_handler(). At present, within upstream next kernel +source code, they are only used within "drivers/scsi/qla2xxx/qla_nx2.c". + +The related error and warnings (with allmodconfig under tile): + + CC [M] drivers/scsi/qla2xxx/qla_nx2.o + drivers/scsi/qla2xxx/qla_nx2.c:1633:1: error: static declaration of 'qla8044_need_reset_handler' follows non-static declaration + qla8044_need_reset_handler(struct scsi_qla_host *vha) + ^ + In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, + from drivers/scsi/qla2xxx/qla_nx2.c:11: + drivers/scsi/qla2xxx/qla_gbl.h:756:20: note: previous declaration of 'qla8044_need_reset_handler' was here + extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); + ^ + drivers/scsi/qla2xxx/qla_gbl.h:756:20: warning: inline function 'qla8044_need_reset_handler' declared but never defined + make[3]: *** [drivers/scsi/qla2xxx/qla_nx2.o] Error 1 + make[2]: *** [drivers/scsi/qla2xxx] Error 2 + make[1]: *** [drivers/scsi] Error 2 + make: *** [drivers] Error 2 + + CC [M] drivers/scsi/qla2xxx/qla_tmpl.o + In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, + from drivers/scsi/qla2xxx/qla_tmpl.c:7: + drivers/scsi/qla2xxx/qla_gbl.h:755:20: warning: inline function 'qla8044_set_qsnt_ready' declared but never defined + extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); + ^ + +Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> +Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> +Signed-off-by: Christoph Hellwig <hch@lst.de> + +diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h +index b1865a7..7686bfe 100644 +--- a/drivers/scsi/qla2xxx/qla_gbl.h ++++ b/drivers/scsi/qla2xxx/qla_gbl.h +@@ -752,8 +752,6 @@ extern void qla8044_set_idc_dontreset(struct scsi_qla_host *ha); + extern int qla8044_rd_direct(struct scsi_qla_host *vha, const uint32_t crb_reg); + extern void qla8044_wr_direct(struct scsi_qla_host *vha, + const uint32_t crb_reg, const uint32_t value); +-extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); +-extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); + extern int qla8044_device_state_handler(struct scsi_qla_host *vha); + extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha); + extern void qla8044_clear_drv_active(struct qla_hw_data *); +diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c +index 24a8528..ed4d6b6 100644 +--- a/drivers/scsi/qla2xxx/qla_nx2.c ++++ b/drivers/scsi/qla2xxx/qla_nx2.c +@@ -238,7 +238,7 @@ qla8044_rmw_crb_reg(struct scsi_qla_host *vha, + return; + } + +-inline void ++static inline void + qla8044_set_qsnt_ready(struct scsi_qla_host *vha) + { + uint32_t qsnt_state; +-- +cgit v0.10.2 + +diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h +index e2b3985..c245ea3 100644 +--- a/lib/mpi/mpi-inline.h ++++ b/lib/mpi/mpi-inline.h +@@ -30,7 +30,7 @@ + #define G10_MPI_INLINE_H + + #ifndef G10_MPI_INLINE_DECL +-#define G10_MPI_INLINE_DECL extern inline ++#define G10_MPI_INLINE_DECL static inline + #endif + + G10_MPI_INLINE_DECL mpi_limb_t +diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h +index 60cf765..91ef8ac 100644 +--- a/lib/mpi/mpi-internal.h ++++ b/lib/mpi/mpi-internal.h +@@ -168,20 +168,24 @@ void mpi_rshift_limbs(MPI a, unsigned int count); + int mpi_lshift_limbs(MPI a, unsigned int count); + + /*-- mpihelp-add.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-sub.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-cmp.c --*/ + int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size); +-- +1.9.3 + diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index a722dd3ef..7e35dd74c 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts-knock # Build stock -lts-knock kernel _pkgbasever=3.14-gnu -_pkgver=3.14.40-gnu +_pkgver=3.14.43-gnu _knockpatchver=3.16_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -41,17 +41,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' '0006-genksyms-fix-typeof-handling.patch' + 'gcc5_buildfixes.diff' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ '3.14.26-8475f027b4-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - 'ce132b3c3e72019cea2ab9bf5cb11871531ee60f06157e9ed8edf2115fa07693' + '1c8d7336a4176e3a96de49688cb268cc5e7a44063d32a2597a339094f3f7cc16' 'SKIP' '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209' 'SKIP' - '260ac2bbfa9d401f7cd283e09e4140273207819417acd4ae9e05b9138c8316a1' - '76d5df27bd7e686faf101cd2e415ad9d4e623b88323819465efb7fdc91a5523a' - '2056d30f799c34f5d9114517cb1fdcba806f8b9477431a260abd4322af8c79aa' + 'f956fa414f4374244867a0e1dc80344b0a9fa302b7c5d71e267642edacb5fcbf' + 'e07a26cfbbf8be8f09ef0fb129079482a3577d1f14ef7b7b0ffd6f4d00140258' + '4422d57b8ec383fc511781e76eba4e5c348467de17e3e0e3ae8f5b665e99208d' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' @@ -61,6 +62,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' + '470d6d019d288dce02b4a9758a34ea71d41715663a19a164749212a470a131e7' '7c2d1e257acce0ea6f260f3acf18e30e21c12a9a6b3d7d1d4097dafd287388e2') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -92,6 +94,12 @@ prepare() { install -m644 -t drivers/video/logo \ "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm} + # buildfixes for gcc5 + # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/scsi/qla2xxx/qla_nx2.c?id=9493c2422cae272d6f1f567cbb424195defe4176 + # https://lkml.org/lkml/2014/11/9/27 + # https://lkml.org/lkml/2014/12/14/55 + patch -p1 -i "${srcdir}/gcc5_buildfixes.diff" + # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git diff --git a/kernels/linux-libre-lts-knock/config.i686 b/kernels/linux-libre-lts-knock/config.i686 index 2840f48a0..73f030116 100644 --- a/kernels/linux-libre-lts-knock/config.i686 +++ b/kernels/linux-libre-lts-knock/config.i686 @@ -1871,7 +1871,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5632,21 +5632,21 @@ CONFIG_FB_OLPC_DCON=m CONFIG_FB_OLPC_DCON_1=y CONFIG_FB_OLPC_DCON_1_5=y # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5656,8 +5656,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/kernels/linux-libre-lts-knock/config.mips64el b/kernels/linux-libre-lts-knock/config.mips64el index a236bf6fc..6bb4fafee 100644 --- a/kernels/linux-libre-lts-knock/config.mips64el +++ b/kernels/linux-libre-lts-knock/config.mips64el @@ -1604,7 +1604,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5052,21 +5052,21 @@ CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5076,8 +5076,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/kernels/linux-libre-lts-knock/config.x86_64 b/kernels/linux-libre-lts-knock/config.x86_64 index 0c8fbcac7..7bec5bdb4 100644 --- a/kernels/linux-libre-lts-knock/config.x86_64 +++ b/kernels/linux-libre-lts-knock/config.x86_64 @@ -1835,7 +1835,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5421,21 +5421,21 @@ CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5445,8 +5445,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/kernels/linux-libre-lts-knock/gcc5_buildfixes.diff b/kernels/linux-libre-lts-knock/gcc5_buildfixes.diff new file mode 100644 index 000000000..f29d60674 --- /dev/null +++ b/kernels/linux-libre-lts-knock/gcc5_buildfixes.diff @@ -0,0 +1,115 @@ +From 9493c2422cae272d6f1f567cbb424195defe4176 Mon Sep 17 00:00:00 2001 +From: Chen Gang <gang.chen.5i5j@gmail.com> +Date: Sat, 1 Nov 2014 19:46:12 +0800 +Subject: qla2xxx: remove redundant declaration in 'qla_gbl.h' + +Remove 2 redundant extern inline functions: qla8044_set_qsnt_ready() and +qla8044_need_reset_handler(). At present, within upstream next kernel +source code, they are only used within "drivers/scsi/qla2xxx/qla_nx2.c". + +The related error and warnings (with allmodconfig under tile): + + CC [M] drivers/scsi/qla2xxx/qla_nx2.o + drivers/scsi/qla2xxx/qla_nx2.c:1633:1: error: static declaration of 'qla8044_need_reset_handler' follows non-static declaration + qla8044_need_reset_handler(struct scsi_qla_host *vha) + ^ + In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, + from drivers/scsi/qla2xxx/qla_nx2.c:11: + drivers/scsi/qla2xxx/qla_gbl.h:756:20: note: previous declaration of 'qla8044_need_reset_handler' was here + extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); + ^ + drivers/scsi/qla2xxx/qla_gbl.h:756:20: warning: inline function 'qla8044_need_reset_handler' declared but never defined + make[3]: *** [drivers/scsi/qla2xxx/qla_nx2.o] Error 1 + make[2]: *** [drivers/scsi/qla2xxx] Error 2 + make[1]: *** [drivers/scsi] Error 2 + make: *** [drivers] Error 2 + + CC [M] drivers/scsi/qla2xxx/qla_tmpl.o + In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, + from drivers/scsi/qla2xxx/qla_tmpl.c:7: + drivers/scsi/qla2xxx/qla_gbl.h:755:20: warning: inline function 'qla8044_set_qsnt_ready' declared but never defined + extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); + ^ + +Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> +Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> +Signed-off-by: Christoph Hellwig <hch@lst.de> + +diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h +index b1865a7..7686bfe 100644 +--- a/drivers/scsi/qla2xxx/qla_gbl.h ++++ b/drivers/scsi/qla2xxx/qla_gbl.h +@@ -752,8 +752,6 @@ extern void qla8044_set_idc_dontreset(struct scsi_qla_host *ha); + extern int qla8044_rd_direct(struct scsi_qla_host *vha, const uint32_t crb_reg); + extern void qla8044_wr_direct(struct scsi_qla_host *vha, + const uint32_t crb_reg, const uint32_t value); +-extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); +-extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); + extern int qla8044_device_state_handler(struct scsi_qla_host *vha); + extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha); + extern void qla8044_clear_drv_active(struct qla_hw_data *); +diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c +index 24a8528..ed4d6b6 100644 +--- a/drivers/scsi/qla2xxx/qla_nx2.c ++++ b/drivers/scsi/qla2xxx/qla_nx2.c +@@ -238,7 +238,7 @@ qla8044_rmw_crb_reg(struct scsi_qla_host *vha, + return; + } + +-inline void ++static inline void + qla8044_set_qsnt_ready(struct scsi_qla_host *vha) + { + uint32_t qsnt_state; +-- +cgit v0.10.2 + +diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h +index e2b3985..c245ea3 100644 +--- a/lib/mpi/mpi-inline.h ++++ b/lib/mpi/mpi-inline.h +@@ -30,7 +30,7 @@ + #define G10_MPI_INLINE_H + + #ifndef G10_MPI_INLINE_DECL +-#define G10_MPI_INLINE_DECL extern inline ++#define G10_MPI_INLINE_DECL static inline + #endif + + G10_MPI_INLINE_DECL mpi_limb_t +diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h +index 60cf765..91ef8ac 100644 +--- a/lib/mpi/mpi-internal.h ++++ b/lib/mpi/mpi-internal.h +@@ -168,20 +168,24 @@ void mpi_rshift_limbs(MPI a, unsigned int count); + int mpi_lshift_limbs(MPI a, unsigned int count); + + /*-- mpihelp-add.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-sub.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-cmp.c --*/ + int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size); +-- +1.9.3 + diff --git a/kernels/linux-libre-pae/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch b/kernels/linux-libre-pae/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch deleted file mode 100644 index 4e801b3cc..000000000 --- a/kernels/linux-libre-pae/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b27b2ff4bd6f0327ee550baa0397ccf0a559821f Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Wed, 1 Apr 2015 13:40:48 +0200 -Subject: [PATCH] drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - -We stopped handling them in - -commit aaecdf611a05cac26a94713bad25297e60225c29 -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Tue Nov 4 15:52:22 2014 +0100 - - drm/i915: Stop gathering error states for CS error interrupts - -but just clearing is apparently not enough: A sufficiently dead gpu -left behind by firmware (*cough* coreboot *cough*) can keep the gpu in -an endless loop of such interrupts, eventually leading to the nmi -firing. And definitely to what looks like a machine hang. - -Since we don't even enable these interrupts on gen5+ let's do the same -on earlier platforms. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=93171 -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_irq.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 14ecb4d13a1a..6d494432b19f 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev) - ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - I915_WRITE16(IMR, dev_priv->irq_mask); - - I915_WRITE16(IER, - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT); - POSTING_READ16(IER); - -@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev) - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - - enable_mask = - I915_ASLE_INTERRUPT | - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT; - - if (I915_HAS_HOTPLUG(dev)) { --- -2.1.4 - diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 97c66060e..3728d79c4 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-pae # Build stock -pae kernel _pkgbasever=4.0-gnu -_pkgver=4.0.1-gnu +_pkgver=4.0.4-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,19 +33,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} - 'change-default-console-loglevel.patch' - '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch') + 'change-default-console-loglevel.patch') sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' - 'b99335ed7c60ba2701d81923de4e3e9efbbfa3ad0782e7d94cd48b92adb1fbd6' + 'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61' 'SKIP' - '93b28de76ceaf7e71079432c3b781dbda092fd64a801760f2b93a833ceec28e9' + 'a77c1bd4473e4a6eae2f276f4fc677054732cd282e001bbe8abab8da7fcda60a' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) @@ -75,10 +73,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # drm/i915: Stop gathering error states for CS error interrupts - # https://bugzilla.kernel.org/show_bug.cgi?id=93171 - patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch" - cat "${srcdir}/config" > ./.config # simpler # append pkgrel to extraversion diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index dd74bce6d..94e07e366 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.0-gnu-1-pae Kernel Configuration +# Linux/x86 4.0.4-gnu-1-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -151,8 +151,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -857,7 +857,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3208,6 +3208,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3666,7 +3667,7 @@ CONFIG_POWER_RESET_GPIO=y # CONFIG_POWER_RESET_RESTART is not set # CONFIG_POWER_RESET_SYSCON is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3824,6 +3825,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set @@ -4333,6 +4335,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4844,8 +4847,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -5056,7 +5061,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -6254,6 +6361,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7155,7 +7263,7 @@ CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index b8c366574..fb7eda293 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-rt # Build stock -rt kernel _pkgbasever=3.18-gnu -_pkgver=3.18.11-gnu +_pkgver=3.18.13-gnu _rtbasever=3.18 -_rtpatchver=rt7 +_rtpatchver=rt10 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,8 +33,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign" - "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_pkgver%-*}-${_rtpatchver}.patch.xz" - "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_pkgver%-*}-${_rtpatchver}.patch.sign" + "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/older/patch-${_pkgver%-*}-${_rtpatchver}.patch.xz" + "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/older/patch-${_pkgver%-*}-${_rtpatchver}.patch.sign" # the main kernel config files 'config.i686' 'config.x86_64' 'config.mips64el' # standard config files for mkinitcpio ramdisk @@ -45,9 +45,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.18-rc6-48c0ad793f-loongson-community.patch') sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' 'SKIP' - '729a652867f9458574307cc5eaf95fd281ad7f28b9a31cab8381304bdcff5df4' + 'cd0baedefbb12b74cdc76e9a42e735ac710513bc59d9df6a72e963ac01cb983d' 'SKIP' - '4d5cf3c1a3660ad1376090fa5916aae38cf5fd8b240e47bde5ec969944edd1b6' + '4852137491341a3f1d976cf5b17c038fdc74b167d555195aacd61094b02ce741' 'SKIP' 'eef029fd77f0de3d7724d722e13f4aa3a850158565bd608c834db23d702a8707' '5662022f3820005108e9591e1a6944b753b8b068540316568723e9fee2a34e40' @@ -61,6 +61,7 @@ sha256sums=('0f347d8eba8a6878246b94b3559eb0371d96a3f43de2f134513e274de11a60cf' validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva '64254695FFF0AA4466CC19E67B96E8162A8CF5D1' # Sebastian Andrzej Siewior + '5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt ) _kernelname=${pkgbase#linux-libre} diff --git a/kernels/linux-libre-xen/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch b/kernels/linux-libre-xen/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch deleted file mode 100644 index 4e801b3cc..000000000 --- a/kernels/linux-libre-xen/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b27b2ff4bd6f0327ee550baa0397ccf0a559821f Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Wed, 1 Apr 2015 13:40:48 +0200 -Subject: [PATCH] drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - -We stopped handling them in - -commit aaecdf611a05cac26a94713bad25297e60225c29 -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Tue Nov 4 15:52:22 2014 +0100 - - drm/i915: Stop gathering error states for CS error interrupts - -but just clearing is apparently not enough: A sufficiently dead gpu -left behind by firmware (*cough* coreboot *cough*) can keep the gpu in -an endless loop of such interrupts, eventually leading to the nmi -firing. And definitely to what looks like a machine hang. - -Since we don't even enable these interrupts on gen5+ let's do the same -on earlier platforms. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=93171 -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_irq.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 14ecb4d13a1a..6d494432b19f 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev) - ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - I915_WRITE16(IMR, dev_priv->irq_mask); - - I915_WRITE16(IER, - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT); - POSTING_READ16(IER); - -@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev) - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - - enable_mask = - I915_ASLE_INTERRUPT | - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT; - - if (I915_HAS_HOTPLUG(dev)) { --- -2.1.4 - diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 1d6bf600d..1f16a6d81 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-xen # Build stock -xen kernel _pkgbasever=4.0-gnu -_pkgver=4.0.1-gnu +_pkgver=4.0.4-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,19 +33,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} - 'change-default-console-loglevel.patch' - '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch') + 'change-default-console-loglevel.patch') sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' - 'b99335ed7c60ba2701d81923de4e3e9efbbfa3ad0782e7d94cd48b92adb1fbd6' + 'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61' 'SKIP' - '85be8d49d63f80d43eb83b6b6fd0ecc961f20c4f90f526042d1c5fe9b774c70d' + '829578ec9d35cae1f7fa559c6cab1d13ca21bc91be88f9f110e7ee70e698e659' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) @@ -75,10 +73,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # drm/i915: Stop gathering error states for CS error interrupts - # https://bugzilla.kernel.org/show_bug.cgi?id=93171 - patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch" - cat "${srcdir}/config" > ./.config # simpler # append pkgrel to extraversion diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index a0b9a8a64..e3bb5fc40 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.0-gnu-1-xen Kernel Configuration +# Linux/x86 4.0.4-gnu-1-xen Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -151,8 +151,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -864,7 +864,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3220,6 +3220,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3683,7 +3684,7 @@ CONFIG_POWER_RESET_GPIO=y # CONFIG_POWER_RESET_RESTART is not set # CONFIG_POWER_RESET_SYSCON is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3841,6 +3842,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set @@ -4351,6 +4353,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4863,8 +4866,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -5075,7 +5080,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -6298,6 +6405,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7199,7 +7307,7 @@ CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre-multilib/lib32-libclc/PKGBUILD b/libre-multilib/lib32-libclc/PKGBUILD index 25236b918..e1531e3ea 100644 --- a/libre-multilib/lib32-libclc/PKGBUILD +++ b/libre-multilib/lib32-libclc/PKGBUILD @@ -2,19 +2,19 @@ # Contributor: André Silva <emulatorman@parabola.nu> pkgname=lib32-libclc -pkgver=0.0.1.217247 +pkgver=0.0.1.231373 pkgrel=1 pkgdesc="Library requirements of the OpenCL C programming language (32-bit)" arch=('x86_64') url="http://libclc.llvm.org/" license=('MIT') -makedepends=('lib32-clang' 'svn' 'python2' 'libclc') +makedepends=('lib32-clang' 'python2' 'libclc') options=('staticlibs') replaces=(lib32-libclc-svn) provides=(lib32-libclc-svn) conflicts=(lib32-libclc-svn) -source=('libclc::svn+http://llvm.org/svn/llvm-project/libclc/trunk#revision=217247') -md5sums=(SKIP) +source=(https://sources.archlinux.org/other/packages/libclc/libclc-$pkgver.src.tar.xz) +md5sums=('e7b0767cd9f6c171ba4990df5d41b2aa') build() { cd libclc diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD index 04ed42d6c..4ee7436b5 100644 --- a/libre-multilib/lib32-mesa-libcl/PKGBUILD +++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa _pkgname=libcl pkgname=lib32-$pkgbase-$_pkgname -pkgver=10.5.4 +pkgver=10.5.5 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library and ICD loader (32-bit)' arch=('x86_64') @@ -18,7 +18,7 @@ provides=("lib32-$_pkgname") conflicts=("lib32-$_pkgname" "lib32-$_pkgname-libre" 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-304xx') replaces=("lib32-$_pkgname" "lib32-$_pkgname-libre" 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-304xx') source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig}) -sha512sums=('e8268b5a28eeafe03d8d8e4a1b3865e5b4a05501507d5b623f7d4c542ade3d8fa6fef2a2b6c05d6aaefa81de26365ab6bb895a0ba2a1d9c05dd1fd701bdab5f5' +sha512sums=('d339f598bfdbe14388d3213b166bed5f89e67535b0ccc09d47f434e2669ed3c5d4c23a1c86f3e180d90e8ba1175f9de24f62b16364f072ac6bb695b57e519b61' 'SKIP') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> diff --git a/libre-multilib/lib32-opencl-mesa/PKGBUILD b/libre-multilib/lib32-opencl-mesa/PKGBUILD index 8319791e1..1f054e083 100644 --- a/libre-multilib/lib32-opencl-mesa/PKGBUILD +++ b/libre-multilib/lib32-opencl-mesa/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa _pkgname=libcl pkgname=lib32-opencl-$pkgbase -pkgver=10.5.4 +pkgver=10.5.5 pkgrel=1 pkgdesc='OpenCL support for mesa drivers (32-bit)' arch=('x86_64') @@ -16,7 +16,7 @@ optdepends=('opencl-headers: headers necessary for OpenCL development') # "CHROOTEXTRAPKG=(multilib-devel)" on "/etc/libretools.d/chroot.conf" file. makedepends=('python2-mako' 'dri2proto' 'dri3proto' 'glproto' 'presentproto' 'python2' 'llvm') source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig}) -sha512sums=('e8268b5a28eeafe03d8d8e4a1b3865e5b4a05501507d5b623f7d4c542ade3d8fa6fef2a2b6c05d6aaefa81de26365ab6bb895a0ba2a1d9c05dd1fd701bdab5f5' +sha512sums=('d339f598bfdbe14388d3213b166bed5f89e67535b0ccc09d47f434e2669ed3c5d4c23a1c86f3e180d90e8ba1175f9de24f62b16364f072ac6bb695b57e519b61' 'SKIP') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index f45d83e5c..3ad505a61 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -9,11 +9,11 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.0 - _archrel=28 + _archrel=30 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _archrel=17 + _archrel=21 _parabolarel=1 elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.19 diff --git a/libre/asciidoc/PKGBUILD b/libre/asciidoc/PKGBUILD new file mode 100644 index 000000000..8ef3debd3 --- /dev/null +++ b/libre/asciidoc/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 118968 2014-09-14 16:00:30Z bluewind $ +# Contributor (Arch): Chris Brannon <cmbrannon79@gmail.com> +# Contributor (Arch): Geoffroy Carrier <geoffroy@archlinux.org> +# Contributor (Arch): Dan McGee <dan@archlinux.org> +# Contributor (Arch): Jaroslaw Rosiek <philosoph@interia.pl> +# Contributor (Arch): Darwin Bautista <djclue917@gmail.com> +# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer (Arch): Florian Pritz <flo@xinu.at> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=asciidoc +pkgver=8.6.9 +pkgrel=2.parabola1 +pkgdesc='Text document format for short documents, articles, books and UNIX man pages, without nonfree fop recommendation' +arch=('any') +url='http://www.methods.co.nz/asciidoc/' +license=('GPL') +depends=('python2' 'libxslt' 'docbook-xsl') +optdepends=('lilypond: music-filter' + 'imagemagick: music-filter (used in conjunction with lilypond)' + 'source-highlight: source-highlight-filter' + 'dblatex: pdf generation' + 'lynx: text generation' + 'w3m: text generation (alternative to lynx)') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('c59018f105be8d022714b826b0be130a') + +prepare() { + cd ${pkgname}-${pkgver} + + # python2 fix + for file in asciidocapi.py a2x.py asciidoc.py filters/music/music2png.py filters/latex/latex2png.py \ + filters/code/code-filter.py filters/graphviz/graphviz2png.py; do + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done + #sed -i -e 's_sys:python_sys:python2_g' -e 's_sys3:python_sys3:python2_g' xhtml11.conf + #sed -i 's_sys:python_sys:python2_g' xhtml11-quirks.conf + #sed -i -e 's/{python}/{python2}/g' \ + #-e 's#{language@python:py:#{language@python2:py:#' \ + #filters/source/source-highlight-filter.conf \ + #html5.conf xhtml11.conf xhtml11-quirks.conf + #sed -i -e "s#'python'#'python2'#g" filters/code/code-filter.py +} + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc +} + +package() { + cd ${pkgname}-${pkgver} + + make install DESTDIR=${pkgdir} + + install -Dm644 asciidocapi.py \ + ${pkgdir}/usr/lib/python2.7/site-packages/asciidocapi.py + + # fix FS#21579 - [asciidoc] 8.6.2-2 "asciidoc" table style doesn't work (mismatched python version) + #sed -i 's/python/python2/' \ + #${pkgdir}/etc/asciidoc/asciidoc.conf +} diff --git a/libre/atool/PKGBUILD b/libre/atool/PKGBUILD index dca366b88..b136ac05c 100644 --- a/libre/atool/PKGBUILD +++ b/libre/atool/PKGBUILD @@ -8,7 +8,7 @@ pkgname=atool pkgver=0.39.0 -pkgrel=3.parabola1 +pkgrel=3.parabola2 pkgdesc="A script for managing file archives of various types, without nonfree unace and unrar support" arch=('any') url="http://www.nongnu.org/$pkgname/" @@ -19,7 +19,6 @@ conflicts=("$pkgname-libre") optdepends=("bzip2: for using $pkgname with bzip2 compressed archives" "cpio: for using $pkgname with cpio archives" "gzip: for using $pkgname with gzip compressed archives" - "lha: for using $pkgname with lha, lharc and similar archives" "xz: for using $pkgname with lzma compressed archives" "lzop: for using $pkgname with lzop compressed archives" "p7zip: for using $pkgname with 7z archives" diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD index b165aed0b..42b18c2a1 100644 --- a/libre/bbswitch/PKGBUILD +++ b/libre/bbswitch/PKGBUILD @@ -9,11 +9,11 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.0 - _archrel=30 + _archrel=32 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _archrel=8 + _archrel=10 _parabolarel=1 elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.19 diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 2accda59e..704831dcc 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -29,7 +29,7 @@ _pkgver=2.74 _depver=${_pkgver%[a-z]} [[ $_git == no ]] && pkgver=$_pkgver [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit -pkgrel=2.parabola1 +pkgrel=3.parabola1 epoch=16 _jpgver=1.5 _llvmver=3.5 diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index 83b760053..d4939e203 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 132635 2015-05-02 09:40:48Z jelle $ +# $Id: PKGBUILD 133492 2015-05-15 10:21:09Z jelle $ # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl> # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ pkgname=calibre _pkgname=$pkgname-libre -pkgver=2.27.0 +pkgver=2.28.0 pkgrel=1.parabola1 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" arch=('i686' 'x86_64' 'mips64el') @@ -32,8 +32,8 @@ install=$pkgname.install mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz") source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz" 'libre.patch') -mkmd5sums=('a41aa53d514b095fc269cefa69bf88e5') -md5sums=('4bcef173cc7775bc82c0d5e17c78f5eb' +mkmd5sums=('1837c57d4c115049c3749e03ca3378ba') +md5sums=('36639a9ebd87beab162135130bbfa628' '466d44b66e40a94ede272093ccd9ade4') mksource(){ diff --git a/libre/doublecmd/PKGBUILD b/libre/doublecmd/PKGBUILD index 77c199aef..3304cef44 100644 --- a/libre/doublecmd/PKGBUILD +++ b/libre/doublecmd/PKGBUILD @@ -1,5 +1,5 @@ # vim:set ft=sh: -# $Id: PKGBUILD 130194 2015-03-29 12:38:40Z idevolder $ +# $Id: PKGBUILD 133195 2015-05-10 18:42:31Z idevolder $ # Maintainer (Arch): BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor (Arch): (sirocco AT ngs.ru) # Maintainer: André Silva <emulatorman@parabola.nu> @@ -7,7 +7,7 @@ pkgbase=doublecmd _pkgbase=$pkgbase-libre pkgname=("$pkgbase-gtk2" "$pkgbase-qt") -pkgver=0.6.1 +pkgver=0.6.2 _helpver=0.6.0 pkgrel=1.parabola1 url="http://$pkgbase.sourceforge.net/" @@ -106,8 +106,8 @@ package_doublecmd-qt() { cp -a * "$pkgdir/usr/share/$pkgbase/doc/" } -mksha256sums=('f5e06488edc5e1d7c7e6f4affd9f205341e5158524bd903e3a4bd5fda5a17642') -sha256sums=('dfab32bb8991b51818e3af00aefbce5d3e91f1256916caa9aaf67746a558f973' +mksha256sums=('76564e927b9bf372dec585df6a65880cfd6ff06086f8c56e7bcf9bbde960e3bb') +sha256sums=('a20c8c8a8aafe1729b0491c3f6c01f5b871166deeaf5c4954373310ee0b2597a' 'd50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39' '16560ad7403ffbee1800384768828e1fad924d03068c6248b68a78c393fc4e20' '610b470ce9961d851b5dcc93d5103e70ea6b3b719df404c7c49b2d11909b8951' diff --git a/libre/epdfview/PKGBUILD b/libre/epdfview/PKGBUILD index adef21e0e..a8e27d41f 100644 --- a/libre/epdfview/PKGBUILD +++ b/libre/epdfview/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 105182 2014-02-02 12:39:48Z bpiotrowski $ -# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# $Id: PKGBUILD 133276 2015-05-12 02:42:33Z kkeen $ # Maintainer (Arch): Kyle Keen <keenerd@gmail.com> +# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor (Arch): schuay <jakob.gruber@gmail.com> # Contributor (Arch): Tom K <tomk@runbox.com> # Contributor (Arch): Thayer Williams <thayer@archlinux.org> @@ -9,7 +9,7 @@ pkgname=epdfview pkgver=0.1.8 -pkgrel=5.parabola1 +pkgrel=6.parabola1 pkgdesc='Lightweight PDF document viewer, without nonfree suggestions' url="http://freecode.com/projects/$pkgname" arch=('i686' 'x86_64' 'mips64el') @@ -22,11 +22,13 @@ install="$pkgname.install" source=(ftp://ftp.slackware.com/.1/blfs/conglomeration/$pkgname/$pkgname-$pkgver.tar.bz2 $pkgname-0.1.8-swap-the-blue-and-red-channel.patch $pkgname-0.1.8-glib2-headers.patch - $pkgname-0.1.8-modern-cups.patch) + $pkgname-0.1.8-modern-cups.patch + $pkgname-0.1.8-pictures.patch) md5sums=('e50285b01612169b2594fea375f53ae4' '7f9ea101a41f5b4e999fd024f423d41f' '2fffa9c7cd4c5f0744803591c2f162a3' - '5c2cf5612d2a7dfe6cf005b94aeb5ada') + '5c2cf5612d2a7dfe6cf005b94aeb5ada' + '60064c976f273d86d6254c71b583cf4d') prepare() { cd $pkgname-$pkgver @@ -37,7 +39,8 @@ prepare() { patch -p1 -i ../$pkgname-0.1.8-swap-the-blue-and-red-channel.patch patch -p1 -i ../$pkgname-0.1.8-glib2-headers.patch # FS#30116 - patch -p1 -i ../$pkgname-0.1.8-modern-cups.patch # FS#32511 + patch -p1 -i ../$pkgname-0.1.8-modern-cups.patch # FS#32511 + patch -p1 -i ../$pkgname-0.1.8-pictures.patch # FS#44936 } build() { diff --git a/libre/epdfview/epdfview-0.1.8-pictures.patch b/libre/epdfview/epdfview-0.1.8-pictures.patch new file mode 100644 index 000000000..5c42cb266 --- /dev/null +++ b/libre/epdfview/epdfview-0.1.8-pictures.patch @@ -0,0 +1,13 @@ +diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx +index df5d75f..782f806 100644 +--- a/src/PDFDocument.cxx ++++ b/src/PDFDocument.cxx +@@ -616,7 +616,7 @@ PDFDocument::renderPage (gint pageNum) + #if defined (HAVE_POPPLER_0_17_0) + cairo_surface_t *surface = cairo_image_surface_create_for_data ( + renderedPage->getData (), +- CAIRO_FORMAT_RGB24, width, height, ++ CAIRO_FORMAT_ARGB32, width, height, + renderedPage->getRowStride ()); + cairo_t *context = cairo_create (surface); + cairo_save(context); diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD index 791e2363d..32ac2da01 100644 --- a/libre/epiphany/PKGBUILD +++ b/libre/epiphany/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 234618 2015-03-24 11:52:11Z jgc $ +# $Id: PKGBUILD 239267 2015-05-12 21:57:11Z heftig $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=epiphany -pkgver=3.16.0 +pkgver=3.16.1 pkgrel=1.parabola1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support" @@ -18,7 +18,7 @@ options=('!emptydirs') groups=('gnome') url="https://wiki.gnome.org/Apps/Web" source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('e8471b492649ee2a5dbbb76ac9225f0131f95895c3962bc2842799e872d82cae') +sha256sums=('4e59a13c299d1ce726871958e1925b42f93d8c73bf1bb0decf79749be00e9666') prepare() { cd $pkgname-$pkgver diff --git a/libre/file-roller/PKGBUILD b/libre/file-roller/PKGBUILD index 5dd047e9b..6429a5434 100644 --- a/libre/file-roller/PKGBUILD +++ b/libre/file-roller/PKGBUILD @@ -1,16 +1,19 @@ -# $Id: PKGBUILD 236427 2015-04-14 01:29:45Z heftig $ +# $Id: PKGBUILD 239484 2015-05-17 10:06:23Z heftig $ # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor (Arch): Jan de Groot <jgc@archlinux.org> pkgname=file-roller -pkgver=3.16.1 -pkgrel=1.parabola1 +pkgver=3.16.2 +pkgrel=2.parabola1 pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip' 'unar') +depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify' 'p7zip' + 'zip' 'unzip') makedepends=('intltool' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl') -optdepends=('lrzip: lrzip archive support') +optdepends=('libarchive: better RAR archive support' + 'lrzip: lrzip archive support' + 'cdrkit: ISO image support') groups=('gnome-extra') replaces=("${pkgname}-libre" "${pkgname}-parabola") conflicts=("${pkgname}-libre" "${pkgname}-parabola") @@ -18,7 +21,7 @@ options=('!emptydirs') install=file-roller.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('d0e3cf1af1bc30e29e6bbf9444fed859092e999bc4686541c021d6c1f6a58689') +sha256sums=('60897ff24d4822395a227b62811c3b8768b701844961e93303d6d6d9463d7e3f') build() { cd $pkgname-$pkgver diff --git a/libre/gnome-boxes/PKGBUILD b/libre/gnome-boxes/PKGBUILD index e253e733f..6a66da448 100644 --- a/libre/gnome-boxes/PKGBUILD +++ b/libre/gnome-boxes/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 131333 2015-04-14 01:31:01Z heftig $ +# $Id: PKGBUILD 133347 2015-05-12 21:58:44Z heftig $ # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com> # Contributor (Arch): Stefano Facchini <stefano.facchini@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Daniel Milewski <niitotantei@gmail.com> pkgname=gnome-boxes -pkgver=3.16.1 +pkgver=3.16.2 pkgrel=1.parabola1 pkgdesc="Simple GNOME 3 application to access remote or virtual systems, without nonfree system logos" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ makedepends=('gobject-introspection' 'intltool' 'itstool' 'spice-protocol' 'vala install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz libre.patch) -sha256sums=('41efae4e6906c9f4b687d996cb07316e71dbdae6f619a497801ab26557e8480d' +sha256sums=('f5fecb1ba0769e2a3dbec31e6149fffbcbd59946e4dbab31fb3ec28a16e41995' '73ea08076d1e2608e27969fbf3127b5f45a659b2a8a89b04e349b519ce1d07ba') prepare() { diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index b2a89bb28..476ea454e 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -4,8 +4,8 @@ epoch=1 _pkgbase=icedove pkgbase=$_pkgbase-l10n -_pkgver=31.6.0 -pkgver=31.6.0.deb1 +_pkgver=31.7.0 +pkgver=31.7.0.deb1 pkgrel=1 pkgdesc="Language pack for Debian ${_pkgbase^}." arch=('any') @@ -114,58 +114,58 @@ _package() { sha256sums=('49b419449431d8d64e20427a2e7105e3ac1ffc41e677a5f9a8eb276f5b82df4a' 'acc2cf95661be7cb8928fca89e08d0681685409ff2428e4e3d25baf1af427b38' - '469ba3e8822685b1b16131da5c50dd3b7372cc92a932f61569d9734daaea2eac' - '26bccf23d234e2ecef00733909bb432969c72cb74527adecc2ae59022b43ca97' - '95540e5f60de453d2281951beb7df8bd78ca91bc88437fcbbc6bb16844d31b90' - 'd7e08d395b768f1de63ced97518f8dbf6a747273264fae3d241cc0ae17a3e867' - '2e69e0b9d95a4018d658cf831dcfd7c8897534ce078d492a96a215dee9bb940c' - '4b7d3ef6c5df11058772483fe7945c3691e2cd8e8236963f4d19b23b4bb1f329' - '735bf46013112a854b3f283714bb0847c475cc068e63c6a3485f1631feae27bf' - '23619105a28386b9cd927f65fd59223a1378fc09134b00864cd21d119c762857' - '117129fbc2fdd5e6572942b600b1049189a7fd91852011c5c92c44bf042362a3' - '2d181ce84bf62a45118941f52e70a5987c610356dca4df48e0e88fc95b45da37' - '90608f577f5ef31c9003b6e2ea937dbf0435f3c06aa1eba561bbf8309568c90c' - 'fde93bbf9ff06e121870bf496418bc1703e0a2d0c5f27bcc3d130d2304921f67' - '11e68ba7462dc8df41a43a1e4c04f6865c8f46e96295abfd6366559204c89cd9' - 'b600ba8e2543eedc1833f6b936a70f25b9553dbc6835879d65dc14749e6db4fb' - '9017824378160bfe10d41bb2decbbc5a60a4db9199bff614c2b63cf40b3d310d' - 'd81f38f094ad0b962bc8fa6e11b57031748f3ca52c0ae0e335d704210e1f63f0' - 'a4f47a340b5623317756cd861705e96aba343a3175bc738bfdc72634859deed2' - '3a66f399789c0375d5e908a23ab306fb64eab8a4c35588112b0c83e027635987' - '38f52c3ae85908354964f816f3e83b12c26899b3112cd3de6d7c2672a35e86dc' - '0deaef241661c4fb34b159528297b7a922a5bacc103fd62e6d5fa73cb129a2d3' - '628c3682e167f87b50aed76ac02fe5e069015fb850eabdc79bfe41d0d2b239e0' - '41cd7af4039f99ba71d30c61764c2b5079c5b23aa6d8bbeb1d7eb5ba76d9915a' - '80788599aba0058d055e14c6931adfc5c3fcafdab2b3f82c765e82ba85cd6618' - 'f2b3dc16e00792dcb23da705428ac694510df99a2365eb92587d814015f91c33' - 'e866fdc131fdb5e384aa3905f41bea5498941a6cbfa73af9c933e3368869c30b' - '975596a745b826d545ab70c000663a3464b22edefb23e97a128d1d8f3c1c3020' - '99288ff622c443eb2701c5cc041705ecbb02afd99d59276c0aea04147f955335' - '746d6a546528e49a5f66a88704a9adfb2d6605dd1148de42ec1ce8427190176d' - '68ba2fd9b48b844d5d3470986ed344917a8021794fe67108c626e5945a2a1e7f' - '48adc76231ef558458a23d91c1055e22b3100412499344cb2f5f17ebbed96c88' - '282169e68a88f96299feaf19cf8c779817c29fa0f9e381691b912988562e3009' - 'f42996017694aa23dfa6d785f165461347cbefc1841ba841d403cc9a7e6cd9cd' - '71d61ba20fb60f7f57e0cc3633f6e4cdbff36fd5a55392646db97d162bd452f2' - '7a135a00b3106249147d5d023e17710266c9f32b0e55496d59387571164db82d' - 'ae50880cfada890136723afd10f7e4ff6edb958bc8cce8c34c9298d8e34d20d3' - '1b6b140130026c86e2f9aacc10fa6e642cee186c67c2a23b350e9bfea3ac828e' - 'b4da0cd42307642492a73ef30e652394927530471b1d71897ce6fc28c53f25d9' - 'ad3e92b8ec4caae1d2228e33e4c55ab46f7ece5eefb5ead17ff76c092fc75be3' - '1a67a4855350a6e13ffcd15da4a546bd830bc4cdb6cc69e75f769c04415c9e45' - 'b3a9c93f19297092f77c3018ccff6b863c333fc60edcbfd7baa503d290cbb091' - '3e511b47615ff491d99d524cdfea9aaf97ec6d2fa44080b32a512a7c8a9a54b9' - 'fbe0f58f8ad2bce7d9a589cdff6bd4f25661aaf8ee3984ea0ecb1390b21a89ff' - '0faa4cea2a9b11329f337c583f9660afd3b243560e6c46709b141192f1957b02' - '2314272354b7eee77ad7ac35c76efcf4d72951062f9ec55ddce0fcb4ae69a6c6' - '0597c8b782f7c5386e926a27798e7f35a39d623e8c3056b1e9a7ce2849268541' - '2f49d57813524da0e686587dc2a442eaec1ba90b53cab4294a99833ba62d8aed' - 'b2df645d03d2b103760a8372792183ad7202c96cbbcd00334ebf15c0532576d8' - '95a3053e4749dd6236e4aa9d23f0fac65151cfb494103c550ac79b644c3a14db' - 'aac574c17163d1ba286677c696d654e667afe9d7eee48b89cf0cfdca86ccb03c' - '9134c27513ee9f4eb51a7b343624e73ba0e74f00372b3fe0dc31f317843da181' - '4f82c2e827b5b5955e476cd92ea5ee3e6ded7b7d608dede7fadb04423704249a' - '2b53c55a0301cf5d5fa64473d1dc97706fef163d96d2af013a90b950fc4be0fd' - '9ff8daa9ee8fcbae042c582e8038505775c0bff64f02d5d482ad275928e3af3b' - 'b2a613f62cb45b4c136cc402e7e54f1737358c63466944d4753b47e7b212e84e' - 'a424e49bb2fa28e4d87e94714d3076cd756760316a5499ae5e7d0cf3e7d50efc') + 'fac353e1067852ccac7bc23a958c54fdebd2aad30ad9551a07deb23811046d79' + '4e39fb7792c7fe787bb9d9f3a03ac57da15e9b353a51f1602afcffc3e0e0ffa8' + '8be5b81c0a747d89ff9f586d726706718711a01ffd70ecbed9fe00352fb795dd' + '7ab3641502204c37108430f5be2f78a161b1aa5a63561c8edcf0186a7f509df6' + '51cf109e8416775e656a1431630f3f4a6b0bde3e44744449283d0666284698bf' + '97bbaea547340a56f528d8675b04a596369fb9b63245e20acd76d74211f7a668' + '49d3df068e9edcf17ed99754bd45c7d00c50f4bacd7a5484ab86018197258523' + 'd491ebf429f56ad21632bc476f9364857ee838a330ff1b966cae2e8ec5a944e8' + 'c95a6ce7d22eca56f365f05805393a1b52a5427af02a447f9dba1cd1559dd7c7' + '0debd56af6d8872d525e62ae8fd609620c3a66a425817dec83d701346fd766ba' + '9b3ca0a7df6b8bc91274b2b757dfb909beb04815cf51b377b22755114776b536' + 'd8d4dc74889792dc9b434f11a8934d5363dafb07aada75068809f1d3ceba7d66' + 'c4e5def480042a55d8532129f3bd5226004b98f5dd3991eeb429a35152f4391e' + 'e0bf50d99447934d0f9865329469559308ab54c32d2d64321a9742b3aa4be063' + '162a5c3879bb4d826b8cfea0dd68cf13f29d417bac79cc2482dd78d76cc0a8f7' + '9f5846d2147eeb8a834a282abc80ef1cd58389faaf4a0dfedfc4e91cd28faaf5' + 'bba78265515862435a7aa19345460c0bdd192be207550f6a9ac0cdb7de535ac8' + 'bdf3d4bf05bc66951c9d861af635c791fd3513f578fe32a9ccc150aa81ba6304' + '5700997d79942d74db684fddb255ee1e5a1b10b0c7c0df875b917dbba91f9607' + 'ed3f3e4bbba12218a0025747257cdaefceb4f37ce65fbf8e3ec1746cacf62d62' + '788127820d6404540b698794a9008990f77005056ec1f15da05785087729c178' + 'f688f29b6e4032d6f6fd9b3e7ae20d2f94f7ae34e977bcb1ea1e9b4393ac9f4d' + '52ba67336de4d8d19ac1d29d22df362af9e8b43a2cb800a0303b51e0b6d4c4fb' + '39519209cf6c19208e8c677439b3cad194d9d14f7ff3814c189890d6285b7af7' + '7abab0668491b42dff80e8b656407b9489f8a133a58f0ca42f8c83a1973efd77' + 'ec4d3c63698bc825fee4a2dedde66a7796fef0efee8df307d8f233f382ba784a' + 'f22b7f8a56d6b92448d4b1cf471fdad56cef13e8668a472e833a8efc8400b53f' + '40c62742c10f08f1b93e68b026b48b849dcf323f99987720be19c0bc0f4fbb7f' + '1007cd1f3f72deecdbfbb3ec54837955f53235de4b39405158eec9dd74750246' + '6de47224c4342a1fc1c81d8ec0bab90cdacb4b4e54709e9590c2bd341fbfbae7' + '4e3f6637cccafab04d665bb66b2d808797384c3b322a4375efcb9a3be480fe7f' + '6c962ee2ce9051223897ace9fa6d7c60ffb7e95b103a52bad0f17803efcfeaf2' + '9dbde5ddc20a9512320490318f5f6278d5626357f3b17401482a439a4f6be654' + '51a38f39dfc18d945a0985a23d0b7770f8fe3cebf8a28f22fd92bb288345a9b0' + '784ba5505afef70f492a85651c632da974c01bf1c5a945ff132df40b077304d7' + 'cfd312de7632a96facd36acdc00a04bc571101d655c5c8f70300d3f982b58366' + 'e444889660a60b44a3e5e6fc94972e2b8a2b97e0fa8959b41bcacacfc8be931d' + '3ef71ff4f72e28f15ea76764be9179cefdbf92a2270e87dad557cbf6d6c44f36' + '298f9a4a205a77e471f96e38d12dbba00b6fb9ddf89b496e8b5eb106d1f33c97' + 'e01d684612fd224536e9cb21f44ace5cab81bf8fd15e8e5265847df1b2407a59' + '0d2606836428595232daf0aedbafea4935e641658712fd99e34668e686c0d2e7' + '7de4b8e3ffcf3ac7ced5aeae0ca84d1e9c8603646e54473665505e1f1ac66925' + '38b372432b02c42703e3f425946cee6a42918d574f7bff7df5f9997ddb076f64' + '3441d57aeedf15c5a29800e8f544b8571d41e5ed5a381d8bb2087cda97074970' + 'dcd56d713daa7b6fb03d64219797e159eab8bef2e7eb9bd7999c0b285a24d153' + '7e7fb8287b9255aa8988bf63677e0bed8ae30c0da5ac7d83ba1300ba2bca41d3' + 'b9270889a4905233e450be25d61e4a1359a057bc6c021d5aba23a941cde56123' + '0ef471cf54c052214d5169189a72efc0e8d65801e482aeff413ffc7c822c1651' + '803529203aded6bf1194a6d5d575f5e16f8a4a249a68878650c5469e92512923' + '3529d8a55ea5458edf24059d55178b6c4935aa82b604bc1c46e4b4bffb88234b' + 'e83e64f528b12b1550efb28ba4dea51e7912ab2af470c1382d78e01d9dc3a3ff' + '12c2001834af439d1a0f95ed3f416788672d41c5b02481d26e54f66e721c83a6' + '7a20d9842117105f4ac641d602977cf20d4149564593adba0f3415976fd7b52d' + 'f582fac503f385ceb59761134ed24170ded9f65861106ff77219040b169e6a37' + '3b60993a3c85f61ef57b02334d3a71d864e9e6609ec29f398c1f60094cad43a3') diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index 0f2f95f04..d86927420 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Sid _debname=icedove -_debver=31.6.0 +_debver=31.7.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=${_debname} epoch=1 pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -28,16 +28,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" mozconfig ${pkgname}.desktop ${pkgname}-install-dir.patch - vendor.js - rhbz-966424.patch) + vendor.js) options=(!emptydirs) -sha256sums=('9011da6632434d6ee991cc69f4e040a194d998ce3a04e5c3a05f21fc361124dc' - 'ac73365adcccf126b97432cfd60828da667b2eb82512ae252cf577939d666fd9' +sha256sums=('00ce17575690400e22e7ce21dc5b3b4f71092b7708ee9aad74448d1401da8794' + '04c30b4e72819b764bc463d36c39f55741d3e47ae994ba89fd14e63fe32c6561' '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a' - 'a0be56fc87f255804e00e7c85abbc4731ebdaa8938858f1f8ac47dd2f17c0b8b' + '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a' '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d' - 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec' - '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a') + 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec') prepare() { export DEBIAN_BUILD="comm-esr31" @@ -59,6 +57,9 @@ prepare() { install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png" done + # We are doing it from sed commands + rm -v debian/patches/fixes/vp8_impl.cc-backporting-naming-for-constants.patch || true + quilt push -av # Fix paths on makefile @@ -89,9 +90,6 @@ prepare() { cp "${srcdir}/mozconfig" .mozconfig - # https://bugs.archlinux.org/task/41689 - patch -Np1 -d mozilla -i ../../rhbz-966424.patch - # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure diff --git a/libre/icedove/icedove.desktop b/libre/icedove/icedove.desktop index f39d5823c..1ba43e0b3 100644 --- a/libre/icedove/icedove.desktop +++ b/libre/icedove/icedove.desktop @@ -1,32 +1,5 @@ [Desktop Entry] Name=Icedove -Name[ast]=Veceru de corréu Icedove -Name[ca]=Client de correu Icedove -Name[cs]=Poštovní klient Icedove -Name[da]=Icedove - e-post/nyhedsgruppe -Name[de]=Icedove-E-Mail und -Nachrichten -Name[el]=Ηλεκτρονική αλληλογραφία Icedove -Name[es]=Cliente de correo Icedove -Name[fi]=Icedove-sähköposti -Name[fr]=Messagerie Icedove -Name[gl]=Cliente de correo Icedove -Name[he]=Icedove דוא״ל/חדשות -Name[hr]=Icedove e-pošta/novosti -Name[hu]=Icedove levelezőkliens -Name[it]=Email Icedove -Name[ja]=Icedove メールクライアント -Name[ko]=Icedove -Name[nl]=Icedove e-mail/nieuws -Name[pl]=Klient poczty Icedove -Name[pt_BR]=Cliente de E-mail Icedove -Name[ru]=Почтовый клиент Icedove -Name[sk]=Icedove - poštový klient -Name[sv]=E-postklienten Icedove -Name[ug]=Icedove ئېلخەت/خەۋەر -Name[uk]=Поштова програма Icedove -Name[vi]=Trình điện thư Icedove -Name[zh_CN]=Icedove 邮件/新闻 -Name[zh_TW]=Icedove 郵件 Comment=Send and receive mail with Icedove Comment[ast]=Lleer y escribir corréu electrónicu Comment[ca]=Llegiu i escriviu correu @@ -82,164 +55,119 @@ GenericName[uk]=Поштова програма GenericName[vi]=Phần mềm khách quản lý thư điện tử GenericName[zh_CN]=邮件新闻客户端 GenericName[zh_TW]=郵件用戶端 -Keywords=Email;E-mail;Newsgroup;Feed;RSS; -Keywords[ast]=Corréu;Corréu-e;Noticies;Discusiones;Mensaxes;Canales;RSS; -Keywords[ca]=Correu;Email;E-mail;Mailing;Llistes;Notícies;RSS; -Keywords[cs]=Email;E-mail;Pošta;Elektronická pošta;Diskusní skupiny;Čtečka;RSS; -Keywords[da]=Email;E-mail;Epost;E-post;E-brev;Newsgroup;Nyhedsgruppe;Nyhedskilde;Usenet;Feed;RSS; -Keywords[de]=Mail;E-Mail;Newsgroup;Nachrichten;Feed;RSS;Post;News;Usenet;online;lesen;schreiben; -Keywords[el]=Email;E-mail;Newsgroup;Feed;RSS;ημαιλ;Αλληλογραφία;Ροή;ΡΣΣ;Συζητήσεις;Γράμματα; -Keywords[es]=Email;Correo electrónico;Noticias;Discusiones;Mensajes;Canales;RSS; -Keywords[fi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;posti;sähköposti;maili;meili;Usenet;uutisryhmät;syöte; -Keywords[fr]=Mails;Mels;E-Mails;Emails;Courriels;Courriers;Newsgroup;Feed;RSS;Poster;Icedove;Lire;Écrire; -Keywords[he]=דוא"ל;דוא״ל;מייל;אי-מייל;אימייל;הודעות;מוזילה;תאנדרבירד;ת׳אנדרבירד;ת'אנדרבירד;ת׳אנדרברד;ת'אנדרברד;דואל; -Keywords[hr]=email;e-mail;e-pošta;pošta;RSS; -Keywords[hu]=Email;E-mail;Levél;Levelezés;Hírcsoport;Feed;Hírforrás;RSS; -Keywords[it]=Email;Mail;Posta;Newsgroup;Feed;RSS; -Keywords[is]=tölvupóstur;rafpóstur;fréttir;fréttahópar;samtöl;skilaboð;fréttastraumar;RSS; -Keywords[ja]=Eメール;イーメール;mail;e-mail;email;メール;電子メール;ニュースグループ;ネットニュース;RSS;フィードリーダー;書く;読む;Icedove; -Keywords[nl]=Email;E-mail;Newsgroup;Feed;RSS;Nieuwsgroep;Post; -Keywords[ru]=Email;E-mail;Newsgroup;Feed;RSS;почта;письма;новости;фиды; -Keywords[sk]=Email;E-mail;Elektronická pošta;Diskusné skupiny;Čítačka kanálov;RSS; -Keywords[uk]=Email;E-mail;Newsgroup;Feed;RSS;пошта;новини;подачі;стрічка; -Keywords[vi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;Thư điện tử;Gửi thư; -Keywords[zh_CN]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;电子;邮件;新闻;Icedove;tb;雷鸟;电邮;邮箱;阅读器; Exec=icedove %u Terminal=false -X-MultipleArgs=false Type=Application Icon=icedove Categories=Network;Email; MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall; StartupNotify=true -Actions=Compose;Contacts; +Actions=ComposeMessage;OpenAddressBook; -[Desktop Action Compose] -Name=Compose New Message -Name[af]=Skryf 'n nuwe boodskap -Name[ar]=حرر رسالة جديدة -Name[ast]=Redactar un mensaxe nuevu -Name[be]=Напісаць ліст -Name[bg]=Ново писмо -Name[bn]=নতুন বার্তা লিখুন -Name[br]=Sevel ur gemennadenn nevez -Name[bs]=Napiši novu poruku -Name[ca]=Redacta un missatge nou +[Desktop Action ComposeMessage] +Name=Write new message +Name[ar]=اكتب رسالة جديدة +Name[ast]=Redactar mensaxe nuevu +Name[be]=Напісаць новы ліст +Name[bg]=Съставяне на ново съобщение +Name[br]=Skrivañ ur gemennadenn nevez +Name[ca]=Escriu un missatge nou Name[cs]=Napsat novou zprávu -Name[cy]=Cyfansoddi Neges Newydd -Name[da]=Skriv en ny besked -Name[de]=Neue Nachricht erstellen +Name[da]=Skriv en ny meddelelse +Name[de]=Neue Nachricht verfassen Name[el]=Σύνταξη νέου μηνύματος -Name[eo]=Redakti novan mesaĝon -Name[es]=Redactar un mensaje nuevo -Name[et]=Koosta uus sõnum -Name[eu]=Mezu Berria Idatzi -Name[fi]=Luo uusi viesti -Name[fr]=Rédiger un nouveau courriel -Name[gd]=Co-chuir Teachdaireachd Ùr -Name[gl]=Redactar unha nova mensaxe -Name[he]=חיבור הודעה חדשה -Name[hi]=नया संदेश लिखें -Name[hr]=Nova poruka +Name[es_AR]=Escribir un nuevo mensaje +Name[es_ES]=Redactar nuevo mensaje +Name[et]=Kirjuta uus kiri +Name[eu]=Idatzi mezu berria +Name[fi]=Kirjoita uusi viesti +Name[fr]=Rédiger un nouveau message +Name[fy_NL]=Skriuw in nij berjocht +Name[ga_IE]=Scríobh teachtaireacht nua +Name[gd]=Sgrìobh teachdaireachd ùr +Name[gl]=Escribir unha nova mensaxe +Name[he]=כתיבת הודעה חדשה +Name[hr]=Piši novu poruku Name[hu]=Új üzenet írása -Name[hy]=Նամակ գրել -Name[id]=Buat Pesan Baru -Name[is]=Skrifa nýtt bréf -Name[it]=Componi nuovo messaggio -Name[ja]=新しいメッセージの作成 -Name[kk]=Жаңа хат жазу -Name[kn]=ಹೊಸ ಸಂದೇಶವನ್ನು ಸಂಯೋಜಿಸು -Name[ko]=새 메시지 쓰기 -Name[ku]=Peyameke nû biafirînê +Name[hy_AM]=Գրել նոր նամակ +Name[is]=SKrifa nýjan póst +Name[it]=Scrivi nuovo messaggio +Name[ja]=新しいメッセージを作成する +Name[ko]=새 메시지 작성 Name[lt]=Rašyti naują laišką -Name[lv]=Sacerēt jaunu vēstuli -Name[mk]=Состави нова порака -Name[ml]=പുതിയ സന്ദേശം രചിക്കുക -Name[mr]=नवीन संदेश लिहा. -Name[nb]=Skriv en ny melding -Name[nl]=Nieuw bericht opstellen -Name[nn]=Skriv ei ny melding -Name[pl]=Utwórz nową wiadomość -Name[pt]=Criar nova mensagem -Name[pt_BR]=Compor nova mensagem -Name[ro]=Compune un mesaj nou -Name[ru]=Написать письмо -Name[si]=නව පණිවිඩයක් අරඹන්න -Name[sk]=Napísať novú správu +Name[nb_NO]=Skriv ny melding +Name[nl]=Nieuw bericht aanmaken +Name[nn_NO]=Skriv ny melding +Name[pl]=Nowa wiadomość +Name[pt_BR]=Nova mensagem +Name[pt_PT]=Escrever nova mensagem +Name[rm]=Scriver in nov messadi +Name[ro]=Scrie un mesaj nou +Name[ru]=Создать новое сообщение +Name[si]=නව ලිපියක් ලියන්න +Name[sk]=Nová e-mailová správa Name[sl]=Sestavi novo sporočilo -Name[sq]=Krijo Mesazh të Ri -Name[sr]=Састави нову поруку -Name[sv]=Skriv nytt meddelande -Name[ta]=புதிய செய்தியை உருவாக்கு -Name[te]=కొత్త సందేశాన్ని రచించు -Name[th]=สร้างข้อความใหม่ -Name[tr]=Yeni İleti Oluştur -Name[uk]=Написати нове повідомлення -Name[zh_CN]=撰写新消息 -Name[zh_TW]=撰寫新郵件 +Name[sq]=Shkruani mesazh të ri +Name[sr]=Писање нове поруке +Name[sv_SE]=Skriv ett nytt meddelande +Name[ta_LK]=புதிய செய்தியை எழுதுக +Name[tr]=Yeni ileti yaz +Name[uk]=Написати нового листа +Name[vi]=Viết thư mới +Name[zh_CN]=编写新消息 +Name[zh_TW]=寫一封新訊息 Exec=icedove -compose -[Desktop Action Contacts] -Name=Contacts -Name[af]=Kontakte -Name[ar]=المتراسلين -Name[ast]=Contautos -Name[be]=Кантакты -Name[bg]=Контакти -Name[bn]=পরিচিতি সমূহ -Name[br]=Darempredoù -Name[bs]=Kontakti -Name[ca]=Contactes -Name[cs]=Kontakty -Name[cy]=Cysylltiadau -Name[da]=Kontakter -Name[de]=Kontakte -Name[el]=Επαφές -Name[eo]=Kontaktoj -Name[es]=Contactos -Name[et]=Kontaktid -Name[eu]=Kontaktuak -Name[fi]=Yhteystiedot -Name[fr]=Carnet d'adresses -Name[gd]=Buntanasan -Name[gl]=Contactos -Name[he]=אנשי קשר -Name[hi]=संपर्क -Name[hr]=Kontakti -Name[hu]=Névjegyek -Name[hy]=Կապորդներ -Name[id]=Kontak -Name[is]=Tengiliðir -Name[it]=Contatti -Name[ja]=連絡先 -Name[kk]=Байланыс жазулары -Name[kn]=ಸಂಪರ್ಕಗಳು -Name[ko]=연락처 -Name[ku]=Tekilî -Name[lt]=Kontaktai -Name[lv]=Kontakti -Name[mk]=Контакти -Name[ml]=വിലാസങ്ങള് -Name[mr]=संपर्क -Name[nb]=Kontakter -Name[nl]=Contacten -Name[nn]=Kontaktar -Name[pl]=Kontakty -Name[pt]=Contactos -Name[pt_BR]=Contatos -Name[ro]=Contacte -Name[ru]=Контакты -Name[si]=සබඳතා -Name[sk]=Kontakty -Name[sl]=Stiki -Name[sq]=Kontaktet -Name[sr]=Контакти -Name[sv]=Kontakter -Name[ta]=தொடர்புகள் -Name[te]=పరిచయాలు -Name[th]=รายชื่อติดต่อ -Name[tr]=Kişiler -Name[uk]=Контакти -Name[zh_CN]=联系人 -Name[zh_TW]=連絡人 +[Desktop Action OpenAddressBook] +Name=Open address book +Name[ar]=افتح دفتر العناوين +Name[ast]=Abrir llibreta de direiciones +Name[be]=Адкрыць адрасную кнігу +Name[bg]=Отваряне на адресник +Name[br]=Digeriñ ur c'harned chomlec'hioù +Name[ca]=Obre la llibreta d'adreces +Name[cs]=Otevřít Adresář +Name[da]=Åbn adressebog +Name[de]=Adressbuch öffnen +Name[el]=Άνοιγμα ευρετηρίου διευθύνσεων +Name[es_AR]=Abrir libreta de direcciones +Name[es_ES]=Abrir libreta de direcciones +Name[et]=Ava aadressiraamat +Name[eu]=Ireki helbide-liburua +Name[fi]=Avaa osoitekirja +Name[fr]=Ouvrir un carnet d'adresses +Name[fy_NL]=Iepenje adresboek +Name[ga_IE]=Oscail leabhar seoltaí +Name[gd]=Fosgail leabhar-sheòlaidhean +Name[gl]=Abrir a axenda de enderezos +Name[he]=פתיחת ספר כתובות +Name[hr]=Otvori adresar +Name[hu]=Címjegyzék megnyitása +Name[hy_AM]=Բացել Հասցեագիրքը +Name[is]=Opna nafnaskrá +Name[it]=Apri rubrica +Name[ja]=アドレス帳を開く +Name[ko]=주소록 열기 +Name[lt]=Atverti adresų knygą +Name[nb_NO]=Åpne adressebok +Name[nl]=Adresboek openen +Name[nn_NO]=Opne adressebok +Name[pl]=Książka adresowa +Name[pt_BR]=Catálogo de endereços +Name[pt_PT]=Abrir livro de endereços +Name[rm]=Avrir il cudeschet d'adressas +Name[ro]=Deschide agenda de contacte +Name[ru]=Открыть адресную книгу +Name[si]=ලිපින පොත විවෘත කරන්න +Name[sk]=Otvoriť adresár +Name[sl]=Odpri adressar +Name[sq]=Hapni libër adresash +Name[sr]=Отвори адресар +Name[sv_SE]=Öppna adressboken +Name[ta_LK]=முகவரி பத்தகத்தை திறக்க +Name[tr]=Adres defterini aç +Name[uk]=Відкрити адресну книгу +Name[vi]=Mở sổ địa chỉ +Name[zh_CN]=打开通讯录 +Name[zh_TW]=開啟通訊錄 Exec=icedove -addressbook diff --git a/libre/icedove/rhbz-966424.patch b/libre/icedove/rhbz-966424.patch deleted file mode 100644 index c4c332e9e..000000000 --- a/libre/icedove/rhbz-966424.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/toolkit/modules/CertUtils.jsm -+++ b/toolkit/modules/CertUtils.jsm -@@ -170,17 +170,19 @@ this.checkCert = - issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3); - var tokenNames = issuerCert.getAllTokenNames({}); - - if (!tokenNames || !tokenNames.some(isBuiltinToken)) - throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT); - } - - function isBuiltinToken(tokenName) { -- return tokenName == "Builtin Object Token"; -+ return tokenName == "Builtin Object Token" || -+ tokenName == "Default Trust" || -+ tokenName == "System Trust"; - } - - /** - * This class implements nsIBadCertListener. Its job is to prevent "bad cert" - * security dialogs from being shown to the user. It is better to simply fail - * if the certificate is bad. See bug 304286. - * - * @param aAllowNonBuiltInCerts (optional) diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 92aaca15b..d1cf77654 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: fauno <fauno@kiwwwi.com.ar> # Contributor: Figue <ffigue@gmail.com> -_debver=37.0.2 +_debver=38.0.1 _debrel=deb1 epoch=1 _pkgbase=iceweasel @@ -160,91 +160,91 @@ _package() { } sha256sums=('6ab481740fdd48790329217a1bbe1fc7d2438bbdc1f767e21ba3d66084f4afcf' - '46df91da1b1f3df067419a53f443f7f42bcd818dbd8f657c504870e9db663802' - '2590b8aa4a585a65804cc4807665e76ea017afd3d0b339d95936a7bc4a12a8bc' - '6394f641e50af7be6ec2e06cfae325e984f9733abb64d14e93053822a4806024' - 'f24db9ae64128546972b08461ed82c8e40e8ca80ec5bdc7fd48f248514b208e5' - 'c93596f85d5557b533d9fbf4a3785643885551609b79a3240bd38522b4ec4f35' - 'fc88e4f63b2ae3cae96c2c272c2c5fda4a6a29461eb37e5394fb4cc92827a21d' - '7888e43366080da53a429cc386e100fdaf88f50c13d0ee43a8abbef6c5a1cb21' - 'f2ed4b3a7ccfa994bf4715c43f235185d6a7812a34ca34a4be9a4a8c9de2cc87' - '26fec282a3c1466b918a1a443990d7c06160be5a9f29b5cca95442c40c7bdeea' - 'd0fdd728ba4115f44d894175f8fda6c0045a41d2013f83d4ec016eb3ba736d26' - 'e7628c1eda64f5b3ea1f1710472333c40290d0c9e3d21f1ec54b1a47059d926d' - '2314ab923d5ede048f2eb3b2e93a84f1acb895b40fb7491c37d9bc8a08b7b2bf' - 'cec666e55649cf193b887499bae2508702e9561d1983f66bab243a350b2413be' - '12a2905ff151bd5f210a2f2c3efa9815beb5db2c9ee3d11416845253a9167f1f' - 'a92af5e7a48f7d34fb8c68adbf1c9592637c7598cde4d6e6145b9a66b04f5578' - '4f2f68c37120863e23dc286ebacc13a49c03ed3d6d94cf2d82eef7829bc289b9' - 'c28437d8b449f8ba303e230b8eff098a562dd63e48bf17487327bb841fb88792' - 'c3aa43888b1ded108b787f313cf837915579f84aa7e3b00c48a9157241259716' - '96165ece3c25386a74acf16825404cd0cbb98396df5a51b2791d5cf2e1821614' - 'd23e4144f323fdd9629dbab91ae5b6eff1eb8b95358cea53c4cf43185533938b' - '72214132772ba4d12fb27fbe024ce9620595b596d234727e74bc543c2abfdd9c' - '20efde5f2a53aac94b082618d173b71731cdc5320bf5dac1d8e840851530a7e2' - '71c2601875e8354e5ba51c59d63988ff6cac178e5ab13ebc7426520461a22d29' - '30f1625e802a0dc9be7213483b258660b7cbae05ac50a7d323763d056e5e9fc2' - '3a7d65c752b009504800bd22d8cfab699681526e9fec24e67db6da31f5ff536d' - 'f2cd4d92f2b6088771108de25228b0ce5ea255e9ee35bbbf950a09c9ff95553b' - 'b0719b04dc9592f5efcaf7a8ca022f3291a45e898b9d881ce68e1e22e00c3efe' - '82944255040c681b71f31ffc686f706711d00d18f01b75a73d1b78f306e444be' - '6894b549aa3775c6d06d43232fcf461cb644db47e1c2b8639f49e19e602b6e4b' - '039dc23e10288be2f24e59438e8ae1aed82782018820f2062da171b83cf46b0e' - '1dae292f8366aa065c405a07707bfa03ed2bb359c5f1ee3a4da7bc4641b2eded' - 'c6addc7af1a16310bd164963f1b346136dd828a5da2918b65ca9f42653712e44' - 'acf5b304315b78b7d64c43816774202a2b657735e52891baba57801e4ce51d19' - 'aee124897df46eefd2f34020f8356e478dd808b2c2454115a2fe89672982f6e9' - '202b66f9ba36e5aa21a53fbcdbda41daf7cc5b811dd21588895e8246472e99f4' - 'baaec2219b2fcc7b22f771ed2db825488d3a8220712f257cab3fa0546fb088a3' - '8f8c97cacf7df7b0bbfa145d643e684dd5ce33baa4ae451e4b7b778e748ea83a' - '7fca605daf0525a43d9ec5de9bc931ba4d758177e9c2bac249230270739be2ca' - '8c742add184120ccf6fa5298a1ffd503af07a9522a2c0fa9041a9ecf7486c042' - '221b0deb134ed158b7634d0622f0f1bb3cb42b3f082d306d629041a8e1f8be7a' - '0c636f0975dfb8f476f4f8eb14533de9b380eccecca7cfe7eeffdaaaedd9628c' - '49eea65ca9c6bab4d1b487b21f1393d9fa1a8f41b04380f466509fc51b590e41' - '18563024ef2d44f24d28160a3e64cd55c17e77e146bc78e58bc6bd683582e334' - 'df2f8b7055096ddcd7d4f1664416e8676eaae81fd0c14786a3887a2215d11488' - '220233daf918d1d21f7eb4168183df55545f5701a9ad7c335bc19410d0078592' - '2c358e388d019ab5617b4385204ae8423030fbfe78853d8da0485f9c798e8fd7' - '8ba54a5d6346fc4e2905ce9c492a2c52b43872741f87d0be416628479a5fe1d5' - '6fa794685b60b14d61d066509e87c9178af68bf7f34c08891f071002dc78241d' - '2155e7780d829952f12c590a49927cf008e28de789e5faa3d364a2144f9dbf77' - 'b2db3f40e7cd0f7a24ddeab5edd2902299a8c9e247d98b408c2df1d97c174925' - 'aef01c5c7f9e14fafa4dca6547d670067eb0f7cdf7dd5281bb224d0d21967e1d' - 'fbbc6db0f8d48f1c7bdd4a471c73c9cc82fbcfd7bd0b8d79a9b1a8719b49e4af' - '1f245ca7e43e5f88f86d978891ee4c89e28f2352973afa9befbe35691d164e29' - '0efa33921795ede12c4e01f595e442226f715183b146c899f50def9ad6a9b0bc' - '621df89a873179d47765b2c2fb79fca4f0b4fe9eb3471d9d760a1ba15eddebf1' - 'e0890fe61843a1942e4e95c0c923d2945bb90a4a39171f780a0ddd2fe94e470a' - '6a3d778cdfc1eef899a14177609ba2a930a1559992652e833c294d7f02e36eb5' - 'b10f4108a12becfcd672a2bf136258bbc42d09d6c06a24bedd83d45069ea56ed' - '02c0fbdb20b1cd2c464a49598febfcf9bd419732080b5a4b57311577dacb1c8a' - '2ecd6df50258eae99ab7bf7608df8cd98030902943192f2de7fc981231f9d245' - '6ada08c6af7c26a1882073b5b024f90fda8b8b2582ec38448c3e163dfed581cb' - '4b695792624e41699218e4030f6ceb0a0870cc2938f892ee463475afb29f6692' - '42dd38b838f174af760aff8e8e3567c9d76e113d88de17da1347bcfe3454eb41' - 'da586ee0b3cf471fe549c728b8d206c374cfe9c63e21f835868a92b88aa017ed' - '2593444bd5cc24dbde3b1d3a4c01cfd117be2950c252a0f93f65c5f40959d74c' - '62c04d53d34449f6d3f53ad07ab315ed6d8e377d82bb80d80d923904f2907a23' - '13c3b617012140a685d3d9be8221f08128ca22ef61efc8c1113907555ed6f928' - '9a0304a8736634f69db6ee759fe094f872c007735a2f14223c34622e00741c47' - '1c21185e07a6a557b5ae8510cf30c63c95caa8e60c5322fd4b779bc4fabbdb0c' - '948b257ddda17c8f5f4b7b86f47a1a1bf998b634451cd00639e9353b27cdcd97' - 'cca61891ce1787f750ecb527e62dd7a128c83b01aa6adf617db8fecd44fe8fda' - '62d42387ecbcfe849003cbb66d519be0a05b28a44ca52162fef9dfc166fd8d96' - '6172487c0adce3d9233ab24484168dfd482d91bfc2d73eb26934642b01e7edc8' - '09ddd532bde2ceca72174e92b5853354f3d35bc58934d7d390e3e2f04ebb5a75' - 'bc0fe33659f7f81a584f3f3f2d2f31fc1a716b882c72d88479058fd18288086e' - '091a9e2e1caee9d95a6697a5e9c7618c9c538fbc2a6fa44f0b17ed992c56277b' - '905bdabfabf2fb3ee761be8d3cf8ef6f583f6a0918e283c5e4bffcabedf42708' - '4bbdb5efd6a2b5d0dc8125654bf5ac868cca5666092213d6083e894530d58f95' - 'efdd83dca77c3cc63aefab5ee8d9a28b4436fae1ed2cb1c503fe81423845abf6' - 'a00f9011c6c971c09918766ed072feee05e60668c4622849f234ec2ddcb84c61' - '7d501554b35afab436d400b10691a34f85c6e13ff9b01f7a4ba6f423e6029f5d' - '5eeafacdbd59e29a26899aef707363df83158bdbcc692bf65d826a71b53ee6db' - 'cdf01aa75b3ab9fa6aa880b1a4ea91e3cc086b233a5174674d9895a0e1dbdcc8' - 'a6c373b4bf80bd15fe15faf37c55ae69eb3552d35104c137d1a982bdd12d82b2' - 'e9280e553402a42436b7025253c3a686e1b6cd7d4718ccce743ef9c64b177a10' - 'f8bac7ecec29c7185b2c682cf7b48ead1f3610f9a6fe98f328d846d50bc1c77c' - '77a8555b964fa3baae54b88d8c329854ae2b04ff0825a88750aabbad9801a5c4' - '402338eb236ffc3d963da03cde1bf8e8d20f902042cd4a9bb84906da25335261') + 'fad6315dd1caae75e9fb05ae23baad58b375882eeec3daf32c2cdf37a83b6504' + 'b9abd689e8e6b7082745919a7939870782aa90d48c0e90aa6c1b82f16e85e782' + '476fc24dcd4da851e54220bfa123944fb162543118ede89c1be42a2a71ae61c2' + 'f8ef47446e1819e912211c5a60689f15bdc351d8eefdd2cc10b3f49f67eb17e7' + 'c5f54afd5c22b97acd960e21fa892da3319c5966a6538dd7139bf57e2a9eaa26' + 'dabf1bc4f5f9e6a5bf8274f053291449dbcb6625fbd40f23a6917e2c1556ac7f' + 'e78e5c6b4b3f2cf254a8cde4c09fb60e02b0ea9ec7dab92e44a0fdf1da84e0ae' + '2492c2612d80c9e2a6ba0cd8901fad155b83e37ff5c29bc6a192d5dd1034360c' + '395032e27b55d8dc9ef6d60f0eecc2e82bf7097e96465b3d4f09efa94306c287' + 'c0b9b2ea96fba3bafb0aa5c6d1385c466897000ed1803727d3ed41a5486a01de' + '9d1b1d6e35e09c19c16dfaf8cddc196385a4890778d63c3b3b548adf57e780fe' + '3a764b4ad540ebaaa0a341f68dd365d1352b8e7d6f9f25f2cad94192296a102e' + '02861e0e2e395baa18e315891c48da5e519ce2f4b8f7706ae6845897609e359c' + '8c0c4d94cfd079ba755f1e0381baec3f06b517cf81b92fef933eac91f47a6da5' + '84cf492e816d7d54d9fbd6efa7d2e731a7a7335f913fc438f6e6c011d8b530a4' + 'b6965520beb1e080103ca28d6bcf66d9a892ea5cd204d4c301e03971138f1e67' + '371253c9e7c7e451d39f7a0f4de2c933723e10832e43fdd2cb70931544639258' + '2b3e44d0a232a65b3ec81fd4d872cf125c0d7f4a96bf8e5f1bfb6b666a97e953' + '4159cec4572feeabb8d84ddff4ccc1e11152a9c4a96a86492073eaf6c85cbae6' + '6432745599c7ebc5c4b3cb5b92d0974530c39af13d0388a5ea00fffae6259a99' + '1deb1aeed20e63ee908aa14e3777768c80d2798f78a94779133efeb9fab51319' + 'eabcb35500514a1f788586368225938be825e78f8f45a113ac8ea57858e54f60' + 'ccb56a546181ff63052e0fd1672e3a54233d9a90a34a5579eaaeb8bb8d9bc515' + '4accd730bb991b6321225c994a5307c9093515519339627b2b71ba93ddd54095' + '46a48f053b3e65fc39bf2ec06f693b0f3b5b691c1b3d5205e023561cbccfabb2' + '0008140022d1457fb0390ace4398cd14bb4e4196186545c571081e625e06997e' + '300322e4a72de37fa11a1ef92abe30083efa1df6510420bcbad54b9b144eb6af' + 'a646a99d31d54f2d0aca6b518c1c4d1059adab95493e20256531348dd984c650' + 'a6a4ca57e11c938aebda1c8954e14d23e40eec08d1635f04a22108907e3393ff' + '5764a8012586616b4bbd039c3b0ba463c5509c5ffbbcbd6404a1e0b1fd4cf2c3' + 'ff5bc97dab31f3b8ff8061ca28e5e5ac8b10bf41e878ae5ef8bf3bf3db6f570e' + '8b8c2aff5ea3322c107c2455f7fc8238101e04f131a246088d12570e709531b1' + '5fcab669d2ef961a0f8c9aa8cd45533ff57443e215c698bb4d5a66e08f2ad2ef' + 'f5c7d5032ce766faae306e033fddba9b55bfda01abcc826947eea71f420f2ce9' + 'b7cb4bb9083f468e632f271b438251bdbce93200a085983f74088b73e7fed8c8' + '921058ee68b5939d49a67f1ed282601611e8fafb1b5539fca02a3fb0a34820c7' + '8c5ba2521e4f8961bc2b843294a0bda0769a43ef7108e95025dd256c87e0319f' + '5eb664ebba8f5aae10035918dabb36a0a74c7f0dff44b4e318ded7f06c228b79' + '8417c5f90c5cd265320792d6ee0e39f7d5aad2ab0cfd1fa74f7ff43d5ab3f4c8' + '7847ae29fb0e2523967d39e7f35b5360ec7eb4d9c381ee9dc433ab9ab4ecff19' + '082c067984e823d15699df95af87a19e4402eb744fa32458c3b4d4a76b8fbc6c' + '9b44cb8d6b505cfbb639cad5a6960a4635d6154df3653c6a68ff75e0fc46aa92' + 'ed1836874b38d5ea81a2ab6e43be00205008932bab57204d33ccf6841d473457' + 'cccfd8af1986973c05b08312530a2368863a60416808bfe3c79cb517cecf3bde' + 'f00584939eadf71608d21ebfe1be6d955bed91ea5c92c7c2b62611ffaa8e1faa' + '79a3b41f3b5ad2c77ca3da5076aa3d26c2e02ece91e617f4c9552f8b873c240c' + '2fddb5d2d196a78a10097011b545a75b79dfc39c4a7b0ce86588111d04ae3a60' + '47a83cdb97cded6f53d740786968cc89f44901fc3dad44be44bd041a483955ab' + 'ac782b93a980504afeb1e9647a9c27bc6ea433873acf70d1faf7307a0f826bdd' + '1d1e39d4f4af2ad8bc0a4551a7e4ccd94e58fe1500fed720c67d3fce026c17ac' + '7a95b4f9b0569f61d5e9db865eeb17d77d3a7d1e0d34a2a79386642ffaeecd40' + '715ad1ac863b8c0f785af3615f63cbc233e14bcca4a95281d0fcf317354fb5e8' + '37c872eabf16c325f8e238c1a28deb3e389223756f9b6e7ef7036fb9a6f3b795' + '51e3647a861b854620f2d7834db5f393d87ba9fea8181648a97f7b5a1ca099ea' + '8f1ffa69dd901cd34ddd5e5803b266a2c4de9035a26245809920f43150ca50f8' + '075752bb779b8dd95fde734e08695abea6a7a397061422f2f3dde067fa5769a8' + '11d640b6fc807406e2f48f83cd4aae063404d03ca3472e2f2c1fdd986dd2564e' + '53e5de731266e0dbae9304d0c08103146bfa18a9bf8cb41793b0a9c266b8b68e' + '11829251bcb1284027117b7acfebf5b3254de7aa741b01d5424aa5c261117b87' + 'c1e5ccbb27c8297a2d1e2058a04056b55a2cd30e09337c5a37c3593483445e47' + 'c99c8e6a035d03b2c66aaccedf84ec5c45283d77ecf353fa6df96826a097101b' + '43ee7a7cf0eef6ade8c362d7648e77d65a39933d28e8334c546da2295682c657' + '8b6183bd587b0d7debe0c249bd2f90892e7d3928aaaa77f8d2d74ba550016881' + '7fbd81d54900d39bbd3941f55f971dfba711f229de8a95c46b3d5e259abd8b47' + 'e7f18dd60b15df485a5e1cb7ff0f77de337d492242192411481df6f7c3998d8b' + 'ef2bb8083468723fd30c34975e05e19ed5990b9e4cc084f30a00755b046be730' + 'cde2befb40649ba789abe323b17743e98d59f159397f0a15278894b05da977e6' + '356754c904a158f145c0982c95b072f827df756160c221f2a6d058f12ab7bca7' + '048849ec5ef9b7370253b311fc06e3c393f350bcb2d213a3343fd84b88297f7e' + '092a4688117d825353c145f59304948afefae0c41e7292b2bb0aab71c1954e3e' + '5c3d34afaef1264b13913bb8effa9065218f246777d3c65e5f163301ce05fb9a' + '509681ca7287445a555a12b20b861945473d91b3a8f4620378366aea34c996a5' + '8fd03ff8d698723cbf5de90efeff30e421997133c103dd04f2efe0d4922ac707' + 'cf27afe1ec0dfa56952829fa1cccfbfaafbd3ad266f9184342d4a69e0182d0b7' + 'c4aa602c53d14c88f3dd29409771c4ce5789dde7c9a372ca86056aeffed0dcd1' + '6a9003bcbe6a4a6d4b1e79b43b1de31e6158d0938a010aaf919880ee9fccf5a6' + '6c41d02ae765d9faf5c46f1ea0f006e68b99b2fa2def8434c0c07df973505860' + 'ddb0b69cabbb5cf05652a3eaf717d02f9044c42e1ca7f8579f504adf2e8771ee' + 'ce3ecc80f22979f68e9e322141bdf63f146655d2732dea95e7ed8b600c936a88' + '465c55d25945ec29f2b699b0a7868473b79bbbad4a4ee37c8e3503fd0a8d2e10' + 'c2ff6b33985422c90594e70f7929d48c5455ac679a6f607770726cab836c8211' + 'a146ba43195b37ac045f432268d874ebf70ac7045e9d596a3a06fa31e56ae21b' + '574bea26c62bae18a904df48d454da2eab06a41d004ed982956b63af78adaf67' + 'c05f2515d7fdd7c3e47f57e8b98554266116a49d58efeb933d6641d44fe21613' + 'ea29f07460c4ce0a6112a083d8c0df877b868eb5ef9558b4aa74b67dcd3f23bb' + 'b1be098710db8d1d6fffca2a1a34b8a0193abd98641ebd70bb60f70a493351c5' + '7958a4277974e4c2ded813ba6423575a1aa390a663ff99ea154909c80296431c' + 'e3f921f80afe8ecc14e2dcb5adb692be2c4e1964ce17b431d3ed6d2fcc577455') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 073ac707e..8afcd744b 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -16,7 +16,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=37.0.2 +_debver=38.0.1 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -52,10 +52,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" $pkgname-install-dir.patch vendor.js $pkgname-fixed-loading-icon.png) -sha256sums=('a9af34b1e1a0851c9e65d2908104b4baab8162080b345c568ecc519c375d5728' - '6ec89b187f2a7ed3a092f0f727b6f0e729c3d36d0d0511080253b2c4222949f9' - '831720c1efd6e67d54e70cf4e2b02f9554aa6c914315be6dd2ca837adbbdcabd' - 'fcb11b3e6bef5afb2f41b631c98d05d10f30bae3afda28ad8d29b98db5187909' +sha256sums=('a0011a4e9078cc2e50a48f76fef3506360d3ab32507b0eef47404dc6d3bd022c' + '490daa2deafd0db5a1193b236cf9f595e7330f2edf61b19950d3e52cf0ad6481' + 'aa354e7d4ebe6bc7618dd4bee86c17a55911df27684a7e47b2f4189bb1fc5832' + '659d7740dd7ace5cc4b806a414245e52322492f0b19b45084b2957839c677255' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' @@ -140,9 +140,6 @@ prepare() { # WebRTC build tries to execute "python" and expects Python 2 ln -s /usr/bin/python2 "$srcdir/path/python" - # Use gold, as Mozilla can use some of its features, such as safe ICF - #ln -s /usr/bin/ld.gold "$srcdir/path/ld" - # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 5e1f7dad4..dea9cc18e 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -158,8 +158,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi } diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2015-03-26 23:20:16.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2015-04-01 18:31:13.921464580 -0300 +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2015-05-08 13:55:12.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2015-05-15 06:52:57.450189850 -0300 @@ -5,155 +5,44 @@ "use strict"; @@ -478,7 +478,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil function onSearchSubmit(aEvent) { let searchText = document.getElementById("searchText"); -@@ -380,144 +156,6 @@ +@@ -381,144 +157,6 @@ document.dispatchEvent(event); } @@ -737,8 +737,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/too <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for - the heading of group of checkboxes corresponding to the developer tools diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.dtd ---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.dtd 2015-02-23 05:39:34.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.dtd 2015-02-25 21:33:17.993024651 -0200 +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.dtd 2015-05-08 13:55:16.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.dtd 2015-05-15 06:52:57.473522026 -0300 @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> @@ -748,7 +748,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web <!ENTITY projectMenu_label "Project"> <!ENTITY projectMenu_accesskey "P"> -@@ -56,7 +56,7 @@ +@@ -58,7 +58,7 @@ <!ENTITY projectButton_label "Open App"> <!ENTITY runtimeButton_label "Select Runtime"> @@ -835,8 +835,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in ---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2015-01-09 02:38:16.000000000 -0200 -+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2015-01-16 15:03:01.408257268 -0200 +--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2015-05-08 13:55:16.000000000 -0300 ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2015-05-15 07:20:33.941389259 -0300 @@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ @@ -847,10 +847,10 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in - <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> + <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3> <DL><p> -- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> -- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> -- <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> -- <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=" ID="rdf:#$22iCK1">@firefox_help@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=" ID="rdf:#$32iCK1">@firefox_customize@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=" ID="rdf:#$42iCK1">@firefox_community@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwMDAsTBZbkNwAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABNElEQVQ4y8WSsU0DURBE3yyWIaAJaqAAN4DPSL6AlIACKIEOyJEgRsIgOOkiInJqgAKowNg7BHdn7MOksNl+zZ//dvbDf5cAiklp22BdVtXdeTEpDYDB9m1VzU6OJuVp2NdEQCaI96fH2YHG4+mDduKYNMYINTcjcGbXzQVDEAphG0k48zUsajIbnAiMIXThpW8EICE0RAK4dvoKg9NIcTiQ589otyHOZLnwqK5nLwBFUZ4igc3iM0d1ff8CMC6mZ6Ihiaqq3gi1aUAnArD00SW1fq5OLBg0ymYmSZsR2/t4e/rGyCLW0sbp3oq+yTYqVgytQWui2FS7XYF7GFprY921T4CNQt8zr47dNzCkIX7y/jBtH+v+RGMQrc828W8pApnZbmEVQp/Ae7BlOy2ttib81/UFc+WRWEbjckIAAAAASUVORK5CYII=" ID="rdf:#$52iCK1">@firefox_about@</A> + <DT><A HREF="https://www.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> + <DT><A HREF="https://www.parabola.nu/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A> + <DT><A HREF="https://wiki.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A> @@ -858,10 +858,10 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in + </DL><p> + <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3> + <DL><p> -+ <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A> -+ <DT><A HREF="http://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A> -+ <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A> -+ <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> ++ <DT><A HREF="https://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A> ++ <DT><A HREF="https://www.gnu.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">The GNU Operating System and the Free Software Movement</A> ++ <DT><A HREF="https://libreplanet.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC">LibrePlanet</A> ++ <DT><A HREF="https://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm @@ -876,7 +876,7 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -20,66 +20,6 @@ +@@ -20,68 +20,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "Promise", "resource://gre/modules/Promise.jsm"); @@ -887,7 +887,9 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro -const STARTPAGE_VERSION = 4; - -this.AboutHomeUtils = { -- get snippetsVersion() STARTPAGE_VERSION, +- get snippetsVersion() { +- return STARTPAGE_VERSION; +- }, - - /* - * showKnowYourRights - Determines if the user should be shown the @@ -943,7 +945,7 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -242,18 +182,9 @@ +@@ -246,18 +184,9 @@ }).then(function(engineName) { let data = { showRestoreLastSession: ss.canRestoreLastSession, diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig index ab1196522..4b6e783a9 100644 --- a/libre/iceweasel/mozconfig +++ b/libre/iceweasel/mozconfig @@ -35,6 +35,7 @@ ac_add_options --disable-debug-symbols # Parabola features ac_add_options --disable-safe-browsing +ac_add_options --disable-eme # Other mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD index 0b8c3fb2b..617b33bf4 100644 --- a/libre/kdebase-konqueror/PKGBUILD +++ b/libre/kdebase-konqueror/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 238288 2015-04-30 08:34:07Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> @@ -6,8 +6,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname='kdebase-konqueror' -pkgver=15.04.0 -pkgrel=3.parabola1 +pkgver=15.04.1 +pkgrel=1.parabola1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') @@ -16,10 +16,9 @@ conflicts=('kdebase-nsplugins' 'kdebase-konqueror-libre') replaces=('kdebase-nsplugins' 'kdebase-konqueror-libre') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets') source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" - 'konq-about-fsdg.diff' 'dolphin-places.patch') -sha1sums=('18ec78a547ca68b110d3b82a12a0001bf62d0b66' - 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a' - 'a3c0536eece94ac288184ceaed3b6bde9241f2dc') + 'konq-about-fsdg.diff') +sha1sums=('099c2d63bd3482936966445950fa290a6dc43550' + 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') optdepends=('kwebkitpart: to enable webkit engine') @@ -31,8 +30,6 @@ prepare() { cd kde-baseapps-${pkgver} # Don't recommend nonfree software or Google. patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" - # Fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174 - patch -p1 -i "$srcdir"/dolphin-places.patch } build() { diff --git a/libre/kdebase-konqueror/dolphin-places.patch b/libre/kdebase-konqueror/dolphin-places.patch deleted file mode 100644 index 2a2bfcba1..000000000 --- a/libre/kdebase-konqueror/dolphin-places.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com> -Date: Thu, 30 Apr 2015 08:12:24 +0000 -Subject: Use user-places.xbel instead of bookmarks.xml in places model. -X-Git-Url: http://quickgit.kde.org/?p=kde-baseapps.git&a=commitdiff&h=270d2affaafcc9e87ba14f82bfe579e22607e2d2 ---- -Use user-places.xbel instead of bookmarks.xml in places model. - -FIXED-IN: 15.04.1 -CCBUG: 345174 ---- - - ---- a/dolphin/src/panels/places/placesitemmodel.cpp -+++ b/dolphin/src/panels/places/placesitemmodel.cpp -@@ -85,8 +85,8 @@ - Baloo::IndexerConfig config; - m_fileIndexingEnabled = config.fileIndexingEnabled(); - #endif -- const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml"); -- m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); -+ const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel"; -+ m_bookmarkManager = KBookmarkManager::managerForExternalFile(file); - - createSystemBookmarks(); - initializeAvailableDevices(); - diff --git a/libre/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD index 7d17fd5f3..14c7a85a9 100644 --- a/libre/kdebase-runtime/PKGBUILD +++ b/libre/kdebase-runtime/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 237798 2015-04-20 18:54:26Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> @@ -6,8 +6,8 @@ pkgbase=kdebase-runtime pkgname=kdebase-runtime -pkgver=15.04.0 -pkgrel=4.parabola1 +pkgver=15.04.1 +pkgrel=1.parabola1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -17,7 +17,7 @@ makedepends=('kdelibs' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra' 'lib source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('5cbfec48ead85a1cd3dab675b98623dd4a831d91' +sha1sums=('73ac23a97bc81b3e988a214ee1342743e516c74c' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD index 066aad9b7..9c11da583 100644 --- a/libre/kdelibs/PKGBUILD +++ b/libre/kdelibs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 238284 2015-04-30 08:28:34Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdelibs -pkgver=4.14.7 -_kdeappver=15.04.0 -pkgrel=2.parabola1 +pkgver=4.14.8 +_kdeappver=15.04.1 +pkgrel=1.parabola1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -21,12 +21,11 @@ depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt' 'polkit-qt4' makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch' 'dolphin-places.patch') -sha1sums=('6de82328f692717b97ad6833109a564a7b6a0a9a' + 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch') +sha1sums=('98b174dbbbef340bcfc11b819405d8e838cac34c' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'a1502a964081ad583a00cf90c56e74bf60121830' - 'ed1f57ee661e5c7440efcaba7e51d2554709701c' - 'a53959b740b66054f981139430f91885657d5e94') + 'ed1f57ee661e5c7440efcaba7e51d2554709701c') prepare() { mkdir build @@ -37,8 +36,6 @@ prepare() { patch -p1 -i "${srcdir}"/khtml-fsdg.diff # qmake refers to Qt5 patch -p1 -i "${srcdir}"/qt4.patch - # fix disappearing bookmarks in Dolphin https://bugs.kde.org/show_bug.cgi?id=345174 - patch -p1 -i "$srcdir"/dolphin-places.patch } build() { diff --git a/libre/kdelibs/dolphin-places.patch b/libre/kdelibs/dolphin-places.patch deleted file mode 100644 index a43812eff..000000000 --- a/libre/kdelibs/dolphin-places.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com> -Date: Wed, 29 Apr 2015 14:02:02 +0000 -Subject: Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only. -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=5c0a31a2f2a46aa44b8c34baae67b6951b2abcaf ---- -Remove bookmarks syncing from KFilePlacesModel and use user-places.xbel only. - -FIXED-IN: 4.14.8 -BUG: 345174 -REVIEW: 123568 ---- - - ---- a/kfile/CMakeLists.txt -+++ b/kfile/CMakeLists.txt -@@ -22,7 +22,6 @@ - kfilewidget.cpp - kfileplacesitem.cpp - kfileplacesmodel.cpp -- kfileplacessharedbookmarks.cpp - kfileplacesview.cpp - kfileplaceeditdialog.cpp - kfilepreviewgenerator.cpp - ---- a/kfile/kfileplacesmodel.cpp -+++ b/kfile/kfileplacesmodel.cpp -@@ -19,7 +19,6 @@ - */ - #include "kfileplacesmodel.h" - #include "kfileplacesitem_p.h" --#include "kfileplacessharedbookmarks_p.h" - - #ifdef _WIN32_WCE - #include "Windows.h" -@@ -61,10 +60,9 @@ - class KFilePlacesModel::Private - { - public: -- Private(KFilePlacesModel *self) : q(self), bookmarkManager(0), sharedBookmarks(0) {} -+ Private(KFilePlacesModel *self) : q(self), bookmarkManager(0) {} - ~Private() - { -- delete sharedBookmarks; - qDeleteAll(items); - } - -@@ -76,7 +74,6 @@ - - Solid::Predicate predicate; - KBookmarkManager *bookmarkManager; -- KFilePlacesSharedBookmarks * sharedBookmarks; - - void reloadAndSignal(); - QList<KFilePlacesItem *> loadBookmarkList(); -@@ -93,8 +90,8 @@ - KFilePlacesModel::KFilePlacesModel(QObject *parent) - : QAbstractItemModel(parent), d(new Private(this)) - { -- const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml"); -- d->bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces"); -+ const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel"; -+ d->bookmarkManager = KBookmarkManager::managerForExternalFile(file); - - // Let's put some places in there if it's empty. We have a corner case here: - // Given you have bookmarked some folders (which have been saved on -@@ -145,9 +142,6 @@ - // user-places.xbel will be filled later). (ereslibre) - d->bookmarkManager->saveAs(file); - } -- -- // create after, so if we have own places, they are added afterwards, in case of equal priorities -- d->sharedBookmarks = new KFilePlacesSharedBookmarks(d->bookmarkManager); - - QString predicate("[[[[ StorageVolume.ignored == false AND [ StorageVolume.usage == 'FileSystem' OR StorageVolume.usage == 'Encrypted' ]]" - " OR " -@@ -632,8 +626,6 @@ - return false; - } - -- d->sharedBookmarks->updateSharedBookmarks(); -- - d->reloadAndSignal(); - - return true; -@@ -660,8 +652,6 @@ - KFilePlacesItem *item = static_cast<KFilePlacesItem*>(after.internalPointer()); - d->bookmarkManager->root().moveBookmark(bookmark, item->bookmark()); - } -- -- d->sharedBookmarks->updateSharedBookmarks(); - - d->reloadAndSignal(); - } -@@ -684,8 +674,6 @@ - bookmark.setIcon(iconName); - bookmark.setMetaDataItem("OnlyInApp", appName); - -- d->sharedBookmarks->updateSharedBookmarks(); -- - d->reloadAndSignal(); - emit dataChanged(index, index); - } -@@ -703,7 +691,6 @@ - if (bookmark.isNull()) return; - - d->bookmarkManager->root().deleteBookmark(bookmark); -- d->sharedBookmarks->updateSharedBookmarks(); - d->reloadAndSignal(); - } - -@@ -718,8 +705,6 @@ - if (bookmark.isNull()) return; - - bookmark.setMetaDataItem("IsHidden", (hidden ? "true" : "false")); -- -- d->sharedBookmarks->updateSharedBookmarks(); - - d->reloadAndSignal(); - emit dataChanged(index, index); diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD index fb715f7e1..87290ac9a 100644 --- a/libre/kdenetwork-kopete/PKGBUILD +++ b/libre/kdenetwork-kopete/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 236016 2015-04-10 06:56:26Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdenetwork-kopete -pkgver=15.04.0 +pkgver=15.04.1 pkgrel=1.parabola1 pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' @@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim' 'mediastreamer' 'libg optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('c287f0fdfc179d97a634320dd54aebcba08561d9') +sha1sums=('18d3061ecfc7e287408d3842ed690e128520fd40') prepare() { cd kopete-${pkgver} diff --git a/libre/kdeutils-ark/PKGBUILD b/libre/kdeutils-ark/PKGBUILD index 50b8c2b7c..0d73786c4 100644 --- a/libre/kdeutils-ark/PKGBUILD +++ b/libre/kdeutils-ark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 236016 2015-04-10 06:56:26Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdeutils-ark -pkgver=15.04.0 +pkgver=15.04.1 pkgrel=1.parabola1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -19,7 +19,7 @@ optdepends=('p7zip' 'zip' 'unzip' 'unar') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('7f5d5bd32ab472e2c17f51d9ee19d16cdb9c9fbe' +sha1sums=('dcfe0c465c9c51b402d2192058126caee206ad8c' 'a0a836950f185d9b2245204579f969203036fdec') prepare() { diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 75e5c9649..d67658e7e 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,11 +9,11 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabola.nu/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20150105.1 -_libretools_commit=9c33131ece34a52341b1a31606d56329371fcce8 -_devtools_commit=5f4e575914fd597d31e5b9edd203eb6a8aa1306a -md5sums=('bcb043b5869e5b2b26d470f0b631d4b3' - '4fbe3aa6e7f87fa720547a8832d3419c') +pkgver=20150526 +_libretools_commit=a608070d29143f11826725ae0261bf0dcd902bc2 +_devtools_commit=b04dc724f01f47107b31b791950d22c27aca7d9b +md5sums=('81c7681cb6e8b94fa87e18cd8e4ef61a' + '84ce76368ddca3bd02198ebc4e85ab3f') _packages_url=https://projects.parabola.nu/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 diff --git a/libre/liferea/PKGBUILD b/libre/liferea/PKGBUILD index 18933bb68..96bb8e6a2 100644 --- a/libre/liferea/PKGBUILD +++ b/libre/liferea/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 232403 2015-03-02 03:49:28Z eric $ +# $Id: PKGBUILD 238777 2015-05-09 23:20:06Z eric $ # Maintainer (Arch): Eric Bélanger <eric@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: bitlord pkgname=liferea -pkgver=1.10.14 +pkgver=1.10.15 pkgrel=1.parabola1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ conflicts=('liferea-libre') license=('GPL') depends=('webkitgtk' 'libnotify' 'json-glib' 'libpeas' 'python2-gobject' 'gnome-icon-theme' 'desktop-file-utils') -makedepends=('intltool') +makedepends=('intltool' 'gobject-introspection') optdepends=('gnome-keyring: for keyring plugin support' 'libgnome-keyring: for keyring plugin support' 'gst-plugins-base: for media player plugin support' @@ -24,8 +24,8 @@ options=('!emptydirs') install=liferea.install source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('ffdd505d01473b1ec29a3da292632f474b9b83fb' - '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') +sha1sums=('5325d1fc06417abd4de5568fa87daf0c7f3e9c82' + 'e787f9209415ed2574e54b020cf449268ece3583') build() { cd liferea-${pkgver} diff --git a/libre/liferea/remove-non-free-suggestions.patch b/libre/liferea/remove-non-free-suggestions.patch index 5024f19ee..b2a01bb49 100644 --- a/libre/liferea/remove-non-free-suggestions.patch +++ b/libre/liferea/remove-non-free-suggestions.patch @@ -1,20 +1,19 @@ -diff --git a/src/browser.c b/src/browser.c -index f91901f..28b0c2b 100644 ---- a/src/browser.c -+++ b/src/browser.c -@@ -35,23 +35,16 @@ static struct browser browsers[] = { +diff -Nur liferea-1.10.15.orig/src/browser.c liferea-1.10.15/src/browser.c +--- liferea-1.10.15.orig/src/browser.c 2015-04-20 18:22:55.000000000 -0300 ++++ liferea-1.10.15/src/browser.c 2015-05-11 05:02:46.503659599 -0300 +@@ -35,23 +35,16 @@ NULL, NULL }, { - /* tested with Firefox 1.5 and 2.0 */ - "firefox", "Firefox", "firefox \"%s\"", -- NULL, "firefox -a firefox -remote \"openURL(%s)\"", -- NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'", -- NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'" -+ "iceweasel", "Iceweasel", "iceweasel %s", -+ NULL, "iceweasel \"%s\"", -+ NULL, "iceweasel -new-window \"%s\"", -+ NULL, "iceweasel -new-tab \"%s\"" +- "firefox \"%s\"", NULL, +- "firefox -a firefox -new-window \"%s\"", NULL, +- "firefox -a firefox -new-tab \"%s\"", NULL ++ "icecat", "Icecat", "icecat \"%s\"", ++ "icecat \"%s\"", NULL, ++ "icecat -a icecat -new-window \"%s\"", NULL, ++ "icecat -a icecat -new-tab \"%s\"", NULL }, { - "google-chrome", "Chrome", "google-chrome \"%s\"", @@ -27,14 +26,14 @@ index f91901f..28b0c2b 100644 - "opera \"%s\"", "opera -remote \"openURL(%s)\"", - "opera -newwindow \"%s\"", NULL, - "opera -newpage \"%s\"", NULL -+ "icecat", "Icecat", "icecat %s", -+ NULL, "icecat \"%s\"", -+ NULL, "icecat -new-window \"%s\"", -+ NULL, "icecat -new-tab \"%s\"" ++ "iceweasel", "Iceweasel", "iceweasel \"%s\"", ++ "iceweasel \"%s\"", NULL, ++ "iceweasel -a iceweasel -new-window \"%s\"", NULL, ++ "iceweasel -a iceweasel -new-tab \"%s\"", NULL }, { "epiphany", "Epiphany", "epiphany \"%s\"", -@@ -60,13 +53,6 @@ static struct browser browsers[] = { +@@ -60,13 +53,6 @@ "epiphany -n \"%s\"", NULL }, { diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 7b378033e..770e5d75a 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 231100 2015-02-07 10:33:26Z allan $ +# $Id: PKGBUILD 237944 2015-04-23 05:19:11Z allan $ # Maintainer (Arch): Allan McRae <allan@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Luke Shumaker <lukeshu@sbcglobal.net> @@ -6,8 +6,8 @@ # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-libre-api-headers -_pkgbasever=3.18-gnu -_pkgver=3.18.5-gnu +_pkgbasever=4.0-gnu +_pkgver=${_pkgbasever} _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} @@ -21,12 +21,10 @@ provides=( "linux-api-headers=${_archpkgver}") conflicts=('linux-api-headers') replaces=( 'linux-api-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign") -md5sums=('b3c2a6827813398dde7e8a2d4e02a2c3' - 'SKIP' - '703db9a7b1c55dcbb2878eaa8e38b0e4' + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign") + #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" + #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign") +md5sums=('87edb0b508abb8d8484bc08daa2ee96d' 'SKIP') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva diff --git a/libre/linux-libre-grsec/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch b/libre/linux-libre-grsec/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch deleted file mode 100644 index 4e801b3cc..000000000 --- a/libre/linux-libre-grsec/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b27b2ff4bd6f0327ee550baa0397ccf0a559821f Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Wed, 1 Apr 2015 13:40:48 +0200 -Subject: [PATCH] drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - -We stopped handling them in - -commit aaecdf611a05cac26a94713bad25297e60225c29 -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Tue Nov 4 15:52:22 2014 +0100 - - drm/i915: Stop gathering error states for CS error interrupts - -but just clearing is apparently not enough: A sufficiently dead gpu -left behind by firmware (*cough* coreboot *cough*) can keep the gpu in -an endless loop of such interrupts, eventually leading to the nmi -firing. And definitely to what looks like a machine hang. - -Since we don't even enable these interrupts on gen5+ let's do the same -on earlier platforms. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=93171 -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_irq.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 14ecb4d13a1a..6d494432b19f 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev) - ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - I915_WRITE16(IMR, dev_priv->irq_mask); - - I915_WRITE16(IER, - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT); - POSTING_READ16(IER); - -@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev) - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - - enable_mask = - I915_ASLE_INTERRUPT | - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT; - - if (I915_HAS_HOTPLUG(dev)) { --- -2.1.4 - diff --git a/kernels/linux-libre-knock/4.0-rc7-37af2c8aae-loongson-community.patch b/libre/linux-libre-grsec/4.0.2-ae91f13af5-loongson-community.patch index 36edc2945..c550ff3da 100644 --- a/kernels/linux-libre-knock/4.0-rc7-37af2c8aae-loongson-community.patch +++ b/libre/linux-libre-grsec/4.0.2-ae91f13af5-loongson-community.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 54430f9..09d9a42 100644 +index 0649a60..d43fa5e 100644 --- a/Makefile +++ b/Makefile @@ -297,8 +297,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ @@ -2174,19 +2174,20 @@ index 0000000..b296220 + gdium_usb_host_fixup); +#endif diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S -index 32a7c82..3a89502 100644 +index e7567c8..498e42d 100644 --- a/arch/mips/power/hibernate.S +++ b/arch/mips/power/hibernate.S -@@ -43,7 +43,9 @@ LEAF(swsusp_arch_resume) - bne t1, t3, 1b - PTR_L t0, PBE_NEXT(t0) - bnez t0, 0b +@@ -30,8 +30,10 @@ LEAF(swsusp_arch_suspend) + END(swsusp_arch_suspend) + + LEAF(swsusp_arch_resume) +#if !defined(CONFIG_MACH_LOONGSON) || !defined(CONFIG_CPU_LOONGSON2) /* Commit 771004298d broke Loongson2. */ - jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */ + /* Avoid TLB mismatch during and after kernel resume */ + jal local_flush_tlb_all +#endif - PTR_LA t0, saved_regs - PTR_L ra, PT_R31(t0) - PTR_L sp, PT_R29(t0) + PTR_L t0, restore_pblist + 0: + PTR_L t1, PBE_ADDRESS(t0) /* source */ diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c index fc897ba..ac60f6b 100644 --- a/drivers/cpufreq/loongson2_cpufreq.c @@ -2475,10 +2476,10 @@ index 0000000..67cc095 +MODULE_LICENSE("GPL"); + diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 9c47867..a3e1258 100644 +index 7fe5590..3087a7f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1021,6 +1021,9 @@ +@@ -1025,6 +1025,9 @@ #define USB_VENDOR_ID_ZYTRONIC 0x14c8 #define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005 diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index b23737a31..d946e9050 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-grsec # Build kernel with -grsec localname _pkgbasever=4.0-gnu -_pkgver=4.0.1-gnu +_pkgver=4.0.4-gnu _grsecver=3.1 -_timestamp=201505042053 +_timestamp=201505222222 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -33,37 +33,35 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign" - "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" - "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" + "https://repo.parabola.nu/other/grsecurity-libre/test/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" + "https://repo.parabola.nu/other/grsecurity-libre/test/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" # the main kernel config files 'config.i686' 'config.x86_64' 'config.mips64el' # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch - '4.0-rc7-37af2c8aae-loongson-community.patch') + '4.0.2-ae91f13af5-loongson-community.patch') sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' - 'b99335ed7c60ba2701d81923de4e3e9efbbfa3ad0782e7d94cd48b92adb1fbd6' + 'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61' 'SKIP' - '9944bf62201fa0ad86bc9d4a5e0368d64967b626933261868b2402547abd039b' + '880b46fd8ac5690587aa0a8db8445956bbab62d12b72c28b78a5dfe05d3ef5b7' 'SKIP' - 'd1b2bfc86563d522562850556a2dd39f41b91b992cb4d839551e44e8d9df0ae3' - '92580d3bd2f8c66ccc9467e9a4bfbc012e90a3d32953503750309313755a3ea2' - 'cfb811c37f4b04bbc93cd87c5d1fa3bff2bcdd6e28bffce703d49beb9f3877d6' + 'd4e66b81d29d5048f072b3eda89b12e1564c2b3c9d0e27f9efbd7290b52cc9ee' + '5c12d80d81dbde43c138acf69a036640a28c8b49c02c8547033a60a0fecc9f08' + '3383ed8dfa70ec91275e52c12965c2e265fffe494c2ee1904c20e3d2773a5993' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5' - '8a070d193bc54db696b38ac844cfbfd62724f483ad74c9a288ccab462c32f80e') + '13e141279af2bc17decfc041e015710daac9a6cd1c9b4e871a76cb8f916b9e22') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - 'DE9452CE46F42094907F108B44D1C0F82525FE49' # Bradley Spengler + 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva ) _kernelname=${pkgbase#linux-libre} @@ -84,8 +82,8 @@ prepare() { patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}" fi - # add grsecurity patches - patch -Np1 -i "${srcdir}/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" + # add grsecurity patches (without nonfree bnx2 firmware patching) + patch -Np1 -i "${srcdir}/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" rm localversion-grsec # add freedo as boot logo @@ -100,13 +98,9 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # drm/i915: Stop gathering error states for CS error interrupts - # https://bugzilla.kernel.org/show_bug.cgi?id=93171 - patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch" - # Adding loongson-community patch if [ "${CARCH}" == "mips64el" ]; then - patch -p1 -i ${srcdir}/4.0-rc7-37af2c8aae-loongson-community.patch + patch -p1 -i ${srcdir}/4.0.2-ae91f13af5-loongson-community.patch fi cat "${srcdir}/config.${CARCH}" > ./.config diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686 index 703e061c3..34d4907b2 100644 --- a/libre/linux-libre-grsec/config.i686 +++ b/libre/linux-libre-grsec/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.1-gnu-201505031602-1-grsec Kernel Configuration +# Linux/x86 4.0.4-gnu-201505182014-1-grsec Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -151,8 +151,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -838,7 +838,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3190,6 +3190,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3646,7 +3647,7 @@ CONFIG_POWER_RESET_GPIO=y # CONFIG_POWER_RESET_RESTART is not set # CONFIG_POWER_RESET_SYSCON is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3804,6 +3805,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set @@ -4313,6 +4315,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4824,8 +4827,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -5036,7 +5041,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -6233,6 +6340,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7307,7 +7415,7 @@ CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre-grsec/config.mips64el b/libre/linux-libre-grsec/config.mips64el index 599589376..f7001ed72 100644 --- a/libre/linux-libre-grsec/config.mips64el +++ b/libre/linux-libre-grsec/config.mips64el @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/mips 4.0.1-gnu-201505042053-1-grsec Kernel Configuration +# Linux/mips 4.0.4-gnu-201505182014-1-grsec Kernel Configuration # CONFIG_MIPS=y @@ -271,8 +271,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -626,7 +626,7 @@ CONFIG_TCP_CONG_ILLINOIS=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -2811,6 +2811,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m # CONFIG_INPUT_E3X0_BUTTON is not set CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -3184,7 +3185,7 @@ CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3324,6 +3325,7 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -3778,6 +3780,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4231,6 +4234,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4395,7 +4399,87 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_RT5631 is not set +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5380,6 +5464,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set @@ -6365,7 +6450,7 @@ CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64 index 53dc4920d..b5f475fac 100644 --- a/libre/linux-libre-grsec/config.x86_64 +++ b/libre/linux-libre-grsec/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.1-gnu-201505031602-1-grsec Kernel Configuration +# Linux/x86 4.0.4-gnu-201505182014-1-grsec Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -159,8 +159,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -822,7 +822,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3079,6 +3079,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3496,7 +3497,7 @@ CONFIG_CHARGER_BQ24735=m CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3653,6 +3654,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -4142,6 +4144,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4632,8 +4635,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4803,7 +4808,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5930,6 +6037,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7001,7 +7109,7 @@ CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index fa2557be6..3916be539 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts # Build kernel with -lts localname _pkgbasever=3.14-gnu -_pkgver=3.14.40-gnu +_pkgver=3.14.43-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -38,15 +38,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' '0006-genksyms-fix-typeof-handling.patch' + 'gcc5_buildfixes.diff' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ '3.14.26-8475f027b4-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - 'ce132b3c3e72019cea2ab9bf5cb11871531ee60f06157e9ed8edf2115fa07693' + '1c8d7336a4176e3a96de49688cb268cc5e7a44063d32a2597a339094f3f7cc16' 'SKIP' - 'a3d5c9546d61a84c93e59ba0a5cd725715b87cb1171aa224ff1ff960331e3fb1' - '66edce909f5e051966c42ed104effb2fb706ef1340a4e248b184059f0ae90ab8' - '18a94cb727c2cae80b1dbd3cddbb1e5484458d4c01b026b69cea68bc2df162d7' + 'b4cc9c49948fc1d571c27ddeddd93b5b499ccc17fb06fa75bfe41ecddfbc12e4' + '3fa8ce26aea9b5e596ccfc842baa3f2a8be8ef4a62bc13d75e8da2bafd89141c' + 'f15f2cf744d402e575713e4d500b82e7bcf8983aef5c97f82dcc9400ba4487f0' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' @@ -56,6 +57,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' + '470d6d019d288dce02b4a9758a34ea71d41715663a19a164749212a470a131e7' '7c2d1e257acce0ea6f260f3acf18e30e21c12a9a6b3d7d1d4097dafd287388e2') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -83,6 +85,12 @@ prepare() { install -m644 -t drivers/video/logo \ "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm} + # buildfixes for gcc5 + # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/scsi/qla2xxx/qla_nx2.c?id=9493c2422cae272d6f1f567cbb424195defe4176 + # https://lkml.org/lkml/2014/11/9/27 + # https://lkml.org/lkml/2014/12/14/55 + patch -p1 -i "${srcdir}/gcc5_buildfixes.diff" + # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 70e91244f..cd24fdfcb 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1870,7 +1870,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5631,21 +5631,21 @@ CONFIG_FB_OLPC_DCON=m CONFIG_FB_OLPC_DCON_1=y CONFIG_FB_OLPC_DCON_1_5=y # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5655,8 +5655,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/libre/linux-libre-lts/config.mips64el b/libre/linux-libre-lts/config.mips64el index 96a39960a..96426a215 100644 --- a/libre/linux-libre-lts/config.mips64el +++ b/libre/linux-libre-lts/config.mips64el @@ -1603,7 +1603,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5051,21 +5051,21 @@ CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5075,8 +5075,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 71b21d7c9..ec000e4ac 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1834,7 +1834,7 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m +# CONFIG_MEGARAID_SAS is not set CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 # CONFIG_SCSI_MPT2SAS_LOGGING is not set @@ -5420,21 +5420,21 @@ CONFIG_COMEDI_DAS08=m CONFIG_COMEDI_NI_LABPC=m CONFIG_COMEDI_NI_TIO=m # CONFIG_PANEL is not set -CONFIG_R8187SE=m +# CONFIG_R8187SE is not set CONFIG_RTL8192U=m CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m -CONFIG_RTL8192E=m -CONFIG_R8712U=m +# CONFIG_RTL8192E is not set +# CONFIG_R8712U is not set CONFIG_R8188EU=m CONFIG_88EU_AP_MODE=y CONFIG_88EU_P2P=y CONFIG_R8821AE=m CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set -CONFIG_RTS5208=m +# CONFIG_RTS5208 is not set # CONFIG_RTS5208_DEBUG is not set # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m @@ -5444,8 +5444,8 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set CONFIG_FB_SM7XX=m CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m diff --git a/libre/linux-libre-lts/gcc5_buildfixes.diff b/libre/linux-libre-lts/gcc5_buildfixes.diff new file mode 100644 index 000000000..f29d60674 --- /dev/null +++ b/libre/linux-libre-lts/gcc5_buildfixes.diff @@ -0,0 +1,115 @@ +From 9493c2422cae272d6f1f567cbb424195defe4176 Mon Sep 17 00:00:00 2001 +From: Chen Gang <gang.chen.5i5j@gmail.com> +Date: Sat, 1 Nov 2014 19:46:12 +0800 +Subject: qla2xxx: remove redundant declaration in 'qla_gbl.h' + +Remove 2 redundant extern inline functions: qla8044_set_qsnt_ready() and +qla8044_need_reset_handler(). At present, within upstream next kernel +source code, they are only used within "drivers/scsi/qla2xxx/qla_nx2.c". + +The related error and warnings (with allmodconfig under tile): + + CC [M] drivers/scsi/qla2xxx/qla_nx2.o + drivers/scsi/qla2xxx/qla_nx2.c:1633:1: error: static declaration of 'qla8044_need_reset_handler' follows non-static declaration + qla8044_need_reset_handler(struct scsi_qla_host *vha) + ^ + In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, + from drivers/scsi/qla2xxx/qla_nx2.c:11: + drivers/scsi/qla2xxx/qla_gbl.h:756:20: note: previous declaration of 'qla8044_need_reset_handler' was here + extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); + ^ + drivers/scsi/qla2xxx/qla_gbl.h:756:20: warning: inline function 'qla8044_need_reset_handler' declared but never defined + make[3]: *** [drivers/scsi/qla2xxx/qla_nx2.o] Error 1 + make[2]: *** [drivers/scsi/qla2xxx] Error 2 + make[1]: *** [drivers/scsi] Error 2 + make: *** [drivers] Error 2 + + CC [M] drivers/scsi/qla2xxx/qla_tmpl.o + In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0, + from drivers/scsi/qla2xxx/qla_tmpl.c:7: + drivers/scsi/qla2xxx/qla_gbl.h:755:20: warning: inline function 'qla8044_set_qsnt_ready' declared but never defined + extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); + ^ + +Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> +Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com> +Signed-off-by: Christoph Hellwig <hch@lst.de> + +diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h +index b1865a7..7686bfe 100644 +--- a/drivers/scsi/qla2xxx/qla_gbl.h ++++ b/drivers/scsi/qla2xxx/qla_gbl.h +@@ -752,8 +752,6 @@ extern void qla8044_set_idc_dontreset(struct scsi_qla_host *ha); + extern int qla8044_rd_direct(struct scsi_qla_host *vha, const uint32_t crb_reg); + extern void qla8044_wr_direct(struct scsi_qla_host *vha, + const uint32_t crb_reg, const uint32_t value); +-extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha); +-extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha); + extern int qla8044_device_state_handler(struct scsi_qla_host *vha); + extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha); + extern void qla8044_clear_drv_active(struct qla_hw_data *); +diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c +index 24a8528..ed4d6b6 100644 +--- a/drivers/scsi/qla2xxx/qla_nx2.c ++++ b/drivers/scsi/qla2xxx/qla_nx2.c +@@ -238,7 +238,7 @@ qla8044_rmw_crb_reg(struct scsi_qla_host *vha, + return; + } + +-inline void ++static inline void + qla8044_set_qsnt_ready(struct scsi_qla_host *vha) + { + uint32_t qsnt_state; +-- +cgit v0.10.2 + +diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h +index e2b3985..c245ea3 100644 +--- a/lib/mpi/mpi-inline.h ++++ b/lib/mpi/mpi-inline.h +@@ -30,7 +30,7 @@ + #define G10_MPI_INLINE_H + + #ifndef G10_MPI_INLINE_DECL +-#define G10_MPI_INLINE_DECL extern inline ++#define G10_MPI_INLINE_DECL static inline + #endif + + G10_MPI_INLINE_DECL mpi_limb_t +diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h +index 60cf765..91ef8ac 100644 +--- a/lib/mpi/mpi-internal.h ++++ b/lib/mpi/mpi-internal.h +@@ -168,20 +168,24 @@ void mpi_rshift_limbs(MPI a, unsigned int count); + int mpi_lshift_limbs(MPI a, unsigned int count); + + /*-- mpihelp-add.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-sub.c --*/ ++#ifndef __GNUC__ + mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, + mpi_size_t s1_size, mpi_limb_t s2_limb); +-mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, +- mpi_ptr_t s2_ptr, mpi_size_t size); + mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size, + mpi_ptr_t s2_ptr, mpi_size_t s2_size); ++#endif ++mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, ++ mpi_ptr_t s2_ptr, mpi_size_t size); + + /*-- mpihelp-cmp.c --*/ + int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size); +-- +1.9.3 + diff --git a/libre/linux-libre/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch b/libre/linux-libre/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch deleted file mode 100644 index 4e801b3cc..000000000 --- a/libre/linux-libre/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b27b2ff4bd6f0327ee550baa0397ccf0a559821f Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Wed, 1 Apr 2015 13:40:48 +0200 -Subject: [PATCH] drm/i915: Dont enable CS_PARSER_ERROR interrupts at all - -We stopped handling them in - -commit aaecdf611a05cac26a94713bad25297e60225c29 -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Tue Nov 4 15:52:22 2014 +0100 - - drm/i915: Stop gathering error states for CS error interrupts - -but just clearing is apparently not enough: A sufficiently dead gpu -left behind by firmware (*cough* coreboot *cough*) can keep the gpu in -an endless loop of such interrupts, eventually leading to the nmi -firing. And definitely to what looks like a machine hang. - -Since we don't even enable these interrupts on gen5+ let's do the same -on earlier platforms. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=93171 -Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> ---- - drivers/gpu/drm/i915/i915_irq.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 14ecb4d13a1a..6d494432b19f 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -3598,14 +3598,12 @@ static int i8xx_irq_postinstall(struct drm_device *dev) - ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - I915_WRITE16(IMR, dev_priv->irq_mask); - - I915_WRITE16(IER, - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT); - POSTING_READ16(IER); - -@@ -3767,14 +3765,12 @@ static int i915_irq_postinstall(struct drm_device *dev) - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | - I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | -- I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); -+ I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT); - - enable_mask = - I915_ASLE_INTERRUPT | - I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | -- I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT | - I915_USER_INTERRUPT; - - if (I915_HAS_HOTPLUG(dev)) { --- -2.1.4 - diff --git a/kernels/linux-libre-grsec-knock/4.0-rc7-37af2c8aae-loongson-community.patch b/libre/linux-libre/4.0.2-ae91f13af5-loongson-community.patch index 5fb2ec0b7..c550ff3da 100644 --- a/kernels/linux-libre-grsec-knock/4.0-rc7-37af2c8aae-loongson-community.patch +++ b/libre/linux-libre/4.0.2-ae91f13af5-loongson-community.patch @@ -1,3 +1,27 @@ +diff --git a/Makefile b/Makefile +index 0649a60..d43fa5e 100644 +--- a/Makefile ++++ b/Makefile +@@ -297,8 +297,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ + + HOSTCC = gcc + HOSTCXX = g++ +-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89 +-HOSTCXXFLAGS = -O2 ++HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O3 -fomit-frame-pointer -std=gnu89 ++HOSTCXXFLAGS = -O3 + + ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1) + HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \ +@@ -616,7 +616,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) + ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE + KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) + else +-KBUILD_CFLAGS += -O2 ++KBUILD_CFLAGS += -O3 + endif + + # Tell gcc to never replace conditional load with a non-conditional one diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index c7a1690..0f854f0 100644 --- a/arch/mips/Kconfig @@ -2150,19 +2174,20 @@ index 0000000..b296220 + gdium_usb_host_fixup); +#endif diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S -index 32a7c82..3a89502 100644 +index e7567c8..498e42d 100644 --- a/arch/mips/power/hibernate.S +++ b/arch/mips/power/hibernate.S -@@ -43,7 +43,9 @@ LEAF(swsusp_arch_resume) - bne t1, t3, 1b - PTR_L t0, PBE_NEXT(t0) - bnez t0, 0b +@@ -30,8 +30,10 @@ LEAF(swsusp_arch_suspend) + END(swsusp_arch_suspend) + + LEAF(swsusp_arch_resume) +#if !defined(CONFIG_MACH_LOONGSON) || !defined(CONFIG_CPU_LOONGSON2) /* Commit 771004298d broke Loongson2. */ - jal local_flush_tlb_all /* Avoid TLB mismatch after kernel resume */ + /* Avoid TLB mismatch during and after kernel resume */ + jal local_flush_tlb_all +#endif - PTR_LA t0, saved_regs - PTR_L ra, PT_R31(t0) - PTR_L sp, PT_R29(t0) + PTR_L t0, restore_pblist + 0: + PTR_L t1, PBE_ADDRESS(t0) /* source */ diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c index fc897ba..ac60f6b 100644 --- a/drivers/cpufreq/loongson2_cpufreq.c @@ -2451,10 +2476,10 @@ index 0000000..67cc095 +MODULE_LICENSE("GPL"); + diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 9c47867..a3e1258 100644 +index 7fe5590..3087a7f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1021,6 +1021,9 @@ +@@ -1025,6 +1025,9 @@ #define USB_VENDOR_ID_ZYTRONIC 0x14c8 #define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 951f6429a..51c10d7c1 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre # Build stock "" kernel _pkgbasever=4.0-gnu -_pkgver=4.0.1-gnu +_pkgver=4.0.4-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -18,7 +18,7 @@ _replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelna _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,24 +33,24 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} + 'md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch' 'change-default-console-loglevel.patch' - '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ - '4.0-rc7-37af2c8aae-loongson-community.patch') + '4.0.2-ae91f13af5-loongson-community.patch') sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' - 'b99335ed7c60ba2701d81923de4e3e9efbbfa3ad0782e7d94cd48b92adb1fbd6' + 'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61' 'SKIP' - '872203c34c5db72a1dc62e8152c89c90469743b39f3e91cbdb1f9bb5c24ab4c1' - '2d76fb20424573559289ab061312971ae1a508a15375513c9f28e5cb84f4515a' - '4e05992849d2db2caaa3cc56f307c82ca4376441d4cad51a5f3611f10866a2a4' + '5fa50ffbe7b6e82c70d1d15947c34caa0b484ecd264f01149f40b910e7c8f394' + '33f68753bc12456e601492f870f7e04cd116f36b81630d9bad954093d72bc57a' + '7b6954ed843d17149129cc04064d00db791767ad8b7dca5a4833a2febafce50a' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' + 'bc83293e64653d60793708a0e277741f57c018f5ea3551a8aff3a220df917ceb' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5' - '6fd223e0e11421f87ff4c913b61636ecbbecf249f431ba87a1288463b847f26c') + '13e141279af2bc17decfc041e015710daac9a6cd1c9b4e871a76cb8f916b9e22') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) @@ -80,18 +80,17 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # https://bugzilla.kernel.org/show_bug.cgi?id=98501 + patch -Np1 -i "${srcdir}/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # drm/i915: Stop gathering error states for CS error interrupts - # https://bugzilla.kernel.org/show_bug.cgi?id=93171 - patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch" - # Adding loongson-community patch if [ "${CARCH}" == "mips64el" ]; then - patch -p1 -i ${srcdir}/4.0-rc7-37af2c8aae-loongson-community.patch + patch -p1 -i ${srcdir}/4.0.2-ae91f13af5-loongson-community.patch fi cat "${srcdir}/config.${CARCH}" > ./.config diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 0219f13de..bb9de9662 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.0-gnu-1 Kernel Configuration +# Linux/x86 4.0.4-gnu-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -151,8 +151,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -851,7 +851,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3202,6 +3202,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3660,7 +3661,7 @@ CONFIG_POWER_RESET_GPIO=y # CONFIG_POWER_RESET_RESTART is not set # CONFIG_POWER_RESET_SYSCON is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3818,6 +3819,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set @@ -4327,6 +4329,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4838,8 +4841,10 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -5050,7 +5055,109 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -6247,6 +6354,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -7148,7 +7256,7 @@ CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre/config.mips64el b/libre/linux-libre/config.mips64el index c4a665344..1017c9e65 100644 --- a/libre/linux-libre/config.mips64el +++ b/libre/linux-libre/config.mips64el @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/mips 4.0.0-gnu-1 Kernel Configuration +# Linux/mips 4.0.4-gnu-1 Kernel Configuration # CONFIG_MIPS=y @@ -273,8 +273,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -629,7 +629,7 @@ CONFIG_TCP_CONG_ILLINOIS=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -2813,6 +2813,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m # CONFIG_INPUT_E3X0_BUTTON is not set CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -3188,7 +3189,7 @@ CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3328,6 +3329,7 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -3782,6 +3784,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4235,6 +4238,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4399,7 +4403,87 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_RT5631 is not set +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5384,6 +5468,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set @@ -6199,7 +6284,7 @@ CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index f254e91cf..2a925a8c9 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.0.0-gnu-1 Kernel Configuration +# Linux/x86 4.0.4-gnu-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -159,8 +159,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -839,7 +839,7 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set +CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3100,6 +3100,7 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m +# CONFIG_INPUT_ARIZONA_HAPTICS is not set CONFIG_INPUT_BMA150=m CONFIG_INPUT_E3X0_BUTTON=m CONFIG_INPUT_PCSPKR=m @@ -3524,7 +3525,7 @@ CONFIG_CHARGER_BQ24735=m CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_RESTART is not set CONFIG_POWER_AVS=y -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3681,6 +3682,7 @@ CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -4171,6 +4173,7 @@ CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -4664,6 +4667,7 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m @@ -4833,7 +4837,108 @@ CONFIG_SND_BEBOB=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_DESIGNWARE_I2S=m + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +# CONFIG_SND_SOC_FSL_ASRC is not set +# CONFIG_SND_SOC_FSL_SAI is not set +# CONFIG_SND_SOC_FSL_SSI is not set +# CONFIG_SND_SOC_FSL_SPDIF is not set +# CONFIG_SND_SOC_FSL_ESAI is not set +# CONFIG_SND_SOC_IMX_AUDMUX is not set +CONFIG_SND_SST_MFLD_PLATFORM=m +CONFIG_SND_SST_IPC=m +CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_SST_ACPI=m +CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m +CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m +CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m +CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m +# CONFIG_SND_SOC_XTFPGA_I2S is not set +CONFIG_SND_SOC_I2C_AND_SPI=m + +# +# CODEC drivers +# +# CONFIG_SND_SOC_ADAU1701 is not set +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4554 is not set +# CONFIG_SND_SOC_AK4642 is not set +# CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_CS35L32 is not set +# CONFIG_SND_SOC_CS42L51_I2C is not set +# CONFIG_SND_SOC_CS42L52 is not set +# CONFIG_SND_SOC_CS42L56 is not set +# CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS4265 is not set +# CONFIG_SND_SOC_CS4270 is not set +# CONFIG_SND_SOC_CS4271_I2C is not set +# CONFIG_SND_SOC_CS4271_SPI is not set +# CONFIG_SND_SOC_CS42XX8_I2C is not set +CONFIG_SND_SOC_HDMI_CODEC=m +# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_PCM1681 is not set +# CONFIG_SND_SOC_PCM1792A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT286=m +# CONFIG_SND_SOC_RT5631 is not set +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_RT5645=m +CONFIG_SND_SOC_RT5670=m +# CONFIG_SND_SOC_RT5677_SPI is not set +# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SI476X=m +# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set +CONFIG_SND_SOC_SPDIF=m +# CONFIG_SND_SOC_SSM2602_SPI is not set +# CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM4567 is not set +# CONFIG_SND_SOC_STA32X is not set +# CONFIG_SND_SOC_STA350 is not set +# CONFIG_SND_SOC_TAS2552 is not set +# CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TFA9879 is not set +# CONFIG_SND_SOC_TLV320AIC23_I2C is not set +# CONFIG_SND_SOC_TLV320AIC23_SPI is not set +# CONFIG_SND_SOC_TLV320AIC31XX is not set +# CONFIG_SND_SOC_TLV320AIC3X is not set +# CONFIG_SND_SOC_TS3A227E is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8523 is not set +# CONFIG_SND_SOC_WM8580 is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8728 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8737 is not set +# CONFIG_SND_SOC_WM8741 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8770 is not set +# CONFIG_SND_SOC_WM8776 is not set +# CONFIG_SND_SOC_WM8804 is not set +# CONFIG_SND_SOC_WM8903 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +CONFIG_SND_SIMPLE_CARD=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m @@ -5986,6 +6091,7 @@ CONFIG_EXTCON=m # Extcon Device Drivers # # CONFIG_EXTCON_ADC_JACK is not set +# CONFIG_EXTCON_ARIZONA is not set CONFIG_EXTCON_GPIO=m # CONFIG_EXTCON_RT8973A is not set CONFIG_EXTCON_SM5502=m @@ -6883,7 +6989,7 @@ CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m diff --git a/libre/linux-libre/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch b/libre/linux-libre/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch new file mode 100644 index 000000000..9f09102dc --- /dev/null +++ b/libre/linux-libre/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch @@ -0,0 +1,50 @@ +From a81157768a00e8cf8a7b43b5ea5cac931262374f Mon Sep 17 00:00:00 2001 +From: Eric Work <work.eric@gmail.com> +Date: Mon, 18 May 2015 23:26:23 -0700 +Subject: [PATCH] md/raid0: fix restore to sector variable in + raid0_make_request + +The variable "sector" in "raid0_make_request()" was improperly updated +by a call to "sector_div()" which modifies its first argument in place. +Commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd restored this variable +after the call for later re-use. Unfortunetly the restore was done after +the referenced variable "bio" was advanced. This lead to the original +value and the restored value being different. Here we move this line to +the proper place. + +One observed side effect of this bug was discarding a file though +unlinking would cause an unrelated file's contents to be discarded. + +Signed-off-by: NeilBrown <neilb@suse.de> +Fixes: 47d68979cc96 ("md/raid0: fix bug with chunksize not a power of 2.") +Cc: stable@vger.kernel.org (any that received above backport) +URL: https://bugzilla.kernel.org/show_bug.cgi?id=98501 +--- + drivers/md/raid0.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c +index 6a68ef5..efb654e 100644 +--- a/drivers/md/raid0.c ++++ b/drivers/md/raid0.c +@@ -524,6 +524,9 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) + ? (sector & (chunk_sects-1)) + : sector_div(sector, chunk_sects)); + ++ /* Restore due to sector_div */ ++ sector = bio->bi_iter.bi_sector; ++ + if (sectors < bio_sectors(bio)) { + split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set); + bio_chain(split, bio); +@@ -531,7 +534,6 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) + split = bio; + } + +- sector = bio->bi_iter.bi_sector; + zone = find_zone(mddev->private, §or); + tmp_dev = map_sector(mddev, zone, sector, §or); + split->bi_bdev = tmp_dev->bdev; +-- +2.4.1 + diff --git a/libre/luxrender/PKGBUILD b/libre/luxrender/PKGBUILD index 20ada0647..9a883bb48 100644 --- a/libre/luxrender/PKGBUILD +++ b/libre/luxrender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 132029 2015-04-23 03:41:06Z fyan $ +# $Id: PKGBUILD 133054 2015-05-09 12:38:26Z stativ $ # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor (Arch): flixie <69one@gmx.net> # Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org> @@ -6,7 +6,7 @@ pkgname=luxrender pkgver=1.4 _pkgver=dfd211d6faa0 -pkgrel=5.parabola1 +pkgrel=6.parabola1 pkgdesc="Rendering system for physically correct, unbiased image synthesis, with opencl-mesa recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.luxrender.net/" diff --git a/libre/mapnik/PKGBUILD b/libre/mapnik/PKGBUILD new file mode 100644 index 000000000..6e6676ecd --- /dev/null +++ b/libre/mapnik/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 132059 2015-04-23 16:30:52Z spupykin $ +# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor (Arch): David Dent <thewinch@gmail.com> +# Contributor (Arch): orbisvicis <orbisvicis@gmail.com> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=mapnik +pkgver=2.2.0.654.g718a8b3 +pkgrel=5.parabola1 +pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps, without nonfree mod_fastcgi recommendation" +arch=('i686' 'x86_64') +url="http://mapnik.org/" +license=('LGPL') +depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' + 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' + 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl') +optdepends=('libxslt: Web Map Service' + 'python2-lxml: Web Map Service' + 'python2-pillow: Web Map Service' + 'python-nose: Web Map Service' + 'apache: Web Map Service' + 'mod_fcgid: Web Map Service - or:' + 'mod_wsgi2: Web Map Service') +makedepends=('scons' 'boost' 'git') +install="mapnik.install" +#source=("$pkgname-$pkgver.tar.gz::https://github.com/mapnik/mapnik/archive/v$pkgver.tar.gz") +source=("git://github.com/mapnik/mapnik.git#branch=2.3.x") +md5sums=('SKIP') + +pkgver() { + cd "$srcdir/$pkgname" + + git describe --long | cut -c2- | sed 's/-/./g' +} + +build() { + cd "$srcdir/$pkgname" + + sed -i 's|lib64|lib|g' SConstruct + sed -i 's|python|python2|' \ + utils/performance/mapnik-speed-check \ + utils/upgrade_map_xml/*.py + scons configure \ + PREFIX="/usr" \ + INPUT_PLUGINS=all \ + DESTDIR="$pkgdir" + scons $MAKEFLAGS +} + +package(){ + cd "$srcdir/$pkgname" + scons install +} diff --git a/pcr/gimp-art/gimp.install b/libre/mapnik/mapnik.install index c317fbaca..46f265d5b 100644 --- a/pcr/gimp-art/gimp.install +++ b/libre/mapnik/mapnik.install @@ -1,6 +1,5 @@ post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + /sbin/ldconfig } post_upgrade() { diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 85e5ff969..23697e90a 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa _pkgname=libcl pkgname=$pkgbase-$_pkgname -pkgver=10.5.4 +pkgver=10.5.5 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library and ICD loader' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ provides=("$_pkgname") conflicts=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx') replaces=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx') source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig}) -sha512sums=('e8268b5a28eeafe03d8d8e4a1b3865e5b4a05501507d5b623f7d4c542ade3d8fa6fef2a2b6c05d6aaefa81de26365ab6bb895a0ba2a1d9c05dd1fd701bdab5f5' +sha512sums=('d339f598bfdbe14388d3213b166bed5f89e67535b0ccc09d47f434e2669ed3c5d4c23a1c86f3e180d90e8ba1175f9de24f62b16364f072ac6bb695b57e519b61' 'SKIP') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD index 715bb6a1f..334326e07 100644 --- a/libre/openexr/PKGBUILD +++ b/libre/openexr/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 212797 2014-05-15 10:44:29Z tpowa $ +# $Id: PKGBUILD 238700 2015-05-08 16:56:07Z tpowa $ # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=openexr _pkgname=$pkgname-libre -pkgver=2.1.0 -pkgrel=1.parabola1 +pkgver=2.2.0 +pkgrel=2.parabola1 pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation" url="http://www.$pkgname.com/" arch=('i686' 'x86_64' 'mips64el') license=('BSD') depends=('zlib' 'ilmbase') -makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama') +makedepends=('unoconv') replaces=("$_pkgname") conflicts=("$_pkgname") mksource=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" @@ -33,11 +33,9 @@ mksource() { install -m644 -v "${srcdir}/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} doc # convert source documentation to pdf format and clean source code - if [ "$CARCH" != "mips64el" ]; then - cd doc - libreoffice --headless --invisible --convert-to pdf {InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} - rm -rv "${srcdir}/"{_rels,Configurations2,customXml,docProps,META-INF,ObjBFFFDCA{1,3,4,5,7},Object\ 1,ObjectReplacements,Pictures,Thumbnails,word} - fi + cd doc + unoconv -v -f pdf {InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} + rm -rv "${srcdir}/"{_rels,Configurations2,customXml,docProps,META-INF,ObjBFFFDCA{1,3,4,5,7},Object\ 1,ObjectReplacements,Pictures,Thumbnails,word} } prepare() { @@ -59,10 +57,10 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -m644 "doc/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}" } -mkmd5sums=('33735d37d2ee01c6d8fbd0df94fb8b43' +mkmd5sums=('b64e931c82aa3790329c21418373db4e' 'a59a8516d9dbb76755cb258d18cf4e72' '0b0b41269d6a3ee1a7090067cc89895f' '6889a150ab9f2f35fbc9835373dd3c34' 'ef6912faf2ab7516678bd0fa56b832f8' '232a6be90fd36ce49e213492a60d335d') -md5sums=('97613563c17dc3a1aa3359e05b7b37da') +md5sums=('0c25d11578b23e9f5b12a3071187b171') diff --git a/libre/openttd/PKGBUILD b/libre/openttd/PKGBUILD new file mode 100644 index 000000000..ed984afa9 --- /dev/null +++ b/libre/openttd/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 130965 2015-04-08 20:31:16Z lcarlier $ +# Maintainer (Arch): Vesa Kaihlavirta <vegai@iki.fi> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=openttd +pkgver=1.5.0 +pkgrel=1.parabola1 +pkgdesc='An engine for running Transport Tycoon Deluxe, without nonfree openttd-opensfx recommendation' +arch=('i686' 'x86_64') +url='http://www.openttd.org' +license=('GPL') +depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz') +install=openttd.install +optdepends=('openttd-opengfx: free graphics') +source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") +sha256sums=('cb2735c3c94709430c58eb4e8820cd5d26b1a17447c34ca8792bb3432a3f7c2d') + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix-dir=/usr \ + --binary-name=${pkgname} \ + --binary-dir=bin \ + --data-dir=share/${pkgname} \ + --install-dir=${pkgdir} \ + --doc-dir=share/doc/${pkgname} \ + --menu-name="OpenTTD" \ + --personal-dir=.${pkgname} + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make install +} diff --git a/libre/openttd/openttd.install b/libre/openttd/openttd.install new file mode 100644 index 000000000..85b22a1c5 --- /dev/null +++ b/libre/openttd/openttd.install @@ -0,0 +1,17 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 + update-desktop-database > /dev/null 2>&1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + update-desktop-database > /dev/null 2>&1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 + update-desktop-database > /dev/null 2>&1 +} diff --git a/libre/spacefm/PKGBUILD b/libre/spacefm/PKGBUILD index 31015bd9c..f7bd4207c 100644 --- a/libre/spacefm/PKGBUILD +++ b/libre/spacefm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 120827 2014-10-16 15:48:31Z bpiotrowski $ +# $Id: PKGBUILD 133107 2015-05-09 18:23:35Z arojas $ # Maintainer (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor (Arch): ridikulus_rat <the.ridikulus.rat@gmail.com> @@ -6,38 +6,31 @@ # Contributor: Edison Ibañez <arkhan.xxx@gmail.com> pkgname=spacefm -pkgver=0.9.4 -pkgrel=3.parabola1 +pkgver=1.0.1 +pkgrel=1.parabola1 pkgdesc='Multi-panel tabbed file manager, with unar support' arch=('i686' 'x86_64' 'mips64el') url='http://ignorantguru.github.com/spacefm/' license=('GPL3') install=$pkgname.install -depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' - 'systemd' 'bash' 'unar') +depends=('gtk3' 'desktop-file-utils' 'startup-notification' 'ffmpegthumbnailer' 'unar') makedepends=('intltool' 'gettext') optdepends=('lsof: device processes' 'wget: plugin download' 'gksu: perform as root functionality' 'udevil: mount as non-root user and mount networks' - 'udisks: mount as non-root user' 'udisks2: mount as non-root user') replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) -source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz - spacefm-0.9.4-glib-2.41.patch +source=($pkgname-$pkgver.tar.gz::https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz libre.patch) -md5sums=('daeee7dcccea33d6258a0a9d783470c4' - '1ec85afcb4fc881a8e876b3cf60c7028' - '30ba2b4b8f5ae7bf1552689b192eab89') +md5sums=('3665b0cf08dcbebefcc832afc19d613e' + '66cc35023050ff6664bf14b1073700e2') prepare() { cd $pkgname-$pkgver # replace nonfree unrar with unar support - patch -Np1 -i $srcdir/libre.patch src/ptk/ptk-file-archiver.c - - # fix freezes with glib 2.41 - patch -p1 -i ../spacefm-0.9.4-glib-2.41.patch + patch -Np1 -i $srcdir/libre.patch } build() { diff --git a/libre/spacefm/libre.patch b/libre/spacefm/libre.patch index 82d51f705..d27b1b850 100644 --- a/libre/spacefm/libre.patch +++ b/libre/spacefm/libre.patch @@ -1,24 +1,15 @@ -From 4605df33f85e5dbd4cc0238b9d289ff73601d898 Mon Sep 17 00:00:00 2001 -From: Edison Ibañez <arkhan.xxx@gmail.com> -Date: mar, 20 may 2014 10:27:55 -0500 -Subject: [PATCH] replace nonfree unrar with unar support - - -diff --git a/src/ptk/ptk-file-archiver.c b/src/ptk/ptk-file-archiver.c -index ec9fbd7..55648d2 100644 ---- a/src/ptk/ptk-file-archiver.c -+++ b/src/ptk/ptk-file-archiver.c -@@ -80,8 +80,8 @@ const ArchiveHandler handlers[]= - { - "application/x-rar", - "rar a -r %o", -- "unrar -o- x", -- "unrar lt", -+ "unar -D ", -+ "unar -D ", - ".rar", "arc_rar", TRUE - }, - { --- -Gitg - +diff -Nur spacefm-1.0.1.orig/src/ptk/ptk-handler.c spacefm-1.0.1/src/ptk/ptk-handler.c +--- spacefm-1.0.1.orig/src/ptk/ptk-handler.c 2015-05-04 09:33:53.000000000 -0300 ++++ spacefm-1.0.1/src/ptk/ptk-handler.c 2015-05-11 19:11:14.248923712 -0300 +@@ -173,9 +173,9 @@ + "*.rar *.RAR", + "rar a -r %o %N", + TRUE, +- "unrar -o- x %x", ++ "unar -D %x", + TRUE, +- "unrar lt %x", ++ "unar -D %x", + TRUE + }, + { diff --git a/libre/spacefm/spacefm-0.9.4-glib-2.41.patch b/libre/spacefm/spacefm-0.9.4-glib-2.41.patch deleted file mode 100644 index 5795c77a8..000000000 --- a/libre/spacefm/spacefm-0.9.4-glib-2.41.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/main.c b/src/main.c -index a7307fb..af5dc5a 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1349,7 +1349,9 @@ int main ( int argc, char *argv[] ) - vfs_file_monitor_clean(); - return ret == -1 ? 0 : ret; - } -+ GDK_THREADS_ENTER(); - gtk_main(); -+ GDK_THREADS_LEAVE(); - vfs_file_monitor_clean(); - return 0; - } -@@ -1509,8 +1511,10 @@ int main ( int argc, char *argv[] ) - run = handle_parsed_commandline_args(); - app_settings.load_saved_tabs = TRUE; - -+ GDK_THREADS_ENTER(); - if( run ) /* run the main loop */ - gtk_main(); -+ GDK_THREADS_LEAVE(); - - main_window_event( NULL, NULL, "evt_exit", 0, 0, NULL, 0, 0, 0, FALSE ); - diff --git a/libre/spectrwm/PKGBUILD b/libre/spectrwm/PKGBUILD index a5e29caed..930263166 100644 --- a/libre/spectrwm/PKGBUILD +++ b/libre/spectrwm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 126653 2015-01-27 19:06:39Z kkeen $ +# $Id: PKGBUILD 134036 2015-05-24 19:37:57Z kkeen $ # Maintainer (Arch): Kyle Keen <keenerd@gmail.com> # Contributor (Arch): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spectrwm -pkgver=2.6.2 +pkgver=2.7.1 pkgrel=1.parabola1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') @@ -19,16 +19,11 @@ optdepends=('scrot: screenshots' 'terminus-font: great font') backup=(etc/spectrwm.conf) -# the +2.6.0 gnu/linux makefile does not build -# so download and use the 2.5.1 makefile until this is fixed - source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ - http://opensource.conformal.com/snapshots/$pkgname/$pkgname-2.5.1.tgz \ LICENSE \ baraction.sh \ spectrwm-no-preload) -md5sums=('eba7cba0c85706435657f744bf9086bc' - 'd9aec3342920e31cbe60f1032571043a' +md5sums=('eb7d8c3db709551a90751ecc2157d6d1' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e' '974d109ce0af39cc73936d5efd682480') @@ -47,7 +42,6 @@ build() { sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c cd linux - cp "$srcdir/$pkgname-2.5.1/linux/Makefile" ./ make PREFIX="/usr" } @@ -71,9 +65,4 @@ package() { # fix this for real in the makefile rm "$pkgdir/usr/bin/scrotwm" ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm" - mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/ - mv "$pkgdir/usr/share/man/man1/spectrwm_es.1" "$pkgdir/usr/share/man/es/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_it.1" "$pkgdir/usr/share/man/it/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_pt.1" "$pkgdir/usr/share/man/pt/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_ru.1" "$pkgdir/usr/share/man/ru/man1/" } diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD index d8da0c2f8..7aeb2ccf5 100644 --- a/libre/tp_smapi/PKGBUILD +++ b/libre/tp_smapi/PKGBUILD @@ -14,11 +14,11 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.0 - _archrel=67 + _archrel=69 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 - _archrel=39 + _archrel=41 _parabolarel=1 elif [[ ${_kernelname} == -grsec ]]; then _basekernel=3.19 diff --git a/libre/unp/PKGBUILD b/libre/unp/PKGBUILD new file mode 100644 index 000000000..fe4b53c47 --- /dev/null +++ b/libre/unp/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 116352 2014-07-25 17:05:00Z anatolik $ +# Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com> +# Contributor (Arch): Michael Düll <mail@akurei.me> PGP-Key: AAAEE882 +# Contributor (Arch): TDY <tdy@gmx.com> +# Contributor (Arch): Sergio Rubio <rubiojr.ml@gmail.com> +# Contributor (Arch): Hannes Rist <cowider@gmail.com> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=unp +pkgver=2.0~pre7+nmu1 +pkgrel=2.parabola1 +pkgdesc='A script for unpacking a wide variety of archive formats, without nonfree unace, unarj and unrar recommendation' +arch=(any) +url='http://packages.qa.debian.org/u/unp.html' +license=(GPL) +depends=(perl) +optdepends=( + 'unzip: zip support' + 'bzip2: bzip2 support' + 'p7zip: p7zip support' + 'cpio: cpio support' + 'sharutils: sharutils' + 'cabextract: cab support' + 'rpmextract: rpm support' +) +source=(http://ftp.debian.org/debian/pool/main/u/unp/unp_$pkgver.tar.bz2 + libre.patch) +sha1sums=('b91f4cbc4720b3aace147652ac2043cf74668244' + '202375dd1c013c798d0d61ab5c273be8ebe1c546') + +prepare() { + cd unp-$pkgver + patch -Np1 -i "$srcdir"/libre.patch +} + +build() { + cd unp-$pkgver/po + make +} + +package() { + cd unp-$pkgver + install -Dm755 unp "$pkgdir"/usr/bin/unp + install -Dm755 ucat "$pkgdir"/usr/bin/ucat + install -Dm644 debian/unp.1 "$pkgdir"/usr/share/man/man1/unp.1 + install -Dm755 bash_completion.d/unp "$pkgdir"/etc/bash_completion.d/unp.sh + + cd po + make DESTDIR="$pkgdir" install +} diff --git a/libre/unp/libre.patch b/libre/unp/libre.patch new file mode 100644 index 000000000..e459ce209 --- /dev/null +++ b/libre/unp/libre.patch @@ -0,0 +1,60 @@ +diff -Nur unp-2.0~pre7+nmu1.orig/unp unp-2.0~pre7+nmu1/unp +--- unp-2.0~pre7+nmu1.orig/unp 2011-03-23 17:07:18.000000000 -0300 ++++ unp-2.0~pre7+nmu1/unp 2015-05-19 04:13:37.929971649 -0300 +@@ -214,11 +214,6 @@ + [ 'archmage'] + ], + +- [ gettext("rar or unrar or unrar-free"), "rar", "RAR.*archive", 0, +- [ "rar", "x" ], +- [ "unrar", "x" ] +- ] +- , + [ "binutils", "ar|deb", "(Debian binary package|\ ar.*archive)", 0, + [ "ar", "-x", "-v" ] + ] +@@ -231,11 +226,6 @@ + [ "lha", "x" ] + ] + , +- [ "arj", "arj", "ARJ.*archive", 0, +- [ "arj", "x" ], +- [ "unarj", "x" ], +- ] +- , + [ "ppmd", "pmd", "PPmd.*archive", 0, + [ "PPMd", "x" ] + ] +@@ -264,18 +254,10 @@ + [ "cabextract" ] + ] + , +- [ "unace", "ace", "ACE.*archive", 0, +- [ "unace", "e" ] +- ] +- , + [ "xdms", "dms", "DMS.*archive", 0, + [ "xdms", "x" ] + ] + , +- [ "unlzx", "lzx", "LZX.*archive", 0, +- [ "unace", "e" ] +- ] +- , + [ "macutils", "sea|sea\.bin", "SEA.*archive", 0, + [ "macutils", "-v" ] + ] +@@ -284,12 +266,9 @@ + [ "hexbin", "-v" ] + ] + , +- [ "maybe orange or unzip or unrar or unarj or lha ", "exe", "executable", 3, ++ [ "maybe orange or unzip or lha ", "exe", "executable", 3, + [ "orange" ], + [ "unzip" ], +- [ "unrar", "x" ], +- [ "rar", "x" ], +- [ "arj", "x" ], + [ "lha", "x" ] + ] + diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD index caf5dbad2..3f2b5f13a 100644 --- a/libre/vhba-module/PKGBUILD +++ b/libre/vhba-module/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.0 - _archrel=11 + _archrel=13 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD index 5937dbdcf..58a845b48 100644 --- a/libre/vim/PKGBUILD +++ b/libre/vim/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=vim pkgname=('vim-minimal' 'vim' 'vim-python3' 'gvim' 'gvim-python3' 'vim-runtime') # list of tags can be found at https://code.google.com/p/vim/source/list _topver=7.4 -_patchlevel=712 +_patchlevel=729 _tag=v${_topver/./-}-${_patchlevel} _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} diff --git a/libre/xmlstarlet/PKGBUILD b/libre/xmlstarlet/PKGBUILD deleted file mode 100644 index c8c126715..000000000 --- a/libre/xmlstarlet/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# From https://aur.archlinux.org/packages.php?ID=20101. -# Maintainer (Arch): PyroPeter <abi1789@googlemail.com> -# Contributor (Arch): BlackEagle <ike.devolder@scarlet.be> -# Contributor (Arch): chochem <chochem@gmail.com> - -pkgname=xmlstarlet -pkgver=1.3.1 -pkgrel=1 -pkgdesc="A set of tools to transform, query, validate, and edit XML documents" -arch=('i686' 'x86_64' 'mips64el') -url="http://xmlstar.sourceforge.net/" -license=('custom:MIT') -depends=('libxslt>=1.1.9') -source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download") -md5sums=('5173ad3f01ec0ba0d54bd1fbfc057abf') - -build() { - cd "$srcdir/$pkgname-$pkgver" - local xsltlibs=$(pkg-config --libs libxslt libexslt) - local xmllibs=$(pkg-config --libs libxml-2.0) - - LIBXSLT_PREFIX=/usr LIBXML_PREFIX=/usr LIBXSLT_LIBS="${xsltlibs}" LIBXML_LIBS="${xmllibs}" ./configure --prefix=/usr - - make - make DESTDIR="${pkgdir}" install - mkdir -p $pkgdir/usr/share/licenses/$pkgname - cp Copyright $pkgdir/usr/share/licenses/$pkgname/COPYING - ln -s /usr/bin/xml ${pkgdir}/usr/bin/xmlstarlet -} diff --git a/libre/xorg-fonts-100dpi/PKGBUILD b/libre/xorg-fonts-100dpi/PKGBUILD index f4a3d5226..cce9f6a75 100644 --- a/libre/xorg-fonts-100dpi/PKGBUILD +++ b/libre/xorg-fonts-100dpi/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: fauno <fauno@kiwwwi.com.ar> pkgname=xorg-fonts-100dpi pkgver=1.0.3 -pkgrel=2.parabola1 +pkgrel=2.parabola2 pkgdesc="X.org 100dpi fonts" arch=(any) url="http://xorg.freedesktop.org/" @@ -16,24 +16,32 @@ replaces=('xorg-fonts-100dpi-libre') install=xfonts.install source=(${url}/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2 ${url}/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2) +md5sums=('1347c3031b74c9e91dc4dfa53b12f143' + '6b223a54b15ecbd5a1bc52312ad790d8') build() { cd "${srcdir}" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - for dir in font-*-100dpi*; do if [ -d "${dir}" ]; then pushd ${dir} ./configure --prefix=/usr \ --with-fontdir=/usr/share/fonts/100dpi - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" || return 1 + make popd fi done - rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.* } -md5sums=('1347c3031b74c9e91dc4dfa53b12f143' - '6b223a54b15ecbd5a1bc52312ad790d8') + +package() { + cd "${srcdir}" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + for dir in font-*-100dpi*; do + if [ -d "${dir}" ]; then + pushd ${dir} + make DESTDIR="${pkgdir}" install + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" + popd + fi + done + rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.* +}
\ No newline at end of file diff --git a/libre/xorg-fonts-100dpi/xfonts.install b/libre/xorg-fonts-100dpi/xfonts.install index 5c5e8a2b4..d8fac18a8 100644 --- a/libre/xorg-fonts-100dpi/xfonts.install +++ b/libre/xorg-fonts-100dpi/xfonts.install @@ -1,6 +1,6 @@ post_install() { echo -n "Updating font cache... " - fc-cache -f > /dev/null + fc-cache -s mkfontscale /usr/share/fonts/100dpi mkfontdir /usr/share/fonts/100dpi echo "done." diff --git a/libre/xorg-fonts-75dpi/PKGBUILD b/libre/xorg-fonts-75dpi/PKGBUILD index e02711ab5..21798e4a0 100644 --- a/libre/xorg-fonts-75dpi/PKGBUILD +++ b/libre/xorg-fonts-75dpi/PKGBUILD @@ -3,7 +3,7 @@ # Contributor (Arch): Jan de Groot <jgc@archlinux.org> pkgname=xorg-fonts-75dpi pkgver=1.0.3 -pkgrel=2.parabola1 +pkgrel=2.parabola2 pkgdesc="X.org 75dpi fonts" arch=(any) url="http://xorg.freedesktop.org/" @@ -15,22 +15,32 @@ replaces=('xorg-fonts-75dpi-libre') install=xfonts.install source=(${url}/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2 ${url}/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2) +md5sums=('6c9f26c92393c0756f3e8d614713495b' + 'd7c0588c26fac055c0dd683fdd65ac34') build() { cd "${srcdir}" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" for dir in *; do if [ -d "${dir}" ]; then pushd "${dir}" ./configure --prefix=/usr \ - --with-fontdir=/usr/share/fonts/75dpi || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-75dpi-*}" || return 1 + --with-fontdir=/usr/share/fonts/75dpi + make popd fi done - rm -f "${pkgdir}"/usr/share/fonts/75dpi/fonts.* } -md5sums=('6c9f26c92393c0756f3e8d614713495b' - 'd7c0588c26fac055c0dd683fdd65ac34') + +package() { + cd "${srcdir}" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + for dir in *; do + if [ -d "${dir}" ]; then + pushd "${dir}" + make DESTDIR="${pkgdir}" install + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-75dpi-*}" + popd + fi + done + rm -f "${pkgdir}"/usr/share/fonts/75dpi/fonts.* +}
\ No newline at end of file diff --git a/libre/xorg-fonts-75dpi/xfonts.install b/libre/xorg-fonts-75dpi/xfonts.install index e52603946..14080a0a5 100644 --- a/libre/xorg-fonts-75dpi/xfonts.install +++ b/libre/xorg-fonts-75dpi/xfonts.install @@ -1,6 +1,6 @@ post_install() { echo -n "Updating font cache... " - fc-cache -f > /dev/null + fc-cache -s mkfontscale /usr/share/fonts/75dpi mkfontdir /usr/share/fonts/75dpi echo "done." diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index ba6915ab8..c9e95ae44 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu license=('GPL3') url="https://projects.parabola.nu/blacklist.git" #url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20150429 -_gitver=148d6b8701309816f80da9a5e9231dad728115eb +pkgver=20150519 +_gitver=e4a9618a4aa1da1421a7dca500081d695a93f114 pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ install=${pkgname}.install makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) #source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver}) -md5sums=('fc52ca4c19ac5df3c2983bdde6f9e22c') +md5sums=('f41ff6df9922def50127d8cee288f8b9') package() { cd "$srcdir" diff --git a/libre/your-freedom_emu/PKGBUILD b/libre/your-freedom_emu/PKGBUILD index 8b289cd94..379f0b2bc 100644 --- a/libre/your-freedom_emu/PKGBUILD +++ b/libre/your-freedom_emu/PKGBUILD @@ -3,19 +3,19 @@ pkgname=your-freedom_emu pkgdesc="This package removes hardware emulators that emulate technically free games and/or OS (but only there are nonfree games and/or OS)." license=('GPL3') -#url="https://projects.parabolagnulinux.org/blacklist.git" -url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20140827.1 -_gitver=e2410d7936cac105a8af764a2bf771fdcffed4c7 +url="https://projects.parabolagnulinux.org/blacklist.git" +#url="https://lukeshu.com/git/mirror/parabola/blacklist.git" +pkgver=20150519 +_gitver=e4a9618a4aa1da1421a7dca500081d695a93f114 pkgrel=1 arch=('any') install=${pkgname}.install makedepends=(librelib) -#source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) -source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) -md5sums=('cf6c392395891ada2fa08970fc5430ef') +source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) +#source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) +md5sums=('731850976f34a609ba86ddd4d99e7467') package() { cd "$srcdir" diff --git a/nonprism/darktable/PKGBUILD b/nonprism/darktable/PKGBUILD index c9f32a637..89e8b1166 100644 --- a/nonprism/darktable/PKGBUILD +++ b/nonprism/darktable/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 132445 2015-04-28 12:43:53Z spupykin $ +# $Id: PKGBUILD 133207 2015-05-10 20:06:41Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Arch): Christian Himpel <chressie at gmail dot com> # Contributor (Arch): Johannes Hanika <hanatos at gmail dot com> pkgname=darktable pkgver=1.6.6 -pkgrel=1.nonprism1 +pkgrel=2.nonprism1 pkgdesc="Utility to organize and develop raw images, without flickcurl support" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ @@ -24,6 +24,7 @@ md5sums=('4e880ffdf9e80dc09de3bdc2fc8f81c9') prepare() { cd "$srcdir/$pkgname-release-$pkgver/cmake" sed "s|@PROJECT_VERSION@|$pkgver|" version.cmake.cmake >version.cmake + sed -i 's|lua5.2|lua52|g' modules/FindLua52.cmake } build() { diff --git a/nonprism/duplicity/PKGBUILD b/nonprism/duplicity/PKGBUILD index cdd4bb53f..94e134016 100644 --- a/nonprism/duplicity/PKGBUILD +++ b/nonprism/duplicity/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 129248 2015-03-14 13:31:03Z foutrelis $ -# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de> +# $Id: PKGBUILD 133848 2015-05-19 21:51:01Z lfleischer $ +# Maintainer (Arch): Lukas Fleischer <lfleischer at archlinux dot org> # Contributor (Arch): Kaiting Chen <kaitocracy@gmail.com> # Contributor (Arch): Aaron Schaefer <aaron@elasticdog.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=duplicity -pkgver=0.7.02 +pkgver=0.7.03 pkgrel=1.nonprism1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-boto, python2-dropbox and python2-gdata recommendation' arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ optdepends=('lftp: FTPS backend' 'gvfs: GIO backend' 'rsync: rsync backend') source=("https://launchpad.net/$pkgname/0.7-series/${pkgver}/+download/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('a6a19b89e50dd52567b6c6c2cc37b9aa' +md5sums=('96b79a22144d4853615f4bc537caaac1' 'SKIP') validpgpkeys=('9D95920CED4A8D5F8B086A9F8B6F8FF4E654E600') diff --git a/nonprism/evolution-data-server/PKGBUILD b/nonprism/evolution-data-server/PKGBUILD index 56618ab39..e47c69cad 100644 --- a/nonprism/evolution-data-server/PKGBUILD +++ b/nonprism/evolution-data-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 236336 2015-04-13 07:31:12Z heftig $ +# $Id: PKGBUILD 239203 2015-05-12 19:58:49Z heftig $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.16.1 +pkgver=3.16.2 pkgrel=1.nonprism1 pkgdesc="Centralized access to appointments and contacts, without libgdata support" arch=(i686 x86_64) @@ -14,7 +14,7 @@ license=(GPL) replaces=("${pkgname}-coherence" "${pkgname}-nonprism") conflicts=("${pkgname}-coherence" "${pkgname}-nonprism") source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('04eedf170708c97ca807951f47e6d6f554bee94c35bc279201a54f64b744eb51') +sha256sums=('6e3da8a553b803571eb4ecf1e412da45bf4f2325e446fc23bffa2b2718d6b8b1') build() { cd "$pkgname-$pkgver" diff --git a/nonprism/gnome-online-accounts/PKGBUILD b/nonprism/gnome-online-accounts/PKGBUILD index c2c7723b7..5efbde08c 100644 --- a/nonprism/gnome-online-accounts/PKGBUILD +++ b/nonprism/gnome-online-accounts/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 236363 2015-04-13 12:50:21Z heftig $ +# $Id: PKGBUILD 239211 2015-05-12 20:10:05Z heftig $ # Maintainer (Arch): Ionut Biru <ibiru@archlinux.org> # Maintainer: Márcio Silva <coadde@parabola.nu> pkgname=gnome-online-accounts -pkgver=3.16.0 -pkgrel=2.nonprism1 +pkgver=3.16.2 +pkgrel=1.nonprism1 pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols" arch=(i686 x86_64 mips64el) url="http://www.gnome.org" @@ -15,7 +15,7 @@ depends=('webkit2gtk' 'json-glib' 'libnotify' 'rest' 'libsecret' 'telepathy-glib makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') install=$pkgname.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('2ca9c404c6a42aac34073087606a962f49f7986f0cc549cfe9100ac29c91ffd6') +sha256sums=('a50f2f0f54f85418c8274580a53fe6783a2b33d0c1fefb725b2dd2d00debd7e6') build() { cd $pkgname-$pkgver diff --git a/nonprism/grilo-plugins/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch b/nonprism/grilo-plugins/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch new file mode 100644 index 000000000..dc7abbb52 --- /dev/null +++ b/nonprism/grilo-plugins/0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch @@ -0,0 +1,80 @@ +From a05b159c330a7a65479bba35bc529d0934640627 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 19 May 2015 20:53:28 +0200 +Subject: [PATCH 2/2] local-metadata: Fixes to video_sanitise_string non-alnum + handling + +- Extract loop condition into a helper function +- Use g_utf8_get_char to properly convert to unichar +- Be more defensive about g_utf8_find_prev_char returning NULL + +https://bugzilla.gnome.org/show_bug.cgi?id=748604 +--- + src/local-metadata/grl-local-metadata.c | 39 +++++++++++++++++++++++---------- + 1 file changed, 28 insertions(+), 11 deletions(-) + +diff --git a/src/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c +index 45856be..c7f731e 100644 +--- a/src/local-metadata/grl-local-metadata.c ++++ b/src/local-metadata/grl-local-metadata.c +@@ -242,6 +242,28 @@ grl_local_metadata_source_set_property (GObject *object, + + /* ======================= Utilities ==================== */ + ++static gboolean ++is_nonalnum (const gchar *str) ++{ ++ gunichar uchar; ++ ++ if (str == NULL) { ++ return FALSE; ++ } ++ ++ uchar = g_utf8_get_char (str); ++ ++ if (g_unichar_isalnum (uchar)) { ++ return FALSE; ++ } ++ ++ if (uchar == '!' || uchar == '?' || uchar == '.') { ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ + static gchar * + video_sanitise_string (const gchar *str) + { +@@ -270,22 +292,17 @@ video_sanitise_string (const gchar *str) + } + + if (*line_end != '\0') { +- line_end = g_utf8_find_prev_char (line, line_end); +- ++ /* After removing substring with blacklisted word, ignore non alpha-numeric ++ * char in the end of the sanitised string */ ++ do { ++ line_end = g_utf8_find_prev_char (line, line_end); ++ } while (is_nonalnum (line_end)); + + /* If everything in the string is blacklisted, just ignore + * the blackisting logic. + */ +- if (line_end == NULL) ++ if (line_end == NULL) { + return g_strdup (str); +- +- /* After removing substring with blacklisted word, ignore non alpha-numeric +- * char in the end of the sanitised string */ +- while (g_unichar_isalnum (*line_end) == FALSE && +- *line_end != '!' && +- *line_end != '?' && +- *line_end != '.') { +- line_end = g_utf8_find_prev_char (line, line_end); + } + + return g_strndup (line, line_end - line); +-- +2.4.0 + diff --git a/nonprism/grilo-plugins/PKGBUILD b/nonprism/grilo-plugins/PKGBUILD index de4e5b3c4..020814d27 100644 --- a/nonprism/grilo-plugins/PKGBUILD +++ b/nonprism/grilo-plugins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 233400 2015-03-12 13:39:12Z jgc $ +# $Id: PKGBUILD 239561 2015-05-19 19:26:57Z heftig $ # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=grilo-plugins pkgver=0.2.14 -pkgrel=1.nonprism1 +pkgrel=4.nonprism1 pkgdesc="Plugins for Grilo, without libgdata support" url="http://www.gnome.org" arch=(i686 x86_64) @@ -12,13 +12,23 @@ license=(LGPL) replaces=(${pkgname}-nonprism) conflicts=(${pkgname}-nonprism) depends=(grilo lua libmediaart libtracker-sparql gom libdmapsharing) -makedepends=(intltool itstool gnome-common git yelp-tools) +makedepends=(intltool itstool yelp-tools) optdepends=('dleyna-server: DLNA plugin' 'tracker: Tracker plugin') options=('!emptydirs') groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz + local-metadata-crash.patch + 0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch) +sha256sums=('d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab' + '221f770b064309635b52095d21d325707d45de03772da5cc579252b7795ced1b' + 'f95343c6433d438c6d67dfe0cf81804a9a19db1744606279159c008fce289aa7') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../local-metadata-crash.patch + patch -Np1 -i ../0002-local-metadata-Fixes-to-video_sanitise_string-non-al.patch +} build() { cd $pkgname-$pkgver diff --git a/nonprism/grilo-plugins/local-metadata-crash.patch b/nonprism/grilo-plugins/local-metadata-crash.patch new file mode 100644 index 000000000..edc2b6dff --- /dev/null +++ b/nonprism/grilo-plugins/local-metadata-crash.patch @@ -0,0 +1,31 @@ +From 85fc7cbf831e914456623a2f7a9efbe81919bf4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com> +Date: Tue, 28 Apr 2015 19:46:54 -0400 +Subject: local-metadata: Ignore sanitization if the whole filename is + blacklisted + +If the whole filename ends up blacklisted, then just take it as-is. + +https://bugzilla.gnome.org/show_bug.cgi?id=748604 + +diff --git a/src/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c +index adc81f0..45856be 100644 +--- a/src/local-metadata/grl-local-metadata.c ++++ b/src/local-metadata/grl-local-metadata.c +@@ -272,6 +272,13 @@ video_sanitise_string (const gchar *str) + if (*line_end != '\0') { + line_end = g_utf8_find_prev_char (line, line_end); + ++ ++ /* If everything in the string is blacklisted, just ignore ++ * the blackisting logic. ++ */ ++ if (line_end == NULL) ++ return g_strdup (str); ++ + /* After removing substring with blacklisted word, ignore non alpha-numeric + * char in the end of the sanitised string */ + while (g_unichar_isalnum (*line_end) == FALSE && +-- +cgit v0.10.2 + diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD index 3ef75b2fa..9db1e0a0d 100644 --- a/nonprism/icedove/PKGBUILD +++ b/nonprism/icedove/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Sid _debname=icedove -_debver=31.6.0 +_debver=31.7.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=${_debname} epoch=1 pkgver=${_debver}.${_debrel} -pkgrel=2.nonprism1 +pkgrel=1.nonprism1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -28,16 +28,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" mozconfig ${pkgname}.desktop ${pkgname}-install-dir.patch - vendor.js - rhbz-966424.patch) + vendor.js) options=(!emptydirs) -sha256sums=('9011da6632434d6ee991cc69f4e040a194d998ce3a04e5c3a05f21fc361124dc' - 'ac73365adcccf126b97432cfd60828da667b2eb82512ae252cf577939d666fd9' +sha256sums=('00ce17575690400e22e7ce21dc5b3b4f71092b7708ee9aad74448d1401da8794' + '04c30b4e72819b764bc463d36c39f55741d3e47ae994ba89fd14e63fe32c6561' '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a' - 'a0be56fc87f255804e00e7c85abbc4731ebdaa8938858f1f8ac47dd2f17c0b8b' + '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a' '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d' - 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec' - '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a') + 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec') prepare() { export DEBIAN_BUILD="comm-esr31" @@ -59,6 +57,9 @@ prepare() { install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png" done + # We are doing it from sed commands + rm -v debian/patches/fixes/vp8_impl.cc-backporting-naming-for-constants.patch || true + quilt push -av # Fix paths on makefile @@ -105,9 +106,6 @@ prepare() { cp "${srcdir}/mozconfig" .mozconfig - # https://bugs.archlinux.org/task/41689 - patch -Np1 -d mozilla -i ../../rhbz-966424.patch - # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure diff --git a/nonprism/icedove/icedove.desktop b/nonprism/icedove/icedove.desktop index f39d5823c..1ba43e0b3 100644 --- a/nonprism/icedove/icedove.desktop +++ b/nonprism/icedove/icedove.desktop @@ -1,32 +1,5 @@ [Desktop Entry] Name=Icedove -Name[ast]=Veceru de corréu Icedove -Name[ca]=Client de correu Icedove -Name[cs]=Poštovní klient Icedove -Name[da]=Icedove - e-post/nyhedsgruppe -Name[de]=Icedove-E-Mail und -Nachrichten -Name[el]=Ηλεκτρονική αλληλογραφία Icedove -Name[es]=Cliente de correo Icedove -Name[fi]=Icedove-sähköposti -Name[fr]=Messagerie Icedove -Name[gl]=Cliente de correo Icedove -Name[he]=Icedove דוא״ל/חדשות -Name[hr]=Icedove e-pošta/novosti -Name[hu]=Icedove levelezőkliens -Name[it]=Email Icedove -Name[ja]=Icedove メールクライアント -Name[ko]=Icedove -Name[nl]=Icedove e-mail/nieuws -Name[pl]=Klient poczty Icedove -Name[pt_BR]=Cliente de E-mail Icedove -Name[ru]=Почтовый клиент Icedove -Name[sk]=Icedove - poštový klient -Name[sv]=E-postklienten Icedove -Name[ug]=Icedove ئېلخەت/خەۋەر -Name[uk]=Поштова програма Icedove -Name[vi]=Trình điện thư Icedove -Name[zh_CN]=Icedove 邮件/新闻 -Name[zh_TW]=Icedove 郵件 Comment=Send and receive mail with Icedove Comment[ast]=Lleer y escribir corréu electrónicu Comment[ca]=Llegiu i escriviu correu @@ -82,164 +55,119 @@ GenericName[uk]=Поштова програма GenericName[vi]=Phần mềm khách quản lý thư điện tử GenericName[zh_CN]=邮件新闻客户端 GenericName[zh_TW]=郵件用戶端 -Keywords=Email;E-mail;Newsgroup;Feed;RSS; -Keywords[ast]=Corréu;Corréu-e;Noticies;Discusiones;Mensaxes;Canales;RSS; -Keywords[ca]=Correu;Email;E-mail;Mailing;Llistes;Notícies;RSS; -Keywords[cs]=Email;E-mail;Pošta;Elektronická pošta;Diskusní skupiny;Čtečka;RSS; -Keywords[da]=Email;E-mail;Epost;E-post;E-brev;Newsgroup;Nyhedsgruppe;Nyhedskilde;Usenet;Feed;RSS; -Keywords[de]=Mail;E-Mail;Newsgroup;Nachrichten;Feed;RSS;Post;News;Usenet;online;lesen;schreiben; -Keywords[el]=Email;E-mail;Newsgroup;Feed;RSS;ημαιλ;Αλληλογραφία;Ροή;ΡΣΣ;Συζητήσεις;Γράμματα; -Keywords[es]=Email;Correo electrónico;Noticias;Discusiones;Mensajes;Canales;RSS; -Keywords[fi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;posti;sähköposti;maili;meili;Usenet;uutisryhmät;syöte; -Keywords[fr]=Mails;Mels;E-Mails;Emails;Courriels;Courriers;Newsgroup;Feed;RSS;Poster;Icedove;Lire;Écrire; -Keywords[he]=דוא"ל;דוא״ל;מייל;אי-מייל;אימייל;הודעות;מוזילה;תאנדרבירד;ת׳אנדרבירד;ת'אנדרבירד;ת׳אנדרברד;ת'אנדרברד;דואל; -Keywords[hr]=email;e-mail;e-pošta;pošta;RSS; -Keywords[hu]=Email;E-mail;Levél;Levelezés;Hírcsoport;Feed;Hírforrás;RSS; -Keywords[it]=Email;Mail;Posta;Newsgroup;Feed;RSS; -Keywords[is]=tölvupóstur;rafpóstur;fréttir;fréttahópar;samtöl;skilaboð;fréttastraumar;RSS; -Keywords[ja]=Eメール;イーメール;mail;e-mail;email;メール;電子メール;ニュースグループ;ネットニュース;RSS;フィードリーダー;書く;読む;Icedove; -Keywords[nl]=Email;E-mail;Newsgroup;Feed;RSS;Nieuwsgroep;Post; -Keywords[ru]=Email;E-mail;Newsgroup;Feed;RSS;почта;письма;новости;фиды; -Keywords[sk]=Email;E-mail;Elektronická pošta;Diskusné skupiny;Čítačka kanálov;RSS; -Keywords[uk]=Email;E-mail;Newsgroup;Feed;RSS;пошта;новини;подачі;стрічка; -Keywords[vi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;Thư điện tử;Gửi thư; -Keywords[zh_CN]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;电子;邮件;新闻;Icedove;tb;雷鸟;电邮;邮箱;阅读器; Exec=icedove %u Terminal=false -X-MultipleArgs=false Type=Application Icon=icedove Categories=Network;Email; MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall; StartupNotify=true -Actions=Compose;Contacts; +Actions=ComposeMessage;OpenAddressBook; -[Desktop Action Compose] -Name=Compose New Message -Name[af]=Skryf 'n nuwe boodskap -Name[ar]=حرر رسالة جديدة -Name[ast]=Redactar un mensaxe nuevu -Name[be]=Напісаць ліст -Name[bg]=Ново писмо -Name[bn]=নতুন বার্তা লিখুন -Name[br]=Sevel ur gemennadenn nevez -Name[bs]=Napiši novu poruku -Name[ca]=Redacta un missatge nou +[Desktop Action ComposeMessage] +Name=Write new message +Name[ar]=اكتب رسالة جديدة +Name[ast]=Redactar mensaxe nuevu +Name[be]=Напісаць новы ліст +Name[bg]=Съставяне на ново съобщение +Name[br]=Skrivañ ur gemennadenn nevez +Name[ca]=Escriu un missatge nou Name[cs]=Napsat novou zprávu -Name[cy]=Cyfansoddi Neges Newydd -Name[da]=Skriv en ny besked -Name[de]=Neue Nachricht erstellen +Name[da]=Skriv en ny meddelelse +Name[de]=Neue Nachricht verfassen Name[el]=Σύνταξη νέου μηνύματος -Name[eo]=Redakti novan mesaĝon -Name[es]=Redactar un mensaje nuevo -Name[et]=Koosta uus sõnum -Name[eu]=Mezu Berria Idatzi -Name[fi]=Luo uusi viesti -Name[fr]=Rédiger un nouveau courriel -Name[gd]=Co-chuir Teachdaireachd Ùr -Name[gl]=Redactar unha nova mensaxe -Name[he]=חיבור הודעה חדשה -Name[hi]=नया संदेश लिखें -Name[hr]=Nova poruka +Name[es_AR]=Escribir un nuevo mensaje +Name[es_ES]=Redactar nuevo mensaje +Name[et]=Kirjuta uus kiri +Name[eu]=Idatzi mezu berria +Name[fi]=Kirjoita uusi viesti +Name[fr]=Rédiger un nouveau message +Name[fy_NL]=Skriuw in nij berjocht +Name[ga_IE]=Scríobh teachtaireacht nua +Name[gd]=Sgrìobh teachdaireachd ùr +Name[gl]=Escribir unha nova mensaxe +Name[he]=כתיבת הודעה חדשה +Name[hr]=Piši novu poruku Name[hu]=Új üzenet írása -Name[hy]=Նամակ գրել -Name[id]=Buat Pesan Baru -Name[is]=Skrifa nýtt bréf -Name[it]=Componi nuovo messaggio -Name[ja]=新しいメッセージの作成 -Name[kk]=Жаңа хат жазу -Name[kn]=ಹೊಸ ಸಂದೇಶವನ್ನು ಸಂಯೋಜಿಸು -Name[ko]=새 메시지 쓰기 -Name[ku]=Peyameke nû biafirînê +Name[hy_AM]=Գրել նոր նամակ +Name[is]=SKrifa nýjan póst +Name[it]=Scrivi nuovo messaggio +Name[ja]=新しいメッセージを作成する +Name[ko]=새 메시지 작성 Name[lt]=Rašyti naują laišką -Name[lv]=Sacerēt jaunu vēstuli -Name[mk]=Состави нова порака -Name[ml]=പുതിയ സന്ദേശം രചിക്കുക -Name[mr]=नवीन संदेश लिहा. -Name[nb]=Skriv en ny melding -Name[nl]=Nieuw bericht opstellen -Name[nn]=Skriv ei ny melding -Name[pl]=Utwórz nową wiadomość -Name[pt]=Criar nova mensagem -Name[pt_BR]=Compor nova mensagem -Name[ro]=Compune un mesaj nou -Name[ru]=Написать письмо -Name[si]=නව පණිවිඩයක් අරඹන්න -Name[sk]=Napísať novú správu +Name[nb_NO]=Skriv ny melding +Name[nl]=Nieuw bericht aanmaken +Name[nn_NO]=Skriv ny melding +Name[pl]=Nowa wiadomość +Name[pt_BR]=Nova mensagem +Name[pt_PT]=Escrever nova mensagem +Name[rm]=Scriver in nov messadi +Name[ro]=Scrie un mesaj nou +Name[ru]=Создать новое сообщение +Name[si]=නව ලිපියක් ලියන්න +Name[sk]=Nová e-mailová správa Name[sl]=Sestavi novo sporočilo -Name[sq]=Krijo Mesazh të Ri -Name[sr]=Састави нову поруку -Name[sv]=Skriv nytt meddelande -Name[ta]=புதிய செய்தியை உருவாக்கு -Name[te]=కొత్త సందేశాన్ని రచించు -Name[th]=สร้างข้อความใหม่ -Name[tr]=Yeni İleti Oluştur -Name[uk]=Написати нове повідомлення -Name[zh_CN]=撰写新消息 -Name[zh_TW]=撰寫新郵件 +Name[sq]=Shkruani mesazh të ri +Name[sr]=Писање нове поруке +Name[sv_SE]=Skriv ett nytt meddelande +Name[ta_LK]=புதிய செய்தியை எழுதுக +Name[tr]=Yeni ileti yaz +Name[uk]=Написати нового листа +Name[vi]=Viết thư mới +Name[zh_CN]=编写新消息 +Name[zh_TW]=寫一封新訊息 Exec=icedove -compose -[Desktop Action Contacts] -Name=Contacts -Name[af]=Kontakte -Name[ar]=المتراسلين -Name[ast]=Contautos -Name[be]=Кантакты -Name[bg]=Контакти -Name[bn]=পরিচিতি সমূহ -Name[br]=Darempredoù -Name[bs]=Kontakti -Name[ca]=Contactes -Name[cs]=Kontakty -Name[cy]=Cysylltiadau -Name[da]=Kontakter -Name[de]=Kontakte -Name[el]=Επαφές -Name[eo]=Kontaktoj -Name[es]=Contactos -Name[et]=Kontaktid -Name[eu]=Kontaktuak -Name[fi]=Yhteystiedot -Name[fr]=Carnet d'adresses -Name[gd]=Buntanasan -Name[gl]=Contactos -Name[he]=אנשי קשר -Name[hi]=संपर्क -Name[hr]=Kontakti -Name[hu]=Névjegyek -Name[hy]=Կապորդներ -Name[id]=Kontak -Name[is]=Tengiliðir -Name[it]=Contatti -Name[ja]=連絡先 -Name[kk]=Байланыс жазулары -Name[kn]=ಸಂಪರ್ಕಗಳು -Name[ko]=연락처 -Name[ku]=Tekilî -Name[lt]=Kontaktai -Name[lv]=Kontakti -Name[mk]=Контакти -Name[ml]=വിലാസങ്ങള് -Name[mr]=संपर्क -Name[nb]=Kontakter -Name[nl]=Contacten -Name[nn]=Kontaktar -Name[pl]=Kontakty -Name[pt]=Contactos -Name[pt_BR]=Contatos -Name[ro]=Contacte -Name[ru]=Контакты -Name[si]=සබඳතා -Name[sk]=Kontakty -Name[sl]=Stiki -Name[sq]=Kontaktet -Name[sr]=Контакти -Name[sv]=Kontakter -Name[ta]=தொடர்புகள் -Name[te]=పరిచయాలు -Name[th]=รายชื่อติดต่อ -Name[tr]=Kişiler -Name[uk]=Контакти -Name[zh_CN]=联系人 -Name[zh_TW]=連絡人 +[Desktop Action OpenAddressBook] +Name=Open address book +Name[ar]=افتح دفتر العناوين +Name[ast]=Abrir llibreta de direiciones +Name[be]=Адкрыць адрасную кнігу +Name[bg]=Отваряне на адресник +Name[br]=Digeriñ ur c'harned chomlec'hioù +Name[ca]=Obre la llibreta d'adreces +Name[cs]=Otevřít Adresář +Name[da]=Åbn adressebog +Name[de]=Adressbuch öffnen +Name[el]=Άνοιγμα ευρετηρίου διευθύνσεων +Name[es_AR]=Abrir libreta de direcciones +Name[es_ES]=Abrir libreta de direcciones +Name[et]=Ava aadressiraamat +Name[eu]=Ireki helbide-liburua +Name[fi]=Avaa osoitekirja +Name[fr]=Ouvrir un carnet d'adresses +Name[fy_NL]=Iepenje adresboek +Name[ga_IE]=Oscail leabhar seoltaí +Name[gd]=Fosgail leabhar-sheòlaidhean +Name[gl]=Abrir a axenda de enderezos +Name[he]=פתיחת ספר כתובות +Name[hr]=Otvori adresar +Name[hu]=Címjegyzék megnyitása +Name[hy_AM]=Բացել Հասցեագիրքը +Name[is]=Opna nafnaskrá +Name[it]=Apri rubrica +Name[ja]=アドレス帳を開く +Name[ko]=주소록 열기 +Name[lt]=Atverti adresų knygą +Name[nb_NO]=Åpne adressebok +Name[nl]=Adresboek openen +Name[nn_NO]=Opne adressebok +Name[pl]=Książka adresowa +Name[pt_BR]=Catálogo de endereços +Name[pt_PT]=Abrir livro de endereços +Name[rm]=Avrir il cudeschet d'adressas +Name[ro]=Deschide agenda de contacte +Name[ru]=Открыть адресную книгу +Name[si]=ලිපින පොත විවෘත කරන්න +Name[sk]=Otvoriť adresár +Name[sl]=Odpri adressar +Name[sq]=Hapni libër adresash +Name[sr]=Отвори адресар +Name[sv_SE]=Öppna adressboken +Name[ta_LK]=முகவரி பத்தகத்தை திறக்க +Name[tr]=Adres defterini aç +Name[uk]=Відкрити адресну книгу +Name[vi]=Mở sổ địa chỉ +Name[zh_CN]=打开通讯录 +Name[zh_TW]=開啟通訊錄 Exec=icedove -addressbook diff --git a/nonprism/icedove/rhbz-966424.patch b/nonprism/icedove/rhbz-966424.patch deleted file mode 100644 index c4c332e9e..000000000 --- a/nonprism/icedove/rhbz-966424.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/toolkit/modules/CertUtils.jsm -+++ b/toolkit/modules/CertUtils.jsm -@@ -170,17 +170,19 @@ this.checkCert = - issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3); - var tokenNames = issuerCert.getAllTokenNames({}); - - if (!tokenNames || !tokenNames.some(isBuiltinToken)) - throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT); - } - - function isBuiltinToken(tokenName) { -- return tokenName == "Builtin Object Token"; -+ return tokenName == "Builtin Object Token" || -+ tokenName == "Default Trust" || -+ tokenName == "System Trust"; - } - - /** - * This class implements nsIBadCertListener. Its job is to prevent "bad cert" - * security dialogs from being shown to the user. It is better to simply fail - * if the certificate is bad. See bug 304286. - * - * @param aAllowNonBuiltInCerts (optional) diff --git a/nonprism/jitsi/PKGBUILD b/nonprism/jitsi/PKGBUILD index d3bc07db2..8533d7ed8 100644 --- a/nonprism/jitsi/PKGBUILD +++ b/nonprism/jitsi/PKGBUILD @@ -1,10 +1,10 @@ -# Maintainer (Arch): Xavier Devlamynck <magicrhesus@ouranos.be> -# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne +# Contributor (Arch): Xavier Devlamynck <magicrhesus@ouranos.be> +# Contributor (Arch): Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=jitsi -pkgver=2.4.4997 +pkgver=2.8.5426 pkgrel=1.nonprism1 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator), without support for unsafe and dangerous for privacy protocols" arch=('i686' 'x86_64' 'mips64el') @@ -12,19 +12,19 @@ url="http://jitsi.org" license=('LGPL') replaces=(${pkgname}-nonprism) conflicts=(${pkgname}-nonprism) -depends=('jre7-openjdk') -makedepends=('apache-ant' 'jdk7-openjdk') +depends=('java-runtime') +makedepends=('apache-ant' 'java-environment') options=(!strip !emptydirs zipman !libtool docs) source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" jitsi.desktop jitsi.sh drop-open-term-on-index-jn-html.patch nonprism.patch) -sha256sums=('f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825' +sha256sums=('e649867e186cf195c4b1bb159d7ffe0a38c4dc60659e5c55f9a74461a309f36c' '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5' 'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631' - 'b66440b35108713e2ada0d8d892c870f72363a238c6c9fa9dba24e02256d5017') + 'bb3a3473fb70b6392ec3c8b400f81c18e1895b9186817401d9fca69e251223aa') prepare() { cd $srcdir/$pkgname diff --git a/nonprism/jitsi/nonprism.patch b/nonprism/jitsi/nonprism.patch index 5effbbd7d..09b446ad2 100644 --- a/nonprism/jitsi/nonprism.patch +++ b/nonprism/jitsi/nonprism.patch @@ -1,6 +1,6 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml ---- jitsi.orig/build.xml 2013-12-08 18:17:08.000000000 -0200 -+++ jitsi/build.xml 2014-04-20 01:08:28.365493685 -0300 +--- jitsi.orig/build.xml 2015-02-10 15:12:09.000000000 -0200 ++++ jitsi/build.xml 2015-05-24 11:04:12.075127164 -0300 @@ -536,7 +536,7 @@ <!--internal-target- setup testing accounts properties --> <!-- The following local file should contain a list of protocol @@ -10,7 +10,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml You should create the file based on lib/account.properties.template and set all the empty fields as indicated. --> <available property="accounts.properties.present" -@@ -774,9 +774,6 @@ +@@ -780,9 +780,6 @@ failonerror="true" classpathref="project.class.path"> @@ -20,7 +20,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- Tell felix to run Jitsi --> <sysproperty key="felix.config.properties" value="file:${lib}/felix.client.run.properties"/> -@@ -871,9 +868,6 @@ +@@ -887,9 +884,6 @@ failonerror="true" classpathref="project.class.path"> @@ -30,7 +30,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- Tell felix to run Jitsi --> <sysproperty key="felix.config.properties" value="file:${lib}/felix.client.run.properties"/> -@@ -1032,18 +1026,15 @@ +@@ -1047,19 +1041,16 @@ bundle-netaddr,bundle-netaddr-slick,bundle-slickless, bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess, bundle-fileaccess-slick,bundle-neomedia,bundle-ldap, @@ -42,18 +42,18 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml + bundle-protocol,bundle-protocol-media, + bundle-mock,bundle-smacklib,bundle-jmdnslib, bundle-jabber,bundle-jabber-slick,bundle-swing-ui,bundle-ui-service, - bundle-jnalib, -- bundle-msn,bundle-msn-slick,bundle-yahoo,bundle-yahoo-slick, + bundle-jnalib,bundle-phonenumbers, + bundle-irc-api,bundle-irc,bundle-irc-commands,bundle-plugin-ircaccregwizz, +- bundle-yahoo,bundle-yahoo-slick, bundle-contactlist,meta-contactlist,meta-contactlist-slick, - bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz, -- bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz, -- bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz, + bundle-plugin-jabberaccregwizz, -+ bundle-plugin-sipaccregwizz, + bundle-plugin-sipaccregwizz, +- bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz, bundle-commons-codec,bundle-commons-lang,bundle-httputil,bundle-plugin-spellcheck, bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown, bundle-growlnotification,bundle-swingnotification,bundle-galagonotification, -@@ -1058,10 +1049,10 @@ +@@ -1074,10 +1065,10 @@ bundle-plugin-keybindingChooser,bundle-plugin-globalproxyconfig, bundle-jfontchooserlib,bundle-update,bundle-plugin-update, bundle-plugin-simpleaccreg,bundle-plugin-generalconfig, @@ -66,7 +66,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz, bundle-contactsource,bundle-plugin-reconnect,bundle-plugin-securityconfig, bundle-plugin-advancedconfig, -@@ -1339,31 +1330,6 @@ +@@ -1368,31 +1359,6 @@ </jar> </target> @@ -78,7 +78,6 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml - prefix="net/java/sip/communicator/service/googlecontacts"/> - <zipfileset dir="${dest}/net/java/sip/communicator/impl/googlecontacts" - prefix="net/java/sip/communicator/impl/googlecontacts" /> -- <zipfileset src="${lib.noinst}/google-collect-1.0-rc1.jar" prefix=""/> - <zipfileset src="${lib.noinst}/gdata-core-1.0.jar" prefix=""/> - <zipfileset src="${lib.noinst}/gdata-contacts-3.0.jar" prefix=""/> - <zipfileset src="${lib.noinst}/gdata-contacts-meta-3.0.jar" prefix=""/> @@ -86,6 +85,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml - <zipfileset src="${lib.noinst}/gdata-client-meta-1.0.jar" prefix=""/> - </jar> - </target> +- - <!--BUNDLE-GOOGLECONTACTS-SERVICE--> - <target name="bundle-googlecontacts-service"> - <jar compress="false" destfile="${bundles.dest}/googlecontacts-service.jar" @@ -95,11 +95,11 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml - </jar> - </target> - - <!--BUNDLE-SERVICEBINDER --> - <target name="bundle-servicebinder"> - <jar compress="true" destfile="lib/bundle/servicebinder.jar" -@@ -1466,12 +1432,7 @@ - prefix="net/java/sip/communicator/service/protocol"/> + <target name="bundle-guava"> + <copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/> + </target> +@@ -1506,12 +1472,7 @@ + </zipfileset> <zipfileset dir="${resources}/images" prefix="resources/images"> - <include name="protocol/icq/**/*"/> @@ -111,7 +111,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- the media package lives in the protocol-media bundle --> <exclude name="protocol/media/**/*"/> </zipfileset> -@@ -1519,36 +1480,6 @@ +@@ -1570,36 +1531,6 @@ </jar> </target> @@ -148,7 +148,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!--BUNDLE-MOCK-PROVIDER--> <target name="bundle-mock"> <!--internal-target- Creates a bundle containing the mock implementation of the protocol provider package --> -@@ -1582,30 +1513,6 @@ +@@ -1633,30 +1564,6 @@ </jar> </target> @@ -179,7 +179,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- BUNDLE-SSH --> <target name="bundle-ssh"> <!-- Creates a bundle containing the SSH impl of the protocol provider.--> -@@ -1627,30 +1534,6 @@ +@@ -1678,30 +1585,6 @@ </jar> </target> @@ -210,7 +210,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- BUNDLE-GIBBERISH --> <target name="bundle-gibberish"> <!-- Creates a bundle containing the Gibberish impl of the protocol provider.--> -@@ -1728,26 +1611,6 @@ +@@ -1779,26 +1662,6 @@ </jar> </target> @@ -237,7 +237,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- BUNDLE-PLUGIN-JABBERACCREGWIZZ --> <target name="bundle-plugin-jabberaccregwizz"> <!-- Creates a bundle for the plugin Jabber Account Registration Wizard.--> -@@ -1758,36 +1621,6 @@ +@@ -1809,36 +1672,6 @@ </jar> </target> @@ -274,7 +274,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml <!-- BUNDLE-PLUGIN-SIPACCREGWIZZ --> <target name="bundle-plugin-sipaccregwizz"> <!-- Creates a bundle for the plugin SIP Account Registration Wizard.--> -@@ -1839,17 +1672,6 @@ +@@ -1890,17 +1723,6 @@ </jar> </target> diff --git a/nonprism/kde-applications-meta/PKGBUILD b/nonprism/kde-applications-meta/PKGBUILD index 8376f8cca..5cdbc55ce 100644 --- a/nonprism/kde-applications-meta/PKGBUILD +++ b/nonprism/kde-applications-meta/PKGBUILD @@ -1,4 +1,6 @@ # $Id: PKGBUILD 233809 2015-03-14 17:55:07Z arojas $ +# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> +# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -6,11 +8,10 @@ pkgbase=kde-applications-meta pkgname=('kde-meta-kdepim') pkgver=15.04 -pkgrel=6.nonprism1 -arch=('any') +pkgrel=7.nonprism1 +arch=(any) url='http://www.parabola.nu/' -license=('GPL') -groups=('kde-applications-meta') +license=(GPL) package_kde-meta-kdepim() { pkgdesc=('Meta package for kdepim, without kdepim-blogilo') diff --git a/nonprism/kdenetwork-kopete/PKGBUILD b/nonprism/kdenetwork-kopete/PKGBUILD index ec29bffa9..fc41adc01 100644 --- a/nonprism/kdenetwork-kopete/PKGBUILD +++ b/nonprism/kdenetwork-kopete/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 236016 2015-04-10 06:56:26Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdenetwork-kopete -pkgver=15.04.0 +pkgver=15.04.1 pkgrel=1.parabola1.nonprism1 pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' @@ -18,7 +18,7 @@ optdepends=('mediastreamer: jingle support') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz" 'libre-nonprism.patch') -sha1sums=('c287f0fdfc179d97a634320dd54aebcba08561d9' +sha1sums=('18d3061ecfc7e287408d3842ed690e128520fd40' 'f0d7b727da1b5160f05952eec4df1bfbefab99cf') prepare() { diff --git a/nonprism/kdepim-runtime/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD index 803435a12..6d659255b 100644 --- a/nonprism/kdepim-runtime/PKGBUILD +++ b/nonprism/kdepim-runtime/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 237184 2015-04-15 17:57:23Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdepim-runtime -pkgver=4.14.7 -_kdeappver=15.04.0 +pkgver=4.14.8 +_kdeappver=15.04.1 pkgrel=1.nonprism1 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ install="${pkgname}.install" replaces=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') conflicts=('kdepim-runtime-coherence' 'kdepim-runtime-nonprism') source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('b5ceac3f2e3fc14b2f823afb22d12aa51798c833') +sha1sums=('ba7cd8ca941e199497c817b70ba72522bd0a7d60') prepare() { mkdir build diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD index 1ccf438ee..a87fdcea2 100644 --- a/nonprism/kdepim/PKGBUILD +++ b/nonprism/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 236242 2015-04-10 20:55:01Z arojas $ +# $Id: PKGBUILD 238946 2015-05-10 20:32:14Z arojas $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -12,8 +12,8 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-knotes' 'kdepim-korganizer' 'kdepim-libkdepim') -pkgver=4.14.7 -_kdeappver=15.04.0 +pkgver=4.14.8 +_kdeappver=15.04.1 pkgrel=1.nonprism1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -22,7 +22,7 @@ groups=('kde-applications' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'libbaloo4' 'grantlee-qt4') source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('b30fd7258f17f5eed7ea2f819f4cb0edac35ef24') +sha1sums=('93fd0155927737ea2944dced22f34d338d29ee02') build() { mkdir build diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD index 0a5b45d45..126596b38 100644 --- a/nonprism/your-privacy/PKGBUILD +++ b/nonprism/your-privacy/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package will remove support for unsafe/dangerous for privacy proto license=('GPL3') url="https://projects.parabola.nu/blacklist.git" #url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20150430 -_gitver=efcde9b85a5e674de88191410514ee7c8df4031d +pkgver=20150519 +_gitver=e4a9618a4aa1da1421a7dca500081d695a93f114 pkgrel=1 arch=('any') @@ -17,7 +17,7 @@ replaces=(your-coherence) makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) #source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) -md5sums=('995ffae4df3ba0bd52a7e58c4d4bf37b') +md5sums=('6fe0573c97b30ad1418a2cbae4916f2a') package() { cd "$srcdir" diff --git a/pcr/acr/PKGBUILD b/pcr/acr/PKGBUILD index a786ab622..d34a51371 100644 --- a/pcr/acr/PKGBUILD +++ b/pcr/acr/PKGBUILD @@ -1,7 +1,8 @@ # Maintainer (Arch): stalker_exe <stalkerexe8@gmail.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=acr pkgver=0.8.6 -pkgrel=1 +pkgrel=1.1 pkgdesc="ACR is an autoconf like tool that allows you to create configure scripts for your programs." arch=('any') url="http://nopcode.org/wk.php/Acr" diff --git a/pcr/apparmor/PKGBUILD b/pcr/apparmor/PKGBUILD index ad6cbcdf9..9d7c27515 100644 --- a/pcr/apparmor/PKGBUILD +++ b/pcr/apparmor/PKGBUILD @@ -1,13 +1,13 @@ -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> -# Contributor: Thomas Kuther <archlinux@kuther.net> -# Contributor: Gianni Vialetto <gianni at rootcube dot net> -# Contributor: Paul N. Maxwell <msg dot maxwel at gmail dot com> -# Contributor: Thomas Mudrunka <harvie@@email..cz> -# Contributor: Max Fierke <max@maxfierke.com> +# Contributor (Arch): Thomas Kuther <archlinux@kuther.net> +# Contributor (Arch): Gianni Vialetto <gianni at rootcube dot net> +# Contributor (Arch): Paul N. Maxwell <msg dot maxwel at gmail dot com> +# Contributor (Arch): Thomas Mudrunka <harvie@@email..cz> +# Contributor (Arch): Max Fierke <max@maxfierke.com> +# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> pkgbase=apparmor pkgname=($pkgbase apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) -pkgver=2.9.1 +pkgver=2.9.2 #_majorver=${pkgver%.*} # bleh, AUR... _majorver=2.9 pkgrel=1 @@ -22,6 +22,11 @@ source=("https://launchpad.net/$pkgname/${_majorver}/$pkgver/+download/$pkgname- "apparmor_unload.sh" "apparmor.service") +md5sums=('3af6ef84881016bf8d9100f3f8ab036b' + 'a657bc9e2670509e489615e63ba718c9' + 'f083aa1926430bc48eb332f1b77fca08' + 'cb226668bb3e0c9a62e672c11f8a012b') + #Configuration core_perl_dir='/usr/bin/core_perl' export MAKEFLAGS+=" POD2MAN=${core_perl_dir}/pod2man" @@ -83,7 +88,7 @@ build() { package_apparmor() { pkgdesc='Linux application security framework - mandatory access control for programs (metapackage)' depends=(apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) - optdepends=('linux-apparmor: an arch kernel with AppArmor patches') + #optdepends=('linux-apparmor: an arch kernel with AppArmor patches') install='apparmor.install' } @@ -109,7 +114,6 @@ package_apparmor-libapparmor() { package_apparmor-utils() { pkgdesc='AppArmor userspace utilities' - arch=('any') depends=('perl' 'perl-locale-gettext' 'perl-term-readkey' 'perl-file-tail' 'perl-rpc-xml' 'python' 'bash') install='apparmor-utils.install' @@ -124,7 +128,6 @@ package_apparmor-utils() { package_apparmor-profiles() { pkgdesc='AppArmor sample pre-made profiles' depends=(apparmor-parser) - arch=('any') # backup /etc/apparmor.d/* so using logprof is safe cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d" @@ -145,7 +148,6 @@ package_apparmor-pam() { } package_apparmor-vim() { pkgdesc='AppArmor VIM support' - arch=('any') depends=('vim') cd "${srcdir}/${pkgbase}-${pkgver}/utils/vim" diff --git a/pcr/apparmor/PKGBUILD.save b/pcr/apparmor/PKGBUILD.save deleted file mode 100644 index 24377b098..000000000 --- a/pcr/apparmor/PKGBUILD.save +++ /dev/null @@ -1,161 +0,0 @@ -# Maintainer : Aurelien Desbriers <aurelien@hackers.camp> -# Contributor: Thomas Kuther <archlinux@kuther.net> -# Contributor: Gianni Vialetto <gianni at rootcube dot net> -# Contributor: Paul N. Maxwell <msg dot maxwel at gmail dot com> -# Contributor: Thomas Mudrunka <harvie@@email..cz> -# Contributor: Max Fierke <max@maxfierke.com> - -pkgbase=apparmor -pkgname=($pkgbase apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) -pkgver=2.9.1 -#_majorver=${pkgver%.*} # bleh, AUR... -_majorver=2.9 -pkgrel=1 -pkgdesc='Linux application security framework - mandatory access control for programs' -arch=('i686' 'x86_64') -license=('GPL') -url='http://wiki.apparmor.net/index.php/Main_Page' -makedepends=('bzr' 'flex' 'swig' 'perl' 'python' 'perl-locale-gettext' 'perl-rpc-xml' 'audit') - -source=("https://launchpad.net/$pkgname/${_majorver}/$pkgver/+download/$pkgname-$pkgver.tar.gz" - "apparmor_load.sh" - "apparmor_unload.sh" - "apparmor.service") - -md5sums=('0e036d69d7ebfb9cc113ed301b8a6c5d' - 'a657bc9e2670509e489615e63ba718c9' - 'f083aa1926430bc48eb332f1b77fca08' - '872f48da4f60f669f89e6f79f8c67171') - -#Configuration -core_perl_dir='/usr/bin/core_perl' -export MAKEFLAGS+=" POD2MAN=${core_perl_dir}/pod2man" -export MAKEFLAGS+=" POD2HTML=${core_perl_dir}/pod2html" -export MAKEFLAGS+=" PROVE=${core_perl_dir}/prove" -export MAKEFLAGS+=" PYTHON=python3" - - -prepare() { - cd "${srcdir}/${pkgbase}-${pkgver}/parser" - # avoid depend on texlive-latex - sed -i -e 's/pdflatex/true/g' Makefile - - cd "${srcdir}/${pkgbase}-${pkgver}/utils" - # Set Arch paths - sed -e '/logfiles/ s/syslog /syslog.log /g' \ - -e '/logfiles/ s/messages/messages.log/g' \ - -e '/parser/ s# /sbin/# /usr/bin/#g' \ - -i logprof.conf - # do not build/install vim file with utils package (causes ref to $srcdir and wrong location) - sed -i '/vim/d' Makefile - - cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d" - # /usr merge vs. profiles - for i in `find . -name "*sbin*"`; do sed -i -e 's@sbin@bin@g' ${i} && mv ${i} ${i/sbin/bin}; done - for i in klogd ping syslog-ng syslogd; do - sed -e "s@/bin/${i}@/usr/bin/${i}@g" \ - -e "s@bin\.${i}@usr\.bin\.${i}@g" \ - -i bin.${i} && \ - mv bin.${i} usr.bin.${i} - done -} - -build() { - msg2 "Building: apparmor-libapparmor" - cd "${srcdir}/${pkgbase}-${pkgver}/libraries/libapparmor" - unset PERL_MM_OPT - NOCONFIGURE=1 ./autogen.sh - ./configure --prefix=/usr --sbindir=/usr/bin --with-perl --with-python - make - - cd "${srcdir}/${pkgbase}-${pkgver}" - msg2 "Building: apparmor-parser" - make -C parser - - msg2 "Building: apparmor-utils" - make -C utils - - msg2 "Building: apparmor-profiles" - make -C profiles - - msg2 "Building: apparmor-pam" - make -C changehat/pam_apparmor - - msg2 "Building: apparmor-vim" - make -C utils/vim -j1 -} - -package_apparmor() { - pkgdesc='Linux application security framework - mandatory access control for programs (metapackage)' - depends=(apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) - optdepends=('linux-apparmor: an arch kernel with AppArmor patches') - install='apparmor.install' -} - -package_apparmor-parser() { - pkgdesc='AppArmor parser - loads AA profiles to kernel module' - depends=('apparmor-libapparmor' 'bash') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C parser install DESTDIR=${pkgdir} - mv "${pkgdir}/lib" "${pkgdir}/usr/lib" - mv "${pkgdir}/sbin" "${pkgdir}/usr/bin" -} - -package_apparmor-libapparmor() { - pkgdesc='AppArmor library' - makedepends=('swig' 'perl' 'python') - depends=('python') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C libraries/libapparmor install DESTDIR=${pkgdir} - install -D -m644 "libraries/libapparmor/swig/perl/LibAppArmor.pm" "${pkgdir}/usr/lib/perl5/vendor_perl/" -} - -package_apparmor-utils() { - pkgdesc='AppArmor userspace utilities' - arch=('any') - depends=('perl' 'perl-locale-gettext' 'perl-term-readkey' - 'perl-file-tail' 'perl-rpc-xml' 'python' 'bash') - install='apparmor-utils.install' - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C utils install DESTDIR=${pkgdir} BINDIR=${pkgdir}/usr/bin - install -D -m755 "${srcdir}/apparmor_load.sh" "${pkgdir}/usr/bin/apparmor_load.sh" - install -D -m755 "${srcdir}/apparmor_unload.sh" "${pkgdir}/usr/bin/apparmor_unload.sh" - install -D -m644 "${srcdir}/apparmor.service" "${pkgdir}/usr/lib/systemd/system/apparmor.service" -} - -package_apparmor-profiles() { - pkgdesc='AppArmor sample pre-made profiles' - depends=(apparmor-parser) - arch=('any') - - # backup /etc/apparmor.d/* so using logprof is safe - cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d" - declare -a _profiles=(`find -type f|sed 's@./@etc/apparmor.d/@'`) - backup=(`echo ${_profiles[@]}`) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C profiles install DESTDIR=${pkgdir} -} - -package_apparmor-pam() { - pkgdesc='AppArmor PAM library' - depends=('apparmor-libapparmor' 'pam') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C changehat/pam_apparmor install DESTDIR=${pkgdir}/usr - install -D -m644 changehat/pam_apparmor/README "${pkgdir}/usr/share/doc/apparmor/README.pam_apparmor" -} -package_apparmor-vim() { - pkgdesc='AppArmor VIM support' - arch=('any') - depends=('vim') - - cd "${srcdir}/${pkgbase}-${pkgver}/utils/vim" - install -D -m644 apparmor.vim \ - "${pkgdir}/usr/share/vim/vimfiles/syntax/apparmor.vim" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/apparmor/apparmor.service b/pcr/apparmor/apparmor.service index 200d9be74..93f273a0d 100644 --- a/pcr/apparmor/apparmor.service +++ b/pcr/apparmor/apparmor.service @@ -1,6 +1,7 @@ [Unit] Description=AppArmor profiles DefaultDependencies=no +After=local-fs.target Before=sysinit.target [Service] diff --git a/pcr/aqsis/PKGBUILD b/pcr/aqsis/PKGBUILD deleted file mode 100644 index 5e6566864..000000000 --- a/pcr/aqsis/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Former contributor (Arch): Gino Pezzin <pezzin@gmail.com> -# Maintainer: Márcio Silva <coadde@parabola.nu> - -pkgname=aqsis -pkgver=1.8.2 -pkgrel=3 -pkgdesc='A high quality, photorealistic, 3D rendering solution' -arch=( - i686 - x86_64 - mips64el -) -url="http://www.$pkgname.org" -license=GPL2 -optdepends=( - 'qt4: graphical interface' - 'mesa-libgl: ptview' -) -depends=( - 'boost-libs=1.53.0' - desktop-file-utils - hicolor-icon-theme - openexr - shared-mime-info -) -makedepends=( - boost - cmake - libpng - mesa - qt4 -) -options=( - '!libtool' -) -install=$pkgname.install -source="http://downloads.sourceforge.net/project/$pkgname/$pkgname-source/$pkgver/$pkgname-$pkgver.tar.gz" -md5sums='399967e99f12cfbd1a7385c4e1d39c3b' - -build() { - cd $srcdir/$pkgname-$pkgver - - mkdir -p $srcdir/$pkgname-build - cd $srcdir/$pkgname-build - - setarch $CARCH cmake "$srcdir"/$pkgname-$pkgver\ - -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc/$pkgname - setarch $CARCH make -} - -package() { - cd $srcdir/$pkgname-build - setarch $CARCH make DESTDIR=$pkgdir install -} - -# vim:set ts=2 sw=2 et: - diff --git a/pcr/aqsis/aqsis.install b/pcr/aqsis/aqsis.install deleted file mode 100644 index b2086e07b..000000000 --- a/pcr/aqsis/aqsis.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor/ - update-mime-database usr/share/mime > /dev/null - update-desktop-database -q -} -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/azr3-jack/PKGBUILD b/pcr/azr3-jack/PKGBUILD index eaa430418..f4ca64641 100644 --- a/pcr/azr3-jack/PKGBUILD +++ b/pcr/azr3-jack/PKGBUILD @@ -1,9 +1,11 @@ +# Contributor (Arch): Philipp Überbacher <murks at lavabit dot com> # Maintainer: Guest One <theguestone at gmail dot com> + pkgname=azr3-jack pkgver=1.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A tonewheel organ with drawbars, distortion and rotating speakers" -arch=('i686') +arch=('i686' 'x86_64') url="http://ll-plugins.nongnu.org/azr3/" license=('GPL') depends=('jack' 'gtkmm' 'lash') diff --git a/pcr/beecrypt/PKGBUILD b/pcr/beecrypt/PKGBUILD new file mode 100644 index 000000000..b9b82eaa6 --- /dev/null +++ b/pcr/beecrypt/PKGBUILD @@ -0,0 +1,29 @@ +# Contributor (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=beecrypt +pkgver=4.2.1 +pkgrel=5.1 +pkgdesc="A strong and fast cryptography toolkit" +arch=('i686' 'x86_64') +url="http://beecrypt.sourceforge.net/" +license=('LGPL') +depends=('icu') +makedepends=('python2') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + + CXXFLAGS=-fpermissive + ./configure --prefix=/usr --sysconfdir=/etc --without-java --disable-openmp --with-python=python2 + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/biblatex/PKGBUILD b/pcr/biblatex/PKGBUILD new file mode 100644 index 000000000..28551751e --- /dev/null +++ b/pcr/biblatex/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: asm <asm@member.fsf.org> + +pkgname=biblatex +pkgver=3.0 +pkgrel=1 +pkgdesc="LaTeX package which provides full-featured bibliographic facilities" +arch=('any') +url="http://biblatex.sourceforge.net/" +license=('LPPL') +depends=( + 'logreq' + 'texlive-core' + 'biblatex-biber' + 'texlive-latexextra') +optdepends=('texlive-bin: provides bibitex and bibtex8, the legacy backends') +conflicts=('texlive-bibtexextra') +install=${pkgname}.install +source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver/$pkgname-$pkgver.tgz") +md5sums=('c484aaf451b28bbaf38d6629803db25c') +sha256sums=('f3cda38555a136404390ebad6fea46b53e5dd5d5a283b795e55c2bcd9ea344c0') +sha512sums=('acc032995581498fd8ddfb0dea003a8ef7925dfa5cbfdf290f75a90e1109461e749ae1916ff69521db1ed7bcb542cceb1dda8ec10ccd08a8dec17d89015e7053') + +package() { + texmflocal=/usr/share/texmf-dist/tex/ + + mkdir -p ${pkgdir}/${texmflocal} + mkdir -p ${pkgdir}/${texmflocal}/bibtex/bst/biblatex/ + mkdir -p ${pkgdir}/${texmflocal}/bibtex/csf/biblatex/ #optional for bibtex8 + + cp -r latex/* ${pkgdir}/${texmflocal} + cp -r bibtex/bst/* ${pkgdir}/${texmflocal}/bibtex/bst/biblatex/ + cp -r bibtex/csf/* ${pkgdir}/${texmflocal}/bibtex/csf/biblatex/ #optional for bibtex8 + + + # Install docs + mkdir -p ${pkgdir}/${texmflocal}/doc/latex/biblatex/ + + cp -r doc/* ${pkgdir}/${texmflocal}/doc/latex/biblatex/ +} + diff --git a/pcr/biblatex/biblatex.install b/pcr/biblatex/biblatex.install new file mode 100644 index 000000000..e4a2a69a1 --- /dev/null +++ b/pcr/biblatex/biblatex.install @@ -0,0 +1,18 @@ +post_install() { + echo ">>> texlive: updating the filename database..." + /usr/bin/mktexlsr + echo ">>> Remember that biblatex 3.0 should be used with" + echo ">>> * etoolbox >=2.1" + echo ">>> * logreq >=1.0" + echo ">>> * bibtex, bibtex8 or biber" + echo ">>> Biber is strongly recommended. BibTeX and bibTeX8 are legacies." +} + +post_upgrade() { + post_install +} + +post_remove() { + echo ">>> texlive: updating the filename database..." + /usr/bin/mktexlsr +} diff --git a/pcr/botan-1.10/PKGBUILD b/pcr/botan-1.10/PKGBUILD new file mode 100644 index 000000000..cb4af0cef --- /dev/null +++ b/pcr/botan-1.10/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer (Arch): drakkan <nicola.murino@gmail.com> +# Contributor (Arch): drakkan <nicola.murino@gmail.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=botan-1.10 +pkgver=1.10.9 +pkgrel=1 +pkgdesc='Crypto library written in C++' +license=('BSD') +arch=('x86_64' 'i686') +url='http://botan.randombit.net/' +depends=('gcc-libs' 'sh') +makedepends=('python2') +source=("http://botan.randombit.net/releases/Botan-${pkgver}.tgz") +sha256sums=('487d27d3a081ae403cf87c0fc78c2a64183f001b48f9feb87e8de1e16fba8df2') + +build() { + cd "Botan-$pkgver" + + python2 configure.py --prefix=/usr --enable-modules=cvc + make +} + +package() { + cd "Botan-$pkgver" + + make DESTDIR="$pkgdir/usr" install + find "$pkgdir/usr/share/doc" -type f -exec chmod 0644 {} \; + install -Dm644 doc/license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/cinepaint-lts/LICENSE b/pcr/cinepaint-lts/LICENSE deleted file mode 100644 index 746207229..000000000 --- a/pcr/cinepaint-lts/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2005, Kai-Uwe Behrmann -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution.ntributors may be used to endorse or promote - products derived from this software without specific prior written - permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD deleted file mode 100644 index 9d7d9a000..000000000 --- a/pcr/cinepaint-lts/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer (Arch): tobias [tobias.archlinux.org] -# Contributor (Arch): tobias [tobias.justdreams.de] -# Maintainer: Márcio Silva <coadde@parabola.nu> - -pkgname=cinepaint-lts -pkgver=1.0 -pkgrel=1 -pkgdesc='Sophisticated graphics manipulation programm supporting > 8bit pictures' -arch=(i686 x86_64 mips64el) -license=(LGPL GPL MIT) -url=http://www.${pkgname%-lts}.org -depends=(gtk2 openexr lcms libxpm fltk ftgl libxxf86vm) -makedepends=(python2 gutenprint) -optdepends=( - 'python2: for python plug-ins' - 'gutenprint: for print plug-ins' - 'ghostscript: for pdf plug-ins' -) -conflicts=(${pkgname%-lts}) -provides=(${pkgname%-lts}) -options=(!libtool) -install=${pkgname%-lts}.install -source=( - http://sourceforge.net/projects/${pkgname%-lts}/files/CinePaint/${pkgname%-lts}-$pkgver.tgz - LICENSE - ${pkgname%-lts}-libpng15.patch -) -md5sums=( - 7dfdb005d246578392ac9bd500534804 - 169085743f667c250ea2e4022efecf5f - 6d3f65b72e0f1569a9efe1bcab1b8124 -) - -build() { - cd $srcdir/${pkgname%-lts} - - rm config.{sub,guess} - ln -s /usr/share/automake-1.12/config.sub config.sub - ln -s /usr/share/automake-1.12/config.guess config.guess - - patch -p1 -i ../${pkgname%-lts}-libpng15.patch - find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + - sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in - sed -i -e '1 s/^/#include <unistd.h>\n/' plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp - - sh autogen.sh - LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ - --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 - sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \ - plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile - make -} - -package() { - cd $srcdir/${pkgname%-lts} - make DESTDIR=$pkgdir install - sed -i -e "s|-I$srcdir/${pkgname%-lts}||" -e "s|-I$srcdir/${pkgname%-lts}/lib||" -e "/lib${pkgname%-lts}.la/d" \ - -e "s|${srcdir}/${pkgname%-lts}/lib/.libs/\$dlname||" $pkgdir/usr/bin/${pkgname%-lts}tool - sed -i "s/${pkgname%-lts}.png/${pkgname%-lts}/" $pkgdir/usr/share/applications/${pkgname%-lts}.desktop - install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/pcr/cinepaint-lts/cinepaint-libpng15.patch b/pcr/cinepaint-lts/cinepaint-libpng15.patch deleted file mode 100644 index 619d9af42..000000000 --- a/pcr/cinepaint-lts/cinepaint-libpng15.patch +++ /dev/null @@ -1,446 +0,0 @@ -diff -Nur a/plug-ins/png/png.c b/plug-ins/png/png.c ---- a/plug-ins/png/png.c 2006-11-24 18:52:55.000000000 -0200 -+++ b/plug-ins/png/png.c 2012-10-12 01:07:56.452245955 -0200 -@@ -390,6 +390,16 @@ - gchar *progress; /* Title for progress display... */ - guchar alpha[256], /* Index -> Alpha */ - *alpha_ptr; /* Temporary pointer */ -+ png_byte color_type; -+ png_byte bit_depth; -+ png_colorp palette; -+ int num_palette; -+ png_charpp iccp_name; -+ int compression_type; -+ png_bytepp iccp_profile; -+ png_uint_32 iccp_proflen; -+ png_uint_32 width, height; -+ png_byte channels; - - /* - * PNG 0.89 and newer have a sane, forwards compatible constructor. -@@ -405,7 +415,7 @@ - info = (png_infop)calloc(sizeof(png_info), 1); - #endif /* PNG_LIBPNG_VER > 88 */ - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_message ("%s\nPNG error. File corrupted?", filename); - return image; -@@ -442,21 +452,26 @@ - */ - - png_read_info(pp, info); -+ color_type = png_get_color_type(pp, info); -+ width=png_get_image_width(pp, info); -+ height=png_get_image_height(pp, info); - - /* - * Latest attempt, this should be my best yet :) - */ - -+ bit_depth = png_get_bit_depth(pp, info); -+ - #ifndef WORDS_BIGENDIAN -- if(info->bit_depth == 16) -+ if(bit_depth == 16) - png_set_swap(pp); - #endif - -- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) { -+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_expand(pp); - } - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) { -+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) { - png_set_packing(pp); - } - -@@ -464,8 +479,8 @@ - * Expand G+tRNS to GA, RGB+tRNS to RGBA - */ - -- if (info->color_type != PNG_COLOR_TYPE_PALETTE && -- (info->valid & PNG_INFO_tRNS)) { -+ if (color_type != PNG_COLOR_TYPE_PALETTE && -+ (png_get_valid(pp, info, PNG_INFO_tRNS))) { - png_set_expand(pp); - } - -@@ -482,7 +497,7 @@ - - #if PNG_LIBPNG_VER > 99 - if (png_get_valid(pp, info, PNG_INFO_tRNS) && -- info->color_type == PNG_COLOR_TYPE_PALETTE) -+ color_type == PNG_COLOR_TYPE_PALETTE) - { - png_get_tRNS(pp, info, &alpha_ptr, &num, NULL); - /* Copy the existing alpha values from the tRNS chunk */ -@@ -505,9 +520,9 @@ - - png_read_update_info(pp, info); - -- if(info->bit_depth==16) -+ if(bit_depth==16) - { -- switch (info->color_type) -+ switch (color_type) - { - case PNG_COLOR_TYPE_RGB : /* RGB */ - bpp = 6; -@@ -545,7 +560,7 @@ - } - else - { -- switch (info->color_type) -+ switch (color_type) - { - case PNG_COLOR_TYPE_RGB : /* RGB */ - bpp = 3; -@@ -582,7 +597,7 @@ - }; - } - -- image = gimp_image_new(info->width, info->height, image_type); -+ image = gimp_image_new(width, height, image_type); - if (image == -1) - { - g_message("Can't allocate new image\n%s", filename); -@@ -595,7 +610,7 @@ - * Create the "background" layer to hold the image... - */ - -- layer = gimp_layer_new(image, _("Background"), info->width, info->height, -+ layer = gimp_layer_new(image, _("Background"), width, height, - layer_type, 100, NORMAL_MODE); - gimp_image_add_layer(image, layer, 0); - -@@ -627,20 +642,21 @@ - - empty= 0; /* by default assume no full transparent palette entries */ - -- if (info->color_type & PNG_COLOR_MASK_PALETTE) { -+ if (color_type & PNG_COLOR_MASK_PALETTE) { - - #if PNG_LIBPNG_VER > 99 -+ png_get_PLTE(pp, info, &palette, &num_palette); - if (png_get_valid(pp, info, PNG_INFO_tRNS)) { - for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty); - /* Calculates number of fully transparent "empty" entries */ - -- gimp_image_set_cmap(image, (guchar *) (info->palette + empty), -- info->num_palette - empty); -+ gimp_image_set_cmap(image, (guchar *) (palette + empty), -+ num_palette - empty); - } else { -- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); -+ gimp_image_set_cmap(image, (guchar *)palette, num_palette); - } - #else -- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette); -+ gimp_image_set_cmap(image, (guchar *)palette, num_palette); - #endif /* PNG_LIBPNG_VER > 99 */ - - } -@@ -659,18 +675,19 @@ - */ - - tile_height = gimp_tile_height (); -- pixel = g_new(guchar, tile_height * info->width * bpp); -+ pixel = g_new(guchar, tile_height * width * bpp); - pixels = g_new(guchar *, tile_height); -+ channels=png_get_channels(pp, info); - -- if(info->bit_depth==16) -+ if(bit_depth==16) - { - for (i = 0; i < tile_height; i ++) -- pixels[i] = pixel + info->width * info->channels * i * 2; -+ pixels[i] = pixel + width * channels * i * 2; - } - else - { - for (i = 0; i < tile_height; i ++) -- pixels[i] = pixel + info->width * info->channels * i; -+ pixels[i] = pixel + width * channels * i; - } - - for (pass = 0; pass < num_passes; pass ++) -@@ -680,11 +697,11 @@ - */ - - for (begin = 0, end = tile_height; -- begin < info->height; -+ begin < height; - begin += tile_height, end += tile_height) - { -- if (end > info->height) -- end = info->height; -+ if (end > height) -+ end = height; - - num = end - begin; - -@@ -697,20 +714,21 @@ - gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin, - drawable->width, num); - -- gimp_progress_update(((double)pass + (double)end / (double)info->height) / -+ gimp_progress_update(((double)pass + (double)end / (double)height) / - (double)num_passes); - }; - }; - - #if defined(PNG_iCCP_SUPPORTED) - /* set icc profile */ -- if (info->iccp_proflen > 0) { -- gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen, -- info->iccp_profile, -- ICC_IMAGE_PROFILE); -+ png_get_iCCP(pp, info, (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen); -+ if (iccp_proflen > 0) { -+ gimp_image_set_icc_profile_by_mem (image, iccp_proflen, -+ (gchar *)iccp_profile, -+ ICC_IMAGE_PROFILE); - printf ("%s:%d %s() set embedded profile \"%s\"\n", - __FILE__,__LINE__,__func__, -- info->iccp_name); -+ (char *)iccp_name); - } - #endif - -@@ -808,6 +826,14 @@ - blue; /* Used for palette background */ - time_t cutime; /* Time since epoch */ - struct tm *gmt; /* GMT broken down */ -+ png_byte color_type; -+ png_byte bit_depth; -+ int filter_method=0; -+ png_colorp palette; -+ int num_palette; -+ png_charpp iccp_name; -+ png_uint_32 height; -+ int compression_type; - - /* - * PNG 0.89 and newer have a sane, forwards compatible constructor. -@@ -824,7 +850,7 @@ - info = (png_infop)calloc(sizeof(png_info), 1); - #endif /* PNG_LIBPNG_VER > 88 */ - -- if (setjmp (pp->jmpbuf)) -+ if (setjmp (png_jmpbuf(pp))) - { - g_message ("%s\nPNG error. Couldn't save image", filename); - return 0; -@@ -858,87 +884,75 @@ - type = gimp_drawable_type (drawable_ID); - - /* -- * Set the image dimensions, bit depth, interlacing and compression -- */ -- -- png_set_compression_level (pp, pngvals.compression_level); -- -- info->width = drawable->width; -- info->height = drawable->height; -- info->interlace_type = pngvals.interlaced; -- -- /* - * Set color type and remember bytes per pixel count - */ - - switch (type) - { - case RGB_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 8; - bpp = 3; - break; - case RGBA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ bit_depth = 8; - bpp = 4; - break; - case GRAY_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = 8; - bpp = 1; - break; - case GRAYA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -- info->bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ bit_depth = 8; - bpp = 2; - break; - case INDEXED_IMAGE : - bpp = 1; -- info->bit_depth = 8; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); -- info->num_palette= num_colors; -+ bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ png_get_valid(pp, info, PNG_INFO_PLTE); -+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); - break; - case INDEXEDA_IMAGE : - bpp = 2; -- info->bit_depth = 8; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = 8; -+ color_type = PNG_COLOR_TYPE_PALETTE; - respin_cmap (pp, info, image_ID); /* fix up transparency */ - break; - case U16_RGB_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_RGB; -+ bit_depth = 16; - bpp = 6; - break; - case U16_RGBA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; -+ bit_depth = 16; - bpp = 8; - break; - case U16_GRAY_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_GRAY; -+ bit_depth = 16; - bpp = 2; - break; - case U16_GRAYA_IMAGE : -- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -- info->bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA; -+ bit_depth = 16; - bpp = 4; - break; - case U16_INDEXED_IMAGE : - bpp = 2; -- info->bit_depth = 16; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -- info->valid |= PNG_INFO_PLTE; -- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors); -- info->num_palette= num_colors; -+ bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ png_get_valid(pp, info, PNG_INFO_PLTE); -+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors); - break; - case U16_INDEXEDA_IMAGE : - bpp = 4; -- info->bit_depth = 16; -- info->color_type = PNG_COLOR_TYPE_PALETTE; -+ bit_depth = 16; -+ color_type = PNG_COLOR_TYPE_PALETTE; - respin_cmap (pp, info, image_ID); /* fix up transparency */ - break; - default: -@@ -950,16 +964,22 @@ - * Fix bit depths for (possibly) smaller colormap images - */ - -- if (info->valid & PNG_INFO_PLTE) { -- if (info->num_palette <= 2) -- info->bit_depth= 1; -- else if (info->num_palette <= 4) -- info->bit_depth= 2; -- else if (info->num_palette <= 16) -- info->bit_depth= 4; -+ if (png_get_valid(pp, info, PNG_INFO_PLTE)) { -+ png_get_PLTE(pp, info, &palette, &num_palette); -+ if (num_palette <= 2) -+ bit_depth= 1; -+ else if (num_palette <= 4) -+ bit_depth= 2; -+ else if (num_palette <= 16) -+ bit_depth= 4; - /* otherwise the default is fine */ - } - -+ png_set_compression_level (pp, pngvals.compression_level); -+ png_set_IHDR(pp, info, drawable->width, drawable->height, -+ bit_depth, color_type, pngvals.interlaced, compression_type, filter_method); -+ -+ - // write icc profile - #if defined(PNG_iCCP_SUPPORTED) - if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) { -@@ -970,10 +990,10 @@ - ICC_IMAGE_PROFILE); - png_set_iCCP (pp, info, - gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE), -- 0, buffer, size); -+ 0, (png_const_bytep)buffer, size); - printf ("%s:%d %s() embedd icc profile \"%s\"\n", - __FILE__,__LINE__,__func__, -- info->iccp_name); -+ (char *)iccp_name); - } - #endif - -@@ -1039,13 +1059,13 @@ - * Convert unpacked pixels to packed if necessary - */ - -- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) -+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) - png_set_packing(pp); - - /* Set swapping for 16 bit per sample images */ - - #ifndef WORDS_BIGENDIAN -- if (info->bit_depth == 16) -+ if (bit_depth == 16) - png_set_swap(pp); - #endif - -@@ -1063,6 +1083,7 @@ - - gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width, - drawable->height, FALSE, FALSE); -+ height=png_get_image_height(pp, info); - - for (pass = 0; pass < num_passes; pass ++) - { -@@ -1077,7 +1098,7 @@ - num = end - begin; - - gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num); -- if (info->valid & PNG_INFO_tRNS) { -+ if (png_get_valid(pp, info, PNG_INFO_tRNS)) { - for (i = 0; i < num; ++i) { - fixed= pixels[i]; - for (k = 0; k < drawable->width; ++k) { -@@ -1085,7 +1106,7 @@ - } - } - /* Forgot this case before, what if there are too many colors? */ -- } else if (info->valid & PNG_INFO_PLTE && bpp == 2) { -+ } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) { - for (i = 0; i < num; ++i) { - fixed= pixels[i]; - for (k = 0; k < drawable->width; ++k) { -@@ -1097,7 +1118,6 @@ - png_write_rows (pp, pixels, num); -- - gimp_progress_update (((double)pass + (double)end / -- (double)info->height) / (double)num_passes); -+ (double)height) / (double)num_passes); - }; - }; - diff --git a/pcr/cjdns-git/PKGBUILD b/pcr/cjdns-git/PKGBUILD index 260326501..319196d3d 100644 --- a/pcr/cjdns-git/PKGBUILD +++ b/pcr/cjdns-git/PKGBUILD @@ -1,77 +1,42 @@ -# Maintainer (Arch): Prurigro -# Contributor (Arch): Prurigro +# Contributor (Arch): Kevin MacMartin <prurigro@gmail.com> +# Contributor (Arch): openfbt # Contributor (Arch): Werecat # Contributor (Arch): Xyne +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> _pkgname=cjdns -pkgname=${_pkgname}-git -pkgver=0.3.1473 +pkgname=$_pkgname-git +pkgver=0.3.3328 pkgrel=1 -pkgdesc="A routing engine designed for security, scalability, speed and ease of use." -url="https://github.com/cjdelisle/${_pkgname}" +pkgdesc='A routing engine designed for security, scalability, speed and ease of use' +url='https://github.com/cjdelisle/cjdns' license=('GPL3') -makedepends=('git' 'cmake' 'python2') -optdepends=('python2: required by the python cjdnsadmin utilities') -arch=('i686' 'x86_64' 'armv6h' 'armv7h') -install=${pkgname}.install -backup=("etc/default/${_pkgname}") - -source=("git://github.com/cjdelisle/${_pkgname}.git#branch=master") -sha256sums=('SKIP') +arch=('i686' 'x86_64') +options=('!distcc' '!strip' '!buildflags') +depends=('glibc') +makedepends=('git' 'nodejs' 'python2') +optdepends=( + 'cjdnsify: allows you to run some programs bound to your cjdns address' + 'libnacl: speed up the build process by skipping the need to compile cnacl' + 'cjdns-git-sysvinit: support for sysvinit (rc.d)' +) +source=("git+$url#branch=crashey") +sha512sums=('SKIP') pkgver() { - cd "${srcdir}/${_pkgname}" - git describe --always | sed 's|-|.|g;s|[^\.]*\.||;s|\.[^\.]*$||' -} - -prepare() { - cd "${srcdir}/${_pkgname}" - - ## Clean previous builds and resync - ./clean - - mkdir build - - ## Set occurances of python to python2 due to a naming conflict between Debian and Archlinux - find "${srcdir}/${_pkgname}"/contrib/python \ - -type f \ - -exec sed -i 's@/usr/bin/python\s*$@/usr/bin/python2@;s@/usr/bin/env\ python@/usr/bin/env\ python2@' {} \+ + cd $_pkgname + git describe --always | sed 's|-|.|g;s|[^\.]*\.||;s|\.[^\.]*$||' } build() { - cd "${srcdir}"/${_pkgname} - - ## Disable Arch's generic makepkg optimizations (set via /etc/makepkg.conf) in favour of those specified by cjdns - unset MAKEFLAGS -# unset CFLAGS -# unset CPPFLAGS - - ## Build using the ./do script - export NO_DEBUG=1 - cd build - cmake .. - make -} - -## Package creation helper functions -_package_cjdns() { - install -D -m755 "${srcdir}"/${_pkgname}/build/admin/angel/cjdroute2 "${pkgdir}"/usr/bin/cjdroute - install -D -m755 "${srcdir}"/${_pkgname}/build/admin/angel/${_pkgname} "${pkgdir}"/usr/bin/${_pkgname} - install -D -m644 "${srcdir}"/${_pkgname}/contrib/systemd/${_pkgname}.service "${pkgdir}"/usr/lib/systemd/system/${_pkgname}.service - install -D -m755 "${srcdir}"/${_pkgname}/contrib/bash/i_am_stupid.sh "${pkgdir}"/usr/bin/cjdns-recoverconfig -} -_package_pyutils() { - install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/cjdnsadmin.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/cjdnsadmin.py - install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/bencode.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/bencode.py - install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/__init__.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/__init__.py - install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/cjdnslog "${pkgdir}"/usr/bin/cjdns-log - install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/dumptable "${pkgdir}"/usr/bin/cjdns-dumptable - install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/findnodes "${pkgdir}"/usr/bin/cjdns-findnodes - install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/pingAll.py "${pkgdir}"/usr/bin/cjdns-pingAll + cd $_pkgname + bash 'do' } -## Package creation function: comment out a helper function to remove its associated functionality package() { - _package_cjdns ## Core binaries (cjdns and cjdroute), a systemd service file and a config recovery script written in bash - _package_pyutils ## Miscellaneous python2-based cjdns admin port utility scripts and libraries + cd $_pkgname + install -Dm755 'cjdroute' "$pkgdir/usr/bin/cjdroute" + install -Dm755 'contrib/sh/run-cjdroute.sh' "$pkgdir/usr/bin/run-cjdroute" + install -Dm644 "contrib/systemd/$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service" + install -Dm644 'doc/man/cjdroute.conf.5' "$pkgdir/usr/share/man/man5/cjdroute.conf.5" } diff --git a/pcr/cjdns-git/cjdns-git.install b/pcr/cjdns-git/cjdns-git.install deleted file mode 100644 index 5e9e1a64c..000000000 --- a/pcr/cjdns-git/cjdns-git.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - if [ $(ps -A | ps -A | grep -cE "systemd$") = 1 ]; then - systemctl --system daemon-reload - fi - - if [ -z $(type -P python2) ]; then - echo "You don't currently have python2 installed. It isn't required to use cjdns, but some scripts have been included in the package that won't function without" - fi - - echo "By default, the cjdns configuration file is expected to be located @ /etc/cjdroute.conf" -} - -post_upgrade() { - if [ $(ps -A | ps -A | grep -cE "systemd$") = 1 ]; then - systemctl --system daemon-reload - fi - - if [ $(grep -c cjdns /etc/passwd) = 1 ]; then - echo "The user 'cjdns' has been detected on your system but is no longer required by this package; if it was installed by a previous version of this package, it can now be safely deleted." - fi -} diff --git a/pcr/conkeror-git/PKGBUILD b/pcr/conkeror-git/PKGBUILD new file mode 100644 index 000000000..4219fc569 --- /dev/null +++ b/pcr/conkeror-git/PKGBUILD @@ -0,0 +1,35 @@ +# Contributor (Arch): Ivy Foster <joyfulgirl@archlinux.us> +# Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de> +# Contributor (Arch): Heeru Kiyura <M8R-p9i5nh@mailinator.com> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=conkeror-git +pkgver=120527.1.225.gc57b7be +pkgrel=1 +pkgdesc="A highly programmable web browser based on Mozilla XULRunner." +arch=('i686' 'x86_64') +url="http://conkeror.mozdev.org/" +license=('MPL' 'GPL' 'LGPL') +depends=('xulrunner' 'desktop-file-utils') +makedepends=('git') +provides=(conkeror) +install=conkeror-git.install +source=('git://repo.or.cz/conkeror.git') +md5sums=('SKIP') +_gitname="conkeror" + +pkgver() { + cd $_gitname + git describe --always|sed -e 's/debian.*+git//' -e 's/-/./g' +} + +build() { + cd $_gitname + make PREFIX=/usr +} + +package() { + cd $_gitname + make DESTDIR="$pkgdir" PREFIX=/usr install + rm -f "$pkgdir"/usr/share/doc/conkeror/COPYING +} diff --git a/pcr/cinepaint-lts/cinepaint.install b/pcr/conkeror-git/conkeror-git.install index 5e5cfef4d..5e5cfef4d 100644 --- a/pcr/cinepaint-lts/cinepaint.install +++ b/pcr/conkeror-git/conkeror-git.install diff --git a/pcr/conkeror/PKGBUILD b/pcr/conkeror/PKGBUILD deleted file mode 100644 index d7f1068e4..000000000 --- a/pcr/conkeror/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (AUR): Ivy Foster <joyfulgirl@archlinux.us> -# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de> -# Contributor (AUR): Heeru Kiyura <M8R-p9i5nh@mailinator.com> - -pkgname=conkeror -pkgver=1.0pre.git140428.1.git25 -_gitver='commit=c5e640d874c65762c082430b42207bcafb58fda6' -pkgrel=1 -pkgdesc="A highly programmable web browser based on Mozilla XULRunner." -arch=('i686' 'x86_64' 'mips64el') -url="http://conkeror.org/" -license=('MPL1.1' 'GPL2' 'LGPL2.1') -depends=('xulrunner' 'desktop-file-utils') -install=conkeror.install - -source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz" - 'conkeror.sh') -md5sums=('a59ddc563eb8de7e8be6465aa023102d' - '11c6c76a2639254754b34a542f1965a1') - -mkdepends=('git') -mksource=("$pkgname-$pkgver::git://repo.or.cz/conkeror.git#${_gitver}") -mkmd5sums=('SKIP') - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -d "$pkgdir"/usr/{bin,share/{man/man1,applications}} - - cp -a . "$pkgdir"/usr/share/$pkgname - - ln -srT "$pkgdir"/usr/share/$pkgname/contrib/man/conkeror.1 \ - "$pkgdir"/usr/share/man/man1/$pkgname.1 - ln -srT "$pkgdir"/usr/share/$pkgname/debian/conkeror.desktop \ - "$pkgdir"/usr/share/applications/$pkgname.desktop - ln -srT "$pkgdir"/usr/share/$pkgname/conkeror-spawn-helper \ - "$pkgdir"/usr/bin/conkeror-spawn-helper - - install -Dm755 "$srcdir"/conkeror.sh "$pkgdir"/usr/bin/$pkgname -} diff --git a/pcr/conkeror/conkeror.install b/pcr/conkeror/conkeror.install deleted file mode 100644 index 5e5cfef4d..000000000 --- a/pcr/conkeror/conkeror.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q -} diff --git a/pcr/conkeror/conkeror.sh b/pcr/conkeror/conkeror.sh deleted file mode 100644 index 963720513..000000000 --- a/pcr/conkeror/conkeror.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec xulrunner /usr/share/conkeror/application.ini "$@" diff --git a/pcr/cpuminer/PKGBUILD b/pcr/cpuminer/PKGBUILD index 507df9ab2..3863c53ae 100644 --- a/pcr/cpuminer/PKGBUILD +++ b/pcr/cpuminer/PKGBUILD @@ -1,14 +1,14 @@ -## Maintainer (Arch): gee +# Contributor (Arch): gee +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> -name=cpuminer -pkgname=$name -pkgver=2.3.2 -pkgrel=5 +pkgname=cpuminer +pkgver=2.4 +pkgrel=6 pkgdesc="pooler's Litecoin cpuminer." -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="https://github.com/pooler/cpuminer" depends=('curl' 'jansson') -license=('GPL2') +license=('GPLv2') source=("${pkgname}-${pkgver}.zip::https://github.com/pooler/cpuminer/zipball/v${pkgver}" "libcurl.m4") @@ -17,7 +17,7 @@ build() { cd ${cpuminer_srcdir} autoreconf -fi -I .. ./configure - make ${MAKEFLAGS} CXXFLAGS="-O3 -march=native" + make CXXFLAGS="-O3 -march=native" } @@ -28,5 +28,5 @@ package() { # get compiled binaries install -D -m755 ${cpuminer_srcdir}/minerd $pkgdir/usr/bin/ } -md5sums=('ca3200d6574fb6463640e8891555cd12' +md5sums=('58af2d5589ba003a417f71844d534731' '5e22a13d29fa628c83c267cf9b4f3218') diff --git a/pcr/culmus/PKGBUILD b/pcr/culmus/PKGBUILD index 8f086231a..1ba81da5a 100644 --- a/pcr/culmus/PKGBUILD +++ b/pcr/culmus/PKGBUILD @@ -5,7 +5,7 @@ pkgname=culmus pkgver=0.130 -pkgrel=1 +pkgrel=1.1 pkgdesc="A collection of Type1 and TrueType Hebrew fonts" arch=('any') url="http://culmus.sourceforge.net" diff --git a/pcr/czmq/PKGBUILD b/pcr/czmq/PKGBUILD index dd16901f0..ab760137e 100644 --- a/pcr/czmq/PKGBUILD +++ b/pcr/czmq/PKGBUILD @@ -1,27 +1,32 @@ -# Contributor (Arch): Brian Knox <taotetek at gmail.com> -# Maintainer (Arch): Brian Knox <taotetek at gmail.com> +# Contributor (Arch): Aleksey Filippov <sarum9in@gmail.com> +# Contributor (Arch): Friedrich Weber <fred@reichbier.de> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=czmq -pkgver=2.0.2 +pkgver=3.0.0 pkgrel=1 -pkgdesc="High level C API for ZeroMQ" -arch=(i686 x86_64) -url="http://czmq.zeromq.org/" -license=('LGPL') -depends=('zeromq') -makedepends=('asciidoc' 'xmlto') -options=(!libtool) -source=(http://download.zeromq.org/${pkgname}-${pkgver}.tar.gz) - -sha1sums=('9a78ea2bf2100863eefdd0512c77486ebd1e2587') -sha256sums=('75115c2a89facf7f706bc24d0cd09ad0cc4f173a6b6b242743a7ed4ffa7a791b') +pkgdesc="High-level C binding for 0MQ" +arch=('i686' 'x86_64') +url="http://czmq.zeromq.org" +license=('MPL2') +depends=('zeromq>=4.0') +sha1sums=('8ceec4058e8176c34c638f5fc33e0bda2c1dad46') +makedepends=() +source=(https://github.com/zeromq/czmq/archive/v${pkgver}.tar.gz) build() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + ./autogen.sh ./configure --prefix=/usr - make + make $MAKEFLAGS +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check } package() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install + mv "$pkgdir/usr/bin/makecert" "$pkgdir/usr/bin/makecert.czmq" } diff --git a/pcr/drumgizmo/PKGBUILD b/pcr/drumgizmo/PKGBUILD index c4a79fb92..749dac225 100644 --- a/pcr/drumgizmo/PKGBUILD +++ b/pcr/drumgizmo/PKGBUILD @@ -1,26 +1,27 @@ -# Maintainer: Guest One <theguestone at gmail dot com> +# Contributor (Arch): speps <speps at aur dot archlinux dot org> +# Maintainer : Guest One <theguestone at gmail dot com> pkgname=drumgizmo -pkgver=0.9.3 +pkgver=0.9.7 pkgrel=1 pkgdesc="A drum LV2 plugin and stand-alone application" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.drumgizmo.org/" -license=('GPL') +license=('GPL3') groups=('lv2-plugins') -depends=('lv2' 'libsmf' 'libao' 'jack' 'qt4') -options=('!libtool') +depends=('lv2' 'jack' 'libsmf' 'libx11' 'zita-resampler') source=("${url}releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz") -md5sums=('a0aeef33f74792afd528bec21b8d0f6b') +md5sums=('70b8edc7ea8c35343c8f8a6c90592b12') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr \ - --enable-static=no + --enable-static=no \ + --enable-lv2 make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir/" install } diff --git a/pcr/econnman/PKGBUILD b/pcr/econnman/PKGBUILD index 22c6cb883..c79a6aa57 100644 --- a/pcr/econnman/PKGBUILD +++ b/pcr/econnman/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer (Arch): Doug Newgard <scimmia22 at outlook dot com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=econnman pkgver=1.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="Enlightenment ConnMan user interface" arch=('any') url="http://www.enlightenment.org" diff --git a/pcr/eid-mw/PKGBUILD b/pcr/eid-mw/PKGBUILD index 7fe710de3..392490fff 100644 --- a/pcr/eid-mw/PKGBUILD +++ b/pcr/eid-mw/PKGBUILD @@ -2,30 +2,29 @@ # Contributor (Arch): Xavier D. <magicrhesus@ouranos.be> # Contributor (Arch): Valere Monseur <valere.monseur@ymail.com> pkgname=eid-mw -pkgver=4.0.6_1620 +pkgver=4.1.2 _pkgver=tcm227_258906 -pkgrel=3 +pkgrel=1 pkgdesc="The eID middleware for the Belgian eID" url="http://eid.belgium.be/" arch=('i686' 'x86_64') license=('LGPL3') depends=('pcsclite' 'gtk2') -optdepends=('firefox: extension for Belgian eid' - 'acsccid: ACS CCID smart card readers' +optdepends=('acsccid: ACS CCID smart card readers' 'ccid: A generic USB Chip/Smart Card Interface Devices driver' 'pcsc-tools: PC/SC smartcard tools') -source=("http://eid.belgium.be/nl/binaries/${pkgname}-${pkgver//_/-}.tar_${_pkgver//_/-}.gz") -sha256sums=('1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2') +source=("http://eid.belgium.be/nl/binaries/${pkgname}-${pkgver}-v${pkgver}.tar_${_pkgver//_/-}.gz") +sha256sums=('7907cfe9f21e5b4f008badbd09d282ec201742aa5f1a67f6c1ec7e838bf7ab89') options=('!libtool') build() { - cd "${srcdir}/${pkgname}-${pkgver%_*}" + cd "${srcdir}/${pkgname}-${pkgver}-v${pkgver}" ./configure --prefix=/usr --libexecdir=/usr/bin make } package() { - cd "${srcdir}/${pkgname}-${pkgver%_*}" + cd "${srcdir}/${pkgname}-${pkgver}-v${pkgver}" make install DESTDIR="${pkgdir}" } diff --git a/pcr/emacs-mailcrypt/PKGBUILD b/pcr/emacs-mailcrypt/PKGBUILD deleted file mode 100644 index 8dad422c0..000000000 --- a/pcr/emacs-mailcrypt/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de> - -_pkgname=mailcrypt -pkgname=emacs-$_pkgname -pkgver=3.5.9 -pkgdesc="Emacs interface to PGP and GnuPG" -url="http://mailcrypt.sourceforge.net/" -license=('GPL') - -pkgrel=2.1 -arch=(any) -depends=(emacs) -install=$_pkgname.install -source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz - destdir.patch) - -build() { - cd "$srcdir/$_pkgname-$pkgver" - patch -Np1 -i "$srcdir/destdir.patch" - autoreconf - ./configure --prefix=/usr --infodir=/usr/share/info - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -md5sums=('18c0dea5dde0fc73168f4815df0d9db0' - '805f2c6bf624c946df2eefaf0edabcb3') diff --git a/pcr/emacs-mailcrypt/destdir.patch b/pcr/emacs-mailcrypt/destdir.patch deleted file mode 100644 index a0159cd02..000000000 --- a/pcr/emacs-mailcrypt/destdir.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ruN mailcrypt-3.5.9.orig/Makefile.in mailcrypt-3.5.9/Makefile.in ---- mailcrypt-3.5.9.orig/Makefile.in 2010-03-11 08:38:05.000000000 -0500 -+++ mailcrypt-3.5.9/Makefile.in 2012-12-13 18:38:59.000000000 -0500 -@@ -77,16 +77,16 @@ - - install: all installdirs install-info - for f in $(SOURCES); do \ -- $(INSTALL_DATA) $(srcdir)/$$f $(lispdir); \ -+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(lispdir); \ - done; - for f in $(OBJECTS); do \ -- $(INSTALL_DATA) $$f $(lispdir); \ -+ $(INSTALL_DATA) $$f $(DESTDIR)$(lispdir); \ - done; - - # Make sure all installation directories actually exist - # by making them if necessary. - installdirs: mkinstalldirs -- $(srcdir)/mkinstalldirs $(lispdir) $(infodir) -+ $(srcdir)/mkinstalldirs $(DESTDIR)$(lispdir) $(DESTDIR)$(infodir) - - # If your install-info doesn't know how to look inside the .info file for the - # menu entry to add, try adding -@@ -95,14 +95,12 @@ - - install-info: info - cd $(srcdir) && for file in $(INFOFILES); do\ -- $(INSTALL_DATA) $$file $(infodir)/$$file; \ -+ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \ - done -- -$(INSTALL_INFO) --info-dir=$(infodir) mailcrypt.info - - uninstall: -- -cd $(lispdir) && rm -f $(SOURCES) $(OBJECTS) -- -cd $(infodir) && rm -f $(INFOFILES) -- $(INSTALL_INFO) --remove --info-dir=$(infodir) mailcrypt.info -+ -cd $(DESTDIR)$(lispdir) && rm -f $(SOURCES) $(OBJECTS) -+ -cd $(DESTDIR)$(infodir) && rm -f $(INFOFILES) - - info: $(INFOFILES) - diff --git a/pcr/emacs-mailcrypt/mailcrypt.install b/pcr/emacs-mailcrypt/mailcrypt.install deleted file mode 100644 index 3257b7338..000000000 --- a/pcr/emacs-mailcrypt/mailcrypt.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=usr/share/info -filelist=(mailcrypt.info) - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -post_upgrade() { - post_install "$1" -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/evolution-mapi/PKGBUILD b/pcr/evolution-mapi/PKGBUILD index e79d3ec07..639332a33 100644 --- a/pcr/evolution-mapi/PKGBUILD +++ b/pcr/evolution-mapi/PKGBUILD @@ -1,35 +1,31 @@ -# Maintainer (Arch): Heenry78 <henry78@gmx.at> +# Contributor (Arch): Heenry78 <henry78@gmx.at> # Contributor (Arch): ngoonee <ngoonee.talk@gmail.com> # Contributor (Arch): Marco A Rojas <marquicus@gmail.com> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=evolution-mapi -pkgver=3.6.2 -_gnomever=3.6 +pkgver=3.16.1 pkgrel=1 pkgdesc="MAPI plugin for evolution." -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.gnome.org" license=('GPL3') -depends=('evolution>=3.6.2' 'openchange>=1.0-5') -makedepends=('intltool') -options=(!makeflags) -source=(http://ftp.gnome.org/pub/gnome/sources/evolution-mapi/$_gnomever/${pkgname}-${pkgver}.tar.xz) -_prefix="/opt/samba4" -md5sums=('4b9eb953e499fca4e1bd7dbd9bf5c0c9') +depends=("evolution>=${pkgver}" "openchange") +makedepends=("intltool") +source=(http://ftp.gnome.org/pub/gnome/sources/evolution-mapi/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz + auto_reconnection.patch) +sha256sums=('bf0913f9456235971f00e961c13bc97a66aeebdf9e74c061896a8603eec6dd64' + '9e9f6259452107195f38729b5a1c2803d95361aa3848fa9a980b2a25ca156983') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - export PKG_CONFIG_PATH=${_prefix}/samba/lib/pkgconfig:${_prefix}/lib/pkgconfig + patch -p1 < "${srcdir}/auto_reconnection.patch" - export CFLAGS="-DHAVE_MEMCTX_ON_CAST_SPROPVALUE -DHAVE_MEMCTX_ON_CAST_MAPI_SPROPVALUE ${CFLAGS}" - ./configure --prefix=${_prefix} - unset CFLAGS - - make || return 1 + ./configure --prefix=/usr + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR="$pkgdir/" install + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR="$pkgdir/" install } diff --git a/pcr/evolution-mapi/auto_reconnection.patch b/pcr/evolution-mapi/auto_reconnection.patch new file mode 100644 index 000000000..d16d7e561 --- /dev/null +++ b/pcr/evolution-mapi/auto_reconnection.patch @@ -0,0 +1,269 @@ +--- a/src/camel/camel-mapi-transport.c ++++ a/src/camel/camel-mapi-transport.c +@@ -39,20 +39,27 @@ + #include <ctype.h> + #include <errno.h> + ++#include <libemail-engine/libemail-engine.h> ++ ++#include "camel-mapi-sasl-krb.h" + #include "camel-mapi-settings.h" + #include "camel-mapi-store.h" +-#include "camel-mapi-folder.h" +-#include "camel-mapi-store-summary.h" +-#define d(x) + +-#include <e-mapi-defs.h> ++#include "e-mapi-defs.h" + #include "e-mapi-mail-utils.h" + #include "e-mapi-utils.h" + ++#define d(x) ++ + #define STREAM_SIZE 4000 + + G_DEFINE_TYPE (CamelMapiTransport, camel_mapi_transport, CAMEL_TYPE_TRANSPORT) + ++struct _CamelMapiTransportPrivate ++{ ++ EMapiConnection *conn; ++}; ++ + static gboolean + convert_message_to_object_cb (EMapiConnection *conn, + TALLOC_CTX *mem_ctx, +@@ -80,6 +87,7 @@ mapi_send_to_sync (CamelTransport *transport, + GError **error) + { + EMapiConnection *conn; ++ CamelMapiTransport *mapi_transport; + const gchar *namep; + const gchar *addressp; + mapi_id_t mid = 0; +@@ -89,8 +97,12 @@ mapi_send_to_sync (CamelTransport *transport, + gchar *profile; + GError *mapi_error = NULL; + ++ mapi_transport = CAMEL_MAPI_TRANSPORT (transport); ++ ++ g_return_val_if_fail (mapi_transport != NULL, FALSE); ++ + if (!camel_internet_address_get (CAMEL_INTERNET_ADDRESS (from), 0, &namep, &addressp)) { +- return (FALSE); ++ return FALSE; + } + + g_return_val_if_fail (CAMEL_IS_SERVICE (transport), FALSE); +@@ -131,7 +143,11 @@ mapi_send_to_sync (CamelTransport *transport, + g_list_free_full (services, (GDestroyNotify) g_object_unref); + } + +- conn = e_mapi_connection_find (profile); ++ conn = mapi_transport->priv->conn; ++ if (conn) ++ g_object_ref (conn); ++ else ++ conn = e_mapi_connection_find (profile); + + g_free (profile); + +@@ -170,7 +186,8 @@ mapi_send_to_sync (CamelTransport *transport, + } + + static gchar * +-mapi_transport_get_name(CamelService *service, gboolean brief) ++mapi_transport_get_name (CamelService *service, ++ gboolean brief) + { + CamelNetworkSettings *network_settings; + CamelSettings *settings; +@@ -201,21 +218,172 @@ mapi_transport_get_name(CamelService *service, gboolean brief) + return name; + } + ++static gboolean ++mapi_connect_sync (CamelService *service, ++ GCancellable *cancellable, ++ GError **error) ++{ ++ CamelMapiTransport *mapi_transport = CAMEL_MAPI_TRANSPORT (service); ++ CamelServiceConnectionStatus status; ++ CamelSession *session; ++ CamelSettings *settings; ++ EMapiProfileData empd = { 0 }; ++ gchar *name; ++ ++ session = camel_service_ref_session (service); ++ ++ if (!camel_session_get_online (session)) { ++ g_set_error_literal ( ++ error, CAMEL_SERVICE_ERROR, CAMEL_SERVICE_ERROR_UNAVAILABLE, ++ _("Cannot connect MAPI store in offline mode")); ++ return FALSE; ++ } ++ ++ status = camel_service_get_connection_status (service); ++ if (status == CAMEL_SERVICE_DISCONNECTED) { ++ return FALSE; ++ } ++ ++ if (mapi_transport->priv->conn && e_mapi_connection_connected (mapi_transport->priv->conn)) { ++ return TRUE; ++ } ++ ++ name = camel_service_get_name (service, TRUE); ++ camel_operation_push_message (cancellable, _("Connecting to '%s'"), name); ++ ++ settings = camel_service_ref_settings (service); ++ e_mapi_util_profiledata_from_settings (&empd, CAMEL_MAPI_SETTINGS (settings)); ++ g_object_unref (settings); ++ ++ if (!camel_session_authenticate_sync (session, service, empd.krb_sso ? "MAPIKRB" : NULL, cancellable, error)) { ++ camel_operation_pop_message (cancellable); ++ g_free (name); ++ return FALSE; ++ } ++ ++ camel_operation_pop_message (cancellable); ++ g_free (name); ++ ++ return mapi_transport->priv->conn != NULL; ++} ++ ++static gboolean ++mapi_disconnect_sync (CamelService *service, ++ gboolean clean, ++ GCancellable *cancellable, ++ GError **error) ++{ ++ CamelMapiTransport *mapi_transport = CAMEL_MAPI_TRANSPORT (service); ++ ++ if (mapi_transport->priv->conn) { ++ e_mapi_utils_unref_in_thread (G_OBJECT (mapi_transport->priv->conn)); ++ mapi_transport->priv->conn = NULL; ++ } ++ ++ return TRUE; ++} ++ ++static CamelAuthenticationResult ++mapi_authenticate_sync (CamelService *service, ++ const gchar *mechanism, ++ GCancellable *cancellable, ++ GError **error) ++{ ++ CamelAuthenticationResult result; ++ CamelMapiTransport *mapi_transport = CAMEL_MAPI_TRANSPORT (service); ++ CamelSession *session; ++ CamelSettings *settings; ++ CamelMapiSettings *mapi_settings; ++ CamelNetworkSettings *network_settings; ++ EMapiProfileData empd = { 0 }; ++ const gchar *profile; ++ const gchar *password; ++ GError *mapi_error = NULL; ++ ENamedParameters *credentials; ++ ++ settings = camel_service_ref_settings (service); ++ mapi_settings = CAMEL_MAPI_SETTINGS (settings); ++ network_settings = CAMEL_NETWORK_SETTINGS (settings); ++ ++ empd.server = camel_network_settings_get_host (network_settings); ++ empd.username = camel_network_settings_get_user (network_settings); ++ e_mapi_util_profiledata_from_settings (&empd, mapi_settings); ++ ++ profile = camel_mapi_settings_get_profile (mapi_settings); ++ ++ if (empd.krb_sso) { ++ if (!e_mapi_util_trigger_krb_auth (&empd, error)) { ++ g_object_unref (settings); ++ return CAMEL_AUTHENTICATION_ERROR; ++ } ++ ++ password = NULL; ++ } else { ++ password = camel_service_get_password (service); ++ ++ if (password == NULL) { ++ g_set_error_literal ( ++ error, CAMEL_SERVICE_ERROR, ++ CAMEL_SERVICE_ERROR_CANT_AUTHENTICATE, ++ _("Authentication password not available")); ++ g_object_unref (settings); ++ return CAMEL_AUTHENTICATION_ERROR; ++ } ++ } ++ ++ credentials = e_named_parameters_new (); e_named_parameters_set (credentials, E_SOURCE_CREDENTIAL_PASSWORD, password); ++ session = camel_service_ref_session (service); ++ mapi_transport->priv->conn = e_mapi_connection_new ( ++ e_mail_session_get_registry (E_MAIL_SESSION (session)), ++ profile, credentials, cancellable, &mapi_error); ++ e_named_parameters_free (credentials); ++ if (mapi_transport->priv->conn && e_mapi_connection_connected (mapi_transport->priv->conn)) { ++ result = CAMEL_AUTHENTICATION_ACCEPTED; ++ } else if (g_error_matches (mapi_error, E_MAPI_ERROR, MAPI_E_LOGON_FAILED) || ++ g_error_matches (mapi_error, E_MAPI_ERROR, ecRpcFailed)) { ++ g_clear_error (&mapi_error); ++ result = CAMEL_AUTHENTICATION_REJECTED; ++ } else { ++ /* mapi_error should be set */ ++ g_return_val_if_fail ( ++ mapi_error != NULL, ++ CAMEL_AUTHENTICATION_ERROR); ++ if (!e_mapi_utils_propagate_cancelled_error (mapi_error, error)) ++ g_propagate_error (error, mapi_error); ++ else ++ g_clear_error (&mapi_error); ++ result = CAMEL_AUTHENTICATION_ERROR; ++ } ++ ++ g_object_unref (settings); ++ ++ return result; ++} ++ + static void + camel_mapi_transport_class_init (CamelMapiTransportClass *class) + { + CamelServiceClass *service_class; + CamelTransportClass *transport_class; + ++ /* register MAPIKRB auth type */ ++ CAMEL_TYPE_MAPI_SASL_KRB; ++ ++ g_type_class_add_private (class, sizeof (CamelMapiTransportPrivate)); ++ + service_class = CAMEL_SERVICE_CLASS (class); + service_class->get_name = mapi_transport_get_name; + service_class->settings_type = CAMEL_TYPE_MAPI_SETTINGS; ++ service_class->connect_sync = mapi_connect_sync; ++ service_class->disconnect_sync = mapi_disconnect_sync; ++ service_class->authenticate_sync = mapi_authenticate_sync; + + transport_class = CAMEL_TRANSPORT_CLASS (class); + transport_class->send_to_sync = mapi_send_to_sync; + } + + static void +-camel_mapi_transport_init (CamelMapiTransport *transport) ++camel_mapi_transport_init (CamelMapiTransport *mapi_transport) + { ++ mapi_transport->priv = G_TYPE_INSTANCE_GET_PRIVATE (mapi_transport, CAMEL_TYPE_MAPI_TRANSPORT, CamelMapiTransportPrivate); + } +--- a/src/camel/camel-mapi-transport.h ++++ a/src/camel/camel-mapi-transport.h +@@ -50,11 +50,12 @@ + G_BEGIN_DECLS + + typedef struct _CamelMapiTransport CamelMapiTransport; ++typedef struct _CamelMapiTransportPrivate CamelMapiTransportPrivate; + typedef struct _CamelMapiTransportClass CamelMapiTransportClass; + + struct _CamelMapiTransport { + CamelTransport parent; +- gboolean connected; ++ CamelMapiTransportPrivate *priv; + }; + + struct _CamelMapiTransportClass { diff --git a/pcr/freecolor/PKGBUILD b/pcr/freecolor/PKGBUILD new file mode 100644 index 000000000..3a6b63c5e --- /dev/null +++ b/pcr/freecolor/PKGBUILD @@ -0,0 +1,33 @@ +# Contributor (Arch): Mariusz Libera <mariusz.libera@gmail.com> +# Contributor (Arch): Vinzenz Vietzke <vinz@archlinux.us> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +pkgname=freecolor +pkgver=0.8.8 +pkgrel=3 +pkgdesc="Displays free memory as a bargraph on the command line." +arch=('i686' 'x86_64') +url="http://www.rkeene.org/oss/freecolor/" +license=('GPL') +depends=('glibc') +source=(http://www.rkeene.org/files/oss/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('438ffe64a6255d61628601f18bb2d990') + +prepare() { + cd $srcdir/$pkgname-$pkgver + # fix for outdated include + sed -i '54d' freecolor.c +} + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --without-libstatgrab + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make prefix="$pkgdir/usr/" install + install -m 755 -d "${pkgdir}/usr/share/doc/${pkgname}" + install -m 644 README "${pkgdir}/usr/share/doc/${pkgname}" +} + diff --git a/pcr/freeipmi/PKGBUILD b/pcr/freeipmi/PKGBUILD index fa18ac825..a5bc36ee5 100644 --- a/pcr/freeipmi/PKGBUILD +++ b/pcr/freeipmi/PKGBUILD @@ -1,18 +1,35 @@ -# Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com> +# Contributor (Arch): Phillip Smith <fukawi2@NO-SPAM.gmail.com> # http://github.com/fukawi2/aur-packages -# Contributor: Nathan Owe <ndowens04 at gmail> +# Contributor (Arch): Nathan Owe <ndowens04 at gmail> # Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp> +### I AM ONLY THE PACKAGER, NOT THE DEVELOPER +### Please ask support questions about this software in one of: +### 1) The AUR comments; OR +### 2) Upstream forums/maillist etc; OR +### 3) The ArchLinux forums +### I do not always know enough about the software itself, or don't have the +### time to promptly respond to direct emails. +### If you have found a problem with the package/PKGBUILD (as opposed to +### the software) then please do email me or post an AUR comment. + pkgname=freeipmi -pkgver=1.4.1 +pkgver=1.4.8 pkgrel=1 pkgdesc="sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL)" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.gnu.org/software/freeipmi/" license=('GPL') depends=('libgcrypt') options=('!libtool') -source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") +source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" + 'bmc-watchdog.service' + 'ipmidetectd.service' + 'ipmiseld.service') +md5sums=('df800f7553d6a7d55e2a928abc65dadb' + '8993098bae8cc6b134a330105373d258' + 'bb8bd4f7e5dddbbb15e309c3f1090551' + 'd8b0658fb8037bf4c09b9179223e4972') build() { cd $srcdir/$pkgname-$pkgver @@ -33,18 +50,17 @@ package() { make DESTDIR=$pkgdir/ install + rm -Rf $pkgdir/usr/share/info/dir + # Move init scripts and config to Arch paths - mv $pkgdir/etc/init.d $pkgdir/etc/rc.d mv $pkgdir/etc/sysconfig $pkgdir/etc/conf.d - - # Fix references to 'init.d' and 'sysconfig' - sed -e 's|/etc/init.d/|/etc/rc.d/|g' \ - -e 's|/etc/rc.d/init.d/functions|/etc/rc.d/functions|g' \ - -i $pkgdir/etc/rc.d/* - sed -e 's|CONFFILE=/etc/sysconfig/bmc-watchdog|CONFFILE=/etc/cond.f/bmc-watchdog|g' \ - -i $pkgdir/etc/rc.d/bmc-watchdog - rm -Rf $pkgdir/usr/share/info/dir + # We need system units, not rc scripts + rm -Rf "$pkgdir"/etc/init.d/ + for svcname in bmc-watchdog ipmidetectd ipmiseld ; do + install -Dm644 "$srcdir"/${svcname}.service \ + "$pkgdir"/usr/lib/systemd/system/${svcname}.service + done } # vim:set ts=2 sw=2 et: diff --git a/pcr/freeipmi/bmc-watchdog.service b/pcr/freeipmi/bmc-watchdog.service new file mode 100644 index 000000000..8ad449a71 --- /dev/null +++ b/pcr/freeipmi/bmc-watchdog.service @@ -0,0 +1,11 @@ +[Unit] +Description=BMC Watchdog Timer Daemon +After=network.target + +[Service] +Type=forking +EnvironmentFile=-/etc/conf.d/bmc-watchdog +ExecStart=/usr/bin/bmc-watchdog $OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/pcr/freeipmi/ipmidetectd.service b/pcr/freeipmi/ipmidetectd.service new file mode 100644 index 000000000..637060225 --- /dev/null +++ b/pcr/freeipmi/ipmidetectd.service @@ -0,0 +1,10 @@ +[Unit] +Description=IPMI Node Detection Monitoring Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/ipmidetectd + +[Install] +WantedBy=multi-user.target diff --git a/pcr/freeipmi/ipmiseld.service b/pcr/freeipmi/ipmiseld.service new file mode 100644 index 000000000..1c4caf5df --- /dev/null +++ b/pcr/freeipmi/ipmiseld.service @@ -0,0 +1,10 @@ +[Unit] +Description=IPMI SEL syslog logging daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/ipmiseld + +[Install] +WantedBy=multi-user.target diff --git a/pcr/freetuxtv/PKGBUILD b/pcr/freetuxtv/PKGBUILD index b12e495ca..67f933612 100644 --- a/pcr/freetuxtv/PKGBUILD +++ b/pcr/freetuxtv/PKGBUILD @@ -1,21 +1,23 @@ -# Maintainer (Arch): Bernard Baeyens (berbae) <berbae52 at sfr dot fr> +# Contributor (Arch): Bernard Baeyens (berbae) <berbae52 at sfr dot fr> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=freetuxtv -pkgver=0.6.5 -pkgrel=3 +pkgver=0.6.6 +pkgrel=2 pkgdesc="WebTV player to watch ADSL TV on the PC." -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://code.google.com/p/freetuxtv/" license=('GPL3') -depends=('vlc' 'gtk2' 'sqlite' 'curl' 'libnotify' 'dbus-glib') +install=freetuxtv.install +depends=('vlc' 'gtk3' 'sqlite' 'curl' 'libnotify' 'dbus-glib') makedepends=('intltool') conflicts=('freetuxtv-svn') source=("http://freetuxtv.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha1sums=('f347a6fd107f9722f4f6be4ec8f530239ffe899a') +sha1sums=('6c42778d65bf20b7aeb70614c696d6736d0fa5cf') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-gtk=2.0 + ./configure --prefix=/usr --with-gtk=3.0 make } package() { diff --git a/pcr/freetuxtv/freetuxtv.install b/pcr/freetuxtv/freetuxtv.install new file mode 100644 index 000000000..26973114e --- /dev/null +++ b/pcr/freetuxtv/freetuxtv.install @@ -0,0 +1,13 @@ +post_install() { +update-desktop-database -q +gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { +post_install +} + +post_remove() { +post_install +} + diff --git a/pcr/fwsnort/#PKGBUILD# b/pcr/fwsnort/#PKGBUILD# deleted file mode 100644 index a4b666dfa..000000000 --- a/pcr/fwsnort/#PKGBUILD# +++ /dev/null @@ -1,44 +0,0 @@ -# Contributor (Arch) : Colin Shea <colin@evaryont.me> -# Maintainer (Parabola): Aurélien DESBRIÈRES <aurelien@hackers.camp> - -pkgname=fwsnort -pkgver=1.6.4 -pkgrel=1 -pkgdesc="application layer IDS/IPS by translating snort rules into iptables" -arch=('any') -url="http://www.cipherdyne.org/fwsnort/" -license=('GPL') -# net-tools: sorry, but fwsnort needs ifconfig. Doesn't support iproute yet -depends=('perl' 'perl-netaddr-ip' 'perl-iptables-parse' 'iptables' 'net-tools') -makedepends=('wget') -source=(http://www.cipherdyne.org/$pkgname/download/$pkgname-$pkgver.tar.bz2 - ) - -options=(emptydirs) - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # fix up the installer for our purposes: - # - removes the root check - # - includes sbin as another place to check for binares - # - fixes various paths for utilities & the man page - #patch -p1 -i $srcdir/install_pl.patch - - # -S skips installing the perl modules, which we did with packages - # and --install-test-dir sets the INSTALL_ROOT to src/../test/fwsnort-test. An - # easy way to collect all the files into 1 - #./install.pl -S --install-test-dir -} - -#package() { - #cp -r $srcdir/fwsnort-$pkgver/test/fwsnort-install/* -t $pkgdir - # delete references to $pkgdir from fwsnort; they were made by the installer - # as part of installing to the test dir - #cp -f $srcdir/fwsnort-$pkgver/fwsnort.conf $pkgdir/etc/fwsnort/fwsnort.conf - - # avoid a 'warning: directory permissions differ on etc/' line from pacman - #chmod 755 $pkgdir/etc -#} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/fwsnort/#install_pl.patch# b/pcr/fwsnort/#install_pl.patch# deleted file mode 100644 index cf0602d04..000000000 --- a/pcr/fwsnort/#install_pl.patch# +++ /dev/null @@ -1,126 +0,0 @@ -diff -u fwsnort-1.6.4-1/install.pl fwsnort-1..3/install.pl ---- fwsnort-1.6.3-2/install.pl 2012-12-24 21:31:28.597018440 -0700 -+++ fwsnort-1.6.3/install.pl 2012-12-24 21:40:38.564569377 -0700 -@@ -45,7 +45,7 @@ - my $perlCmd = '/usr/bin/perl'; - my $makeCmd = '/usr/bin/make'; - my $wgetCmd = '/usr/bin/wget'; --my $gzipCmd = '/bin/gzip'; -+my $gzipCmd = '/usr/bin/gzip'; - my $tarCmd = '/bin/tar'; - #======================= end config ====================== - -@@ -129,10 +129,6 @@ - ### make sure the system binaries are where we think they are. - &check_commands(); - --### check to make sure we are running as root --$< == 0 && $> == 0 or die "You need to be root (or equivalent UID 0", -- " account) to install/uninstall fwsnort!\n"; -- - if ($uninstall) { - &uninstall(); - } else { -@@ -154,10 +150,10 @@ - "sources directory." unless -e 'fwsnort' and -e 'fwsnort.conf'; - - unless (-d $config{'CONF_DIR'}) { -- &full_mkdir($config{'CONF_DIR'}, 0500); -+ &full_mkdir($config{'CONF_DIR'}, 0700); - } - unless (-d $config{'RULES_DIR'}) { -- &full_mkdir($config{'RULES_DIR'}, 0500); -+ &full_mkdir($config{'RULES_DIR'}, 0700); - } - - ### install perl modules -@@ -336,52 +332,11 @@ - - sub install_manpage() { - my $manpage = 'fwsnort.8'; -- ### remove old man page -- unlink "/usr/local/man/man8/${manpage}" if -- (-e "/usr/local/man/man8/${manpage}"); - - ### default location to put the fwsnort man page, but check with - ### /etc/man.config -- my $mpath = '/usr/share/man/man8'; -- if (-e '/etc/man.config') { -- ### prefer to install $manpage in /usr/local/man/man8 if -- ### this directory is configured in /etc/man.config -- open M, '< /etc/man.config' or -- die "[*] Could not open /etc/man.config: $!"; -- my @lines = <M>; -- close M; -- ### prefer the path "/usr/share/man" -- my $found = 0; -- for my $line (@lines) { -- chomp $line; -- if ($line =~ m|^MANPATH\s+/usr/share/man|) { -- $found = 1; -- last; -- } -- } -- ### try to find "/usr/local/man" if we didn't find /usr/share/man -- unless ($found) { -- for my $line (@lines) { -- chomp $line; -- if ($line =~ m|^MANPATH\s+/usr/local/man|) { -- $mpath = '/usr/local/man/man8'; -- $found = 1; -- last; -- } -- } -- } -- ### if we still have not found one of the above man paths, -- ### just select the first one out of /etc/man.config -- unless ($found) { -- for my $line (@lines) { -- chomp $line; -- if ($line =~ m|^MANPATH\s+(\S+)|) { -- $mpath = $1; -- last; -- } -- } -- } -- } -+ my $mpath = $config{'INSTALL_ROOT'}.'/usr/share/man/man8'; -+ - &full_mkdir($mpath, 0755); - my $mfile = "${mpath}/${manpage}"; - print "[+] Installing $manpage man page as $mfile\n"; -@@ -532,6 +487,9 @@ - /bin - /usr/bin - /usr/local/bin -+ /sbin -+ /usr/sbin -+ /usr/local/sbin - ); - CMD: for my $cmd (keys %cmds) { - unless (-x $cmds{$cmd}) { -diff -u fwsnort-1.6.3-2/fwsnort.conf fwsnort-1.6.3/fwsnort.conf ---- fwsnort-1.6.3-2/fwsnort.conf 2012-12-24 22:39:21.323178467 -0700 -+++ fwsnort-1.6.3/fwsnort.conf 2012-12-24 22:41:52.172194457 -0700 -@@ -103,14 +103,14 @@ - - ### system binaries - shCmd /bin/sh; --echoCmd /bin/echo; -+echoCmd /usr/bin/echo; - tarCmd /bin/tar; - wgetCmd /usr/bin/wget; - unameCmd /usr/bin/uname; - ifconfigCmd /sbin/ifconfig; --iptablesCmd /sbin/iptables; --iptables-saveCmd /sbin/iptables-save; --iptables-restoreCmd /sbin/iptables-restore; --ip6tablesCmd /sbin/ip6tables; --ip6tables-saveCmd /sbin/ip6tables-save; --ip6tables-restoreCmd /sbin/ip6tables-restore; -+iptablesCmd /usr/sbin/iptables; -+iptables-saveCmd /usr/sbin/iptables-save; -+iptables-restoreCmd /usr/sbin/iptables-restore; -+ip6tablesCmd /usr/sbin/ip6tables; -+ip6tables-saveCmd /usr/sbin/ip6tables-save; -+ip6tables-restoreCmd /usr/sbin/ip6tables-restore; diff --git a/pcr/fwsnort/PKGBUILD b/pcr/fwsnort/PKGBUILD index a4b666dfa..1a0505faa 100644 --- a/pcr/fwsnort/PKGBUILD +++ b/pcr/fwsnort/PKGBUILD @@ -1,9 +1,8 @@ -# Contributor (Arch) : Colin Shea <colin@evaryont.me> -# Maintainer (Parabola): Aurélien DESBRIÈRES <aurelien@hackers.camp> - +# Contributor (Arch): Colin Shea <colin@evaryont.me> +# Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> pkgname=fwsnort -pkgver=1.6.4 -pkgrel=1 +pkgver=1.6.3 +pkgrel=3 pkgdesc="application layer IDS/IPS by translating snort rules into iptables" arch=('any') url="http://www.cipherdyne.org/fwsnort/" @@ -12,8 +11,9 @@ license=('GPL') depends=('perl' 'perl-netaddr-ip' 'perl-iptables-parse' 'iptables' 'net-tools') makedepends=('wget') source=(http://www.cipherdyne.org/$pkgname/download/$pkgname-$pkgver.tar.bz2 - ) - + 'install_pl.patch') +md5sums=('3e7501e4587a3e33615b604935c75e4e' + 'd7925e3f869ec8decb0e8336801350d6') options=(emptydirs) build() { @@ -23,22 +23,22 @@ build() { # - removes the root check # - includes sbin as another place to check for binares # - fixes various paths for utilities & the man page - #patch -p1 -i $srcdir/install_pl.patch + patch -p1 -i $srcdir/install_pl.patch # -S skips installing the perl modules, which we did with packages # and --install-test-dir sets the INSTALL_ROOT to src/../test/fwsnort-test. An # easy way to collect all the files into 1 - #./install.pl -S --install-test-dir + ./install.pl -S --install-test-dir } -#package() { - #cp -r $srcdir/fwsnort-$pkgver/test/fwsnort-install/* -t $pkgdir +package() { + cp -r $srcdir/fwsnort-$pkgver/test/fwsnort-install/* -t $pkgdir # delete references to $pkgdir from fwsnort; they were made by the installer # as part of installing to the test dir - #cp -f $srcdir/fwsnort-$pkgver/fwsnort.conf $pkgdir/etc/fwsnort/fwsnort.conf + cp -f $srcdir/fwsnort-$pkgver/fwsnort.conf $pkgdir/etc/fwsnort/fwsnort.conf # avoid a 'warning: directory permissions differ on etc/' line from pacman - #chmod 755 $pkgdir/etc -#} + chmod 755 $pkgdir/etc +} # vim:set ts=2 sw=2 et: diff --git a/pcr/gdk-pixbuf/PKGBUILD b/pcr/gdk-pixbuf/PKGBUILD new file mode 100644 index 000000000..e569b2902 --- /dev/null +++ b/pcr/gdk-pixbuf/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 99752 2013-10-30 23:29:49Z allan $ +# Maintainer: Brian Bidulock <bidulock@openss7.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=gdk-pixbuf +pkgver=0.22.0 +pkgrel=12 +pkgdesc="Image loading and manipulation library" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL' 'LGPL') +depends=('gtk' 'libtiff' 'libpng') +makedepends=('libxt') +source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.22/${pkgname}-${pkgver}.tar.bz2 + gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch + gdk-pixbuf-0.22.0-bmp_secure.patch + gdk-pixbuf-0.22.0-loaders.patch + gdk-pixbuf-0.22.0.patch + libpng15.patch) +md5sums=('05fcb68ceaa338614ab650c775efc2f2' + 'd1fb93f1ae994875158a7e0c108c36f8' + '5f59d5772b1482d885a180dbc581cf84' + '3cf31ae0509747f72ac27a9fd96109c2' + 'e0f5f301ce958b7cea0be631ed7b8e56' + '16db4dc83d507ebcf15d1beb753a77bc') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + export SED=/bin/sed + patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch + patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch + patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch + patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch + patch -Np1 -i ${srcdir}/libpng15.patch + sed -i \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|' \ + -e 's|AM_PROG_CC_STDC|AC_PROG_CC|' \ + configure.in + libtoolize --force --copy --automake + autoreconf --force --install + ./configure --prefix=/usr --disable-gtk-doc + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + rm -rf ${pkgdir}/usr/share/gnome +} diff --git a/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch b/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch new file mode 100644 index 000000000..ffb4378aa --- /dev/null +++ b/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch @@ -0,0 +1,48 @@ +--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c 2002-09-27 23:12:40.000000000 +0200 ++++ gdk-pixbuf-0.22.0.patched/gdk-pixbuf/io-bmp.c 2005-03-30 01:33:06.000000000 +0200 +@@ -31,8 +31,6 @@ + #include "gdk-pixbuf-private.h" + #include "gdk-pixbuf-io.h" + +- +- + #if 0 + /* If these structures were unpacked, they would define the two headers of the + * BMP file. After them comes the palette, and then the image data. +@@ -206,7 +204,7 @@ + + if (State == NULL) + return NULL; +- ++ + while (feof(f) == 0) { + length = fread(membuf, 1, sizeof (membuf), f); + if (length > 0) +@@ -245,11 +243,26 @@ + static gboolean + grow_buffer (struct bmp_progressive_state *State) + { +- guchar *tmp = realloc (State->buff, State->BufferSize); ++ guchar *tmp; ++ ++ if (State->BufferSize == 0) { ++#if 0 ++ g_set_error (error, ++ GDK_PIXBUF_ERROR, ++ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, ++ _("BMP image has bogus header data")); ++#endif ++ State->read_state = READ_STATE_ERROR; ++ return FALSE; ++ } ++ ++ tmp = realloc (State->buff, State->BufferSize); ++ + if (!tmp) { + State->read_state = READ_STATE_ERROR; + return FALSE; + } ++ + State->buff = tmp; + return TRUE; + } diff --git a/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch b/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch new file mode 100644 index 000000000..29471f147 --- /dev/null +++ b/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch @@ -0,0 +1,19 @@ +Index: io-bmp.c +=================================================================== +RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v +retrieving revision 1.41 +diff -u -p -r1.41 io-bmp.c +--- gdk-pixbuf/io-bmp.c 13 Aug 2004 02:26:57 -0000 1.41 ++++ gdk-pixbuf/io-bmp.c 20 Aug 2004 00:18:14 -0000 +@@ -876,8 +876,10 @@ DoCompressed(struct bmp_progressive_stat + guchar c; + gint idx; + +- if (context->compr.y >= context->Header.height) ++ if (context->compr.y >= context->Header.height) { ++ context->BufferDone = 0; + return TRUE; ++ } + + y = context->compr.y; + diff --git a/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch b/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch new file mode 100644 index 000000000..068653808 --- /dev/null +++ b/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch @@ -0,0 +1,134 @@ +diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c +--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c 2002-09-27 17:19:15.000000000 -0500 ++++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c 2005-10-27 11:28:23.000000000 -0500 +@@ -330,6 +330,9 @@ + + State->HeaderSize+=I; + ++ if (State->HeaderSize < 0) ++ return FALSE; ++ + if (State->HeaderSize>State->BytesInHeaderBuf) { + guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize); + if (!tmp) +diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c +--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c 2001-03-01 15:16:28.000000000 -0500 ++++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c 2005-10-27 11:29:14.000000000 -0500 +@@ -243,8 +243,8 @@ + break; + else { + if (numnames > 0) { +- space -= 1; +- strcat (color, " "); ++ strncat (color, " ", space); ++ space -= MIN (space, 1); + } + + strncat (color, temp, space); +@@ -281,7 +281,8 @@ + /* Fall through to the xpm_read_string. */ + + case op_body: +- xpm_read_string (h->infile, &h->buffer, &h->buffer_size); ++ if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size)) ++ return NULL; + return h->buffer; + + default: +@@ -317,13 +318,6 @@ + return NULL; + } + +-/* Destroy notification function for the pixbuf */ +-static void +-free_buffer (guchar *pixels, gpointer data) +-{ +- free (pixels); +-} +- + static gboolean + xpm_color_parse (const char *spec, XColor *color) + { +@@ -342,7 +336,8 @@ + gchar pixel_str[32]; + GHashTable *color_hash; + _XPMColor *colors, *color, *fallbackcolor; +- guchar *pixels, *pixtmp; ++ guchar *pixtmp; ++ GdkPixbuf* pixbuf; + + fallbackcolor = NULL; + +@@ -352,16 +347,33 @@ + return NULL; + } + sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp); +- if (cpp >= 32) { +- g_warning ("XPM has more than 31 chars per pixel."); ++ if (cpp <= 0 || cpp >= 32) { ++ g_warning ("XPM has invalid number of chars per pixel."); + return NULL; + } ++ if (n_col <= 0 || ++ n_col >= G_MAXINT / (cpp + 1) || ++ n_col >= G_MAXINT / sizeof (_XPMColor)) { ++ g_warning ("XPM file has invalid number of colors"); ++ return NULL; ++ } + + /* The hash is used for fast lookups of color from chars */ + color_hash = g_hash_table_new (g_str_hash, g_str_equal); + +- name_buf = g_new (gchar, n_col * (cpp + 1)); +- colors = g_new (_XPMColor, n_col); ++ name_buf = g_new (gchar, n_col * (cpp + 1)); ++ if (!name_buf) { ++ g_warning ("Cannot allocate memory for loading XPM image"); ++ g_hash_table_destroy (color_hash); ++ return NULL; ++ } ++ colors = g_new (_XPMColor, n_col); ++ if (!colors) { ++ g_warning ("Cannot allocate memory for loading XPM image"); ++ g_hash_table_destroy (color_hash); ++ g_free (name_buf); ++ return NULL; ++ } + + for (cnt = 0; cnt < n_col; cnt++) { + gchar *color_name; +@@ -397,12 +409,8 @@ + fallbackcolor = color; + } + +- if (is_trans) +- pixels = malloc (w * h * 4); +- else +- pixels = malloc (w * h * 3); +- +- if (!pixels) { ++ pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h); ++ if (!pixbuf) { + g_hash_table_destroy (color_hash); + g_free (colors); + g_free (name_buf); +@@ -410,7 +418,7 @@ + } + + wbytes = w * cpp; +- pixtmp = pixels; ++ pixtmp = pixbuf->pixels; + + for (ycnt = 0; ycnt < h; ycnt++) { + buffer = (*get_buf) (op_body, handle); +@@ -443,9 +451,7 @@ + g_free (colors); + g_free (name_buf); + +- return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8, +- w, h, is_trans ? (w * 4) : (w * 3), +- free_buffer, NULL); ++ return pixbuf; + } + + /* Shared library entry point for file loading */ diff --git a/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0.patch b/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0.patch new file mode 100644 index 000000000..8e0f55680 --- /dev/null +++ b/pcr/gdk-pixbuf/gdk-pixbuf-0.22.0.patch @@ -0,0 +1,129 @@ +--- configure.in ++++ configure.in +@@ -21,6 +21,7 @@ + AC_PROG_CC + AC_ISC_POSIX + AM_PROG_CC_STDC ++AM_PROG_AS + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET +@@ -147,18 +148,18 @@ + dnl Test for libtiff + if test -z "$LIBTIFF"; then + AC_CHECK_LIB(tiff, TIFFReadScanline, +- AC_CHECK_HEADER(tiffio.h, ++ [AC_CHECK_HEADER(tiffio.h, + TIFF='tiff'; LIBTIFF='-ltiff', +- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), +- AC_CHECK_LIB(tiff, TIFFWriteScanline, +- AC_CHECK_HEADER(tiffio.h, ++ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], ++ [AC_CHECK_LIB(tiff, TIFFWriteScanline, ++ [AC_CHECK_HEADER(tiffio.h, + TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz', +- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), +- AC_CHECK_LIB(tiff34, TIFFFlushData, +- AC_CHECK_HEADER(tiffio.h, ++ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], ++ [AC_CHECK_LIB(tiff34, TIFFFlushData, ++ [AC_CHECK_HEADER(tiffio.h, + TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz', +- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), +- AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm) ++ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], ++ AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm) + fi + + dnl Test for libjpeg +@@ -191,9 +192,9 @@ + dnl Test for libpng + if test -z "$LIBPNG"; then + AC_CHECK_LIB(png, png_read_info, +- AC_CHECK_HEADER(png.h, ++ [AC_CHECK_HEADER(png.h, + png_ok=yes, +- png_ok=no), ++ png_ok=no)], + AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm) + if test "$png_ok" = yes; then + AC_MSG_CHECKING([for png_structp in png.h]) +--- doc/Makefile.am ++++ doc/Makefile.am +@@ -156,7 +156,7 @@ + done; \ + fi) + # echo '-- Installing $(srcdir)/html/index.sgml' ; \ +-# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ ++# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); + + # + # Require gtk-doc when making dist +--- gdk-pixbuf.m4 ++++ gdk-pixbuf.m4 +@@ -9,7 +9,7 @@ + dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS + dnl +-AC_DEFUN(AM_PATH_GDK_PIXBUF, ++AC_DEFUN([AM_PATH_GDK_PIXBUF], + [dnl + dnl Get the cflags and libraries from the gdk-pixbuf-config script + dnl +--- gdk-pixbuf/Makefile.am ++++ gdk-pixbuf/Makefile.am +@@ -18,7 +18,7 @@ + + libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS) + +-libexecdir = $(libdir)/gdk-pixbuf/loaders ++loaderdir = $(libdir)/gdk-pixbuf/loaders + + # + # The PNG plugin. +@@ -118,7 +118,7 @@ + + if BUILD_DYNAMIC_MODULES + +-libexec_LTLIBRARIES = \ ++loader_LTLIBRARIES = \ + $(PNG_LIB) \ + $(JPEG_LIB) \ + $(GIF_LIB) \ +@@ -134,7 +134,7 @@ + extra_sources = + + else +-libexec_LTLIBRARIES = ++loader_LTLIBRARIES = + + extra_sources = $(libpixbufloader_png_la_SOURCES) \ + $(libpixbufloader_jpeg_la_SOURCES) \ +@@ -159,7 +159,7 @@ + -I$(top_builddir)/gdk-pixbuf \ + $(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) + +-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\"" ++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" + + LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS) + +@@ -211,7 +211,7 @@ + gdk-pixbuf-parse-color.c \ + $(extra_sources) + +-libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS) ++libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) + libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS) + + +--- gdk-pixbuf/io-bmp.c ++++ gdk-pixbuf/io-bmp.c +@@ -28,6 +28,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <string.h> ++#include <stdlib.h> + #include "gdk-pixbuf-private.h" + #include "gdk-pixbuf-io.h" + diff --git a/pcr/gdk-pixbuf/libpng15.patch b/pcr/gdk-pixbuf/libpng15.patch new file mode 100644 index 000000000..e667288f8 --- /dev/null +++ b/pcr/gdk-pixbuf/libpng15.patch @@ -0,0 +1,30 @@ +diff -wbBur gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c +--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c 2001-01-24 23:59:23.000000000 +0300 ++++ gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c 2012-01-23 13:33:08.000000000 +0400 +@@ -175,7 +175,7 @@ + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); + return NULL; + } +@@ -311,7 +311,7 @@ + return NULL; + } + +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + if (lc->png_info_ptr) + png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); + g_free(lc); +@@ -366,7 +366,7 @@ + lc->max_row_seen_in_chunk = -1; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + return FALSE; + } else { + png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size); diff --git a/pcr/gengetopt/PKGBUILD b/pcr/gengetopt/PKGBUILD index bc4bd7308..db5e32ed8 100644 --- a/pcr/gengetopt/PKGBUILD +++ b/pcr/gengetopt/PKGBUILD @@ -1,16 +1,18 @@ -# Contributor : Christian Hesse <mail@eworm.de> -# Contributor : andreas_baumann <abaumann@yahoo.com> -# Contributor : zhuqin <zhuqin83@gmail.com> +# Contributor (Arch): Christian Hesse <mail@eworm.de> +# Contributor (Arch): andreas_baumann <abaumann@yahoo.com> +# Contributor (Arch): zhuqin <zhuqin83@gmail.com> # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> + pkgname=gengetopt pkgver=2.22.6 -pkgrel=2 +pkgrel=3 pkgdesc="A tool to write command line option parsing code for C programs." -arch=('i686' 'x86_64' 'arm' 'armv6h') +arch=('i686' 'x86_64') url="http://www.gnu.org/software/gengetopt/gengetopt.html" license="GPL" options=('!docs' '!makeflags') -source=(ftp://ftp.gnu.org/gnu/gengetopt/${pkgname}-${pkgver}.tar.gz{,.sig}) +source=(ftp://ftp.gnu.org/gnu/gengetopt/${pkgname}-${pkgver}.tar.gz) + build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -24,3 +26,6 @@ package() { make DESTDIR=${pkgdir} install } + +sha256sums=('30b05a88604d71ef2a42a2ef26cd26df242b41f5b011ad03083143a31d9b01f7' + ) diff --git a/pcr/gens-gs/PKGBUILD b/pcr/gens-gs/PKGBUILD deleted file mode 100644 index 29b828637..000000000 --- a/pcr/gens-gs/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer (Arch): trya <tryagainprod@gmail.com> - -pkgname=gens-gs -pkgver=r7 -pkgrel=5 -pkgdesc="An emulator of Sega Genesis, Sega CD and 32X, combining features from various forks of Gens" -url="http://segaretro.org/Gens/GS" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -if [[ $CARCH == "x86_64" ]]; then - depends=('lib32-gtk2' 'lib32-sdl' 'lib32-libgl') - makedepends=('nasm' 'gcc-multilib') - optdepends=('lib32-alsa-plugins: sound with Gens/GS for Pulseaudio users' - 'lib32-libpulse: sound with Gens/GS for Pulseaudio users') -else - depends=('gtk2' 'sdl' 'libgl') - makedepends=('nasm' 'gcc') -fi -replaces=('bin32-gens-gs') -conflicts=('gens' 'gens-gs-git' 'bin32-gens-gs' 'bin32-gens') -options=('!libtool') -source=("http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz" - gens-gtk.patch) -md5sums=('bcb17b49774aa318a224c741028aabc3' - '94a8ea744dee8caea73db1223ac67dcd') - -build() { - if [ $CARCH == "x86_64" ]; then - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 < ../gens-gtk.patch - if [ $CARCH == "x86_64" ]; then - i386 ./configure --prefix=/usr - else - ./configure --prefix=/usr LIBS="-ldl -lX11" - fi - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - rm -f "$pkgdir/usr/lib/mdp/*.a" -} diff --git a/pcr/gens-gs/gens-gtk.patch b/pcr/gens-gs/gens-gtk.patch deleted file mode 100644 index 0bc6fd0ee..000000000 --- a/pcr/gens-gs/gens-gtk.patch +++ /dev/null @@ -1,187 +0,0 @@ -diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp ---- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000 -@@ -84,7 +84,7 @@ - gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE); -+ g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)about_window, "delete_event", -diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp ---- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000 -@@ -84,7 +84,7 @@ - gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE); -+ g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)bmf_window, "delete_event", -diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp ---- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000 -@@ -109,7 +109,7 @@ - gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE); -+ g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)(dir_window), "delete_event", -diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp ---- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000 -@@ -140,7 +140,7 @@ - gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(genopt_window), false); - gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false); -+ g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)genopt_window, "delete_event", -@@ -458,11 +458,11 @@ - gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0); - - // Dropdown for intro effect. -- cboIntroEffect = gtk_combo_box_new_text(); -- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None"); -- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect"); -- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect"); -- //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. -+ cboIntroEffect = gtk_combo_box_text_new(); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None"); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect"); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect"); -+ //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. - gtk_widget_show(cboIntroEffect); - gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0); - g_signal_connect((gpointer)(cboIntroEffect), "changed", -diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp ---- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000 -@@ -154,9 +154,9 @@ - GSFT_UNUSED_PARAMETER(y); - GSFT_UNUSED_PARAMETER(user_data); - -- if (context->targets) -+ if (gdk_drag_context_list_targets(context)) - { -- GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0)); -+ GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0)); - gtk_drag_get_data(widget, context, target_type, time); - return true; - } -diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp ---- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000 -@@ -75,7 +75,7 @@ - gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE); -+ g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)(glres_window), "delete_event", -diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp ---- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000 -@@ -80,8 +80,7 @@ - // Callbacks. - static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data); - static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data); --static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, -- guint page_num, gpointer user_data); -+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data); - static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data); - static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data); - -@@ -119,7 +118,7 @@ - gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE); -+ g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)pmgr_window, "delete_event", -@@ -559,11 +558,9 @@ - * @param page_num New notebook page index. - * @param user_data User data. - */ --static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, -- guint page_num, gpointer user_data) -+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data) - { - GSFT_UNUSED_PARAMETER(notebook); -- GSFT_UNUSED_PARAMETER(page); - GSFT_UNUSED_PARAMETER(user_data); - - // Activate the "cursor-changed" callback for the page. -diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp ---- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000 -@@ -94,7 +94,7 @@ - gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE); - gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE); -+ g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL); - - // Callbacks for if the window is closed. - g_signal_connect((gpointer)(selcd_window), "delete_event", -@@ -128,7 +128,7 @@ - gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0); - - // Create the dropdown for the CD-ROM device name. -- cboDeviceName = gtk_combo_box_entry_new_text(); -+ cboDeviceName = gtk_combo_box_text_new_with_entry(); - gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63); - gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName); - gtk_widget_show(cboDeviceName); -@@ -156,7 +156,7 @@ - gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0); - - // Create the dropdown for the CD-ROM drive speed selection. -- cboDriveSpeed = gtk_combo_box_new_text(); -+ cboDriveSpeed = gtk_combo_box_text_new(); - char tmpSpeed[16]; - for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++) - { -@@ -167,7 +167,7 @@ - else - szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]); - -- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed); - } - gtk_widget_show(cboDriveSpeed); - gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0); -@@ -252,7 +252,7 @@ - continue; - - // Add the device file. -- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName); -+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName); - } - } - -diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp ---- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000 -+++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000 -@@ -111,7 +111,7 @@ - gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER); - gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE); - gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG); -- gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE); -+ g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL); - - // Add the window icon. - GList *icon_list = NULL; diff --git a/pcr/gigolo/PKGBUILD b/pcr/gigolo/PKGBUILD new file mode 100644 index 000000000..7db436696 --- /dev/null +++ b/pcr/gigolo/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Jan Misiak <fijam [at] archlinux.us> +# Maintainer: + +pkgname=gigolo +pkgver=0.4.2 +pkgrel=1 +pkgdesc="Frontend to manage connections to remote filesystems using GIO/GVFS" +arch=('i686' 'x86_64') +url="http://www.uvena.de/gigolo" +license=('GPL2') +depends=('gtk2' 'gvfs') +makedepends=('intltool') +optdepends=('gnome-mount: to use HAL mounter for local drives') +conflicts=('gigolo-git') +source=(http://files.uvena.de/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('553fc78fe4e7bd2f01f3851baea7e63f6414fe652dfb4b08c60b5c4b2b909164') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD deleted file mode 100644 index dbf9ed51f..000000000 --- a/pcr/gimp-art/PKGBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# Maintainer: Márcio Silva <coadde@parabola.nu> - -pkgname=gimp-art -pkgver=2.8.2 -pkgrel=2 -pkgdesc='GNU Image Manipulation Program (changed splash artwork)' -arch=( - i686 - x86_64 - mips64el -) -url=http://www.${pkgname%-art}.org/ -license=( - GPL - LGPL -) -depends=( - babl - dbus-glib - desktop-file-utils - gegl - hicolor-icon-theme - jasper - lcms - libexif - libmng - librsvg - libxmu - libxpm - libwmf - pygtk -) -makedepends=( - alsa-lib - curl - ghostscript - intltool - iso-codes - libwebkit - poppler-glib -) -optdepends=( - 'alsa-lib: for MIDI event controller module' - 'curl: for URI support' - 'ghostscript: for postscript support' - 'gutenprint: for sophisticated printing only as gimp has built-in cups print support' - 'libwebkit: for the help browser' - 'poppler-glib: for pdf support' -) -options=( - !libtool - !makeflags -) -conflicts=( - ${pkgname%-art} - ${pkgname%-art}-devel -) -provides=( - ${pkgname%-art}=$pkgver -) -install=${pkgname%-art}.install -source=( - ftp://ftp.${pkgname%-art}.org/pub/${pkgname%-art}/v${pkgver%.*}/${pkgname%-art}-$pkgver.tar.bz2 - ${pkgname%-art}-splash-artwork.png - ${pkgname%-art}-splash-artwork.license -) -sha512sums=( - 82a15072aba97d41a7dd74920f5db4e89442ff83841ac614f6fadfd964bdb8d3ae478ac0ba2e906bcf4569c8de00a1616fd6d626032f093060f28df3655d9111 - 1a2930e612b339f49aa85f98275c24202e056f2fff5c1fda94e662bfd45ed5b6226e6ab1947f3daf758f4e5106fd3f7e4f286d63b258f008b6a5d9e5cd6f0611 - d3f055ce278f25b33a6b11f3b031ae801206390fa1f62e3383daf35570e5f68b98ddfac30dea71d89d4916eaf3263e642ad06805c3175f620412e546784335ac -) - -build() { - cd $srcdir/${pkgname%-art}-$pkgver - - ## Add artwork splash image ## - install -Dm644 $srcdir/${pkgname%-art}-splash-artwork.png \ - $srcdir/${pkgname%-art}-$pkgver/data/images/${pkgname%-art}-splash.png - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --enable-${pkgname%-art}-console \ - --enable-mp \ - --enable-python \ - --sysconfdir=/etc \ - --with-gif-compression=lzw \ - --with-libcurl \ - --without-aa \ - --without-gvfs - make -} - -package() { - cd $srcdir/${pkgname%-art}-$pkgver - make DESTDIR=$pkgdir install - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgdir/usr/lib/${pkgname%-art}/${pkgver::2}0/plug-ins/*.py - - ## Add artwork splash license ## - install -Dm644 $srcdir/${pkgname%-art}-splash-artwork.license \ - $pkgdir/usr/share/licenses/${pkgname%-art}/${pkgname%-art}-splash-artwork.license - - rm $pkgdir/usr/share/man/man1/$_pkgname-console.1 - ln -s ${pkgname%-art}-console-${pkgver%.*}.1.gz $pkgdir/usr/share/man/man1/${pkgname%-art}-console.1.gz - ln -s ${pkgname%-art}tool-${pkgver::2}0 $pkgdir/usr/bin/${pkgname%-art}tool - ln -sf ${pkgname%-art}tool-${pkgver::2}0.1.gz $pkgdir/usr/share/man/man1/${pkgname%-art}tool.1.gz -} diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license deleted file mode 100644 index 0600f3f76..000000000 --- a/pcr/gimp-art/gimp-splash-artwork.license +++ /dev/null @@ -1,13 +0,0 @@ -GIMP LIBRE SPLASH LICENSE - -Logo and Effects is created by Zé Lara <ze.miguel.lara@gmail.com> and Márcio Silva <coadde@parabola.nu> -Idea by André Silva <emulatorman@parabola.nu> - -The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send aletter to Creative Commons, 444 Castro Street, -Suite 900, Mountain View, California, 94041, USA. - -Sangeno Waterfall Picture is created by Abedinali from Wikimedia Commons under the Creative Commons CC0 1.0 Universal license (Public Domain). -To the extent possible under law, Abedinali from Wikimedia Commons has waived all copyright and related or neighboring rights to Sangeno Waterfall. -This work is published from: United States. -https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg diff --git a/pcr/gimp-art/gimp-splash-artwork.png b/pcr/gimp-art/gimp-splash-artwork.png Binary files differdeleted file mode 100644 index 76c9e8c94..000000000 --- a/pcr/gimp-art/gimp-splash-artwork.png +++ /dev/null diff --git a/pcr/gimp-pcr/PKGBUILD b/pcr/gimp-pcr/PKGBUILD deleted file mode 100644 index 6b6ed80f1..000000000 --- a/pcr/gimp-pcr/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 198811 2013-11-05 16:40:29Z bpiotrowski $ -# Maintainer (Arch): Daniel Isenmann <daniel@archlinux.org> - -_pkgname=gimp -pkgname=$_pkgname-pcr -pkgver=2.8.10 -pkgrel=1 -pkgdesc="GNU Image Manipulation Program" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gimp.org/" -license=('GPL' 'LGPL') -depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ - 'libexif' 'gegl' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl') -makedepends=('intltool' 'webkitgtk2' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript') -optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' - 'webkitgtk2: for the help browser' - 'poppler-glib: for pdf support' - 'alsa-lib: for MIDI event controller module' - 'curl: for URI support' - 'ghostscript: for postscript support') -options=('!makeflags') -provides=("$_pkgname") -conflicts=('gimp-devel' "$_pkgname") -install=gimp.install -source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver}.tar.bz2 gnu.gpl - uri-backend-libcurl.patch) -md5sums=('84c964aab7044489af69f7319bb59b47' - '2d823a7e7cd7f99b681943e42bfb7d40' - 'e894f4b2ffa92c71448fdd350e9b78c6') - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # fixing freetype header path file - sed -i "s|freetype/tttables[.]h|freetype2/tttables.h|" app/text/${_pkgname}font.c -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - #patch -p1 < ../uri-backend-libcurl.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --enable-mp --enable-gimp-console --enable-gimp-remote \ - --enable-python --with-gif-compression=lzw --with-libcurl \ - --without-aa --without-hal --without-gvfs --without-gnomevfs - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py - install -D -m644 "${srcdir}/gnu.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/GNU.gpl" - - rm "${pkgdir}/usr/share/man/man1/gimp-console.1" - ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz" - ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" - ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz" -} diff --git a/pcr/gimp-pcr/gimp.install b/pcr/gimp-pcr/gimp.install deleted file mode 100644 index c317fbaca..000000000 --- a/pcr/gimp-pcr/gimp.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/pcr/gimp-pcr/gnu.gpl b/pcr/gimp-pcr/gnu.gpl deleted file mode 100644 index e7ce2b288..000000000 --- a/pcr/gimp-pcr/gnu.gpl +++ /dev/null @@ -1,19 +0,0 @@ -GIMP Palette -Name: gnu -# - 0 0 0 - 0 0 170 - 0 170 0 - 0 170 170 -170 0 0 -170 0 170 -170 85 0 -170 170 170 - 85 85 85 - 85 85 255 - 85 255 85 - 85 255 255 -255 85 85 -255 85 255 -255 255 85 -255 255 255 diff --git a/pcr/gimp-pcr/uri-backend-libcurl.patch b/pcr/gimp-pcr/uri-backend-libcurl.patch deleted file mode 100644 index 85da2fc7f..000000000 --- a/pcr/gimp-pcr/uri-backend-libcurl.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c ---- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c 2010-07-03 00:51:59.000000000 +0200 -+++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c 2011-06-23 19:15:30.000000000 +0200 -@@ -4,9 +4,9 @@ - * libcurl backend for the URI plug-in - * Copyright (C) 2006 Mukund Sivaraman <muks@mukund.org> - * -- * This program is free software; you can redistribute it and/or modify -+ * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -+ * 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, -@@ -15,8 +15,7 @@ - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - - #include "config.h" -@@ -24,7 +23,6 @@ - #include <errno.h> - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include <glib/gstdio.h> -@@ -63,7 +61,7 @@ - - vinfo = curl_version_info (CURLVERSION_NOW); - -- protocols = g_string_new ("http:,ftp:"); -+ protocols = g_string_new ("http:,ftp:,gopher:"); - - if (vinfo->features & CURL_VERSION_SSL) - { -@@ -153,7 +151,7 @@ - FILE *out_file; - CURL *curl_handle; - CURLcode result; -- gint response_code; -+ glong response_code; - - gimp_progress_init (_("Connecting to server")); - -@@ -195,12 +193,12 @@ - - curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code); - -- if (response_code != 200) -+ if (response_code != 200 && response_code != 226 && response_code != 0) - { - fclose (out_file); - g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Opening '%s' for reading resulted in HTTP " -- "response code: %d"), -+ "response code: %ld"), - uri, response_code); - curl_easy_cleanup (curl_handle); - return FALSE; -@@ -224,3 +222,10 @@ - - return FALSE; - } -+ -+gchar * -+uri_backend_map_image (const gchar *uri, -+ GimpRunMode run_mode) -+{ -+ return NULL; -+} diff --git a/pcr/gimp-plugin-resynthesizer-git/PKGBUILD b/pcr/gimp-plugin-resynthesizer-git/PKGBUILD new file mode 100644 index 000000000..0de110ebc --- /dev/null +++ b/pcr/gimp-plugin-resynthesizer-git/PKGBUILD @@ -0,0 +1,43 @@ +# Contributor (Arch): Lex Black (autumn-wind at web.de) +# Contributor (Arch): andre.vmatos +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> + +_pkgname=resynthesizer +pkgname=gimp-plugin-$_pkgname-git +pkgver=2.0.r13.g251eedc +pkgrel=2 +pkgdesc="Suite of gimp plugins for texture synthesis (like heal-selection). Git-Version" +arch=('i686' 'x86_64') +url="https://github.com/bootchk/resynthesizer" +license=('GPL2') +depends=('gimp') +makedepends=('git' 'intltool') +conflicts=('gimp-resynth' 'gimp-resynth-git') +options=('!emptydirs') +source=('git://github.com/bootchk/resynthesizer#branch=master') +md5sums=('SKIP') + + +pkgver() { + cd $_pkgname + git describe | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//' +} + +prepare() { + cd $_pkgname + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' PluginScripts/*.py + sed -i 's/--enable-maintainer-mode//g' autogen.sh +} + +build() { + cd $_pkgname + + ./autogen.sh --disable-maintainer-mode --prefix=/usr + make +} + +package() { + cd $_pkgname + + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/gimp-plugin-saveforweb/PKGBUILD b/pcr/gimp-plugin-saveforweb/PKGBUILD new file mode 100644 index 000000000..70a2b47fc --- /dev/null +++ b/pcr/gimp-plugin-saveforweb/PKGBUILD @@ -0,0 +1,26 @@ +# Contributor (Arch): Cesar Alcalde <lambda512_at_gmail.com> +# Contributor (Arch): ValHue <vhuelamo_at_gmail_dot_com> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=gimp-plugin-saveforweb +pkgver=0.29.3 +pkgrel=2.1 +pkgdesc="Plugin to save optimized images for display on web pages" +url="http://registry.gimp.org/node/33" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gimp>=2.3') +makedepends=('perl-xml-parser' 'intltool' 'gettext') +source=(http://registry.gimp.org/files/gimp-save-for-web-$pkgver.tar.bz2) +md5sums=('9dae11ffa9f7b8e44a65df5b0e49a04c') + +build() { + cd "${srcdir}/gimp-save-for-web-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/gimp-save-for-web-$pkgver" + make DESTDIR=${pkgdir} install +} diff --git a/pcr/gimpfx-foundry/PKGBUILD b/pcr/gimpfx-foundry/PKGBUILD new file mode 100644 index 000000000..c49167eab --- /dev/null +++ b/pcr/gimpfx-foundry/PKGBUILD @@ -0,0 +1,21 @@ +# Contributor (Arch): Vitaliy Berdinskikh <skipper13@root.ua> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=gimpfx-foundry +pkgver=2.6_1 +pkgrel=2.1 +pkgdesc="Collection of Gimp scripts" +url="http://gimpfx-foundry.sourceforge.net/" +license="GPL" +arch=('any') +depends=('gimp') +source=(http://downloads.sourceforge.net/sourceforge/gimpfx-foundry/${pkgname}-${pkgver/_/-}.tar.gz) +md5sums=('72c01fe6ac0dd4ce3151d306113c01a7') +sha1sums=('ee4aa98c60bbf6a70ef1404c50cbd27530bf9597') + +package() { + cd $srcdir + + mkdir -p $pkgdir/usr/share/gimp/2.0/scripts + install -m644 *.scm $pkgdir/usr/share/gimp/2.0/scripts +} diff --git a/pcr/glib/PKGBUILD b/pcr/glib/PKGBUILD new file mode 100644 index 000000000..6c683e100 --- /dev/null +++ b/pcr/glib/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Connor Behan <connor.behan@gmail.com> +# Contributor: Eric Bélanger <eric@archlinux.org> + +pkgname=glib +pkgver=1.2.10 +pkgrel=12 +pkgdesc="Common C routines used by Gtk+ and other libs" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('LGPL') +depends=('glibc' 'sh') +options=('!makeflags') +install=glib.install +source=(ftp://ftp.gnome.org/pub/gnome/sources/glib/1.2/${pkgname}-${pkgver}.tar.gz + gcc340.patch aclocal-fixes.patch glib1-autotools.patch) +sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' + 'a2cc224a66aeffdcac16ebd9e8af18143cf54918' + 'ae4438cf56c0c9264ee36f6973fb445f9a820be0' + '8a25fde3c79567262b3024f4e74c9ca4ee8a6279') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i "${srcdir}/gcc340.patch" + patch -Np0 -i "${srcdir}/aclocal-fixes.patch" + patch -Np1 -i "${srcdir}/glib1-autotools.patch" +} + +build() { + cd ${pkgname}-${pkgver} + if [[ $CARCH = "i686" ]]; then + CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu' + elif [[ $CARCH = "x86_64" ]]; then + CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + fi + + autoreconf --force --install + ./configure --prefix=/usr --mandir=/usr/share/man \ + --infodir=/usr/share/info $CONFIGFLAG + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/glib/aclocal-fixes.patch b/pcr/glib/aclocal-fixes.patch new file mode 100644 index 000000000..b064074aa --- /dev/null +++ b/pcr/glib/aclocal-fixes.patch @@ -0,0 +1,11 @@ +--- glib.m4.orig 2006-03-05 13:13:24.000000000 +0000 ++++ glib.m4 2006-03-05 13:13:35.000000000 +0000 +@@ -5,7 +5,7 @@ + dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or + dnl gthread is specified in MODULES, pass to glib-config + dnl +-AC_DEFUN(AM_PATH_GLIB, ++AC_DEFUN([AM_PATH_GLIB], + [dnl + dnl Get the cflags and libraries from the glib-config script + dnl diff --git a/pcr/glib/gcc340.patch b/pcr/glib/gcc340.patch new file mode 100644 index 000000000..941111ae7 --- /dev/null +++ b/pcr/glib/gcc340.patch @@ -0,0 +1,15 @@ +diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h +--- glib-1.2.10.orig/glib.h 2001-02-27 04:44:38.000000000 +0100 ++++ glib-1.2.10/glib.h 2004-05-27 15:50:32.436527848 +0200 +@@ -271,8 +271,10 @@ + + /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with + * macros, so we can refer to them as strings unconditionally. ++ * ++ * Unfortunately these are _not_ treated as strings anymore in GCC3.4. + */ +-#ifdef __GNUC__ ++#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4) + #define G_GNUC_FUNCTION __FUNCTION__ + #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ + #else /* !__GNUC__ */ diff --git a/~coadde/cross-binutils/binutils.install b/pcr/glib/glib.install index 9de0533ee..c0046feba 100644 --- a/~coadde/cross-binutils/binutils.install +++ b/pcr/glib/glib.install @@ -1,17 +1,20 @@ infodir=usr/share/info -filelist=(as.info bfd.info binutils.info gprof.info ld.info) +filelist=(glib.info.gz) -post_upgrade() { +post_install() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + install-info $infodir/$file $infodir/dir 2> /dev/null done } +post_upgrade() { + post_install $1 +} + pre_remove() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + install-info --delete $infodir/$file $infodir/dir 2> /dev/null done } - diff --git a/pcr/glib/glib1-autotools.patch b/pcr/glib/glib1-autotools.patch new file mode 100644 index 000000000..1332c9639 --- /dev/null +++ b/pcr/glib/glib1-autotools.patch @@ -0,0 +1,33 @@ +diff -Naur glib-1.2.10-orig/configure.in glib-1.2.10/configure.in +--- glib-1.2.10-orig/configure.in 2013-07-22 01:33:26.930091236 -0400 ++++ glib-1.2.10/configure.in 2013-07-22 01:35:19.988776415 -0400 +@@ -17,7 +17,7 @@ + + dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they + dnl are available for $ac_help expansion (don't we all *love* autoconf?) +-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl ++AC_DIVERT_PUSH()dnl + # + # The following version number definitions apply to GLib, GModule and GThread + # as a whole, so if changes occoured in any of them, they are all +@@ -81,7 +81,7 @@ + + dnl figure debugging default, prior to $ac_help setup + dnl +-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl ++AC_DIVERT_PUSH()dnl + if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then + debug_default=yes + else +diff -Naur glib-1.2.10-orig/gmodule/Makefile.am glib-1.2.10/gmodule/Makefile.am +--- glib-1.2.10-orig/gmodule/Makefile.am 2013-07-22 01:33:26.933424531 -0400 ++++ glib-1.2.10/gmodule/Makefile.am 2013-07-22 01:38:46.553041607 -0400 +@@ -42,7 +42,7 @@ + libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) + + noinst_PROGRAMS = testgmodule +-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ ++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ + testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ + + .PHONY: files release diff --git a/pcr/gnash-git/PKGBUILD b/pcr/gnash-git/PKGBUILD index 2f8a802ad..6e041e2ce 100644 --- a/pcr/gnash-git/PKGBUILD +++ b/pcr/gnash-git/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gnash-git _gitname=gnash -pkgver=0.8.11.r22270.g84f8bfd +pkgver=0.8.11.r22276.g939bcfb pkgrel=1 pkgdesc="The GNU SWF Player based on GameSWF - git development version" arch=('i686' 'x86_64') @@ -15,25 +15,20 @@ depends=('curl' 'giflib' 'sdl' 'libjpeg' 'libpng' 'libltdl' 'libgl' 'glu' 'speex' 'fontconfig' 'cairo' 'ffmpeg' 'jemalloc' 'boost-libs' 'gtk2' 'libldap' 'hicolor-icon-theme' 'desktop-file-utils' 'gconf' 'gtkglext' 'agg') -makedepends=('mesa' 'xulrunner' 'pkgconfig' 'boost' 'git') -provides=('gnash-common' 'gnash-gtk') -conflicts=('gnash-common' 'gnash-gtk') +makedepends=('mesa' 'xulrunner' 'pkgconfig' 'boost' 'git' + 'gdk-pixbuf2' 'gdk-pixbuf') +provides=('gnash-common' 'gnash-gtk' "$_gitname") +conflicts=('gnash-common' 'gnash-gtk' "$_gitname") replaces=('gnash-common' 'gnash-gtk') options=('!emptydirs') install=$_gitname.install backup=('etc/gnashpluginrc') -source=("libre://$pkgname-$pkgver.tar.gz") -md5sums=('efe95a81cc3bc4316f5d3567d821d15d') +source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('d771bf518551efedc5593868e0750a25') mksource=('git://git.sv.gnu.org/gnash.git') mkmd5sums=('SKIP') -pkgver() { - cd $_gitname - - echo "0.8.11.r$(git rev-list --count master).g$(git log -1 --format="%h")" -} - prepare() { cd $_gitname diff --git a/pcr/gnash/PKGBUILD b/pcr/gnash/PKGBUILD deleted file mode 100644 index 93265ce21..000000000 --- a/pcr/gnash/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 107172 2014-03-14 00:14:28Z heftig $ -# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gnash -pkgdesc="A GNU Flash movie player" -pkgver=0.8.11dev -pkgrel=2 -arch=(i686 x86_64) -url="http://www.gnu.org/software/gnash/" -license=(GPL3) -depends=(curl giflib sdl agg libjpeg libpng libltdl libgl glu speex fontconfig cairo ffmpeg jemalloc boost-libs gtk2 libldap hicolor-icon-theme desktop-file-utils gconf gtkglext) -makedepends=(libtool mesa xulrunner pkgconfig boost git) -provides=(gnash-common gnash-gtk) -conflicts=(gnash-common gnash-gtk) -replaces=(gnash-common gnash-gtk) -options=(!emptydirs) -backup=(etc/gnashrc etc/gnashthumbnailrc etc/gnashpluginrc) -install=gnash-gtk.install -source=('gnash::git://git.sv.gnu.org/gnash.git#commit=a3180f2' - nodebug.patch) -sha256sums=('SKIP' - '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551') - - -prepare() { - cd gnash - - # Disable very, very verbose debugging (gigabytes of logs) - patch -Np1 -i ../nodebug.patch - - ./autogen.sh -} - -build() { - cd gnash - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-plugins-install=system \ - --with-npapi-plugindir=/usr/lib/mozilla/plugins \ - --enable-gui=sdl,gtk,dump \ - --enable-media=ffmpeg \ - --enable-renderer=all \ - --enable-device=x11 - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd gnash - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install install-plugin - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/gnash.schemas" --domain gnash \ - "$pkgdir"/usr/share/applications/*.schemas - rm -f "$pkgdir"/usr/share/applications/*.schemas -} diff --git a/pcr/gnash/gnash-gtk.install b/pcr/gnash/gnash-gtk.install deleted file mode 100644 index 6678a7f8a..000000000 --- a/pcr/gnash/gnash-gtk.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - gconfpkg --install gnash - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - gconfpkg --uninstall gnash -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/pcr/gnash/nodebug.patch b/pcr/gnash/nodebug.patch deleted file mode 100644 index ca160b898..000000000 --- a/pcr/gnash/nodebug.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h ---- gnash-0.8.9/libbase/log.h 2011-02-26 19:11:08.000000000 +0100 -+++ gnash-0.8.9-nodebug/libbase/log.h 2012-01-18 09:39:02.004103494 +0100 -@@ -331,27 +331,27 @@ - - // Define to 0 to completely remove parse debugging at compile-time - #ifndef VERBOSE_PARSE --#define VERBOSE_PARSE 1 -+#define VERBOSE_PARSE 0 - #endif - - // Define to 0 to completely remove action debugging at compile-time - #ifndef VERBOSE_ACTION --#define VERBOSE_ACTION 1 -+#define VERBOSE_ACTION 0 - #endif - - // Define to 0 to remove ActionScript errors verbosity at compile-time - #ifndef VERBOSE_ASCODING_ERRORS --#define VERBOSE_ASCODING_ERRORS 1 -+#define VERBOSE_ASCODING_ERRORS 0 - #endif - - // Define to 0 this to remove invalid SWF verbosity at compile-time - #ifndef VERBOSE_MALFORMED_SWF --#define VERBOSE_MALFORMED_SWF 1 -+#define VERBOSE_MALFORMED_SWF 0 - #endif - - // Define to 0 this to remove Networking verbosity at compile-time - #ifndef VERBOSE_NETWORKING --#define VERBOSE_NETWORKING 1 -+#define VERBOSE_NETWORKING 0 - #endif - - #if VERBOSE_PARSE -diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp ---- gnash-0.8.9/libcore/vm/ActionExec.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp 2012-01-18 09:40:25.653458508 +0100 -@@ -46,7 +46,7 @@ - // too much information for my tastes. I really want just - // to see how stack changes while executing actions... - // --strk Fri Jun 30 02:28:46 CEST 2006 --# define DEBUG_STACK 1 -+//# define DEBUG_STACK 1 - - // Max number of stack item to dump. 0 for unlimited. - # define STACK_DUMP_LIMIT 32 diff --git a/pcr/gtk/PKGBUILD b/pcr/gtk/PKGBUILD new file mode 100644 index 000000000..22d94cdb1 --- /dev/null +++ b/pcr/gtk/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Connor Behan <connor.behan@gmail.com> +# Contributor: Eric Bélanger <eric@archlinux.org> + +pkgname=gtk +pkgver=1.2.10 +pkgrel=15 +pkgdesc="A multi-platform toolkit (v1)" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('LGPL') +depends=('libxi' 'glib') +makedepends=('libxt') +install=gtk.install +source=(ftp://ftp.gnome.org/pub/gnome/sources/gtk+/1.2/gtk+-${pkgver}.tar.gz + aclocal-fixes.patch) +sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' + 'b034e33efb85d27f3f3fb082c404e3b6ea79259f') + +prepare() { + cd gtk+-${pkgver} + cp /usr/share/libtool/build-aux/config.guess . + cp /usr/share/libtool/build-aux/config.sub . + patch -p0 -i "${srcdir}/aclocal-fixes.patch" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure +} + +build() { + cd gtk+-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc \ + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-xinput=xfree + make +} + +package() { + cd gtk+-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/gtk/aclocal-fixes.patch b/pcr/gtk/aclocal-fixes.patch new file mode 100644 index 000000000..dd2ffbd44 --- /dev/null +++ b/pcr/gtk/aclocal-fixes.patch @@ -0,0 +1,11 @@ +--- gtk.m4.orig 2006-03-05 13:18:09.000000000 +0000 ++++ gtk.m4 2006-03-05 13:18:20.000000000 +0000 +@@ -4,7 +4,7 @@ + dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) + dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS + dnl +-AC_DEFUN(AM_PATH_GTK, ++AC_DEFUN([AM_PATH_GTK], + [dnl + dnl Get the cflags and libraries from the gtk-config script + dnl diff --git a/pcr/gtk/gtk.install b/pcr/gtk/gtk.install new file mode 100644 index 000000000..8758bebc3 --- /dev/null +++ b/pcr/gtk/gtk.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gdk.info.gz gtk.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/pcr/gxmessage2/PKGBUILD b/pcr/gxmessage-gtk2/PKGBUILD index 180edee04..f3f19335b 100644 --- a/pcr/gxmessage2/PKGBUILD +++ b/pcr/gxmessage-gtk2/PKGBUILD @@ -1,33 +1,28 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer (Arch): Geoffroy Carrier <geoffroy.carrier@koon.fr> +# Maintainer (Arch): Brian Bidulock <bidulock@openss7.org> +# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor (Arch): Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor (Arch): Jaroslav Lichtblau <tu@dragonlord.cz> +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +pkgname=gxmessage-gtk2 _pkgname=gxmessage pkgver=2.20.1 - -pkgname=$_pkgname${pkgver%%.*} -conflicts=("$_pkgname") -provides=("$_pkgname=$pkgver") -pkgrel=1 -pkgdesc="A GTK+${pkgver%%.*} based xmessage clone." +pkgrel=1.1 +pkgdesc="A GTK2 based xmessage clone for GTK2." arch=('i686' 'x86_64') url="http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage" license=('GPL') -depends=("gtk${pkgver%%.*}" 'desktop-file-utils') +depends=('gtk2' 'desktop-file-utils') makedepends=('pkgconfig' 'intltool') +provides=("$_pkgname") +conflicts=("$_pkgname") install=$_pkgname.install -source=(https://ftp.gnu.org/pub/gnu/$_pkgname/$_pkgname-${pkgver}.tar.gz{,.sig} - $_pkgname.desktop.in) -md5sums=('45428121eb08db8472fc378dc93d171d' - 'SKIP' - '03272ac913cd91437912002c5a7e4fe5') +source=(http://homepages.ihug.co.nz/~trmusson/stuff/$_pkgname-$pkgver.tar.gz + $_pkgname.desktop) +md5sums=('f4160442548bdd90895b008b85df0f6e' + 'af92506581c1aae70e3845a66a983f22') build() { - cd "$srcdir" - sed "s|@toolkit@|GTK+${pkgver%%.*}|g" \ - < gxmessage.desktop.in \ - > gxmessage.desktop cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix=/usr --mandir=/usr/share/man make @@ -39,3 +34,5 @@ package() { install -D -m644 "$srcdir/$_pkgname.desktop" \ "${pkgdir}/usr/share/applications/$_pkgname.desktop" } +md5sums=('45428121eb08db8472fc378dc93d171d' + 'af92506581c1aae70e3845a66a983f22') diff --git a/pcr/gxmessage2/gxmessage.desktop.in b/pcr/gxmessage-gtk2/gxmessage.desktop index 4c65512b6..f569431ff 100644 --- a/pcr/gxmessage2/gxmessage.desktop.in +++ b/pcr/gxmessage-gtk2/gxmessage.desktop @@ -2,8 +2,8 @@ Type=Application Name=Gxmessage GenericName=gxmessage -Comment=A @toolkit@ based xmessage clone. -Comment[cs]=Klon xmessage postavený na knihovně @toolkit@. +Comment=A GTK2 based xmessage clone. +Comment[cs]=Klon xmessage postavený na knihovně GTK2. Icon=gxmessage Exec=gxmessage Terminal=false diff --git a/pcr/gxmessage2/gxmessage.install b/pcr/gxmessage-gtk2/gxmessage.install index de3e0f510..de3e0f510 100644 --- a/pcr/gxmessage2/gxmessage.install +++ b/pcr/gxmessage-gtk2/gxmessage.install diff --git a/pcr/httrack/PKGBUILD b/pcr/httrack/PKGBUILD index 771fdfd81..d8f94516a 100644 --- a/pcr/httrack/PKGBUILD +++ b/pcr/httrack/PKGBUILD @@ -1,21 +1,23 @@ -# Maintainer (Arch): Marcos Heredia <chelqo@gmail.com> +# Contributor (Arch): Marcos Heredia <chelqo@gmail.com> # Contributor (Arch): Joris Steyn <jorissteyn@gmail.com> # Contributor (Arch): speps <speps at aur dot archlinux dot org> # Contributor (Arch): Roman Kyrylych <roman@archlinux.org> # Contributor (Arch): orelien <aurelien.foret@wanadoo.fr> +# Contributor (Arch): Muflone <webreg@vbsimple.net> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=httrack -pkgver=3.47.27 -pkgrel=1 +pkgver=3.48.21 +pkgrel=2 pkgdesc="An easy-to-use offline browser utility." -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.httrack.com/" -license=('GPL3') +license=('GPL') depends=('bash' 'xdg-utils' 'hicolor-icon-theme' 'openssl') options=('!libtool') install="$pkgname.install" -source=("http://download.httrack.com/$pkgname-$pkgver.tar.gz") -md5sums=('60a47cbda7775fdbe21802061a9ed47a') +source=("http://mirror.httrack.com/historical/$pkgname-$pkgver.tar.gz") +md5sums=('c2a2f44da400fe18fad6f98bac49a987') build() { cd "$srcdir/$pkgname-$pkgver" @@ -32,4 +34,3 @@ package() { install -Dpm644 AUTHORS INSTALL* README ${_docdir}/ install -Dpm644 COPYING license.txt ${_licdir}/ } - diff --git a/pcr/icinga2/PKGBUILD b/pcr/icinga2/PKGBUILD new file mode 100644 index 000000000..02b36f3c3 --- /dev/null +++ b/pcr/icinga2/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer (Arch): Malte Rabenseifner <mail@malte-rabenseifner.de> +# Contributor (Arch): bebehei <bebe@bebehei.de> + +pkgname=icinga2 +pkgver=2.3.4 +pkgrel=1 +pkgdesc="A libre host, service and network monitoring program." +license=('GPL') +arch=('i686' 'x86_64') +url="http://www.icinga.org" +depends=('boost-libs' 'yajl') +makedepends=('boost' 'cmake' 'libmariadbclient' 'postgresql-libs' 'yajl') +optdepends=('monitoring-plugins: plugins needed for icinga checks' + 'libmariadbclient: for MySQL support' + 'postgresql-libs: for PostgreSQL support') +backup=(etc/default/icinga2 + etc/icinga2/features-available/{api,checker,command,compatlog}.conf + etc/icinga2/features-available/{debuglog,gelf,graphite,icingastatus}.conf + etc/icinga2/features-available/{ido-mysql,ido-pgsql,livestatus,mainlog}.conf + etc/icinga2/features-available/{notification,perfdata,statusdata,syslog}.conf + etc/icinga2/{constants,icinga2,init,zones}.conf + etc/logrotate.d/icinga2) +install='icinga2.install' +source=("https://github.com/Icinga/$pkgname/archive/v$pkgver.tar.gz") +sha256sums=('3a6d23214c90c1e308df784254659c51962f4c49b13093aff2095e1dfa06cdaa') + +build() { + mkdir -p "$srcdir/$pkgname-$pkgver/build" + cd "$srcdir/$pkgname-$pkgver/build" + + cmake "$srcdir/$pkgname-$pkgver" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DICINGA2_RUNDIR=/run \ + -DCMAKE_INSTALL_SBINDIR=/usr/bin \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DICINGA2_SYSCONFIGFILE=/etc/default/icinga2 \ + -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins \ + -DUSE_SYSTEMD=ON + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + + make DESTDIR="$pkgdir" install + + mv "$pkgdir/etc/icinga2/conf.d" "$pkgdir/etc/icinga2/conf.d.example" + mkdir "$pkgdir/etc/icinga2/conf.d" + rm "$pkgdir/etc/icinga2/features-enabled/checker.conf" + rm "$pkgdir/etc/icinga2/features-enabled/mainlog.conf" + rm "$pkgdir/etc/icinga2/features-enabled/notification.conf" + rm -r "$pkgdir/run" + + mkdir -p "$pkgdir/usr/lib/tmpfiles.d" + cat > "$pkgdir/usr/lib/tmpfiles.d/icinga2.conf" <<- EOF + d /run/icinga2 0750 icinga icingacmd - + d /run/icinga2/cmd 2750 icinga icingacmd - + EOF + + chmod 750 "$pkgdir/etc/icinga2" \ + "$pkgdir/var/lib/icinga2" \ + "$pkgdir/var/spool/icinga2" \ + "$pkgdir/var/cache/icinga2" \ + "$pkgdir/var/log/icinga2" +} diff --git a/pcr/icinga2/icinga2.install b/pcr/icinga2/icinga2.install new file mode 100644 index 000000000..86ea3d4bc --- /dev/null +++ b/pcr/icinga2/icinga2.install @@ -0,0 +1,52 @@ +post_install() { + /usr/bin/getent group icinga &> /dev/null || /usr/bin/groupadd -r icinga &> /dev/null + /usr/bin/getent group icingacmd &> /dev/null || /usr/bin/groupadd -r icingacmd &> /dev/null + /usr/bin/getent passwd icinga &> /dev/null || /usr/bin/useradd -r -c "icinga" -M -d /var/spool/icinga2 -g icinga -G icingacmd -s /usr/bin/nologin icinga &> /dev/null + + /usr/bin/chown -R icinga:icinga \ + /etc/icinga2 \ + /var/lib/icinga2 \ + /var/spool/icinga2 + + /usr/bin/chown -R icinga:icingacmd \ + /var/cache/icinga2 \ + /var/log/icinga2 + + /usr/bin/systemd-tmpfiles --create icinga2.conf + + /usr/bin/icinga2 feature enable checker &> /dev/null + /usr/bin/icinga2 feature enable mainlog &> /dev/null + /usr/bin/icinga2 feature enable notification &> /dev/null +} + +pre_upgrade() { + /usr/bin/chown -R root:root \ + /etc/icinga2 \ + /var/lib/icinga2 \ + /var/spool/icinga2 \ + /var/cache/icinga2 \ + /var/log/icinga2 +} + +post_upgrade() { + /usr/bin/chown -R icinga:icinga \ + /etc/icinga2 \ + /var/lib/icinga2 \ + /var/spool/icinga2 + + /usr/bin/chown -R icinga:icingacmd \ + /var/cache/icinga2 \ + /var/log/icinga2 +} + +pre_remove() { + [ -f "/etc/icinga2/features-enabled/checker.conf" ] && /usr/bin/icinga2 feature disable checker &> /dev/null + [ -f "/etc/icinga2/features-enabled/mainlog.conf" ] && /usr/bin/icinga2 feature disable mainlog &> /dev/null + [ -f "/etc/icinga2/features-enabled/notification.conf" ] && /usr/bin/icinga2 feature disable notification &> /dev/null +} + +post_remove() { + /usr/bin/getent passwd icinga &> /dev/null && /usr/bin/userdel icinga &> /dev/null + /usr/bin/getent group icinga &> /dev/null && /usr/bin/groupdel icinga &> /dev/null + /usr/bin/getent group icingacmd &> /dev/null && /usr/bin/groupdel icingacmd &> /dev/null +} diff --git a/pcr/initng-git/PKGBUILD b/pcr/initng-git/PKGBUILD index baa877648..f50687ffd 100644 --- a/pcr/initng-git/PKGBUILD +++ b/pcr/initng-git/PKGBUILD @@ -1,51 +1,45 @@ +# Maintainer (Arch): Zsolt Udvari <udvzsolt gmail com> # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (AUR): Jens Staal <staal1978@gmail.com> -_pkgname=initng pkgname=initng-git -pkgver=20120517.1043 +_gitname="initng" +pkgver=774.3d82abc +pkgrel=1 pkgdesc="A full replacement for the old System V Init system" -url="http://initng.org/" +arch=('i686' 'x86_64') +url="http://initng.sourceforge.net/trac" license=('GPL3') - -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -provides=('init') -depends=('dbus') -makedepends=('git' 'acr' 'ftjam' 'makepkg-git') -optdepends=('ncurses') +makedepends=('git' 'acr' 'ftjam' 'dbus') +optdepdends=('ncurses') options=(!strip) -source=('git://github.com/initng/initng.git' fixes.patch) -backup=(etc/initng/killall5-ignore) +source=(git://github.com/initng/${_gitname}.git + initng-paths.h +) +md5sums=('SKIP' + '3336bc8037273a3e007891d09967a627') pkgver() { - cd "$srcdir/$_pkgname" - date -u +%Y%m%d.%H%M -d "$(git log -n1 --date=iso --format=format:'%cd')" + cd $_gitname + echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) } build() { - cd "$srcdir/$_pkgname" - patch -Np1 -i "$srcdir/fixes.patch" + rm -rf $srcdir/build #start fresh + cp -ar $srcdir/initng $srcdir/build + cd $srcdir/build + cp ${srcdir}/initng-paths.h . + sed -i "s|includedir=.*|&/libinitng-@VERSION@|" initng.pc.acr + sed -i "s/_BSD_SOURCE/_DEFAULT_SOURCE/g" \ + src/modules/chroot/initng_chroot.c \ + src/modules/fmon/initng_fmon.c \ + src/modules/netdev/initng_netdev.c \ + src/modules/suid/initng_suid.c acr - ./configure --prefix="/usr" --sbindir=/sbin --sysconfdir=/etc - jam + ./configure --prefix="/usr" + make } package() { - cd "$srcdir/$_pkgname" - - jam install DESTDIR="$pkgdir" - find "$pkgdir"/usr/lib -type f -name '*.so*' -exec chmod 755 {} + - find "$pkgdir"/sbin -type f -exec chmod 755 {} + - pushd "$pkgdir"/usr/lib - ln -s libngeclient.so.* libngeclient.so.0 - ln -s libngcclient.so.* libngcclient.so.0 - popd - - install -d "$pkgdir"/usr/share/licenses/initng - install -m644 COPYING "$pkgdir"/usr/share/licenses/initng/ - install -m644 AUTHORS "$pkgdir"/usr/share/licenses/initng/ + cd $srcdir/build + make install DESTDIR=$pkgdir } - -md5sums=('SKIP' - 'bf6d17e00c5f0d85d99b7184980528ad') diff --git a/pcr/initng-git/fixes.patch b/pcr/initng-git/fixes.patch deleted file mode 100644 index 397965e38..000000000 --- a/pcr/initng-git/fixes.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ru initng.orig/include/initng/io.h initng/include/initng/io.h ---- initng.orig/include/initng/io.h 2012-12-11 03:45:20.000000000 -0500 -+++ initng/include/initng/io.h 2012-12-11 03:44:30.000000000 -0500 -@@ -21,6 +21,7 @@ - #define INITNG_IO_H - - #include <unistd.h> -+#include <stdbool.h> - #include <fcntl.h> - - #include <initng/active_db.h> -@@ -43,6 +44,6 @@ - pipe_h * pipe); - void initng_io_module_poll(int timeout); - --int initng_io_set_cloexec(int fd); -+/* int initng_io_set_cloexec(int fd); */ - - #endif /* !defined(INITNG_IO_H) */ -diff -ru initng.orig/src/main/io/open.c initng/src/main/io/open.c ---- initng.orig/src/main/io/open.c 2012-12-11 03:45:20.000000000 -0500 -+++ initng/src/main/io/open.c 2012-12-11 03:44:30.000000000 -0500 -@@ -26,8 +26,5 @@ - int fd; - - fd = open(path, flags); -- if (fd != -1) { -- initng_io_fdtrack(fd); -- } - return fd; - } diff --git a/pcr/initng-git/initng-paths.h b/pcr/initng-git/initng-paths.h new file mode 100644 index 000000000..96decfc9c --- /dev/null +++ b/pcr/initng-git/initng-paths.h @@ -0,0 +1,7 @@ +#ifndef INITNG_PATHS_H +#define INITNG_PATHS_H + +#define DEVDIR "/dev" +#define INITNG_PLUGIN_DIR "/usr/lib/initng" + +#endif /* INITNG_PATHS_H */ diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD index 0cf3d76f3..d956e06e0 100644 --- a/pcr/jitsi/PKGBUILD +++ b/pcr/jitsi/PKGBUILD @@ -1,23 +1,23 @@ -# Maintainer (Arch): Xavier Devlamynck <magicrhesus@ouranos.be> -# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne +# Contributor (Arch): Xavier Devlamynck <magicrhesus@ouranos.be> +# Contributor (Arch): Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=jitsi -pkgver=2.4.4997 +pkgver=2.8.5426 pkgrel=1 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://jitsi.org" license=('LGPL') -depends=('jre7-openjdk') -makedepends=('apache-ant' 'jdk7-openjdk') +depends=('java-runtime') +makedepends=('apache-ant' 'java-environment') options=(!strip !emptydirs zipman !libtool docs) source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" jitsi.desktop jitsi.sh drop-open-term-on-index-jn-html.patch) -sha256sums=('f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825' +sha256sums=('e649867e186cf195c4b1bb159d7ffe0a38c4dc60659e5c55f9a74461a309f36c' '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5' 'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631') @@ -26,7 +26,7 @@ prepare() { cd $srcdir/$pkgname # append the build revision to the jitsi version - sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java # remove Open Source term patch -Np0 -i ../drop-open-term-on-index-jn-html.patch @@ -72,7 +72,7 @@ build() { } package() { - cd $srcdir/$pkgname + cd "${srcdir}/${pkgname}" find lib/ lib/bundle/ -maxdepth 1 -type f -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; # find lib/os-specific/linux/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \; shopt -sq extglob diff --git a/pcr/kamailio/PKGBUILD b/pcr/kamailio/PKGBUILD index 741616dc3..33555bfd4 100644 --- a/pcr/kamailio/PKGBUILD +++ b/pcr/kamailio/PKGBUILD @@ -1,36 +1,38 @@ # Maintainer (Arch): Xavier Devlamynck <magicrhesus@ouranos.be> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=kamailio -pkgver=4.0.1 +pkgver=4.2.5 pkgrel=1 pkgdesc="Rock solid SIP server" url="http://www.kamailio.org/" license=('GPL2') -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') +depends=() makedepends=('flex' 'bison' 'docbook2x' 'mariadb' 'postgresql' 'libxml2' 'radiusclient-ng' 'lua51' 'mono' 'hiredis' 'libpurple' 'net-snmp' - 'libunistring' 'python2') + 'libunistring' 'python2') optdepends=('mariadb: mysql support' 'expat: xmpp/jabber support' - 'libxml2: cpl and presence modules support' - 'radiusclient-ng: radius support' - 'postgresql: postgresql backend') + 'libxml2: cpl and presence modules support' + 'postgresql: postgresql backend') +arch=('x86_64' 'i686') source=(http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz) -sha256sums=('dd8652f47a572c0b0e1e45bdd0f6f838a14e50f2dbbeed77726ec0c7076e1769') +sha256sums=('bc19d7a7cc0c3aceb68ac9bb64c2169d8713fe73a2267509954bd36f037810cc') +provides=() +conflicts=() +replaces=() +backup=('etc/kamailio/kamctlrc' 'etc/kamailio/kamailio.cfg' 'etc/kamailio/kamailio-basic.cfg' 'etc/kamailio/kamailio-advanced.cfg') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make cfg prefix=/usr cfg_prefix=/ bin_dir=/usr/bin - make PYTHON="python2" all + cd "${srcdir}/${pkgname}-${pkgver}" + make proper + sed -i 's/bin_dir = sbin\//bin_dir = bin\//g' Makefile.defs + make prefix=${pkgdir}/usr cfg_prefix=${pkgdir} LIBDIR=lib config + make all } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=${pkgdir}/usr \ - PYTHON="python2" \ - cfg_prefix=${pkgdir} \ - bind_dir=${pkgdir}/usr/bin \ - bingroup_include="standard standard-dep stable experimental" \ - skip_modules="iptrtpproxy osp dbtext oracle" \ - install + cd "${srcdir}/${pkgname}-${pkgver}" + make install } diff --git a/pcr/libcgroup/PKGBUILD b/pcr/libcgroup/PKGBUILD index 605dcbca3..396316e76 100644 --- a/pcr/libcgroup/PKGBUILD +++ b/pcr/libcgroup/PKGBUILD @@ -1,11 +1,12 @@ # Maintainer (Arch): Christian Hesse <mail@eworm.de> # Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=libcgroup -pkgver=0.40rc1 +pkgver=0.41 pkgrel=1 pkgdesc="Library that abstracts the control group file system in Linux" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://libcg.sourceforge.net" license=(LGPL) backup=('etc/cgconfig.conf' @@ -52,6 +53,6 @@ package() { chmod 2755 ${pkgdir}/usr/bin/cgexec } -sha256sums=('c2fa2cfdfd1023093afb6de456fc3ac000f92a2f01b905bcdda1c3e36ad44072' +sha256sums=('e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51' '808fc354abf36d7b6673dad790be275309ac57a2606d1be3732b9b3aeb5885eb' '6b1340ff6717f55e5e57dacc72accc0bfaed7e50ef31439271b6ddc893cbf671') diff --git a/pcr/libfilteraudio-git/PKGBUILD b/pcr/libfilteraudio-git/PKGBUILD index 5e602d7ad..bb35f98be 100644 --- a/pcr/libfilteraudio-git/PKGBUILD +++ b/pcr/libfilteraudio-git/PKGBUILD @@ -1,13 +1,13 @@ -# Contributor (AUR): Håvard Pettersson <mail@haavard.me> -# Contributor (AUR): Ivan Shapovalov <intelfx100 at gmail dot com> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer (Arch): Håvard Pettersson <mail@haavard.me> +# Contributor (Arch): Ivan Shapovalov <intelfx100 at gmail dot com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _pkgname=libfilteraudio pkgname=libfilteraudio-git -pkgver=r87.d64d957 -pkgrel=3 +pkgver=r92.612c5a1 +pkgrel=1 pkgdesc="An easy to use audio filtering library made from webrtc code" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h') url="https://github.com/irungentoo/filter_audio" license=('BSD3') makedepends=('git') @@ -15,7 +15,7 @@ depends=('glibc') provides=("${_pkgname}" 'filter_audio') conflicts=("${_pkgname}" 'filter_audio') source=( - "${_pkgname}::git://github.com/irungentoo/libfilteraudio.git" + "${_pkgname}::git+https://github.com/irungentoo/libfilteraudio.git" 'LICENSE' ) sha512sums=('SKIP' diff --git a/pcr/libgcrypt15/PKGBUILD b/pcr/libgcrypt15/PKGBUILD new file mode 100644 index 000000000..e1a66c755 --- /dev/null +++ b/pcr/libgcrypt15/PKGBUILD @@ -0,0 +1,54 @@ +# Contributor (Arch): "UnCO" Lin <trash__box <_at_> 163.com> +# Contributor (Arch): Andreas Radke <andyrtr <_at_> archlinux.org> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=libgcrypt15 +_pkgname=libgcrypt +pkgver=1.5.4 +_apiver=11.8.3 +pkgrel=4 +pkgdesc="General purpose cryptographic library based on the code from GnuPG" +arch=(any) +url="http://www.gnupg.org" +license=('LGPL') +depends=() +source=( + ftp://ftp.gnupg.org/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + # HTTP MIRRORS + # http://gd.tuwien.ac.at/privacy/gnupg/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + # http://artfiles.org/gnupg.org/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + # http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + # http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + # http://www.ring.gr.jp/pub/net/gnupg/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + # + # Currently, this mirror returns 403 + # http://mirrors.dotsrc.org/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + debian_security_patches.patch +) +sha1sums=('bdf4b04a0d2aabc04ab3564fbe38fd094135aa7a' + 'eb1b1c3a8afd6705573455b9259ac6ece961d1b3') + +prepare() { + cd ${_pkgname}-${pkgver} + patch -Np1 -i "$srcdir"/debian_security_patches.patch +} + +build() { + cd ${_pkgname}-${pkgver} + ./configure --prefix=/usr \ + --disable-static \ + --disable-padlock-support + make +} + +# check() { + # cd ${_pkgname}-${pkgver} + # make check +# } + +package() { + cd ${_pkgname}-${pkgver} + install -Dm755 src/.libs/libgcrypt.so.${_apiver} "$pkgdir/usr/lib/libgcrypt.so.${_apiver}" + cd "$pkgdir/usr/lib" + ln -s libgcrypt.so.${_apiver} libgcrypt.so.11 +} diff --git a/pcr/libgcrypt15/debian_security_patches.patch b/pcr/libgcrypt15/debian_security_patches.patch new file mode 100644 index 000000000..2f17f8fab --- /dev/null +++ b/pcr/libgcrypt15/debian_security_patches.patch @@ -0,0 +1,435 @@ +diff -NurbBp libgcrypt-1.4.5.orig/src/libgcrypt-config.in libgcrypt-1.4.5/src/libgcrypt-config.in +--- libgcrypt-1.4.5.orig/src/libgcrypt-config.in 2009-04-02 11:25:32.000000000 +0200 ++++ libgcrypt-1.4.5/src/libgcrypt-config.in 2009-12-12 09:37:05.000000000 +0100 +@@ -151,7 +151,8 @@ if test "$echo_libs" = "yes"; then + fi + + # Set up `libs_final'. +- libs_final="$libs_final $gpg_error_libs" ++ #libs_final="$libs_final $gpg_error_libs" ++ libs_final="-lgcrypt" + + tmp="" + for i in $libdirs $libs_final; do +From 410d70bad9a650e3837055e36f157894ae49a57d Mon Sep 17 00:00:00 2001 +From: Werner Koch <wk@gnupg.org> +Date: Mon, 23 Feb 2015 11:39:58 +0100 +Subject: [PATCH] cipher: Use ciphertext blinding for Elgamal decryption. + +* cipher/elgamal.c (USE_BLINDING): New. +(decrypt): Rewrite to use ciphertext blinding. +-- + +CVE-id: CVE-2014-3591 + +As a countermeasure to a new side-channel attacks on sliding windows +exponentiation we blind the ciphertext for Elgamal decryption. This +is similar to what we are doing with RSA. This patch is a backport of +the GnuPG 1.4 commit ff53cf06e966dce0daba5f2c84e03ab9db2c3c8b. + +Unfortunately, the performance impact of Elgamal blinding is quite +noticeable (i5-2410M CPU @ 2.30GHz TP 220): + + Algorithm generate 100*priv 100*public + ------------------------------------------------ + ELG 1024 bit - 100ms 90ms + ELG 2048 bit - 330ms 350ms + ELG 3072 bit - 660ms 790ms + + Algorithm generate 100*priv 100*public + ------------------------------------------------ + ELG 1024 bit - 150ms 90ms + ELG 2048 bit - 520ms 360ms + ELG 3072 bit - 1100ms 800ms + +Signed-off-by: Werner Koch <wk@gnupg.org> +--- + cipher/elgamal.c | 46 +++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 41 insertions(+), 5 deletions(-) + +--- a/cipher/elgamal.c ++++ b/cipher/elgamal.c +@@ -38,6 +38,12 @@ + } ELG_public_key; + + ++/* Blinding is used to mitigate side-channel attacks. You may undef ++ this to speed up the operation in case the system is secured ++ against physical and network mounted side-channel attacks. */ ++#define USE_BLINDING 1 ++ ++ + typedef struct + { + gcry_mpi_t p; /* prime */ +@@ -486,12 +492,42 @@ + static void + decrypt(gcry_mpi_t output, gcry_mpi_t a, gcry_mpi_t b, ELG_secret_key *skey ) + { +- gcry_mpi_t t1 = mpi_alloc_secure( mpi_get_nlimbs( skey->p ) ); ++ gcry_mpi_t t1, t2, r; ++ unsigned int nbits = mpi_get_nbits (skey->p); ++ ++ t1 = mpi_snew (nbits); ++ ++#ifdef USE_BLINDING ++ ++ t2 = mpi_snew (nbits); ++ r = mpi_new (nbits); ++ ++ /* We need a random number of about the prime size. The random ++ number merely needs to be unpredictable; thus we use level 0. */ ++ _gcry_mpi_randomize (r, nbits, GCRY_WEAK_RANDOM); ++ ++ /* t1 = r^x mod p */ ++ mpi_powm (t1, r, skey->x, skey->p); ++ /* t2 = (a * r)^-x mod p */ ++ mpi_mulm (t2, a, r, skey->p); ++ mpi_powm (t2, t2, skey->x, skey->p); ++ mpi_invm (t2, t2, skey->p); ++ /* t1 = (t1 * t2) mod p*/ ++ mpi_mulm (t1, t1, t2, skey->p); ++ ++ mpi_free (r); ++ mpi_free (t2); ++ ++#else /*!USE_BLINDING*/ + + /* output = b/(a^x) mod p */ +- gcry_mpi_powm( t1, a, skey->x, skey->p ); +- mpi_invm( t1, t1, skey->p ); +- mpi_mulm( output, b, t1, skey->p ); ++ mpi_powm (t1, a, skey->x, skey->p); ++ mpi_invm (t1, t1, skey->p); ++ ++#endif /*!USE_BLINDING*/ ++ ++ mpi_mulm (output, b, t1, skey->p); ++ + #if 0 + if( DBG_CIPHER ) + { +@@ -502,7 +538,7 @@ + log_mpidump("elg decrypted M= ", output); + } + #endif +- mpi_free(t1); ++ mpi_free (t1); + } + + +From 653a9fa1a3a4c35a4dc1841cb57d7e2a318f3288 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Wed, 11 Feb 2015 21:42:22 +0900 +Subject: [PATCH] mpi: Add mpi_set_cond. + +* mpi/mpiutil.c (_gcry_mpi_set_cond): New. +(_gcry_mpi_swap_cond): Fix types. +* src/mpi.h (mpi_set_cond): New. +--- + mpi/mpiutil.c | 33 +++++++++++++++++++++++++++++---- + src/mpi.h | 3 +++ + 2 files changed, 32 insertions(+), 4 deletions(-) + +--- a/mpi/mpiutil.c ++++ b/mpi/mpiutil.c +@@ -386,6 +386,31 @@ + / BITS_PER_MPI_LIMB ); + } + ++gcry_mpi_t ++_gcry_mpi_set_cond (gcry_mpi_t w, const gcry_mpi_t u, unsigned long set) ++{ ++ mpi_size_t i; ++ mpi_size_t nlimbs = u->alloced; ++ mpi_limb_t mask = ((mpi_limb_t)0) - !!set; ++ mpi_limb_t x; ++ ++ if (w->alloced != u->alloced) ++ log_bug ("mpi_set_cond: different sizes\n"); ++ ++ for (i = 0; i < nlimbs; i++) ++ { ++ x = mask & (w->d[i] ^ u->d[i]); ++ w->d[i] = w->d[i] ^ x; ++ } ++ ++ x = mask & (w->nlimbs ^ u->nlimbs); ++ w->nlimbs = w->nlimbs ^ x; ++ ++ x = mask & (w->sign ^ u->sign); ++ w->sign = w->sign ^ x; ++ return w; ++} ++ + + gcry_mpi_t + gcry_mpi_snew( unsigned int nbits ) +--- a/src/mpi.h ++++ b/src/mpi.h +@@ -116,8 +116,11 @@ + #define mpi_swap(a,b) _gcry_mpi_swap ((a),(b)) + #define mpi_new(n) _gcry_mpi_new ((n)) + #define mpi_snew(n) _gcry_mpi_snew ((n)) ++#define mpi_set_cond(w,u,set) _gcry_mpi_set_cond ((w),(u),(set)) + + void _gcry_mpi_clear( gcry_mpi_t a ); ++gcry_mpi_t _gcry_mpi_set_cond( gcry_mpi_t w, const gcry_mpi_t u, ++ unsigned long swap ); + gcry_mpi_t _gcry_mpi_alloc_like( gcry_mpi_t a ); + gcry_mpi_t _gcry_mpi_alloc_set_ui( unsigned long u); + gcry_err_code_t _gcry_mpi_get_ui (gcry_mpi_t w, ulong *u); +From 1fa8cdb933505960d4e4b4842b122d4e06953e88 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Wed, 11 Feb 2015 22:30:02 +0900 +Subject: [PATCH] mpi: Revise mpi_powm. + +* mpi/mpi-pow.c (_gcry_mpi_powm): Rename the table to PRECOMP. + +-- + +The name of precomputed table was b_2i3 which stands for BASE^(2*I+3). +But it's too cryptic, so, it's renamed. Besides, we needed to +distinguish the case of I==0, that was not good. Since it's OK to +increase the size of table by one, it's BASE^(2*I+1), now. +--- + mpi/mpi-pow.c | 60 ++++++++++++++++++----------------------------------------- + 1 file changed, 18 insertions(+), 42 deletions(-) + +--- a/mpi/mpi-pow.c ++++ b/mpi/mpi-pow.c +@@ -381,7 +381,7 @@ + *xsize_p = rsize + ssize; + } + +-#define SIZE_B_2I3 ((1 << (5 - 1)) - 1) ++#define SIZE_PRECOMP ((1 << (5 - 1))) + + /**************** + * RES = BASE ^ EXPO mod MOD +@@ -417,8 +417,8 @@ + unsigned int bp_nlimbs = 0; + unsigned int ep_nlimbs = 0; + unsigned int xp_nlimbs = 0; +- mpi_ptr_t b_2i3[SIZE_B_2I3]; /* Pre-computed array: BASE^3, ^5, ^7, ... */ +- mpi_size_t b_2i3size[SIZE_B_2I3]; ++ mpi_ptr_t precomp[SIZE_PRECOMP]; /* Pre-computed array: BASE^1, ^3, ^5, ... */ ++ mpi_size_t precomp_size[SIZE_PRECOMP]; + mpi_size_t W; + mpi_ptr_t base_u; + mpi_size_t base_u_size; +@@ -555,31 +555,23 @@ + memset( &karactx, 0, sizeof karactx ); + negative_result = (ep[0] & 1) && bsign; + +- /* Precompute B_2I3[], BASE^(2 * i + 3), BASE^3, ^5, ^7, ... */ ++ /* Precompute PRECOMP[], BASE^(2 * i + 1), BASE^1, ^3, ^5, ... */ + if (W > 1) /* X := BASE^2 */ + mul_mod (xp, &xsize, bp, bsize, bp, bsize, mp, msize, &karactx); +- for (i = 0; i < (1 << (W - 1)) - 1; i++) +- { /* B_2I3[i] = BASE^(2 * i + 3) */ +- if (i == 0) +- { +- base_u = bp; +- base_u_size = bsize; +- } +- else +- { +- base_u = b_2i3[i-1]; +- base_u_size = b_2i3size[i-1]; +- } +- ++ base_u = precomp[0] = mpi_alloc_limb_space (bsize, esec); ++ base_u_size = precomp_size[0] = bsize; ++ MPN_COPY (precomp[0], bp, bsize); ++ for (i = 1; i < (1 << (W - 1)); i++) ++ { /* PRECOMP[i] = BASE^(2 * i + 1) */ + if (xsize >= base_u_size) + mul_mod (rp, &rsize, xp, xsize, base_u, base_u_size, + mp, msize, &karactx); + else + mul_mod (rp, &rsize, base_u, base_u_size, xp, xsize, + mp, msize, &karactx); +- b_2i3[i] = mpi_alloc_limb_space (rsize, esec); +- b_2i3size[i] = rsize; +- MPN_COPY (b_2i3[i], rp, rsize); ++ base_u = precomp[i] = mpi_alloc_limb_space (rsize, esec); ++ base_u_size = precomp_size[i] = rsize; ++ MPN_COPY (precomp[i], rp, rsize); + } + + i = esize - 1; +@@ -667,16 +659,8 @@ + rsize = xsize; + } + +- if (e0 == 0) +- { +- base_u = bp; +- base_u_size = bsize; +- } +- else +- { +- base_u = b_2i3[e0 - 1]; +- base_u_size = b_2i3size[e0 -1]; +- } ++ base_u = precomp[e0]; ++ base_u_size = precomp_size[e0]; + + mul_mod (xp, &xsize, rp, rsize, base_u, base_u_size, + mp, msize, &karactx); +@@ -703,16 +687,8 @@ + + if (e != 0) + { +- if ((e>>1) == 0) +- { +- base_u = bp; +- base_u_size = bsize; +- } +- else +- { +- base_u = b_2i3[(e>>1) - 1]; +- base_u_size = b_2i3size[(e>>1) -1]; +- } ++ base_u = precomp[(e>>1)]; ++ base_u_size = precomp_size[(e>>1)]; + + mul_mod (xp, &xsize, rp, rsize, base_u, base_u_size, + mp, msize, &karactx); +@@ -761,8 +737,8 @@ + MPN_NORMALIZE (rp, rsize); + + _gcry_mpih_release_karatsuba_ctx (&karactx ); +- for (i = 0; i < (1 << (W - 1)) - 1; i++) +- _gcry_mpi_free_limb_space( b_2i3[i], esec ? b_2i3size[i] : 0 ); ++ for (i = 0; i < (1 << (W - 1)); i++) ++ _gcry_mpi_free_limb_space( precomp[i], esec ? precomp_size[i] : 0 ); + } + + /* Fixup for negative results. */ +From 6636c4fd0c6ceab9f79827bf96967d1e112c0b82 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Thu, 26 Feb 2015 21:07:01 +0900 +Subject: [PATCH] mpi: Avoid data-dependent timing variations in mpi_powm. + +* mpi/mpi-pow.c (mpi_powm): Access all data in the table by +mpi_set_cond. + +-- + +Access to the precomputed table was indexed by a portion of EXPO, +which could be mounted by a side channel attack. This change fixes +this particular data-dependent access pattern. + +Cherry-picked from commit 5e72b6c76ebee720f69b8a5c212f52d38eb50287 +in LIBGCRYPT-1-6-BRANCH. +--- + mpi/mpi-pow.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 45 insertions(+), 6 deletions(-) + +--- a/mpi/mpi-pow.c ++++ b/mpi/mpi-pow.c +@@ -422,6 +422,7 @@ + mpi_size_t W; + mpi_ptr_t base_u; + mpi_size_t base_u_size; ++ mpi_size_t max_u_size; + + esize = expo->nlimbs; + msize = mod->nlimbs; +@@ -540,7 +541,7 @@ + + /* Main processing. */ + { +- mpi_size_t i, j; ++ mpi_size_t i, j, k; + mpi_ptr_t xp; + mpi_size_t xsize; + int c; +@@ -559,7 +560,7 @@ + if (W > 1) /* X := BASE^2 */ + mul_mod (xp, &xsize, bp, bsize, bp, bsize, mp, msize, &karactx); + base_u = precomp[0] = mpi_alloc_limb_space (bsize, esec); +- base_u_size = precomp_size[0] = bsize; ++ base_u_size = max_u_size = precomp_size[0] = bsize; + MPN_COPY (precomp[0], bp, bsize); + for (i = 1; i < (1 << (W - 1)); i++) + { /* PRECOMP[i] = BASE^(2 * i + 1) */ +@@ -571,9 +572,14 @@ + mp, msize, &karactx); + base_u = precomp[i] = mpi_alloc_limb_space (rsize, esec); + base_u_size = precomp_size[i] = rsize; ++ if (max_u_size < base_u_size) ++ max_u_size = base_u_size; + MPN_COPY (precomp[i], rp, rsize); + } + ++ base_u = mpi_alloc_limb_space (max_u_size, esec); ++ MPN_ZERO (base_u, max_u_size); ++ + i = esize - 1; + + /* Main loop. +@@ -659,8 +665,24 @@ + rsize = xsize; + } + +- base_u = precomp[e0]; +- base_u_size = precomp_size[e0]; ++ /* ++ * base_u <= precomp[e0] ++ * base_u_size <= precomp_size[e0] ++ */ ++ base_u_size = 0; ++ for (k = 0; k < (1<< (W - 1)); k++) ++ { ++ struct gcry_mpi w, u; ++ w.alloced = w.nlimbs = precomp_size[k]; ++ u.alloced = u.nlimbs = precomp_size[k]; ++ w.sign = u.sign = 0; ++ w.flags = u.flags = 0; ++ w.d = base_u; ++ u.d = precomp[k]; ++ ++ mpi_set_cond (&w, &u, k == e0); ++ base_u_size |= (precomp_size[k] & ((mpi_size_t)0 - (k == e0)) ); ++ } + + mul_mod (xp, &xsize, rp, rsize, base_u, base_u_size, + mp, msize, &karactx); +@@ -687,8 +709,24 @@ + + if (e != 0) + { +- base_u = precomp[(e>>1)]; +- base_u_size = precomp_size[(e>>1)]; ++ /* ++ * base_u <= precomp[(e>>1)] ++ * base_u_size <= precomp_size[(e>>1)] ++ */ ++ base_u_size = 0; ++ for (k = 0; k < (1<< (W - 1)); k++) ++ { ++ struct gcry_mpi w, u; ++ w.alloced = w.nlimbs = precomp_size[k]; ++ u.alloced = u.nlimbs = precomp_size[k]; ++ w.sign = u.sign = 0; ++ w.flags = u.flags = 0; ++ w.d = base_u; ++ u.d = precomp[k]; ++ ++ mpi_set_cond (&w, &u, k == (e>>1)); ++ base_u_size |= (precomp_size[k] & ((mpi_size_t)0 - (k == (e>>1))) ); ++ } + + mul_mod (xp, &xsize, rp, rsize, base_u, base_u_size, + mp, msize, &karactx); +@@ -739,6 +777,7 @@ + _gcry_mpih_release_karatsuba_ctx (&karactx ); + for (i = 0; i < (1 << (W - 1)); i++) + _gcry_mpi_free_limb_space( precomp[i], esec ? precomp_size[i] : 0 ); ++ _gcry_mpi_free_limb_space (base_u, esec ? max_u_size : 0); + } + + /* Fixup for negative results. */ diff --git a/pcr/libgee06/PKGBUILD b/pcr/libgee06/PKGBUILD new file mode 100644 index 000000000..b51e3b653 --- /dev/null +++ b/pcr/libgee06/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer (Arch): ValHue <vhuelamo at gmail dot com> +# https://github.com/ValHue/AUR-PKGBUILDs +# +# $Id: PKGBUILD 198164 2013-10-30 13:11:04Z allan $ +# Contributor (Arch): Jan Alexander Steffens (heftig) <jan dot steffens at gmail dot com> +# Contributor (Arch): Ionut Biru <ibiru at archlinux dot org> +# Contributor (Arch): Sergej Pupykin <pupykin.s+arch at gmail dot com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=libgee06 +_pkgname=libgee +pkgver=0.6.8 +pkgrel=1 +pkgdesc="GObject collection library (legacy)" +url="http://live.gnome.org/Libgee" +license=('LGPL2.1') +arch=('i686' 'x86_64') +depends=('glib2') +makedepends=('gobject-introspection') +source=("http://ftp.gnome.org/pub/GNOME/sources/${_pkgname}/${pkgver::3}/${_pkgname}-${pkgver}.tar.xz") +sha256sums=('a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3') + +build() { + cd "${_pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/libnatpmp-from-social-repo/PKGBUILD b/pcr/libnatpmp-from-social-repo/PKGBUILD deleted file mode 100644 index 49a2d3193..000000000 --- a/pcr/libnatpmp-from-social-repo/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer (Arch): Pierre Bourdon <delroth@gmail.com> - -pkgname=libnatpmp -pkgver=20120821 -pkgrel=1 -pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" -arch=('i686' 'x86_64' 'mips64el') -url="http://miniupnp.free.fr/libnatpmp.html" -license=('BSD') -depends=('glibc') -makedepends=() -source=(libnatpmp-$pkgver.tar.gz::http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz) - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make INSTALLPREFIX="$pkgdir/usr" \ - INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install - - # Needed by some packages - install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp" - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('d2b9c2dedba3a00deb0e7589982ceced') diff --git a/pcr/libowfat/PKGBUILD b/pcr/libowfat/PKGBUILD index 4a9d619db..6e678bf48 100644 --- a/pcr/libowfat/PKGBUILD +++ b/pcr/libowfat/PKGBUILD @@ -1,13 +1,9 @@ -# Contributors: -# Alexander Ulrich <a.ulrich@student.uni-tuebingen.de> -# Mildred <silkensedai@online.fr> -# henning mueller <henning@orgizm.net> -# Maintainer : -# Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor (Arch): gls < ghostlovescorebg at gmail dot com > +# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp> pkgname=libowfat pkgver=0.29 -pkgrel=3 +pkgrel=3.1 pkgdesc='GPL reimplementation of libdjb' arch=(i686 x86_64 mips64el) url=http://www.fefe.de/libowfat/ diff --git a/pcr/libpng12/PKGBUILD b/pcr/libpng12/PKGBUILD index d3ea430c8..5cb279376 100644 --- a/pcr/libpng12/PKGBUILD +++ b/pcr/libpng12/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 58551 2009-11-08 22:37:12Z eric $ -# Contributor (Arch): dorphell <archlinux.org: dorphell> -# Contributor (Arch): Travis Willard <archlinux.org: travis> -# Contributor (Arch): Douglas Soares de Andrade <archlinux.org: douglas> -# Maintainer (Arch): Jesse Jaara <gmail.com: jesse.jaara> +# Contributor (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor (Arch): dorphell <archlinux.org: dorphell> +# Contributor (Arch): Travis Willard <archlinux.org: travis> +# Contributor (Arch): Douglas Soares de Andrade <archlinux.org: douglas> +# Contributor (Arch): Jesse Jaara <gmail.com: jesse.jaara> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=libpng12 _realname=libpng -pkgver=1.2.50 +pkgver=1.2.52 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.libpng.org/pub/png/libpng.html" license=('custom') depends=('zlib') -options=('!libtool') source=("http://sourceforge.net/projects/libpng/files/libpng-${pkgver}.tar.xz" "http://sourceforge.net/projects/apng/files/libpng/libpng12/libpng-${pkgver}-apng.patch.gz") @@ -42,7 +42,10 @@ package() { rm -rf "${pkgdir}/usr/lib/"{libpng.so,libpng.a} rm -fr "${pkgdir}/usr/lib/pkgconfig/libpng.pc" rm -rf "${pkgdir}/usr/include/"{pngconf.h,png.h} + + install -Dm644 LICENSE $pkgdir/usr/share/licenses/libpng12/LICENSE + } -md5sums=('a3e00fccbfe356174ab515b5c00641c7' - 'b06ac3f6a6f982abc2036359665e82a9') +md5sums=('49d5c71929bf69a172147c47b9309fbe' + '17c8a671ddcc99b8e17f9c8a395677f9') diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD deleted file mode 100644 index c21a93c39..000000000 --- a/pcr/libquvi-scripts-current/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 196118 2013-10-07 11:53:00Z jgc $ -# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de> - -pkgname=libquvi-scripts-current -_pkgname=libquvi-scripts -provides=(libquvi-scripts) -pkgver=0.9.20131130 -pkgrel=1 -pkgdesc='Library for parsing video download links.' -arch=('any') -url='http://quvi.sourceforge.net/' -license=('AGPL3') -options=('!libtool') -depends=('lua51-socket' 'lua51-bitop' 'lua51-expat') -source=("http://downloads.sourceforge.net/sourceforge/quvi/${_pkgname}-${pkgver}.tar.xz"{,.sig}) - -build() { - cd "${_pkgname}-${pkgver}" - ./configure --prefix=/usr --with-nsfw --with-geoblocked - make -} - -package() { - cd "${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} -md5sums=('46ddfd887260a515199c2e1ba8c46d8a' - 'SKIP') diff --git a/pcr/libubox-lua-git/001-lua-version.patch b/pcr/libubox-lua-git/001-lua-version.patch new file mode 100644 index 000000000..2cde4b36b --- /dev/null +++ b/pcr/libubox-lua-git/001-lua-version.patch @@ -0,0 +1,11 @@ +--- a/lua/CMakeLists.txt ++++ b/lua/CMakeLists.txt +@@ -24,7 +24,7 @@ + + IF(NOT LUAPATH) + EXECUTE_PROCESS( +- COMMAND lua -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end" ++ COMMAND lua5.1 -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end" + OUTPUT_VARIABLE LUAPATH + RESULT_VARIABLE LUA_CHECK_RES + OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/pcr/libubox-lua-git/002-json-c-include.patch b/pcr/libubox-lua-git/002-json-c-include.patch new file mode 100644 index 000000000..72b50816f --- /dev/null +++ b/pcr/libubox-lua-git/002-json-c-include.patch @@ -0,0 +1,31 @@ +--- a/blobmsg_json.c ++++ b/blobmsg_json.c +@@ -17,11 +17,7 @@ + #include "blobmsg.h" + #include "blobmsg_json.h" + +-#ifdef JSONC +- #include <json.h> +-#else +- #include <json/json.h> +-#endif ++#include <json-c/json.h> + + bool blobmsg_add_object(struct blob_buf *b, json_object *obj) + { +--- a/jshn.c ++++ b/jshn.c +@@ -13,11 +13,8 @@ + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +-#ifdef JSONC +- #include <json.h> +-#else +- #include <json/json.h> +-#endif ++ ++#include <json-c/json.h> + + #include <string.h> + #include <stdlib.h> diff --git a/pcr/libubox-lua-git/PKGBUILD b/pcr/libubox-lua-git/PKGBUILD new file mode 100644 index 000000000..e724d66de --- /dev/null +++ b/pcr/libubox-lua-git/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer (Arch): Luka Perkov <luka.perkov@sartura.hr> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=libubox-lua-git +_gitname=libubox +pkgver=r340.791a361 +# commit 791a361ad1b08fa56e554654109122b828657a2b +pkgrel=1 +pkgdesc='A small utility library developed for OpenWrt containing a event loop, linked lists, blobmsg, stream buffer management, [...]' +url='http://git.openwrt.org/?p=project/libubox.git' +arch=('i686' 'x86_64') +license=('ISC BSD-3c') +depends=('json-c' 'lua51') +makedepends=('git' 'cmake' 'gcc' 'make' 'patch' 'pkg-config') +conflicts=('libubox' 'libubox-git') +provides=('libubox') +source=('git://git.openwrt.org/project/libubox.git' '001-lua-version.patch' '002-json-c-include.patch') +md5sums=('SKIP' 'SKIP' 'SKIP') + +pkgver() { + cd "$srcdir/$_gitname" + + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +prepare() { + cd "$srcdir/$_gitname" + + patch -p1 -i "$srcdir/001-lua-version.patch" + patch -p1 -i "$srcdir/002-json-c-include.patch" +} + +build() { + cd "$srcdir/$_gitname" + + cmake CMakeLists.txt \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_LUA=ON + + make +} + +package() { + cd "$srcdir/$_gitname" + + make DESTDIR="$pkgdir" install +} + +# burp -c lib `ls libubox-lua-git*.src.tar.gz | sort | tail -n 1` diff --git a/pcr/libubox/PKGBUILD b/pcr/libubox/PKGBUILD deleted file mode 100644 index 577eecd24..000000000 --- a/pcr/libubox/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> -pkgname=libubox -pkgver=0.8.0 -pkgrel=2 -pkgdesc="OpenWRT's Basic Utility Library" -arch=('i686' 'mips64el') -url="https://openwrt.org" -license=('BSD') -depends=('json-c') -makedepends=('git' 'cmake' 'lua51') -source=(git://nbd.name/luci2/libubox.git) -md5sums=(SKIP) - -pkgver() { - cd ${srcdir}/${pkgname} - local ver="$(git describe --long --tags)" - printf "%s" "${ver//-/.}" -} - -build() { - cd ${srcdir}/${pkgname} - - cmake -DCMAKE_INSTALL_PREFIX=/usr . - make -} - -package() { - cd ${srcdir}/${pkgname} - make DESTDIR=${pkgdir}/ install -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/liburcu/PKGBUILD b/pcr/liburcu/PKGBUILD deleted file mode 100644 index 5b2adbef8..000000000 --- a/pcr/liburcu/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> -# Maintainer: Christian Babeux <christian.babeux@0x80.ca> -# Contributor: Yggdrasil <tetzank at web dot de> - -pkgname=liburcu -pkgver=0.8.6 -pkgrel=1 -pkgdesc="LGPLv2.1 userspace RCU (read-copy-update) library" -arch=('i686' 'x86_64') -url="http://lttng.org/urcu" -license=('LGPL2.1') -source=(http://lttng.org/files/urcu/userspace-rcu-${pkgver}.tar.bz2) -depends=('glibc') -options=('!libtool') - -build() -{ - cd ${srcdir}/userspace-rcu-${pkgver} - ./configure --prefix=/usr - make -} - -package() -{ - cd ${srcdir}/userspace-rcu-${pkgver} - make install DESTDIR=${pkgdir} -} diff --git a/pcr/lives/PKGBUILD b/pcr/lives/PKGBUILD new file mode 100644 index 000000000..8b76a7ce0 --- /dev/null +++ b/pcr/lives/PKGBUILD @@ -0,0 +1,31 @@ +# Contributor (Arch): Angelo Theodorou <encelo@users.sourceforge.net> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +pkgname=lives +pkgver=2.2.8 +pkgrel=1 +pkgdesc="A Video Editing System" +arch=('i686' 'x86_64') +url="http://lives.sourceforge.net" +license=('GPL') +depends=('mplayer' 'imagemagick' 'gtk3' 'sox' 'libvisual' 'liboil' 'libavc1394' 'mjpegtools' 'python' 'ffmpeg' 'ffmpeg-compat' 'jack' 'fftw') +optdepends=('xorg-utils' 'sdl' 'libogg' 'mkvtoolnix-cli' 'libmatroska' 'ogmtools' 'dvgrab' 'cdrkit' 'lame' 'youtube-dl') +options=(!libtool) +source=(http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-$pkgver.tar.bz2) +md5sums=('8440e2a2b6e83655dfc39c9fef5ee903') + +build() { + cd "$srcdir"/$pkgname-$pkgver + sed -i 's/gtk_label_set_y_align/gtk_label_set_yalign/g' src/widget-helper.c + # /bin/touch -> /usr/bin/touch + find -type f -exec sed -i 's:/bin/touch:/usr&:g' {} \; + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir" install + rm "$pkgdir"/usr/bin/lives + ln -s /usr/bin/lives-exe "$pkgdir"/usr/bin/lives +} diff --git a/pcr/logreq/PKGBUILD b/pcr/logreq/PKGBUILD new file mode 100644 index 000000000..779ab880d --- /dev/null +++ b/pcr/logreq/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: asm <asm@member.fsf.org> + +pkgname=logreq +pkgver=1.0 +pkgrel=1 +pkgdesc="Support for automation of the LaTeX workflow" +arch=('any') +url="http://www.ctan.org/pkg/logreq" +license=('LPPL') +depends=( + 'texlive-core' + 'texlive-latexextra') +conflicts=('texlive-bibtexextra') +source=("http://mirrors.ctan.org/install/macros/latex/contrib/$pkgname.tds.zip") +md5sums=('ffbfb5a73250be0be7cc4d8c4ade6220') +sha256sums=('4f7834b18908e51a28a611026da7ca79dd7585df59ce35fa668a5b4ddf992f05') +sha512sums=('ed9d26df24de9d853ae8fc24dcce1854c00d9f3ddbc850d79fc6596b8b5385239567b4c9487ded0ad67843fcfdace90de493a738e6b32c4d70ad3dfc178051cb') + +package() { + texmflocal=/usr/share/texmf-dist/ + + mkdir -p ${pkgdir}/${texmflocal} + + cp -r tex/ ${pkgdir}/${texmflocal}/ + cp -r doc/ ${pkgdir}/${texmflocal}/ # Install docs +} diff --git a/pcr/lua51-sql-mysql/PKGBUILD b/pcr/lua51-sql-mysql/PKGBUILD index 5505140f9..f28f8ab7a 100644 --- a/pcr/lua51-sql-mysql/PKGBUILD +++ b/pcr/lua51-sql-mysql/PKGBUILD @@ -6,7 +6,7 @@ pkgname=lua51-sql-mysql pkgdesc='MySQL module for Lua 5.1' pkgver=2.2.0 -pkgrel=3 +pkgrel=3.1 arch=('i686' 'x86_64' 'mips64el') url='http://www.keplerproject.org/luasql/' license=('MIT') diff --git a/pcr/lv2-c++-tools/PKGBUILD b/pcr/lv2-c++-tools/PKGBUILD index de2e69578..36c08ae27 100644 --- a/pcr/lv2-c++-tools/PKGBUILD +++ b/pcr/lv2-c++-tools/PKGBUILD @@ -1,33 +1,39 @@ -# Maintainer : Guest One <theguestone at gmail dot com> -# patch taken from https://aur.archlinux.org/packages/lv2-c%2B%2B-tools/ +# Maintainer (Arch): speps <speps at aur dot archlinux dot org> +# Contributor (Arch): Philipp Überbacher <murks at lavabit dot com> +# Maintainer: Guest One <theguestone at gmail dot com> + pkgname=lv2-c++-tools pkgver=1.0.4 -pkgrel=1 +pkgrel=3 pkgdesc="Tools and libraries that may come in handy when writing LV2 plugins." -arch=('i686') +arch=('i686' 'x86_64') url="http://ll-plugins.nongnu.org/hacking.html" license=('GPL3') depends=('gtkmm') makedepends=('boost') +options=('staticlibs') source=("http://download.savannah.nongnu.org/releases-noredirect/ll-plugins/$pkgname-$pkgver.tar.bz2" "$pkgname-boost-1.50.patch") md5sums=('2468f8750bae1d57300853479846e5ed' '1dd1152e9ab8be15248b54546716c8c9') -build() { - cd "$srcdir/$pkgname-$pkgver" +prepare() { + cd $pkgname-$pkgver # boots 1.50 patch patch -p1 -i ../${source[1]} # do not call ldconfig sed -i '/ldconfig/d' Makefile.template +} +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir/" install }
\ No newline at end of file diff --git a/pcr/lv2-ir/PKGBUILD b/pcr/lv2-ir/PKGBUILD index 4dcdafd18..d62fad3fa 100644 --- a/pcr/lv2-ir/PKGBUILD +++ b/pcr/lv2-ir/PKGBUILD @@ -1,17 +1,19 @@ +# Maintainer (Arch): rtfreedman (rob<d0t>til<d0t>freedman<aT>googlemail<d0t>com +# Contributor (Arch): Bernardo Barros <bbarros*AT*xsounds*DOT*org> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=lv2-ir pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="zero-latency, realtime, high performance signal convolver especially for creating reverb effects." -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://factorial.hu/plugins/lv2/ir" license=('GPL') -depends=('zita-convolver' 'libsamplerate' 'gtk2') +depends=('zita-convolver' 'libsamplerate' 'gtk2>=2.16') provides=('ir-lv2') conflicts=('ir-lv2') groups=('lv2-plugins') -makedepends=('lv2core' ) +makedepends=('lv2' ) source=("http://factorial.hu/system/files/ir.lv2-${pkgver}.tar.gz") md5sums=('01140e1f70e7f4949f502eafc1958bcd') diff --git a/pcr/lxappearance-gtk3/PKGBUILD b/pcr/lxappearance-gtk3/PKGBUILD index 210037f22..aeb3b5bb1 100644 --- a/pcr/lxappearance-gtk3/PKGBUILD +++ b/pcr/lxappearance-gtk3/PKGBUILD @@ -21,6 +21,9 @@ provides=($_pkgname) source=(http://downloads.sourceforge.net/lxde/$_pkgname-$pkgver.tar.xz 0001-Substitute-the-correct-GTK-version-in-pkgconfig-file.patch 0002-Fix-About-dialog-for-GTK-3.patch) +md5sums=('79740125628a8374c1101cf26e558fa5' + '4c8e294c268c884e92e7b2b87c3f0942' + 'ca89c010d12ca4be9120580334bcda79') prepare() { cd $_pkgname-$pkgver diff --git a/pcr/lynis/PKGBUILD b/pcr/lynis/PKGBUILD deleted file mode 100644 index ae1445106..000000000 --- a/pcr/lynis/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> -# Contributor: Levente Polyak <levente[at]leventepolyak[dot]net> -# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgname=lynis -pkgver=2.1.0 -pkgrel=1 -pkgdesc='Security and system auditing tool to harden Unix/Linux systems' -url='http://cisofy.com/lynis/' -license=('GPL3') -arch=('any') -backup=('etc/lynis/default.prf') -depends=('sh') -optdepends=('net-tools: networking tests' - 'bash-completion: completion for bash') -source=(https://cisofy.com/files/lynis-2.1.0-88394c1affb9e23bd7390098947b3fd4b04e35e8.tar.gz{,.asc}) -sha256sums=('16ed596c8c283b8e4c635ada25ceb042371384ae09b3238a658ca60801a73c24' - 'SKIP') -validpgpkeys=('73AC9FC55848E977024D1A61429A566FD5B79251') - -prepare() { - cd ${pkgname} - sed -e 's|/path/to/lynis|/usr/bin/lynis|g' -i extras/systemd/lynis.service -} - -package() { - cd ${pkgname} - - # profile - install -Dm 644 default.prf "${pkgdir}/etc/${pkgname}/default.prf" - - # binary - install -Dm 755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}" - - # plugins, include, db - install -d "${pkgdir}/usr/share/${pkgname}" - cp -a db include plugins "${pkgdir}/usr/share/${pkgname}" - - # doc files - install -d "${pkgdir}/usr/share/doc/${pkgname}" - install -m 644 -t "${pkgdir}/usr/share/doc/${pkgname}" README INSTALL CHANGELOG FAQ - - # manpage - install -Dm 644 "${pkgname}.8" "${pkgdir}/usr/share/man/man8/${pkgname}.8" - - # completion - install -Dm 644 extras/bash_completion.d/${pkgname} "${pkgdir}/usr/share/bash-completion/completions/${pkgname}" - - # systemd - install -d "${pkgdir}/usr/lib/systemd/system/" - install -m 644 extras/systemd/{lynis.service,lynis.timer} "${pkgdir}/usr/lib/systemd/system/" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/pcr/mailcrypt/PKGBUILD b/pcr/mailcrypt/PKGBUILD new file mode 100644 index 000000000..027bfa124 --- /dev/null +++ b/pcr/mailcrypt/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer (Arch): Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +pkgname=mailcrypt +pkgver=3.5.9 +pkgrel=5 +pkgdesc="Emacs interface to PGP and GnuPG" +arch=('any') +url="http://mailcrypt.sourceforge.net/" +license=('GPL') +depends=('emacs') +makedepends=('texlive-plainextra') +source=(http://downloads.sourceforge.net/sourceforge/mailcrypt/mailcrypt-$pkgver.tar.gz) +md5sums=('18c0dea5dde0fc73168f4815df0d9db0') +install=$pkgname.install + +build() { + cd "$srcdir/$pkgname-$pkgver" + autoreconf + ./configure --prefix=/usr --infodir=/usr/share/info + make all info + texi2pdf $pkgname.texi +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir"/usr/share/info + make lispdir="$pkgdir"/usr/share/emacs/site-lisp \ + infodir="$pkgdir"/usr/share/info install + for _i in $pkgname.pdf ANNOUNCE COPYING ChangeLog ChangeLog.1 \ + INSTALL LCD-entry + do + install -Dm644 ${_i} $pkgdir/usr/share/doc/$pkgname/${_i} + done +} diff --git a/pcr/mailcrypt/mailcrypt.install b/pcr/mailcrypt/mailcrypt.install new file mode 100644 index 000000000..f3da9efcb --- /dev/null +++ b/pcr/mailcrypt/mailcrypt.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(mailcrypt.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/pcr/mda-lv2/PKGBUILD b/pcr/mda-lv2/PKGBUILD index 500a656a5..48c147851 100644 --- a/pcr/mda-lv2/PKGBUILD +++ b/pcr/mda-lv2/PKGBUILD @@ -1,26 +1,27 @@ +# Maintainer (Arch): speps <speps at aur dot archlinux dot org> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=mda-lv2 -pkgver=1.0.0 +pkgver=1.2.2 pkgrel=1 pkgdesc="An LV2 port of the MDA plugins by Paul Kellett" -arch=('i686') -url="http://drobilla.net/2012/04/21/mda-lv2-1-0-0/" +arch=(i686 x86_64) +url="http://drobilla.net/software/mda-lv2/" license=('GPL3') depends=('lv2') makedepends=('python2') source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('843ac4eade386034562917e95905e5d8') +md5sums=('1962f48c54eafe52a3d2471cd3072aa8') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver python2 ./waf configure --prefix=/usr python2 ./waf } package() { - cd "$srcdir/$pkgname-$pkgver" - DESTDIR="$pkgdir" python2 ./waf install + cd $pkgname-$pkgver + python2 ./waf --destdir="$pkgdir/" install } # vim:set ts=2 sw=2 et: diff --git a/pcr/mimms/PKGBUILD b/pcr/mimms/PKGBUILD index 3f2a9207e..8e8aab41a 100644 --- a/pcr/mimms/PKGBUILD +++ b/pcr/mimms/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mimms pkgver=3.2.1 -pkgrel=2 +pkgrel=2.1 pkgdesc="Download streams using the MMS protocol and save them to your computer" arch=('any') diff --git a/pcr/minicomputer/PKGBUILD b/pcr/minicomputer/PKGBUILD index 4888c999f..ff9bcf5dd 100644 --- a/pcr/minicomputer/PKGBUILD +++ b/pcr/minicomputer/PKGBUILD @@ -1,10 +1,13 @@ -# Maintainer: Guest One <theguestone at gmail dot com> +# Maintainer (Arch): speps <speps at aur dot archlinux dot org> +# Contributor (Arch): farid abdelnour <farid at archlinux-br.org> +# Contributor (Arch): DonVla <donvla@users.sourceforge.net> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=minicomputer pkgver=1.41 -pkgrel=1 +pkgrel=3 pkgdesc="A standalone Linux softwaresynthesizer for creating experimental electronic sounds." -arch=('i686') +arch=('i686' 'x86_64') url="http://minicomputer.sourceforge.net" license=('GPL3') depends=('fltk' 'jack' 'liblo') @@ -15,24 +18,22 @@ source=("http://downloads.sourceforge.net/sourceforge/$pkgname/MinicomputerV$pkg md5sums=('d2524f5fee7475159292e29a5bcd73d2' '3cc74321d55870b1684767255c74c2f8') -build() { - cd "$srcdir" - +prepare() { # installpresets.sh fix sed -i "s|factory|/usr/share/$pkgname/&|g" installpresets.sh - # 'R_OK' was not declared fix - sed -i '/#include <cstdlib>/a#include <unistd.h>' editor/Memory.h - # DSO linking fix sed -i "35aenv.Append(LINKFLAGS = ['-lm'])" -i SConstruct - # build - LDFLAGS="LDFLAGS -lm" scons + # missing includes + sed -i '30a#include <unistd.h>' editor/Memory.h } -package() { - cd "$srcdir" +build() { + scons +} + +package() { # bin install -d "$pkgdir/usr/bin" install -Dm755 "$pkgname"{,CPU} "$pkgdir/usr/bin" diff --git a/pcr/mpdscribble/PKGBUILD b/pcr/mpdscribble/PKGBUILD new file mode 100644 index 000000000..c57d2550f --- /dev/null +++ b/pcr/mpdscribble/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer (Arch): jason ryan <jasonwryan@gmail.com> +# Contributor (Arch): Bartłomiej Piotrowski <nospam@bpiotrowwski.pl> +# Contributor (Arch): Thomas Dziedzic < gostrc at gmail > +# Contributor (Arch): evr <evanroman at gmail> +# Contributor (Arch): Luiz Ribeiro <luizribeiro@gmail.com> + +pkgname=mpdscribble +pkgver=0.22 +pkgrel=12 +pkgdesc='MPD client which submits track info to {Libre,Last}.fm' +url='http://mpd.wikia.com/wiki/Client:Mpdscribble' +arch=('i686' 'x86_64' 'armv6h') +license=('GPL') +depends=('libsoup' 'glib2' 'libmpdclient') +install=$pkgname.install +source=(http://www.musicpd.org/download/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + service) +md5sums=('652ee927b797e9a4cef45494e77047db' + 'a57d7d3d41b37fb23b45835aa0cfc325') + +prepare() { + sed 's:multi-user.target:default.target:;:User=%i:d' service > user.service +} + +build() { + cd ${pkgname}-"${pkgver}" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-http-client=soup + + make +} + +package() { + cd ${pkgname}-"${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}"/service \ + "${pkgdir}"/usr/lib/systemd/system/mpdscribble@.service + install -Dm644 "${srcdir}"/user.service \ + "${pkgdir}"/usr/lib/systemd/user/mpdscribble.service + + # default config is really an example + install -D -m644 "${pkgdir}"/etc/mpdscribble.conf \ + "${pkgdir}"/usr/share/mpdscribble/mpdscribble.conf.example + rm -f "${pkgdir}"/etc/mpdscribble.conf + + install -d "${pkgdir}"/var/cache/mpdscribble + touch "${pkgdir}"/var/cache/mpdscribble/mpdscribble.cache +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/mpdscribble/mpdscribble.install b/pcr/mpdscribble/mpdscribble.install new file mode 100644 index 000000000..e7038d5d8 --- /dev/null +++ b/pcr/mpdscribble/mpdscribble.install @@ -0,0 +1,22 @@ +post_install() { + echo 'An example config is provided in /usr/share/mpdscribble/mpdscribble.conf.example' + echo + echo 'For system-wide config copy this file to /etc/mpdscribble.conf' + echo 'For per-user config copy this file to ~/.mpdscribble/mpdscribble.conf' +} + +## arg 1: the new package version +## arg 2: the old package version +pre_upgrade() { + # removed /etc/mpdscribble.conf on FEB 19 2011 + # only display warning for people with mpdscribble older then 0.21 + if (( "$(vercmp 0.21-1 $2)" > 0 )) && [[ -f /etc/mpdscribble.conf ]] + then + echo "$1 is new $2 is old" + cp /etc/mpdscribble.conf /etc/mpdscribble.conf.oldbackup + echo 'The package does not provide /etc/mpdscribble.conf anymore.' + echo 'Copied /etc/mpdscribble.conf to /etc/mpdscribble.conf.oldbackup' + echo + echo 'The example file is now located at /etc/mpdscribble.conf.example' + fi +} diff --git a/pcr/mpdscribble/service b/pcr/mpdscribble/service new file mode 100644 index 000000000..bda531cdf --- /dev/null +++ b/pcr/mpdscribble/service @@ -0,0 +1,10 @@ +[Unit] +Description={Libre,Last}.fm updater for MPD +After=mpd.service + +[Service] +User=%i +ExecStart=/usr/bin/mpdscribble --no-daemon + +[Install] +WantedBy=multi-user.target diff --git a/pcr/msdl/PKGBUILD b/pcr/msdl/PKGBUILD index 2cf2d11a4..b8723cca2 100644 --- a/pcr/msdl/PKGBUILD +++ b/pcr/msdl/PKGBUILD @@ -1,10 +1,11 @@ # Contributor (Arch): Nathan Owe ndowens04 at gmail dot com # Contributor (Arch): noonov <noonov@gmail.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=msdl pkgver=1.2.7_r2 _pkgver=${pkgver/_/-} -pkgrel=1 +pkgrel=1.1 pkgdesc="A multi-protocol downloader for various streaming protocols" arch=('i686' 'x86_64' 'mips64el') url="http://msdl.sourceforge.net/" diff --git a/pcr/mx44/PKGBUILD b/pcr/mx44/PKGBUILD index 6666a1405..df3708f26 100644 --- a/pcr/mx44/PKGBUILD +++ b/pcr/mx44/PKGBUILD @@ -1,10 +1,11 @@ +# Maintainer (Arch): David Adler <david dot jo dot adler at gmail dot com> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=mx44 _pkgname=Mx44 pkgver=2 -pkgrel=1 +pkgrel=4 pkgdesc="polyphonic multi-channel MIDI software synthesizer" -arch=('i686') +arch=(i686 x86_64) url="http://web.comhem.se/luna/" license=('GPL') depends=('jack' 'gtk2') diff --git a/pcr/ndoutils/PKGBUILD b/pcr/ndoutils/PKGBUILD new file mode 100644 index 000000000..405f4b20f --- /dev/null +++ b/pcr/ndoutils/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer (Arch): Muhkoenig +# Contributor (Arch): MisterG <mathieu.grzybek at gmail dot com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=ndoutils +pkgver=2.0.0 +pkgrel=1 +pkgdesc="An addon designed to store all configuration and event data from Nagios in a database." +license=('GPL') +arch=('i686' 'x86_64') +url="http://www.nagios.org" +depends=('libmysqlclient' 'glibc' 'zlib') +optdepends=('nagios') +source=("http://downloads.sourceforge.net/project/nagios/ndoutils-2.x/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('93561584f0fa7582a795e795306a3b35') + +_nagios_user="nagios" +_nagios_group="nagios" +_instdir="usr/share/nagios" +_bindir="usr/bin" +_vardir="var/nagios" +_confdir="etc/nagios" + +getent group $_nagios_group > /dev/null || _nagios_group=30 +getent passwd $_nagios_user > /dev/null || _nagios_user=30 + +build() { + cd $pkgname-$pkgver + + ./configure \ + --with-ndo2db-user=$_nagios_user \ + --with-ndo2db-group=$_nagios_group \ + --prefix="/$_instdir" \ + --bindir="/$_bindir" \ + --localstatedir="/$_vardir" \ + --sysconfdir="/$_confdir" \ + --enable-mysql \ + --disable-ssl + + make all +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir/" fullinstall +} diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD index b91eb7ff4..d6c8d0432 100644 --- a/pcr/netatalk/PKGBUILD +++ b/pcr/netatalk/PKGBUILD @@ -1,53 +1,46 @@ -# Maintainer (Arch): SJ_UnderWater -# Based on netatalk package : -# Maintainer (Arch): Dominik Dingel <mail at wodar dot de> +# Maintainer (Arch): Denis Yantarev <denis dot yantarev at gmail dot com> +# Contributor (Arch): SJ_UnderWater +# Contributor (Arch): Dominik Dingel <mail at wodar dot de> # Contributor (Arch): William Udovich <nerdzrule7 at earthlink dot net> # Contributor (Arch): Farhan Yousaf <farhany at xaviya dot com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=netatalk -pkgver=3.0.4 -pkgrel=2 -pkgdesc='A kernel-level implementation of AFP services' -arch=('i686' 'x86_64' 'mips64el') +pkgver=3.1.7 +pkgrel=1 +pkgdesc='Open-source implementation of the Apple Filing Protocol' +arch=('i686' 'x86_64') url='http://netatalk.sourceforge.net' license=('GPL') -depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python' 'dbus-glib') +depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python2' 'dbus-glib' 'python2-dbus') replaces=('netatalk-git' 'netatalk2') backup=('etc/afp.conf' 'etc/extmap.conf') -options=('!libtool') install=$pkgname.install -changelog=$pkgname.changelog -source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('f455505884a6aea307640d46a6577fd1') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 + avahi-client.patch + python2.patch) +md5sums=('831ec8bf9e084b64f965d16c528af299' + '00379aacb88dcac8c1e0513da1a5f24c' + '97bc0467dd8a866d9f0835d6440e3c19') prepare() { - cd $pkgname-$pkgver - - sed -i -e 's:AX_CHECK_DOCBOOK:[AX_CHECK_DOCBOOK]:' -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4 - sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in} - cp /usr/share/automake*/missing . - - autoreconf -i + cd "$srcdir/$pkgname-$pkgver" + patch -p0 < "$srcdir/python2.patch" + patch -p0 < "$srcdir/avahi-client.patch" } build() { - cd $pkgname-$pkgver - - - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --localstatedir=/var/state \ - --sysconfdir=/etc \ - --with-init-style=systemd \ - --with-cracklib \ - --with-cnid-cdb-backend \ - --enable-pgp-uam \ - --with-libevent=no - + cd "$srcdir/$pkgname-$pkgver" + autoreconf -fi + CFLAGS="-Wno-unused-result -O2" \ + ./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc \ + --sbindir=/usr/bin --enable-silent-rules --with-init-style=systemd \ + --with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-libevent=no make } + package() { - cd $pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/pcr/netatalk/avahi-client.patch b/pcr/netatalk/avahi-client.patch new file mode 100644 index 000000000..a1eef2b33 --- /dev/null +++ b/pcr/netatalk/avahi-client.patch @@ -0,0 +1,54 @@ +--- macros/zeroconf.m4.orig 2014-06-08 21:23:46.000000000 +0400 ++++ macros/zeroconf.m4 2014-06-08 21:36:25.000000000 +0400 +@@ -25,23 +25,7 @@ + zeroconf_dir="$zeroconf" + fi + +- # mDNS support using mDNSResponder +- AC_CHECK_HEADER( +- dns_sd.h, +- AC_CHECK_LIB( +- dns_sd, +- DNSServiceRegister, +- AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration])) +- ) +- +- if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then +- ZEROCONF_LIBS="-ldns_sd" +- AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration]) +- found_zeroconf=yes +- fi +- + # mDNS support using Avahi +- if test x"$found_zeroconf" != x"yes" ; then + AC_CHECK_HEADER( + avahi-client/client.h, + AC_CHECK_LIB( +@@ -62,10 +46,26 @@ + found_zeroconf=yes + ;; + esac ++ ++ # mDNS support using mDNSResponder ++ if test x"$found_zeroconf" != x"yes" ; then ++ AC_CHECK_HEADER( ++ dns_sd.h, ++ AC_CHECK_LIB( ++ dns_sd, ++ DNSServiceRegister, ++ AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration])) ++ ) ++ ++ if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then ++ ZEROCONF_LIBS="-ldns_sd" ++ AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration]) ++ found_zeroconf=yes ++ fi ++ fi + CPPFLAGS="$savedcppflags" + LDFLAGS="$savedldflags" + fi +- fi + + netatalk_cv_zeroconf=no + AC_MSG_CHECKING([whether to enable Zerconf support]) diff --git a/pcr/netatalk/python2.patch b/pcr/netatalk/python2.patch new file mode 100644 index 000000000..eaf02c71c --- /dev/null +++ b/pcr/netatalk/python2.patch @@ -0,0 +1,8 @@ +--- contrib/shell_utils/afpstats.orig 2014-03-04 09:56:31.000000000 +0400 ++++ contrib/shell_utils/afpstats 2014-03-04 09:57:23.000000000 +0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + + usage = """Usage: + python afpstats.py diff --git a/pcr/netcat6/PKGBUILD b/pcr/netcat6/PKGBUILD index a71acb4e4..c39e0444d 100644 --- a/pcr/netcat6/PKGBUILD +++ b/pcr/netcat6/PKGBUILD @@ -1,7 +1,8 @@ -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> -# Maintainer : <kfgz at interia dot pl> -# Contributor: Elmo Todurov <todurov at gmail dot com> -# Contributor: henning mueller <henning at orgizm dot net> +# Maintainer (Arch): Aurelien Desbrieres <aurelien@hackers.camp> +# Maintainer (Arch): <kfgz at interia dot pl> +# Contributor (Arch): Elmo Todurov <todurov at gmail dot com> +# Contributor (Arch): henning mueller <henning at orgizm dot net> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=netcat6 pkgver=1.0 @@ -13,6 +14,7 @@ license=(GPL) depends=(bluez) makedepends=(glibc) source=(http://fossies.org/unix/privat/nc6-${pkgver}.tar.bz2) +md5sums=('5074bc51989420a1f68716f93322030f') build() { cd "${srcdir}"/nc6-${pkgver} diff --git a/pcr/networkmanager-strongswan/PKGBUILD b/pcr/networkmanager-strongswan/PKGBUILD index 5d1a54e81..aa297c54b 100644 --- a/pcr/networkmanager-strongswan/PKGBUILD +++ b/pcr/networkmanager-strongswan/PKGBUILD @@ -1,9 +1,10 @@ # Contributor (Arch): Michael Seiwald <michael@mseiwald.at> # Maintainer (Arch): Dmitry Korzhevin <dkorzhevin at gmail dot com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=networkmanager-strongswan _pkgname=NetworkManager-strongswan pkgver=1.3.0 -pkgrel=2 +pkgrel=2.1 pkgdesc="strongswan NetworkManager plugin" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.strongswan.org/projects/strongswan/wiki/NetworkManager" @@ -19,7 +20,7 @@ build() { --prefix=/usr \ --libexecdir=/usr/lib \ --with-charon=/usr/lib/strongswan/charon \ - CFLAGS="$CFLAGS -Wno-error=unused-local-typedefs" + CFLAGS="$CFLAGS -Wno-error=unused-local-typedefs -Wno-error=deprecated-declarations" make } diff --git a/pcr/newtonator/PKGBUILD b/pcr/newtonator/PKGBUILD index f007a12b9..9fea50c41 100644 --- a/pcr/newtonator/PKGBUILD +++ b/pcr/newtonator/PKGBUILD @@ -1,28 +1,32 @@ +# Maintainer (Arch): speps <speps at aur dot archlinux dot org> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=newtonator -pkgver=0.5.2 +pkgver=0.6.0 pkgrel=1 pkgdesc="An LV2 soft synth based on velocity and acceleration" -arch=('i686') +arch=(i686 x86_64) url="http://newtonator.sourceforge.net/" license=('GPL3') -depends=('lv2' 'gtkmm') +depends=('lv2' 'gtkmm' 'stk') +groups=('lv2-plugins') makedepends=('cmake' 'lv2-c++-tools') source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('2a9a809e4c8a4851911cb661bcab24c0') +md5sums=('7f2db9a8928c5e06af1312f50c806646') -build() { - cd "$srcdir/$pkgname-$pkgver" - - [ -d build ] || mkdir build && cd build +prepare() { + cd $pkgname-$pkgver + [ -d b ] || mkdir b +} +build() { + cd $pkgname-$pkgver/b cmake .. -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver/build" + cd $pkgname-$pkgver/b make DESTDIR="$pkgdir/" install } diff --git a/pcr/nicotine/PKGBUILD b/pcr/nicotine/PKGBUILD index b0bd552b4..c167011fb 100644 --- a/pcr/nicotine/PKGBUILD +++ b/pcr/nicotine/PKGBUILD @@ -1,15 +1,20 @@ +# Maintainer (Arch): Antonio Rojas <nqn1976 @ gmail.com> +# Contributor (Arch): Alexander Rødseth <rodseth@gmail.com> +# Contributor (Arch): Angel Velasquez <angvp@archlinux.org> +# Contributor (Arch): Hugo Doria <hugo@archlinux.org> +# Contributor (Arch): Andrew Wright <andreww@photism.org> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=nicotine pkgver=1.2.16 -pkgrel=1 -pkgdesc="Soulseek music-sharing client, written in python" -arch=('i686') +pkgrel=7 +pkgdesc='Soulseek music-sharing client, written in python' +arch=('x86_64' 'i686') url='http://sourceforge.net/projects/nicotine-plus/' license=('GPL') -depends=('pygtk' 'mutagen' 'python2-sexy') +depends=('pygtk' 'mutagen') makedepends=('setconf') -optdepends=('python2-geoip: to enable Geographical blocker') +optdepends=('python2-geoip: to enable Geographical blocker' 'python2-sexy: spell checking support' 'miniupnpc-python2: UPNP support') source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2") sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d') diff --git a/pcr/ninja-open/PKGBUILD b/pcr/ninja-open/PKGBUILD index e3e939688..e60317478 100644 --- a/pcr/ninja-open/PKGBUILD +++ b/pcr/ninja-open/PKGBUILD @@ -1,16 +1,19 @@ -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> -# Contributor: Alexander Rdseth <rodseth@gmail.com> +# Contributor (Arch): Aurelien Desbrieres <aurelien@hackers.camp> +# Contributor (Arch): Alexander Rdseth <rodseth@gmail.com> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> + pkgname=ninja-open pkgver=0.7 -pkgrel=5 +pkgrel=5.1 pkgdesc='Quick and dirty replacement for xdg-open' arch=('x86_64' 'i686') url='http://roboticoverlords.org/ninjaopen/' license=('GPL2') -optdepends=('eog' 'evince' 'file-roller' 'deluge' 'gedit' 'wine' 'firefox' 'smplayer' 'vlc' 'gimp') +optdepends=('eog' 'evince' 'file-roller' 'deluge' 'gedit' 'wine' 'smplayer' 'vlc' 'gimp') makedepends=('go') options=(!strip) source=("http://roboticoverlords.org/ninjaopen/$pkgname-$pkgver.xz") +sha256sums=('c7c72297d75cfa27f3e66015b61255e02bfec3c13dd7fceeb2013ba3f34c566b') build() { cd "$pkgname-$pkgver" diff --git a/pcr/npapi-vlc-git/PKGBUILD b/pcr/npapi-vlc-git/PKGBUILD index c9fb64249..bfba5a1e2 100644 --- a/pcr/npapi-vlc-git/PKGBUILD +++ b/pcr/npapi-vlc-git/PKGBUILD @@ -1,40 +1,54 @@ -# Maintainer (Arch): Det +# Maintainer (Arch): Det <nimetonmaili g-mail> # Contributor (Arch): Pimper (M0Rf30) +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _pkgname=npapi-vlc pkgname=$_pkgname-git -pkgver=0.2.213.gc992dba +pkgver=2.2.1.95.r1444.gd5accd8 pkgrel=1 -pkgdesc="The modern VLC Mozilla plugin" -arch=('i686' 'x86_64' 'mips64el') +pkgdesc="The modern VLC Mozilla (NPAPI) plugin" +arch=('i686' 'x86_64') url="http://git.videolan.org/?p=$_pkgname.git;a=summary" license=('LGPL-2.1') -options=('!libtool') depends=('vlc') -makedepends=('git' 'npapi-sdk') +makedepends=('git' 'gtk2' 'npapi-sdk') provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") +options=('!libtool') source=("git://git.videolan.org/$_pkgname.git") md5sums=('SKIP') pkgver() { cd $_pkgname - git describe --always | sed 's/-/./g' + + echo $(git describe | cut -d "-" -f1-2 | tr - .).r$(git rev-list HEAD --count).$(git describe | cut -d "-" -f3) +} + +prepare() { + cd $_pkgname + + msg2 "Updating sources..." + git submodule update --init } build() { cd $_pkgname + msg2 "Starting autogen.sh..." sh ./autogen.sh + msg2 "Starting configure..." ./configure --prefix=/usr + msg2 "Starting make..." make } package() { cd $_pkgname + msg2 "Starting make install..." make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING" }
\ No newline at end of file diff --git a/pcr/openchange/PKGBUILD b/pcr/openchange/PKGBUILD index 9a774867a..8ed9d2e90 100644 --- a/pcr/openchange/PKGBUILD +++ b/pcr/openchange/PKGBUILD @@ -1,67 +1,76 @@ -# Maintainer (Arch): Michael Hansen <zrax0111 gmail com> -# Contributor (Arch): ngoonee <ngoonee.talk@gmail.com> -# Contributor (Arch): Adam Russell <adamlr6+arch@gmail.com> +# Maintainer: Michael Hansen <zrax0111 gmail com> +# Contributor: DJ Lucas <dj@linuxfromscratch.org> +# Contributor: ngoonee <ngoonee.talk@gmail.com> +# Contributor: Adam Russell <adamlr6+arch@gmail.com> pkgname=openchange -_codename=BORG -_dlid=180 -pkgver=1.0 -pkgrel=6 -pkgdesc="Library for MAPI connectivity with Microsoft Exchange. This package was SPECIFICALLY created to support evolution-mapi and may not work for any other purpose." -arch=('i686' 'x86_64' 'mips64el') +_codename=NANOPROBE +_dlid=246 +pkgver=2.2 +pkgrel=4 +pkgdesc="A portable, open source implementation of Microsoft Exchange server \ +and Exchange protocols. This package was originally created to support \ +evolution-mapi and may not work for any other purpose." +arch=('i686' 'x86_64') url="http://www.openchange.org" license=('GPL3') -depends=('samba4>=4.0.0B1' 'popt' 'libical' 'sqlite3' 'file' 'boost' 'zlib') -makedepends=('ccache' 'python2' 'subversion' 'docbook-xsl' 'libxslt' 'flex' 'bison' 'autoconf' 'automake') +depends=('samba>=4.2' 'libical' 'sqlite3' 'file' 'boost' 'python2' 'libmariadbclient') +makedepends=('ccache' 'python2' 'docbook-xsl' 'libxslt') options=(!makeflags) # Releases are mirrored at http://tracker.openchange.org/projects/openchange/files source=("http://tracker.openchange.org/attachments/download/${_dlid}/${pkgname}-${pkgver}-${_codename}.tar.gz" - "bugzilla_682449.patch") + "openchange-samba42.patch") -md5sums=('9b57a325e90e5ad3a702ddc6e8762ab6' - '7521f89f8ffaa733ed72532334951b90') -_prefix="/opt/samba4" +sha256sums=('f15eb26d16370e85f01649300dd6722c31f0750437a4b60acd604a79439cf688' + '8e4c2afede896e16a74be87323412bdcad8173d6943107a0aab38c6b77860887') build() { - cd ${srcdir}/${pkgname}-${pkgver}-${_codename} + cd "${srcdir}/${pkgname}-${pkgver}-${_codename}" - patch -i ../bugzilla_682449.patch + patch -p1 < "${srcdir}/openchange-samba42.patch" - SAVEIFS=${IFS} - IFS=$(echo -en "\n\b") - PYTHON_CALLERS="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.py') -$(find ${srcdir}/${pkgname}-${pkgver}-${_codename}/ -type f) -$(find ${srcdir}/${pkgname}-${pkgver}-${_codename}/ -name 'configure.ac')" - sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \ - -e "s|python-config$|python2-config|" \ - -e "s|bin/python$|bin/python2|" \ - ${PYTHON_CALLERS} + PYTHON_CALLERS="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.py') + $(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name 'configure.ac') + setup/openchange_newuser setup/openchange_provision + mapiproxy/services/web/rpcproxy/rpcproxy.wsgi" + sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \ + -e "s|python-config|python2-config|" \ + -e "s|bin/python|bin/python2|" \ + ${PYTHON_CALLERS} - # Patch for samba4-alpha19+ - SRC_FILES="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.c')" - sed -i -e "s|#include <samba/popt.h>|#include <popt.h>|" ${SRC_FILES} - IFS=${SAVEIFS} + # Fix linking of boost_thread in autoconf test + sed -i -e "s|-lboost_thread\$BOOST_LIB_SUFFIX|-lboost_thread\$BOOST_LIB_SUFFIX -lboost_system\$BOOST_LIB_SUFFIX|" \ + configure.ac - export PYTHON=/usr/bin/python2 + export PYTHON=/usr/bin/python2 - export PKG_CONFIG_PATH="${_prefix}/samba/lib/pkgconfig:${_prefix}/lib/pkgconfig" - export BOOST_LIB_SUFFIX="-mt" - ./autogen.sh - - sed -i -e "s|python-config|python2-config|g" configure - ./configure --prefix=${_prefix} --with-samba=${_prefix} - make FLEX=/usr/bin/flex BISON=/usr/bin/bison || return 1 + ./autogen.sh + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --datadir=/usr/share/samba \ + --enable-pyopenchange \ + --with-modulesdir=/usr/lib/samba/modules + rm mapiproxy/libmapi{proxy,store}/backends/*.po + rm mapiproxy/util/*.po + make FLEX=/usr/bin/flex BISON=/usr/bin/bison || return 1 } package() { - _pyver=`python2 -c 'import sys; print(sys.version[:3])'` + _pyver=`python2 -c 'import sys; print(sys.version[:3])'` + + cd "${srcdir}/${pkgname}-${pkgver}-${_codename}" + make DESTDIR="$pkgdir/" install - cd ${srcdir}/${pkgname}-${pkgver}-${_codename} - make DESTDIR="$pkgdir/" install + # NOTE: Not using `make installman' because that generates a bunch + # of doxygen-based manpages which may have conflicting names with + # other system man pages + install -d "${pkgdir}/usr/share/man" + cp -r doc/man/man* "${pkgdir}/usr/share/man" - cd ${pkgdir}/${_prefix}/lib/ - ln -s libmapi.so libmapi.so.0 - ln -s libocpf.so libocpf.so.0 + cd "${pkgdir}/usr/lib" + ln -s libmapi.so libmapi.so.0 + ln -s libocpf.so libocpf.so.0 - find ${pkgdir}/${_prefix}/lib/python${_pyver}/site-packages/ -name '*.py' | \ - xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + find "${pkgdir}/usr/lib/python${_pyver}/site-packages" -name '*.py' | \ + xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" } diff --git a/pcr/openchange/bugzilla_682449.patch b/pcr/openchange/bugzilla_682449.patch deleted file mode 100644 index e1b3f0983..000000000 --- a/pcr/openchange/bugzilla_682449.patch +++ /dev/null @@ -1,191 +0,0 @@ -Index: exchange.idl -=================================================================== ---- exchange.idl (revision 4004) -+++ exchange.idl (working copy) -@@ -1039,7 +1039,7 @@ - [case(ActionType_OP_COPY)] MoveCopy_Action CopyAction; - [case(ActionType_OP_REPLY)] ReplyOOF_Action ReplyAction; - [case(ActionType_OP_OOF_REPLY)] ReplyOOF_Action ReplyOOFAction; -- [case(ActionType_OP_DEFER_ACTION)][flag(NDR_REMAINING)] DATA_BLOB DeferAction; -+ [case(ActionType_OP_DEFER_ACTION)][flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB DeferAction; - [case(ActionType_OP_BOUNCE)] BounceCode BounceCode; - [case(ActionType_OP_TAG)] mapi_SPropValue_wrap PropValue; - [case(ActionType_OP_FORWARD)] ForwardDelegate_Action ForwardAction; -@@ -1057,7 +1057,7 @@ - - typedef [flag(NDR_NOALIGN)] struct { - uint16 ActionLength; -- [subcontext(0),subcontext_size(ActionLength),flag(NDR_REMAINING)] ActionBlockData ActionBlockData; -+ [subcontext(0),subcontext_size(ActionLength),flag(NDR_REMAINING|NDR_NOALIGN)] ActionBlockData ActionBlockData; - } ActionBlock; - - typedef [flag(NDR_NOALIGN)] struct { -@@ -1095,7 +1095,7 @@ - - typedef [public,flag(NDR_NOALIGN)] struct { - uint16 cValues; -- [flag(NDR_REMAINING)]mapi_SPropValue lpProps[cValues]; -+ [flag(NDR_REMAINING|NDR_NOALIGN)]mapi_SPropValue lpProps[cValues]; - } mapi_SPropValue_array; - - typedef [flag(NDR_NOALIGN)] struct { -@@ -1281,7 +1281,7 @@ - // TODO: figure out if "layout" can go - uint8 layout; - // TODO: convert this to a proper structure - see if we already have one. -- [flag(NDR_REMAINING)] DATA_BLOB prop_values; -+ [flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB prop_values; - } RecipientRow; - - typedef [flag(NDR_NOALIGN)] struct { -@@ -1356,7 +1356,7 @@ - - typedef [flag(NDR_NOALIGN)] struct { - uint8 layout; -- [flag(NDR_REMAINING)] DATA_BLOB prop_data; -+ [flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB prop_data; - } GetProps_repl; - - /*************************/ -@@ -1455,7 +1455,7 @@ - typedef [flag(NDR_NOALIGN)]struct { - uint32 idx; - ulRecipClass RecipClass; -- [subcontext(2),flag(NDR_REMAINING)] RecipientRow RecipientRow; -+ [subcontext(2),flag(NDR_REMAINING|NDR_NOALIGN)] RecipientRow RecipientRow; - } ModifyRecipientRow; - - typedef [flag(NDR_NOALIGN)] struct { -@@ -1532,7 +1532,7 @@ - uint8 handle_idx; - MSGFLAG_READ flags; - /* TEMP HACK for editing notes without crashing Outlook: -- [flag(NDR_REMAINING)] DATA_BLOB clientdata; */ -+ [flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB clientdata; */ - } SetMessageReadFlag_req; - - typedef [nodiscriminant, flag(NDR_NOALIGN)] union { -@@ -1782,7 +1782,7 @@ - typedef [nopush,nopull,flag(NDR_NOALIGN)] struct { - uint8 Origin; - uint16 RowCount; -- [flag(NDR_REMAINING)]DATA_BLOB RowData; -+ [flag(NDR_REMAINING|NDR_NOALIGN)]DATA_BLOB RowData; - } QueryRows_repl; - - /**************************/ -@@ -2394,13 +2394,13 @@ - } ReadStream_req; - - typedef [flag(NDR_NOALIGN)] struct { -- [subcontext(2), flag(NDR_REMAINING)] DATA_BLOB data; -+ [subcontext(2), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB data; - } ReadStream_repl; - - /*************************/ - /* EcDoRpc Function 0x2d */ - typedef [flag(NDR_NOALIGN)] struct { -- [subcontext(2), flag(NDR_REMAINING)] DATA_BLOB data; -+ [subcontext(2), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB data; - } WriteStream_req; - - -@@ -2900,7 +2900,7 @@ - uint16 TotalStepCount; - uint8 Reserved; - uint16 TransferBufferSize; -- [subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING)] DATA_BLOB TransferBuffer; -+ [subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB TransferBuffer; - } FastTransferSourceGetBuffer_repl; - - /**************************/ -@@ -2982,7 +2982,7 @@ - /* EcDoRpc Function 0x54 */ - typedef [flag(NDR_NOALIGN)] struct { - uint16 TransferBufferSize; -- [subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING)] DATA_BLOB TransferBuffer; -+ [subcontext(0),subcontext_size(TransferBufferSize),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB TransferBuffer; - } FastTransferDestinationPutBuffer_req; - - typedef [flag(NDR_NOALIGN)] struct { -@@ -3075,7 +3075,7 @@ - typedef [flag(NDR_NOALIGN)] struct { - uint32 ExpandedRowCount; - uint16 RowCount; -- [flag(NDR_REMAINING)]DATA_BLOB RowData; -+ [flag(NDR_REMAINING|NDR_NOALIGN)]DATA_BLOB RowData; - } ExpandRow_repl; - - /*************************/ -@@ -3184,7 +3184,7 @@ - typedef [flag(NDR_NOALIGN)] struct { - boolean8 HasFinished; - uint16 DataSize; -- [subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING)] DATA_BLOB Data; -+ [subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB Data; - } ReadPerUserInformation_repl; - - /*************************/ -@@ -3194,7 +3194,7 @@ - boolean8 HasFinished; - uint32 DataOffset; - uint16 DataSize; -- [subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING)] DATA_BLOB Data; -+ [subcontext(0), subcontext_size(DataSize), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB Data; - GUID ReplGuid; /* Note: ReplGuid gets only included under specific circumstances */ - } WritePerUserInformation_req; - -@@ -3364,7 +3364,7 @@ - SendOptions SendOptions; - SynchronizationFlag SynchronizationFlag; - uint16 RestrictionSize; -- [subcontext(0),subcontext_size(RestrictionSize),flag(NDR_REMAINING)] DATA_BLOB RestrictionData; -+ [subcontext(0),subcontext_size(RestrictionSize),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB RestrictionData; - SynchronizationExtraFlags SynchronizationExtraFlags; - mapi_SPropTagArray PropertyTags; - } SyncConfigure_req; -@@ -3542,7 +3542,7 @@ - } MessageReadState; - - typedef [flag(NDR_NOALIGN)] struct { -- [subcontext(2),flag(NDR_REMAINING)] DATA_BLOB MessageReadStates; -+ [subcontext(2),flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB MessageReadStates; - } SyncImportReadStateChanges_req; - - typedef [flag(NDR_NOALIGN)] struct { -@@ -3617,7 +3617,7 @@ - /*************************/ - /* EcDoRpc Function 0x90 */ - typedef [flag(NDR_NOALIGN)] struct { -- [subcontext(2), flag(NDR_REMAINING)] DATA_BLOB data; -+ [subcontext(2), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB data; - } WriteAndCommitStream_req; - - -@@ -4462,7 +4462,7 @@ - uint32 MajorVersion; - uint32 MinorVersion; - uint32 BuildNumber; -- [subcontext(0), subcontext_size(132), flag(NDR_NOALIGN|NDR_REMAINING)] DATA_BLOB Reserved_1; -+ [subcontext(0), subcontext_size(132), flag(NDR_REMAINING|NDR_NOALIGN)] DATA_BLOB Reserved_1; - uint16 ServicePackMajor; - uint16 ServicePackMinor; - uint32 Reserved_2; -@@ -4567,7 +4567,7 @@ - [out] uint16 rgwServerVersion[3], - [out] uint16 rgwBestVersion[3], - [in,out] uint32 *pulTimeStamp, -- [in,subcontext(4),flag(NDR_NOALIGN|NDR_REMAINING)] mapi2k7_AuxInfo *rgbAuxIn, -+ [in,subcontext(4),flag(NDR_REMAINING|NDR_NOALIGN)] mapi2k7_AuxInfo *rgbAuxIn, - [in] uint32 cbAuxIn, - [out, length_is(*pcbAuxOut), size_is(*pcbAuxOut)] mapi2k7_AuxInfo *rgbAuxOut, - [in,out][range(0,0x1008)] uint32 *pcbAuxOut -@@ -4588,7 +4588,7 @@ - - typedef [public,nopull] struct { - RPC_HEADER_EXT header; -- [subcontext(0),flag(NDR_NOALIGN|NDR_REMAINING)] mapi_response *mapi_response; -+ [subcontext(0),flag(NDR_REMAINING|NDR_NOALIGN)] mapi_response *mapi_response; - } mapi2k7_response; - - [public,noprint] MAPISTATUS EcDoRpcExt2( diff --git a/pcr/openchange/openchange-samba42.patch b/pcr/openchange/openchange-samba42.patch new file mode 100644 index 000000000..cf005004a --- /dev/null +++ b/pcr/openchange/openchange-samba42.patch @@ -0,0 +1,282 @@ +diff -Naurp openchange-2.2-NANOPROBE-orig/config.mk.in openchange-2.2-NANOPROBE/config.mk.in +--- openchange-2.2-NANOPROBE-orig/config.mk.in 2014-08-11 10:51:05.000000000 -0500 ++++ openchange-2.2-NANOPROBE/config.mk.in 2015-03-22 23:10:47.208548756 -0500 +@@ -52,6 +52,9 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ + SAMBA_CFLAGS=@SAMBA_CFLAGS@ + SAMBA_LIBS=@SAMBA_LIBS@ + ++SAMBA_DEBUG_LDFLAGS=@SAMBA_DEBUG_LDFLAGS@ ++SAMBA_DEBUG_LIBS=@SAMBA_DEBUG_LIBS@ ++ + LDB_CFLAGS=@LDB_CFLAGS@ + LDB_LIBS=@LDB_LIBS@ + +diff -Naurp openchange-2.2-NANOPROBE-orig/configure.ac openchange-2.2-NANOPROBE/configure.ac +--- openchange-2.2-NANOPROBE-orig/configure.ac 2014-08-11 10:51:05.000000000 -0500 ++++ openchange-2.2-NANOPROBE/configure.ac 2015-03-22 23:31:08.448303310 -0500 +@@ -412,6 +412,12 @@ PKG_CHECK_MODULES(SAMBASERVER, dcerpc_se + PKG_CHECK_MODULES(TDB, tdb) + PKG_CHECK_MODULES(LDB, ldb) + ++SAMBA_DEBUG_LIBS="-lsamba-debug-samba4 -lsocket-blocking-samba4" ++AC_SUBST(SAMBA_DEBUG_LIBS) ++ ++SAMBA_DEBUG_LDFLAGS="-L`pkg-config --variable=libdir samba-util`/samba -Wl,-rpath,`pkg-config --variable=libdir samba-util`/samba" ++AC_SUBST(SAMBA_DEBUG_LDFLAGS) ++ + dnl --------------------------------------------------------------------------- + dnl Check a particular Samba4 git revision + dnl --------------------------------------------------------------------------- +diff -Naurp openchange-2.2-NANOPROBE-orig/Makefile openchange-2.2-NANOPROBE/Makefile +--- openchange-2.2-NANOPROBE-orig/Makefile 2014-08-11 10:51:05.000000000 -0500 ++++ openchange-2.2-NANOPROBE/Makefile 2015-03-22 23:31:08.451636651 -0500 +@@ -357,7 +357,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) + libmapi++/src/session.po \ + libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) + @echo "Linking $@" +- @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS) ++ @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + libmapixx-installpc: + @echo "[*] install: libmapi++ pc files" +@@ -438,7 +438,7 @@ bin/libmapixx-test: libmapi++/tests/test + libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking sample application $@" +- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) ++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + clean:: libmapixx-test-clean + +@@ -453,7 +453,7 @@ bin/libmapixx-attach: libmapi++/tests/at + libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking sample application $@" +- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) ++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + clean:: libmapixx-attach-clean + +@@ -463,7 +463,7 @@ bin/libmapixx-exception: libmapi++/tests + libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking exception test application $@" +- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) ++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + libmapixx-exception-clean: + rm -f bin/libmapixx-exception +@@ -483,7 +483,7 @@ bin/libmapixx-profiletest: libmapi++/tes + libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking profile test application $@" +- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) ++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + clean:: libmapixx-profiletest-clean + +@@ -504,7 +504,7 @@ libmapi++/examples/foldertree: libmapi++ + libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking foldertree example application $@" +- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) ++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + clean:: libmapixx-foldertree-clean + +@@ -512,7 +512,7 @@ libmapi++/examples/messages: libmapi++/e + libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking messages example application $@" +- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) ++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + clean:: libmapixx-messages-clean + +@@ -579,7 +579,7 @@ libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSI + libmapiadmin/mapiadmin.po \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS) ++ @$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + + +@@ -656,7 +656,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION): + libocpf/ocpf_write.po \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS) ++ @$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION): libocpf.$(SHLIBEXT).$(PACKAGE_VERSION) + ln -fs $< $@ +@@ -728,7 +728,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT): + gen_ndr/ndr_exchange.po + + @echo "Linking $@" +- @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) ++ @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + mapiproxy/dcesrv_mapiproxy.c: gen_ndr/ndr_exchange_s.c gen_ndr/ndr_exchange.c + +@@ -783,7 +783,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC + mapiproxy/util/mysql.po \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) ++ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION): mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) + ln -fs $< $@ +@@ -939,7 +939,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC + mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) ++ @$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + mapiproxy/libmapistore/mapistore_interface.po: mapiproxy/libmapistore/mapistore_nameid.h + +@@ -960,7 +960,7 @@ bin/mapistore_test: mapiproxy/libmapist + mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \ + mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) ++ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + mapistore_clean: + rm -f mapiproxy/libmapistore/tests/*.o +@@ -1138,7 +1138,7 @@ bin/openchangeclient: utils/openchangec + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) \ + libocpf.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt ++ @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + + ############## +@@ -1166,7 +1166,7 @@ bin/mapiprofile: utils/mapiprofile.o + utils/openchange-tools.o \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt ++ @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + + ################### +@@ -1195,7 +1195,7 @@ bin/openchangepfadmin: utils/openchangep + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) \ + libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt ++ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + + ################### +@@ -1226,7 +1226,7 @@ bin/exchange2mbox: utils/exchange2mbox.o + utils/openchange-tools.o \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(MAGIC_LIBS) ++ @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(MAGIC_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + + ################### +@@ -1290,7 +1290,7 @@ bin/exchange2ical: utils/exchange2ical_t + utils/openchange-tools.o \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt ++ @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + ###################### + # testsuite +@@ -1321,7 +1321,7 @@ bin/openchange-testsuite: testsuite/tes + mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \ + mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) ++ @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + testsuite-check: testsuite + @LD_LIBRARY_PATH=. CK_XML_LOG_FILE_NAME=test_results.xml ./bin/openchange-testsuite +@@ -1390,7 +1390,7 @@ bin/mapitest: utils/mapitest/mapitest.o + utils/mapitest/modules/module_lzxpress.o \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS) ++ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + utils/mapitest/proto.h: \ + utils/mapitest/mapitest_suite.c \ +@@ -1450,7 +1450,7 @@ bin/openchangemapidump: utils/backup/ope + utils/openchange-tools.o \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt ++ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + + ############### +@@ -1503,7 +1503,7 @@ bin/check_fasttransfer: testprogs/check_ + mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \ + mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt ++ @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + ################### + # test_asyncnotif test app. +@@ -1529,7 +1529,7 @@ clean:: test_asyncnotif-clean + bin/test_asyncnotif: testprogs/test_asyncnotif.o \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt ++ @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + ################### + # python code +@@ -1574,7 +1574,7 @@ $(pythonscriptdir)/openchange/mapi.$(SHL + pyopenchange/pymapi_properties.c \ + libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) + @echo "Linking $@" +- @$(CC) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS) ++ @$(CC) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS) + + # $(pythonscriptdir)/openchange/ocpf.$(SHLIBEXT): pyopenchange/pyocpf.c \ + # libocpf.$(SHLIBEXT).$(PACKAGE_VERSION) \ +diff -Naurp openchange-2.2-NANOPROBE-orig/mapiproxy/dcesrv_mapiproxy.c openchange-2.2-NANOPROBE/mapiproxy/dcesrv_mapiproxy.c +--- openchange-2.2-NANOPROBE-orig/mapiproxy/dcesrv_mapiproxy.c 2014-08-11 10:51:05.000000000 -0500 ++++ openchange-2.2-NANOPROBE/mapiproxy/dcesrv_mapiproxy.c 2015-03-22 23:41:19.793032062 -0500 +@@ -132,10 +132,10 @@ static NTSTATUS mapiproxy_op_connect(str + + switch (dce_call->pkt.ptype) { + case DCERPC_PKT_BIND: +- b->assoc_group_id = dce_call->pkt.u.bind.assoc_group_id; ++ status = dcerpc_binding_set_assoc_group_id(b, dce_call->pkt.u.bind.assoc_group_id); + break; + case DCERPC_PKT_ALTER: +- b->assoc_group_id = dce_call->pkt.u.alter.assoc_group_id; ++ status = dcerpc_binding_set_assoc_group_id(b, dce_call->pkt.u.alter.assoc_group_id); + break; + default: + break; +@@ -152,7 +152,7 @@ static NTSTATUS mapiproxy_op_connect(str + if (!NT_STATUS_IS_OK(status)) { + return status; + } +- dce_call->context->assoc_group->id = private->c_pipe->assoc_group_id; ++ dce_call->context->assoc_group->id = dcerpc_binding_get_assoc_group_id(private->c_pipe->binding); + + } else { + status = dcerpc_pipe_connect(dce_call->context, +@@ -167,7 +167,7 @@ static NTSTATUS mapiproxy_op_connect(str + if (!NT_STATUS_IS_OK(status)) { + return status; + } +- dce_call->context->assoc_group->id = private->c_pipe->assoc_group_id; ++ dce_call->context->assoc_group->id = dcerpc_binding_get_assoc_group_id(private->c_pipe->binding); + } + + private->connected = true; diff --git a/pcr/opendnssec/LICENSE b/pcr/opendnssec/LICENSE deleted file mode 100644 index 5700d408a..000000000 --- a/pcr/opendnssec/LICENSE +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2009 Nominet UK. All rights reserved. - * Copyright (c) 2010 .SE (The Internet Infrastructure Foundation). - * Copyright (c) 2009 NLNet Labs. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/* pkcs11.h - Copyright 2006, 2007 g10 Code GmbH - Copyright 2006 Andreas Jellinghaus - - This file is free software; as a special exception the author gives - unlimited permission to copy and/or distribute it, with or without - modifications, as long as this notice is preserved. - - This file is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY, to the extent permitted by law; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. */
\ No newline at end of file diff --git a/pcr/opendnssec/PKGBUILD b/pcr/opendnssec/PKGBUILD index 54a880757..001d55f15 100644 --- a/pcr/opendnssec/PKGBUILD +++ b/pcr/opendnssec/PKGBUILD @@ -1,48 +1,74 @@ # Maintainer (Arch): Javier Torres <javitonino [at] gmail [dot] com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=opendnssec -pkgver=1.4.0 -pkgrel=4 +pkgver=1.4.7 +pkgrel=2 pkgdesc="Turn-key solution for DNSSEC (sqlite3)" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.opendnssec.org/" license=('BSD') -depends=('libxml2' 'ldns' 'sqlite3' 'softhsm') +groups=() +depends=('libxml2>=2.6.16' 'ldns>=1.6.16' 'sqlite3>=3.3.9') +makedepends=() +optdepends=('softhsm: key storage') +provides=() +conflicts=() +replaces=() backup=("etc/opendnssec/conf.xml" "etc/opendnssec/kasp.xml" "etc/opendnssec/zonelist.xml") +options=() install="opendnssec.install" -source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig} - "pid-path.patch" +changelog= +source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz" + "pid-path.patch" "ods-signer.service" - "ods-enforcer.service") -sha256sums=('36d4926dcdf351a527ad7600b151ab6cc56d0a472a7eb8871eecd70afef9e101' - 'SKIP' - '1cc1c1ec75a5a5f2c35e019ac6dfd2153fa6f10705dc242aaf6ceb21796097f0' - '1a8cdec0e97a33048956268b766da570f8f7a90d05af59e547219f1381832071' - '75cecbfb0ece13957a68a5bc39c20a1d69b95373e7473545d70621e1732733d8') + "ods-enforcer.service" + "opendnssec.tmpfiles") +noextract=() -prepare() { +md5sums=('363387b90624acc2e3f6d33fea23c2d3' + '471ec859269bc2add2ad6f95539e8c04' + 'e762cdc2c3f8be40aeff379aa4bade76' + 'c5464f7be7984bb9a925da0b157eafdf' + '69908ba1f46c25e4c34bc91f45bc9660') +sha1sums=('c8a5808d68a50db8ed7edf806a58f54428ad7aa8' + 'a8234e007fb56262c450016d4058693b4fb7c98c' + '2a4fac3a16fea3f89b281f0933b6920524978d49' + 'fa28111fdce06c389813ff6ed2d4cae136252488' + 'f10d783b3e0232fd3beff645a07207c161371d0c') +sha256sums=('8f757ca9e88d6a6dc8f9b6e46a3da5e3a2881b3311fb91c428bcf906683ac41f' + 'c16b206258bca7fd0fd4838c23d3a1bd80bc33aaf355f6ccdbfbfb3b4c3a7e8f' + '596d238ad219de1c88f79fd26a8b829250bf0512a308b34c11fd231d0b4eb0f4' + '75cecbfb0ece13957a68a5bc39c20a1d69b95373e7473545d70621e1732733d8' + '28a43d8d5ee512db5425c86bdba9c5832753dce0260291958b1b73253e3ebf55') +sha384sums=('b99c5cd05eb11167f353a5b95d01e1f2c2cadf9c1e49c04afe99f2b083338589d189b5c651274378a427c278cb7ad7ac' + '9fbdf5f5e50c1bddc9d7e0ea3126bb520b00cb3f764878629c86075303226b011e401158751a5d3086e22e8ac8f685e7' + '29d68ccca64339ab190518f6c5bffedba71287548634e305a12c98b7744984cc37f6a1748394ca0d96e709dbd520fe19' + '0869168e8c5a5064cbac0d2f0afe71539a68785d548752c609759381648b04015fc7c3ed9684aec944a914143c777a66' + '5c42366ad7b99d496679b089c1605b3af9060ba737350915439d8ef7bbcfd0f7128c389d256a62754bb79e5ad3e215c2') +sha512sums=('def2a8e41331bd70f287ea3081a7368144ada92ad5cc9f62d28d3064e34f7c0c84998422d515f5ec9c7e668757e796df8c5446839e24e4a9e2af1357c342c0b2' + 'd927457d2d7a5343c4480ff34237f49e3829cef65eefd71fb58ce4fa15d8d969126e64c5a59dc02cc7792876f8a5a91cd4de3c5bfe3acc0396663c8c139d7cce' + '39068133b3bfd075f3555491096be50ea0973a73ac716abb19faed0aa972ef043a6012491d4c6c208443352a2a508b8ebfbd7273fd84df43b3d6d478e72e7957' + 'a3700c82e6577bdacbce9cfd749e71e3c749814884ad4e9a1359e97105f9c045dc1472ba231ecb52c23855cacf67874623c8eef715955bfd41239b199d03a0db' + 'b221eec802ac471cd90908faa252d49ef2d217d6e48262a02490ae99fb64f3b82bc7f2dd2056d6e58b8bb1ca62072d52bffbc2bfd9f4eb794ec2d02275e88899') + + +build() +{ cd "${srcdir}/${pkgname}-${pkgver}" - # /var/lib/run -> /run - patch -p0 -i "${srcdir}/pid-path.patch" + + # /var/lib/run -> /var/run + patch -p0 < "${srcdir}/pid-path.patch" aclocal autoconf automake --add-missing -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --datarootdir=/usr/share \ - --localstatedir=/var/lib \ - --sysconfdir=/etc \ - --with-pkcs11-softhsm=/usr/lib/libsofthsm.so \ - --sbindir=/usr/bin + ./configure --prefix=/usr --datarootdir=/usr/share --localstatedir=/var/lib --sysconfdir=/etc --with-pkcs11-softhsm=/usr/lib/libsofthsm.so --sbindir=/usr/bin - # Create the correct (/run/opendnssec) directory + # Create the correct (/var/run/opendnssec) directory sed -i \ -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run\/opendnssec/#Removed/" \ -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run/\$(INSTALL) -d \$(DESTDIR)\$(OPENDNSSEC_PID_DIR)/" \ @@ -54,24 +80,24 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -d "${pkgdir}/run/opendnssec" - make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/etc/rc.d" install -Dm0644 "${srcdir}/ods-signer.service" \ "${pkgdir}/usr/lib/systemd/system/ods-signer.service" install -Dm0644 "${srcdir}/ods-enforcer.service" \ "${pkgdir}/usr/lib/systemd/system/ods-enforcer.service" - install -Dm0644 "LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm0644 "enforcer/utils/migrate_adapters_1.sqlite3" \ "${pkgdir}/usr/share/opendnssec" + install -Dm0644 "${srcdir}/opendnssec.tmpfiles" \ + "${pkgdir}/usr/lib/tmpfiles.d/opendnssec.conf" + install -Dm0644 "LICENSE" \ + "${pkgdir}/usr/share/licenses/opendnssec/LICENSE" + + chown 227:227 "${pkgdir}/etc/opendnssec" -R + chown 227:227 "${pkgdir}/var/lib/opendnssec" -R - chown -R 227:227 "${pkgdir}/etc/opendnssec" \ - "${pkgdir}/var/lib/opendnssec" \ - "${pkgdir}/run/opendnssec" chmod 750 "${pkgdir}/etc/opendnssec" \ - "${pkgdir}/var/lib/opendnssec" \ - "${pkgdir}/run/opendnssec" + "${pkgdir}/var/lib/opendnssec" + + rm "${pkgdir}/run" -R } diff --git a/pcr/opendnssec/ods-signer.service b/pcr/opendnssec/ods-signer.service index 26cc03481..ab723e884 100644 --- a/pcr/opendnssec/ods-signer.service +++ b/pcr/opendnssec/ods-signer.service @@ -1,6 +1,6 @@ [Unit] Description=OpenDNSSEC Signer -After=syslog.target nerwork.target +After=syslog.target network.target [Service] Type=forking diff --git a/pcr/opendnssec/opendnssec.install b/pcr/opendnssec/opendnssec.install index 0c74659ee..184803ba5 100644 --- a/pcr/opendnssec/opendnssec.install +++ b/pcr/opendnssec/opendnssec.install @@ -5,6 +5,8 @@ post_install() { if [ -z "`grep '^opendnssec:' /etc/passwd`" ]; then useradd -u 227 -d /var/lib/opendnssec -g opendnssec -s /bin/false opendnssec fi + + systemd-tmpfiles --create opendnssec.conf echo ">> You need an HSM implementation (try softhsm)" } diff --git a/pcr/opendnssec/opendnssec.tmpfiles b/pcr/opendnssec/opendnssec.tmpfiles new file mode 100644 index 000000000..797fcdf52 --- /dev/null +++ b/pcr/opendnssec/opendnssec.tmpfiles @@ -0,0 +1 @@ +d /run/opendnssec 0750 opendnssec opendnssec
\ No newline at end of file diff --git a/pcr/opendnssec/pid-path.patch b/pcr/opendnssec/pid-path.patch index 122b68e08..09194a128 100644 --- a/pcr/opendnssec/pid-path.patch +++ b/pcr/opendnssec/pid-path.patch @@ -1,6 +1,6 @@ --- Makefile.am 2012-07-17 08:53:51.000000000 +0200 +++ Makefile.am 2012-11-20 21:56:11.000000000 +0100 -@@ -30,8 +30,8 @@ +@@ -29,8 +29,8 @@ $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed @@ -13,7 +13,7 @@ (cd libhsm; $(MAKE) doxygen) --- m4/opendnssec_common.m4 2012-11-01 11:56:59.000000000 +0100 +++ m4/opendnssec_common.m4 2012-11-20 21:52:56.000000000 +0100 -@@ -19,7 +19,7 @@ +@@ -17,7 +17,7 @@ OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec" diff --git a/pcr/opentracker-git/PKGBUILD b/pcr/opentracker-git/PKGBUILD new file mode 100644 index 000000000..f5ef91aef --- /dev/null +++ b/pcr/opentracker-git/PKGBUILD @@ -0,0 +1,117 @@ +# Maintainer (Arch): TheCreeper <loxoko@gmail.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=opentracker-git +pkgver=r583.6c60309 +pkgrel=1 +pkgdesc="Opentracker is a open and free bittorrent tracker project. It aims for minimal resource usage and is intended to run at your wlan router." +arch=('i686' 'x86_64') +url="http://erdgeist.org/arts/software/opentracker/" +license=('custom') +depends=('libowfat') +makedepends=( + 'git' + #'cvs' + 'make' + 'gcc' + 'gcc-libs' + 'dietlibc' +) +backup=("etc/opentracker/config") +source=( + 'opentracker.service' + 'license.txt' + "$pkgname"::'git://erdgeist.org/opentracker') +sha1sums=( + 'f623a45a0722bdc007f1d4b303ff6e3913281953' + '7cd200ee8ee89ddbd302dbbf63b6993bc51d4e3e' + 'SKIP') + +pkgver() { + cd "$srcdir/$pkgname" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +build() { + + ## BEWARE: + ## I had problems compiling this on arm using the new verson of GCC. + + #### + ## Build Libowfat + #### + + ## Pull in libowfat + #msg "Pulling in libowfat" + #cvs -d :pserver:cvs@cvs.fefe.de:/cvs -z9 co libowfat + + ## Compile libowfat + #msg "Compiling libowfat" + #cd "$srcdir/libowfat" + #make + + #### + ## Build Opentracker + #### + + #### + ## The following is a list of compile time options + ## Add them to the 'FEATURES' option of the make command below + + #DWANT_V6 > Compile in IPV6 only support. + + ## Only one of the following accesslist options can be used. + #DWANT_ACCESSLIST_BLACK > Compile in a blacklist of allowed torrents. + #DWANT_ACCESSLIST_WHITE > Compile in a whitelist of allowed torrents. + + #FDWANT_SYNC_LIVE > Compile in support for running in clusters. + #DWANT_IP_FROM_QUERY_STRING > Experimental or old feature. No idea what this does. + #DWANT_COMPRESSION_GZIP > Compile in support for GZIP. This is used when downloading scrapes. + #DWANT_COMPRESSION_GZIP_ALWAYS > Always compress scrapes using GZIP before serving them to clients. + #DWANT_LOG_NETWORKS > Experimental or old feature. No idea what this does. + #DWANT_RESTRICT_STATS > Compile in support for restricting tracker stats based on IP. Can be configured in the configuration file. + #DWANT_IP_FROM_PROXY > Experimental or old feature. No idea what this does. + #DWANT_FULLLOG_NETWORKS > Experimental or old feature. No idea what this does. + #DWANT_LOG_NUMWANT > Experimental or old feature. No idea what this does. + #DWANT_MODEST_FULLSCRAPES > Experimental or old feature. No idea what this does. + #DWANT_SPOT_WOODPECKER > Experimental or old feature. No idea what this does. + #DWANT_SYSLOGS > Experimental or old feature. No idea what this does. + #DWANT_DEV_RANDOM > Experimental or old feature. No idea what this does. + #DWANT_FULLSCRAPE > Compile in support for querying opentracker for all tracked torrents. Defualt. Change Makefile to compile out this support. + + #D_DEBUG_HTTPERROR > This should add in support for serving errors to clients when pages like 127.0.0.1:6969/random are accessed which are not used by opentracker. + + msg "Compiling Opentracker" + cd "$srcdir/opentracker-git/" + + make LIBOWFAT_HEADERS="/usr/include" \ + LIBOWFAT_LIBRARY="/usr/lib" \ + #LIBOWFAT_HEADERS="../libowfat" \ + #LIBOWFAT_LIBRARY="../libowfat" \ + FEATURES="-DWANT_SYSLOGS -DDEBUG_HTTPERROR" \ + CC="/opt/diet/bin/diet gcc" +} + +package() { + + msg "Preparing the package" + + cd "$srcdir/" + + install -d $pkgdir/usr/bin/ + install -m 755 opentracker-git/opentracker $pkgdir/usr/bin/ + + install -d $pkgdir/usr/lib/systemd/system + install -m 755 opentracker.service $pkgdir/usr/lib/systemd/system/ + + install -d $pkgdir/etc/opentracker + install -m 644 opentracker-git/opentracker.conf.sample $pkgdir/etc/opentracker/config + + install -d $pkgdir/usr/share/doc/opentracker/ + install -m 644 opentracker-git/opentracker.conf.sample $pkgdir/usr/share/doc/opentracker/config + + install -d $pkgdir/usr/share/licenses/opentracker/ + install -m 644 license.txt $pkgdir/usr/share/licenses/opentracker/ + + msg "Finished" +}
\ No newline at end of file diff --git a/pcr/opentracker-git/license.txt b/pcr/opentracker-git/license.txt new file mode 100644 index 000000000..ebbaa7b0f --- /dev/null +++ b/pcr/opentracker-git/license.txt @@ -0,0 +1,8 @@ +/* + * ---------------------------------------------------------------------------- + * "THE BEER-WARE LICENSE" (Revision 42): + * <erdgeist@erdgeist.org> wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return Poul-Henning Kamp + * ---------------------------------------------------------------------------- + */
\ No newline at end of file diff --git a/pcr/opentracker/opentracker.service b/pcr/opentracker-git/opentracker.service index 5f1b887ea..5f1b887ea 100644 --- a/pcr/opentracker/opentracker.service +++ b/pcr/opentracker-git/opentracker.service diff --git a/pcr/opentracker/PKGBUILD b/pcr/opentracker/PKGBUILD deleted file mode 100644 index 2834866aa..000000000 --- a/pcr/opentracker/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> -# Maintainer (Arch): Jonas Heinrich <onny@project-insanity.org> - -pkgname=opentracker -pkgver=20130312 -pkgrel=1 -pkgdesc='An open and free bittorrent tracker (open mode)' -arch=('i686' 'x86_64' 'mips64el') -url='http://erdgeist.org/arts/software/opentracker/' -license=('custom:Beer' 'GPL') -makedepends=('libowfat' 'cvs') -depends=('bash' 'zlib') -backup=('etc/opentracker/config') -source=("http://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} -'opentracker.service' -'license.txt') -md5sums=('64956fd9bc7b453b4862b8ba15a27511' - '0217a2aeaee2b75017c13cdf86a245f2' - '3c638b71d5ecb65fb7964796975b2078' - '865211941e882c0aff5d36a22ac9efaa') - -_cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot' -_cvsmod='opentracker' - -mksource() { - pushd "${srcdir}" - msg 'Connecting to CVS server....' - if [ -d ${_cvsmod}/CVS ]; then - cd ${_cvsmod} - cvs -z3 update -d - else - cvs -z3 -d ${_cvsroot} co -f ${_cvsmod} - cd ${_cvsmod} - fi - - msg 'CVS checkout done or server timeout' - popd - - tar czf ${pkgname}-${pkgver}.tar.gz ${_cvsmod}/ -} - -build() { - cd "${srcdir}/${_cvsmod}" - msg 'Starting make...' - - sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ - -e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \ - -i opentracker.conf.sample - -# See Makefile for available features - make PREFIX=/usr \ - LIBOWFAT_HEADERS=/usr/includes \ - LIBOWFAT_LIBRARY=/usr/lib \ - FEATURES="-DWANT_SYSLOGS -DDEBUG_HTTPERROR" -} - -package(){ - cd "${srcdir}/${_cvsmod}" - - install -D -m 755 opentracker $pkgdir/usr/bin/opentracker - install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config - install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt - - # Create opentracker service - mkdir -p "$pkgdir/usr/lib/systemd/system/" - install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/" -} diff --git a/pcr/opentracker/license.txt b/pcr/opentracker/license.txt deleted file mode 100644 index ff1bb40f5..000000000 --- a/pcr/opentracker/license.txt +++ /dev/null @@ -1,2 +0,0 @@ -This software was written by Dirk Engling <erdgeist@erdgeist.org> -It is considered beerware. Prost. Skol. Cheers or whatever. diff --git a/pcr/opentracker/opentracker.install b/pcr/opentracker/opentracker.install deleted file mode 100644 index 59f6f6ebe..000000000 --- a/pcr/opentracker/opentracker.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - cat <<EOM - - Please be aware this package is built without accesslist support. Any - torrent announced to it will be tracked. - - If you want this features you'll have to rebuild this package. There're - instructions on the PKGBUILD. - - For more info check: http://erdgeist.org/arts/software/opentracker/ - -EOM -} - -post_upgrade() { - post_install -} diff --git a/pcr/opentracker/opentracker.rc.d b/pcr/opentracker/opentracker.rc.d deleted file mode 100644 index b1aa34c14..000000000 --- a/pcr/opentracker/opentracker.rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/opentracker` - -case "$1" in - start) - stat_busy "Starting opentracker Daemon" - [ -z "$PID" ] && su nobody -s /bin/sh -c "/usr/bin/opentracker -f /etc/opentracker/config&" - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon opentracker - stat_done - fi - ;; - stop) - stat_busy "Stopping opentracker Daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon opentracker - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/pcr/otf-stix/PKGBUILD b/pcr/otf-stix/PKGBUILD index 8fe871305..cb7187fcc 100644 --- a/pcr/otf-stix/PKGBUILD +++ b/pcr/otf-stix/PKGBUILD @@ -1,37 +1,29 @@ # Maintainer (Arch): ezzetabi <ezzetabi at gawab dot com> # Maintainer: Alon Ivtsan <alonivtsan@lavabit.com> -# taken from https://aur.archlinux.org/packages/otf-stix/ pkgname=otf-stix -pkgver=1.1.0 -#_pkgver=${pkgver//_/-} -pkgrel=2 -epoch=2 -pkgdesc='A comprehensive set of fonts that serve the scientific and -engineering community.' +pkgver=1.1.1_webfonts +_pkgver=${pkgver//_/-} +pkgrel=1 +epoch=3 +pkgdesc='A comprehensive set of fonts that serve the scientific and engineering community.' arch=('any') url="http://www.stixfonts.org" -license=('Custom: OFL') +license=('custom:STIXFont') depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils') makedepends=('unzip') install=otf-stix.install -source=("http://downloads.sourceforge.net/stixfonts/STIXv$pkgver.zip" +source=("http://downloads.sourceforge.net/stixfonts/STIXv$_pkgver.zip" 'http://www.stixfonts.org/STIXFontLicense2010.txt') -build() { - /bin/true -} - package() { cd "$srcdir" install -m755 -d "$pkgdir/usr/share/fonts/OTF" - install -m644 Fonts/STIX-General/*.otf "$pkgdir/usr/share/fonts/OTF" - install -m644 Fonts/STIX-Word/*.otf "$pkgdir/usr/share/fonts/OTF" + install -m644 ./STIX-MathJax/otf/*.otf "$pkgdir/usr/share/fonts/OTF" install -Dm644 "$srcdir"/STIXFontLicense2010.txt \ "$pkgdir"/usr/share/licenses/"$pkgname"/license.txt } -md5sums=('e5ebc8ef9b7df0f0bac0fd90bce95295' +md5sums=('5673808f48b1e5ab77064a3585866aab' 'b1af7bbd3cea93a60bf68cf571ad6cab') - diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD index c86601271..1f9b76f98 100644 --- a/pcr/par/PKGBUILD +++ b/pcr/par/PKGBUILD @@ -1,38 +1,28 @@ -# Contributor (Arch): Federico Quagliata (quaqo) <quaqo@despammed.com> -# Contributor (Arch): quantax -- contact via Arch Linux forum or AUR - +# Maintainer (Arch): Ray Hogenson <rayhogenson@gmail.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=par pkgver=1.52 -pkgrel=3 +pkgrel=4 pkgdesc="Paragraph reformatter" url="http://www.nicemice.net/par/" depends=('glibc') arch=(i686 x86_64) -license=('Custom') -source=(http://www.nicemice.net/par/Par152-autoconf.tar.gz - http://www.nicemice.net/par/par_1.52-i18n.3.diff.gz - http://www.nicemice.net/par/Par152.tar.gz ) -md5sums=('83e4d23a943ab07c44dd995b73195c70' - 'e79b448cb14323a39d817afce4847cdf' - '4ccacd824171ba2c2f14fb8aba78b9bf') +license=('custom') +source=(http://www.nicemice.net/par/Par152.tar.gz) +md5sums=('4ccacd824171ba2c2f14fb8aba78b9bf') +_dirname="Par152" prepare() { - cd $srcdir/Par152 - - patch -p1 -i $srcdir/par_1.52-i18n.3.diff + cd "$_dirname" } - build() { - cd $srcdir/Par152 - - ./configure --prefix=/usr - - make + cd "$_dirname" + make -f protoMakefile } - package() { - cd $srcdir/Par152 - install --mode=755 -D par "${pkgdir}/usr/bin/par" - install --mode=644 -D par.1 "${pkgdir}/usr/share/man/man1/par.1" - install --mode=644 -D par.doc "${pkgdir}/usr/share/licenses/${pkgname}/par.doc" + cd "$_dirname" + install --mode=755 -D par "$pkgdir/usr/bin/par" + install --mode=644 -D par.1 "$pkgdir/usr/share/man/man1/par.1" + install --mode=644 -D par.doc "$pkgdir/usr/share/licenses/$pkgname/par.doc" } + diff --git a/pcr/paraboley/COPYING b/pcr/paraboley/COPYING deleted file mode 100644 index 53556406c..000000000 --- a/pcr/paraboley/COPYING +++ /dev/null @@ -1,5 +0,0 @@ -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/>. diff --git a/pcr/paraboley/PKGBUILD b/pcr/paraboley/PKGBUILD deleted file mode 100644 index 0767b86ca..000000000 --- a/pcr/paraboley/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> - -pkgname=paraboley -pkgver=0.1 -pkgrel=1 -pkgdesc="Python script to display system infomation alongside the Parabola GNU / Linux-libre logo." -arch=('any') -url="http://XL04D.github.com/paraboley" -license=('GPL') -depends=('python') -makedepends=('git' 'python-distribute') -optdepends=( -'python-mpd-git: python libary for mpd interaction', -'python-logbook-git: for logging' -'imagemagick: for default screenshot command' -) -conflicts=() -provides=('paraboley') -source="git://github.com/XL04D/paraboley.git" - -pkgver() { - cd ${pkgname} - git describe --always | sed 's|-|.|g' -} - -package() { - cd "$srcdir/$pkgname" - python setup.py install --root=${pkgdir} - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/paraboley/COPYING -} diff --git a/pcr/paraboley/README.md b/pcr/paraboley/README.md deleted file mode 100644 index e24e8fe12..000000000 --- a/pcr/paraboley/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Paraboley -======== - -Paraboley is a system infomation printer, designed to be used when taking screenshots of computer desktops to provide additional infomation about the operating system setup. Paraboley is designed to be used for Parabola GNU / Linux-libre, and it acordingly prints out the Parabola GNU / Linux-libre logo along side the system infomation.
\ No newline at end of file diff --git a/pcr/paraboley/paraboley b/pcr/paraboley/paraboley deleted file mode 100755 index 122b3cbb0..000000000 --- a/pcr/paraboley/paraboley +++ /dev/null @@ -1,865 +0,0 @@ -#!/usr/bin/env python -# -# Paraboley is a forked made by Aurélien DESBIRÈRES <aurelien@hackers.camp> -# of archey3 to present the Parabola GNU / Linux-libre logo and informations -# -# archey3 [version 0.5] -# -# Copyright 2010 Melik Manukyan <melik@archlinux.us> -# Copyright 2010-2012 Laurie Clark-Michalek <bluepeppers@archlinux.us> -# Distributed under the terms of the GNU General Public License v3. -# See http://www.gnu.org/licenses/gpl.txt for the full license text. -# -# Simple python script to display an Archlinux logo in ASCII art -# Along with basic system information. - -# Import libraries - -import collections -import subprocess, optparse, re, sys, configparser -from subprocess import Popen, PIPE -from optparse import OptionParser -from getpass import getuser -from time import ctime, sleep -from os import getenv -from datetime import datetime -import re -import os.path -import multiprocessing - -try: - from logbook import Logger, lookup_level -except ImportError: - class Logger(object): - def __init__(self, name, level=0): - self.name = name - self.level = level - debug = info = warn = warning = notice = error = exception = \ - critical = log = lambda *a, **kw: None - - def lookup_level(_): - return 0 - -UNAME_FLAG_MEANINGS = { - 'a': 'System Infomation', - 's': 'Kernel Name', - 'n': 'Hostname', - 'r': 'Kernel Release', - 'v': 'Kernel Version', - 'm': 'Machine Hardware name', - 'p': 'Processor Type', - 'i': 'Hardware Platform', -} - -LOGOS = {'Parabola': '''{c1} -{c1} ## ### {results[0]} -{c1} ## ## ##### {results[1]} -{c1} ## ## ## ####### {results[2]} -{c1} # ## ## ## ######## {results[3]} -{c1} ### # ######### {results[4]} -{c1} ### ######### {results[5]} -{c1} ## ######## {results[6]} -{c1} ####### {results[7]} -{c1} ###### {results[8]} -{c1} ###### {results[9]} -{c1} ##### {results[10]} -{c1} ##### {results[11]} -{c1} #### {results[12]} -{c1} #### {results[13]} -{c1} ### {results[14]} -{c1} ### {results[15]} -{c1} ## {results[16]} -{c1} # {results[17]} -\x1b[0m''' -} - -CLASS_MAPPINGS = {} - -def module_register(name): - """ - Registers the class in the CLASS_MAPPING global. - """ - def decorator(cls): - CLASS_MAPPINGS[name] = cls - return cls - return decorator - -DE_DICT = collections.OrderedDict([ - ('cinnamon', 'Cinnamon'), - ('gnome-session', 'GNOME'), - ('ksmserver', 'KDE'), - ('xfce4-session', 'Xfce'), - ('lxsession', 'LXDE'), - ('', 'None'), - ]) - -WM_DICT = collections.OrderedDict([ - ('awesome', 'Awesome'), - ('beryl', 'Beryl'), - ('blackbox', 'Blackbox'), - ('dwm', 'DWM'), - ('enlightenment', 'Enlightenment'), - ('fluxbox', 'Fluxbox'), - ('fvwm', 'FVWM'), - ('i3', 'i3'), - ('icewm', 'IceWM'), - ('kwin', 'KWin'), - ('metacity', 'Metacity'), - ('musca', 'Musca'), - ('openbox', 'Openbox'), - ('pekwm', 'PekWM'), - ('ratpoison', 'ratpoison'), - ('scrotwm', 'ScrotWM'), - ('subtle', 'subtle'), - ('monsterwm', 'MonsterWM'), - ('wmaker', 'Window Maker'), - ('wmfs', 'Wmfs'), - ('wmii', 'wmii'), - ('xfwm4', 'Xfwm'), - ('emerald', 'Emerald'), - ('compiz', 'Compiz'), - (re.compile('xmonad-*'), 'xmonad'), - ('qtile', 'QTile'), - ('wingo', 'Wingo'), - ('', 'None'), - ]) - -COLORS = { - 'black': '0', - 'red': '1', - 'green': '2', - 'yellow': '3', - 'blue': '4', - 'magenta': '5', - 'cyan': '6', - 'white': '7' -} - -class ArgumentError(Exception): - def __init__(self, caller, message): - msg = "{0}: {1}".format(caller.__class__.__name__, message) - super().__init__(msg) - -# State must be serializable -State = collections.namedtuple("State", "color config logger") - -class display(object): - command_line = '' - stdindata = '' - - def __init__(self, state, args=()): - self.state = state - # Python3 unpacking is awesome - self.arg1, self.arg2, self.arg3, *_ = tuple(args) + ('', '', '') - - @staticmethod - def call_command(command): - """ - Calls a command, waits for it to exit and returns all text from stdout. - Discards all other information. - """ - proc = Popen(command.split(), stdout=PIPE) - proc.wait() - return proc.communicate()[0].decode() - - def run_command(self): - if self.command_line: - if '{arg3}' in self.command_line: - cmd = self.command_line.format(arg1=self.arg1, arg2=self.arg2, - arg3=self.arg3) - elif '{arg2}' in self.command_line: - cmd = self.command_line.format(arg1=self.arg1, arg2=self.arg2) - elif '{arg1}' in self.command_line: - cmd = self.command_line.format(arg1=self.arg1) - else: - cmd = self.command_line - - try: - self.process = Popen(cmd.split(), stdin=PIPE, stdout=PIPE, - stderr=PIPE) - except Exception as e: - self.state.logger.error("Could not run command {0}".format(cmd)) - - def render(self): - (stdoutdata, stderrdata) = self.process.communicate(self.stdindata - or None) - - return self.format_output(stdoutdata.decode()) - - def color_me(self, output, number=None, low=30, low_color='green', - medium=60, medium_color='yellow', high_color='red'): - if number is None and output.isdigit(): - number = int(output) - elif number is None: - return output - - if number <= low: - color_= low_color - elif low < number <= medium: - color_ = medium_color - elif medium < number: - color_ = high_color - - return '{0}{1}{2}'.format(color(self.state, color_), output, - color(self.state, 'clear')) - - regex_class = re.compile("").__class__ - def process_exists(self, key): - global PROCESSES - if isinstance(key, self.regex_class): - for proc in PROCESSES._processes: - if key.search(proc): - return True - return PROCESSES(key) - - -@module_register("fs") -class fsDisplay(display): - command_line = "df -TPh {arg1}" - - conversions = { - 'binary': { - 'K': 2 ** 10, - 'M': 2 ** 20, - 'G': 2 ** 30, - 'T': 2 ** 40, - }, - 'si': { - 'K': 10 ** 3, - 'M': 10 ** 6, - 'G': 10 ** 9, - 'T': 10 ** 12, - }, - } - - def __init__(self, **kwargs): - super().__init__(**kwargs) - if not self.arg1: - msg = "Did not any arguments, require one, the fs to display" - self.state.logger.error(msg) - raise ArgumentError(self, msg) - - def format_output(self, instring): - try: - decimal_point = self.call_command( - 'locale -ck decimal_point').split('\n')[1].split('=')[1] - except Exception as e: - self.state.logger.warning('Could not determine locale decimal point,' + - 'defaulting to \'.\', failed with error {0}'.format(e)) - decimal_point = '.' - values = [line for line in instring.split('\n') if line][1].split() - used = values[3].replace(decimal_point, '.') - total = values[2].replace(decimal_point, '.') - fstype = values[1] - conversion_type = self.state.config.get('fs', 'unit', fallback="si").lower() - conversions = self.conversions[conversion_type] - - mount = '/root' if self.arg1 == '/' else self.arg1 - title = mount.split('/')[-1].title() - - low = self.state.config.getint('fs', 'low_bound', fallback=40) - medium = self.state.config.getint('fs', 'medium_bound', fallback=70) - - try: - #convert to straight float - used_ = float(used[:-1]) * conversions[used[-1].upper()] - total_ = float(total[:-1]) * conversions[total[-1].upper()] - persentage = used_ / total_ * 100 - except Exception as e: - self.state.logger.error( - "Could not colorize output, errored with {0}".format(e)) - return - else: - used = self.color_me(used, persentage, low=low, medium=medium) - - if self.state.config.getboolean("fs", "persentage", fallback=True): - part = '{used} / {total} ({persentage}%) ({fstype})'.format( - used=used, total=total, persentage=int(persentage), - fstype=fstype) - else: - part = '{used} / {total} ({fstype})'.format( - used=used, total=total, fstype=fstype) - return title, part - -@module_register("ram") -class ramDisplay(display): - command_line = "free -m" - - def format_output(self, instring): - ram = ''.join(line for line in str(instring).split('\n') if\ - line.startswith('Mem:')).split() - used = int(ram[2]) - int(ram[5]) - int(ram[6]) - total = int(ram[1]) - title = 'RAM' - try: - persentage = (used / total * 100) - except: - used += ' MB' - else: - used = self.color_me(number=persentage, output=str(used) + ' MB') - part = '{used} / {total} MB'.format(used=used, total=total) - return title, part - -@module_register("sensor") -class sensorDisplay(display): - command_line = "sensors {arg1}" - - def __init__(self, **kwargs): - super().__init__(**kwargs) - - arg_from_conf = self.state.config.get('sensor', 'sensor', - fallback='coretemp-*') - try: - arg_from_arg = kwargs["args"][0] - except IndexError: - self.state.logger.error( - "Did not get any arguments, require one, the sensor to display.") - raise - - if arg_from_arg: - self.arg1 = arg_from_arg - else: - self.arg1 = arg_from_conf - - def format_output(self, instring): - tempinfo = instring.split('\n')[2::4] - - out = [] - for line in tempinfo: - info = [re.sub("\s\s+", "", line) for line in line.split(' ') if\ - line] - value = info[1] - intvalue = int(value[:3]) - if intvalue > 45: - temp = (color(self.state, "red") + info[1] + - color(self.state, "clear")) - elif intvalue in range(30, 45): - temp = (color(self.state, "magenta") + info[1] + - color(self.state, "clear")) - else: - temp = (color(self.state, "green") + info[1] + - color(self.state, "clear")) - out.append((info[0], temp)) - return out - -@module_register("env") -class envDisplay(display): - def __init__(self, **kwargs): - try: - self.arg1 = kwargs["args"][0] - except IndexError: - self.state.logger.error("Did not get any arguments, require one," + - " the env variable to display.") - raise - - super().__init__(**kwargs) - - def render(self): - argvalue = getenv(self.arg1.upper()) - return ('$' + self.arg1.upper(), argvalue) - -@module_register("uname") -class unameDisplay(display): - command_line = "uname {arg1}" - - def __init__(self, **kwargs): - super().__init__(**kwargs) - - try: - flag = kwargs["args"][0] - except IndexError: - self.state.logger.error("Did not get any arguments, require one," + - " the flag to pass to uname") - raise - - arg_from_conf = self.state.config.get('uname', 'argument', fallback="") - arg_from_arg = flag - if arg_from_arg: - self.arg1 = '-' + arg_from_arg - elif arg_from_conf: - self.arg1 = '-' + arg_from_conf - else: - self.arg1 = '' - - def format_output(self, instring): - return (UNAME_FLAG_MEANINGS[self.arg1[1]], instring) - -@module_register("cpu") -class cpuDisplay(display): - command_line = "cat /proc/cpuinfo" - - def format_output(self, instring): - kv = [line.split(":") for line in instring.split("\n") if line] - infodict = {} - for k, v in kv: - infodict[k.strip()] = v.strip() - return "Processor Type", infodict["model name"] - -@module_register("uptime") -class uptimeDisplay(display): - def render(self): - with open("/proc/uptime") as upfile: - raw = upfile.read() - fuptime = int(raw.split('.')[0]) - - day = int(fuptime / 86400) - fuptime = fuptime % 86400 - hour = int(fuptime / 3600) - fuptime = fuptime % 3600 - minute = int(fuptime / 60) - uptime = '{daystring}{hours}:{mins:02d}'.format( - daystring='{days} day{s}, '.format(days=day, s=('s' if day > 1 - else '')) if day else '', - hours = hour, mins = minute - ) - return "Uptime", uptime - -@module_register("packages") -class packageDisplay(display): - command_line = "pacman -Q" - - def format_output(self, instring): - return "Packages", len(instring.rstrip('\n').split('\n')) - -@module_register("distro") -class distroCheck(display): - def render(self): - try: - _ = open("/etc/pacman.conf") - except IOError: - distro = self.call_command("uname -o") - else: - distro = "Parabola" - distro = '{0} {1}'.format(distro, self.call_command("uname -m")) - return "OS", distro - -@module_register("process") -class processCheck(display): - command_line = "ps -u " + getuser() - - render = lambda self: self - - def run_command(self): - super().run_command() - out = str(self.process.communicate()[0]) - - self._processes = set() - for line in out.split("\\n"): - words = line.split() - if len(words) <= 3: - continue - - self._processes.add(words[3]) - - def __call__(self, proc): - if proc in self._processes: - return True - return False - -@module_register("wm") -class wmDisplay(display): - def render(self): - if self.state.config.get('wm', 'manual', fallback=False): - return "WM", self.state.config.get('wm', 'manual') - wm = '' - for key in WM_DICT.keys(): - if self.process_exists(key): - wm = key - break - return "WM", WM_DICT[wm] - -@module_register("de") -class deDisplay(display): - def render(self): - if self.state.config.get('de', 'manual', fallback=False): - return "DE", self.state.config.get('de', 'manual') - de = '' - for key in DE_DICT.keys(): - if self.process_exists(key): - de = key - break - return "DE", DE_DICT[de] - -@module_register("mpd") -class mpdDisplay(display): - """ - Displays certain stat about MPD database. If mpd not installed, output - nothing. - """ - command_line = "mpc stats --host {arg1} --port {arg2}" - - def __init__(self, **kwargs): - super().__init__(**kwargs) - - try: - self.stat = kwargs["args"][0] - except IndexError: - self.state.logger.error("Did not get any arguments, require one," + - " the stat to display.") - self.arg1 = self.state.config.get('mpd', 'host', fallback='localhost') - self.arg2 = self.state.config.getint('mpd', 'port', fallback=6600) - - def format_output(self, instring): - lines = instring.split('\n') - stats = {} - try: - stats['artists'] = lines[0].split(':')[1].strip() - stats['albums'] = lines[1].split(':')[1].strip() - stats['songs'] = lines[2].split(':')[1].strip() - #if people don't have mpc installed then return None) - except: - self.state.logger.error( - "Could not parse mpc output, is mpc installed?") - return - - return ('{statname} in MPD database'.format(statname=self.stat.title()), - stats[self.stat]) - -@module_register("system_upgrade") -class systemUpgrade(display): - - _upgrade_message = 'starting full system upgrade' - - def render(self): - try: - datestr = None - for line in reversed(list(open('/var/log/pacman.log'))): - if line.rstrip().endswith(self._upgrade_message): - datestart = line.find('[') - dateend = line.find(']') - if datestart != -1 and dateend != -1: - datestr = line[datestart + 1 : dateend] - break - except Exception as err: - print(err) - - if not datestr: - datestr = 'Unknown' - else: - currenttime = datetime.today() - updatetime = datetime.strptime(datestr, '%Y-%m-%d %H:%M') - numdays = (currenttime - updatetime).days - datestr = '{0} ({1} days ago)'.format(datestr, numdays) - - return "Last Upgrade", datestr - -#------------ Config ----------- - -class ArcheyConfigParser(configparser.SafeConfigParser): - """ - A parser for the archey config file. - """ - - defaults = {'core': {'align': 'top', - 'color': 'blue', - 'display_modules': - """\ -distro(), uname(n), uname(r), uptime(), wm(), de(), packages(), ram(),\ - cpu(), env(editor), fs(/), mpd(albums)""" - }, - } - - def read(self, file_location=None): - """ - Loads the config options stored in at file_location. If file_location - does not exist, it will attempt to load from the default config location - ($XDG_CONFIG_HOME/archey3.cfg). If that does not exist, it will write a - default config file to $XDG_CONFIG_HOME/archey3.cfg. - """ - - if file_location is None and "XDG_CONFIG_HOME" not in os.environ: - config_location = os.path.expanduser("~/.archey3.cfg") - elif file_location is None: - config_location = os.path.expandvars("$XDG_CONFIG_HOME/archey3.cfg") - else: - config_location = \ - os.path.expandvars(os.path.expanduser(file_location)) - - loaded = super(ArcheyConfigParser, self).read(config_location) - - if file_location == None and not loaded: - self.load_default_config() - self.write_config(config_location) - return [config_location] - if not loaded: - #Try with default - loaded = super(ArcheyConfigParser, self).read() - return loaded - - def load_default_config(self): - """ - Loads the config options stored at self.defaults. - """ - for section, values in self.defaults.items(): - if not self.has_section(section): - self.add_section(section) - - for option, value in values.items(): - #strip any excess spaces - value = re.sub("( +)", " ", value) - self.set(section, option, value) - - def write_config(self, location): - """ - Writes the current config to the given location. - """ - with open(location, 'w') as configfile: - self.write(configfile) - - -#------------ Functions ----------- - -def screenshot(state): - print('Screenshotting in') - screenshot_time = state.config.getint("core", "screenshotwait", fallback=5) - for x in sorted(range(1, screenshot_time + 1), reverse=True): - print('%s' % x, end='') - sys.stdout.flush() - sleep(1.0/3) - for x in range(3): - print('.', end='') - sys.stdout.flush() - sleep(1.0/3) - - print('Say Cheese!') - sys.stdout.flush() - - screenshot_command = state.config.get('core', 'screenshot_command', - fallback="import -window root <datetime>.jpg") - try: - subprocess.check_call( - screenshot_command.replace('<datetime>', - ctime().replace(' ','_')).split(" ")) - except subprocess.CalledProcessError as e: - state.logger.critical('Screenshot failed with return code {0}.'.format( - e.returncode)) - raise - except subprocess.FileNotFoundError: - print("Could not find import command, install imagemagick") - -def color(state, code, bold=False): - """ - Returns a character color sequence acording to the code given, and the - color theme in the state argument. - """ - if code == 2: - bold = True - first_bitty_bit = '\x1b[{0};'.format(int(not bold)) - if code in range(3): - second_bitty_bit = '3{0}m'.format(state.color) - elif code == "clear": - return '\x1b[0m' - else: - second_bitty_bit = '3{0}m'.format(COLORS[code]) - - return first_bitty_bit + second_bitty_bit - -def _mp_render_helper(container): - """ - A little helper to get round the one iterator argument with - multiprocessing.Pool.map. - """ - state = container["state"] - cls_name = container["cls_name"] - args = container["args"] - cls = CLASS_MAPPINGS[cls_name] - return render_class(state, cls, args) - -def render_class(state, cls, args): - """ - Returns the result of the run_command method for the class passed. - """ - try: - instance = cls(args=args, state=State( - logger=Logger(cls.__name__, state.logger.level), - color=state.color, - config=state.config)) - - except Exception as e: - state.logger.error( - "Could not instantiate {0}, failed with error {1}".format( - cls.__name__, e)) - return - try: - instance.run_command() - return instance.render() - except Exception as e: - state.logger.error( - "Could not render line for {0}, failed with error {1}".format( - cls.__name__, e)) - -#------------ Display object --------- - -class Archey(object): - DISPLAY_PARSING_REGEX = "(?P<func>\w+)\((|(?P<args>[\w, /]+))\)" - - def __init__(self, config, options): - log_level = lookup_level(options.log_level) - logger = Logger("Core", log_level) - - self.display = config.get("core", "display_modules") - colorscheme = options.color or config.get( - "core", "color", fallback="blue") - for key in COLORS.keys(): - if key == colorscheme: - colorcode = COLORS[key] - - self.state = State(colorcode, config, logger) - - global PROCESSES - PROCESSES = render_class(self.state, processCheck, ()) - - distro_out = render_class(self.state, distroCheck, ()) - - if not distro_out: - self.state.logger.critical( - "Unrecognised distribution.") - raise RuntimeException("Unrecognised distribution.") - - self.distro_name = ' '.join(distro_out[1].split()[:-1]) - - def run(self, screenshot_=False): - """ - Actually print the logo etc, and take a screenshot if required. - """ - print(self.render()) - - if screenshot_: - screenshot(self.state) - - def render(self): - results = self.prepare_results() - results = self.arrange_results(results) - - return LOGOS[self.distro_name].format(c1=color(self.state, 1), - results = results - ) - - def prepare_results(self): - """ - Renders all classes found in the display array, and then returns them - as a list. The returned list will be exactly 18 items long, with any - left over spaces being filled with empty strings. - """ - poolsize = self.state.config.getint("core", "poolsize", fallback=5) - - pool = multiprocessing.Pool(poolsize) - - arguments = [] - for cls_name, args in self.parse_display(): - arguments.append({ - 'cls_name': cls_name, - 'args': args, - 'state': self.state - }) - raw_out = pool.map(_mp_render_helper, arguments) - outputs = list(map(self.format_item, - filter(bool, raw_out))) - - - return outputs + [""] * (18 - len(outputs)) - - def arrange_results(self, results): - """ - Arranges the results as specified in the config file. - """ - arrangement = self.state.config.get("core", "align", fallback="top") - if arrangement == "top": - return results - elif arrangement == "bottom": - actuall_res = [res for res in results if res] - return [""] * (len(results) - len(actuall_res)) + actuall_res - elif arrangement == "center": - actuall_res = [res for res in results if res] - offset = [""] * int((len(results) - len(actuall_res)) / 2) - return (offset + actuall_res + - [""] * (len(results) - len(actuall_res))) - else: - return results - - def parse_display(self): - """ - Iterates over the display attribute of the Archey class, and tries to - parse them using the DISPLAY_PARSING_REGEX. - """ - for func in self.display.split(","): - func = func.strip() - - info = re.match(self.DISPLAY_PARSING_REGEX, func) - if not info: - self.state.logger.error( - "Could not parse display string {0}".format(func)) - continue - - groups = info.groupdict() - if groups["args"]: - args = [arg.strip() for arg in groups["args"].split(",")] - else: - args = () - - yield groups["func"], args - raise StopIteration - - def format_item(self, item): - title = item[0].rstrip(':') - data = str(item[1]).rstrip() - - #if we're dealing with a fraction - if len(data.split('/')) == 2: - numerator = data.split('/')[0] - numerator = (color(self.state, 1, bold=True) + numerator + - color(self.state, 'clear')) - denominator = data.split('/')[1] - data = '/'.join((numerator, denominator)) - - return "{color}{title}:{clear} {data}".format( - color=color(self.state, 1), - title=title, - data=data, - clear=color(self.state, "clear") - ) - -def main(): - parser = OptionParser( - usage='%prog', - description="""%prog is a utility to display system info and take\ - screenshots""", - version="%prog 0.3") - parser.add_option('-c', '--color', - action='store', type='choice', dest='color', - choices=('black', - 'red', - 'green', - 'yellow', - 'blue', - 'magenta', - 'cyan', - 'white'), - help="""choose a color: black, red, green, yellow, blue, magenta,\ - cyan, white [Default: blue]""") - parser.add_option('-s', '--screenshot', - action='store_true', dest='screenshot', help='Take a screenshot') - parser.add_option('--config', - action='store', dest='config', default=None, - help="Set the location of the config file to load.") - parser.add_option('--debug', - action='store', type='choice', dest='log_level', - choices=('NOTSET', - 'DEBUG', - 'INFO', - 'WARNING', - 'ERROR', - 'CRITICAL'), - default='CRITICAL', - help="The level of errors you wish to display. Choices are\ - NOTSET, DEBUG, INFO, WARNING, ERROR, and CRITICAL. CRITICAL is the default.") - (options, args) = parser.parse_args() - - config = ArcheyConfigParser() - config.read(options.config) - - archey = Archey(config=config, options=options) - archey.run(options.screenshot) - -if __name__ == "__main__": - main() diff --git a/pcr/paraboley/setup.py b/pcr/paraboley/setup.py deleted file mode 100644 index c80486ce1..000000000 --- a/pcr/paraboley/setup.py +++ /dev/null @@ -1,17 +0,0 @@ -import os -from setuptools import setup - -def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() - -setup( - name="Paraboley", - version="0.1", - author="Aurélien DESBRIÈRES", - author_email="aurelien@hackers.camp", - description="A simple python scrip to display an Parabola GNU / Linux-libre logo in ASCII art along with basic system information.", - license="GPL", - url="https://github.com/XL04D/paraboley", - long_description=read("README.md"), - scripts=["paraboley"] -) diff --git a/pcr/pdsh/PKGBUILD b/pcr/pdsh/PKGBUILD index 86bf8c987..68bfaa22a 100644 --- a/pcr/pdsh/PKGBUILD +++ b/pcr/pdsh/PKGBUILD @@ -13,6 +13,7 @@ depends=('glibc' 'openssh' 'readline') optdepends=('perl: required by the dshbak utility') options=('libtool') source=("http://pdsh.googlecode.com/files/$pkgname-$pkgver.tar.bz2") +md5sums=('e3512d03e491de6f1a735ab0ff702108') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/pcr/perl-readonly/PKGBUILD b/pcr/perl-readonly/PKGBUILD deleted file mode 100644 index cec681e71..000000000 --- a/pcr/perl-readonly/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Contributor (Arch): John D Jones III <jnbek1972 -_AT_- g m a i l -_Dot_- com> -# Generator (Arch): CPANPLUS::Dist::Arch 1.28 -# Contributor : Márcio Silva <coadde@parabola.nu> - -pkgname='perl-readonly' -pkgver='2.00' -pkgrel='1' -pkgdesc="Facility for creating read-only scalars, arrays, hashes" -arch=('any') -license=('GPL1') -options=('!emptydirs') -depends=('perl>=5.6.0') -makedepends=() -url='http://search.mcpan.org/dist/Readonly' -source=("http://search.mcpan.org/CPAN/authors/id/S/SA/SANKO/Readonly-$pkgver.tar.gz") -md5sums=('05866426331fd2b8d4feebbba245298d') -sha512sums=('293c3be4af0bee2390d5370132c17de31010443123321771dd124d3e285cd72abbdaa7b6f50a2c44102d03a5724636f2976016111efe09afd27149f6880c2bec') -_distdir="Readonly-$pkgver" - -build() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ - PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - MODULEBUILDRC=/dev/null - - cd "$srcdir/$_distdir" - /usr/bin/perl Build.PL - /usr/bin/perl Build - ) -} - -check() { - cd "$srcdir/$_distdir" - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - /usr/bin/perl Build test - ) -} - -package() { - cd "$srcdir/$_distdir" - /usr/bin/perl Build install - - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: diff --git a/pcr/petri-foo/PKGBUILD b/pcr/petri-foo/PKGBUILD index 72ca1e45a..981c76adb 100644 --- a/pcr/petri-foo/PKGBUILD +++ b/pcr/petri-foo/PKGBUILD @@ -1,10 +1,10 @@ +# Maintainer (Arch): masutu <masutu dot arch at gmail dot com> # Maintainer: Guest One <theguestone at gmail dot com> -# patch taken from https://aur.archlinux.org/packages/petri-foo/ pkgname=petri-foo pkgver=0.1.87 -pkgrel=1 +pkgrel=2 pkgdesc="A fork of specimen, a MIDI controllable audio sampler, for JACK." -arch=('i686') +arch=('i686' 'x86_64') url="http://petri-foo.sourceforge.net/" license=('GPL2') depends=('jack' 'libgnomecanvas') diff --git a/pcr/places/PKGBUILD b/pcr/places/PKGBUILD new file mode 100644 index 000000000..decc56842 --- /dev/null +++ b/pcr/places/PKGBUILD @@ -0,0 +1,49 @@ +# Contributor (Arch): Doug Newgard <scimmia at archlinux dot info> +# Contributor (Arch): fancris3 <fancris3 at aol.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> + +_pkgname=places +pkgname=$_pkgname +pkgver=0.19.r197.b736f06 +pkgrel=1 +pkgdesc="Enlightenment module: Manage the mounting of volumes" +arch=('i686' 'x86_64') +url="https://phab.enlightenment.org/w/emodules/places/" +license=('MIT') +depends=('enlightenment<0.19.99' 'udisks') +makedepends=('git') +source=("git://git.enlightenment.org/enlightenment/modules/$_pkgname.git#branch=enlightenment-0.19") +sha256sums=('SKIP') + +pkgver() { + cd "$srcdir/$_pkgname" + + local v_ver=$(awk -F , '/^AC_INIT/ {gsub(/[\[\] -]/, ""); print $2}' configure.ac) + + printf "$v_ver.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" +} + +build() { + cd "$srcdir/$_pkgname" + + ./autogen.sh \ + --prefix=/usr \ + --disable-static + + make +} + +package() { + cd "$srcdir/$_pkgname" + + make DESTDIR="$pkgdir" install + +# install text files + install -Dm644 ChangeLog "$pkgdir/usr/share/doc/$_pkgname/ChangeLog" + install -Dm644 NEWS "$pkgdir/usr/share/doc/$_pkgname/NEWS" + install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README" + +# install license files + install -Dm644 AUTHORS "$pkgdir/usr/share/licenses/$pkgname/AUTHORS" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/pcr/popcorntime/PKGBUILD b/pcr/popcorntime/PKGBUILD index 0ab0ab9a2..d1653b2aa 100644 --- a/pcr/popcorntime/PKGBUILD +++ b/pcr/popcorntime/PKGBUILD @@ -7,22 +7,20 @@ pkgname=popcorntime pkgver=0.3.7.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="Stream movies from torrents. Skip the downloads. Launch, click, watch." arch=('i686' 'x86_64') url="http://popcorntime.io/" license=('GPL3') -makedepends=('git' 'nodejs-grunt-cli' 'nodejs-bower') -depends=('alsa-lib' 'gconf' 'gtk2' 'nss' 'ttf-font' 'libxtst') +makedepends=('git' 'nodejs-grunt-cli' 'nodejs-bower' 'npm') +depends=('alsa-lib' 'gconf' 'gtk2' 'nss' 'ttf-liberation' 'libxtst') optdepends=('net-tools: vpn.ht client') options=('!strip') -install="popcorntime.install" _gitname=desktop.git _nw_ver=0.9.2 md5sums=('5b3ddb62787e9ed381105b56626974bb' - 'SKIP' + 'c2934ff1ce2e40c086449b0465df42c3' 'fc25eb312257b8c7e04e8e59c973566e' - 'efe872f41ed74a706308b4015e4fd82f' '9608f35f4cc083a0c36b0f4ef275ab10') _platform=linux64 @@ -37,15 +35,14 @@ _nw_file=node-webkit-v${_nw_ver}-${_nw_platform}.tar.gz source=("desktop-v${pkgver}.tar.bz2::https://git.popcorntime.io/popcorntime/desktop/repository/archive.tar.bz2?ref=v${pkgver}" "desktop-i18n-master.tar.bz2::https://git.popcorntime.io/popcorntime/desktop-i18n/repository/archive.tar.bz2?ref=master" "http://cdn.popcorntime.io/nw/v${_nw_ver}/${_nw_file}" - "popcorntime.install" "popcorntime.desktop") prepare() { cd "${srcdir}/${_gitname}" - + # https://git.popcorntime.io/popcorntime/desktop/commit/6f1864cb00b0af4da062391de04206f9495c88b0 sed -i "s|git+https://git.popcorntime.io/mirrors/peerflix.git|https://git.popcorntime.io/mirrors/peerflix/repository/archive.tar.gz|g" package.json - + cp "${srcdir}"/desktop-i18n.git/* src/app/language mkdir -p "${srcdir}/${_gitname}/build/cache/${_platform}/${_nw_ver}/" diff --git a/pcr/popcorntime/popcorntime.install b/pcr/popcorntime/popcorntime.install deleted file mode 100644 index bd924b2be..000000000 --- a/pcr/popcorntime/popcorntime.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - echo - echo "WARNING: Popcorn Time streams movies from Torrents" - echo "Downloading copyrighted material may be illegal in your country!" - echo "Use at your own risk!" -} - -post_upgrade() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/pspp/PKGBUILD b/pcr/pspp/PKGBUILD index 8cba34875..dadb3a963 100644 --- a/pcr/pspp/PKGBUILD +++ b/pcr/pspp/PKGBUILD @@ -1,18 +1,19 @@ # Maintainer (Arch): Miguel Revilla <yo@miguelrevilla.com> # Contributor (Arch): joyfulgirl <joyfulgirl (at) archlinux.us> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=pspp -pkgver=0.8.2 +pkgver=0.8.4 pkgrel=1 -pkgdesc="Statistical analysis program" -arch=('i686' 'x86_64' 'mips64el') +pkgdesc="Statistical analysis program. Free replacement for SPSS." +arch=('i686' 'x86_64') url="http://www.gnu.org/software/pspp/" license=('GPL3') depends=('gsl' 'gtksourceview2' 'postgresql-libs' 'desktop-file-utils') optdepends=('zlib: GNUmeric support' 'libxml2: GNUMERIC support') options=('!libtool' '!emptydirs') -source=(http://ftp.gnu.org/gnu/pspp/pspp-${pkgver}.tar.gz) -md5sums=('cba0b161bb69e1bbd71612d09694b0ec') +source=(ftp://ftp.gnu.org/gnu/pspp/pspp-${pkgver}.tar.gz) +md5sums=('85b7729751ebe427fb71a362b71cdfd9') install=pspp.install build() { diff --git a/pcr/pyrenamer/PKGBUILD b/pcr/pyrenamer/PKGBUILD new file mode 100644 index 000000000..f202afee7 --- /dev/null +++ b/pcr/pyrenamer/PKGBUILD @@ -0,0 +1,41 @@ +# Contributor (Arch): boenki <boenki at gmx dot de> +# Contributor (Arch): Arkham <arkham at archlinux dot us> +# Contributor (Arch): Christoph Zeiler <rabyte*gmail> +# Contributor (Arch): Marcin Karpezo <sirmacik at gmail dot com> +# Contributor (Arch): Lucas Salies Brum <lucas at archlinux dot com dot br> +# Contributor (Arch): max.bra <max.bra at alice dot it> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=pyrenamer +pkgver=0.6.0 +pkgrel=9 +pkgdesc="Mass file renamer" +arch=('any') +url="http://www.infinicode.org" +license=('GPL2') +depends=('python2-gconf') +makedepends=('perl-xml-parser') +optdepends=('hachoir-metadata: rename multimedia files metadata' + 'python2-eyed3: rename MP3 files metadata') +install=$pkgname.install +source=(http://ftp.de.debian.org/debian/pool/main/p/pyrenamer/pyrenamer_0.6.0.orig.tar.gz) +md5sums=('a7159f803cd919ab76f17789189c577b') + +prepare() { + cd $pkgname-$pkgver + sed -i 's|python python2 python2.5|python2 python2.5|' configure + sed -i 's|PYTHON=python|PYTHON=python2|' py-compile + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' src/$pkgname +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/pcr/pyrenamer/pyrenamer.install b/pcr/pyrenamer/pyrenamer.install new file mode 100644 index 000000000..3604d0bc0 --- /dev/null +++ b/pcr/pyrenamer/pyrenamer.install @@ -0,0 +1,20 @@ +post_install() { + gconfpkg --install pyrenamer + post_remove $1 +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall pyrenamer +} + +post_remove() { + update-desktop-database -q +} diff --git a/pcr/python-django-extensions/PKGBUILD b/pcr/python-django-extensions/PKGBUILD index 9abf30fda..27c926da2 100644 --- a/pcr/python-django-extensions/PKGBUILD +++ b/pcr/python-django-extensions/PKGBUILD @@ -1,12 +1,12 @@ -# Contributor (Arch): Jeremy "Ichimonji10" Audet <ichimonji10 at gmail dot com> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer (Arch): Jeremy "Ichimonji10" Audet <ichimonji10 at gmail dot com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # # namcap warns that python-django and python-six are unnecessary dependencies. # This is untrue. pkgname=python-django-extensions _pkgname=django-extensions -pkgver=1.5.2 +pkgver=1.5.5 pkgrel=1 pkgdesc='A collection of custom extensions for the Django Framework.' arch=(any) @@ -20,7 +20,7 @@ optdepends=( ) options=(!emptydirs) source=("https://github.com/${_pkgname}/${_pkgname}/archive/${pkgver}.tar.gz") -sha256sums=('dd719ca75fe69803a55f7cd7e0f0c6563eb4e0bf68acfc352ffb58fe708722de') +sha256sums=('4ee4fe0559137a74df3d7692406d1efaa7c47fe903442f211b926104f193e436') package() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/pcr/python-pygame-hg/PKGBUILD b/pcr/python-pygame-hg/PKGBUILD deleted file mode 100644 index a0c2773ca..000000000 --- a/pcr/python-pygame-hg/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# Maintainer: Márcio Silva <coadde@parabola.nu> - -_pkgname=pygame -_pkgver=1.9.2 -_pyname=python -_py3ver=3.3 -_py2ver=2.7 -_pkg3name=$_pyname-$_pkgname -_pkg2name=${_pyname}2-$_pkgname -_srcver=pre.d$(LC_ALL=C date -u +%Y%m%d) - -pkgbase=$_pyname-$_pkgname -pkgname=( - $_pkg3name-hg - $_pkg2name-hg -) -pkgver=$_pkgver$_srcver -pkgrel=1 -pkgdesc="${_pyname^} game library" -arch=( - mips64el - x86_64 - i686 -) -url=http://www.$_pkgname.org/ -license=LGPL2.1 -depends=( - ffmpeg - portmidi - python - python2 - #sdl_gfx - sdl_image - sdl_mixer - sdl_ttf -) -makedepends=mercurial -source=hg+https://bitbucket.org/$_pkgname/$_pkgname -sha512sums=SKIP - -package_python-pygame-hg() { - # disabled, due which conflicts with $_pkg2name - #provides=("$_pkg3name=$_pkgver") - #conflicts=$_pkg3name - - cd $_pkgname - - msg Building - find . -type f -exec sed -i "s|/usr/bin/env ${_pyname}2|/usr/bin/env $_pyname|" {} + - $_pyname config.py -auto - $_pyname setup.py install --root=$pkgdir --prefix=/usr - - msg 'Copying the examples and tests' - cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname - cp -va test/* $pkgdir/usr/lib/$_pyname$_py3ver/site-packages/$_pkgname/tests -} - -package_python2-pygame-hg() { - provides=("$_pkg2name=$_pkgver") - conflicts=$_pkg2name - - cd $_pkgname - - msg Building - find . -type f -exec sed -i "s|/usr/bin/env $_pyname|/usr/bin/env ${_pyname}2|" {} + - ${_pyname}2 config.py -auto - ${_pyname}2 setup.py install --root=$pkgdir --prefix=/usr - - msg 'Copying the examples and tests' - cp -va examples lib/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname - cp -va test/* $pkgdir/usr/lib/$_pyname$_py2ver/site-packages/$_pkgname/tests -} diff --git a/pcr/python2-django-extensions/PKGBUILD b/pcr/python2-django-extensions/PKGBUILD index 2ce9c8e4c..b7a12e16e 100644 --- a/pcr/python2-django-extensions/PKGBUILD +++ b/pcr/python2-django-extensions/PKGBUILD @@ -1,9 +1,9 @@ -# Contributor (Arch): Jeremy "Ichimonji10" Audet <ichimonji10 at gmail dot com> +# Maintainer (Arch): Jeremy "Ichimonji10" Audet <ichimonji10 at gmail dot com> # Contributor (Arch): Dominik Kozaczko <dominik@kozaczko.info> # Contributor (Arch): Alper Kanat <alperkanat@raptiye.org> # Contributor (Arch): Apkawa <apkawa@gmail.com> # Contributor (Arch): Schnouki <thomas.jost@gmail.com> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # # namcap warns that python2-django and python2-six are unnecessary dependencies. # This is untrue. @@ -13,7 +13,7 @@ pkgname=python2-django-extensions _pkgname=django-extensions -pkgver=1.5.2 +pkgver=1.5.5 pkgrel=1 pkgdesc='A collection of custom extensions for the Django Framework.' arch=(any) @@ -29,7 +29,7 @@ provides=(django-extensions) conflicts=(django-extensions) options=(!emptydirs) source=("https://github.com/${_pkgname}/${_pkgname}/archive/${pkgver}.tar.gz") -sha256sums=('dd719ca75fe69803a55f7cd7e0f0c6563eb4e0bf68acfc352ffb58fe708722de') +sha256sums=('4ee4fe0559137a74df3d7692406d1efaa7c47fe903442f211b926104f193e436') package() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/pcr/python2-sendfile/PKGBUILD b/pcr/python2-sendfile/PKGBUILD index c30e4d1a1..936f46a88 100644 --- a/pcr/python2-sendfile/PKGBUILD +++ b/pcr/python2-sendfile/PKGBUILD @@ -19,3 +19,4 @@ package() { } # vim:set ts=2 sw=2 et: +md5sums=('bd8d96b64e7c5c5b91ea2a6659aa82a3') diff --git a/pcr/qemu-usbredir/65-kvm.rules b/pcr/qemu-usbredir/65-kvm.rules deleted file mode 100644 index 569ded9f9..000000000 --- a/pcr/qemu-usbredir/65-kvm.rules +++ /dev/null @@ -1,2 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" -KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net" diff --git a/pcr/qemu-usbredir/PKGBUILD b/pcr/qemu-usbredir/PKGBUILD deleted file mode 100644 index 480b19c7c..000000000 --- a/pcr/qemu-usbredir/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# $Id$ -# Maintainer (Arch GNU/Linux): Tobias Powalowski <tpowa@archlinux.org> -_pkgname=qemu -pkgname=qemu-usbredir -pkgver=1.7.0 -pkgrel=1 -pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2' 'LGPL2.1') -url="http://wiki.qemu.org/Index.html" -makedepends=('texi2html' 'perl' 'python2' 'spice-protocol') -depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' - 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' - 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' - 'libiscsi' 'libcacard' 'spice' 'usbredir') -backup=('etc/qemu/target-x86_64.conf') -install=qemu.install -source=(http://wiki.qemu.org/download/${_pkgname}-${pkgver}.tar.bz2 - 65-kvm.rules) -makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' - 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' - 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' - 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2' - 'usbredir') -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") -replaces=('qemu-kvm') -options=(!strip) - -build () -{ - cd "${srcdir}/${_pkgname}-${pkgver}" - # qemu vs. make 4 == bad - export ARFLAGS="rv" - # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740 - # gtk gui breaks keymappings at the moment - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \ - --python=/usr/bin/python2 --smbd=/usr/bin/smbd \ - --enable-docs --libexecdir=/usr/lib/qemu \ - --disable-gtk --enable-linux-aio --enable-seccomp \ - --enable-spice --localstatedir=/var --enable-usb-redir - make V=99 -} - -package () -{ - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install - # provided by seabios package - rm "${pkgdir}/usr/share/qemu/bios.bin" - rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml" - rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml" - # remove conflicting /var/run directory - rm -r "${pkgdir}/var" - install -D -m644 "${srcdir}/65-kvm.rules" \ - "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules" - # bridge_helper needs suid - # https://bugs.archlinux.org/task/32565 - chmod u+s "${pkgdir}/usr/lib/qemu/qemu-bridge-helper" - # add sample config - echo "allow br0" > ${pkgdir}/etc/qemu/bridge.conf.sample - # strip scripts directory - find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -bi "$binary")" in - *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; - esac - done - # remove libcacard files - rm -rf ${pkgdir}/usr/include/cacard - rm -rf ${pkgdir}/usr/lib/libcacard* - rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc - rm -rf ${pkgdir}/usr/bin/vscclient -} - -md5sums=('32893941d40d052a5e649efcf06aca06' - '33ab286a20242dda7743a900f369d68a') diff --git a/pcr/qemu-usbredir/qemu.install b/pcr/qemu-usbredir/qemu.install deleted file mode 100644 index 79ee83536..000000000 --- a/pcr/qemu-usbredir/qemu.install +++ /dev/null @@ -1,23 +0,0 @@ -# kvm: the new package version -post_install() { - # - groupadd kvm -f -g 78 -} - -post_upgrade() { - if [ "$(vercmp $2 0.11)" -lt 0 ]; then - echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module" - echo "is no longer supported and will be removed from the repositories. You" - echo "can safely uninstall it from your system." - fi - if [ "$(vercmp $2 1.3.1)" -lt 0 ]; then - echo "With the release of qemu 1.3.0, qemu-kvm binary is removed." - echo "You need to change the emulator path, if you use libvirt by using:" - echo "'virsh edit <vm-name>'" - fi -} - -post_remove() { - # - groupdel kvm -} diff --git a/pcr/quvi-current/PKGBUILD b/pcr/quvi-current/PKGBUILD deleted file mode 100644 index 009646597..000000000 --- a/pcr/quvi-current/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 98182 2013-10-07 12:06:30Z jgc $ -# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor (Arch): joyfulgirl@archlinux.us - -pkgname=quvi-current -_pkgname=quvi -provides=(quvi) -pkgver=0.9.5 -pkgrel=1 -pkgdesc='Command-line tool for parsing video download links.' -arch=('i686' 'x86_64' 'mips64el') -url='http://quvi.sourceforge.net/' -license=('AGPL3') -depends=('libquvi') -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"{,.sig}) - -build() { - cd "${_pkgname}-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} -md5sums=('baa1d7b25e9fd173e952e27d4aa4b933' - 'SKIP') diff --git a/pcr/qwtpolar/PKGBUILD b/pcr/qwtpolar/PKGBUILD new file mode 100644 index 000000000..a4cb5c91b --- /dev/null +++ b/pcr/qwtpolar/PKGBUILD @@ -0,0 +1,48 @@ +# Contributor (Arch): SaultDon <sault.don gmail> +# Contributor (Arch): Gunther Schulz < mail at guntherschulz.de > +# Contributor (Arch): Kévin Guilloy <kevin at guilloy dot ath dot cx> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +pkgname=qwtpolar +_pkgver=1.1 +pkgver=1.1.r182 +pkgrel=6 +pkgdesc="A Qwt library that contains classes for displaying values on a polar coordinate system." +arch=('i686' 'x86_64') +url="http://qwtpolar.sourceforge.net/" +license=('custom:Qwt License, Version 1.0') +depends=('qt4>=4.8.5' + 'qwt>=6.1.0') +makedepends=('subversion') +provides=("$pkgname=$pkgver") +conflicts=('qwtpolar' + 'qwtpolar-svn' + 'qwtpolar-svn-qt4') +source=("qwtpolar::svn+https://svn.code.sf.net/p/qwtpolar/code/branches/qwtpolar-${_pkgver}") +md5sums=('SKIP') + +pkgver() { + cd "$pkgname" + local ver="$(svnversion)" + printf "%s.r%s" "${_pkgver}" "${ver//[[:alpha:]]}" +} + +build() { + cd "$srcdir/$pkgname" + + sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/doc/\/usr\/share\/doc\/qwt\//' qwtpolarconfig.pri + sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/include/\/usr\/include\/qwt\//' qwtpolarconfig.pri + sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/lib/\/usr\/lib\//' qwtpolarconfig.pri + sed -i -e 's/$${QWT_POLAR_INSTALL_PREFIX}\/features/\/usr\/share\/qwt\/features\//' qwtpolarconfig.pri + sed -i -e 's/^.*QwtPolarDesigner//' qwtpolarconfig.pri + sed -i -e 's/^.*QwtPolarExamples//' qwtpolarconfig.pri + echo "INCLUDEPATH += /usr/include" >> qwtpolarbuild.pri + + qmake-qt4 qwtpolar.pro + make +} + +package() { + cd "$srcdir/$pkgname" + + make INSTALL_ROOT="${pkgdir}"/ install +}
\ No newline at end of file diff --git a/pcr/rootcheck/PKGBUILD b/pcr/rootcheck/PKGBUILD index 89ccefda7..2cd7f962b 100644 --- a/pcr/rootcheck/PKGBUILD +++ b/pcr/rootcheck/PKGBUILD @@ -9,6 +9,7 @@ arch=(i686 x86_64) url="http://www.ossec.net/main/rootcheck" license=("GPL") source=(http://www.ossec.net/rootcheck/files/rootcheck-$pkgver.tar.gz) +md5sums=('d7c1afc8026a6a073147e322058ea6bd') package() { cd $srcdir/$pkgname-$pkgver diff --git a/pcr/rtorrent-color/PKGBUILD b/pcr/rtorrent-color/PKGBUILD index 2016108f1..39f52b1e4 100644 --- a/pcr/rtorrent-color/PKGBUILD +++ b/pcr/rtorrent-color/PKGBUILD @@ -19,6 +19,8 @@ provides=("${_pkgname}") install="${pkgname}.install" source=("${url}/downloads/${_pkgname}-${pkgver}.tar.gz" "${_pkgname}-${pkgver}_color.patch") +sha1sums=('e997822e9b0d53cf8ecfb6b836e380065890e10d' + '78429b5cf5976270dc1a55d8dc0ef4644675512b') build() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/pcr/send-to-torrent/PKGBUILD b/pcr/send-to-torrent/PKGBUILD index 110ba0b1a..4773370d0 100644 --- a/pcr/send-to-torrent/PKGBUILD +++ b/pcr/send-to-torrent/PKGBUILD @@ -1,12 +1,13 @@ +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=send-to-torrent -pkgver=0.0.3 -pkgrel=1 +pkgver=0.0.4 +pkgrel=1.1 pkgdesc="Share files from the file browser" arch=('any') url="http://repo.hackcoop.com.ar/send-to-torrent.git/" license=("AGPL3") source=("http://repo.hackcoop.com.ar/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.xz") -md5sums=('e9d465ebec3abd1e142731f53adf8cf2') +md5sums=('19b759f6534af8dfe7ed1aa9a6fde65e') depends=("bash" "mktorrent" "xdg-utils") optdepends=("libnotify: desktop notifications" "transmission-cli: transmission support" diff --git a/pcr/setbfree/PKGBUILD b/pcr/setbfree/PKGBUILD index c17511f47..7290f66f8 100644 --- a/pcr/setbfree/PKGBUILD +++ b/pcr/setbfree/PKGBUILD @@ -1,6 +1,8 @@ +# Maintainer (Arch): speps <speps at aur dot archlinux dot org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=setbfree -pkgver=0.7.3 +pkgver=0.7.5 pkgrel=1 pkgdesc="A DSP Tonewheel Organ emulator." arch=(i686 x86_64) @@ -11,8 +13,8 @@ makedepends=('lv2') install="$pkgname.install" source=("https://github.com/pantherb/setBfree/tarball/v$pkgver" "https://raw.github.com/pantherb/setBfree/master/debian/setbfree.desktop") -md5sums=('8b7b077dfb784927c7103948083e1f04' - '8c2a863562f26856dcff0a456cf36dcf') +md5sums=('d018bbb9630cf008998967f6c21c0eca' + '800b4bbf87c7628fe5d3b0cb8c6a04d5') build() { cd "$srcdir/pantherb"* diff --git a/pcr/setbfree/setbfree.desktop b/pcr/setbfree/setbfree.desktop new file mode 100644 index 000000000..db3f1d8e2 --- /dev/null +++ b/pcr/setbfree/setbfree.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=setBfree +GenericName=DSP tonewheel organ +Comment=MIDI-controlled, software synthesizer using JACK +Icon=setBfree +Exec=setBfreeUI +Terminal=false +Categories=AudioVideo;Audio; diff --git a/pcr/shocco/PKGBUILD b/pcr/shocco/PKGBUILD index 32baa6d2d..22c84cb64 100644 --- a/pcr/shocco/PKGBUILD +++ b/pcr/shocco/PKGBUILD @@ -2,29 +2,25 @@ pkgname="shocco" pkgver=1.0 +pkgrel=1.1 pkgdesc="Docco-like documentation generator for POSIX shell" -url="http://rtomayko.github.com/shocco/" -license=('custom:MIT') - -pkgrel=1 arch=('any') -depends=('markdown' 'python2-pygments') +url="http://rtomayko.github.com/shocco/" +license=('MIT') +depends=('markdown' 'pygmentize') optdepends=('ronn: builds man pages') -source=("libre://$pkgname-$pkgver.tar.gz") -md5sums=('edaed31d14a2c16e6303c07e24e7bc9a') - -mksource=("git://github.com/rtomayko/shocco.git#tag=${pkgver}") -mkmd5sums=('SKIP') +source=("https://github.com/rtomayko/shocco/archive/$pkgver.tar.gz") +md5sums=('a2833b69b22d406d47e0826083c3960d') build() { - cd "$srcdir/$pkgname" - ./configure --prefix="$pkgdir"/usr + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make -j1 } package() { - cd "$srcdir/$pkgname" - make -j1 install + cd "$srcdir/$pkgname-$pkgver" + install -Dm755 shocco "$pkgdir/usr/bin/shocco" install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/pcr/snapraid/PKGBUILD b/pcr/snapraid/PKGBUILD new file mode 100644 index 000000000..cf4ce0abf --- /dev/null +++ b/pcr/snapraid/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer (Arch): John Williams <jwilliams4200 liamg reverse&remove moc> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +pkgname=snapraid +pkgver=8.1 +pkgrel=1 +pkgdesc="tool for Snapshot RAID: generate parity files, maintain checksums on data, restore lost data" +arch=('x86_64' 'i686') +url="http://snapraid.sourceforge.net/" +license=('GPL3') +depends=('openssl') +conflicts=('snapraid-git') +source=("http://sourceforge.net/projects/snapraid/files/snapraid-${pkgver}.tar.gz") +sha256sums=('6bf89a1319ac3403958cd2c98a9c6102728c0070cfa1aedd90c4561d93c54e5d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # patch to not print excluded files and directories + # printf("Excluding file '%s'\n", path_next); + #sed -i -r -e '/printf\("Excluding file '\''%s'\''\\n", path_next\);/d' scan.c + # printf("Excluding directory '%s'\n", path_next); + #sed -i -r -e '/printf\("Excluding directory '\''%s'\''\\n", path_next\);/d' scan.c + + ./configure --prefix="/usr" + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" prefix="/usr" mandir="/usr/share/man" install + + # documentation + install -D -m644 snapraid.conf.example ${pkgdir}/usr/share/${pkgname}/snapraid.conf.example + install -D -m644 AUTHORS ${pkgdir}/usr/share/doc/${pkgname}/AUTHORS + install -D -m644 COPYING ${pkgdir}/usr/share/doc/${pkgname}/COPYING + install -D -m644 HISTORY ${pkgdir}/usr/share/doc/${pkgname}/HISTORY + install -D -m644 INSTALL ${pkgdir}/usr/share/doc/${pkgname}/INSTALL + install -D -m644 README ${pkgdir}/usr/share/doc/${pkgname}/README + install -D -m644 CHECK ${pkgdir}/usr/share/doc/${pkgname}/CHECK + install -D -m644 TODO ${pkgdir}/usr/share/doc/${pkgname}/TODO +} + diff --git a/pcr/softhsm/PKGBUILD b/pcr/softhsm/PKGBUILD index a85c68fef..96c77aaa0 100644 --- a/pcr/softhsm/PKGBUILD +++ b/pcr/softhsm/PKGBUILD @@ -1,20 +1,34 @@ # Maintainer (Arch): Javier Torres <javitonino [at] gmail [dot] com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=softhsm -pkgver=1.3.4 -pkgrel=1 +pkgver=1.3.7 +pkgrel=3 pkgdesc="Software PKCS11 store" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.opendnssec.org/softhsm/" -license=('custom' 'BSD') -depends=('botan' 'sqlite3') +license=('BSD') +groups=() +depends=('botan-1.10' 'sqlite3>=3.3.9') +makedepends=() +optdepends=() +provides=() +conflicts=() +replaces=() backup=("etc/softhsm.conf") -source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig}) -sha1sums=('f09b6828776bcf9fef1dd46cfa7a495da01c7747' - 'SKIP') -sha256sums=('f10319dfa651023dad3d0845d284ec08ef982c1fc1bdb55cf8a725f762961e97' - 'SKIP') -prepare() { +options=(!libtool) +install= +changelog= +source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz") +noextract=() + +md5sums=('acfda39ee23c32f38ee51692d6c6a44b') +sha1sums=('e8bf4269472f9e63d1dfeda238b1d542d6c036f2') +sha256sums=('d12d6456a85561266d9da427565f3ee3746a35df6670d5e6be75de253c2810a4') +sha384sums=('a0c8541efe1443f4c98c83be4c86265f1e40c112c5bf4ae5b98a358d858b7a392c39938ad8f6a8f4d4a103742ddbc913') +sha512sums=('287400b981b7b420a300593129696e4739afe085a8106047ef429bc741d205bed214386b422572327c3bda63f0fb1b7558bb4d30d184ca3ec2ba9900153f075d') + +build() { cd "${srcdir}/${pkgname}-${pkgver}" # /usr/lib/softhsm -> /usr/bin (no subdirectory) @@ -22,17 +36,8 @@ prepare() { -e "s/full_libdir=\"\$full_libdir\/softhsm\"/#full_libdir=\"\$full_libdir\/softhsm\"/" \ -e "s/libdir=\$full_libdir/#libdir=\$full_libdir/" \ configure -} -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --datarootdir=/usr/share \ - --localstatedir=/var/lib \ - --sysconfdir=/etc \ - --with-botan=/usr + ./configure --prefix=/usr --datarootdir=/usr/share --localstatedir=/var --sysconfdir=/etc --with-botan=/usr make } @@ -40,7 +45,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install - install -Dm0644 "LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + "${pkgdir}/usr/share/licenses/softhsm/LICENSE" } diff --git a/pcr/spatialindex/PKGBUILD b/pcr/spatialindex/PKGBUILD index a8b2f6fce..2e107db42 100644 --- a/pcr/spatialindex/PKGBUILD +++ b/pcr/spatialindex/PKGBUILD @@ -1,9 +1,10 @@ -# Maintainer (Arch): Lantald <lantald at Gmx dot com> +# Contributor (Arch): Lantald <lantald at Gmx dot com> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=spatialindex -pkgver=1.8.0 +pkgver=1.8.4 pkgrel=1 pkgdesc="An extensible framework that supports robust spatial indexing methods and sophisticated spatial queries." -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://libspatialindex.github.com/" license=('MIT') depends=(gcc-libs) @@ -11,7 +12,7 @@ provides=(spatialindex) conflicts=(libspatialindex-git) source=("http://download.osgeo.org/libspatialindex/$pkgname-src-$pkgver.tar.gz" 'LICENSE') -md5sums=('aa78e2c641c472df257f49cd140669c4' +md5sums=('b17f86d9a49f284fe403c19b36fb5d89' '6a9a7d8158edbf1529ca46aae5a76752') build() { diff --git a/pcr/sphinx/PKGBUILD b/pcr/sphinx/PKGBUILD new file mode 100644 index 000000000..96f149275 --- /dev/null +++ b/pcr/sphinx/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer (Arch): Isaac Aronson <i at linux dotcom> +# Contributor (Arch): Dan Serban +# Contributor (Arch): Jim Casteel +# Contributor (Arch): dryes <joswiseman@gmail> +# Contributor (Arch): Vishnevsky Roman <aka dot x0x01 at gmail dot com> +# Contributor (Arch): Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor (Arch): Aldo Culquicondor <alculquicondor@gmail.com> +# Contributor (Arch): Florijan Hamzic <florijanh@gmail.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +pkgname='sphinx' +pkgver=2.2.9 +pkgrel=1 +pkgdesc='Free open-source SQL full-text search engine.' +arch=('i686' 'x86_64') +url='http://www.sphinxsearch.com/' +license=('GPL') +depends=('unixodbc' 'expat' 'libmysqlclient' 'postgresql-libs') +optdepends=('postgresql') +backup=('etc/conf.d/sphinx') +install='sphinx.install' +source=("http://sphinxsearch.com/files/${pkgname}-${pkgver}-release.tar.gz" + 'sphinx.conf.d' + 'sphinx.rc.d' + 'sphinx.service' + 'sphinx.tmpfiles.conf') + +build() { + sed -i '15199,15199 s/x00/x21/' "${srcdir}/${pkgname}-${pkgver}-release/src/searchd.cpp" + + cd "${srcdir}/${pkgname}-${pkgver}-release" + ./configure --prefix=/usr --exec-prefix=/usr --localstatedir=/var/lib/sphinx \ + --sysconfdir=/etc/sphinx --with-pgsql --enable-id64 + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-release" + + make DESTDIR="${pkgdir}" install + + for _f in "${pkgdir}/usr/bin/"*; do + ln -s "/usr/bin/${_f##*/}" "${pkgdir}/usr/bin/sphinx-${_f##*/}" + done + + install -Dm755 "${srcdir}/sphinx.rc.d" "${pkgdir}/etc/rc.d/sphinx" + install -Dm644 "${srcdir}/sphinx.conf.d" "${pkgdir}/etc/conf.d/sphinx" + install -Dm644 "${srcdir}/sphinx.service" "${pkgdir}/usr/lib/systemd/system/sphinx.service" + install -d "${pkgdir}/usr/share/sphinx/lib" + install -Dm644 api/sphinxapi.php "${pkgdir}/usr/share/sphinx/lib/sphinxapi.php" + install -Dm644 api/sphinxapi.py "${pkgdir}/usr/share/sphinx/lib/sphinxapi.py" + install -Dm644 "${srcdir}/sphinx.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/sphinx.conf" +} +md5sums=('1fcc3d180c0559bdeb93602ef248caf4' + '48e3e1857919d26d5104a48caffb531b' + 'faaa8310af97ff1dbdaf08612e442020' + 'fe06a8aff0520a6f75596ee43d2e5935' + '22ec4cd0471a1d52702d57d78614b8d8') diff --git a/pcr/sphinx/sphinx.conf.d b/pcr/sphinx/sphinx.conf.d new file mode 100644 index 000000000..c809e56fa --- /dev/null +++ b/pcr/sphinx/sphinx.conf.d @@ -0,0 +1,5 @@ +# +# Arguments to be passed to the sphinx daemon +# + +SPHINX_ARGS="" diff --git a/pcr/sphinx/sphinx.install b/pcr/sphinx/sphinx.install new file mode 100644 index 000000000..bb4d80f4a --- /dev/null +++ b/pcr/sphinx/sphinx.install @@ -0,0 +1,11 @@ +post_install() { + groupadd sphinx + useradd -d /var/lib/sphinx -g sphinx sphinx + chown -R sphinx:sphinx /var/lib/sphinx +} + +## arg 1: the old package version +post_remove() { + userdel sphinx + groupdel sphinx +} diff --git a/pcr/sphinx/sphinx.rc.d b/pcr/sphinx/sphinx.rc.d new file mode 100644 index 000000000..053be0fd4 --- /dev/null +++ b/pcr/sphinx/sphinx.rc.d @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/sphinx + +PID=$(pidof -o %PPID /usr/bin/sphinx-searchd) +case $1 in +start) + stat_busy "Starting Sphinx Daemon" + + if [[ -z $PID ]] && /usr/bin/sphinx-searchd $SPHINX_ARGS; then + + PID=$(pidof -o %PPID /var/lib/sphinx/log/searchd.pid) + echo "$PID" > /var/lib/sphinx/log/searchd.pid + add_daemon sphinx + stat_done + else + stat_fail + exit 1 + fi + ;; + +stop) + stat_busy "Stopping Sphinx Daemon" + if [[ ! -z $PID ]] && kill "$PID" &>/dev/null; then + rm_daemon sphinx + stat_done + else + stat_fail + exit 1 + fi + ;; + +restart) + $0 stop + $0 start + ;; + +*) + echo "Usage: $0 {start|stop|restart}" >&2 + exit 1 + +esac diff --git a/pcr/sphinx/sphinx.service b/pcr/sphinx/sphinx.service new file mode 100644 index 000000000..cb22f01ce --- /dev/null +++ b/pcr/sphinx/sphinx.service @@ -0,0 +1,15 @@ +[Unit] +Description=Sphinx - SQL Full Text Search Engine +After=local-fs.target network.target mysqld.service + +[Service] +Type=forking +Restart=always +PIDFile=/var/lib/sphinx/log/searchd.pid +ExecStart=/usr/bin/searchd --config /etc/sphinx/sphinx.conf +ExecStop=/usr/bin/searchd --config /etc/sphinx/sphinx.conf --stopwait +#User=sphinx +#Group=sphinx + +[Install] +WantedBy=multi-user.target diff --git a/pcr/sphinx/sphinx.tmpfiles.conf b/pcr/sphinx/sphinx.tmpfiles.conf new file mode 100644 index 000000000..084b47ab7 --- /dev/null +++ b/pcr/sphinx/sphinx.tmpfiles.conf @@ -0,0 +1 @@ +d /run/sphinx 0755 sphinx sphinx - diff --git a/pcr/sqlcipher/PKGBUILD b/pcr/sqlcipher/PKGBUILD index d0c702e22..3e63f86ea 100644 --- a/pcr/sqlcipher/PKGBUILD +++ b/pcr/sqlcipher/PKGBUILD @@ -1,8 +1,10 @@ +#Special regards to fauno +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=sqlcipher -pkgver=2.2.1 +pkgver=3.2.0 pkgrel=1 pkgdesc="SQLite extension that provides transparent 256-bit AES encryption of database files" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://sqlcipher.net/" license=('BSD') makedepends=('tcl' 'openssl' 'sqlite3' 'git') @@ -11,21 +13,21 @@ sha1sums=('SKIP') sha256sums=('SKIP') pkgver() { - echo $pkgver + echo $pkgver } build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr \ - --disable-tcl \ - --enable-tempstore=yes \ - CFLAGS="$CFLAGS -DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-tcl \ + --enable-tempstore=yes \ + CFLAGS="$CFLAGS -DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" make } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver - make DESTDIR="$pkgdir/" install - install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + make DESTDIR="$pkgdir/" install + install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/pcr/steadyflow/PKGBUILD b/pcr/steadyflow/PKGBUILD index 3be25b36e..fb32710f2 100644 --- a/pcr/steadyflow/PKGBUILD +++ b/pcr/steadyflow/PKGBUILD @@ -1,25 +1,26 @@ # Maintainer (Arch): M0Rf30 # Contributor (Arch): Dan Serban # Contributor (Arch): zbito <ztokarczyk at gmail dot com +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=steadyflow pkgver=0.2.0 -pkgrel=3 -pkgdesc="A download manager that aims for minimalism, ease of use, and a -clean, malleable codebase" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=4 +pkgdesc="A download manager that aims for minimalism, ease of use, and a clean, malleable codebase" +arch=('i686' 'x86_64') url=https://launchpad.net/steadyflow license=('GPL3') install=steadyflow.install -depends=('desktop-file-utils' 'glib2' 'gtk3' 'gvfs' 'libgee' 'libnotify' -'libunique' 'libgee06') -makedepends=('cmake' 'vala') +depends=('desktop-file-utils' 'glib2' 'gtk3' 'gvfs' 'libgee06' 'libnotify' 'libunique') +makedepends=('cmake' 'vala' 'wget') conflicts=('steadyflow-bzr') -source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.xz https://launchpadlibrarian.net/55910801/steadyflow-64px.png) -md5sums=('16b9907c1d681e7f0a861f066d4fda0e' 'bbe025886f071ebfffa5fed350cced0c') +source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.xz + patch) build() { cd $pkgname-$pkgver + patch -Np1 -i ../patch + sed -i 's/ListStore/Gtk.ListStore/g' Steadyflow/FileListController.vala cmake -DCMAKE_INSTALL_PREFIX='/usr' -DCOMPILE_GSETTINGS_ON_INSTALL=NO -DWANT_AYATANA=NO make } @@ -28,6 +29,9 @@ package() { cd $pkgname-$pkgver make install DESTDIR="$pkgdir" mkdir -p "$pkgdir"/usr/share/pixmaps - cp "$srcdir"/steadyflow-64px.png "$pkgdir"/usr/share/pixmaps/steadyflow.png + install -D -m644 data/img/hicolor/64x64/apps/steadyflow.svg "$pkgdir"/usr/share/pixmaps/steadyflow.svg + #wget -O "$pkgdir"/usr/share/pixmaps/steadyflow.png https://launchpadlibrarian.net/55910801/steadyflow-64px.png } +md5sums=('16b9907c1d681e7f0a861f066d4fda0e' + '53ff49bd70c499fa75498ba06250e7fc') diff --git a/pcr/steadyflow/patch b/pcr/steadyflow/patch new file mode 100644 index 000000000..efa3fd024 --- /dev/null +++ b/pcr/steadyflow/patch @@ -0,0 +1,11 @@ +--- a/Steadyflow/Services.vala 2012-06-30 14:39:35.000000000 +0200 ++++ b/Steadyflow/Services.vala 2014-05-19 16:05:43.826607777 +0200 +@@ -61,7 +61,7 @@ + "information to the developer:\n\nError Code %d:\n\n%s").printf (e.code, message)); + + md.run (); +- exit(1); ++ GLib.Process.exit(1); + } + } + diff --git a/pcr/swig1/PKGBUILD b/pcr/swig1/PKGBUILD index 540db98df..7ba4c2554 100644 --- a/pcr/swig1/PKGBUILD +++ b/pcr/swig1/PKGBUILD @@ -15,6 +15,7 @@ depends=('gcc-libs' 'zlib') conflicts=('swig' 'swig-pantheon') provides=('swig') source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") +md5sums=('2df766c9e03e02811b1ab4bba1c7b9cc') build() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/pcr/switzerland/PKGBUILD b/pcr/switzerland/PKGBUILD new file mode 100644 index 000000000..fc3f3cbee --- /dev/null +++ b/pcr/switzerland/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer (Arch): Brad Conte <brad AT bradconte DOT com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> + +pkgname=switzerland +pkgver=0.1.0 +pkgrel=3 +#epoch= +pkgdesc="A client/server program by the EFF to detect when ISPs, networks, or firewalls interfere with Internet traffic." +arch=('i686' 'x86_64') +url="http://www.eff.org/testyourisp/switzerland" +license=('GPL') +groups=() +depends=(python2 libpcap ntp) +makedepends=() +checkdepends=() +optdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +#install= +#changelog= +source=("http://download.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz") +noextract=() +sha512sums=('3a5474c005bf45cddf8eede7c1e2faa5855bf9017f5c732555cfe2c8b7b82381ea25c2ada000a9945a330ff3af19f1e861a11508ff057c81a78eab53de1d0cdb') + +#prepare() { +#} + +build() { + cd "$srcdir/$pkgname-$pkgver" + make || return 1 +} + +#check() { +#} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 setup.py install --root="$pkgdir/" +} diff --git a/pcr/tanglet/PKGBUILD b/pcr/tanglet/PKGBUILD index 3777b0dde..a514d589e 100644 --- a/pcr/tanglet/PKGBUILD +++ b/pcr/tanglet/PKGBUILD @@ -1,28 +1,25 @@ -# Maintainer (AUR): Graeme Gott <graeme@gottcode.org> +# Maintainer (Arch): Graeme Gott <graeme@gottcode.org> # Maintainer: Alon Ivtsan <alonivtsan@lavabit.com> -# Based on https://aur.archlinux.org/packages.php?ID=32311 pkgname=tanglet -pkgver=1.2.2 +pkgver=1.3.1 pkgrel=1 -pkgdesc="A single player word finding game based on Boggle." -arch=('i686' 'x86_64' 'mips64el') -url="http://gottcode.org/${pkgname}/" +pkgdesc='A single player word finding game based on Boggle.' +arch=('i686' 'x86_64') +url="http://gottcode.org/$pkgname/" license=('GPL3') depends=('qt5-base') -install=${pkgname}.install -source=(http://gottcode.org/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2) -md5sums=('584e50d01323c0686ff094195eba4341') -sha256sums=('c90d5c36b7e6cca54cdc001c7eecfb333795add16e6ae01f100026c61f4a84da') +install="$pkgname.install" +source=("http://gottcode.org/$pkgname/$pkgname-$pkgver-src.tar.bz2") +sha256sums=('d0eab174eaa8cdd5f3499ae275db4cd720172ef28346273db7f5988f2304e0d8') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" + qmake-qt5 PREFIX=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_ROOT="${pkgdir}/" install + make -C "$pkgname-$pkgver" install INSTALL_ROOT="$pkgdir" } - diff --git a/pcr/ted/PKGBUILD b/pcr/ted/PKGBUILD index 765fbf576..0543e80ae 100644 --- a/pcr/ted/PKGBUILD +++ b/pcr/ted/PKGBUILD @@ -1,15 +1,15 @@ -# Contributor (Arch): willemw <willemw12@gmail.com> +# Maintainer (Arch): willemw <willemw12@gmail.com> # Contributor (Arch): shirokuro <tod dot jackson at gmail dot com> # Contributor (Arch): sergej -# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@xload.IO> +# Maintainer: Parabola Aurélien DESBRIÈRES <aurelien@xload.IO> pkgname=ted pkgver=2.23 -pkgrel=2 -pkgdesc="A lightweight rtf text processor" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=5 +pkgdesc="Lightweight RTF text processor" +arch=('i686' 'x86_64') url="http://www.nllgg.nl/Ted/" -depends=('zlib' 'pcre' 'libxpm' 'libjpeg' 'libtiff' 'libpng' 'gtk2' 'libpaper' 'desktop-file-utils') +depends=('freetype2' 'desktop-file-utils' 'gtk2' 'libjpeg' 'libpaper' 'libpng' 'libtiff' 'libxpm' 'pcre' 'zlib') license=('GPL') install=$pkgname.install source=(http://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz @@ -37,7 +37,37 @@ source=(http://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz http://ftp.nluug.nl/pub/editors/ted/TedDocument-de_DE.rtf http://ftp.nluug.nl/pub/editors/ted/TedDocument-fr_FR.rtf http://ftp.nluug.nl/pub/editors/ted/TedDocument-mg_MG.rtf) +md5sums=('4199df0deb82a90450135ec3f2b7d915' + 'e68939d2d8533491c8c14bd380d6650c' + '3f43d0fe3ac66f21943f547f2080e478' + '365d845cd318c426354c1743d7104341' + '18c278f719f6df68200a15e198c8a88e' + '5592f169ce8da6693f0b5ec37be9146a' + '4ee2915dd3d3ee6f402ab60212ee235c' + '0bef013ea7ae99897b0ae4779257207b' + '9ab767df1d476cbe93af9ba07d0b2992' + '412034b993f37f0c7bb8dbd4c0200618' + '28230070a46ea5a341cfe1600c66704b' + 'b72a7444ff831c443152c4eb489263a1' + 'e27b02e5196c59c038f4510a608c76df' + 'c24cda500db0c8a9a6f9674d4e1e30d1' + 'd6e33a8001561bc89becebd006283360' + '125791b19f33ed94727008d8563e652f' + '7c2db94442f9d1c5b2eb42157a9e01f3' + '674ccafc2121288f8d344976308bea4b' + '4e488f8025a793e5d171770dfa2f85d7' + '4a32b49850244be6ed973e810ca7467e' + '888f70f17c5f16c4bd1fc9fb8b954fb2' + 'dd1bf4cf1142732a3152899e548101b0' + 'fc92fda9a49aa309fefdf6a682028b2d' + '4efb63d391b1196983fdcc1bcf751bc7' + '63b39a2bd36790f2164cf80dfab603aa') +prepare() { + cd Ted-$pkgver + # Freetype2 include patch: remove leading 'freetype' directory path from #include statement + sed -i "s|^\(#[ \t]*include[ \t]*<\)freetype/|\1|" appFrame/appFontConfig.c +} build() { cd Ted-$pkgver diff --git a/pcr/terminal-screensaver/PKGBUILD b/pcr/terminal-screensaver/PKGBUILD index b5fd3592e..45223360e 100644 --- a/pcr/terminal-screensaver/PKGBUILD +++ b/pcr/terminal-screensaver/PKGBUILD @@ -12,6 +12,7 @@ depends=('ncurses') conflicts=('tss') makedepends=('gcc') source=(http://distcache.freebsd.org/ports-distfiles/tss-$pkgver.tar.gz) +md5sums=('e4223283dd2d7cf564fb81b940c0bdc8') build() { cd "$srcdir/tss-$pkgver" diff --git a/pcr/thinkfan/PKGBUILD b/pcr/thinkfan/PKGBUILD index 9af51d9c7..a75a6500b 100644 --- a/pcr/thinkfan/PKGBUILD +++ b/pcr/thinkfan/PKGBUILD @@ -1,13 +1,15 @@ -# Maintainer (Arch): nblock <nblock [/at\] archlinux DOT us> +# Contributor (Arch): nblock <nblock [/at\] archlinux DOT us> # Contributor (Arch): Frederik Alkærsig (FALKER) <havnelisten AT gmail.com> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=thinkfan pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A minimalist fan control program. Supports the sysfs hwmon interface and thinkpad_acpi" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') makedepends=('cmake') depends=('libatasmart') +optdepends=('lm_sensors: hwmon support') license=('GPL') source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz "thinkfan.install" "thinkfan.service" "thinkpad_acpi.conf") @@ -15,7 +17,7 @@ url="http://thinkfan.sourceforge.net/" install="thinkfan.install" md5sums=('4292633aebd61b91f04cd332c4d3e181' '76553f63dc55a6e09a429bb4e28eb649' - '0197bde7c3d3b64d34635ead78cf3437' + '656b3721d0fccd770f615531f50ce0aa' 'bca920d066846e5811a2465aefa13012') build() { @@ -29,7 +31,7 @@ package() { install -D -m755 ${pkgname} ${pkgdir}/usr/bin/${pkgname} install -D -m644 ${srcdir}/thinkpad_acpi.conf ${pkgdir}/usr/lib/modprobe.d/thinkpad_acpi.conf install -D -m644 README ${pkgdir}/usr/share/doc/${pkgname}/README - install -D -m644 NEWS ${pkgdir}/usr/share/doc/${pkgname}/README + install -D -m644 NEWS ${pkgdir}/usr/share/doc/${pkgname}/NEWS install -D -m644 ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service install -D -m644 ${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 cp -r examples ${pkgdir}/usr/share/doc/${pkgname}/ diff --git a/pcr/thinkfan/thinkfan.service b/pcr/thinkfan/thinkfan.service index e7c8badd1..5618aed6f 100644 --- a/pcr/thinkfan/thinkfan.service +++ b/pcr/thinkfan/thinkfan.service @@ -1,9 +1,13 @@ [Unit] -Description=Thinkfan Daemon - simple and lightweight fan control program -After=basic.target +Description=simple and lightweight fan control program +Wants=lm_sensors.service +After=lm_sensors.service [Service] -ExecStart=/usr/bin/thinkfan -n -s5 -q +Type=forking +ExecStart=/usr/bin/thinkfan +PIDFile=/var/run/thinkfan.pid +ExecReload=/usr/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target diff --git a/pcr/tomb/PKGBUILD b/pcr/tomb/PKGBUILD index d43c01727..4d4f1ef30 100644 --- a/pcr/tomb/PKGBUILD +++ b/pcr/tomb/PKGBUILD @@ -1,16 +1,19 @@ -# Maintainer: fauno <fauno@parabola.nu> # Maintainer (Arch): Rich Li <rich at dranek com> # Contributor (Arch): nignux <nignux@freaknet.org> +# Contributor (Arch): fauno <fauno@parabola.nu> # Contributor (Arch): BoySka +# Maintainer: fauno <fauno@parabola.nu> +pkgbase=tomb pkgname=(tomb tomb-kdf) -pkgver=1.5.3 -pkgrel=1.parabola1 +pkgver=2.0.1 +pkgrel=1 pkgdesc="Crypto Undertaker, a simple tool to manage encrypted storage" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.dyne.org/software/tomb/" license=('GPL3') install=${pkgname}.install + source=( https://releases.dyne.org/tomb/Tomb-${pkgver}.tar.gz https://releases.dyne.org/tomb/Tomb-${pkgver}.tar.gz.sha @@ -18,12 +21,13 @@ source=( ) # The first hash comes from the .sha file -sha256sums=('e56180434011acda6e58f25c24db3a6d6a10f9e796cfd9c88405ae7abb27e1fb' - 'c2bdd00edb0df013a97d50dd109b4744dfc8cee1b5dd71283fc942cdabc7b1af' +sha256sums=('b6ae4e55cd9ee05c5fea800b4c9a757202d90a6278956a1c818113d17cc2f022' + 'SKIP' 'SKIP') # The public key is found at http://jaromil.dyne.org/contact # gpg --recv-keys 0x73b35da54acb7d10 +validpgpkeys=('6113D89CA825C5CEDD02C87273B35DA54ACB7D10') build() { cd ${srcdir}/Tomb-${pkgver}/extras/kdf-keys diff --git a/pcr/triceratops-lv2/PKGBUILD b/pcr/triceratops-lv2/PKGBUILD index 5a8a78ea3..f0f1bac44 100644 --- a/pcr/triceratops-lv2/PKGBUILD +++ b/pcr/triceratops-lv2/PKGBUILD @@ -1,27 +1,37 @@ +# Maintainer (Arch): speps <speps at aur dot archlinux dot org> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=triceratops-lv2 -pkgver=0.1.7 +pkgver=0.2.0 pkgrel=1 pkgdesc="Polyphonic synthesizer LV2 plugin" -arch=('i686' 'x86_64' 'mips64el') +arch=(i686 x86_64) url="http://deliriumdecrypted.blogspot.com/" -license=('GPL') +license=('GPL3') groups=('lv2-plugins') depends=('gtkmm' 'lv2') makedepends=('python2') -source=("http://downloads.sourceforge.net/project/${pkgname/-lv2}/$pkgname-v$pkgver.tar.gz") -md5sums=('b4f058c30b3b218bd21dbaa04430dd8b') +source=("http://downloads.sourceforge.net/project/triceratops/$pkgname-v$pkgver.tar.gz" + "$pkgname-read-presets.patch") +md5sums=('0946acd2bcab02bf8f8d6e4ea4b0e2ab' + '907c1d032eb888a2a69d0963720d6016') + +prepare() { + cd $pkgname-v$pkgver + + # let inner presets being discovered + patch -p1 -i ../${source[1]} +} build() { - cd "$srcdir/$pkgname-v$pkgver" + cd $pkgname-v$pkgver python2 waf configure --prefix=/usr python2 waf } package() { - cd "$srcdir/$pkgname-v$pkgver" - DESTDIR="$pkgdir/" python2 waf install + cd $pkgname-v$pkgver + python2 waf install --destdir="$pkgdir/" } # vim:set ts=2 sw=2 et: diff --git a/pcr/triceratops-lv2/triceratops-lv2-read-presets.patch b/pcr/triceratops-lv2/triceratops-lv2-read-presets.patch new file mode 100644 index 000000000..05d2785a1 --- /dev/null +++ b/pcr/triceratops-lv2/triceratops-lv2-read-presets.patch @@ -0,0 +1,167 @@ +diff -aur triceratops-lv2-v0.2.0/presets.cpp triceratops-lv2-v0.2.0.patched/presets.cpp +--- triceratops-lv2-v0.2.0/presets.cpp 2014-06-18 13:33:34.000000000 +0200 ++++ triceratops-lv2-v0.2.0.patched/presets.cpp 2014-09-11 10:43:59.932732363 +0200 +@@ -470,7 +470,7 @@ + void presets::get_preset_names() + { + +- //------------------- LOAD /usr/lib/lv2/triceratops-presets.lv2/ presets ++ //------------------- LOAD ~/.lv2/triceratops-presets.lv2/ presets + + stringstream home_lv2; + home_lv2.str(""); +@@ -484,74 +484,74 @@ + { + cout << "No presets found in " << dir << endl; + closedir(dp); +- return; ++ // return; + } +- +- while ((dirp = readdir(dp)) != NULL) +- { +- if (string(dirp->d_name) != ".directory" && +- string(dirp->d_name) != "." && +- string(dirp->d_name) != ".." && +- string(dirp->d_name) != "manifest.ttl") ++ else { ++ while ((dirp = readdir(dp)) != NULL) + { +- stringstream file_name; +- file_name.str(""); +- file_name << "." << dirp->d_name; +- +- stringstream preset_file_name_home; +- preset_file_name_home.str(""); +- preset_file_name_home << getenv("HOME") << "/.lv2/"; +- preset_file_name_home << file_name.str().substr(1); +- preset_file_name_home << "/"; +- dir = preset_file_name_home.str(); +- int file_name_length = file_name.str().length(); +- preset_file_name_home << file_name.str().substr(1,file_name_length-4); +- preset_file_name_home << "ttl"; +- +- bool our_preset = false; +- +- ifstream check_file(preset_file_name_home.str()); +- string line; +- int preset_category_number = 0; +- +- while (getline(check_file,line)) ++ if (string(dirp->d_name) != ".directory" && ++ string(dirp->d_name) != "." && ++ string(dirp->d_name) != ".." && ++ string(dirp->d_name) != "manifest.ttl") + { +- int triceratops_applies_to = +- line.rfind("lv2:appliesTo <http://nickbailey.co.nr/triceratops>"); ++ stringstream file_name; ++ file_name.str(""); ++ file_name << "." << dirp->d_name; ++ ++ stringstream preset_file_name_home; ++ preset_file_name_home.str(""); ++ preset_file_name_home << getenv("HOME") << "/.lv2/"; ++ preset_file_name_home << file_name.str().substr(1); ++ preset_file_name_home << "/"; ++ dir = preset_file_name_home.str(); ++ int file_name_length = file_name.str().length(); ++ preset_file_name_home << file_name.str().substr(1,file_name_length-4); ++ preset_file_name_home << "ttl"; + +- if (triceratops_applies_to > 0) our_preset = true; ++ bool our_preset = false; + +- int preset_category_finder = line.rfind("preset_category"); +- if (preset_category_finder > 0) ++ ifstream check_file(preset_file_name_home.str()); ++ string line; ++ int preset_category_number = 0; ++ ++ while (getline(check_file,line)) + { +- getline(check_file,line); +- istringstream (line.substr(line.rfind("pset:value") + 11)) >> preset_category_number; ++ int triceratops_applies_to = ++ line.rfind("lv2:appliesTo <http://nickbailey.co.nr/triceratops>"); ++ ++ if (triceratops_applies_to > 0) our_preset = true; ++ ++ int preset_category_finder = line.rfind("preset_category"); ++ if (preset_category_finder > 0) ++ { ++ getline(check_file,line); ++ istringstream (line.substr(line.rfind("pset:value") + 11)) >> preset_category_number; ++ } + } +- } + +- if (our_preset) +- { +- preset_file_names.push_back(file_name.str()); +- presets_object new_preset_object; ++ if (our_preset) ++ { ++ preset_file_names.push_back(file_name.str()); ++ presets_object new_preset_object; + +- new_preset_object.type = PRESET_TYPE_PRESET; +- new_preset_object.category = preset_category_number; +- +- stringstream file_name_ttl; +- file_name_ttl.str(""); +- file_name_ttl << file_name.str().substr(1,file_name.str().size()-4) << "ttl"; ++ new_preset_object.type = PRESET_TYPE_PRESET; ++ new_preset_object.category = preset_category_number; + +- new_preset_object.name = file_name_ttl.str(); +- new_preset_object.dir = dir; +- new_preset_object.unfold = false; ++ stringstream file_name_ttl; ++ file_name_ttl.str(""); ++ file_name_ttl << file_name.str().substr(1,file_name.str().size()-4) << "ttl"; + +- preset_list.push_back(new_preset_object); ++ new_preset_object.name = file_name_ttl.str(); ++ new_preset_object.dir = dir; ++ new_preset_object.unfold = false; ++ ++ preset_list.push_back(new_preset_object); ++ } + } +- } + ++ } ++ closedir(dp); + } +- closedir(dp); +- + //------------------- LOAD /usr/lib/lv2/triceratops-presets.lv2/ presets + + +@@ -563,7 +563,6 @@ + + else + { +- + while ((dirp = readdir(dp)) != NULL) + { + if (string(dirp->d_name) != ".directory" && +@@ -1305,9 +1304,14 @@ + string triceratops_ttl_file_name = ""; + + ifstream triceratops_ttl("/usr/lib/lv2/triceratops.lv2/triceratops.ttl" ); +- if (triceratops_ttl) triceratops_ttl_file_name = "/usr/lib/lv2/triceratops.lv2/triceratops.ttl" ; +- triceratops_ttl.open("/usr/local/lib/lv2/triceratops.lv2/triceratops.ttl" ); +- if (triceratops_ttl) triceratops_ttl_file_name = "/usr/local/lib/lv2/triceratops.lv2/triceratops.ttl"; ++ if (triceratops_ttl) ++ { ++ triceratops_ttl_file_name = "/usr/lib/lv2/triceratops.lv2/triceratops.ttl"; ++ } else ++ { ++ triceratops_ttl.open("/usr/local/lib/lv2/triceratops.lv2/triceratops.ttl" ); ++ if (triceratops_ttl) triceratops_ttl_file_name = "/usr/local/lib/lv2/triceratops.lv2/triceratops.ttl"; ++ } + + int current_port = -1; + int symbol_port = -1; diff --git a/pcr/ttf-asana-math/PKGBUILD b/pcr/ttf-asana-math/PKGBUILD index e6e92dbc0..7e65f751b 100644 --- a/pcr/ttf-asana-math/PKGBUILD +++ b/pcr/ttf-asana-math/PKGBUILD @@ -1,30 +1,24 @@ # Maintainer (Arch): GordonGR <gordongr@freemail.gr> # Maintainer: Alon Ivtsan <alonivtsan@lavabit.com> -# taken from https://aur.archlinux.org/packages/ttf-asana-math/ - pkgname=ttf-asana-math -pkgver=000.951 -pkgrel=2 +pkgver=000.954 +pkgrel=1 license=('Custom: OFL') depends=('fontconfig' 'xorg-font-utils') pkgdesc="A font to typeset maths in Xe(La)TeX and Lua(La)TeX by Apostolos Syropoulos" arch=('any') url="http://www.ctan.org/pkg/asana-math" -source=("ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/fonts/Asana-Math/Asana-Math.otf" -"ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/fonts/Asana-Math/Asana-Math.ttf" +source=("ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/fonts/Asana-Math/Asana-Math.ttf" "http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=OFL_plaintext&filename=OFL.txt") +md5sums=('acc1721727c225b31aa0b9857b6ccd76' + '6ed93967ff0dc6dd9c8d31c17f817a06') install=$pkgname.install package() { - mkdir -p $pkgdir/usr/share/fonts/TTF - mkdir -p $pkgdir/usr/share/fonts/OTF - cp *.ttf $pkgdir/usr/share/fonts/TTF - cp *.otf $pkgdir/usr/share/fonts/OTF - mkdir -p $pkgdir/usr/share/licenses/custom/ttf-asana-math/ - mv 'render_download.php?&format=file&media_id=OFL_plaintext&filename=OFL.txt' LICENSE - cp LICENSE $pkgdir/usr/share/licenses/custom/ttf-asana-math/ +mkdir -p $pkgdir/usr/share/fonts/TTF +cp *.ttf $pkgdir/usr/share/fonts/TTF +mkdir -p $pkgdir/usr/share/licenses/custom/ttf-asana-math/ +mv 'render_download.php?&format=file&media_id=OFL_plaintext&filename=OFL.txt' LICENSE +cp LICENSE $pkgdir/usr/share/licenses/custom/ttf-asana-math/ } -md5sums=('d9f9faa296a12a14354d9e83c90f167b' - 'd7a05892aeed8bbe4b410bf845ce9882' - '6ed93967ff0dc6dd9c8d31c17f817a06') diff --git a/pcr/tvenlinux-desktop/PKGBUILD b/pcr/tvenlinux-desktop/PKGBUILD index 8f92787aa..33062cbf6 100644 --- a/pcr/tvenlinux-desktop/PKGBUILD +++ b/pcr/tvenlinux-desktop/PKGBUILD @@ -1,17 +1,19 @@ -# Contributor (Arch) : ValHue <vhuelamo at gmail dot com> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (Arch): ValHue <vhuelamo at gmail dot com> +# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp> # https://github.com/ValHue/AUR-PKGBUILDs pkgname=tvenlinux-desktop -pkgver=20140127 -pkgrel=2 +pkgver=20140601 +pkgrel=1 pkgdesc="Simple bash script to watch and record TV on GNU/Linux/BSD without capture card/tuner. (TV in Spain, Peru, Chile, Cuba, Venezuela, Bolivia and Argentina)" url="http://www.tvenlinux.com/" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') license=('GPL3') depends=('mplayer' 'rtmpdump') optdepends=('zenity: for GTK users' 'kdialog: for QT users' 'curl: for view EPG (Electronic Program Guide)') -source=("http://www.tvenlinux.com/TVenLinux_2.sh" "http://www.tvenlinux.com/busi_tv.png") +source=("http://www.tvenlinux.com/TVenLinux.sh" "http://www.tvenlinux.com/busi_tv.png") +md5sums=('a8f1c8d9d87f84e29bcca2de1656a3fd' + '57fe139851d8227320dc2b78a9390dd6') _pkgname="TVenLinux" @@ -29,7 +31,7 @@ MimeType=x-scheme-handler/sop;" pkgver() { cd "${srcdir}" - cat TVenLinux_2.sh | grep -e 'V_script=' | sed -e 's/V_script=//;s/"//g;s/;//;s/\///g;s/^\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)/\5\6\7\8\3\4\1\2/' + cat TVenLinux.sh | grep -e 'V_script=' | sed -e 's/V_script=//;s/"//g;s/;//;s/\///g;s/^\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)/\5\6\7\8\3\4\1\2/' } build() { @@ -43,7 +45,7 @@ package() { install -d ${pkgdir}/usr/share/applications install -d ${pkgdir}/usr/share/pixmaps install -d ${pkgdir}/usr/bin - install -m 755 ${_pkgname}_2.sh ${pkgdir}/usr/bin/${_pkgname} + install -m 755 ${_pkgname}.sh ${pkgdir}/usr/bin/${_pkgname} install -m 644 ${_pkgname}.desktop ${pkgdir}/usr/share/applications install -m 644 ${_pkgname}.png ${pkgdir}/usr/share/pixmaps } diff --git a/pcr/vim-pathogen/PKGBUILD b/pcr/vim-pathogen/PKGBUILD index 04260d47d..a697fe92b 100644 --- a/pcr/vim-pathogen/PKGBUILD +++ b/pcr/vim-pathogen/PKGBUILD @@ -1,17 +1,20 @@ -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> -# Maintainer: Facundo Tuesca <facutuesca at gmail dot com> +# Contributor (Arch): Facundo Tuesca <facutuesca at gmail dot com> +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=vim-pathogen pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A vim plugin for managing your runtimepath" arch=('any') url="http://github.com/tpope/vim-pathogen" license=('GPL') groups=('vim-plugins') depends=('vim') +conflicts=('vim-pathogen-git') +provides=('vim-pathogen') install=vimdoc.install source=("$pkgname-$pkgver.tar.gz"::"https://github.com/tpope/$pkgname/archive/v$pkgver.tar.gz") +md5sums=('8cf56e1d8f5c993bee44d89a003aa943') package() { cd "$pkgname-$pkgver" diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD index d82dd6b5e..ddd66728c 100644 --- a/pcr/xfce-theme-greybird/PKGBUILD +++ b/pcr/xfce-theme-greybird/PKGBUILD @@ -1,5 +1,6 @@ -# Maintainer (Arch): Limao Luo <luolimao+AUR@gmail.com> +# Contributor (Arch): Bjoern Franke <bjo at nord-west.org> # Contributor (Arch): flan_suse +# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> # # This suite contains the following: # * xfwm4 theme @@ -15,7 +16,7 @@ pkgname=xfce-theme-greybird _pkgname=Greybird -pkgver=1.5.1 +pkgver=1.5.3 pkgrel=1 pkgdesc="A grey and blue Xfce theme, used by default in Xubuntu 12.04" arch=(any) @@ -31,7 +32,7 @@ optdepends=('elementary-xfce-icons: matching icon set; use the dark icon theme' 'lib32-gtk-engine-murrine: required for multilib') conflicts=($pkgname-git) source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$pkgver.tar.gz) -sha512sums=('970ef8137d0e8ef44af171eeb6111f4c1ab09993f3dd3e5a2bc0dc9d731764f8d75be9d44f443feb06e5337c731d94280d2809c23405340f9539dbe86de9eeb7') +sha512sums=('1010019b1341cf1c0d48d15d0bc371bbe62e3b6d4aa5d8feb6998093487f465c7dbe42133753a6ca74a01e351ce7b15fcc14c4e194a97034e2e4c171885accae') diff --git a/pcr/xfwm4-titleless/PKGBUILD b/pcr/xfwm4-titleless/PKGBUILD index aeb3f820a..9c6778cac 100644 --- a/pcr/xfwm4-titleless/PKGBUILD +++ b/pcr/xfwm4-titleless/PKGBUILD @@ -5,7 +5,7 @@ pkgname=xfwm4-titleless pkgver=4.10.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="Xfce window manager - patched with option to hide titlebar when maximized" arch=('i686' 'x86_64' 'mips64el') url="https://bitbucket.org/thesame/xfwm4-titleless" @@ -23,7 +23,7 @@ build() { cd "${srcdir}/${pkgname%%-*}-${pkgver}" patch -Np1 < ${srcdir}/xfwm4-hide-titlebar-when-maximized.patch - + sed -i 's/_conflict_dialog (/_conflict_dialog (GTK_WINDOW (dialog),/g' settings-dialogs/xfwm4-settings.c ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -44,3 +44,5 @@ package() { make DESTDIR="${pkgdir}" install } +sha256sums=('380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740' + '20f9b18f7e2af3566a81adb58a1675ce4c193c392a594e32243f9c00472dbd0f') diff --git a/pcr/xsynth-dssi/PKGBUILD b/pcr/xsynth-dssi/PKGBUILD index f353b9bfa..9b214d00f 100644 --- a/pcr/xsynth-dssi/PKGBUILD +++ b/pcr/xsynth-dssi/PKGBUILD @@ -1,13 +1,15 @@ +# $Id$ +# Maintainer (Arch): Sean Bolton musound at jps dot net +# Contributor (Arch): Thomas Karmann <thomas@karmann-paf.de> # Maintainer: Guest One <theguestone at gmail dot com> - pkgname=xsynth-dssi pkgver=0.9.4 -pkgrel=1 +pkgrel=2 pkgdesc="An analog-style (VCOs-VCF-VCA) synth plugin for DSSI" -arch=('i686') +arch=('i686' 'x86_64') url="http://dssi.sourceforge.net/download.html#Xsynth-DSSI" license=('GPL') -depends=('gtk2' 'liblo') +depends=('gtk2' 'liblo>=0.22') makedepends=('dssi' 'ladspa') options=('!libtool') source=(http://downloads.sourceforge.net/project/dssi/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz diff --git a/pcr/xtables-addons/PKGBUILD b/pcr/xtables-addons/PKGBUILD index 2a26481ba..1db9c2566 100644 --- a/pcr/xtables-addons/PKGBUILD +++ b/pcr/xtables-addons/PKGBUILD @@ -1,9 +1,9 @@ +# Contributor (Arch): Thiago Coutinho <root at thiagoc . net> # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> -# Contributor: Vladimir Kutyavin <vlkut@bk.ru> pkgname=xtables-addons -pkgver=2.5 -pkgrel=1 -pkgdesc="Successor to patch-o-matic(-ng). Additional extensions for iptables, ip6tables, etc. CHAOS, TARPIT, TEE, DELUDE and other targets; condition, geoip, ipp2p and other matches. Includes ipset package." +pkgver=2.6 +pkgrel=3 +pkgdesc="Successor to patch-o-matic(-ng). Additional extensions for iptables, ip6tables, etc. CHAOS, TARPIT, TEE, DELUDE and other targets; condition, geoip, ipp2p and other matches. Includes ipset package." arch=('i686' 'x86_64') license=('GPL2') url="http://xtables-addons.sourceforge.net/" @@ -12,7 +12,9 @@ makedepends=('linux-api-headers' 'linux-headers') conflicts=(ipset) replaces=(ipset) provides=(ipset) +install='xtables-addons.install' source=(http://download.sourceforge.net/project/xtables-addons/Xtables-addons/$pkgver/$pkgname-$pkgver.tar.xz) +md5sums=('087835ba7e564481b6fd398692268340') build() { cd $srcdir/$pkgname-$pkgver @@ -28,5 +30,9 @@ build() { package () { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install || return 1 + mv $pkgdir/lib/* $pkgdir/usr/lib/ + mv $pkgdir/usr/lib/modules/$(uname -r)/extra $pkgdir/usr/lib/modules/$(uname -r)/$(readlink /usr/lib/modules/$(uname -r)/extramodules) + rmdir $pkgdir/lib + mv $pkgdir/usr/sbin $pkgdir/usr/bin chmod a-x $pkgdir/usr/lib/iptables/*.so } diff --git a/pcr/xtables-addons/xtables-addons.install b/pcr/xtables-addons/xtables-addons.install new file mode 100644 index 000000000..7194d8e71 --- /dev/null +++ b/pcr/xtables-addons/xtables-addons.install @@ -0,0 +1,6 @@ +post_install() { + echo "Please run \`depmod -a\` or reboot before load modules" +} +post_upgrade() { + echo "Please run \`depmod -a\` or reboot before load modules" +} diff --git a/pcr/yoshimi/PKGBUILD b/pcr/yoshimi/PKGBUILD index ddfa20278..11dedf957 100644 --- a/pcr/yoshimi/PKGBUILD +++ b/pcr/yoshimi/PKGBUILD @@ -1,22 +1,25 @@ -# Maintainer: David Adler <david dot jo dot adler at gmail dot com> -# Contributor: SpepS <dreamspepser at yahoo dot it> +# Maintainer (Arch): David Adler <david dot jo dot adler at gmail dot com> +# Contributor (Arch): SpepS <dreamspepser at yahoo dot it> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=yoshimi -pkgver=1.2.1 +pkgver=1.3.4 pkgrel=1 pkgdesc="ZynAddSubFX fork with improved JACK audio & MIDI IO" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://yoshimi.sourceforge.net/" license=('GPL') -depends=('jack' 'fltk' 'fftw' 'mxml' 'cairo') +depends=('jack' 'fltk' 'fftw' 'mxml' 'cairo' 'lv2') makedepends=('cmake' 'boost' 'mesa') install="$pkgname.install" -source=("http://downloads.sourceforge.net/project/$pkgname/1.2/$pkgname-$pkgver.tar.bz2") -md5sums=('a455f47d6c533ce0b3d64445d3cbf6de') +source=("http://downloads.sourceforge.net/project/$pkgname/1.3/$pkgname-$pkgver.tar.bz2") +md5sums=('ba8ca36693bdb32cb8ff751d28260873') +sha256sums=('9b33b82798a391a045421cb589a003e7c7ba0873f9473fc009220fcb2548d36d') build() { cd "$srcdir/$pkgname-$pkgver/src" - cmake . -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" + cmake -DCMAKE_INSTALL_PREFIX="$pkgdir/usr" \ + -DCMAKE_INSTALL_LIBDIR="/lib" . make } @@ -26,3 +29,5 @@ package() { } # vim:set ts=2 sw=2 et: + + diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD deleted file mode 100644 index 533cf1995..000000000 --- a/pcr/youtube-dl-current/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer (Arch): Eric Bélanger <eric@archlinux.org> -# Maintainer: Alon Ivtsan <alonivtsan@lavabit.com> -# Based on https://www.archlinux.org/packages/community/any/youtube-dl/ - -pkgname=youtube-dl-current -_pkgname=youtube-dl -provides=(youtube-dl) -pkgver=2014.07.15 -pkgrel=1 -pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" -arch=('any') -url="http://rg3.github.io/youtube-dl/" -license=('custom') -depends=('python' 'python-setuptools') -optdepends=('ffmpeg: for video post-processing') -makedepends=('python-distribute') -source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig}) - -prepare() { - cd ${_pkgname} - sed -i 's|etc/bash_completion.d|share/bash-completion/completions|' setup.py -} - -package() { - cd ${_pkgname} - python setup.py install --root="${pkgdir}/" --optimize=1 - mv "${pkgdir}/usr/share/bash-completion/completions/youtube-dl.bash-completion" \ - "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" -} -md5sums=('ebc14ead72704f232c16ff53a948da91' - 'SKIP') diff --git a/pcr/zulucrypt/PKGBUILD b/pcr/zulucrypt/PKGBUILD index 21683a01f..c8f8ad852 100644 --- a/pcr/zulucrypt/PKGBUILD +++ b/pcr/zulucrypt/PKGBUILD @@ -15,6 +15,7 @@ conflicts=('zulucrypt-git') makedepends=('cmake') options=('!buildflags') source=("https://github.com/mhogomchungu/zuluCrypt/releases/download/${pkgver}/${_altpkgname}-${pkgver}.tar.bz2") +md5sums=('cbd9d64c40677122263d2b9317548cae') changelog=${pkgname}.changelog install=${pkgname}.install diff --git a/~coadde b/~coadde new file mode 100644 index 000000000..6cd2cd7c4 --- /dev/null +++ b/~coadde @@ -0,0 +1 @@ +moved to [ssh://git@projects.parabola.nu/~git/pcr.git/~coadde] git repo diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD deleted file mode 100644 index 8caecaaee..000000000 --- a/~coadde/cross-binutils/PKGBUILD +++ /dev/null @@ -1,406 +0,0 @@ -# Maintainer: Márcio Silva <coadde@parabola.nu> -# Contributor: André Silva <emulatorman@parabola.nu> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -# +-------------+-------------+-----------------------------------------------------------+-----------+---------+ -# | -march | CARCH | CHOST (_target) | Multilib | QEMU | -# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ -# | _arch | _CARCH | _host | _machine | _system (GNU/*) | _multilib | - | -# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ -# | mips64el | mips64el | mips64el | unknown | linux-gnu|elf | yes | sys | -# | mips64 | mips64 | mips64 | unknown | linux-gnu|elf | yes | sys | -# | * | mipsel | mipsel | unknown | elf | no | bin/sys | -# | * | mips | mips | unknown | elf | no | bin/sys | -# | x86_64 | x86_64 | x86_64 | unknown | linux-gnu|gnu<|elf | yes | bin/sys | -# | i[5-7]86 | i[5-7]86 | i[5-7]86 | pc | linux-gnu|gnu| | no | bin/sys | -# | * | i386 | i386 | unknown | elf | no | bin/sys | -# | armv8-a | aarch64 | aarch64 | unknown | linux-gnu|elf | yes | - | -# | armv8-a | aarch64_be | aarch64_be | unknown | linux-gnu|elf | yes | - | -# | armv7-a | armv7h | armv7l | unknown | linux-gnueabihf | no | bin/sys | -# | armv6 | armv6h | armv6l | unknown | linux-gnueabihf | no | bin/sys | -# | armv5te | arm | armv5tel | unknown | linux-gnueabi | no | bin/sys | -# | * | arm | arm | unknown | eabi | no | bin/sys | -# | arm | armeb | armeb | unknown | linux-gnueabi|eabi | no | bin | -# | sparc64 | sparc64 | sparc64 | unknown | linux-gnu | yes | bin/sys | -# | sparc | sparc | sparc | unknown | linux-gnu | no | bin/sys | -# | - | ia64 | ia64 | unknown | linux-gnu | yes | - | -# | - | s390 | s390 | unknown | linux-gnu | no | - | -# | - | s390x | s390x | unknown | linux-gnu | no | bin/sys | -# | powerpc64 | powerpc64 | powerpc64 | unknown | linux-gnu|linux-gnueabi|elf|eabi | yes | bin/sys | -# | powerpc64le | powerpc64le | powerpc64le | unknown | linux-gnu|linux-gnueabi|elf|eabi | yes | - | -# | powerpc | powerpc | powerpc | unknown | linux-gnu|linux-gnueabi|elf|eabi | no | bin/sys | -# | powerpcle | powerpcle | powerpcle | unknown | linux-gnu|linux-gnueabi|elf|eabi | no | - | -# | - | spu | spu | unknown | elf | no | - | -# | - | sh64 | sh64 | unknown | linux-gnu|elf | yes | - | -# | - | sh64l | sh64l | unknown | linux-gnu|elf | yes | - | -# | - | sh4 | sh4 | unknown | linux-gnu | no | bin/sys | -# | - | sh4l | sh4l | unknown | linux-gnu | no | bin/sys | -# | - | sh | sh | unknown | elf | no | - @ | -# | - | shl | shl | unknown | elf | no | - @ | -# | - | xtensa | xtensa | unknown | elf | no | sys | -# | * | m68k | m68k | unknown | elf | no | bin/sys | -# | - | lm32 | lm32 | unknown | linux-gnu|elf | no | sys | -# | - | or32 | or32 | unknown | linux-gnu<|elf< | no | bin/sys | -# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ - -# For "DOSBox" -# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ -# | * | i386 | i386 | pc | msdosdjgpp | no | bin/sys | -# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ - -# For "Wine" -# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ -# | * | x86_64 | x86_64 | unknown | mingw64 | yes | bin/sys | -# | * | i386 | i386 | unknown | mingw32 | no | bin/sys | -# +-------------+-------------+-------------+----------+----------------------------------+-----------+---------+ - -# * : Any supported by architecture. -# - : None. -# @ : bin/sys (Only sh4 and sh4l support) -# < : I will support it. (future) - -_carch_list=('mips64el' 'mips64' 'x86_64' 'i786' 'i686' 'i586' 'i486' 'i386' 'aarch64' 'aarch64_be' - 'armv7l' 'armv6l' 'armv5tel' 'armeb' 'sparc64' 'sparc' 'ia64' 's390' 's390x' - 'powerpc64' 'powerpc64le' 'powerpc' 'powerpcle' 'sh64' 'sh64l' 'sh4' 'sh4l' 'lm32' 'or32') -_multilib_list=('mips64el' 'mips64' 'x86_64' 'aarch64' 'aarch64_be' 'sparc64' 'ia64' 'powerpc64' 'powerpc64le''sh64' 'sh64l') - -#--------------------------------------------------------------------------------------------------------------------------------------------- - -### Base FLAGS: ### -# For custom name. -_pkgname="binutils" -_pkgver="2.23.2" -_pkgrel="2" -# For binutils-common ("${_pkgname}-common${_pkgflag}${_verflag}") release. -_pkgrelb="2" -# For _target-binutils ("${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}${_pkgflag}${_verflag}") release. -_pkgrelc="2" -# For older version. -_add_version_name="no" -# For custom pkg. -_pkgflag="" - -### Architecture FLAGS: ### -# CARCH flag -_CARCH="mips64" -# CHOST flags -_host="${_CARCH}" -_machine="unknown" -_system="linux-gnu" -# Multilib flag -_multilib="yes" - -### Patch FLAGS: ### -_patch_ath9k_htc_fw="no" - -#--------------------------------------------------------------------------------------------------------------------------------------------- - -# For older version. -[[ ${_add_version_name} == yes ]] && _verflag="-v${_pkgver}" - -# For Architecture. -_target="${_host}-${_machine}-${_system}" - -# For "_patch_ath9k_htc_fw" -[[ ${_CARCH} != xtensa ]] && _patch_ath9k_htc_fw="no" -[[ ${_patch_ath9k_htc_fw} == "yes" ]] && { - _ath9k_htc_name="-ath9k-htc" - _ath9k_htc_desc=" adapted for ath9k-htc firmware" - _multilib="no" -} - -# For "_multilib" -[[ ${_CARCH} != $(echo ${_multilib_list[@]} | sed 's| |\n|g' | grep -x ${_CARCH}) ]] && _multilib="no" -[[ ${_multilib} == "yes" ]] && { - _multilib_name="-multilib" - _multilib_desc=" for multilib" -} - -#--------------------------------------------------------------------------------------------------------------------------------------------- - -pkgname=( - "${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}${_pkgflag}${_verflag}" - "${_pkgname}-common${_pkgflag}${_verflag}" -) -pkgver=${_pkgver} -pkgrel=${_pkgrel} -arch=("${_carch_list[@]}") -url="http://www.gnu.org/software/${_pkgname}/" -license=('GPL2') -groups=('cross-devel') -checkdepends=('dejagnu' 'bc') -# Make sure we compile this with {$CHOST-,}gcc-multilib -[[ ${_multilib} == "yes" ]] && makedepends=('gcc-multilib') # makedepends=("$CHOST-gcc-multilib") -options=('!libtool' '!distcc' '!ccache') -source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2{,.sig} - ${_pkgname}-2.23.2-texinfo-5.0.patch) -md5sums=('4f8fa651e35ef262edc01d60fb45702e' - 'dfde4428f08d91f309cdcfe92bf28d08' - '34e439ce23213a91e2af872dfbb5094c') - -[[ ${_patch_ath9k_htc_fw} == "yes" ]] && { - source+=("_patch_ath9k_htc_fw.patch::https://raw.github.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/${_pkgname}.patch") - md5sums+=('7077126d96e9a755a0eaddb5505efe68') -} - -#--------------------------------------------------------------------------------------------------------------------------------------------- - -prepare() { - cd ${srcdir}/${_pkgname}-${pkgver} - - msg "http://sourceware.org/git/?p=${_pkgname}.git;a=patch;h=e02bf935" - msg "http://sourceware.org/git/?p=${_pkgname}.git;a=patch;h=935f8542" - patch -p1 -i ${srcdir}/${_pkgname}-2.23.2-texinfo-5.0.patch - - [[ ${_patch_ath9k_htc_fw} == "yes" ]] && { - patch -p1 -i ${srcdir}/_patch_ath9k_htc_fw.patch - } - - msg "hack! - libiberty configure tests for header files using" "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure - - mkdir -v ${srcdir}/${_pkgname}-build -} - -#--------------------------------------------------------------------------------------------------------------------------------------------- - -build() { - cd ${srcdir}/${_pkgname}-build - - [[ $CARCH != ${_CARCH} ]] && _TARGET="--target=${_target}" - if [[ ${_CARCH} == $(echo ${_multilib_list[@]} | sed 's| |\n|g' | grep -x ${_CARCH}) ]]; then - _LIB_PATH="--with-lib-path=/usr/lib:/usr/lib32:/usr/local/lib:/usr/local/lib32:/usr/${_target}/lib:/usr/${_target}/lib32" - else - _LIB_PATH="--with-lib-path=/usr/lib:/usr/local/lib:/usr/${_target}/lib" - fi - - if [[ ${_multilib} == "yes" ]]; then - _MULTILIB='--enable-multilib' - else - _MULTILIB='--disable-multilib' - fi - - ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/opt/${pkgname[0]/${_verflag}/}/${pkgver} \ - $_TARGET $_LIB_PATH \ - --program-prefix=${_target}- \ - --program-suffix=${_multilib_name}${_ath9k_htc_name}-${pkgver} \ - --with-bugurl=https://labs.parabola.nu/ \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --with-pic --enable-shared \ - --disable-werror ${_MULTILIB} - # !!! Disabled, due which problematic libretools (prepare() and build() with --bindir, --includedir and --datarootdir)" !!! - #--bindir=/usr/bin --includedir=/usr/include --datarootdir=/usr/share \ - - msg "Check the host environment and makes sure all the necessary tools are available" - make configure-host - - make tooldir=/opt/${pkgname[0]/${_verflag}/}/${pkgver} -} - -#--------------------------------------------------------------------------------------------------------------------------------------------- - -check() { - cd ${srcdir}/${_pkgname}-build - - msg "Unset LDFLAGS as testsuite makes assumptions about which ones are active" - msg "do not abort on errors - manually check log files" - make LDFLAGS="" -k check || true -} - -#--------------------------------------------------------------------------------------------------------------------------------------------- - -_target-binutils() { - pkgrel=${_pkgrelc} - pkgdesc="A set of programs to assemble and manipulate binary and object files${_multilib_desc}${_ath9k_htc_desc}. (${_target} architecture)" - depends=('glibc>=2.17' 'zlib' "${_pkgname}-common") - [[ $CHOST == ${_target} ]] && provides=("${_pkgname}=${pkgver}") - if [[ ${_multilib} == "yes" ]]; then - groups+=('multilib-devel') - else - groups+=('base-devel') - fi - groups+=("${_target}-devel") - install="${_target}-${_pkgname}${_multilib_name}${_ath9k_htc_name}.install" - - cd ${srcdir}/${_pkgname}-build - make prefix=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} tooldir=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} install - - # temp # - msg "!!! Move 'bin', 'include' and 'share' dir to /usr, !!!" - msg "!!! due which problematic libretools ('prepare()' and 'build()' with --bindir, --includedir and --datarootdir) !!!" - install -vd ${pkgdir}/usr - if [[ $CARCH == ${_CARCH} ]]; then - mv -v ${pkgdir}/{opt/${pkgname}/${pkgver}/{bin,include,share},usr} - else - mv -v ${pkgdir}/{opt/${pkgname}/${pkgver}/{bin,$CHOST/${_target}/include,share},usr} - fi - # temp # - - [[ $CARCH != ${_CARCH} ]] && { - msg "Move 'lib' files and directories, and remove architecture directories" - mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{$CHOST/${_target}/lib/*,lib} - rmdir -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/$CHOST/{${_target}/{lib,},} - } - - msg "Change lib-path on ldscripts files" - sed -i "/^SEARCH_DIR/ s|/${pkgver}/${_target}/lib|/${pkgver}/lib|g; - /^SEARCH_DIR/ s|/${pkgver}/lib|/${pkgver}/lib32|g; - /^SEARCH_DIR/ s|/${pkgver}/lib3264|/${pkgver}/lib|g; - /^SEARCH_DIR/ s|/${pkgver}/lib32x32|/${pkgver}/lib|g; - " ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/lib/ldscripts/* - - _removebin=(ar as nm objcopy objdump ranlib strip) - for _rbin in ${_removebin[@]}; do - msg "Remove conflicting binaries" - rm -v ${pkgdir}/usr/bin/${_rbin[@]} - done - - msg "Create links for libraries" - install -vd ${pkgdir}/{usr/${_target},etc/ld.so.conf.d} - ln -vs ../lib ${pkgdir}/usr/${_target}/lib - echo /opt/${pkgname/${_verflag}/}/${pkgver}/lib > ${pkgdir}/etc/ld.so.conf.d/${pkgname}-${pkgver}.conf - - msg "Install PIC libiberty.a" - install -vm644 libiberty/pic/libiberty.a ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/lib - - msg "Remove unnecessaries manuals and create links for manuals" - _man=$(ls -1A ${pkgdir}/usr/share/man/man1) - for _man_stage1 in ${_man[@]}; do - _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/} - _manuals=${_man_stage2/${_target}-/} - rm -v ${pkgdir}/usr/share/man/man1/${_man_stage1} - ln -vs ${_manuals}.gz ${pkgdir}/usr/share/man/man1/${_man_stage1}.gz - done - - msg "Remove unnecessaries files and directories" - rm -vr ${pkgdir}/usr/{include,share/{info,locale}} -} - -#--------------------------------------------------------------------------------------------------------------------------------------------- - -# GNU/Linux-libre -package_mips64el-unknown-linux-gnu-binutils() { _target-binutils; } -package_mips64el-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_mips64-unknown-linux-gnu-binutils() { _target-binutils; } -package_mips64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_x86_64-unknown-linux-gnu-binutils() { _target-binutils; } -package_x86_64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_i786-pc-linux-gnu-binutils() { _target-binutils; } -package_i686-pc-linux-gnu-binutils() { _target-binutils; } -package_i586-pc-linux-gnu-binutils() { _target-binutils; } -package_aarch64-unknown-linux-gnu-binutils() { _target-binutils; } -package_aarch64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_aarch64_be-unknown-linux-gnu-binutils() { _target-binutils; } -package_aarch64_be-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_arm7l-unknown-linux-gnueabi-binutils() { _target-binutils; } -package_arm6l-unknown-linux-gnueabi-binutils() { _target-binutils; } -package_arm5tel-unknown-linux-gnueabi-binutils() { _target-binutils; } -package_armeb-unknown-linux-gnueabi-binutils() { _target-binutils; } -package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; } -package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_sparc-unknown-linux-gnu-binutils() { _target-binutils; } -package_ia64-unknown-linux-gnu-binutils() { _target-binutils; } -package_ia64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_s390-unknown-linux-gnu-binutils() { _target-binutils; } -package_s390x-unknown-linux-gnu-binutils() { _target-binutils; } -package_sparc64-unknown-linux-gnu-binutils() { _target-binutils; } -package_sparc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_powerpc64-unknown-linux-gnu-binutils() { _target-binutils; } -package_powerpc64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_powerpc64le-unknown-linux-gnu-binutils() { _target-binutils; } -package_powerpc64le-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_powerpc-unknown-linux-gnu-binutils() { _target-binutils; } -package_powerpcle-unknown-linux-gnu-binutils() { _target-binutils; } -package_sh64-unknown-linux-gnu-binutils() { _target-binutils; } -package_sh64-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_sh64l-unknown-linux-gnu-binutils() { _target-binutils; } -package_sh64l-unknown-linux-gnu-binutils-multilib() { _target-binutils; } -package_sh4-unknown-linux-gnu-binutils() { _target-binutils; } -package_sh4l-unknown-linux-gnu-binutils() { _target-binutils; } -package_lm32-unknown-linux-gnu-binutils() { _target-binutils; } -package_or32-unknown-linux-gnu-binutils() { _target-binutils; } - -# GNU -package_x86_64-unknown-gnu-binutils() { _target-binutils; } -package_x86_64-unknown-gnu-binutils-multilib() { _target-binutils; } -package_i786-pc-gnu-binutils() { _target-binutils; } -package_i686-pc-gnu-binutils() { _target-binutils; } -package_i586-pc-gnu-binutils() { _target-binutils; } - -# ELF or EABI only -package_mips64el-unknown-elf-binutils() { _target-binutils; } -package_mips64el-unknown-elf-binutils-multilib() { _target-binutils; } -package_mips64-unknown-elf-binutils() { _target-binutils; } -package_mips64-unknown-elf-binutils-multilib() { _target-binutils; } -package_mipsel-unknown-elf-binutils() { _target-binutils; } -package_mips-unknown-elf-binutils() { _target-binutils; } -package_x86_64-unknown-elf-binutils() { _target-binutils; } -package_x86_64-unknown-elf-binutils-multilib() { _target-binutils; } -package_i386-unknown-elf-binutils() { _target-binutils; } -package_aarch64-unknown-elf-binutils() { _target-binutils; } -package_aarch64-unknown-elf-binutils-multilib() { _target-binutils; } -package_aarch64_be-unknown-elf-binutils() { _target-binutils; } -package_aarch64_be-unknown-elf-binutils-multilib() { _target-binutils; } -package_arm-unknown-eabi-binutils() { _target-binutils; } -package_armeb-unknown-eabi-binutils() { _target-binutils; } -package_powerpc64-unknown-elf-binutils() { _target-binutils; } -package_powerpc64-unknown-elf-binutils-multilib() { _target-binutils; } -package_powerpc64-unknown-eabi-binutils() { _target-binutils; } -package_powerpc64-unknown-eabi-binutils-multilib() { _target-binutils; } -package_powerpc64le-unknown-elf-binutils() { _target-binutils; } -package_powerpc64le-unknown-elf-binutils-multilib() { _target-binutils; } -package_powerpc64le-unknown-eabi-binutils() { _target-binutils; } -package_powerpc64le-unknown-eabi-binutils-multilib() { _target-binutils; } -package_powerpc-unknown-elf-binutils() { _target-binutils; } -package_powerpc-unknown-eabi-binutils() { _target-binutils; } -package_powerpcle-unknown-elf-binutils() { _target-binutils; } -package_powerpcle-unknown-eabi-binutils() { _target-binutils; } -package_spu-unknown-elf-binutils() { _target-binutils; } -package_sh64-unknown-elf-binutils() { _target-binutils; } -package_sh64-unknown-elf-binutils-multilib() { _target-binutils; } -package_sh64l-unknown-elf-binutils() { _target-binutils; } -package_sh64l-unknown-elf-binutils-multilib() { _target-binutils; } -package_sh-unknown-elf-binutils() { _target-binutils; } -package_shl-unknown-elf-binutils() { _target-binutils; } -package_xtensa-unknown-elf-binutils() { _target-binutils; } -package_xtensa-unknown-elf-binutils-ath9k_htc() { _target-binutils; } -package_m68k-unknown-elf-binutils() { _target-binutils; } -package_lm32-unknown-elf-binutils() { _target-binutils; } -package_or32-unknown-elf-binutils() { _target-binutils; } - -#--------------------------------------------------------------------------------------------------------------------------------------------- - -package_binutils-common() { - pkgrel=${_pkgrelb} - pkgdesc="A set of programs to assemble and manipulate binary and object files. (headers, docs and locales files only)" - arch=('any') - depends=('linktools') - install="${_pkgname}.install" - - cd ${srcdir}/${_pkgname}-build - make prefix=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} tooldir=${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver} install - - [[ $CARCH != ${_CARCH} ]] && { - msg "Move 'include' files and directories" - mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{$CHOST/${_target}/include,} - } - - msg "Add some useful headers" - install -vm644 ${srcdir}/${_pkgname}-${pkgver}/include/{demangle,libiberty}.h ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/include - - msg "Remove unnecessaries files and directories" - rm -vr ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/{bin,lib} - [[ $CARCH != ${_CARCH} ]] && { - rm -vr ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/$CHOST - } - - msg "Rename manuals" - _man=$(ls -1A ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/share/man/man1) - for _man_stage1 in ${_man[@]}; do - _man_stage2=${_man_stage1/${_multilib_name}${_ath9k_htc_name}-${pkgver}/} - _manuals=${_man_stage2/${_target}-/} - mv -v ${pkgdir}/opt/${pkgname/${_verflag}/}/${pkgver}/share/man/man1/{${_man_stage1},${_manuals}} - done -} diff --git a/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install deleted file mode 100644 index e2cb3892c..000000000 --- a/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=aarch64-unknown-elf-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install b/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install deleted file mode 100644 index 7546e29a1..000000000 --- a/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=aarch64-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install deleted file mode 100644 index 6f986cd41..000000000 --- a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=aarch64-unknown-linux-gnu-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install deleted file mode 100644 index 96d20da4a..000000000 --- a/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=aarch64-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install deleted file mode 100644 index ae71b8f32..000000000 --- a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=aarch64_be-unknown-elf-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install deleted file mode 100644 index 886d38ddc..000000000 --- a/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=aarch64_be-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install deleted file mode 100644 index 21e87d4a6..000000000 --- a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=aarch64_be-unknown-linux-gnu-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install deleted file mode 100644 index 7c040a1d1..000000000 --- a/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=aarch64_be-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/arm-unknown-eabi-binutils.install b/~coadde/cross-binutils/arm-unknown-eabi-binutils.install deleted file mode 100644 index 2a5ac8d12..000000000 --- a/~coadde/cross-binutils/arm-unknown-eabi-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=arm-unknown-eabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install deleted file mode 100644 index f1053cd1e..000000000 --- a/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=arm5tel-unknown-linux-gnueabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install deleted file mode 100644 index fa11d3f92..000000000 --- a/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=arm6l-unknown-linux-gnueabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install b/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install deleted file mode 100644 index 4e9ca080f..000000000 --- a/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=arm7l-unknown-linux-gnueabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install b/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install deleted file mode 100644 index 363e4b477..000000000 --- a/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=armeb-unknown-eabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install b/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install deleted file mode 100644 index 75fa9f797..000000000 --- a/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=armeb-unknown-linux-gnueabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/i386-unknown-elf-binutils.install b/~coadde/cross-binutils/i386-unknown-elf-binutils.install deleted file mode 100644 index 572ecca6e..000000000 --- a/~coadde/cross-binutils/i386-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=i386-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/i586-pc-gnu-binutils.install b/~coadde/cross-binutils/i586-pc-gnu-binutils.install deleted file mode 100644 index 6e4dac15d..000000000 --- a/~coadde/cross-binutils/i586-pc-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=i586-pc-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/i586-pc-linux-gnu-binutils.install b/~coadde/cross-binutils/i586-pc-linux-gnu-binutils.install deleted file mode 100644 index f14abdfaa..000000000 --- a/~coadde/cross-binutils/i586-pc-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=i586-pc-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/i686-pc-gnu-binutils.install b/~coadde/cross-binutils/i686-pc-gnu-binutils.install deleted file mode 100644 index 1fbfac209..000000000 --- a/~coadde/cross-binutils/i686-pc-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=i686-pc-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/i686-pc-linux-gnu-binutils.install b/~coadde/cross-binutils/i686-pc-linux-gnu-binutils.install deleted file mode 100644 index a0498ff51..000000000 --- a/~coadde/cross-binutils/i686-pc-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=i686-pc-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/i786-pc-gnu-binutils.install b/~coadde/cross-binutils/i786-pc-gnu-binutils.install deleted file mode 100644 index f77927c8d..000000000 --- a/~coadde/cross-binutils/i786-pc-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=i786-pc-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install b/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install deleted file mode 100644 index b6422d2ce..000000000 --- a/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=i786-pc-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install deleted file mode 100644 index a31a76a41..000000000 --- a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=ia64-unknown-linux-gnu-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install deleted file mode 100644 index 9853a7dce..000000000 --- a/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=ia64-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/lm32-unknown-elf-binutils.install b/~coadde/cross-binutils/lm32-unknown-elf-binutils.install deleted file mode 100644 index c2481ba1f..000000000 --- a/~coadde/cross-binutils/lm32-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=lm32-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install deleted file mode 100644 index e59746dd4..000000000 --- a/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=lm32-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/m68k-unknown-elf-binutils.install b/~coadde/cross-binutils/m68k-unknown-elf-binutils.install deleted file mode 100644 index b45dcea38..000000000 --- a/~coadde/cross-binutils/m68k-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=m68k-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/mips-unknown-elf-binutils.install b/~coadde/cross-binutils/mips-unknown-elf-binutils.install deleted file mode 100644 index f8dd9a4ad..000000000 --- a/~coadde/cross-binutils/mips-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=mips-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install deleted file mode 100644 index e24e260f6..000000000 --- a/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=mips64-unknown-elf-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/mips64-unknown-elf-binutils.install b/~coadde/cross-binutils/mips64-unknown-elf-binutils.install deleted file mode 100644 index 8e5e0a192..000000000 --- a/~coadde/cross-binutils/mips64-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=mips64-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install deleted file mode 100644 index 7ae20c93c..000000000 --- a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=mips64-unknown-linux-gnu-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install deleted file mode 100644 index 3da7b37e3..000000000 --- a/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=mips64-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install deleted file mode 100644 index 201c805dd..000000000 --- a/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=mips64el-unknown-elf-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install b/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install deleted file mode 100644 index ab338a443..000000000 --- a/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=mips64el-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install deleted file mode 100644 index cff96a72a..000000000 --- a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=mips64el-unknown-linux-gnu-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils.install deleted file mode 100644 index 21b4a2af2..000000000 --- a/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=mips64el-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install b/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install deleted file mode 100644 index 87c99efcf..000000000 --- a/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=mipsel-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/or32-unknown-elf-binutils.install b/~coadde/cross-binutils/or32-unknown-elf-binutils.install deleted file mode 100644 index 92833bd5d..000000000 --- a/~coadde/cross-binutils/or32-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=or32-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install deleted file mode 100644 index 8427c5c91..000000000 --- a/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=or32-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install deleted file mode 100644 index eed9a2c98..000000000 --- a/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc-unknown-eabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install deleted file mode 100644 index fbd5f0556..000000000 --- a/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install deleted file mode 100644 index b7e544e48..000000000 --- a/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install deleted file mode 100644 index 5667c84e2..000000000 --- a/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc-unknown-linux-gnueabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install deleted file mode 100644 index 0c1b1d7b8..000000000 --- a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64-unknown-eabi-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install deleted file mode 100644 index 2e3ca0474..000000000 --- a/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64-unknown-eabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install deleted file mode 100644 index 4000bde4f..000000000 --- a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64-unknown-elf-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install deleted file mode 100644 index f9d4ff394..000000000 --- a/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install deleted file mode 100644 index 15a8c37c5..000000000 --- a/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install deleted file mode 100644 index 28e4914c6..000000000 --- a/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64-unknown-linux-gnueabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install deleted file mode 100644 index 0b6f6c848..000000000 --- a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64le-unknown-eabi-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install deleted file mode 100644 index 3798f1bfe..000000000 --- a/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64le-unknown-eabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install deleted file mode 100644 index 1e30719bf..000000000 --- a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64le-unknown-elf-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install deleted file mode 100644 index 891b7f85b..000000000 --- a/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64le-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install deleted file mode 100644 index f8872d8e1..000000000 --- a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64le-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install deleted file mode 100644 index ae20ca33c..000000000 --- a/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpc64le-unknown-linux-gnueabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install deleted file mode 100644 index 850610fc6..000000000 --- a/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpcle-unknown-eabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install deleted file mode 100644 index 24e07a7ec..000000000 --- a/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpcle-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install deleted file mode 100644 index b681acc4b..000000000 --- a/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpcle-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install b/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install deleted file mode 100644 index 6559cdd29..000000000 --- a/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=powerpcle-unknown-linux-gnueabi-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install deleted file mode 100644 index 0a583f543..000000000 --- a/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=s390-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install deleted file mode 100644 index dc576d75e..000000000 --- a/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=s390x-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh-unknown-elf-binutils.install b/~coadde/cross-binutils/sh-unknown-elf-binutils.install deleted file mode 100644 index 20d123559..000000000 --- a/~coadde/cross-binutils/sh-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install deleted file mode 100644 index 5843ac274..000000000 --- a/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh4-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install deleted file mode 100644 index f97168df0..000000000 --- a/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh4l-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install deleted file mode 100644 index 1f11dabbb..000000000 --- a/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh64-unknown-elf-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh64-unknown-elf-binutils.install b/~coadde/cross-binutils/sh64-unknown-elf-binutils.install deleted file mode 100644 index 04ee63c8c..000000000 --- a/~coadde/cross-binutils/sh64-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh64-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install deleted file mode 100644 index 451eedb44..000000000 --- a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh64-unknown-linux-gnu-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install deleted file mode 100644 index 2af6a7268..000000000 --- a/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh64-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install deleted file mode 100644 index 6e01ac61e..000000000 --- a/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh64l-unknown-elf-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install b/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install deleted file mode 100644 index ab95b36ec..000000000 --- a/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh64l-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install deleted file mode 100644 index 71c191e1c..000000000 --- a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh64l-unknown-linux-gnu-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install deleted file mode 100644 index cbe5c788a..000000000 --- a/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sh64l-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/shl-unknown-elf-binutils.install b/~coadde/cross-binutils/shl-unknown-elf-binutils.install deleted file mode 100644 index cdb30916b..000000000 --- a/~coadde/cross-binutils/shl-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=shl-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install deleted file mode 100644 index f3dfca2d3..000000000 --- a/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sparc-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install deleted file mode 100644 index d0aff2a85..000000000 --- a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sparc64-unknown-linux-gnu-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install deleted file mode 100644 index 2d24404e5..000000000 --- a/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=sparc64-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/spu-unknown-elf-binutils.install b/~coadde/cross-binutils/spu-unknown-elf-binutils.install deleted file mode 100644 index 204d4bfb2..000000000 --- a/~coadde/cross-binutils/spu-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=spu-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install deleted file mode 100644 index dcf66e30a..000000000 --- a/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=x86_64-unknown-elf-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install b/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install deleted file mode 100644 index 779e65ab3..000000000 --- a/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=x86_64-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install deleted file mode 100644 index 7c682ba82..000000000 --- a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=x86_64-unknown-gnu-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install deleted file mode 100644 index 102a11fd0..000000000 --- a/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=x86_64-unknown-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install deleted file mode 100644 index 96140638c..000000000 --- a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=x86_64-unknown-linux-gnu-binutils-multilib - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils.install b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils.install deleted file mode 100644 index 299a9675f..000000000 --- a/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=x86_64-unknown-linux-gnu-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install b/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install deleted file mode 100644 index 643379261..000000000 --- a/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=xtensa-unknown-elf-binutils-ath9k-htc - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install b/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install deleted file mode 100644 index 120b40b1b..000000000 --- a/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install +++ /dev/null @@ -1,16 +0,0 @@ -_pkgname=xtensa-unknown-elf-binutils - -post_install() { - linktools set $_pkgname - linktools update binutils -} - -post_upgrade() { - post_install -} - -pre_remove() { - [[ $_pkgname == $(linktools check) ]] && { - linktools unset - } -} diff --git a/~coadde/mariadb/PKGBUILD b/~coadde/mariadb/PKGBUILD deleted file mode 100644 index 5bfbf9a0f..000000000 --- a/~coadde/mariadb/PKGBUILD +++ /dev/null @@ -1,141 +0,0 @@ -# $Id$ -# Maintainer (Arch): -# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> -# Contributor (Arch): Douglas Soares de Andrade <douglas@archlinux.org> -# Maintainer: Márcio Silva <coadde@parabola.nu> - -falsename=mysql -_falsename=MySQL -pkgbase=mariadb -_pkgbase=MariaDB -pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") -pkgver=5.5.23 -pkgrel=1.5 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.${pkgbase}.org/" -makedepends=('cmake' 'openssl' 'zlib') -options=('!libtool') -source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgbase}-${pkgver}.tar.gz" - "${falsename}d" - 'my.cnf') -md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f' - 'b9ecca93aaeee9d8375fffb199d9057c' - '1351485633baf9894cfdf7c5bbffd7b5') - -build() { - cd "${srcdir}" - mkdir build - cd build - - # CFLAGS/CXXFLAGS as suggested upstream - CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ - - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/${falsename} \ - -DMYSQL_DATADIR=/var/lib/${falsename} \ - -DMYSQL_UNIX_ADDR=/run/${falsename}/${falsename}.sock \ - -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_unicode_ci \ - -DENABLED_LOCAL_INFILE=ON \ - -DINSTALL_INFODIR=share/${falsename}/docs \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/${falsename}/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/${falsename} \ - -DINSTALL_DOCREADMEDIR=share/${falsename} \ - -DINSTALL_SUPPORTFILESDIR=share/${falsename} \ - -DINSTALL_MYSQLSHAREDIR=share/${falsename} \ - -DINSTALL_DOCDIR=share/${falsename}/docs \ - -DINSTALL_SHAREDIR=share/${falsename} \ - -DWITH_READLINE=ON \ - -DWITH_ZLIB=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=1 \ - -DWITH_PARTITION_STORAGE_ENGINE=1 \ - -DWITH_PBXT_STORAGE_ENGINE=1 \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 - - make -} - -package_libmariadbclient(){ - pkgdesc="${_pkgbase} client libraries (branch of ${_falsename})" - depends=('openssl') - conflicts=("lib${falsename}client") - provides=("lib${falsename}client=${pkgver}") - - cd "${srcdir}"/build - for dir in include lib${falsename} lib${falsename}d libservices; do - make -C ${dir} DESTDIR="${pkgdir}" install - done - - install -d "${pkgdir}"/usr/bin - install -m755 scripts/${falsename}_config "${pkgdir}"/usr/bin/ - install -d "${pkgdir}"/usr/share/man/man1 - for man in ${falsename}_config ${falsename}_client_test_embedded ${falsename}test_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done -} - -package_mariadb-clients(){ - pkgdesc="${_pkgbase} client tools (branch of ${_falsename})" - depends=("lib${pkgbase}client") - conflicts=("${falsename}-clients") - provides=("${falsename}-clients=${pkgver}") - - cd "${srcdir}"/build - make -C client DESTDIR="${pkgdir}" install - - # install man pages - install -d "${pkgdir}"/usr/share/man/man1 - for man in ${falsename} ${falsename}admin ${falsename}check ${falsename}dump ${falsename}import ${falsename}show ${falsename}slap; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done - - # provided by mariadb - rm "${pkgdir}"/usr/bin/{${falsename}_{plugin,upgrade},${falsename}binlog,${falsename}test} -} - -package_mariadb(){ - pkgdesc="A fast SQL database server branch of ${_falsename} - ${_pkgbase}" - backup=("etc/${pkgbase}/my.cnf") - install=${falsename}.install - depends=("${pkgbase}-clients") - optdepends=('perl-dbi' "perl-dbd-${falsename}") - conflicts=("${falsename}") - provides=("${falsename}=${pkgver}") - options=('emptydirs') - - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${falsename}/my.cnf - install -Dm755 "${srcdir}"/${falsename}d "${pkgdir}"/etc/rc.d/${falsename}d - - # provided by libmariadbclient - rm "${pkgdir}"/usr/bin/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded} - rm "${pkgdir}"/usr/lib/lib${falsename}* - rm -r "${pkgdir}"/usr/include/ - rm "${pkgdir}"/usr/share/man/man1/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}.1 - - # provided by mariadb-clients - rm "${pkgdir}"/usr/bin/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap} - rm "${pkgdir}"/usr/share/man/man1/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}.1 - - # not needed - rm -r "${pkgdir}"/usr/{data,${falsename}-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/${falsename}-test-run.pl.1 - - install -dm700 "${pkgdir}"/var/lib/${falsename} -} diff --git a/~coadde/mariadb/mariadb.install b/~coadde/mariadb/mariadb.install deleted file mode 100644 index f56a0dcaa..000000000 --- a/~coadde/mariadb/mariadb.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install(){ - groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null - /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mariadb - chown -R mysql:mysql /var/lib/mariadb &>/dev/null -} - -post_upgrade(){ - getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mariadb -s /bin/false mysql &>/dev/null - - if [ "$(vercmp $2 5.5)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} - -post_remove(){ - if getent passwd mysql >/dev/null 2>&1; then - userdel mysql - fi - if getent group mysql >/dev/null 2>&1; then - groupdel mysql - fi -} diff --git a/~coadde/mariadb/mariadbd b/~coadde/mariadb/mariadbd deleted file mode 100755 index 95986eb1a..000000000 --- a/~coadde/mariadb/mariadbd +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MariaDB Server" - [ ! -d /run/mariadb ] && install -d -g mysql -o mysql /run/mariadb &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /run/mariadb/mariadb.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MariaDB Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /run/mariadb/mariadb.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/~coadde/mariadb/my.cnf b/~coadde/mariadb/my.cnf deleted file mode 100644 index 387020858..000000000 --- a/~coadde/mariadb/my.cnf +++ /dev/null @@ -1,145 +0,0 @@ -# MySQL config file for medium systems. -# -# This is for a system with little memory (32M - 64M) where MySQL plays -# an important part, or systems up to 128M where MySQL is used together with -# other programs (such as a web server) -# -# MySQL programs look for option files in a set of -# locations which depend on the deployment platform. -# You can copy this option file to one of those -# locations. For information about these locations, see: -# http://dev.mysql.com/doc/mysql/en/option-files.html -# -# In this file, you can use all long options that a program supports. -# If you want to know which options a program supports, run the program -# with the "--help" option. - -# The following options will be passed to all MySQL clients -[client] -#password = your_password -port = 3306 -socket = /run/mysqld/mysqld.sock - -# Here follows entries for some specific programs - -# The MySQL server -[mysqld] -port = 3306 -socket = /run/mysqld/mysqld.sock -datadir = /var/lib/mysql -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 1M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -# Don't listen on a TCP/IP port at all. This can be a security enhancement, -# if all processes that need to connect to mysqld run on the same host. -# All interaction with mysqld must be made via Unix sockets or named pipes. -# Note that using this option without enabling named pipes on Windows -# (via the "enable-named-pipe" option) will render mysqld useless! -# -skip-networking - -# Replication Master Server (default) -# binary logging is required for replication -log-bin=mysql-bin - -# binary logging format - mixed recommended -binlog_format=mixed - -# required unique id between 1 and 2^32 - 1 -# defaults to 1 if master-host is not set -# but will not function as a master if omitted -server-id = 1 - -# Replication Slave (comment out master section to use this) -# -# To configure this host as a replication slave, you can choose between -# two methods : -# -# 1) Use the CHANGE MASTER TO command (fully described in our manual) - -# the syntax is: -# -# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, -# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; -# -# where you replace <host>, <user>, <password> by quoted strings and -# <port> by the master's port number (3306 by default). -# -# Example: -# -# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, -# MASTER_USER='joe', MASTER_PASSWORD='secret'; -# -# OR -# -# 2) Set the variables below. However, in case you choose this method, then -# start replication for the first time (even unsuccessfully, for example -# if you mistyped the password in master-password and the slave fails to -# connect), the slave will create a master.info file, and any later -# change in this file to the variables' values below will be ignored and -# overridden by the content of the master.info file, unless you shutdown -# the slave server, delete master.info and restart the slaver server. -# For that reason, you may want to leave the lines below untouched -# (commented) and instead use CHANGE MASTER TO (see above) -# -# required unique id between 2 and 2^32 - 1 -# (and different from the master) -# defaults to 2 if master-host is set -# but will not function as a slave if omitted -#server-id = 2 -# -# The replication master for this slave - required -#master-host = <hostname> -# -# The username the slave will use for authentication when connecting -# to the master - required -#master-user = <username> -# -# The password the slave will authenticate with when connecting to -# the master - required -#master-password = <password> -# -# The port the master is listening on. -# optional - defaults to 3306 -#master-port = <port> -# -# binary logging - not required for slaves, but recommended -#log-bin=mysql-bin - -# Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = /var/lib/mysql -#innodb_data_file_path = ibdata1:10M:autoextend -#innodb_log_group_home_dir = /var/lib/mysql -# You can set .._buffer_pool_size up to 50 - 80 % -# of RAM but beware of setting memory usage too high -#innodb_buffer_pool_size = 16M -#innodb_additional_mem_pool_size = 2M -# Set .._log_file_size to 25 % of buffer pool size -#innodb_log_file_size = 5M -#innodb_log_buffer_size = 8M -#innodb_flush_log_at_trx_commit = 1 -#innodb_lock_wait_timeout = 50 - -[mysqldump] -quick -max_allowed_packet = 16M - -[mysql] -no-auto-rehash -# Remove the next comment character if you are not familiar with SQL -#safe-updates - -[myisamchk] -key_buffer_size = 20M -sort_buffer_size = 20M -read_buffer = 2M -write_buffer = 2M - -[mysqlhotcopy] -interactive-timeout diff --git a/~coadde/mariadb/mysql.install b/~coadde/mariadb/mysql.install deleted file mode 100644 index 9a4479215..000000000 --- a/~coadde/mariadb/mysql.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install(){ - groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - usr/bin/mysql_install_db --user=mysql --basedir=/usr - chown -R mysql:mysql var/lib/mysql &>/dev/null -} - -post_upgrade(){ - getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - - if [ "$(vercmp $2 5.5)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} - -post_remove(){ - if getent passwd mysql >/dev/null 2>&1; then - userdel mysql - fi - if getent group mysql >/dev/null 2>&1; then - groupdel mysql - fi -} diff --git a/~coadde/mariadb/mysqld b/~coadde/mariadb/mysqld deleted file mode 100644 index 4bbddb5a4..000000000 --- a/~coadde/mariadb/mysqld +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MySQL Server" - [ ! -d /run/mysqld ] && install -d -g mysql -o mysql /run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MySQL Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/~coadde/torque/PKGBUILD b/~coadde/torque/PKGBUILD deleted file mode 100644 index c482c515c..000000000 --- a/~coadde/torque/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Maintainer: Márcio Silva <coadde@parabola.nu> - -pkgname=torque -pkgver=4.2.2 -_pkgver=1065 -pkgrel=3 -pkgdesc='An open source resource manager providing control over batch jobs and distributed compute nodes.' -url=http://www.adaptivecomputing.com/products/open-source/$pkgname/ -arch=( - i686 - x86_64 - mips64el -) -license=custom -depends=( - libxml2 - openssh -) -install=$pkgname.install -options=(!libtool) -backup=( - var/spool/$pkgname/mom_priv/config - var/spool/$pkgname/serv_priv/nodes - var/spool/$pkgname/serv_priv/serverdb - var/spool/$pkgname/server_name -) -source=( - $pkgname-$pkgver.tar.gz::http://www.adaptivecomputing.com/index.php?wpfb_dl=$_pkgver - $pkgname-{node,scheduler,server}.service -) -sha512sums=('9ad0bbe4afdec57a261d079ee236e9f52cd50345a91264888100a2d7bc2ee3026c05195715bf33e2eef8d7e2bf86342638d65ae814a27ca3401a19ae051c2c4d' - 'aa25cc61eb09aad7e6b43f9ac6b955095846e1db84501a2a1dfabdb44c59335f68be6c4916f934cbf6b6b56f6a42aafd80dfe9660c6e8e956af9b5e0fe5eb255' - 'c6c4be41fa4a66da0a64a28d373bae3b8821d7f1b64001464e62e2827c0a0655689e9d93801d3082752733d21dee3aae87544fb4816cb98e9848ef2c3a3388f0' - '566a782ea0327cbf946a698434e0fb1650aacf73a26c30a3789848162f574cc353c18d61ddc4b04e97690cfbc777b655efa1dc66d16390f608f27c1e6b823acb') - -build() { - cd $srcdir/$pkgname-$pkgver - setarch $CARCH ./configure --prefix=/usr\ - --disable-gui\ - --disable-gcc-warnings\ - --mandir=/usr/share/man\ - --with-default-server=localhost\ - --with-rcp=scp\ - --with-server-home=/var/spool/$pkgname\ - --with-tcl=no - mv src/resmom/Makefile src/resmom/Makefile.old - cat src/resmom/Makefile.old | sed 's/$(MOMLIBS) $(PBS_LIBS)/$(PBS_LIBS) $(MOMLIBS)/g' > src/resmom/Makefile - setarch $CARCH make -} - -package() { - cd $srcdir/$pkgname-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install - - install -d $pkgdir/usr/lib/systemd/system - install -Dm644 $srcdir/*.service $pkgdir/usr/lib/systemd/system -} - -# vim:set ts=2 sw=2 et: diff --git a/~coadde/torque/torque-node.service b/~coadde/torque/torque-node.service deleted file mode 100644 index f8fcb46a2..000000000 --- a/~coadde/torque/torque-node.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=TORQUE node -Wants=basic.target -After=basic.target network.target - -[Service] -Type=forking -PIDFile=/var/spool/torque/mom_priv/mom.lock -ExecStart=/usr/bin/pbs_mom - -[Install] -WantedBy=multi-user.target diff --git a/~coadde/torque/torque-scheduler.service b/~coadde/torque/torque-scheduler.service deleted file mode 100644 index fa417cdf3..000000000 --- a/~coadde/torque/torque-scheduler.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=TORQUE scheduler -Wants=torque-server.service -After=torque-server.service - -[Service] -Type=forking -PIDFile=/var/spool/torque/sched_priv/sched.lock -ExecStart=/usr/bin/pbs_sched - -[Install] -WantedBy=multi-user.target diff --git a/~coadde/torque/torque-server.service b/~coadde/torque/torque-server.service deleted file mode 100644 index a491bbff7..000000000 --- a/~coadde/torque/torque-server.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=TORQUE server -Wants=basic.target -After=basic.target network.target - -[Service] -Type=forking -PIDFile=/var/spool/torque/server_priv/server.lock -ExecStart=/usr/bin/pbs_server - -[Install] -WantedBy=multi-user.target diff --git a/~coadde/torque/torque.install b/~coadde/torque/torque.install deleted file mode 100644 index 2e90bd1ba..000000000 --- a/~coadde/torque/torque.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - pbs_server -f -t create - systemctl stop torque-server - echo 'Change the server name in /var/spool/torque/server_name to your needs. -You may add your clients to /var/spool/torque/server_priv/nodes if your are the server. -Enable torque-server.service or torque-node.service depending on whether you are the server or a node.' -} - -# vim:set ts=2 sw=2 et: |
