tizen 2.3 releasetizen_2.3_releasesubmit/tizen_2.3/20150202.105343tizen_2.3

11 files changed, 113 insertions, 126 deletions

diff --git a/packaging/nodigest.patch b/packaging/nodigest.patch
new file mode 100644
index 0000000..1eb101b
--- /dev/null
+++ b/packaging/nodigest.patch
@@ -0,0 +1,20 @@
+diff -urNp rpm-4.9.1.orig/rpmqv.c rpm-4.9.1/rpmqv.c
+--- rpm-4.9.1.orig/rpmqv.c	2014-03-04 11:19:08.000000000 +0900
++++ rpm-4.9.1/rpmqv.c	2014-05-26 10:26:25.183992358 +0900
+@@ -76,12 +76,16 @@ int main(int argc, char *argv[])
+ 
+ #if defined(IAM_RPMQV)
+     QVA_t qva = &rpmQVKArgs;
++    qva->qva_flags |= VERIFY_FILEDIGEST;
+ #endif
+ 
+ #ifdef	IAM_RPMEIU
+    struct rpmInstallArguments_s * ia = &rpmIArgs;
++    ia->transFlags |= RPMTRANS_FLAG_NOFILEDIGEST;
+ #endif
+ 
++    rpmcliQueryFlags |= VERIFY_DIGEST;
++
+     poptContext optCon;
+     int ec = 0;
+ #ifdef	IAM_RPMEIU
diff --git a/packaging/optflags.patch b/packaging/optflags.patch
index 0ab1ed1..5b6f51e 100644
--- a/packaging/optflags.patch
+++ b/packaging/optflags.patch
@@ -1,8 +1,6 @@
-Index: rpm-4.9.0/rpmrc.in
-===================================================================
---- rpm-4.9.0.orig/rpmrc.in
-+++ rpm-4.9.0/rpmrc.in
-@@ -12,10 +12,10 @@
+--- rpm-4.9.1.orig/rpmrc.in	2014-05-30 11:31:55.031950000 +0900
++++ rpm-4.9.1/rpmrc.in	2014-05-30 11:36:33.899950616 +0900
+@@ -12,16 +12,16 @@
  # "fat" binary with both archs, for Darwin
  optflags: fat -O2 -g -arch i386 -arch ppc
  
@@ -17,6 +15,13 @@ Index: rpm-4.9.0/rpmrc.in
  optflags: pentium3 -O2 -g -march=pentium3
  optflags: pentium4 -O2 -g -march=pentium4
  optflags: athlon -O2 -g -march=athlon
+ optflags: geode -Os -g -m32 -march=geode
+ optflags: ia64 -O2 -g
+-optflags: x86_64 -O2 -g
++optflags: x86_64 %{__global_cflags}
+ optflags: amd64 -O2 -g
+ optflags: ia32e -O2 -g
+ 
 @@ -58,18 +58,19 @@ optflags: hppa2.0 -O2 -g -mpa-risc-1-0
  optflags: mips -O2 -g
  optflags: mipsel -O2 -g
diff --git a/packaging/rpm-macros.patch b/packaging/rpm-macros.patch
index 8f3e1a2..44dfb31 100644
--- a/packaging/rpm-macros.patch
+++ b/packaging/rpm-macros.patch
@@ -14,6 +14,15 @@ Index: rpm-4.9.0/platform.in
 ===================================================================
 --- rpm-4.9.0.orig/platform.in
 +++ rpm-4.9.0/platform.in
+@@ -21,7 +21,7 @@
+ %_exec_prefix		@exec_prefix@
+ %_bindir		@bindir@
+ %_sbindir		@sbindir@
+-%_libexecdir		@libexecdir@
++%_libexecdir		@exec_prefix@/lib
+ %_datarootdir		@datarootdir@
+ %_datadir		@datadir@
+ %_sysconfdir		@sysconfdir@
 @@ -76,6 +76,26 @@
  @redhat@#%defattr(-,root,root,-)\
  @redhat@#%{nil}
diff --git a/packaging/rpm-python.changes b/packaging/rpm-python.changes
deleted file mode 100644
index e69de29..0000000
--- a/packaging/rpm-python.changes
+++ /dev/null
diff --git a/packaging/rpm-python.spec b/packaging/rpm-python.spec
index 47ca8ca..6671a65 100755..100644
--- a/packaging/rpm-python.spec
+++ b/packaging/rpm-python.spec
@@ -17,14 +17,15 @@ Name: rpm-python
 Version: %{rpmver}
 Release: 4
 License: GPLv2+
+BuildRequires: python-devel
 %{expand:%(sed -n -e '/^Source0:/,/^##PYTHON##/p' <%_sourcedir/rpm.spec)}
 Source100: rpm.spec
 Source1002: rpm-python.manifest 
 Requires: popt >= 1.10.2.1
-
 Requires: rpm = %{version}
 BuildRequires: db4-devel
-BuildRequires: python-devel
+
+
 # XXX generally assumed to be installed but make it explicit as rpm
 # is a bit special...
 BuildRequires: gawk
@@ -58,6 +59,7 @@ the package like its version, a description, etc.
 %{expand:%(sed -n -e '/^%%prep/,/^%%install/p' <%_sourcedir/rpm.spec | sed -e '1d' -e '$d')}
 %install
 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
diff --git a/packaging/rpm.changes b/packaging/rpm.changes
deleted file mode 100644
index f1fa2d8..0000000
--- a/packaging/rpm.changes
+++ /dev/null
@@ -1,52 +0,0 @@
-* Fri Jul 24 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0
-- Fixing the handling of all_packages uthash list
-- Changing the free functions to use msmFreePointer in order to delete safely
-- Changing the request handling in order to allow only one domain name inside a request section
-- Changing the allowed length of the label or domain to be 255
-
-* Fri Jul 12 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0
-- Fixing the path handling in plugin during labelling phase
-- Fixing the sw source retrival in case verify hook isn't called
-
-* Fri Jul 10 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0
-- Fixing rpm-security-plugin bug PTSEC-22: dbus  manifest is not generated correctly 
-- Fixing rpm-security-plugin bug PTSEC-24: package upgrade removes the file from /etc/smack/accesses.d
-
-* Wed Jul 04 2012 Anas Nashif <anas.nashif@intel.com> 6bf3412
-- remove auto dependencies
-
-* Mon Jun 25 2012 Anas Nashif <anas.nashif@intel.com> ab35aed
-- update release
-- require bzip2-devel >= 1.0.5
-
-* Mon Jun 25 2012 Anas Nashif <anas.nashif@intel.com> 70cc161
-- require bzip2-devel >= 1.0.5
-
-* Thu Jun 21 2012 Anas Nashif <anas.nashif@intel.com> 6863478
-- fixed optflags and perl auto-dependencies
-
-* Thu Jun 21 2012 Anas Nashif <anas.nashif@intel.com> c290eab
-- disable perl auto requires
-- fixed optflags
-
-* Wed Jun 20 2012 Elena, Reshetova <elena.reshetova@intel.com> dd9dc00
-- fixing pre/posttrans scripts calls and plugin
-
-* Fri Jun 15 2012 Ryan Ware <ryan.r.ware@intel.com> bf466c3
-- Version 4.9.0, release to OBS
-
-* Tue Jun 12 2012 Elena, Reshetova <elena.reshetova@intel.com> 733aadb
-- Fixng rpm-security-plugin bugs (PTSEC-19, PTSEC-20, PTSEC-21)
-
-* Wed May 30 2012 Ryan Ware <ryan.r.ware@intel.com> 91057db
-- Add default Smack manifest for rpm.spec
-- Add default Smack manifest for rpm-python.spec
-
-* Tue May 29 2012 Elena, Reshetova <elena.reshetova@intel.com> 3257c01
-- adding fixes for exec label handling and fixing plugin dependencies
-
-* Mon May 21 2012 Kim Kibum <kb0929.kim@samsung.com> dec48cf
-- Upload Tizen:Base source
-[ Hyesook Choi ]
-- Initial empty repository
-
diff --git a/packaging/rpm.manifest b/packaging/rpm.manifest
index c922afb..9f7b847 100644
--- a/packaging/rpm.manifest
+++ b/packaging/rpm.manifest
@@ -3,6 +3,6 @@
                 <domain name="_"/>
         </request>
         <assign>
