FreeBSD Bugzilla – Attachment 196712 Details for
Bug 231029
[PATCH] sysutils/shim: update to 0.9
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
[PATCH] sysutils/shim: update to 0.9
sysutils_shim.diff (text/plain), 5.07 KB, created by
VinÃcius Zavam
on 2018-08-30 16:46:10 UTC
(
hide
)
Description:
[PATCH] sysutils/shim: update to 0.9
Filename:
MIME Type:
Creator:
VinÃcius Zavam
Created:
2018-08-30 16:46:10 UTC
Size:
5.07 KB
patch
obsolete
>Index: sysutils/shim/Makefile >=================================================================== >--- sysutils/shim/Makefile (revision 478367) >+++ sysutils/shim/Makefile (working copy) >@@ -1,44 +1,44 @@ > # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org> > # $FreeBSD$ > > PORTNAME= shim >-PORTVERSION= 0.8 >-PORTREVISION= 6 >+PORTVERSION= 0.9 > CATEGORIES= sysutils > >-MAINTAINER= ports@FreeBSD.org >+MAINTAINER= egypcio@googlemail.com > COMMENT= UEFI Secure Boot shim loader > > LICENSE= BSD2CLAUSE >+LICENSE_FILE= ${WRKSRC}/COPYRIGHT > > BUILD_DEPENDS= ${LOCALBASE}/lib/libgnuefi.a:devel/gnu-efi \ > bash:shells/bash > > USE_GITHUB= yes > GH_ACCOUNT= mjg59 > >-USES= gmake >+USES= compiler gmake > USE_CSTD= gnu89 > USE_GCC= yes > USE_GITHUB= yes > MAKE_ARGS= CC="${CC} ${CFLAGS:M-std=*}" LD="${LD}" OBJCOPY="${OBJCOPY}" > MAKE_JOBS_UNSAFE= yes > ONLY_FOR_ARCHS= amd64 > > PLIST_FILES= lib/shim/shim.pem lib/shim/shim.key \ > lib/shim/MokManager.efi lib/shim/fallback.efi lib/shim/shim.efi > > post-patch: > @${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/make-certs > > do-install: > # Note that before this step, the shim.pem contains the _private_ key. > openssl x509 -inform der -in ${WRKSRC}/shim.cer -outform pem -out ${WRKSRC}/shim.pem > ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/shim > ${INSTALL_DATA} -m 600 ${WRKSRC}/shim.key ${STAGEDIR}/${PREFIX}/lib/shim > ${INSTALL_DATA} ${WRKSRC}/shim.pem ${STAGEDIR}/${PREFIX}/lib/shim > ${INSTALL_DATA} ${WRKSRC}/shim.efi ${STAGEDIR}/${PREFIX}/lib/shim > ${INSTALL_DATA} ${WRKSRC}/MokManager.efi ${STAGEDIR}/${PREFIX}/lib/shim > ${INSTALL_DATA} ${WRKSRC}/fallback.efi ${STAGEDIR}/${PREFIX}/lib/shim > > .include <bsd.port.mk> >Index: sysutils/shim/distinfo >=================================================================== >--- sysutils/shim/distinfo (revision 478367) >+++ sysutils/shim/distinfo (working copy) >@@ -1,2 +1,3 @@ >-SHA256 (mjg59-shim-0.8_GH0.tar.gz) = 668629b51179d4832415d5c3ebf0cdb28feaae16e7158d8fc6e3740a1a29cdd8 >-SIZE (mjg59-shim-0.8_GH0.tar.gz) = 1251831 >+TIMESTAMP = 1535569510 >+SHA256 (mjg59-shim-0.9_GH0.tar.gz) = d277d7bea0b5d554dacf284d84252a5e995fb4ef54b6de5ec6296c6c2a9a21bd >+SIZE (mjg59-shim-0.9_GH0.tar.gz) = 1302211 >Index: sysutils/shim/files/patch-Makefile >=================================================================== >--- sysutils/shim/files/patch-Makefile (revision 478367) >+++ sysutils/shim/files/patch-Makefile (working copy) >@@ -1,43 +1,53 @@ >---- Makefile.orig 2014-10-13 22:41:51.000000000 +0200 >-+++ Makefile 2014-12-21 16:18:40.000000000 +0100 >-@@ -4,13 +1,17 @@ >+--- Makefile.orig 2015-06-30 18:20:12.000000000 +0000 >++++ Makefile 2018-08-30 16:35:51.966986000 +0000 >+@@ -1,5 +1,5 @@ >+ VERSION = 0.9 >+-RELEASE := >++RELEASE := "" >+ ifneq ($(RELEASE),"") >+ RELEASE="-$(RELEASE)" >+ endif >+@@ -9,15 +9,20 @@ >+ OBJCOPY = $(CROSS_COMPILE)objcopy > > ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,) >- >++ > +ifeq ($(ARCH),amd64) >-+ override ARCH := x86_64 >++ override ARCH := x86_64 > +endif > + >+ OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^.* //g' | cut -f1-2 -d.` \>= 2.24) >+ > SUBDIRS = Cryptlib lib > > -LIB_PATH = /usr/lib64 >-+LIB_PATH = $(LOCALBASE)/lib >++LIB_PATH = /usr/lib -L$(LOCALBASE)/lib > > -EFI_INCLUDE := /usr/include/efi >-+EFI_INCLUDE := $(LOCALBASE)/include/efi >- EFI_INCLUDES = -nostdinc -ICryptlib -ICryptlib/Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -Iinclude >+-EFI_INCLUDES = -nostdinc -ICryptlib -ICryptlib/Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I$(shell pwd)/include > -EFI_PATH := /usr/lib64/gnuefi >++EFI_INCLUDE := $(LOCALBASE)/include/efi >++EFI_INCLUDES = -nostdinc -ICryptlib -ICryptlib/Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I$(shell pwd)/include -I/usr/include > +EFI_PATH := $(LOCALBASE)/lib > > LIB_GCC = $(shell $(CC) -print-libgcc-file-name) > EFI_LIBS = -lefi -lgnuefi --start-group Cryptlib/libcryptlib.a Cryptlib/OpenSSL/libopenssl.a --end-group $(LIB_GCC) >-@@ -57,7 +63,7 @@ LDFLAGS = -nostdlib -znocombreloc -T $( >+@@ -65,7 +70,7 @@ > >- VERSION = 0.8 >+ LDFLAGS = --hash-style=sysv -nostdlib -znocombreloc -T $(EFI_LDS) -shared -Bsymbolic -L$(EFI_PATH) -L$(LIB_PATH) -LCryptlib -LCryptlib/OpenSSL $(EFI_CRT_OBJS) --build-id=sha1 > > -TARGET = shim.efi MokManager.efi.signed fallback.efi.signed > +TARGET = shim.efi MokManager.efi fallback.efi > OBJS = shim.o netboot.o cert.o replacements.o version.o > KEYS = shim_cert.h ocsp.* ca.* shim.crt shim.csr shim.p12 shim.pem shim.key shim.cer > SOURCES = shim.c shim.h netboot.c include/PeImage.h include/wincert.h include/console.h replacements.c replacements.h version.c version.h >-@@ -144,8 +150,8 @@ FORMAT ?= --target efi-app-$(ARCH) >- -j .debug_line -j .debug_str -j .debug_ranges \ >+@@ -156,9 +161,6 @@ >+ -j .note.gnu.build-id \ > $(FORMAT) $^ $@.debug > > -%.efi.signed: %.efi certdb/secmod.db > - pesign -n certdb -i $< -c "shim" -s -o $@ -f >-+#%.efi.signed: %.efi certdb/secmod.db >-+# pesign -n certdb -i $< -c "shim" -s -o $@ -f >- >+- > clean: > $(MAKE) -C Cryptlib clean >+ $(MAKE) -C Cryptlib/OpenSSL clean
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 231029
:
196712
|
196895