* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/files/
@ 2017-01-18 9:23 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-01-18 9:23 UTC (permalink / raw
To: gentoo-commits
commit: 0b7fe3e7c3876078be541653aa503c56003ef004
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jan 17 17:49:14 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 09:19:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7fe3e7
net-p2p/mldonkey: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3516
net-p2p/mldonkey/files/2.9.5-execstacks.patch | 44 ---------------------------
1 file changed, 44 deletions(-)
diff --git a/net-p2p/mldonkey/files/2.9.5-execstacks.patch b/net-p2p/mldonkey/files/2.9.5-execstacks.patch
deleted file mode 100644
index 487bfbc..00000000
--- a/net-p2p/mldonkey/files/2.9.5-execstacks.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i386.s mldonkey-2.9.5/src/utils/lib/md4_i386.s
---- mldonkey-2.9.5.orig/src/utils/lib/md4_i386.s 2008-06-30 17:45:37.000000000 +0200
-+++ mldonkey-2.9.5/src/utils/lib/md4_i386.s 2008-06-30 17:48:10.000000000 +0200
-@@ -934,3 +934,7 @@
-
- .data
-
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i486.s mldonkey-2.9.5/src/utils/lib/md4_i486.s
---- mldonkey-2.9.5.orig/src/utils/lib/md4_i486.s 2008-06-30 17:45:37.000000000 +0200
-+++ mldonkey-2.9.5/src/utils/lib/md4_i486.s 2008-06-30 17:48:21.000000000 +0200
-@@ -1091,3 +1091,7 @@
-
- .data
-
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i586.s mldonkey-2.9.5/src/utils/lib/md4_i586.s
---- mldonkey-2.9.5.orig/src/utils/lib/md4_i586.s 2008-06-30 17:45:37.000000000 +0200
-+++ mldonkey-2.9.5/src/utils/lib/md4_i586.s 2008-06-30 17:48:27.000000000 +0200
-@@ -1047,3 +1047,7 @@
-
- .data
-
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i686.s mldonkey-2.9.5/src/utils/lib/md4_i686.s
---- mldonkey-2.9.5.orig/src/utils/lib/md4_i686.s 2008-06-30 17:45:37.000000000 +0200
-+++ mldonkey-2.9.5/src/utils/lib/md4_i686.s 2008-06-30 17:48:34.000000000 +0200
-@@ -1009,3 +1009,7 @@
-
- .data
-
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/files/
@ 2020-11-19 8:17 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-11-19 8:17 UTC (permalink / raw
To: gentoo-commits
commit: 6a3acb499c83384aea3c076f6b723b55df62461d
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Nov 19 08:14:09 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 08:17:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3acb49
net-p2p/mldonkey: remove unused patches
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18302
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/mldonkey/files/ocaml-4.03.patch | 145 --------------------------------
net-p2p/mldonkey/files/ocaml4.patch | 12 ---
2 files changed, 157 deletions(-)
diff --git a/net-p2p/mldonkey/files/ocaml-4.03.patch b/net-p2p/mldonkey/files/ocaml-4.03.patch
deleted file mode 100644
index fce94c851e2..00000000000
--- a/net-p2p/mldonkey/files/ocaml-4.03.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Index: mldonkey-3.1.5/src/config/unix/os_stubs_c.c
-===================================================================
---- mldonkey-3.1.5.orig/src/config/unix/os_stubs_c.c
-+++ mldonkey-3.1.5/src/config/unix/os_stubs_c.c
-@@ -66,7 +66,7 @@ ssize_t os_read(OS_FD fd, char *buf, siz
-
- void os_ftruncate(OS_FD fd, OFF_T len, /* bool */ int sparse)
- {
-- int64 cursize;
-+ int64_t cursize;
- if(!fd) failwith("ftruncate32: file is closed");
-
- cursize = os_getfdsize(fd);
-@@ -109,7 +109,7 @@ int os_getdtablesize()
-
- *******************************************************************/
-
--int64 os_getfdsize(OS_FD fd)
-+int64_t os_getfdsize(OS_FD fd)
- {
- struct stat buf;
-
-@@ -127,7 +127,7 @@ int64 os_getfdsize(OS_FD fd)
-
- *******************************************************************/
-
--int64 os_getfilesize(char *path)
-+int64_t os_getfilesize(char *path)
- {
- struct stat buf;
-
-Index: mldonkey-3.1.5/src/networks/donkey/donkeyGlobals.ml
-===================================================================
---- mldonkey-3.1.5.orig/src/networks/donkey/donkeyGlobals.ml
-+++ mldonkey-3.1.5/src/networks/donkey/donkeyGlobals.ml
-@@ -781,7 +781,6 @@ let set_client_name c name md4 =
- c.client_md4 <- md4;
- end
-
--exception ClientFound of client
- let find_client_by_name name =
- try
- H.iter (fun c ->
-Index: mldonkey-3.1.5/src/utils/cdk/zip.ml
-===================================================================
---- mldonkey-3.1.5.orig/src/utils/cdk/zip.ml
-+++ mldonkey-3.1.5/src/utils/cdk/zip.ml
-@@ -72,8 +72,6 @@ type out_file =
- mutable of_entries: entry list;
- of_comment: string }
-
--exception Error of string * string * string
--
- (* Return the position of the last occurrence of s1 in s2, or -1 if not
- found. *)
-
-Index: mldonkey-3.1.5/src/utils/cdk/zlibstubs.c
-===================================================================
---- mldonkey-3.1.5.orig/src/utils/cdk/zlibstubs.c
-+++ mldonkey-3.1.5/src/utils/cdk/zlibstubs.c
-@@ -191,7 +191,7 @@ value camlzip_inflateEnd(value vzs)
-
- value camlzip_update_crc32(value crc, value buf, value pos, value len)
- {
-- return copy_int32(crc32((uint32) Int32_val(crc),
-+ return copy_int32(crc32((uint32_t) Int32_val(crc),
- &Byte_u(buf, Long_val(pos)),
- Long_val(len)));
- }
-Index: mldonkey-3.1.5/src/utils/lib/fst_hash.c
-===================================================================
---- mldonkey-3.1.5.orig/src/utils/lib/fst_hash.c
-+++ mldonkey-3.1.5/src/utils/lib/fst_hash.c
-@@ -197,7 +197,7 @@ unsigned short fst_hash_checksum (unsign
- /*****************************************************************************/
-
- // hash file
--int fst_hash_file (unsigned char *fth, char *file, int64 filesize)
-+int fst_hash_file (unsigned char *fth, char *file, int64_t filesize)
- {
- FILE *fp;
- unsigned char *buf;
-@@ -271,7 +271,7 @@ int fst_hash_file (unsigned char *fth, c
- }
-
-
--void fst_hash_string (unsigned char *fth, unsigned char *file, int64 filesize)
-+void fst_hash_string (unsigned char *fth, unsigned char *file, int64_t filesize)
- {
- unsigned char * buf = file;
- size_t len = filesize;
-Index: mldonkey-3.1.5/src/utils/lib/options.ml4
-===================================================================
---- mldonkey-3.1.5.orig/src/utils/lib/options.ml4
-+++ mldonkey-3.1.5/src/utils/lib/options.ml4
-@@ -332,7 +332,6 @@ let exit_exn = Exit
-
-
- let unsafe_get = String.unsafe_get
--external is_printable : char -> bool = "caml_is_printable"
- let unsafe_set = String.unsafe_set
-
- let escaped s =
-@@ -343,7 +342,7 @@ let escaped s =
- (match unsafe_get s i with
- '"' | '\\' -> 2
- | '\n' | '\t' -> 1
-- | c -> if is_printable c then 1 else 4)
-+ | c -> 1)
- done;
- if !n = String.length s then s
- else
-@@ -354,16 +353,7 @@ let escaped s =
- '"' | '\\' as c -> unsafe_set s' !n '\\'; incr n; unsafe_set s' !n c
- | '\n' | '\t' as c -> unsafe_set s' !n c
- | c ->
-- if is_printable c then unsafe_set s' !n c
-- else
-- let a = int_of_char c in
-- unsafe_set s' !n '\\';
-- incr n;
-- unsafe_set s' !n (char_of_int (48 + a / 100));
-- incr n;
-- unsafe_set s' !n (char_of_int (48 + a / 10 mod 10));
-- incr n;
-- unsafe_set s' !n (char_of_int (48 + a mod 10))
-+ unsafe_set s' !n c
- end;
- incr n
- done;
-Index: mldonkey-3.1.5/src/utils/lib/os_stubs.h
-===================================================================
---- mldonkey-3.1.5.orig/src/utils/lib/os_stubs.h
-+++ mldonkey-3.1.5/src/utils/lib/os_stubs.h
-@@ -155,8 +155,8 @@ extern OFF_T os_lseek(OS_FD fd, OFF_T po
- extern void os_ftruncate(OS_FD fd, OFF_T len, int sparse);
- extern ssize_t os_read(OS_FD fd, char *buf, size_t len);
- extern int os_getdtablesize();
--extern int64 os_getfdsize(OS_FD fd);
--extern int64 os_getfilesize(char *path);
-+extern int64_t os_getfdsize(OS_FD fd);
-+extern int64_t os_getfilesize(char *path);
- extern void os_set_nonblock(OS_SOCKET fd);
- extern void os_uname(char buf[]);
- extern int os_os_supported();
diff --git a/net-p2p/mldonkey/files/ocaml4.patch b/net-p2p/mldonkey/files/ocaml4.patch
deleted file mode 100644
index 32882417b62..00000000000
--- a/net-p2p/mldonkey/files/ocaml4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: mldonkey-3.1.5/src/utils/net/terminal.ml
-===================================================================
---- mldonkey-3.1.5.orig/src/utils/net/terminal.ml
-+++ mldonkey-3.1.5/src/utils/net/terminal.ml
-@@ -185,7 +185,6 @@ module Output = struct
- let canal = List.assoc chan !chanmap in
- etat.chan <- Some (chan, canal);
- info (sprintf "connecte au canal '%s'" chan);
-- (* {| canal ALL } *)
- with Not_found -> (* pas encore de recepteur pour ce canal *)
- try (* on en cree un *)
- let serveur = nsrecord.get_loc chan in
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-19 8:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-19 8:17 [gentoo-commits] repo/gentoo:master commit in: net-p2p/mldonkey/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2017-01-18 9:23 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox