Updating all commits from forked branch

GNUmakefile

@@ -1,12 +1,14 @@
 # GNUmakefile
-# 
+#
 # Copyright 2008 Bryan Ischo <bryan@ischo.com>
-# 
+#
 # This file is part of libs3.
-# 
+#
 # libs3 is free software: you can redistribute it and/or modify it under the
 # terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, version 3 of the License.
+# Software Foundation, version 3 or above of the License.  You can also
+# redistribute and/or modify it under the terms of the GNU General Public
+# License, version 2 or above of the License.
 #
 # In addition, as a special exception, the copyright holders give
 # permission to link the code of this library and its programs with the
@@ -20,6 +22,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # version 3 along with libs3, in a file named COPYING.  If not, see
 # <http://www.gnu.org/licenses/>.
+#
+# You should also have received a copy of the GNU General Public License
+# version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 # I tried to use the autoconf/automake/autolocal/etc (i.e. autohell) tools
 # but I just couldn't stomach them.  Since this is a Makefile for POSIX
@@ -38,8 +44,8 @@
 # --------------------------------------------------------------------------
 # Set libs3 version number, unless it is already set.
 
-LIBS3_VER_MAJOR ?= 2
-LIBS3_VER_MINOR ?= 0
+LIBS3_VER_MAJOR ?= 4
+LIBS3_VER_MINOR ?= 1
 LIBS3_VER := $(LIBS3_VER_MAJOR).$(LIBS3_VER_MINOR)
 
 
@@ -119,6 +125,9 @@ ifndef LIBXML2_CFLAGS
     LIBXML2_CFLAGS := $(shell xml2-config --cflags)
 endif
 
+ifndef OPENSSL_LIBS
+    OPENSSL_LIBS := -lssl -lcrypto
+endif
 
 # --------------------------------------------------------------------------
 # These CFLAGS assume a GNU compiler.  For other compilers, write a script
@@ -133,7 +142,7 @@ ifndef CFLAGS
     endif
 endif
 
-CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
+CFLAGS += -Wall -Wshadow -Wextra -Iinc \
           $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \
           -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \
           -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \
@@ -142,7 +151,10 @@ CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
           -D_ISOC99_SOURCE \
           -D_POSIX_C_SOURCE=200112L
 
-LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread
+LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) -lpthread
+
+STRIP ?= strip
+INSTALL := install --strip-program=$(STRIP)
 
 
 # --------------------------------------------------------------------------
@@ -156,7 +168,7 @@ all: exported test
 # Exported targets are the library and driver program
 
 .PHONY: exported
-exported: libs3 s3 headers
+exported: libs3 s3 s3-static headers
 
 
 # --------------------------------------------------------------------------
@@ -165,11 +177,11 @@ exported: libs3 s3 headers
 .PHONY: install
 install: exported
 	$(QUIET_ECHO) $(DESTDIR)/bin/s3: Installing executable
-	$(VERBOSE_SHOW) install -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 \
+	$(VERBOSE_SHOW) $(INSTALL) -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 \
                     $(DESTDIR)/bin/s3
 	$(QUIET_ECHO) \
         $(LIBDIR)/libs3.so.$(LIBS3_VER): Installing shared library
-	$(VERBOSE_SHOW) install -Dps -m u+rw,go+r \
+	$(VERBOSE_SHOW) $(INSTALL) -Dps -m u+rw,go+r \
                $(BUILD)/lib/libs3.so.$(LIBS3_VER_MAJOR) \
                $(LIBDIR)/libs3.so.$(LIBS3_VER)
 	$(QUIET_ECHO) \
@@ -179,10 +191,10 @@ install: exported
 	$(QUIET_ECHO) $(LIBDIR)/libs3.so: Linking shared library
 	$(VERBOSE_SHOW) ln -sf libs3.so.$(LIBS3_VER_MAJOR) $(LIBDIR)/libs3.so
 	$(QUIET_ECHO) $(LIBDIR)/libs3.a: Installing static library
