From 3ebbe6a9cacaa9356d0a8488ed083f4a45a5b532 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Fri, 23 Oct 2015 15:41:24 +0900 Subject: tizen 2.4 release --- packaging/Makefile | 0 packaging/autodeps.diff | 0 packaging/beecrypt-4.1.2.diff | 0 packaging/beecrypt-4.1.2.tar.bz2 | Bin packaging/build_pack_4.9.1_fix.patch | 0 packaging/buildidprov.diff | 0 packaging/db-4.8.30.tar.gz | Bin packaging/db.diff | 0 packaging/debugsource-package.diff | 0 packaging/debugsubpkg.diff | 0 packaging/device-sec-policy | 0 packaging/fileattrs.diff | 0 packaging/find-docs.sh | 0 packaging/finddebuginfo.diff | 0 packaging/firmware.diff | 0 packaging/fontprovides.diff | 0 packaging/lib_rpmdb_4.9.1_fix.patch | 0 packaging/libsymlink.attr | 0 packaging/macros | 38 ++++++++++++++++++++------ packaging/mimetype.diff | 0 packaging/no_rep_autop.diff | 0 packaging/nodigest.patch | 0 packaging/optflags.patch | 10 +++---- packaging/pythondeps.diff | 0 packaging/remove-translations.patch | 0 packaging/rpm-4.5.90-gstreamer-provides.patch | 0 packaging/rpm-4.5.90-pkgconfig-path.patch | 0 packaging/rpm-4.7.90-devel-autodep.patch | 0 packaging/rpm-4.8.0-tilde.patch | 0 packaging/rpm-4.9.0-tizen-arm.patch | 4 +-- packaging/rpm-beecrypt.diff | 0 packaging/rpm-gst-provides.patch | 0 packaging/rpm-macros.patch | 0 packaging/rpm-python.manifest | 0 packaging/rpm-python.spec | 15 +++++----- packaging/rpm-shorten-changelog.patch | 0 packaging/rpm.manifest | 0 packaging/rpm.spec | 22 +++++++++++++-- packaging/rpmbuild_4.9.1_fix.patch | 0 packaging/rpmbuild_rpmfc_4.9.1_fix.patch | 0 packaging/rpmio_base64_4.9.1_fix.patch | 0 packaging/rpmlib_format_value_4.9.1_fix.patch | 0 packaging/security_4.9.1.patch | 16 +++++++---- 43 files changed, 73 insertions(+), 32 deletions(-) mode change 100644 => 100755 packaging/Makefile mode change 100644 => 100755 packaging/autodeps.diff mode change 100644 => 100755 packaging/beecrypt-4.1.2.diff mode change 100644 => 100755 packaging/beecrypt-4.1.2.tar.bz2 mode change 100644 => 100755 packaging/build_pack_4.9.1_fix.patch mode change 100644 => 100755 packaging/buildidprov.diff mode change 100644 => 100755 packaging/db-4.8.30.tar.gz mode change 100644 => 100755 packaging/db.diff mode change 100644 => 100755 packaging/debugsource-package.diff mode change 100644 => 100755 packaging/debugsubpkg.diff mode change 100644 => 100755 packaging/device-sec-policy mode change 100644 => 100755 packaging/fileattrs.diff mode change 100644 => 100755 packaging/find-docs.sh mode change 100644 => 100755 packaging/finddebuginfo.diff mode change 100644 => 100755 packaging/firmware.diff mode change 100644 => 100755 packaging/fontprovides.diff mode change 100644 => 100755 packaging/lib_rpmdb_4.9.1_fix.patch mode change 100644 => 100755 packaging/libsymlink.attr mode change 100644 => 100755 packaging/mimetype.diff mode change 100644 => 100755 packaging/no_rep_autop.diff mode change 100644 => 100755 packaging/nodigest.patch mode change 100644 => 100755 packaging/pythondeps.diff mode change 100644 => 100755 packaging/remove-translations.patch mode change 100644 => 100755 packaging/rpm-4.5.90-gstreamer-provides.patch mode change 100644 => 100755 packaging/rpm-4.5.90-pkgconfig-path.patch mode change 100644 => 100755 packaging/rpm-4.7.90-devel-autodep.patch mode change 100644 => 100755 packaging/rpm-4.8.0-tilde.patch mode change 100644 => 100755 packaging/rpm-4.9.0-tizen-arm.patch mode change 100644 => 100755 packaging/rpm-beecrypt.diff mode change 100644 => 100755 packaging/rpm-gst-provides.patch mode change 100644 => 100755 packaging/rpm-macros.patch mode change 100644 => 100755 packaging/rpm-python.manifest mode change 100644 => 100755 packaging/rpm-python.spec mode change 100644 => 100755 packaging/rpm-shorten-changelog.patch mode change 100644 => 100755 packaging/rpm.manifest mode change 100644 => 100755 packaging/rpm.spec mode change 100644 => 100755 packaging/rpmbuild_4.9.1_fix.patch mode change 100644 => 100755 packaging/rpmbuild_rpmfc_4.9.1_fix.patch mode change 100644 => 100755 packaging/rpmio_base64_4.9.1_fix.patch mode change 100644 => 100755 packaging/rpmlib_format_value_4.9.1_fix.patch mode change 100644 => 100755 packaging/security_4.9.1.patch (limited to 'packaging') diff --git a/packaging/Makefile b/packaging/Makefile old mode 100644 new mode 100755 diff --git a/packaging/autodeps.diff b/packaging/autodeps.diff old mode 100644 new mode 100755 diff --git a/packaging/beecrypt-4.1.2.diff b/packaging/beecrypt-4.1.2.diff old mode 100644 new mode 100755 diff --git a/packaging/beecrypt-4.1.2.tar.bz2 b/packaging/beecrypt-4.1.2.tar.bz2 old mode 100644 new mode 100755 diff --git a/packaging/build_pack_4.9.1_fix.patch b/packaging/build_pack_4.9.1_fix.patch old mode 100644 new mode 100755 diff --git a/packaging/buildidprov.diff b/packaging/buildidprov.diff old mode 100644 new mode 100755 diff --git a/packaging/db-4.8.30.tar.gz b/packaging/db-4.8.30.tar.gz old mode 100644 new mode 100755 diff --git a/packaging/db.diff b/packaging/db.diff old mode 100644 new mode 100755 diff --git a/packaging/debugsource-package.diff b/packaging/debugsource-package.diff old mode 100644 new mode 100755 diff --git a/packaging/debugsubpkg.diff b/packaging/debugsubpkg.diff old mode 100644 new mode 100755 diff --git a/packaging/device-sec-policy b/packaging/device-sec-policy old mode 100644 new mode 100755 diff --git a/packaging/fileattrs.diff b/packaging/fileattrs.diff old mode 100644 new mode 100755 diff --git a/packaging/find-docs.sh b/packaging/find-docs.sh old mode 100644 new mode 100755 diff --git a/packaging/finddebuginfo.diff b/packaging/finddebuginfo.diff old mode 100644 new mode 100755 diff --git a/packaging/firmware.diff b/packaging/firmware.diff old mode 100644 new mode 100755 diff --git a/packaging/fontprovides.diff b/packaging/fontprovides.diff old mode 100644 new mode 100755 diff --git a/packaging/lib_rpmdb_4.9.1_fix.patch b/packaging/lib_rpmdb_4.9.1_fix.patch old mode 100644 new mode 100755 diff --git a/packaging/libsymlink.attr b/packaging/libsymlink.attr old mode 100644 new mode 100755 diff --git a/packaging/macros b/packaging/macros index 4bf2d1a..79c6d7f 100644 --- a/packaging/macros +++ b/packaging/macros @@ -13,8 +13,11 @@ %_default_patch_fuzz 2 %_enable_debug_packages 1 -#============================================================================== -# ---- configure and makeinstall. +%do_profiling 1 +%cflags_profile_generate -fprofile-generate +%cflags_profile_feedback -fprofile-use + +# Tizen # %configure \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ @@ -99,6 +102,7 @@ infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\ install + %make_install \ %{__make} \\\ DESTDIR=%{?buildroot:%{buildroot}} \\\ @@ -158,14 +162,15 @@ %{nil} -%lang_package \ -%package locale \ +%lang_package(n:f:) \ +%package %{-n:-n %{-n*}-}locale \ Summary: Translations and Locale for package %{name}\ -Group: Translations\ -AutoReqProv: 0\ -%description locale\ +Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \ +Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \ +BuildArch: noarch \ +%description %{-n:-n %{-n*}-}locale\ This package provides translations for package %{name}.\ -%files locale -f %{name}.lang\ +%files %{-n:-n %{-n*}-}locale -f %{-f:%{-f*}.lang} %{!-f:%{name}.lang}\ %defattr(-,root,root,-)\ %{nil} @@ -236,7 +241,7 @@ rm -rf %{?buildroot:%{buildroot}} \ # Should unpackaged files in a build root terminate a build? %_unpackaged_files_terminate_build 1 -%__global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Wl,--as-needed +%__global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Wl,--as-needed -Wl,-O1 -Wl,--hash-style=gnu # Disable lookups %_hkp_keyserver %{nil} @@ -309,3 +314,18 @@ install -D -m 644 %1-16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/ %global __find_provides /bin/sh -c "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \ %global __find_requires /bin/sh -c "%{?__filter_req_cmd} %{__deploop R} %{?__filter_from_req}" \ } + +%remove_docs \ + rm -rf %{?buildroot:%{buildroot}}%{_infodir} \ + rm -rf %{?buildroot:%{buildroot}}%{_defaultdocdir} \ + rm -rf %{?buildroot:%{buildroot}}%{_datadir}/doc/%{name} \ + rm -rf %{?buildroot:%{buildroot}}%{_datadir}/doc/%{name}-%{version} \ + rm -rf %{?buildroot:%{buildroot}}%{_datadir}/gtk-doc \ + rm -rf %{?buildroot:%{buildroot}}%{_datadir}/doc \ + rm -rf %{?buildroot:%{buildroot}}%{_datadir}/man \ + find %{?buildroot:%{buildroot}} -regex ".*/man/man./.*\.[0-9]" | xargs rm -f -- \ + find %{?buildroot:%{buildroot}} -regex ".*/man/../man./.*\.[0-9]" | xargs rm -f -- \ + find %{?buildroot:%{buildroot}} -regex ".*/man/man./.*\.[0-9]pm" | xargs rm -f -- + +%ext_info .gz +%ext_man .gz diff --git a/packaging/mimetype.diff b/packaging/mimetype.diff old mode 100644 new mode 100755 diff --git a/packaging/no_rep_autop.diff b/packaging/no_rep_autop.diff old mode 100644 new mode 100755 diff --git a/packaging/nodigest.patch b/packaging/nodigest.patch old mode 100644 new mode 100755 diff --git a/packaging/optflags.patch b/packaging/optflags.patch index 5b6f51e..794db22 100644 --- a/packaging/optflags.patch +++ b/packaging/optflags.patch @@ -34,8 +34,8 @@ -optflags: armv5tejl -O2 -g -march=armv5te -optflags: armv6l -O2 -g -march=armv6 -optflags: armv7l -O2 -g -march=armv7 --optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mno-thumb --optflags: armv7nhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon -mno-thumb +-optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 +-optflags: armv7nhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon -optflags: armv7thl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb -optflags: armv7tnhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon -mthumb +optflags: armv3l %{__global_cflags} -fsigned-char -march=armv3 @@ -45,9 +45,9 @@ +optflags: armv5tejl %{__global_cflags} -march=armv5te +Optflags: armv5tel %{__global_cflags} -fmessage-length=0 -march=armv5te -mlittle-endian +Optflags: armv6l %{__global_cflags} -fmessage-length=0 -march=armv6 -mlittle-endian -mfpu=vfp -mfloat-abi=softfp -D__SOFTFP__ -+Optflags: armv7l %{__global_cflags} -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=vfpv3 -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -+optflags: armv7hl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mno-thumb -+optflags: armv7nhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mno-thumb ++Optflags: armv7l %{__global_cflags} -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb ++optflags: armv7hl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 ++optflags: armv7nhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon +optflags: armv7thl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb +optflags: armv7tnhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mthumb + diff --git a/packaging/pythondeps.diff b/packaging/pythondeps.diff old mode 100644 new mode 100755 diff --git a/packaging/remove-translations.patch b/packaging/remove-translations.patch old mode 100644 new mode 100755 diff --git a/packaging/rpm-4.5.90-gstreamer-provides.patch b/packaging/rpm-4.5.90-gstreamer-provides.patch old mode 100644 new mode 100755 diff --git a/packaging/rpm-4.5.90-pkgconfig-path.patch b/packaging/rpm-4.5.90-pkgconfig-path.patch old mode 100644 new mode 100755 diff --git a/packaging/rpm-4.7.90-devel-autodep.patch b/packaging/rpm-4.7.90-devel-autodep.patch old mode 100644 new mode 100755 diff --git a/packaging/rpm-4.8.0-tilde.patch b/packaging/rpm-4.8.0-tilde.patch old mode 100644 new mode 100755 diff --git a/packaging/rpm-4.9.0-tizen-arm.patch b/packaging/rpm-4.9.0-tizen-arm.patch old mode 100644 new mode 100755 index b977090..1ef1154 --- a/packaging/rpm-4.9.0-tizen-arm.patch +++ b/packaging/rpm-4.9.0-tizen-arm.patch @@ -19,8 +19,8 @@ Index: rpm-4.9.0/rpmrc.in optflags: armv5tejl -O2 -g -march=armv5te optflags: armv6l -O2 -g -march=armv6 optflags: armv7l -O2 -g -march=armv7 -+optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mno-thumb -+optflags: armv7nhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon -mno-thumb ++optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 ++optflags: armv7nhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon +optflags: armv7thl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb +optflags: armv7tnhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon -mthumb diff --git a/packaging/rpm-beecrypt.diff b/packaging/rpm-beecrypt.diff old mode 100644 new mode 100755 diff --git a/packaging/rpm-gst-provides.patch b/packaging/rpm-gst-provides.patch old mode 100644 new mode 100755 diff --git a/packaging/rpm-macros.patch b/packaging/rpm-macros.patch old mode 100644 new mode 100755 diff --git a/packaging/rpm-python.manifest b/packaging/rpm-python.manifest old mode 100644 new mode 100755 diff --git a/packaging/rpm-python.spec b/packaging/rpm-python.spec old mode 100644 new mode 100755 index 6671a65..cbb8fa8 --- a/packaging/rpm-python.spec +++ b/packaging/rpm-python.spec @@ -14,11 +14,11 @@ Summary: The RPM package management system Name: rpm-python +License: GPLv2+ Version: %{rpmver} Release: 4 -License: GPLv2+ BuildRequires: python-devel -%{expand:%(sed -n -e '/^Source0:/,/^##PYTHON##/p' <%_sourcedir/rpm.spec)} +%{expand:%(sed -n -e '/^Source1002:/d' -e '/^Source0:/,/^##PYTHON##/p' <%_sourcedir/rpm.spec)} Source100: rpm.spec Source1002: rpm-python.manifest Requires: popt >= 1.10.2.1 @@ -41,12 +41,11 @@ BuildRequires: ncurses-devel BuildRequires: bzip2-devel >= 0.9.0c-2 BuildRequires: liblua-devel >= 5.1 BuildRequires: libcap-devel +BuildRequires: xz-devel >= 4.999.8 +BuildRequires: uthash-devel BuildRequires: libxml2-devel BuildRequires: libattr-devel -BuildRequires: uthash-devel -BuildRequires: smack-devel -BuildRequires: xz-devel >= 4.999.8 - +BuildRequires: pkgconfig(libsmack) %description The RPM Package Manager (RPM) is a powerful command line driven @@ -62,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT cp %{SOURCE1002} . make DESTDIR="$RPM_BUILD_ROOT" install -find "%{buildroot}" -not -type d -and -not -path %{buildroot}%{_libdir}/python%{py_ver}/site-packages/rpm/\* -print0 | xargs -0 rm +find "%{buildroot}" -not -type d -and -not -path %{buildroot}/usr/lib/python%{py_ver}/site-packages/rpm/\* -print0 | xargs -0 rm pushd $RPM_BUILD_ROOT/%py_sitedir/rpm rm -f _rpmmodule.a _rpmmodule.la python %py_libdir/py_compile.py *.py @@ -75,5 +74,5 @@ rm -rf $RPM_BUILD_ROOT %files %manifest rpm-python.manifest %defattr(-,root,root) -%{_libdir}/python* +/usr/lib/python* diff --git a/packaging/rpm-shorten-changelog.patch b/packaging/rpm-shorten-changelog.patch old mode 100644 new mode 100755 diff --git a/packaging/rpm.manifest b/packaging/rpm.manifest old mode 100644 new mode 100755 diff --git a/packaging/rpm.spec b/packaging/rpm.spec old mode 100644 new mode 100755 index b2f70cb..38107c3 --- a/packaging/rpm.spec +++ b/packaging/rpm.spec @@ -4,8 +4,9 @@ Name: rpm +VCS: external/rpm#ffd7318edc23db77145257774c704b33d171bde0 Version: 4.9.1 -Release: %{release_prefix} +Release: %{?release_prefix:%{release_prefix}.}5.3.%{?dist}%{!?dist:tizen} Summary: The RPM package management system Url: http://www.rpm.org/ # Partially GPL/LGPL dual-licensed and some bits with BSD @@ -179,7 +180,15 @@ rm -f rpmdb/db.h %patch86 -p1 %patch87 -p1 -b .msm +%{?opt_mcpu: %define replace_mopt 1} +%{!?opt_mcpu: %define replace_mopt 0} +%if %{replace_mopt} +sed -e "/^Optflags: %{_target_cpu}/ s/-march[^ ]*/-mcpu=%{opt_mcpu}/g" -i rpmrc.in +sed -e "/^Optflags: %{_target_cpu}/ s/-mtune[^ ]*//g" -i rpmrc.in +sed -e "/^Optflags: %{_target_cpu}/ s/ / /g" -i rpmrc.in +grep "^Optflags: %{_target_cpu}" -rn rpmrc.in +%endif rm -f m4/libtool.m4 rm -f m4/lt*.m4 @@ -195,6 +204,11 @@ export CPPFLAGS CFLAGS LDFLAGS libtoolize -f -c ./autogen.sh \ +%ifarch %arm + --build=%{_target_cpu}-tizen-linux-gnueabi \ +%else + --build=%{_target_cpu}-tizen-linux-gnu \ +%endif --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ --localstatedir=%{_localstatedir} \ @@ -204,6 +218,7 @@ libtoolize -f -c %if %{with python} --enable-python \ %endif + --with-vendor=tizen \ --with-lua \ --with-cap \ --with-msm \ @@ -218,9 +233,10 @@ find %{buildroot} -regex ".*\\.la$" | xargs rm -f -- mkdir -p %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_libexecdir}/rpm +mkdir -p %{buildroot}%{_libexecdir}/rpm-plugins install -m 644 %{SOURCE1} %{buildroot}%{_libexecdir}/rpm/fileattrs/libsymlink.attr install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_sysconfdir}/device-sec-policy -install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_libdir}/rpm-plugins/msm-device-sec-policy +install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_libexecdir}/rpm-plugins/msm-device-sec-policy mkdir -p %{buildroot}%{_localstatedir}/lib/rpm #install -m 755 scripts/firmware.prov %{buildroot}%{_prefix}/lib/rpm @@ -382,6 +398,6 @@ exit 0 %defattr(-,root,root) %{_libdir}/rpm-plugins/msm.so %config(noreplace) %{_sysconfdir}/device-sec-policy -%{_libdir}/rpm-plugins/msm-device-sec-policy +%{_libexecdir}/rpm-plugins/msm-device-sec-policy /usr/share/license/%{name}-security-plugin %manifest rpm.manifest diff --git a/packaging/rpmbuild_4.9.1_fix.patch b/packaging/rpmbuild_4.9.1_fix.patch old mode 100644 new mode 100755 diff --git a/packaging/rpmbuild_rpmfc_4.9.1_fix.patch b/packaging/rpmbuild_rpmfc_4.9.1_fix.patch old mode 100644 new mode 100755 diff --git a/packaging/rpmio_base64_4.9.1_fix.patch b/packaging/rpmio_base64_4.9.1_fix.patch old mode 100644 new mode 100755 diff --git a/packaging/rpmlib_format_value_4.9.1_fix.patch b/packaging/rpmlib_format_value_4.9.1_fix.patch old mode 100644 new mode 100755 diff --git a/packaging/security_4.9.1.patch b/packaging/security_4.9.1.patch old mode 100644 new mode 100755 index 8c82fbf..ad7d660 --- a/packaging/security_4.9.1.patch +++ b/packaging/security_4.9.1.patch @@ -54,10 +54,10 @@ diff -Nuarp rpm/build/parsePreamble.c rpm-security/build/parsePreamble.c if (nump == NULL || *nump == '\0') { num = flag == RPMBUILD_ISSOURCE ? 0 : INT_MAX; } else { -@@ -891,6 +891,7 @@ static struct PreambleRec_s const preamb - {RPMTAG_BUGURL, 0, 0, LEN_AND_STR("bugurl")}, - {RPMTAG_COLLECTIONS, 0, 0, LEN_AND_STR("collections")}, - {RPMTAG_ORDERFLAGS, 2, 0, LEN_AND_STR("orderwithrequires")}, +@@ -913,6 +913,7 @@ static struct PreambleRec_s const preambleList[] = { + {RPMTAG_BUILDSUGGESTS, 0, 0, LEN_AND_STR("buildsuggests")}, + {RPMTAG_BUILDENHANCES, 0, 0, LEN_AND_STR("buildsupplements")}, + {RPMTAG_BUILDENHANCES, 0, 0, LEN_AND_STR("buildenhances")}, + {RPMTAG_SECMANIFEST, 0, 0, LEN_AND_STR("manifest")}, {0, 0, 0, 0} }; @@ -4323,7 +4323,7 @@ diff -Nuarp rpm/security/msmmatch.c rpm-security/security/msmmatch.c diff -Nuarp rpm/security/msmxattr.c rpm-security/security/msmxattr.c --- rpm/security/msmxattr.c 1970-01-01 02:00:00.000000000 +0200 +++ rpm-security/security/msmxattr.c 2012-10-01 10:29:50.327983644 +0300 -@@ -0,0 +1,1338 @@ +@@ -0,0 +1,1344 @@ +/* + * This file is part of MSM security plugin + * Greatly based on the code of MSSF security plugin @@ -5045,6 +5045,8 @@ diff -Nuarp rpm/security/msmxattr.c rpm-security/security/msmxattr.c + rpmlog(RPMLOG_ERR, "Request for a domain name %s that hasn't been yet defined by any package\n", mfx->request->ac_domain); + #ifdef ENABLE_DCHECKS + return -1; ++ #else ++ return 0; + #endif + } + @@ -5061,6 +5063,8 @@ diff -Nuarp rpm/security/msmxattr.c rpm-security/security/msmxattr.c + if (msmCheckDomainJoinPossibility(mfx, defined_ac_domain) < 0 ) + #ifdef ENABLE_DCHECKS + return -1; ++ #else ++ return 0; + #endif + + // now checking if security policy allows to join this domain @@ -5072,6 +5076,8 @@ diff -Nuarp rpm/security/msmxattr.c rpm-security/security/msmxattr.c + rpmlog(RPMLOG_ERR, "Request for a domain name %s isn't allowed based on package sw source\n", mfx->request->ac_domain); + #ifdef ENABLE_DCHECKS + return -1; ++ #else ++ return 0; + #endif + } + return 0; -- cgit v1.2.3