Star1
13
代码
代码
Issues4
Pull Requests7
项目讨论
Wiki
分析
Star1
13
已开启
replace hardcoded $RPM_SOURCE_DIR with %{_sourcedir} and %{_prefix}/lib/tmpfiles.d with %{_tmpfilesdir} #286
majianhan创建于 3月18日
replace hardcoded $RPM_SOURCE_DIR with %{_sourcedir} and %{_prefix}/lib/tmpfiles.d with %{_tmpfilesdir} #286
已开启
majianhan创建于 3月18日
从crawfordxx/httpdfix-spec-hardcoded-paths合入到src-openeuler/httpdmaster
共 1 个文件变更+27-25
Mhttpd.spec+27-25
@@ -8,7 +8,7 @@
8Name: httpd8Name: httpd
9Summary: Apache HTTP Server9Summary: Apache HTTP Server
10Version: 2.4.5810Version: 2.4.58
11-Release: 1211+Release: 13
12License: ASL 2.012License: ASL 2.0
13URL: https://httpd.apache.org/13URL: https://httpd.apache.org/
14Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz214Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@@ -208,17 +208,17 @@ sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
208sed -i 's/openEuler/%{_vendor}/g' config.layout208sed -i 's/openEuler/%{_vendor}/g' config.layout
209 209 
210# Example conf for instances210# Example conf for instances
211-cp $RPM_SOURCE_DIR/instance.conf .211+cp %{_sourcedir}/instance.conf .
212-sed < $RPM_SOURCE_DIR/httpd.conf >> instance.conf '212+sed < %{_sourcedir}/httpd.conf >> instance.conf '
2130,/^ServerRoot/d;2130,/^ServerRoot/d;
214/# Supplemental configuration/,$d214/# Supplemental configuration/,$d
215/^ *CustomLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,215/^ *CustomLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,
216/^ *ErrorLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,216/^ *ErrorLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,
217'217'
218-touch -r $RPM_SOURCE_DIR/instance.conf instance.conf218+touch -r %{_sourcedir}/instance.conf instance.conf
219-cp -p $RPM_SOURCE_DIR/server-status.conf server-status.conf219+cp -p %{_sourcedir}/server-status.conf server-status.conf
220 220 
221-sed 's/@MPM@/%{mpm}/' < $RPM_SOURCE_DIR/httpd.service.xml \221+sed 's/@MPM@/%{mpm}/' < %{_sourcedir}/httpd.service.xml \
222 > httpd.service.xml222 > httpd.service.xml
223 223 
224xmlto man ./httpd.service.xml224xmlto man ./httpd.service.xml
@@ -263,31 +263,31 @@ rm -rf $RPM_BUILD_ROOT
263%make_install263%make_install
264 264 
265install -d $RPM_BUILD_ROOT%{_unitdir}265install -d $RPM_BUILD_ROOT%{_unitdir}
266-install -p -m644 $RPM_SOURCE_DIR/httpd.service $RPM_BUILD_ROOT%{_unitdir}/httpd.service266+install -p -m644 %{_sourcedir}/httpd.service $RPM_BUILD_ROOT%{_unitdir}/httpd.service
267-install -p -m644 $RPM_SOURCE_DIR/{htcacheclean.service,httpd.socket,httpd@.service,httpd-init.service} $RPM_BUILD_ROOT%{_unitdir}/267+install -p -m644 %{_sourcedir}/{htcacheclean.service,httpd.socket,httpd@.service,httpd-init.service} $RPM_BUILD_ROOT%{_unitdir}/
268 268 
269-install -D -m644 $RPM_SOURCE_DIR/README.confd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README269+install -D -m644 %{_sourcedir}/README.confd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
270-install -D -m644 $RPM_SOURCE_DIR/README.confmod $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README270+install -D -m644 %{_sourcedir}/README.confmod $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README
271-install -p -m644 $RPM_SOURCE_DIR/0*.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/271+install -p -m644 %{_sourcedir}/0*.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/
272 272 
273sed -i '/^#LoadModule mpm_%{mpm}_module /s/^#//' $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf273sed -i '/^#LoadModule mpm_%{mpm}_module /s/^#//' $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf
274-touch -r $RPM_SOURCE_DIR/00-mpm.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf274+touch -r %{_sourcedir}/00-mpm.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf
275 275 
276install -d $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d276install -d $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d
277-install -D -m 644 -p $RPM_SOURCE_DIR/10-listen443.conf $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf277+install -D -m 644 -p %{_sourcedir}/10-listen443.conf $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf
278-install -m644 -p $RPM_SOURCE_DIR/{welcome.conf,ssl.conf,manual.conf,userdir.conf} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/278+install -m644 -p %{_sourcedir}/{welcome.conf,ssl.conf,manual.conf,userdir.conf} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
279install -m 644 docs/conf/extra/httpd-autoindex.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/autoindex.conf279install -m 644 docs/conf/extra/httpd-autoindex.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/autoindex.conf
280 280 
281rm -v docs/conf/extra/httpd-{ssl,userdir}.conf281rm -v docs/conf/extra/httpd-{ssl,userdir}.conf
282rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf282rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
283 283 
284-install -m 644 -p $RPM_SOURCE_DIR/httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf284+install -m 644 -p %{_sourcedir}/httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
285 285 
286-install -D -m 644 -p $RPM_SOURCE_DIR/htcacheclean.sysconf \286+install -D -m 644 -p %{_sourcedir}/htcacheclean.sysconf \
287 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/htcacheclean287 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/htcacheclean
288 288 
289-install -D -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \289+install -D -m 644 -p %{_sourcedir}/httpd.tmpfiles \
290- $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/httpd.conf290+ $RPM_BUILD_ROOT%{_tmpfilesdir}/httpd.conf
291 291 
292install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/{dav,httpd} \292install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/{dav,httpd} \
293 $RPM_BUILD_ROOT/run/httpd/htcacheclean293 $RPM_BUILD_ROOT/run/httpd/htcacheclean
@@ -313,7 +313,7 @@ cat > $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.httpd <<EOF
313EOF313EOF
314 314 
315install -d $RPM_BUILD_ROOT%{contentdir}/{noindex,server-status}315install -d $RPM_BUILD_ROOT%{contentdir}/{noindex,server-status}
316-install -m 644 -p $RPM_SOURCE_DIR/index.html \316+install -m 644 -p %{_sourcedir}/index.html \
317 $RPM_BUILD_ROOT%{contentdir}/noindex/index.html317 $RPM_BUILD_ROOT%{contentdir}/noindex/index.html
318install -m 644 -p docs/server-status/* \318install -m 644 -p docs/server-status/* \
319 $RPM_BUILD_ROOT%{contentdir}/server-status319 $RPM_BUILD_ROOT%{contentdir}/server-status
@@ -343,15 +343,15 @@ ln -s ../..%{_localstatedir}/lib/httpd $RPM_BUILD_ROOT/etc/httpd/state
343ln -s /run/httpd $RPM_BUILD_ROOT/etc/httpd/run343ln -s /run/httpd $RPM_BUILD_ROOT/etc/httpd/run
344ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules344ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
345 345 
346-install -D -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \346+install -D -m755 %{_sourcedir}/httpd-ssl-pass-dialog \
347 $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog347 $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog
348 348 
349-install -m755 $RPM_SOURCE_DIR/httpd-ssl-gencerts $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts349+install -m755 %{_sourcedir}/httpd-ssl-gencerts $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts
350 350 
351-install -D -p -m 755 $RPM_SOURCE_DIR/action-graceful.sh $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/graceful351+install -D -p -m 755 %{_sourcedir}/action-graceful.sh $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/graceful
352-install -p -m 755 $RPM_SOURCE_DIR/action-configtest.sh $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/configtest352+install -p -m 755 %{_sourcedir}/action-configtest.sh $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/configtest
353 353 
354-install -D -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \354+install -D -m 644 -p %{_sourcedir}/httpd.logrotate \
355 $RPM_BUILD_ROOT/etc/logrotate.d/httpd355 $RPM_BUILD_ROOT/etc/logrotate.d/httpd
356 356 
357install -m 644 -p httpd.service.8 httpd-init.service.8 httpd.socket.8 httpd@.service.8 \357install -m 644 -p httpd.service.8 httpd-init.service.8 httpd.socket.8 httpd@.service.8 \
@@ -448,7 +448,7 @@ exit $rv
448 448 
449%config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean449%config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean
450%ghost %{_sysconfdir}/sysconfig/httpd450%ghost %{_sysconfdir}/sysconfig/httpd
451-%{_prefix}/lib/tmpfiles.d/httpd.conf451+%{_tmpfilesdir}/httpd.conf
452%{_libexecdir}/initscripts/legacy-actions/httpd/*452%{_libexecdir}/initscripts/legacy-actions/httpd/*
453%{_sbindir}/ht*453%{_sbindir}/ht*
454%{_sbindir}/fcgistarter454%{_sbindir}/fcgistarter
@@ -544,6 +544,8 @@ exit $rv
544%{_rpmconfigdir}/macros.d/macros.httpd544%{_rpmconfigdir}/macros.d/macros.httpd
545 545 
546%changelog546%changelog
547+* Wed Mar 18 2026 majianhan <majianhan@kylinos.cn> - 2.4.58-13
548+- DESC:replace hardcoded $RPM_SOURCE_DIR with %{_sourcedir} and %{_prefix}/lib/tmpfiles.d with %{_tmpfilesdir}
547* Tue Jan 13 2026 zhaoyonghao <zhaoyonghao10@h-partners.com> - 2.4.58-12549* Tue Jan 13 2026 zhaoyonghao <zhaoyonghao10@h-partners.com> - 2.4.58-12
548- Type:CVE550- Type:CVE
549- CVE:CVE-2025-55753551- CVE:CVE-2025-55753