[arch-commits] Commit in efitools/trunk (PKGBUILD)

2020-05-19 Thread Allan McRae via arch-commits 
Date: Tuesday, May 19, 2020 @ 06:10:22
  Author: allan
Revision: 386023

upgpkg: efitools 1.9.2-2: FTBFS fix

Modified:
  efitools/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-19 06:08:39 UTC (rev 386022)
+++ PKGBUILD2020-05-19 06:10:22 UTC (rev 386023)
@@ -4,7 +4,7 @@
 
 pkgname="efitools"
 pkgver=1.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools for manipulating UEFI secure boot platforms"
 url="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
 arch=('x86_64')
@@ -26,6 +26,7 @@
cd "${pkgname}"
git clean -x -d -f
sed -i "s/-O2/${CFLAGS} -Wno-pointer-sign/" Make.rules
+   sed -i "s/EFI_WARN_UNKOWN_GLYPH/EFI_WARN_UNKNOWN_GLYPH/" lib/console.c
 }
 
 build() {

[arch-commits] Commit in efitools/trunk (PKGBUILD)

2019-05-04 Thread Antonio Rojas via arch-commits 
Date: Saturday, May 4, 2019 @ 18:55:32
  Author: arojas
Revision: 352485

https

Modified:
  efitools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-04 18:54:52 UTC (rev 352484)
+++ PKGBUILD2019-05-04 18:55:32 UTC (rev 352485)
@@ -6,7 +6,7 @@
 pkgver=1.9.2
 pkgrel=1
 pkgdesc="Tools for manipulating UEFI secure boot platforms"
-url="http://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
+url="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
 arch=('x86_64')
 replaces=('prebootloader')
 license=('GPL' 'LGPL2.1')

[arch-commits] Commit in efitools/trunk (PKGBUILD)

2019-03-12 Thread Tobias Powalowski via arch-commits 
Date: Tuesday, March 12, 2019 @ 14:03:49
  Author: tpowa
Revision: 347748

upgpkg: efitools 1.9.2-1

bump to latest version

Modified:
  efitools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-12 14:00:04 UTC (rev 347747)
+++ PKGBUILD2019-03-12 14:03:49 UTC (rev 347748)
@@ -3,7 +3,7 @@
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) 
(gemmaeiil) (ddoott) (ccoomm)>
 
 pkgname="efitools"
-pkgver=1.8.1
+pkgver=1.9.2
 pkgrel=1
 pkgdesc="Tools for manipulating UEFI secure boot platforms"
 url="http://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
@@ -13,7 +13,7 @@
 options=('!strip' '!makeflags')
 makedepends=('gnu-efi-libs' 'help2man' 'sbsigntools' 'perl-file-slurp' 'git')
 depends=('openssl')
-_commit=28687de80b18b3b35271de1d70769eac3c0b1ab4 # master
+_commit=392836a46ce3c92b55dc88a1aebbcfdfc5dcddce # master
 
source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=$_commit;)
 md5sums=('SKIP')

[arch-commits] Commit in efitools/trunk (PKGBUILD openssl11.patch)

2018-06-22 Thread Tobias Powalowski via arch-commits 
Date: Friday, June 22, 2018 @ 08:11:53
  Author: tpowa
Revision: 327434

upgpkg: efitools 1.8.1-1

bump to latest version

Modified:
  efitools/trunk/PKGBUILD
Deleted:
  efitools/trunk/openssl11.patch

-+
 PKGBUILD|   11 ---
 openssl11.patch |   13 -
 2 files changed, 4 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-22 08:06:54 UTC (rev 327433)
+++ PKGBUILD2018-06-22 08:11:53 UTC (rev 327434)
@@ -4,7 +4,7 @@
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) 
(gemmaeiil) (ddoott) (ccoomm)>
 
 pkgname="efitools"
-pkgver=1.7.0.5.g0649468
+pkgver=1.8.1
 pkgrel=1
 pkgdesc="Tools for manipulating UEFI secure boot platforms"
 url="http://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
@@ -14,11 +14,9 @@
 options=('!strip' '!makeflags')
 makedepends=('gnu-efi-libs' 'help2man' 'sbsigntools' 'perl-file-slurp' 'git')
 depends=('openssl')
