开源软件构建与测试

_service:obs_scm:gcc_secure.spec Changed

@@ -1,30 +1,37 @@
 Name:           gcc_secure
-Summary:        Enforcing secure compile options for abuild
-License:        GPL-2.0-only
+Summary:        Build with gcov
+License:        GPL
 Group:          System/Management
 Version:        1.0
-Release:        0.13
+Release:        0.5
 BuildRoot:      %{_tmppath}/%{name}-%{version}
+#Source:         %{name}-%{version}.tar.bz2
 
 BuildRequires: util-linux coreutils
 
-Requires:  util-linux rpm grep binutils gcc coreutils rpm-build gcc-c++
-
+Requires:  util-linux rpm grep binutils gcc coreutils rpm-build
+#expect grep sudo kernel-default kernel-default-base openssh
 %description
-Enforcing secure compile option for abuild
+Build with gcov
 
 %prep
+#%setup -cT
 
 %install
+#mkdir -p %{buildroot}/opt/needgcov
+
 
 %pre
 
 %post
-echo -e '*cc1_options:\n+ %{!D__KERNEL__:%{!nostdlib:%{!nodefaultlibs:%{!fno-stack-protector:%{!fstack-protector-all:-fstack-protector-strong}}}}}' >/opt/gcc-specs-fs-cc1
+%if 1
+echo "Dummy. Do nothing."
+%else
+echo -e '*cc1_options:\n+ %{!D__KERNEL__:%{!nostdlib:%{!nodefaultlibs:%{!fno-stack-protector:%{!fstack-protector-all:-fstack-protector-strong}}}}}' >/tmp/gcc-specs-fs-cc1
 
-echo -e '*cc1_options:\n+ %{!r:%{!D__KERNEL__:%{!pie:%{!fpic:%{!fPIC:%{!fpie:%{!fPIE:%{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE:%{!shared:%{!static:%{!nostdlib:%{!nostartfiles:-fPIE}}}}}}}}}}}}}}}' >/opt/gcc-specs-pie-cc1
+echo -e '*cc1_options:\n+ %{!r:%{!D__KERNEL__:%{!pie:%{!fpic:%{!fPIC:%{!fpie:%{!fPIE:%{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE:%{!shared:%{!static:%{!nostdlib:%{!nostartfiles:-fPIE}}}}}}}}}}}}}}}' >/tmp/gcc-specs-pie-cc1
 
-echo -e '*self_spec:\n+ %{!D__KERNEL__:%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r:%{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}}' >/opt/gcc-specs-pie-ld
+echo -e '*self_spec:\n+ %{!D__KERNEL__:%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r:%{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}}' >/tmp/gcc-specs-pie-ld
 
 old_gcc=/usr/bin/gcc
 mv $old_gcc $old_gcc"_old"