-	$(VERBOSE_SHOW) install -Dp -m u+rw,go+r $(BUILD)/lib/libs3.a \
+	$(VERBOSE_SHOW) $(INSTALL) -Dp -m u+rw,go+r $(BUILD)/lib/libs3.a \
                     $(LIBDIR)/libs3.a
 	$(QUIET_ECHO) $(DESTDIR)/include/libs3.h: Installing header
-	$(VERBOSE_SHOW) install -Dp -m u+rw,go+r $(BUILD)/include/libs3.h \
+	$(VERBOSE_SHOW) $(INSTALL) -Dp -m u+rw,go+r $(BUILD)/include/libs3.h \
                     $(DESTDIR)/include/libs3.h
 
 
@@ -218,7 +230,7 @@ $(BUILD)/obj/%.do: src/%.c
 	@ $(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
         -o $(BUILD)/dep/$(<:%.c=%.dd) -c $<
 	@ mkdir -p $(dir $@)
-	$(VERBOSE_SHOW) $(CC) $(CFLAGS) -fpic -fPIC -o $@ -c $< 
+	$(VERBOSE_SHOW) $(CC) $(CFLAGS) -fpic -fPIC -o $@ -c $<
 
 
 # --------------------------------------------------------------------------
@@ -230,7 +242,7 @@ LIBS3_STATIC = $(BUILD)/lib/libs3.a
 .PHONY: libs3
 libs3: $(LIBS3_SHARED) $(LIBS3_STATIC)
 
-LIBS3_SOURCES := acl.c bucket.c error_parser.c general.c \
+LIBS3_SOURCES := bucket.c bucket_metadata.c error_parser.c general.c \
                  object.c request.c request_context.c \
                  response_headers_handler.c service_access_logging.c \
                  service.c simplexml.c util.c multipart.c
@@ -252,12 +264,17 @@ $(LIBS3_STATIC): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.o)
 
 .PHONY: s3
 s3: $(BUILD)/bin/s3
+s3-static: $(BUILD)/bin/s3-static
 
 $(BUILD)/bin/s3: $(BUILD)/obj/s3.o $(LIBS3_SHARED)
 	$(QUIET_ECHO) $@: Building executable
 	@ mkdir -p $(dir $@)
 	$(VERBOSE_SHOW) $(CC) -o $@ $^ $(LDFLAGS)
 
+$(BUILD)/bin/s3-static: $(BUILD)/obj/s3.o $(LIBS3_STATIC)
+	$(QUIET_ECHO) $@: Building static executable
+	@ mkdir -p $(dir $@)
+	$(VERBOSE_SHOW) $(CC) -o $@ $^ $(LDFLAGS)
 
 # --------------------------------------------------------------------------
 # libs3 header targets

GNUmakefile.mingw

@@ -1,12 +1,12 @@
 # GNUmakefile.mingw
-# 
-# Copyright 2008 Bryan Ischo <bryan@ischo.com>
-# 
+#
 # This file is part of libs3.
-# 
+#
 # libs3 is free software: you can redistribute it and/or modify it under the
 # terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, version 3 of the License.
+# Software Foundation, version 3 or above of the License.  You can also
+# redistribute and/or modify it under the terms of the GNU General Public
+# License, version 2 or above of the License.
 #
 # In addition, as a special exception, the copyright holders give
 # permission to link the code of this library and its programs with the
@@ -20,6 +20,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # version 3 along with libs3, in a file named COPYING.  If not, see
 # <http://www.gnu.org/licenses/>.
+#
+# You should also have received a copy of the GNU General Public License
+# version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 # I tried to use the autoconf/automake/autolocal/etc (i.e. autohell) tools
 # but I just couldn't stomach them.  Since this is a Makefile for POSIX
