aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg (Zorry) <zorry@ume.nu>2010-03-27 01:06:14 +0100
committerMagnus Granberg (Zorry) <zorry@ume.nu>2010-03-27 01:06:14 +0100
commit6408f2109657bae0374118ae4f3cbd4c910dfd65 (patch)
tree467a8449669e0ed63a597ed656b021af19d0c580 /sys-boot
parentIn portage (diff)
downloadhardened-dev-6408f2109657bae0374118ae4f3cbd4c910dfd65.tar.gz
hardened-dev-6408f2109657bae0374118ae4f3cbd4c910dfd65.tar.bz2
hardened-dev-6408f2109657bae0374118ae4f3cbd4c910dfd65.zip
Fix some typos in grub ebuild ty klondike
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/Manifest3
-rw-r--r--sys-boot/grub/files/grub-0.97-gcc4-hardened.patch11
-rw-r--r--sys-boot/grub/grub-0.97-r12.ebuild2
3 files changed, 2 insertions, 14 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 17249a43..d44fe84e 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,10 +1,9 @@
AUX grub-0.97-fix-ssp.patch 694 RMD160 c014d10ccf40cc4e9be037e3c5834e3327d5c6a3 SHA1 58d8b10c84618dfa64ab52556f26da35a6e97f0b SHA256 bc2f1c97a6324f9779e6aa8bad04034c1cd047fe64ecd905d32db7841cc9049b
AUX grub-0.97-fpie_check.patch 943 RMD160 e5a5b00eb8d03cff58154262a8b71eff76ccf800 SHA1 2e0de7cf888bcdfe692e7284d4b5bc408e8a6c46 SHA256 09adaed802e58698d565d149b01937771888b8e3a08aafb2dfa4f964fb3547da
-AUX grub-0.97-gcc4-hardened.patch 462 RMD160 f1429fd7ebddede7dcc243e897ae3ff24ee19e06 SHA1 75860a643ac0588ef60fcc8e26fca734b11b3dae SHA256 24f135ba1404ac68a379d21885563adec58a38a7e2c05735a9328cd78aef19c2
AUX grub.conf.gentoo 659 RMD160 9ab841d6fdd03be3f99f109ed3dfe0a5027e66d2 SHA1 26455e5c3ba2043be970bf64ce2386119fd35f30 SHA256 5e3a209af537090456546704e52e0dee8f8600944a34184f79776523cdaa9a25
DIST grub-0.97-patches-1.9.tar.bz2 51809 RMD160 a745902212dbd22f4d9f0bb0d563ffd44b429eaa SHA1 1d9da2df8bccef9821ebbbc2f5c5353dbd90bf4d SHA256 6b8445c9260803f059031cbe7475a45fee6499fc2dbd911288af6169455c4028
DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
-EBUILD grub-0.97-r12.ebuild 9247 RMD160 b7b2a7da5286f065b4a89fb047606fe318444f3f SHA1 973e594fc5c863e4d5b3bd2e5fff892eac5e178c SHA256 4752c69da2529275d76cb0d59dd0372892f4682a051e38672f76204d026d01d6
+EBUILD grub-0.97-r12.ebuild 9256 RMD160 6eea3ddd1f87ec3818cd294e7940881b5f65e075 SHA1 cd0c75736bda4b4b8caeaf0be88a8cb1886b0958 SHA256 9cef7ba9415f7db4a3f03f99bbc0ba449a4a492f809ee853f572f6877e4402ed
MISC ChangeLog 645 RMD160 789496bde988ba8a92e551b76d1e4551208d1042 SHA1 79d438bbcf3b903f007660e1289e77a217584f85 SHA256 85d0f62ab5ae44d5ac4931bf61d8ddead023e727fa63e544fad6f34f8c782a18
MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
diff --git a/sys-boot/grub/files/grub-0.97-gcc4-hardened.patch b/sys-boot/grub/files/grub-0.97-gcc4-hardened.patch
deleted file mode 100644
index cf851888..00000000
--- a/sys-boot/grub/files/grub-0.97-gcc4-hardened.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN /var/tmp/portage/sys-boot/grub-0.97-r6/work/grub-0.97/configure.ac /root/hardened/grub-0.97/configure.ac
---- /work/grub-0.97/configure.ac 2008-06-03 16:09:34.000000000 +0200
-+++ /grub-0.97/configure.ac 2008-06-04 00:24:01.000000000 +0200
-@@ -106,6 +106,7 @@
- ])
- if test "x$no_stack_protector_flag" = xyes; then
- STAGE2_CFLAGS="$STAGE2_CFLAGS -fno-stack-protector"
-+ GRUB_CFLAGS="$GRUB_CFLAGS -fno-stack-protector"
- fi
- fi
- fi
diff --git a/sys-boot/grub/grub-0.97-r12.ebuild b/sys-boot/grub/grub-0.97-r12.ebuild
index f7d11aca..d0ee0e9c 100644
--- a/sys-boot/grub/grub-0.97-r12.ebuild
+++ b/sys-boot/grub/grub-0.97-r12.ebuild
@@ -64,7 +64,7 @@ src_unpack() {
|| die "Failed to hack memory size"
# Bugs #139277 #168834 #281246
- epatch "${FILESDIR}"/nopie_check.patch
+ epatch "${FILESDIR}"/grub-0.97-fpie_check.patch
if [[ -n ${PATCHVER} ]] ; then
EPATCH_SUFFIX="patch"