-                <filesystem path="/bin/*" exec_label="none" />
+                <filesystem path="/usr/bin/*" exec_label="none" />
         </assign>
 </manifest>
diff --git a/packaging/rpm.spec b/packaging/rpm.spec
index 680f7e5..b2f70cb 100644
--- a/packaging/rpm.spec
+++ b/packaging/rpm.spec
@@ -8,6 +8,8 @@ Version:        4.9.1
 Release:        %{release_prefix}
 Summary:        The RPM package management system
 Url:            http://www.rpm.org/
+# Partially GPL/LGPL dual-licensed and some bits with BSD
+# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
 License:        GPLv2+
 Group:          System/Base
 Source0:        http://rpm.org/releases/rpm-4.9.x/rpm-%{version}.tar.bz2
@@ -48,8 +50,6 @@ Patch85:        rpmio_base64_4.9.1_fix.patch
 Patch86:        rpmlib_format_value_4.9.1_fix.patch
 Patch87:        security_4.9.1.patch
 
-# Partially GPL/LGPL dual-licensed and some bits with BSD
-# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
 ##PYTHON##
 
 BuildRequires:  bzip2-devel >= 0.9.0c-2
@@ -200,6 +200,7 @@ libtoolize -f -c
     --localstatedir=%{_localstatedir} \
     --sharedstatedir=%{_localstatedir}/lib \
     --libdir=%{_libdir} \
+    --libexecdir=%{_libexecdir} \
 %if %{with python}
     --enable-python \
 %endif
@@ -216,8 +217,8 @@ make %{?_smp_mflags}
 find %{buildroot} -regex ".*\\.la$" | xargs rm -f --
 
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
-mkdir -p %{buildroot}%{_libdir}/rpm
-install -m 644 %{SOURCE1} %{buildroot}%{_libdir}/rpm/fileattrs/libsymlink.attr
+mkdir -p %{buildroot}%{_libexecdir}/rpm
+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
 mkdir -p %{buildroot}%{_localstatedir}/lib/rpm
@@ -237,9 +238,9 @@ done
 
 #macros
 
-mkdir -p %{buildroot}%{_libdir}/rpm/tizen
-install -m 755 %{SOURCE21} %{buildroot}%{_libdir}/rpm/tizen
-install -m 644 %{SOURCE20} %{buildroot}%{_libdir}/rpm/tizen
+mkdir -p %{buildroot}%{_libexecdir}/rpm/tizen
+install -m 755 %{SOURCE21} %{buildroot}%{_libexecdir}/rpm/tizen
+install -m 644 %{SOURCE20} %{buildroot}%{_libexecdir}/rpm/tizen
 
 mkdir -p %{buildroot}/usr/share/license
 cp %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/usr/share/license/%{name}
@@ -247,7 +248,7 @@ cp %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/usr/share/license/%{name}-li
 cp %{_builddir}/%{buildsubdir}/COPYING %{buildroot}/usr/share/license/%{name}-security-plugin
 
 # avoid dragging in tonne of perl libs for an unused script
