From 19757b51c306a7de464aa79183d60b9a079ddcfd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 7 Sep 2018 13:43:38 +0200 Subject: [PATCH] oprofile: update to 1.3.0. Use account _oprofile. --- srcpkgs/oprofile/patches/basename.patch | 13 ------------- srcpkgs/oprofile/patches/system-account.patch | 11 +++++++++++ srcpkgs/oprofile/template | 14 +++++++------- 3 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 srcpkgs/oprofile/patches/basename.patch create mode 100644 srcpkgs/oprofile/patches/system-account.patch diff --git a/srcpkgs/oprofile/patches/basename.patch b/srcpkgs/oprofile/patches/basename.patch deleted file mode 100644 index 350715a7d1..0000000000 --- a/srcpkgs/oprofile/patches/basename.patch +++ /dev/null @@ -1,13 +0,0 @@ -Use internal op_basename function rather than basename. - ---- pp/oparchive.cpp 2017-08-08 13:32:18.667327870 -0400 -+++ pp/oparchive.cpp 2017-08-08 13:36:09.502600880 -0400 -@@ -261,7 +262,7 @@ - /* determine the session name of sample file */ - int offset = sample_name.find('{'); - string base_samples_dir = sample_name.substr(0, offset-1); -- string session = basename(base_samples_dir.c_str()); -+ string session = op_basename(base_samples_dir); - /* Get rid of the the archive_path from the name */ - string sample_base = sample_name.substr(offset); - string sample_archive_file = dest_samples_dir + "/" + session + "/" + sample_base; diff --git a/srcpkgs/oprofile/patches/system-account.patch b/srcpkgs/oprofile/patches/system-account.patch new file mode 100644 index 0000000000..a49217f01b --- /dev/null +++ b/srcpkgs/oprofile/patches/system-account.patch @@ -0,0 +1,11 @@ +--- opjitconv/opjitconv.c.orig ++++ opjitconv/opjitconv.c +@@ -659,7 +659,7 @@ + if (non_root) { + pw_oprofile = NULL; + } else { +- pw_oprofile = getpwnam("oprofile"); ++ pw_oprofile = getpwnam("_oprofile"); + if (pw_oprofile == NULL) { + printf("opjitconv: User information for special user oprofile cannot be found.\n"); + rc = OP_JIT_CONV_FAIL; diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template index 2a29c39b25..772b5c689a 100644 --- a/srcpkgs/oprofile/template +++ b/srcpkgs/oprofile/template @@ -1,17 +1,17 @@ # Template file for 'oprofile' pkgname=oprofile -version=1.2.0 -revision=2 +version=1.3.0 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" makedepends="popt-devel binutils-devel" -system_accounts="oprofile" +system_accounts="_oprofile" oprofile_homedir="/var/lib/oprofile" -make_dirs="/var/lib/oprofile 0750 oprofile oprofile" +make_dirs="/var/lib/oprofile 0750 _oprofile _oprofile" short_desc="Transparent low-overhead system-wide profiler for Linux" maintainer="Juan RP " -license="GPL-2" +license="GPL-2.0-only" homepage="http://oprofile.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=eb95f98c40b7d0ee29b45fba3565d9f8381747528aa6b6159e37d4fa0c8ca57d +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" +checksum=95ded8bde1ec39922f0af015981a67aec63e025a501e4dc04cd65d38f73647e6