From ec91747176dcfbb05f2a3e87100b67ecdd076013 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 17 Feb 2008 21:08:59 +0000 Subject: [PATCH] acpid: push gcc patch upstream and consolidate identical patches. --- packages/acpid/acpid-1.0.4/.mtn2git_empty | 0 packages/acpid/acpid-1.0.4/gcc40.patch | 13 ------------- .../acpid/{acpid-1.0.3 => acpid}/.mtn2git_empty | 0 packages/acpid/{acpid-1.0.3 => acpid}/gcc40.patch | 2 ++ 4 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 packages/acpid/acpid-1.0.4/.mtn2git_empty delete mode 100644 packages/acpid/acpid-1.0.4/gcc40.patch rename packages/acpid/{acpid-1.0.3 => acpid}/.mtn2git_empty (100%) rename packages/acpid/{acpid-1.0.3 => acpid}/gcc40.patch (82%) diff --git a/packages/acpid/acpid-1.0.4/.mtn2git_empty b/packages/acpid/acpid-1.0.4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/acpid/acpid-1.0.4/gcc40.patch b/packages/acpid/acpid-1.0.4/gcc40.patch deleted file mode 100644 index dbe090ba41..0000000000 --- a/packages/acpid/acpid-1.0.4/gcc40.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: acpid-1.0.3/ud_socket.c -=================================================================== ---- acpid-1.0.3.orig/ud_socket.c 2003-11-17 14:24:58.000000000 -0700 -+++ acpid-1.0.3/ud_socket.c 2005-06-27 14:44:17.785576106 -0700 -@@ -58,7 +58,7 @@ - while (1) { - int newsock = 0; - struct sockaddr_un cliaddr; -- int len = sizeof(struct sockaddr_un); -+ socklen_t len = sizeof(struct sockaddr_un); - - newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len); - if (newsock < 0) { diff --git a/packages/acpid/acpid-1.0.3/.mtn2git_empty b/packages/acpid/acpid/.mtn2git_empty similarity index 100% rename from packages/acpid/acpid-1.0.3/.mtn2git_empty rename to packages/acpid/acpid/.mtn2git_empty diff --git a/packages/acpid/acpid-1.0.3/gcc40.patch b/packages/acpid/acpid/gcc40.patch similarity index 82% rename from packages/acpid/acpid-1.0.3/gcc40.patch rename to packages/acpid/acpid/gcc40.patch index dbe090ba41..5320cee0bb 100644 --- a/packages/acpid/acpid-1.0.3/gcc40.patch +++ b/packages/acpid/acpid/gcc40.patch @@ -1,3 +1,5 @@ +upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1895615&group_id=33140&atid=407341 + Index: acpid-1.0.3/ud_socket.c =================================================================== --- acpid-1.0.3.orig/ud_socket.c 2003-11-17 14:24:58.000000000 -0700 -- 2.39.5