This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit fc2556209710a276898395978a506bbe84f41985 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Oct 25 01:03:05 2019 +0200 x2gokdrive.spec: copy configure flags from debian/rules{,.flags}. Most compiler flags should be getting passed down automatically through the %configure macro, but CPPFLAGS is special and seemingly not defined in redhat-rpm-macros (or the *SuSE equivalent) and is hence passed-down manually. %{__global_ldflags} is empty and unknown on some systems, so copy workaround from nx-libs for that one. --- debian/changelog | 6 ++++ x2gokdrive.spec | 89 +++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 78 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index b300328..635e744 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,12 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium lsb_release, needed at package configuration time. + Enable hardening in a low-effort way. + Disable debugsource... disabling. Debug packages are actually useful! + + Copy configure flags from debian/rules{,.flags}. Most compiler flags + should be getting passed down automatically through the %configure + macro, but CPPFLAGS is special and seemingly not defined in + redhat-rpm-macros (or the *SuSE equivalent) and is hence passed-down + manually. %{__global_ldflags} is empty and unknown on some systems, so + copy workaround from nx-libs for that one. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 524590f..bf11185 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -172,24 +172,79 @@ export CXXFLAGS="$CFLAGS" pushd 'BUILD' autoreconf -fvi -# Another block from tigervnc.spec, except for the 1st option line. +# The RPM macro for the linker flags does not exist on EPEL +%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} +# disable-static is so we don't get libfoo.a for modules. now if only we could +# kill the .las. %configure \ - --enable-kdrive --enable-x2gokdrive \ - --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ - --disable-xwin --disable-xephyr --disable-xwayland \ - --with-pic --disable-static \ - --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \ - --with-fontdir=%{_datadir}/X11/fonts \ - --with-xkb-output=%{_localstatedir}/lib/xkb \ - --enable-install-libxf86config \ - --enable-glx --disable-dri --enable-dri2 --disable-dri3 \ - --disable-unit-tests \ - --disable-config-hal \ - --disable-config-udev \ - --with-dri-driver-path=%{_libdir}/dri \ - --without-dtrace \ - --disable-devel-docs \ - --disable-selective-werror + --libexecdir='%{_prefix}/lib/xorg' \ + --with-module-dir='%{_prefix}/lib/xorg/modules' \ + --with-serverconfig-path='%{_libexecdir}' \ + --disable-static \ + --without-dtrace \ + --disable-strict-compilation \ + --disable-debug \ + --with-int10=x86emu \ + --with-os-vendor="$(lsb_release -i -s)" \ + --with-builderstring="%{name} %{version} (https://wiki.x2go.org)" \ + --with-xkb-path=%{_datadir}/X11/xkb \ + --with-xkb-output=%{_localstatedir}/lib/xkb \ + --with-shared-memory-dir=/dev/shm \ + --enable-mitshm \ + --enable-xres \ + --disable-xcsecurity \ + --disable-tslib \ + --enable-dbe \ + --disable-xf86bigfont \ + --enable-dpms \ + --enable-xorg \ + --disable-linux-acpi \ + --disable-linux-apm \ + --disable-xquartz \ + --disable-xwin \ + --disable-xnest \ + --disable-xfake \ + --disable-xfbdev \ + --disable-install-setuid \ + --disable-xshmfence \ + --disable-config-hal \ + --disable-config-udev \ + --with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \ + --enable-composite \ + --enable-record \ + --enable-xv \ + --disable-xvmc \ + --disable-dga \ + --enable-screensaver \ + --disable-xdmcp \ + --disable-xdm-auth-1 \ + --enable-glx \ + --enable-present \ + --enable-xinerama \ + --enable-xf86vidmode \ + --enable-xace \ + --disable-xfree86-utils \ + --disable-suid-wrapper \ + --disable-dmx \ + --disable-xvfb \ + --enable-kdrive \ + --enable-x2gokdrive \ + --disable-xephyr \ + --disable-wayland \ + --with-sha1=libgcrypt \ + --enable-xcsecurity \ + --disable-dri3 \ + --disable-xselinux \ + --disable-systemd-logind \ + --without-systemd-daemon \ + --disable-dri \ + --disable-dri2 \ + --disable-glamor \ + --enable-libunwind \ + --disable-libdrm \ + --enable-unit-tests \ + CPPFLAGS="${CPPFLAGS} %{?__global_cppflags} -DPRE_RELEASE=0" \ + LDFLAGS='%{__global_ldflags}' make %{?_smp_mflags} popd -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git