diff options
Diffstat (limited to 'flx')
102 files changed, 3394 insertions, 0 deletions
diff --git a/flx/flx/Manifest b/flx/flx/Manifest new file mode 100644 index 00000000..43c001c0 --- /dev/null +++ b/flx/flx/Manifest @@ -0,0 +1,17 @@ +AUX 0.1.31-respect-CFLAGS-LDFLAGS.diff 503 SHA256 8a8342cba996d51e42b5c9486ce42591b7f0899f850d05cd6c4aa5d9118b5add SHA512 93e0b03a250a7aa328a17057409ec9516a55ff34841407f1c46ae774832ca25e733ad375a95fbf84c9f64c9fb46dbb1147af3ad7dde55a3204a821290a5105a2 WHIRLPOOL e67c1eab1bca82464bbbdaa3990dba2d3d9bf744fb60bdc6a8e4da38b2dc73484bdc164c91939a4c9f83a51743b338bccb7d2c00849a53d64031b650f7ba3c55 +AUX 0.1.31-warning-cast.diff 9513 SHA256 4bb4801f530869cb5e1bfecfa5cb007b4b5e5b1de1e25404f1c107135025a165 SHA512 f553491533c2c97da41ae513d5c12b3dca80fd46892cbb0c58ea32faa01bf76c3bda6e9f2cdb92477e057a703583318495e39f790528982249c4d27c1683497c WHIRLPOOL 1cb86d258df028e7c46f10d8a5866f32565e359f1cfc644cadd46478de140b3f3ebc1c42a764056ca301c27b519907290ca77e7a277f0064cffba9d391b5d3a1 +AUX 0.1.31-warning-implicit-declaration.diff 1147 SHA256 610c41f21175e369bfe1185b59b875744506b4d5ec2fcdd529f7d3beb8d64d29 SHA512 b38e2053c40d756f88d351e75b046b7fc46677ac214e2b2227b100ff630f11f314a69f5ab917df8bd8eb8a0df1e6bc98c95917a75f99297f93cefd7db4217787 WHIRLPOOL 98483417447ab1a1d61facc32f65af5bf4ec70a99983592d4088d18f62840a5e35b9d31b95451a3f835b2eb3d40b12928ec52205f25bf7ae830867ffa46fecc4 +AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 503 SHA256 8a8342cba996d51e42b5c9486ce42591b7f0899f850d05cd6c4aa5d9118b5add SHA512 93e0b03a250a7aa328a17057409ec9516a55ff34841407f1c46ae774832ca25e733ad375a95fbf84c9f64c9fb46dbb1147af3ad7dde55a3204a821290a5105a2 WHIRLPOOL e67c1eab1bca82464bbbdaa3990dba2d3d9bf744fb60bdc6a8e4da38b2dc73484bdc164c91939a4c9f83a51743b338bccb7d2c00849a53d64031b650f7ba3c55 +AUX 0.1.34-warning-cast.diff 9513 SHA256 4bb4801f530869cb5e1bfecfa5cb007b4b5e5b1de1e25404f1c107135025a165 SHA512 f553491533c2c97da41ae513d5c12b3dca80fd46892cbb0c58ea32faa01bf76c3bda6e9f2cdb92477e057a703583318495e39f790528982249c4d27c1683497c WHIRLPOOL 1cb86d258df028e7c46f10d8a5866f32565e359f1cfc644cadd46478de140b3f3ebc1c42a764056ca301c27b519907290ca77e7a277f0064cffba9d391b5d3a1 +AUX 0.1.34-warning-implicit-declaration.diff 1147 SHA256 610c41f21175e369bfe1185b59b875744506b4d5ec2fcdd529f7d3beb8d64d29 SHA512 b38e2053c40d756f88d351e75b046b7fc46677ac214e2b2227b100ff630f11f314a69f5ab917df8bd8eb8a0df1e6bc98c95917a75f99297f93cefd7db4217787 WHIRLPOOL 98483417447ab1a1d61facc32f65af5bf4ec70a99983592d4088d18f62840a5e35b9d31b95451a3f835b2eb3d40b12928ec52205f25bf7ae830867ffa46fecc4 +AUX 0.6.7-cast.diff 3845 SHA256 3e0917453c6deed578bed03ae40de1096617cbbaf4fd20d20d128c06def4e850 SHA512 8fb14f4fa42982c069f5279e99af90e67a265edde73c529579c75cf7ccc8ef3a5dd26d40ff67b817fbbe13c4e4cff28bb081eea09f002d73902087d5aa6565f4 WHIRLPOOL 731b50135e3b9374c981168df51f8764d3d94578c4b5f4a5c1caef854c468033c0b0ef8d964e83711b1ffd0ea9e2ef640a90f4a42c141b9338168388df320b29 +AUX 0.6.7-gcc-2.9-define.diff 1101 SHA256 b5ddc7098c4f4ef2860a3cfe7347c3775b753b7fca4aa527ac68a8d128e2fc58 SHA512 c2dd1e24ba01b8a2328a645bc6a99b87828516ffad8cf2401c9f073ef1b5404e34258a8cc76b1c873869b117ffbefc4d8253b618eb645edd37c802cbddaedf2e WHIRLPOOL 8f7c82fdad2b7b5c99fccc3534531e42bd2870e1ec1d9b9b2de1a40e4407a9141a0612f197824641938917f506d0d8d87e627c118382c1378ec1c46ecdd49385 +AUX 0.6.7-quoted-FLX_poptions.diff 897 SHA256 6d6e71bf88cdb521e530ebda93c85994f8551be597b0d67fc24a585823263976 SHA512 dedd5517079384fc860c0ac0f937b26700e0b5cd79762ec2de413ec8d468ab5d59dfb9c87643b60e9d25523d85d20d6c025a54cdbff55803331e55fdc3636c85 WHIRLPOOL 78c1e87059ed7f7f61cb145a2d24b6e845422efee90e218aef7c61b7f1894ba58b7a6fc1299d80e72b88ade9354d319e61161a0c6f59f042dca04c20e718860d +AUX 0.6.7-respect-CFLAGS-LDFLAGS.diff 507 SHA256 1483dcff7234be64f581d4a4a645fc6b9e575993d76230a5493fa86aa9368365 SHA512 e83838f4bc8794da3ff0068dfbe6e23f0386f3b305686787e3e3738c56c3ea1b038c258be97cb2e88f7e97a37fbf96c28967c767a009a956ecdd0ddc60923ce3 WHIRLPOOL c6295065570c4ccc0e1d5ee1077d134162d6706daf378b6fca48eeb21d06b6a4c9007786837ccdac855f91bb16b8ce707b8de328553559fb45226f29224ebf17 +AUX 0.6.7-warnings.diff 1124 SHA256 e13b569a38125a6a8373b13278dd4df85b8459028815277cb7bf687798aa0856 SHA512 7721e50d74cbfcb5e6776eb2da95d6ce389314de67a726c4f7ed7bca65efe6b5b2d3ccfafccee27351b99fad4f695a332660b0c3a1d15d34473f086f0bd6f701 WHIRLPOOL fd7a6101c461e51ba80404d8c071de4f3a36ab068cb43512b0fbf16257040c4384393ea75ec8c23aab64e783425bdd079f16f9f3351dfda5195983119aad62d5 +AUX 9999-respect-CFLAGS-LDFLAGS.diff 503 SHA256 8a8342cba996d51e42b5c9486ce42591b7f0899f850d05cd6c4aa5d9118b5add SHA512 93e0b03a250a7aa328a17057409ec9516a55ff34841407f1c46ae774832ca25e733ad375a95fbf84c9f64c9fb46dbb1147af3ad7dde55a3204a821290a5105a2 WHIRLPOOL e67c1eab1bca82464bbbdaa3990dba2d3d9bf744fb60bdc6a8e4da38b2dc73484bdc164c91939a4c9f83a51743b338bccb7d2c00849a53d64031b650f7ba3c55 +AUX 9999-warning-implicit-declaration.diff 1443 SHA256 8cb585822838656c1cb6a7f4f5b37108839122c3abac1d654093be642d69ff76 SHA512 9b2d65c30af154090684c5cb01ddcba1ab6be75c58847818ea597f31e42202fda36d19d8390277014cbc8e45ffe9068a274f39a661153b7c209d88c2737efc3c WHIRLPOOL 79a0ffadfe979ba7c69f6efb7b770a0a4bc2f399b2a827e2bd30f985447765651124f7decf278fc31306f302fbcad31e98bdcde0065e3d90aff15a6966841e34 +EBUILD flx-0.1.31.ebuild 726 SHA256 f6d33e0e87eba3f97429e6e33c17b145d3318bafb6c32be4eb2cac7d4295ffe4 SHA512 8eaecb5588ad2753100802b61b2605b9b1becefe6906ce91a2f9874a952be366df7a2d0309720c007e8c3fdd0ddfa50ee2fd64fa0bd3d170fd13c39730ec503d WHIRLPOOL 954208f900ef9b4c251a78c26b70f981cde5819de94cb41efe10e6e556c6d704f3266692cfcdb49c8ebf58cf07323e1e3fd31cf7adb95d4869b95a3d5b1ab671 +EBUILD flx-0.1.34.ebuild 726 SHA256 f6d33e0e87eba3f97429e6e33c17b145d3318bafb6c32be4eb2cac7d4295ffe4 SHA512 8eaecb5588ad2753100802b61b2605b9b1becefe6906ce91a2f9874a952be366df7a2d0309720c007e8c3fdd0ddfa50ee2fd64fa0bd3d170fd13c39730ec503d WHIRLPOOL 954208f900ef9b4c251a78c26b70f981cde5819de94cb41efe10e6e556c6d704f3266692cfcdb49c8ebf58cf07323e1e3fd31cf7adb95d4869b95a3d5b1ab671 +EBUILD flx-0.6.7.ebuild 780 SHA256 ba86c4ad2a1df8895c3712f0cb07db17aa545e007ce574d1f27227bd792b13a7 SHA512 4ba1eff1358646b48e185e1e6858497af05f88e58300b55e76aac4e7aa2ee10716d4b6e3a4b55bc97abca4faf2af25527a8ab3ded10c4f94753bd5f13770689d WHIRLPOOL c8760ba22665b3552196d32c32de4a538efcaaeb7ac236421aff8e1eb0db5d6d16dd4220b590859ba5bf4a0832651497a3304cf86b18628066feae1e17834863 +EBUILD flx-9999.ebuild 726 SHA256 1e4430f77f95010c7804827cd6ed4ba93f367a2f97be391de1a3ecf4a642eaed SHA512 603618aaed702fa1d3e37b2c3b9b8e3631bdacdd41ad425478143d56dad5e812b77cc9efa23fee6dd7ae7338f455d32b1f5b419c90c6ae37e162b95f73b8e285 WHIRLPOOL 101f787b80b2a073dcd5650a6970c5ea61550d90ae5151498c4460bbfa1ad8d6bf4d97a1835c2394f3d1c651893c0420408d4cb183d80ede556598eac837e231 diff --git a/flx/flx/files/0.1.31-respect-CFLAGS-LDFLAGS.diff b/flx/flx/files/0.1.31-respect-CFLAGS-LDFLAGS.diff new file mode 100644 index 00000000..54f85b98 --- /dev/null +++ b/flx/flx/files/0.1.31-respect-CFLAGS-LDFLAGS.diff @@ -0,0 +1,15 @@ +diff --git a/flx/Makefile b/flx/Makefile +index 6bee331..7cb9fd2 100644 +--- a/flx/Makefile ++++ b/flx/Makefile +@@ -32,8 +32,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \ + output.c output_file.c + OBJ=$(SRC:.c=.o) + COPTS=-O2 +-CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" +-LDFLAGS=-L. -Wl,--gc-sections ++CFLAGS += -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" ++LDFLAGS += -Wl,--gc-sections + + all: $(NAME) + diff --git a/flx/flx/files/0.1.31-warning-cast.diff b/flx/flx/files/0.1.31-warning-cast.diff new file mode 100644 index 00000000..9c45d9af --- /dev/null +++ b/flx/flx/files/0.1.31-warning-cast.diff @@ -0,0 +1,255 @@ +diff --git a/flx/check.c b/flx/check.c +index 9589c5e..3f3e26a 100644 +--- a/flx/check.c ++++ b/flx/check.c +@@ -384,25 +384,25 @@ t_file_diff *fct_free_diff_desc(void *data, t_file_diff *desc) { + + char *build_diff_line(char *path, char *filename, t_file_diff *info) { + static char tmp[BUFFER_LENGTH]; +- static char opath[BUFFER_LENGTH]; ++ static unsigned char opath[BUFFER_LENGTH]; + char *s = tmp; +- char *ppath; ++ unsigned char *ppath; + + *s = 0; + if (info->diff == 0) { + ppath = opath; +- if (Output_Str) ppath += sprintf(ppath, "%s/", Output_Str); +- if (Rewrite_Src1) ppath += sprintf(ppath, "%s/", Rewrite_Src1); +- sprintf(ppath, "%s", path); ++ if (Output_Str) ppath += sprintf((char *)ppath, "%s/", Output_Str); ++ if (Rewrite_Src1) ppath += sprintf((char *)ppath, "%s/", Rewrite_Src1); ++ sprintf((char *)ppath, "%s", path); + s += sprintf(s, "= %s", build_line(opath, filename, info->src1)); + return (tmp); + } + + if (info->src1 && IS(Options, SHOW_OLD)) { + ppath = opath; +- if (Output_Str) ppath += sprintf(ppath, "%s/", Output_Str); +- if (Rewrite_Src1) ppath += sprintf(ppath, "%s/", Rewrite_Src1); +- sprintf(ppath, "%s", path); ++ if (Output_Str) ppath += sprintf((char *)ppath, "%s/", Output_Str); ++ if (Rewrite_Src1) ppath += sprintf((char *)ppath, "%s/", Rewrite_Src1); ++ sprintf((char *)ppath, "%s", path); + + if (!info->src2) + s += sprintf(s, "- %s", build_line(opath, filename, info->src1)); +@@ -412,9 +412,9 @@ char *build_diff_line(char *path, char *filename, t_file_diff *info) { + } + if (info->src2 && IS(Options, SHOW_NEW)) { + ppath = opath; +- if (Output_Str) ppath += sprintf(ppath, "%s/", Output_Str); +- if (Rewrite_Src2) ppath += sprintf(ppath, "%s/", Rewrite_Src2); +- sprintf(ppath, "%s", path); ++ if (Output_Str) ppath += sprintf((char *)ppath, "%s/", Output_Str); ++ if (Rewrite_Src2) ppath += sprintf((char *)ppath, "%s/", Rewrite_Src2); ++ sprintf((char *)ppath, "%s", path); + + if (!info->src1) + s += sprintf(s, "+ %s", build_line(opath, filename, info->src2)); +diff --git a/flx/fct1.c b/flx/fct1.c +index c074a7a..e9ade63 100644 +--- a/flx/fct1.c ++++ b/flx/fct1.c +@@ -38,14 +38,14 @@ t_file_desc *complete_info_from_file(char *path, t_file_desc *desc, int flag) { + desc->md5 = checksum_md5_from_file(path); + else if (S_ISLNK(stat.st_mode) && !desc->link) { + /* get link and md5 associed */ +- char temp[BUFFER_LENGTH]; ++ unsigned char temp[BUFFER_LENGTH]; + int l; + +- if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) { ++ if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) { + PFERROR("readlink(%s)", path); + } else { + temp[l] = 0; +- desc->link = strdup(temp); ++ desc->link = (unsigned char *)strdup((char *)temp); + desc->md5 = checksum_md5_from_data(temp, l); + } + } +@@ -81,7 +81,7 @@ int files_are_the_same(t_file_desc *f1, t_file_desc *f2, int Diff, char *path) + diff |= DIFF_TIME; /* modification times diff */ + } + if (DIFF(LINK) && S_ISLNK(f1->stat.st_mode) && S_ISLNK(f2->stat.st_mode)) { +- char temp[BUFFER_LENGTH]; ++ unsigned char temp[BUFFER_LENGTH]; + int l; + + if (f1->link != f2->link) { +@@ -89,18 +89,18 @@ int files_are_the_same(t_file_desc *f1, t_file_desc *f2, int Diff, char *path) + if (!path) diff |= DIFF_LINK; + else { + /* rebuild link and link's checksum */ +- if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) { ++ if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) { + PFERROR("readlink(%s)",path); + } else { + temp[l] = 0; +- if (!f1->link) f1->link = strdup(temp); +- if (!f2->link) f2->link = strdup(temp); ++ if (!f1->link) f1->link = (unsigned char *)strdup((char *)temp); ++ if (!f2->link) f2->link = (unsigned char *)strdup((char *)temp); + if (!f1->md5) f1->md5 = checksum_md5_from_data(temp, l); + if (!f2->md5) f2->md5 = checksum_md5_from_data(temp, l); + } + } + } +- if (!(diff & DIFF_LINK) && strcmp(f1->link, f2->link)) ++ if (!(diff & DIFF_LINK) && strcmp((char *)f1->link, (char *)f2->link)) + diff |= DIFF_LINK; /* links differ */ + } + } +@@ -223,10 +223,10 @@ int browse_over_path(char *path, PROTO_FS(*fct), void *data) { + + + /* build an MD5 checksum from data in file */ +-char *checksum_md5_from_file(char *file) { ++unsigned char *checksum_md5_from_file(char *file) { + int fd; + ssize_t size; +- char *checksum_md5 = NULL, blk[BUFFER_LENGTH]; ++ unsigned char *checksum_md5 = NULL, blk[BUFFER_LENGTH]; + MD5_CTX md5_ctx; + + if ((fd = open(file, O_RDONLY)) < 0 ) { +@@ -247,8 +247,8 @@ char *checksum_md5_from_file(char *file) { + } + + /* build an MD5 checksum from a string */ +-char *checksum_md5_from_data(char *data, int len) { +- char *checksum_md5 = 0; ++unsigned char *checksum_md5_from_data(unsigned char *data, int len) { ++ unsigned char *checksum_md5 = 0; + MD5_CTX md5_ctx; + + MD5_Init(&md5_ctx); +@@ -310,7 +310,7 @@ int mkdir_with_parent(char *pathname, mode_t mode) { + } + + /* return formatted info into a static string */ +-char *build_line(char *path, char *filename, t_file_desc *info) { ++char *build_line(unsigned char *path, char *filename, t_file_desc *info) { + struct stat *st = &(info->stat); + static char blk[BUFFER_LENGTH], tmp[64]; + int s; +diff --git a/flx/flx.h b/flx/flx.h +index 3315ded..7030102 100644 +--- a/flx/flx.h ++++ b/flx/flx.h +@@ -216,11 +216,11 @@ struct s_dtree { + + + extern int browse_over_path(char *path, void *(*fct)(), void *data) ; +-extern char *checksum_md5_from_file(char *file) ; +-extern char *checksum_md5_from_data(char *data, int len) ; ++extern unsigned char *checksum_md5_from_file(char *file) ; ++extern unsigned char *checksum_md5_from_data(unsigned char *data, int len) ; + extern char *end_field(char *line) ; + extern int mkdir_with_parent(char *pathname, mode_t mode) ; +-extern char *build_line(char *path, char *filename, t_file_desc *info) ; ++extern char *build_line(unsigned char *path, char *filename, t_file_desc *info) ; + extern char *show_filename(char *path, char *filename, t_file_desc *info) ; + extern void dump_tree(t_ft *tree) ; + extern int dump_diff_tree(t_dtree *tree); +diff --git a/flx/input_file.c b/flx/input_file.c +index ec50c02..5dc8e80 100644 +--- a/flx/input_file.c ++++ b/flx/input_file.c +@@ -132,7 +132,7 @@ t_file_desc *fill_from_signfs_line(char **tab, char **rpath, t_file_desc **desc) + if (rpath) *rpath = p1; + break; + case 8: /* link */ +- (*desc)->link = strdup(p1); ++ (*desc)->link = (unsigned char *)strdup(p1); + break; + } + } +diff --git a/flx/input_fs.c b/flx/input_fs.c +index e64f9da..3a35759 100644 +--- a/flx/input_fs.c ++++ b/flx/input_fs.c +@@ -40,14 +40,14 @@ static t_file_desc *complete_info_from_fs(char *path, t_file_desc *desc) { + desc->md5 = checksum_md5_from_file(path); + else if (S_ISLNK(stat.st_mode) && !desc->link) { + /* get link and md5 associed */ +- char temp[BUFFER_LENGTH]; ++ unsigned char temp[BUFFER_LENGTH]; + int l; + +- if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) { ++ if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) { + PFERROR("readlink(%s)", path); + } else { + temp[l] = 0; +- desc->link = strdup(temp); ++ desc->link = (unsigned char *)strdup((char *)temp); + desc->md5 = checksum_md5_from_data(temp, l); + } + } +diff --git a/flx/utils.c b/flx/utils.c +index 16aaad2..090e314 100644 +--- a/flx/utils.c ++++ b/flx/utils.c +@@ -10,7 +10,7 @@ + + #include "utils.h" + +-static char bigbuffer[BUFFLEN]; ++static unsigned char bigbuffer[BUFFLEN]; + + POOL_INIT(p2void); + +@@ -121,8 +121,8 @@ char *backslashed_strmchr(char *s, char *mc) { + } + + /* return the string with characters 'toback' backslashed */ +-char *backslashed_str(char *s, char *toback) { +- char *pbuff = bigbuffer; ++unsigned char *backslashed_str(char *s, char *toback) { ++ unsigned char *pbuff = bigbuffer; + int len = 0; + + while (*s && len < (BUFFLEN-1)) { +@@ -136,8 +136,8 @@ char *backslashed_str(char *s, char *toback) { + } + + /* escape unprintable char with its hexadecimal value (url encode form) */ +-char *escape_str(char *s) { +- char *pbuff = bigbuffer; ++unsigned char *escape_str(unsigned char *s) { ++ unsigned char *pbuff = bigbuffer; + int len = 0; + + while (*s && len < (BUFFLEN-4)) { +@@ -158,8 +158,8 @@ char *escape_str(char *s) { + } + + /* unescape string from %xx string form */ +-char *unescape_str(char *s) { +- char *pbuff = bigbuffer; ++unsigned char *unescape_str(char *s) { ++ unsigned char *pbuff = bigbuffer; + int len = 0; + + while (*s && len < (BUFFLEN-1)) { +diff --git a/flx/utils.h b/flx/utils.h +index 984fc7a..707e620 100644 +--- a/flx/utils.h ++++ b/flx/utils.h +@@ -186,9 +186,9 @@ int fatal_error(char *,...); + int pferror(char *,...); + char *backslashed_strchr(char *s, char c); + char *backslashed_strmchr(char *s, char *mc); +-char *backslashed_str(char *, char *toback); ++unsigned char *backslashed_str(char *, char *toback); + void *push_str_sorted(void *ptr, char *str); +-char *escape_str(char *s); +-char *unescape_str(char *s); ++unsigned char *escape_str(unsigned char *s); ++unsigned char *unescape_str(char *s); + + #endif /* __UTILS_H__ */ diff --git a/flx/flx/files/0.1.31-warning-implicit-declaration.diff b/flx/flx/files/0.1.31-warning-implicit-declaration.diff new file mode 100644 index 00000000..6cbc45bf --- /dev/null +++ b/flx/flx/files/0.1.31-warning-implicit-declaration.diff @@ -0,0 +1,58 @@ +diff --git a/flx/arg.c b/flx/arg.c +index d82d2d1..8b7c112 100644 +--- a/flx/arg.c ++++ b/flx/arg.c +@@ -1,6 +1,7 @@ + #include <stdio.h> + #include <string.h> + #include <stdarg.h> ++#include <stdlib.h> + + #include "flx.h" + #include "arg.h" +diff --git a/flx/check.c b/flx/check.c +index 0a425c3..9589c5e 100644 +--- a/flx/check.c ++++ b/flx/check.c +@@ -23,6 +23,7 @@ + + #include <string.h> + #include <stdio.h> ++#include <stdlib.h> + + #include "flx.h" + #include "check.h" +diff --git a/flx/input.c b/flx/input.c +index 182fa83..5e9ecbc 100644 +--- a/flx/input.c ++++ b/flx/input.c +@@ -1,4 +1,6 @@ + #include <string.h> ++#include <stdlib.h> ++ + #include "utils.h" + #include "source_type.h" + #include "input.h" +diff --git a/flx/output.c b/flx/output.c +index 7898fc8..801bccc 100644 +--- a/flx/output.c ++++ b/flx/output.c +@@ -1,4 +1,6 @@ + #include <string.h> ++#include <stdlib.h> ++ + #include "utils.h" + #include "flx.h" + #include "output.h" +diff --git a/flx/utils.c b/flx/utils.c +index 6b0272a..16aaad2 100644 +--- a/flx/utils.c ++++ b/flx/utils.c +@@ -6,6 +6,7 @@ + #include <fcntl.h> + #include <stdarg.h> + #include <ctype.h> ++#include <stdlib.h> + + #include "utils.h" + diff --git a/flx/flx/files/0.1.34-respect-CFLAGS-LDFLAGS.diff b/flx/flx/files/0.1.34-respect-CFLAGS-LDFLAGS.diff new file mode 100644 index 00000000..54f85b98 --- /dev/null +++ b/flx/flx/files/0.1.34-respect-CFLAGS-LDFLAGS.diff @@ -0,0 +1,15 @@ +diff --git a/flx/Makefile b/flx/Makefile +index 6bee331..7cb9fd2 100644 +--- a/flx/Makefile ++++ b/flx/Makefile +@@ -32,8 +32,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \ + output.c output_file.c + OBJ=$(SRC:.c=.o) + COPTS=-O2 +-CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" +-LDFLAGS=-L. -Wl,--gc-sections ++CFLAGS += -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" ++LDFLAGS += -Wl,--gc-sections + + all: $(NAME) + diff --git a/flx/flx/files/0.1.34-warning-cast.diff b/flx/flx/files/0.1.34-warning-cast.diff new file mode 100644 index 00000000..9c45d9af --- /dev/null +++ b/flx/flx/files/0.1.34-warning-cast.diff @@ -0,0 +1,255 @@ +diff --git a/flx/check.c b/flx/check.c +index 9589c5e..3f3e26a 100644 +--- a/flx/check.c ++++ b/flx/check.c +@@ -384,25 +384,25 @@ t_file_diff *fct_free_diff_desc(void *data, t_file_diff *desc) { + + char *build_diff_line(char *path, char *filename, t_file_diff *info) { + static char tmp[BUFFER_LENGTH]; +- static char opath[BUFFER_LENGTH]; ++ static unsigned char opath[BUFFER_LENGTH]; + char *s = tmp; +- char *ppath; ++ unsigned char *ppath; + + *s = 0; + if (info->diff == 0) { + ppath = opath; +- if (Output_Str) ppath += sprintf(ppath, "%s/", Output_Str); +- if (Rewrite_Src1) ppath += sprintf(ppath, "%s/", Rewrite_Src1); +- sprintf(ppath, "%s", path); ++ if (Output_Str) ppath += sprintf((char *)ppath, "%s/", Output_Str); ++ if (Rewrite_Src1) ppath += sprintf((char *)ppath, "%s/", Rewrite_Src1); ++ sprintf((char *)ppath, "%s", path); + s += sprintf(s, "= %s", build_line(opath, filename, info->src1)); + return (tmp); + } + + if (info->src1 && IS(Options, SHOW_OLD)) { + ppath = opath; +- if (Output_Str) ppath += sprintf(ppath, "%s/", Output_Str); +- if (Rewrite_Src1) ppath += sprintf(ppath, "%s/", Rewrite_Src1); +- sprintf(ppath, "%s", path); ++ if (Output_Str) ppath += sprintf((char *)ppath, "%s/", Output_Str); ++ if (Rewrite_Src1) ppath += sprintf((char *)ppath, "%s/", Rewrite_Src1); ++ sprintf((char *)ppath, "%s", path); + + if (!info->src2) + s += sprintf(s, "- %s", build_line(opath, filename, info->src1)); +@@ -412,9 +412,9 @@ char *build_diff_line(char *path, char *filename, t_file_diff *info) { + } + if (info->src2 && IS(Options, SHOW_NEW)) { + ppath = opath; +- if (Output_Str) ppath += sprintf(ppath, "%s/", Output_Str); +- if (Rewrite_Src2) ppath += sprintf(ppath, "%s/", Rewrite_Src2); +- sprintf(ppath, "%s", path); ++ if (Output_Str) ppath += sprintf((char *)ppath, "%s/", Output_Str); ++ if (Rewrite_Src2) ppath += sprintf((char *)ppath, "%s/", Rewrite_Src2); ++ sprintf((char *)ppath, "%s", path); + + if (!info->src1) + s += sprintf(s, "+ %s", build_line(opath, filename, info->src2)); +diff --git a/flx/fct1.c b/flx/fct1.c +index c074a7a..e9ade63 100644 +--- a/flx/fct1.c ++++ b/flx/fct1.c +@@ -38,14 +38,14 @@ t_file_desc *complete_info_from_file(char *path, t_file_desc *desc, int flag) { + desc->md5 = checksum_md5_from_file(path); + else if (S_ISLNK(stat.st_mode) && !desc->link) { + /* get link and md5 associed */ +- char temp[BUFFER_LENGTH]; ++ unsigned char temp[BUFFER_LENGTH]; + int l; + +- if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) { ++ if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) { + PFERROR("readlink(%s)", path); + } else { + temp[l] = 0; +- desc->link = strdup(temp); ++ desc->link = (unsigned char *)strdup((char *)temp); + desc->md5 = checksum_md5_from_data(temp, l); + } + } +@@ -81,7 +81,7 @@ int files_are_the_same(t_file_desc *f1, t_file_desc *f2, int Diff, char *path) + diff |= DIFF_TIME; /* modification times diff */ + } + if (DIFF(LINK) && S_ISLNK(f1->stat.st_mode) && S_ISLNK(f2->stat.st_mode)) { +- char temp[BUFFER_LENGTH]; ++ unsigned char temp[BUFFER_LENGTH]; + int l; + + if (f1->link != f2->link) { +@@ -89,18 +89,18 @@ int files_are_the_same(t_file_desc *f1, t_file_desc *f2, int Diff, char *path) + if (!path) diff |= DIFF_LINK; + else { + /* rebuild link and link's checksum */ +- if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) { ++ if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) { + PFERROR("readlink(%s)",path); + } else { + temp[l] = 0; +- if (!f1->link) f1->link = strdup(temp); +- if (!f2->link) f2->link = strdup(temp); ++ if (!f1->link) f1->link = (unsigned char *)strdup((char *)temp); ++ if (!f2->link) f2->link = (unsigned char *)strdup((char *)temp); + if (!f1->md5) f1->md5 = checksum_md5_from_data(temp, l); + if (!f2->md5) f2->md5 = checksum_md5_from_data(temp, l); + } + } + } +- if (!(diff & DIFF_LINK) && strcmp(f1->link, f2->link)) ++ if (!(diff & DIFF_LINK) && strcmp((char *)f1->link, (char *)f2->link)) + diff |= DIFF_LINK; /* links differ */ + } + } +@@ -223,10 +223,10 @@ int browse_over_path(char *path, PROTO_FS(*fct), void *data) { + + + /* build an MD5 checksum from data in file */ +-char *checksum_md5_from_file(char *file) { ++unsigned char *checksum_md5_from_file(char *file) { + int fd; + ssize_t size; +- char *checksum_md5 = NULL, blk[BUFFER_LENGTH]; ++ unsigned char *checksum_md5 = NULL, blk[BUFFER_LENGTH]; + MD5_CTX md5_ctx; + + if ((fd = open(file, O_RDONLY)) < 0 ) { +@@ -247,8 +247,8 @@ char *checksum_md5_from_file(char *file) { + } + + /* build an MD5 checksum from a string */ +-char *checksum_md5_from_data(char *data, int len) { +- char *checksum_md5 = 0; ++unsigned char *checksum_md5_from_data(unsigned char *data, int len) { ++ unsigned char *checksum_md5 = 0; + MD5_CTX md5_ctx; + + MD5_Init(&md5_ctx); +@@ -310,7 +310,7 @@ int mkdir_with_parent(char *pathname, mode_t mode) { + } + + /* return formatted info into a static string */ +-char *build_line(char *path, char *filename, t_file_desc *info) { ++char *build_line(unsigned char *path, char *filename, t_file_desc *info) { + struct stat *st = &(info->stat); + static char blk[BUFFER_LENGTH], tmp[64]; + int s; +diff --git a/flx/flx.h b/flx/flx.h +index 3315ded..7030102 100644 +--- a/flx/flx.h ++++ b/flx/flx.h +@@ -216,11 +216,11 @@ struct s_dtree { + + + extern int browse_over_path(char *path, void *(*fct)(), void *data) ; +-extern char *checksum_md5_from_file(char *file) ; +-extern char *checksum_md5_from_data(char *data, int len) ; ++extern unsigned char *checksum_md5_from_file(char *file) ; ++extern unsigned char *checksum_md5_from_data(unsigned char *data, int len) ; + extern char *end_field(char *line) ; + extern int mkdir_with_parent(char *pathname, mode_t mode) ; +-extern char *build_line(char *path, char *filename, t_file_desc *info) ; ++extern char *build_line(unsigned char *path, char *filename, t_file_desc *info) ; + extern char *show_filename(char *path, char *filename, t_file_desc *info) ; + extern void dump_tree(t_ft *tree) ; + extern int dump_diff_tree(t_dtree *tree); +diff --git a/flx/input_file.c b/flx/input_file.c +index ec50c02..5dc8e80 100644 +--- a/flx/input_file.c ++++ b/flx/input_file.c +@@ -132,7 +132,7 @@ t_file_desc *fill_from_signfs_line(char **tab, char **rpath, t_file_desc **desc) + if (rpath) *rpath = p1; + break; + case 8: /* link */ +- (*desc)->link = strdup(p1); ++ (*desc)->link = (unsigned char *)strdup(p1); + break; + } + } +diff --git a/flx/input_fs.c b/flx/input_fs.c +index e64f9da..3a35759 100644 +--- a/flx/input_fs.c ++++ b/flx/input_fs.c +@@ -40,14 +40,14 @@ static t_file_desc *complete_info_from_fs(char *path, t_file_desc *desc) { + desc->md5 = checksum_md5_from_file(path); + else if (S_ISLNK(stat.st_mode) && !desc->link) { + /* get link and md5 associed */ +- char temp[BUFFER_LENGTH]; ++ unsigned char temp[BUFFER_LENGTH]; + int l; + +- if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) { ++ if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) { + PFERROR("readlink(%s)", path); + } else { + temp[l] = 0; +- desc->link = strdup(temp); ++ desc->link = (unsigned char *)strdup((char *)temp); + desc->md5 = checksum_md5_from_data(temp, l); + } + } +diff --git a/flx/utils.c b/flx/utils.c +index 16aaad2..090e314 100644 +--- a/flx/utils.c ++++ b/flx/utils.c +@@ -10,7 +10,7 @@ + + #include "utils.h" + +-static char bigbuffer[BUFFLEN]; ++static unsigned char bigbuffer[BUFFLEN]; + + POOL_INIT(p2void); + +@@ -121,8 +121,8 @@ char *backslashed_strmchr(char *s, char *mc) { + } + + /* return the string with characters 'toback' backslashed */ +-char *backslashed_str(char *s, char *toback) { +- char *pbuff = bigbuffer; ++unsigned char *backslashed_str(char *s, char *toback) { ++ unsigned char *pbuff = bigbuffer; + int len = 0; + + while (*s && len < (BUFFLEN-1)) { +@@ -136,8 +136,8 @@ char *backslashed_str(char *s, char *toback) { + } + + /* escape unprintable char with its hexadecimal value (url encode form) */ +-char *escape_str(char *s) { +- char *pbuff = bigbuffer; ++unsigned char *escape_str(unsigned char *s) { ++ unsigned char *pbuff = bigbuffer; + int len = 0; + + while (*s && len < (BUFFLEN-4)) { +@@ -158,8 +158,8 @@ char *escape_str(char *s) { + } + + /* unescape string from %xx string form */ +-char *unescape_str(char *s) { +- char *pbuff = bigbuffer; ++unsigned char *unescape_str(char *s) { ++ unsigned char *pbuff = bigbuffer; + int len = 0; + + while (*s && len < (BUFFLEN-1)) { +diff --git a/flx/utils.h b/flx/utils.h +index 984fc7a..707e620 100644 +--- a/flx/utils.h ++++ b/flx/utils.h +@@ -186,9 +186,9 @@ int fatal_error(char *,...); + int pferror(char *,...); + char *backslashed_strchr(char *s, char c); + char *backslashed_strmchr(char *s, char *mc); +-char *backslashed_str(char *, char *toback); ++unsigned char *backslashed_str(char *, char *toback); + void *push_str_sorted(void *ptr, char *str); +-char *escape_str(char *s); +-char *unescape_str(char *s); ++unsigned char *escape_str(unsigned char *s); ++unsigned char *unescape_str(char *s); + + #endif /* __UTILS_H__ */ diff --git a/flx/flx/files/0.1.34-warning-implicit-declaration.diff b/flx/flx/files/0.1.34-warning-implicit-declaration.diff new file mode 100644 index 00000000..6cbc45bf --- /dev/null +++ b/flx/flx/files/0.1.34-warning-implicit-declaration.diff @@ -0,0 +1,58 @@ +diff --git a/flx/arg.c b/flx/arg.c +index d82d2d1..8b7c112 100644 +--- a/flx/arg.c ++++ b/flx/arg.c +@@ -1,6 +1,7 @@ + #include <stdio.h> + #include <string.h> + #include <stdarg.h> ++#include <stdlib.h> + + #include "flx.h" + #include "arg.h" +diff --git a/flx/check.c b/flx/check.c +index 0a425c3..9589c5e 100644 +--- a/flx/check.c ++++ b/flx/check.c +@@ -23,6 +23,7 @@ + + #include <string.h> + #include <stdio.h> ++#include <stdlib.h> + + #include "flx.h" + #include "check.h" +diff --git a/flx/input.c b/flx/input.c +index 182fa83..5e9ecbc 100644 +--- a/flx/input.c ++++ b/flx/input.c +@@ -1,4 +1,6 @@ + #include <string.h> ++#include <stdlib.h> ++ + #include "utils.h" + #include "source_type.h" + #include "input.h" +diff --git a/flx/output.c b/flx/output.c +index 7898fc8..801bccc 100644 +--- a/flx/output.c ++++ b/flx/output.c +@@ -1,4 +1,6 @@ + #include <string.h> ++#include <stdlib.h> ++ + #include "utils.h" + #include "flx.h" + #include "output.h" +diff --git a/flx/utils.c b/flx/utils.c +index 6b0272a..16aaad2 100644 +--- a/flx/utils.c ++++ b/flx/utils.c +@@ -6,6 +6,7 @@ + #include <fcntl.h> + #include <stdarg.h> + #include <ctype.h> ++#include <stdlib.h> + + #include "utils.h" + diff --git a/flx/flx/files/0.6.7-cast.diff b/flx/flx/files/0.6.7-cast.diff new file mode 100644 index 00000000..5dcc297e --- /dev/null +++ b/flx/flx/files/0.6.7-cast.diff @@ -0,0 +1,110 @@ +--- fct1.c.ori 2009-04-23 17:25:23.000000000 +0200 ++++ fct1.c 2009-04-23 17:37:29.000000000 +0200 +@@ -45,7 +45,7 @@ + PFERROR("readlink(%s)", path); + } else { + temp[l] = 0; +- desc->link = strdup(temp); ++ desc->link = (unsigned char*)strdup(temp); + desc->md5 = checksum_md5_from_data(temp, l); + } + } +@@ -92,13 +92,13 @@ + PFERROR("readlink(%s)",path); + } else { + temp[l] = 0; +- if (!f1->link) f1->link = strdup(temp); +- if (!f2->link) f2->link = strdup(temp); ++ if (!f1->link) f1->link = (unsigned char*)strdup(temp); ++ if (!f2->link) f2->link = (unsigned char*)strdup(temp); + if (!f1->md5) f1->md5 = checksum_md5_from_data(temp, l); + if (!f2->md5) f2->md5 = checksum_md5_from_data(temp, l); + } + } +- if (strcmp(f1->link, f2->link)) ++ if (strcmp((const char*)f1->link, (const char*)f2->link)) + diff |= DIFF_LINK; /* links differ */ + } + } +@@ -222,10 +222,10 @@ + + + /* build an MD5 checksum from data in file */ +-char *checksum_md5_from_file(char *file) { ++unsigned char *checksum_md5_from_file(char *file) { + int fd; + ssize_t size; +- char *checksum_md5 = NULL, blk[BUFFER_LENGTH]; ++ unsigned char *checksum_md5 = NULL, *blk[BUFFER_LENGTH]; + MD5_CTX md5_ctx; + + if ((fd = open(file, O_RDONLY)) < 0 ) { +@@ -234,7 +234,7 @@ + else { + MD5_Init(&md5_ctx); + while ((size = read(fd, blk, BUFFER_LENGTH)) > 0) +- MD5_Update(&md5_ctx, blk, size); ++ MD5_Update(&md5_ctx, (const void*)blk, size); + close(fd); + // if size = -1, there is a read error, don't do anything + if (size == 0) { // last read is null +@@ -246,12 +246,12 @@ + } + + /* build an MD5 checksum from a string */ +-char *checksum_md5_from_data(char *data, int len) { +- char *checksum_md5 = 0; ++unsigned char *checksum_md5_from_data(char *data, int len) { ++ unsigned char *checksum_md5 = 0; + MD5_CTX md5_ctx; + + MD5_Init(&md5_ctx); +- MD5_Update(&md5_ctx, data, len); ++ MD5_Update(&md5_ctx, (const void*)data, len); + checksum_md5 = MALLOC(16); + MD5_Final(checksum_md5, &md5_ctx); + return (checksum_md5); +@@ -365,7 +365,7 @@ + s += sprintf(blk+s, "%s", backslashed_str(path, " \\\n()\t")); + + if (S_ISLNK(st->st_mode) && info->link) +- s += sprintf(blk+s, " %s", backslashed_str(info->link, " \\\n()\t")); ++ s += sprintf(blk+s, " %s", backslashed_str((char*)info->link, " \\\n()\t")); + } + else { + if (IS(Options, GOPT_HUMAN_READABLE)) +--- input_file.c.ori 2009-04-23 17:22:17.000000000 +0200 ++++ input_file.c 2009-04-23 17:24:09.000000000 +0200 +@@ -127,7 +127,7 @@ + if (rpath) *rpath = p1; + break; + case 8: /* link */ +- (*desc)->link = strdup(p1); ++ (*desc)->link = (unsigned char*)strdup(p1); + break; + } + } +--- input_fs.c.ori 2009-04-23 17:24:21.000000000 +0200 ++++ input_fs.c 2009-04-23 17:34:05.000000000 +0200 +@@ -46,7 +46,7 @@ + PFERROR("readlink(%s)", path); + } else { + temp[l] = 0; +- desc->link = strdup(temp); ++ desc->link = (unsigned char*)strdup(temp); + desc->md5 = checksum_md5_from_data(temp, l); + } + } +--- flx.h.ori 2009-04-23 17:42:49.000000000 +0200 ++++ flx.h 2009-04-23 17:26:52.000000000 +0200 +@@ -214,8 +214,8 @@ + + + extern int browse_over_path(char *path, void *(*fct)(), void *data) ; +-extern char *checksum_md5_from_file(char *file) ; +-extern char *checksum_md5_from_data(char *data, int len) ; ++extern unsigned char *checksum_md5_from_file(char *file) ; ++extern unsigned char *checksum_md5_from_data(char *data, int len) ; + extern char *end_field(char *line) ; + extern int mkdir_with_parent(char *pathname, mode_t mode) ; + extern char *build_line(char *path, char *filename, t_file_desc *info) ; diff --git a/flx/flx/files/0.6.7-gcc-2.9-define.diff b/flx/flx/files/0.6.7-gcc-2.9-define.diff new file mode 100644 index 00000000..1a133adf --- /dev/null +++ b/flx/flx/files/0.6.7-gcc-2.9-define.diff @@ -0,0 +1,29 @@ +--- utils.h.ori 2009-04-23 16:34:45.000000000 +0200 ++++ utils.h 2009-04-23 17:16:23.000000000 +0200 +@@ -56,7 +56,7 @@ + + #define BUFFLEN BUFFER_LENGTH + +-#define PFERROR(str...) PFERROR2(##str, 0) ++#define PFERROR(str...) PFERROR2(str, 0) + #define PFERROR2(str, p...) pferror("%s:%d: " str, __FILE__, __LINE__, ##p) + #define HEXTODEC(a) (('0'<=(a) && (a)<='9')?(a)-'0':(a)-'a'+10) + +@@ -71,7 +71,7 @@ + #define POOL_ALLOC(type) ({ \ + void *p; \ + if ((p = pool_##type) == NULL) \ +- p = malloc(sizeof(##type)); \ ++ p = malloc(sizeof(type)); \ + else { \ + pool_##type = *(void **)pool_##type; \ + } \ +@@ -94,7 +94,7 @@ + #define POOL_INIT_PROTO(type) extern type *pool_##type + + #else +-#define POOL_ALLOC(type) (calloc(1,sizeof(##type))); ++#define POOL_ALLOC(type) (calloc(1,sizeof(type))); + #define POOL_FREE(type, ptr) (free(ptr)); + #define POOL_INIT + #endif /* MEM_OPTIM */ diff --git a/flx/flx/files/0.6.7-quoted-FLX_poptions.diff b/flx/flx/files/0.6.7-quoted-FLX_poptions.diff new file mode 100644 index 00000000..92c71534 --- /dev/null +++ b/flx/flx/files/0.6.7-quoted-FLX_poptions.diff @@ -0,0 +1,21 @@ +--- main.c.ori 2009-04-23 16:28:35.000000000 +0200 ++++ main.c 2009-04-23 16:29:10.000000000 +0200 +@@ -36,12 +36,12 @@ + + + t_param FLX_poptions[] = { +- { 0, NULL, 0xFFFF, 0, "sign -h|<options> input [...] +- sign data" }, +- { 0, NULL, 0xFFFF, 0, "check -h|<options> src1 src2 +- check difference between src1 and src2" }, +- { 0, NULL, 0xFFFF, 0, "check -h|<options> src1 [...] , src2 [...] +- check difference between srcs1 and srcs2" }, ++ { 0, NULL, 0xFFFF, 0, "sign -h|<options> input [...]" ++ "sign data" }, ++ { 0, NULL, 0xFFFF, 0, "check -h|<options> src1 src2" ++ "check difference between src1 and src2" }, ++ { 0, NULL, 0xFFFF, 0, "check -h|<options> src1 [...] , src2 [...]" ++ "check difference between srcs1 and srcs2" }, + { 0, NULL, 0, 0} + }; + diff --git a/flx/flx/files/0.6.7-respect-CFLAGS-LDFLAGS.diff b/flx/flx/files/0.6.7-respect-CFLAGS-LDFLAGS.diff new file mode 100644 index 00000000..844cff51 --- /dev/null +++ b/flx/flx/files/0.6.7-respect-CFLAGS-LDFLAGS.diff @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index d7a4df0..3a0c0d9 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,8 +31,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \ + input.c input_fs.c input_file.c \ + output.c output_file.c + OBJ=$(SRC:.c=.o) +-CFLAGS= -Wall -g2 -O0 -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" +-LDFLAGS=-L. ++ ++CFLAGS += -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" + + $(NAME): $(OBJ) + $(CC) -o $(NAME) $(OBJ) $(LDFLAGS) diff --git a/flx/flx/files/0.6.7-warnings.diff b/flx/flx/files/0.6.7-warnings.diff new file mode 100644 index 00000000..736b16ce --- /dev/null +++ b/flx/flx/files/0.6.7-warnings.diff @@ -0,0 +1,46 @@ +--- arg.c.ori 2009-04-23 16:32:31.000000000 +0200 ++++ arg.c 2009-04-23 16:32:52.000000000 +0200 +@@ -1,6 +1,7 @@ + #include <stdio.h> + #include <string.h> + #include <stdarg.h> ++#include <stdlib.h> + + #include "flx.h" + #include "arg.h" +--- check.c.ori 2009-04-23 17:27:44.000000000 +0200 ++++ check.c 2009-04-23 17:27:55.000000000 +0200 +@@ -23,6 +23,7 @@ + + #include <string.h> + #include <stdio.h> ++#include <stdlib.h> + + #include "flx.h" + #include "check.h" +--- output.c.ori 2009-04-23 17:20:26.000000000 +0200 ++++ output.c 2009-04-23 17:21:25.000000000 +0200 +@@ -1,4 +1,5 @@ + #include <string.h> ++#include <stdlib.h> + #include "utils.h" + #include "flx.h" + #include "output.h" +--- utils.c.ori 2009-04-23 16:32:02.000000000 +0200 ++++ utils.c 2009-04-23 16:48:19.000000000 +0200 +@@ -5,6 +5,7 @@ + #include <sys/types.h> + #include <fcntl.h> + #include <stdarg.h> ++#include <stdlib.h> + + #include "utils.h" + +--- input.c.ori 2009-04-23 17:21:43.000000000 +0200 ++++ input.c 2009-04-23 17:21:54.000000000 +0200 +@@ -1,4 +1,5 @@ + #include <string.h> ++#include <stdlib.h> + #include "utils.h" + #include "source_type.h" + #include "input.h" diff --git a/flx/flx/files/9999-respect-CFLAGS-LDFLAGS.diff b/flx/flx/files/9999-respect-CFLAGS-LDFLAGS.diff new file mode 100644 index 00000000..54f85b98 --- /dev/null +++ b/flx/flx/files/9999-respect-CFLAGS-LDFLAGS.diff @@ -0,0 +1,15 @@ +diff --git a/flx/Makefile b/flx/Makefile +index 6bee331..7cb9fd2 100644 +--- a/flx/Makefile ++++ b/flx/Makefile +@@ -32,8 +32,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \ + output.c output_file.c + OBJ=$(SRC:.c=.o) + COPTS=-O2 +-CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" +-LDFLAGS=-L. -Wl,--gc-sections ++CFLAGS += -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" ++LDFLAGS += -Wl,--gc-sections + + all: $(NAME) + diff --git a/flx/flx/files/9999-warning-implicit-declaration.diff b/flx/flx/files/9999-warning-implicit-declaration.diff new file mode 100644 index 00000000..4f5f02af --- /dev/null +++ b/flx/flx/files/9999-warning-implicit-declaration.diff @@ -0,0 +1,71 @@ +diff --git a/flx/arg.c b/flx/arg.c +index d82d2d1..8b7c112 100644 +--- a/flx/arg.c ++++ b/flx/arg.c +@@ -1,6 +1,7 @@ + #include <stdio.h> + #include <string.h> + #include <stdarg.h> ++#include <stdlib.h> + + #include "flx.h" + #include "arg.h" +diff --git a/flx/check.c b/flx/check.c +index 0a425c3..9589c5e 100644 +--- a/flx/check.c ++++ b/flx/check.c +@@ -23,6 +23,7 @@ + + #include <string.h> + #include <stdio.h> ++#include <stdlib.h> + + #include "flx.h" + #include "check.h" +diff --git a/flx/input.c b/flx/input.c +index 182fa83..5e9ecbc 100644 +--- a/flx/input.c ++++ b/flx/input.c +@@ -1,4 +1,6 @@ + #include <string.h> ++#include <stdlib.h> ++ + #include "utils.h" + #include "source_type.h" + #include "input.h" +diff --git a/flx/output.c b/flx/output.c +index 7898fc8..801bccc 100644 +--- a/flx/output.c ++++ b/flx/output.c +@@ -1,4 +1,6 @@ + #include <string.h> ++#include <stdlib.h> ++ + #include "utils.h" + #include "flx.h" + #include "output.h" +diff --git a/flx/utils.c b/flx/utils.c +index 6b0272a..16aaad2 100644 +--- a/flx/utils.c ++++ b/flx/utils.c +@@ -6,6 +6,7 @@ + #include <fcntl.h> + #include <stdarg.h> + #include <ctype.h> ++#include <stdlib.h> + + #include "utils.h" + +diff --git a/flx/md5.c b/flx/md5.c +index 5323469..b9dfe45 100644 +--- a/flx/md5.c ++++ b/flx/md5.c +@@ -15,6 +15,8 @@ + * will fill a supplied 16-byte array with the digest. + */ + ++#include <string.h> ++ + #include "md5.h" + + static void MD5Transform(unsigned int buf[4], unsigned int const in[16]); diff --git a/flx/flx/flx-0.1.31.ebuild b/flx/flx/flx-0.1.31.ebuild new file mode 100644 index 00000000..84fffd96 --- /dev/null +++ b/flx/flx/flx-0.1.31.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 toolchain-funcs eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff + epatch "${FILESDIR}"/${PV}-warning-implicit-declaration.diff + + tc-export CC +} + +src_compile () +{ + emake -C flx \ + VERSION=${PV} +} + +src_install () +{ + into /usr + dobin flx/flx + dodoc flx/{AUTHORS,ChangeLog,NOTES,README,TODO} +} diff --git a/flx/flx/flx-0.1.34.ebuild b/flx/flx/flx-0.1.34.ebuild new file mode 100644 index 00000000..84fffd96 --- /dev/null +++ b/flx/flx/flx-0.1.34.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 toolchain-funcs eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff + epatch "${FILESDIR}"/${PV}-warning-implicit-declaration.diff + + tc-export CC +} + +src_compile () +{ + emake -C flx \ + VERSION=${PV} +} + +src_install () +{ + into /usr + dobin flx/flx + dodoc flx/{AUTHORS,ChangeLog,NOTES,README,TODO} +} diff --git a/flx/flx/flx-0.6.7.ebuild b/flx/flx/flx-0.6.7.ebuild new file mode 100644 index 00000000..8872bb39 --- /dev/null +++ b/flx/flx/flx-0.6.7.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 toolchain-funcs eutils + +DESCRIPTION="Tool to have an image of the filesystem" +HOMEPAGE="http://master.formilux.org/git/dist/src/flx.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flx.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff + epatch "${FILESDIR}"/${PV}-quoted-FLX_poptions.diff + epatch "${FILESDIR}"/${PV}-warnings.diff + epatch "${FILESDIR}"/${PV}-gcc-2.9-define.diff + epatch "${FILESDIR}"/${PV}-cast.diff + + tc-export CC +} + +src_install () +{ + dobin flx + dodoc AUTHORS NOTES README TODO +} + diff --git a/flx/flx/flx-9999.ebuild b/flx/flx/flx-9999.ebuild new file mode 100644 index 00000000..60d9220b --- /dev/null +++ b/flx/flx/flx-9999.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 toolchain-funcs eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="master" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff + epatch "${FILESDIR}"/${PV}-warning-implicit-declaration.diff + + tc-export CC +} + +src_compile () +{ + emake -C flx \ + VERSION=$PV +} + +src_install () +{ + into /usr + dobin flx/flx + dodoc flx/{AUTHORS,ChangeLog,NOTES,README,TODO} +} diff --git a/flx/init-alix-leds/Manifest b/flx/init-alix-leds/Manifest new file mode 100644 index 00000000..c721bf3a --- /dev/null +++ b/flx/init-alix-leds/Manifest @@ -0,0 +1 @@ +EBUILD init-alix-leds-3.0.ebuild 389 RMD160 08e4c66baa1b70fedcffacfd84226954b470ad72 SHA1 451247989f2c31982143aa6da6376245f17397f0 SHA256 36492e9bccae740df1e8c9b054c3d68b5d791a3329c3059eff9852fa466260bc diff --git a/flx/init-alix-leds/init-alix-leds-3.0.ebuild b/flx/init-alix-leds/init-alix-leds-3.0.ebuild new file mode 100644 index 00000000..8e5f4c5d --- /dev/null +++ b/flx/init-alix-leds/init-alix-leds-3.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx + +SDIR="people/beber" + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/alix-leds.git/" +EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=sys-apps/alix-leds-${PV}" diff --git a/flx/init-apache/Manifest b/flx/init-apache/Manifest new file mode 100644 index 00000000..faba2ab8 --- /dev/null +++ b/flx/init-apache/Manifest @@ -0,0 +1 @@ +EBUILD init-apache-1.3.ebuild 413 RMD160 3074c7dd401fcd012774e364be986997e03a8184 SHA1 28ecc6b31676a4aeaa430394b2305d012e960359 SHA256 a0f67d57b8e0ff6eaeedf753c50cb156f3cfe73bb3c7f77fe13e6b79e7eb298e diff --git a/flx/init-apache/init-apache-1.3.ebuild b/flx/init-apache/init-apache-1.3.ebuild new file mode 100644 index 00000000..000865b6 --- /dev/null +++ b/flx/init-apache/init-apache-1.3.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/apache.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git" +EGIT_BRANCH="1.3-flx0" +EGIT_COMMIT="v1.3.36-flx0.1" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=www-servers/apache-${PV}" diff --git a/flx/init-clamav/Manifest b/flx/init-clamav/Manifest new file mode 100644 index 00000000..9ed94b23 --- /dev/null +++ b/flx/init-clamav/Manifest @@ -0,0 +1 @@ +EBUILD init-clamav-0.92.1.ebuild 517 RMD160 2f76ebcd269c34396e7819d954b871d3a0618b0d SHA1 d44aa5c8b0920bfa45fff98a0fd07cd18ab27074 SHA256 5929857934eb817357708768c9dda77ce57c038985848fe1ab0df13c04dfb821 diff --git a/flx/init-clamav/init-clamav-0.92.1.ebuild b/flx/init-clamav/init-clamav-0.92.1.ebuild new file mode 100644 index 00000000..3601130e --- /dev/null +++ b/flx/init-clamav/init-clamav-0.92.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx + +SDIR="people/beber" + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/pkg/clamav.git" +EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git" +EGIT_BRANCH="0-flx0" +#EGIT_COMMIT="v0.92.1-flx0.1" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=app-antivirus/clamav-${PV}" + +SVCNAME="clamd" diff --git a/flx/init-dnsmasq/Manifest b/flx/init-dnsmasq/Manifest new file mode 100644 index 00000000..bc5117ed --- /dev/null +++ b/flx/init-dnsmasq/Manifest @@ -0,0 +1 @@ +EBUILD init-dnsmasq-2.32.ebuild 409 RMD160 b7de9ee5a8c41a3f9172f8db6f3f555443e0e39d SHA1 793c1c67f2b4c75decd549e78a968560be950e8a SHA256 5e429660168e04fc010feadbb0854569fc8e8f54825fd88376a6c20fc4dec716 diff --git a/flx/init-dnsmasq/init-dnsmasq-2.32.ebuild b/flx/init-dnsmasq/init-dnsmasq-2.32.ebuild new file mode 100644 index 00000000..b7e91c7b --- /dev/null +++ b/flx/init-dnsmasq/init-dnsmasq-2.32.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/clamav.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git" +EGIT_BRANCH="2.32-flx0" +EGIT_COMMIT="v2.32-flx0.1" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=net-dns/dnsmasq-${PV}" diff --git a/flx/init-frox/Manifest b/flx/init-frox/Manifest new file mode 100644 index 00000000..e0f9585e --- /dev/null +++ b/flx/init-frox/Manifest @@ -0,0 +1 @@ +EBUILD init-frox-0.7.ebuild 431 RMD160 00c392223699e8fd1cfb0a21fc9778ca4d271820 SHA1 c4d0f6312fd1e35ce3354b3ff95e0ef03105a8b6 SHA256 709f68a4052e93d03f4d38ac61dce18540aff785580813b1e912aad50e24b457 diff --git a/flx/init-frox/init-frox-0.7.ebuild b/flx/init-frox/init-frox-0.7.ebuild new file mode 100644 index 00000000..f6ba904a --- /dev/null +++ b/flx/init-frox/init-frox-0.7.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx + +SDIR="people/beber" + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/frox.git/" +EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git" +EGIT_BRANCH="0.7-flx0" +#EGIT_COMMIT="v0.7.18-flx0.1" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=net-ftp/frox-${PV}" diff --git a/flx/init-havp/Manifest b/flx/init-havp/Manifest new file mode 100644 index 00000000..8d2d3bf1 --- /dev/null +++ b/flx/init-havp/Manifest @@ -0,0 +1,2 @@ +AUX init-havp-BJA-tail.diff 456 RMD160 c5b3eb7350bea185ee4bd6bd3a45b7e652347772 SHA1 1c0de43f0a5468cd133e453b081f3c9d3fd133dc SHA256 7588b12094ad1c63c62dba1e987d5402ea128ca2cb36227d2296c26384d259c4 +EBUILD init-havp-0.85.ebuild 490 RMD160 77d2e466d140699ac91478232c6cf318e463621e SHA1 cafe495c4b776b5f67fca28970ed23429ac9db0e SHA256 a3d616dd06629a7c1a125e5b829d4438de38c2b020d15b23847849acf034209b diff --git a/flx/init-havp/files/init-havp-BJA-tail.diff b/flx/init-havp/files/init-havp-BJA-tail.diff new file mode 100644 index 00000000..9862c295 --- /dev/null +++ b/flx/init-havp/files/init-havp-BJA-tail.diff @@ -0,0 +1,13 @@ +diff --git add-ons/initscript add-ons/initscript +index 6b440c3..be97a11 100644 +--- add-ons/initscript ++++ add-ons/initscript +@@ -15,7 +15,7 @@ function fct_pre_start { + && chown havp:havp $dir + done + +- set -- $(df /var/tmp/havp | tail -1) ++ set -- $(df /var/tmp/havp | tail -n 1) + shift $[$#-1] + if ! grep -sq " $1 "'[^ ]* \(mand\|[ ]*,mand\)[, ]' /proc/mounts ; then + echo "remounting $1 with mandatory lock option" >&2 diff --git a/flx/init-havp/init-havp-0.85.ebuild b/flx/init-havp/init-havp-0.85.ebuild new file mode 100644 index 00000000..578a0831 --- /dev/null +++ b/flx/init-havp/init-havp-0.85.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx eutils + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/havp.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git" +EGIT_BRANCH="0-flx0" +EGIT_COMMIT="v0.85-flx0.2" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=net-proxy/havp-${PV}" + +src_prepare () +{ + epatch "${FILESDIR}"/${PN}-BJA-tail.diff + + flx_src_prepare +} diff --git a/flx/init-nagios/Manifest b/flx/init-nagios/Manifest new file mode 100644 index 00000000..f6b41657 --- /dev/null +++ b/flx/init-nagios/Manifest @@ -0,0 +1,2 @@ +AUX init-nagios-BJA-path.diff 1389 SHA256 43ad4ae71b5c47102297d98a5ccb01f293803a72e7099997f86217597ea2b992 SHA512 e5f15664b167fb65b5d314f890d90aa8acf5bd0bdfa1574f0eba698bb988d0a2be6a40620a4dd94277fa2f7bbf26064225a22a7a47d8bbccb97c26bad0c44f49 WHIRLPOOL c76150f0025c0593a1e4719b40f2deba8ea5eda1c2fab4d92a181cf5ba8d652f4fe415817b3dbbcd9fc73967d198886731b5737a6f08870ff0654242d4002650 +EBUILD init-nagios-2.5.ebuild 499 SHA256 a51c8a5e5c1c4827133bef83390e5413539be683d8acb894dd0746788d1dd520 SHA512 b0b3b2e4d8b30fa8698c036ed2de94822a42b0069240830ab46144c5dea218330f69d765574c80efb4e17ed11a6b6d7d43da2ed7f46ca880c0ead81b222f6d2a WHIRLPOOL ee4558b84815cd5a0dfebe20c7a50bb739828ffbbc79429fb1e87452debbdbc8cb9cbf0dd2adefeca414374e5f0922497f384ad062ba1f917f838b5340d94b1d diff --git a/flx/init-nagios/files/init-nagios-BJA-path.diff b/flx/init-nagios/files/init-nagios-BJA-path.diff new file mode 100644 index 00000000..47d18f65 --- /dev/null +++ b/flx/init-nagios/files/init-nagios-BJA-path.diff @@ -0,0 +1,37 @@ +diff --git a/addons/init.d/nagios b/addons/init.d/nagios +index 833b47d..825a70e 100644 +--- a/addons/init.d/nagios ++++ b/addons/init.d/nagios +@@ -5,9 +5,9 @@ + . `dirname $0`/functions + + option config standard_option /etc/nagios/nagios.cfg +-option pidfile reserved_option /var/lib/nagios/nagios.lock ++option pidfile reserved_option /var/nagios/nagios.pid + +-option bin reserved_option /opt/nagios/bin/nagios ++option bin reserved_option /usr/sbin/nagios + option cmdline reserved_option '$bin -d $opt_config' + + # perform a forced synchronisation before starting the daemon +diff --git a/addons/init.d/nagios b/addons/init.d/nagios +index ba8c2a1..833b47d 100644 +--- a/addons/init.d/nagios ++++ b/addons/init.d/nagios +@@ -12,15 +12,13 @@ option cmdline reserved_option '$bin -d $opt_config' + + # perform a forced synchronisation before starting the daemon + function fct_pre_start { +- for opt in log_file status_file lock_file ; do ++ for opt in status_file lock_file ; do + valueof $opt_config $opt > /dev/null 2>&1 + REPLY=${REPLY%/*} + [ -z "$REPLY" ] && continue + + [ ! -d "$REPLY" ] && mkdir -p $REPLY && \ + chown nagios:nagios $REPLY +- [ "$opt" = "log_file" -a "$REPLY" != "/var/log/nagios" ] && \ +- ln -s $REPLY /var/log/nagios + [ "$opt" = "lock_file" -a "x$REPLY" != "x" ] && pidfile=$REPLY + done + } diff --git a/flx/init-nagios/init-nagios-2.5.ebuild b/flx/init-nagios/init-nagios-2.5.ebuild new file mode 100644 index 00000000..8f12ba43 --- /dev/null +++ b/flx/init-nagios/init-nagios-2.5.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx eutils + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/nagios.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git" +EGIT_BRANCH="2.5-flx0" +EGIT_COMMIT="v2.5-flx0.1" + +KEYWORDS="~amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=net-analyzer/nagios-${PV}" + +src_prepare () +{ + epatch "${FILESDIR}"/${PN}-BJA-path.diff + + flx_src_prepare +} diff --git a/flx/init-ntp/Manifest b/flx/init-ntp/Manifest new file mode 100644 index 00000000..eddcae6b --- /dev/null +++ b/flx/init-ntp/Manifest @@ -0,0 +1,5 @@ +AUX absolute-path-reuse-do-update.diff 927 SHA256 8a8e7f3f8a1bf677bb51bdb8a15da389d117608c4fc4ff8ffd765591b9eab7d8 SHA512 b3a9e19f8755c2931c6a01cd8079e6105ad4e33fa7d64a4f5f2e0a5002fa27b89d2744af47a9e8f45a8dab265332642508f6c37571ce789a2554cc26b3c7a0f7 WHIRLPOOL 9aba493c006c9b096b5d9934a788372d048fcc395a680368f042c2298c3ec6cec02710dee5e2fcbc5dbb87bb593c51b92a2a1d2552dbd3c52c09cc6bf5d95905 +AUX indent.diff 2048 SHA256 b351deca5737c5618b2149da2051bce284e43217d9812de62348927f600985fb SHA512 38654f7a94d24796910f7d5524dafcdd5619eeee6161847b9a684d1e93447cdacb17c8153fa414e70f97082c56c4a25289acbede5fc71c6b46147cf6e6c492f4 WHIRLPOOL 9bd3bfbef98612ddc2f1d3b7f4614cb48bb9f1d72102d6fba2e84ff8bd992aed8d728276c72b2bf51070a8a747c9811eac668c98202d6eaa2e95b1b8217c8fdb +AUX path.diff 1337 SHA256 7753a9eb741fab1116b19f7e1d0e3fd05007ed12c5e868ba45942ea74b8c9498 SHA512 9fb4208a26ee92794b095fc28092fd29d0c6f20396f620855ebecd288e216fb52143021cec98eb8840ac0c03a077635d65aebf1849c394653bb3e5e715547214 WHIRLPOOL 3038064ccf5f4c875ef913624aaf9898b307ccd9f3fdbf8fe1adabb1b0735324bfa04f3a36a6648876d5f31903a7400541c0ad413ef9c68a8013f7269d00c8b2 +AUX remove-ntptimeset.diff 2322 SHA256 30c723b919d7884c05c1fa9fc34bd0a0265d81f8d0f1075a9e823df39a108e90 SHA512 2daa219f29d3b55734a5613e99618752e198d3069e3e7444b10d281abd22f546d590f8f39f401156a786abf81f2ef9d861baf9f8307c5303597c9499e5bb62c0 WHIRLPOOL 3490668064a165f795c2ecc624ca80c65c8c48d693ab9078778aa9c05293951826f2356e3d05e4fb8a611d597b2ca8cbc8b4a587c50d99e1b4ae41161526acd6 +EBUILD init-ntp-4.2.ebuild 622 SHA256 88853de9461141f703a5ef3956eace740559cd37f3fbc09c3ff1151273585232 SHA512 10edd510ce62b60de3552f3084750fb2186f2030796432c476a2c806b0f28159312adf532f34d50611e203412392407a47d575d38e3a0b333355e897b4ce324e WHIRLPOOL 3892704b9926c46c37ddc74c7a53f15ff4dea9f1d1baaa68bc76890ca916afd213beb365c1cdcf95403bba46456c8ef93a63b9bf3fca520bcf980a42ed49a424 diff --git a/flx/init-ntp/files/absolute-path-reuse-do-update.diff b/flx/init-ntp/files/absolute-path-reuse-do-update.diff new file mode 100644 index 00000000..ff8d1211 --- /dev/null +++ b/flx/init-ntp/files/absolute-path-reuse-do-update.diff @@ -0,0 +1,29 @@ +diff --git a/add-ons/ntp b/add-ons/ntp +index 73554be..81ddabd 100644 +--- a/add-ons/ntp ++++ b/add-ons/ntp +@@ -47,12 +47,9 @@ function fct_pre_start { + mkdir -p ${driftfile%/*} + fi + +- if [ "$opt_force_sync" = "1" ]; then +- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if ! /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then +- echo " --> sync failed, starting unsynced." +- fi +- fi ++ [ "$opt_force_sync" = "1" ] \ ++ && do_update ++ + return 0 + } + +@@ -61,7 +58,7 @@ function do_update { + local synced=0 + + echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then ++ if ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then + synced=1 + else + echo " --> sync failed. Aborting." diff --git a/flx/init-ntp/files/indent.diff b/flx/init-ntp/files/indent.diff new file mode 100644 index 00000000..f6fb5e90 --- /dev/null +++ b/flx/init-ntp/files/indent.diff @@ -0,0 +1,63 @@ +diff --git a/add-ons/ntp b/add-ons/ntp +index 9777a3b..73554be 100644 +--- a/add-ons/ntp ++++ b/add-ons/ntp +@@ -26,15 +26,15 @@ function do_help { + echo " - unpriv_port : boolean ; def=1 ; cur=$opt_unpriv_port" + echo " - sync_servers : IP list ; def=<automatic> ; cur='${opt_sync_servers[@]}'" + echo +- exit 1 ++ exit 1 + } + + # assign values after all the options have been read + function fct_end_section { + if [ -z "$opt_sync_servers" ]; then +- valueof $opt_config server > /dev/null +- opt_sync_servers=( $REPLY ) +- opt_sync_servers=( ${opt_sync_servers[@]##127.*} ) ++ valueof $opt_config server > /dev/null ++ opt_sync_servers=( $REPLY ) ++ opt_sync_servers=( ${opt_sync_servers[@]##127.*} ) + fi + } + +@@ -48,10 +48,10 @@ function fct_pre_start { + fi + + if [ "$opt_force_sync" = "1" ]; then +- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if ! /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then +- echo " --> sync failed, starting unsynced." +- fi ++ echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." ++ if ! /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then ++ echo " --> sync failed, starting unsynced." ++ fi + fi + return 0 + } +@@ -60,12 +60,12 @@ function fct_pre_start { + function do_update { + local synced=0 + +- echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then +- synced=1 +- else +- echo " --> sync failed. Aborting." +- fi ++ echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." ++ if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then ++ synced=1 ++ else ++ echo " --> sync failed. Aborting." ++ fi + + test $synced -eq 1 + return $? +@@ -76,4 +76,3 @@ function do_query { + } + + load_config +- diff --git a/flx/init-ntp/files/path.diff b/flx/init-ntp/files/path.diff new file mode 100644 index 00000000..6517aa86 --- /dev/null +++ b/flx/init-ntp/files/path.diff @@ -0,0 +1,30 @@ +diff --git a/add-ons/ntp b/add-ons/ntp +index 384e845..1db7311 100644 +--- a/add-ons/ntp ++++ b/add-ons/ntp +@@ -2,8 +2,7 @@ + + . `dirname $0`/functions + +-option config standard_option /etc/ntp/ntp.conf +-option keys standard_option /etc/ntp/ntp.keys ++option config standard_option /etc/ntp.conf + option pidfile reserved_option /var/run/ntp.pid + option hard_sync boolean_option # not used anymore + option min_servers standard_option 1 +@@ -13,14 +12,13 @@ option sync_servers long_option + + option procname reserved_option ntpd + option bin reserved_option /usr/sbin/ntpd +-option cmdline reserved_option '$bin -c $opt_config -p $pidfile -k $opt_keys' ++option cmdline reserved_option '$bin -c $opt_config -p $pidfile' + + function do_help { + echo "Usage: ${0##*/} <status|start|query|update|stop|check|help>" + echo "List of config.rc options (name, type, default value, current value) :" + echo + echo " - config : file ; def='/etc/ntp/ntp.conf' ; cur=$opt_config" +- echo " - keys : file ; def='/etc/ntp/ntp.keys' ; cur=$opt_keys" + echo " - min_servers : integer ; def=1 ; cur=$opt_min_servers" + echo " - force_sync : boolean ; def=0 ; cur=$opt_force_sync" + echo " - unpriv_port : boolean ; def=1 ; cur=$opt_unpriv_port" diff --git a/flx/init-ntp/files/remove-ntptimeset.diff b/flx/init-ntp/files/remove-ntptimeset.diff new file mode 100644 index 00000000..836611cd --- /dev/null +++ b/flx/init-ntp/files/remove-ntptimeset.diff @@ -0,0 +1,71 @@ +diff --git a/add-ons/ntp b/add-ons/ntp +index f6b1990..9777a3b 100644 +--- a/add-ons/ntp ++++ b/add-ons/ntp +@@ -41,35 +41,17 @@ function fct_end_section { + # perform a forced synchronisation before starting the daemon + function fct_pre_start { + local driftfile +- local synced=0 + + valueof $opt_config driftfile > /dev/null 2>&1 ; driftfile=$REPLY + if [ -n "$driftfile" -a ! -e "${driftfile%/*}" ] ; then + mkdir -p ${driftfile%/*} + fi +- if [ "$opt_force_sync" = "1" ]; then +- if [ -x /usr/bin/ntptimeset ]; then +- echo " Using ntptimeset to sync with servers..." +- if /usr/bin/ntptimeset -l -s -c $opt_config -S $opt_min_servers \ +- -V $opt_min_servers -t 5 ${opt_unpriv_port:+-u}; then +- synced=1 +- else +- echo " --> sync failed." +- fi +- fi + +- if [ $synced -eq 0 ]; then +- if [ -z "$opt_sync_servers" ]; then +- echo " --> sync_servers not set, and ntptimeset not installed. Not forcing sync." +- else ++ if [ "$opt_force_sync" = "1" ]; then + echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." +- if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then +- synced=1 +- else ++ if ! /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then + echo " --> sync failed, starting unsynced." + fi +- fi +- fi + fi + return 0 + } +@@ -77,28 +59,13 @@ function fct_pre_start { + # execute a forced resynchronisation to sync servers + function do_update { + local synced=0 +- if [ -x /usr/bin/ntptimeset ]; then +- echo " Using ntptimeset to sync with servers..." +- if /usr/bin/ntptimeset -l -s -c $opt_config -S $opt_min_servers \ +- -V $opt_min_servers -t 5 ${opt_unpriv_port:+-u}; then +- synced=1 +- else +- echo " --> sync failed." +- fi +- fi + +- if [ $synced -eq 0 ]; then +- if [ -z "$opt_sync_servers" ]; then +- echo " --> sync_servers not set, and ntptimeset not installed. Aborting." +- else + echo " Using ntpdate to sync with server(s) ${opt_sync_servers[*]}..." + if /usr/bin/ntpdate ${opt_unpriv_port:+-u} -t 2 ${opt_sync_servers[*]}; then + synced=1 + else + echo " --> sync failed. Aborting." + fi +- fi +- fi + + test $synced -eq 1 + return $? diff --git a/flx/init-ntp/init-ntp-4.2.ebuild b/flx/init-ntp/init-ntp-4.2.ebuild new file mode 100644 index 00000000..adf1595a --- /dev/null +++ b/flx/init-ntp/init-ntp-4.2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx eutils + +#SDIR="people/beber" + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/ntp.git" +EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${SVCNAME}.git" +EGIT_BRANCH="4.2-flx0" +EGIT_COMMIT="v4.2.4p4-flx0.1" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=net-misc/ntp-${PV}" + +src_prepare () +{ + epatch "${FILESDIR}"/remove-ntptimeset.diff + epatch "${FILESDIR}"/indent.diff + epatch "${FILESDIR}"/absolute-path-reuse-do-update.diff + epatch "${FILESDIR}"/path.diff +} diff --git a/flx/init-openssh/Manifest b/flx/init-openssh/Manifest new file mode 100644 index 00000000..4f60423b --- /dev/null +++ b/flx/init-openssh/Manifest @@ -0,0 +1,2 @@ +AUX init-openssh-BJA-ecdsa.diff 1147 RMD160 c4f31ce9e511fab0c53c2df777369367053c167f SHA1 6759138d5c1795835866cadbe42007909c109b55 SHA256 9c15bf627ee4e5c2eb117f5cd0e27ea5346514b31b58d16693e998acf6fa022d +EBUILD init-openssh-4.5.ebuild 544 RMD160 777d000cf239ae678d6826b27d72b30beca95e4e SHA1 129f638315d383ede44c54462f8a608f81721f99 SHA256 1f9474ad287445c64cb77209df252cf0df90fa2731c3ce53825d377ca92a0c12 diff --git a/flx/init-openssh/files/init-openssh-BJA-ecdsa.diff b/flx/init-openssh/files/init-openssh-BJA-ecdsa.diff new file mode 100644 index 00000000..98f1f979 --- /dev/null +++ b/flx/init-openssh/files/init-openssh-BJA-ecdsa.diff @@ -0,0 +1,27 @@ +diff --git add-ons/sshd add-ons/sshd +index deb5e86..79bf3e6 100644 +--- add-ons/sshd ++++ add-ons/sshd +@@ -35,6 +35,8 @@ function sshd_find_keys { + hostkey_list="$hostkey_list /etc/ssh/ssh_host_rsa_key" + echo " Assuming /etc/ssh/ssh_host_dsa_key for Protocol v2." + hostkey_list="$hostkey_list /etc/ssh/ssh_host_dsa_key" ++ echo " Assuming /etc/ssh/ssh_host_ecdsa_key for Protocol v2." ++ hostkey_list="$hostkey_list /etc/ssh/ssh_host_ecdsa_key" + fi + else + echo " File $sshd_cfgfile references these keys : $hostkey_list" +@@ -81,11 +83,12 @@ function do_install { + */ssh_host_key*) type=rsa1 ;; + */ssh_host_rsa_key*) type=rsa ;; + */ssh_host_dsa_key*) type=dsa ;; ++ */ssh_host_ecdsa_key*) type=ecdsa ;; + *) type="" + echo " Warning! host key $key does not exist and cannot" + echo " be auto-generated since it does not have a standard name." + echo " If SSHD doesn't start, you'll have to generate it manually this way :" +- echo " # ssh-keygen -t { rsa1 | rsa | dsa } -N '' -f $key" ++ echo " # ssh-keygen -t { rsa1 | rsa | dsa | ecdsa } -N '' -f $key" + echo + ;; + esac diff --git a/flx/init-openssh/init-openssh-4.5.ebuild b/flx/init-openssh/init-openssh-4.5.ebuild new file mode 100644 index 00000000..a812ce95 --- /dev/null +++ b/flx/init-openssh/init-openssh-4.5.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/pkg/openssh.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git" +EGIT_BRANCH="4.5-flx0" +EGIT_COMMIT="v4.5p1-flx0.1" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=net-misc/openssh-${PV}" + +SVCNAME="sshd" + +src_prepare () +{ + epatch "${FILESDIR}"/${PN}-BJA-ecdsa.diff + + flx_src_prepare +} diff --git a/flx/init-openvpn/Manifest b/flx/init-openvpn/Manifest new file mode 100644 index 00000000..11c53822 --- /dev/null +++ b/flx/init-openvpn/Manifest @@ -0,0 +1 @@ +EBUILD init-openvpn-2.0.9.ebuild 437 RMD160 dd4844971342bf13fa3a038f80e3913f312462b7 SHA1 85c206de63b818087b908816842cc6288cdaae0b SHA256 78f3d98d0ea61a472ac3d21fb0e974ba76343197a53b0a5f323b199702f755d8 diff --git a/flx/init-openvpn/init-openvpn-2.0.9.ebuild b/flx/init-openvpn/init-openvpn-2.0.9.ebuild new file mode 100644 index 00000000..3b4c099b --- /dev/null +++ b/flx/init-openvpn/init-openvpn-2.0.9.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx + +SDIR="people/beber" + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/openvpn.git/" +EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git" +EGIT_BRANCH="2.0-flx0" +#EGIT_COMMIT="v${PV}-flx0.1" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=net-misc/openvpn-${PV}" diff --git a/flx/init-scripts/Manifest b/flx/init-scripts/Manifest new file mode 100644 index 00000000..a61a59ed --- /dev/null +++ b/flx/init-scripts/Manifest @@ -0,0 +1,6 @@ +AUX init-scripts-BJA-debug.diff 219 RMD160 cfc51c8e30b5d86d23d2ca294e105983f39ed044 SHA1 11657fb59e1c0a51365ab33acaf35df41690649a SHA256 e0bf4ea5386c2c139b52297f565b9114b1bfd015d3debb2b8fade886ecc5dd76 +AUX init-scripts-BJA-path.diff 11094 RMD160 fad7a592cfee4324780c23ea9025738d25fbaae3 SHA1 a64f3a67628792bc439dc2247a001750e53cb2fb SHA256 6c37265cab0b5db793de461db75af974988c49a9a89ed512cc0405d04df355e8 +AUX init-scripts-BJA-remove-mii-diag.diff 3687 RMD160 dda7c956624140681a371fd9f38715cf565b1d72 SHA1 9b3cc8f137e4db23ae0a2c064b59413e6a705f90 SHA256 5dd370df3eb70a1a03ae0219b591cb537e59f39abffd1a000bbca2236822ae99 +AUX init-scripts-BJA-remove-unused-code.diff 4097 RMD160 64d2a92a649a5f992367a12717ca8f5f6e6758c9 SHA1 6f3c0806ca6cded5deb14d46b209130cb9d99900 SHA256 87ed7d8450fe6d8f591c95ce01bb0dcd645a93a05d68c58b829b8b4dca6844ac +AUX init-scripts-BJA-tail.diff 983 RMD160 782fcbf0bd3747138aaa7b6516ef7c7bdfd7b4cc SHA1 d3f493e9861f279c318bb7740bbf9fc9eac2b3a2 SHA256 10f90f8273f960b45514389abf3cbc284c09bc59444a34ef89613c319387b5d7 +EBUILD init-scripts-0.3.42.ebuild 952 RMD160 13cfec365faa819d8be342deaf2e146baa4608da SHA1 2347687a02b22d568484c8012577beb1b06f12c2 SHA256 baa5a3e8886604094849e3c9b83aba6546f1fd834bbef86940cd52cdea1b23de diff --git a/flx/init-scripts/files/init-scripts-BJA-debug.diff b/flx/init-scripts/files/init-scripts-BJA-debug.diff new file mode 100644 index 00000000..55887d94 --- /dev/null +++ b/flx/init-scripts/files/init-scripts-BJA-debug.diff @@ -0,0 +1,10 @@ +--- sbin/initscript.ori 2011-11-23 23:05:35.260815979 +0100 ++++ sbin/initscript 2011-11-23 23:04:58.091656971 +0100 +@@ -1,5 +1,7 @@ + #!/bin/sh + ++echo $0 $@ ++ + umask 022 + PATH=/bin:/sbin:/usr/sbin:/usr/bin + export PATH diff --git a/flx/init-scripts/files/init-scripts-BJA-path.diff b/flx/init-scripts/files/init-scripts-BJA-path.diff new file mode 100644 index 00000000..de89cd7e --- /dev/null +++ b/flx/init-scripts/files/init-scripts-BJA-path.diff @@ -0,0 +1,292 @@ +diff --git a/sbin/init.d/monitor b/sbin/init.d/monitor +index 59cbb16..0942336 100755 +--- a/sbin/init.d/monitor ++++ b/sbin/init.d/monitor +@@ -7,7 +7,7 @@ option check_interval standard_option 60 + option facility standard_option + option try_restart boolean_option + option html standard_option +-option bin reserved_option /opt/exosec/bin/monitor ++option bin reserved_option /usr/sbin/monitor + option cmdline reserved_option \ + '$bin -p $pidfile ${opt_html:+--html $opt_html} ${opt_facility:+--syslog $opt_facility} ${opt_try_restart:+--restart}' + option pidfile reserved_option /var/run/monitor.pid +diff --git a/sbin/init.d/network b/sbin/init.d/network +index 9919c4d..8ad38a3 100755 +--- a/sbin/init.d/network ++++ b/sbin/init.d/network +@@ -83,18 +83,18 @@ function do_help { + function set_media { + case "$2" in + auto) +- /sbin/mii-diag -r $1 >/dev/null 2>&1 || \ +- /sbin/ethtool -s $1 autoneg on ++ mii-diag -r $1 >/dev/null 2>&1 || \ ++ ethtool -s $1 autoneg on + ;; + full|fdx|100full|100fdx) +- /sbin/mii-diag -F 100baseTx-FD $1 >/dev/null 2>&1 || \ +- /sbin/ethtool -s $1 autoneg off speed 100 duplex full ++ mii-diag -F 100baseTx-FD $1 >/dev/null 2>&1 || \ ++ ethtool -s $1 autoneg off speed 100 duplex full + ;; + half|hdx|100half|100hdx) +- /sbin/mii-diag -F 100baseTx-HD $1 >/dev/null 2>&1 || \ +- /sbin/ethtool -s $1 autoneg off speed 100 duplex half ++ mii-diag -F 100baseTx-HD $1 >/dev/null 2>&1 || \ ++ ethtool -s $1 autoneg off speed 100 duplex half + ;; +- *) /sbin/mii-diag -F $opt_media $1 >/dev/null ;; ++ *) mii-diag -F $opt_media $1 >/dev/null ;; + esac + } + +@@ -108,8 +108,8 @@ function set_media2 { + speed="$2"; [ "$speed" = "-" ] && speed="" + duplex="$3"; [ "$duplex" = "-" ] && duplex="" + if [ "$4" = "on" ] || [ -z "$speed" -a -z "$duplex" ]; then +- /sbin/mii-diag -r $1 >/dev/null 2>&1 || \ +- /sbin/ethtool -s $1 autoneg on ++ mii-diag -r $1 >/dev/null 2>&1 || \ ++ ethtool -s $1 autoneg on + [ -n "$speed" -o -n "$duplex" ] || return 0 + fi + +@@ -122,8 +122,8 @@ function set_media2 { + + # warning: with ethtool, it's important to set auto, then speed and duplex + # in this exact order. +- /sbin/mii-diag -F $miistr $1 >/dev/null 2>&1 || \ +- /sbin/ethtool -s $1 ${4:+autoneg $4} ${speed:+speed $speed} ${duplex:+duplex $duplex} ++ mii-diag -F $miistr $1 >/dev/null 2>&1 || \ ++ ethtool -s $1 ${4:+autoneg $4} ${speed:+speed $speed} ${duplex:+duplex $duplex} + } + + function fct_begin_section { +@@ -680,10 +680,10 @@ _start_if() { + if [ "`eval echo \\$int_${eth}_media`" ]; then + media=`eval echo \\$int_${eth}_media` + case "$media" in +- auto) /sbin/mii-diag -r $eth >/dev/null ;; +- full|fdx|100full|100fdx) /sbin/mii-diag -F 100baseTx-FD $eth >/dev/null ;; +- half|hdx|100half|100hdx) /sbin/mii-diag -F 100baseTx-HD $eth >/dev/null ;; +- *) /sbin/mii-diag -F $media $eth >/dev/null ;; ++ auto) mii-diag -r $eth >/dev/null ;; ++ full|fdx|100full|100fdx) mii-diag -F 100baseTx-FD $eth >/dev/null ;; ++ half|hdx|100half|100hdx) mii-diag -F 100baseTx-HD $eth >/dev/null ;; ++ *) mii-diag -F $media $eth >/dev/null ;; + esac + echo "Link set to $media for interface $eth" + fi +@@ -747,7 +747,7 @@ _do_start() + if [ -z "$way" ] ; then way=default ; fi + gateway=`echo $route | cut -f2 -d":"` + echo "Setting route $way via $gateway" +- /sbin/ip route add $way via $gateway ++ ip route add $way via $gateway + done + } + +diff --git a/sbin/init.d/functions b/sbin/init.d/functions +index 288849e..14d0212 100755 +--- a/sbin/init.d/functions ++++ b/sbin/init.d/functions +@@ -336,7 +336,7 @@ recursive_rmmod() { + (( mod++ )) + done + elif [ "${args[2]}" = "0" ]; then +- /sbin/modprobe -r $1 ++ modprobe -r $1 + return $? + else + # impossible to remove this module (count>0) +diff --git a/sbin/init.d/firewall b/sbin/init.d/firewall +index b15866c..469af0b 100755 +--- a/sbin/init.d/firewall ++++ b/sbin/init.d/firewall +@@ -14,9 +14,6 @@ option nat boolean_option + option conntrack option_conntrack + option modprobe multiple_option + +-IPTABLES=/sbin/iptables +-IPRESTORE=/sbin/iptables-restore +- + conntrack_args=( ) + + function do_help { +@@ -70,9 +67,9 @@ function load_modules { + local sys1=/proc/sys/net + local sys2=/proc/sys/net/netfilter + +- /sbin/modprobe ip_tables 2>/dev/null +- /sbin/modprobe iptable_filter 2>/dev/null +- /sbin/modprobe iptable_mangle 2>/dev/null ++ modprobe ip_tables 2>/dev/null ++ modprobe iptable_filter 2>/dev/null ++ modprobe iptable_mangle 2>/dev/null + + if ! grep -q "^filter$" /proc/net/ip_tables_names; then + echo "Error: filtering module did not load correctly." +@@ -81,7 +78,7 @@ function load_modules { + fi + + if [ -n "$opt_stateful" ]; then +- /sbin/modprobe nf_conntrack expect_hashsize=$opt_hashsize ++ modprobe nf_conntrack expect_hashsize=$opt_hashsize + if [ ! -e $sys1/nf_conntrack_max -a \ + ! -e $sys2/nf_conntrack_max ]; then + echo "Error: conntrack module did not load correctly." +@@ -90,7 +87,7 @@ function load_modules { + return 1 + fi + +- [ -n "$opt_nat" ] && /sbin/modprobe iptable_nat 2>/dev/null ++ [ -n "$opt_nat" ] && modprobe iptable_nat 2>/dev/null + + for arg in "${conntrack_args[@]}"; do + var=${arg%%=*} ; val=${arg##*=} +@@ -108,7 +105,7 @@ function load_modules { + arg=0 + while [ $arg -lt ${#opt_modprobe[*]} ]; do + if [ "${opt_modprobe[$arg]}" != "#" ]; then +- /sbin/modprobe ${opt_modprobe[$arg]} || { echo "Warning: could not load module ${opt_modprobe[$arg]}"; return 1; } ++ modprobe ${opt_modprobe[$arg]} || { echo "Warning: could not load module ${opt_modprobe[$arg]}"; return 1; } + fi + arg=$[$arg+1] + done +@@ -123,20 +120,20 @@ function flush_rules { + + # filter chain has a default policy set to DROP + for chain in INPUT OUTPUT FORWARD; do +- $IPTABLES -t filter -P $chain DROP ++ iptables -t filter -P $chain DROP + done + + # flush all rules in all tables + for table in mangle filter ${opt_stateful:+${opt_nat:+nat}}; do +- $IPTABLES -t $table -F +- $IPTABLES -t $table -X ++ iptables -t $table -F ++ iptables -t $table -X + done + + # other chains have a default policy set to ACCEPT + for table in mangle ${opt_stateful:+${opt_nat:+nat}}; do +- chains=$($IPTABLES -t $table -L | grep "^Chain " | cut -f2 -d' ') ++ chains=$(iptables -t $table -L | grep "^Chain " | cut -f2 -d' ') + for chain in $chains; do +- $IPTABLES -t $table -P $chain ACCEPT ++ iptables -t $table -P $chain ACCEPT + done + done + +@@ -162,7 +159,7 @@ function disable_forwarding { + # system. + function load_policy { + [ -n "$1" ] || return 1 +- if ! [ -r "$opt_confdir/$1" ] || ! $IPRESTORE < "$opt_confdir/$1"; then ++ if ! [ -r "$opt_confdir/$1" ] || ! iptables-restore < "$opt_confdir/$1"; then + flush_rules + return 1 + fi +@@ -196,27 +193,27 @@ function block_on_error { + echo "Firewall: CRITICAL! cannot load any policy file !" + # we'll block external traffic and enable internal one in this case + echo "Firewall: Changing policy to block external traffic..." +- $IPTABLES -t filter -P INPUT DROP +- $IPTABLES -t filter -P OUTPUT DROP +- $IPTABLES -t filter -P FORWARD DROP +- $IPTABLES -t filter -F +- +- $IPTABLES -t filter -A INPUT -i lo -j ACCEPT +- $IPTABLES -t filter -A OUTPUT -o lo -j ACCEPT +- [ -n "$opt_stateful" ] && $IPTABLES -t filter -A INPUT -m state --state ESTABLISHED -j ACCEPT +- [ -n "$opt_stateful" ] && $IPTABLES -t filter -A OUTPUT -m state --state ESTABLISHED -j ACCEPT +- +- $IPTABLES -t mangle -P PREROUTING ACCEPT +- $IPTABLES -t mangle -P INPUT ACCEPT +- $IPTABLES -t mangle -P FORWARD DROP +- $IPTABLES -t mangle -P POSTROUTING ACCEPT +- $IPTABLES -t mangle -P OUTPUT ACCEPT +- $IPTABLES -t mangle -F +- +- $IPTABLES -t mangle -A PREROUTING -i lo -j ACCEPT +- $IPTABLES -t mangle -A INPUT -i lo -j ACCEPT +- $IPTABLES -t mangle -A POSTROUTING -o lo -j ACCEPT +- $IPTABLES -t mangle -A OUTPUT -o lo -j ACCEPT ++ iptables -t filter -P INPUT DROP ++ iptables -t filter -P OUTPUT DROP ++ iptables -t filter -P FORWARD DROP ++ iptables -t filter -F ++ ++ iptables -t filter -A INPUT -i lo -j ACCEPT ++ iptables -t filter -A OUTPUT -o lo -j ACCEPT ++ [ -n "$opt_stateful" ] && iptables -t filter -A INPUT -m state --state ESTABLISHED -j ACCEPT ++ [ -n "$opt_stateful" ] && iptables -t filter -A OUTPUT -m state --state ESTABLISHED -j ACCEPT ++ ++ iptables -t mangle -P PREROUTING ACCEPT ++ iptables -t mangle -P INPUT ACCEPT ++ iptables -t mangle -P FORWARD DROP ++ iptables -t mangle -P POSTROUTING ACCEPT ++ iptables -t mangle -P OUTPUT ACCEPT ++ iptables -t mangle -F ++ ++ iptables -t mangle -A PREROUTING -i lo -j ACCEPT ++ iptables -t mangle -A INPUT -i lo -j ACCEPT ++ iptables -t mangle -A POSTROUTING -o lo -j ACCEPT ++ iptables -t mangle -A OUTPUT -o lo -j ACCEPT + disable_forwarding + echo + echo "################################################################" +@@ -339,7 +336,7 @@ function do_start { + # filter chain has a default policy set to ACCEPT if "no filter" is used + echo -n "Firewall: setting default policy to ACCEPT... " + for chain in INPUT OUTPUT FORWARD; do +- $IPTABLES -t filter -P $chain ACCEPT ++ iptables -t filter -P $chain ACCEPT + done + echo "OK." + if [ -n "$opt_forward" ]; then +@@ -451,17 +448,17 @@ function do_block { + fi + + echo -n "Firewall: Changing policy to block all external traffic... " +- $IPTABLES -t filter -A INPUT -i lo -j ACCEPT +- $IPTABLES -t filter -A OUTPUT -o lo -j ACCEPT +- $IPTABLES -t mangle -P PREROUTING DROP +- $IPTABLES -t mangle -P INPUT DROP +- $IPTABLES -t mangle -P FORWARD DROP +- $IPTABLES -t mangle -P POSTROUTING DROP +- $IPTABLES -t mangle -P OUTPUT DROP +- $IPTABLES -t mangle -A PREROUTING -i lo -j ACCEPT +- $IPTABLES -t mangle -A INPUT -i lo -j ACCEPT +- $IPTABLES -t mangle -A POSTROUTING -o lo -j ACCEPT +- $IPTABLES -t mangle -A OUTPUT -o lo -j ACCEPT ++ iptables -t filter -A INPUT -i lo -j ACCEPT ++ iptables -t filter -A OUTPUT -o lo -j ACCEPT ++ iptables -t mangle -P PREROUTING DROP ++ iptables -t mangle -P INPUT DROP ++ iptables -t mangle -P FORWARD DROP ++ iptables -t mangle -P POSTROUTING DROP ++ iptables -t mangle -P OUTPUT DROP ++ iptables -t mangle -A PREROUTING -i lo -j ACCEPT ++ iptables -t mangle -A INPUT -i lo -j ACCEPT ++ iptables -t mangle -A POSTROUTING -o lo -j ACCEPT ++ iptables -t mangle -A OUTPUT -o lo -j ACCEPT + echo "OK." + return 0 + } +@@ -542,10 +539,10 @@ function do_try { + + local TEMP=/tmp/fw.try.$RANDOM.$RANDOM + +- /sbin/iptables-save > $TEMP ++ iptables-save > $TEMP + +- if ! /sbin/iptables-restore < $opt_confdir/new/conf-$(uname -n).ipt ; then +- /sbin/iptables-restore < $TEMP ++ if ! iptables-restore < $opt_confdir/new/conf-$(uname -n).ipt ; then ++ iptables-restore < $TEMP + rm -f $TEMP + echo "Error loading pending config" >&2 + return 1 diff --git a/flx/init-scripts/files/init-scripts-BJA-remove-mii-diag.diff b/flx/init-scripts/files/init-scripts-BJA-remove-mii-diag.diff new file mode 100644 index 00000000..8f4637f7 --- /dev/null +++ b/flx/init-scripts/files/init-scripts-BJA-remove-mii-diag.diff @@ -0,0 +1,101 @@ +diff --git a/sbin/init.d/network b/sbin/init.d/network +index 8ad38a3..40385e1 100755 +--- a/sbin/init.d/network ++++ b/sbin/init.d/network +@@ -3,7 +3,6 @@ + # service network [<ifname>] # interface name -> int_<ifname>=enable + # replace <old_if_name> + # ip address <ip/mask> [secondary] # address for this interface +-# media {auto|full|fdx|100full|100fdx|half|hdx|100half|100hdx> + # speed {10|100|1000} + # duplex {half|full} + # auto {on|off} +@@ -39,7 +38,6 @@ option ip option_ip + option replace standard_option + option usedhcphostname boolean_option 0 + option dhcptimeout standard_option 10 +-option media standard_option + option duplex standard_option + option speed standard_option + option auto standard_option +@@ -64,7 +62,6 @@ function do_help { + echo "List of config.rc options (name, type, default value, current value) :" + echo + echo " - ip addr <address>, arp <ip> <mac>|pub, dhcp, route <dest> <-|gw> [<args>]" +- echo " - media auto|{full|fdx|100full|100fdx}|{half|hdx|100half|100hdx}" + echo " - duplex {half|full} ; speed {10|100|1000} ; auto {on|off}" + echo " - slave <interface*>" + echo " - bridge <interface*> ; bridge_stp {on|off}" +@@ -79,51 +76,22 @@ function do_help { + } + + # changes the negociation parameters for interface $1 +-# usage: set_media <interface> <media> +-function set_media { +- case "$2" in +- auto) +- mii-diag -r $1 >/dev/null 2>&1 || \ +- ethtool -s $1 autoneg on +- ;; +- full|fdx|100full|100fdx) +- mii-diag -F 100baseTx-FD $1 >/dev/null 2>&1 || \ +- ethtool -s $1 autoneg off speed 100 duplex full +- ;; +- half|hdx|100half|100hdx) +- mii-diag -F 100baseTx-HD $1 >/dev/null 2>&1 || \ +- ethtool -s $1 autoneg off speed 100 duplex half +- ;; +- *) mii-diag -F $opt_media $1 >/dev/null ;; +- esac +-} +- +-# changes the negociation parameters for interface $1 + # $2=speed(10|100|1000) or "-" if unchanged + # $3=duplex(half|full) or "-" if unchanged + # $4=auto(on|off) or "-" if unchanged +-function set_media2 { +- local miistr speed duplex ++function set_media { ++ local speed duplex + + speed="$2"; [ "$speed" = "-" ] && speed="" + duplex="$3"; [ "$duplex" = "-" ] && duplex="" + if [ "$4" = "on" ] || [ -z "$speed" -a -z "$duplex" ]; then +- mii-diag -r $1 >/dev/null 2>&1 || \ +- ethtool -s $1 autoneg on ++ ethtool -s $1 autoneg on + [ -n "$speed" -o -n "$duplex" ] || return 0 + fi + +- [ "$duplex" = "half" ] && miistr="HD" || miistr="FD" +- if [ "$speed" = "10" ]; then +- miistr=10baseT-$miistr +- else +- miistr=${speed:-100}baseTx-$miistr +- fi +- + # warning: with ethtool, it's important to set auto, then speed and duplex + # in this exact order. +- mii-diag -F $miistr $1 >/dev/null 2>&1 || \ +- ethtool -s $1 ${4:+autoneg $4} ${speed:+speed $speed} ${duplex:+duplex $duplex} ++ ethtool -s $1 ${4:+autoneg $4} ${speed:+speed $speed} ${duplex:+duplex $duplex} + } + + function fct_begin_section { +@@ -375,14 +343,8 @@ function do_start { + return 1 + fi + +- if [ "$opt_media" ]; then +- if [ -n "$opt_speed" -o -n "$opt_duplex" -o -n "$opt_auto" ]; then +- echo " ==> Warning: option 'media' inhibits 'speed','duplex' and 'auto'." +- fi +- set_media $instname "$opt_media" +- echo " ==> Link set to $opt_media for interface $instname" +- elif [ -n "$opt_speed" -o -n "$opt_duplex" -o -n "$opt_auto" ]; then +- set_media2 $instname "${opt_speed:--}" "${opt_duplex:--}" "${opt_auto:--}" ++ if [ -n "$opt_speed" -o -n "$opt_duplex" -o -n "$opt_auto" ]; then ++ set_media $instname "${opt_speed:--}" "${opt_duplex:--}" "${opt_auto:--}" + echo " ==> Link configuration changed for interface $instname" + fi + diff --git a/flx/init-scripts/files/init-scripts-BJA-remove-unused-code.diff b/flx/init-scripts/files/init-scripts-BJA-remove-unused-code.diff new file mode 100644 index 00000000..12a49bbc --- /dev/null +++ b/flx/init-scripts/files/init-scripts-BJA-remove-unused-code.diff @@ -0,0 +1,142 @@ +diff --git a/sbin/init.d/network b/sbin/init.d/network +index 40385e1..e950dd6 100755 +--- a/sbin/init.d/network ++++ b/sbin/init.d/network +@@ -612,137 +612,4 @@ function do_flush { + echo " ==> flush $svcname${instname:+[$instname]} : Done." + } + +-#### these are the old versions. The slave mechanism should be checked. +- +-_start_if() { +- local eth=$1 +- local temp=`eval echo \\$int_${eth}_modprobe` +- ip link show $eth >/dev/null 2>&1 +- if [ "$temp" -a $? -ne 0 ] ; then +- if [ "$temp" = modprobe ] ; then +- modprobe $eth +- else +- modprobe $temp +- fi +- fi +- +- ip link show $eth | grep -q UP +- if [ $? = 0 ] ; then +- echo "Interface $eth already configured" +- continue +- fi +- +- if [ "`eval echo \\$int_${eth}_slave`" ]; then +- # the slaves should be up before continuing +- for int in `eval echo \\$int_${eth}_slave`; do +- start_if $int +- done +- fi +- +- if [ "`eval echo \\$int_${eth}_media`" ]; then +- media=`eval echo \\$int_${eth}_media` +- case "$media" in +- auto) mii-diag -r $eth >/dev/null ;; +- full|fdx|100full|100fdx) mii-diag -F 100baseTx-FD $eth >/dev/null ;; +- half|hdx|100half|100hdx) mii-diag -F 100baseTx-HD $eth >/dev/null ;; +- *) mii-diag -F $media $eth >/dev/null ;; +- esac +- echo "Link set to $media for interface $eth" +- fi +- +- ip link set $eth up +- ip addr flush dev $eth >/dev/null 2>&1 +- if [ "`eval echo \\$ip_dhcp_$eth`" = enable ] ; then +- echo "Waiting for ip address with DHCP request ... " +- dhcpcd -t 10 $eth +- elif [ "`eval echo \\$ip_address_$eth`" ]; then +- ip_address=`eval echo \\$ip_address_$eth` +- ip_address_sec=`eval echo \\$ip_address_sec_$eth` +- echo "Setting ip address $ip_address to interface $eth" +- ip addr add $ip_address dev $eth +- for addr in $ip_address_sec ; do +- echo "Setting secondary ip address $addr to interface $eth" +- ip addr add $addr dev $eth +- done +- fi +- +- if [ "`eval echo \\$int_${eth}_slave`" ]; then +- ifenslave $eth `eval echo \\$int_${eth}_slave` +- # we prefer no ip address on the slaves +- for int in `eval echo \\$int_${eth}_slave`; do +- ip addr flush dev $int +- done +- fi +- +- addr=`ip addr show $eth | grep "inet " | sed 's/^.*inet \([^ ]\+\) .*$/\1/'` +- if [ ! -z "$addr" ]; then +- if [ ! -z "$display_addr_in_issue" ]; then +- echo " -> $eth has address $addr" +- echo "$eth has address $addr" >> /etc/issue +- fi +- else +- if [ ! -z "$display_addr_in_issue" ]; then +- echo " -> $eth has no address" +- echo "$eth has no address" >> /etc/issue +- fi +- fi +-} +- +-_do_start() +-{ +- # set hostname +- if [ "$hostname" ] ; then +- echo "Setting hostname '$hostname'" +- hostname $hostname +- domainname `echo $hostname | cut -f2- -d.` +- fi +- +- # set ip address for each interface +- for eth in `set|grep -a '^int_[a-zA-Z0-9:-_]*=enable$'|\ +- sed -e 's/.*_\(.*\)=.*/\1/'` ; do +- start_if $eth +- done +- +- # set ip route +- for route in `echo $ip_route` ; do +- way=`echo $route | cut -f1 -d:` +- if [ -z "$way" ] ; then way=default ; fi +- gateway=`echo $route | cut -f2 -d":"` +- echo "Setting route $way via $gateway" +- ip route add $way via $gateway +- done +-} +- +-_do_stop() +-{ +- for eth in `set|grep -a '^int_[a-zA-Z0-9:-_]*=enable$'|\ +- sed -e 's/.*_\(.*\)=.*/\1/'` ; do +- echo "Shutting down $eth" +- if [ "`eval echo \\$ip_dhcp_$eth`" = enable ] ; then +- for proc in `pidof dhcpcd` ; do +- if grep -qs $eth /proc/$proc/cmdline ; then kill $proc ; fi +- done +- fi +- ip link set $eth down +- ip addr flush dev $eth >/dev/null 2>&1 +- if [ ! -z `eval echo \\$int_"$eth"_slave` ]; then +- for slave in `eval echo \\$int_"$eth"_slave`; do +- ip link set $slave down arp on +- ip addr flush dev $slave >/dev/null 2>&1 +- done +- fi +- if [ ! -z "$display_addr_in_issue" ]; then +- grep -v "$eth " /etc/issue > /etc/issue- && mv /etc/issue- /etc/issue +- fi +- done +-} +- +-_do_status() +-{ +- echo "'ip addr show' give:" +- ip addr show +- echo "'ip route show' give:" +- ip route show +-} +- + load_config diff --git a/flx/init-scripts/files/init-scripts-BJA-tail.diff b/flx/init-scripts/files/init-scripts-BJA-tail.diff new file mode 100644 index 00000000..5061750b --- /dev/null +++ b/flx/init-scripts/files/init-scripts-BJA-tail.diff @@ -0,0 +1,31 @@ +diff --git sbin/init.d/functions sbin/init.d/functions +index d50c1eb..cb7d1a4 100755 +--- sbin/init.d/functions ++++ sbin/init.d/functions +@@ -276,7 +276,7 @@ run_stdin() { + + remount_rw() { + local root +- set -- $(df $1|tail +2) ++ set -- $(df $1|tail -n +2) + root=$6 + set -- $(grep -v '^rootfs' /proc/mounts |cut -f2- -d' '|grep "^$root ") + if [ "${3/rw//}" != "$3" ]; then +@@ -301,7 +301,7 @@ remount_rw() { + + remount_ro() { + local root +- set -- $(df $1|tail +2) ++ set -- $(df $1|tail -n +2) + root=$6 + set -- $(grep -v '^rootfs' /proc/mounts |cut -f2- -d' '|grep "^$root ") + if [ "${3/ro//}" != "$3" ]; then +@@ -323,7 +323,7 @@ recursive_rmmod() { + local mod + + while : ; do +- args=( $(/sbin/lsmod|tail +2|sed "s/([^)]*)//g"|grep "^$1 "|tr -d '\[\]') ) ++ args=( $(/sbin/lsmod|tail -n +2|sed "s/([^)]*)//g"|grep "^$1 "|tr -d '\[\]') ) + [ ${#args[@]} -gt 0 ] || return 0 + if [ -n "${args[3]}" ]; then + # there are modules to unload first diff --git a/flx/init-scripts/init-scripts-0.3.42.ebuild b/flx/init-scripts/init-scripts-0.3.42.ebuild new file mode 100644 index 00000000..a2743851 --- /dev/null +++ b/flx/init-scripts/init-scripts-0.3.42.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 eutils + +SDIR="people/beber" + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/init-scripts.git" +EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/src/${PN}.git" +#EGIT_COMMIT="v${PV}" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PN}-BJA-path.diff + epatch "${FILESDIR}"/${PN}-BJA-remove-mii-diag.diff + epatch "${FILESDIR}"/${PN}-BJA-remove-unused-code.diff +} + +src_install () +{ + cd ${S}/etc + insinto /etc + doins init.d initscript + + exeinto /etc + doexe startup.rc + + cd ${S}/sbin + exeinto /sbin + doexe rc.{0,6,K,M,S} + doexe bootmodules initscript listpart service + + cd ${S}/sbin/init.d + exeinto /sbin/init.d + doexe dhcpd firewall functions keyboard klogd monitor network sysprofiles system +} diff --git a/flx/init-squid/Manifest b/flx/init-squid/Manifest new file mode 100644 index 00000000..26c3d4aa --- /dev/null +++ b/flx/init-squid/Manifest @@ -0,0 +1,3 @@ +AUX init-squid-BJA-obsolete-opt.diff 1205 RMD160 b3e3f21a7389f709e8f9add40c92b12eaba9b174 SHA1 aeb60e8236b1705f67e5e500fbccf3d660672c40 SHA256 383586abc3c993b3dc10a3214d02bf077dbc3eb57ab56346b34f34793e9deeeb +AUX init-squid-BJA-path.diff 621 RMD160 6aa8aba26980cbe6f54828a6342c91d8f42d1693 SHA1 062654ed423f2cd66662dc92da47dc1ee6b6b979 SHA256 be4f7e173562665ae2140908c02fdbf9512ecd804a9b02f0112d0d9c5fea9710 +EBUILD init-squid-2.6.ebuild 552 RMD160 c0c83b23b5c7aeb55d1207b9b7a165d303a27e34 SHA1 dde1742630e780792fc4ed4e2429077989fa4eeb SHA256 e8e829a40e06810c05a23e723427cac58090f9cc63e2a6a3bddc771b96d93fa1 diff --git a/flx/init-squid/files/init-squid-BJA-obsolete-opt.diff b/flx/init-squid/files/init-squid-BJA-obsolete-opt.diff new file mode 100644 index 00000000..794ccf32 --- /dev/null +++ b/flx/init-squid/files/init-squid-BJA-obsolete-opt.diff @@ -0,0 +1,29 @@ +diff --git add-ons/squid.init add-ons/squid.init +index ad4aebc..e67f992 100644 +--- add-ons/squid.init ++++ add-ons/squid.init +@@ -10,7 +10,6 @@ option whitelist standard_option + option usesyslog boolean_option 0 + option createswap boolean_option 0 + option catchsignals boolean_option 1 +-option dnstest boolean_option 1 + option waitrebuild boolean_option 0 + option reuseaddr boolean_option 1 + option doublecheck boolean_option 0 +@@ -19,7 +18,7 @@ option vhostaccel boolean_option 0 + option bin reserved_option /usr/sbin/squid + option gbin reserved_option /usr/bin/squidGuard + option pidfile reserved_option /var/run/squid.pid +-option cmdline reserved_option '$bin -D' ++option cmdline reserved_option '$bin' + + function fct_pre_start { + +@@ -82,7 +81,6 @@ function fct_end_section { + [ "$opt_usesyslog" = "1" ] && cmdline="$cmdline -s" + [ "$opt_createswap" = "1" ] && cmdline="$cmdline -z" + [ "$opt_catchsignals" != "1" ] && cmdline="$cmdline -C" +- [ "$opt_dnstest" != "1" ] && cmdline="$cmdline -D" + [ "$opt_reuseaddr" != "1" ] && cmdline="$cmdline -R" + [ "$opt_waitrebuild" = "1" ] && cmdline="$cmdline -F" + [ "$opt_doublecheck" = "1" ] && cmdline="$cmdline -S" diff --git a/flx/init-squid/files/init-squid-BJA-path.diff b/flx/init-squid/files/init-squid-BJA-path.diff new file mode 100644 index 00000000..f4c63457 --- /dev/null +++ b/flx/init-squid/files/init-squid-BJA-path.diff @@ -0,0 +1,20 @@ +diff --git add-ons/squid.init add-ons/squid.init +index 6702aea..ad4aebc 100644 +--- add-ons/squid.init ++++ add-ons/squid.init +@@ -16,8 +16,8 @@ option reuseaddr boolean_option 1 + option doublecheck boolean_option 0 + option vhostaccel boolean_option 0 + +-option bin reserved_option /opt/sbin/squid +-option gbin reserved_option /opt/squid/bin/squidguard ++option bin reserved_option /usr/sbin/squid ++option gbin reserved_option /usr/bin/squidGuard + option pidfile reserved_option /var/run/squid.pid + option cmdline reserved_option '$bin -D' + +@@ -107,4 +107,3 @@ function do_refresh_lists { + + + load_config +- diff --git a/flx/init-squid/init-squid-2.6.ebuild b/flx/init-squid/init-squid-2.6.ebuild new file mode 100644 index 00000000..5176cdd7 --- /dev/null +++ b/flx/init-squid/init-squid-2.6.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx eutils + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/squid.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git" +EGIT_BRANCH="2.6-flx0" +EGIT_COMMIT="v2.6.STABLE13-flx0.1" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=net-proxy/squid-${PV}" + +src_prepare () +{ + epatch "${FILESDIR}"/${PN}-BJA-path.diff + epatch "${FILESDIR}"/${PN}-BJA-obsolete-opt.diff + + flx_src_prepare +} diff --git a/flx/init-syslog-ng/Manifest b/flx/init-syslog-ng/Manifest new file mode 100644 index 00000000..df0cf9e5 --- /dev/null +++ b/flx/init-syslog-ng/Manifest @@ -0,0 +1,2 @@ +AUX init-syslog-ng-BJA-path.diff 789 SHA256 4fbee8523d312a29e8aefa089caadfed7ca7f2b6c04917de307f2967be8eabf1 SHA512 ed5d9953ce867247c9f486fd4f2134b22f84f11b3a2f11880fdd0d25aa9da1389c432b81acdcd72467bd103640d27aa7cb31afb18fd02fa0220819025fcb8a8d WHIRLPOOL ffd53302ed30fa0ddef81c175b65b7b9f59e2b87bdd5f40daf31e8290124dffe37d380dd0b70710a1f3888481194bbe71d48a82f941c7c3f49b58f9d5b86093b +EBUILD init-syslog-ng-1.6.ebuild 504 SHA256 ffab25cecb8fcf53b9ff3ae007e9b9dfac1ef31c513ee9118b19e1960e4c003f SHA512 d39254fc3e069c9880420a21f217be6f132a4a6fad93f40f3f7909518d349399ad753ed936e04d869ccaccf77406e4a3f2439ec5bc92b5b4595501210fac1f6b WHIRLPOOL 2403e192581a4a14dee6e57372ee7e05fb89f623250252c9f82c37588f0ff35c6794d25c3e8b7addf84c53561c49a54150d6a0b0e901d8d8d9d39f7c588cdc53 diff --git a/flx/init-syslog-ng/files/init-syslog-ng-BJA-path.diff b/flx/init-syslog-ng/files/init-syslog-ng-BJA-path.diff new file mode 100644 index 00000000..d3639bd1 --- /dev/null +++ b/flx/init-syslog-ng/files/init-syslog-ng-BJA-path.diff @@ -0,0 +1,24 @@ +diff --git a/add-ons/syslog-ng b/add-ons/syslog-ng +index 07426f6..d2055b9 100644 +--- a/add-ons/syslog-ng ++++ b/add-ons/syslog-ng +@@ -8,7 +8,7 @@ option chain standard_option + option console standard_option 5 + option pidfile reserved_option /var/run/syslog-ng.pid + +-option bin reserved_option /sbin/syslog-ng ++option bin reserved_option /usr/sbin/syslog-ng + option cmdline reserved_option 'nice -n $opt_nice $bin -f $opt_config -p $pidfile' + + # we might want to start klogd right after syslog-ng, or at least correctly configure +@@ -28,8 +28,8 @@ function fct_pre_stop { + } + + function do_update { +- if [ -e $pidfile ] ; then +- read < $pidfile ++ if [ -e $pidfile ] ; then ++ read < $pidfile + [ "$REPLY" ] && kill -HUP $REPLY > /dev/null 2>&1 + fi + } diff --git a/flx/init-syslog-ng/init-syslog-ng-1.6.ebuild b/flx/init-syslog-ng/init-syslog-ng-1.6.ebuild new file mode 100644 index 00000000..c3780a8d --- /dev/null +++ b/flx/init-syslog-ng/init-syslog-ng-1.6.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx eutils + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/syslog-ng.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/pkg/${PN//init-/}.git" +EGIT_BRANCH="1.6-flx0" +EGIT_COMMIT="v1.6.11-flx0.1" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=app-admin/syslog-ng-${PV}" + +src_prepare () +{ + epatch "${FILESDIR}"/${PN}-BJA-path.diff + + flx_src_prepare +} diff --git a/flx/init-thttpd/Manifest b/flx/init-thttpd/Manifest new file mode 100644 index 00000000..6bef6f08 --- /dev/null +++ b/flx/init-thttpd/Manifest @@ -0,0 +1 @@ +EBUILD init-thttpd-2.25b.ebuild 498 RMD160 29771a5fc988032b9ea243f3ba9c88bc8af1fa49 SHA1 a578779b93fda6ac4a7efc82bf1bd19969cce2b4 SHA256 694f1d3b5eeaa7ca172b9614415f25a2cd010fbef8ec16d5ae2e15d8518e5b62 diff --git a/flx/init-thttpd/init-thttpd-2.25b.ebuild b/flx/init-thttpd/init-thttpd-2.25b.ebuild new file mode 100644 index 00000000..5d4afeb9 --- /dev/null +++ b/flx/init-thttpd/init-thttpd-2.25b.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx + +SDIR="people/beber" + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/pkg/clamav.git" +EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git" +EGIT_BRANCH="2-flx0" +#EGIT_COMMIT="v2.25b-flx0.1 " + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=www-servers/thttpd-${PV}" diff --git a/flx/init-vixie-cron/Manifest b/flx/init-vixie-cron/Manifest new file mode 100644 index 00000000..e459bb59 --- /dev/null +++ b/flx/init-vixie-cron/Manifest @@ -0,0 +1 @@ +EBUILD init-vixie-cron-3.0.1.ebuild 462 RMD160 295b6b037076722a896fa2a4c8ae1612e5572d1e SHA1 215c0b0ef21a3162d5ab5be78aabc9e9b0ea8c8a SHA256 9c0c113ec4613248f088cdb0de817e9727230018078ef27ba151c72ea0b0883c diff --git a/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild b/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild new file mode 100644 index 00000000..94ae2e5e --- /dev/null +++ b/flx/init-vixie-cron/init-vixie-cron-3.0.1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx + +SDIR="people/beber" + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/vixie-cron.git" +EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git" +EGIT_BRANCH="3.0-flx0" +#EGIT_COMMIT="v3.0.1-flx0.5" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=sys-process/vixie-cron-${PV}" + +SVCNAME="crond" diff --git a/flx/init-wdd/Manifest b/flx/init-wdd/Manifest new file mode 100644 index 00000000..84da794c --- /dev/null +++ b/flx/init-wdd/Manifest @@ -0,0 +1,2 @@ +EBUILD init-wdd-0.1.31.ebuild 372 SHA256 3b1efb721091e92cd7f4ff34cff31c5e7785f9958de1ab2e95e1800a651f3667 SHA512 e569bf663bbb785d7cc7d1ca0b039d6cd6b38081e5b8ff01e92619b3a8bb5da884bb048102c165aaa7a37af37f78892fe57283b2f3101ca5bb2ab1fbdd4f4ce7 WHIRLPOOL 5d6e5dad327a1e33caffd6c18915c36bdff33a0c742a02ce68dac074f280d99fbb02aa0edb4504ce1e5c7159cdc4527436d4bce0bf7f436b3cee4f9c3d56d9b2 +EBUILD init-wdd-0.1.34.ebuild 372 SHA256 3b1efb721091e92cd7f4ff34cff31c5e7785f9958de1ab2e95e1800a651f3667 SHA512 e569bf663bbb785d7cc7d1ca0b039d6cd6b38081e5b8ff01e92619b3a8bb5da884bb048102c165aaa7a37af37f78892fe57283b2f3101ca5bb2ab1fbdd4f4ce7 WHIRLPOOL 5d6e5dad327a1e33caffd6c18915c36bdff33a0c742a02ce68dac074f280d99fbb02aa0edb4504ce1e5c7159cdc4527436d4bce0bf7f436b3cee4f9c3d56d9b2 diff --git a/flx/init-wdd/init-wdd-0.1.31.ebuild b/flx/init-wdd/init-wdd-0.1.31.ebuild new file mode 100644 index 00000000..e299a8e2 --- /dev/null +++ b/flx/init-wdd/init-wdd-0.1.31.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx + +SDIR="people/beber" + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/wdd.git/" +EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=flx/wdd-${PV}" diff --git a/flx/init-wdd/init-wdd-0.1.34.ebuild b/flx/init-wdd/init-wdd-0.1.34.ebuild new file mode 100644 index 00000000..e299a8e2 --- /dev/null +++ b/flx/init-wdd/init-wdd-0.1.34.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flx + +SDIR="people/beber" + +HOMEPAGE="http://master.formilux.org/git/dist/pkg/wdd.git/" +EGIT_REPO_URI="http://master.formilux.org/git/${SDIR}/pkg/${PN//init-/}.git" + +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=">=flx/wdd-${PV}" diff --git a/flx/init/Manifest b/flx/init/Manifest new file mode 100644 index 00000000..b8439f9d --- /dev/null +++ b/flx/init/Manifest @@ -0,0 +1,9 @@ +AUX 0.1.31-error-struct-stat.diff 240 RMD160 f06a2412626fe5f783269b8ba5076c6ab9285bf1 SHA1 a9d60b1181c0400955713aaf20d002a2feee4503 SHA256 4555439fdbd221a30314a368e16ad53d6bf9cf723b84ddec766eafbd125f023a +AUX 0.1.31-remove-strip-diet.diff 1164 RMD160 3d67a6f1e4927558bdf28faa3dfc043b24f3123f SHA1 bb60e9ac9b2af987fd1f062a95f7c8b364302258 SHA256 57ef00faf22631861d14478f3cc8fb54a4fcd483768b54f24b495feadd5b3bdd +AUX 0.1.31-respect-CFLAGS-LDFLAGS.diff 475 RMD160 35a236b73139a6d898a2bdbc68d9ecc92315cdd9 SHA1 752b4d9002c15a39c087df0ea87d34bd7275a0ad SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e +AUX 0.1.34-error-struct-stat.diff 240 RMD160 f06a2412626fe5f783269b8ba5076c6ab9285bf1 SHA1 a9d60b1181c0400955713aaf20d002a2feee4503 SHA256 4555439fdbd221a30314a368e16ad53d6bf9cf723b84ddec766eafbd125f023a +AUX 0.1.34-no-no-omit-leaf-frame-pointer.diff 302 RMD160 b8e06143be7b330b01446bef15a7e1eb93857b07 SHA1 ef20035289525a1ae00c37f1e39f9cfb37bbb0f4 SHA256 28d16f01d4f5523da10db9472b4476f083d73a1dbf10c7e4dcae635beae9e6f3 +AUX 0.1.34-remove-strip-diet.diff 1165 RMD160 318b9ca4ba2de98c1bc68230fa7c4d24ede1d8c1 SHA1 c2ad9104bbaf56f65e45bb4149f9e318dd1887c1 SHA256 7e3a01385ab120ec2f0630d081aa2ce7cc324e5e9f3b9687dab62e09e5bc2fea +AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 475 RMD160 35a236b73139a6d898a2bdbc68d9ecc92315cdd9 SHA1 752b4d9002c15a39c087df0ea87d34bd7275a0ad SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e +EBUILD init-0.1.31.ebuild 955 RMD160 7746d37e48818924f5b87d7e229fc430f8418498 SHA1 e5c2847813a0ebb556a968fb62d2298ed70f7f32 SHA256 d44f3d5d94f5de78704804fe6f920bbf4ee9af034b8239fdb54bd5d9291dd6b9 +EBUILD init-0.1.34.ebuild 1023 RMD160 c879b537f264636efb4a3fa50c3411fbfc1a01a5 SHA1 e761e3322ddf288afc0ddc6fd22a19f76b1d0c9c SHA256 e9559547d6dfaa512996d5ed1dd51b9dfae58734fc0045ed2e0aff640565e1c0 diff --git a/flx/init/files/0.1.31-error-struct-stat.diff b/flx/init/files/0.1.31-error-struct-stat.diff new file mode 100644 index 00000000..9d21b1ae --- /dev/null +++ b/flx/init/files/0.1.31-error-struct-stat.diff @@ -0,0 +1,12 @@ +diff --git a/init/mkdev.c b/init/mkdev.c +index 47e4aa0..78a8c8d 100644 +--- a/init/mkdev.c ++++ b/init/mkdev.c +@@ -49,6 +49,7 @@ + #include <stdlib.h> + #include <sys/ioctl.h> + #include <linux/loop.h> ++#include <sys/stat.h> + + + //#ifdef DEBUG diff --git a/flx/init/files/0.1.31-remove-strip-diet.diff b/flx/init/files/0.1.31-remove-strip-diet.diff new file mode 100644 index 00000000..023e85eb --- /dev/null +++ b/flx/init/files/0.1.31-remove-strip-diet.diff @@ -0,0 +1,36 @@ +diff --git a/include/rules.make b/include/rules.make +index 58d0af1..f373aad 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,30 +1,16 @@ + CC ?= gcc +-STRIP ?= strip +-OBJDUMP ?= objdump +-SSTRIP ?= sstrip +-DIET ?= diet +- +-CC_ORIG := $(CC) +-override CC := $(DIET) $(CC) + + CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-s -Wl,--gc-sections ++LDFLAGS=-Wl,--gc-sections + + all: $(OBJS) + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true +- -if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi + + %-debug: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true + + clean: + @rm -f *.[ao] *~ core diff --git a/flx/init/files/0.1.31-respect-CFLAGS-LDFLAGS.diff b/flx/init/files/0.1.31-respect-CFLAGS-LDFLAGS.diff new file mode 100644 index 00000000..8ac81836 --- /dev/null +++ b/flx/init/files/0.1.31-respect-CFLAGS-LDFLAGS.diff @@ -0,0 +1,15 @@ +diff --git a/include/rules.make b/include/rules.make +index f373aad..1f95cd1 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,8 +1,8 @@ + CC ?= gcc + +-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) ++CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-Wl,--gc-sections ++LDFLAGS += -Wl,--gc-sections + + all: $(OBJS) + diff --git a/flx/init/files/0.1.34-error-struct-stat.diff b/flx/init/files/0.1.34-error-struct-stat.diff new file mode 100644 index 00000000..9d21b1ae --- /dev/null +++ b/flx/init/files/0.1.34-error-struct-stat.diff @@ -0,0 +1,12 @@ +diff --git a/init/mkdev.c b/init/mkdev.c +index 47e4aa0..78a8c8d 100644 +--- a/init/mkdev.c ++++ b/init/mkdev.c +@@ -49,6 +49,7 @@ + #include <stdlib.h> + #include <sys/ioctl.h> + #include <linux/loop.h> ++#include <sys/stat.h> + + + //#ifdef DEBUG diff --git a/flx/init/files/0.1.34-no-no-omit-leaf-frame-pointer.diff b/flx/init/files/0.1.34-no-no-omit-leaf-frame-pointer.diff new file mode 100644 index 00000000..e7706737 --- /dev/null +++ b/flx/init/files/0.1.34-no-no-omit-leaf-frame-pointer.diff @@ -0,0 +1,9 @@ +diff --git a/init/Makefile b/init/Makefile +index 9bcbcde..8b95b06 100644 +--- a/init/Makefile ++++ b/init/Makefile +@@ -1,3 +1,3 @@ + OBJS=init mkdev + include ../include/rules.make +-CFLAGS+=-fomit-frame-pointer -mno-omit-leaf-frame-pointer -Wl,--gc-sections ++CFLAGS+=-fomit-frame-pointer -Wl,--gc-sections diff --git a/flx/init/files/0.1.34-remove-strip-diet.diff b/flx/init/files/0.1.34-remove-strip-diet.diff new file mode 100644 index 00000000..d377de8a --- /dev/null +++ b/flx/init/files/0.1.34-remove-strip-diet.diff @@ -0,0 +1,36 @@ +diff --git a/include/rules.make b/include/rules.make +index 99bff82..f373aad 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,30 +1,16 @@ + CC ?= gcc +-STRIP ?= strip +-OBJDUMP ?= objdump +-SSTRIP ?= sstrip +-DIET ?= diet +- +-CC_ORIG := $(CC) +-override CC := $(DIET) $(CC) + + CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-s -Wl,--gc-sections ++LDFLAGS=-Wl,--gc-sections + + all: $(OBJS) + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true +- #-if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi + + %-debug: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true + + clean: + @rm -f *.[ao] *~ core diff --git a/flx/init/files/0.1.34-respect-CFLAGS-LDFLAGS.diff b/flx/init/files/0.1.34-respect-CFLAGS-LDFLAGS.diff new file mode 100644 index 00000000..8ac81836 --- /dev/null +++ b/flx/init/files/0.1.34-respect-CFLAGS-LDFLAGS.diff @@ -0,0 +1,15 @@ +diff --git a/include/rules.make b/include/rules.make +index f373aad..1f95cd1 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,8 +1,8 @@ + CC ?= gcc + +-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) ++CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-Wl,--gc-sections ++LDFLAGS += -Wl,--gc-sections + + all: $(OBJS) + diff --git a/flx/init/init-0.1.31.ebuild b/flx/init/init-0.1.31.ebuild new file mode 100644 index 00000000..e2698407 --- /dev/null +++ b/flx/init/init-0.1.31.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flag-o-matic toolchain-funcs eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="debug static symlink" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PV}-remove-strip-diet.diff + epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff + + tc-export CC +} + +src_compile () +{ + use debug && append-cflags -DDEBUG -DI_AM_REALLY_DEBUGGING + use static && append-ldflags -static + + append-cflags -D_GNU_SOURCE + + emake -C init + mv init/init init/flx-init +} + +src_install () +{ + into / + dosbin init/flx-init + use symlink \ + && dosym /sbin/flx-init /init + + dodoc init/README{,.2} init/test.cfg + dodoc -r init/examples +} diff --git a/flx/init/init-0.1.34.ebuild b/flx/init/init-0.1.34.ebuild new file mode 100644 index 00000000..441f9b0e --- /dev/null +++ b/flx/init/init-0.1.34.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 flag-o-matic toolchain-funcs eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 mips" +IUSE="debug static symlink" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PV}-remove-strip-diet.diff + epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff + epatch "${FILESDIR}"/${PV}-no-no-omit-leaf-frame-pointer.diff + + tc-export CC +} + +src_compile () +{ + use debug && append-cflags -DDEBUG -DI_AM_REALLY_DEBUGGING + use static && append-ldflags -static + + append-cflags -D_GNU_SOURCE + + emake -C init + mv init/init init/flx-init +} + +src_install () +{ + into / + dosbin init/flx-init + use symlink \ + && dosym /sbin/flx-init /init + + dodoc init/README{,.2} init/test.cfg + dodoc -r init/examples +} diff --git a/flx/remount/Manifest b/flx/remount/Manifest new file mode 100644 index 00000000..74f8ee69 --- /dev/null +++ b/flx/remount/Manifest @@ -0,0 +1,10 @@ +AUX 0.1.31-remove-strip-diet.diff 1915 RMD160 f7f319c295fac8620d442a4badb3e828dd8564f0 SHA1 9cafb471cdfb8ca41f5b0ad672d3bb4e2a025f75 SHA256 9612ee7854e2b147b03d02c308a13d09d44c2beb074ebcb2428b5a4ff2deca05 +AUX 0.1.31-respect-CFLAGS-LDFLAGS.diff 475 RMD160 35a236b73139a6d898a2bdbc68d9ecc92315cdd9 SHA1 752b4d9002c15a39c087df0ea87d34bd7275a0ad SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e +AUX 0.1.31-warning-cast.diff 550 RMD160 3ac238246cca1fa8ce85f0934c5cb75701ccf516 SHA1 6235310139694be7658494404fcfb525aff6befb SHA256 49050466db1280ad8a3e9c3c0c56e0ac8623d5fd3f8e00577ce9341f49e6992f +AUX 0.1.31-warning-implicit-declaration.diff 292 RMD160 d9e597983b4b1b85f520f10e5e632565cb294697 SHA1 bcca77487f9258abaf519fe475746e8123efd213 SHA256 db1cd3f07b6a0bad1a197d231832d01fab49f2237384feea076e7fc613254d59 +AUX 0.1.34-remove-strip-diet.diff 1924 RMD160 67d96d92bd6ce3aa6f9a5788855fd2e17c6bd9fc SHA1 7936b624eec038a07789602bb9dc9e388bec1b50 SHA256 b870b2d12347d2ec27bd060d72c997b3abe67fc47b5c27cd597510c69b92ffaa +AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 475 RMD160 35a236b73139a6d898a2bdbc68d9ecc92315cdd9 SHA1 752b4d9002c15a39c087df0ea87d34bd7275a0ad SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e +AUX 0.1.34-warning-cast.diff 550 RMD160 3ac238246cca1fa8ce85f0934c5cb75701ccf516 SHA1 6235310139694be7658494404fcfb525aff6befb SHA256 49050466db1280ad8a3e9c3c0c56e0ac8623d5fd3f8e00577ce9341f49e6992f +AUX 0.1.34-warning-implicit-declaration.diff 292 RMD160 d9e597983b4b1b85f520f10e5e632565cb294697 SHA1 bcca77487f9258abaf519fe475746e8123efd213 SHA256 db1cd3f07b6a0bad1a197d231832d01fab49f2237384feea076e7fc613254d59 +EBUILD remount-0.1.31.ebuild 762 RMD160 a3b2014909dc9d7b229a13158eb39bea6727d4e3 SHA1 1ac7dd7632cca04904f5dc2b16933173d13c6743 SHA256 b1e3bfef185a99b0afd9c0523f475d3e9a176008c109a86f0026f31eea57fc8e +EBUILD remount-0.1.34.ebuild 762 RMD160 a3b2014909dc9d7b229a13158eb39bea6727d4e3 SHA1 1ac7dd7632cca04904f5dc2b16933173d13c6743 SHA256 b1e3bfef185a99b0afd9c0523f475d3e9a176008c109a86f0026f31eea57fc8e diff --git a/flx/remount/files/0.1.31-remove-strip-diet.diff b/flx/remount/files/0.1.31-remove-strip-diet.diff new file mode 100644 index 00000000..18e9ea09 --- /dev/null +++ b/flx/remount/files/0.1.31-remove-strip-diet.diff @@ -0,0 +1,61 @@ +diff --git a/include/rules.make b/include/rules.make +index 58d0af1..68bfbd6 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,30 +1,16 @@ + CC ?= gcc +-STRIP ?= strip +-OBJDUMP ?= objdump +-SSTRIP ?= sstrip +-DIET ?= diet +- +-CC_ORIG := $(CC) +-override CC := $(DIET) $(CC) + + CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-s -Wl,--gc-sections ++LDFLAGS=-Wl,--gc-sections + + all: $(OBJS) + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true +- -if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi + + %-debug: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true + + clean: + @rm -f *.[ao] *~ core +diff --git a/wd/Makefile b/wd/Makefile +index 58650df..8350b33 100644 +--- a/wd/Makefile ++++ b/wd/Makefile +@@ -4,6 +4,3 @@ CFLAGS+=-fomit-frame-pointer + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- sstrip $@ +diff --git a/remount/Makefile b/remount/Makefile +index 71633d5..3887b5f 100644 +--- a/remount/Makefile ++++ b/remount/Makefile +@@ -4,9 +4,3 @@ CFLAGS+=-fomit-frame-pointer + + remountw : remountr + ln -s $^ $@ +- +-%: %.c +- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- sstrip $@ diff --git a/flx/remount/files/0.1.31-respect-CFLAGS-LDFLAGS.diff b/flx/remount/files/0.1.31-respect-CFLAGS-LDFLAGS.diff new file mode 100644 index 00000000..8ac81836 --- /dev/null +++ b/flx/remount/files/0.1.31-respect-CFLAGS-LDFLAGS.diff @@ -0,0 +1,15 @@ +diff --git a/include/rules.make b/include/rules.make +index f373aad..1f95cd1 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,8 +1,8 @@ + CC ?= gcc + +-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) ++CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-Wl,--gc-sections ++LDFLAGS += -Wl,--gc-sections + + all: $(OBJS) + diff --git a/flx/remount/files/0.1.31-warning-cast.diff b/flx/remount/files/0.1.31-warning-cast.diff new file mode 100644 index 00000000..97e86393 --- /dev/null +++ b/flx/remount/files/0.1.31-warning-cast.diff @@ -0,0 +1,23 @@ +diff --git a/remount/remountr.c b/remount/remountr.c +index 2a38f22..13c270d 100644 +--- a/remount/remountr.c ++++ b/remount/remountr.c +@@ -12,15 +12,15 @@ int main (int argc, char **argv) { + char *flag, *mntpnt; + + if (argv[0][strlen(argv[0])-1] == 'w') +- flag = wo_str; ++ flag = (char *)wo_str; + else +- flag = ro_str; ++ flag = (char *)ro_str; + + setreuid(0, 0); + if (argc > 1) + mntpnt = argv[1]; + else +- mntpnt = slash_str; ++ mntpnt = (char *)slash_str; + + return execl(mount_str, mount_str, flag, remount_str, mntpnt, NULL); + } diff --git a/flx/remount/files/0.1.31-warning-implicit-declaration.diff b/flx/remount/files/0.1.31-warning-implicit-declaration.diff new file mode 100644 index 00000000..ac469e99 --- /dev/null +++ b/flx/remount/files/0.1.31-warning-implicit-declaration.diff @@ -0,0 +1,11 @@ +diff --git a/remount/remountr.c b/remount/remountr.c +index f45c39a..2a38f22 100644 +--- a/remount/remountr.c ++++ b/remount/remountr.c +@@ -1,4 +1,6 @@ + #include <stdio.h> ++#include <string.h> ++#include <unistd.h> + + const char mount_str[] = "/bin/mount"; + const char remount_str[] = "remount"; diff --git a/flx/remount/files/0.1.34-remove-strip-diet.diff b/flx/remount/files/0.1.34-remove-strip-diet.diff new file mode 100644 index 00000000..414295d0 --- /dev/null +++ b/flx/remount/files/0.1.34-remove-strip-diet.diff @@ -0,0 +1,61 @@ +diff --git a/include/rules.make b/include/rules.make +index 99bff82..f373aad 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,30 +1,16 @@ + CC ?= gcc +-STRIP ?= strip +-OBJDUMP ?= objdump +-SSTRIP ?= sstrip +-DIET ?= diet +- +-CC_ORIG := $(CC) +-override CC := $(DIET) $(CC) + + CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-s -Wl,--gc-sections ++LDFLAGS=-Wl,--gc-sections + + all: $(OBJS) + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true +- #-if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi + + %-debug: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true + + clean: + @rm -f *.[ao] *~ core +diff --git a/wd/Makefile b/wd/Makefile +index ed8a82c..8350b33 100644 +--- a/wd/Makefile ++++ b/wd/Makefile +@@ -4,6 +4,3 @@ CFLAGS+=-fomit-frame-pointer + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- #$(SSTRIP) $@ +diff --git a/remount/Makefile b/remount/Makefile +index 740f38f..3887b5f 100644 +--- a/remount/Makefile ++++ b/remount/Makefile +@@ -4,9 +4,3 @@ CFLAGS+=-fomit-frame-pointer + + remountw : remountr + ln -s $^ $@ +- +-%: %.c +- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- #$(SSTRIP) $@ diff --git a/flx/remount/files/0.1.34-respect-CFLAGS-LDFLAGS.diff b/flx/remount/files/0.1.34-respect-CFLAGS-LDFLAGS.diff new file mode 100644 index 00000000..8ac81836 --- /dev/null +++ b/flx/remount/files/0.1.34-respect-CFLAGS-LDFLAGS.diff @@ -0,0 +1,15 @@ +diff --git a/include/rules.make b/include/rules.make +index f373aad..1f95cd1 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,8 +1,8 @@ + CC ?= gcc + +-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) ++CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-Wl,--gc-sections ++LDFLAGS += -Wl,--gc-sections + + all: $(OBJS) + diff --git a/flx/remount/files/0.1.34-warning-cast.diff b/flx/remount/files/0.1.34-warning-cast.diff new file mode 100644 index 00000000..97e86393 --- /dev/null +++ b/flx/remount/files/0.1.34-warning-cast.diff @@ -0,0 +1,23 @@ +diff --git a/remount/remountr.c b/remount/remountr.c +index 2a38f22..13c270d 100644 +--- a/remount/remountr.c ++++ b/remount/remountr.c +@@ -12,15 +12,15 @@ int main (int argc, char **argv) { + char *flag, *mntpnt; + + if (argv[0][strlen(argv[0])-1] == 'w') +- flag = wo_str; ++ flag = (char *)wo_str; + else +- flag = ro_str; ++ flag = (char *)ro_str; + + setreuid(0, 0); + if (argc > 1) + mntpnt = argv[1]; + else +- mntpnt = slash_str; ++ mntpnt = (char *)slash_str; + + return execl(mount_str, mount_str, flag, remount_str, mntpnt, NULL); + } diff --git a/flx/remount/files/0.1.34-warning-implicit-declaration.diff b/flx/remount/files/0.1.34-warning-implicit-declaration.diff new file mode 100644 index 00000000..ac469e99 --- /dev/null +++ b/flx/remount/files/0.1.34-warning-implicit-declaration.diff @@ -0,0 +1,11 @@ +diff --git a/remount/remountr.c b/remount/remountr.c +index f45c39a..2a38f22 100644 +--- a/remount/remountr.c ++++ b/remount/remountr.c +@@ -1,4 +1,6 @@ + #include <stdio.h> ++#include <string.h> ++#include <unistd.h> + + const char mount_str[] = "/bin/mount"; + const char remount_str[] = "remount"; diff --git a/flx/remount/remount-0.1.31.ebuild b/flx/remount/remount-0.1.31.ebuild new file mode 100644 index 00000000..296a32e6 --- /dev/null +++ b/flx/remount/remount-0.1.31.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 toolchain-funcs eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PV}-remove-strip-diet.diff + epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff + epatch "${FILESDIR}"/${PV}-warning-implicit-declaration.diff + epatch "${FILESDIR}"/${PV}-warning-cast.diff + + tc-export CC +} + +src_compile () +{ + emake -C remount +} + +src_install () +{ + dobin remount/remount{r,w} +} diff --git a/flx/remount/remount-0.1.34.ebuild b/flx/remount/remount-0.1.34.ebuild new file mode 100644 index 00000000..296a32e6 --- /dev/null +++ b/flx/remount/remount-0.1.34.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 toolchain-funcs eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PV}-remove-strip-diet.diff + epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff + epatch "${FILESDIR}"/${PV}-warning-implicit-declaration.diff + epatch "${FILESDIR}"/${PV}-warning-cast.diff + + tc-export CC +} + +src_compile () +{ + emake -C remount +} + +src_install () +{ + dobin remount/remount{r,w} +} diff --git a/flx/system-conf/Manifest b/flx/system-conf/Manifest new file mode 100644 index 00000000..e51fe536 --- /dev/null +++ b/flx/system-conf/Manifest @@ -0,0 +1 @@ +EBUILD system-conf-0.1.15.ebuild 514 RMD160 5cb00ef0275d67cda1dfd3a296961bc198e80c56 SHA1 38a4c5af1aade530a6f8d0b758f89b46ff7910e1 SHA256 871e208b8ebee9d51b3282a391a52d3b49dc2d1b2b7a5a998ce3a5441d07451e diff --git a/flx/system-conf/system-conf-0.1.15.ebuild b/flx/system-conf/system-conf-0.1.15.ebuild new file mode 100644 index 00000000..917f3203 --- /dev/null +++ b/flx/system-conf/system-conf-0.1.15.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/system-conf.git/" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/system-conf.git/" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_install () +{ + insinto /etc + doins etc/{fstab,group,ld.so.conf,mtab,nsswitch.conf,passwd,shadow} +} diff --git a/flx/wdd/Manifest b/flx/wdd/Manifest new file mode 100644 index 00000000..be3a3456 --- /dev/null +++ b/flx/wdd/Manifest @@ -0,0 +1,12 @@ +AUX 0.1.31-remove-strip-diet.diff 1553 SHA256 3b5235acff3fe732278548e5bf43098e46c3b96d3d1a5cc243e98b4447296f83 SHA512 01542bada430759c1c59e70b754f046f9c343b799b4639b6b06ea37d3c0dca7161371bfe5f0c851ce24bfa2eff44b0b9b3ce23745216c427cac3e53a89bfd760 WHIRLPOOL 9a92dac9535408916a07c54000a1cd9c50ff1f8b838851532a9b0ba78cf04034e2f59a9ba54bac3b1f7d76b52376be6dd9e06c7631bc05fbe5bda185a782a5b2 +AUX 0.1.31-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e SHA512 6b41a77f31c9805ff96e2b93b0e51af868dc7dfc227a305329ccf82d9afe43e21360ea54db630360b4a51264c6e5ddbba4d6a967f56705d0555aeaafb8b1bce0 WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2 +AUX 0.1.31-warning-cast.diff 812 SHA256 9c3aeafd401d0f2a4143d2b974bec506cb02de4d77d947f4cc0c70571a392926 SHA512 6e21000718aef1300af0160d382298e7164136c92242e1ac0b0b31b5de6ede7d55d98f0b462c42bb8a12a78449459c36ed3320191bae64b9464363f439214de0 WHIRLPOOL fedc910994fed6dec6a13a258540df4755b83b8601287f461db10d81b36c921967f96c72073fba315f95f3cf7c5128632a3cd99f1c94b21314544dec521de09a +AUX 0.1.31-warning-implicit-declaration.diff 378 SHA256 ea8b84942b0608fc29e9f0be3b6f7679c21ad9d56396e80f4ae55c24eef9cc6e SHA512 103119005560846fc7c07c6a78d975f0ab8817d24010307ee935a62e037265d3f5b02c4d6d2fb1382fba7a36d7cfaaa2daf9a750a0509bd37398abcdb30d77c8 WHIRLPOOL ab02aed0bdf75d5743331948a4c23f1b8a078ba89b81ddd2e405b6efced15421ceb8e1fb097810a42122949f637ff9166c4557b639bb530bd3b99a73e3a2c8a9 +AUX 0.1.34-remove-strip-diet.diff 1558 SHA256 16b19327d1c8487f3badefb2c5ad714f020b0fe805aeab2d1e500d61cb2b774b SHA512 b1e3c3a241f4a6544b870ac551d3ea48211ee9f1fde18b021e61176caf6058aed4d9c44712f479b2ae469b09bbf30906738cfb617a3c8a9c087a8657048b19fa WHIRLPOOL 819dac4e550c13ec6c7ba86bdb17d4525237c3fd1dc8275cbfd1c798b95c3f01bada25b66607ce63d94d56accd7b95d476376aa721dcd8a3275991bc989a067b +AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e SHA512 6b41a77f31c9805ff96e2b93b0e51af868dc7dfc227a305329ccf82d9afe43e21360ea54db630360b4a51264c6e5ddbba4d6a967f56705d0555aeaafb8b1bce0 WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2 +AUX 0.1.34-warning-cast.diff 812 SHA256 9c3aeafd401d0f2a4143d2b974bec506cb02de4d77d947f4cc0c70571a392926 SHA512 6e21000718aef1300af0160d382298e7164136c92242e1ac0b0b31b5de6ede7d55d98f0b462c42bb8a12a78449459c36ed3320191bae64b9464363f439214de0 WHIRLPOOL fedc910994fed6dec6a13a258540df4755b83b8601287f461db10d81b36c921967f96c72073fba315f95f3cf7c5128632a3cd99f1c94b21314544dec521de09a +AUX 0.1.34-warning-implicit-declaration.diff 378 SHA256 ea8b84942b0608fc29e9f0be3b6f7679c21ad9d56396e80f4ae55c24eef9cc6e SHA512 103119005560846fc7c07c6a78d975f0ab8817d24010307ee935a62e037265d3f5b02c4d6d2fb1382fba7a36d7cfaaa2daf9a750a0509bd37398abcdb30d77c8 WHIRLPOOL ab02aed0bdf75d5743331948a4c23f1b8a078ba89b81ddd2e405b6efced15421ceb8e1fb097810a42122949f637ff9166c4557b639bb530bd3b99a73e3a2c8a9 +AUX wdd.confd 63 SHA256 bd66a212cb55fdf74bf967917f5d5a68e08ab855d3b44a97d3a634da19da8d88 SHA512 e0044f0f926004352e4e60aa0c470366ca0c0476bfad4a342fc4817ac97d3e6d6aba820c152440720d4a5fbbeca1dda874ce778bcfae25a76a62e7fcd90e03c0 WHIRLPOOL ff4487a3e0c178de715361eb7be56899d1614e211751b041a529ed9f7d01519d164b67cb0a26c47a129bbeeafccc634f007c50706e67bc19e630e6caf46cd15c +AUX wdd.initd 413 SHA256 41b52446d2b513a945e84a12fc303d2b2c75e1f31c8ce33e1dde23d395947d17 SHA512 3a1657d9f029be07b83fff9332d9a58261e28b3094ca8dc1d9f40ac8bad0080917333895a8db540256379244f27a5fe3eae0ee26be1e54f4648656f2a9f5225f WHIRLPOOL d5dddf3b9dc4eb3ca779eff408861de85fcfd57f2f3f3233d97fb9292a97ecacb6243988b9a73582faeed9084c3f9e595a4ae143dd5d3bed529437bc0b37cde5 +EBUILD wdd-0.1.31.ebuild 825 SHA256 1a450d25647c16f8e0c92ad0f9f9204233c7fffbed35fdd2fabcfa4b12f06cca SHA512 7585d812305ff29bae02082c5e2b6cf1cb132dc39cb1ea5ca6f52fc6afbb11cfdc4a105442cffd83beaaa5a32f7424e08f40f934c708e832477f061baf0ee8b2 WHIRLPOOL 32ab6dd0e75c543355433e0e5b84dee1c8c6d9a5eb3d4164526aed15d0132f8753b8dd1bea6ee09aaf73c3db9311e01937157f8c7a16236efd8f24b75918ee51 +EBUILD wdd-0.1.34.ebuild 834 SHA256 d3ead45f874db35832f6c67129b79f1d16e51c733f2cd157c53afdca83e271c8 SHA512 b1223980c44c8b1348a83835585aa94a259764f47a123a068f1c89c2648ab39f1a0d1625ecd317e3e8fedfb5244d9befb7e869be82cb0b13cf45131536bf63db WHIRLPOOL e57e334bf7605a3c532201d93677f48f1d3c36e98e73baf8f2a6685d48d7e9229b35c8715e42e29fee6d1d29d4d65382a24a74e837a6409510df5b33634cc411 diff --git a/flx/wdd/files/0.1.31-remove-strip-diet.diff b/flx/wdd/files/0.1.31-remove-strip-diet.diff new file mode 100644 index 00000000..631c576f --- /dev/null +++ b/flx/wdd/files/0.1.31-remove-strip-diet.diff @@ -0,0 +1,50 @@ +diff --git a/include/rules.make b/include/rules.make +index 58d0af1..f373aad 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,30 +1,16 @@ + CC ?= gcc +-STRIP ?= strip +-OBJDUMP ?= objdump +-SSTRIP ?= sstrip +-DIET ?= diet +- +-CC_ORIG := $(CC) +-override CC := $(DIET) $(CC) + + CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-s -Wl,--gc-sections ++LDFLAGS=-Wl,--gc-sections + + all: $(OBJS) + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true +- -if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi + + %-debug: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true + + clean: + @rm -f *.[ao] *~ core +diff --git a/wd/Makefile b/wd/Makefile +index 58650df..e41685a 100644 +--- a/wd/Makefile ++++ b/wd/Makefile +@@ -1,9 +1,3 @@ + OBJS=wdd + include ../include/rules.make + CFLAGS+=-fomit-frame-pointer +- +-%: %.c +- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- sstrip $@ diff --git a/flx/wdd/files/0.1.31-respect-CFLAGS-LDFLAGS.diff b/flx/wdd/files/0.1.31-respect-CFLAGS-LDFLAGS.diff new file mode 100644 index 00000000..8ac81836 --- /dev/null +++ b/flx/wdd/files/0.1.31-respect-CFLAGS-LDFLAGS.diff @@ -0,0 +1,15 @@ +diff --git a/include/rules.make b/include/rules.make +index f373aad..1f95cd1 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,8 +1,8 @@ + CC ?= gcc + +-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) ++CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-Wl,--gc-sections ++LDFLAGS += -Wl,--gc-sections + + all: $(OBJS) + diff --git a/flx/wdd/files/0.1.31-warning-cast.diff b/flx/wdd/files/0.1.31-warning-cast.diff new file mode 100644 index 00000000..c4a1c7b8 --- /dev/null +++ b/flx/wdd/files/0.1.31-warning-cast.diff @@ -0,0 +1,30 @@ +diff --git a/wd/wdd.c b/wd/wdd.c +index c48758c..0519eb0 100644 +--- a/wd/wdd.c ++++ b/wd/wdd.c +@@ -9,6 +9,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/wait.h> ++#include <unistd.h> + + const char dev_wd_str[] = "/dev/watchdog"; /* standard entry */ + const char dev_misc_str[] = "/dev/misc/watchdog"; /* devfs entry */ +@@ -22,7 +23,7 @@ const char root_str[] = "/"; + static inline void try_malloc() { + void *heap; + +- heap = (void*)sbrk(NULL); ++ heap = sbrk(0); + if (brk(heap + 4096)) + exit(1); + memset(heap, 0, 4096); +@@ -56,7 +57,7 @@ static inline int try_stat(const char *file, int do_exit) { + void *heap; + int ret; + +- heap = (void*)sbrk(NULL); ++ heap = sbrk(0); + if (brk(heap + sizeof (struct stat))) + exit(1); + memset(heap, 0, sizeof (struct stat)); diff --git a/flx/wdd/files/0.1.31-warning-implicit-declaration.diff b/flx/wdd/files/0.1.31-warning-implicit-declaration.diff new file mode 100644 index 00000000..8839d1bc --- /dev/null +++ b/flx/wdd/files/0.1.31-warning-implicit-declaration.diff @@ -0,0 +1,14 @@ +diff --git a/wd/wdd.c b/wd/wdd.c +index 4468178..c48758c 100644 +--- a/wd/wdd.c ++++ b/wd/wdd.c +@@ -6,6 +6,9 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/wait.h> + + const char dev_wd_str[] = "/dev/watchdog"; /* standard entry */ + const char dev_misc_str[] = "/dev/misc/watchdog"; /* devfs entry */ diff --git a/flx/wdd/files/0.1.34-remove-strip-diet.diff b/flx/wdd/files/0.1.34-remove-strip-diet.diff new file mode 100644 index 00000000..166a3809 --- /dev/null +++ b/flx/wdd/files/0.1.34-remove-strip-diet.diff @@ -0,0 +1,50 @@ +diff --git a/include/rules.make b/include/rules.make +index 99bff82..f373aad 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,30 +1,16 @@ + CC ?= gcc +-STRIP ?= strip +-OBJDUMP ?= objdump +-SSTRIP ?= sstrip +-DIET ?= diet +- +-CC_ORIG := $(CC) +-override CC := $(DIET) $(CC) + + CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-s -Wl,--gc-sections ++LDFLAGS=-Wl,--gc-sections + + all: $(OBJS) + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true +- #-if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi + + %-debug: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true + + clean: + @rm -f *.[ao] *~ core +diff --git a/wd/Makefile b/wd/Makefile +index ed8a82c..e41685a 100644 +--- a/wd/Makefile ++++ b/wd/Makefile +@@ -1,9 +1,3 @@ + OBJS=wdd + include ../include/rules.make + CFLAGS+=-fomit-frame-pointer +- +-%: %.c +- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- #$(SSTRIP) $@ diff --git a/flx/wdd/files/0.1.34-respect-CFLAGS-LDFLAGS.diff b/flx/wdd/files/0.1.34-respect-CFLAGS-LDFLAGS.diff new file mode 100644 index 00000000..8ac81836 --- /dev/null +++ b/flx/wdd/files/0.1.34-respect-CFLAGS-LDFLAGS.diff @@ -0,0 +1,15 @@ +diff --git a/include/rules.make b/include/rules.make +index f373aad..1f95cd1 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,8 +1,8 @@ + CC ?= gcc + +-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) ++CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-Wl,--gc-sections ++LDFLAGS += -Wl,--gc-sections + + all: $(OBJS) + diff --git a/flx/wdd/files/0.1.34-warning-cast.diff b/flx/wdd/files/0.1.34-warning-cast.diff new file mode 100644 index 00000000..c4a1c7b8 --- /dev/null +++ b/flx/wdd/files/0.1.34-warning-cast.diff @@ -0,0 +1,30 @@ +diff --git a/wd/wdd.c b/wd/wdd.c +index c48758c..0519eb0 100644 +--- a/wd/wdd.c ++++ b/wd/wdd.c +@@ -9,6 +9,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/wait.h> ++#include <unistd.h> + + const char dev_wd_str[] = "/dev/watchdog"; /* standard entry */ + const char dev_misc_str[] = "/dev/misc/watchdog"; /* devfs entry */ +@@ -22,7 +23,7 @@ const char root_str[] = "/"; + static inline void try_malloc() { + void *heap; + +- heap = (void*)sbrk(NULL); ++ heap = sbrk(0); + if (brk(heap + 4096)) + exit(1); + memset(heap, 0, 4096); +@@ -56,7 +57,7 @@ static inline int try_stat(const char *file, int do_exit) { + void *heap; + int ret; + +- heap = (void*)sbrk(NULL); ++ heap = sbrk(0); + if (brk(heap + sizeof (struct stat))) + exit(1); + memset(heap, 0, sizeof (struct stat)); diff --git a/flx/wdd/files/0.1.34-warning-implicit-declaration.diff b/flx/wdd/files/0.1.34-warning-implicit-declaration.diff new file mode 100644 index 00000000..8839d1bc --- /dev/null +++ b/flx/wdd/files/0.1.34-warning-implicit-declaration.diff @@ -0,0 +1,14 @@ +diff --git a/wd/wdd.c b/wd/wdd.c +index 4468178..c48758c 100644 +--- a/wd/wdd.c ++++ b/wd/wdd.c +@@ -6,6 +6,9 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <stdlib.h> ++#include <string.h> ++#include <sys/wait.h> + + const char dev_wd_str[] = "/dev/watchdog"; /* standard entry */ + const char dev_misc_str[] = "/dev/misc/watchdog"; /* devfs entry */ diff --git a/flx/wdd/files/wdd.confd b/flx/wdd/files/wdd.confd new file mode 100644 index 00000000..29635f06 --- /dev/null +++ b/flx/wdd/files/wdd.confd @@ -0,0 +1,2 @@ +NICE="10" +WATCH_FILES="/ /dev/watchdog /proc/self/root /tmp/." diff --git a/flx/wdd/files/wdd.initd b/flx/wdd/files/wdd.initd new file mode 100755 index 00000000..b7b531aa --- /dev/null +++ b/flx/wdd/files/wdd.initd @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +depend() { + need localmount +} + +start() { + ebegin "Starting wdd" + start-stop-daemon --start --quiet --nicelevel ${NICE:-10} \ + --exec /sbin/wdd -- ${WATCH_FILES} + eend ${?} +} + +stop() { + ebegin "Stopping wdd" + start-stop-daemon --stop --retry 5 --exec /sbin/wdd + eend ${?} +} diff --git a/flx/wdd/wdd-0.1.31.ebuild b/flx/wdd/wdd-0.1.31.ebuild new file mode 100644 index 00000000..4e98545d --- /dev/null +++ b/flx/wdd/wdd-0.1.31.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PV}-remove-strip-diet.diff + epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff + epatch "${FILESDIR}"/${PV}-warning-implicit-declaration.diff + epatch "${FILESDIR}"/${PV}-warning-cast.diff + + tc-export CC +} + +src_compile () +{ + emake -C wd +} + +src_install () +{ + into / + dosbin wd/wdd + doman wd/wdd.8 + + newinitd ${FILESDIR}/wdd.initd wdd + newconfd ${FILESDIR}/wdd.confd wdd +} diff --git a/flx/wdd/wdd-0.1.34.ebuild b/flx/wdd/wdd-0.1.34.ebuild new file mode 100644 index 00000000..d791b650 --- /dev/null +++ b/flx/wdd/wdd-0.1.34.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit git-2 eutils + +DESCRIPTION="Formilux Tools" +HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 mips arm" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_prepare () +{ + epatch "${FILESDIR}"/${PV}-remove-strip-diet.diff + epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff + epatch "${FILESDIR}"/${PV}-warning-implicit-declaration.diff + epatch "${FILESDIR}"/${PV}-warning-cast.diff + + tc-export CC +} + +src_compile () +{ + emake -C wd +} + +src_install () +{ + into / + dosbin wd/wdd + doman wd/wdd.8 + + newinitd ${FILESDIR}/wdd.initd wdd + newconfd ${FILESDIR}/wdd.confd wdd +} |