@@ -32,7 +39,7 @@
 #!/bin/sh
 gcc_secure_exclude=\`rpm --eval %{gcc_secure_exclude}\`
 if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then
-    sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -fsigned-char'
+    sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines'
     fs_opt=''
 
     if  "\$@" =~ "-O0" ; then
@@ -59,16 +66,16 @@
 
     if  x\$rpm_name = "xglibc"  ||  x\$rpm_name = "xcompat-glibc" ;then
         #glibc supply fs define, can not add fs for glibc self
-        /usr/bin/gcc_old \$sec_opt "\$@" \$fs_opt --specs=/opt/gcc-specs-pie-cc1 --specs=/opt/gcc-specs-pie-ld
+        /usr/bin/gcc_old \$sec_opt "\$@" \$fs_opt --specs=/tmp/gcc-specs-pie-cc1 --specs=/tmp/gcc-specs-pie-ld
     else
-        /usr/bin/gcc_old \$sec_opt "\$@" \$fs_opt --specs=/opt/gcc-specs-pie-cc1 --specs=/opt/gcc-specs-pie-ld --specs=/opt/gcc-specs-fs-cc1
+        /usr/bin/gcc_old \$sec_opt "\$@" \$fs_opt --specs=/tmp/gcc-specs-pie-cc1 --specs=/tmp/gcc-specs-pie-ld --specs=/tmp/gcc-specs-fs-cc1
     fi
 
 else
     $old_gcc"_old" "\$@"
 fi
 END1
-chmod 755 $old_gcc $old_gcc"_old"
+chmod 777 $old_gcc $old_gcc"_old"
 
 old_gplus=/usr/bin/g++
 if  -f $old_gplus ; then
@@ -77,7 +84,7 @@
 #!/bin/sh
 gcc_secure_exclude=\`rpm --eval %{gcc_secure_exclude}\`
 if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then
-    sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -fsigned-char'
+    sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines'
     fs_opt=''
 
     if  "\$@" =~ "-O0" ; then
@@ -101,13 +108,13 @@
         #libtool use g++ -v for test compile env,if add Wl opt, it will make g++ -v fail
         $old_gplus"_old" "\$@"
     else
-        /usr/bin/g++_old \$sec_opt "\$@" \$fs_opt  --specs=/opt/gcc-specs-pie-cc1 --specs=/opt/gcc-specs-pie-ld --specs=/opt/gcc-specs-fs-cc1
+        /usr/bin/g++_old \$sec_opt "\$@" \$fs_opt  --specs=/tmp/gcc-specs-pie-cc1 --specs=/tmp/gcc-specs-pie-ld --specs=/tmp/gcc-specs-fs-cc1
     fi
 else
     $old_gplus"_old" "\$@"
 fi
 END1
-chmod 755 $old_gplus $old_gplus"_old"
+chmod 777 $old_gplus $old_gplus"_old"
 fi
 
 old_cpp=/usr/bin/c++
@@ -117,7 +124,7 @@
 #!/bin/sh
 gcc_secure_exclude=\`rpm --eval %{gcc_secure_exclude}\`
 if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then
-    sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -fsigned-char'
+    sec_opt='-fPIC -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines'
     fs_opt=''
 
     if  "\$@" =~ "-O0" ; then
@@ -137,14 +144,15 @@
         fs_opt=\`cat \$configfile| grep fs_opt| awk -F: '{print \$NF}'\`
     fi
 
-    /usr/bin/c++_old \$sec_opt "\$@" \$fs_opt  --specs=/opt/gcc-specs-pie-cc1 --specs=/opt/gcc-specs-pie-ld --specs=/opt/gcc-specs-fs-cc1
+    /usr/bin/c++_old \$sec_opt "\$@" \$fs_opt  --specs=/tmp/gcc-specs-pie-cc1 --specs=/tmp/gcc-specs-pie-ld --specs=/tmp/gcc-specs-fs-cc1
 
 else
     $old_cpp"_old" "\$@"
 fi
 END1
-chmod 755 $old_cpp $old_cpp"_old"
+chmod 777 $old_cpp $old_cpp"_old"
 fi
+%endif
 
 %preun
 
@@ -153,6 +161,9 @@
 
 %files
 %defattr(-,root,root)
+#%dir /opt/needgcov
+
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT/*
@@ -160,50 +171,8 @@
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
 %changelog
-* Fri Nov 25 2022 Ge Wang<wnagge20@h-partners.com> - 1.0-0.13
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: add requires gcc-c++
-
-* Thu Jul 28 2022 Chenyx <chenyixiong3@huawei.com> - 1.0-0.12
-- License compliance rectification
-
-* Thu Feb 17 2022 zoulin<zoulin13@h-partners.com> - 1.0-0.11
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: Add automake.spec to gcc_secure_exclude
-
-* Thu Feb 10 2022 zhangchenfeng<zhangchenfeng1@huawei.com> - 1.0-0.10
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: clean spec
-
-* Wed Jul 21 2021 licihua<licihua@huawei.com> - 1.0-0.9
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: support -fsigned-char for g++
-
-* Mon Jul 12 2021 shenyangyang<shenyangyang4@huawei.com> - 1.0-0.8
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:change file mode from 777 to 755 for secure
-
-* Thu Apr 8 2021 shenyangyang<shenyangyang4@huawei.com> - 1.0-0.7
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: bump release rebuilding for adding rhash.spec to macro gcc_secure_exclude
-
-* Tue Feb 18 2020 yanzhihua<yanzhihua4@huawei.com> - 1.0-0.6
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: add compile options for arm
+* Mon Jan 31 2022 Eustace <eustace@outlook.com> - 1.0-1
+- the code needs to be tidy up
 
 * Mon Jan 13 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.0-0.5
 - package init

_service Changed

_service:obs_scm:SPEC.gcc_secure-1643631123.7da915e.obscpio Added

_service:obs_scm:SPEC.gcc_secure.obsinfo Added

_service:obs_scm:gcc_secure-1718191967.c407202.obscpio Deleted

_service:obs_scm:gcc_secure.obsinfo Deleted

_service:obs_scm:gcc_secure.yaml Deleted

Changes of Revision 2