#21 Drop unnecessary LDFLAGS addition.
Merged a year ago by zdohnal. Opened a year ago by siddhesh.
rpms/ siddhesh/cups fortify  into  rawhide

file modified
+4 -2
@@ -15,7 +15,7 @@ 

  Name: cups

  Epoch: 1

  Version: 2.4.2

- Release: 10%{?dist}

+ Release: 11%{?dist}

  # the CUPS exception text is the same as LLVM exception, so using that name with

  # agreement from legal team

  # https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/message/A7GFSD6M3GYGSI32L2FC5KB22DUAEQI3/
@@ -326,7 +326,6 @@ 

  export DSOFLAGS="$DSOFLAGS $RPM_LD_FLAGS"

  export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DLDAP_DEPRECATED=1"

  export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DLDAP_DEPRECATED=1"

- export LDFLAGS="$LDFLAGS $RPM_LD_FLAGS -Wall -fstack-clash-protection -D_FORTIFY_SOURCE=2"

  # --enable-debug to avoid stripping binaries

  %configure --with-docdir=%{_datadir}/%{name}/www \

    --enable-debug \
@@ -704,6 +703,9 @@ 

  %{_mandir}/man7/ippeveps.7.gz

  

  %changelog

+ * Thu Mar 23 2023 Siddhesh Poyarekar <siddhesh@redhat.com> - 1:2.4.2-11

+ - Drop unnecessary LDFLAGS addition.

+ 

  * Thu Mar 02 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.4.2-10

  - fix loading ippeveps in ippeveprinter if only the command name is provided

  - don't override color settings from print dialog

The flags being added are unnecessary for the linker and they're already
part of CFLAGS, so avoid adding them.

The build still unnecessarily inserts _FORTIFY_SOURCE=2; it doesn't warn for some reason, something I need to look into more closely but it should be orthogonal to this change.

Hi @siddhesh ,

I added this part in the past because annocheck (the tool which is used in rpminspect) was failing at that time. I've tested it on the build without explicit LDFLAGS and it doesn't report any new problems, so I'll merge it.

Thank you for the PR!

FYI - we set FORTIFY_SOURCE upstream, so I've sent a PR for switching to level 3. https://github.com/OpenPrinting/cups/pull/642

Pull-Request has been merged by zdohnal

a year ago

FYI - we set FORTIFY_SOURCE upstream, so I've sent a PR for switching to level 3. https://github.com/OpenPrinting/cups/pull/642

Ah, you beat me to it, thanks :)

Metadata