diff options
| author |   Chris White <chriswhite@gentoo.org> | 2005-12-11 03:03:22 +0000 |
|---|---|---|
| committer | Chris White <chriswhite@gentoo.org> | 2005-12-11 03:03:22 +0000 |
| commit | 0c73328658546093690a3f0cf819f14d49c43d1d (patch) | |
| tree | 1014c226204c3ee3cee0f69c4c2d69ddca1c1de3 /net-analyzer/mwcollect/files | |
| parent | Remove generated/unused mime.types to fix bug 108200. Fix enewgroup/enewuser ... (diff) | |
| download | gentoo-2-0c73328658546093690a3f0cf819f14d49c43d1d.tar.gz gentoo-2-0c73328658546093690a3f0cf819f14d49c43d1d.tar.bz2 gentoo-2-0c73328658546093690a3f0cf819f14d49c43d1d.zip | |
Version bump. Thanks to upstream for letting me know.
(Portage version: 2.0.53)
Diffstat (limited to 'net-analyzer/mwcollect/files')
4 files changed, 82 insertions, 0 deletions
diff --git a/net-analyzer/mwcollect/files/digest-mwcollect-3.0.1 b/net-analyzer/mwcollect/files/digest-mwcollect-3.0.1 new file mode 100644 index 000000000000..65de69ff9ad5 --- /dev/null +++ b/net-analyzer/mwcollect/files/digest-mwcollect-3.0.1 @@ -0,0 +1 @@ +MD5 b8840504618bf1e8686e1f2e3a2ecc37 mwcollect-3.0.1.tar.bz2 58559 diff --git a/net-analyzer/mwcollect/files/mwcollect-3.0.1-capacity.patch b/net-analyzer/mwcollect/files/mwcollect-3.0.1-capacity.patch new file mode 100644 index 000000000000..880f14fbd601 --- /dev/null +++ b/net-analyzer/mwcollect/files/mwcollect-3.0.1-capacity.patch @@ -0,0 +1,11 @@ +--- src/core/mwcollect.cpp.old 2005-11-01 01:51:39.000000000 +0900 ++++ src/core/mwcollect.cpp 2005-11-01 01:51:52.000000000 +0900 +@@ -284,7 +284,7 @@ + #ifdef LINUX_FLAVOURED + { // we still may need to bind ports < 1024 / create raw sockets + cap_t capCapabilities = cap_init(); +- cap_value_t cvValues[] = { CAP_NET_RAW, CAP_NET_BIND_SERVICE, }; ++ cap_value_t cvValues[] = { CAP_NET_RAW, CAP_NET_BIND_SERVICE, CAP_SETUID, }; + + cap_set_flag(capCapabilities, CAP_PERMITTED, sizeof(cvValues) / sizeof(cap_value_t), cvValues, CAP_SET); + cap_set_flag(capCapabilities, CAP_INHERITABLE, sizeof(cvValues) / sizeof(cap_value_t), cvValues, CAP_SET); diff --git a/net-analyzer/mwcollect/files/mwcollect-3.0.1-modules.patch b/net-analyzer/mwcollect/files/mwcollect-3.0.1-modules.patch new file mode 100644 index 000000000000..0edb8fecf20e --- /dev/null +++ b/net-analyzer/mwcollect/files/mwcollect-3.0.1-modules.patch @@ -0,0 +1,59 @@ +Index: mwcollect3/trunk/src/core/mwcollect.cpp
+===================================================================
+--- mwcollect3/trunk/src/core/mwcollect.cpp (revision 250)
++++ mwcollect3/trunk/src/core/mwcollect.cpp (revision 251)
+@@ -246,4 +246,14 @@
+ }
+
++ if(!pCollector->start())
++ {
++ g_pLogManager->log(LT_LEVEL_CRITICAL | LT_STATUS, "Startup failed, aborting!");
++
++ delete pCollector;
++ delete g_pLogManager;
++
++ return -1;
++ }
++
+ if(szChuid)
+ { // needs to be done before chrooting
+@@ -285,4 +295,5 @@
+ if(szChuid)
+ {
++ DEBUG("Changing UID to %s (%i) %s setting capabilties.", szChuid, (int) uid, bCaps ? "with" : "without");
+
+ #ifdef LINUX_FLAVOURED
+@@ -313,14 +324,4 @@
+ }
+
+- if(!pCollector->start())
+- {
+- g_pLogManager->log(LT_LEVEL_CRITICAL | LT_STATUS, "Startup failed, aborting!");
+-
+- delete pCollector;
+- delete g_pLogManager;
+-
+- return -1;
+- }
+-
+ if(bDaemon && (pid = fork()))
+ {
+Index: mwcollect3/trunk/src/log-file/log-file.cpp
+===================================================================
+--- mwcollect3/trunk/src/log-file/log-file.cpp (revision 134)
++++ mwcollect3/trunk/src/log-file/log-file.cpp (revision 251)
+@@ -7,4 +7,7 @@
+
+ #include "log-file.h"
++
++#include <errno.h>
++#include <string.h>
+
+
+@@ -41,5 +44,5 @@
+ if(!(pFile = fopen(szFileName, "at")))
+ {
+- LOG(LT_LEVEL_CRITICAL | LT_STATUS, "Could not open logfile \"%s\" for writing!", szFileName);
++ LOG(LT_LEVEL_CRITICAL | LT_STATUS, "Could not open logfile \"%s\" for writing: %s!", szFileName, strerror(errno));
+ return false;
+ }
diff --git a/net-analyzer/mwcollect/files/mwcollect-3.0.1-pic.patch b/net-analyzer/mwcollect/files/mwcollect-3.0.1-pic.patch new file mode 100644 index 000000000000..be093efbaab9 --- /dev/null +++ b/net-analyzer/mwcollect/files/mwcollect-3.0.1-pic.patch @@ -0,0 +1,11 @@ +--- Makefile.MODULE.old 2005-12-11 10:52:56.000000000 +0900 ++++ Makefile.MODULE 2005-12-11 10:54:21.000000000 +0900 +@@ -43,7 +43,7 @@ + + $(MODULE_LIBRARY): $(MODULE_OBJ) + echo '[M] $@' +- $(CXX) $(CXXFLAGS) -o $@ -shared $(MODULE_OBJ) $(LDFLAGS) ++ $(CXX) $(CXXFLAGS) -o $@ -shared -fPIC $(MODULE_OBJ) $(LDFLAGS) + + $(SOURCE_DIRECTORY)/%.o: $(SOURCE_DIRECTORY)/%.cpp + echo '[C] $<' |