-_commit=0649468475d20d8ca5634433c4912467cef3ce93  # master
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=$_commit;
-openssl11.patch)
-md5sums=('SKIP'
- '08672dd4dc23daf7345a6f2535960fc1')
+_commit=28687de80b18b3b35271de1d70769eac3c0b1ab4 # master
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=$_commit;)
+md5sums=('SKIP')
 
 pkgver() {
cd "${pkgname}"
@@ -28,7 +26,6 @@
 prepare() {
cd "${pkgname}"
git clean -x -d -f
-   patch -Np1 -i ../openssl11.patch
sed -i "s/-O2/${CFLAGS} -Wno-pointer-sign/" Make.rules
 }
 

Deleted: openssl11.patch
===
--- openssl11.patch 2018-06-22 08:06:54 UTC (rev 327433)
+++ openssl11.patch 2018-06-22 08:11:53 UTC (rev 327434)
@@ -1,13 +0,0 @@
-diff --git i/cert-to-efi-hash-list.c w/cert-to-efi-hash-list.c
-index d4484f9b8e6535f3..399ba704eaab238d 100644
 i/cert-to-efi-hash-list.c
-+++ w/cert-to-efi-hash-list.c
-@@ -135,7 +135,7 @@ main(int argc, char *argv[])
- X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
-   unsigned char *cert_buf = NULL;
- 
--  int cert_len = i2d_X509_CINF(cert->cert_info, _buf);
-+  int cert_len = i2d_re_X509_tbs(cert, _buf);
-   ERR_print_errors_fp(stdout);
- 
-   int len, digest_len, time_offset;

[arch-commits] Commit in efitools/trunk (PKGBUILD openssl11.patch)

2017-03-24 Thread Jan Steffens 
Date: Friday, March 24, 2017 @ 18:42:23
  Author: heftig
Revision: 291254

1.7.0.5.g0649468-1: openssl 1.1

Added:
  efitools/trunk/openssl11.patch
Modified:
  efitools/trunk/PKGBUILD

-+
 PKGBUILD|   20 
 openssl11.patch |   13 +
 2 files changed, 25 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-24 17:13:01 UTC (rev 291253)
+++ PKGBUILD2017-03-24 18:42:23 UTC (rev 291254)
@@ -4,7 +4,7 @@
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) 
(gemmaeiil) (ddoott) (ccoomm)>
 
 pkgname="efitools"
-pkgver=1.7.0.3.g791e463
+pkgver=1.7.0.5.g0649468
 pkgrel=1
 pkgdesc="Tools for manipulating UEFI secure boot platforms"
 url="http://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
@@ -14,23 +14,28 @@
 options=('!strip' '!makeflags')
 makedepends=('gnu-efi-libs' 'help2man' 'sbsigntools' 'perl-file-slurp' 'git')
 depends=('openssl')
-#source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#tag=v${pkgver};)
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=791e4639ee837f70c8d5e1190e01dc3441d4a401;)
+_commit=0649468475d20d8ca5634433c4912467cef3ce93  # master
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=$_commit;
+openssl11.patch)
+md5sums=('SKIP'
+ '08672dd4dc23daf7345a6f2535960fc1')
 
 pkgver() {
cd "${pkgname}"
-   echo "$(git describe --tags)" | sed -e 's|-|\.|g' -e 's|^v||g' 
+   echo "$(git describe --tags)" | sed -e 's|-|\.|g' -e 's|^v||g'
 }
 
 prepare() {
-cd "${pkgname}"
+   cd "${pkgname}"
git clean -x -d -f
+   patch -Np1 -i ../openssl11.patch
+   sed -i "s/-O2/${CFLAGS} -Wno-pointer-sign/" Make.rules
 }
 
 build() {
-cd "${pkgname}"
+   cd "${pkgname}"
# fix PreLoader.efi building on x86_64 #49314
-export ARCH="${CARCH}"
+   export ARCH="${CARCH}"
make
 }
 
@@ -41,4 +46,3 @@
cd "${pkgname}"
make DESTDIR="${pkgdir}" install
 }
-md5sums=('SKIP')

Added: openssl11.patch
===
--- openssl11.patch (rev 0)
+++ openssl11.patch 2017-03-24 18:42:23 UTC (rev 291254)
@@ -0,0 +1,13 @@
+diff --git i/cert-to-efi-hash-list.c w/cert-to-efi-hash-list.c
+index d4484f9b8e6535f3..399ba704eaab238d 100644
+--- i/cert-to-efi-hash-list.c
 w/cert-to-efi-hash-list.c