-chmod 0644 %{buildroot}/%{_libdir}/rpm/perldeps.pl
+chmod 0644 %{buildroot}/%{_libexecdir}/rpm/perldeps.pl
 
 rm -rf %{buildroot}%{_mandir}/*/man?
 %clean
@@ -277,16 +278,15 @@ exit 0
 
 
 %files  -f rpm.lang
-/usr/share/license/rpm
-%manifest rpm.manifest
 %defattr(-,root,root,-)
+/usr/share/license/rpm
 %doc GROUPS COPYING CREDITS
 %exclude /usr/lib/rpm/rpmdb_loadcvt
 %dir %{_sysconfdir}/rpm
 
 %attr(0755, root, root)   %dir %{_localstatedir}/lib/rpm
 %attr(0644, root, root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_localstatedir}/lib/rpm/*
-%attr(0755, root, root) %dir %{_libdir}/rpm
+%attr(0755, root, root) %dir %{_libexecdir}/rpm
 
 /bin/rpm
 %{_bindir}/rpmkeys
@@ -300,87 +300,88 @@ exit 0
 %{_libdir}/rpm-plugins/exec.so
 %{_libdir}/rpm-plugins/sepolicy.so
 
-%{_libdir}/rpm/macros
-%{_libdir}/rpm/tizen/macros
-%{_libdir}/rpm/rpmpopt*
-%{_libdir}/rpm/rpmrc
+%{_libexecdir}/rpm/macros
+%{_libexecdir}/rpm/tizen/macros
+%{_libexecdir}/rpm/rpmpopt*
+%{_libexecdir}/rpm/rpmrc
 
-%{_libdir}/rpm/rpmdb_*
-%{_libdir}/rpm/rpm.daily
-%{_libdir}/rpm/rpm.log
-%{_libdir}/rpm/rpm2cpio.sh
-%{_libdir}/rpm/tgpg
+%{_libexecdir}/rpm/rpmdb_*
+%{_libexecdir}/rpm/rpm.daily
+%{_libexecdir}/rpm/rpm.log
+%{_libexecdir}/rpm/rpm2cpio.sh
+%{_libexecdir}/rpm/tgpg
 
-%{_libdir}/rpm/platform
+%{_libexecdir}/rpm/platform
+%manifest rpm.manifest
 
 %files libs
-%manifest rpm.manifest
 %defattr(-,root,root)
 %{_libdir}/librpm*.so.*
 /usr/share/license/%{name}-libs
+%manifest rpm.manifest
 
 %files build
-%manifest rpm.manifest
 %defattr(-,root,root)
 %{_bindir}/rpmbuild
 %{_bindir}/gendiff
 
-%{_libdir}/rpm/fileattrs/*.attr
-%{_libdir}/rpm/script.req
-
-%{_libdir}/rpm/brp-*
-%{_libdir}/rpm/check-buildroot
-%{_libdir}/rpm/check-files
-%{_libdir}/rpm/check-prereqs
-%{_libdir}/rpm/check-rpaths*
-%{_libdir}/rpm/debugedit
-%{_libdir}/rpm/elfdeps
-%{_libdir}/rpm/find-debuginfo.sh
-%{_libdir}/rpm/tizen/find-docs.sh
-%{_libdir}/rpm/find-lang.sh
-%{_libdir}/rpm/find-provides
-%{_libdir}/rpm/find-requires
-%{_libdir}/rpm/javadeps
-%{_libdir}/rpm/mono-find-provides
-%{_libdir}/rpm/mono-find-requires
-%{_libdir}/rpm/ocaml-find-provides.sh
-%{_libdir}/rpm/ocaml-find-requires.sh
-%{_libdir}/rpm/osgideps.pl
-%{_libdir}/rpm/perldeps.pl
-%{_libdir}/rpm/libtooldeps.sh
-%{_libdir}/rpm/pkgconfigdeps.sh
-%{_libdir}/rpm/perl.prov
-#%{_libdir}/rpm/debuginfo.prov
-#%{_libdir}/rpm/firmware.prov
-%{_libdir}/rpm/perl.req
-%{_libdir}/rpm/tcl.req
-%{_libdir}/rpm/pythondeps.sh
-%{_libdir}/rpm/rpmdeps
-%{_libdir}/rpm/config.guess
-%{_libdir}/rpm/config.sub
-%{_libdir}/rpm/mkinstalldirs
-%{_libdir}/rpm/desktop-file.prov
-%{_libdir}/rpm/fontconfig.prov
-
-%{_libdir}/rpm/macros.perl
-%{_libdir}/rpm/macros.python
-%{_libdir}/rpm/macros.php
+%{_libexecdir}/rpm/fileattrs/*.attr
+%{_libexecdir}/rpm/script.req
+
+%{_libexecdir}/rpm/brp-*
+%{_libexecdir}/rpm/check-buildroot
+%{_libexecdir}/rpm/check-files
+%{_libexecdir}/rpm/check-prereqs
+%{_libexecdir}/rpm/check-rpaths*
+%{_libexecdir}/rpm/debugedit
+%{_libexecdir}/rpm/elfdeps
+%{_libexecdir}/rpm/find-debuginfo.sh
+%{_libexecdir}/rpm/tizen/find-docs.sh
+%{_libexecdir}/rpm/find-lang.sh
+%{_libexecdir}/rpm/find-provides
+%{_libexecdir}/rpm/find-requires
+%{_libexecdir}/rpm/javadeps
+%{_libexecdir}/rpm/mono-find-provides
+%{_libexecdir}/rpm/mono-find-requires
+%{_libexecdir}/rpm/ocaml-find-provides.sh
+%{_libexecdir}/rpm/ocaml-find-requires.sh
+%{_libexecdir}/rpm/osgideps.pl
+%{_libexecdir}/rpm/perldeps.pl
+%{_libexecdir}/rpm/libtooldeps.sh
+%{_libexecdir}/rpm/pkgconfigdeps.sh
+%{_libexecdir}/rpm/perl.prov
+#%{_libexecdir}/rpm/debuginfo.prov
+#%{_libexecdir}/rpm/firmware.prov
+%{_libexecdir}/rpm/perl.req
+%{_libexecdir}/rpm/tcl.req
+%{_libexecdir}/rpm/pythondeps.sh
+%{_libexecdir}/rpm/rpmdeps
+%{_libexecdir}/rpm/config.guess
+%{_libexecdir}/rpm/config.sub
+%{_libexecdir}/rpm/mkinstalldirs
+%{_libexecdir}/rpm/desktop-file.prov
+%{_libexecdir}/rpm/fontconfig.prov
+
+%{_libexecdir}/rpm/macros.perl
+%{_libexecdir}/rpm/macros.python
+%{_libexecdir}/rpm/macros.php
 
+%manifest rpm.manifest
 
 
 %files devel
-%manifest rpm.manifest
 %defattr(-,root,root)
 %{_includedir}/rpm
 %{_libdir}/librp*[a-z].so
 %{_bindir}/rpmgraph
 %{_libdir}/pkgconfig/rpm.pc
+%manifest rpm.manifest
 
 
 %files security-plugin
-%manifest rpm.manifest
 %defattr(-,root,root)
 %{_libdir}/rpm-plugins/msm.so
 %config(noreplace) %{_sysconfdir}/device-sec-policy
 %{_libdir}/rpm-plugins/msm-device-sec-policy
 /usr/share/license/%{name}-security-plugin
+%manifest rpm.manifest
diff --git a/scripts/rpm.daily b/scripts/rpm.daily
index 3a199cc..a65c93e 100755
--- a/scripts/rpm.daily
+++ b/scripts/rpm.daily
@@ -1,4 +1,5 @@
 #!/bin/sh
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 tmpfile=`/bin/mktemp /var/log/rpmpkgs.XXXXXXXXX` || exit 1
 /bin/rpm -qa --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n' 2>&1 \
diff --git a/scripts/rpm2cpio.sh b/scripts/rpm2cpio.sh
index b03ee36..b81022c 100755
--- a/scripts/rpm2cpio.sh
+++ b/scripts/rpm2cpio.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 pkg=$1
 if [ "$pkg" = "" -o ! -e "$pkg" ]; then
diff --git a/scripts/tgpg b/scripts/tgpg
index 238cffb..491740d 100755
--- a/scripts/tgpg
+++ b/scripts/tgpg
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:/bin:/usr/bin
 
 for pkg in $*
 do