summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--community/cgit/PKGBUILD6
-rw-r--r--community/radvd/PKGBUILD6
-rw-r--r--community/wt/PKGBUILD17
-rwxr-xr-xcommunity/xnoise/PKGBUILD18
-rw-r--r--core/cryptsetup/PKGBUILD25
-rw-r--r--core/lvm2/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch199
-rw-r--r--core/lvm2/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch74
-rw-r--r--core/lvm2/PKGBUILD21
-rw-r--r--core/lvm2/sd-lvm22
-rw-r--r--extra/live-media/PKGBUILD6
-rw-r--r--libre/calibre-libre/PKGBUILD8
-rw-r--r--libre/calibre-libre/desktop_integration.patch47
-rw-r--r--pcr/httrack/PKGBUILD35
-rw-r--r--pcr/httrack/httrack.install12
14 files changed, 388 insertions, 88 deletions
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD
index f7912b40d..9f0b824bf 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104414 2014-01-20 11:04:47Z spupykin $
+# $Id: PKGBUILD 106333 2014-02-28 07:30:32Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Patrick Palka <patrick@parcs.ath.cx>
@@ -6,7 +6,7 @@
# Contributor: Andreas Baumann <abaumann at yahoo dot com>
pkgname=cgit
-pkgver=0.10
+pkgver=0.10.1
pkgrel=1
pkgdesc="A web interface for git written in plain C"
arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ makedepends=('zlib' 'curl' 'asciidoc')
install=cgit.install
source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz"
"apache.example.conf")
-md5sums=('19944c17ecea1b1d1944718ce8ce6b61'
+md5sums=('060ef0aa95ebda6ea7daf823214bc4d0'
'bd5696bea0654bfcf98f249b1a36737d')
prepare() {
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index 408f7dae9..ec5ac658b 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103783 2014-01-11 19:10:38Z seblu $
+# $Id: PKGBUILD 106348 2014-02-28 21:36:16Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
pkgname=radvd
-pkgver=1.9.8
+pkgver=1.9.9
pkgrel=1
pkgdesc='IPv6 Router Advertisement Daemon'
url='http://www.litech.org/radvd/'
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64')
backup=('etc/radvd.conf')
source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.xz"{,.asc}
"$pkgname.service")
-sha1sums=('69db8ee2e74e2312db482882bb68726f7bbd3477'
+sha1sums=('373f7b1b6b2c6efbf8dc253f90b466703526d9b4'
'SKIP'
'2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc')
build() {
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 5a13a578f..9cbe6ed83 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,30 +1,27 @@
-# $Id: PKGBUILD 102285 2013-12-07 10:37:21Z bpiotrowski $
+# $Id: PKGBUILD 106346 2014-02-28 12:48:49Z svenstaro $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Denis Martinez <deuns.martinez@gmail.com>
pkgname=wt
-pkgver=3.3.1
-_pkgver=3.3.1
-pkgrel=2
+pkgver=3.3.2rc2
+_pkgver=3.3.2-rc2
+pkgrel=1
pkgdesc="a C++ library and application server for developing and deploying web applications"
arch=('i686' 'x86_64')
url="http://www.webtoolkit.eu/"
license=('GPL')
-depends=('boost-libs' 'libharu')
-makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt4')
+depends=('boost-libs' 'libharu' 'graphicsmagick' 'pango' 'zlib')
+makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'fcgi' 'sqlite' 'mysql++' 'qt4')
optdepends=('openssl: for SSL support in built-in webserver'
- 'zlib: for compression in HTTP protocol'
'fcgi: for FastCGI support'
'postgresql-libs: for PostgreSQL Dbo support'
'sqlite: for Sqlite Dbo support'
- 'graphicsmagick: for raster image support (WRasterImage)'
- 'pango: for advanced font rendering (WRasterImage)'
'mysql++: for the hangman example'
'qt4: for the Wt/Qt interopability example (wtwithqt)')
backup=('etc/wt/wt_config.xml')
source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz)
-md5sums=('3e93152c0ba3feb4ee687e7370b27552')
+md5sums=('70d0326f90e4c34b3c48580dc791931e')
build() {
cd ${srcdir}/${pkgname}-${_pkgver}
diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD
index 729ad49e5..2e7eef423 100755
--- a/community/xnoise/PKGBUILD
+++ b/community/xnoise/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102565 2013-12-15 04:07:27Z fyan $
+# $Id: PKGBUILD 106330 2014-02-28 07:09:33Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: archtux <antonio dot arias99999 at gmail dot com>
pkgname=xnoise
-pkgver=0.2.20
+pkgver=0.2.21
pkgrel=1
pkgdesc="Media player with a slick GUI, great speed and lots of features."
arch=('i686' 'x86_64')
@@ -15,23 +15,23 @@ optdepends=('gst-plugins-base: Basic media codecs'
'gst-plugins-ugly: Extra media codecs'
'gst-libav: Extra media codecs'
'gvfs: Needed for fetching album art')
-makedepends=('vala' 'intltool')
+makedepends=('vala' 'intltool' 'git' 'gnome-common')
install=$pkgname.install
-source=("https://bitbucket.org/shuerhaaken/xnoise/downloads/$pkgname-$pkgver.tar.gz")
+source=("git+https://bitbucket.org/shuerhaaken/xnoise.git#tag=$pkgver")
build() {
- cd $pkgname-$pkgver
-
- ./configure --prefix=/usr
+ cd $pkgname
+
+ ./autogen.sh --prefix=/usr
make
}
package() {
- cd $pkgname-$pkgver
+ cd $pkgname
make DESTDIR="$pkgdir" install
# Remove obsolete files
rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala"
}
-sha512sums=('d2bcf7c8fa542ef9703a831583ab90e1a03f00a0740b068966cb8bf5c76475832cf04eb55b9f14ac1c5aa50536d8e3965ac3e0d22503af44e1af8e7f908d2390')
+sha512sums=('SKIP')
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 279a4ee3a..77f38c0a2 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 203562 2014-01-13 17:11:38Z andyrtr $
+# $Id: PKGBUILD 206502 2014-02-28 22:40:16Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=cryptsetup
-pkgver=1.6.3
-pkgrel=2
+pkgver=1.6.4
+pkgrel=1
pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
arch=(i686 x86_64)
license=('GPL')
@@ -10,20 +10,19 @@ url="http://code.google.com/p/cryptsetup/"
groups=('base')
depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
options=('!emptydirs')
-source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
- http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
+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)
-md5sums=('a7aeb549a543eeac433eadfb6bc67837'
- 'SKIP'
- 'c279d86d6dc18322c054d2272ebb9e90'
- '21c45f9cab3e0b5165f68358884fbd0f'
- '6cf7e170ecd13e42fe829209628fdb4d')
+sha256sums=('70b8e86eef94bbb4441ad38460d87138130d7aaaafe5d01131c3ba50b9f0dca0'
+ '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff'
+ 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
+ 'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
build() {
cd "${srcdir}"/$pkgname-${pkgver}
- ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt
+ ./configure --prefix=/usr --sbindir=/usr/bin --disable-static --enable-cryptsetup-reencrypt
make
}
@@ -34,8 +33,4 @@ package() {
install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
install -D -m644 "${srcdir}"/sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
-
- # usrmove
- cd "$pkgdir"/usr
- mv sbin bin
}
diff --git a/core/lvm2/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch b/core/lvm2/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch
new file mode 100644
index 000000000..3e9154bf9
--- /dev/null
+++ b/core/lvm2/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch
@@ -0,0 +1,199 @@
+From a29d36c9ac41aa3aa4818c277c9c0e20cbd6175b Mon Sep 17 00:00:00 2001
+From: Peter Rajnoha <prajnoha@redhat.com>
+Date: Mon, 10 Feb 2014 13:28:13 +0100
+Subject: [PATCH 1/2] wiping: wipe DM_snapshot_cow signature without prompt in
+ newly created LVs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The libblkid can detect DM_snapshot_cow signature and when creating
+new LVs with blkid wiping used (allocation/use_blkid_wiping=1 lvm.conf
+setting and --wipe y used at the same time - which it is by default).
+
+Do not issue any prompts about this signature when new LV is created
+and just wipe it right away without asking questions. Still keep the
+log in verbose mode though.
+
+Conflicts:
+ WHATS_NEW
+ lib/device/dev-type.c
+
+[backported to 2.02.105 by Thomas Bächler, thomas@archlinux.org]
+---
+ WHATS_NEW | 2 ++
+ lib/device/dev-type.c | 47 ++++++++++++++++++++++++++++++++---------------
+ lib/device/dev-type.h | 6 +++++-
+ lib/metadata/lv_manip.c | 4 +++-
+ lib/metadata/metadata.c | 4 +++-
+ 5 files changed, 45 insertions(+), 18 deletions(-)
+
+diff --git a/WHATS_NEW b/WHATS_NEW
+index 26b63ae..d2a3482 100644
+--- a/WHATS_NEW
++++ b/WHATS_NEW
+@@ -1,3 +1,5 @@
++ Wipe DM_snapshot_cow signature without prompt in new LVs with blkid wiping.
++
+ Version 2.02.105 - 20th January 2014
+ ====================================
+ Fix thin LV flagging for udev to skip scanning only if the LV is wiped.
+diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
+index 78b093c..d2ff71e 100644
+--- a/lib/device/dev-type.c
++++ b/lib/device/dev-type.c
+@@ -449,17 +449,25 @@ out:
+
+ #ifdef BLKID_WIPING_SUPPORT
+
++static inline int _type_in_flag_list(const char *type, uint32_t flag_list)
++{
++ return (((flag_list & TYPE_LVM2_MEMBER) && !strcmp(type, "LVM2_member")) ||
++ ((flag_list & TYPE_LVM1_MEMBER) && !strcmp(type, "LVM1_member")) ||
++ ((flag_list & TYPE_DM_SNAPSHOT_COW) && !strcmp(type, "DM_snapshot_cow")));
++}
++
+ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
+- int exclude_lvm_member, int yes, force_t force)
++ uint32_t types_to_exclude, uint32_t types_no_prompt,
++ int yes, force_t force)
+ {
++ static const char* msg_wiping = "Wiping %s signature on %s.";
+ const char *offset = NULL, *type = NULL, *magic = NULL,
+ *usage = NULL, *label = NULL, *uuid = NULL;
+ loff_t offset_value;
+ size_t len;
+
+ if (!blkid_probe_lookup_value(probe, "TYPE", &type, NULL)) {
+- if (exclude_lvm_member &&
+- (!strcmp(type, "LVM1_member") || !strcmp(type, "LVM2_member")))
++ if (_type_in_flag_list(type, types_to_exclude))
+ return 1;
+ if (!blkid_probe_lookup_value(probe, "SBMAGIC_OFFSET", &offset, NULL) &&
+ blkid_probe_lookup_value(probe, "SBMAGIC", &magic, &len))
+@@ -483,12 +491,15 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
+ "UUID=\"%s\" TYPE=\"%s\" USAGE=\"%s\"",
+ name, offset, label, uuid, type, usage);
+
+- if (!yes && (force == PROMPT) &&
+- yes_no_prompt("WARNING: %s signature detected on %s at offset %s. "
+- "Wipe it? [y/n] ", type, name, offset) != 'y')
+- return_0;
++ if (!_type_in_flag_list(type, types_no_prompt)) {
++ if (!yes && (force == PROMPT) &&
++ yes_no_prompt("WARNING: %s signature detected on %s at offset %s. "
++ "Wipe it? [y/n] ", type, name, offset) != 'y')
++ return_0;
++ log_print_unless_silent(msg_wiping, type, name);
++ } else
++ log_verbose(msg_wiping, type, name);
+
+- log_print_unless_silent("Wiping %s signature on %s.", type, name);
+ if (!dev_set(dev, offset_value, len, 0)) {
+ log_error("Failed to wipe %s signature on %s.", type, name);
+ return 0;
+@@ -498,7 +509,8 @@ static int _blkid_wipe(blkid_probe probe, struct device *dev, const char *name,
+ }
+
+ static int _wipe_known_signatures_with_blkid(struct device *dev, const char *name,
+- int exclude_lvm_member,
++ uint32_t types_to_exclude,
++ uint32_t types_no_prompt,
+ int yes, force_t force)
+ {
+ blkid_probe probe = NULL;
+@@ -526,7 +538,7 @@ static int _wipe_known_signatures_with_blkid(struct device *dev, const char *nam
+
+ while (!blkid_do_probe(probe)) {
+ found++;
+- if (_blkid_wipe(probe, dev, name, exclude_lvm_member, yes, force))
++ if (_blkid_wipe(probe, dev, name, types_to_exclude, types_no_prompt, yes, force))
+ wiped++;
+ }
+
+@@ -580,7 +592,8 @@ static int _wipe_signature(struct device *dev, const char *type, const char *nam
+ }
+
+ static int _wipe_known_signatures_with_lvm(struct device *dev, const char *name,
+- int exclude_lvm_member,
++ uint32_t types_to_exclude __attribute__((unused)),
++ uint32_t types_no_prompt __attribute__((unused)),
+ int yes, force_t force)
+ {
+ if (!_wipe_signature(dev, "software RAID md superblock", name, 4, yes, force, dev_is_md) ||
+@@ -592,16 +605,20 @@ static int _wipe_known_signatures_with_lvm(struct device *dev, const char *name,
+ }
+
+ int wipe_known_signatures(struct cmd_context *cmd, struct device *dev,
+- const char *name, int exclude_lvm_member,
+- int yes, force_t force)
++ const char *name, uint32_t types_to_exclude,
++ uint32_t types_no_prompt, int yes, force_t force)
+ {
+ #ifdef BLKID_WIPING_SUPPORT
+ if (find_config_tree_bool(cmd, allocation_use_blkid_wiping_CFG, NULL))
+ return _wipe_known_signatures_with_blkid(dev, name,
+- exclude_lvm_member, yes, force);
++ types_to_exclude,
++ types_no_prompt,
++ yes, force);
+ #endif
+ return _wipe_known_signatures_with_lvm(dev, name,
+- exclude_lvm_member, yes, force);
++ types_to_exclude,
++ types_no_prompt,
++ yes, force);
+ }
+
+ #ifdef __linux__
+diff --git a/lib/device/dev-type.h b/lib/device/dev-type.h
+index 284280e..b1520ee 100644
+--- a/lib/device/dev-type.h
++++ b/lib/device/dev-type.h
+@@ -60,8 +60,12 @@ int dev_is_swap(struct device *dev, uint64_t *signature);
+ int dev_is_luks(struct device *dev, uint64_t *signature);
+
+ /* Signature wiping. */
++#define TYPE_LVM1_MEMBER 0x001
++#define TYPE_LVM2_MEMBER 0x002
++#define TYPE_DM_SNAPSHOT_COW 0x004
+ int wipe_known_signatures(struct cmd_context *cmd, struct device *dev, const char *name,
+- int exclude_lvm_member, int yes, force_t force);
++ uint32_t types_to_exclude, uint32_t types_no_prompt,
++ int yes, force_t force);
+
+ /* Type-specific device properties */
+ unsigned long dev_md_stripe_width(struct dev_types *dt, struct device *dev);
+diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
+index f45c89f..66f3bd7 100644
+--- a/lib/metadata/lv_manip.c
++++ b/lib/metadata/lv_manip.c
+@@ -5448,7 +5448,9 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp)
+ if (wp.do_wipe_signatures) {
+ log_verbose("Wiping known signatures on logical volume \"%s/%s\"",
+ lv->vg->name, lv->name);
+- if (!wipe_known_signatures(lv->vg->cmd, dev, name, 0, wp.yes, wp.force))
++ if (!wipe_known_signatures(lv->vg->cmd, dev, name, 0,
++ TYPE_DM_SNAPSHOT_COW,
++ wp.yes, wp.force))
+ stack;
+ }
+
+diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
+index 4d4778b..e4e1771 100644
+--- a/lib/metadata/metadata.c
++++ b/lib/metadata/metadata.c
+@@ -1372,7 +1372,9 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name,
+ goto bad;
+ }
+
+- if (!wipe_known_signatures(cmd, dev, name, 1, pp->yes, pp->force)) {
++ if (!wipe_known_signatures(cmd, dev, name,
++ TYPE_LVM1_MEMBER | TYPE_LVM2_MEMBER,
++ 0, pp->yes, pp->force)) {
+ log_error("Aborting pvcreate on %s.", name);
+ goto bad;
+ }
+--
+1.9.0
+
diff --git a/core/lvm2/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch b/core/lvm2/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch
new file mode 100644
index 000000000..b1f9775bb
--- /dev/null
+++ b/core/lvm2/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch
@@ -0,0 +1,74 @@
+From d5c2c146ee050905a175b73dd3d0155f46d5cf81 Mon Sep 17 00:00:00 2001
+From: Zdenek Kabelac <zkabelac@redhat.com>
+Date: Wed, 26 Feb 2014 00:17:11 +0100
+Subject: [PATCH 2/2] snapshot: zero cow header for read-only snapshot
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When read-only snapshot was created, tool was skipping header
+initialization of cow device. If it happened device has been
+already containing header from some previous snapshot, it's
+been 'reused' for a newly created snapshot instead of being cleared.
+
+Conflicts:
+ WHATS_NEW
+
+[Backported to 2.02.105 by Thomas Bächler (thomas@archlinux.org)]
+---
+ WHATS_NEW | 1 +
+ test/shell/snapshot-usage.sh | 11 +++++++++++
+ tools/lvcreate.c | 8 ++++++--
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/WHATS_NEW b/WHATS_NEW
+index d2a3482..eeb3517 100644
+--- a/WHATS_NEW
++++ b/WHATS_NEW
+@@ -1,3 +1,4 @@
++ Zero snapshot COW header when creating read-only snapshot.
+ Wipe DM_snapshot_cow signature without prompt in new LVs with blkid wiping.
+
+ Version 2.02.105 - 20th January 2014
+diff --git a/test/shell/snapshot-usage.sh b/test/shell/snapshot-usage.sh
+index 9e6a14f..17abe9b 100644
+--- a/test/shell/snapshot-usage.sh
++++ b/test/shell/snapshot-usage.sh
+@@ -128,4 +128,15 @@ vgremove -ff $vg1
+
+ fi
+
++lvremove -f $vg
++
++# Check snapshot really deletes COW header for read-only snapshot
++aux lvmconf "allocation/wipe_signatures_when_zeroing_new_lvs = 1"
++lvcreate -L10 -n $lv1 $vg
++lvcreate -s -L10 -n snap $vg/$lv1
++# Populate snapshot with some filesystem signatures
++mkfs.ext4 "$DM_DEV_DIR/$vg/snap"
++lvremove -f $vg/snap
++lvcreate -s -pr -l12 -n snap $vg/$lv1
++
+ vgremove -ff $vg
+diff --git a/tools/lvcreate.c b/tools/lvcreate.c
+index d0ca7bc..e8270c4 100644
+--- a/tools/lvcreate.c
++++ b/tools/lvcreate.c
+@@ -644,8 +644,12 @@ static int _read_activation_params(struct lvcreate_params *lp, struct cmd_contex
+ lp->permission = arg_uint_value(cmd, permission_ARG,
+ LVM_READ | LVM_WRITE);
+
+- /* Must not zero/wipe read only volume */
+- if (!(lp->permission & LVM_WRITE)) {
++ if (lp->snapshot) {
++ /* Snapshot has to zero COW header */
++ lp->zero = 1;
++ lp->wipe_signatures = 0;
++ } else if (!(lp->permission & LVM_WRITE)) {
++ /* Must not zero/wipe read only volume */
+ lp->zero = 0;
+ lp->wipe_signatures = 0;
+ }
+--
+1.9.0
+
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 6aba96ed0..566e06924 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 204497 2014-01-21 09:38:00Z thomas $
+# $Id: PKGBUILD 206501 2014-02-28 22:40:15Z thomas $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
pkgver=2.02.105
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://sourceware.org/lvm2/"
license=('GPL2' 'LGPL2.1')
@@ -21,24 +21,31 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
dmeventd.socket
lvm-monitoring.service
lvmetad.service
- lvmetad.socket)
+ lvmetad.socket
+ 0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch
+ 0002-snapshot-zero-cow-header-for-read-only-snapshot.patch)
sha1sums=('796163e766480cdc427cd443dc1336ae8e8e3bd7'
'SKIP'
'76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
'ff0fdf0a3005a41acd4b36865056109effc3474b'
- '30777d42e31cb7fe1f4fadc1e8f4c4d4cdd8ffed'
+ 'ab1719813fd7e5f5b525b7f38e969d1f855d6083'
'f6a554eea9557c3c236df2943bb6e7e723945c41'
'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
'01782ce8e10718c1513e3906b126f30f682f5cab'
'1d56f47a81350ae37ffbf61ee036fe31f4c5d504'
'aad90fce0e12eda41d38571d8eb27c5d5a8c59ec'
'f857a4a63fcc604a981e56875edda91767d4f1bf'
- 'fcfc265e3b10294cc4b10949a342e9db4310b186')
+ 'fcfc265e3b10294cc4b10949a342e9db4310b186'
+ '044d426c49919b5a86fd84228d1c7e1f3a86c59a'
+ '4f83555347e7c3596c53d9009f260c1d65639e6d')
prepare() {
cd LVM2.${pkgver}
# enable lvmetad
sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in
+
+ patch -p1 -i "${srcdir}"/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch
+ patch -p1 -i "${srcdir}"/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch
}
build() {
@@ -94,6 +101,6 @@ package_lvm2() {
install -D -m644 "${srcdir}/lvm-monitoring.service" "${pkgdir}/usr/lib/systemd/system/lvm-monitoring.service"
install -D -m644 "${srcdir}/lvmetad.service" "${pkgdir}/usr/lib/systemd/system/lvmetad.service"
install -D -m644 "${srcdir}/lvmetad.socket" "${pkgdir}/usr/lib/systemd/system/lvmetad.socket"
- install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
- ln -sf /usr/lib/systemd/system/lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/lvmetad.socket"
+ install -d -m755 "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants"
+ ln -sf /usr/lib/systemd/system/lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvmetad.socket"
}
diff --git a/core/lvm2/sd-lvm2 b/core/lvm2/sd-lvm2
index 07cb19a09..214b38c8e 100644
--- a/core/lvm2/sd-lvm2
+++ b/core/lvm2/sd-lvm2
@@ -19,7 +19,7 @@ build() {
add_file "/usr/lib/systemd/system/lvmetad.service"
add_file "/usr/lib/systemd/system/lvmetad.socket"
- add_symlink "/usr/lib/systemd/system/sockets.target.wants/lvmetad.socket"
+ add_symlink "/usr/lib/systemd/system/sysinit.target.wants/lvmetad.socket"
}
help() {
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index e6512b559..e7b268a4e 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 206260 2014-02-23 09:59:15Z giovanni $
+# $Id: PKGBUILD 206500 2014-02-28 17:30:37Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=live-media
-pkgver=2014.02.19
+pkgver=2014.02.26
pkgrel=1
pkgdesc="A set of C++ libraries for multimedia streaming"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://live555.com/liveMedia"
depends=('gcc-libs')
options=('staticlibs')
source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('95ed125b9ce848276bd1a7d443a2ddb1')
+md5sums=('db00af2b661795b3d31094951975b4ea')
build() {
cd ${srcdir}/live
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index cb6ac5238..0a1502d15 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106016 2014-02-21 08:27:06Z jelle $
+# $Id: PKGBUILD 106341 2014-02-28 10:31:18Z jelle $
# Maintainer: jelle van der Waa <jelle@vdwaa.nl>
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
_pkgname=calibre
pkgname=calibre-libre
-pkgver=1.25.0
+pkgver=1.26.0
pkgrel=1
pkgdesc="Ebook management application, with unar support"
arch=('i686' 'x86_64' 'mips64el')
@@ -30,8 +30,8 @@ install=calibre.install
source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
'desktop_integration.patch'
'calibre-mount-helper')
-md5sums=('66151757e67a9d0abdb0fd3b7e91614e'
- '8e1855ce1ae254c34d12ddbc358b7a36'
+md5sums=('530485d30087c569c604df1c7e2b3d3a'
+ 'ece36dfd737fa4a346f0a0e59395e949'
'675cd87d41342119827ef706055491e7')
prepare(){
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch
index da3c7a52e..f1a66c020 100644
--- a/libre/calibre-libre/desktop_integration.patch
+++ b/libre/calibre-libre/desktop_integration.patch
@@ -1,7 +1,7 @@
diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
---- calibre/src/calibre/linux.py 2014-02-07 04:19:59.000000000 +0100
-+++ calibre.new/src/calibre/linux.py 2014-02-08 13:07:09.925693077 +0100
-@@ -451,18 +451,6 @@
+--- calibre/src/calibre/linux.py 2014-02-28 04:06:35.000000000 +0100
++++ calibre.new/src/calibre/linux.py 2014-02-28 11:18:00.518362669 +0100
+@@ -495,18 +495,6 @@
self.setup_completion()
if islinux or isbsd:
self.setup_desktop_integration()
@@ -19,8 +19,8 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
- os.rmdir(config_dir)
if warn is None and self.warnings:
- self.info('There were %d warnings'%len(self.warnings))
-@@ -513,7 +501,7 @@
+ self.info('\n\nThere were %d warnings\n'%len(self.warnings))
+@@ -564,7 +552,7 @@
if isnetbsd:
f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
else:
@@ -28,8 +28,8 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
+ f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
if not os.path.exists(os.path.dirname(f)):
os.makedirs(os.path.dirname(f))
- if zsh.dest:
-@@ -657,56 +645,37 @@
+ bash_comp_dest, zsh_comp_dest = f, None
+@@ -713,56 +701,37 @@
with TemporaryDirectory() as tdir, CurrentDir(tdir), \
PreserveMIMEDefaults():
@@ -53,13 +53,13 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
- self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
- render_img('lt.png', 'calibre-gui.png', width=256, height=256)
- cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
-- self.icon_resources.append(('apps', 'calibre-gui', '128'))
-- render_img('viewer.png', 'calibre-viewer.png')
-- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
-- self.icon_resources.append(('apps', 'calibre-viewer', '128'))
-- render_img('tweak.png', 'calibre-ebook-edit.png')
-- cc('xdg-icon-resource install --size 128 calibre-ebook-edit.png calibre-ebook-edit', shell=True)
-- self.icon_resources.append(('apps', 'calibre-ebook-edit', '128'))
+- self.icon_resources.append(('apps', 'calibre-gui', '256'))
+- render_img('viewer.png', 'calibre-viewer.png', width=256, height=256)
+- cc('xdg-icon-resource install --size 256 calibre-viewer.png calibre-viewer', shell=True)
+- self.icon_resources.append(('apps', 'calibre-viewer', '256'))
+- render_img('tweak.png', 'calibre-ebook-edit.png', width=256, height=256)
+- cc('xdg-icon-resource install --size 256 calibre-ebook-edit.png calibre-ebook-edit', shell=True)
+- self.icon_resources.append(('apps', 'calibre-ebook-edit', '256'))
+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
+ os.mkdir(dir)
+ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
@@ -99,22 +99,3 @@ diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
f.write(GUI)
write_mimetypes(f)
f.close()
-@@ -725,15 +694,9 @@
- translators = dict(get_all_translators())
-
- APPDATA = get_appdata()
-- for x in des:
-- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
-- cc(' '.join(cmd), shell=True)
-- self.menu_resources.append(x)
-- ak = x.partition('.')[0]
-- if ak in APPDATA and os.access(appdata, os.W_OK):
-- write_appdata(ak, APPDATA[ak], appdata, translators)
-- cc(['xdg-desktop-menu', 'forceupdate'])
-- f = open('calibre-mimetypes.xml', 'wb')
-+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+ os.makedirs(dir)
-+ f = open(os.path.join(dir, 'calibre.xml'), 'wb')
- f.write(MIME)
- f.close()
- self.mime_resources.append('calibre-mimetypes.xml')
diff --git a/pcr/httrack/PKGBUILD b/pcr/httrack/PKGBUILD
new file mode 100644
index 000000000..4d40153ef
--- /dev/null
+++ b/pcr/httrack/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer : Marcos Heredia <chelqo@gmail.com>
+# Contributor: Joris Steyn <jorissteyn@gmail.com>
+# Contributor: speps <speps at aur dot archlinux dot org>
+# Contributor: Roman Kyrylych <roman@archlinux.org>
+# Contributor: orelien <aurelien.foret@wanadoo.fr>
+
+pkgname=httrack
+pkgver=3.47.27
+pkgrel=1
+pkgdesc="An easy-to-use offline browser utility."
+arch=('i686' 'x86_64')
+url="http://www.httrack.com/"
+license=('GPL3')
+depends=('bash' 'xdg-utils' 'hicolor-icon-theme' 'openssl')
+options=('!libtool')
+install="$pkgname.install"
+source=("http://download.httrack.com/$pkgname-$pkgver.tar.gz")
+md5sums=('60a47cbda7775fdbe21802061a9ed47a')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --enable-static=no
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+ _docdir=${pkgdir}/usr/share/doc/${pkgname}
+ _licdir=${pkgdir}/usr/share/licenses/${pkgname}
+ install -dpm755 ${_docdir} ${_licdir}
+ install -Dpm644 AUTHORS INSTALL* README ${_docdir}/
+ install -Dpm644 COPYING license.txt ${_licdir}/
+}
+
diff --git a/pcr/httrack/httrack.install b/pcr/httrack/httrack.install
new file mode 100644
index 000000000..029294d67
--- /dev/null
+++ b/pcr/httrack/httrack.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-21 22:21:41 +0000