@@ -38,8 +42,8 @@
 # --------------------------------------------------------------------------
 # Set libs3 version number, unless it is already set.
 
-LIBS3_VER_MAJOR ?= 2
-LIBS3_VER_MINOR ?= 0
+LIBS3_VER_MAJOR ?= 4
+LIBS3_VER_MINOR ?= 1
 LIBS3_VER := $(LIBS3_VER_MAJOR).$(LIBS3_VER_MINOR)
 
 
@@ -212,7 +216,7 @@ LIBS3_STATIC = $(BUILD)/lib/libs3.a
 .PHONY: libs3
 libs3: $(LIBS3_SHARED) $(BUILD)/lib/libs3.a
 
-LIBS3_SOURCES := src/acl.c src/bucket.c src/error_parser.c src/general.c \
+LIBS3_SOURCES := src/bucket.c src/bucket_metadata.c src/error_parser.c src/general.c \
                  src/object.c src/request.c src/request_context.c \
                  src/response_headers_handler.c src/service_access_logging.c \
                  src/service.c src/simplexml.c src/util.c src/multipart.c \

GNUmakefile.osx

@@ -1,12 +1,12 @@
 # GNUmakefile.osx
-# 
-# Copyright 2008 Bryan Ischo <bryan@ischo.com>
-# 
+#
 # This file is part of libs3.
-# 
+#
 # libs3 is free software: you can redistribute it and/or modify it under the
 # terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation, version 3 of the License.
+# Software Foundation, version 3 or above of the License.  You can also
+# redistribute and/or modify it under the terms of the GNU General Public
+# License, version 2 or above of the License.
 #
 # In addition, as a special exception, the copyright holders give
 # permission to link the code of this library and its programs with the
@@ -20,6 +20,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # version 3 along with libs3, in a file named COPYING.  If not, see
 # <http://www.gnu.org/licenses/>.
+#
+# You should also have received a copy of the GNU General Public License
+# version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+# <http://www.gnu.org/licenses/>.
 
 # I tried to use the autoconf/automake/autolocal/etc (i.e. autohell) tools
 # but I just couldn't stomach them.  Since this is a Makefile for POSIX
@@ -38,8 +42,8 @@
 # --------------------------------------------------------------------------
 # Set libs3 version number, unless it is already set.
 
-LIBS3_VER_MAJOR ?= 2
-LIBS3_VER_MINOR ?= 0
+LIBS3_VER_MAJOR ?= 4
+LIBS3_VER_MINOR ?= 1
 LIBS3_VER := $(LIBS3_VER_MAJOR).$(LIBS3_VER_MINOR)
 
 
@@ -102,6 +106,9 @@ endif
 
 ifndef LIBXML2_LIBS
     LIBXML2_LIBS := $(shell xml2-config --libs)
+    # Work around missing libsystem_symptoms.dylib in Xcode 8; see
+    # http://stackoverflow.com/questions/39536144/libsystem-symptoms-dylib-missing-in-xcode-8
+    LIBXML2_LIBS := $(filter-out -L$(shell xcrun --show-sdk-path)/usr/lib, $(LIBXML2_LIBS))
 endif
 
 ifndef LIBXML2_CFLAGS
@@ -122,7 +129,12 @@ ifndef CFLAGS
     endif
 endif
 
-CFLAGS += -Wall -Werror -Wshadow -Wextra -Iinc \
+# --------------------------------------------------------------------------
+# -Werror breaks the build on the macOS Sierra rendering build unusable 
+# so we use -Wunused-parameter flag instead that will only issue a warning
+# with the newest clang compiler
+
+CFLAGS += -Wall -Wunused-parameter -Wshadow -Wextra -Iinc \
           $(CURL_CFLAGS) $(LIBXML2_CFLAGS) \
           -DLIBS3_VER_MAJOR=\"$(LIBS3_VER_MAJOR)\" \
           -DLIBS3_VER_MINOR=\"$(LIBS3_VER_MINOR)\" \
@@ -208,7 +220,7 @@ $(BUILD)/obj/%.do: src/%.c
 	@ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \
         -o $(BUILD)/dep/$(<:%.c=%.dd) -c $<
 	@ mkdir -p $(dir $@)
