From 963a6823c1201d8ca8457ba6811a1bd18740bf50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Tue, 29 Jul 2014 03:33:06 +0000 Subject: Tue Jul 29 03:26:06 UTC 2014 --- community/aegisub/PKGBUILD | 11 +-- community/cinnamon-control-center/PKGBUILD | 6 +- community/cinnamon-session/PKGBUILD | 4 +- community/cinnamon/PKGBUILD | 8 +- community/dbmail/PKGBUILD | 8 +- community/goaccess/PKGBUILD | 6 +- community/liteide/PKGBUILD | 4 +- community/muffin/PKGBUILD | 6 +- community/nemo/PKGBUILD | 6 +- community/sqlitebrowser/PKGBUILD | 17 +++- ...able-params-wipe-into-function-which-allo.patch | 37 +++++++++ ...-Re-check-flags-after-DM-device-creations.patch | 62 +++++++++++++++ ...low-activation-of-discard-even-if-dm_cryp.patch | 92 ++++++++++++++++++++++ core/cryptsetup/PKGBUILD | 24 ++++-- core/iproute2/PKGBUILD | 6 +- extra/imagemagick/PKGBUILD | 6 +- 16 files changed, 259 insertions(+), 44 deletions(-) create mode 100644 core/cryptsetup/0001-Move-safe-table-params-wipe-into-function-which-allo.patch create mode 100644 core/cryptsetup/0002-Re-check-flags-after-DM-device-creations.patch create mode 100644 core/cryptsetup/0003-Properly-allow-activation-of-discard-even-if-dm_cryp.patch diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index f746c889b..237108955 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 109779 2014-04-18 17:31:23Z andyrtr $ +# $Id: PKGBUILD 116486 2014-07-28 16:44:53Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: kozec # Contributor: Limao Luo pkgname=aegisub -pkgver=3.1.3 -pkgrel=2 +pkgver=3.2.0 +pkgrel=1 pkgdesc='A general-purpose subtitle editor with ASS/SSA support' arch=('i686' 'x86_64') url='http://www.aegisub.org' @@ -14,12 +14,13 @@ depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'wxgtk') makedepends=('boost' 'intltool' 'mesa') install="${pkgname}.install" source=("http://ftp.aegisub.org/pub/archives/releases/source/${pkgname}-${pkgver}.tar.xz") -sha256sums=('efea5bc2bc5e0651ada4f65cfdd8af1b422a15f87933710d11287bf51e2b5e58') +sha256sums=('d9e5fd48b243e29832361a13f8be82b271ef0c606b13593ec72461156ee19159') build() { cd ${pkgname}-${pkgver} - ./configure --prefix='/usr' --without-{portaudio,openal,oss} + ./configure --prefix='/usr' --without-{portaudio,openal,oss} \ + --disable-update-checker make } diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 832f0f87c..f469672a3 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112279 2014-05-30 21:58:10Z faidoc $ +# $Id: PKGBUILD 116454 2014-07-27 23:10:08Z faidoc $ # Maintainer: Alexandre Filgueira # Based on gnome-control-center: # Jan Alexander Steffens (heftig) # Jan de Groot pkgname=cinnamon-control-center -pkgver=2.2.9 +pkgver=2.2.10 pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ install=cinnamon-control-center.install license=('GPL') options=('!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") -sha256sums=('76b32187298f4d934ded2a2a898c371e7644fe9f3142b41bf9acf39d11436491') +sha256sums=('5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef') build() { cd $pkgname-$pkgver diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD index 6400707b9..efcf14c9b 100644 --- a/community/cinnamon-session/PKGBUILD +++ b/community/cinnamon-session/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan Alexander Steffens (heftig) pkgname=cinnamon-session -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=1 pkgdesc="The Cinnamon Session Handler" arch=(i686 x86_64) @@ -15,7 +15,7 @@ install=cinnamon-session.install url="https://github.com/linuxmint/cinnamon-session" source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz timeout.patch) -sha256sums=('357c952e9f57072c03fce08d3fb59a345ab74a386858a4599eace29c4953cf8e' +sha256sums=('16e94442dc8c3d666ca2b576088b7dd4b179e48a3af96ac92ac94864c1f51288' 'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a') prepare() { diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index c6edd8018..858872df4 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 113158 2014-06-14 16:06:43Z faidoc $ +# $Id: PKGBUILD 116456 2014-07-27 23:18:14Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=2.2.13 -pkgrel=2 +pkgver=2.2.14 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -25,7 +25,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/ "upower_calender_fix.patch" "set_wheel.patch" "upower_power_applet_fix.patch") -sha256sums=('123261a6a90954adc13f251489d708bc1b611808c63ae87c5189bf717f42483a' +sha256sums=('ffccc44c8b4675ba76510172d8252c3c07a131a9ad7b5ba062740b686a3cb0f9' '2edb96f42fb4da07eee635b1159e3ae869c64d7ac80f600bc509190648abcf3e' 'dafb2b7b275053aa77d15f2ffab62ad1567aa9d93ed7a82077feeef86b81c7f7' 'da6594cd05f5f9c242cdc179e5af1bd5afb79506e77ac457d2a7e8930692c45c') diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index aac0cb881..8a7af3ea2 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 116161 2014-07-23 12:16:17Z spupykin $ +# $Id: PKGBUILD 116478 2014-07-28 10:44:55Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sebastian Faltoni pkgname=dbmail -pkgver=3.1.16 -pkgrel=2 +pkgver=3.1.17 +pkgrel=1 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime' 'libzdb' 'mhash' 'libevent') @@ -28,7 +28,7 @@ source=("http://www.dbmail.org/download/3.1/dbmail-${pkgver}.tar.gz" "dbmail-pop3d.xinetd" "dbmail-timsieved.xinetd" "dbmail-7-systemd.diff") -md5sums=('e5dc416766e8bf335eb394ad9748b800' +md5sums=('f7df17cb984385cadd17b276381b9af6' '890de13361afbdf4fed12d6d7eb53e66' '961593658cd596297d03d25eb9c9e98f' '4cb764894abd3914802e90602bf90a0c' diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD index 072f24bed..0c9b81746 100644 --- a/community/goaccess/PKGBUILD +++ b/community/goaccess/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 113241 2014-06-16 12:52:06Z fyan $ +# $Id: PKGBUILD 116476 2014-07-28 10:32:24Z fyan $ # Maintainer: Felix Yan # Contributor: Josh VanderLinden # Contributor: Nicolas Storme pkgname=goaccess -pkgver=0.8.1 +pkgver=0.8.3 pkgrel=1 pkgdesc="An open source real-time web log analyzer and interactive viewer" arch=('i686' 'x86_64') @@ -25,4 +25,4 @@ package() { make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" install } -sha512sums=('91399abc97bd64d0a7174e9ebde54a7b621aca660375d1571354941e5334e7a04cf7acd33d6f8610a4affe20dfc22399e20450813d2aaf33e858e4b64b893f7f') +sha512sums=('ae03a6a5090ffbc9a329365ffb1c706613553af6005288bcbae5c05edd20bc6198234d6a32808367a28c53358244caaec26c38aad52c5c669b9d592e75ba4660') diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD index 1e9525477..fa6cbd3d8 100644 --- a/community/liteide/PKGBUILD +++ b/community/liteide/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 116338 2014-07-25 14:02:29Z arodseth $ +# $Id: PKGBUILD 116480 2014-07-28 13:10:15Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: spambanane # Contributor: Matteo # Contributor: Matthew Zimmerman pkgname=liteide -pkgver=23 +pkgver=23.1 pkgrel=1 pkgdesc='IDE for editing and building projects written in the Go programming language' license=('LGPL') diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index b44207703..00fa82a1a 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112269 2014-05-30 21:46:17Z faidoc $ +# $Id: PKGBUILD 116450 2014-07-27 23:01:38Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=2.2.5 +pkgver=2.2.6 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz") -sha256sums=('f4815df0a2724c94d478cc88770da5cbfc8cd15a540c45235ce12b2d4e5c8e8a') +sha256sums=('5617504f5f8ecaf53268787728e6b7bf5da1514d9bc538dd0c047d467cca9ccf') prepare() { cd ${pkgname}-${pkgver} diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index ddb05ed11..4571d84ae 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 112285 2014-05-30 22:35:48Z faidoc $ +# $Id: PKGBUILD 116458 2014-07-27 23:21:17Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo -pkgver=2.2.2 +pkgver=2.2.3 pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ options=('!emptydirs') install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" "adwaita_style.patch") -sha256sums=('452b3720eceb7ae591ce9e1875cb555f531822d8ba73184ea241561d8ad624b2' +sha256sums=('c326bbae39b0cdf4b646eb557e9d72e8135501226be0399429de62612421ebea' '21555779bc9d2cc87f73042039bcffd43a3d858a7f1f3a93ec27c91cdf69d4ce') prepare() { diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD index fd3c241d2..763d8c476 100644 --- a/community/sqlitebrowser/PKGBUILD +++ b/community/sqlitebrowser/PKGBUILD @@ -1,26 +1,35 @@ -# $Id: PKGBUILD 115282 2014-07-07 17:13:29Z spupykin $ +# $Id: PKGBUILD 116472 2014-07-28 09:51:01Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Douglas Soares de Andrade # Contributor: Michael Fellinger pkgname=sqlitebrowser pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="SQLite Database browser is a light GUI editor for SQLite databases, built on top of Qt" arch=('i686' 'x86_64') url="http://sqlitebrowser.org/" license=('GPL') depends=('qt5-base' 'sqlite' 'libxkbcommon-x11') +makedepends=('cmake') source=(https://github.com/sqlitebrowser/sqlitebrowser/archive/sqlb-$pkgver.tar.gz) md5sums=('8e0edc6b14230e3933aa68a4731d9bd3') +prepare() { + cd $srcdir/$pkgname-sqlb-$pkgver + sed -i 's|Icon=.*|Icon=sqlitebrowser|' distri/sqlitebrowser.desktop +} + build() { cd $srcdir/$pkgname-sqlb-$pkgver - qmake-qt5 QMAKE_INCDIR="/usr/include/qt/QtWidgets /usr/include/qt/QtPrintSupport/" + cmake -DUSE_QT5=TRUE -DCMAKE_INSTALL_PREFIX=/usr . make } package() { cd $srcdir/$pkgname-sqlb-$pkgver - install -Dm0755 src/$pkgname $pkgdir/usr/bin/$pkgname + make install DESTDIR=$pkgdir + install -Dm0644 distri/sqlitebrowser.desktop $pkgdir/usr/share/applications/sqlitebrowser.desktop + install -dm0755 $pkgdir/usr/share/icons/ + install -m0644 images/sqlitebrowser.{png,svg} $pkgdir/usr/share/icons/ } diff --git a/core/cryptsetup/0001-Move-safe-table-params-wipe-into-function-which-allo.patch b/core/cryptsetup/0001-Move-safe-table-params-wipe-into-function-which-allo.patch new file mode 100644 index 000000000..64bfa50ed --- /dev/null +++ b/core/cryptsetup/0001-Move-safe-table-params-wipe-into-function-which-allo.patch @@ -0,0 +1,37 @@ +From 2250d5f71f9dd66112d5c63367169f4e6af8ad70 Mon Sep 17 00:00:00 2001 +From: Milan Broz +Date: Thu, 24 Jul 2014 11:37:24 +0200 +Subject: [PATCH 1/3] Move safe table params wipe into function which allocates + it. +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + lib/libdevmapper.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c +index 3ed87c0..8e5a696 100644 +--- a/lib/libdevmapper.c ++++ b/lib/libdevmapper.c +@@ -642,8 +642,6 @@ out_no_removal: + if (cookie && _dm_use_udev()) + (void)_dm_udev_wait(cookie); + +- if (params) +- crypt_safe_free(params); + if (dmt) + dm_task_destroy(dmt); + +@@ -674,6 +672,8 @@ int dm_create_device(struct crypt_device *cd, const char *name, + r = _dm_create_device(name, type, dmd->data_device, + dmd->flags, dmd->uuid, dmd->size, + table_params, reload); ++ ++ crypt_safe_free(table_params); + dm_exit_context(); + return r; + } +-- +2.0.1 + diff --git a/core/cryptsetup/0002-Re-check-flags-after-DM-device-creations.patch b/core/cryptsetup/0002-Re-check-flags-after-DM-device-creations.patch new file mode 100644 index 000000000..b6c0005e9 --- /dev/null +++ b/core/cryptsetup/0002-Re-check-flags-after-DM-device-creations.patch @@ -0,0 +1,62 @@ +From 3640eaa726b7a9d761f1c67cd8620153d791688e Mon Sep 17 00:00:00 2001 +From: Milan Broz +Date: Thu, 24 Jul 2014 11:52:58 +0200 +Subject: [PATCH 2/3] Re-check flags after DM device creations. +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + lib/libdevmapper.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c +index 8e5a696..6138a6b 100644 +--- a/lib/libdevmapper.c ++++ b/lib/libdevmapper.c +@@ -566,6 +566,9 @@ static int _dm_create_device(const char *name, const char *type, + uint32_t cookie = 0; + uint16_t udev_flags = 0; + ++ if (!params) ++ return -EINVAL; ++ + if (flags & CRYPT_ACTIVATE_PRIVATE) + udev_flags = CRYPT_TEMP_UDEV_FLAGS; + +@@ -646,6 +649,10 @@ out_no_removal: + dm_task_destroy(dmt); + + dm_task_update_nodes(); ++ ++ /* If code just loaded target module, update versions */ ++ _dm_check_versions(); ++ + return r; + } + +@@ -655,7 +662,7 @@ int dm_create_device(struct crypt_device *cd, const char *name, + int reload) + { + char *table_params = NULL; +- int r = -EINVAL; ++ int r; + + if (!type) + return -EINVAL; +@@ -668,10 +675,9 @@ int dm_create_device(struct crypt_device *cd, const char *name, + else if (dmd->target == DM_VERITY) + table_params = get_dm_verity_params(dmd->u.verity.vp, dmd); + +- if (table_params) +- r = _dm_create_device(name, type, dmd->data_device, +- dmd->flags, dmd->uuid, dmd->size, +- table_params, reload); ++ r = _dm_create_device(name, type, dmd->data_device, ++ dmd->flags, dmd->uuid, dmd->size, ++ table_params, reload); + + crypt_safe_free(table_params); + dm_exit_context(); +-- +2.0.1 + diff --git a/core/cryptsetup/0003-Properly-allow-activation-of-discard-even-if-dm_cryp.patch b/core/cryptsetup/0003-Properly-allow-activation-of-discard-even-if-dm_cryp.patch new file mode 100644 index 000000000..8570bbf26 --- /dev/null +++ b/core/cryptsetup/0003-Properly-allow-activation-of-discard-even-if-dm_cryp.patch @@ -0,0 +1,92 @@ +From 59fdf2a6bb461a39e6db6b7d515873419f8a8ada Mon Sep 17 00:00:00 2001 +From: Milan Broz +Date: Thu, 24 Jul 2014 22:11:58 +0200 +Subject: [PATCH 3/3] Properly allow activation of discard even if dm_crypt + module is not yet loaded. +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The dm_flags() call cannot be used if dmcrypt module is not present. + +Better try to activate volume with dicard flags and if it is not possible, +try to activate device without the discard flag. +--- + lib/libdevmapper.c | 37 ++++++++++++++++++++++++------------- + 1 file changed, 24 insertions(+), 13 deletions(-) + +diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c +index 6138a6b..dcc54fd 100644 +--- a/lib/libdevmapper.c ++++ b/lib/libdevmapper.c +@@ -306,22 +306,19 @@ static void hex_key(char *hexkey, size_t key_size, const char *key) + } + + /* http://code.google.com/p/cryptsetup/wiki/DMCrypt */ +-static char *get_dm_crypt_params(struct crypt_dm_active_device *dmd) ++static char *get_dm_crypt_params(struct crypt_dm_active_device *dmd, uint32_t flags) + { + int r, max_size, null_cipher = 0; + char *params, *hexkey; +- const char *features = ""; ++ const char *features; + + if (!dmd) + return NULL; + +- if (dmd->flags & CRYPT_ACTIVATE_ALLOW_DISCARDS) { +- if (dm_flags() & DM_DISCARDS_SUPPORTED) { +- features = " 1 allow_discards"; +- log_dbg("Discard/TRIM is allowed."); +- } else +- log_dbg("Discard/TRIM is not supported by the kernel."); +- } ++ if (flags & CRYPT_ACTIVATE_ALLOW_DISCARDS) ++ features = " 1 allow_discards"; ++ else ++ features = ""; + + if (!strncmp(dmd->u.crypt.cipher, "cipher_null-", 12)) + null_cipher = 1; +@@ -662,6 +659,7 @@ int dm_create_device(struct crypt_device *cd, const char *name, + int reload) + { + char *table_params = NULL; ++ uint32_t dmd_flags; + int r; + + if (!type) +@@ -670,14 +668,27 @@ int dm_create_device(struct crypt_device *cd, const char *name, + if (dm_init_context(cd)) + return -ENOTSUP; + ++ dmd_flags = dmd->flags; ++ + if (dmd->target == DM_CRYPT) +- table_params = get_dm_crypt_params(dmd); ++ table_params = get_dm_crypt_params(dmd, dmd_flags); + else if (dmd->target == DM_VERITY) + table_params = get_dm_verity_params(dmd->u.verity.vp, dmd); + +- r = _dm_create_device(name, type, dmd->data_device, +- dmd->flags, dmd->uuid, dmd->size, +- table_params, reload); ++ r = _dm_create_device(name, type, dmd->data_device, dmd_flags, ++ dmd->uuid, dmd->size, table_params, reload); ++ ++ /* If discard not supported try to load without discard */ ++ if (!reload && r && dmd->target == DM_CRYPT && ++ (dmd->flags & CRYPT_ACTIVATE_ALLOW_DISCARDS) && ++ !(dm_flags() & DM_DISCARDS_SUPPORTED)) { ++ log_dbg("Discard/TRIM is not supported, retrying activation."); ++ dmd_flags = dmd_flags & ~CRYPT_ACTIVATE_ALLOW_DISCARDS; ++ crypt_safe_free(table_params); ++ table_params = get_dm_crypt_params(dmd, dmd_flags); ++ r = _dm_create_device(name, type, dmd->data_device, dmd_flags, ++ dmd->uuid, dmd->size, table_params, reload); ++ } + + crypt_safe_free(table_params); + dm_exit_context(); +-- +2.0.1 + diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 3cb39a35b..99ab1c1ff 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,24 +1,38 @@ -# $Id: PKGBUILD 217526 2014-07-21 10:53:05Z fyan $ +# $Id: PKGBUILD 218262 2014-07-28 21:21:54Z thomas $ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.6.5 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/" groups=('base') -depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux') +depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux') +makedepends=('util-linux') options=('!emptydirs') source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.xz #https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.sign encrypt_hook encrypt_install - sd-encrypt) + sd-encrypt + 0001-Move-safe-table-params-wipe-into-function-which-allo.patch + 0002-Re-check-flags-after-DM-device-creations.patch + 0003-Properly-allow-activation-of-discard-even-if-dm_cryp.patch) sha256sums=('267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a' '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae' - 'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd') + 'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd' + '54895ebba0cf1df27da7a53b6a256b7826f9b2d4cff577f840ab457dc32b5c49' + 'd022e43fa96ee60e295cf6041a8b9e15225eeb03b713f32675061c4063c17ea5' + '16d55306a5dde637db16cb219834095432bc8579528789ee52aa975df12284d4') + +prepare() { + cd "${srcdir}"/$pkgname-${pkgver} + patch -p1 -i "${srcdir}"/0001-Move-safe-table-params-wipe-into-function-which-allo.patch + patch -p1 -i "${srcdir}"/0002-Re-check-flags-after-DM-device-creations.patch + patch -p1 -i "${srcdir}"/0003-Properly-allow-activation-of-discard-even-if-dm_cryp.patch +} build() { cd "${srcdir}"/$pkgname-${pkgver} diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index a1b26856a..0a7fd2dab 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 210619 2014-04-15 20:43:33Z ronald $ +# $Id: PKGBUILD 218251 2014-07-28 16:10:39Z fyan $ # Maintainer: Ronald van Haren # Contributor: Judd Vinet pkgname=iproute2 -pkgver=3.14.0 +pkgver=3.15.0 pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz iproute2-fhs.patch unwanted-link-help.patch) -sha1sums=('0b7d9db9e17da77a5bd8c2c75f6ddd607449ba3e' +sha1sums=('82dce736488dac5af0f4b5659ae905fef87ed308' '35b8cf2dc94b73eccad427235c07596146cd6f6c' '3b1335f4025f657f388fbf4e5a740871e3129c2a') diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 0b0335c4a..c7bd52d01 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 216641 2014-07-08 16:05:07Z eric $ +# $Id: PKGBUILD 218256 2014-07-28 18:13:47Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.9.5 +pkgver=6.8.9.6 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} perlmagick.rpath.patch) -sha1sums=('0808fcc20e92bd3fdfc6af75229d584f67cb723c' +sha1sums=('d2e30cdc0e3becb781ac011f0452171926a72a2a' 'SKIP' 'e143cf9d530fabf3b58023899b5cc544ba93daec') -- cgit v1.2.3