Star1
13
代码
代码
Issues4
Pull Requests7
项目讨论
Wiki
分析
Star1
13
已开启
modify spec file macro #252
AtomGit-Bot创建于 2025年11月25日
modify spec file macro #252
已开启
AtomGit-Bot创建于 2025年11月25日
从refs/pull/252/head合入到master
共 1 个文件变更+33-25
Mhttpd.spec+33-25
@@ -8,7 +8,7 @@
8Name: httpd8Name: httpd
9Summary: Apache HTTP Server9Summary: Apache HTTP Server
10Version: 2.4.5810Version: 2.4.58
11-Release: 1011+Release: 11
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
@@ -204,17 +204,17 @@ sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
204sed -i 's/openEuler/%{_vendor}/g' config.layout204sed -i 's/openEuler/%{_vendor}/g' config.layout
205 205 
206# Example conf for instances206# Example conf for instances
207-cp $RPM_SOURCE_DIR/instance.conf .207+cp %{_sourcedir}/instance.conf .
208-sed < $RPM_SOURCE_DIR/httpd.conf >> instance.conf '208+sed < %{_sourcedir}/httpd.conf >> instance.conf '
2090,/^ServerRoot/d;2090,/^ServerRoot/d;
210/# Supplemental configuration/,$d210/# Supplemental configuration/,$d
211/^ *CustomLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,211/^ *CustomLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,
212/^ *ErrorLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,212/^ *ErrorLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_,
213'213'
214-touch -r $RPM_SOURCE_DIR/instance.conf instance.conf214+touch -r %{_sourcedir}/instance.conf instance.conf
215-cp -p $RPM_SOURCE_DIR/server-status.conf server-status.conf215+cp -p %{_sourcedir}/server-status.conf server-status.conf
216 216 
217-sed 's/@MPM@/%{mpm}/' < $RPM_SOURCE_DIR/httpd.service.xml \217+sed 's/@MPM@/%{mpm}/' < %{_sourcedir}/httpd.service.xml \
218 > httpd.service.xml218 > httpd.service.xml
219 219 
220xmlto man ./httpd.service.xml220xmlto man ./httpd.service.xml
@@ -259,31 +259,31 @@ rm -rf $RPM_BUILD_ROOT
259%make_install259%make_install
260 260 
261install -d $RPM_BUILD_ROOT%{_unitdir}261install -d $RPM_BUILD_ROOT%{_unitdir}
262-install -p -m644 $RPM_SOURCE_DIR/httpd.service $RPM_BUILD_ROOT%{_unitdir}/httpd.service262+install -p -m644 %{_sourcedir}/httpd.service $RPM_BUILD_ROOT%{_unitdir}/httpd.service
263-install -p -m644 $RPM_SOURCE_DIR/{htcacheclean.service,httpd.socket,httpd@.service,httpd-init.service} $RPM_BUILD_ROOT%{_unitdir}/263+install -p -m644 %{_sourcedir}/{htcacheclean.service,httpd.socket,httpd@.service,httpd-init.service} $RPM_BUILD_ROOT%{_unitdir}/
264 264 
265-install -D -m644 $RPM_SOURCE_DIR/README.confd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README265+install -D -m644 %{_sourcedir}/README.confd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
266-install -D -m644 $RPM_SOURCE_DIR/README.confmod $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README266+install -D -m644 %{_sourcedir}/README.confmod $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README
267-install -p -m644 $RPM_SOURCE_DIR/0*.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/267+install -p -m644 %{_sourcedir}/0*.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/
268 268 
269sed -i '/^#LoadModule mpm_%{mpm}_module /s/^#//' $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf269sed -i '/^#LoadModule mpm_%{mpm}_module /s/^#//' $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf
270-touch -r $RPM_SOURCE_DIR/00-mpm.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf270+touch -r %{_sourcedir}/00-mpm.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf
271 271 
272install -d $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d272install -d $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d
273-install -D -m 644 -p $RPM_SOURCE_DIR/10-listen443.conf $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf273+install -D -m 644 -p %{_sourcedir}/10-listen443.conf $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf
274-install -m644 -p $RPM_SOURCE_DIR/{welcome.conf,ssl.conf,manual.conf,userdir.conf} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/274+install -m644 -p %{_sourcedir}/{welcome.conf,ssl.conf,manual.conf,userdir.conf} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
275install -m 644 docs/conf/extra/httpd-autoindex.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/autoindex.conf275install -m 644 docs/conf/extra/httpd-autoindex.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/autoindex.conf
276 276 
277rm -v docs/conf/extra/httpd-{ssl,userdir}.conf277rm -v docs/conf/extra/httpd-{ssl,userdir}.conf
278rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf278rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf
279 279 
280-install -m 644 -p $RPM_SOURCE_DIR/httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf280+install -m 644 -p %{_sourcedir}/httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf
281 281 
282-install -D -m 644 -p $RPM_SOURCE_DIR/htcacheclean.sysconf \282+install -D -m 644 -p %{_sourcedir}/htcacheclean.sysconf \
283 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/htcacheclean283 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/htcacheclean
284 284 
285-install -D -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \285+install -D -m 644 -p %{_sourcedir}/httpd.tmpfiles \
286- $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/httpd.conf286+ $RPM_BUILD_ROOT%{_tmpfilesdir}/httpd.conf
287 287 
288install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/{dav,httpd} \288install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/{dav,httpd} \
289 $RPM_BUILD_ROOT/run/httpd/htcacheclean289 $RPM_BUILD_ROOT/run/httpd/htcacheclean
@@ -309,7 +309,7 @@ cat > $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.httpd <<EOF
309EOF309EOF
310 310 
311install -d $RPM_BUILD_ROOT%{contentdir}/{noindex,server-status}311install -d $RPM_BUILD_ROOT%{contentdir}/{noindex,server-status}
312-install -m 644 -p $RPM_SOURCE_DIR/index.html \312+install -m 644 -p %{_sourcedir}/index.html \
313 $RPM_BUILD_ROOT%{contentdir}/noindex/index.html313 $RPM_BUILD_ROOT%{contentdir}/noindex/index.html
314install -m 644 -p docs/server-status/* \314install -m 644 -p docs/server-status/* \
315 $RPM_BUILD_ROOT%{contentdir}/server-status315 $RPM_BUILD_ROOT%{contentdir}/server-status
@@ -339,15 +339,15 @@ ln -s ../..%{_localstatedir}/lib/httpd $RPM_BUILD_ROOT/etc/httpd/state
339ln -s /run/httpd $RPM_BUILD_ROOT/etc/httpd/run339ln -s /run/httpd $RPM_BUILD_ROOT/etc/httpd/run
340ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules340ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules
341 341 
342-install -D -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \342+install -D -m755 %{_sourcedir}/httpd-ssl-pass-dialog \
343 $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog343 $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog
344 344 
345-install -m755 $RPM_SOURCE_DIR/httpd-ssl-gencerts $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts345+install -m755 %{_sourcedir}/httpd-ssl-gencerts $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts
346 346 
347-install -D -p -m 755 $RPM_SOURCE_DIR/action-graceful.sh $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/graceful347+install -D -p -m 755 %{_sourcedir}/action-graceful.sh $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/graceful
348-install -p -m 755 $RPM_SOURCE_DIR/action-configtest.sh $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/configtest348+install -p -m 755 %{_sourcedir}/action-configtest.sh $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd/configtest
349 349 
350-install -D -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \350+install -D -m 644 -p %{_sourcedir}/httpd.logrotate \
351 $RPM_BUILD_ROOT/etc/logrotate.d/httpd351 $RPM_BUILD_ROOT/etc/logrotate.d/httpd
352 352 
353install -m 644 -p httpd.service.8 httpd-init.service.8 httpd.socket.8 httpd@.service.8 \353install -m 644 -p httpd.service.8 httpd-init.service.8 httpd.socket.8 httpd@.service.8 \
@@ -444,7 +444,7 @@ exit $rv
444 444 
445%config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean445%config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean
446%ghost %{_sysconfdir}/sysconfig/httpd446%ghost %{_sysconfdir}/sysconfig/httpd
447-%{_prefix}/lib/tmpfiles.d/httpd.conf447+%{_tmpfilesdir}/httpd.conf
448%{_libexecdir}/initscripts/legacy-actions/httpd/*448%{_libexecdir}/initscripts/legacy-actions/httpd/*
449%{_sbindir}/ht*449%{_sbindir}/ht*
450%{_sbindir}/fcgistarter450%{_sbindir}/fcgistarter
@@ -540,6 +540,14 @@ exit $rv
540%{_rpmconfigdir}/macros.d/macros.httpd540%{_rpmconfigdir}/macros.d/macros.httpd
541 541 
542%changelog542%changelog
543+* Tue Nov 25 2025 moyang <moyang@kylinos.cn> - 2.4.58-11
544+- Type:NA
545+- CVE:NA
546+- SUG:NA
547+- DESC: modify spec file
548+ $RPM_SOURCE_DIR -> %{_sourcedir}
549+ %{_prefix}/lib/tmpfiles.d -> %{_tmpfilesdir}
550+ 
543* Wed Aug 13 2025 yanglu <yanglu72@h-partners.com> - 2.4.58-10551* Wed Aug 13 2025 yanglu <yanglu72@h-partners.com> - 2.4.58-10
544- Type:CVE552- Type:CVE
545- CVE:CVE-2025-49812,CVE-2025-23048,CVE-2024-47252,CVE-2024-43204,CVE-2024-42516553- CVE:CVE-2025-49812,CVE-2025-23048,CVE-2024-47252,CVE-2024-43204,CVE-2024-42516