+@@ -135,7 +135,7 @@ main(int argc, char *argv[])
+ X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
+   unsigned char *cert_buf = NULL;
+ 
+-  int cert_len = i2d_X509_CINF(cert->cert_info, _buf);
++  int cert_len = i2d_re_X509_tbs(cert, _buf);
+   ERR_print_errors_fp(stdout);
+ 
+   int len, digest_len, time_offset;

[arch-commits] Commit in efitools/trunk (PKGBUILD)

2016-05-14 Thread Tobias Powalowski 
Date: Saturday, May 14, 2016 @ 17:00:24
  Author: tpowa
Revision: 267983

upgpkg: efitools 1.7.0.3.g791e463-1

fix #49314 Preloader.efi

Modified:
  efitools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-14 14:29:28 UTC (rev 267982)
+++ PKGBUILD2016-05-14 15:00:24 UTC (rev 267983)
@@ -4,7 +4,7 @@
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) 
(gemmaeiil) (ddoott) (ccoomm)>
 
 pkgname="efitools"
-pkgver=1.7.0
+pkgver=1.7.0.3.g791e463
 pkgrel=1
 pkgdesc="Tools for manipulating UEFI secure boot platforms"
 url="http://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;

[arch-commits] Commit in efitools/trunk (PKGBUILD)

2016-05-14 Thread Tobias Powalowski 
Date: Saturday, May 14, 2016 @ 16:29:28
  Author: tpowa
Revision: 267982

upgpkg: efitools 1.7.0-1

fix #49314 Preloader.efi

Modified:
  efitools/trunk/PKGBUILD

--+
 PKGBUILD |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-14 13:42:50 UTC (rev 267981)
+++ PKGBUILD2016-05-14 14:29:28 UTC (rev 267982)
@@ -4,8 +4,8 @@
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) 
(gemmaeiil) (ddoott) (ccoomm)>
 
 pkgname="efitools"
-pkgver="1.7.0"
-pkgrel="2"
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="Tools for manipulating UEFI secure boot platforms"
 url="http://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
 arch=('x86_64' 'i686')
@@ -19,12 +19,17 @@
 
 pkgver() {
cd "${pkgname}"
-   echo "$(git describe --tags)" | sed -e 's|efitools-||g' -e 's|-|\.|g'
+   echo "$(git describe --tags)" | sed -e 's|-|\.|g' -e 's|^v||g' 
 }
 
+prepare() {
+cd "${pkgname}"
+   git clean -x -d -f
+}
+
 build() {
-   cd "${pkgname}"
-# fix PreLoader.efi building on x86_64 #49314
+cd "${pkgname}"
+   # fix PreLoader.efi building on x86_64 #49314
 export ARCH="${CARCH}"
make
 }

[arch-commits] Commit in efitools/trunk (PKGBUILD)

2016-05-14 Thread Tobias Powalowski 
Date: Saturday, May 14, 2016 @ 15:42:42
  Author: tpowa
Revision: 267976

upgpkg: efitools 1.7.0-2

fix #49314 building of Preloader.efi on x86_64

Modified:
  efitools/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-14 13:34:38 UTC (rev 267975)
+++ PKGBUILD2016-05-14 13:42:42 UTC (rev 267976)
@@ -5,7 +5,7 @@
 
 pkgname="efitools"
 pkgver="1.7.0"
-pkgrel="1"
+pkgrel="2"
 pkgdesc="Tools for manipulating UEFI secure boot platforms"
 url="http://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git;
 arch=('x86_64' 'i686')
@@ -14,10 +14,18 @@
 options=('!strip' '!makeflags')
 makedepends=('gnu-efi-libs' 'help2man' 'sbsigntools' 'perl-file-slurp' 'git')
 depends=('openssl')
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#tag=v${pkgver};)
+#source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#tag=v${pkgver};)
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/$pkgname.git#commit=791e4639ee837f70c8d5e1190e01dc3441d4a401;)
 
+pkgver() {
+   cd "${pkgname}"
+   echo "$(git describe --tags)" | sed -e 's|efitools-||g' -e 's|-|\.|g'
+}
+
 build() {
cd "${pkgname}"
+# fix PreLoader.efi building on x86_64 #49314
+export ARCH="${CARCH}"
make
 }