[12478] | 1 | %bcond_with systemd |
---|
| 2 | |
---|
[8063] | 3 | %define contentdir %{_datadir}/apache2 |
---|
| 4 | %define docroot /var/www/apache2 |
---|
[8599] | 5 | %define suexec_caller www-data |
---|
[11205] | 6 | %define mmn 20120211 |
---|
[8599] | 7 | %define mmnisa %{mmn}%{__isa_name}%{__isa_bits} |
---|
[521] | 8 | %define pkgname apache2 |
---|
[8599] | 9 | %define vstring Vine |
---|
[521] | 10 | |
---|
[12478] | 11 | Name: %{pkgname} |
---|
[521] | 12 | Summary: Apache HTTP Server |
---|
[12478] | 13 | Version: 2.4.46 |
---|
| 14 | Release: 1%{_dist_release}%{?with_systemd:.systemd} |
---|
| 15 | Group: servers |
---|
[521] | 16 | Vendor: Project Vine |
---|
| 17 | Distribution: Vine Linux |
---|
| 18 | Packager: daisuke |
---|
| 19 | |
---|
[12478] | 20 | License: Apache Software License |
---|
| 21 | URL: https://httpd.apache.org/ |
---|
| 22 | Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 |
---|
[8599] | 23 | Source2: index.html |
---|
[521] | 24 | Source3: apache2.logrotate |
---|
| 25 | Source4: apache2.init |
---|
[8599] | 26 | Source6: poweredby-vine.png |
---|
| 27 | Source7: apache2.tmpfiles |
---|
[521] | 28 | Source10: httpd.conf |
---|
[8599] | 29 | Source11: 00-base.conf |
---|
| 30 | Source12: 00-mpm.conf |
---|
| 31 | Source13: 00-lua.conf |
---|
| 32 | Source14: 01-cgi.conf |
---|
| 33 | Source15: 00-dav.conf |
---|
| 34 | Source16: 00-proxy.conf |
---|
| 35 | Source17: 00-ssl.conf |
---|
| 36 | Source18: 01-ldap.conf |
---|
| 37 | Source19: 00-proxyhtml.conf |
---|
| 38 | Source20: userdir.conf |
---|
| 39 | Source21: ssl.conf |
---|
| 40 | Source22: welcome.conf |
---|
| 41 | Source23: manual.conf |
---|
| 42 | Source25: 01-session.conf |
---|
[11205] | 43 | Source28: 00-optional.conf |
---|
[8599] | 44 | # Documentation |
---|
| 45 | Source30: README.confd |
---|
| 46 | Source31: README.confmod |
---|
[521] | 47 | # add vine entry to config.layout |
---|
| 48 | Source100: vine-config.layout |
---|
[8599] | 49 | |
---|
[12478] | 50 | Source105: httpd-ssl-pass-dialog |
---|
| 51 | Source106: httpd.tmpfiles |
---|
| 52 | Source107: httpd.service |
---|
| 53 | Source125: 00-systemd.conf |
---|
| 54 | Source128: httpd.socket |
---|
| 55 | Source127: 10-listen443.conf |
---|
| 56 | Source140: htcacheclean.service |
---|
| 57 | Source141: htcacheclean.sysconf |
---|
| 58 | Source142: httpd-init.service |
---|
| 59 | Source143: httpd-ssl-gencerts |
---|
| 60 | Source144: httpd@.service |
---|
| 61 | |
---|
[11281] | 62 | # build/scripts patches |
---|
[12478] | 63 | Patch2: httpd-2.4.43-apxs.patch |
---|
| 64 | Patch3: httpd-2.4.43-deplibs.patch |
---|
[11205] | 65 | # Needed for socket activation and mod_systemd patch |
---|
[12478] | 66 | Patch19: httpd-2.4.43-detect-systemd.patch |
---|
[8599] | 67 | # Features/functional changes |
---|
[12478] | 68 | Patch21: httpd-2.4.43-r1842929+.patch |
---|
| 69 | Patch22: httpd-2.4.43-mod_systemd.patch |
---|
| 70 | Patch23: httpd-2.4.43-export.patch |
---|
| 71 | Patch24: httpd-2.4.43-corelimit.patch |
---|
| 72 | Patch25: httpd-2.4.43-selinux.patch |
---|
| 73 | Patch26: httpd-2.4.43-gettid.patch |
---|
| 74 | Patch27: httpd-2.4.43-icons.patch |
---|
| 75 | Patch30: httpd-2.4.43-cachehardmax.patch |
---|
| 76 | Patch31: httpd-2.4.43-sslmultiproxy.patch |
---|
| 77 | Patch34: httpd-2.4.43-socket-activation.patch |
---|
| 78 | Patch38: httpd-2.4.43-sslciphdefault.patch |
---|
| 79 | Patch39: httpd-2.4.43-sslprotdefault.patch |
---|
| 80 | Patch40: httpd-2.4.43-r1861269.patch |
---|
| 81 | Patch41: httpd-2.4.43-r1861793+.patch |
---|
| 82 | Patch42: httpd-2.4.43-r1828172+.patch |
---|
| 83 | Patch43: httpd-2.4.43-sslcoalesce.patch |
---|
| 84 | Patch44: httpd-2.4.43-lua-resume.patch |
---|
[11205] | 85 | |
---|
[521] | 86 | # Bug fixes |
---|
[11205] | 87 | # https://bugzilla.redhat.com/show_bug.cgi?id=1397243 |
---|
[12478] | 88 | Patch60: httpd-2.4.43-enable-sslv3.patch |
---|
| 89 | Patch62: httpd-2.4.43-r1870095+.patch |
---|
[11281] | 90 | |
---|
[521] | 91 | # Security fixes |
---|
| 92 | |
---|
| 93 | BuildRoot: %{_tmppath}/%{name}-%{version}-root |
---|
[8599] | 94 | BuildRequires: db4-devel, expat-devel, xmlto |
---|
[521] | 95 | BuildRequires: findutils, perl, openldap-devel, zlib-devel |
---|
| 96 | BuildRequires: apr-devel, apr-util-devel |
---|
| 97 | BuildRequires: pcre-devel, sqlite3-devel |
---|
[8599] | 98 | BuildRequires: lua-devel, libxml2-devel |
---|
[10359] | 99 | BuildRequires: libnghttp2-devel |
---|
[12478] | 100 | BuildRequires: brotli-devel |
---|
[8063] | 101 | BuildRequires: www-common |
---|
[521] | 102 | Requires: mailcap, gawk, file, findutils, apr, apr-util |
---|
[8063] | 103 | Requires(pre): www-common |
---|
[12478] | 104 | Requires(pre): mktemp, fileutils |
---|
| 105 | %if %{with systemd} |
---|
| 106 | BuildRequires: systemd-devel |
---|
| 107 | %{?systemd_requires} |
---|
| 108 | %else |
---|
| 109 | Requires(pre): chkconfig |
---|
[521] | 110 | Requires(pre): sh-utils, textutils, shadow-utils |
---|
[1629] | 111 | Requires(post): alternatives |
---|
[12478] | 112 | %endif |
---|
[521] | 113 | Provides: webserver |
---|
| 114 | Provides: httpd = %{version} |
---|
| 115 | Provides: httpd-mmn = %{mmn} |
---|
[8601] | 116 | Provides: apache2-mmn = %{mmn} |
---|
[521] | 117 | Obsoletes: apache2-apr, apache2-apr-devel |
---|
[8599] | 118 | Obsoletes: apache < 2.0, apache-devel < 2.0 |
---|
[521] | 119 | |
---|
| 120 | %description |
---|
| 121 | Apache is a powerful, full-featured, efficient, and freely-available |
---|
| 122 | Web server. Apache is also the most popular Web server on the |
---|
| 123 | Internet. |
---|
| 124 | |
---|
[12478] | 125 | |
---|
[521] | 126 | %package devel |
---|
[12478] | 127 | Group: programming |
---|
[521] | 128 | Summary: Development tools for the Apache HTTP server. |
---|
[8601] | 129 | Requires: libtool, apache2 = %{version} |
---|
[521] | 130 | Requires: apr-devel, apr-util-devel |
---|
| 131 | |
---|
| 132 | %description devel |
---|
| 133 | The httpd-devel package contains the APXS binary and other files |
---|
| 134 | that you need to build Dynamic Shared Objects (DSOs) for Apache. |
---|
| 135 | |
---|
| 136 | If you are installing the Apache HTTP server and you want to be |
---|
| 137 | able to compile or develop additional modules for Apache, you need |
---|
| 138 | to install this package. |
---|
| 139 | |
---|
[12478] | 140 | |
---|
[521] | 141 | %package manual |
---|
[12478] | 142 | Group: documentation |
---|
[521] | 143 | Summary: Documentation for the Apache HTTP server. |
---|
| 144 | |
---|
| 145 | %description manual |
---|
| 146 | The httpd-manual package contains the complete manual and |
---|
| 147 | reference guide for the Apache HTTP server. The information can |
---|
| 148 | also be found at http://httpd.apache.org/docs/. |
---|
| 149 | |
---|
[12478] | 150 | |
---|
[521] | 151 | %package -n mod_ssl-apache2 |
---|
[12478] | 152 | Group: servers |
---|
[521] | 153 | Summary: SSL/TLS module for the Apache HTTP server |
---|
| 154 | Epoch: 1 |
---|
| 155 | BuildRequires: openssl-devel |
---|
[9858] | 156 | Requires(pre): net-tools, openssl, dev, /bin/cat |
---|
[8601] | 157 | Requires: apache2, make, apache2-mmn = %{mmn} |
---|
[521] | 158 | |
---|
| 159 | %description -n mod_ssl-apache2 |
---|
| 160 | The mod_ssl module provides strong cryptography for the Apache Web |
---|
| 161 | server via the Secure Sockets Layer (SSL) and Transport Layer |
---|
| 162 | Security (TLS) protocols. |
---|
| 163 | |
---|
[12478] | 164 | |
---|
[521] | 165 | %prep |
---|
| 166 | %setup -q -n httpd-%{version} |
---|
| 167 | |
---|
| 168 | %patch2 -p1 -b .apxs |
---|
[8599] | 169 | %patch3 -p1 -b .deplibs |
---|
[12478] | 170 | %if %{with systemd} |
---|
| 171 | %patch19 -p1 -b .detectsystemd |
---|
| 172 | %endif |
---|
[12131] | 173 | %patch21 -p1 -b .r1842929+ |
---|
[12478] | 174 | %if %{with systemd} |
---|
| 175 | %patch22 -p1 -b .mod_systemd |
---|
[521] | 176 | %patch23 -p1 -b .export |
---|
[12478] | 177 | %endif |
---|
[521] | 178 | %patch24 -p1 -b .corelimit |
---|
[12478] | 179 | %patch25 -p1 -b .selinux |
---|
| 180 | %patch26 -p1 -b .gettid |
---|
[8599] | 181 | %patch27 -p1 -b .icons |
---|
| 182 | %patch30 -p1 -b .cachehardmax |
---|
[12478] | 183 | #patch31 -p1 -b .sslmultiproxy |
---|
| 184 | %if %{with systemd} |
---|
[11205] | 185 | %patch34 -p1 -b .socketactivation |
---|
[12478] | 186 | %endif |
---|
[11870] | 187 | %patch38 -p1 -b .sslciphdefault |
---|
| 188 | %patch39 -p1 -b .sslprotdefault |
---|
[12131] | 189 | %patch40 -p1 -b .r1861269 |
---|
| 190 | %patch41 -p1 -b .r1861793+ |
---|
| 191 | %patch42 -p1 -b .r1828172+ |
---|
[12478] | 192 | %patch43 -p1 -b .sslcoalesce |
---|
| 193 | #patch44 -p1 -b .luaresume |
---|
[521] | 194 | |
---|
[11870] | 195 | %patch60 -p1 -b .enable-sslv3 |
---|
[12478] | 196 | %patch62 -p1 -b .r1870095 |
---|
[521] | 197 | |
---|
[11281] | 198 | perl -pi -e 's|/httpd/build|/apache2/build|' support/apxs.in |
---|
[9858] | 199 | |
---|
[8599] | 200 | # Patch in the vendor string |
---|
| 201 | sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h |
---|
[521] | 202 | |
---|
[8599] | 203 | # Prevent use of setcap in "install-suexec-caps" target. |
---|
| 204 | sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in |
---|
[521] | 205 | |
---|
| 206 | # add Vine configure's option to config.layout |
---|
| 207 | sed -e "s|${prefix}/lib|${prefix}/%{_lib}|" \ |
---|
| 208 | < $RPM_SOURCE_DIR/vine-config.layout >> config.layout |
---|
| 209 | |
---|
[12478] | 210 | |
---|
[521] | 211 | %build |
---|
| 212 | # remove bundled apr, apr-util, pcre |
---|
| 213 | rm -rf srclib/{apr,apr-util,pcre} |
---|
| 214 | |
---|
[8599] | 215 | # regenerate configure scripts |
---|
| 216 | autoheader && autoconf || exit 1 |
---|
| 217 | |
---|
[12478] | 218 | export CFLAGS="$RPM_OPT_FLAGS" |
---|
| 219 | export LDFLAGS="-Wl,-z,relro,-z,now" |
---|
| 220 | %if %{with systemd} |
---|
| 221 | export HTTPD_LIBS="-lsystemd" |
---|
| 222 | %endif |
---|
[521] | 223 | |
---|
[12478] | 224 | ./configure \ |
---|
[521] | 225 | --prefix=%{_sysconfdir}/apache2 \ |
---|
| 226 | --exec-prefix=%{_prefix} \ |
---|
| 227 | --bindir=%{_bindir} \ |
---|
| 228 | --sbindir=%{_sbindir} \ |
---|
| 229 | --mandir=%{_mandir} \ |
---|
| 230 | --libdir=%{_libdir} \ |
---|
| 231 | --sysconfdir=%{_sysconfdir}/apache2/conf \ |
---|
[12478] | 232 | --includedir=%{_includedir}/apache2 \ |
---|
[521] | 233 | --libexecdir=%{_libdir}/apache2/modules \ |
---|
| 234 | --datadir=%{contentdir} \ |
---|
| 235 | --with-installbuilddir=%{_libdir}/apache2/build \ |
---|
| 236 | --enable-layout=Vine \ |
---|
| 237 | --with-program-name=apache2 \ |
---|
| 238 | --with-ldap \ |
---|
| 239 | --enable-ldap --enable-authnz-ldap \ |
---|
| 240 | --enable-mods-shared=all \ |
---|
[12478] | 241 | --enable-cache=shared \ |
---|
| 242 | --enable-cgi=shared \ |
---|
| 243 | --enable-cgid=shared \ |
---|
| 244 | --enable-rewrite=shared \ |
---|
| 245 | --enable-disk-cache=shared \ |
---|
| 246 | --enable-file-cache=shared \ |
---|
| 247 | --enable-mem-cache=shared \ |
---|
[521] | 248 | --enable-authn-anon --enable-authn-alias \ |
---|
| 249 | --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ |
---|
| 250 | --enable-suexec --with-suexec \ |
---|
[12478] | 251 | --enable-suexec-capabilities \ |
---|
[521] | 252 | --with-suexec-caller=%{suexec_caller} \ |
---|
[8063] | 253 | --with-suexec-docroot=%{docroot} \ |
---|
[521] | 254 | --with-suexec-logfile=%{_localstatedir}/log/apache2/suexec.log \ |
---|
[10349] | 255 | --with-suexec-bin=%{_sbindir}/suexec \ |
---|
[521] | 256 | --with-suexec-uidmin=500 --with-suexec-gidmin=500 \ |
---|
[12478] | 257 | --with-brotli \ |
---|
| 258 | --enable-pie \ |
---|
[521] | 259 | --with-pcre \ |
---|
| 260 | --enable-ssl --with-ssl \ |
---|
| 261 | --enable-deflate \ |
---|
| 262 | --enable-proxy --enable-proxy-connect \ |
---|
[8599] | 263 | --enable-proxy-http --enable-proxy-ftp \ |
---|
| 264 | --enable-case-filter --enable-case-filter-in \ |
---|
[10359] | 265 | --enable-http2 \ |
---|
[12478] | 266 | %if %{with systemd} |
---|
| 267 | --enable-systemd \ |
---|
| 268 | %endif |
---|
| 269 | --enable-mpms-shared=all |
---|
| 270 | |
---|
[8599] | 271 | make %{?_smp_mflags} |
---|
[521] | 272 | |
---|
[12478] | 273 | |
---|
[521] | 274 | %install |
---|
| 275 | rm -rf $RPM_BUILD_ROOT |
---|
| 276 | |
---|
[8599] | 277 | make DESTDIR=$RPM_BUILD_ROOT install |
---|
[521] | 278 | |
---|
[12478] | 279 | %if %{with systemd} |
---|
| 280 | # Install systemd service files |
---|
| 281 | mkdir -p $RPM_BUILD_ROOT%{_unitdir} |
---|
| 282 | for s in httpd.service htcacheclean.service httpd.socket \ |
---|
| 283 | httpd@.service httpd-init.service; do |
---|
| 284 | install -p -m 644 $RPM_SOURCE_DIR/${s} \ |
---|
| 285 | $RPM_BUILD_ROOT%{_unitdir}/${s} |
---|
| 286 | done |
---|
| 287 | # install systemd override drop directory |
---|
| 288 | # Web application packages can drop snippets into this location if |
---|
| 289 | # they need ExecStart[pre|post]. |
---|
| 290 | mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d |
---|
| 291 | mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d |
---|
| 292 | |
---|
| 293 | install -m 644 -p $RPM_SOURCE_DIR/10-listen443.conf \ |
---|
| 294 | $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf |
---|
| 295 | mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig |
---|
| 296 | install -m 644 -p $RPM_SOURCE_DIR/htcacheclean.sysconf \ |
---|
| 297 | $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/htcacheclean |
---|
| 298 | # tmpfiles.d configuration |
---|
| 299 | mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} |
---|
| 300 | install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \ |
---|
| 301 | $RPM_BUILD_ROOT%{_tmpfilesdir}/httpd.conf |
---|
| 302 | |
---|
| 303 | # install http-ssl-pass-dialog |
---|
| 304 | mkdir -p $RPM_BUILD_ROOT%{_libexecdir} |
---|
| 305 | install -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \ |
---|
| 306 | $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog |
---|
| 307 | # install http-ssl-gencerts |
---|
| 308 | install -m755 $RPM_SOURCE_DIR/httpd-ssl-gencerts \ |
---|
| 309 | $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts |
---|
| 310 | %else |
---|
| 311 | # install SYSV init stuff |
---|
| 312 | mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d |
---|
| 313 | install -m755 $RPM_SOURCE_DIR/apache2.init \ |
---|
| 314 | $RPM_BUILD_ROOT/etc/rc.d/init.d/apache2 |
---|
| 315 | %{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \ |
---|
| 316 | $RPM_BUILD_ROOT/etc/rc.d/init.d/apache2 |
---|
| 317 | %endif |
---|
| 318 | |
---|
[8599] | 319 | # create apache2ctl symlink |
---|
| 320 | ln -sf apachectl $RPM_BUILD_ROOT%{_sbindir}/apache2ctl |
---|
[521] | 321 | |
---|
| 322 | # install conf file/directory |
---|
[8599] | 323 | mkdir $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.d \ |
---|
| 324 | $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.modules.d \ |
---|
| 325 | $RPM_BUILD_ROOT%{_sysconfdir}/apache2/sites.d |
---|
[521] | 326 | install -m 644 $RPM_SOURCE_DIR/README.confd \ |
---|
| 327 | $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.d/README |
---|
[8599] | 328 | install -m 644 $RPM_SOURCE_DIR/README.confmod \ |
---|
| 329 | $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.modules.d/README |
---|
[521] | 330 | |
---|
[8599] | 331 | for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \ |
---|
| 332 | 00-proxy.conf 00-ssl.conf 01-ldap.conf 00-proxyhtml.conf \ |
---|
[11205] | 333 | 01-ldap.conf 01-session.conf 00-optional.conf; do |
---|
[8599] | 334 | install -m 644 -p $RPM_SOURCE_DIR/$f \ |
---|
| 335 | $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.modules.d/$f |
---|
| 336 | done |
---|
[12478] | 337 | %if %{with systemd} |
---|
| 338 | install -m 644 -p %{SOURCE125} \ |
---|
| 339 | $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.modules.d/ |
---|
| 340 | %endif |
---|
[521] | 341 | |
---|
[8599] | 342 | for f in welcome.conf ssl.conf manual.conf userdir.conf; do |
---|
| 343 | install -m 644 -p $RPM_SOURCE_DIR/$f \ |
---|
| 344 | $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.d/$f |
---|
[521] | 345 | done |
---|
| 346 | |
---|
[8599] | 347 | # Split-out extra config shipped as default in conf.d: |
---|
| 348 | for f in autoindex; do |
---|
[12478] | 349 | install -m 644 docs/conf/extra/httpd-${f}.conf \ |
---|
[8599] | 350 | $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.d/${f}.conf |
---|
[521] | 351 | done |
---|
[12478] | 352 | |
---|
[8599] | 353 | # Extra config trimmed: |
---|
| 354 | rm -v docs/conf/extra/httpd-{ssl,userdir}.conf |
---|
[521] | 355 | |
---|
[8599] | 356 | rm $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf/*.conf |
---|
| 357 | install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \ |
---|
| 358 | $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf/httpd.conf |
---|
| 359 | ln -sf httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf/apache2.conf |
---|
[521] | 360 | |
---|
[8599] | 361 | # Other directories |
---|
| 362 | mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \ |
---|
| 363 | $RPM_BUILD_ROOT/run/apache2/htcacheclean |
---|
[521] | 364 | |
---|
[8599] | 365 | # Create cache directory |
---|
| 366 | mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apache2 \ |
---|
| 367 | $RPM_BUILD_ROOT%{_localstatedir}/cache/apache2/proxy \ |
---|
| 368 | $RPM_BUILD_ROOT%{_localstatedir}/cache/apache2/ssl |
---|
| 369 | |
---|
[521] | 370 | # Make the MMN accessible to module packages |
---|
[8599] | 371 | echo %{mmnisa} > $RPM_BUILD_ROOT%{_includedir}/apache2/.mmn |
---|
| 372 | mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm |
---|
| 373 | cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.apache2 <<EOF |
---|
| 374 | %%_httpd_mmn %{mmnisa} |
---|
| 375 | %%_httpd_apxs %%{_bindir}/apxs |
---|
| 376 | %%_httpd_modconfdir %%{_sysconfdir}/apache2/conf.modules.d |
---|
| 377 | %%_httpd_confdir %%{_sysconfdir}/apache2/conf.d |
---|
| 378 | %%_httpd_contentdir %{contentdir} |
---|
| 379 | %%_httpd_moddir %%{_libdir}/apache2/modules |
---|
| 380 | %%_apache2_mmn %{mmnisa} |
---|
| 381 | %%_apache2_apxs %%{_bindir}/apxs |
---|
| 382 | %%_apache2_modconfdir %%{_sysconfdir}/apache2/conf.modules.d |
---|
| 383 | %%_apache2_confdir %%{_sysconfdir}/apache2/conf.d |
---|
| 384 | %%_apache2_contentdir %{contentdir} |
---|
| 385 | %%_apache2_moddir %%{_libdir}/apache2/modules |
---|
| 386 | EOF |
---|
[521] | 387 | |
---|
[8599] | 388 | # Handle contentdir |
---|
| 389 | mkdir $RPM_BUILD_ROOT%{contentdir}/noindex |
---|
| 390 | install -m 644 -p $RPM_SOURCE_DIR/index.html \ |
---|
| 391 | $RPM_BUILD_ROOT%{contentdir}/noindex/index.html |
---|
| 392 | install -m 644 -p $RPM_SOURCE_DIR/poweredby-vine.png \ |
---|
| 393 | $RPM_BUILD_ROOT%{contentdir}/icons/ |
---|
| 394 | rm -rf %{contentdir}/htdocs |
---|
[521] | 395 | |
---|
[8599] | 396 | # remove manual sources |
---|
| 397 | find $RPM_BUILD_ROOT%{contentdir}/manual \( \ |
---|
| 398 | -name \*.xml -o -name \*.xml.* -o -name \*.ent -o -name \*.xsl -o -name \*.dtd \ |
---|
| 399 | \) -print0 | xargs -0 rm -f |
---|
[521] | 400 | |
---|
[8599] | 401 | # Strip the manual down just to English and replace the typemaps with flat files: |
---|
| 402 | set +x |
---|
| 403 | for f in `find $RPM_BUILD_ROOT%{contentdir}/manual -name \*.html -type f`; do |
---|
| 404 | if test -f ${f}.en; then |
---|
| 405 | cp ${f}.en ${f} |
---|
| 406 | rm ${f}.* |
---|
| 407 | fi |
---|
| 408 | done |
---|
| 409 | set -x |
---|
[8063] | 410 | |
---|
[8599] | 411 | # Clean Document Root |
---|
| 412 | rm -v $RPM_BUILD_ROOT%{docroot}/html/*.html |
---|
| 413 | rm -v $RPM_BUILD_ROOT/var/www/cgi-bin/* |
---|
[521] | 414 | |
---|
| 415 | # symlinks for /etc/apache2 |
---|
| 416 | ln -s ../..%{_localstatedir}/log/apache2 $RPM_BUILD_ROOT/etc/apache2/logs |
---|
[8599] | 417 | ln -s /run/apache2 $RPM_BUILD_ROOT/etc/apache2/run |
---|
[521] | 418 | ln -s ../..%{_libdir}/apache2/modules $RPM_BUILD_ROOT/etc/apache2/modules |
---|
| 419 | |
---|
[8599] | 420 | # Install logrotate config |
---|
[521] | 421 | mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d |
---|
[8599] | 422 | install -m 644 -p $RPM_SOURCE_DIR/apache2.logrotate \ |
---|
[521] | 423 | $RPM_BUILD_ROOT/etc/logrotate.d/apache2 |
---|
| 424 | |
---|
| 425 | # fix man page paths |
---|
| 426 | sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/apache2/conf/httpd.conf|" \ |
---|
| 427 | -e "s|/usr/local/apache2/conf/mime.types|/etc/mime.types|" \ |
---|
| 428 | -e "s|/usr/local/apache2/conf/magic|/etc/apache2/conf/magic|" \ |
---|
| 429 | -e "s|/usr/local/apache2/logs/error_log|/var/log/apache2/error_log|" \ |
---|
| 430 | -e "s|/usr/local/apache2/logs/access_log|/var/log/apache2/access_log|" \ |
---|
[8599] | 431 | -e "s|/usr/local/apache2/logs/httpd.pid|/run/apache2/apache2.pid|" \ |
---|
| 432 | -e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \ |
---|
| 433 | > $RPM_BUILD_ROOT%{_mandir}/man8/httpd.8 |
---|
[521] | 434 | |
---|
[8599] | 435 | # Make ap_config_layout.h libdir-agnostic |
---|
| 436 | sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \ |
---|
| 437 | $RPM_BUILD_ROOT%{_includedir}/apache2/ap_config_layout.h |
---|
[521] | 438 | |
---|
[8599] | 439 | # Fix path to instdso in special.mk |
---|
| 440 | sed -i '/instdso/s,top_srcdir,top_builddir,' \ |
---|
| 441 | $RPM_BUILD_ROOT%{_libdir}/apache2/build/special.mk |
---|
[521] | 442 | |
---|
[8599] | 443 | # Remove unpackaged files |
---|
| 444 | rm -vf \ |
---|
[521] | 445 | $RPM_BUILD_ROOT%{_libdir}/*.exp \ |
---|
[8599] | 446 | $RPM_BUILD_ROOT/etc/apache2/conf/mime.types \ |
---|
[521] | 447 | $RPM_BUILD_ROOT%{_libdir}/apache2/modules/*.exp \ |
---|
| 448 | $RPM_BUILD_ROOT%{_libdir}/apache2/build/config.nice \ |
---|
[8599] | 449 | $RPM_BUILD_ROOT%{_bindir}/{ap?-config,dbmmanage} \ |
---|
| 450 | $RPM_BUILD_ROOT%{_sbindir}/{checkgid,envvars*} \ |
---|
| 451 | $RPM_BUILD_ROOT%{contentdir}/htdocs/* \ |
---|
| 452 | $RPM_BUILD_ROOT%{_mandir}/man1/dbmmanage.* \ |
---|
[521] | 453 | $RPM_BUILD_ROOT%{contentdir}/cgi-bin/* |
---|
| 454 | |
---|
[8599] | 455 | rm -rf $RPM_BUILD_ROOT/etc/apache2/conf/{original,extra} |
---|
| 456 | |
---|
| 457 | |
---|
[12478] | 458 | %clean |
---|
| 459 | rm -rf $RPM_BUILD_ROOT |
---|
[8599] | 460 | |
---|
[12478] | 461 | |
---|
[521] | 462 | %triggerpostun -- apache < 2.0 |
---|
| 463 | /sbin/chkconfig --add apache2 |
---|
| 464 | |
---|
| 465 | %post |
---|
[12478] | 466 | %if %{with systemd} |
---|
| 467 | %systemd_post httpd.service htcacheclean.service httpd.socket |
---|
| 468 | %else |
---|
[521] | 469 | /sbin/chkconfig --add apache2 |
---|
[12478] | 470 | %endif |
---|
[521] | 471 | |
---|
| 472 | %preun |
---|
[12478] | 473 | %if %{with systemd} |
---|
| 474 | %systemd_preun httpd.service htcacheclean.service httpd.socket |
---|
| 475 | %else |
---|
| 476 | if [ $1 = 0 -o -x /bin/systemctl ]; then |
---|
[521] | 477 | /sbin/service apache2 stop > /dev/null 2>&1 |
---|
| 478 | /sbin/chkconfig --del apache2 |
---|
| 479 | fi |
---|
[12478] | 480 | %endif |
---|
[521] | 481 | |
---|
| 482 | %postun |
---|
[12478] | 483 | %if %{with systemd} |
---|
| 484 | %systemd_postun httpd.service htcacheclean.service httpd.socket |
---|
| 485 | %else |
---|
[521] | 486 | if [ "$1" -ge 1 ]; then |
---|
| 487 | /sbin/service apache2 condrestart |
---|
| 488 | fi |
---|
[12478] | 489 | %endif |
---|
[521] | 490 | /sbin/ldconfig |
---|
| 491 | |
---|
[8599] | 492 | %define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt |
---|
| 493 | %define sslkey %{_sysconfdir}/pki/tls/private/localhost.key |
---|
| 494 | |
---|
[521] | 495 | %post -n mod_ssl-apache2 |
---|
| 496 | umask 077 |
---|
| 497 | |
---|
[8599] | 498 | if [ -f %{sslkey} -o -f %{sslcert} ]; then |
---|
| 499 | exit 0 |
---|
[521] | 500 | fi |
---|
| 501 | |
---|
[8599] | 502 | %{_bindir}/openssl genrsa \ |
---|
| 503 | -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime \ |
---|
| 504 | 2048 > %{sslkey} 2> /dev/null ||: |
---|
| 505 | |
---|
| 506 | FQDN=`hostname` ||: |
---|
[521] | 507 | if [ "x${FQDN}" = "x" ]; then |
---|
| 508 | FQDN=localhost.localdomain |
---|
| 509 | fi |
---|
[8599] | 510 | |
---|
| 511 | cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \ |
---|
| 512 | -x509 -sha256 -days 3650 -set_serial $RANDOM -extensions v3_req \ |
---|
| 513 | -out %{sslcert} 2>/dev/null ||: |
---|
[521] | 514 | -- |
---|
| 515 | SomeState |
---|
| 516 | SomeCity |
---|
| 517 | SomeOrganization |
---|
| 518 | SomeOrganizationalUnit |
---|
| 519 | ${FQDN} |
---|
| 520 | root@${FQDN} |
---|
| 521 | EOF |
---|
| 522 | |
---|
| 523 | |
---|
| 524 | %files |
---|
| 525 | %defattr(-,root,root) |
---|
[10560] | 526 | %license LICENSE |
---|
| 527 | %doc ABOUT_APACHE README CHANGES LAYOUT |
---|
[8599] | 528 | %doc docs/conf/extra/*.conf |
---|
[521] | 529 | |
---|
| 530 | %dir %{_sysconfdir}/apache2 |
---|
| 531 | %{_sysconfdir}/apache2/modules |
---|
| 532 | %{_sysconfdir}/apache2/logs |
---|
| 533 | %{_sysconfdir}/apache2/run |
---|
| 534 | %dir %{_sysconfdir}/apache2/conf |
---|
[8599] | 535 | %config(noreplace) %{_sysconfdir}/apache2/conf/httpd.conf |
---|
| 536 | %config(noreplace) %{_sysconfdir}/apache2/conf/apache2.conf |
---|
[521] | 537 | %config(noreplace) %{_sysconfdir}/apache2/conf/magic |
---|
| 538 | |
---|
[8599] | 539 | %config(noreplace) %{_sysconfdir}/logrotate.d/apache2 |
---|
| 540 | |
---|
[12478] | 541 | %if %{with systemd} |
---|
| 542 | %{_unitdir}/httpd.service |
---|
| 543 | %{_unitdir}/httpd@.service |
---|
| 544 | %{_unitdir}/htcacheclean.service |
---|
| 545 | %{_unitdir}/*.socket |
---|
| 546 | %attr(755,root,root) %dir %{_unitdir}/httpd.service.d |
---|
| 547 | %attr(755,root,root) %dir %{_unitdir}/httpd.socket.d |
---|
| 548 | %config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean |
---|
| 549 | %{_tmpfilesdir}/httpd.conf |
---|
| 550 | %else |
---|
[521] | 551 | %config %{_sysconfdir}/rc.d/init.d/apache2 |
---|
[12478] | 552 | %endif |
---|
[521] | 553 | |
---|
| 554 | %dir %{_sysconfdir}/apache2/conf.d |
---|
| 555 | %{_sysconfdir}/apache2/conf.d/README |
---|
[8599] | 556 | %config(noreplace) %{_sysconfdir}/apache2/conf.d/*.conf |
---|
| 557 | %exclude %{_sysconfdir}/apache2/conf.d/ssl.conf |
---|
| 558 | %exclude %{_sysconfdir}/apache2/conf.d/manual.conf |
---|
[521] | 559 | |
---|
[8599] | 560 | %dir %{_sysconfdir}/apache2/conf.modules.d |
---|
| 561 | %{_sysconfdir}/apache2/conf.modules.d/README |
---|
| 562 | %config(noreplace) %{_sysconfdir}/apache2/conf.modules.d/*.conf |
---|
| 563 | %exclude %{_sysconfdir}/apache2/conf.modules.d/00-ssl.conf |
---|
[521] | 564 | |
---|
[8599] | 565 | %dir %{_sysconfdir}/apache2/sites.d |
---|
[521] | 566 | |
---|
| 567 | %{_bindir}/ab |
---|
| 568 | %{_bindir}/ht* |
---|
| 569 | %{_bindir}/logresolve |
---|
| 570 | %{_sbindir}/ht* |
---|
[8599] | 571 | %{_sbindir}/apache2 |
---|
| 572 | %{_sbindir}/apachectl |
---|
[521] | 573 | %{_sbindir}/apache2ctl |
---|
[8599] | 574 | %{_sbindir}/rotatelogs |
---|
| 575 | %{_sbindir}/fcgistarter |
---|
| 576 | %attr(4510,root,%{suexec_caller}) %{_sbindir}/suexec |
---|
[521] | 577 | |
---|
| 578 | %dir %{_libdir}/apache2 |
---|
| 579 | %dir %{_libdir}/apache2/modules |
---|
[8599] | 580 | %{_libdir}/apache2/modules/mod_*.so |
---|
| 581 | %exclude %{_libdir}/apache2/modules/mod_ssl.so |
---|
[521] | 582 | |
---|
| 583 | %dir %{contentdir} |
---|
| 584 | %dir %{contentdir}/icons |
---|
| 585 | %dir %{contentdir}/error |
---|
| 586 | %dir %{contentdir}/error/include |
---|
[8599] | 587 | %dir %{contentdir}/noindex |
---|
[521] | 588 | %{contentdir}/icons/* |
---|
| 589 | %{contentdir}/error/README |
---|
[8599] | 590 | %{contentdir}/error/*.var |
---|
| 591 | %{contentdir}/error/include/*.html |
---|
| 592 | %{contentdir}/noindex/index.html |
---|
[521] | 593 | |
---|
[8063] | 594 | %dir %{docroot}/html |
---|
[8599] | 595 | %dir /var/www/cgi-bin |
---|
[8063] | 596 | |
---|
[8599] | 597 | %attr(0710,root,www-data) %dir /run/apache2 |
---|
| 598 | %attr(0700,www-data,www-data) %dir /run/apache2/htcacheclean |
---|
| 599 | |
---|
[521] | 600 | %attr(0700,root,root) %dir %{_localstatedir}/log/apache2 |
---|
[8063] | 601 | %attr(0700,www-data,www-data) %dir %{_localstatedir}/lib/dav |
---|
[8599] | 602 | %attr(0700,www-data,www-data) %dir %{_localstatedir}/cache/apache2 |
---|
| 603 | %attr(0700,www-data,www-data) %dir %{_localstatedir}/cache/apache2/proxy |
---|
[521] | 604 | |
---|
| 605 | %{_mandir}/man1/* |
---|
[8599] | 606 | %exclude %{_mandir}/man1/apxs* |
---|
[521] | 607 | %{_mandir}/man8/* |
---|
| 608 | |
---|
| 609 | %files manual |
---|
| 610 | %defattr(-,root,root) |
---|
| 611 | %{contentdir}/manual |
---|
[8599] | 612 | %config(noreplace) %{_sysconfdir}/apache2/conf.d/manual.conf |
---|
[521] | 613 | |
---|
| 614 | %files -n mod_ssl-apache2 |
---|
| 615 | %defattr(-,root,root) |
---|
| 616 | %{_libdir}/apache2/modules/mod_ssl.so |
---|
[8599] | 617 | %config(noreplace) %{_sysconfdir}/apache2/conf.modules.d/00-ssl.conf |
---|
[521] | 618 | %config(noreplace) %{_sysconfdir}/apache2/conf.d/ssl.conf |
---|
[8599] | 619 | %attr(0700,www-data,www-data) %dir %{_localstatedir}/cache/apache2/ssl |
---|
[12478] | 620 | %if %{with systemd} |
---|
| 621 | %{_libexecdir}/httpd-ssl-pass-dialog |
---|
| 622 | %{_libexecdir}/httpd-ssl-gencerts |
---|
| 623 | %{_unitdir}/httpd-init.service |
---|
| 624 | %{_unitdir}/httpd.socket.d/10-listen443.conf |
---|
| 625 | %endif |
---|
[521] | 626 | |
---|
| 627 | %files devel |
---|
| 628 | %defattr(-,root,root) |
---|
| 629 | %{_includedir}/apache2 |
---|
| 630 | %{_bindir}/apxs |
---|
[8599] | 631 | %{_mandir}/man1/apxs* |
---|
| 632 | %dir %{_libdir}/apache2/build |
---|
[521] | 633 | %{_libdir}/apache2/build/*.mk |
---|
| 634 | %{_libdir}/apache2/build/*.sh |
---|
[8599] | 635 | %{_sysconfdir}/rpm/macros.apache2 |
---|
[521] | 636 | |
---|
[8599] | 637 | |
---|
[521] | 638 | %changelog |
---|
[12478] | 639 | * Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.46-1 |
---|
| 640 | - new upstream release. |
---|
| 641 | - added systemd support (disabled as default). |
---|
| 642 | |
---|
[12131] | 643 | * Thu Aug 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.41-1 |
---|
| 644 | - new upstream release. |
---|
| 645 | - dropped Patch1 and 5. |
---|
| 646 | - updated Patch23, 36 and 39. |
---|
| 647 | - imported Patch21 and 40-42 from rawhide. |
---|
| 648 | |
---|
[11870] | 649 | * Tue Nov 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.37-1 |
---|
| 650 | - new upstream release. |
---|
| 651 | - updated patches. |
---|
| 652 | |
---|
[11614] | 653 | * Sun Apr 01 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.33-1 |
---|
| 654 | - new upstream release. |
---|
| 655 | - updated Patch35 and 58. |
---|
| 656 | - disabled Patch31. |
---|
| 657 | - dropped Patch23: fixed in upstream. |
---|
| 658 | - imported Patch23 from rawhide. |
---|
| 659 | |
---|
[11281] | 660 | * Mon Dec 18 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.29-1 |
---|
| 661 | - new upstream release. |
---|
| 662 | - fixed apxs. |
---|
| 663 | - dropped Patch56,60 and 61: fixed in upstream. |
---|
| 664 | |
---|
[11205] | 665 | * Sun Oct 15 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.28-1 |
---|
| 666 | - new upstream release. |
---|
| 667 | |
---|
[10938] | 668 | * Fri Mar 17 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.25-1 |
---|
| 669 | - new upstream release. |
---|
| 670 | - dropped Patch55: fixed in upstream. |
---|
| 671 | |
---|
[10560] | 672 | * Fri Jul 8 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.23-1 |
---|
| 673 | - new upstream release. |
---|
| 674 | |
---|
[10359] | 675 | * Tue Jun 7 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.20-2 |
---|
| 676 | - enabled HTTP/2. |
---|
| 677 | |
---|
[10349] | 678 | * Sun May 29 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.20-1 |
---|
| 679 | - updated to 2.4.20. |
---|
| 680 | - updated Patch58. |
---|
| 681 | - fixed %%files. |
---|
| 682 | - fixed location of suexec (BTS#3007). |
---|
| 683 | |
---|
[10067] | 684 | * Thu Mar 10 2016 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.4.18-2 |
---|
| 685 | - rebuilt with openssl 1.0.2g |
---|
| 686 | |
---|
[10009] | 687 | * Thu Feb 4 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.18-1 |
---|
[10349] | 688 | - updated to 2.4.18. |
---|
[10009] | 689 | - fixed 00-base.conf. |
---|
| 690 | - updated Patch31. |
---|
| 691 | |
---|
[9861] | 692 | * Mon Dec 7 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.17-2 |
---|
| 693 | - fixed configuration files. |
---|
| 694 | |
---|
[9858] | 695 | * Fri Dec 4 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.17-1 |
---|
| 696 | - update to 2.4.17. |
---|
| 697 | - fixed dependency. |
---|
| 698 | |
---|
[8601] | 699 | * Wed Jun 25 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.4.9-2 |
---|
| 700 | - modify dependency |
---|
| 701 | |
---|
[8599] | 702 | * Wed Jun 25 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.4.9-1 |
---|
| 703 | - update to 2.4.9 |
---|
| 704 | - remove suffix '2' from {htdigest,htpasswd,rotatelogs}2 |
---|
| 705 | - use /run instead of /var/run |
---|
| 706 | - remove /etc/apache2/conf/ssl* , use /etc/pki now. |
---|
| 707 | - move suexec from %%{_libdir}/apache2 to %%{_sbindir} |
---|
| 708 | - split all LoadModules to conf.modules.d/*.conf |
---|
| 709 | - split module configs to conf.d/*.conf |
---|
| 710 | - cleanup docroot, move apache specific files to %%{_datadir}/apache2 |
---|
| 711 | - add BR: lua-devel, libxml2-devel |
---|
| 712 | - add /etc/apache2/sites.d for virtual host settings. |
---|
| 713 | |
---|
[8063] | 714 | * Wed Dec 25 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2.25-2 |
---|
| 715 | - merge VineSeed spec file |
---|
| 716 | * Wed Oct 24 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.23-2 |
---|
| 717 | - rebuild with pcre-8.31 |
---|
| 718 | |
---|
| 719 | * Wed Mar 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.23-1 |
---|
| 720 | - update to 2.2.23 |
---|
| 721 | - add R(pre): www-common, BR: www-common |
---|
| 722 | - move apache contents to %{contentdir} |
---|
| 723 | |
---|
[8062] | 724 | * Sat Sep 28 2013 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.25-1 |
---|
| 725 | - new upstream release with security fix (CVE-2013-1862,1896) |
---|
| 726 | - drop patch100 (is included in new release) |
---|
[6998] | 727 | |
---|
[8062] | 728 | * Fri May 17 2013 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.24-2 |
---|
| 729 | - add patch100 for fix CVE-2013-1862 (mod_rewrite) |
---|
[6959] | 730 | |
---|
[8062] | 731 | * Wed Feb 27 2013 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.24-1 |
---|
| 732 | - new upstream release with security fix (CVE-2012-3499, 4558) |
---|
| 733 | |
---|
| 734 | * Sun Sep 16 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.23-1 |
---|
| 735 | - new upstream release with security fix (CVE-2012-3502,CVE-2012-2687) |
---|
| 736 | - update patch22 to fit new release |
---|
| 737 | - update man filename convert list |
---|
| 738 | |
---|
[5930] | 739 | * Wed Mar 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.22-1 |
---|
| 740 | - update to 2.2.22 |
---|
| 741 | - CVE-2012-0021 (mod_log_config) |
---|
| 742 | - CVE-2012-0031 |
---|
| 743 | - CVE-2012-0053 |
---|
[8062] | 744 | - remove upstreamed patches |
---|
[5930] | 745 | |
---|
| 746 | * Fri Dec 9 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-5 |
---|
| 747 | - add patch120 for fix CVE-2011-4317 (mod_rewrite/mod_proxy) |
---|
| 748 | |
---|
| 749 | * Fri Nov 18 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-4 |
---|
| 750 | - add patch110 for fix CVE-2011-3607-4415 (ModSetEnvIf) |
---|
| 751 | |
---|
| 752 | * Wed Oct 12 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-3 |
---|
| 753 | - add patch70 for fix byterange filter |
---|
| 754 | |
---|
| 755 | * Tue Oct 11 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-2 |
---|
| 756 | - add Patch100 for fix CVE-2011-3368 (mod_proxy) |
---|
| 757 | |
---|
| 758 | * Wed Sep 14 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-1 |
---|
| 759 | - new upstream release with security fix (CVE-2011-3348) |
---|
| 760 | - regression fixes of CVE-2011-3192 byterange fix in 2.2.20 |
---|
| 761 | |
---|
| 762 | * Tue Sep 6 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.20-3 |
---|
| 763 | - update Patch101 (Thanks to debian team) |
---|
| 764 | |
---|
| 765 | * Sat Sep 3 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.20-2 |
---|
| 766 | - add Patch101 for fix CVE-2011-3192 regression |
---|
| 767 | |
---|
| 768 | * Thu Sep 1 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.20-1 |
---|
| 769 | - new upstream release with security fix (CVE-2011-3192) |
---|
| 770 | - drop patch100 (is included in new release) |
---|
| 771 | |
---|
| 772 | * Thu Aug 25 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.19-2 |
---|
| 773 | - add patch100 for fix CVE-2011-3192 (Range Header DoS) |
---|
| 774 | |
---|
[3942] | 775 | * Mon May 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.19-1 |
---|
| 776 | - update to 2.2.19 |
---|
| 777 | |
---|
[3749] | 778 | * Sat Apr 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.14-9 |
---|
| 779 | - remove old Obsoletes/Conflicts |
---|
| 780 | |
---|
[2490] | 781 | * Tue Jan 11 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2.14-8 |
---|
| 782 | - rebuild with openssl-1.0.0c |
---|
| 783 | |
---|
| 784 | * Sat Aug 21 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.14-7 |
---|
[2401] | 785 | - add patch120 for fix CVE-2010-1452 (mod_dav/mod_cache) from mdk2010 |
---|
| 786 | |
---|
[1629] | 787 | * Wed Aug 18 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.14-6 |
---|
| 788 | - add R(post): alternatives |
---|
| 789 | |
---|
[877] | 790 | * Sat Mar 20 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> - 2.2.14-5 |
---|
| 791 | - add patch110 for fix CVE-2010-0434 from mdk 2010 |
---|
| 792 | |
---|
| 793 | * Sun Mar 7 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> - 2.2.14-4 |
---|
| 794 | - add patch100 for fix CVE-2010-0408 (mod_proxy_ajp) |
---|
| 795 | |
---|
[521] | 796 | * Fri Feb 5 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.2.14-3 |
---|
| 797 | - rebuilt with rpm-4.8.0-3 (on ppc) |
---|
| 798 | |
---|
| 799 | * Tue Feb 02 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.14-2 |
---|
| 800 | - rebuild with db4-4.8.0 |
---|
| 801 | |
---|
| 802 | * Tue Jan 05 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.14-1 |
---|
| 803 | - new upstream release with security fix |
---|
| 804 | (CVE-2009-2699, CVE-2009-3095, CVE-2009-3094) |
---|
| 805 | - fix ssl.conf (2.2.13-1 includes wrong file) |
---|
| 806 | |
---|
| 807 | * Sun Aug 09 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.13-1 |
---|
| 808 | - new upstream release |
---|
| 809 | |
---|
| 810 | * Wed Jul 29 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.12-1 |
---|
| 811 | - new upstream release |
---|
| 812 | (including security fix for CVE-2009-1890, CVE-2009-1191, |
---|
| 813 | CVE-2009-1195, CVE-2009-1955, CVE-2009-1956, CVE-2009-0023) |
---|
| 814 | |
---|
| 815 | * Fri Jan 09 2009 NAKAMURA Kenta <kenta@vinelinux.org> 2.2.11-2 |
---|
| 816 | - rebuilt with openldap-2.4.11 |
---|
| 817 | |
---|
| 818 | * Fri Jan 2 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.11-1 |
---|
| 819 | - new upstream release |
---|
| 820 | |
---|
| 821 | * Sat Oct 18 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.10-1 |
---|
| 822 | - new upstream release (including security fix for CVE-2008-2939) |
---|
| 823 | |
---|
| 824 | * Fri Jun 20 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.9-1 |
---|
| 825 | - new upstream release (including security fix for CVE-2008-2364, CVE-2007-6420) |
---|
| 826 | - built with db4-4.6.21, apr 1.3.0 |
---|
| 827 | |
---|
| 828 | * Sun Apr 27 2008 Tomohiro 'Tomo-p' KATO <tomop@teamgedoh.net> 2.2.8-1 |
---|
| 829 | - add Patch60 (to fix bug#31418). |
---|
| 830 | |
---|
| 831 | * Thu Feb 21 2008 AKIYAMA Kazuhito <akiyama@yb3.so-net.ne.jp> 2.2.8-0vl2 |
---|
| 832 | - rebuild with expat-2.0.1 |
---|
| 833 | |
---|
| 834 | * Tue Jan 22 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.8-0vl1 |
---|
| 835 | - new upstream release |
---|
| 836 | |
---|
| 837 | * Sat Nov 3 2007 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.6-0vl2 |
---|
| 838 | - added postun script from VinePlus/4.0 package |
---|
| 839 | * Tue Sep 11 2007 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.3-0vl3.2 |
---|
| 840 | - add postun script to restart daemon with message |
---|
| 841 | |
---|
| 842 | * Sun Jul 01 2007 NAKAMURA Kenta <kenta@vinelinux.org> 2.2.3-0vl8 |
---|
| 843 | - updated Patch2: httpd-2.2.3-apxs.patch |
---|
| 844 | |
---|
| 845 | * Sun Jun 24 2007 NAKAMURA Kenta <kenta@vinelinux.org> 2.2.3-0vl7 |
---|
| 846 | - modified libdir in config.layout for lib64 architecture |
---|
| 847 | |
---|
| 848 | * Sun May 27 2007 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.3-0vl6 |
---|
| 849 | - rebuilt with openssl-0.9.8e |
---|
| 850 | |
---|
| 851 | * Thu May 10 2007 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 2.2.3-0vl5 |
---|
| 852 | - rebuilt with new toolchain and db4-4.3.x |
---|
| 853 | |
---|
[8062] | 854 | * Wed Feb 7 2007 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.3-0vl4 |
---|
[521] | 855 | - added BuildRequires: pcre-devel, sqlite3-devel <BTS:VineLinux:474> |
---|
| 856 | |
---|
| 857 | * Mon Sep 11 2006 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 2.2.3-0vl3 |
---|
| 858 | - change manual Group to Applications/Documentation. <BTS:VineLinux:163> |
---|
| 859 | |
---|
| 860 | * Sun Aug 27 2006 NAKAMURA Kenta <kenta@vinelinux.org> 2.2.3-0vl2 |
---|
| 861 | - rebuilt with openldap-2.3.27-0vl1 |
---|
| 862 | |
---|
| 863 | * Sat Jul 29 2006 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.2.3-0vl1 |
---|
| 864 | - new upstream release including security fix (CVE-2006-3747) |
---|
| 865 | |
---|
| 866 | * Sun May 28 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.2-0vl1 |
---|
| 867 | - new upstream release |
---|
| 868 | - update to 2.2.2 |
---|
| 869 | - remove apr/apr-devel subpackage, |
---|
| 870 | use external apr/apr-util instead of internal one. |
---|
| 871 | |
---|
| 872 | * Sun May 28 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.58-0vl1 |
---|
| 873 | - new upstream release |
---|
| 874 | - use apache2.prefork as default. |
---|
| 875 | |
---|
| 876 | * Thu Mar 23 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.55-0vl3 |
---|
| 877 | - rebuild to use new _localstatedir (rpm-4.4.2-0vl11) |
---|
| 878 | - remove unpackaged files in %%install section |
---|
| 879 | |
---|
| 880 | * Fri Jan 27 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.55-0vl2 |
---|
| 881 | - fix logrotate configuration (use apache2.pid instead of httpd.pid) |
---|
| 882 | (BTS:10) |
---|
| 883 | - use Epoch instead of Serial |
---|
| 884 | |
---|
| 885 | * Sat Oct 15 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.55-0vl1 |
---|
| 886 | - new upstream release |
---|
| 887 | - drop obsolete security patches which is merged in upstream |
---|
| 888 | |
---|
| 889 | * Sat Oct 08 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.54-0vl1 |
---|
| 890 | - new upstream release |
---|
| 891 | |
---|
| 892 | * Sun Sep 11 2005 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.53-0vl2 |
---|
| 893 | - added Patch122 to 125 for secutiry fix |
---|
| 894 | (CAN-2004-{1268,2088,2700,2728}) |
---|
| 895 | - fix %install section |
---|
| 896 | |
---|
| 897 | * Sun Apr 10 2005 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.53-0vl1 |
---|
| 898 | - new upstream release |
---|
| 899 | |
---|
| 900 | * Sat Nov 06 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.52-0vl1 |
---|
| 901 | - new upstream release |
---|
| 902 | |
---|
| 903 | * Sun Oct 24 2004 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 2.0.50-0vl4 |
---|
| 904 | - rebuilt with db4-4.2.52 |
---|
| 905 | |
---|
| 906 | * Sat Sep 4 2004 USAMI Kosuke <usami-k@yc5.so-net.ne.jp> - 2.0.50-0vl3 |
---|
| 907 | - separate apr, apr-devel packages |
---|
| 908 | - add BuildPreReq: zlib-devel |
---|
| 909 | |
---|
| 910 | * Sun Jul 11 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.50-0vl2 |
---|
| 911 | - fix %%files to include instdso.sh |
---|
| 912 | thanks to jax <jax AT morejams DOT no-ip DOT com> |
---|
| 913 | - add %%{?_smp_mflags} to make option. |
---|
| 914 | |
---|
| 915 | * Sun Jul 4 2004 IWAI, Masaharu <iwai@alib.jp> 2.0.50-0vl1 |
---|
| 916 | - new upstream version |
---|
| 917 | |
---|
| 918 | * Sun Nov 23 2003 IWAI, Masaharu <iwai@alib.jp> 2.0.48-0vl1 |
---|
| 919 | - new upstream version |
---|
| 920 | |
---|
| 921 | * Mon Sep 15 2003 IWAI, Masaharu <iwai@alib.jp> 2.0.47-0vl1 |
---|
| 922 | - new upstream version |
---|
| 923 | - update apxs patch (Patch101) |
---|
| 924 | - fix dependency: |
---|
| 925 | - change file name to package name in Requires and {Build,}Prereq |
---|
| 926 | - add BuildPrereq: openldap-devel |
---|
| 927 | - update %%files section |
---|
| 928 | - rename httpd.8 manpage |
---|
| 929 | |
---|
[8062] | 930 | * Mon May 12 2003 Satoshi MACHINO <machino@vinelinux.org> 2.0.45-0vl1 |
---|
[521] | 931 | - new upstream version |
---|
| 932 | - used vine-config.layout in srclib |
---|
| 933 | |
---|
[8062] | 934 | * Mon May 12 2003 Satoshi MACHINO <machino@vinelinux.org> 2.0.44-0vl9 |
---|
[521] | 935 | - rebuild |
---|
| 936 | |
---|
| 937 | * Sun Apr 6 2003 Kazuhisa TAKEI <takei@vinelinux.org> 2.0.44-0vl8 |
---|
| 938 | - change pkg name from mod_ssl to mod_ssl-apache2 |
---|
| 939 | - remove "apache-manual" entry from Obsoletes: |
---|
| 940 | |
---|
| 941 | * Thu Apr 3 2003 Kazuhisa TAKEI <takei@vinelinux.org> 2.0.44-0vl7 |
---|
| 942 | - remove "mod_dav" and "apache-devel" from Obsoletes: |
---|
| 943 | - enable MPMS(worker %mpms ) |
---|
| 944 | |
---|
| 945 | * Sun Mar 30 2003 Kazuhisa TAKEI <takei@vinelinux.org> 2.0.44-0vl6 |
---|
| 946 | - add correct config_vars.mk |
---|
| 947 | |
---|
| 948 | * Sun Mar 30 2003 Kazuhisa TAKEI <takei@vinelinux.org> 2.0.44-0vl5 |
---|
| 949 | - apply apxs's patch ( from Debian) |
---|
| 950 | |
---|
| 951 | * Sun Mar 30 2003 Kazuhisa TAKEI <takei@vinelinux.org> 2.0.44-0vl4 |
---|
| 952 | - add apr-config,apu-config to devel's %file |
---|
| 953 | |
---|
| 954 | * Sun Mar 30 2003 Kazuhisa TAKEI <takei@vinelinux.org> 2.0.44-0vl3 |
---|
| 955 | - change apxs path ( /usr/sbin -> /usr/bin |
---|
| 956 | - add symlink under /etc/apache2/conf |
---|
| 957 | (logs, run), httpd.conf -> apache2.conf |
---|
| 958 | - fixed apache2 initscript. |
---|
| 959 | |
---|
| 960 | * Sat Mar 29 2003 Kazuhisa TAKEI <takei@vinelinux.org> 2.0.44-0vl2 |
---|
| 961 | - build Vine Linux |
---|
| 962 | - new upstream version |
---|
| 963 | - sharing with apache1 |
---|
| 964 | |
---|
| 965 | * Wed Sep 4 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.40-8 |
---|
| 966 | - link httpd with libssl to avoid library loading/unloading weirdness |
---|
| 967 | |
---|
| 968 | * Tue Sep 3 2002 Joe Orton <jorton@redhat.com> 2.0.40-7 |
---|
| 969 | - add LoadModule lines for proxy modules in httpd.conf (#73349) |
---|
| 970 | - fix permissions of conf/ssl.*/ directories; add Makefiles for |
---|
| 971 | certificate management (#73352) |
---|
| 972 | |
---|
| 973 | * Mon Sep 2 2002 Joe Orton <jorton@redhat.com> 2.0.40-6 |
---|
| 974 | - provide "httpd-mmn" to manage module ABI compatibility |
---|
| 975 | |
---|
| 976 | * Sun Sep 1 2002 Joe Orton <jorton@redhat.com> 2.0.40-5 |
---|
| 977 | - fix SSL session cache (#69699) |
---|
| 978 | - revert addition of LDAP support to apr-util |
---|
| 979 | |
---|
| 980 | * Mon Aug 26 2002 Joe Orton <jorton@redhat.com> 2.0.40-4 |
---|
| 981 | - set SIGXFSZ disposition to "ignored" (#69520) |
---|
| 982 | - make dummy connections to the first listener in config (#72692) |
---|
| 983 | |
---|
| 984 | * Mon Aug 26 2002 Joe Orton <jorton@redhat.com> 2.0.40-3 |
---|
| 985 | - allow "apachectl configtest" on a 1.3 httpd.conf |
---|
| 986 | - add mod_deflate |
---|
| 987 | - enable LDAP support in apr-util |
---|
| 988 | - don't package everything in /var/www/error as config(noreplace) |
---|
| 989 | |
---|
| 990 | * Wed Aug 21 2002 Bill Nottingham <notting@redhat.com> 2.0.40-2 |
---|
| 991 | - add trigger (#68657) |
---|
| 992 | |
---|
| 993 | * Mon Aug 12 2002 Joe Orton <jorton@redhat.com> 2.0.40-1 |
---|
| 994 | - update to 2.0.40 |
---|
| 995 | |
---|
| 996 | * Wed Jul 24 2002 Joe Orton <jorton@redhat.com> 2.0.36-8 |
---|
| 997 | - improve comment on use of UserDir in default config (#66886) |
---|
| 998 | |
---|
| 999 | * Wed Jul 10 2002 Joe Orton <jorton@redhat.com> 2.0.36-7 |
---|
| 1000 | - use /sbin/nologin as shell for apache user (#68371) |
---|
| 1001 | - add patch from CVS to fix possible infinite loop when processing |
---|
| 1002 | internal redirects |
---|
| 1003 | |
---|
| 1004 | * Wed Jun 26 2002 Gary Benson <gbenson@redhat.com> 2.0.36-6 |
---|
| 1005 | - modify init script to detect 1.3.x httpd.conf's and direct users |
---|
| 1006 | to the migration guide |
---|
| 1007 | |
---|
| 1008 | * Tue Jun 25 2002 Gary Benson <gbenson@redhat.com> 2.0.36-5 |
---|
| 1009 | - patch apachectl to detect 1.3.x httpd.conf's and direct users |
---|
| 1010 | to the migration guide |
---|
| 1011 | - ship the migration guide |
---|
| 1012 | |
---|
| 1013 | * Fri Jun 21 2002 Joe Orton <jorton@redhat.com> |
---|
| 1014 | - move /etc/httpd2 back to /etc/httpd |
---|
| 1015 | - add noindex.html page and poweredby logo; tweak default config |
---|
| 1016 | to load noindex.html if no default "/" page is present. |
---|
| 1017 | - add patch to prevent mutex errors on graceful restart |
---|
| 1018 | |
---|
| 1019 | * Fri Jun 21 2002 Tim Powers <timp@redhat.com> 2.0.36-4 |
---|
| 1020 | - automated rebuild |
---|
| 1021 | |
---|
| 1022 | * Wed Jun 12 2002 Joe Orton <jorton@redhat.com> 2.0.36-3 |
---|
| 1023 | - add patch to fix SSL mutex handling |
---|
| 1024 | |
---|
| 1025 | * Wed Jun 12 2002 Joe Orton <jorton@redhat.com> 2.0.36-2 |
---|
| 1026 | - improved config directory patch |
---|
| 1027 | |
---|
| 1028 | * Mon May 20 2002 Joe Orton <jorton@redhat.com> |
---|
| 1029 | - initial build; based heavily on apache.spec and mod_ssl.spec |
---|
| 1030 | - fixes: #65214, #58490, #57376, #61265, #65518, #58177, #57245 |
---|
[877] | 1031 | |
---|