Changeset efec285 for server/major

Timestamp:

11/03/2023 08:46:15 AM (10 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

lazarus

Children:

167c050

Parents:

3e86dee (diff), 3a725a3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fix merge conflict

Location:

server/major

Files:

• apache.xml (modified) (1 diff)
• bind.xml (modified) (1 diff)
• kea.xml (modified) (1 diff)
• proftpd.xml (modified) (1 diff)

server/major/apache.xml

@@ -8 +8 @@
            "https://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
   <!ENTITY apache-download-ftp  " ">
-  <!ENTITY apache-md5sum        "34575e92f91fb625f3842d6ca382caa5">
-  <!ENTITY apache-size          "7.2 MB">
-  <!ENTITY apache-buildsize     "87 MB">
+  <!ENTITY apache-md5sum        "30377ec4d7fb8361e1d1f2ab3158b467">
+  <!ENTITY apache-size          "7.1 MB">
+  <!ENTITY apache-buildsize     "88 MB">
   <!ENTITY apache-time          "0.3 SBU (Using parallelism=4)">
 ]>

server/major/bind.xml

@@ -6 +6 @@
 
   <!ENTITY bind-download-http "https://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
-  <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
+  <!ENTITY bind-download-ftp  " ">
   <!ENTITY bind-md5sum        "&bind-md5;">
   <!ENTITY bind-size          "5.2 MB">

server/major/kea.xml

@@ -6 +6 @@
 
   <!ENTITY kea-download-http "https://downloads.isc.org/isc/kea/&kea-dhcp-version;/kea-&kea-dhcp-version;.tar.gz">
-  <!ENTITY kea-download-ftp  "ftp://ftp.isc.org/isc/kea/&kea-dhcp-version;/kea-&kea-dhcp-version;.tar.gz">
+  <!ENTITY kea-download-ftp  " ">
   <!ENTITY kea-md5sum        "e01bdc8d68cfaca1cae17b20b26e09b6">
   <!ENTITY kea-size          "9.9 MB">

server/major/proftpd.xml

@@ -6 +6 @@
 
   <!ENTITY proftpd-download-http "https://github.com/proftpd/proftpd/archive/v&proftpd-version;/proftpd-&proftpd-version;.tar.gz">
-  <!ENTITY proftpd-download-ftp  "ftp://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.gz">
-  <!ENTITY proftpd-md5sum        "eafdca17287bec7b6e8d88aaeba0f6aa">
-  <!ENTITY proftpd-size          "18.8 MB">
+  <!ENTITY proftpd-download-ftp  " ">
+  <!ENTITY proftpd-md5sum        "28f84d8f27380956dbb9cf4dcf606b7c">
+  <!ENTITY proftpd-size          "19 MB">
   <!ENTITY proftpd-buildsize     "66 MB">
-  <!ENTITY proftpd-time          "0.3 SBU">
+  <!ENTITY proftpd-time          "0.2 SBU">
 ]>