silv3rr · silv3rr · Nov 8, 2014 · Sep 15, 2015 · Sep 15, 2015 · Apr 6, 2017
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,26 @@
 *.exe
 *.out
 *.app
+
+simple_entry
+entry
+datanode
+*.pid
+nfocleaner
+foo-nukes
+foo-pre
+mp3info
+foo-reset
+createsfv
+blehsfv
+lfrtest
+spy
+webspy
+zipcheck
+
+Makefile
+config.h
+config.status
+config.cache
+config.log
+
diff --git a/README.1st b/README.1st
@@ -0,0 +1,65 @@
+
+Welcome to foo-tools. Good to see that you managed to download it ;-).
+======================================================================
+
+This is the first file you should be reading after downloading, it
+contains the very basics of getting you started, so be sure to read
+it all, top to bottom.
+
+
+License:
+--------
+
+foo-tools is free software, licensed under the GPL. Please take a
+few minutes to read through the included LICENSE.txt to learn about
+what this means, since we are strong believers of free software, and
+do not tolerate violations.
+
+
+Requirements:
+-------------
+
+foo-tools does not require glftpd, but many of the tools are specific
+to glftpd, and will not work without it.
+
+Also, since the tools have been developed on Linux, some will not
+work under other OSs.  Most are known to be working under FreeBSD
+with minor or no changes (mainly changing 'make' to 'gmake' in the
+Makefiles). If someone have the skills/time to fix the portability
+issues, please let us know.
+
+
+Organization:
+-------------
+
+* The tools, look at the src/ catalog. You can run the './configure'
+  script followed by 'make' to build.
+
+* Documentation, look in the doc/ catalog.
+
+* Older stuff, look in the unsorted-older/ catalog.
+
+* Not 100% finished but running, look in the testing/ catalog.
+  You are not adviced to use these, but if you have guts be my
+  guest :-).  Some are running well, but just not well-documented
+  for release.
+
+
+Bugs/improvements:
+------------------
+
+If you find bugs (yes, they are there for sure), or have ideas for
+improvements, you are ofcause entitled to fix/improve by yourself,
+but it would be highly appreciated, if you would follow the spirit
+of foo-tools, and either send us patches, or make them available for
+download.
+
+If you do are not a programmer, but got this great idea that just
+fits so well into foo-tools, you can also tell us about it, and ask
+us to implement it. If we have enough sparetime and the idea is good,
+maybe we will do it ;-).
+
+
+
+Enjoy, Tanesha Team, <[email protected]>
+
diff --git a/README.md b/README.md
@@ -1,65 +1,26 @@
+# foo-tools updates
 
-Welcome to foo-tools. Good to see that you managed to download it ;-).
-======================================================================
+- updates/fixes from https://github.com/glftpd/foo-tools
+- Makefiles updated
+- foo-pre has mp3 genre in PRE line (no module needed)
 
-This is the first file you should be reading after downloading, it
-contains the very basics of getting you started, so be sure to read
-it all, top to bottom.
+## Documentation:
 
+- [README.1st](README.1st) Original README file
+- [src/CHANGES](src/CHANGES) CHANGELOG
+- [src/README.1st](src/README.1st) Building instructions
+- [doc](doc) Documentation on installing/running the programs
+- [README.mp3genre](src/pre/README.mp3genre) mp3genre specific README (install/configure)
 
-License:
---------
+## TODO:
 
-foo-tools is free software, licensed under the GPL. Please take a
-few minutes to read through the included LICENSE.txt to learn about
-what this means, since we are strong believers of free software, and
-do not tolerate violations.
+### foo-pre
+- [X] switch from mp3genre to master branch
+- [X] add option in pre.cfg disable genre completely(?)
+- [ ] replace pre/mp3genre by pzs-ng code or other id3 lib instead
+- [X] change bytes to mb/gb: "Totals of this pre for announce: 3F 28734928B"
+- [ ] FLAC support?
 
-
-Requirements:
--------------
-
-foo-tools does not require glftpd, but many of the tools are specific
-to glftpd, and will not work without it.
-
-Also, since the tools have been developed on Linux, some will not
-work under other OSs.  Most are known to be working under FreeBSD
-with minor or no changes (mainly changing 'make' to 'gmake' in the
-Makefiles). If someone have the skills/time to fix the portability
-issues, please let us know.
-
-
-Organization:
--------------
-
-* The tools, look at the src/ catalog. You can run the './configure'
-  script followed by 'make' to build.
-
-* Documentation, look in the doc/ catalog.
-
-* Older stuff, look in the unsorted-older/ catalog.
-
-* Not 100% finished but running, look in the testing/ catalog.
-  You are not adviced to use these, but if you have guts be my
-  guest :-).  Some are running well, but just not well-documented
-  for release.
-
-
-Bugs/improvements:
-------------------
-
-If you find bugs (yes, they are there for sure), or have ideas for
-improvements, you are ofcause entitled to fix/improve by yourself,
-but it would be highly appreciated, if you would follow the spirit
-of foo-tools, and either send us patches, or make them available for
-download.
-
-If you do are not a programmer, but got this great idea that just
-fits so well into foo-tools, you can also tell us about it, and ask
-us to implement it. If we have enough sparetime and the idea is good,
-maybe we will do it ;-).
-
-
-
-Enjoy, Tanesha Team, <[email protected]>
+### spy
+- [ ] look into libhttpd.h since it's LGPL now (http://www.hughes.com.au/products/libhttpd)
 