-	$(VERBOSE_SHOW) gcc $(CFLAGS) -fpic -fPIC -o $@ -c $< 
+	$(VERBOSE_SHOW) gcc $(CFLAGS) -fpic -fPIC -o $@ -c $<
 
 
 # --------------------------------------------------------------------------
@@ -220,7 +232,7 @@ LIBS3_STATIC = $(BUILD)/lib/libs3.a
 .PHONY: libs3
 libs3: $(LIBS3_SHARED) $(LIBS3_SHARED_MAJOR) $(BUILD)/lib/libs3.a
 
-LIBS3_SOURCES := src/acl.c src/bucket.c src/error_parser.c src/general.c \
+LIBS3_SOURCES := src/bucket.c src/bucket_metadata.c src/error_parser.c src/general.c \
                  src/object.c src/request.c src/request_context.c \
                  src/response_headers_handler.c src/service_access_logging.c \
                  src/service.c src/simplexml.c src/util.c src/multipart.c
@@ -274,7 +286,6 @@ $(BUILD)/bin/testsimplexml: $(BUILD)/obj/testsimplexml.o $(LIBS3_STATIC)
 	@ mkdir -p $(dir $@)
 	$(VERBOSE_SHOW) gcc -o $@ $^ $(LIBXML2_LIBS)
 
-
 # --------------------------------------------------------------------------
 # Clean target
 

LICENSE

@@ -2,7 +2,11 @@ Copyright 2008 Bryan Ischo <bryan@ischo.com>
 
 libs3 is free software: you can redistribute it and/or modify it under the
 terms of the GNU Lesser General Public License as published by the Free
-Software Foundation, version 3 of the License.
+Software Foundation, version 3 or above of the License.
+
+You can also redistribute it and/or modify it under the terms of the
+GNU General Public License as published by the Free Software Foundation,
+version 2 or above of the License.
 
 In addition, as a special exception, the copyright holders give
 permission to link the code of this library and its programs with the
@@ -14,5 +18,9 @@ FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 details.
 
 You should have received a copy of the GNU Lesser General Public License
-version 3 along with libs3, in a file named COPYING.  If not, see
+version 3 along with libs3, in a file named COPYING-LGPLv3.  If not, see
+<http://www.gnu.org/licenses/>.
+
+You should also have received a copy of the GNU General Public License
+version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
 <http://www.gnu.org/licenses/>.

TODO

@@ -81,11 +81,6 @@ This is Amazon's "user" management API; not part of S3 although IAM users can be
 - POST /?delete -- 4 hours
 
 
-=== Object Expiration Support ===
-
-- Handle the /?lifecycle property: 8 hours
-
-
 === MFA Authentication ===
 
 (part of Bucket Policy)

inc/error_parser.h

@@ -2,12 +2,14 @@
  * error_parser.h
  * 
  * Copyright 2008 Bryan Ischo <bryan@ischo.com>
- * 
+ *
  * This file is part of libs3.
- * 
+ *
  * libs3 is free software: you can redistribute it and/or modify it under the
  * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, version 3 of the License.
+ * Software Foundation, version 3 or above of the License.  You can also
+ * redistribute and/or modify it under the terms of the GNU General Public
+ * License, version 2 or above of the License.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of this library and its programs with the
@@ -22,6 +24,10 @@
  * version 3 along with libs3, in a file named COPYING.  If not, see
  * <http://www.gnu.org/licenses/>.
  *
+ * You should also have received a copy of the GNU General Public License
+ * version 2 along with libs3, in a file named COPYING-GPLv2.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
  ************************************************************************** **/
 
 #ifndef ERROR_PARSER_H