[med-svn] [Git][med-team/libtabixpp][master] 2 commits: Add hardening opts

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / libtabixpp


Commits:
71e7de3c by Nilesh Patra at 2022-07-14T21:12:49+05:30
Add hardening opts

- - - - -
c28d16d3 by Nilesh Patra at 2022-07-14T21:17:00+05:30
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/patches/build_shared_lib_with_debian_htslib.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,12 +1,16 @@
-libtabixpp (1.1.1-1) UNRELEASED; urgency=medium
+libtabixpp (1.1.1-1) unstable; urgency=medium
 
   [ Andreas Tille ]
+  * Team Upload.
   * New upstream version
   * Proper filename for upstream tarball
 
   [ Mohammed Bilal ]
   * Refresh patch
 
+  [ Nilesh Patra ]
+  * Add hardening opts
+
  -- Mohammed Bilal <mdbilal at disroot.org>  Thu, 14 Jul 2022 20:35:35 +0530
 
 libtabixpp (1.1.0-6) unstable; urgency=medium


=====================================
debian/patches/build_shared_lib_with_debian_htslib.patch
=====================================
@@ -23,7 +23,10 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
  .SUFFIXES:.c .o
  
  .c.o:
- 	$(CC) -c $(CXXFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
+-	$(CC) -c $(CXXFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
++	$(CC) -c $(CXXFLAGS) $(CPPFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
++
++all:   $(BIN) libtabixpp.so.$(SONUMBER) libtabixpp.a
  
 -all-recur lib-recur clean-recur cleanlocal-recur install-recur:
 -	@target=`echo $@ | sed s/-recur//`; \
@@ -35,34 +38,34 @@ Author: Sascha Steinbiss <sascha at steinbiss.name>
 -			|| exit 1; \
 -		cd $$wdir; \
 -	done;
--
++tabix.o: tabix.cpp tabix.hpp
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c tabix.cpp $(INCLUDES)
+ 
 -all:	$(BIN) $(LIB) $(SLIB)
-+all:   $(BIN) libtabixpp.so.$(SONUMBER) libtabixpp.a
++libtabixpp.a: tabix.o
++	ar rcs $@ $<
  
 -tabix.o: $(HTS_HEADERS) tabix.cpp tabix.hpp
-+tabix.o: tabix.cpp tabix.hpp
- 	$(CXX) $(CXXFLAGS) -c tabix.cpp $(INCLUDES)
+-	$(CXX) $(CXXFLAGS) -c tabix.cpp $(INCLUDES)
++libtabixpp.so.$(SONUMBER): tabix.o
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -shared -o $@ $< -fPIC -Wl,-soname,libtabixpp.so.$(SONUMBER) $(LDFLAGS) -lhts
  
 -htslib/libhts.a:
 -	cd htslib && $(MAKE) lib-static
-+libtabixpp.a: tabix.o
-+	ar rcs $@ $<
-+
-+libtabixpp.so.$(SONUMBER): tabix.o
-+	$(CXX) -shared -o $@ $< -fPIC -Wl,-soname,libtabixpp.so.$(SONUMBER) $(LDFLAGS) -lhts
-+
  
  $(LIB): $(OBJS)
  	$(AR) rs $(LIB) $(OBJS)
-@@ -61,7 +53,7 @@
+@@ -61,8 +53,8 @@
  $(SLIB): $(OBJS)
  	$(CXX) -shared -Wl,-soname,$(SLIB) -o $(SLIB) $(OBJS)
  
 -tabix++: $(OBJS) main.cpp $(HTS_LIB)
-+tabix++: $(OBJS) main.cpp
- 	$(CXX) $(CXXFLAGS) -o $@ main.cpp $(OBJS) $(INCLUDES) $(LIBPATH) \
+-	$(CXX) $(CXXFLAGS) -o $@ main.cpp $(OBJS) $(INCLUDES) $(LIBPATH) \
++$(BIN): $(OBJS) main.cpp
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ main.cpp $(OBJS) $(INCLUDES) $(LIBPATH) $(LDFLAGS) \
  		-lhts -lpthread -lm -lz -lcurl -llzma -lbz2
  
+ test: all
 @@ -82,7 +74,6 @@
  cleanlocal:
  	rm -rf $(BIN) $(LIB) $(SLIB) $(OBJS) $(DESTDIR)



View it on GitLab: https://salsa.debian.org/med-team/libtabixpp/-/compare/f08397c8ca20793cf70603c1941a4a7065d0a2fe...c28d16d3b0e51f76d54b0409e9659fc89d6b163f

-- 
View it on GitLab: https://salsa.debian.org/med-team/libtabixpp/-/compare/f08397c8ca20793cf70603c1941a4a7065d0a2fe...c28d16d3b0e51f76d54b0409e9659fc89d6b163f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220714/f3d43ec7/attachment-0001.htm>