Browse Source

beep: change git repository to fix CVE-2018-0492 and CVE-2018-1000532

1. Changed Git repository, which is used for Fedora packaging
https://github.com/johnath/beep/issues/11#issuecomment-450277122

Fixed CVEs:
CVE-2018-0492 - https://nvd.nist.gov/vuln/detail/CVE-2018-0492
CVE-2018-1000532 - https://nvd.nist.gov/vuln/detail/CVE-2018-1000532

2. Fixed SPDX License Identifier

3. Add patch to comment out -D_FORTIFY_SOURCE
Otherwise, it can not be built by default.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 6488eaf250)
lilik-openwrt-22.03
Josef Schlehofer 6 years ago
parent
commit
afea2bcafc
No known key found for this signature in database GPG Key ID: B950216FE4329F4C
2 changed files with 34 additions and 14 deletions
  1. +10
    -14
      utils/beep/Makefile
  2. +24
    -0
      utils/beep/patches/0001-GNUmakefile-comment-out-D_FORTIFY_SOURCE.patch

+ 10
- 14
utils/beep/Makefile View File

@ -8,20 +8,16 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=beep PKG_NAME:=beep
PKG_REV:=0d790fa45777896749a885c3b93b2c1476d59f20
PKG_VERSION:=1.3
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/johnath/beep.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_MIRROR_HASH:=fc97d41e68d7b7e43a972e3416dd9326acc40efe66856271ccb36e3678464dec
PKG_LICENSE:=GPL-2.0
PKG_VERSION:=1.4.12
PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/spkr-beep/beep/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=6188d0f0c180db7a30467b5b6065a3cb5d2665b937d2e8c40366efb52bf689fe
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/beep define Package/beep
@ -29,11 +25,11 @@ define Package/beep
CATEGORY:=Sound CATEGORY:=Sound
DEPENDS:=+TARGET_x86:kmod-pcspkr @!TARGET_x86:kmod-gpio-beeper DEPENDS:=+TARGET_x86:kmod-pcspkr @!TARGET_x86:kmod-gpio-beeper
TITLE:=Play beep sounds through a PC speaker TITLE:=Play beep sounds through a PC speaker
URL:=http://johnath.com/beep/README
URL:=https://github.com/spkr-beep/beep
endef endef
define Package/beep/description define Package/beep/description
This program plays beeps through the PC speaker
This program plays beeps through the PC speaker
endef endef
MAKE_FLAGS += \ MAKE_FLAGS += \


+ 24
- 0
utils/beep/patches/0001-GNUmakefile-comment-out-D_FORTIFY_SOURCE.patch View File

@ -0,0 +1,24 @@
From 937b2e633754c1234cc0037e47c77f7735704a12 Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Tue, 7 Jun 2022 17:55:59 +0200
Subject: [PATCH] GNUmakefile: comment out D_FORTIFY_SOURCE
Fixes:
<command-line>: error: "_FORTIFY_SOURCE" redefined [-Werror]
<command-line>: note: this is the location of the previous definition
cc1: all warnings being treated as errors
---
GNUmakefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -160,7 +160,7 @@ $(eval $(call CHECK_CFLAGS,common_CFLAGS
$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Werror=format-security))
$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Wno-disabled-macro-expansion))
$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Wno-format-nonliteral))
-$(eval $(call CHECK_CFLAGS,CPPFLAGS,-D_FORTIFY_SOURCE=2))
+# $(eval $(call CHECK_CFLAGS,CPPFLAGS,-D_FORTIFY_SOURCE=2))
$(eval $(call CHECK_CFLAGS,CPPFLAGS,-D_GLIBCXX_ASSERTIONS))
# $(eval $(call CHECK_CFLAGS,CFLAGS,-Wp$$(comma)-D_FORTIFY_SOURCE=2))
# $(eval $(call CHECK_CFLAGS,CFLAGS,-Wp$$(comma)-D_GLIBCXX_ASSERTIONS))

Loading…
Cancel
Save