* backport [13042]

extras/contrib/src/Makefile

@@ -1014,6 +1014,7 @@ libcddb-$(CDDB_VERSION).tar.gz:
 
 libcddb: libcddb-$(CDDB_VERSION).tar.gz
 	$(EXTRACT_GZ)
+	patch -p 0 < Patches/libcddb.patch
 
 .cddb: libcddb
 	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)

extras/contrib/src/Patches/libcddb.patch

+diff -ruN libcddb.orig/include/cddb/cddb_regex.h libcddb/include/cddb/cddb_regex.h
+--- libcddb.orig/include/cddb/cddb_regex.h	Fri Oct 15 21:42:08 2004
++++ libcddb/include/cddb/cddb_regex.h	Tue Jan 18 01:57:50 2005
+@@ -30,9 +30,7 @@
+ #include <cddb/cddb_config.h>
+ #include <stdlib.h>
+ 
+-#ifdef CDDB_NEED_UNISTD_H
+ #include <unistd.h>
+-#endif
+ #include <regex.h>
+ 
+ /**