Hello community, here is the log from the commit of package kdesu for openSUSE:Factory checked in at 2014-08-16 15:41:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesu (Old) and /work/SRC/openSUSE:Factory/.kdesu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesu" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesu/kdesu.changes 2014-07-15 08:00:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdesu.new/kdesu.changes 2014-08-16 15:41:46.000000000 +0200 @@ -1,0 +2,14 @@ +Sat Aug 2 10:19:59 UTC 2014 - [email protected] + +- Update to 5.1.0 + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.1.php + +------------------------------------------------------------------- +Sat Jul 26 10:00:31 UTC 2014 - [email protected] + +- Add fpie.patch, to make kdesud link with -fPIE flag +- Add %verifyscript and adjust permission for kdesud libexec, now + that permissions are whitelisted + +------------------------------------------------------------------- Old: ---- kdesu-5.0.0.tar.xz New: ---- fpie.patch kdesu-5.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesu.spec ++++++ --- /var/tmp/diff_new_pack.fgUlMY/_old 2014-08-16 15:41:47.000000000 +0200 +++ /var/tmp/diff_new_pack.fgUlMY/_new 2014-08-16 15:41:47.000000000 +0200 @@ -18,11 +18,11 @@ %define lname libKF5Su5 Name: kdesu -Version: 5.0.0 +Version: 5.1.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.0.0 +BuildRequires: extra-cmake-modules >= 1.1.0 BuildRequires: fdupes BuildRequires: kcoreaddons-devel >= %{kf5_version} BuildRequires: kf5-filesystem @@ -36,6 +36,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE fpie.patch -- make kdesud compile/link with -(f)pie flags +Patch0: fpie.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,6 +48,7 @@ %package -n %lname Summary: User interface for running shell commands with root privileges Group: System/GUI/KDE +PreReq: permissions Obsoletes: libKF5Su4 %description -n %lname @@ -69,6 +72,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build @@ -78,16 +82,26 @@ %kf5_makeinstall -C build %fdupes -s %{buildroot} -%post -n %lname -p /sbin/ldconfig +%if 0%{?suse_version} <= 1310 +# we need this for older oS releases; only Factory/13.2 has the whitelist +echo "setBadness('permissions-file-setuid-bit', 0)" > $RPM_SOURCE_DIR/%name-rpmlintrc +%endif + +%post -n %lname +/sbin/ldconfig +%set_permissions %{_kf5_libexecdir}/kdesud %postun -n %lname -p /sbin/ldconfig +%verifyscript -n %lname +%verify_permissions -e %{_kf5_libexecdir}/kdesud + %files -n %lname %defattr(-,root,root) %doc COPYING* README* %{_kf5_libdir}/libKF5Su.so.* %{_kf5_libexecdir}/kdesu_stub -%{_kf5_libexecdir}/kdesud +%verify(not mode) %attr(2755,root,nogroup) %{_kf5_libexecdir}/kdesud %files devel %defattr(-,root,root) ++++++ fpie.patch ++++++ diff --git a/src/kdesud/CMakeLists.txt b/src/kdesud/CMakeLists.txt index 1276a55..998f9e0 100644 --- a/src/kdesud/CMakeLists.txt +++ b/src/kdesud/CMakeLists.txt @@ -17,10 +17,9 @@ ecm_mark_nongui_executable(kdesud) target_link_libraries(kdesud KF5::Su KF5::I18n ${X11_LIBRARIES}) -if(KDE4_ENABLE_FPIE) - macro_add_compile_flags(kdesud ${KDE4_CXX_FPIE_FLAGS}) - macro_add_link_flags(kdesud ${KDE4_PIE_LDFLAGS}) -endif() +set_property(TARGET kdesud APPEND_STRING PROPERTY COMPILE_FLAGS " -fPIE") + +set_property(TARGET kdesud APPEND_STRING PROPERTY LINK_FLAGS " -pie") ########### install files ############### ++++++ kdesu-5.0.0.tar.xz -> kdesu-5.1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesu-5.0.0/CMakeLists.txt new/kdesu-5.1.0/CMakeLists.txt --- old/kdesu-5.0.0/CMakeLists.txt 2014-07-01 20:15:05.000000000 +0200 +++ new/kdesu-5.1.0/CMakeLists.txt 2014-08-02 10:18:09.000000000 +0200 @@ -2,7 +2,7 @@ project(KDESu) -find_package(ECM 1.0.0 REQUIRED NO_MODULE) +find_package(ECM 1.1.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -12,8 +12,8 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.0.0") # handled by release scripts -set(KF5_DEP_VERSION "5.0.0") # handled by release scripts +set(KF5_VERSION "5.1.0") # handled by release scripts +set(KF5_DEP_VERSION "5.1.0") # handled by release scripts find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Pty ${KF5_DEP_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesu-5.0.0/src/client.cpp new/kdesu-5.1.0/src/client.cpp --- old/kdesu-5.0.0/src/client.cpp 2014-07-01 20:15:05.000000000 +0200 +++ new/kdesu-5.1.0/src/client.cpp 2014-08-02 10:18:09.000000000 +0200 @@ -378,7 +378,7 @@ static QString findDaemon() { - QString daemon = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KF5_LIBEXEC_INSTALL_DIR "/kdesud"); + QString daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); if (daemon.isEmpty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesu-5.0.0/src/config-kdesu.h.cmake new/kdesu-5.1.0/src/config-kdesu.h.cmake --- old/kdesu-5.0.0/src/config-kdesu.h.cmake 2014-07-01 20:15:05.000000000 +0200 +++ new/kdesu-5.1.0/src/config-kdesu.h.cmake 2014-08-02 10:18:09.000000000 +0200 @@ -5,4 +5,4 @@ #cmakedefine01 HAVE_INITGROUPS #cmakedefine01 HAVE_SYS_SELECT_H #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" -#define KF5_LIBEXEC_INSTALL_DIR "${KF5_LIBEXEC_INSTALL_DIR}" +#define CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesu-5.0.0/src/kdesud/CMakeLists.txt new/kdesu-5.1.0/src/kdesud/CMakeLists.txt --- old/kdesu-5.0.0/src/kdesud/CMakeLists.txt 2014-07-01 20:15:05.000000000 +0200 +++ new/kdesu-5.1.0/src/kdesud/CMakeLists.txt 2014-08-02 10:18:09.000000000 +0200 @@ -25,13 +25,8 @@ ########### install files ############### install(TARGETS kdesud DESTINATION ${KF5_LIBEXEC_INSTALL_DIR}) -if(IS_ABSOLUTE KF5_LIBEXEC_INSTALL_DIR) - set(ABS_KF5_LIBEXEC_INSTALL_DIR "${KF5_LIBEXEC_INSTALL_DIR}") -else() - set(ABS_KF5_LIBEXEC_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/${KF5_LIBEXEC_INSTALL_DIR}") -endif() install(CODE " - set(KDESUD_PATH \"\$ENV{DESTDIR}${ABS_KF5_LIBEXEC_INSTALL_DIR}/kdesud\") + set(KDESUD_PATH \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBEXECDIR_KF5}/kdesud\") execute_process(COMMAND sh -c \"chgrp nogroup '\${KDESUD_PATH}' && chmod g+s '\${KDESUD_PATH}'\") ") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesu-5.0.0/src/suprocess.cpp new/kdesu-5.1.0/src/suprocess.cpp --- old/kdesu-5.0.0/src/suprocess.cpp 2014-07-01 20:15:05.000000000 +0200 +++ new/kdesu-5.1.0/src/suprocess.cpp 2014-08-02 10:18:09.000000000 +0200 @@ -124,7 +124,7 @@ if (d->superUserCommand == QLatin1String("su")) { args += "-c"; } - args += QByteArray(KF5_LIBEXEC_INSTALL_DIR) + "/kdesu_stub"; + args += QByteArray(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5) + "/kdesu_stub"; args += "-"; // krazy:exclude=doublequote_chars (QList, not QString) QByteArray command; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
