From 19cc907af08bedb5882290cd1eee31c094f4038c Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Mon, 15 Feb 2016 23:29:25 +0200 Subject: Move tails-installer to aur --- .SRCINFO | 27 +++++++++++++++++++++++++++ PKGBUILD | 22 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..ef52115 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,27 @@ +# Generated by mksrcinfo v8 +# Mon Feb 15 21:29:03 UTC 2016 +pkgbase = tails-installer + pkgdesc = Installer for the Tails live operating system + pkgver = 4.4.7 + pkgrel = 1 + url = https://tails.boum.org/ + arch = x86_64 + arch = i686 + license = GPL + makedepends = git + depends = cdrkit + depends = coreutils + depends = dosfstools + depends = e2fsprogs + depends = gptfdisk + depends = gtk3 + depends = p7zip + depends = python2-configobj + depends = syslinux + depends = udisks2 + depends = urlgrabber + source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.7 + sha256sums = SKIP + +pkgname = tails-installer + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..364cf33 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Yuval Adam PGP-Key: 271386AA2EB7672F + +pkgname=tails-installer +pkgver=4.4.7 +pkgrel=1 +pkgdesc="Installer for the Tails live operating system" +arch=('x86_64' 'i686') +url="https://tails.boum.org/" +license=(GPL) +depends=('cdrkit' 'coreutils' 'dosfstools' 'e2fsprogs' 'gptfdisk' 'gtk3' 'p7zip' 'python2-configobj' 'syslinux' 'udisks2' 'urlgrabber') +makedepends=('git') +source=("git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}") +sha256sums=('SKIP') +_pkgname=liveusb-creator + +package() { + cd "${srcdir}/${_pkgname}" + sed -i '1!b;s/python/python2/' tails-installer{,-launcher} + python2 setup.py install --root=${pkgdir} +} + +# vim:set ts=2 sw=2 et: -- cgit v1.3.1 From b7ee561c16d0adde6b33add2da03d318da06b868 Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Tue, 16 Feb 2016 11:29:58 +0200 Subject: Add syslinux path patch to tails-installer --- .SRCINFO | 6 ++++-- 0001-syslinux-path.patch | 34 ++++++++++++++++++++++++++++++++++ PKGBUILD | 17 ++++++++++++++--- 3 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 0001-syslinux-path.patch diff --git a/.SRCINFO b/.SRCINFO index ef52115..8db42f9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Feb 15 21:29:03 UTC 2016 +# Tue Feb 16 09:29:31 UTC 2016 pkgbase = tails-installer pkgdesc = Installer for the Tails live operating system pkgver = 4.4.7 - pkgrel = 1 + pkgrel = 2 url = https://tails.boum.org/ arch = x86_64 arch = i686 @@ -21,7 +21,9 @@ pkgbase = tails-installer depends = udisks2 depends = urlgrabber source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.7 + source = 0001-syslinux-path.patch sha256sums = SKIP + sha256sums = 9f6d72212172e3f4275f953b4d3387b17fe8c4daac83d41a93d659d688f9ea27 pkgname = tails-installer diff --git a/0001-syslinux-path.patch b/0001-syslinux-path.patch new file mode 100644 index 0000000..628c507 --- /dev/null +++ b/0001-syslinux-path.patch @@ -0,0 +1,34 @@ +From 65a2b31fa89ff27251ae30ad3bb3a22d4ef6dff0 Mon Sep 17 00:00:00 2001 +From: Yuval Adam +Date: Mon, 15 Feb 2016 23:08:00 +0200 +Subject: [PATCH] Add additional syslinux paths + +This path exists on Arch Linux systems, and since liveusb-creator is now +packaged for Arch we should probably add it +--- + tails_installer/creator.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tails_installer/creator.py b/tails_installer/creator.py +index 38ec961..4683c3c 100755 +--- a/tails_installer/creator.py ++++ b/tails_installer/creator.py +@@ -997,6 +997,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator): + for com32mod in com32modules: + copied = False + for orig_dir in ('/usr/lib/syslinux/modules/bios', ++ '/usr/lib/syslinux/bios', + '/usr/share/syslinux', + '/usr/lib/syslinux'): + com32path = os.path.join(orig_dir, com32mod) +@@ -1227,6 +1228,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator): + for mbr_bin in ('/usr/lib/syslinux/mbr/gptmbr.bin', + '/usr/lib/SYSLINUX/gptmbr.bin', + '/usr/lib/syslinux/gptmbr.bin', ++ '/usr/lib/syslinux/bios/gptmbr.bin', + '/usr/share/syslinux/gptmbr.bin'): + if os.path.exists(mbr_bin): + return mbr_bin +-- +2.7.1 + diff --git a/PKGBUILD b/PKGBUILD index 364cf33..1356d65 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,17 +2,28 @@ pkgname=tails-installer pkgver=4.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="Installer for the Tails live operating system" arch=('x86_64' 'i686') url="https://tails.boum.org/" license=(GPL) depends=('cdrkit' 'coreutils' 'dosfstools' 'e2fsprogs' 'gptfdisk' 'gtk3' 'p7zip' 'python2-configobj' 'syslinux' 'udisks2' 'urlgrabber') makedepends=('git') -source=("git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}") -sha256sums=('SKIP') +source=( + "git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}" + "0001-syslinux-path.patch" +) +sha256sums=( + 'SKIP' + '9f6d72212172e3f4275f953b4d3387b17fe8c4daac83d41a93d659d688f9ea27' +) _pkgname=liveusb-creator +prepare() { + cd "${srcdir}/${_pkgname}" + patch -p1 -i "${srcdir}/0001-syslinux-path.patch" +} + package() { cd "${srcdir}/${_pkgname}" sed -i '1!b;s/python/python2/' tails-installer{,-launcher} -- cgit v1.3.1 From a934fa46bbf3e98e7ae3ff6b40c3bfee93fa1378 Mon Sep 17 00:00:00 2001 From: Yuval Adam Date: Sun, 13 Mar 2016 13:17:29 +0200 Subject: Bump tails-installer to v4.4.8 Remove syslinux paths patch since it was merged upstream --- .SRCINFO | 14 ++++++++------ 0001-syslinux-path.patch | 34 ---------------------------------- PKGBUILD | 17 +++++------------ 3 files changed, 13 insertions(+), 52 deletions(-) delete mode 100644 0001-syslinux-path.patch diff --git a/.SRCINFO b/.SRCINFO index 8db42f9..e73a761 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Feb 16 09:29:31 UTC 2016 +# Sun Mar 13 11:16:46 UTC 2016 pkgbase = tails-installer pkgdesc = Installer for the Tails live operating system - pkgver = 4.4.7 - pkgrel = 2 + pkgver = 4.4.8 + pkgrel = 1 url = https://tails.boum.org/ arch = x86_64 arch = i686 @@ -15,15 +15,17 @@ pkgbase = tails-installer depends = e2fsprogs depends = gptfdisk depends = gtk3 + depends = mtools depends = p7zip + depends = parted depends = python2-configobj + depends = python2-distutils-extra + depends = python2-gobject depends = syslinux depends = udisks2 depends = urlgrabber - source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.7 - source = 0001-syslinux-path.patch + source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.8 sha256sums = SKIP - sha256sums = 9f6d72212172e3f4275f953b4d3387b17fe8c4daac83d41a93d659d688f9ea27 pkgname = tails-installer diff --git a/0001-syslinux-path.patch b/0001-syslinux-path.patch deleted file mode 100644 index 628c507..0000000 --- a/0001-syslinux-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 65a2b31fa89ff27251ae30ad3bb3a22d4ef6dff0 Mon Sep 17 00:00:00 2001 -From: Yuval Adam -Date: Mon, 15 Feb 2016 23:08:00 +0200 -Subject: [PATCH] Add additional syslinux paths - -This path exists on Arch Linux systems, and since liveusb-creator is now -packaged for Arch we should probably add it ---- - tails_installer/creator.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tails_installer/creator.py b/tails_installer/creator.py -index 38ec961..4683c3c 100755 ---- a/tails_installer/creator.py -+++ b/tails_installer/creator.py -@@ -997,6 +997,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator): - for com32mod in com32modules: - copied = False - for orig_dir in ('/usr/lib/syslinux/modules/bios', -+ '/usr/lib/syslinux/bios', - '/usr/share/syslinux', - '/usr/lib/syslinux'): - com32path = os.path.join(orig_dir, com32mod) -@@ -1227,6 +1228,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator): - for mbr_bin in ('/usr/lib/syslinux/mbr/gptmbr.bin', - '/usr/lib/SYSLINUX/gptmbr.bin', - '/usr/lib/syslinux/gptmbr.bin', -+ '/usr/lib/syslinux/bios/gptmbr.bin', - '/usr/share/syslinux/gptmbr.bin'): - if os.path.exists(mbr_bin): - return mbr_bin --- -2.7.1 - diff --git a/PKGBUILD b/PKGBUILD index 1356d65..973739b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,27 +1,20 @@ # Maintainer: Yuval Adam PGP-Key: 271386AA2EB7672F pkgname=tails-installer -pkgver=4.4.7 -pkgrel=2 +pkgver=4.4.8 +pkgrel=1 pkgdesc="Installer for the Tails live operating system" arch=('x86_64' 'i686') url="https://tails.boum.org/" license=(GPL) -depends=('cdrkit' 'coreutils' 'dosfstools' 'e2fsprogs' 'gptfdisk' 'gtk3' 'p7zip' 'python2-configobj' 'syslinux' 'udisks2' 'urlgrabber') +depends=('cdrkit' 'coreutils' 'dosfstools' 'e2fsprogs' 'gptfdisk' 'gtk3' 'mtools' 'p7zip' 'parted' 'python2-configobj' 'python2-distutils-extra' 'python2-gobject' 'syslinux' 'udisks2' 'urlgrabber') makedepends=('git') -source=( - "git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}" - "0001-syslinux-path.patch" -) -sha256sums=( - 'SKIP' - '9f6d72212172e3f4275f953b4d3387b17fe8c4daac83d41a93d659d688f9ea27' -) +source=("git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}") +sha256sums=('SKIP') _pkgname=liveusb-creator prepare() { cd "${srcdir}/${_pkgname}" - patch -p1 -i "${srcdir}/0001-syslinux-path.patch" } package() { -- cgit v1.3.1 From 392ab33fff9c84d5352b9ad6e23c8af0ab6aa24a Mon Sep 17 00:00:00 2001 From: Yuval Adam <_@yuv.al> Date: Mon, 2 Jan 2017 00:22:15 +0200 Subject: Bump tails-installer to v4.4.11 --- .SRCINFO | 6 +++--- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e73a761..a344419 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Mar 13 11:16:46 UTC 2016 +# Sun Jan 1 22:22:00 UTC 2017 pkgbase = tails-installer pkgdesc = Installer for the Tails live operating system - pkgver = 4.4.8 + pkgver = 4.4.11 pkgrel = 1 url = https://tails.boum.org/ arch = x86_64 @@ -24,7 +24,7 @@ pkgbase = tails-installer depends = syslinux depends = udisks2 depends = urlgrabber - source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.8 + source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.11 sha256sums = SKIP pkgname = tails-installer diff --git a/PKGBUILD b/PKGBUILD index 973739b..06cad8f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Yuval Adam PGP-Key: 271386AA2EB7672F pkgname=tails-installer -pkgver=4.4.8 +pkgver=4.4.11 pkgrel=1 pkgdesc="Installer for the Tails live operating system" arch=('x86_64' 'i686') -- cgit v1.3.1 From c4e6e0a53e415996ee9eb7f60ac9c40eaa4089d5 Mon Sep 17 00:00:00 2001 From: Emiel Wiedijk Date: Sun, 13 May 2018 09:11:44 +0200 Subject: Add .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..268c1b4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +src/ +pkg/ +*.pkg.tar* +liveusb-creator -- cgit v1.3.1 From 6590c1ffeb23808d44de05904869a40cc5da4372 Mon Sep 17 00:00:00 2001 From: Emiel Wiedijk Date: Sun, 13 May 2018 09:11:56 +0200 Subject: tails-installer - update to 5.0.7 - Remove i686 from arch - Remove useless prepare function - Remove python2 patch (upstream uses python2 correctly now) - Use separate build function --- .SRCINFO | 7 ++----- PKGBUILD | 15 ++++++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a344419..fa78ca6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,9 @@ -# Generated by mksrcinfo v8 -# Sun Jan 1 22:22:00 UTC 2017 pkgbase = tails-installer pkgdesc = Installer for the Tails live operating system - pkgver = 4.4.11 + pkgver = 5.0.7 pkgrel = 1 url = https://tails.boum.org/ arch = x86_64 - arch = i686 license = GPL makedepends = git depends = cdrkit @@ -24,7 +21,7 @@ pkgbase = tails-installer depends = syslinux depends = udisks2 depends = urlgrabber - source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.11 + source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_5.0.7 sha256sums = SKIP pkgname = tails-installer diff --git a/PKGBUILD b/PKGBUILD index 06cad8f..6c43bec 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Yuval Adam PGP-Key: 271386AA2EB7672F pkgname=tails-installer -pkgver=4.4.11 +pkgver=5.0.7 pkgrel=1 pkgdesc="Installer for the Tails live operating system" -arch=('x86_64' 'i686') +arch=('x86_64') url="https://tails.boum.org/" license=(GPL) depends=('cdrkit' 'coreutils' 'dosfstools' 'e2fsprogs' 'gptfdisk' 'gtk3' 'mtools' 'p7zip' 'parted' 'python2-configobj' 'python2-distutils-extra' 'python2-gobject' 'syslinux' 'udisks2' 'urlgrabber') @@ -13,14 +13,15 @@ source=("git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}" sha256sums=('SKIP') _pkgname=liveusb-creator -prepare() { - cd "${srcdir}/${_pkgname}" +build() { + cd liveusb-creator + python2 setup.py build } package() { - cd "${srcdir}/${_pkgname}" - sed -i '1!b;s/python/python2/' tails-installer{,-launcher} - python2 setup.py install --root=${pkgdir} + cd liveusb-creator + + python2 setup.py install --root="${pkgdir}" } # vim:set ts=2 sw=2 et: -- cgit v1.3.1 From 76515a4bdacd2a1d3e97b1bfd4d9363fe0533407 Mon Sep 17 00:00:00 2001 From: Emiel Wiedijk Date: Sun, 13 May 2018 09:15:38 +0200 Subject: Add myself as maintainer --- PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 6c43bec..607be84 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Yuval Adam PGP-Key: 271386AA2EB7672F +# Maintainer: aimileus +# Contributor: Yuval Adam PGP-Key: 271386AA2EB7672F pkgname=tails-installer pkgver=5.0.7 -- cgit v1.3.1 From 1a8fa496f0fa70b0454208c2208b232015f1c9b3 Mon Sep 17 00:00:00 2001 From: Emiel Wiedijk Date: Sun, 13 May 2018 09:21:30 +0200 Subject: Set arch to any This package only provides python scripts and some architecture- independent resources. The package can be installed on every architecture. Therefore, arch should be set to 'any'. --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fa78ca6..98d9e6b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ pkgbase = tails-installer pkgdesc = Installer for the Tails live operating system pkgver = 5.0.7 - pkgrel = 1 + pkgrel = 2 url = https://tails.boum.org/ - arch = x86_64 + arch = any license = GPL makedepends = git depends = cdrkit diff --git a/PKGBUILD b/PKGBUILD index 607be84..a115dd0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,9 +3,9 @@ pkgname=tails-installer pkgver=5.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Installer for the Tails live operating system" -arch=('x86_64') +arch=('any') url="https://tails.boum.org/" license=(GPL) depends=('cdrkit' 'coreutils' 'dosfstools' 'e2fsprogs' 'gptfdisk' 'gtk3' 'mtools' 'p7zip' 'parted' 'python2-configobj' 'python2-distutils-extra' 'python2-gobject' 'syslinux' 'udisks2' 'urlgrabber') -- cgit v1.3.1 From acb8d1b8e4911a135fbc2bf284fbc25cc30c83d1 Mon Sep 17 00:00:00 2001 From: Emiel Wiedijk Date: Wed, 25 Jul 2018 22:46:24 +0200 Subject: tails-installer 5.0.8-1 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 98d9e6b..fe83127 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = tails-installer pkgdesc = Installer for the Tails live operating system - pkgver = 5.0.7 - pkgrel = 2 + pkgver = 5.0.8 + pkgrel = 1 url = https://tails.boum.org/ arch = any license = GPL @@ -21,7 +21,7 @@ pkgbase = tails-installer depends = syslinux depends = udisks2 depends = urlgrabber - source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_5.0.7 + source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_5.0.8 sha256sums = SKIP pkgname = tails-installer diff --git a/PKGBUILD b/PKGBUILD index a115dd0..dfa779f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Yuval Adam PGP-Key: 271386AA2EB7672F pkgname=tails-installer -pkgver=5.0.7 -pkgrel=2 +pkgver=5.0.8 +pkgrel=1 pkgdesc="Installer for the Tails live operating system" arch=('any') url="https://tails.boum.org/" -- cgit v1.3.1