diff --git a/src/CHANGES b/src/CHANGES
@@ -71,3 +71,21 @@ Nov  1 2011: * Fixed mktime timeout on configure (thks to peakz)
              * Added a little help file.
 Nov  2 2011: * Fixed a bug about "you're not in any of your predir" :)
 Mar 31 2013: * Fixed a strncpy bug while resolving links on x64 env. which lead to a "destination section's path doesnt exist" (overflow).
+
+Nov  2 2013: * compilation fixes
+Nov 16 2013: * deleted some generated files and update configure
+Mar  9 2014: * added current mp3info version
+Mar  9 2014: * added stack protection flags to compilation
+
+//slv
+Aug 08 2012: * MP3 genre added to PRE output (instead of in mod_idmp3)
+Apr 09 2017: * cleaned up files
+Apr 09 2017: * created makefile for mp3genre, fixed a few compiler warnings
+Apr 09 2017: * merged commits 2014/15 commits from glftpd/foo-tools.git
+Apr 09 2017: * updated mp3 genres from pzs-ng/zipscript/src/multimedia.c
+
+
+//glftpd-scripts
+Nov  8 2014: * add calendar weeks for pre, fix typo, add CW/KW as macro for dated pre-dirs
+Sep 15 2015: * fix compile warning
+
diff --git a/src/Makefile.config b/src/Makefile.config
@@ -10,7 +10,7 @@ INSTALL = install -m755 -o root -g root
 
 ## these prolly doesnt need to be changed.
 
-CC = gcc -O0 -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-all -DSSP 
+CC = gcc -O0 -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-all -DSSP
 
 ## these should not be changed.
 

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -12,6 +12,7 @@ help:
 	@echo Available targets:
 	@echo "  make build     - builds most."
 	@echo "  make show      - shows build binaries."
+	@echo "  make foobnc    - makes foobnc."
 	@echo "  make webspy    - makes webspy."
 	@echo "  make clean     - cleans."
 
@@ -26,6 +27,9 @@ show:
 	@size bouncer/simple_entry nfo/nfocleaner nukes/foo-nukes pre/foo-pre \
 	reset/foo-reset sfv/blehsfv sfv/createsfv who/spy who/webspy
 
+foobnc: foobnc
+	(cd bouncer; make foobnc)
+
 webspy: build
 	(cd who; make webspy)
 
@@ -36,8 +40,8 @@ clean:
 
 distclean: clean
 	/bin/rm -f Makefile config.h config.status config.cache config.log
-	@for dir in ${DIRS}; do \
-	  (cd $$dir && $(MAKE) distclean) \
-	  || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
+#	@for dir in ${DIRS}; do \
+#	  (cd $$dir && $(MAKE) distclean) \
+#	  || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+#	done && test -z "$$fail"
 
diff --git a/src/bouncer/Makefile b/src/bouncer/Makefile
diff --git a/src/bouncer/Makefile.in b/src/bouncer/Makefile.in
@@ -22,7 +22,8 @@ FOOBNCOBJS = foobnc.o $(GENOBJS) ../util/linereaderbuffer.o hammerprotect.o
 #DEFS = -DADMINPORT
 SRCDIR = .. -I/usr/local/lib
 
-all:	foobnc
+#all:	foobnc
+all:
 
 
 foobnc: $(FOOBNCOBJS)

diff --git a/src/checker/Makefile b/src/checker/Makefile
diff --git a/src/collection/Makefile b/src/collection/Makefile
diff --git a/src/configure b/src/configure
@@ -5535,7 +5535,7 @@ fi
 done
 
 
-ac_config_files="$ac_config_files Makefile bouncer/Makefile checker/Makefile collection/Makefile lib/Makefile nfo/Makefile nukes/Makefile pre/Makefile pre/modules/Makefile reset/Makefile sfv/Makefile thread/Makefile unzip/Makefile util/Makefile who/Makefile zip/Makefile"
+ac_config_files="$ac_config_files Makefile bouncer/Makefile checker/Makefile collection/Makefile lib/Makefile nfo/Makefile nukes/Makefile pre/Makefile pre/mp3genre/Makefile pre/modules/Makefile reset/Makefile sfv/Makefile thread/Makefile unzip/Makefile util/Makefile who/Makefile zip/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6240,6 +6240,7 @@ do
     "nfo/Makefile") CONFIG_FILES="$CONFIG_FILES nfo/Makefile" ;;
     "nukes/Makefile") CONFIG_FILES="$CONFIG_FILES nukes/Makefile" ;;
     "pre/Makefile") CONFIG_FILES="$CONFIG_FILES pre/Makefile" ;;
+    "pre/mp3genre/Makefile") CONFIG_FILES="$CONFIG_FILES pre/mp3genre/Makefile" ;;
     "pre/modules/Makefile") CONFIG_FILES="$CONFIG_FILES pre/modules/Makefile" ;;
     "reset/Makefile") CONFIG_FILES="$CONFIG_FILES reset/Makefile" ;;
     "sfv/Makefile") CONFIG_FILES="$CONFIG_FILES sfv/Makefile" ;;

diff --git a/src/lib/Makefile b/src/lib/Makefile
diff --git a/src/nfo/Makefile b/src/nfo/Makefile