Changeset 2e78f75

Timestamp:

2016-05-15T17:16:38Z (9 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:

• configure (modified) (3 diffs)
• debian/changelog (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• irc_send.c (modified) (1 diff)
• irc_user.c (modified) (1 diff)
• lib/http_client.c (modified) (1 diff)
• protocols/jabber/iq.c (modified) (1 diff)
• protocols/twitter/twitter_http.c (modified) (1 diff)

configure

@@ -57 +57 @@
 pie=1
 
-arch=$(uname -s)
-cpu=$(uname -m)
-
 GLIB_MIN_VERSION=2.16
 
@@ -200 +197 @@
 
 TARGET=$target
-ARCH=$arch
-CPU=$cpu
 
 INSTALL=install -p
@@ -248 +243 @@
 #define PIDFILE "$pidfile"
 #define IPCSOCKET "$ipcsocket"
-#define ARCH "$arch"
-#define CPU "$cpu"
 EOF
 

debian/changelog

@@ +1 @@
+bitlbee (3.4.2-1) UNRELEASED; urgency=medium
+
+  * Make the build reproducible by not encoding ARCH / CPU defines in
+    the binary.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Sun, 15 May 2016 17:15:13 +0000
+
 bitlbee (3.4.1-1) unstable; urgency=medium
 

irc_commands.c

@@ -767 +767 @@
 static void irc_cmd_version(irc_t *irc, char **cmd)
 {
-        irc_send_num(irc, 351, "%s-%s. %s :%s/%s ",
-                     PACKAGE, BITLBEE_VERSION, irc->root->host, ARCH, CPU);
+        irc_send_num(irc, 351, "%s-%s. %s :",
+                     PACKAGE, BITLBEE_VERSION, irc->root->host);
 }
 

irc_send.c

@@ -41 +41 @@
 {
         irc_send_num(irc,   1, ":Welcome to the %s gateway, %s", PACKAGE, irc->user->nick);
-        irc_send_num(irc,   2, ":Host %s is running %s %s %s/%s.", irc->root->host,
-                     PACKAGE, BITLBEE_VERSION, ARCH, CPU);
+        irc_send_num(irc,   2, ":Host %s is running %s %s.", irc->root->host,
+                     PACKAGE, BITLBEE_VERSION);
         irc_send_num(irc,   3, ":%s", IRCD_INFO);
         irc_send_num(irc,   4, "%s %s %s %s", irc->root->host, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES);

irc_user.c

@@ -251 +251 @@
         if (g_strcasecmp(ctcp[0], "VERSION") == 0) {
                 irc_send_msg_f(iu, "NOTICE", iu->irc->user->nick, "\001%s %s\001",
-                               ctcp[0], PACKAGE " " BITLBEE_VERSION " " ARCH "/" CPU);
+                               ctcp[0], PACKAGE " " BITLBEE_VERSION);
         } else if (g_strcasecmp(ctcp[0], "PING") == 0) {
                 irc_send_msg_f(iu, "NOTICE", iu->irc->user->nick, "\001%s %s\001",

lib/http_client.c

@@ -95 +95 @@
         request = g_strdup_printf("GET %s HTTP/1.0\r\n"
                                   "Host: %s\r\n"
-                                  "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n"
+                                  "User-Agent: BitlBee " BITLBEE_VERSION "\r\n"
                                   "\r\n", url->file, url->host);
 

protocols/jabber/iq.c

@@ -67 +67 @@
                         xt_add_child(reply, xt_new_node("name", set_getstr(&ic->acc->set, "user_agent"), NULL));
                         xt_add_child(reply, xt_new_node("version", BITLBEE_VERSION, NULL));
-                        xt_add_child(reply, xt_new_node("os", ARCH, NULL));
                 } else if (strcmp(s, XMLNS_TIME_OLD) == 0) {
                         time_t time_ep;

protocols/twitter/twitter_http.c

@@ -79 +79 @@
         g_string_printf(request, "%s %s%s%s%s HTTP/1.1\r\n"
                         "Host: %s\r\n"
-                        "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n",
+                        "User-Agent: BitlBee " BITLBEE_VERSION "\r\n",
                         is_post ? "POST" : "GET",
                         base_url ? base_url->file : td->url_path,