AutoBuild: update-httpd started at 2025-02-01-01UTC (#11227)

* Edge 132.0.2957.127-1 => 132.0.2957.140-1

* Httpd 2.4.62 => 2.4.63

* Remove i686 build

---------

Co-authored-by: Ed Reel <edreel@gmail.com>
This commit is contained in:
github-actions[bot]
2025-02-01 22:08:44 +11:00
committed by GitHub
parent b665e34582
commit 7c11c4001e
4 changed files with 59 additions and 1703 deletions

View File

@@ -14,7 +14,6 @@
/usr/local/bin/httxt2dbm
/usr/local/bin/logresolve
/usr/local/bin/rotatelogs
/usr/local/etc/bash.d/10-httpd
/usr/local/share/httpd/build/config.nice
/usr/local/share/httpd/build/config_vars.mk
/usr/local/share/httpd/build/instdso.sh
@@ -384,20 +383,6 @@
/usr/local/share/httpd/include/util_time.h
/usr/local/share/httpd/include/util_varbuf.h
/usr/local/share/httpd/include/util_xml.h
/usr/local/share/httpd/man/man1/ab.1
/usr/local/share/httpd/man/man1/apxs.1
/usr/local/share/httpd/man/man1/dbmmanage.1
/usr/local/share/httpd/man/man1/htdbm.1
/usr/local/share/httpd/man/man1/htdigest.1
/usr/local/share/httpd/man/man1/htpasswd.1
/usr/local/share/httpd/man/man1/httxt2dbm.1
/usr/local/share/httpd/man/man1/logresolve.1
/usr/local/share/httpd/man/man8/apachectl.8
/usr/local/share/httpd/man/man8/fcgistarter.8
/usr/local/share/httpd/man/man8/htcacheclean.8
/usr/local/share/httpd/man/man8/httpd.8
/usr/local/share/httpd/man/man8/rotatelogs.8
/usr/local/share/httpd/man/man8/suexec.8
/usr/local/share/httpd/manual/BUILDING
/usr/local/share/httpd/manual/LICENSE
/usr/local/share/httpd/manual/bind.html
@@ -1150,8 +1135,6 @@
/usr/local/share/httpd/manual/mod/mod_systemd.html
/usr/local/share/httpd/manual/mod/mod_systemd.html.en
/usr/local/share/httpd/manual/mod/mod_systemd.html.fr.utf8
/usr/local/share/httpd/manual/mod/mod_tls.html
/usr/local/share/httpd/manual/mod/mod_tls.html.en
/usr/local/share/httpd/manual/mod/mod_unique_id.html
/usr/local/share/httpd/manual/mod/mod_unique_id.html.en
/usr/local/share/httpd/manual/mod/mod_unique_id.html.fr.utf8
@@ -1633,3 +1616,17 @@
/usr/local/share/httpd/modules/mod_version.so
/usr/local/share/httpd/modules/mod_vhost_alias.so
/usr/local/share/httpd/modules/mod_watchdog.so
/usr/local/share/man/man1/ab.1.zst
/usr/local/share/man/man1/apxs.1.zst
/usr/local/share/man/man1/dbmmanage.1.zst
/usr/local/share/man/man1/htdbm.1.zst
/usr/local/share/man/man1/htdigest.1.zst
/usr/local/share/man/man1/htpasswd.1.zst
/usr/local/share/man/man1/httxt2dbm.1.zst
/usr/local/share/man/man1/logresolve.1.zst
/usr/local/share/man/man8/apachectl.8.zst
/usr/local/share/man/man8/fcgistarter.8.zst
/usr/local/share/man/man8/htcacheclean.8.zst
/usr/local/share/man/man8/httpd.8.zst
/usr/local/share/man/man8/rotatelogs.8.zst
/usr/local/share/man/man8/suexec.8.zst

File diff suppressed because it is too large Load Diff

View File

@@ -14,7 +14,6 @@
/usr/local/bin/httxt2dbm
/usr/local/bin/logresolve
/usr/local/bin/rotatelogs
/usr/local/etc/bash.d/10-httpd
/usr/local/share/httpd/build/config.nice
/usr/local/share/httpd/build/config_vars.mk
/usr/local/share/httpd/build/instdso.sh
@@ -384,20 +383,6 @@
/usr/local/share/httpd/include/util_time.h
/usr/local/share/httpd/include/util_varbuf.h
/usr/local/share/httpd/include/util_xml.h
/usr/local/share/httpd/man/man1/ab.1
/usr/local/share/httpd/man/man1/apxs.1
/usr/local/share/httpd/man/man1/dbmmanage.1
/usr/local/share/httpd/man/man1/htdbm.1
/usr/local/share/httpd/man/man1/htdigest.1
/usr/local/share/httpd/man/man1/htpasswd.1
/usr/local/share/httpd/man/man1/httxt2dbm.1
/usr/local/share/httpd/man/man1/logresolve.1
/usr/local/share/httpd/man/man8/apachectl.8
/usr/local/share/httpd/man/man8/fcgistarter.8
/usr/local/share/httpd/man/man8/htcacheclean.8
/usr/local/share/httpd/man/man8/httpd.8
/usr/local/share/httpd/man/man8/rotatelogs.8
/usr/local/share/httpd/man/man8/suexec.8
/usr/local/share/httpd/manual/BUILDING
/usr/local/share/httpd/manual/LICENSE
/usr/local/share/httpd/manual/bind.html
@@ -1150,8 +1135,6 @@
/usr/local/share/httpd/manual/mod/mod_systemd.html
/usr/local/share/httpd/manual/mod/mod_systemd.html.en
/usr/local/share/httpd/manual/mod/mod_systemd.html.fr.utf8
/usr/local/share/httpd/manual/mod/mod_tls.html
/usr/local/share/httpd/manual/mod/mod_tls.html.en
/usr/local/share/httpd/manual/mod/mod_unique_id.html
/usr/local/share/httpd/manual/mod/mod_unique_id.html.en
/usr/local/share/httpd/manual/mod/mod_unique_id.html.fr.utf8
@@ -1633,3 +1616,17 @@
/usr/local/share/httpd/modules/mod_version.so
/usr/local/share/httpd/modules/mod_vhost_alias.so
/usr/local/share/httpd/modules/mod_watchdog.so
/usr/local/share/man/man1/ab.1.zst
/usr/local/share/man/man1/apxs.1.zst
/usr/local/share/man/man1/dbmmanage.1.zst
/usr/local/share/man/man1/htdbm.1.zst
/usr/local/share/man/man1/htdigest.1.zst
/usr/local/share/man/man1/htpasswd.1.zst
/usr/local/share/man/man1/httxt2dbm.1.zst
/usr/local/share/man/man1/logresolve.1.zst
/usr/local/share/man/man8/apachectl.8.zst
/usr/local/share/man/man8/fcgistarter.8.zst
/usr/local/share/man/man8/htcacheclean.8.zst
/usr/local/share/man/man8/httpd.8.zst
/usr/local/share/man/man8/rotatelogs.8.zst
/usr/local/share/man/man8/suexec.8.zst

View File

@@ -1,20 +1,20 @@
require 'package'
require 'buildsystems/autotools'
require 'convenience_functions'
class Httpd < Package
class Httpd < Autotools
description 'The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows.'
homepage 'https://httpd.apache.org/'
version '2.4.62'
version '2.4.63'
license 'GPL-2+'
compatibility 'all'
compatibility 'x86_64 aarch64 armv7l'
source_url "https://dlcdn.apache.org/httpd/httpd-#{version}.tar.bz2"
source_sha256 '674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec'
source_sha256 '88fc236ab99b2864b248de7d49a008ec2afd7551e64dce8b95f58f32f94c46ab'
binary_compression 'tar.zst'
binary_sha256({
aarch64: 'caa26002fba12159774416d6b664ceeba7ae918e11f63302d4e4ed8ba3c886af',
armv7l: 'caa26002fba12159774416d6b664ceeba7ae918e11f63302d4e4ed8ba3c886af',
i686: '6cdfb3f1bea82821c21aa1da2b7b285950bcc6efd89fda5eac2b994f6293a712',
x86_64: 'ed25f5ab36847c6c88f9e18d314eb6a595bc8d7f5ec4657b1a7317bf3ec2c6c1'
aarch64: 'b5bb883fd8bbef85f0b4f07f1ea72ae2440aa43f32bf4921866057d3eca044fc',
armv7l: 'b5bb883fd8bbef85f0b4f07f1ea72ae2440aa43f32bf4921866057d3eca044fc',
x86_64: 'a26481c3014646418ad74688892a0b48bc0e854158a1891be0ae2ee90a16cf17'
})
depends_on 'apr'
@@ -23,29 +23,37 @@ class Httpd < Package
depends_on 'libxcrypt'
depends_on 'pcre'
depends_on 'expat'
depends_on 'brotli' # R
depends_on 'glibc' # R
depends_on 'libnghttp2' # R
depends_on 'openssl' # R
depends_on 'pcre2' # R
depends_on 'util_linux' # R
depends_on 'zlib' # R
print_source_bashrc
def self.build
system './configure',
"--prefix=#{CREW_PREFIX}/share/httpd",
"--libdir=#{CREW_LIB_PREFIX}",
"--bindir=#{CREW_PREFIX}/bin",
"--sbindir=#{CREW_PREFIX}/bin",
'--disable-maintainer-mode',
'--disable-debugger-mode'
system 'make'
def self.prebuild
ConvenienceFunctions.libtoolize('expat')
end
def self.install
system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/bash.d"
File.write "#{CREW_DEST_PREFIX}/etc/bash.d/10-httpd", <<~EOF
configure_build_extras do
File.write '10-httpd', <<~EOF
#!/bin/bash
[ -f #{CREW_PREFIX}/bin/apachectl ] && sudo #{CREW_PREFIX}/bin/apachectl start
EOF
end
configure_options "--prefix=#{CREW_PREFIX}/share/httpd \
--bindir=#{CREW_PREFIX}/bin \
--sbindir=#{CREW_PREFIX}/bin \
--disable-maintainer-mode \
--disable-debugger-mode"
configure_install_extras do
FileUtils.install '10-httpd', "#{CREW_PREFIX}/etc/bash.d/10-httpd", mode: 0o755
end
def self.postinstall
ExitMessage.add <<~EOM
@@ -60,17 +68,6 @@ class Httpd < Package
end
def self.postremove
config_dir = "#{CREW_PREFIX}/share/httpd"
if Dir.exist? config_dir
puts 'WARNING: This will remove all hosting files and configuration.'.orange
print "Would you like to remove the #{config_dir} directory? [y/N] "
case $stdin.gets.chomp.downcase
when 'y', 'yes'
FileUtils.rm_rf config_dir
puts "#{config_dir} removed.".lightgreen
else
puts "#{config_dir} saved.".lightgreen
end
end
Package.agree_to_remove("#{CREW_PREFIX}/share/httpd")
end
end