Changeset efec285 for server


Ignore:
Timestamp:
11/03/2023 08:46:15 AM (12 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
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • server/databases/mariadb.xml

    r3e86dee refec285  
    77
    88  <!ENTITY mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
    9   <!--<!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">-->
    10   <!-- FTP site only keeps the most current version.-->
    119  <!ENTITY mariadb-download-ftp  " ">
    1210  <!ENTITY mariadb-md5sum        "9a4396dea3a7d3009db6ea962cac0eb6">

  • server/databases/postgresql.xml

    r3e86dee refec285  
    66
    77  <!ENTITY postgresql-download-http "https://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
    8   <!--  <!ENTITY postgresql-download-ftp  "ftp://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2"> -->
    98  <!ENTITY postgresql-download-ftp  " ">
    109  <!ENTITY postgresql-md5sum        "f5319191df114e2361d938687216cc9b">

  • server/databases/sqlite.xml

    r3e86dee refec285  
    1313  <!ENTITY sqlite-download-http "https://sqlite.org/&sqlite-year;/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
    1414  <!ENTITY sqlite-download-ftp  " ">
    15   <!ENTITY sqlite-md5sum        "77e61befe9c3298da0504f87772a24b0">
    16   <!ENTITY sqlite-size          "3.0 MB">
    17   <!ENTITY sqlite-buildsize     "126 MB">
     15  <!ENTITY sqlite-md5sum        "94fb06bfebc437762e489c355ae63716">
     16  <!ENTITY sqlite-size          "3.1 MB">
     17  <!ENTITY sqlite-buildsize     "127 MB">
    1818  <!ENTITY sqlite-time          "0.4 SBU (Using parallelism=4)">
    1919
    2020  <!ENTITY sqlite-docs-download "https://sqlite.org/&sqlite-year;/sqlite-doc-&sqlite-doc-version;.zip">
    21   <!ENTITY sqlite-docs-md5sum   "e1cd7dd84d3a73e6dca464004bdd8b8f">
     21  <!ENTITY sqlite-docs-md5sum   "6a0d94e77ebda730844b02eed0dadd75">
    2222  <!ENTITY sqlite-docs-size     "10 MB">
    2323]>

  • server/mail/exim.xml

    r3e86dee refec285  
    77  <!ENTITY exim-download-http   "https://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.xz">
    88
    9   <!ENTITY exim-download-ftp    "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.xz">
     9  <!ENTITY exim-download-ftp    " ">
    1010  <!-- if above don't work, please use one of the official mirrors at
    1111       http://www.exim.org/mirmon/ftp_mirrors.html -->
    12   <!ENTITY exim-md5sum          "0d10d5b10f2af77ec8c2c2fe5be6c1ad">
     12  <!ENTITY exim-md5sum          "27f552d5ba125a734d867642400d1d43">
    1313  <!ENTITY exim-size            "1.8 MB">
    14   <!ENTITY exim-buildsize       "20 MB">
    15   <!ENTITY exim-time            "0.3 SBU">
     14  <!ENTITY exim-buildsize       "21 MB">
     15  <!ENTITY exim-time            "less than 0.1 SBU (at -j4)">
    1616
    1717  <!ENTITY exim-daemon-version  "&exim-version;-2">
    … …  
    120120      <xref linkend="sqlite"/>,
    121121      <xref linkend="x-window-system"/>,
    122       <ulink url="https://github.com/heimdal/heimdal">Heimdal GSSAPI</ulink>, and
     122      <ulink url="https://github.com/heimdal/heimdal">Heimdal GSSAPI</ulink>,
     123      <ulink url="https://github.com/shevek/libspf2/">libspf2</ulink>, and
    123124      <ulink url="http://www.trusteddomain.org/opendmarc/">OpenDMARC</ulink>
    124125    </para>
    … …  
    139140useradd -d /dev/null -c "Exim Daemon" -g exim -s /bin/false -u 31 exim</userinput></screen>
    140141
    141 <!-- Applied in 4.96
    142     <para>
    143       If you want to build with <application>PAM</application> support, apply the following patch:
    144     </para>
    145 
    146 <screen><userinput>patch -Np2 -i ../exim-&exim-version;-call_pam-1.patch</userinput></screen>
    147 
    148     <para>
    149       Apply a patch required for building against openssl version 3:
    150     </para>
    151 
    152 <screen><userinput>patch -Np2 -i ../exim-&exim-version;-openssl3_fix-1.patch</userinput></screen>
    153 -->
    154 
    155142    <para>
    156143      Configure <application>Exim</application> with the following commands:
    … …  
    160147    -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' \
    161148    -e 's,^EXIM_USER.*$,EXIM_USER=exim,'           \
    162     -e '/# SUPPORT_TLS=yes/s,^#,,'                   \
    163     -e '/# USE_OPENSSL/s,^#,,'                       \
    164     -e 's,^EXIM_MONITOR,#EXIM_MONITOR,' src/EDITME > Local/Makefile &amp;&amp;
     149    -e '/# USE_OPENSSL/s,^#,,' src/EDITME > Local/Makefile &amp;&amp;
    165150
    166151printf "USE_GDBM = yes\nDBMLIB = -lgdbm\n" >> Local/Makefile
    … …  
    195180install -v -m644 doc/exim.8 /usr/share/man/man8 &amp;&amp;
    196181
    197 install -v -d -m755    /usr/share/doc/exim-&exim-version; &amp;&amp;
    198 install -v -m644 doc/* /usr/share/doc/exim-&exim-version; &amp;&amp;
     182install -vdm 755    /usr/share/doc/exim-&exim-version; &amp;&amp;
     183cp      -Rv doc/*  /usr/share/doc/exim-&exim-version; &amp;&amp;
    199184
    200185ln -sfv exim /usr/sbin/sendmail                 &amp;&amp;
    … …  
    710695        <listitem>
    711696          <para>
    712             queries running <application>Exim</application>
    713           processes
     697            queries running <application>Exim</application> processes
    714698          </para>
    715699          <indexterm zone="exim exiwhat">

  • server/mail/postfix.xml

    r3e86dee refec285  
    99  mirror status, some of the mirrors shown as http are actually https -->
    1010  <!ENTITY postfix-download-http "https://ghostarchive.org/postfix/postfix-release/official/postfix-&postfix-version;.tar.gz">
    11   <!ENTITY postfix-download-ftp  "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
     11  <!ENTITY postfix-download-ftp  " ">
    1212  <!ENTITY postfix-md5sum        "3e9d80bbbb692693f4172d465c08c893">
    1313  <!ENTITY postfix-size          "4.6 MB">

  • server/mail/sendmail.xml

    r3e86dee refec285  
    66
    77  <!ENTITY sendmail-download-http "https://ftp.sendmail.org/sendmail.&sendmail-version;.tar.gz">
    8   <!ENTITY sendmail-download-ftp  "ftp://ftp.sendmail.org/pub/sendmail/sendmail.&sendmail-version;.tar.gz">
     8  <!ENTITY sendmail-download-ftp  " ">
    99  <!ENTITY sendmail-md5sum        "eb21e7c8a1d2a69a4597e9ce6b1cb3d5">
    1010  <!ENTITY sendmail-size          "2.2 MB">

  • server/major/apache.xml

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

  • server/major/bind.xml

    r3e86dee refec285  
    66
    77  <!ENTITY bind-download-http "https://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
    8   <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
     8  <!ENTITY bind-download-ftp  " ">
    99  <!ENTITY bind-md5sum        "&bind-md5;">
    1010  <!ENTITY bind-size          "5.2 MB">

  • server/major/kea.xml

    r3e86dee refec285  
    66
    77  <!ENTITY kea-download-http "https://downloads.isc.org/isc/kea/&kea-dhcp-version;/kea-&kea-dhcp-version;.tar.gz">
    8   <!ENTITY kea-download-ftp  "ftp://ftp.isc.org/isc/kea/&kea-dhcp-version;/kea-&kea-dhcp-version;.tar.gz">
     8  <!ENTITY kea-download-ftp  " ">
    99  <!ENTITY kea-md5sum        "e01bdc8d68cfaca1cae17b20b26e09b6">
    1010  <!ENTITY kea-size          "9.9 MB">

  • server/major/proftpd.xml

    r3e86dee refec285  
    66
    77  <!ENTITY proftpd-download-http "https://github.com/proftpd/proftpd/archive/v&proftpd-version;/proftpd-&proftpd-version;.tar.gz">
    8   <!ENTITY proftpd-download-ftp  "ftp://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.gz">
    9   <!ENTITY proftpd-md5sum        "eafdca17287bec7b6e8d88aaeba0f6aa">
    10   <!ENTITY proftpd-size          "18.8 MB">
     8  <!ENTITY proftpd-download-ftp  " ">
     9  <!ENTITY proftpd-md5sum        "28f84d8f27380956dbb9cf4dcf606b7c">
     10  <!ENTITY proftpd-size          "19 MB">
    1111  <!ENTITY proftpd-buildsize     "66 MB">
    12   <!ENTITY proftpd-time          "0.3 SBU">
     12  <!ENTITY proftpd-time          "0.2 SBU">
    1313]>
    1414

  • server/other/openldap.xml

    r3e86dee refec285  
    66
    77  <!ENTITY openldap-download-http "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
    8   <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
     8  <!ENTITY openldap-download-ftp  " ">
    99  <!ENTITY openldap-md5sum        "5259e75484be71563e3f5c33d64a274d">
    1010  <!ENTITY openldap-size          "6.2 MB">
Note: See TracChangeset for help on using the changeset viewer.