Changeset 2e78f75


Ignore:
Timestamp:
2016-05-15T17:16:38Z (3 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
d3b99b6
Parents:
4fe91a1
git-author:
Jelmer Vernooij <jelmer@…> (15-05-16 17:12:24)
git-committer:
Jelmer Vernooij <jelmer@…> (15-05-16 17:16:38)
Message:

Remove the ARCH / CPU defines.

These only reflect on what arch/cpu bitlbee was built, not on which
it is running. This makes the Debian package unreproducible.
See e.g.
https://tests.reproducible-builds.org/rb-pkg/testing/i386/bitlbee.html

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • configure

    r4fe91a1 r2e78f75  
    5757pie=1
    5858
    59 arch=$(uname -s)
    60 cpu=$(uname -m)
    61 
    6259GLIB_MIN_VERSION=2.16
    6360
     
    200197
    201198TARGET=$target
    202 ARCH=$arch
    203 CPU=$cpu
    204199
    205200INSTALL=install -p
     
    248243#define PIDFILE "$pidfile"
    249244#define IPCSOCKET "$ipcsocket"
    250 #define ARCH "$arch"
    251 #define CPU "$cpu"
    252245EOF
    253246
  • debian/changelog

    r4fe91a1 r2e78f75  
     1bitlbee (3.4.2-1) UNRELEASED; urgency=medium
     2
     3  * Make the build reproducible by not encoding ARCH / CPU defines in
     4    the binary.
     5
     6 -- Jelmer Vernooij <jelmer@debian.org>  Sun, 15 May 2016 17:15:13 +0000
     7
    18bitlbee (3.4.1-1) unstable; urgency=medium
    29
  • irc_commands.c

    r4fe91a1 r2e78f75  
    767767static void irc_cmd_version(irc_t *irc, char **cmd)
    768768{
    769         irc_send_num(irc, 351, "%s-%s. %s :%s/%s ",
    770                      PACKAGE, BITLBEE_VERSION, irc->root->host, ARCH, CPU);
     769        irc_send_num(irc, 351, "%s-%s. %s :",
     770                     PACKAGE, BITLBEE_VERSION, irc->root->host);
    771771}
    772772
  • irc_send.c

    r4fe91a1 r2e78f75  
    4141{
    4242        irc_send_num(irc,   1, ":Welcome to the %s gateway, %s", PACKAGE, irc->user->nick);
    43         irc_send_num(irc,   2, ":Host %s is running %s %s %s/%s.", irc->root->host,
    44                      PACKAGE, BITLBEE_VERSION, ARCH, CPU);
     43        irc_send_num(irc,   2, ":Host %s is running %s %s.", irc->root->host,
     44                     PACKAGE, BITLBEE_VERSION);
    4545        irc_send_num(irc,   3, ":%s", IRCD_INFO);
    4646        irc_send_num(irc,   4, "%s %s %s %s", irc->root->host, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES);
  • irc_user.c

    r4fe91a1 r2e78f75  
    251251        if (g_strcasecmp(ctcp[0], "VERSION") == 0) {
    252252                irc_send_msg_f(iu, "NOTICE", iu->irc->user->nick, "\001%s %s\001",
    253                                ctcp[0], PACKAGE " " BITLBEE_VERSION " " ARCH "/" CPU);
     253                               ctcp[0], PACKAGE " " BITLBEE_VERSION);
    254254        } else if (g_strcasecmp(ctcp[0], "PING") == 0) {
    255255                irc_send_msg_f(iu, "NOTICE", iu->irc->user->nick, "\001%s %s\001",
  • lib/http_client.c

    r4fe91a1 r2e78f75  
    9595        request = g_strdup_printf("GET %s HTTP/1.0\r\n"
    9696                                  "Host: %s\r\n"
    97                                   "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n"
     97                                  "User-Agent: BitlBee " BITLBEE_VERSION "\r\n"
    9898                                  "\r\n", url->file, url->host);
    9999
  • protocols/jabber/iq.c

    r4fe91a1 r2e78f75  
    6767                        xt_add_child(reply, xt_new_node("name", set_getstr(&ic->acc->set, "user_agent"), NULL));
    6868                        xt_add_child(reply, xt_new_node("version", BITLBEE_VERSION, NULL));
    69                         xt_add_child(reply, xt_new_node("os", ARCH, NULL));
    7069                } else if (strcmp(s, XMLNS_TIME_OLD) == 0) {
    7170                        time_t time_ep;
  • protocols/twitter/twitter_http.c

    r4fe91a1 r2e78f75  
    7979        g_string_printf(request, "%s %s%s%s%s HTTP/1.1\r\n"
    8080                        "Host: %s\r\n"
    81                         "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n",
     81                        "User-Agent: BitlBee " BITLBEE_VERSION "\r\n",
    8282                        is_post ? "POST" : "GET",
    8383                        base_url ? base_url->file : td->url_path,
Note: See TracChangeset for help on using the changeset viewer.