From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 15 Jul 2014 13:00:17 +0000 (+0000)
Subject: Mirror fix from trunk for STR #4452.
X-Git-Tag: release-2.1.4~16^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbd45c3e08b47b82fe39f607fbe5c3eb1ca0aaa4;p=thirdparty%2Fcups.git

Mirror fix from trunk for STR #4452.

Bump version to 1.7.5.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@12025 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 26076645f6..9fd62a0731 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
-CHANGES.txt - 1.7.4 - 2014-07-08
+CHANGES.txt - 1.7.4 - 2014-07-15
 --------------------------------
 
+CHANGES IN CUPS V1.7.5
+
+	- The LPD backend did not work with some versions of glibc (STR #4452)
+
+
 CHANGES IN CUPS V1.7.4
 
 	- Security: The web interface incorrectly served symlinked files and
@@ -25,7 +30,6 @@ CHANGES IN CUPS V1.7.4
 	- Fixed a bug in the CUPS_SC_GET_DEVICE_ID handling by the network
 	  backends (STR #4447)
 	- Added USB quirk rule for Lexmark E230 (STR #4448)
-	- The LPD backend did not work with some versions of glibc (STR #4452)
 
 
 CHANGES IN CUPS V1.7.3
diff --git a/backend/lpd.c b/backend/lpd.c
index 92f2430157..17e31fe5ac 100644
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -1276,7 +1276,7 @@ rresvport_af(int *port,			/* IO - Port number to bind to */
     * Try binding the port to the socket; return if all is OK...
     */
 
-    if (!bind(fd, (struct sockaddr *)&addr, httpAddrSize(&addr)))
+    if (!bind(fd, (struct sockaddr *)&addr, httpAddrLength(&addr)))
       return (fd);
 
    /*
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 57e6a06364..884165aaff 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION="1.7.4"
+CUPS_VERSION="1.7.5"
 CUPS_REVISION=""
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
diff --git a/cups/cups.h b/cups/cups.h
index 8dc20fdeba..76a0614a47 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -49,10 +49,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION			1.0704
+#  define CUPS_VERSION			1.0705
 #  define CUPS_VERSION_MAJOR		1
 #  define CUPS_VERSION_MINOR		7
-#  define CUPS_VERSION_PATCH		4
+#  define CUPS_VERSION_PATCH		5
 
 #  define CUPS_BC_FD			3
 					/* Back-channel file descriptor for